diff --git a/.buildkite/aarch64_pipeline.yml b/.buildkite/aarch64_pipeline.yml
new file mode 100644
index 000000000..8c66116fe
--- /dev/null
+++ b/.buildkite/aarch64_pipeline.yml
@@ -0,0 +1,161 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+
+agents:
+  provider: aws
+  imagePrefix: platform-ingest-logstash-ubuntu-2204-aarch64
+  instanceType: "m6g.4xlarge"
+  diskSizeGb: 200
+
+steps:
+  - group: "Testing Phase"
+    key: "testing-phase"
+    steps:
+      - label: ":rspec: Ruby unit tests"
+        key: "ruby-unit-tests"
+        command: |
+          set -euo pipefail
+
+          source .buildkite/scripts/common/vm-agent.sh
+          ci/unit_tests.sh ruby
+        retry:
+          automatic:
+            - limit: 3
+
+      - label: ":java: Java unit tests"
+        key: "java-unit-tests"
+        env:
+          # https://github.com/elastic/logstash/pull/15486 for background
+          ENABLE_SONARQUBE: "false"
+        command: |
+          set -euo pipefail
+
+          source .buildkite/scripts/common/vm-agent.sh
+          ci/unit_tests.sh java
+        retry:
+          automatic:
+            - limit: 3
+
+      - label: ":lab_coat: Integration Tests / part 1-of-3"
+        key: "integration-tests-part-1-of-3"
+        command: |
+          set -euo pipefail
+
+          source .buildkite/scripts/common/vm-agent.sh
+          ci/integration_tests.sh split 0 3
+        retry:
+          automatic:
+            - limit: 3
+
+      - label: ":lab_coat: Integration Tests / part 2-of-3"
+        key: "integration-tests-part-2-of-3"
+        command: |
+          set -euo pipefail
+
+          source .buildkite/scripts/common/vm-agent.sh
+          ci/integration_tests.sh split 1 3
+        retry:
+          automatic:
+            - limit: 3
+
+      - label: ":lab_coat: Integration Tests / part 3-of-3"
+        key: "integration-tests-part-3-of-3"
+        command: |
+          set -euo pipefail
+
+          source .buildkite/scripts/common/vm-agent.sh
+          ci/integration_tests.sh split 2 3
+        retry:
+          automatic:
+            - limit: 3
+
+      - label: ":lab_coat: IT Persistent Queues / part 1-of-3"
+        key: "integration-tests-qa-part-1-of-3"
+        command: |
+          set -euo pipefail
+
+          source .buildkite/scripts/common/vm-agent.sh
+          export FEATURE_FLAG=persistent_queues
+          ci/integration_tests.sh split 0 3
+        retry:
+          automatic:
+            - limit: 3
+
+      - label: ":lab_coat: IT Persistent Queues / part 2-of-3"
+        key: "integration-tests-qa-part-2-of-3"
+        command: |
+          set -euo pipefail
+
+          source .buildkite/scripts/common/vm-agent.sh
+          export FEATURE_FLAG=persistent_queues
+          ci/integration_tests.sh split 1 3
+        retry:
+          automatic:
+            - limit: 3
+
+      - label: ":lab_coat: IT Persistent Queues / part 3-of-3"
+        key: "integration-tests-qa-part-3-of-3"
+        command: |
+          set -euo pipefail
+
+          source .buildkite/scripts/common/vm-agent.sh
+          export FEATURE_FLAG=persistent_queues
+          ci/integration_tests.sh split 2 3
+        retry:
+          automatic:
+            - limit: 3
+
+      - label: ":lab_coat: x-pack unit tests"
+        key: "x-pack-unit-tests"
+        command: |
+          set -euo pipefail
+
+          source .buildkite/scripts/common/vm-agent.sh
+          x-pack/ci/unit_tests.sh
+        retry:
+          automatic:
+            - limit: 3
+
+      - label: ":lab_coat: x-pack integration"
+        key: "integration-tests-x-pack"
+        command: |
+          set -euo pipefail
+
+          source .buildkite/scripts/common/vm-agent.sh
+          x-pack/ci/integration_tests.sh
+        retry:
+          automatic:
+            - limit: 3
+
+  - group: "Acceptance Phase"
+    depends_on: "testing-phase"
+    key: "acceptance-phase"
+    steps:
+      - label: "Docker [{{matrix}}] flavor acceptance"
+        command:
+          set -euo pipefail
+          
+          source .buildkite/scripts/common/vm-agent.sh && ci/docker_acceptance_tests.sh {{matrix}}
+        retry:
+          automatic:
+            - limit: 3
+        matrix:
+          - "full"
+          - "oss"
+
+      # *** TODO: enable after clarifying if acceptance tests really need vagrant on aarch64
+      # - label: "Acceptance tests on {{matrix.distribution}}"
+      #   agents:
+      #     provider: aws
+      #     imagePrefix: platform-ingest-logstash-{{matrix.distribution}}-aarch64
+      #     instanceType: "m6g.4xlarge"
+      #     diskSizeGb: 200
+      #   command:
+      #     set -euo pipefail
+          
+      #     source .buildkite/scripts/common/vm-agent.sh && ci/acceptance_tests.sh {{matrix.suite}}
+      #   matrix:
+      #     setup:
+      #       suite:
+      #         - "debian"
+      #       distribution:
+      #         - "ubuntu-2204"
diff --git a/.buildkite/benchmark_marathon_pipeline.yml b/.buildkite/benchmark_marathon_pipeline.yml
new file mode 100644
index 000000000..d2f8b6577
--- /dev/null
+++ b/.buildkite/benchmark_marathon_pipeline.yml
@@ -0,0 +1,11 @@
+agents:
+  provider: gcp
+  imageProject: elastic-images-prod
+  image: family/platform-ingest-logstash-ubuntu-2204
+  machineType: "n2-standard-16"
+  diskSizeGb: 100
+  diskType: pd-ssd
+
+steps:
+  - label: "Benchmark Marathon"
+    command: .buildkite/scripts/benchmark/marathon.sh
\ No newline at end of file
diff --git a/.buildkite/benchmark_pipeline.yml b/.buildkite/benchmark_pipeline.yml
new file mode 100644
index 000000000..071ee6996
--- /dev/null
+++ b/.buildkite/benchmark_pipeline.yml
@@ -0,0 +1,14 @@
+agents:
+  provider: gcp
+  imageProject: elastic-images-prod
+  image: family/platform-ingest-logstash-ubuntu-2204
+  machineType: "n2-standard-16"
+  diskSizeGb: 100
+  diskType: pd-ssd
+
+steps:
+  - label: "Benchmark Snapshot"
+    retry:
+      automatic:
+        - limit: 3
+    command: .buildkite/scripts/benchmark/main.sh
\ No newline at end of file
diff --git a/.buildkite/dra_pipeline.yml b/.buildkite/dra_pipeline.yml
new file mode 100644
index 000000000..10007715c
--- /dev/null
+++ b/.buildkite/dra_pipeline.yml
@@ -0,0 +1,15 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+
+steps:
+  - label: ":pipeline: Generate steps"
+    command: |
+      set -euo pipefail
+      
+      echo "--- Building [$${WORKFLOW_TYPE}] artifacts"
+      python3 -m pip install pyyaml
+      echo "--- Building dynamic pipeline steps"
+      python3 .buildkite/scripts/dra/generatesteps.py > steps.yml
+      echo "--- Printing dynamic pipeline steps"
+      cat steps.yml
+      echo "--- Uploading dynamic pipeline steps"
+      cat steps.yml | buildkite-agent pipeline upload
diff --git a/.buildkite/exhaustive_tests_pipeline.yml b/.buildkite/exhaustive_tests_pipeline.yml
new file mode 100644
index 000000000..fadccf232
--- /dev/null
+++ b/.buildkite/exhaustive_tests_pipeline.yml
@@ -0,0 +1,39 @@
+steps:
+  - label: "Exhaustive tests pipeline"
+    command: |
+      #!/usr/bin/env bash
+      echo "--- Check for docs changes"
+      set +e
+      .buildkite/scripts/common/check-files-changed.sh '^docs/.*'
+      if [[ $$? -eq 0 ]]; then
+        echo "^^^ +++"
+        echo "Skipping running pipeline as all changes are related to docs."
+        exit 0
+      else
+        echo "Changes are not exclusively related to docs, continuing."
+      fi
+
+      set -eo pipefail
+
+      echo "--- Downloading prerequisites"
+      python3 -m pip install ruamel.yaml
+      curl -fsSL --retry-max-time 60 --retry 3 --retry-delay 5 -o /usr/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64
+      chmod a+x /usr/bin/yq
+
+      echo "--- Printing generated dynamic steps"
+      set +e
+      python3 .buildkite/scripts/exhaustive-tests/generate-steps.py >pipeline_steps.yml
+      if [[ $$? -ne 0 ]]; then
+        echo "^^^ +++"
+        echo "There was a problem rendering the pipeline steps."
+        cat pipeline_steps.yml
+        echo "Exiting now."
+        exit 1
+      else
+        set -eo pipefail
+        cat pipeline_steps.yml | yq .
+      fi
+
+      set -eo pipefail
+      echo "--- Uploading steps to buildkite"
+      cat pipeline_steps.yml | buildkite-agent pipeline upload
diff --git a/.buildkite/health_report_tests_pipeline.yml b/.buildkite/health_report_tests_pipeline.yml
new file mode 100644
index 000000000..93dd4d7ac
--- /dev/null
+++ b/.buildkite/health_report_tests_pipeline.yml
@@ -0,0 +1,20 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+
+agents:
+  provider: gcp
+  imageProject: elastic-images-prod
+  image: family/platform-ingest-logstash-ubuntu-2204
+  machineType: "n2-standard-4"
+  diskSizeGb: 64
+
+steps:
+  - group: ":logstash: Health API integration tests"
+    key: "testing-phase"
+    steps:
+      - label: "main branch"
+        key: "integ-tests-on-main-branch"
+        command:
+          - .buildkite/scripts/health-report-tests/main.sh
+        retry:
+          automatic:
+            - limit: 3
\ No newline at end of file
diff --git a/.buildkite/jdk_availability_check_pipeline.yml b/.buildkite/jdk_availability_check_pipeline.yml
new file mode 100644
index 000000000..3fa826564
--- /dev/null
+++ b/.buildkite/jdk_availability_check_pipeline.yml
@@ -0,0 +1,14 @@
+steps:
+  - label: "JDK Availability check"
+    key: "jdk-availability-check"
+    agents:
+      image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-logstash-ci"
+      cpu: "4"
+      memory: "6Gi"
+      ephemeralStorage: "100Gi"
+    command: |
+      set -euo pipefail
+
+      source .buildkite/scripts/common/container-agent.sh
+      export GRADLE_OPTS="-Xmx2g -Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info"
+      ci/check_jdk_version_availability.sh
\ No newline at end of file
diff --git a/.buildkite/linux_jdk_matrix_pipeline.yml b/.buildkite/linux_jdk_matrix_pipeline.yml
new file mode 100644
index 000000000..4fd7874bf
--- /dev/null
+++ b/.buildkite/linux_jdk_matrix_pipeline.yml
@@ -0,0 +1,96 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+# Before adding an Operating System to the JDK matrix:
+#  - Ensure the image is available in https://github.com/elastic/ci-agent-images/blob/main/vm-images/platform-ingest/logstash-multi-jdk.yml
+#  - If image doesn't exist, review https://docs.elastic.dev/ingest-dev-docs/engineer-productivity/custom-ci-images
+
+env:
+  DEFAULT_MATRIX_OS: "ubuntu-2204"
+  DEFAULT_MATRIX_JDK: "adoptiumjdk_21"
+
+steps:
+  - input: "Test Parameters"
+    if: build.source != "schedule" && build.source != "trigger_job"
+    fields:
+      - select: "Operating System"
+        key: "matrix-os"
+        hint: "The operating system variant(s) to run on:"
+        required: true
+        multiple: true
+        default: "${DEFAULT_MATRIX_OS}"
+        options:
+          - label: "Ubuntu 24.04"
+            value: "ubuntu-2404"
+          - label: "Ubuntu 22.04"
+            value: "ubuntu-2204"
+          - label: "Ubuntu 20.04"
+            value: "ubuntu-2004"
+          - label: "Debian 12"
+            value: "debian-12"
+          - label: "Debian 11"
+            value: "debian-11"
+          - label: "RHEL 9"
+            value: "rhel-9"
+          - label: "RHEL 8"
+            value: "rhel-8"
+          - label: "Oracle Linux 8"
+            value: "oraclelinux-8"
+          - label: "Oracle Linux 7"
+            value: "oraclelinux-7"
+          - label: "Rocky Linux 8"
+            value: "rocky-linux-8"
+          - label: "Rocky Linux 9"
+            value: "rocky-linux-9"
+          - label: "Alma Linux 8"
+            value: "almalinux-8"
+          - label: "Alma Linux 9"
+            value: "almalinux-9"
+          - label: "Amazon Linux (2023)"
+            value: "amazonlinux-2023"
+          - label: "OpenSUSE Leap 15"
+            value: "opensuse-leap-15"
+
+      - select: "Java"
+        key: "matrix-jdk"
+        hint: "The JDK to test with:"
+        required: true
+        multiple: true
+        default: "${DEFAULT_MATRIX_JDK}"
+        options:
+          - label: "Adoptium JDK 21 (Eclipse Temurin)"
+            value: "adoptiumjdk_21"
+          - label: "Adoptium JDK 17 (Eclipse Temurin)"
+            value: "adoptiumjdk_17"
+          - label: "OpenJDK 21"
+            value: "openjdk_21"
+          - label: "Zulu 21"
+            value: "zulu_21"
+          - label: "Zulu 17"
+            value: "zulu_17"
+
+  - wait: ~
+    if: build.source != "schedule" && build.source != "trigger_job"
+
+  - command: |
+      set -euo pipefail
+
+      echo "--- Downloading prerequisites"
+      python3 -m pip install ruamel.yaml
+
+      echo "--- Printing generated dynamic steps"
+      export MATRIX_OSES="$(buildkite-agent meta-data get matrix-os --default=${DEFAULT_MATRIX_OS})"
+      export MATRIX_JDKS="$(buildkite-agent meta-data get matrix-jdk --default=${DEFAULT_MATRIX_JDK})"
+      set +eo pipefail
+      python3 .buildkite/scripts/jdk-matrix-tests/generate-steps.py >pipeline_steps.yml
+      if [[ $$? -ne 0 ]]; then
+        echo "^^^ +++"
+        echo "There was a problem rendering the pipeline steps."
+        cat pipeline_steps.yml
+        echo "Exiting now."
+        exit 1
+      else
+        set -eo pipefail
+        cat pipeline_steps.yml
+      fi
+
+      echo "--- Uploading steps to buildkite"
+      cat pipeline_steps.yml | buildkite-agent pipeline upload
diff --git a/.buildkite/pull-requests.json b/.buildkite/pull-requests.json
new file mode 100644
index 000000000..2414a75b5
--- /dev/null
+++ b/.buildkite/pull-requests.json
@@ -0,0 +1,26 @@
+{
+    "jobs": [
+      {
+        "enabled": true,
+        "pipeline_slug": "logstash-pull-request-pipeline",
+        "allow_org_users": true,
+        "allowed_repo_permissions": ["admin", "write"],
+        "allowed_list": ["dependabot[bot]", "mergify[bot]", "github-actions[bot]", "elastic-vault-github-plugin-prod[bot]"],
+        "set_commit_status": true,
+        "build_on_commit": true,
+        "build_on_comment": true,
+        "trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))",
+        "always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))",
+        "skip_ci_labels": [ ],
+        "skip_target_branches": [ ],
+        "skip_ci_on_only_changed": [
+          "^.github/",
+          "^docs/",
+          "^.mergify.yml$",
+          "^.pre-commit-config.yaml",
+          "\\.md$"
+        ],
+        "always_require_ci_on_changed": [ ]
+      }
+    ]
+  }
diff --git a/.buildkite/pull_request_pipeline.yml b/.buildkite/pull_request_pipeline.yml
new file mode 100644
index 000000000..a087813df
--- /dev/null
+++ b/.buildkite/pull_request_pipeline.yml
@@ -0,0 +1,243 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+
+steps:
+  - label: ":passport_control: License check"
+    key: "license-check"
+    agents:
+      image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-logstash-ci"
+      cpu: "4"
+      memory: "6Gi"
+      ephemeralStorage: "100Gi"
+    retry:
+      automatic:
+        - limit: 3
+    command: |
+      set -euo pipefail
+
+      source .buildkite/scripts/common/container-agent.sh
+      export JRUBY_OPTS="-J-Xmx1g"
+      export GRADLE_OPTS="-Xmx2g -Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info"
+      ci/license_check.sh -m 4G
+
+  - label: ":rspec: Ruby unit tests"
+    key: "ruby-unit-tests"
+    agents:
+      image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-logstash-ci-no-root"
+      cpu: "4"
+      memory: "8Gi"
+      ephemeralStorage: "100Gi"
+      # Run as a non-root user
+      imageUID: "1002"
+    retry:
+      automatic:
+        - limit: 3
+    command: |
+      set -euo pipefail
+
+      source .buildkite/scripts/common/container-agent.sh
+      ci/unit_tests.sh ruby
+    artifact_paths:
+      - "coverage/coverage.json"
+
+  - label: ":java: Java unit tests"
+    key: "java-unit-tests"
+    agents:
+      image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-logstash-ci"
+      cpu: "8"
+      memory: "16Gi"
+      ephemeralStorage: "100Gi"
+    retry:
+      automatic:
+        - limit: 3
+    env:
+      ENABLE_SONARQUBE: true
+    command: |
+      set -euo pipefail      
+      source .buildkite/scripts/common/container-agent.sh
+      ci/unit_tests.sh java
+    artifact_paths:
+      - "**/build/test-results/javaTests/TEST-*.xml"
+      - "**/jacocoTestReport.xml"
+      - "**/build/classes/**/*.*"
+
+  - label: ":sonarqube: Continuous Code Inspection"
+    if: | 
+      build.pull_request.id != null || 
+      build.branch == "main" || 
+      build.branch =~ /^[0-9]+\.[0-9]+\$/
+    env:
+      VAULT_SONAR_TOKEN_PATH: "kv/ci-shared/platform-ingest/elastic/logstash/sonar-analyze-token"
+    agents:
+      image: "docker.elastic.co/cloud-ci/sonarqube/buildkite-scanner:latest"
+    command:
+      - "buildkite-agent artifact download --step ruby-unit-tests coverage/coverage.json ."
+      - "buildkite-agent artifact download --step java-unit-tests **/jacocoTestReport.xml ."
+      - "buildkite-agent artifact download --step java-unit-tests **/build/classes/**/*.* ."
+      - "/scan-source-code.sh"
+    depends_on:
+      - "ruby-unit-tests"
+      - "java-unit-tests"
+    retry:
+      manual:
+        allowed: true
+
+  - label: ":lab_coat: Integration Tests / part 1-of-3"
+    key: "integration-tests-part-1-of-3"
+    agents:
+      image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-logstash-ci-no-root"
+      cpu: "8"
+      memory: "16Gi"
+      ephemeralStorage: "100Gi"
+      # Run as a non-root user
+      imageUID: "1002"
+    retry:
+      automatic:
+        - limit: 3
+    command: |
+      set -euo pipefail
+
+      source .buildkite/scripts/common/container-agent.sh
+      ci/integration_tests.sh split 0 3
+
+  - label: ":lab_coat: Integration Tests / part 2-of-3"
+    key: "integration-tests-part-2-of-3"
+    agents:
+      image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-logstash-ci-no-root"
+      cpu: "8"
+      memory: "16Gi"
+      ephemeralStorage: "100Gi"
+      # Run as a non-root user
+      imageUID: "1002"
+    retry:
+      automatic:
+        - limit: 3
+    command: |
+      set -euo pipefail
+
+      source .buildkite/scripts/common/container-agent.sh
+      ci/integration_tests.sh split 1 3
+
+  - label: ":lab_coat: Integration Tests / part 3-of-3"
+    key: "integration-tests-part-3-of-3"
+    agents:
+      image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-logstash-ci-no-root"
+      cpu: "8"
+      memory: "16Gi"
+      ephemeralStorage: "100Gi"
+      # Run as a non-root user
+      imageUID: "1002"
+    retry:
+      automatic:
+        - limit: 3
+    command: |
+      set -euo pipefail
+
+      source .buildkite/scripts/common/container-agent.sh
+      ci/integration_tests.sh split 2 3
+
+  - label: ":lab_coat: IT Persistent Queues / part 1-of-3"
+    key: "integration-tests-qa-part-1-of-3"
+    agents:
+      image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-logstash-ci-no-root"
+      cpu: "8"
+      memory: "16Gi"
+      ephemeralStorage: "100Gi"
+      # Run as non root (logstash) user. UID is hardcoded in image.
+      imageUID: "1002"
+    retry:
+      automatic:
+        - limit: 3
+    command: |
+      set -euo pipefail
+
+      source .buildkite/scripts/common/container-agent.sh
+      export FEATURE_FLAG=persistent_queues
+      ci/integration_tests.sh split 0 3
+
+  - label: ":lab_coat: IT Persistent Queues / part 2-of-3"
+    key: "integration-tests-qa-part-2-of-3"
+    agents:
+      image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-logstash-ci-no-root"
+      cpu: "8"
+      memory: "16Gi"
+      ephemeralStorage: "100Gi"
+      # Run as non root (logstash) user. UID is hardcoded in image.
+      imageUID: "1002"
+    retry:
+      automatic:
+        - limit: 3
+    command: |
+      set -euo pipefail
+
+      source .buildkite/scripts/common/container-agent.sh
+      export FEATURE_FLAG=persistent_queues
+      ci/integration_tests.sh split 1 3
+
+  - label: ":lab_coat: IT Persistent Queues / part 3-of-3"
+    key: "integration-tests-qa-part-3-of-3"
+    agents:
+      image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-logstash-ci-no-root"
+      cpu: "8"
+      memory: "16Gi"
+      ephemeralStorage: "100Gi"
+      # Run as non root (logstash) user. UID is hardcoded in image.
+      imageUID: "1002"
+    retry:
+      automatic:
+        - limit: 3
+    command: |
+      set -euo pipefail
+
+      source .buildkite/scripts/common/container-agent.sh
+      export FEATURE_FLAG=persistent_queues
+      ci/integration_tests.sh split 2 3
+
+  - label: ":lab_coat: x-pack unit tests"
+    key: "x-pack-unit-tests"
+    agents:
+      image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-logstash-ci-no-root"
+      cpu: "8"
+      memory: "16Gi"
+      ephemeralStorage: "100Gi"
+      # Run as non root (logstash) user. UID is hardcoded in image.
+      imageUID: "1002"
+    retry:
+      automatic:
+        - limit: 3
+    command: |
+      set -euo pipefail
+
+      source .buildkite/scripts/common/container-agent.sh
+      x-pack/ci/unit_tests.sh
+
+  - label: ":lab_coat: x-pack integration"
+    key: "integration-tests-x-pack"
+    agents:
+      image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-logstash-ci-no-root"
+      cpu: "8"
+      memory: "16Gi"
+      ephemeralStorage: "100Gi"
+      # Run as non root (logstash) user. UID is hardcoded in image.
+      imageUID: "1002"
+    retry:
+      automatic:
+        - limit: 3
+    command: |
+      set -euo pipefail
+
+      source .buildkite/scripts/common/container-agent.sh
+      x-pack/ci/integration_tests.sh
+
+  - wait: ~
+    continue_on_failure: true
+
+  - label: "🏁 Annotate JUnit results"
+    # the plugin requires docker run, hence the use of a VM
+    agents:
+      provider: gcp
+      imageProject: elastic-images-prod
+      image: family/platform-ingest-logstash-ubuntu-2204
+      machineType: "n2-standard-2"
+    plugins:
+      - junit-annotate#v2.4.1:
+          artifacts: "**/TEST-*.xml"
diff --git a/.buildkite/scripts/benchmark/README.md b/.buildkite/scripts/benchmark/README.md
new file mode 100644
index 000000000..63cc8dbac
--- /dev/null
+++ b/.buildkite/scripts/benchmark/README.md
@@ -0,0 +1,22 @@
+## Steps to set up GCP instance to run benchmark script
+- Create an instance "n2-standard-16" with Ubuntu image
+- Install docker
+  - `sudo snap install docker`
+  - `sudo usermod -a -G docker $USER`
+- Install jq
+- Install vault
+  - `sudo snap install vault`
+  - `vault login --method github`
+  - `vault kv get -format json secret/ci/elastic-logstash/benchmark`
+- Setup Elasticsearch index mapping and alias with `setup/*`
+- Import Kibana dashboard with `save-objects/*`
+- Run the benchmark script
+  - Send data to your own Elasticsearch. Customise `VAULT_PATH="secret/ci/elastic-logstash/your/path"`
+  - Run the script `main.sh` 
+    - or run in background `nohup bash -x main.sh > log.log 2>&1 &`
+
+## Notes
+- Benchmarks should only be compared using the same hardware setup.
+- Please do not send the test metrics to the benchmark cluster. You can set `VAULT_PATH` to send data and metrics to your own server.
+- Run `all.sh` as calibration which gives you a baseline of performance in different versions.
+- [#16586](https://github.com/elastic/logstash/pull/16586) allows legacy monitoring using the configuration `xpack.monitoring.allow_legacy_collection: true`, which is not recognized in version 8. To run benchmarks in version 8, use the script of the corresponding branch (e.g. `8.16`) instead of `main` in buildkite.
\ No newline at end of file
diff --git a/.buildkite/scripts/benchmark/config/filebeat.yml b/.buildkite/scripts/benchmark/config/filebeat.yml
new file mode 100644
index 000000000..b7fb90fc8
--- /dev/null
+++ b/.buildkite/scripts/benchmark/config/filebeat.yml
@@ -0,0 +1,15 @@
+http.enabled: false
+filebeat.inputs:
+- type: log
+  symlinks: true
+  paths:
+  - "/usr/share/filebeat/flog/*.log"
+logging.level: info
+output.logstash:
+  hosts:
+    - "localhost:5044"
+  ttl: 10ms
+  bulk_max_size: 2048
+# queue.mem:
+#   events: 4096
+#   flush.min_events: 2048
\ No newline at end of file
diff --git a/.buildkite/scripts/benchmark/config/logstash.yml b/.buildkite/scripts/benchmark/config/logstash.yml
new file mode 100644
index 000000000..59d648889
--- /dev/null
+++ b/.buildkite/scripts/benchmark/config/logstash.yml
@@ -0,0 +1,10 @@
+api.http.host: 0.0.0.0
+pipeline.workers: ${WORKER} 
+pipeline.batch.size: ${BATCH_SIZE}
+queue.type: ${QTYPE}
+
+xpack.monitoring.allow_legacy_collection: true
+xpack.monitoring.enabled: true
+xpack.monitoring.elasticsearch.username: ${MONITOR_ES_USER}
+xpack.monitoring.elasticsearch.password: ${MONITOR_ES_PW}
+xpack.monitoring.elasticsearch.hosts: ["${MONITOR_ES_HOST}"]
diff --git a/.buildkite/scripts/benchmark/config/pipelines.yml b/.buildkite/scripts/benchmark/config/pipelines.yml
new file mode 100644
index 000000000..dd0cbf8df
--- /dev/null
+++ b/.buildkite/scripts/benchmark/config/pipelines.yml
@@ -0,0 +1,44 @@
+- pipeline.id: main
+  config.string: |
+    input { 
+      beats {
+        port => 5044
+      }
+    } 
+    output { 
+      elasticsearch {
+        hosts => [ "${BENCHMARK_ES_HOST}" ]
+        user => "${BENCHMARK_ES_USER}"
+        password => "${BENCHMARK_ES_PW}"
+      }
+    }
+- pipeline.id: node_stats
+  config.string: |
+    input {
+      http_poller {
+        urls => {
+          NodeStats => {
+            method => get
+            url => "http://localhost:9600/_node/stats"
+          }
+        }
+        schedule => { every => "30s"}
+        codec => "json"
+      }
+    }
+    filter {
+      mutate { 
+        remove_field => [ "host", "[pipelines][.monitoring-logstash]", "event" ]
+        add_field => { "[benchmark][label]" => "${QTYPE}_w${WORKER}b${BATCH_SIZE}" }
+      }
+    }
+    output {
+      elasticsearch {
+        hosts => [ "${BENCHMARK_ES_HOST}" ]
+        user => "${BENCHMARK_ES_USER}"
+        password => "${BENCHMARK_ES_PW}"
+        data_stream_type => "metrics"
+        data_stream_dataset => "nodestats"
+        data_stream_namespace => "logstash"
+      }
+    }
\ No newline at end of file
diff --git a/.buildkite/scripts/benchmark/config/uuid b/.buildkite/scripts/benchmark/config/uuid
new file mode 100644
index 000000000..b6ac241f7
--- /dev/null
+++ b/.buildkite/scripts/benchmark/config/uuid
@@ -0,0 +1 @@
+f74f1a28-25e9-494f-ba41-ca9f13d4446d
\ No newline at end of file
diff --git a/.buildkite/scripts/benchmark/core.sh b/.buildkite/scripts/benchmark/core.sh
new file mode 100755
index 000000000..b778b0ccb
--- /dev/null
+++ b/.buildkite/scripts/benchmark/core.sh
@@ -0,0 +1,331 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+SCRIPT_PATH="$(dirname "${BASH_SOURCE[0]}")"
+CONFIG_PATH="$SCRIPT_PATH/config"
+source "$SCRIPT_PATH/util.sh"
+
+usage() {
+  echo "Usage: $0 [FB_CNT] [QTYPE] [CPU] [MEM]"
+  echo "Example: $0 4 {persisted|memory|all} 2 2"
+  exit 1
+}
+
+parse_args() {
+  while [[ "$#" -gt 0 ]]; do
+    if [ -z "$FB_CNT" ]; then
+      FB_CNT=$1
+    elif [ -z "$QTYPE" ]; then
+      case $1 in
+        all | persisted | memory)
+            QTYPE=$1
+            ;;
+        *)
+          echo "Error: wrong queue type $1"
+          usage
+          ;;
+      esac
+    elif [ -z "$CPU" ]; then
+      CPU=$1
+    elif [ -z "$MEM" ]; then
+      MEM=$1
+    else
+      echo "Error: Too many arguments"
+      usage
+    fi
+    shift
+  done
+
+  # set default value
+  # number of filebeat
+  FB_CNT=${FB_CNT:-4}
+  # all | persisted | memory
+  QTYPE=${QTYPE:-all}
+  CPU=${CPU:-4}
+  MEM=${MEM:-4}
+  XMX=$((MEM / 2))
+
+  IFS=','
+  # worker multiplier: 1,2,4
+  MULTIPLIERS="${MULTIPLIERS:-1,2,4}"
+  read -ra MULTIPLIERS <<< "$MULTIPLIERS"
+  BATCH_SIZES="${BATCH_SIZES:-500}"
+  read -ra BATCH_SIZES <<< "$BATCH_SIZES"
+  # tags to json array
+  read -ra TAG_ARRAY <<< "$TAGS"
+  JSON_TAGS=$(printf '"%s",' "${TAG_ARRAY[@]}" | sed 's/,$//')
+  JSON_TAGS="[$JSON_TAGS]"
+
+  IFS=' '
+  echo "filebeats: $FB_CNT, cpu: $CPU, mem: $MEM, Queue: $QTYPE, worker multiplier: ${MULTIPLIERS[@]}, batch size: ${BATCH_SIZES[@]}"
+}
+
+get_secret() {
+  VAULT_PATH=${VAULT_PATH:-secret/ci/elastic-logstash/benchmark}
+  VAULT_DATA=$(vault kv get -format json $VAULT_PATH)
+  BENCHMARK_ES_HOST=$(echo $VAULT_DATA | jq -r '.data.es_host')
+  BENCHMARK_ES_USER=$(echo $VAULT_DATA | jq -r '.data.es_user')
+  BENCHMARK_ES_PW=$(echo $VAULT_DATA | jq -r '.data.es_pw')
+
+  MONITOR_ES_HOST=$(echo $VAULT_DATA | jq -r '.data.monitor_es_host')
+  MONITOR_ES_USER=$(echo $VAULT_DATA | jq -r '.data.monitor_es_user')
+  MONITOR_ES_PW=$(echo $VAULT_DATA | jq -r '.data.monitor_es_pw')
+}
+
+pull_images() {
+  echo "--- Pull docker images"
+
+  if [[ -n "$LS_VERSION" ]]; then
+    # pull image if it doesn't exist in local
+    [[ -z $(docker images -q docker.elastic.co/logstash/logstash:$LS_VERSION) ]] && docker pull "docker.elastic.co/logstash/logstash:$LS_VERSION"
+  else
+    # pull the latest snapshot logstash image
+    # select the SNAPSHOT artifact with the highest semantic version number
+    LS_VERSION=$( curl --retry-all-errors --retry 5 --retry-delay 1 -s "https://storage.googleapis.com/artifacts-api/snapshots/main.json" | jq -r '.version' )
+    BUILD_ID=$(curl --retry-all-errors --retry 5 --retry-delay 1 -s "https://storage.googleapis.com/artifacts-api/snapshots/main.json" | jq -r '.build_id')
+    ARCH=$(arch)
+    IMAGE_URL="https://snapshots.elastic.co/${BUILD_ID}/downloads/logstash/logstash-$LS_VERSION-docker-image-$ARCH.tar.gz"
+    IMAGE_FILENAME="$LS_VERSION.tar.gz"
+
+    echo "Download $LS_VERSION from $IMAGE_URL"
+    [[ ! -e $IMAGE_FILENAME ]] && curl -fsSL --retry-max-time 60 --retry 3 --retry-delay 5 -o "$IMAGE_FILENAME" "$IMAGE_URL"
+    [[ -z $(docker images -q docker.elastic.co/logstash/logstash:$LS_VERSION) ]] && docker load -i "$IMAGE_FILENAME"
+  fi
+
+  # pull filebeat image
+  FB_DEFAULT_VERSION="8.13.4"
+  FB_VERSION=${FB_VERSION:-$FB_DEFAULT_VERSION}
+  docker pull "docker.elastic.co/beats/filebeat:$FB_VERSION"
+}
+
+generate_logs() {
+  FLOG_FILE_CNT=${FLOG_FILE_CNT:-4}
+  SINGLE_SIZE=524288000
+  TOTAL_SIZE="$((FLOG_FILE_CNT * SINGLE_SIZE))"
+  FLOG_PATH="$SCRIPT_PATH/flog"
+  mkdir -p $FLOG_PATH
+
+  if [[ ! -e "$FLOG_PATH/log${FLOG_FILE_CNT}.log" ]]; then
+    echo "--- Generate logs in background. log: ${FLOG_FILE_CNT}, each size: 500mb"
+    docker run -d --name=flog --rm -v $FLOG_PATH:/go/src/data mingrammer/flog -t log -w -o "/go/src/data/log.log" -b $TOTAL_SIZE -p $SINGLE_SIZE
+  fi
+}
+
+check_logs() {
+  echo "--- Check log generation"
+
+  local cnt=0
+  until [[ -e "$FLOG_PATH/log${FLOG_FILE_CNT}.log" || $cnt -gt 600 ]]; do
+    echo "wait 30s" && sleep 30
+    cnt=$((cnt + 30))
+  done
+
+  ls -lah $FLOG_PATH
+}
+
+start_logstash() {
+  LS_CONFIG_PATH=$SCRIPT_PATH/ls/config
+  mkdir -p $LS_CONFIG_PATH
+
+  cp $CONFIG_PATH/pipelines.yml $LS_CONFIG_PATH/pipelines.yml
+  cp $CONFIG_PATH/logstash.yml $LS_CONFIG_PATH/logstash.yml
+  cp $CONFIG_PATH/uuid $LS_CONFIG_PATH/uuid
+
+  remove_v9_config
+
+  LS_JAVA_OPTS=${LS_JAVA_OPTS:--Xmx${XMX}g}
+  docker run -d --name=ls --net=host --cpus=$CPU --memory=${MEM}g -e LS_JAVA_OPTS="$LS_JAVA_OPTS" \
+    -e QTYPE="$QTYPE" -e WORKER="$WORKER" -e BATCH_SIZE="$BATCH_SIZE" \
+    -e BENCHMARK_ES_HOST="$BENCHMARK_ES_HOST" -e BENCHMARK_ES_USER="$BENCHMARK_ES_USER" -e BENCHMARK_ES_PW="$BENCHMARK_ES_PW" \
+    -e MONITOR_ES_HOST="$MONITOR_ES_HOST" -e MONITOR_ES_USER="$MONITOR_ES_USER" -e MONITOR_ES_PW="$MONITOR_ES_PW" \
+    -v $LS_CONFIG_PATH/logstash.yml:/usr/share/logstash/config/logstash.yml:ro \
+    -v $LS_CONFIG_PATH/pipelines.yml:/usr/share/logstash/config/pipelines.yml:ro \
+    -v $LS_CONFIG_PATH/uuid:/usr/share/logstash/data/uuid:ro \
+    docker.elastic.co/logstash/logstash:$LS_VERSION
+}
+
+remove_v9_config() {
+  local config_path="$LS_CONFIG_PATH/logstash.yml"
+  local major_version=$(echo $LS_VERSION | cut -d. -f1)
+  if [ "$major_version" -lt 9 ]; then
+    echo "Remove v9 config 'xpack.monitoring.allow_legacy_collection' from logstash.yml"
+
+    if [[ "$(uname)" == "Darwin" ]]; then
+      sed -i '' '/xpack\.monitoring\.allow_legacy_collection/d' "$config_path"
+    else
+      sed -i '/xpack\.monitoring\.allow_legacy_collection/d' "$config_path"
+    fi
+  fi
+}
+
+start_filebeat() {
+  for ((i = 0; i < FB_CNT; i++)); do
+    FB_PATH="$SCRIPT_PATH/fb${i}"
+    mkdir -p $FB_PATH
+
+    cp $CONFIG_PATH/filebeat.yml $FB_PATH/filebeat.yml
+
+    docker run -d --name=fb$i --net=host --user=root \
+        -v $FB_PATH/filebeat.yml:/usr/share/filebeat/filebeat.yml \
+        -v $SCRIPT_PATH/flog:/usr/share/filebeat/flog \
+        docker.elastic.co/beats/filebeat:$FB_VERSION filebeat -e --strict.perms=false
+  done
+}
+
+capture_stats() {
+  CURRENT=$(jq -r '.flow.output_throughput.current' $NS_JSON)
+  local eps_1m=$(jq -r '.flow.output_throughput.last_1_minute' $NS_JSON)
+  local eps_5m=$(jq -r '.flow.output_throughput.last_5_minutes' $NS_JSON)
+  local worker_util=$(jq -r '.pipelines.main.flow.worker_utilization.last_1_minute' $NS_JSON)
+  local worker_concurr=$(jq -r '.pipelines.main.flow.worker_concurrency.last_1_minute' $NS_JSON)
+  local cpu_percent=$(jq -r '.process.cpu.percent' $NS_JSON)
+  local heap=$(jq -r '.jvm.mem.heap_used_in_bytes' $NS_JSON)
+  local non_heap=$(jq -r '.jvm.mem.non_heap_used_in_bytes' $NS_JSON)
+  local q_event_cnt=$(jq -r '.pipelines.main.queue.events_count' $NS_JSON)
+  local q_size=$(jq -r '.pipelines.main.queue.queue_size_in_bytes' $NS_JSON)
+  TOTAL_EVENTS_OUT=$(jq -r '.pipelines.main.events.out' $NS_JSON)
+  printf "current: %s, 1m: %s, 5m: %s, worker_utilization: %s, worker_concurrency: %s, cpu: %s, heap: %s, non-heap: %s, q_events: %s, q_size: %s, total_events_out: %s\n" \
+    $CURRENT $eps_1m $eps_5m $worker_util $worker_concurr $cpu_percent $heap $non_heap $q_event_cnt $q_size $TOTAL_EVENTS_OUT
+}
+
+aggregate_stats() {
+  local file_glob="$SCRIPT_PATH/$NS_DIR/${QTYPE:0:1}_w${WORKER}b${BATCH_SIZE}_*.json"
+  MAX_EPS_1M=$( jqmax '.flow.output_throughput.last_1_minute' "$file_glob" )
+  MAX_EPS_5M=$( jqmax '.flow.output_throughput.last_5_minutes' "$file_glob" )
+  MAX_WORKER_UTIL=$( jqmax '.pipelines.main.flow.worker_utilization.last_1_minute' "$file_glob" )
+  MAX_WORKER_CONCURR=$( jqmax '.pipelines.main.flow.worker_concurrency.last_1_minute' "$file_glob" )
+  MAX_Q_EVENT_CNT=$( jqmax '.pipelines.main.queue.events_count' "$file_glob" )
+  MAX_Q_SIZE=$( jqmax '.pipelines.main.queue.queue_size_in_bytes' "$file_glob" )
+
+  AVG_CPU_PERCENT=$( jqavg '.process.cpu.percent' "$file_glob" )
+  AVG_VIRTUAL_MEM=$( jqavg '.process.mem.total_virtual_in_bytes' "$file_glob" )
+  AVG_HEAP=$( jqavg '.jvm.mem.heap_used_in_bytes' "$file_glob" )
+  AVG_NON_HEAP=$( jqavg '.jvm.mem.non_heap_used_in_bytes' "$file_glob" )
+}
+
+send_summary() {
+  echo "--- Send summary to Elasticsearch"
+
+  # build json
+  local timestamp
+  timestamp=$(date -u +"%Y-%m-%dT%H:%M:%S")
+  SUMMARY="{\"timestamp\": \"$timestamp\", \"version\": \"$LS_VERSION\", \"cpu\": \"$CPU\", \"mem\": \"$MEM\", \"workers\": \"$WORKER\", \"batch_size\": \"$BATCH_SIZE\", \"queue_type\": \"$QTYPE\""
+  not_empty "$TOTAL_EVENTS_OUT" && SUMMARY="$SUMMARY, \"total_events_out\": \"$TOTAL_EVENTS_OUT\""
+  not_empty "$MAX_EPS_1M" && SUMMARY="$SUMMARY, \"max_eps_1m\": \"$MAX_EPS_1M\""
+  not_empty "$MAX_EPS_5M" && SUMMARY="$SUMMARY, \"max_eps_5m\": \"$MAX_EPS_5M\""
+  not_empty "$MAX_WORKER_UTIL" && SUMMARY="$SUMMARY, \"max_worker_utilization\": \"$MAX_WORKER_UTIL\""
+  not_empty "$MAX_WORKER_CONCURR" && SUMMARY="$SUMMARY, \"max_worker_concurrency\": \"$MAX_WORKER_CONCURR\""
+  not_empty "$AVG_CPU_PERCENT" && SUMMARY="$SUMMARY, \"avg_cpu_percentage\": \"$AVG_CPU_PERCENT\""
+  not_empty "$AVG_HEAP" && SUMMARY="$SUMMARY, \"avg_heap\": \"$AVG_HEAP\""
+  not_empty "$AVG_NON_HEAP" && SUMMARY="$SUMMARY, \"avg_non_heap\": \"$AVG_NON_HEAP\""
+  not_empty "$AVG_VIRTUAL_MEM" && SUMMARY="$SUMMARY, \"avg_virtual_memory\": \"$AVG_VIRTUAL_MEM\""
+  not_empty "$MAX_Q_EVENT_CNT" && SUMMARY="$SUMMARY, \"max_queue_events\": \"$MAX_Q_EVENT_CNT\""
+  not_empty "$MAX_Q_SIZE" && SUMMARY="$SUMMARY, \"max_queue_bytes_size\": \"$MAX_Q_SIZE\""
+  not_empty "$TAGS" && SUMMARY="$SUMMARY, \"tags\": $JSON_TAGS"
+  SUMMARY="$SUMMARY}"
+
+  tee summary.json << EOF
+{"index": {}}
+$SUMMARY
+EOF
+
+  # send to ES
+  local resp
+  local err_status
+  resp=$(curl -s -X POST -u "$BENCHMARK_ES_USER:$BENCHMARK_ES_PW" "$BENCHMARK_ES_HOST/benchmark_summary/_bulk" -H 'Content-Type: application/json' --data-binary @"summary.json")
+  echo "$resp"
+  err_status=$(echo "$resp" | jq -r ".errors")
+  if [[ "$err_status" == "true" ]]; then
+    echo "Failed to send summary"
+    exit 1
+  fi
+}
+
+# $1: snapshot index
+node_stats() {
+  NS_JSON="$SCRIPT_PATH/$NS_DIR/${QTYPE:0:1}_w${WORKER}b${BATCH_SIZE}_$1.json" # m_w8b1000_0.json
+
+  # curl inside container because docker on mac cannot resolve localhost to host network interface
+  docker exec -i ls curl localhost:9600/_node/stats > "$NS_JSON" 2> /dev/null
+}
+
+# $1: index
+snapshot() {
+  node_stats $1
+  capture_stats
+}
+
+create_directory() {
+  NS_DIR="fb${FB_CNT}c${CPU}m${MEM}" # fb4c4m4
+  mkdir -p "$SCRIPT_PATH/$NS_DIR"
+}
+
+queue() {
+  for QTYPE in "persisted" "memory"; do
+    worker
+  done
+}
+
+worker() {
+  for m in "${MULTIPLIERS[@]}"; do
+    WORKER=$((CPU * m))
+    batch
+  done
+}
+
+batch() {
+  for BATCH_SIZE in "${BATCH_SIZES[@]}"; do
+    run_pipeline
+    stop_pipeline
+  done
+}
+
+run_pipeline() {
+  echo "--- Run pipeline. queue type: $QTYPE, worker: $WORKER, batch size: $BATCH_SIZE"
+
+  start_logstash
+  start_filebeat
+  docker ps
+
+  echo "(0) sleep 3m" && sleep 180
+  snapshot "0"
+
+  for i in {1..8}; do
+    echo "($i) sleep 30s" && sleep 30
+    snapshot "$i"
+
+    # print docker log when ingestion rate is zero
+    # remove '.' in number and return max val
+    [[ $(max -g "${CURRENT/./}" "0") -eq 0 ]] &&
+      docker logs fb0 &&
+      docker logs ls
+  done
+
+  aggregate_stats
+  send_summary
+}
+
+stop_pipeline() {
+  echo "--- Stop Pipeline"
+
+  for ((i = 0; i < FB_CNT; i++)); do
+    docker stop fb$i
+    docker rm fb$i
+  done
+
+  docker stop ls
+  docker rm ls
+
+  curl -u "$BENCHMARK_ES_USER:$BENCHMARK_ES_PW" -X DELETE $BENCHMARK_ES_HOST/_data_stream/logs-generic-default
+  echo " data stream deleted "
+
+  # TODO: clean page caches, reduce memory fragmentation
+  # https://github.com/elastic/logstash/pull/16191#discussion_r1647050216
+}
+
+clean_up() {
+  # stop log generation if it has not done yet
+  [[ -n $(docker ps | grep flog) ]] && docker stop flog || true
+  # remove image
+  docker image rm docker.elastic.co/logstash/logstash:$LS_VERSION
+}
diff --git a/.buildkite/scripts/benchmark/main.sh b/.buildkite/scripts/benchmark/main.sh
new file mode 100755
index 000000000..3d615fcb4
--- /dev/null
+++ b/.buildkite/scripts/benchmark/main.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+# *******************************************************
+# This script does benchmark by running Filebeats (docker) -> Logstash (docker) -> ES Cloud.
+# Logstash metrics and benchmark results are sent to the same ES Cloud.
+# Highlights:
+# - Use flog (docker) to generate ~2GB log
+# - Pull the snapshot docker image of the main branch every day
+# - Logstash runs two pipelines, main and node_stats
+#   - The main pipeline handles beats ingestion, sending data to the data stream `logs-generic-default`
+#     - It runs for all combinations. (pq + mq) x worker x batch size
+#     - Each test runs for ~7 minutes
+#   - The node_stats pipeline retrieves Logstash /_node/stats every 30s and sends it to the data stream `metrics-nodestats-logstash`
+# - The script sends a summary of EPS and resource usage to index `benchmark_summary`
+# *******************************************************
+
+SCRIPT_PATH="$(dirname "${BASH_SOURCE[0]}")"
+source "$SCRIPT_PATH/core.sh"
+
+## usage:
+##   main.sh FB_CNT QTYPE CPU MEM
+##   main.sh 4 all 4 4          # default launch 4 filebeats to benchmark pq and mq
+##   main.sh 4 memory
+##   main.sh 4 persisted
+##   main.sh 4
+##   main.sh
+## accept env vars:
+##   FB_VERSION=8.13.4          # docker tag
+##   LS_VERSION=8.15.0-SNAPSHOT # docker tag
+##   LS_JAVA_OPTS=-Xmx2g        # by default, Xmx is set to half of memory
+##   MULTIPLIERS=1,2,4          # determine the number of workers (cpu * multiplier)
+##   BATCH_SIZES=125,500
+##   CPU=4                      # number of cpu for Logstash container
+##   MEM=4                      # number of GB for Logstash container
+##   QTYPE=memory               # queue type to test {persisted|memory|all}
+##   FB_CNT=4                   # number of filebeats to use in benchmark
+##   FLOG_FILE_CNT=4            # number of files to generate for ingestion
+##   VAULT_PATH=secret/path     # vault path point to Elasticsearch credentials. The default value points to benchmark cluster.
+##   TAGS=test,other            # tags with "," separator.
+main() {
+  parse_args "$@"
+  get_secret
+
+  generate_logs
+  pull_images
+  check_logs
+
+  create_directory
+  if [[ $QTYPE == "all" ]]; then
+    queue
+  else
+    worker
+  fi
+
+  clean_up
+}
+
+main "$@"
\ No newline at end of file
diff --git a/.buildkite/scripts/benchmark/marathon.sh b/.buildkite/scripts/benchmark/marathon.sh
new file mode 100755
index 000000000..5cc3c2033
--- /dev/null
+++ b/.buildkite/scripts/benchmark/marathon.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+# *******************************************************
+# Run benchmark for versions that have flow metrics
+# When the hardware changes, run the marathon task to establish a new baseline.
+# Usage:
+#   nohup bash -x all.sh > log.log 2>&1 &
+# Accept env vars:
+#   STACK_VERSIONS=8.15.0,8.15.1,8.16.0-SNAPSHOT # versions to test. It is comma separator string
+# *******************************************************
+
+SCRIPT_PATH="$(dirname "${BASH_SOURCE[0]}")"
+source "$SCRIPT_PATH/core.sh"
+
+parse_stack_versions() {
+  IFS=','
+  STACK_VERSIONS="${STACK_VERSIONS:-8.9.0,8.10.0,8.11.0,8.12.0,8.13.0,8.14.0,8.15.5,8.16.6,8.17.5,8.18.0,9.0.0}"
+  read -ra STACK_VERSIONS <<< "$STACK_VERSIONS"
+}
+
+main() {
+  parse_stack_versions
+  parse_args "$@"
+  get_secret
+  generate_logs
+  check_logs
+
+  USER_QTYPE="$QTYPE"
+
+  for V in "${STACK_VERSIONS[@]}" ; do
+    LS_VERSION="$V"
+    QTYPE="$USER_QTYPE"
+    pull_images
+    create_directory
+    if [[ $QTYPE == "all" ]]; then
+      queue
+    else
+      worker
+    fi
+  done
+}
+
+main "$@"
\ No newline at end of file
diff --git a/.buildkite/scripts/benchmark/save-objects/CHANGELOG.md b/.buildkite/scripts/benchmark/save-objects/CHANGELOG.md
new file mode 100644
index 000000000..75a297e75
--- /dev/null
+++ b/.buildkite/scripts/benchmark/save-objects/CHANGELOG.md
@@ -0,0 +1,8 @@
+## 20241210
+Remove scripted field `5m_num` from dashboards
+
+## 20240912
+Updated runtime field `release` to return `true` when `version` contains "SNAPSHOT"
+
+## 20240912
+Initial dashboards
\ No newline at end of file
diff --git a/.buildkite/scripts/benchmark/save-objects/README.md b/.buildkite/scripts/benchmark/save-objects/README.md
new file mode 100644
index 000000000..264207618
--- /dev/null
+++ b/.buildkite/scripts/benchmark/save-objects/README.md
@@ -0,0 +1,14 @@
+benchmark_objects.ndjson contains the following resources
+
+- Dashboards
+  - daily snapshot
+  - released versions
+- Data Views
+  - benchmark
+    - runtime fields
+      - | Fields Name  | Type         | Comment                                                                               |
+        |--------------|---------------------------------------------------------------------------------------|--------------------------------------------------|
+        | versions_num | long         | convert semantic versioning to number for graph sorting                               |
+        | release      | boolean      | `true` for released version. `false` for snapshot version. It is for graph filtering. |
+    
+To import objects to Kibana, navigate to Stack Management > Save Objects and click Import
\ No newline at end of file
diff --git a/.buildkite/scripts/benchmark/save-objects/benchmark_objects.ndjson b/.buildkite/scripts/benchmark/save-objects/benchmark_objects.ndjson
new file mode 100644
index 000000000..32bdf55cc
--- /dev/null
+++ b/.buildkite/scripts/benchmark/save-objects/benchmark_objects.ndjson
@@ -0,0 +1,31 @@
+{"attributes":{"allowHidden":false,"fieldAttrs":"{\"5m_num\":{\"customLabel\":\"\"},\"avg_heap_num\":{\"customLabel\":\"\"},\"avg_non_heap_num\":{\"customLabel\":\"\"},\"max_worker_utilization_num\":{\"customLabel\":\"\"},\"max_worker_concurrency_num\":{\"customLabel\":\"\"},\"max_queue_events\":{\"customLabel\":\"\"},\"max_queue_events_num\":{\"customLabel\":\"\"},\"total_events_out_num\":{\"customLabel\":\"\"},\"avg_cpu_percentage_num\":{\"customLabel\":\"\"},\"release\":{},\"version_num\":{}}","fieldFormatMap":"{\"5m_num\":{\"id\":\"number\",\"params\":{\"pattern\":\"0\"}},\"avg_heap_num\":{\"id\":\"number\"},\"avg_non_heap_num\":{\"id\":\"number\"},\"max_worker_utilization_num\":{\"id\":\"number\"},\"max_worker_concurrency_num\":{\"id\":\"number\"},\"max_queue_events\":{\"id\":\"number\"},\"max_queue_events_num\":{\"id\":\"number\"},\"avg_cpu_percentage_num\":{\"id\":\"number\"}}","fields":"[{\"name\":\"5m_num\",\"script\":\"return Integer.parseInt(doc['max_eps_5m.keyword'].value)\",\"lang\":\"painless\",\"type\":\"number\",\"scripted\":true,\"customLabel\":\"\"}]","name":"benchmark","runtimeFieldMap":"{\"release\":{\"type\":\"boolean\",\"script\":{\"source\":\"def version = doc['version.keyword'].value;\\nif (version.contains(\\\"SNAPSHOT\\\")) {\\n\\temit(false);\\n}\\nelse {\\n\\temit(true);\\n}\"}},\"version_num\":{\"type\":\"long\",\"script\":{\"source\":\"if (doc.containsKey('version.keyword') && !doc['version.keyword'].empty) {\\n    // Get the version string\\n    String version = doc['version.keyword'].value;\\n    \\n    // Remove any suffix after the patch number (e.g., -SNAPSHOT)\\n    int dashIndex = version.indexOf('-');\\n    if (dashIndex != -1) {\\n        version = version.substring(0, dashIndex);\\n    }\\n    \\n    // Find positions of dots\\n    int firstDot = version.indexOf('.');\\n    int secondDot = version.indexOf('.', firstDot + 1);\\n    \\n    // Extract major, minor, and patch parts of the version\\n    int major = Integer.parseInt(version.substring(0, firstDot));\\n    int minor = Integer.parseInt(version.substring(firstDot + 1, secondDot));\\n    int patch = Integer.parseInt(version.substring(secondDot + 1));\\n    \\n    // Combine into a sortable numeric value\\n    emit(major * 10000 + minor * 100 + patch);\\n}\\n\\nemit(0);\"}}}","sourceFilters":"[]","timeFieldName":"timestamp","title":"benchmark_*"},"coreMigrationVersion":"8.8.0","created_at":"2024-09-05T11:52:42.820Z","id":"c5493557-3fd6-4929-8dc2-40d248303942","managed":false,"references":[],"type":"index-pattern","typeMigrationVersion":"8.0.0","updated_at":"2024-09-12T20:34:35.037Z","updated_by":"u_4132377203_cloud","version":"WzE1NjYsOF0="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["e7fa90f9-5d12-46d7-a62d-d6a77e6b2bd3","16dcf8b0-378f-48df-8bb3-f537324eea46","cc8c1413-0ccc-4109-a6c3-0c910eff776e","2c32a023-462c-4205-b462-6a87182732e4"],"columns":{"16dcf8b0-378f-48df-8bb3-f537324eea46":{"dataType":"date","isBucketed":true,"label":"timestamp","operationType":"date_histogram","params":{"dropPartials":false,"includeEmptyRows":true,"interval":"auto"},"scale":"interval","sourceField":"timestamp"},"2c32a023-462c-4205-b462-6a87182732e4":{"customLabel":true,"dataType":"number","isBucketed":false,"label":"non_heap","operationType":"median","params":{"emptyAsNull":true,"format":{"id":"bytes","params":{"decimals":2}}},"scale":"ratio","sourceField":"avg_non_heap"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"customLabel":true,"dataType":"number","isBucketed":false,"label":"heap","operationType":"median","params":{"emptyAsNull":true,"format":{"id":"bytes","params":{"decimals":2}}},"scale":"ratio","sourceField":"avg_heap"},"e7fa90f9-5d12-46d7-a62d-d6a77e6b2bd3":{"dataType":"number","isBucketed":true,"label":"Top 10 values of workers","operationType":"terms","params":{"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"secondaryFields":[],"size":10},"scale":"ordinal","sourceField":"workers"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"893cd07c-e480-4dc1-9109-c6ebf926f0bf","key":"queue_type.keyword","negate":false,"params":{"query":"memory"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"memory"}}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e","2c32a023-462c-4205-b462-6a87182732e4"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"e7fa90f9-5d12-46d7-a62d-d6a77e6b2bd3","xAccessor":"16dcf8b0-378f-48df-8bb3-f537324eea46"}],"legend":{"horizontalAlignment":"left","isInside":false,"isVisible":true,"position":"right","verticalAlignment":"bottom"},"preferredSeriesType":"line","tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","yTitle":"jvm heap / non heap"}},"title":"[MQ] memory by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-10-24T13:24:44.067Z","created_by":"u_4132377203_cloud","id":"f5104988-461c-4f65-b31d-ed22d04cb6b8","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"893cd07c-e480-4dc1-9109-c6ebf926f0bf","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-10-24T13:24:44.067Z","updated_by":"u_4132377203_cloud","version":"WzE3OTAsOV0="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["e7fa90f9-5d12-46d7-a62d-d6a77e6b2bd3","16dcf8b0-378f-48df-8bb3-f537324eea46","cc8c1413-0ccc-4109-a6c3-0c910eff776e","0ad565fc-0a55-492b-ba69-1be57f501e13"],"columns":{"0ad565fc-0a55-492b-ba69-1be57f501e13":{"customLabel":true,"dataType":"number","isBucketed":false,"label":"non_heap","operationType":"median","params":{"emptyAsNull":true,"format":{"id":"bytes","params":{"decimals":2}}},"scale":"ratio","sourceField":"avg_non_heap"},"16dcf8b0-378f-48df-8bb3-f537324eea46":{"dataType":"date","isBucketed":true,"label":"timestamp","operationType":"date_histogram","params":{"dropPartials":false,"includeEmptyRows":true,"interval":"auto"},"scale":"interval","sourceField":"timestamp"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"customLabel":true,"dataType":"number","isBucketed":false,"label":"heap","operationType":"median","params":{"emptyAsNull":true,"format":{"id":"bytes","params":{"decimals":2}}},"scale":"ratio","sourceField":"avg_heap"},"e7fa90f9-5d12-46d7-a62d-d6a77e6b2bd3":{"dataType":"number","isBucketed":true,"label":"Top 10 values of workers","operationType":"terms","params":{"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"secondaryFields":[],"size":10},"scale":"ordinal","sourceField":"workers"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"74d4500c-b3ea-4cd1-9c8c-6b4852a4baf4","key":"queue_type.keyword","negate":false,"params":{"query":"persisted"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"persisted"}}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e","0ad565fc-0a55-492b-ba69-1be57f501e13"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"e7fa90f9-5d12-46d7-a62d-d6a77e6b2bd3","xAccessor":"16dcf8b0-378f-48df-8bb3-f537324eea46"}],"legend":{"horizontalAlignment":"left","isInside":false,"isVisible":true,"position":"right","verticalAlignment":"bottom"},"preferredSeriesType":"line","tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","yTitle":"jvm heap / non heap"}},"title":"[PQ] memory by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-10-24T13:24:31.401Z","created_by":"u_4132377203_cloud","id":"4d1f7bef-c184-4457-b159-465128d2d70b","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"74d4500c-b3ea-4cd1-9c8c-6b4852a4baf4","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-10-24T13:24:31.401Z","updated_by":"u_4132377203_cloud","version":"WzE3ODksOV0="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["e7fa90f9-5d12-46d7-a62d-d6a77e6b2bd3","16dcf8b0-378f-48df-8bb3-f537324eea46","cc8c1413-0ccc-4109-a6c3-0c910eff776e","2c32a023-462c-4205-b462-6a87182732e4"],"columns":{"16dcf8b0-378f-48df-8bb3-f537324eea46":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"version","operationType":"terms","params":{"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderAgg":{"dataType":"number","isBucketed":false,"label":"Maximum of version_num","operationType":"max","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"version_num"},"orderBy":{"type":"custom"},"orderDirection":"asc","otherBucket":true,"parentFormat":{"id":"terms"},"size":100},"scale":"ordinal","sourceField":"version.keyword"},"2c32a023-462c-4205-b462-6a87182732e4":{"customLabel":true,"dataType":"number","isBucketed":false,"label":"non_heap","operationType":"median","params":{"emptyAsNull":true,"format":{"id":"bytes","params":{"decimals":2}}},"scale":"ratio","sourceField":"avg_non_heap"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"customLabel":true,"dataType":"number","isBucketed":false,"label":"heap","operationType":"median","params":{"emptyAsNull":true,"format":{"id":"bytes","params":{"decimals":2}}},"scale":"ratio","sourceField":"avg_heap"},"e7fa90f9-5d12-46d7-a62d-d6a77e6b2bd3":{"dataType":"number","isBucketed":true,"label":"Top 10 values of workers","operationType":"terms","params":{"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"secondaryFields":[],"size":10},"scale":"ordinal","sourceField":"workers"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"a3c80a6b-82a1-4a58-9832-16f1ff9d2ac4","key":"queue_type.keyword","negate":false,"params":{"query":"persisted"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"persisted"}}}],"internalReferences":[],"query":{"language":"kuery","query":"release : true "},"visualization":{"axisTitlesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e","2c32a023-462c-4205-b462-6a87182732e4"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"e7fa90f9-5d12-46d7-a62d-d6a77e6b2bd3","xAccessor":"16dcf8b0-378f-48df-8bb3-f537324eea46"}],"legend":{"horizontalAlignment":"left","isInside":false,"isVisible":true,"position":"right","verticalAlignment":"bottom"},"preferredSeriesType":"line","tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","yTitle":"jvm heap / non heap"}},"title":"[PQ][R] memory by worker ","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-10-24T13:24:22.412Z","created_by":"u_4132377203_cloud","id":"72ae6cc9-47cd-4b51-b441-86905c2b92bd","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"a3c80a6b-82a1-4a58-9832-16f1ff9d2ac4","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-10-24T13:24:22.412Z","updated_by":"u_4132377203_cloud","version":"WzE3ODgsOV0="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["e7fa90f9-5d12-46d7-a62d-d6a77e6b2bd3","16dcf8b0-378f-48df-8bb3-f537324eea46","cc8c1413-0ccc-4109-a6c3-0c910eff776e","2c32a023-462c-4205-b462-6a87182732e4"],"columns":{"16dcf8b0-378f-48df-8bb3-f537324eea46":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"version","operationType":"terms","params":{"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderAgg":{"dataType":"number","isBucketed":false,"label":"Maximum of version_num","operationType":"max","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"version_num"},"orderBy":{"type":"custom"},"orderDirection":"asc","otherBucket":true,"parentFormat":{"id":"terms"},"size":100},"scale":"ordinal","sourceField":"version.keyword"},"2c32a023-462c-4205-b462-6a87182732e4":{"customLabel":true,"dataType":"number","isBucketed":false,"label":"non_heap","operationType":"median","params":{"emptyAsNull":true,"format":{"id":"bytes","params":{"decimals":2}}},"scale":"ratio","sourceField":"avg_non_heap"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"customLabel":true,"dataType":"number","isBucketed":false,"label":"heap","operationType":"median","params":{"emptyAsNull":true,"format":{"id":"bytes","params":{"decimals":2}}},"scale":"ratio","sourceField":"avg_heap"},"e7fa90f9-5d12-46d7-a62d-d6a77e6b2bd3":{"dataType":"number","isBucketed":true,"label":"Top 10 values of workers","operationType":"terms","params":{"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"secondaryFields":[],"size":10},"scale":"ordinal","sourceField":"workers"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"7c4a3d0f-46e7-4d19-bde0-0ea79a3cbdd9","key":"queue_type.keyword","negate":false,"params":{"query":"memory"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"memory"}}}],"internalReferences":[],"query":{"language":"kuery","query":"release : true "},"visualization":{"axisTitlesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e","2c32a023-462c-4205-b462-6a87182732e4"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"e7fa90f9-5d12-46d7-a62d-d6a77e6b2bd3","xAccessor":"16dcf8b0-378f-48df-8bb3-f537324eea46"}],"legend":{"horizontalAlignment":"left","isInside":false,"isVisible":true,"position":"right","verticalAlignment":"bottom"},"preferredSeriesType":"line","tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","yTitle":"jvm heap / non heap"}},"title":"[MQ][R] memory by worker ","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-10-24T13:24:09.653Z","created_by":"u_4132377203_cloud","id":"a577558f-f9a6-4c86-b562-7618b2c71db0","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"7c4a3d0f-46e7-4d19-bde0-0ea79a3cbdd9","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-10-24T13:24:09.653Z","updated_by":"u_4132377203_cloud","version":"WzE3ODcsOV0="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["0da92b64-fe48-439e-9b3a-47775ce1a149","9542ed03-9691-42a3-b5c2-407bcaab221c","cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"columns":{"0da92b64-fe48-439e-9b3a-47775ce1a149":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"workers","operationType":"terms","params":{"accuracyMode":false,"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"size":10},"scale":"ordinal","sourceField":"workers.keyword"},"9542ed03-9691-42a3-b5c2-407bcaab221c":{"dataType":"date","isBucketed":true,"label":"timestamp","operationType":"date_histogram","params":{"dropPartials":false,"includeEmptyRows":true,"interval":"auto"},"scale":"interval","sourceField":"timestamp"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"dataType":"number","isBucketed":false,"label":"Median of max_eps_5m","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"max_eps_5m"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"8963247c-0194-4916-8a2b-e121fefbb4b3","key":"queue_type.keyword","negate":false,"params":{"query":"persisted"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"persisted"}}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":false,"yLeft":true,"yRight":true},"endValue":"None","fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"hideEndzones":false,"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"0da92b64-fe48-439e-9b3a-47775ce1a149","xAccessor":"9542ed03-9691-42a3-b5c2-407bcaab221c"}],"legend":{"horizontalAlignment":"left","isInside":true,"isVisible":true,"legendSize":"small","legendStats":[],"position":"right","shouldTruncate":true,"showSingleSeries":true,"verticalAlignment":"bottom"},"preferredSeriesType":"line","showCurrentTimeMarker":false,"tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","yTitle":"5m eps"}},"title":"[PQ] EPS by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-10-24T11:50:10.083Z","created_by":"u_4132377203_cloud","id":"f24fc69c-7714-40d3-b34e-3d90fa9b7023","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"8963247c-0194-4916-8a2b-e121fefbb4b3","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-10-24T11:50:10.083Z","updated_by":"u_4132377203_cloud","version":"WzE3ODEsOV0="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["0da92b64-fe48-439e-9b3a-47775ce1a149","9542ed03-9691-42a3-b5c2-407bcaab221c","cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"columns":{"0da92b64-fe48-439e-9b3a-47775ce1a149":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"workers","operationType":"terms","params":{"accuracyMode":false,"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"size":10},"scale":"ordinal","sourceField":"workers.keyword"},"9542ed03-9691-42a3-b5c2-407bcaab221c":{"dataType":"date","isBucketed":true,"label":"timestamp","operationType":"date_histogram","params":{"dropPartials":false,"includeEmptyRows":true,"interval":"auto"},"scale":"interval","sourceField":"timestamp"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"customLabel":false,"dataType":"number","isBucketed":false,"label":"Median of max_eps_5m","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"max_eps_5m"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"index":"8171fdc1-2ff4-4f45-8796-dffd31749c63","key":"queue_type.keyword","negate":false,"params":{"query":"memory"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"memory"}}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":false,"yLeft":true,"yRight":true},"endValue":"None","fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"hideEndzones":false,"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"0da92b64-fe48-439e-9b3a-47775ce1a149","xAccessor":"9542ed03-9691-42a3-b5c2-407bcaab221c"}],"legend":{"horizontalAlignment":"left","isInside":true,"isVisible":true,"legendSize":"small","legendStats":[],"position":"right","shouldTruncate":true,"showSingleSeries":true,"verticalAlignment":"bottom"},"preferredSeriesType":"line","showCurrentTimeMarker":false,"tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","yTitle":"5m eps"}},"title":"[MQ] EPS by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-10-24T11:49:58.528Z","created_by":"u_4132377203_cloud","id":"5c7f9518-5dac-4a3f-b8e1-6ece4135a8be","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-10-24T11:49:58.528Z","updated_by":"u_4132377203_cloud","version":"WzE3ODAsOV0="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"999c9564-cba1-4f3b-af99-ccbacb8e034f":{"columnOrder":["a58f8c48-c2a7-4fc6-b54e-716bf4ca001e","9ddc0f02-5530-4930-99bd-2a914ada1b8f","be033d18-2c04-44f2-b403-0b88d888143d"],"columns":{"9ddc0f02-5530-4930-99bd-2a914ada1b8f":{"dataType":"date","isBucketed":true,"label":"timestamp","operationType":"date_histogram","params":{"dropPartials":false,"includeEmptyRows":true,"interval":"auto"},"scale":"interval","sourceField":"timestamp"},"a58f8c48-c2a7-4fc6-b54e-716bf4ca001e":{"dataType":"string","isBucketed":true,"label":"Top values of workers.keyword + 1 other","operationType":"terms","params":{"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"be033d18-2c04-44f2-b403-0b88d888143d","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"multi_terms"},"secondaryFields":["queue_type.keyword"],"size":10},"scale":"ordinal","sourceField":"workers.keyword"},"be033d18-2c04-44f2-b403-0b88d888143d":{"dataType":"number","isBucketed":false,"label":"Median of max_eps_5m","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"max_eps_5m"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"release","index":"6feecd96-2840-4a20-bb3c-73837932d9ff","key":"release","negate":false,"params":{"query":false},"type":"phrase"},"query":{"match_phrase":{"release":false}}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["be033d18-2c04-44f2-b403-0b88d888143d"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":[["4","memory"]]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":[["8","memory"]]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":[["16","memory"]]},"touched":false},{"color":{"colorCode":"#5e6c94","type":"colorCode"},"rule":{"type":"matchExactly","values":[["8","persisted"]]},"touched":true},{"color":{"colorIndex":4,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":[["16","persisted"]]},"touched":false},{"color":{"colorCode":"#a0df7b","type":"colorCode"},"rule":{"type":"matchExactly","values":[["4","persisted"]]},"touched":true}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"999c9564-cba1-4f3b-af99-ccbacb8e034f","layerType":"data","seriesType":"line","splitAccessor":"a58f8c48-c2a7-4fc6-b54e-716bf4ca001e","xAccessor":"9ddc0f02-5530-4930-99bd-2a914ada1b8f"}],"legend":{"isVisible":true,"position":"right"},"preferredSeriesType":"line","tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","yTitle":"5m eps"}},"title":"Daily EPS by worker & queue","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-10-24T11:48:00.951Z","created_by":"u_4132377203_cloud","id":"94ae4c78-8004-4abb-80c9-271f37c94cdc","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-999c9564-cba1-4f3b-af99-ccbacb8e034f","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"6feecd96-2840-4a20-bb3c-73837932d9ff","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-10-24T11:48:00.951Z","updated_by":"u_4132377203_cloud","version":"WzE3NzUsOV0="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"currentIndexPatternId":"c5493557-3fd6-4929-8dc2-40d248303942","layers":{"999c9564-cba1-4f3b-af99-ccbacb8e034f":{"columnOrder":["a58f8c48-c2a7-4fc6-b54e-716bf4ca001e","9ddc0f02-5530-4930-99bd-2a914ada1b8f","be033d18-2c04-44f2-b403-0b88d888143d"],"columns":{"9ddc0f02-5530-4930-99bd-2a914ada1b8f":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"version","operationType":"terms","params":{"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderAgg":{"dataType":"number","isBucketed":false,"label":"Maximum of version_num","operationType":"max","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"version_num"},"orderBy":{"type":"custom"},"orderDirection":"asc","otherBucket":true,"parentFormat":{"id":"terms"},"size":100},"scale":"ordinal","sourceField":"version.keyword"},"a58f8c48-c2a7-4fc6-b54e-716bf4ca001e":{"dataType":"string","isBucketed":true,"label":"Top values of workers.keyword + 1 other","operationType":"terms","params":{"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"be033d18-2c04-44f2-b403-0b88d888143d","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"multi_terms"},"secondaryFields":["queue_type.keyword"],"size":100},"scale":"ordinal","sourceField":"workers.keyword"},"be033d18-2c04-44f2-b403-0b88d888143d":{"dataType":"number","isBucketed":false,"label":"Median of max_eps_5m","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"max_eps_5m"}},"incompleteColumns":{},"indexPatternId":"c5493557-3fd6-4929-8dc2-40d248303942","sampling":1}}},"indexpattern":{"currentIndexPatternId":"c5493557-3fd6-4929-8dc2-40d248303942","layers":{}},"textBased":{"indexPatternRefs":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","timeField":"timestamp","title":"benchmark_*"}],"layers":{}}},"filters":[],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["be033d18-2c04-44f2-b403-0b88d888143d"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":[["4","memory"]]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":[["8","memory"]]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":[["16","memory"]]},"touched":false},{"color":{"colorCode":"#5e6c94","type":"colorCode"},"rule":{"type":"matchExactly","values":[["8","persisted"]]},"touched":true},{"color":{"colorIndex":4,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":[["16","persisted"]]},"touched":false},{"color":{"colorCode":"#a0df7b","type":"colorCode"},"rule":{"type":"matchExactly","values":[["4","persisted"]]},"touched":true}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"999c9564-cba1-4f3b-af99-ccbacb8e034f","layerType":"data","seriesType":"line","splitAccessor":"a58f8c48-c2a7-4fc6-b54e-716bf4ca001e","xAccessor":"9ddc0f02-5530-4930-99bd-2a914ada1b8f"}],"legend":{"isVisible":true,"position":"right"},"preferredSeriesType":"line","tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","yTitle":"5m eps"}},"title":"Release EPS by worker & queue","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-10-24T11:46:07.298Z","created_by":"u_4132377203_cloud","id":"2c017667-7403-402c-b027-3cc790945a27","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-999c9564-cba1-4f3b-af99-ccbacb8e034f","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-10-24T11:46:07.298Z","updated_by":"u_4132377203_cloud","version":"WzE3NjQsOV0="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["0da92b64-fe48-439e-9b3a-47775ce1a149","9542ed03-9691-42a3-b5c2-407bcaab221c","cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"columns":{"0da92b64-fe48-439e-9b3a-47775ce1a149":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"workers","operationType":"terms","params":{"accuracyMode":false,"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"size":10},"scale":"ordinal","sourceField":"workers.keyword"},"9542ed03-9691-42a3-b5c2-407bcaab221c":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"version","operationType":"terms","params":{"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderAgg":{"dataType":"number","isBucketed":false,"label":"Maximum of version_num","operationType":"max","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"version_num"},"orderBy":{"type":"custom"},"orderDirection":"asc","otherBucket":true,"parentFormat":{"id":"terms"},"size":100},"scale":"ordinal","sourceField":"version.keyword"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"dataType":"number","isBucketed":false,"label":"Median of max_worker_concurrency","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"max_worker_concurrency"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"7edb6dc9-8b2b-47ec-be64-bae2a4958cc9","key":"queue_type.keyword","negate":false,"params":{"query":"memory"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"memory"}}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":false,"yLeft":true,"yRight":true},"fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"hideEndzones":false,"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"0da92b64-fe48-439e-9b3a-47775ce1a149","xAccessor":"9542ed03-9691-42a3-b5c2-407bcaab221c"}],"legend":{"horizontalAlignment":"left","isInside":true,"isVisible":true,"legendSize":"small","position":"right","shouldTruncate":true,"showSingleSeries":true,"verticalAlignment":"bottom"},"preferredSeriesType":"line","showCurrentTimeMarker":false,"tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","valuesInLegend":false,"yTitle":"worker_concurrency"}},"title":"[MQ][R] Worker Concurrency by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-09-11T09:53:13.413Z","id":"9546a73b-5937-4d3d-850f-30625d6e1405","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"7edb6dc9-8b2b-47ec-be64-bae2a4958cc9","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-09-11T09:53:13.413Z","version":"WzEzOTEsN10="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["0da92b64-fe48-439e-9b3a-47775ce1a149","9542ed03-9691-42a3-b5c2-407bcaab221c","cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"columns":{"0da92b64-fe48-439e-9b3a-47775ce1a149":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"workers","operationType":"terms","params":{"accuracyMode":false,"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"size":10},"scale":"ordinal","sourceField":"workers.keyword"},"9542ed03-9691-42a3-b5c2-407bcaab221c":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"version","operationType":"terms","params":{"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderAgg":{"dataType":"number","isBucketed":false,"label":"Maximum of version_num","operationType":"max","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"version_num"},"orderBy":{"type":"custom"},"orderDirection":"asc","otherBucket":true,"parentFormat":{"id":"terms"},"size":100},"scale":"ordinal","sourceField":"version.keyword"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"dataType":"number","isBucketed":false,"label":"Median of total_events_out","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"total_events_out"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"2786f33f-2ad1-4722-8706-9cba9613662e","key":"queue_type.keyword","negate":false,"params":{"query":"memory"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"memory"}}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":false,"yLeft":true,"yRight":true},"fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"hideEndzones":false,"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"0da92b64-fe48-439e-9b3a-47775ce1a149","xAccessor":"9542ed03-9691-42a3-b5c2-407bcaab221c"}],"legend":{"horizontalAlignment":"left","isInside":true,"isVisible":true,"legendSize":"small","position":"right","shouldTruncate":true,"showSingleSeries":true,"verticalAlignment":"bottom"},"preferredSeriesType":"line","showCurrentTimeMarker":false,"tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","valuesInLegend":false,"yTitle":"total events out"}},"title":"[MQ][R] total events out by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-09-11T09:53:00.945Z","id":"6fba7dff-2564-450b-b885-8c6cf97fa727","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"2786f33f-2ad1-4722-8706-9cba9613662e","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-09-11T09:53:00.945Z","version":"WzEzODksN10="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["0da92b64-fe48-439e-9b3a-47775ce1a149","9542ed03-9691-42a3-b5c2-407bcaab221c","cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"columns":{"0da92b64-fe48-439e-9b3a-47775ce1a149":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"workers","operationType":"terms","params":{"accuracyMode":false,"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"size":10},"scale":"ordinal","sourceField":"workers.keyword"},"9542ed03-9691-42a3-b5c2-407bcaab221c":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"version","operationType":"terms","params":{"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderAgg":{"dataType":"number","isBucketed":false,"label":"Maximum of version_num","operationType":"max","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"version_num"},"orderBy":{"type":"custom"},"orderDirection":"asc","otherBucket":true,"parentFormat":{"id":"terms"},"size":100},"scale":"ordinal","sourceField":"version.keyword"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"dataType":"number","isBucketed":false,"label":"Median of max_worker_concurrency","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"max_worker_concurrency"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"a22f82f6-c7b8-4e06-b2f5-69e25c5aefc4","key":"queue_type.keyword","negate":false,"params":{"query":"persisted"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"persisted"}}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":false,"yLeft":true,"yRight":true},"fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"hideEndzones":false,"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"0da92b64-fe48-439e-9b3a-47775ce1a149","xAccessor":"9542ed03-9691-42a3-b5c2-407bcaab221c"}],"legend":{"horizontalAlignment":"left","isInside":true,"isVisible":true,"legendSize":"small","position":"right","shouldTruncate":true,"showSingleSeries":true,"verticalAlignment":"bottom"},"preferredSeriesType":"line","showCurrentTimeMarker":false,"tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","valuesInLegend":false,"yTitle":"worker_concurrency"}},"title":"[PQ][R] Worker Concurrency by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-09-11T09:51:52.744Z","id":"661cb795-bb69-4599-8c4b-a4798ef69dc6","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"a22f82f6-c7b8-4e06-b2f5-69e25c5aefc4","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-09-11T09:51:52.744Z","version":"WzEzODAsN10="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["0da92b64-fe48-439e-9b3a-47775ce1a149","9542ed03-9691-42a3-b5c2-407bcaab221c","cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"columns":{"0da92b64-fe48-439e-9b3a-47775ce1a149":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"workers","operationType":"terms","params":{"accuracyMode":false,"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"size":10},"scale":"ordinal","sourceField":"workers.keyword"},"9542ed03-9691-42a3-b5c2-407bcaab221c":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"version","operationType":"terms","params":{"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderAgg":{"dataType":"number","isBucketed":false,"label":"Maximum of version_num","operationType":"max","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"version_num"},"orderBy":{"type":"custom"},"orderDirection":"asc","otherBucket":true,"parentFormat":{"id":"terms"},"size":100},"scale":"ordinal","sourceField":"version.keyword"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"dataType":"number","isBucketed":false,"label":"Median of max_queue_events","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"max_queue_events"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"48ba7011-43c1-48fc-bc36-858bcec74547","key":"queue_type.keyword","negate":false,"params":{"query":"persisted"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"persisted"}}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":false,"yLeft":true,"yRight":true},"fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"hideEndzones":false,"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"0da92b64-fe48-439e-9b3a-47775ce1a149","xAccessor":"9542ed03-9691-42a3-b5c2-407bcaab221c"}],"legend":{"horizontalAlignment":"left","isInside":true,"isVisible":true,"legendSize":"small","position":"right","shouldTruncate":true,"showSingleSeries":true,"verticalAlignment":"bottom"},"preferredSeriesType":"line","showCurrentTimeMarker":false,"tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","valuesInLegend":false,"yTitle":"events in queue"}},"title":"[PQ][R] events in queue by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-09-11T09:51:43.703Z","id":"d79b8742-6284-4842-ac44-65640d090179","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"48ba7011-43c1-48fc-bc36-858bcec74547","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-09-11T09:51:43.703Z","version":"WzEzNzgsN10="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["0da92b64-fe48-439e-9b3a-47775ce1a149","9542ed03-9691-42a3-b5c2-407bcaab221c","cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"columns":{"0da92b64-fe48-439e-9b3a-47775ce1a149":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"workers","operationType":"terms","params":{"accuracyMode":false,"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"size":10},"scale":"ordinal","sourceField":"workers.keyword"},"9542ed03-9691-42a3-b5c2-407bcaab221c":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"version","operationType":"terms","params":{"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderAgg":{"dataType":"number","isBucketed":false,"label":"Maximum of version_num","operationType":"max","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"version_num"},"orderBy":{"type":"custom"},"orderDirection":"asc","otherBucket":true,"parentFormat":{"id":"terms"},"size":100},"scale":"ordinal","sourceField":"version.keyword"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"dataType":"number","isBucketed":false,"label":"Median of total_events_out","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"total_events_out"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"d556c1f1-16ab-45de-adda-366de4703635","key":"queue_type.keyword","negate":false,"params":{"query":"persisted"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"persisted"}}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":false,"yLeft":true,"yRight":true},"fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"hideEndzones":false,"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"0da92b64-fe48-439e-9b3a-47775ce1a149","xAccessor":"9542ed03-9691-42a3-b5c2-407bcaab221c"}],"legend":{"horizontalAlignment":"left","isInside":true,"isVisible":true,"legendSize":"small","position":"right","shouldTruncate":true,"showSingleSeries":true,"verticalAlignment":"bottom"},"preferredSeriesType":"line","showCurrentTimeMarker":false,"tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","valuesInLegend":false,"yTitle":"total events out"}},"title":"[PQ][R] total events out by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-09-11T09:52:31.089Z","id":"1872e84f-56f2-4a17-9426-3d25d6e03931","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"d556c1f1-16ab-45de-adda-366de4703635","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-09-11T09:52:31.089Z","version":"WzEzODQsN10="}
+{"attributes":{"description":"","kibanaSavedObjectMeta":{"searchSourceJSON":"{\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[{\"meta\":{\"disabled\":false,\"negate\":false,\"alias\":null,\"key\":\"release\",\"field\":\"release\",\"params\":{\"query\":true},\"type\":\"phrase\",\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index\"},\"query\":{\"match_phrase\":{\"release\":true}},\"$state\":{\"store\":\"appState\"}}]}"},"optionsJSON":"{\"useMargins\":true,\"syncColors\":false,\"syncCursor\":true,\"syncTooltips\":false,\"hidePanelTitles\":false}","panelsJSON":"[{\"type\":\"lens\",\"gridData\":{\"x\":0,\"y\":0,\"w\":48,\"h\":19,\"i\":\"329684df-6ec4-4973-8c96-bc91eaa23fe9\"},\"panelIndex\":\"329684df-6ec4-4973-8c96-bc91eaa23fe9\",\"embeddableConfig\":{\"enhancements\":{},\"attributes\":{\"title\":\"Release EPS by worker & queue\",\"description\":\"\",\"visualizationType\":\"lnsXY\",\"state\":{\"visualization\":{\"axisTitlesVisibilitySettings\":{\"x\":true,\"yLeft\":true,\"yRight\":true},\"fittingFunction\":\"Linear\",\"gridlinesVisibilitySettings\":{\"x\":true,\"yLeft\":true,\"yRight\":true},\"labelsOrientation\":{\"x\":0,\"yLeft\":0,\"yRight\":0},\"layers\":[{\"accessors\":[\"be033d18-2c04-44f2-b403-0b88d888143d\"],\"colorMapping\":{\"assignments\":[{\"color\":{\"colorIndex\":0,\"paletteId\":\"eui_amsterdam_color_blind\",\"type\":\"categorical\"},\"rule\":{\"type\":\"matchExactly\",\"values\":[[\"4\",\"memory\"]]},\"touched\":false},{\"color\":{\"colorIndex\":1,\"paletteId\":\"eui_amsterdam_color_blind\",\"type\":\"categorical\"},\"rule\":{\"type\":\"matchExactly\",\"values\":[[\"8\",\"memory\"]]},\"touched\":false},{\"color\":{\"colorIndex\":2,\"paletteId\":\"eui_amsterdam_color_blind\",\"type\":\"categorical\"},\"rule\":{\"type\":\"matchExactly\",\"values\":[[\"16\",\"memory\"]]},\"touched\":false},{\"color\":{\"colorCode\":\"#5e6c94\",\"type\":\"colorCode\"},\"rule\":{\"type\":\"matchExactly\",\"values\":[[\"8\",\"persisted\"]]},\"touched\":true},{\"color\":{\"colorIndex\":4,\"paletteId\":\"eui_amsterdam_color_blind\",\"type\":\"categorical\"},\"rule\":{\"type\":\"matchExactly\",\"values\":[[\"16\",\"persisted\"]]},\"touched\":false},{\"color\":{\"colorCode\":\"#a0df7b\",\"type\":\"colorCode\"},\"rule\":{\"type\":\"matchExactly\",\"values\":[[\"4\",\"persisted\"]]},\"touched\":true}],\"colorMode\":{\"type\":\"categorical\"},\"paletteId\":\"eui_amsterdam_color_blind\",\"specialAssignments\":[{\"color\":{\"type\":\"loop\"},\"rule\":{\"type\":\"other\"},\"touched\":false}]},\"layerId\":\"999c9564-cba1-4f3b-af99-ccbacb8e034f\",\"layerType\":\"data\",\"seriesType\":\"line\",\"splitAccessor\":\"a58f8c48-c2a7-4fc6-b54e-716bf4ca001e\",\"xAccessor\":\"9ddc0f02-5530-4930-99bd-2a914ada1b8f\"}],\"legend\":{\"isVisible\":true,\"position\":\"right\"},\"preferredSeriesType\":\"line\",\"tickLabelsVisibilitySettings\":{\"x\":true,\"yLeft\":true,\"yRight\":true},\"valueLabels\":\"hide\",\"yTitle\":\"5m eps\"},\"query\":{\"language\":\"kuery\",\"query\":\"\"},\"filters\":[],\"datasourceStates\":{\"formBased\":{\"layers\":{\"999c9564-cba1-4f3b-af99-ccbacb8e034f\":{\"columnOrder\":[\"a58f8c48-c2a7-4fc6-b54e-716bf4ca001e\",\"9ddc0f02-5530-4930-99bd-2a914ada1b8f\",\"be033d18-2c04-44f2-b403-0b88d888143d\"],\"columns\":{\"9ddc0f02-5530-4930-99bd-2a914ada1b8f\":{\"customLabel\":true,\"dataType\":\"string\",\"isBucketed\":true,\"label\":\"version\",\"operationType\":\"terms\",\"params\":{\"exclude\":[],\"excludeIsRegex\":false,\"include\":[],\"includeIsRegex\":false,\"missingBucket\":false,\"orderAgg\":{\"dataType\":\"number\",\"isBucketed\":false,\"label\":\"Maximum of version_num\",\"operationType\":\"max\",\"params\":{\"emptyAsNull\":true},\"scale\":\"ratio\",\"sourceField\":\"version_num\"},\"orderBy\":{\"type\":\"custom\"},\"orderDirection\":\"asc\",\"otherBucket\":true,\"parentFormat\":{\"id\":\"terms\"},\"size\":100},\"scale\":\"ordinal\",\"sourceField\":\"version.keyword\"},\"a58f8c48-c2a7-4fc6-b54e-716bf4ca001e\":{\"dataType\":\"string\",\"isBucketed\":true,\"label\":\"Top values of workers.keyword + 1 other\",\"operationType\":\"terms\",\"params\":{\"exclude\":[],\"excludeIsRegex\":false,\"include\":[],\"includeIsRegex\":false,\"missingBucket\":false,\"orderBy\":{\"columnId\":\"be033d18-2c04-44f2-b403-0b88d888143d\",\"type\":\"column\"},\"orderDirection\":\"desc\",\"otherBucket\":true,\"parentFormat\":{\"id\":\"multi_terms\"},\"secondaryFields\":[\"queue_type.keyword\"],\"size\":100},\"scale\":\"ordinal\",\"sourceField\":\"workers.keyword\"},\"be033d18-2c04-44f2-b403-0b88d888143d\":{\"dataType\":\"number\",\"isBucketed\":false,\"label\":\"Median of max_eps_5m\",\"operationType\":\"median\",\"params\":{\"emptyAsNull\":true},\"scale\":\"ratio\",\"sourceField\":\"max_eps_5m\"}},\"incompleteColumns\":{},\"sampling\":1,\"indexPatternId\":\"c5493557-3fd6-4929-8dc2-40d248303942\"}},\"currentIndexPatternId\":\"c5493557-3fd6-4929-8dc2-40d248303942\"},\"indexpattern\":{\"layers\":{}},\"textBased\":{\"layers\":{}}},\"internalReferences\":[],\"adHocDataViews\":{}},\"references\":[{\"type\":\"index-pattern\",\"id\":\"c5493557-3fd6-4929-8dc2-40d248303942\",\"name\":\"indexpattern-datasource-layer-999c9564-cba1-4f3b-af99-ccbacb8e034f\"}],\"type\":\"lens\"}},\"panelRefName\":\"panel_329684df-6ec4-4973-8c96-bc91eaa23fe9\"},{\"type\":\"lens\",\"gridData\":{\"x\":0,\"y\":19,\"w\":16,\"h\":17,\"i\":\"68db206a-6de8-40a8-bd6c-b82d78a41ac7\"},\"panelIndex\":\"68db206a-6de8-40a8-bd6c-b82d78a41ac7\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_68db206a-6de8-40a8-bd6c-b82d78a41ac7\"},{\"type\":\"lens\",\"gridData\":{\"x\":16,\"y\":19,\"w\":16,\"h\":17,\"i\":\"485385cb-cd2b-408b-a119-5e7b15c15eeb\"},\"panelIndex\":\"485385cb-cd2b-408b-a119-5e7b15c15eeb\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_485385cb-cd2b-408b-a119-5e7b15c15eeb\"},{\"type\":\"lens\",\"gridData\":{\"x\":32,\"y\":19,\"w\":16,\"h\":17,\"i\":\"f29c5ed5-423f-44bc-8ded-2bdf8844f1ce\"},\"panelIndex\":\"f29c5ed5-423f-44bc-8ded-2bdf8844f1ce\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_f29c5ed5-423f-44bc-8ded-2bdf8844f1ce\"},{\"type\":\"lens\",\"gridData\":{\"x\":0,\"y\":36,\"w\":16,\"h\":16,\"i\":\"2934659f-462a-41b1-bdc0-344a7a4a2267\"},\"panelIndex\":\"2934659f-462a-41b1-bdc0-344a7a4a2267\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_2934659f-462a-41b1-bdc0-344a7a4a2267\"},{\"type\":\"lens\",\"gridData\":{\"x\":16,\"y\":36,\"w\":16,\"h\":16,\"i\":\"76f881d0-d2d3-4eaa-b71e-8cf8b7c1c5c2\"},\"panelIndex\":\"76f881d0-d2d3-4eaa-b71e-8cf8b7c1c5c2\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_76f881d0-d2d3-4eaa-b71e-8cf8b7c1c5c2\"},{\"type\":\"lens\",\"gridData\":{\"x\":32,\"y\":36,\"w\":16,\"h\":8,\"i\":\"99c4094f-8906-4ded-b56f-8e20107a8f3b\"},\"panelIndex\":\"99c4094f-8906-4ded-b56f-8e20107a8f3b\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_99c4094f-8906-4ded-b56f-8e20107a8f3b\"},{\"type\":\"lens\",\"gridData\":{\"x\":32,\"y\":44,\"w\":16,\"h\":8,\"i\":\"a8dd132b-9212-4c33-83ef-19ec5152448e\"},\"panelIndex\":\"a8dd132b-9212-4c33-83ef-19ec5152448e\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_a8dd132b-9212-4c33-83ef-19ec5152448e\"}]","refreshInterval":{"pause":true,"value":60000},"timeFrom":"now-1y","timeRestore":true,"timeTo":"now","title":"Logstash release benchmark","version":2},"coreMigrationVersion":"8.8.0","created_at":"2024-09-09T13:43:43.023Z","id":"901317cf-f97a-4d20-8420-53f0bf67c606","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index","type":"index-pattern"},{"id":"2c017667-7403-402c-b027-3cc790945a27","name":"329684df-6ec4-4973-8c96-bc91eaa23fe9:panel_329684df-6ec4-4973-8c96-bc91eaa23fe9","type":"lens"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"329684df-6ec4-4973-8c96-bc91eaa23fe9:indexpattern-datasource-layer-999c9564-cba1-4f3b-af99-ccbacb8e034f","type":"index-pattern"},{"id":"a577558f-f9a6-4c86-b562-7618b2c71db0","name":"68db206a-6de8-40a8-bd6c-b82d78a41ac7:panel_68db206a-6de8-40a8-bd6c-b82d78a41ac7","type":"lens"},{"id":"9546a73b-5937-4d3d-850f-30625d6e1405","name":"485385cb-cd2b-408b-a119-5e7b15c15eeb:panel_485385cb-cd2b-408b-a119-5e7b15c15eeb","type":"lens"},{"id":"6fba7dff-2564-450b-b885-8c6cf97fa727","name":"f29c5ed5-423f-44bc-8ded-2bdf8844f1ce:panel_f29c5ed5-423f-44bc-8ded-2bdf8844f1ce","type":"lens"},{"id":"72ae6cc9-47cd-4b51-b441-86905c2b92bd","name":"2934659f-462a-41b1-bdc0-344a7a4a2267:panel_2934659f-462a-41b1-bdc0-344a7a4a2267","type":"lens"},{"id":"661cb795-bb69-4599-8c4b-a4798ef69dc6","name":"76f881d0-d2d3-4eaa-b71e-8cf8b7c1c5c2:panel_76f881d0-d2d3-4eaa-b71e-8cf8b7c1c5c2","type":"lens"},{"id":"d79b8742-6284-4842-ac44-65640d090179","name":"99c4094f-8906-4ded-b56f-8e20107a8f3b:panel_99c4094f-8906-4ded-b56f-8e20107a8f3b","type":"lens"},{"id":"1872e84f-56f2-4a17-9426-3d25d6e03931","name":"a8dd132b-9212-4c33-83ef-19ec5152448e:panel_a8dd132b-9212-4c33-83ef-19ec5152448e","type":"lens"}],"type":"dashboard","typeMigrationVersion":"10.2.0","updated_at":"2024-10-24T11:45:42.246Z","updated_by":"u_4132377203_cloud","version":"WzE3NjMsOV0="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["0da92b64-fe48-439e-9b3a-47775ce1a149","9542ed03-9691-42a3-b5c2-407bcaab221c","cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"columns":{"0da92b64-fe48-439e-9b3a-47775ce1a149":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"workers","operationType":"terms","params":{"accuracyMode":false,"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"size":10},"scale":"ordinal","sourceField":"workers.keyword"},"9542ed03-9691-42a3-b5c2-407bcaab221c":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"version","operationType":"terms","params":{"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderAgg":{"dataType":"number","isBucketed":false,"label":"Maximum of version_num","operationType":"max","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"version_num"},"orderBy":{"type":"custom"},"orderDirection":"asc","otherBucket":true,"parentFormat":{"id":"terms"},"size":100},"scale":"ordinal","sourceField":"version.keyword"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"dataType":"number","isBucketed":false,"label":"Median of max_worker_utilization","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"max_worker_utilization"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"368034aa-1121-464d-8aed-8a4312274fa8","key":"queue_type.keyword","negate":false,"params":{"query":"memory"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"memory"}}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":false,"yLeft":true,"yRight":true},"endValue":"None","fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"hideEndzones":false,"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"0da92b64-fe48-439e-9b3a-47775ce1a149","xAccessor":"9542ed03-9691-42a3-b5c2-407bcaab221c"}],"legend":{"horizontalAlignment":"left","isInside":true,"isVisible":true,"position":"top","shouldTruncate":true,"showSingleSeries":true,"verticalAlignment":"bottom"},"preferredSeriesType":"line","showCurrentTimeMarker":false,"tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","valuesInLegend":false,"yTitle":"worker_utilization (%)"}},"title":"[MQ][R] Worker Utilization (%) by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-09-11T09:52:50.960Z","id":"6295535b-736d-4704-99d3-1cc0c4bb4cb4","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"368034aa-1121-464d-8aed-8a4312274fa8","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-09-11T09:52:50.960Z","version":"WzEzODcsN10="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["0da92b64-fe48-439e-9b3a-47775ce1a149","9542ed03-9691-42a3-b5c2-407bcaab221c","cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"columns":{"0da92b64-fe48-439e-9b3a-47775ce1a149":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"workers","operationType":"terms","params":{"accuracyMode":false,"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"size":10},"scale":"ordinal","sourceField":"workers.keyword"},"9542ed03-9691-42a3-b5c2-407bcaab221c":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"version","operationType":"terms","params":{"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderAgg":{"dataType":"number","isBucketed":false,"label":"Maximum of version_num","operationType":"max","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"version_num"},"orderBy":{"type":"custom"},"orderDirection":"asc","otherBucket":true,"parentFormat":{"id":"terms"},"size":100},"scale":"ordinal","sourceField":"version.keyword"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"dataType":"number","isBucketed":false,"label":"Median of max_worker_utilization","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"max_worker_utilization"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"b16664e5-7dda-45f4-853a-0ae2a0e0a692","key":"queue_type.keyword","negate":false,"params":{"query":"persisted"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"persisted"}}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":false,"yLeft":true,"yRight":true},"endValue":"None","fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"hideEndzones":false,"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"0da92b64-fe48-439e-9b3a-47775ce1a149","xAccessor":"9542ed03-9691-42a3-b5c2-407bcaab221c"}],"legend":{"horizontalAlignment":"left","isInside":true,"isVisible":true,"position":"top","shouldTruncate":true,"showSingleSeries":true,"verticalAlignment":"bottom"},"preferredSeriesType":"line","showCurrentTimeMarker":false,"tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","valuesInLegend":false,"yTitle":"worker_utilization (%)"}},"title":"[PQ][R] Worker Utilization (%) by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-09-11T09:51:33.831Z","id":"64d0f8a7-afe3-4443-88e1-7551d666fee8","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"b16664e5-7dda-45f4-853a-0ae2a0e0a692","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-09-11T09:51:33.831Z","version":"WzEzNzcsN10="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["0da92b64-fe48-439e-9b3a-47775ce1a149","9542ed03-9691-42a3-b5c2-407bcaab221c","cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"columns":{"0da92b64-fe48-439e-9b3a-47775ce1a149":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"workers","operationType":"terms","params":{"accuracyMode":false,"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"size":10},"scale":"ordinal","sourceField":"workers.keyword"},"9542ed03-9691-42a3-b5c2-407bcaab221c":{"dataType":"date","isBucketed":true,"label":"timestamp","operationType":"date_histogram","params":{"dropPartials":false,"includeEmptyRows":true,"interval":"auto"},"scale":"interval","sourceField":"timestamp"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"dataType":"number","isBucketed":false,"label":"Median of max_worker_concurrency","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"max_worker_concurrency"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"8e8a8743-f0a4-47ed-a4f0-21e21971e264","key":"queue_type.keyword","negate":false,"params":{"query":"memory"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"memory"}}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":false,"yLeft":true,"yRight":true},"fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"hideEndzones":false,"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"0da92b64-fe48-439e-9b3a-47775ce1a149","xAccessor":"9542ed03-9691-42a3-b5c2-407bcaab221c"}],"legend":{"horizontalAlignment":"left","isInside":true,"isVisible":true,"legendSize":"small","position":"right","shouldTruncate":true,"showSingleSeries":true,"verticalAlignment":"bottom"},"preferredSeriesType":"line","showCurrentTimeMarker":false,"tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","valuesInLegend":false,"yTitle":"worker_concurrency"}},"title":"[MQ] Worker Concurrency by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-09-05T11:52:42.820Z","id":"8cbdba7b-e921-42b9-b55b-da567717e259","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"8e8a8743-f0a4-47ed-a4f0-21e21971e264","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-09-05T11:52:42.820Z","version":"Wzc0Nyw3XQ=="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["0da92b64-fe48-439e-9b3a-47775ce1a149","9542ed03-9691-42a3-b5c2-407bcaab221c","cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"columns":{"0da92b64-fe48-439e-9b3a-47775ce1a149":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"workers","operationType":"terms","params":{"accuracyMode":false,"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"size":10},"scale":"ordinal","sourceField":"workers.keyword"},"9542ed03-9691-42a3-b5c2-407bcaab221c":{"dataType":"date","isBucketed":true,"label":"timestamp","operationType":"date_histogram","params":{"dropPartials":false,"includeEmptyRows":true,"interval":"auto"},"scale":"interval","sourceField":"timestamp"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"dataType":"number","isBucketed":false,"label":"Median of max_queue_events","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"max_queue_events"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"738fa511-8000-4f6a-b892-4a767bd733ab","key":"queue_type.keyword","negate":false,"params":{"query":"persisted"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"persisted"}}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":false,"yLeft":true,"yRight":true},"fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"hideEndzones":false,"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"0da92b64-fe48-439e-9b3a-47775ce1a149","xAccessor":"9542ed03-9691-42a3-b5c2-407bcaab221c"}],"legend":{"horizontalAlignment":"left","isInside":true,"isVisible":true,"legendSize":"small","position":"right","shouldTruncate":true,"showSingleSeries":true,"verticalAlignment":"bottom"},"preferredSeriesType":"line","showCurrentTimeMarker":false,"tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","valuesInLegend":false,"yTitle":"events in queue"}},"title":"[PQ] events in queue by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-09-05T11:52:42.820Z","id":"7a2c9e96-8e48-4546-b736-065757a52c47","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"738fa511-8000-4f6a-b892-4a767bd733ab","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-09-05T11:52:42.820Z","version":"Wzc0Myw3XQ=="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["0da92b64-fe48-439e-9b3a-47775ce1a149","9542ed03-9691-42a3-b5c2-407bcaab221c","cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"columns":{"0da92b64-fe48-439e-9b3a-47775ce1a149":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"workers","operationType":"terms","params":{"accuracyMode":false,"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"size":10},"scale":"ordinal","sourceField":"workers.keyword"},"9542ed03-9691-42a3-b5c2-407bcaab221c":{"dataType":"date","isBucketed":true,"label":"timestamp","operationType":"date_histogram","params":{"dropPartials":false,"includeEmptyRows":true,"interval":"auto"},"scale":"interval","sourceField":"timestamp"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"dataType":"number","isBucketed":false,"label":"Median of total_events_out","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"total_events_out"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"6dab2bf1-e8cd-4d30-99d6-4e8038c8d19b","key":"queue_type.keyword","negate":false,"params":{"query":"persisted"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"persisted"}}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":false,"yLeft":true,"yRight":true},"fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"hideEndzones":false,"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"0da92b64-fe48-439e-9b3a-47775ce1a149","xAccessor":"9542ed03-9691-42a3-b5c2-407bcaab221c"}],"legend":{"horizontalAlignment":"left","isInside":true,"isVisible":true,"legendSize":"small","position":"right","shouldTruncate":true,"showSingleSeries":true,"verticalAlignment":"bottom"},"preferredSeriesType":"line","showCurrentTimeMarker":false,"tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","valuesInLegend":false,"yTitle":"total events out"}},"title":"[PQ] total events out by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-09-05T11:52:42.820Z","id":"daa3722a-cab7-49ba-b5bb-033e81133096","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"6dab2bf1-e8cd-4d30-99d6-4e8038c8d19b","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-09-05T11:52:42.820Z","version":"Wzc0MSw3XQ=="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["0da92b64-fe48-439e-9b3a-47775ce1a149","9542ed03-9691-42a3-b5c2-407bcaab221c","cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"columns":{"0da92b64-fe48-439e-9b3a-47775ce1a149":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"workers","operationType":"terms","params":{"accuracyMode":false,"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"size":10},"scale":"ordinal","sourceField":"workers.keyword"},"9542ed03-9691-42a3-b5c2-407bcaab221c":{"dataType":"date","isBucketed":true,"label":"timestamp","operationType":"date_histogram","params":{"dropPartials":false,"includeEmptyRows":true,"interval":"auto"},"scale":"interval","sourceField":"timestamp"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"dataType":"number","isBucketed":false,"label":"Median of max_worker_concurrency","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"max_worker_concurrency"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"80e5b5e1-481a-478e-b5cd-3ad74106ff85","key":"queue_type.keyword","negate":false,"params":{"query":"persisted"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"persisted"}}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":false,"yLeft":true,"yRight":true},"fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"hideEndzones":false,"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"0da92b64-fe48-439e-9b3a-47775ce1a149","xAccessor":"9542ed03-9691-42a3-b5c2-407bcaab221c"}],"legend":{"horizontalAlignment":"left","isInside":true,"isVisible":true,"legendSize":"small","position":"right","shouldTruncate":true,"showSingleSeries":true,"verticalAlignment":"bottom"},"preferredSeriesType":"line","showCurrentTimeMarker":false,"tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","valuesInLegend":false,"yTitle":"worker_concurrency"}},"title":"[PQ] Worker Concurrency by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-09-05T11:52:42.820Z","id":"f233b0e6-8ca5-4c29-a6b3-1f1bc83509fd","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"80e5b5e1-481a-478e-b5cd-3ad74106ff85","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-09-05T11:52:42.820Z","version":"Wzc0Miw3XQ=="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["0da92b64-fe48-439e-9b3a-47775ce1a149","9542ed03-9691-42a3-b5c2-407bcaab221c","cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"columns":{"0da92b64-fe48-439e-9b3a-47775ce1a149":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"workers","operationType":"terms","params":{"accuracyMode":false,"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"size":10},"scale":"ordinal","sourceField":"workers.keyword"},"9542ed03-9691-42a3-b5c2-407bcaab221c":{"dataType":"date","isBucketed":true,"label":"timestamp","operationType":"date_histogram","params":{"dropPartials":false,"includeEmptyRows":true,"interval":"auto"},"scale":"interval","sourceField":"timestamp"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"dataType":"number","isBucketed":false,"label":"Median of total_events_out","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"total_events_out"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"dd6c6d40-b512-4c67-94f0-02cb3e9e65bd","key":"queue_type.keyword","negate":false,"params":{"query":"memory"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"memory"}}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":false,"yLeft":true,"yRight":true},"fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"hideEndzones":false,"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"0da92b64-fe48-439e-9b3a-47775ce1a149","xAccessor":"9542ed03-9691-42a3-b5c2-407bcaab221c"}],"legend":{"horizontalAlignment":"left","isInside":true,"isVisible":true,"legendSize":"small","position":"right","shouldTruncate":true,"showSingleSeries":true,"verticalAlignment":"bottom"},"preferredSeriesType":"line","showCurrentTimeMarker":false,"tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","valuesInLegend":false,"yTitle":"total events out"}},"title":"[MQ] total events out by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-09-05T11:52:42.820Z","id":"b0a3d8ea-030a-46e5-95b4-9f73b625f6ee","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"dd6c6d40-b512-4c67-94f0-02cb3e9e65bd","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-09-05T11:52:42.820Z","version":"Wzc0Niw3XQ=="}
+{"attributes":{"description":"","kibanaSavedObjectMeta":{"searchSourceJSON":"{\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[{\"meta\":{\"disabled\":false,\"negate\":false,\"alias\":null,\"key\":\"release\",\"field\":\"release\",\"params\":{\"query\":false},\"type\":\"phrase\",\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index\"},\"query\":{\"match_phrase\":{\"release\":false}},\"$state\":{\"store\":\"appState\"}}]}"},"optionsJSON":"{\"useMargins\":true,\"syncColors\":false,\"syncCursor\":true,\"syncTooltips\":false,\"hidePanelTitles\":false}","panelsJSON":"[{\"type\":\"lens\",\"gridData\":{\"x\":0,\"y\":0,\"w\":48,\"h\":14,\"i\":\"c0ef3cf2-9dbe-4a88-a176-c50422d9041f\"},\"panelIndex\":\"c0ef3cf2-9dbe-4a88-a176-c50422d9041f\",\"embeddableConfig\":{\"enhancements\":{},\"attributes\":{\"title\":\"Daily EPS by queue & worker\",\"description\":\"\",\"visualizationType\":\"lnsXY\",\"state\":{\"visualization\":{\"legend\":{\"isVisible\":true,\"position\":\"right\"},\"valueLabels\":\"hide\",\"fittingFunction\":\"Linear\",\"axisTitlesVisibilitySettings\":{\"x\":true,\"yLeft\":true,\"yRight\":true},\"tickLabelsVisibilitySettings\":{\"x\":true,\"yLeft\":true,\"yRight\":true},\"labelsOrientation\":{\"x\":0,\"yLeft\":0,\"yRight\":0},\"gridlinesVisibilitySettings\":{\"x\":true,\"yLeft\":true,\"yRight\":true},\"preferredSeriesType\":\"line\",\"layers\":[{\"layerId\":\"999c9564-cba1-4f3b-af99-ccbacb8e034f\",\"seriesType\":\"line\",\"xAccessor\":\"9ddc0f02-5530-4930-99bd-2a914ada1b8f\",\"splitAccessor\":\"a58f8c48-c2a7-4fc6-b54e-716bf4ca001e\",\"accessors\":[\"be033d18-2c04-44f2-b403-0b88d888143d\"],\"layerType\":\"data\",\"colorMapping\":{\"assignments\":[{\"rule\":{\"type\":\"matchExactly\",\"values\":[[\"8\",\"memory\"]]},\"color\":{\"type\":\"colorCode\",\"colorCode\":\"#207f8c\"},\"touched\":true},{\"rule\":{\"type\":\"matchExactly\",\"values\":[[\"16\",\"memory\"]]},\"color\":{\"type\":\"colorCode\",\"colorCode\":\"#0055fc\"},\"touched\":true},{\"rule\":{\"type\":\"matchExactly\",\"values\":[[\"4\",\"memory\"]]},\"color\":{\"type\":\"colorCode\",\"colorCode\":\"#99e6e8\"},\"touched\":true},{\"rule\":{\"type\":\"matchExactly\",\"values\":[[\"8\",\"persisted\"]]},\"color\":{\"type\":\"colorCode\",\"colorCode\":\"#c3513a\"},\"touched\":true},{\"rule\":{\"type\":\"matchExactly\",\"values\":[[\"16\",\"persisted\"]]},\"color\":{\"type\":\"colorCode\",\"colorCode\":\"#fd1900\"},\"touched\":true},{\"rule\":{\"type\":\"matchExactly\",\"values\":[[\"4\",\"persisted\"]]},\"color\":{\"type\":\"colorCode\",\"colorCode\":\"#e88888\"},\"touched\":true}],\"specialAssignments\":[{\"rule\":{\"type\":\"other\"},\"color\":{\"type\":\"loop\"},\"touched\":false}],\"paletteId\":\"eui_amsterdam_color_blind\",\"colorMode\":{\"type\":\"categorical\"}}}],\"yTitle\":\"5m eps\"},\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filters\":[],\"datasourceStates\":{\"formBased\":{\"layers\":{\"999c9564-cba1-4f3b-af99-ccbacb8e034f\":{\"columns\":{\"a58f8c48-c2a7-4fc6-b54e-716bf4ca001e\":{\"label\":\"Top values of workers.keyword + 1 other\",\"dataType\":\"string\",\"operationType\":\"terms\",\"scale\":\"ordinal\",\"sourceField\":\"workers.keyword\",\"isBucketed\":true,\"params\":{\"size\":6,\"orderBy\":{\"type\":\"column\",\"columnId\":\"be033d18-2c04-44f2-b403-0b88d888143d\"},\"orderDirection\":\"desc\",\"otherBucket\":true,\"missingBucket\":false,\"parentFormat\":{\"id\":\"multi_terms\"},\"include\":[],\"exclude\":[],\"includeIsRegex\":false,\"excludeIsRegex\":false,\"secondaryFields\":[\"queue_type.keyword\"]}},\"9ddc0f02-5530-4930-99bd-2a914ada1b8f\":{\"label\":\"timestamp\",\"dataType\":\"date\",\"operationType\":\"date_histogram\",\"sourceField\":\"timestamp\",\"isBucketed\":true,\"scale\":\"interval\",\"params\":{\"interval\":\"auto\",\"includeEmptyRows\":true,\"dropPartials\":false}},\"be033d18-2c04-44f2-b403-0b88d888143d\":{\"label\":\"Median of 5m_num\",\"dataType\":\"number\",\"operationType\":\"median\",\"sourceField\":\"5m_num\",\"isBucketed\":false,\"scale\":\"ratio\",\"params\":{\"emptyAsNull\":true}}},\"columnOrder\":[\"a58f8c48-c2a7-4fc6-b54e-716bf4ca001e\",\"9ddc0f02-5530-4930-99bd-2a914ada1b8f\",\"be033d18-2c04-44f2-b403-0b88d888143d\"],\"incompleteColumns\":{},\"sampling\":1,\"indexPatternId\":\"c5493557-3fd6-4929-8dc2-40d248303942\"}},\"currentIndexPatternId\":\"c5493557-3fd6-4929-8dc2-40d248303942\"},\"indexpattern\":{\"layers\":{}},\"textBased\":{\"layers\":{}}},\"internalReferences\":[],\"adHocDataViews\":{}},\"references\":[{\"id\":\"c5493557-3fd6-4929-8dc2-40d248303942\",\"name\":\"indexpattern-datasource-layer-999c9564-cba1-4f3b-af99-ccbacb8e034f\",\"type\":\"index-pattern\"}],\"type\":\"lens\"}},\"panelRefName\":\"panel_c0ef3cf2-9dbe-4a88-a176-c50422d9041f\"},{\"type\":\"lens\",\"gridData\":{\"x\":0,\"y\":14,\"w\":16,\"h\":14,\"i\":\"3fc59b3e-512e-4a47-baa4-e89e4978b685\"},\"panelIndex\":\"3fc59b3e-512e-4a47-baa4-e89e4978b685\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_3fc59b3e-512e-4a47-baa4-e89e4978b685\"},{\"type\":\"lens\",\"gridData\":{\"x\":16,\"y\":14,\"w\":16,\"h\":14,\"i\":\"6294036c-7c92-4e51-990d-ace6af0de939\"},\"panelIndex\":\"6294036c-7c92-4e51-990d-ace6af0de939\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_6294036c-7c92-4e51-990d-ace6af0de939\"},{\"type\":\"lens\",\"gridData\":{\"x\":32,\"y\":28,\"w\":16,\"h\":8,\"i\":\"77d40890-d175-436f-aac3-7bcc9f7beacc\"},\"panelIndex\":\"77d40890-d175-436f-aac3-7bcc9f7beacc\",\"embeddableConfig\":{\"attributes\":{\"title\":\"PQ max q events by worker\",\"description\":\"\",\"visualizationType\":\"lnsXY\",\"state\":{\"visualization\":{\"legend\":{\"isVisible\":true,\"position\":\"right\",\"isInside\":true,\"showSingleSeries\":true,\"legendSize\":\"small\",\"shouldTruncate\":true,\"verticalAlignment\":\"bottom\",\"horizontalAlignment\":\"left\"},\"valueLabels\":\"hide\",\"fittingFunction\":\"Linear\",\"yTitle\":\"events in queue\",\"hideEndzones\":false,\"showCurrentTimeMarker\":false,\"valuesInLegend\":false,\"axisTitlesVisibilitySettings\":{\"x\":false,\"yLeft\":true,\"yRight\":true},\"tickLabelsVisibilitySettings\":{\"x\":true,\"yLeft\":true,\"yRight\":true},\"labelsOrientation\":{\"x\":0,\"yLeft\":0,\"yRight\":0},\"gridlinesVisibilitySettings\":{\"x\":true,\"yLeft\":true,\"yRight\":true},\"preferredSeriesType\":\"line\",\"layers\":[{\"layerId\":\"eb818eba-fa75-45d1-a9ee-6619eecc9280\",\"seriesType\":\"line\",\"splitAccessor\":\"0da92b64-fe48-439e-9b3a-47775ce1a149\",\"accessors\":[\"cc8c1413-0ccc-4109-a6c3-0c910eff776e\"],\"layerType\":\"data\",\"colorMapping\":{\"assignments\":[{\"rule\":{\"type\":\"matchExactly\",\"values\":[\"4\"]},\"color\":{\"type\":\"categorical\",\"paletteId\":\"eui_amsterdam_color_blind\",\"colorIndex\":0},\"touched\":false},{\"rule\":{\"type\":\"matchExactly\",\"values\":[\"8\"]},\"color\":{\"type\":\"categorical\",\"paletteId\":\"eui_amsterdam_color_blind\",\"colorIndex\":1},\"touched\":false},{\"rule\":{\"type\":\"matchExactly\",\"values\":[\"16\"]},\"color\":{\"type\":\"categorical\",\"paletteId\":\"eui_amsterdam_color_blind\",\"colorIndex\":2},\"touched\":false}],\"specialAssignments\":[{\"rule\":{\"type\":\"other\"},\"color\":{\"type\":\"loop\"},\"touched\":false}],\"paletteId\":\"eui_amsterdam_color_blind\",\"colorMode\":{\"type\":\"categorical\"}},\"xAccessor\":\"9542ed03-9691-42a3-b5c2-407bcaab221c\"}]},\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filters\":[{\"meta\":{\"disabled\":false,\"negate\":false,\"alias\":null,\"index\":\"599131c3-0cd9-4a1f-b9da-9894538d58cc\",\"key\":\"queue_type.keyword\",\"field\":\"queue_type.keyword\",\"params\":{\"query\":\"persisted\"},\"type\":\"phrase\"},\"query\":{\"match_phrase\":{\"queue_type.keyword\":\"persisted\"}},\"$state\":{\"store\":\"appState\"}}],\"datasourceStates\":{\"formBased\":{\"layers\":{\"eb818eba-fa75-45d1-a9ee-6619eecc9280\":{\"columns\":{\"0da92b64-fe48-439e-9b3a-47775ce1a149\":{\"label\":\"workers\",\"dataType\":\"string\",\"operationType\":\"terms\",\"scale\":\"ordinal\",\"sourceField\":\"workers.keyword\",\"isBucketed\":true,\"params\":{\"size\":3,\"orderBy\":{\"type\":\"column\",\"columnId\":\"cc8c1413-0ccc-4109-a6c3-0c910eff776e\"},\"orderDirection\":\"desc\",\"otherBucket\":true,\"missingBucket\":false,\"parentFormat\":{\"id\":\"terms\"},\"include\":[],\"exclude\":[],\"includeIsRegex\":false,\"excludeIsRegex\":false,\"accuracyMode\":false},\"customLabel\":true},\"9542ed03-9691-42a3-b5c2-407bcaab221c\":{\"label\":\"timestamp\",\"dataType\":\"date\",\"operationType\":\"date_histogram\",\"sourceField\":\"timestamp\",\"isBucketed\":true,\"scale\":\"interval\",\"params\":{\"interval\":\"auto\",\"includeEmptyRows\":true,\"dropPartials\":false}},\"cc8c1413-0ccc-4109-a6c3-0c910eff776e\":{\"label\":\"Median of max_queue_events_num\",\"dataType\":\"number\",\"operationType\":\"median\",\"sourceField\":\"max_queue_events_num\",\"isBucketed\":false,\"scale\":\"ratio\",\"params\":{\"emptyAsNull\":true}}},\"columnOrder\":[\"0da92b64-fe48-439e-9b3a-47775ce1a149\",\"9542ed03-9691-42a3-b5c2-407bcaab221c\",\"cc8c1413-0ccc-4109-a6c3-0c910eff776e\"],\"incompleteColumns\":{},\"sampling\":1,\"indexPatternId\":\"c5493557-3fd6-4929-8dc2-40d248303942\"}},\"currentIndexPatternId\":\"c5493557-3fd6-4929-8dc2-40d248303942\"},\"indexpattern\":{\"layers\":{}},\"textBased\":{\"layers\":{}}},\"internalReferences\":[],\"adHocDataViews\":{}},\"references\":[{\"id\":\"c5493557-3fd6-4929-8dc2-40d248303942\",\"name\":\"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280\",\"type\":\"index-pattern\"}],\"type\":\"lens\"},\"enhancements\":{}},\"panelRefName\":\"panel_77d40890-d175-436f-aac3-7bcc9f7beacc\"},{\"type\":\"lens\",\"gridData\":{\"x\":32,\"y\":36,\"w\":16,\"h\":8,\"i\":\"8bd920f9-5be7-4481-b733-ba83bdd127d5\"},\"panelIndex\":\"8bd920f9-5be7-4481-b733-ba83bdd127d5\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_8bd920f9-5be7-4481-b733-ba83bdd127d5\"},{\"type\":\"lens\",\"gridData\":{\"x\":0,\"y\":28,\"w\":16,\"h\":16,\"i\":\"23581637-2ff1-4cae-a839-345620c3d180\"},\"panelIndex\":\"23581637-2ff1-4cae-a839-345620c3d180\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_23581637-2ff1-4cae-a839-345620c3d180\"},{\"type\":\"lens\",\"gridData\":{\"x\":16,\"y\":28,\"w\":16,\"h\":16,\"i\":\"c7ab44aa-4607-40b7-b268-d69136bfdcde\"},\"panelIndex\":\"c7ab44aa-4607-40b7-b268-d69136bfdcde\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_c7ab44aa-4607-40b7-b268-d69136bfdcde\"},{\"type\":\"lens\",\"gridData\":{\"x\":32,\"y\":14,\"w\":16,\"h\":14,\"i\":\"01628fc9-19c2-4c65-bc9f-3f284f77c309\"},\"panelIndex\":\"01628fc9-19c2-4c65-bc9f-3f284f77c309\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_01628fc9-19c2-4c65-bc9f-3f284f77c309\"}]","refreshInterval":{"pause":true,"value":60000},"timeFrom":"now-2M","timeRestore":true,"timeTo":"now","title":"Logstash daily benchmark","version":1},"coreMigrationVersion":"8.8.0","created_at":"2024-09-09T13:44:20.764Z","id":"9ef273e3-bee2-48bb-9976-7edc19454b93","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index","type":"index-pattern"},{"id":"94ae4c78-8004-4abb-80c9-271f37c94cdc","name":"c0ef3cf2-9dbe-4a88-a176-c50422d9041f:panel_c0ef3cf2-9dbe-4a88-a176-c50422d9041f","type":"lens"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"c0ef3cf2-9dbe-4a88-a176-c50422d9041f:indexpattern-datasource-layer-999c9564-cba1-4f3b-af99-ccbacb8e034f","type":"index-pattern"},{"id":"f5104988-461c-4f65-b31d-ed22d04cb6b8","name":"3fc59b3e-512e-4a47-baa4-e89e4978b685:panel_3fc59b3e-512e-4a47-baa4-e89e4978b685","type":"lens"},{"id":"8cbdba7b-e921-42b9-b55b-da567717e259","name":"6294036c-7c92-4e51-990d-ace6af0de939:panel_6294036c-7c92-4e51-990d-ace6af0de939","type":"lens"},{"id":"7a2c9e96-8e48-4546-b736-065757a52c47","name":"77d40890-d175-436f-aac3-7bcc9f7beacc:panel_77d40890-d175-436f-aac3-7bcc9f7beacc","type":"lens"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"77d40890-d175-436f-aac3-7bcc9f7beacc:indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"daa3722a-cab7-49ba-b5bb-033e81133096","name":"8bd920f9-5be7-4481-b733-ba83bdd127d5:panel_8bd920f9-5be7-4481-b733-ba83bdd127d5","type":"lens"},{"id":"4d1f7bef-c184-4457-b159-465128d2d70b","name":"23581637-2ff1-4cae-a839-345620c3d180:panel_23581637-2ff1-4cae-a839-345620c3d180","type":"lens"},{"id":"f233b0e6-8ca5-4c29-a6b3-1f1bc83509fd","name":"c7ab44aa-4607-40b7-b268-d69136bfdcde:panel_c7ab44aa-4607-40b7-b268-d69136bfdcde","type":"lens"},{"id":"b0a3d8ea-030a-46e5-95b4-9f73b625f6ee","name":"01628fc9-19c2-4c65-bc9f-3f284f77c309:panel_01628fc9-19c2-4c65-bc9f-3f284f77c309","type":"lens"}],"type":"dashboard","typeMigrationVersion":"10.2.0","updated_at":"2024-09-09T13:44:20.764Z","version":"WzE0ODksOF0="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["0da92b64-fe48-439e-9b3a-47775ce1a149","9542ed03-9691-42a3-b5c2-407bcaab221c","cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"columns":{"0da92b64-fe48-439e-9b3a-47775ce1a149":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"workers","operationType":"terms","params":{"accuracyMode":false,"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"size":10},"scale":"ordinal","sourceField":"workers.keyword"},"9542ed03-9691-42a3-b5c2-407bcaab221c":{"dataType":"date","isBucketed":true,"label":"timestamp","operationType":"date_histogram","params":{"dropPartials":false,"includeEmptyRows":true,"interval":"auto"},"scale":"interval","sourceField":"timestamp"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"dataType":"number","isBucketed":false,"label":"Median of max_worker_utilization","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"max_worker_utilization"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"9aee27f1-97bc-46c4-b369-81b7cd5fe38c","key":"queue_type.keyword","negate":false,"params":{"query":"persisted"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"persisted"}}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":false,"yLeft":true,"yRight":true},"endValue":"None","fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"hideEndzones":false,"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"0da92b64-fe48-439e-9b3a-47775ce1a149","xAccessor":"9542ed03-9691-42a3-b5c2-407bcaab221c"}],"legend":{"horizontalAlignment":"left","isInside":true,"isVisible":true,"position":"top","shouldTruncate":true,"showSingleSeries":true,"verticalAlignment":"bottom"},"preferredSeriesType":"line","showCurrentTimeMarker":false,"tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","valuesInLegend":false,"yTitle":"worker_utilization (%)"}},"title":"[PQ] Worker Utilization (%) by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-09-05T11:52:42.820Z","id":"07700ebe-b8c9-498f-9a91-30efb0c48784","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"9aee27f1-97bc-46c4-b369-81b7cd5fe38c","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-09-05T11:52:42.820Z","version":"Wzc0MCw3XQ=="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["0da92b64-fe48-439e-9b3a-47775ce1a149","9542ed03-9691-42a3-b5c2-407bcaab221c","cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"columns":{"0da92b64-fe48-439e-9b3a-47775ce1a149":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"workers","operationType":"terms","params":{"accuracyMode":false,"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"size":10},"scale":"ordinal","sourceField":"workers.keyword"},"9542ed03-9691-42a3-b5c2-407bcaab221c":{"dataType":"date","isBucketed":true,"label":"timestamp","operationType":"date_histogram","params":{"dropPartials":false,"includeEmptyRows":true,"interval":"auto"},"scale":"interval","sourceField":"timestamp"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"dataType":"number","isBucketed":false,"label":"Median of max_worker_utilization","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"max_worker_utilization"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"4e0f2401-369e-4818-8a1f-52b64ff175df","key":"queue_type.keyword","negate":false,"params":{"query":"memory"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"memory"}}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":false,"yLeft":true,"yRight":true},"fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"hideEndzones":false,"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"0da92b64-fe48-439e-9b3a-47775ce1a149","xAccessor":"9542ed03-9691-42a3-b5c2-407bcaab221c"}],"legend":{"horizontalAlignment":"left","isInside":true,"isVisible":true,"legendSize":"small","position":"right","shouldTruncate":true,"showSingleSeries":true,"verticalAlignment":"bottom"},"preferredSeriesType":"line","showCurrentTimeMarker":false,"tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","valuesInLegend":false,"yTitle":"worker_utilization (%)"}},"title":"[MQ] Worker Utilization (%) by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-09-05T11:52:42.820Z","id":"29ebb6b1-bee6-4f15-b3dc-aac083d5d2f5","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"4e0f2401-369e-4818-8a1f-52b64ff175df","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-09-05T11:52:42.820Z","version":"Wzc0NSw3XQ=="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["0da92b64-fe48-439e-9b3a-47775ce1a149","9542ed03-9691-42a3-b5c2-407bcaab221c","cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"columns":{"0da92b64-fe48-439e-9b3a-47775ce1a149":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"workers","operationType":"terms","params":{"accuracyMode":false,"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"size":10},"scale":"ordinal","sourceField":"workers.keyword"},"9542ed03-9691-42a3-b5c2-407bcaab221c":{"dataType":"string","isBucketed":true,"label":"Top 100 values of version.keyword","operationType":"terms","params":{"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderAgg":{"dataType":"number","isBucketed":false,"label":"Maximum of version_num","operationType":"max","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"version_num"},"orderBy":{"type":"custom"},"orderDirection":"asc","otherBucket":true,"parentFormat":{"id":"terms"},"size":100},"scale":"ordinal","sourceField":"version.keyword"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"dataType":"number","isBucketed":false,"label":"Median of avg_cpu_percentage","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"avg_cpu_percentage"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"index":"f4c5b868-7b2c-4d12-b989-9a057dd128e4","negate":false,"params":[{"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"c5493557-3fd6-4929-8dc2-40d248303942","key":"queue_type.keyword","negate":false,"params":{"query":"memory"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"memory"}}},{"meta":{"alias":null,"disabled":false,"field":"release","index":"c5493557-3fd6-4929-8dc2-40d248303942","key":"release","negate":false,"params":{"query":true},"type":"phrase"},"query":{"match_phrase":{"release":true}}}],"relation":"AND","type":"combined"},"query":{}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":false,"yLeft":true,"yRight":true},"fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"hideEndzones":false,"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"0da92b64-fe48-439e-9b3a-47775ce1a149","xAccessor":"9542ed03-9691-42a3-b5c2-407bcaab221c"}],"legend":{"horizontalAlignment":"left","isInside":true,"isVisible":true,"legendSize":"small","position":"right","shouldTruncate":true,"showSingleSeries":true,"verticalAlignment":"bottom"},"preferredSeriesType":"line","showCurrentTimeMarker":false,"tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","valuesInLegend":false,"yTitle":"avg cpu (%)"}},"title":"[MQ][R] cpu % by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-09-05T11:52:42.820Z","id":"26ec195e-e4a9-4417-be97-6d1fbc6b63c0","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"f4c5b868-7b2c-4d12-b989-9a057dd128e4","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-09-05T11:52:42.820Z","version":"Wzc0OSw3XQ=="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["0da92b64-fe48-439e-9b3a-47775ce1a149","9542ed03-9691-42a3-b5c2-407bcaab221c","cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"columns":{"0da92b64-fe48-439e-9b3a-47775ce1a149":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"workers","operationType":"terms","params":{"accuracyMode":false,"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"size":10},"scale":"ordinal","sourceField":"workers.keyword"},"9542ed03-9691-42a3-b5c2-407bcaab221c":{"dataType":"string","isBucketed":true,"label":"Top 100 values of version.keyword","operationType":"terms","params":{"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderAgg":{"dataType":"number","isBucketed":false,"label":"Maximum of version_num","operationType":"max","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"version_num"},"orderBy":{"type":"custom"},"orderDirection":"asc","otherBucket":true,"parentFormat":{"id":"terms"},"size":100},"scale":"ordinal","sourceField":"version.keyword"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"dataType":"number","isBucketed":false,"label":"Median of avg_cpu_percentage","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"avg_cpu_percentage"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"index":"da1edddb-a868-406c-b3a3-e02cf1069e50","negate":false,"params":[{"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"c5493557-3fd6-4929-8dc2-40d248303942","key":"queue_type.keyword","negate":false,"params":{"query":"persisted"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"persisted"}}},{"meta":{"alias":null,"disabled":false,"field":"release","index":"c5493557-3fd6-4929-8dc2-40d248303942","key":"release","negate":false,"params":{"query":true},"type":"phrase"},"query":{"match_phrase":{"release":true}}}],"relation":"AND","type":"combined"},"query":{}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":false,"yLeft":true,"yRight":true},"fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"hideEndzones":false,"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"0da92b64-fe48-439e-9b3a-47775ce1a149","xAccessor":"9542ed03-9691-42a3-b5c2-407bcaab221c"}],"legend":{"horizontalAlignment":"left","isInside":true,"isVisible":true,"legendSize":"small","position":"right","shouldTruncate":true,"showSingleSeries":true,"verticalAlignment":"bottom"},"preferredSeriesType":"line","showCurrentTimeMarker":false,"tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","valuesInLegend":false,"yTitle":"avg cpu (%)"}},"title":"[PQ][R] cpu % by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-09-05T11:52:42.820Z","id":"bb65f9af-1246-4e75-8b61-dea93d920da8","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"da1edddb-a868-406c-b3a3-e02cf1069e50","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-09-05T11:52:42.820Z","version":"Wzc1MCw3XQ=="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["0da92b64-fe48-439e-9b3a-47775ce1a149","9542ed03-9691-42a3-b5c2-407bcaab221c","cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"columns":{"0da92b64-fe48-439e-9b3a-47775ce1a149":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"workers","operationType":"terms","params":{"accuracyMode":false,"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"size":10},"scale":"ordinal","sourceField":"workers.keyword"},"9542ed03-9691-42a3-b5c2-407bcaab221c":{"dataType":"date","isBucketed":true,"label":"timestamp","operationType":"date_histogram","params":{"dropPartials":false,"includeEmptyRows":true,"interval":"auto"},"scale":"interval","sourceField":"timestamp"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"dataType":"number","isBucketed":false,"label":"Median of avg_cpu_percentage","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"avg_cpu_percentage"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"637adce1-2cf3-4869-a35d-ead85c340ab9","key":"queue_type.keyword","negate":false,"params":{"query":"persisted"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"persisted"}}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":false,"yLeft":true,"yRight":true},"fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"hideEndzones":false,"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"0da92b64-fe48-439e-9b3a-47775ce1a149","xAccessor":"9542ed03-9691-42a3-b5c2-407bcaab221c"}],"legend":{"horizontalAlignment":"left","isInside":true,"isVisible":true,"legendSize":"small","position":"right","shouldTruncate":true,"showSingleSeries":true,"verticalAlignment":"bottom"},"preferredSeriesType":"line","showCurrentTimeMarker":false,"tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","valuesInLegend":false,"yTitle":"avg cpu (%)"}},"title":"[PQ] cpu % by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-09-05T11:52:42.820Z","id":"fc548f47-c5ab-491f-a234-4f24ce439d55","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"637adce1-2cf3-4869-a35d-ead85c340ab9","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-09-05T11:52:42.820Z","version":"Wzc1Myw3XQ=="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"eb818eba-fa75-45d1-a9ee-6619eecc9280":{"columnOrder":["0da92b64-fe48-439e-9b3a-47775ce1a149","9542ed03-9691-42a3-b5c2-407bcaab221c","cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"columns":{"0da92b64-fe48-439e-9b3a-47775ce1a149":{"customLabel":true,"dataType":"string","isBucketed":true,"label":"workers","operationType":"terms","params":{"accuracyMode":false,"exclude":[],"excludeIsRegex":false,"include":[],"includeIsRegex":false,"missingBucket":false,"orderBy":{"columnId":"cc8c1413-0ccc-4109-a6c3-0c910eff776e","type":"column"},"orderDirection":"desc","otherBucket":true,"parentFormat":{"id":"terms"},"size":10},"scale":"ordinal","sourceField":"workers.keyword"},"9542ed03-9691-42a3-b5c2-407bcaab221c":{"dataType":"date","isBucketed":true,"label":"timestamp","operationType":"date_histogram","params":{"dropPartials":false,"includeEmptyRows":true,"interval":"auto"},"scale":"interval","sourceField":"timestamp"},"cc8c1413-0ccc-4109-a6c3-0c910eff776e":{"dataType":"number","isBucketed":false,"label":"Median of avg_cpu_percentage","operationType":"median","params":{"emptyAsNull":true},"scale":"ratio","sourceField":"avg_cpu_percentage"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[{"$state":{"store":"appState"},"meta":{"alias":null,"disabled":false,"field":"queue_type.keyword","index":"26183784-8280-42c4-ae7c-71c4e9a5908c","key":"queue_type.keyword","negate":false,"params":{"query":"memory"},"type":"phrase"},"query":{"match_phrase":{"queue_type.keyword":"memory"}}}],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":false,"yLeft":true,"yRight":true},"fittingFunction":"Linear","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"hideEndzones":false,"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["cc8c1413-0ccc-4109-a6c3-0c910eff776e"],"colorMapping":{"assignments":[{"color":{"colorIndex":0,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["4"]},"touched":false},{"color":{"colorIndex":1,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["8"]},"touched":false},{"color":{"colorIndex":2,"paletteId":"eui_amsterdam_color_blind","type":"categorical"},"rule":{"type":"matchExactly","values":["16"]},"touched":false}],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"eb818eba-fa75-45d1-a9ee-6619eecc9280","layerType":"data","seriesType":"line","splitAccessor":"0da92b64-fe48-439e-9b3a-47775ce1a149","xAccessor":"9542ed03-9691-42a3-b5c2-407bcaab221c"}],"legend":{"horizontalAlignment":"left","isInside":true,"isVisible":true,"legendSize":"small","position":"right","shouldTruncate":true,"showSingleSeries":true,"verticalAlignment":"bottom"},"preferredSeriesType":"line","showCurrentTimeMarker":false,"tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide","valuesInLegend":false,"yTitle":"avg cpu (%)"}},"title":"[MQ] cpu % by worker","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-09-05T11:52:42.820Z","id":"b3c44ade-7f2f-497a-bc9b-f4b53695d975","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-eb818eba-fa75-45d1-a9ee-6619eecc9280","type":"index-pattern"},{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"26183784-8280-42c4-ae7c-71c4e9a5908c","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-09-05T11:52:42.820Z","version":"Wzc1NCw3XQ=="}
+{"attributes":{"description":"","state":{"adHocDataViews":{},"datasourceStates":{"formBased":{"layers":{"904fa8c5-7ce1-45ec-bc0d-a52929cabaa6":{"columnOrder":["3dfc74bb-0629-4809-8416-282f6924ecf6","2e3311e8-099f-48bc-81e8-f8dd643cee72","c62ffb65-c24f-49fe-b8ed-683257e60808"],"columns":{"2e3311e8-099f-48bc-81e8-f8dd643cee72":{"dataType":"number","isBucketed":false,"label":"Moving average of Last value of 5m_num","operationType":"moving_average","params":{"window":5},"references":["c62ffb65-c24f-49fe-b8ed-683257e60808"],"scale":"ratio"},"3dfc74bb-0629-4809-8416-282f6924ecf6":{"dataType":"date","isBucketed":true,"label":"timestamp","operationType":"date_histogram","params":{"dropPartials":false,"includeEmptyRows":true,"interval":"auto"},"scale":"interval","sourceField":"timestamp"},"c62ffb65-c24f-49fe-b8ed-683257e60808":{"dataType":"number","filter":{"language":"kuery","query":"\"5m_num\": *"},"isBucketed":false,"label":"Last value of 5m_num","operationType":"last_value","params":{"showArrayValues":true,"sortField":"timestamp"},"scale":"ratio","sourceField":"5m_num"}},"incompleteColumns":{},"sampling":1}}},"indexpattern":{"layers":{}},"textBased":{"layers":{}}},"filters":[],"internalReferences":[],"query":{"language":"kuery","query":""},"visualization":{"axisTitlesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"fittingFunction":"None","gridlinesVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"labelsOrientation":{"x":0,"yLeft":0,"yRight":0},"layers":[{"accessors":["2e3311e8-099f-48bc-81e8-f8dd643cee72"],"colorMapping":{"assignments":[],"colorMode":{"type":"categorical"},"paletteId":"eui_amsterdam_color_blind","specialAssignments":[{"color":{"type":"loop"},"rule":{"type":"other"},"touched":false}]},"layerId":"904fa8c5-7ce1-45ec-bc0d-a52929cabaa6","layerType":"data","position":"top","seriesType":"bar","showGridlines":false,"xAccessor":"3dfc74bb-0629-4809-8416-282f6924ecf6"}],"legend":{"isVisible":true,"position":"right"},"preferredSeriesType":"bar","tickLabelsVisibilitySettings":{"x":true,"yLeft":true,"yRight":true},"valueLabels":"hide"}},"title":"logstash_5m_eps","visualizationType":"lnsXY"},"coreMigrationVersion":"8.8.0","created_at":"2024-07-08T16:56:26.170Z","id":"af3a2cb0-138f-4b4a-aaf8-49ff4325386d","managed":false,"references":[{"id":"c5493557-3fd6-4929-8dc2-40d248303942","name":"indexpattern-datasource-layer-904fa8c5-7ce1-45ec-bc0d-a52929cabaa6","type":"index-pattern"}],"type":"lens","typeMigrationVersion":"8.9.0","updated_at":"2024-07-08T16:56:26.170Z","version":"WzQzLDRd"}
+{"excludedObjects":[],"excludedObjectsCount":0,"exportedCount":30,"missingRefCount":0,"missingReferences":[]}
\ No newline at end of file
diff --git a/.buildkite/scripts/benchmark/setup/alias b/.buildkite/scripts/benchmark/setup/alias
new file mode 100644
index 000000000..efa658a4d
--- /dev/null
+++ b/.buildkite/scripts/benchmark/setup/alias
@@ -0,0 +1,6 @@
+POST /_aliases
+{
+  "actions": [
+    { "add": { "index": "benchmark_summary_v2", "alias": "benchmark_summary" } }
+  ]
+}
\ No newline at end of file
diff --git a/.buildkite/scripts/benchmark/setup/benchmark_summary_v2 b/.buildkite/scripts/benchmark/setup/benchmark_summary_v2
new file mode 100644
index 000000000..57c80f8c7
--- /dev/null
+++ b/.buildkite/scripts/benchmark/setup/benchmark_summary_v2
@@ -0,0 +1,179 @@
+PUT /benchmark_summary_v2/_mapping
+{
+  "properties": {
+    "avg_cpu_percentage": {
+      "type": "float",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "avg_heap": {
+      "type": "float",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "avg_non_heap": {
+      "type": "float",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "avg_virtual_memory": {
+      "type": "float",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "batch_size": {
+      "type": "integer",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "cpu": {
+      "type": "float",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "max_eps_1m": {
+      "type": "float",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "max_eps_5m": {
+      "type": "float",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "max_queue_bytes_size": {
+      "type": "integer",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "max_queue_events": {
+      "type": "integer",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "max_worker_concurrency": {
+      "type": "float",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "max_worker_utilization": {
+      "type": "float",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "mem": {
+      "type": "float",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "queue_type": {
+      "type": "text",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "tag": {
+      "type": "text",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "timestamp": {
+      "type": "date"
+    },
+    "total_events_out": {
+      "type": "integer",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "version": {
+      "type": "text",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "workers": {
+      "type": "integer",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "tags" : {
+      "type": "text",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    }
+  }
+}
diff --git a/.buildkite/scripts/benchmark/util.sh b/.buildkite/scripts/benchmark/util.sh
new file mode 100755
index 000000000..ac036d59e
--- /dev/null
+++ b/.buildkite/scripts/benchmark/util.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+arch() { uname -m | sed -e "s|amd|x86_|" -e "s|arm|aarch|"; }
+
+# return the min value
+# usage: 
+#  g: float; h: human; d: dictionary; M: month
+#  min -g 3 2 5 1
+#  max -g 1.5 5.2 2.5 1.2 5.7
+#  max -g "null" "0"
+#  min -h 25M 13G 99K 1098M
+min() { printf "%s\n" "${@:2}" | sort "$1" | head -n1 ; }
+
+max() { min ${1}r ${@:2} ; }
+
+# return the average of values
+# usage:
+#   jqavg '.process.cpu.percent' m_w8b1000_*.json
+#   $1: jq field
+#   $2: file path in glob pattern
+jqavg() {
+  jq -r "$1 | select(. != null)" $2 | jq -s . | jq 'add / length'
+}
+
+# return the maximum of values
+# usage:
+#   jqmax '.process.cpu.percent' m_w8b1000_*.json
+#   $1: jq field
+#   $2: file path in glob pattern
+jqmax() {
+  jq -r "$1  | select(. != null)" $2 | jq -s . | jq 'max'
+}
+
+# return true if $1 is non empty and not "null"
+not_empty() {
+  if [[ -n "$1" && "$1" != "null" ]]; then
+    return 0
+  else
+    return 1
+  fi
+}
\ No newline at end of file
diff --git a/.buildkite/scripts/common/check-files-changed.sh b/.buildkite/scripts/common/check-files-changed.sh
new file mode 100755
index 000000000..b02dc356b
--- /dev/null
+++ b/.buildkite/scripts/common/check-files-changed.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+# **********************************************************
+# Returns true if current checkout compared to parent commit
+# has changes ONLY matching the argument regexp
+#
+# Used primarily to skip running the exhaustive pipeline
+# when only docs changes have happened.
+# ********************************************************
+
+if [[ -z "$1" ]]; then
+  echo "Usage: $0 <regexp>"
+  exit 1
+fi
+
+previous_commit=$(git rev-parse HEAD^)
+changed_files=$(git diff --name-only $previous_commit)
+
+if [[ -n "$changed_files" ]] && [[ -z "$(echo "$changed_files" | grep -vE "$1")" ]]; then
+    echo "All files compared to the previous commit [$previous_commit] match the specified regex: [$1]"
+    echo "Files changed:"
+    git --no-pager diff --name-only HEAD^
+  exit 0
+else
+  exit 1
+fi
diff --git a/.buildkite/scripts/common/container-agent.sh b/.buildkite/scripts/common/container-agent.sh
new file mode 100644
index 000000000..e0e2019e2
--- /dev/null
+++ b/.buildkite/scripts/common/container-agent.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+# ********************************************************
+# This file contains prerequisite bootstrap invocations
+# required for Logstash CI when using containerized agents
+# ********************************************************
+
+set -euo pipefail
+
+if [[ $(whoami) == "logstash" ]]
+then
+    export PATH="/home/logstash/.rbenv/bin:$PATH"
+    eval "$(rbenv init -)"
+else
+    export PATH="/usr/local/rbenv/bin:$PATH"
+    eval "$(rbenv init -)"
+fi
diff --git a/.buildkite/scripts/common/qualified-version.sh b/.buildkite/scripts/common/qualified-version.sh
new file mode 100755
index 000000000..4d8e32adb
--- /dev/null
+++ b/.buildkite/scripts/common/qualified-version.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+# ********************************************************
+# Source this script to get the QUALIFIED_VERSION env var
+# or execute it to receive the qualified version on stdout
+# ********************************************************
+
+set -euo pipefail
+
+export QUALIFIED_VERSION="$(
+  # Extract the version number from the version.yml file
+  # e.g.: 8.6.0
+  printf '%s' "$(awk -F':' '{ if ("logstash" == $1) { gsub(/^ | $/,"",$2); printf $2; exit } }' versions.yml)"
+
+  # Qualifier is passed from CI as optional field and specify the version postfix
+  # in case of alpha or beta releases for staging builds only:
+  # e.g: 8.0.0-alpha1
+  printf '%s' "${VERSION_QUALIFIER:+-${VERSION_QUALIFIER}}"
+
+  # add the SNAPSHOT tag unless WORKFLOW_TYPE=="staging" or RELEASE=="1"
+  if [[ ! ( "${WORKFLOW_TYPE:-}" == "staging" || "${RELEASE:+$RELEASE}" == "1" ) ]]; then
+    printf '%s' "-SNAPSHOT"
+  fi
+)"
+
+# if invoked directly, output the QUALIFIED_VERSION to stdout
+if [[ "$0" == "${BASH_SOURCE:-${ZSH_SCRIPT:-}}" ]]; then
+  printf '%s' "${QUALIFIED_VERSION}"
+fi
diff --git a/.buildkite/scripts/common/trigger-pipeline-generate-steps.sh b/.buildkite/scripts/common/trigger-pipeline-generate-steps.sh
new file mode 100755
index 000000000..f0dc4263a
--- /dev/null
+++ b/.buildkite/scripts/common/trigger-pipeline-generate-steps.sh
@@ -0,0 +1,106 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+
+# *******************************************************
+# this script is used by schedule-type pipelines
+# to automate triggering other pipelines (e.g. DRA) based
+# on ci/branches.json
+#
+# See:
+# https://elasticco.atlassian.net/browse/ENGPRD-318 /
+# https://github.com/elastic/ingest-dev/issues/2664
+# *******************************************************
+
+ACTIVE_BRANCHES_URL="https://storage.googleapis.com/artifacts-api/snapshots/branches.json"
+EXCLUDE_BRANCHES_ARRAY=()
+BRANCHES=()
+
+function install_yq() {
+if ! [[ -x $(which yq) && $(yq --version) == *mikefarah* ]]; then
+  echo "--- Downloading prerequisites"
+  curl -fsSL --retry-max-time 60 --retry 3 --retry-delay 5 -o /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64
+  chmod a+x /usr/local/bin/yq
+fi
+}
+
+function parse_pipelines() {
+  IFS="," read -ra PIPELINES <<< "$PIPELINES_TO_TRIGGER"
+}
+
+# converts the (optional) $EXCLUDE_BRANCHES env var, containing a comma separated branches string, to $EXCLUDE_BRANCHES_ARRAY
+function exclude_branches_to_array() {
+  if [[ ! -z "$EXCLUDE_BRANCHES" ]]; then
+    IFS="," read -ra EXCLUDE_BRANCHES_ARRAY <<< "$EXCLUDE_BRANCHES"
+  fi
+}
+
+function check_if_branch_in_exclude_array() {
+  local branch=$1
+  local _excl_br
+  local ret_val="false"
+
+  for _excl_br in "${EXCLUDE_BRANCHES_ARRAY[@]}"; do
+    if [[ "$branch" == "$_excl_br" ]]; then
+      ret_val="true"
+      break
+    fi
+  done
+
+  echo $ret_val
+}
+
+if [[ -z $PIPELINES_TO_TRIGGER ]]; then
+    echo "^^^ +++"
+    echo "Required environment variable [PIPELINES_TO_TRIGGER] is missing."
+    echo "Exiting now."
+    exit 1
+fi
+
+parse_pipelines
+exclude_branches_to_array
+
+set -u
+set +e
+# pull releaseable branches from $ACTIVE_BRANCHES_URL
+readarray -t ELIGIBLE_BRANCHES < <(curl --retry-all-errors --retry 5 --retry-delay 5 -fsSL $ACTIVE_BRANCHES_URL | jq -r '.branches[]')
+if [[ $? -ne 0 ]]; then
+  echo "There was an error downloading or parsing the json output from [$ACTIVE_BRANCHES_URL]. Exiting."
+  exit 1
+fi
+set -e
+
+if [[ ${#EXCLUDE_BRANCHES_ARRAY[@]} -eq 0 ]]; then
+  # no branch exclusions
+  BRANCHES=("${ELIGIBLE_BRANCHES[@]}")
+else
+  # exclude any branches passed via optional $EXCLUDE_BRANCHES
+  for _branch in "${ELIGIBLE_BRANCHES[@]}"; do
+    res=$(check_if_branch_in_exclude_array $_branch)
+    if [[ "$res" == "false" ]]; then
+      BRANCHES+=("$_branch")
+    fi
+  done
+fi
+
+install_yq
+
+echo 'steps:' >pipeline_steps.yaml
+
+for PIPELINE in "${PIPELINES[@]}"; do
+  for BRANCH in "${BRANCHES[@]}"; do
+      cat >>pipeline_steps.yaml <<EOF
+  - trigger: $PIPELINE
+    label: ":testexecute: Triggering ${PIPELINE} / ${BRANCH}"
+    build:
+      branch: "$BRANCH"
+      message: ":testexecute: Scheduled build for ${BRANCH}"
+EOF
+  done
+done
+
+echo "--- Printing generated steps"
+yq . pipeline_steps.yaml
+
+echo "--- Uploading steps to buildkite"
+cat pipeline_steps.yaml | buildkite-agent pipeline upload
diff --git a/.buildkite/scripts/common/vm-agent-multi-jdk.sh b/.buildkite/scripts/common/vm-agent-multi-jdk.sh
new file mode 100644
index 000000000..364b0ba24
--- /dev/null
+++ b/.buildkite/scripts/common/vm-agent-multi-jdk.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+# **************************************************************
+# This file contains prerequisite bootstrap invocations
+# required for Logstash CI when using custom multi-jdk VM images
+# It is primarily used by the exhaustive BK pipeline.
+# **************************************************************
+
+set -euo pipefail
+
+source .ci/java-versions.properties
+export BUILD_JAVA_HOME=/opt/buildkite-agent/.java/$LS_BUILD_JAVA
+
+export PATH="/opt/buildkite-agent/.rbenv/bin:/opt/buildkite-agent/.pyenv/bin:$BUILD_JAVA_HOME/bin:$PATH"
+
+eval "$(rbenv init -)"
diff --git a/.buildkite/scripts/common/vm-agent.sh b/.buildkite/scripts/common/vm-agent.sh
new file mode 100644
index 000000000..f01a92254
--- /dev/null
+++ b/.buildkite/scripts/common/vm-agent.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# ********************************************************
+# This file contains prerequisite bootstrap invocations
+# required for Logstash CI when using VM/baremetal agents
+# ********************************************************
+
+set -euo pipefail
+
+export PATH="/opt/buildkite-agent/.rbenv/bin:/opt/buildkite-agent/.pyenv/bin:/opt/buildkite-agent/.java/bin:$PATH"
+export JAVA_HOME="/opt/buildkite-agent/.java"
+eval "$(rbenv init -)"
diff --git a/.buildkite/scripts/common/vm-images.json b/.buildkite/scripts/common/vm-images.json
new file mode 100644
index 000000000..bd1f0d3ed
--- /dev/null
+++ b/.buildkite/scripts/common/vm-images.json
@@ -0,0 +1,13 @@
+{
+    "#comment": "This file lists all custom vm images. We use it to make decisions about randomized CI jobs.",
+    "linux": {
+        "ubuntu": ["ubuntu-2404", "ubuntu-2204", "ubuntu-2004"],
+        "debian": ["debian-12", "debian-11"],
+        "rhel": ["rhel-9", "rhel-8"],
+        "oraclelinux": ["oraclelinux-8", "oraclelinux-7"],
+        "rocky": ["rocky-linux-8"],
+        "amazonlinux": ["amazonlinux-2023"],
+        "opensuse": ["opensuse-leap-15"]
+    },
+    "windows": ["windows-2025", "windows-2022", "windows-2019", "windows-2016"]
+}
diff --git a/.buildkite/scripts/dra/build_docker.sh b/.buildkite/scripts/dra/build_docker.sh
new file mode 100755
index 000000000..0c89b56e5
--- /dev/null
+++ b/.buildkite/scripts/dra/build_docker.sh
@@ -0,0 +1,55 @@
+#!/bin/bash -ie
+#Note - ensure that the -e flag is set to properly set the $? status if any command fails
+echo "####################################################################"
+echo "##################### Starting $0"
+echo "####################################################################"
+
+source ./$(dirname "$0")/common.sh
+
+# WORKFLOW_TYPE is a CI externally configured environment variable that could assume "snapshot" or "staging" values
+info "Building artifacts for the $WORKFLOW_TYPE workflow ..."
+
+case "$WORKFLOW_TYPE" in
+    snapshot)
+        :  # no-op
+        ;;
+    staging)
+        export RELEASE=1
+        ;;
+    *)
+        error "Workflow (WORKFLOW_TYPE variable) is not set, exiting..."
+        ;;
+esac
+
+rake artifact:docker || error "artifact:docker build failed."
+rake artifact:docker_oss || error "artifact:docker_oss build failed."
+rake artifact:docker_wolfi || error "artifact:docker_wolfi build failed."
+rake artifact:dockerfiles || error "artifact:dockerfiles build failed."
+
+STACK_VERSION="$(./$(dirname "$0")/../common/qualified-version.sh)"
+info "Build complete, setting STACK_VERSION to $STACK_VERSION."
+
+info "Saving tar.gz for docker images"
+save_docker_tarballs "${ARCH}" "${STACK_VERSION}"
+
+info "Generated Artifacts"
+for file in build/logstash-*; do shasum $file;done
+
+info "Uploading DRA artifacts in buildkite's artifact store ..."
+# Note the deb, rpm tar.gz AARCH64 files generated has already been loaded by the build_packages.sh
+images="logstash logstash-oss logstash-wolfi"
+for image in ${images}; do
+    buildkite-agent artifact upload "build/$image-${STACK_VERSION}-docker-image-${ARCH}.tar.gz"
+done
+
+# Upload 'docker-build-context.tar.gz' files only when build x86_64, otherwise they will be
+# overwritten when building aarch64 (or viceversa).
+if [ "$ARCH" != "aarch64" ]; then
+    for image in logstash logstash-oss logstash-wolfi logstash-ironbank; do
+        buildkite-agent artifact upload "build/${image}-${STACK_VERSION}-docker-build-context.tar.gz"
+    done
+fi
+
+echo "####################################################################"
+echo "##################### Finishing $0"
+echo "####################################################################"
diff --git a/.buildkite/scripts/dra/build_packages.sh b/.buildkite/scripts/dra/build_packages.sh
new file mode 100755
index 000000000..3d297bcdc
--- /dev/null
+++ b/.buildkite/scripts/dra/build_packages.sh
@@ -0,0 +1,44 @@
+#!/bin/bash -ie
+#Note - ensure that the -e flag is set to properly set the $? status if any command fails
+echo "####################################################################"
+echo "##################### Starting $0"
+echo "####################################################################"
+
+source ./$(dirname "$0")/common.sh
+
+# WORKFLOW_TYPE is a CI externally configured environment variable that could assume "snapshot" or "staging" values
+info "Building artifacts for the $WORKFLOW_TYPE workflow ..."
+
+case "$WORKFLOW_TYPE" in
+    snapshot)
+        :  # no-op
+        ;;
+    staging)
+        export RELEASE=1
+        ;;
+    *)
+        error "Workflow (WORKFLOW_TYPE variable) is not set, exiting..."
+        ;;
+esac
+
+SKIP_DOCKER=1 rake artifact:all || error "rake artifact:all build failed."
+
+STACK_VERSION="$(./$(dirname "$0")/../common/qualified-version.sh)"
+info "Build complete, setting STACK_VERSION to $STACK_VERSION."
+
+info "Generated Artifacts"
+for file in build/logstash-*; do shasum $file;done
+
+info "Creating dependencies report for ${STACK_VERSION}"
+mkdir -p build/distributions/dependencies-reports/
+bin/dependencies-report --csv=build/distributions/dependencies-reports/logstash-${STACK_VERSION}.csv
+
+info "Generated dependencies report"
+shasum build/distributions/dependencies-reports/logstash-${STACK_VERSION}.csv
+
+info "Uploading DRA artifacts in buildkite's artifact store ..."
+buildkite-agent artifact upload "build/logstash*;build/distributions/dependencies-reports/logstash*"
+
+echo "####################################################################"
+echo "##################### Finishing $0"
+echo "####################################################################"
diff --git a/.buildkite/scripts/dra/common.sh b/.buildkite/scripts/dra/common.sh
new file mode 100755
index 000000000..1ff6c5f8b
--- /dev/null
+++ b/.buildkite/scripts/dra/common.sh
@@ -0,0 +1,42 @@
+function info {
+    echo "--- INFO: $1"
+}
+
+function error {
+    echo "--- ERROR: $1"
+    exit 1
+}
+
+function save_docker_tarballs {
+    local arch="${1:?architecture required}"
+    local version="${2:?stack-version required}"
+    local images="logstash logstash-oss logstash-wolfi"
+
+    for image in ${images}; do
+        tar_file="${image}-${version}-docker-image-${arch}.tar"
+        docker save -o "build/${tar_file}" \
+            "docker.elastic.co/logstash/${image}:${version}" || \
+            error "Unable to save tar file ${tar_file} for ${image} image."
+        # NOTE: if docker save exited with non-zero the error log already exited the script
+        gzip "build/${tar_file}"
+    done
+}
+
+# Since we are using the system jruby, we need to make sure our jvm process
+# uses at least 1g of memory, If we don't do this we can get OOM issues when
+# installing gems. See https://github.com/elastic/logstash/issues/5179
+export JRUBY_OPTS="-J-Xmx4g"
+
+# Extract the version number from the version.yml file
+# e.g.: 8.6.0
+# The suffix part like alpha1 etc is managed by the optional VERSION_QUALIFIER environment variable
+STACK_VERSION=`cat versions.yml | sed -n 's/^logstash\:[[:space:]]\([[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*\)$/\1/p'`
+
+info "Agent is running on architecture [$(uname -i)]"
+
+export VERSION_QUALIFIER=${VERSION_QUALIFIER:-""}
+export DRA_DRY_RUN=${DRA_DRY_RUN:-""}
+
+if [[ ! -z $DRA_DRY_RUN && $BUILDKITE_STEP_KEY == "logstash_publish_dra" ]]; then
+    info "Release manager will run in dry-run mode [$DRA_DRY_RUN]"
+fi
diff --git a/.buildkite/scripts/dra/docker-env-setup.sh b/.buildkite/scripts/dra/docker-env-setup.sh
new file mode 100755
index 000000000..6787a4e9d
--- /dev/null
+++ b/.buildkite/scripts/dra/docker-env-setup.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -euo pipefail
+
+DOCKER_REGISTRY="docker.elastic.co"
+DOCKER_REGISTRY_SECRET_PATH="kv/ci-shared/platform-ingest/docker_registry_prod"
+CI_DRA_ROLE_PATH="kv/ci-shared/release/dra-role"
+
+
+function docker_login {
+  DOCKER_USERNAME_SECRET=$(retry -t 5 -- vault kv get -field user "${DOCKER_REGISTRY_SECRET_PATH}")
+  DOCKER_PASSWORD_SECRET=$(retry -t 5 -- vault kv get -field password "${DOCKER_REGISTRY_SECRET_PATH}")
+  docker login -u "${DOCKER_USERNAME_SECRET}" -p "${DOCKER_PASSWORD_SECRET}" "${DOCKER_REGISTRY}" 2>/dev/null
+  unset DOCKER_USERNAME_SECRET DOCKER_PASSWORD_SECRET
+}
+
+function release_manager_login {
+  DRA_CREDS_SECRET=$(retry -t 5 -- vault kv get -field=data -format=json ${CI_DRA_ROLE_PATH})
+  VAULT_ADDR_SECRET=$(echo ${DRA_CREDS_SECRET} | jq -r '.vault_addr')
+  VAULT_ROLE_ID=$(echo ${DRA_CREDS_SECRET} | jq -r '.role_id')
+  VAULT_SECRET_ID=$(echo ${DRA_CREDS_SECRET} | jq -r '.secret_id')
+  export VAULT_ADDR_SECRET VAULT_ROLE_ID VAULT_SECRET_ID
+}
diff --git a/.buildkite/scripts/dra/docker-env-teardown.sh b/.buildkite/scripts/dra/docker-env-teardown.sh
new file mode 100755
index 000000000..8e7fe0a9a
--- /dev/null
+++ b/.buildkite/scripts/dra/docker-env-teardown.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -euo pipefail
+
+# Unset all variables ending with _SECRET or _TOKEN
+for var in $(printenv | sed 's;=.*;;' | sort); do
+  if [[ $var != "VAULT_ADDR" && ("$var" == *_SECRET || "$var" == *_TOKEN || "$var" == *VAULT* ) ]]; then
+      unset "$var"
+  fi
+done
+
+if command -v docker &>/dev/null; then
+  DOCKER_REGISTRY="docker.elastic.co"
+  docker logout $DOCKER_REGISTRY
+fi
diff --git a/.buildkite/scripts/dra/generatesteps.py b/.buildkite/scripts/dra/generatesteps.py
new file mode 100644
index 000000000..85891e1b9
--- /dev/null
+++ b/.buildkite/scripts/dra/generatesteps.py
@@ -0,0 +1,147 @@
+import os
+import sys
+
+import yaml
+
+YAML_HEADER = '# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json\n'
+
+def to_bk_key_friendly_string(key):
+    """
+    Convert and return key to an acceptable format for Buildkite's key: field
+    Only alphanumerics, dashes and underscores are allowed.
+    """
+
+    mapping_table = str.maketrans({'.': '_'})
+
+    return key.translate(mapping_table)
+
+def package_x86_step(branch, workflow_type):
+    step = f'''
+- label: ":package: Build packages / {branch}-{workflow_type.upper()} DRA artifacts"
+  key: "logstash_build_packages_dra"
+  agents:
+    provider: gcp
+    imageProject: elastic-images-prod
+    image: family/platform-ingest-logstash-ubuntu-2204
+    machineType: "n2-standard-16"
+    diskSizeGb: 200
+  command: |
+    export WORKFLOW_TYPE="{workflow_type}"
+    export PATH="/opt/buildkite-agent/.rbenv/bin:/opt/buildkite-agent/.pyenv/bin:$PATH"
+    eval "$(rbenv init -)"
+    .buildkite/scripts/dra/build_packages.sh
+  artifact_paths:
+    - "**/*.hprof"
+'''
+
+    return step
+
+def package_x86_docker_step(branch, workflow_type):
+    step = f'''
+- label: ":package: Build x86_64 Docker / {branch}-{workflow_type.upper()} DRA artifacts"
+  key: "logstash_build_x86_64_docker_dra"
+  agents:
+    provider: gcp
+    imageProject: elastic-images-prod
+    image: family/platform-ingest-logstash-ubuntu-2204
+    machineType: "n2-standard-16"
+    diskSizeGb: 200
+  artifact_paths:
+    - "**/*.hprof"
+  command: |
+    export WORKFLOW_TYPE="{workflow_type}"
+    export PATH="/opt/buildkite-agent/.rbenv/bin:/opt/buildkite-agent/.pyenv/bin:$PATH"
+    export ARCH="x86_64"
+    eval "$(rbenv init -)"
+    .buildkite/scripts/dra/build_docker.sh
+'''
+
+    return step
+
+def package_aarch64_docker_step(branch, workflow_type):
+    step = f'''
+- label: ":package: Build aarch64 Docker / {branch}-{workflow_type.upper()} DRA artifacts"
+  key: "logstash_build_aarch64_docker_dra"
+  agents:
+    provider: aws
+    imagePrefix: platform-ingest-logstash-ubuntu-2204-aarch64
+    instanceType: "m6g.4xlarge"
+    diskSizeGb: 200
+  artifact_paths:
+    - "**/*.hprof"
+  command: |
+    export WORKFLOW_TYPE="{workflow_type}"
+    export PATH="/opt/buildkite-agent/.rbenv/bin:/opt/buildkite-agent/.pyenv/bin:$PATH"
+    export ARCH="aarch64"
+    eval "$(rbenv init -)"
+    .buildkite/scripts/dra/build_docker.sh
+'''
+
+    return step
+
+def publish_dra_step(branch, workflow_type, depends_on):
+    step = f'''
+- label: ":elastic-stack: Publish  / {branch}-{workflow_type.upper()} DRA artifacts"
+  key: "logstash_publish_dra"
+  depends_on: "{depends_on}"
+  agents:
+    provider: gcp
+    imageProject: elastic-images-prod
+    image: family/platform-ingest-logstash-ubuntu-2204
+    machineType: "n2-standard-16"
+    diskSizeGb: 200
+  command: |
+    echo "+++ Restoring Artifacts"
+    buildkite-agent artifact download "build/logstash*" .
+    buildkite-agent artifact download "build/distributions/**/*" .
+    echo "+++ Changing permissions for the release manager"
+    sudo chown -R :1000 build
+    echo "+++ Running DRA publish step"
+    export WORKFLOW_TYPE="{workflow_type}"
+    .buildkite/scripts/dra/publish.sh
+    '''
+
+    return step
+
+def build_steps_to_yaml(branch, workflow_type):
+    steps = []
+    steps.extend(yaml.safe_load(package_x86_step(branch, workflow_type)))
+    steps.extend(yaml.safe_load(package_x86_docker_step(branch, workflow_type)))
+    steps.extend(yaml.safe_load(package_aarch64_docker_step(branch, workflow_type)))
+
+    return steps
+
+if __name__ == "__main__":
+    try:
+        workflow_type = os.environ["WORKFLOW_TYPE"]
+        version_qualifier = os.environ.get("VERSION_QUALIFIER", "")
+    except ImportError:
+        print(f"Missing env variable WORKFLOW_TYPE. Use export WORKFLOW_TYPE=<staging|snapshot>\n.Exiting.")
+        exit(1)
+
+    branch = os.environ["BUILDKITE_BRANCH"]
+
+    structure = {"steps": []}
+
+    if workflow_type.upper() == "SNAPSHOT" and len(version_qualifier)>0:
+        structure["steps"].append({
+            "label": f"no-op pipeline because prerelease builds (VERSION_QUALIFIER is set to [{version_qualifier}]) don't support the [{workflow_type}] workflow",
+            "command": ":",
+            "skip": "VERSION_QUALIFIER (prerelease builds) not supported with SNAPSHOT DRA",
+        })
+    else:
+        # Group defining parallel steps that build and save artifacts
+        group_key = to_bk_key_friendly_string(f"logstash_dra_{workflow_type}")
+
+        structure["steps"].append({
+            "group": f":Build Artifacts - {workflow_type.upper()}",
+            "key": group_key,
+            "steps": build_steps_to_yaml(branch, workflow_type),
+        })
+
+        # Final step: pull artifacts built above and publish them via the release-manager
+        structure["steps"].extend(
+            yaml.safe_load(publish_dra_step(branch, workflow_type, depends_on=group_key)),
+        )
+
+    print(YAML_HEADER + yaml.dump(structure, Dumper=yaml.Dumper, sort_keys=False))
diff --git a/.buildkite/scripts/dra/publish.sh b/.buildkite/scripts/dra/publish.sh
new file mode 100755
index 000000000..c13cb411c
--- /dev/null
+++ b/.buildkite/scripts/dra/publish.sh
@@ -0,0 +1,118 @@
+#!/bin/bash -i
+set -euo pipefail
+
+echo "####################################################################"
+echo "##################### Starting $0"
+echo "####################################################################"
+
+source ./$(dirname "$0")/common.sh
+
+# DRA_BRANCH can be used for manually testing packaging with PRs
+# e.g. define `DRA_BRANCH="main"` and `RUN_SNAPSHOT="true"` under Options/Environment Variables in the Buildkite UI after clicking new Build
+BRANCH="${DRA_BRANCH:="${BUILDKITE_BRANCH:=""}"}"
+
+# This is the branch selector that needs to be passed to the release-manager
+# It has to be the name of the branch which originates the artifacts.
+RELEASE_VER=`cat versions.yml | sed -n 's/^logstash\:[[:space:]]\([[:digit:]]*\.[[:digit:]]*\)\.[[:digit:]]*$/\1/p'`
+if [ -n "$(git ls-remote --heads origin $RELEASE_VER)" ] ; then
+    RELEASE_BRANCH=$RELEASE_VER
+else
+    RELEASE_BRANCH="${BRANCH:="main"}"
+fi
+echo "RELEASE BRANCH: $RELEASE_BRANCH"
+
+VERSION_QUALIFIER="${VERSION_QUALIFIER:=""}"
+
+case "$WORKFLOW_TYPE" in
+    snapshot)
+        :
+        ;;
+    staging)
+        ;;
+    *)
+        error "Workflow (WORKFLOW_TYPE variable) is not set, exiting..."
+        ;;
+esac
+
+info "Uploading artifacts for ${WORKFLOW_TYPE} workflow on branch: ${RELEASE_BRANCH} for version: ${STACK_VERSION} with version_qualifier: ${VERSION_QUALIFIER}"
+
+if [ "$RELEASE_VER" != "7.17" ]; then
+  # Version 7.17.x doesn't generates ARM artifacts for Darwin
+  # TODO see if we need to do anything here
+  :
+fi
+
+info "Downloaded ARTIFACTS sha report"
+for file in build/logstash-*; do shasum $file;done
+
+FINAL_VERSION="$(./$(dirname "$0")/../common/qualified-version.sh)"
+
+mv build/distributions/dependencies-reports/logstash-${FINAL_VERSION}.csv build/distributions/dependencies-${FINAL_VERSION}.csv
+
+# set required permissions on artifacts and directory
+chmod -R a+r build/*
+chmod -R a+w build
+
+chmod -R a+r $PWD/*
+chmod -R a+w $PWD
+
+info "Setup docker credentials"
+# TODO disable tracing
+# set +o xtrace
+source ./$(dirname "$0")/docker-env-setup.sh
+release_manager_login
+
+# ensure the latest image has been pulled
+docker pull docker.elastic.co/infra/release-manager:latest
+
+echo "+++ :clipboard: Listing DRA artifacts for version [$STACK_VERSION], branch [$RELEASE_BRANCH], workflow [$WORKFLOW_TYPE], QUALIFIER [$VERSION_QUALIFIER]"
+docker run --rm \
+        --name release-manager \
+        -e VAULT_ROLE_ID \
+        -e VAULT_SECRET_ID \
+        --mount type=bind,readonly=false,src="$PWD",target=/artifacts \
+        docker.elastic.co/infra/release-manager:latest \
+          cli list \
+          --project logstash \
+          --branch "${RELEASE_BRANCH}" \
+          --commit "$(git rev-parse HEAD)" \
+          --workflow "${WORKFLOW_TYPE}" \
+          --version "${STACK_VERSION}" \
+          --artifact-set main \
+          --qualifier "${VERSION_QUALIFIER}"
+
+info "Running the release manager ..."
+
+# collect the artifacts for use with the unified build
+docker run --rm \
+  --name release-manager \
+  -e VAULT_ADDR="${VAULT_ADDR_SECRET}" \
+  -e VAULT_ROLE_ID \
+  -e VAULT_SECRET_ID \
+  --mount type=bind,readonly=false,src="$PWD",target=/artifacts \
+  docker.elastic.co/infra/release-manager:latest \
+    cli collect \
+      --project logstash \
+      --branch ${RELEASE_BRANCH} \
+      --commit "$(git rev-parse HEAD)" \
+      --workflow "${WORKFLOW_TYPE}" \
+      --version "${STACK_VERSION}" \
+      --artifact-set main \
+      --qualifier "${VERSION_QUALIFIER}" \
+      ${DRA_DRY_RUN} | tee rm-output.txt
+
+# extract the summary URL from a release manager output line like:
+# Report summary-8.22.0.html can be found at https://artifacts-staging.elastic.co/logstash/8.22.0-ABCDEFGH/summary-8.22.0.html
+
+SUMMARY_URL=$(grep -E '^Report summary-.* can be found at ' rm-output.txt | grep -oP 'https://\S+' | awk '{print $1}')
+rm rm-output.txt
+
+# and make it easily clickable as a Builkite annotation
+printf "**Summary link:** [${SUMMARY_URL}](${SUMMARY_URL})\n" | buildkite-agent annotate --style=success 
+
+info "Teardown logins"
+$(dirname "$0")/docker-env-teardown.sh
+
+echo "####################################################################"
+echo "##################### Finishing $0"
+echo "####################################################################"
diff --git a/.buildkite/scripts/exhaustive-tests/generate-steps.py b/.buildkite/scripts/exhaustive-tests/generate-steps.py
new file mode 100644
index 000000000..c042985b1
--- /dev/null
+++ b/.buildkite/scripts/exhaustive-tests/generate-steps.py
@@ -0,0 +1,219 @@
+import json
+import os
+import random
+import sys
+import typing
+
+from ruamel.yaml import YAML
+from ruamel.yaml.scalarstring import LiteralScalarString
+
+VM_IMAGES_FILE = ".buildkite/scripts/common/vm-images.json"
+VM_IMAGE_PREFIX = "platform-ingest-logstash-multi-jdk-"
+
+ACCEPTANCE_LINUX_OSES = ["ubuntu-2404", "ubuntu-2204", "ubuntu-2004", "debian-11", "rhel-8", "oraclelinux-7", "rocky-linux-8", "opensuse-leap-15", "amazonlinux-2023"]
+
+CUR_PATH = os.path.dirname(os.path.abspath(__file__))
+
+def slugify_bk_key(key: str) -> str:
+    """
+    Convert and return key to an acceptable format for Buildkite's key: field
+    Only alphanumerics, dashes and underscores are allowed.
+    """
+
+    mapping_table = str.maketrans({'.': '_', ' ': '_', '/': '_'})
+
+    return key.translate(mapping_table)
+
+def testing_phase_steps() -> typing.Dict[str, typing.List[typing.Any]]:
+    with open(os.path.join(CUR_PATH, "..", "..", "pull_request_pipeline.yml")) as fp:
+        return YAML().load(fp)
+
+def compat_linux_step(imagesuffix: str) -> dict[str, typing.Any]:
+    linux_command = LiteralScalarString("""#!/usr/bin/env bash
+set -eo pipefail
+source .buildkite/scripts/common/vm-agent.sh
+ci/unit_tests.sh""")
+
+    return compat_step(imagesuffix, command=linux_command)
+
+
+def compat_windows_step(imagesuffix: str) -> dict[str, typing.Any]:
+    windows_command = LiteralScalarString(r'''.\\ci\\unit_tests.ps1''')
+
+    return compat_step(imagesuffix, command=windows_command)
+
+def compat_step(imagesuffix: str, command: LiteralScalarString) -> dict[str, typing.Any]:
+    step = {
+        "label": imagesuffix,
+        "key": slugify_bk_key(f"compat-linux-{imagesuffix}"),
+        "command": command,
+        "agents": {},
+        "retry": {"automatic": [{"limit": 3}]},
+    }
+
+    if "amazon" in imagesuffix.lower():
+        step["agents"] = {
+            "provider": "aws",
+            "imagePrefix": f"{VM_IMAGE_PREFIX}{imagesuffix}",
+            "instanceType": "m5.2xlarge",
+            "diskSizeGb": 200,
+       }
+    else:
+       step["agents"] = {
+            "provider": "gcp",
+            "imageProject": "elastic-images-prod",
+            "image": f"family/{VM_IMAGE_PREFIX}{imagesuffix}",
+            "machineType": "n2-standard-4",
+            "diskSizeGb": 200,
+            "diskType": "pd-ssd",
+       }
+
+    return step
+
+def randomized_linux_oses() -> typing.List[str]:
+    with open(VM_IMAGES_FILE, "r") as fp:
+        all_oses = json.load(fp)
+
+    randomized_oses = []
+    for _, family_oses in all_oses["linux"].items():
+       randomized_oses.append(random.choice(family_oses))
+    return randomized_oses
+
+def randomized_windows_os() -> str:
+    with open(VM_IMAGES_FILE, "r") as fp:
+        all_oses = json.load(fp)
+
+    return random.choice(all_oses["windows"])
+
+def aws_agent(vm_name: str, instance_type: str, image_prefix: str = "platform-ingest-logstash-multi-jdk", disk_size_gb: int = 200) -> dict[str, typing.Any]:
+    return {
+        "provider": "aws",
+        "imagePrefix": f"{image_prefix}-{vm_name}",
+        "instanceType": instance_type,
+        "diskSizeGb": disk_size_gb,
+    }
+
+def gcp_agent(vm_name: str, instance_type: str = "n2-standard-4", image_prefix: str = "family/platform-ingest-logstash-multi-jdk", disk_size_gb: int = 200) -> dict[str, typing.Any]:
+    return {
+        "provider": "gcp",
+        "imageProject": "elastic-images-prod",
+        "image": f"{image_prefix}-{vm_name}",
+        "machineType": instance_type,
+        "diskSizeGb": disk_size_gb,
+        "diskType": "pd-ssd",
+    }
+
+def acceptance_linux_vms() -> typing.List[str]:
+    acceptance_linux_vms = os.getenv("ACCEPTANCE_LINUX_OSES")
+    if acceptance_linux_vms:
+        acceptance_linux_vms = acceptance_linux_vms.split(",")
+    else:
+        acceptance_linux_vms = ACCEPTANCE_LINUX_OSES
+
+    return acceptance_linux_vms
+
+def acceptance_linux_steps() -> list[typing.Any]:
+    steps = []
+
+    build_artifacts_step = {
+        "label": "Build artifacts",
+        "key": "acceptance-build-artifacts",
+        # use the same agent as the one we use for building DRA artifacts
+        "agents": gcp_agent("ubuntu-2204", instance_type="n2-standard-16", image_prefix="family/platform-ingest-logstash"),
+        "command": LiteralScalarString("""#!/usr/bin/env bash
+set -eo pipefail
+source .buildkite/scripts/common/vm-agent.sh
+echo "--- Building all artifacts"
+./gradlew clean bootstrap
+rake artifact:deb artifact:rpm
+"""),
+        "artifact_paths": [
+            "build/*rpm",
+            "build/*deb",
+            "build/*tar.gz",
+        ],
+    }
+
+    steps.append(build_artifacts_step)
+
+    for vm in acceptance_linux_vms():
+        step = {
+            "label": vm,
+            "key": slugify_bk_key(vm),
+            "agents": aws_agent(vm,instance_type="m5.4xlarge") if "amazonlinux" in vm else gcp_agent(vm),
+            "depends_on": "acceptance-build-artifacts",
+            "retry": {"automatic": [{"limit": 3}]},
+            "command": LiteralScalarString("""#!/usr/bin/env bash
+set -eo pipefail
+source .buildkite/scripts/common/vm-agent-multi-jdk.sh
+source /etc/os-release
+ci/acceptance_tests.sh"""),
+        }
+        steps.append(step)
+
+    return steps
+
+def acceptance_docker_steps()-> list[typing.Any]:
+    steps = []
+    for flavor in ["full", "oss", "ubi", "wolfi"]:
+        steps.append({
+            "label": f":docker: {flavor} flavor acceptance",
+            "agents": gcp_agent(vm_name="ubuntu-2204", image_prefix="family/platform-ingest-logstash"),
+            "command": LiteralScalarString(f"""#!/usr/bin/env bash
+set -euo pipefail
+source .buildkite/scripts/common/vm-agent.sh
+ci/docker_acceptance_tests.sh {flavor}"""),
+            "retry": {"automatic": [{"limit": 3}]},
+        })
+
+    return steps
+
+if __name__ == "__main__":
+    LINUX_OS_ENV_VAR_OVERRIDE = os.getenv("LINUX_OS")
+    WINDOWS_OS_ENV_VAR_OVERRIDE = os.getenv("WINDOWS_OS")
+
+    compat_linux_steps = []
+    linux_test_oses = [LINUX_OS_ENV_VAR_OVERRIDE] if LINUX_OS_ENV_VAR_OVERRIDE else randomized_linux_oses()
+    for linux_os in linux_test_oses:
+       compat_linux_steps.append(compat_linux_step(linux_os))
+
+    windows_test_os = WINDOWS_OS_ENV_VAR_OVERRIDE or randomized_windows_os()
+
+    structure = {"steps": []}
+
+    structure["steps"].append({
+        "group": "Testing Phase",
+        "key": "testing-phase",
+        **testing_phase_steps(),
+    })
+
+    structure["steps"].append({
+            "group": "Compatibility / Linux",
+            "key": "compatibility-linux",
+            "depends_on": "testing-phase",
+            "steps": compat_linux_steps,
+    })
+
+    structure["steps"].append({
+            "group": "Compatibility / Windows",
+            "key": "compatibility-windows",
+            "depends_on": "testing-phase",
+            "steps": [compat_windows_step(imagesuffix=windows_test_os)],
+    })
+
+    structure["steps"].append({
+            "group": "Acceptance / Packaging",
+            "key": "acceptance-packaging",
+            "depends_on": ["testing-phase"],
+            "steps": acceptance_linux_steps(),
+    })
+
+    structure["steps"].append({
+            "group": "Acceptance / Docker",
+            "key": "acceptance-docker",
+            "depends_on": ["testing-phase"],
+            "steps": acceptance_docker_steps(),
+    })
+
+    print('# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json')
+    YAML().dump(structure, sys.stdout)
diff --git a/.buildkite/scripts/health-report-tests/README.md b/.buildkite/scripts/health-report-tests/README.md
new file mode 100644
index 000000000..99bd198a8
--- /dev/null
+++ b/.buildkite/scripts/health-report-tests/README.md
@@ -0,0 +1,18 @@
+## Description
+This package for integration tests of the Health Report API.
+Export `LS_BRANCH` to run on a specific branch. By default, it uses the main branch.
+
+## How to run the Health Report Integration test?
+### Prerequisites
+Make sure you have python installed. Install the integration test dependencies with the following command:
+```shell
+python3 -mpip install -r .buildkite/scripts/health-report-tests/requirements.txt
+```
+
+### Run the integration tests
+```shell
+python3 .buildkite/scripts/health-report-tests/main.py
+```
+
+### Troubleshooting
+- If you get `WARNING: pip is configured with locations that require TLS/SSL,...` warning message, make sure you have python >=3.12.4 installed.
\ No newline at end of file
diff --git a/.buildkite/scripts/health-report-tests/__init__.py b/.buildkite/scripts/health-report-tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/.buildkite/scripts/health-report-tests/bootstrap.py b/.buildkite/scripts/health-report-tests/bootstrap.py
new file mode 100644
index 000000000..5fa37a7bc
--- /dev/null
+++ b/.buildkite/scripts/health-report-tests/bootstrap.py
@@ -0,0 +1,111 @@
+"""
+Health Report Integration test bootstrapper with Python script
+    - A script to resolve Logstash version if not provided
+    - Download LS docker image and spin up
+    - When tests finished, teardown the Logstash
+"""
+import os
+import subprocess
+import time
+import util
+import yaml
+
+
+class Bootstrap:
+    ELASTIC_STACK_RELEASED_VERSION_URL = "https://storage.googleapis.com/artifacts-api/releases/current/"
+
+    def __init__(self) -> None:
+        f"""
+        A constructor of the {Bootstrap}.
+        Returns:
+            Resolves Logstash branch considering provided LS_BRANCH
+            Checks out git branch
+        """
+        logstash_branch = os.environ.get("LS_BRANCH")
+        if logstash_branch is None:
+            # version is not specified, use the main branch, no need to git checkout
+            print(f"LS_BRANCH is not specified, using main branch.")
+        else:
+            # LS_BRANCH accepts major latest as a major.x or specific branch as X.Y
+            if logstash_branch.find(".x") == -1:
+                print(f"Using specified branch: {logstash_branch}")
+                util.git_check_out_branch(logstash_branch)
+            else:
+                major_version = logstash_branch.split(".")[0]
+                if major_version and major_version.isnumeric():
+                    resolved_version = self.__resolve_latest_stack_version_for(major_version)
+                    minor_version = resolved_version.split(".")[1]
+                    branch = major_version + "." + minor_version
+                    print(f"Using resolved branch: {branch}")
+                    util.git_check_out_branch(branch)
+                else:
+                    raise ValueError(f"Invalid value set to LS_BRANCH. Please set it properly (ex: 8.x or 9.0) and "
+                                     f"rerun again")
+
+    def __resolve_latest_stack_version_for(self, major_version: str) -> str:
+        resp = util.call_url_with_retry(self.ELASTIC_STACK_RELEASED_VERSION_URL + major_version)
+        release_version = resp.text.strip()
+        print(f"Resolved latest version for {major_version} is {release_version}.")
+
+        if release_version == "":
+            raise ValueError(f"Cannot resolve latest version for {major_version} major")
+        return release_version
+
+    def install_plugin(self, plugin_path: str) -> None:
+        util.run_or_raise_error(
+            ["bin/logstash-plugin", "install", plugin_path],
+            f"Failed to install {plugin_path}")
+
+    def build_logstash(self):
+        print(f"Building Logstash...")
+        util.run_or_raise_error(
+            ["./gradlew", "clean", "bootstrap", "assemble", "installDefaultGems"],
+            "Failed to build Logstash")
+        print(f"Logstash has successfully built.")
+
+    def apply_config(self, config: dict) -> None:
+        with open(os.getcwd() + "/.buildkite/scripts/health-report-tests/config/pipelines.yml", 'w') as pipelines_file:
+            yaml.dump(config, pipelines_file)
+
+    def run_logstash(self, full_start_required: bool) -> subprocess.Popen:
+        # --config.reload.automatic is to make instance active
+        # it is helpful when testing crash pipeline cases
+        config_path = os.getcwd() + "/.buildkite/scripts/health-report-tests/config"
+        process = subprocess.Popen(["bin/logstash", "--config.reload.automatic", "--path.settings", config_path,
+                                    "-w 1"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, shell=False)
+        if process.poll() is not None:
+            print(f"Logstash failed to run, check the the config and logs, then rerun.")
+            return None
+
+        # Read stdout and stderr in real-time
+        logs = []
+        for stdout_line in iter(process.stdout.readline, ""):
+            logs.append(stdout_line.strip())
+            # we don't wait for Logstash fully start as we also test slow pipeline start scenarios
+            if full_start_required is False and "Starting pipeline" in stdout_line:
+                break
+            if full_start_required is True and "Pipeline started" in stdout_line:
+                break
+            if "Logstash shut down" in stdout_line or "Logstash stopped" in stdout_line:
+                print(f"Logstash couldn't spin up.")
+                print(logs)
+                return None
+
+        print(f"Logstash is running with PID: {process.pid}.")
+        return process
+
+    def stop_logstash(self, process: subprocess.Popen):
+        start_time = time.time()    # in seconds
+        process.terminate()
+        for stdout_line in iter(process.stdout.readline, ""):
+            # print(f"STDOUT: {stdout_line.strip()}")
+            if "Logstash shut down" in stdout_line or "Logstash stopped" in stdout_line:
+                print(f"Logstash stopped.")
+                return None
+            # shudown watcher keep running, we should be good with considering time spent
+            if time.time() - start_time > 60:
+                print(f"Logstash didn't stop in 1min, sending SIGTERM signal.")
+                process.kill()
+            if time.time() - start_time > 70:
+                print(f"Logstash didn't stop over 1min, exiting.")
+                return None
diff --git a/.buildkite/scripts/health-report-tests/config/pipelines.yml b/.buildkite/scripts/health-report-tests/config/pipelines.yml
new file mode 100644
index 000000000..cfa2d9632
--- /dev/null
+++ b/.buildkite/scripts/health-report-tests/config/pipelines.yml
@@ -0,0 +1 @@
+# Intentionally left blank
\ No newline at end of file
diff --git a/.buildkite/scripts/health-report-tests/config_validator.py b/.buildkite/scripts/health-report-tests/config_validator.py
new file mode 100644
index 000000000..be8795d69
--- /dev/null
+++ b/.buildkite/scripts/health-report-tests/config_validator.py
@@ -0,0 +1,70 @@
+import yaml
+from typing import Any, List, Dict
+
+
+class ConfigValidator:
+    REQUIRED_KEYS = {
+        "root": ["name", "config", "conditions", "expectation"],
+        "config": ["pipeline.id", "config.string"],
+        "conditions": ["full_start_required", "wait_seconds"],
+        "expectation": ["status", "symptom", "indicators"],
+        "indicators": ["pipelines"],
+        "pipelines": ["status", "symptom", "indicators"],
+        "DYNAMIC": ["status", "symptom", "diagnosis", "impacts", "details"],    # pipeline-id is a DYNAMIC
+        "details": ["status"],
+        "status": ["state"]
+    }
+
+    def __init__(self):
+        self.yaml_content = None
+
+    def __has_valid_keys(self, data: any, key_path: str, repeated: bool) -> bool:
+        # we reached the value
+        if isinstance(data, str) or isinstance(data, bool) or isinstance(data, int) or isinstance(data, float):
+            return True
+
+        # we have two indicators section and for the next repeated ones, we go deeper
+        first_key = next(iter(data))
+        data = data[first_key] if repeated and key_path == "indicators" else data
+
+        if isinstance(data, dict):
+            # pipeline-id is a DYNAMIC
+            required = self.REQUIRED_KEYS.get("DYNAMIC" if repeated and key_path == "indicators" else key_path, [])
+            repeated = not repeated if key_path == "indicators" else repeated
+            for key in required:
+                if key not in data:
+                    print(f"Missing key '{key}' in '{key_path}'")
+                    return False
+                else:
+                    dic_keys_result = self.__has_valid_keys(data[key], key, repeated)
+                    if dic_keys_result is False:
+                        return False
+        elif isinstance(data, list):
+            for item in data:
+                list_keys_result = self.__has_valid_keys(item, key_path, repeated)
+                if list_keys_result is False:
+                    return False
+        return True
+
+    def load(self, file_path: str) -> None:
+        """Load the YAML file content into self.yaml_content."""
+        self.yaml_content: [Dict[str, Any]] = None
+        try:
+            with open(file_path, 'r') as file:
+                self.yaml_content = yaml.safe_load(file)
+        except yaml.YAMLError as exc:
+            print(f"Error in YAML file: {exc}")
+            self.yaml_content = None
+
+    def is_valid(self) -> bool:
+        """Validate the entire YAML structure."""
+        if self.yaml_content is None:
+            print(f"YAML content is empty.")
+            return False
+
+        if not isinstance(self.yaml_content, dict):
+            print(f"YAML structure is not as expected, it should start with a Dict.")
+            return False
+
+        result = self.__has_valid_keys(self.yaml_content, "root", False)
+        return True if result is True else False
diff --git a/.buildkite/scripts/health-report-tests/logstash_health_report.py b/.buildkite/scripts/health-report-tests/logstash_health_report.py
new file mode 100644
index 000000000..6b00cff07
--- /dev/null
+++ b/.buildkite/scripts/health-report-tests/logstash_health_report.py
@@ -0,0 +1,16 @@
+"""
+A class to provide information about Logstash node stats.
+"""
+
+import util
+
+
+class LogstashHealthReport:
+    LOGSTASH_HEALTH_REPORT_URL = "http://localhost:9600/_health_report"
+
+    def __init__(self):
+        pass
+
+    def get(self):
+        response = util.call_url_with_retry(self.LOGSTASH_HEALTH_REPORT_URL)
+        return response.json()
diff --git a/.buildkite/scripts/health-report-tests/main.py b/.buildkite/scripts/health-report-tests/main.py
new file mode 100644
index 000000000..52462f15b
--- /dev/null
+++ b/.buildkite/scripts/health-report-tests/main.py
@@ -0,0 +1,89 @@
+"""
+ Main entry point of the LS health report API integration test suites
+"""
+import glob
+import os
+import time
+import traceback
+import yaml
+from bootstrap import Bootstrap
+from scenario_executor import ScenarioExecutor
+from config_validator import ConfigValidator
+
+
+class BootstrapContextManager:
+
+    def __init__(self):
+        pass
+
+    def __enter__(self):
+        print(f"Starting Logstash Health Report Integration test.")
+        self.bootstrap = Bootstrap()
+        self.bootstrap.build_logstash()
+
+        plugin_path = os.getcwd() + "/qa/support/logstash-integration-failure_injector/logstash-integration" \
+                                    "-failure_injector-*.gem"
+        matching_files = glob.glob(plugin_path)
+        if len(matching_files) == 0:
+            raise ValueError(f"Could not find logstash-integration-failure_injector plugin.")
+
+        self.bootstrap.install_plugin(matching_files[0])
+        print(f"logstash-integration-failure_injector successfully installed.")
+        return self.bootstrap
+
+    def __exit__(self, exc_type, exc_value, exc_traceback):
+        if exc_type is not None:
+            print(traceback.format_exception(exc_type, exc_value, exc_traceback))
+
+
+def main():
+    with BootstrapContextManager() as bootstrap:
+        scenario_executor = ScenarioExecutor()
+        config_validator = ConfigValidator()
+
+        working_dir = os.getcwd()
+        scenario_files_path = working_dir + "/.buildkite/scripts/health-report-tests/tests/*.yaml"
+        scenario_files = glob.glob(scenario_files_path)
+
+        for scenario_file in scenario_files:
+            print(f"Validating {scenario_file} scenario file.")
+            config_validator.load(scenario_file)
+            if config_validator.is_valid() is False:
+                print(f"{scenario_file} scenario file is not valid.")
+                return
+            else:
+                print(f"Validation succeeded.")
+
+        has_failed_scenario = False
+        for scenario_file in scenario_files:
+            with open(scenario_file, 'r') as file:
+                # scenario_content: Dict[str, Any] = None
+                scenario_content = yaml.safe_load(file)
+                print(f"Testing `{scenario_content.get('name')}` scenario.")
+                scenario_name = scenario_content['name']
+
+                is_full_start_required = scenario_content.get('conditions').get('full_start_required')
+                wait_seconds = scenario_content.get('conditions').get('wait_seconds')
+                config = scenario_content['config']
+                if config is not None:
+                    bootstrap.apply_config(config)
+                    expectations = scenario_content.get("expectation")
+                    process = bootstrap.run_logstash(is_full_start_required)
+                    if process is not None:
+                        if wait_seconds is not None:
+                            print(f"Test requires to wait for `{wait_seconds}` seconds.")
+                            time.sleep(wait_seconds)  # wait for Logstash to start
+                        try:
+                            scenario_executor.on(scenario_name, expectations)
+                        except Exception as e:
+                            print(e)
+                            has_failed_scenario = True
+                        bootstrap.stop_logstash(process)
+
+        if has_failed_scenario:
+            # intentionally fail due to visibility
+            raise Exception("Some of scenarios failed, check the log for details.")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/.buildkite/scripts/health-report-tests/main.sh b/.buildkite/scripts/health-report-tests/main.sh
new file mode 100755
index 000000000..e6cbf3727
--- /dev/null
+++ b/.buildkite/scripts/health-report-tests/main.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -euo pipefail
+
+export PATH="/opt/buildkite-agent/.rbenv/bin:/opt/buildkite-agent/.pyenv/bin:/opt/buildkite-agent/.java/bin:$PATH"
+export JAVA_HOME="/opt/buildkite-agent/.java"
+export PYENV_VERSION="3.11.5"
+
+eval "$(rbenv init -)"
+eval "$(pyenv init -)"
+
+echo "--- Installing dependencies"
+python3 -m pip install -r .buildkite/scripts/health-report-tests/requirements.txt
+
+echo "--- Running tests"
+python3 .buildkite/scripts/health-report-tests/main.py
\ No newline at end of file
diff --git a/.buildkite/scripts/health-report-tests/requirements.txt b/.buildkite/scripts/health-report-tests/requirements.txt
new file mode 100644
index 000000000..c48e50211
--- /dev/null
+++ b/.buildkite/scripts/health-report-tests/requirements.txt
@@ -0,0 +1,2 @@
+requests==2.32.3
+pyyaml==6.0.2
\ No newline at end of file
diff --git a/.buildkite/scripts/health-report-tests/scenario_executor.py b/.buildkite/scripts/health-report-tests/scenario_executor.py
new file mode 100644
index 000000000..b5d8f7419
--- /dev/null
+++ b/.buildkite/scripts/health-report-tests/scenario_executor.py
@@ -0,0 +1,67 @@
+"""
+A class to execute the given scenario for Logstash Health Report integration test
+"""
+import time
+from logstash_health_report import LogstashHealthReport
+
+
+class ScenarioExecutor:
+    logstash_health_report_api = LogstashHealthReport()
+
+    def __init__(self):
+        pass
+
+    def __has_intersection(self, expects, results):
+        # TODO: this logic is aligned on current Health API response
+        #   there is no guarantee that method correctly runs if provided multi expects and results
+        # we expect expects to be existing in results
+        for expect in expects:
+            for result in results:
+                if result.get('help_url') and "health-report-pipeline-" not in result.get('help_url'):
+                    return False
+                if not all(key in result and result[key] == value for key, value in expect.items()):
+                    return False
+        return True
+
+    def __get_difference(self, differences: list, expectations: dict, reports: dict) -> dict:
+        for key in expectations.keys():
+
+            if type(expectations.get(key)) != type(reports.get(key)):
+                differences.append(f"Scenario expectation and Health API report structure differs for {key}.")
+                return differences
+
+            if isinstance(expectations.get(key), str):
+                if expectations.get(key) != reports.get(key):
+                    differences.append({key: {"expected": expectations.get(key), "got": reports.get(key)}})
+                continue
+            elif isinstance(expectations.get(key), dict):
+                self.__get_difference(differences, expectations.get(key), reports.get(key))
+            elif isinstance(expectations.get(key), list):
+                if not self.__has_intersection(expectations.get(key), reports.get(key)):
+                    differences.append({key: {"expected": expectations.get(key), "got": reports.get(key)}})
+        return differences
+
+    def __is_expected(self, expectations: dict) -> None:
+        reports = self.logstash_health_report_api.get()
+        differences = self.__get_difference([], expectations, reports)
+        if differences:
+            print("Differences found in 'expectation' section between YAML content and stats:")
+            for diff in differences:
+                print(f"Difference: {diff}")
+            return False
+        else:
+            return True
+
+    def on(self, scenario_name: str, expectations: dict) -> None:
+        # retriable check the expectations
+        attempts = 5
+        while self.__is_expected(expectations) is False:
+            attempts = attempts - 1
+            if attempts == 0:
+                break
+            time.sleep(1)
+
+        if attempts == 0:
+            raise Exception(f"{scenario_name} failed.")
+        else:
+            print(f"Scenario `{scenario_name}` expectaion meets the health report stats.")
diff --git a/.buildkite/scripts/health-report-tests/tests/abnormal-termination.yaml b/.buildkite/scripts/health-report-tests/tests/abnormal-termination.yaml
new file mode 100644
index 000000000..8accc6528
--- /dev/null
+++ b/.buildkite/scripts/health-report-tests/tests/abnormal-termination.yaml
@@ -0,0 +1,32 @@
+name: "Abnormally terminated pipeline"
+config:
+  - pipeline.id: abnormally-terminated-pp
+    config.string: |
+      input { heartbeat { interval => 1 } }
+      filter { failure_injector { crash_at => filter } }
+      output { stdout {} }
+    pipeline.workers: 1
+    pipeline.batch.size: 1
+conditions:
+  full_start_required: true
+  wait_seconds: 5
+expectation:
+  status: "red"
+  symptom: "1 indicator is unhealthy (`pipelines`)"
+  indicators:
+    pipelines:
+      status: "red"
+      symptom: "1 indicator is unhealthy (`abnormally-terminated-pp`)"
+      indicators:
+        abnormally-terminated-pp:
+          status: "red"
+          symptom: "The pipeline is unhealthy; 1 area is impacted and 1 diagnosis is available"
+          diagnosis:
+            - cause: "pipeline is not running, likely because it has encountered an error"
+              action: "view logs to determine the cause of abnormal pipeline shutdown"
+          impacts:
+            - description: "the pipeline is not currently processing"
+              impact_areas: ["pipeline_execution"]
+          details:
+            status:
+              state: "TERMINATED"
\ No newline at end of file
diff --git a/.buildkite/scripts/health-report-tests/tests/backpressure-1m.yaml b/.buildkite/scripts/health-report-tests/tests/backpressure-1m.yaml
new file mode 100644
index 000000000..446d17a36
--- /dev/null
+++ b/.buildkite/scripts/health-report-tests/tests/backpressure-1m.yaml
@@ -0,0 +1,38 @@
+name: "Backpressured in 1min pipeline"
+config:
+  - pipeline.id: backpressure-1m-pp
+    config.string: |
+      input { heartbeat { interval => 0.1 } }
+      filter { failure_injector { degrade_at => [filter] } }
+      output { stdout {} }
+    pipeline.workers: 1
+    pipeline.batch.size: 1
+conditions:
+  full_start_required: true
+  wait_seconds: 70 # give more seconds to make sure time is over the threshold, 1m in this case
+expectation:
+  status: "yellow"
+  symptom: "1 indicator is concerning (`pipelines`)"
+  indicators:
+    pipelines:
+      status: "yellow"
+      symptom: "1 indicator is concerning (`backpressure-1m-pp`)"
+      indicators:
+        backpressure-1m-pp:
+          status: "yellow"
+          symptom: "The pipeline is concerning; 1 area is impacted and 1 diagnosis is available"
+          diagnosis:
+            - id: "logstash:health:pipeline:flow:worker_utilization:diagnosis:1m-blocked"
+              cause: "pipeline workers have been completely blocked for at least one minute"
+              action: "address bottleneck or add resources"
+          impacts:
+            - id: "logstash:health:pipeline:flow:impact:blocked_processing"
+              severity: 2
+              description: "the pipeline is blocked"
+              impact_areas: ["pipeline_execution"]
+          details:
+            status:
+              state: "RUNNING"
+            flow:
+              worker_utilization:
+                last_1_minute: 100.0
\ No newline at end of file
diff --git a/.buildkite/scripts/health-report-tests/tests/backpressure-5m.yaml b/.buildkite/scripts/health-report-tests/tests/backpressure-5m.yaml
new file mode 100644
index 000000000..3e33595fc
--- /dev/null
+++ b/.buildkite/scripts/health-report-tests/tests/backpressure-5m.yaml
@@ -0,0 +1,39 @@
+name: "Backpressured in 5min pipeline"
+config:
+  - pipeline.id: backpressure-5m-pp
+    config.string: |
+      input { heartbeat { interval => 0.1 } }
+      filter { failure_injector { degrade_at => [filter] } }
+      output { stdout {} }
+    pipeline.workers: 1
+    pipeline.batch.size: 1
+conditions:
+  full_start_required: true
+  wait_seconds: 310 # give more seconds to make sure time is over the threshold, 1m in this case
+expectation:
+  status: "red"
+  symptom: "1 indicator is unhealthy (`pipelines`)"
+  indicators:
+    pipelines:
+      status: "red"
+      symptom: "1 indicator is unhealthy (`backpressure-5m-pp`)"
+      indicators:
+        backpressure-5m-pp:
+          status: "red"
+          symptom: "The pipeline is unhealthy; 1 area is impacted and 1 diagnosis is available"
+          diagnosis:
+            - id: "logstash:health:pipeline:flow:worker_utilization:diagnosis:5m-blocked"
+              cause: "pipeline workers have been completely blocked for at least five minutes"
+              action: "address bottleneck or add resources"
+          impacts:
+            - id: "logstash:health:pipeline:flow:impact:blocked_processing"
+              severity: 1
+              description: "the pipeline is blocked"
+              impact_areas: ["pipeline_execution"]
+          details:
+            status:
+              state: "RUNNING"
+            flow:
+              worker_utilization:
+                last_1_minute: 100.0
+                last_5_minutes: 100.0
\ No newline at end of file
diff --git a/.buildkite/scripts/health-report-tests/tests/multipipeline.yaml b/.buildkite/scripts/health-report-tests/tests/multipipeline.yaml
new file mode 100644
index 000000000..42fd4ad95
--- /dev/null
+++ b/.buildkite/scripts/health-report-tests/tests/multipipeline.yaml
@@ -0,0 +1,67 @@
+name: "Multi pipeline"
+config:
+  - pipeline.id: slow-start-pp-multipipeline
+    config.string: |
+      input { heartbeat {} }
+      filter { failure_injector { degrade_at => [register] } }
+      output { stdout {} }
+    pipeline.workers: 1
+    pipeline.batch.size: 1
+  - pipeline.id: normally-terminated-pp-multipipeline
+    config.string: |
+      input { generator { count => 1 } }
+      output { stdout {} }
+    pipeline.workers: 1
+    pipeline.batch.size: 1
+  - pipeline.id: abnormally-terminated-pp-multipipeline
+    config.string: |
+      input { heartbeat { interval => 1 } }
+      filter { failure_injector { crash_at => filter } }
+      output { stdout {} }
+    pipeline.workers: 1
+    pipeline.batch.size: 1
+conditions:
+  full_start_required: false
+  wait_seconds: 10
+expectation:
+  status: "red"
+  symptom: "1 indicator is unhealthy (`pipelines`)"
+  indicators:
+    pipelines:
+      status: "red"
+      symptom: "1 indicator is unhealthy (`abnormally-terminated-pp-multipipeline`) and 2 indicators are concerning (`slow-start-pp-multipipeline`, `normally-terminated-pp-multipipeline`)"
+      indicators:
+        slow-start-pp-multipipeline:
+          status: "yellow"
+          symptom: "The pipeline is concerning; 1 area is impacted and 1 diagnosis is available"
+          diagnosis:
+            - cause: "pipeline is loading"
+              action: "if pipeline does not come up quickly, you may need to check the logs to see if it is stalled"
+          impacts:
+            - impact_areas: ["pipeline_execution"]
+          details:
+            status:
+              state: "LOADING"
+        normally-terminated-pp-multipipeline:
+          status: "yellow"
+          symptom: "The pipeline is concerning; 1 area is impacted and 1 diagnosis is available"
+          diagnosis:
+            - cause: "pipeline has finished running because its inputs have been closed and events have been processed"
+              action: "if you expect this pipeline to run indefinitely, you will need to configure its inputs to continue receiving or fetching events"
+          impacts:
+            - impact_areas: [ "pipeline_execution" ]
+          details:
+            status:
+              state: "FINISHED"
+        abnormally-terminated-pp-multipipeline:
+          status: "red"
+          symptom: "The pipeline is unhealthy; 1 area is impacted and 1 diagnosis is available"
+          diagnosis:
+            - cause: "pipeline is not running, likely because it has encountered an error"
+              action: "view logs to determine the cause of abnormal pipeline shutdown"
+          impacts:
+            - description: "the pipeline is not currently processing"
+              impact_areas: [ "pipeline_execution" ]
+          details:
+            status:
+              state: "TERMINATED"
\ No newline at end of file
diff --git a/.buildkite/scripts/health-report-tests/tests/normal-termination.yaml b/.buildkite/scripts/health-report-tests/tests/normal-termination.yaml
new file mode 100644
index 000000000..aa499b44f
--- /dev/null
+++ b/.buildkite/scripts/health-report-tests/tests/normal-termination.yaml
@@ -0,0 +1,30 @@
+name: "Successfully terminated pipeline"
+config:
+  - pipeline.id: normally-terminated-pp
+    config.string: |
+      input { generator { count => 1 } }
+      output { stdout {} }
+    pipeline.workers: 1
+    pipeline.batch.size: 1
+conditions:
+  full_start_required: true
+  wait_seconds: 5
+expectation:
+  status: "yellow"
+  symptom: "1 indicator is concerning (`pipelines`)"
+  indicators:
+    pipelines:
+      status: "yellow"
+      symptom: "1 indicator is concerning (`normally-terminated-pp`)"
+      indicators:
+        normally-terminated-pp:
+          status: "yellow"
+          symptom: "The pipeline is concerning; 1 area is impacted and 1 diagnosis is available"
+          diagnosis:
+            - cause: "pipeline has finished running because its inputs have been closed and events have been processed"
+              action: "if you expect this pipeline to run indefinitely, you will need to configure its inputs to continue receiving or fetching events"
+          impacts:
+            - impact_areas: ["pipeline_execution"]
+          details:
+            status:
+              state: "FINISHED"
\ No newline at end of file
diff --git a/.buildkite/scripts/health-report-tests/tests/slow-start.yaml b/.buildkite/scripts/health-report-tests/tests/slow-start.yaml
new file mode 100644
index 000000000..5343dc9a1
--- /dev/null
+++ b/.buildkite/scripts/health-report-tests/tests/slow-start.yaml
@@ -0,0 +1,31 @@
+name: "Slow start pipeline"
+config:
+  - pipeline.id: slow-start-pp
+    config.string: |
+      input { heartbeat {} }
+      filter { failure_injector { degrade_at => [register] } }
+      output { stdout {} }
+    pipeline.workers: 1
+    pipeline.batch.size: 1
+conditions:
+  full_start_required: false
+  wait_seconds: 0
+expectation:
+  status: "yellow"
+  symptom: "1 indicator is concerning (`pipelines`)"
+  indicators:
+    pipelines:
+      status: "yellow"
+      symptom: "1 indicator is concerning (`slow-start-pp`)"
+      indicators:
+        slow-start-pp:
+          status: "yellow"
+          symptom: "The pipeline is concerning; 1 area is impacted and 1 diagnosis is available"
+          diagnosis:
+            - cause: "pipeline is loading"
+              action: "if pipeline does not come up quickly, you may need to check the logs to see if it is stalled"
+          impacts:
+            - impact_areas: ["pipeline_execution"]
+          details:
+            status:
+              state: "LOADING"
\ No newline at end of file
diff --git a/.buildkite/scripts/health-report-tests/util.py b/.buildkite/scripts/health-report-tests/util.py
new file mode 100644
index 000000000..86db9d571
--- /dev/null
+++ b/.buildkite/scripts/health-report-tests/util.py
@@ -0,0 +1,36 @@
+import os
+import requests
+import subprocess
+from requests.adapters import HTTPAdapter, Retry
+
+
+def call_url_with_retry(url: str, max_retries: int = 5, delay: int = 1) -> requests.Response:
+    f"""
+    Calls the given {url} with maximum of {max_retries} retries with {delay} delay.
+    """
+    schema = "https://" if "https://" in url else "http://"
+    session = requests.Session()
+    # retry on most common failures such as connection timeout(408), etc...
+    retries = Retry(total=max_retries, backoff_factor=delay, status_forcelist=[408, 502, 503, 504])
+    session.mount(schema, HTTPAdapter(max_retries=retries))
+    return session.get(url)
+
+
+def git_check_out_branch(branch_name: str) -> None:
+    f"""
+    Checks out specified branch or fails with error if checkout operation fails.
+    """
+    run_or_raise_error(["git", "checkout", branch_name],
+                       "Error occurred while checking out the " + branch_name + " branch")
+
+
+def run_or_raise_error(commands: list, error_message):
+    f"""
+    Executes the {list} commands and raises an {Exception} if opration fails.
+    """
+    result = subprocess.run(commands, env=os.environ.copy(), universal_newlines=True, stdout=subprocess.PIPE)
+    if result.returncode != 0:
+        full_error_message = (error_message + ", output: " + result.stdout.decode('utf-8')) \
+            if result.stdout else error_message
+        raise Exception(f"{full_error_message}")
+
diff --git a/.buildkite/scripts/jdk-matrix-tests/generate-steps.py b/.buildkite/scripts/jdk-matrix-tests/generate-steps.py
new file mode 100644
index 000000000..cbb490035
--- /dev/null
+++ b/.buildkite/scripts/jdk-matrix-tests/generate-steps.py
@@ -0,0 +1,398 @@
+import abc
+import copy
+from dataclasses import dataclass, field
+import os
+import sys
+import typing
+from functools import partial
+
+from ruamel.yaml import YAML
+from ruamel.yaml.scalarstring import LiteralScalarString
+
+ENABLED_RETRIES = {"automatic": [{"limit": 3}]}
+
+@dataclass
+class JobRetValues:
+    step_label: str
+    command: str
+    step_key: str
+    depends: str
+    agent: typing.Dict[typing.Any, typing.Any]
+    retry: typing.Optional[typing.Dict[typing.Any, typing.Any]] = None
+    artifact_paths: list = field(default_factory=list)
+
+
+class GCPAgent:
+    def __init__(self, image: str, machineType: str, diskSizeGb: int = 200, diskType: str = "pd-ssd") -> None:
+        self.provider = "gcp"
+        self.imageProject = "elastic-images-prod"
+        self.image = image
+        self.machineType = machineType
+        self.diskSizeGb = diskSizeGb
+        self.diskType = diskType
+
+    def to_dict(self):
+        return {
+            "provider": self.provider,
+            "imageProject": self.imageProject,
+            "image": self.image,
+            "machineType": self.machineType,
+            "diskSizeGb": self.diskSizeGb,
+            "diskType": self.diskType,
+        }
+
+
+class AWSAgent:
+    def __init__(self, imagePrefix: str, instanceType: str, diskSizeGb: int):
+        self.provider = "aws"
+        self.imagePrefix = imagePrefix
+        self.instanceType = instanceType
+        self.diskSizeGb = diskSizeGb
+
+    def to_dict(self):
+        return {
+            "provider": self.provider,
+            "imagePrefix": self.imagePrefix,
+            "instanceType": self.instanceType,
+            "diskSizeGb": self.diskSizeGb,   
+        }
+    
+class DefaultAgent:
+    """
+    Represents an empty agent definition which makes Buildkite use the default agent i.e. a container
+    """
+
+    def __init__(self) -> None:
+        pass
+
+    def to_json(self) -> typing.Dict:
+        return {}
+    
+
+@dataclass
+class BuildkiteEmojis:
+    running: str = ":bk-status-running:"
+    success: str = ":bk-status-passed:"
+    failed: str = ":bk-status-failed:"
+
+def slugify_bk_key(key: str) -> str:
+    """
+    Convert and return key to an acceptable format for Buildkite's key: field
+    Only alphanumerics, dashes and underscores are allowed.
+    """
+
+    mapping_table = str.maketrans({'.': '_', ' ': '_', '/': '_'})
+
+    return key.translate(mapping_table)
+
+def get_bk_metadata(key: str) -> typing.List[str]:
+    try:
+      return os.environ[key].split()
+    except KeyError:
+        print(f"Missing environment variable [{key}]. This should be set before calling this script using buildkite-agent meta-data get. Exiting.")
+        exit(1)
+
+def bk_annotate(body: str, context: str, mode = "") -> str:
+    cmd = f"""buildkite-agent annotate --style=info --context={context} """
+    if mode:
+        cmd += f"--{mode} "
+
+    cmd += f"\"{body}\n\""
+    return cmd
+
+
+class Jobs(abc.ABC):
+    def __init__(self, os: str, jdk: str, group_key: str, agent: typing.Union[GCPAgent, AWSAgent]):
+        self.os = os
+        self.jdk = jdk
+        self.group_key = group_key
+        self.init_annotation_key = f"{os}-{jdk}-initialize-annotation"
+        self.agent = agent
+
+    def init_annotation(self) -> JobRetValues:
+        """
+        Command for creating the header of a new annotation for a group step
+        """
+
+        body = f"### Group: {self.os} / {self.jdk}\n| **Status** | **Test** |\n| --- | ----|"
+
+        return JobRetValues(
+            step_label="Initialize annotation",
+            command=LiteralScalarString(bk_annotate(body=body, context=self.group_key)),
+            step_key=self.init_annotation_key,
+            depends="",
+            agent=DefaultAgent().to_json(),
+        )
+
+    @abc.abstractmethod
+    def all_jobs(self) -> list[typing.Callable[[], typing.Tuple[str, str]]]:
+        pass
+
+
+class WindowsJobs(Jobs):
+    def __init__(self, os: str, jdk: str, group_key: str, agent: typing.Union[GCPAgent, AWSAgent]):
+      super().__init__(os=os, jdk=jdk, group_key=group_key, agent=agent)
+
+    def all_jobs(self) -> list[typing.Callable[[], JobRetValues]]:
+        return [
+          self.init_annotation,
+          self.java_unit_test,
+          self.ruby_unit_test,          
+        ]
+
+    def java_unit_test(self) -> JobRetValues:
+        step_name_human = "Java Unit Test"
+        step_key = f"{self.group_key}-java-unit-test"
+        test_command = rf'''.\\.buildkite\\scripts\\jdk-matrix-tests\\launch-command.ps1 -JDK "{self.jdk}" -StepNameHuman "{step_name_human}" -AnnotateContext "{self.group_key}" -CIScript ".\\ci\\unit_tests.ps1 java" -Annotate
+        '''
+
+        return JobRetValues(
+            step_label=step_name_human,
+            command=LiteralScalarString(test_command),
+            step_key=step_key,
+            depends=self.init_annotation_key,
+            artifact_paths=["build_reports.zip"],
+            agent=self.agent.to_dict(),
+            retry=copy.deepcopy(ENABLED_RETRIES),
+        )
+
+    def ruby_unit_test(self) -> JobRetValues:
+        step_name_human = "Ruby Unit Test"
+        step_key = f"{self.group_key}-ruby-unit-test"
+        test_command = rf'''.\\.buildkite\\scripts\\jdk-matrix-tests\\launch-command.ps1 -JDK "{self.jdk}" -StepNameHuman "{step_name_human}" -AnnotateContext "{self.group_key}" -CIScript ".\\ci\\unit_tests.ps1 ruby" -Annotate
+        '''
+
+        return JobRetValues(
+            step_label=step_name_human,
+            command=LiteralScalarString(test_command),
+            step_key=step_key,
+            depends=self.init_annotation_key,
+            artifact_paths=["build_reports.zip"],
+            agent=self.agent.to_dict(),
+            retry=copy.deepcopy(ENABLED_RETRIES),
+        )
+
+
+class LinuxJobs(Jobs):
+    def __init__(self, os: str, jdk: str, group_key: str, agent: typing.Union[GCPAgent, AWSAgent]):
+      super().__init__(os=os, jdk=jdk, group_key=group_key, agent=agent)
+
+    def all_jobs(self) -> list[typing.Callable[[], JobRetValues]]:
+        jobs=list()
+        jobs.append(self.init_annotation)
+        jobs.append(self.java_unit_test)
+        jobs.append(self.ruby_unit_test)
+        jobs.extend(self.integration_test_parts(3))
+        jobs.extend(self.pq_integration_test_parts(3))
+        jobs.append(self.x_pack_unit_tests)
+        jobs.append(self.x_pack_integration)
+        return jobs
+
+    def prepare_shell(self) -> str:
+        jdk_dir = f"/opt/buildkite-agent/.java/{self.jdk}"
+        return f"""#!/usr/bin/env bash
+set -euo pipefail
+
+# unset generic JAVA_HOME
+unset JAVA_HOME
+
+# LS env vars for JDK matrix tests
+export BUILD_JAVA_HOME={jdk_dir}
+export RUNTIME_JAVA_HOME={jdk_dir}
+export LS_JAVA_HOME={jdk_dir}
+
+export PATH="/opt/buildkite-agent/.rbenv/bin:/opt/buildkite-agent/.pyenv/bin:$PATH"
+eval "$(rbenv init -)"
+"""
+
+    def failed_step_annotation(self, step_name_human) -> str:
+        return bk_annotate(body=f"| {BuildkiteEmojis.failed} | {step_name_human} |", context=self.group_key, mode="append")
+
+    def succeeded_step_annotation(self, step_name_human) -> str:
+        return bk_annotate(body=f"| {BuildkiteEmojis.success} | {step_name_human} |", context=self.group_key, mode="append")
+
+    def emit_command(self, step_name_human, test_command: str) -> str:
+        return LiteralScalarString(f"""
+{self.prepare_shell()}
+# temporarily disable immediate failure on errors, so that we can update the BK annotation
+set +eo pipefail
+{test_command}
+if [[ $$? -ne 0 ]]; then
+    {self.failed_step_annotation(step_name_human)}
+  exit 1
+else
+    {self.succeeded_step_annotation(step_name_human)}
+fi
+      """)
+
+    def java_unit_test(self) -> JobRetValues:
+        step_name_human = "Java Unit Test"
+        step_key = f"{self.group_key}-java-unit-test"
+        test_command = '''
+export ENABLE_SONARQUBE="false"
+ci/unit_tests.sh java
+        '''
+
+        return JobRetValues(
+            step_label=step_name_human,
+            command=self.emit_command(step_name_human, test_command),
+            step_key=step_key,
+            depends=self.init_annotation_key,
+            agent=self.agent.to_dict(),
+            retry=copy.deepcopy(ENABLED_RETRIES),
+        )
+
+    def ruby_unit_test(self) -> JobRetValues:
+        step_name_human = "Ruby Unit Test"
+        step_key = f"{self.group_key}-ruby-unit-test"
+        test_command = """
+ci/unit_tests.sh ruby
+        """
+
+        return JobRetValues(
+            step_label=step_name_human,
+            command=self.emit_command(step_name_human, test_command),
+            step_key=step_key,
+            depends=self.init_annotation_key,
+            agent=self.agent.to_dict(),
+            retry=copy.deepcopy(ENABLED_RETRIES),
+        )
+
+    def integration_test_parts(self, parts) -> list[partial[JobRetValues]]:
+        return [partial(self.integration_tests, part=idx+1, parts=parts) for idx in range(parts)]
+
+    def integration_tests(self, part: int, parts: int) -> JobRetValues:
+        step_name_human = f"Integration Tests - {part}/{parts}"
+        step_key = f"{self.group_key}-integration-tests-{part}-of-{parts}"
+        test_command = f"""
+ci/integration_tests.sh split {part-1} {parts}
+        """
+
+        return JobRetValues(
+            step_label=step_name_human,
+            command=self.emit_command(step_name_human, test_command),
+            step_key=step_key,
+            depends=self.init_annotation_key,
+            agent=self.agent.to_dict(),
+            retry=copy.deepcopy(ENABLED_RETRIES),
+        )
+
+    def pq_integration_test_parts(self, parts) -> list[partial[JobRetValues]]:
+        return [partial(self.pq_integration_tests, part=idx+1, parts=parts) for idx in range(parts)]
+
+    def pq_integration_tests(self, part: int, parts: int) -> JobRetValues:
+        step_name_human = f"IT Persistent Queues - {part}/{parts}"
+        step_key = f"{self.group_key}-it-persistent-queues-{part}-of-{parts}"
+        test_command = f"""
+export FEATURE_FLAG=persistent_queues
+ci/integration_tests.sh split {part-1} {parts}
+        """
+
+        return JobRetValues(
+            step_label=step_name_human,
+            command=self.emit_command(step_name_human, test_command),
+            step_key=step_key,
+            depends=self.init_annotation_key,
+            agent=self.agent.to_dict(),
+            retry=copy.deepcopy(ENABLED_RETRIES),
+        )
+
+    def x_pack_unit_tests(self) -> JobRetValues:
+        step_name_human = "x-pack unit tests"
+        step_key = f"{self.group_key}-x-pack-unit-test"
+        test_command = """
+x-pack/ci/unit_tests.sh
+        """
+
+        return JobRetValues(
+            step_label=step_name_human,
+            command=self.emit_command(step_name_human, test_command),
+            step_key=step_key,
+            depends=self.init_annotation_key,
+            agent=self.agent.to_dict(),
+            retry=copy.deepcopy(ENABLED_RETRIES),
+        )
+
+    def x_pack_integration(self) -> JobRetValues:
+        step_name_human = "x-pack integration"
+        step_key = f"{self.group_key}-x-pack-integration"
+        test_command = """
+x-pack/ci/integration_tests.sh
+        """
+
+        return JobRetValues(
+            step_label=step_name_human,
+            command=self.emit_command(step_name_human, test_command),
+            step_key=step_key,
+            depends=self.init_annotation_key,
+            agent=self.agent.to_dict(),
+            retry=copy.deepcopy(ENABLED_RETRIES),
+        )
+
+
+if __name__ == "__main__":
+    matrix_oses = get_bk_metadata(key="MATRIX_OSES")
+    matrix_jdkes = get_bk_metadata(key="MATRIX_JDKS")
+
+    pipeline_name = os.environ.get("BUILDKITE_PIPELINE_NAME", "").lower()
+
+    structure = {"steps": []}
+
+    for matrix_os in matrix_oses:
+        gcpAgent = GCPAgent(
+            image=f"family/platform-ingest-logstash-multi-jdk-{matrix_os}",
+            machineType="n2-standard-4",
+            diskSizeGb=200,
+            diskType="pd-ssd",
+        )
+
+        awsAgent = AWSAgent(
+            imagePrefix=f"platform-ingest-logstash-multi-jdk-{matrix_os}",
+            instanceType="m5.2xlarge",
+            diskSizeGb=200,
+        )
+
+        for matrix_jdk in matrix_jdkes:
+          group_name = f"{matrix_os}/{matrix_jdk}"
+          group_key = slugify_bk_key(group_name)
+
+          agent = awsAgent if "amazon" in matrix_os else gcpAgent
+
+          if "windows" in pipeline_name:
+            jobs = WindowsJobs(os=matrix_os, jdk=matrix_jdk, group_key=group_key, agent=agent)
+          else:
+            jobs = LinuxJobs(os=matrix_os, jdk=matrix_jdk, group_key=group_key, agent=agent)
+
+          group_steps = []
+          for job in jobs.all_jobs():
+            job_values = job()
+
+            step = {
+              "label": f"{job_values.step_label}",
+              "key": job_values.step_key,
+            }
+
+            if job_values.depends:
+                step["depends_on"] = job_values.depends
+
+            if job_values.agent:
+                step["agents"] = job_values.agent
+
+            if job_values.artifact_paths:
+                step["artifact_paths"] = job_values.artifact_paths
+
+            if job_values.retry:
+                step["retry"] = job_values.retry
+
+            step["command"] = job_values.command
+
+            group_steps.append(step)
+
+
+          structure["steps"].append({
+            "group": group_name,
+            "key": slugify_bk_key(group_name),
+            "steps": group_steps})
+
+    print('# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json')
+    YAML().dump(structure, sys.stdout)
diff --git a/.buildkite/scripts/jdk-matrix-tests/launch-command.ps1 b/.buildkite/scripts/jdk-matrix-tests/launch-command.ps1
new file mode 100644
index 000000000..4645881f5
--- /dev/null
+++ b/.buildkite/scripts/jdk-matrix-tests/launch-command.ps1
@@ -0,0 +1,51 @@
+# ********************************************************
+# This file contains prerequisite bootstrap invocations
+# required for Logstash CI JDK matrix tests
+# ********************************************************
+
+param (
+    [string]$JDK,
+    [string]$CIScript,
+    [string]$StepNameHuman,
+    [string]$AnnotateContext,
+    [switch]$Annotate
+)
+
+# expand previous buildkite folded section (command invocation)
+Write-Host "^^^ +++"
+
+# unset generic JAVA_HOME
+if (Test-Path env:JAVA_HOME) {
+    Remove-Item -Path env:JAVA_HOME
+    Write-Host "--- Environment variable 'JAVA_HOME' has been unset."
+} else {
+    Write-Host "--- Environment variable 'JAVA_HOME' doesn't exist. Continuing."
+}
+
+# LS env vars for JDK matrix tests
+$JAVA_CUSTOM_DIR = "C:\Users\buildkite\.java\$JDK"
+$env:BUILD_JAVA_HOME = $JAVA_CUSTOM_DIR
+$env:RUNTIME_JAVA_HOME = $JAVA_CUSTOM_DIR
+$env:LS_JAVA_HOME = $JAVA_CUSTOM_DIR
+
+Write-Host "--- Running test: $CIScript"
+try {
+    Invoke-Expression $CIScript
+
+    if ($LASTEXITCODE -ne 0) {
+        throw "Test script $CIScript failed with a non-zero code: $LASTEXITCODE"
+    }
+
+    if ($Annotate) {
+        C:\buildkite-agent\bin\buildkite-agent.exe annotate --context="$AnnotateContext" --append "| :bk-status-passed: | $StepNameHuman |`n"
+    }
+} catch {
+    # tests failed
+    Write-Host "^^^ +++"
+    if ($Annotate) {
+        C:\buildkite-agent\bin\buildkite-agent.exe annotate --context="$AnnotateContext" --append "| :bk-status-failed: | $StepNameHuman |`n"
+        Write-Host "--- Archiving test reports"
+        & "7z.exe" a -r .\build_reports.zip .\logstash-core\build\reports\tests
+    }
+    exit 1
+}
diff --git a/.buildkite/scripts/setup_java.sh b/.buildkite/scripts/setup_java.sh
new file mode 100755
index 000000000..3ba20201c
--- /dev/null
+++ b/.buildkite/scripts/setup_java.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+install_java() {
+  # TODO: let's think about regularly creating a custom image for Logstash which may align on version.yml definitions
+  sudo apt update && sudo apt install -y openjdk-21-jdk && sudo apt install -y openjdk-21-jre
+}
+
+install_java
diff --git a/.buildkite/scripts/snyk/report.sh b/.buildkite/scripts/snyk/report.sh
new file mode 100755
index 000000000..529fd887b
--- /dev/null
+++ b/.buildkite/scripts/snyk/report.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+set -e
+
+TARGET_BRANCHES=("main")
+
+install_java_11() {
+  curl -L -s "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.24_8.tar.gz" | tar -zxf -
+}
+
+# Resolves the branches we are going to track
+resolve_latest_branches() {
+  source .buildkite/scripts/snyk/resolve_stack_version.sh
+}
+
+# Build Logstash specific branch to generate Gemlock file where Snyk scans
+build_logstash() {
+  ./gradlew clean bootstrap assemble installDefaultGems
+}
+
+# Downloads snyk distribution
+download_auth_snyk() {
+  echo "Downloading snyk..."
+  curl https://static.snyk.io/cli/latest/snyk-linux -o snyk
+  chmod +x ./snyk
+
+  vault_path=secret/ci/elastic-logstash/snyk-creds
+  SNYK_TOKEN=$(vault read -field=token "${vault_path}")
+  ./snyk auth "$SNYK_TOKEN"
+}
+
+# Reports vulnerabilities to the Snyk
+report() {
+  REMOTE_REPO_URL=$1
+  echo "Reporting $REMOTE_REPO_URL branch."
+  if [ "$REMOTE_REPO_URL" != "main" ] && [ "$REMOTE_REPO_URL" != "8.x" ]; then
+    MAJOR_VERSION=$(echo "$REMOTE_REPO_URL"| cut -d'.' -f 1)
+    REMOTE_REPO_URL="$MAJOR_VERSION".latest
+    echo "Using '$REMOTE_REPO_URL' remote repo url."
+  fi
+
+  # adding git commit hash to Snyk tag to improve visibility
+  # for big projects Snyk recommends pruning dependencies
+  # https://support.snyk.io/hc/en-us/articles/360002061438-CLI-returns-the-error-Failed-to-get-Vulns
+  GIT_HEAD=$(git rev-parse --short HEAD 2> /dev/null)
+  ./snyk monitor --prune-repeated-subdependencies --all-projects --org=logstash --remote-repo-url="$REMOTE_REPO_URL" --target-reference="$REMOTE_REPO_URL" --detection-depth=6 --exclude=qa,tools,devtools,requirements.txt --project-tags=branch="$TARGET_BRANCH",git_head="$GIT_HEAD" || :
+}
+
+resolve_latest_branches
+download_auth_snyk
+
+# clone Logstash repo, build and report
+for TARGET_BRANCH in "${TARGET_BRANCHES[@]}"
+do
+  if [ "$TARGET_BRANCH" == "7.17" ]; then
+    echo "Installing and configuring JDK11."
+    export OLD_PATH=$PATH
+    install_java_11
+    export PATH=$PWD/jdk-11.0.24+8/bin:$PATH
+  fi
+  git reset --hard HEAD # reset if any generated files appeared
+  # check if target branch exists
+  echo "Checking out $TARGET_BRANCH branch."
+  if git checkout "$TARGET_BRANCH"; then
+    build_logstash
+    report "$TARGET_BRANCH"
+  else
+    echo "$TARGET_BRANCH branch doesn't exist."
+  fi
+  if [ "$TARGET_BRANCH" == "7.17" ]; then
+    # reset state
+    echo "Removing JDK11 installation."
+    rm -rf jdk-11.0.24+8
+    export PATH=$OLD_PATH
+  fi
+done
diff --git a/.buildkite/scripts/snyk/resolve_stack_version.sh b/.buildkite/scripts/snyk/resolve_stack_version.sh
new file mode 100755
index 000000000..06da9baa5
--- /dev/null
+++ b/.buildkite/scripts/snyk/resolve_stack_version.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# This script resolves latest version from VERSION_URL SNAPSHOTS based on given N.x (where N is a precise, ex 8.x)
+# Why Snapshot? - the 7.latest and 8.latest branchs will be accurately places in snapshots, not in releases.
+# Ensure you have set the ELASTIC_STACK_VERSION environment variable.
+
+set -e
+
+VERSION_URL="https://storage.googleapis.com/artifacts-api/snapshots/branches.json"
+
+echo "Fetching versions from $VERSION_URL"
+readarray -t TARGET_BRANCHES < <(curl --retry-all-errors --retry 5 --retry-delay 5 -fsSL $VERSION_URL | jq -r '.branches[]')
+echo "${TARGET_BRANCHES[@]}"
+
diff --git a/.buildkite/serverless_integration_pipeline.yml b/.buildkite/serverless_integration_pipeline.yml
new file mode 100644
index 000000000..1c7742a6d
--- /dev/null
+++ b/.buildkite/serverless_integration_pipeline.yml
@@ -0,0 +1,57 @@
+agents:
+  provider: "gcp"
+  machineType: "n1-standard-4"
+  image: family/core-ubuntu-2204
+
+steps:
+  - label: "DLQ rspec integration test"
+    command: ./.buildkite/scripts/setup_java.sh && ./ci/serverless/dlq_rspec_tests.sh
+    retry:
+      automatic:
+        - limit: 3
+  - label: "es-output test"
+    command: ./.buildkite/scripts/setup_java.sh && ./ci/serverless/es_output_tests.sh
+    retry:
+      automatic:
+        - limit: 3
+  - label: "es-input test"
+    command: ./.buildkite/scripts/setup_java.sh && ./ci/serverless/es_input_tests.sh
+    retry:
+      automatic:
+        - limit: 3
+  - label: "es-filter test"
+    command: ./.buildkite/scripts/setup_java.sh && ./ci/serverless/es_filter_tests.sh
+    retry:
+      automatic:
+        - limit: 3
+  - label: "elastic_integration filter test"
+    command: ./.buildkite/scripts/setup_java.sh && ./ci/serverless/elastic_integration_filter_tests.sh
+    retry:
+      automatic:
+        - limit: 3
+  - label: "central pipeline management test"
+    command: ./.buildkite/scripts/setup_java.sh && ./ci/serverless/cpm_tests.sh
+    # Legacy monitoring is disabled. Serverless does not support /_monitoring/bulk, hence the test always fails to ingest metrics.
+    retry:
+      automatic:
+        - limit: 3
+  - label: "Logstash legacy monitoring test"
+    command: ./.buildkite/scripts/setup_java.sh && ./ci/serverless/monitoring_tests.sh
+    skip: true
+    # Kibana API is disabled as it is not available with the current configuration in QA
+    retry:
+      automatic:
+        - limit: 3
+  - label: "Kibana API test"
+    command: ./.buildkite/scripts/setup_java.sh && ./ci/serverless/kibana_api_tests.sh
+    skip: true
+    # Metricbeat stack monitoring is disabled
+    retry:
+      automatic:
+        - limit: 3
+  - label: "metricbeat test is disabled as metricbeat has not disabled /_ilm yet"
+    command: ./.buildkite/scripts/setup_java.sh && ./ci/serverless/metricbeat_monitoring_tests.sh
+    skip: true
+    retry:
+      automatic:
+        - limit: 3
diff --git a/.buildkite/snyk_report_pipeline.yml b/.buildkite/snyk_report_pipeline.yml
new file mode 100644
index 000000000..4f541256a
--- /dev/null
+++ b/.buildkite/snyk_report_pipeline.yml
@@ -0,0 +1,14 @@
+agents:
+  image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-logstash-ci"
+  cpu: "2"
+  memory: "4Gi"
+  ephemeralStorage: "64Gi"
+
+steps:
+  # reports main, previous (ex: 7.latest) and current (ex: 8.latest) release branches to Snyk
+  - label: ":hammer: Report to Snyk"
+    command:
+      - .buildkite/scripts/snyk/report.sh
+    retry:
+      automatic:
+        - limit: 3
diff --git a/.buildkite/supported_plugins_test_pipeline.yml b/.buildkite/supported_plugins_test_pipeline.yml
new file mode 100644
index 000000000..a1044752c
--- /dev/null
+++ b/.buildkite/supported_plugins_test_pipeline.yml
@@ -0,0 +1,77 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+
+agents:
+  image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-logstash-ci"
+  cpu: "8"
+  memory: "16Gi"
+  ephemeralStorage: "200Gi"
+
+steps:
+  - group: "Tier1 plugins test group"
+    key: "tier1_plugins"
+    steps:
+      - label: "Test input file plugin"
+        command: |
+          source .buildkite/scripts/common/vm-agent.sh
+          ./ci/test_plugins.sh -p logstash-input-file
+        # Workaround for https://github.com/elastic/ingest-dev/issues/2676
+        agents:
+          provider: gcp
+          imageProject: elastic-images-prod
+          image: family/platform-ingest-logstash-ubuntu-2204
+          machineType: "n2-standard-4"
+          diskSizeGb: 120
+      - label: "Test rest of Tier1 inputs"
+        command: |
+          source .buildkite/scripts/common/vm-agent.sh
+          ./ci/test_plugins.sh -p logstash-input-azure_event_hubs,logstash-input-beats,logstash-input-elasticsearch,logstash-input-generator,logstash-input-heartbeat,logstash-input-http,logstash-input-http_poller,logstash-input-redis,logstash-input-stdin,logstash-input-syslog,logstash-input-udp
+        # Workaround for https://github.com/elastic/ingest-dev/issues/2676
+        agents:
+          provider: gcp
+          imageProject: elastic-images-prod
+          image: family/platform-ingest-logstash-ubuntu-2204
+          machineType: "n2-standard-4"
+          diskSizeGb: 120
+      - label: "Test Tier1 filters"
+        command: ./ci/test_plugins.sh -t tier1 -k filter
+      - label: "Test Tier1 codecs"
+        command: ./ci/test_plugins.sh -t tier1 -k codec
+      - label: "Test Tier1 outputs"
+        command: ./ci/test_plugins.sh -t tier1 -k output
+      - label: "Test Tier1 integrations"
+        command: |
+          source .buildkite/scripts/common/vm-agent.sh
+          ./ci/test_plugins.sh -t tier1 -k integration
+        # Workaround to avoid errors on chmod of files
+        agents:
+          provider: gcp
+          imageProject: elastic-images-prod
+          image: family/platform-ingest-logstash-ubuntu-2204
+          machineType: "n2-standard-4"
+          diskSizeGb: 120  
+
+  - group: "Tier2 plugins test group"
+    key: "tier2_plugins"
+    steps:
+      - label: "Test Tier2 inputs"
+        command: ./ci/test_plugins.sh -t tier2 -k input
+      - label: "Test Tier2 filters"
+        command: ./ci/test_plugins.sh -t tier2 -k filter
+      - label: "Test Tier2 codecs"
+        command: |
+          source .buildkite/scripts/common/vm-agent.sh
+          ./ci/test_plugins.sh -t tier2 -k codec
+        agents:
+          provider: gcp
+          imageProject: elastic-images-prod
+          image: family/platform-ingest-logstash-ubuntu-2204
+          machineType: "n2-standard-4"
+          diskSizeGb: 120
+      - label: "Test Tier2 outputs"
+        command: ./ci/test_plugins.sh -t tier2 -k output
+
+  - group: "Unsupported plugins test group"
+    key: "unsupported_plugins"
+    steps:
+      - label: "Test unsupported inputs"
+        command: ./ci/test_plugins.sh -t unsupported -k input
diff --git a/.buildkite/trigger_pipelines.yml b/.buildkite/trigger_pipelines.yml
new file mode 100644
index 000000000..fd734bf1f
--- /dev/null
+++ b/.buildkite/trigger_pipelines.yml
@@ -0,0 +1,5 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+
+steps:
+  - label: ":pipeline: Generate trigger steps for $PIPELINES_TO_TRIGGER"
+    command: ".buildkite/scripts/common/trigger-pipeline-generate-steps.sh"
diff --git a/.buildkite/windows_jdk_matrix_pipeline.yml b/.buildkite/windows_jdk_matrix_pipeline.yml
new file mode 100644
index 000000000..a1578c5ea
--- /dev/null
+++ b/.buildkite/windows_jdk_matrix_pipeline.yml
@@ -0,0 +1,73 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
+
+env:
+  DEFAULT_MATRIX_OS: "windows-2022"
+  DEFAULT_MATRIX_JDK: "adoptiumjdk_21"
+
+steps:
+  - input: "Test Parameters"
+    if: build.source != "schedule" && build.source != "trigger_job"
+    fields:
+      - select: "Operating System"
+        key: "matrix-os"
+        hint: "The operating system variant(s) to run on:"
+        required: true
+        multiple: true
+        default: "${DEFAULT_MATRIX_OS}"
+        options:
+          - label: "Windows 2025"
+            value: "windows-2025"
+          - label: "Windows 2022"
+            value: "windows-2022"
+          - label: "Windows 2019"
+            value: "windows-2019"
+          - label: "Windows 2016"
+            value: "windows-2016"
+
+      - select: "Java"
+        key: "matrix-jdk"
+        hint: "The JDK to test with:"
+        required: true
+        multiple: true
+        default: "${DEFAULT_MATRIX_JDK}"
+        options:
+          - label: "Adoptium JDK 21 (Eclipse Temurin)"
+            value: "adoptiumjdk_21"
+          - label: "Adoptium JDK 17 (Eclipse Temurin)"
+            value: "adoptiumjdk_17"
+          - label: "OpenJDK 21"
+            value: "openjdk_21"
+          - label: "OpenJDK 17"
+            value: "openjdk_17"
+          - label: "Zulu 21"
+            value: "zulu_21"
+          - label: "Zulu 17"
+            value: "zulu_17"
+
+  - wait: ~
+    if: build.source != "schedule" && build.source != "trigger_job"
+
+  - command: |
+      set -euo pipefail
+
+      echo "--- Downloading prerequisites"
+      python3 -m pip install ruamel.yaml
+
+      echo "--- Printing generated dynamic steps"
+      export MATRIX_OSES="$(buildkite-agent meta-data get matrix-os --default=${DEFAULT_MATRIX_OS})"
+      export MATRIX_JDKS="$(buildkite-agent meta-data get matrix-jdk --default=${DEFAULT_MATRIX_JDK})"
+      set +eo pipefail
+      python3 .buildkite/scripts/jdk-matrix-tests/generate-steps.py >pipeline_steps.yml
+      if [[ $$? -ne 0 ]]; then
+        echo "^^^ +++"
+        echo "There was a problem rendering the pipeline steps."
+        cat pipeline_steps.yml
+        echo "Exiting now."
+        exit 1
+      else
+        set -eo pipefail
+        cat pipeline_steps.yml
+      fi
+
+      echo "--- Uploading steps to buildkite"
+      cat pipeline_steps.yml | buildkite-agent pipeline upload
diff --git a/.ci/Makefile b/.ci/Makefile
new file mode 100644
index 000000000..c826b724e
--- /dev/null
+++ b/.ci/Makefile
@@ -0,0 +1,42 @@
+.SILENT:
+MAKEFLAGS += --no-print-directory
+.SHELLFLAGS = -euc
+SHELL = /bin/bash
+
+#######################
+## Templates
+#######################
+## Mergify template
+define MERGIFY_TMPL
+
+  - name: backport patches to $(BRANCH) branch
+    conditions:
+      - merged
+      - base=main
+      - label=$(BACKPORT_LABEL)
+    actions:
+      backport:
+        branches:
+          - "$(BRANCH)"
+endef
+
+# Add mergify entry for the new backport label
+.PHONY: mergify
+export MERGIFY_TMPL
+mergify: BACKPORT_LABEL=$${BACKPORT_LABEL} BRANCH=$${BRANCH} PUSH_BRANCH=$${PUSH_BRANCH}
+mergify:
+	@echo ">> mergify"
+	echo "$$MERGIFY_TMPL" >> ../.mergify.yml
+	git add ../.mergify.yml
+	git status
+	if [ ! -z "$$(git status --porcelain)" ]; then \
+		git commit -m "mergify: add $(BACKPORT_LABEL) rule"; \
+		git push origin $(PUSH_BRANCH) ; \
+	fi
+
+# Create GitHub backport label
+.PHONY: backport-label
+backport-label: BACKPORT_LABEL=$${BACKPORT_LABEL}
+backport-label:
+	@echo ">> backport-label"
+	gh label create $(BACKPORT_LABEL) --description "Automated backport with mergify" --color 0052cc --force
diff --git a/.ci/java-versions.properties b/.ci/java-versions.properties
new file mode 100644
index 000000000..0ca3d870d
--- /dev/null
+++ b/.ci/java-versions.properties
@@ -0,0 +1,2 @@
+LS_BUILD_JAVA=adoptiumjdk_21
+LS_RUNTIME_JAVA=adoptiumjdk_21
diff --git a/.fossa.yml b/.fossa.yml
new file mode 100755
index 000000000..60fd562b6
--- /dev/null
+++ b/.fossa.yml
@@ -0,0 +1,55 @@
+# Generated by FOSSA CLI (https://github.com/fossas/fossa-cli)
+# Visit https://fossa.com to learn more
+
+version: 2
+cli:
+  server: https://app.fossa.com
+  fetcher: custom
+  project: git@github.com:elastic/logstash.git
+analyze:
+  modules:
+    - name: Logstash gems
+      type: bundler
+      strategy: lockfile
+      target: .
+      path: .
+    - name: benchmark-cli
+      type: gradle
+      target: 'benchmark-cli:'
+      path: .
+    - name: dependencies-report
+      type: gradle
+      target: 'dependencies-report:'
+      path: .
+    - name: logstash-core
+      type: gradle
+      target: 'logstash-core:'
+      path: .
+    - name: logstash-core-benchmarks
+      type: gradle
+      target: 'logstash-core-benchmarks:'
+      path: .
+    - name: logstash-integration-tests
+      type: gradle
+      target: 'logstash-integration-tests:'
+      path: .
+    - name: logstash-xpack
+      type: gradle
+      target: 'logstash-xpack:'
+    #   path: .
+    # - name: docker
+    #   type: pip
+    #   target: docker
+    #   path: docker
+    # - name: Gemfile
+    #   type: gem
+    #   target: qa
+    #   path: qa
+    # - name: Gemfile
+    #   type: gem
+    #   target: qa/integration
+    #   path: qa/integration
+    # - name: Gemfile
+    #   type: gem
+    #   target: tools/paquet
+    #   path: tools/paquet
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 024adf051..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,14 +0,0 @@
-Please post all product and debugging questions on our [forum](https://discuss.elastic.co/c/logstash). Your questions will reach our wider community members there, and if we confirm that there is a bug, then we can open a new issue here.
-
-For security vulnerabilities please only send reports to security@elastic.co.
-See https://www.elastic.co/community/security for more information.
-
-Logstash Plugins are located in a different organization: https://github.com/logstash-plugins. For bugs on specific Logstash plugins, for example, if Redis Output has a defect, please open it in the respective Redis Output repository. 
-
-For all general issues, please provide the following details for fast resolution:
-
-- Version:
-- Operating System:
-- Config File (if you have sensitive info, please remove it):
-- Sample Data:
-- Steps to Reproduce:
diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
new file mode 100644
index 000000000..be518109f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -0,0 +1,56 @@
+---
+name: Bug
+about: "Report a confirmed bug. For unconfirmed bugs please
+ visit https://discuss.elastic.co/c/logstash"
+labels: "bug,status:needs-triage"
+
+---
+<!--
+GitHub is reserved for bug reports and feature requests; it is not the place
+for general questions. If you have a question or an unconfirmed bug , please
+visit the [forums](https://discuss.elastic.co/c/logstash).  Please also
+check your OS is [supported](https://www.elastic.co/support/matrix#show_os).
+If it is not, the issue is likely to be closed.
+
+Logstash Plugins are located in a different organization: [logstash-plugins](https://github.com/logstash-plugins). For bugs on specific Logstash plugins, for example, if Redis Output has a defect, please open it in the respective Redis Output repository.
+
+For security vulnerabilities please only send reports to security@elastic.co.
+See https://www.elastic.co/community/security for more information.
+
+Please fill in the following details to help us reproduce the bug:
+-->
+
+**Logstash information**:
+
+Please include the following information:
+
+1. Logstash version (e.g. `bin/logstash --version`)
+2. Logstash installation source (e.g. built from source, with a package manager: DEB/RPM, expanded from tar or zip archive, docker)
+3. How is Logstash being run (e.g. as a service/service manager: systemd, upstart, etc. Via command line, docker/kubernetes)
+
+**Plugins installed**: (`bin/logstash-plugin list --verbose`)
+
+**JVM** (e.g. `java -version`):
+
+If the affected version of Logstash is 7.9 (or earlier), or if it is NOT using the bundled JDK or using the 'no-jdk' version in 7.10 (or higher), please provide the following information:
+
+1. JVM version (`java -version`)
+2. JVM installation source (e.g. from the Operating System's package manager, from source, etc).
+3. Value of the `LS_JAVA_HOME` environment variable if set.
+
+**OS version** (`uname -a` if on a Unix-like system):
+
+**Description of the problem including expected versus actual behavior**:
+
+**Steps to reproduce**:
+
+Please include a *minimal* but *complete* recreation of the problem,
+including (e.g.) pipeline definition(s), settings, locale, etc.  The easier
+you make for us to reproduce it, the more likely that somebody will take the
+time to look at it.
+
+ 1.
+ 2.
+ 3.
+
+**Provide logs (if relevant)**:
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..a33a088a8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Question
+    url: https://discuss.elastic.co/c/logstash
+    about: Ask (and answer) questions here.
+  - name: Security Vulnerability
+    url: https://www.elastic.co/community/security
+    about: Send security vulnerability reports to security@elastic.co.
+  - name: Plugin Issue
+    url: https://github.com/logstash-plugins
+    about: Plugins for Logstash do the heavy lifting when it comes to integrating with a variety of external technologies and services. If your issue has to do with a specific plugin, please file it in the appropriate repository. 
diff --git a/.github/ISSUE_TEMPLATE/doc-request.md b/.github/ISSUE_TEMPLATE/doc-request.md
new file mode 100644
index 000000000..aa1905010
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/doc-request.md
@@ -0,0 +1,26 @@
+---
+name: Documentation
+about: Report a documentation issue
+labels: "docs,status:needs-triage"
+
+---
+<!--
+Please search [existing issues](https://github.com/elastic/logstash/issues?q=is%3Aopen+is%3Aissue+label%3Adocs). The issue may already exist.
+-->
+
+#### Tell us about the issue
+<!--
+What's the problem? Is information missing? Inaccurate? Just not clear?
+Please include a link to the page (if applicable).
+
+-->
+**Description:**  
+
+
+**URL:** 
+
+Example: https://www.elastic.co/guide/en/logstash/current/introduction.html
+
+
+**Anything else?** 
+
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 000000000..d8930d675
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,21 @@
+---
+name: Feature Request
+about: Request a new feature or suggest an enhancement to an existing one
+labels: "enhancement,status:needs-triage"
+
+---
+<!--
+Please first search existing issues for the feature you are requesting;
+it may already exist, even as a closed issue.
+-->
+
+<!--
+Describe the feature.
+
+Please give us as much context as possible about the feature. For example,
+you could include a story about a time when you wanted to use the feature,
+and also tell us what you had to do instead. The last part is helpful
+because it gives us an idea of how much harder your life is without the
+feature.
+
+-->
diff --git a/.github/ISSUE_TEMPLATE/test-failure.md b/.github/ISSUE_TEMPLATE/test-failure.md
new file mode 100644
index 000000000..6e6023e45
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/test-failure.md
@@ -0,0 +1,25 @@
+---
+name: Test Failure
+about: A test failure in CI
+labels: "test failure"
+
+---
+
+<!--
+Please fill out the following information, and ensure you have attempted
+to reproduce locally
+-->
+
+**Build scan**:
+
+**Repro line**:
+
+**Reproduces locally?**:
+
+**Applicable branches**:
+
+**Failure history**:
+<!--
+Link to build stats and possible indication of when this started failing and how often it fails
+-->
+**Failure excerpt**:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..c97b7fcdf
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,95 @@
+<!-- Type of change
+Please label this PR with the release version and one of the following labels, depending on the scope of your change:
+- bug
+- enhancement
+- breaking change
+- doc
+-->
+
+## Release notes
+<!-- Add content to appear in  [Release Notes](https://www.elastic.co/guide/en/logstash/current/releasenotes.html), or add [rn:skip] to leave this PR out of release notes -->
+
+
+## What does this PR do?
+
+<!-- Mandatory
+Explain here the changes you made on the PR. Please explain the WHAT: patterns used, algorithms implemented, design architecture, message processing, etc.
+
+Example:
+  Expose 'xpack.monitoring.elasticsearch.proxy' in the docker environment variables and update logstash.yml to surface this config option.
+  
+  This commit exposes the 'xpack.monitoring.elasticsearch.proxy' variable in the docker by adding it in env2yaml.go, which translates from
+  being an environment variable to a proper yaml config.
+  
+  Additionally, this PR exposes this setting for both xpack monitoring & management to the logstash.yml file.
+-->
+
+## Why is it important/What is the impact to the user?
+
+<!-- Mandatory
+Explain here the WHY or the IMPACT to the user, or the rationale/motivation for the changes.
+
+Example:
+  This PR fixes an issue that was preventing the docker image from using the proxy setting when sending xpack monitoring information.
+  and/or
+  This PR now allows the user to define the xpack monitoring proxy setting in the docker container.
+-->
+
+## Checklist
+
+<!-- Mandatory
+Add a checklist of things that are required to be reviewed in order to have the PR approved
+
+List here all the items you have verified BEFORE sending this PR. Please DO NOT remove any item, striking through those that do not apply. (Just in case, strikethrough uses two tildes. ~~Scratch this.~~)
+-->
+
+- [ ] My code follows the style guidelines of this project
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] I have made corresponding change to the default configuration files (and/or docker env variables)
+- [ ] I have added tests that prove my fix is effective or that my feature works
+
+## Author's Checklist
+
+<!-- Recommended
+Add a checklist of things that are required to be reviewed in order to have the PR approved
+-->
+- [ ]
+
+## How to test this PR locally
+
+<!-- Recommended
+Explain here how this PR will be tested by the reviewer: commands, dependencies, steps, etc.
+-->
+
+## Related issues
+
+<!-- Recommended
+Link related issues below. Insert the issue link or reference after the word "Closes" if merging this should automatically close it.
+
+- Closes #123
+- Relates #123
+- Requires #123
+- Superseeds #123
+-->
+- 
+
+## Use cases
+
+<!-- Recommended
+Explain here the different behaviors that this PR introduces or modifies in this project, user roles, environment configuration, etc.
+
+If you are familiar with Gherkin test scenarios, we recommend its usage: https://cucumber.io/docs/gherkin/reference/
+-->
+
+## Screenshots
+
+<!-- Optional
+Add here screenshots about how the project will be changed after the PR is applied. They could be related to web pages, terminal, etc, or any other image you consider important to be shared with the team.
+-->
+
+## Logs
+
+<!-- Recommended
+Paste here output logs discovered while creating this PR, such as stack traces or integration logs, or any other output you consider important to be shared with the team.
+-->
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..ee85a87f6
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,18 @@
+---
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directories:
+      - '/'
+      - '/.github/actions/*'
+    schedule:
+      interval: "weekly"
+      day: "sunday"
+      time: "22:00"
+    reviewers:
+      - "elastic/observablt-ci"
+      - "elastic/observablt-ci-contractors"
+    groups:
+      github-actions:
+        patterns:
+          - "*"
diff --git a/.github/workflows/backport-active.yml b/.github/workflows/backport-active.yml
new file mode 100644
index 000000000..a0f563fea
--- /dev/null
+++ b/.github/workflows/backport-active.yml
@@ -0,0 +1,22 @@
+name: Backport to active branches
+
+on:
+  pull_request_target:
+    types: [closed]
+    branches:
+      - main
+
+permissions:
+  pull-requests: write
+  contents: read
+
+jobs:
+  backport:
+    # Only run if the PR was merged (not just closed) and has one of the backport labels
+    if: |
+      github.event.pull_request.merged == true && 
+      contains(toJSON(github.event.pull_request.labels.*.name), 'backport-active-')
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: elastic/oblt-actions/github/backport-active@v1
diff --git a/.github/workflows/critical_vulnerability_scan.yml b/.github/workflows/critical_vulnerability_scan.yml
new file mode 100644
index 000000000..14e7eab72
--- /dev/null
+++ b/.github/workflows/critical_vulnerability_scan.yml
@@ -0,0 +1,24 @@
+name: Scan for vulnerabilities
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+  workflow_dispatch:
+
+jobs:
+  scan_image:
+    runs-on: ubuntu-latest
+    steps: 
+      - name: checkout repo content
+        uses: actions/checkout@v4
+      - name: build tar distribution
+        run: ./gradlew clean assembleTarDistribution
+      - run: mkdir scan
+      - run: tar -zxf ../build/logstash-*.tar.gz
+        working-directory: ./scan
+      - name: scan image
+        uses: anchore/scan-action@v3
+        with:
+          path: "./scan"
+          fail-build: true
+          severity-cutoff: critical
diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml
new file mode 100644
index 000000000..bb466166d
--- /dev/null
+++ b/.github/workflows/docs-build.yml
@@ -0,0 +1,19 @@
+name: docs-build
+
+on:
+  push:
+    branches:
+      - main
+  pull_request_target: ~
+  merge_group: ~
+
+jobs:
+  docs-preview:
+    uses: elastic/docs-builder/.github/workflows/preview-build.yml@main
+    with:
+      path-pattern: docs/**
+    permissions:
+      deployments: write
+      id-token: write
+      contents: read
+      pull-requests: read
diff --git a/.github/workflows/docs-cleanup.yml b/.github/workflows/docs-cleanup.yml
new file mode 100644
index 000000000..f83e017b5
--- /dev/null
+++ b/.github/workflows/docs-cleanup.yml
@@ -0,0 +1,14 @@
+name: docs-cleanup
+
+on:
+  pull_request_target:
+    types:
+      - closed
+
+jobs:
+  docs-preview:
+    uses: elastic/docs-builder/.github/workflows/preview-cleanup.yml@main
+    permissions:
+      contents: none
+      id-token: write
+      deployments: write
diff --git a/.github/workflows/gen_release_notes.yml b/.github/workflows/gen_release_notes.yml
new file mode 100644
index 000000000..2f9af4b3b
--- /dev/null
+++ b/.github/workflows/gen_release_notes.yml
@@ -0,0 +1,35 @@
+name: Release Notes Draft generator
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        type: string
+        required: true
+        default: "8.2"
+      last_release:
+        type: string
+        required: true
+        default: "8.2.2"
+
+
+permissions:
+  contents: write
+  pull-requests: write
+  issues: write
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.0'
+    - run: git config --global user.email "43502315+logstashmachine@users.noreply.github.com"
+    - run: git config --global user.name "logstashmachine"
+    - name: Create Release Notes Draft
+      run:  ./tools/release/generate_release_notes.rb ${{ github.event.inputs.branch }} ${{ github.event.inputs.last_release }} ${{ github.actor }} ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/lint_docs.yml b/.github/workflows/lint_docs.yml
new file mode 100644
index 000000000..6f5153557
--- /dev/null
+++ b/.github/workflows/lint_docs.yml
@@ -0,0 +1,69 @@
+name: Lint the docs!
+on:
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  pull-requests: write
+  contents: read
+
+jobs:
+  lint-docs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.13.2
+          cache: npm
+
+      - name: Install docs-lint
+        run: npm install -g @elastic/docs-lint
+
+      - name: Install strip-ansi
+        run: npm install strip-ansi
+        
+      - name: Run docs-lint
+        id: run_docs_lint
+        run: |
+          LINT=$(((docs-lint $GITHUB_WORKSPACE/docs --asciidoc) 2>&1) || true)
+          echo "$LINT"
+          LINT="${LINT//'%'/'%25'}"
+          LINT="${LINT//$'\n'/'%0A'}"
+          LINT="${LINT//$'\r'/'%0D'}"
+          LINT="${LINT//$'`'/'\`'}"
+          echo "::set-output name=LINT_RESULT::$LINT"
+
+      - name: Add PR comment
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const report = `${{ steps.run_docs_lint.outputs.LINT_RESULT }}`
+            if (report !== '') {
+              const { default: stripAnsi } = await import('/home/runner/work/docs-lint/docs-lint/node_modules/strip-ansi/index.js')
+              const cleanText = stripAnsi(report)
+              const errorWithContext = `**⚠️ Lint failed**\n~~~\n${cleanText}\n~~~`
+              github.rest.issues.createComment({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                body: errorWithContext
+              })
+            } else {
+              console.log("🎉 No errors!")
+            }
+
+      - name: Throw error if linter fails
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const report = `${{ steps.run_docs_lint.outputs.LINT_RESULT }}`
+            if (report !== '') {
+              core.setFailed(report)
+            } else {
+              console.log("No errors!")
+            }
diff --git a/.github/workflows/logstash_project_board.yml b/.github/workflows/logstash_project_board.yml
new file mode 100644
index 000000000..48858610f
--- /dev/null
+++ b/.github/workflows/logstash_project_board.yml
@@ -0,0 +1,23 @@
+name: Add to project
+on:
+  issues:
+    types:
+      - opened
+
+jobs:
+  add-to-project:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:ID!,$contentid:ID!) {
+               addProjectV2ItemById(input:{projectId:$projectid contentId:$contentid}) {
+                clientMutationId
+              }
+             }
+          projectid: "PVT_kwDOAGc3Zs0SEg"
+          contentid: ${{ github.event.issue.node_id }}
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
diff --git a/.github/workflows/mergify-labels-copier.yml b/.github/workflows/mergify-labels-copier.yml
new file mode 100644
index 000000000..d5ff3ed0e
--- /dev/null
+++ b/.github/workflows/mergify-labels-copier.yml
@@ -0,0 +1,23 @@
+name: mergify backport labels copier
+
+on:
+  pull_request:
+    types:
+      - opened
+
+permissions:
+  contents: read
+
+jobs:
+  mergify-backport-labels-copier:
+    runs-on: ubuntu-latest
+    if: startsWith(github.head_ref, 'mergify/bp/')
+    permissions:
+      # Add GH labels
+      pull-requests: write
+      # See https://github.com/cli/cli/issues/6274
+      repository-projects: read
+    steps:
+      - uses: elastic/oblt-actions/mergify/labels-copier@v1
+        with:
+          excluded-labels-regex: "^backport-*"
diff --git a/.github/workflows/platform_ingest_docs_project_board.yml b/.github/workflows/platform_ingest_docs_project_board.yml
new file mode 100644
index 000000000..7efa750cd
--- /dev/null
+++ b/.github/workflows/platform_ingest_docs_project_board.yml
@@ -0,0 +1,57 @@
+name: Add Docs issue to Ingest project
+
+on:
+  issues:
+    types:
+      - labeled
+env:
+  INGEST_PROJECT_ID: 'PVT_kwDOAGc3Zs4AEzn4'
+  
+  # GitHub labels for each team/area
+  DOCS_LABEL: 'Team:Docs'
+  
+  # ID values for the Area property + its options
+  AREA_FIELD_ID: 'PVTSSF_lADOAGc3Zs4AEzn4zgEgZSo'
+  INGEST_DOCS_OPTION_ID: 'def2f8e6'
+  
+jobs:
+  add_to_ingest_project:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        if: github.event.label.name == env.DOCS_LABEL
+        with:
+          query: |
+            # Variables have to be snake cased because of https://github.com/octokit/graphql-action/issues/164
+            mutation AddToIngestProject($project_id: ID!, $content_id: ID!) {
+              addProjectV2ItemById(input: { projectId: $project_id, contentId: $content_id }) {
+                  item {
+                    id
+                  }
+                }
+              }
+          project_id: ${{ env.INGEST_PROJECT_ID }}
+          content_id: ${{ github.event.issue.node_id }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
+      # `if` conditions can only be assigned as the "step" level, so there's no way to conditionally pass differing
+      # `areaId` values to our GraphQL mutation. Would be nice if there was support for dictionaries or something in
+      # GH actions to make this a lot more DRY
+      - uses: octokit/graphql-action@v2.x
+        id: set_data_processing_area
+        if: github.event.label.name == env.DOCS_LABEL
+        with:
+          query: |
+            mutation updateIngestArea($item_id: ID!, $project_id: ID!, $area_field_id: ID!, $area_id: String) {
+              updateProjectV2ItemFieldValue(
+                input: { itemId: $item_id, projectId: $project_id, fieldId: $area_field_id, value: { singleSelectOptionId: $area_id } }) {
+                  clientMutationId
+                }
+              }
+          item_id: ${{ fromJSON(steps.add_to_project.outputs.data).addProjectV2ItemById.item.id }}
+          project_id: ${{ env.INGEST_PROJECT_ID }}
+          area_field_id: ${{ env.AREA_FIELD_ID }}
+          area_id: ${{ env.INGEST_DOCS_OPTION_ID }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
diff --git a/.github/workflows/platform_logstash_project_board.yml b/.github/workflows/platform_logstash_project_board.yml
new file mode 100644
index 000000000..459bfc253
--- /dev/null
+++ b/.github/workflows/platform_logstash_project_board.yml
@@ -0,0 +1,57 @@
+name: Add Logstash issue to Logstash Ingest Project
+
+on:
+  issues:
+    types:
+      - labeled
+env:
+  LOGSTASH_PROJECT_ID: 'PVT_kwDOAGc3Zs4AMlnl'
+  
+  # GitHub labels for each team/area
+  LOGSTASH_LABEL: 'Team:Logstash'
+  
+  # ID values for the Area property + its options
+  AREA_FIELD_ID: 'PVTSSF_lADOAGc3Zs4AMlnlzgIB8yM'
+  DATA_PROCESSING_OPTION_ID: '41c049c0'
+  
+jobs:
+  add_to_ingest_project:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_logstash_project
+        if: github.event.label.name == env.LOGSTASH_LABEL
+        with:
+          query: |
+            # Variables have to be snake cased because of https://github.com/octokit/graphql-action/issues/164
+            mutation AddToIngestProject($project_id: ID!, $content_id: ID!) {
+              addProjectV2ItemById(input: { projectId: $project_id, contentId: $content_id }) {
+                  item {
+                    id
+                  }
+                }
+              }
+          project_id: ${{ env.LOGSTASH_PROJECT_ID }}
+          content_id: ${{ github.event.issue.node_id }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
+      # `if` conditions can only be assigned as the "step" level, so there's no way to conditionally pass differing
+      # `areaId` values to our GraphQL mutation. Would be nice if there was support for dictionaries or something in
+      # GH actions to make this a lot more DRY
+      - uses: octokit/graphql-action@v2.x
+        id: set_data_processing_area
+        if: github.event.label.name == env.LOGSTASH_LABEL
+        with:
+          query: |
+            mutation updateIngestArea($item_id: ID!, $project_id: ID!, $area_field_id: ID!, $area_id: String) {
+              updateProjectV2ItemFieldValue(
+                input: { itemId: $item_id, projectId: $project_id, fieldId: $area_field_id, value: { singleSelectOptionId: $area_id } }) {
+                  clientMutationId
+                }
+              }
+          item_id: ${{ fromJSON(steps.add_to_project.outputs.data).addProjectV2ItemById.item.id }}
+          project_id: ${{ env.LOGSTASH_PROJECT_ID }}
+          area_field_id: ${{ env.AREA_FIELD_ID }}
+          area_id: ${{ env.DATA_PROCESSING_OPTION_ID }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
new file mode 100644
index 000000000..23545b29c
--- /dev/null
+++ b/.github/workflows/pre-commit.yml
@@ -0,0 +1,18 @@
+name: pre-commit
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+      - 8.*
+      - 9.*
+
+permissions:
+  contents: read
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: elastic/oblt-actions/pre-commit@v1
diff --git a/.github/workflows/project-board-assigner.yml b/.github/workflows/project-board-assigner.yml
new file mode 100644
index 000000000..74d3aab88
--- /dev/null
+++ b/.github/workflows/project-board-assigner.yml
@@ -0,0 +1,76 @@
+name: Add issue to Ingest or Logstash project
+
+on:
+  issues:
+    types:
+      - labeled
+env:
+  INGEST_PROJECT_ID: 'PVT_kwDOAGc3Zs4AEzn4'
+  LOGSTASH_PROJECT_ID: 'PVT_kwDOAGc3Zs4AMlnl'
+  
+  # GitHub labels for each team/area
+  LOGSTASH_LABEL: 'Team:Logstash'
+  DOCS_LABEL: 'Team:Docs'
+  
+  # ID values for the Area property + its options for Ingest Board
+  AREA_FIELD_ID: 'PVTSSF_lADOAGc3Zs4AEzn4zgEgZSo'
+  INGEST_DOCS_OPTION_ID: 'def2f8e6'
+  
+jobs:
+  add_to_ingest_project:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_ingest_project
+        if: github.event.label.name == env.DOCS_LABEL
+        with:
+          query: |
+            # Variables have to be snake cased because of https://github.com/octokit/graphql-action/issues/164
+            mutation AddToIngestProject($project_id: ID!, $content_id: ID!) {
+              addProjectV2ItemById(input: { projectId: $project_id, contentId: $content_id }) {
+                  item {
+                    id
+                  }
+                }
+              }
+          project_id: ${{ env.INGEST_PROJECT_ID }}
+          content_id: ${{ github.event.issue.node_id }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_logstash_project
+        if: github.event.label.name == env.LOGSTASH_LABEL
+        with:
+          query: |
+            # Variables have to be snake cased because of https://github.com/octokit/graphql-action/issues/164
+            mutation AddToLogstashProject($project_id: ID!, $content_id: ID!) {
+              addProjectV2ItemById(input: { projectId: $project_id, contentId: $content_id }) {
+                  item {
+                    id
+                  }
+                }
+              }
+          project_id: ${{ env.LOGSTASH_PROJECT_ID }}
+          content_id: ${{ github.event.issue.node_id }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
+      # `if` conditions can only be assigned as the "step" level, so there's no way to conditionally pass differing
+      # `areaId` values to our GraphQL mutation. Would be nice if there was support for dictionaries or something in
+      # GH actions to make this a lot more DRY
+      - uses: octokit/graphql-action@v2.x
+        id: set_data_processing_area
+        if: github.event.label.name == env.DOCS_LABEL
+        with:
+          query: |
+            mutation updateIngestArea($item_id: ID!, $project_id: ID!, $area_field_id: ID!, $area_id: String) {
+              updateProjectV2ItemFieldValue(
+                input: { itemId: $item_id, projectId: $project_id, fieldId: $area_field_id, value: { singleSelectOptionId: $area_id } }) {
+                  clientMutationId
+                }
+              }
+          item_id: ${{ fromJSON(steps.add_to_project.outputs.data).addProjectV2ItemById.item.id }}
+          project_id: ${{ env.INGEST_PROJECT_ID }}
+          area_field_id: ${{ env.AREA_FIELD_ID }}
+          area_id: ${{ env.INGEST_DOCS_OPTION_ID }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
diff --git a/.github/workflows/version_bumps.yml b/.github/workflows/version_bumps.yml
new file mode 100644
index 000000000..e674c0b6c
--- /dev/null
+++ b/.github/workflows/version_bumps.yml
@@ -0,0 +1,77 @@
+name: Bump dependencies
+on:
+  workflow_dispatch:
+   inputs:
+      branch:
+        description: 'Release Branch'     
+        required: true
+        default: '8.4'
+        type: string
+      bump:
+        description: 'Bump type'     
+        required: true
+        default: 'patch' 
+        type: choice
+        options:
+        - "patch"
+        - "minor"
+        - "major"
+    
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  version_bumper:
+    name: Bump versions
+    runs-on: ubuntu-latest
+    env:
+      INPUTS_BRANCH: "${{ inputs.branch }}"
+      INPUTS_BUMP: "${{ inputs.bump }}"
+      BACKPORT_LABEL: "backport-${{ inputs.branch }}"
+    steps:
+      - name: Fetch logstash-core team member list
+        uses: tspascoal/get-user-teams-membership@57e9f42acd78f4d0f496b3be4368fc5f62696662 #v3.0.0
+        with: 
+          username: ${{ github.actor }}
+          organization: elastic
+          team: logstash
+          GITHUB_TOKEN: ${{ secrets.READ_ORG_SECRET_JSVD }}
+      - name: Is user a core team member?
+        if: ${{ steps.checkUserMember.outputs.isTeamMember == 'false' }}
+        run: exit 1
+      - name: checkout repo content
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: ${{ env.INPUTS_BRANCH }}
+      - run: git config --global user.email "43502315+logstashmachine@users.noreply.github.com"
+      - run: git config --global user.name "logstashmachine"
+      - run: ./gradlew clean installDefaultGems
+      - run: ./vendor/jruby/bin/jruby -S bundle update --all --${{ env.INPUTS_BUMP }} --strict
+      - run: mv Gemfile.lock Gemfile.jruby-*.lock.release
+      - run: echo "T=$(date +%s)" >> $GITHUB_ENV
+      - run: echo "BRANCH=update_lock_${T}" >> $GITHUB_ENV
+      - run: |
+          git checkout -b $BRANCH
+          git add .
+          git status
+          if [[ -z $(git status --porcelain) ]]; then echo "No changes. We're done."; exit 0; fi
+          git commit -m "Update ${{ env.INPUTS_BUMP }} plugin versions in gemfile lock" -a
+          git push origin $BRANCH
+
+      - name: Update mergify (minor only)
+        if: ${{ inputs.bump == 'minor' }}
+        continue-on-error: true
+        run: make -C .ci mergify BACKPORT_LABEL=$BACKPORT_LABEL BRANCH=$INPUTS_BRANCH PUSH_BRANCH=$BRANCH
+
+      - name: Create Pull Request
+        run: |
+          curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -X POST -d "{\"title\": \"bump lock file for ${{ env.INPUTS_BRANCH }}\",\"head\": \"${BRANCH}\",\"base\": \"${{ env.INPUTS_BRANCH }}\"}" https://api.github.com/repos/elastic/logstash/pulls
+
+      - name: Create GitHub backport label (Mergify) (minor only)
+        if: ${{ inputs.bump == 'minor' }}
+        continue-on-error: true
+        run: make -C .ci backport-label BACKPORT_LABEL=$BACKPORT_LABEL
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 691ac83c2..cc0ab0db4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,8 +16,9 @@ out
 local
 test/setup/elasticsearch/elasticsearch-*
 vendor
+!docker/ironbank/go/src/env2yaml/vendor
 .sass-cache
-data
+/data
 .buildpath
 .project
 .DS_Store
@@ -57,3 +58,9 @@ logstash-core/versions-gem-copy.yml
 logstash-core-plugin-api/versions-gem-copy.yml
 config/logstash.keystore
 html_docs
+lib/pluginmanager/plugin_aliases.yml
+logstash-core/src/main/resources/org/logstash/plugins/plugin_aliases.yml
+spec/unit/plugin_manager/plugin_aliases.yml
+logstash-core/src/test/resources/org/logstash/plugins/plugin_aliases.yml
+qa/integration/fixtures/logs_rollover/log4j2.properties
+ci/serverless/config/*.log
\ No newline at end of file
diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 000000000..9c724e109
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,132 @@
+commands_restrictions:
+  backport:
+    conditions:
+      - or:
+        - sender-permission>=write
+        - sender=github-actions[bot]
+defaults:
+  actions:
+    backport:
+      title: "[{{ destination_branch }}] (backport #{{ number }}) {{ title }}"
+      assignees:
+        - "{{ author }}"
+      labels:
+        - "backport"
+pull_request_rules:
+#  - name: ask to resolve conflict
+#    conditions:
+#      - conflict
+#    actions:
+#      comment:
+#        message: |
+#          This pull request is now in conflicts. Could you fix it @{{author}}? 🙏
+#          To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/
+#          ```
+#          git fetch upstream
+#          git checkout -b {{head}} upstream/{{head}}
+#          git merge upstream/{{base}}
+#          git push upstream {{head}}
+#          ```
+
+  - name: notify the backport policy
+    conditions:
+      - -label~=^backport
+      - base=main
+    actions:
+      comment:
+        message: |
+          This pull request does not have a backport label. Could you fix it @{{author}}? 🙏
+          To fixup this pull request, you need to add the backport labels for the needed
+          branches, such as:
+          * `backport-8./d` is the label to automatically backport to the `8./d` branch. `/d` is the digit.
+          * If no backport is necessary, please add the `backport-skip` label
+
+  - name: remove backport-skip label
+    conditions:
+      - label~=^backport-\d
+    actions:
+      label:
+        remove:
+          - backport-skip
+
+  - name: notify the backport has not been merged yet
+    conditions:
+      - -merged
+      - -closed
+      - author=mergify[bot]
+      - "#check-success>0"
+      - schedule=Mon-Mon 06:00-10:00[Europe/Paris]
+    actions:
+      comment:
+        message: |
+          This pull request has not been merged yet. Could you please review and merge it @{{ assignee | join(', @') }}? 🙏
+
+  - name: backport patches to 8.16 branch
+    conditions:
+      - merged
+      - base=main
+      - label=backport-8.16
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "8.16"
+        labels:
+          - "backport"
+        title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
+
+  - name: backport patches to 8.17 branch
+    conditions:
+      - merged
+      - base=main
+      - label=backport-8.17
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "8.17"
+        labels:
+          - "backport"
+        title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
+
+  - name: backport patches to 8.18 branch
+    conditions:
+      - merged
+      - base=main
+      - label=backport-8.18
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "8.18"
+        labels:
+          - "backport"
+        title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
+
+  - name: backport patches to 8.19 branch
+    conditions:
+      - merged
+      - base=main
+      - label=backport-8.19
+    actions:
+      backport:
+        branches:
+          - "8.19"
+
+  - name: backport patches to 9.0 branch
+    conditions:
+      - merged
+      - base=main
+      - label=backport-9.0
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "9.0"
+        labels:
+          - "backport"
+        title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 000000000..56f1047be
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,6 @@
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.6.0
+    hooks:
+    -   id: check-merge-conflict
+        args: ['--assume-in-merge']
diff --git a/.rubocop.yml b/.rubocop.yml
new file mode 100644
index 000000000..2e1e3201a
--- /dev/null
+++ b/.rubocop.yml
@@ -0,0 +1,237 @@
+AllCops:
+  RubyInterpreters:
+    - ruby
+    - rake
+    - jruby
+  Include:
+    - '**/*.rb'
+    - '**/*.gemfile'
+    - '**/*.gemspec'
+    - '**/*.rake'
+    - '**/Gemfile'
+    - '**/Rakefile'
+  Exclude:
+    - 'node_modules/**/*'
+    - 'tmp/**/*'
+    - 'vendor/**/*'
+    - '.git/**/*'
+    - 'build/**/*'
+    - 'config/**/*'
+  DisplayCopNames: true
+  UseCache: false
+
+#################### Lint   ###########################
+##### Enabled Cops #####
+Lint/DeprecatedClassMethods:
+  Enabled: true
+Lint/ErbNewArguments:
+  Enabled: true
+Lint/BigDecimalNew:
+  Enabled: true
+
+#################### Layout ###########################
+##### Enabled/Disabled Cops #####
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+Layout/EmptyLineAfterMagicComment:
+  Enabled: true
+Layout/EmptyLineAfterMultilineCondition:
+  Enabled: false
+Layout/EmptyLineBetweenDefs:
+  EnabLEd: true
+Layout/EmptyLines:
+  Enabled: true
+Layout/EmptyLinesAroundAccessModifier:
+  Enabled: false
+Layout/EmptyLinesAroundArguments:
+  Enabled: true
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+Layout/EmptyLinesAroundBeginBody:
+  Enabled: true
+Layout/EmptyLinesAroundBlockBody:
+  Enabled: true
+Layout/EmptyLinesAroundExceptionHandlingKeywords:
+  Enabled: true
+Layout/EmptyLinesAroundMethodBody:
+  Enabled: true
+Layout/EmptyLinesAroundModuleBody:
+  Enabled: true
+Layout/TrailingWhitespace:
+  Enabled: true
+Layout/TrailingEmptyLines:
+  Enabled: true
+Layout/SpaceAfterColon:
+  Enabled: true
+Layout/SpaceAfterComma:
+  Enabled: true
+Layout/SpaceAfterSemicolon:
+  Enabled: true
+Layout/SpaceAroundBlockParameters:
+  Enabled: true
+Layout/SpaceAroundEqualsInParameterDefault:
+  Enabled: true
+Layout/SpaceAroundKeyword:
+  Enabled: true
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+Layout/SpaceAroundOperators:
+  Enabled: true
+Layout/SpaceBeforeBlockBraces:
+  Enabled: true
+Layout/SpaceBeforeBrackets:
+  Enabled: true
+Layout/SpaceBeforeComma:
+  Enabled: true
+Layout/SpaceBeforeComment:
+  Enabled: true
+Layout/SpaceBeforeFirstArg:
+  Enabled: true
+Layout/SpaceBeforeSemicolon:
+  Enabled: true
+Layout/SpaceInsideArrayLiteralBrackets:
+  Enabled: true
+  EnforcedStyle: no_space
+  EnforcedStyleForEmptyBrackets: no_space
+Layout/SpaceInsideArrayPercentLiteral:
+  Enabled: true # no offenses
+Layout/SpaceInsideParens:
+  Enabled: true
+  EnforcedStyle: no_space
+Layout/SpaceInsidePercentLiteralDelimiters:
+  Enabled: true
+Layout/SpaceInsideRangeLiteral:
+  Enabled: true # no offenses
+Layout/SpaceInsideReferenceBrackets:
+  Enabled: true # no offenses
+Layout/SpaceInsideStringInterpolation:
+  Enabled: true
+  EnforcedStyle: no_space
+
+##### Need review #####
+Layout/AccessModifierIndentation:
+  Enabled: false
+Layout/ArgumentAlignment:
+  Enabled: false
+Layout/ArrayAlignment:
+  Enabled: false
+Layout/AssignmentIndentation:
+  Enabled: false
+Layout/BeginEndAlignment:
+  Enabled: false
+Layout/BlockAlignment:
+  Enabled: false
+Layout/BlockEndNewline:
+  Enabled: false
+Layout/CaseIndentation:
+  Enabled: false
+Layout/ClassStructure:
+  Enabled: false
+Layout/ClosingHeredocIndentation:
+  Enabled: false
+Layout/ClosingParenthesisIndentation:
+  Enabled: false
+Layout/CommentIndentation:
+  Enabled: false
+Layout/ConditionPosition:
+  Enabled: false
+Layout/DefEndAlignment:
+  Enabled: false
+Layout/DotPosition:
+  Enabled: false
+Layout/ElseAlignment:
+  Enabled: false
+Layout/EmptyComment:
+  Enabled: false
+Layout/EmptyLinesAroundClassBody:
+  Enabled: false
+Layout/EndAlignment:
+  Enabled: false
+Layout/EndOfLine:
+  Enabled: false
+Layout/ExtraSpacing:
+  Enabled: false
+Layout/FirstArgumentIndentation:
+  Enabled: false
+Layout/FirstArrayElementIndentation:
+  Enabled: false
+Layout/FirstArrayElementLineBreak:
+  Enabled: false
+Layout/FirstHashElementIndentation:
+  Enabled: false
+Layout/FirstHashElementLineBreak:
+  Enabled: false
+Layout/FirstMethodArgumentLineBreak:
+  Enabled: false
+Layout/FirstMethodParameterLineBreak:
+  Enabled: false
+Layout/FirstParameterIndentation:
+  Enabled: false
+Layout/HashAlignment:
+  Enabled: false
+Layout/HeredocArgumentClosingParenthesis:
+  Enabled: false
+Layout/HeredocIndentation:
+  Enabled: false
+Layout/IndentationConsistency:
+  Enabled: false
+Layout/IndentationStyle:
+  Enabled: false
+Layout/IndentationWidth:
+  Enabled: false
+Layout/InitialIndentation:
+  Enabled: false
+Layout/LeadingCommentSpace:
+  Enabled: false
+Layout/LeadingEmptyLines:
+  Enabled: false
+Layout/LineContinuationLeadingSpace:
+  Enabled: false
+Layout/LineContinuationSpacing:
+  Enabled: false
+Layout/LineEndStringConcatenationIndentation:
+  Enabled: false
+Layout/LineLength:
+  Enabled: false
+Layout/MultilineArrayBraceLayout:
+  Enabled: false
+Layout/MultilineArrayLineBreaks:
+  Enabled: false
+Layout/MultilineAssignmentLayout:
+  Enabled: false
+Layout/MultilineBlockLayout:
+  Enabled: false
+Layout/MultilineHashBraceLayout:
+  Enabled: false
+Layout/MultilineHashKeyLineBreaks:
+  Enabled: false
+Layout/MultilineMethodArgumentLineBreaks:
+  Enabled: false
+Layout/MultilineMethodCallBraceLayout:
+  Enabled: false
+Layout/MultilineMethodCallIndentation:
+  Enabled: false
+Layout/MultilineMethodDefinitionBraceLayout:
+  Enabled: false
+Layout/MultilineMethodParameterLineBreaks:
+  Enabled: false
+Layout/MultilineOperationIndentation:
+  Enabled: false
+Layout/ParameterAlignment:
+  Enabled: false
+Layout/RedundantLineBreak:
+  Enabled: false
+Layout/RescueEnsureAlignment:
+  Enabled: false
+Layout/SingleLineBlockChain:
+  Enabled: false
+Layout/SpaceAfterMethodName:
+  Enabled: false
+Layout/SpaceAfterNot:
+  Enabled: false
+Layout/SpaceInLambdaLiteral:
+  Enabled: false
+Layout/SpaceInsideBlockBraces:
+  Enabled: false
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: false
diff --git a/.ruby-version b/.ruby-version
index 87d3afa18..489dd416b 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-jruby-9.1.12.0
+jruby-9.4.9.0
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ad09e1824..8ae27eae9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,6 +3,8 @@
 All contributions are welcome: ideas, patches, documentation, bug reports,
 complaints, etc!
 
+If you want to be rewarded for your contributions, sign up for the [Elastic Contributor Program](https://www.elastic.co/community/contributor). Each time you make a valid contribution, you’ll earn points that increase your chances of winning prizes and being recognized as a top contributor.
+
 Programming is not a required skill, and there are many ways to help out!
 It is more important to us that you are able to contribute.
 
@@ -12,7 +14,7 @@ That said, some basic guidelines, which you are free to ignore :)
 
 Want to lurk about and see what others are doing with Logstash?
 
-* The irc channel (#logstash on irc.freenode.org) is a good place for this
+* The #logstash channel on Elastic Stack Community slack (https://elasticstack.slack.com/channels/logstash) is a good place to start. 
 * The [forum](https://discuss.elastic.co/c/logstash) is also
   great for learning from others.
 
@@ -21,12 +23,11 @@ Want to lurk about and see what others are doing with Logstash?
 Have a problem you want Logstash to solve for you?
 
 * You can ask a question in the [forum](https://discuss.elastic.co/c/logstash)
-* Alternately, you are welcome to join the IRC channel #logstash on
-irc.freenode.org and ask for help there!
+* You are welcome to join Elastic Stack Community slack (https://elasticstack.slack.com) and ask for help on the #logstash channel.
 
 ## Have an Idea or Feature Request?
 
-* File a ticket on [GitHub](https://github.com/elastic/logstash/issues). Please remember that GitHub is used only for issues and feature requests. If you have a general question, the [forum](https://discuss.elastic.co/c/logstash) or IRC would be the best place to ask.
+* File a ticket on [GitHub](https://github.com/elastic/logstash/issues). Please remember that GitHub is used only for issues and feature requests. If you have a general question, the [forum](https://discuss.elastic.co/c/logstash) or Elastic Stack Community slack (https://elasticstack.slack.com) is the best place to ask.
 
 ## Something Not Working? Found a Bug?
 
@@ -49,29 +50,69 @@ get in touch with our security team [here](https://www.elastic.co/community/secu
 
 If you have a bugfix or new feature that you would like to contribute to Logstash, and you think it will take
 more than a few minutes to produce the fix (ie; write code), it is worth discussing the change with the Logstash
-users and developers first. You can reach us via [GitHub](https://github.com/elastic/logstash/issues), the [forum](https://discuss.elastic.co/c/logstash), or via IRC (#logstash on freenode irc)
+users and developers first. You can reach us via [GitHub](https://github.com/elastic/logstash/issues), the [forum](https://discuss.elastic.co/c/logstash), or Elastic Stack Community slack (https://elasticstack.slack.com).
 
 Please note that Pull Requests without tests and documentation may not be merged. If you would like to contribute but do not have
-experience with writing tests, please ping us on IRC/forum or create a PR and ask our help.
+experience with writing tests, please ping us on the forum or create a PR and ask for our help.
 
-If you would like to contribute to Logstash, but don't know where to start, you can use the GitHub labels "adoptme"
-and "low hanging fruit". Issues marked with these labels are relatively easy, and provides a good starting
+If you would like to contribute to Logstash, but don't know where to start, you can use the GitHub labels "adoptme",
+"low hanging fruit" and "good first issue". Issues marked with these labels are relatively easy, and provide a good starting
 point to contribute to Logstash.
 
-See: https://github.com/elastic/logstash/labels/adoptme
-https://github.com/elastic/logstash/labels/low%20hanging%20fruit
+See the following links:
+ * https://github.com/elastic/logstash/labels/adoptme
+ * https://github.com/elastic/logstash/labels/low%20hanging%20fruit
+ * https://github.com/elastic/logstash/labels/good%20first%20issue
+
+Or go directly here for an exhaustive list: https://github.com/elastic/logstash/contribute
+
+Sometimes during the development of Logstash core or plugins, configuration parameters for sensitive data such as password, API keys or SSL keyphrases need to be provided to the user.
+To protect sensitive information leaking into the logs, follow the best practices below:
+- Logstash core and plugin should flag any settings that may contain secrets. If your source changes are in Ruby, apply `:password` validation or wrap the object with `Logstash::Util::Password` object.
+- A setting marked as secret should not disclose its value unless retrieved in a non-obvious way. If you are introducing a new class for sensitive object (check `Password.java` and `SecretVariable.java` classes before doing so), make sure to mask the sensitive info by overriding get value (or `toString()` of Java class) default methods.
+- Logstash should not log secrets on any log level by default. Make sure you double-check the loggers if they are touching the objects carrying sensitive info.
+- Logstash has a dedicated flag, disabled by default, that the raw configuration text be logged for debugging purposes only. Use of `config.debug` will log/display sensitive info in the debug logs, so beware of using it in Produciton.
+
+As an example, suppose you have `my_auth` config which carries the sensitive key. Defining with `:password` validated protects `my_auth` being leaked in Logstash core logics. 
+```
+:my_auth => { :validate => :password },
+```
+In the plugin level, make sure to wrap `my_auth` with `Password` object.
+```
+::LogStash::Util::Password.new(my_auth)
+```
 
 Using IntelliJ? See a detailed getting started guide [here](https://docs.google.com/document/d/1kqunARvYMrlfTEOgMpYHig0U-ZqCcMJfhvTtGt09iZg/pub).
 
+## Breaking Changes
+
+When introducing new behaviour, we favor implementing it in a non-breaking way that users can opt into, meaning users' existing configurations continue to work as they expect them to after upgrading Logstash.
+
+But sometimes it is necessary to introduce "breaking changes," whether that is removing an option that doesn't make sense anymore, changing the default value of a setting, or reimplementing a major component differently for performance or safety reasons.
+
+When we do so, we need to acknowledge the work we are placing on the rest of our users the next time they upgrade, and work to ensure that they can upgrade confidently.
+
+Where possible, we:
+ 1. first implement new behaviour in a way that users can explicitly opt into (MINOR),
+ 2. commuicate the pending change in behaviour, including the introduction of deprecation warnings when old behaviour is used (MINOR, potentially along-side #1),
+ 3. change the default to be new behaviour, communicate the breaking change, optionally allow users to opt out in favor of the old behaviour (MAJOR), and eventually
+ 4. remove the old behaviour's implementation from the code-base (MAJOR, potentially along-side #3).
+
+After a pull request is marked as a "breaking change," it becomes necessary to either:
+ - refactor into a non-breaking change targeted at next minor; OR
+ - split into non-breaking change targeted at next minor, plus breaking change targeted at next major
+
 ## Contributing to plugins
 
 Check our [documentation](https://www.elastic.co/guide/en/logstash/current/contributing-to-logstash.html) on how to contribute to plugins or write your own!
 
+Check the _Contributing Documentation and Code Changes_ section to prevent plugin sensitive info from leaking in the debug logs.
+
 ### Logstash Plugin Changelog Guidelines
 
 This document provides guidelines on editing a logstash plugin's CHANGELOG file.
 
-#### What's a CHANGELOG file?
+### What's a CHANGELOG file?
 
 According to [keepachangelog.com](https://keepachangelog.com/en/1.0.0/):
 
@@ -107,14 +148,24 @@ then you should still create an entry in the changelog, using the word `Unreleas
 
 Most code in logstash-plugins comes from self-contained changes in the form of pull requests, so each entry should:
 
-1. be a summary of the Pull Request and contain a markdown link to it.
-2. start with [BREAKING], when it denotes a breaking change.
-  * Note: Breaking changes should warrant a major version bump.
-3. after [BREAKING], start with one of the following keywords:
-    `Added`, `Changed`, `Deprecated`, `Removed`, `Fixed`, `Security`.
-4. keep multiple entries with the same keyword in the same changelog revision together.
+1. Be a summary of the Pull Request and contain a markdown link to the PR.
+2. Begin your entry with an introductory label if appropriate. Labels include:
+    `[DOC]`, `[BREAKING]`, `[SECURITY]`.  
+    NOTE: Your PR may not need a label.
+3. After the label, start with one of the following keywords:
+    `Added`, `Changed`, `Deprecated`, `Removed`, `Fixed`.
+4. Keep multiple entries with the same keyword in the same changelog revision together.
 
-The meaning of the keywords is as follows (copied from [keepachangelog.com](https://keepachangelog.com/en/1.0.0/#how):
+Labels (optional):
+
+- **`[BREAKING]`** for a breaking change.
+ Note that breaking changes should warrant a major version bump.
+- **`[DOC]`** for a change that affects only documentation, and not code.
+- **`[SECURITY]`** for a security fix. If you're working on a security issue, 
+please make sure to follow the process outlined by our security team. 
+If you haven't done so already, please [get in touch with them](https://www.elastic.co/community/security) first.
+
+Keywords (copied from [keepachangelog.com](https://keepachangelog.com/en/1.0.0/#how)):
 
 - **`Added`** for new features.
 - **`Changed`** for changes in existing functionality.
@@ -135,6 +186,9 @@ Example:
 - Changed default value of `execution_bugs` from 30 to 0 [#104](http://example.org)
 - [BREAKING] Removed obsolete option `enable_telnet` option [#100](http://example.org)
 
+## 3.3.3
+- [DOC] Fixed incorrect formatting of code sample [#85](http://example.org)
+
 ## 3.3.2
 - Fixed incorrect serialization of input data when encoding was `Emacs-Mule` [#84](http://example.org)
 
@@ -196,4 +250,3 @@ Keep these in mind as both authors and reviewers of PRs:
   * If no, ask for clarifications on the PR. This will usually lead to changes in the code such as renaming of variables/functions or extracting of functions or simply adding "why" inline comments. But first ask the author for clarifications before assuming any intent on their part.
 
 * I must not focus on personal preferences or nitpicks. If I understand the code in the PR but simply would've implemented the same solution a different way that's great but its not feedback that belongs in the PR. Such feedback only serves to slow down progress for little to no gain.
-
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 56dc10b8f..000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,59 +0,0 @@
-FROM ubuntu:xenial
-
-RUN apt-get update && \
-    apt-get install -y zlib1g-dev build-essential vim rake git curl libssl-dev libreadline-dev libyaml-dev  \
-      libxml2-dev libxslt-dev openjdk-8-jdk-headless curl iputils-ping netcat && \
-    apt-get clean
-
-WORKDIR /root
-
-RUN adduser --disabled-password --gecos "" --home /home/logstash logstash && \
-    mkdir -p /usr/local/share/ruby-build && \
-    mkdir -p /opt/logstash && \
-    mkdir -p /opt/logstash/data && \
-    mkdir -p /mnt/host && \
-    chown logstash:logstash /opt/logstash
-
-USER logstash
-WORKDIR /home/logstash
-
-# used by the purge policy
-LABEL retention="keep"
-
-ADD gradlew /opt/logstash/gradlew
-ADD gradle/wrapper /opt/logstash/gradle/wrapper
-ADD buildSrc /opt/logstash/buildSrc
-RUN /opt/logstash/gradlew wrapper
-
-ADD versions.yml /opt/logstash/versions.yml
-ADD LICENSE.txt /opt/logstash/LICENSE.txt
-ADD NOTICE.TXT /opt/logstash/NOTICE.TXT
-ADD licenses /opt/logstash/licenses
-ADD CONTRIBUTORS /opt/logstash/CONTRIBUTORS
-ADD Gemfile.template /opt/logstash/Gemfile.template
-ADD Rakefile /opt/logstash/Rakefile
-ADD build.gradle /opt/logstash/build.gradle
-ADD rakelib /opt/logstash/rakelib
-ADD config /opt/logstash/config
-ADD spec /opt/logstash/spec
-ADD qa /opt/logstash/qa
-ADD lib /opt/logstash/lib
-ADD pkg /opt/logstash/pkg
-ADD tools /opt/logstash/tools
-ADD logstash-core /opt/logstash/logstash-core
-ADD logstash-core-plugin-api /opt/logstash/logstash-core-plugin-api
-ADD bin /opt/logstash/bin
-ADD modules /opt/logstash/modules
-ADD x-pack /opt/logstash/x-pack
-ADD ci /opt/logstash/ci
-ADD settings.gradle /opt/logstash/settings.gradle
-
-USER root
-RUN rm -rf build && \
-    mkdir -p build && \
-    chown -R logstash:logstash /opt/logstash
-USER logstash
-WORKDIR /opt/logstash
-
-LABEL retention="prune"
-
diff --git a/Dockerfile.base b/Dockerfile.base
deleted file mode 100644
index a33c1bfd2..000000000
--- a/Dockerfile.base
+++ /dev/null
@@ -1,22 +0,0 @@
-#logstash-base image, use ci/docker_update_base_image.sh to push updates
-FROM ubuntu:xenial
-
-RUN apt-get update && \
-    apt-get install -y zlib1g-dev build-essential vim rake git curl libssl-dev libreadline-dev libyaml-dev  \
-      libxml2-dev libxslt-dev openjdk-8-jdk-headless curl iputils-ping netcat && \
-    apt-get clean
-
-WORKDIR /root
-
-RUN adduser --disabled-password --gecos "" --home /home/logstash logstash && \
-    mkdir -p /usr/local/share/ruby-build && \
-    mkdir -p /opt/logstash && \
-    mkdir -p /mnt/host && \
-    chown logstash:logstash /opt/logstash
-
-USER logstash
-WORKDIR /home/logstash
-RUN mkdir -p /opt/logstash/data
-
-# used by the purge policy
-LABEL retention="keep"
diff --git a/Gemfile.template b/Gemfile.template
index 8795c6816..ba6e429df 100644
--- a/Gemfile.template
+++ b/Gemfile.template
@@ -4,122 +4,46 @@
 source "https://rubygems.org"
 gem "logstash-core", :path => "./logstash-core"
 gem "logstash-core-plugin-api", :path => "./logstash-core-plugin-api"
+
 gem "paquet", "~> 0.2"
-gem "ruby-progressbar", "~> 1"
-gem "builder", "~> 3"
-gem "ci_reporter_rspec", "~> 1", :group => :development
-gem "rspec", "~> 3.5", :group => :development
-gem "logstash-devutils", "~> 1", :group => :development
-gem "benchmark-ips", :group => :development
-gem "octokit", "~> 4", :group => :build
-gem "stud", "~> 0.0.22", :group => :build
-gem "rack-test", :require => "rack/test", :group => :development
-gem "fpm", "~> 1.3.3", :group => :build
-gem "rubyzip", "~> 1", :group => :build
+gem "pleaserun", "~>0.0.28", require: false
+gem "rake", "~> 13", require: false
+gem "ruby-progressbar", "~> 1", require: false
+gem "ruby-maven-libs", "~> 3", ">= 3.9.6.1"
+gem "logstash-output-elasticsearch", ">= 11.14.0"
+gem "polyglot", require: false
+gem "treetop", require: false
+gem "minitar", "~> 1", :group => :build
+gem "childprocess", "~> 4", :group => :build
+gem "fpm", "~> 1", ">= 1.14.1", :group => :build # compound due to bugfix https://github.com/jordansissel/fpm/pull/1856
 gem "gems", "~> 1", :group => :build
-gem "flores", "~> 0.0.6", :group => :development
-gem "atomic", "~> 1"
+gem "octokit", "~> 4.25", :group => :build
+gem "rubyzip", "~> 1", :group => :build
+gem "stud", "~> 0.0.22", :group => :build
+# remove fileutils declaration when start using Ruby 3.2+, by default includes `fileutils-v1.7.0`
+# (https://git.ruby-lang.org/ruby.git/commit/?h=ruby_3_2&id=05caafb4731c796890027cafedaac59dc108a23a)
+# note that the reason to use 1.7.0 is due to https://github.com/logstash-plugins/logstash-integration-aws/issues/28
+gem "fileutils", "~> 1.7"
+
+gem "rubocop", :group => :development
+# rubocop-ast 1.43.0 carries a dep on `prism` which requires native c extensions
+gem 'rubocop-ast', '= 1.42.0', :group => :development
 gem "belzebuth", :group => :development
+gem "benchmark-ips", :group => :development
+gem "ci_reporter_rspec", "~> 1", :group => :development
+gem "flores", "~> 0.0.8", :group => :development
 gem "json-schema", "~> 2", :group => :development
-gem "pleaserun", "~>0.0.28"
-gem "rake", "~> 12"
+gem "logstash-devutils", "~> 2.6.0", :group => :development
+gem "rack-test", :require => "rack/test", :group => :development
+gem "rspec", "~> 3.5", :group => :development
 gem "webmock", "~> 3", :group => :development
-gem "logstash-codec-cef"
-gem "logstash-codec-collectd"
-gem "logstash-codec-dots"
-gem "logstash-codec-edn"
-gem "logstash-codec-edn_lines"
-gem "logstash-codec-es_bulk"
-gem "logstash-codec-fluent"
-gem "logstash-codec-graphite"
-gem "logstash-codec-json"
-gem "logstash-codec-json_lines"
-gem "logstash-codec-line"
-gem "logstash-codec-msgpack"
-gem "logstash-codec-multiline"
-gem "logstash-codec-netflow"
-gem "logstash-codec-plain"
-gem "logstash-codec-rubydebug"
-gem "logstash-filter-aggregate"
-gem "logstash-filter-anonymize"
-gem "logstash-filter-cidr"
-gem "logstash-filter-clone"
-gem "logstash-filter-csv"
-gem "logstash-filter-date"
-gem "logstash-filter-de_dot"
-gem "logstash-filter-dissect"
-gem "logstash-filter-dns"
-gem "logstash-filter-drop"
-gem "logstash-filter-elasticsearch"
-gem "logstash-filter-fingerprint"
-gem "logstash-filter-geoip"
-gem "logstash-filter-grok"
-gem "logstash-filter-http"
-gem "logstash-filter-jdbc_static"
-gem "logstash-filter-jdbc_streaming"
-gem "logstash-filter-json"
-gem "logstash-filter-kv"
-gem "logstash-filter-memcached"
-gem "logstash-filter-metrics"
-gem "logstash-filter-mutate"
-gem "logstash-filter-ruby"
-gem "logstash-filter-sleep"
-gem "logstash-filter-split"
-gem "logstash-filter-syslog_pri"
-gem "logstash-filter-throttle"
-gem "logstash-filter-translate"
-gem "logstash-filter-truncate"
-gem "logstash-filter-urldecode"
-gem "logstash-filter-useragent"
-gem "logstash-filter-xml"
-gem "logstash-input-beats"
-gem "logstash-input-azure_event_hubs"
-gem "logstash-input-dead_letter_queue"
-gem "logstash-input-elasticsearch"
-gem "logstash-input-exec"
-gem "logstash-input-file"
-gem "logstash-input-ganglia"
-gem "logstash-input-gelf"
-gem "logstash-input-generator"
-gem "logstash-input-graphite"
-gem "logstash-input-heartbeat"
-gem "logstash-input-http"
-gem "logstash-input-http_poller"
-gem "logstash-input-imap"
-gem "logstash-input-jdbc"
-gem "logstash-input-kafka"
-gem "logstash-input-pipe"
-gem "logstash-input-rabbitmq"
-gem "logstash-input-redis"
-gem "logstash-input-s3"
-gem "logstash-input-snmp"
-gem "logstash-input-snmptrap"
-gem "logstash-input-sqs"
-gem "logstash-input-stdin"
-gem "logstash-input-syslog"
-gem "logstash-input-tcp"
-gem "logstash-input-twitter"
-gem "logstash-input-udp"
-gem "logstash-input-unix"
-gem "logstash-output-elastic_app_search"
-gem "logstash-output-cloudwatch"
-gem "logstash-output-csv"
-gem "logstash-output-elasticsearch"
-gem "logstash-output-email"
-gem "logstash-output-file"
-gem "logstash-output-graphite"
-gem "logstash-output-http"
-gem "logstash-output-kafka"
-gem "logstash-output-lumberjack"
-gem "logstash-output-nagios"
-gem "logstash-output-null"
-gem "logstash-output-pipe"
-gem "logstash-output-rabbitmq"
-gem "logstash-output-redis"
-gem "logstash-output-s3"
-gem "logstash-output-sns"
-gem "logstash-output-sqs"
-gem "logstash-output-stdout"
-gem "logstash-output-tcp"
-gem "logstash-output-udp"
-gem "logstash-output-webhdfs"
+gem "simplecov", "~> 0.22.0", :group => :development
+gem "simplecov-json", require: false, :group => :development
+gem "jar-dependencies", "= 0.4.1" # Gem::LoadError with jar-dependencies 0.4.2
+gem "murmurhash3", "= 0.1.6" # Pins until version 0.1.7-java is released
+gem "date", "= 3.3.3"
+gem "thwait"
+gem "bigdecimal", "~> 3.1"
+gem "psych", "5.2.2"
+gem "cgi", "0.3.7" # Pins until a new jruby version with updated cgi is released
+gem "uri", "0.12.3" # Pins until a new jruby version with updated cgi is released
diff --git a/NOTICE.TXT b/NOTICE.TXT
index f72c1c4ff..fda51f916 100644
--- a/NOTICE.TXT
+++ b/NOTICE.TXT
@@ -1,15 +1,97 @@
-Logstash
-Copyright 2012-2018 Elasticsearch
 
-This product includes software developed by The Apache Software Foundation (http://www.apache.org/).
+==========
+Notice for: Red Hat Universal Base Image minimal-9
+----------
 
-==========================================================================
-Third party libraries bundled by the Logstash project:
+source: https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf
 
---------------------------------------------------
-Library: addressable v2.3.8
-Url: https://github.com/sporkmonger/addressable
-License: Apache-2.0
+END USER LICENSE AGREEMENT
+RED HAT UNIVERSAL BASE IMAGE
+
+PLEASE READ THIS END USER LICENSE AGREEMENT CAREFULLY BEFORE USING SOFTWARE FROM RED HAT. BY USING RED HAT
+SOFTWARE, YOU SIGNIFY YOUR ASSENT TO AND ACCEPTANCE OF THIS END USER LICENSE AGREEMENT AND ACKNOWLEDGE YOU
+HAVE READ AND UNDERSTAND THE TERMS. AN INDIVIDUAL ACTING ON BEHALF OF AN ENTITY REPRESENTS THAT HE OR SHE HAS THE
+AUTHORITY TO ENTER INTO THIS END USER LICENSE AGREEMENT ON BEHALF OF THAT ENTITY. IF YOU DO NOT ACCEPT THE TERMS
+OF THIS AGREEMENT, THEN YOU MUST NOT USE THE RED HAT SOFTWARE. THIS END USER LICENSE AGREEMENT DOES NOT PROVIDE
+ANY RIGHTS TO RED HAT SERVICES SUCH AS SOFTWARE MAINTENANCE, UPGRADES OR SUPPORT. PLEASE REVIEW YOUR SERVICE
+OR SUBSCRIPTION AGREEMENT(S) THAT YOU MAY HAVE WITH RED HAT OR OTHER AUTHORIZED RED HAT SERVICE PROVIDERS
+REGARDING SERVICES AND ASSOCIATED PAYMENTS.
+
+This end user license agreement (“EULA”) governs the use of Red Hat Universal Base Image and associated software supporting such container(s)
+and any related updates, source code, including the appearance, structure and organization (the “Programs”), regardless of the delivery mechanism.
+If a Red Hat Universal Base Image is included in another Red Hat product, the EULA terms of such other Red Hat product will apply and supersede
+this EULA. If a Red Hat Universal Base Image is included in a third party work, the terms of this EULA will continue to govern the Red Hat Universal
+Base Image.
+
+1. License Grant. Subject to the terms of this EULA, Red Hat, Inc. (“Red Hat”) grants to you a perpetual, worldwide license to the Programs (each
+of which may include multiple software components). With the exception of the Red Hat trademark identified in Section 2 below, each software
+component is governed by a license that permits you to run, copy, modify, and redistribute (subject to certain obligations in some cases) the
+software components. This EULA pertains solely to the Programs and does not limit your rights under, or grant you rights that supersede, the
+license terms applicable to any particular component. The license terms applicable to each software component are provided in the source code
+of that component.
+
+2. Intellectual Property Rights. The Programs and each of their components are owned by Red Hat and other licensors and are protected under
+copyright law and other laws as applicable. Title to the Programs and any component shall remain with Red Hat and other licensors, subject to
+the applicable license, excluding any independently developed and licensed work. The “Red Hat” trademark is a registered trademark of Red
+Hat and its affiliates in the U.S. and other countries. Subject to Red Hat’s trademark usage guidelines (set forth at
+http://www.redhat.com/about/corporate/trademark/), this EULA permits you to distribute the Programs that include the Red Hat trademark,
+provided you do not make any statements on behalf of Red Hat, including but not limited to, stating or in any way suggesting (in any public,
+private and/or confidential statement (whether written or verbal)) that Red Hat supports or endorses software built and delivered with a Red Hat
+Universal Base Image(s) (such derivative works referred to as a “Red Hat Based Container Images”); provided if a Red Hat Based Container
+Image is Red Hat Certified and deployed on a Red Hat supported configuration as set forth at https://access.redhat.com/articles/2726611 then
+you may state that the Red Hat Universal Base Image is supported by Red Hat. You agree to include this unmodified EULA in all distributions of
+container images sourced, built or otherwise derived from the Programs. If you modify the Red Hat Universal Base Image(s), you must remove
+any Red Hat trademark(s) prior to any subsequent distribution. Any breach of this Section 2 is a material breach of the EULA and you may no
+longer use and/or distribute the Red Hat trademark(s). Modifications to the software may corrupt the Programs.
+
+3. Limited Warranty. Except as specifically stated in this Section 3, a separate agreement with Red Hat, or a license for a particular component,
+to the maximum extent permitted under applicable law, the Programs and the components are provided and licensed “as is” without
+warranty of any kind, expressed or implied, including the implied warranties of merchantability, non-infringement or fitness for a
+particular purpose. Neither Red Hat nor its affiliates warrant that the functions contained in the Programs will meet your requirements or that
+the operation of the Programs will be entirely error free, appear or perform precisely as described in the accompanying documentation, or comply
+with regulatory requirements. Red Hat warrants that the media on which the Programs and the components are provided will be free from defects
+in materials and manufacture under normal use for a period of 30 days from the date of delivery to you. This warranty extends only to the party
+that purchases subscription services for the supported configurations from Red Hat and/or its affiliates or a Red Hat authorized
+distributor.
+
+4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, your exclusive remedy under this EULA is to return
+any defective media within 30 days of delivery along with a copy of your payment receipt and Red Hat, at its option, will replace it or refund the
+money you paid for the media. To the maximum extent permitted under applicable law, under no circumstances will Red Hat, its affiliates,
+any Red Hat authorized distributor, or the licensor of any component provided to you under this EULA be liable to you for any incidental
+or consequential damages, including lost profits or lost savings arising out of the use or inability to use the Programs or any
+component, even if Red Hat, its affiliates, an authorized distributor, and/or licensor has been advised of the possibility of such
+damages. In no event shall Red Hat's or its affiliates’ liability, an authorized distributor’s liability or the liability of the licensor of a
+component provided to you under this EULA exceed the amount that you paid to Red Hat for the media under this EULA.
+
+5. Export Control. As required by the laws of the United States and other countries, you represent and warrant that you: (a) understand that the
+Programs and their components may be subject to export controls under the U.S. Commerce Department’s Export Administration Regulations
+(“EAR”); (b) are not located in a prohibited destination country under the EAR or U.S. sanctions regulations (currently Cuba, Iran, North Korea,
+Sudan, Syria, and the Crimea Region of Ukraine, subject to change as posted by the United States government); (c) will not export, re-export, or
+transfer the Programs to any prohibited destination, persons or entities on the U.S. Bureau of Industry and Security Denied Parties List or Entity
+List, or the U.S. Office of Foreign Assets Control list of Specially Designated Nationals and Blocked Persons, or any similar lists maintained by
+other countries, without the necessary export license(s) or authorizations(s); (d) will not use or transfer the Programs for use in connection with
+any nuclear, chemical or biological weapons, missile technology, or military end-uses where prohibited by an applicable arms embargo, unless
+authorized by the relevant government agency by regulation or specific license; (e) understand and agree that if you are in the United States and
+export or transfer the Programs to eligible end users, you will, to the extent required by EAR Section 740.17(e), submit semi-annual reports to
+the Commerce Department’s Bureau of Industry and Security, which include the name and address (including country) of each transferee; and
+(f) understand that countries including the United States may restrict the import, use, or export of encryption products (which may include the
+Programs and the components) and agree that you shall be solely responsible for compliance with any such import, use, or export restrictions.
+
+6. Third Party Software. The Program may be provided with third party software programs subject to their own license terms. The license terms
+either accompany the third party software programs or, in some instances, may be viewed at registry.access.redhat.com. If you do not agree to
+abide by the applicable license terms for the third party software programs, then you may not install, distribute or use them.
+
+7. General. If any provision of this EULA is held to be unenforceable, the enforceability of the remaining provisions shall not be affected. Any claim,
+controversy or dispute arising under or relating to this EULA shall be governed by the laws of the State of New York and of the United States,
+without regard to any conflict of laws provisions. The rights and obligations of the parties to this EULA shall not be governed by the United
+Nations Convention on the International Sale of Goods.
+
+Copyright © 2019 Red Hat, Inc. All rights reserved. “Red Hat,” is a registered trademark of Red Hat, Inc.
+All other trademarks are the property of their respective owners.
+
+==========
+Notice for: addressable-2.8.7
+----------
 
 Copyright © Bob Aman
 
@@ -215,43 +297,36 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
---------------------------------------------------
-Library: asm v6.0
-Url: http://asm.objectweb.org
-License: BSD-3-Clause
+==========
+Notice for: amazing_print-1.7.2
+----------
 
-ASM: a very small and fast Java bytecode manipulation framework
-Copyright (c) 2000-2011 INRIA, France Telecom
-All rights reserved.
+MIT License
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-3. Neither the name of the copyright holders nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
+Copyright (c) 2010-2019 Michael Dvorkin
+Copyright (c) 2020 AmazingPrint
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
+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:
 
---------------------------------------------------
-Library: atomic v1.1.99
-Url: http://github.com/ruby-concurrency/atomic
-License: Apache-2.0
+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.
+
+==========
+Notice for: atomic-1.1.101
+----------
 
 Apache License
 
@@ -398,10 +473,9 @@ additional liability.
 
 END OF TERMS AND CONDITIONS
 
---------------------------------------------------
-Library: avl_tree v1.2.1
-Url: https://github.com/nahi/avl_tree
-License: BSD-2-Clause-FreeBSD
+==========
+Notice for: avl_tree-1.2.1
+----------
 
 Copyright (c) 2012,  Hiroshi Nakamura <nahi@ruby-lang.org>
 All rights reserved.
@@ -429,40 +503,21 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
---------------------------------------------------
-Library: awesome_print v1.8.0
-Url: https://github.com/awesome-print/awesome_print
-License: MIT
+==========
+Notice for: avro-1.10.2
+----------
 
-Copyright (c) 2010-2013 Michael Dvorkin
-http://www.dvorkin.net
-%w(mike dvorkin.net) * "@" || "twitter.com/mid"
+Apache Avro
+Copyright 2010-2015 The Apache Software Foundation
 
-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:
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
 
-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.
+==========
+Notice for: aws-eventstream-1.3.1
+----------
 
---------------------------------------------------
-Library: aws-sdk-core v2.11.37
-Url: http://github.com/aws/aws-sdk-ruby
-License: Apache-2.0
-
-copyright 2013. amazon web services, inc. all rights reserved.
 
                                  Apache License
                            Version 2.0, January 2004
@@ -666,12 +721,10 @@ copyright 2013. amazon web services, inc. all rights reserved.
    See the License for the specific language governing permissions and
    limitations under the License.
 
---------------------------------------------------
-Library: aws-sdk-resources v2.11.37
-Url: http://github.com/aws/aws-sdk-ruby
-License: Apache-2.0
+==========
+Notice for: aws-partitions-1.1055.0
+----------
 
-copyright 2013. amazon web services, inc. all rights reserved.
 
                                  Apache License
                            Version 2.0, January 2004
@@ -875,30 +928,10 @@ copyright 2013. amazon web services, inc. all rights reserved.
    See the License for the specific language governing permissions and
    limitations under the License.
 
---------------------------------------------------
-Library: aws-sdk-v1 v1.67.0
-Url: http://aws.amazon.com/sdkforruby
-License: Apache-2.0
+==========
+Notice for: aws-sdk-cloudfront-1.112.0
+----------
 
-Copyright 2011-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License"). You
-may not use this file except in compliance with the License. A copy of
-the License is located at
-
-    http://aws.amazon.com/apache2.0/
-
-or in the "license" file accompanying this file. This file is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-ANY KIND, either express or implied. See the License for the specific
-language governing permissions and limitations under the License.
-
---------------------------------------------------
-Library: aws-sdk v2.11.37
-Url: http://github.com/aws/aws-sdk-ruby
-License: Apache-2.0
-
-copyright 2013. amazon web services, inc. all rights reserved.
 
                                  Apache License
                            Version 2.0, January 2004
@@ -1102,12 +1135,10 @@ copyright 2013. amazon web services, inc. all rights reserved.
    See the License for the specific language governing permissions and
    limitations under the License.
 
---------------------------------------------------
-Library: aws-sigv4 v1.0.2
-Url: http://github.com/aws/aws-sdk-ruby
-License: Apache-2.0
+==========
+Notice for: aws-sdk-cloudwatch-1.111.0
+----------
 
-copyright 2013. amazon web services, inc. all rights reserved.
 
                                  Apache License
                            Version 2.0, January 2004
@@ -1311,36 +1342,1565 @@ copyright 2013. amazon web services, inc. all rights reserved.
    See the License for the specific language governing permissions and
    limitations under the License.
 
---------------------------------------------------
-Library: backports v3.11.3
-Url: http://github.com/marcandre/backports
-License: MIT
+==========
+Notice for: aws-sdk-core-3.219.0
+----------
 
-Copyright (c) 2009 Marc-Andre Lafortune
 
-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:
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-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.
+   1. Definitions.
 
---------------------------------------------------
-Library: bindata v2.4.3
-Url: http://github.com/dmendel/bindata
-License: BSD-2-Clause
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+==========
+Notice for: aws-sdk-kms-1.99.0
+----------
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+==========
+Notice for: aws-sdk-resourcegroups-1.79.0
+----------
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+==========
+Notice for: aws-sdk-s3-1.182.0
+----------
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+==========
+Notice for: aws-sdk-sns-1.96.0
+----------
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+==========
+Notice for: aws-sdk-sqs-1.93.0
+----------
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+==========
+Notice for: aws-sigv4-1.11.0
+----------
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+==========
+Notice for: back_pressure-1.0.0
+----------
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+==========
+Notice for: base64-0.2.0
+----------
+
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+==========
+Notice for: bigdecimal-3.1.9
+----------
+
+# source: https://github.com/ruby/bigdecimal/blob/v3.1.4/LICENSE
+
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
+You can redistribute it and/or modify it under either the terms of the
+2-clause BSDL (see the file BSDL), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
+
+       a) distribute the binaries and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under these terms.
+
+     For the list of those files and their copying conditions, see the
+     file LEGAL.
+
+  5. The scripts and library files supplied as input to or produced as
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them,
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.
+==========
+Notice for: bindata-2.5.0
+----------
 
 Copyright (C) 2007-2012 Dion Mendel. All rights reserved.
 
@@ -1365,23 +2925,9 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
---------------------------------------------------
-Library: bouncycastle v
-Url: https://www.bouncycastle.org
-License: MIT
-
-Copyright (c) 2000 - 2018 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
-
-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.
-
---------------------------------------------------
-Library: buftok v0.2.0
-Url: https://github.com/sferik/buftok
-License:  MIT OR Ruby|BSD-2-Clause
+==========
+Notice for: buftok-0.2.0
+----------
 
 Copyright (c) 2006-2013 Tony Arcieri, Martin Emde, Erik Michaels-Ober. Distributed under the [Ruby license][license]. [license]: http://www.ruby-lang.org/en/LICENSE.txt
 
@@ -1442,36 +2988,9 @@ You can redistribute it and/or modify it under either the terms of the
      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
      PURPOSE.
 
---------------------------------------------------
-Library: builder v3.2.3
-Url: http://onestepback.org
-License: MIT
-
-Copyright (c) 2003-2012 Jim Weirich (jim.weirich@gmail.com)
-
-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.
-
---------------------------------------------------
-Library: bundler v1.9.10
-Url: https://bundler.io/
-License: MIT
+==========
+Notice for: bundler-2.3.26
+----------
 
 Portions copyright (c) 2010 Andre Arko  
 Portions copyright (c) 2009 Engine Yard
@@ -1496,2504 +3015,9 @@ 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.
-
---------------------------------------------------
-Library: bytelist v
-Url: http://github.com/jruby/bytelist
-License: EPL-1.0
-
-JRuby is Copyright (c) 2007-2013 The JRuby project, and is released
-under a tri EPL/GPL/LGPL license. You can use it, redistribute it
-and/or modify it under the terms of the:
-
-  Eclipse Public License version 1.0
-  GNU General Public License version 2
-  GNU Lesser General Public License version 2.1
-
-The complete text of the Eclipse Public License is as follows:
-
-  Eclipse Public License - v 1.0
-
-  THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-  PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-  OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-  1. DEFINITIONS
-
-  "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial code and
-         documentation distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor:
-
-          i) changes to the Program, and
-
-          ii) additions to the Program;
-              where such changes and/or additions to the Program
-              originate from and are distributed by that particular
-              Contributor. A Contribution 'originates' from a
-              Contributor if it was added to the Program by such
-              Contributor itself or anyone acting on such
-              Contributor's behalf. Contributions do not include
-              additions to the Program which: (i) are separate modules
-              of software distributed in conjunction with the Program
-              under their own license agreement, and (ii) are not
-              derivative works of the Program.
-
-  "Contributor" means any person or entity that distributes the Program.
-
-  "Licensed Patents" mean patent claims licensable by a Contributor
-  which are necessarily infringed by the use or sale of its
-  Contribution alone or when combined with the Program.
-
-  "Program" means the Contributions distributed in accordance with
-  this Agreement.
-
-  "Recipient" means anyone who receives the Program under this
-  Agreement, including all Contributors.
-
-  2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor
-         hereby grants Recipient a non-exclusive, worldwide,
-         royalty-free copyright license to reproduce, prepare
-         derivative works of, publicly display, publicly perform,
-         distribute and sublicense the Contribution of such
-         Contributor, if any, and such derivative works, in source
-         code and object code form.
-
-      b) Subject to the terms of this Agreement, each Contributor
-         hereby grants Recipient a non-exclusive, worldwide,
-         royalty-free patent license under Licensed Patents to make,
-         use, sell, offer to sell, import and otherwise transfer the
-         Contribution of such Contributor, if any, in source code and
-         object code form. This patent license shall apply to the
-         combination of the Contribution and the Program if, at the
-         time the Contribution is added by the Contributor, such
-         addition of the Contribution causes such combination to be
-         covered by the Licensed Patents. The patent license shall not
-         apply to any other combinations which include the
-         Contribution. No hardware per se is licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants
-         the licenses to its Contributions set forth herein, no
-         assurances are provided by any Contributor that the Program
-         does not infringe the patent or other intellectual property
-         rights of any other entity. Each Contributor disclaims any
-         liability to Recipient for claims brought by any other entity
-         based on infringement of intellectual property rights or
-         otherwise. As a condition to exercising the rights and
-         licenses granted hereunder, each Recipient hereby assumes
-         sole responsibility to secure any other intellectual property
-         rights needed, if any. For example, if a third party patent
-         license is required to allow Recipient to distribute the
-         Program, it is Recipient's responsibility to acquire that
-         license before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-         sufficient copyright rights in its Contribution, if any, to
-         grant the copyright license set forth in this Agreement.
-
-  3. REQUIREMENTS
-
-  A Contributor  may choose to  distribute the Program in  object code
-  form under its own license agreement, provided that:
-
-      a) it complies with the terms and conditions of this Agreement; and
-
-      b) its license agreement:
-
-          i) effectively disclaims on behalf of all Contributors all
-             warranties and conditions, express and implied, including
-             warranties or conditions of title and non-infringement,
-             and implied warranties or conditions of merchantability
-             and fitness for a particular purpose;
-
-          ii) effectively excludes on behalf of all Contributors all
-              liability for damages, including direct, indirect,
-              special, incidental and consequential damages, such as
-              lost profits;
-
-          iii) states that any provisions which differ from this
-               Agreement are offered by that Contributor alone and not
-               by any other party; and
-
-          iv) states that source code for the Program is available
-              from such Contributor, and informs licensees how to
-              obtain it in a reasonable manner on or through a medium
-              customarily used for software exchange.
-
-  When the Program is made available in source code form:
-
-      a) it must be made available under this Agreement; and
-
-      b) a copy of this Agreement must be included with each copy of
-         the Program.
-
-  Contributors may not remove or alter any copyright notices contained
-  within the Program.
-
-  Each Contributor must identify itself as the originator of its
-  Contribution, if any, in a manner that reasonably allows subsequent
-  Recipients to identify the originator of the Contribution.
-
-  4. COMMERCIAL DISTRIBUTION
-
-  Commercial distributors of software may accept certain
-  responsibilities with respect to end users, business partners and
-  the like. While this license is intended to facilitate the
-  commercial use of the Program, the Contributor who includes the
-  Program in a commercial product offering should do so in a manner
-  which does not create potential liability for other Contributors.
-  Therefore, if a Contributor includes the Program in a commercial
-  product offering, such Contributor ("Commercial Contributor") hereby
-  agrees to defend and indemnify every other Contributor ("Indemnified
-  Contributor") against any losses, damages and costs (collectively
-  "Losses") arising from claims, lawsuits and other legal actions
-  brought by a third party against the Indemnified Contributor to the
-  extent caused by the acts or omissions of such Commercial
-  Contributor in connection with its distribution of the Program in a
-  commercial product offering. The obligations in this section do not
-  apply to any claims or Losses relating to any actual or alleged
-  intellectual property infringement. In order to qualify, an
-  Indemnified Contributor must: a) promptly notify the Commercial
-  Contributor in writing of such claim, and b) allow the Commercial
-  Contributor to control, and cooperate with the Commercial
-  Contributor in, the defense and any related settlement negotiations.
-  The Indemnified Contributor may participate in any such claim at its
-  own expense.
-
-  For example, a Contributor might include the Program in a commercial
-  product offering, Product X. That Contributor is then a Commercial
-  Contributor. If that Commercial Contributor then makes performance
-  claims, or offers warranties related to Product X, those performance
-  claims and warranties are such Commercial Contributor's
-  responsibility alone. Under this section, the Commercial Contributor
-  would have to defend claims against the other Contributors related
-  to those performance claims and warranties, and if a court requires
-  any other Contributor to pay any damages as a result, the Commercial
-  Contributor must pay those damages.
-
-  5. NO WARRANTY
-
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-  PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-  ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-  ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-  MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient
-  is solely responsible for determining the appropriateness of using
-  and distributing the Program and assumes all risks associated with
-  its exercise of rights under this Agreement , including but not
-  limited to the risks and costs of program errors, compliance with
-  applicable laws, damage to or loss of data, programs or equipment,
-  and unavailability or interruption of operations.
-
-  6. DISCLAIMER OF LIABILITY
-
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-  NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT,
-  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON
-  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-  THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-  GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-  DAMAGES.
-
-  7. GENERAL
-
-  If any provision of this Agreement is invalid or unenforceable under
-  applicable law, it shall not affect the validity or enforceability
-  of the remainder of the terms of this Agreement, and without further
-  action by the parties hereto, such provision shall be reformed to
-  the minimum extent necessary to make such provision valid and
-  enforceable.
-
-  If Recipient institutes patent litigation against any entity
-  (including a cross-claim or counterclaim in a lawsuit) alleging that
-  the Program itself (excluding combinations of the Program with other
-  software or hardware) infringes such Recipient's patent(s), then
-  such Recipient's rights granted under Section 2(b) shall terminate
-  as of the date such litigation is filed.
-
-  All Recipient's rights under this Agreement shall terminate if it
-  fails to comply with any of the material terms or conditions of this
-  Agreement and does not cure such failure in a reasonable period of
-  time after becoming aware of such noncompliance. If all Recipient's
-  rights under this Agreement terminate, Recipient agrees to cease use
-  and distribution of the Program as soon as reasonably practicable.
-  However, Recipient's obligations under this Agreement and any
-  licenses granted by Recipient relating to the Program shall continue
-  and survive.
-
-  Everyone is permitted to copy and distribute copies of this
-  Agreement, but in order to avoid inconsistency the Agreement is
-  copyrighted and may only be modified in the following manner. The
-  Agreement Steward reserves the right to publish new versions
-  (including revisions) of this Agreement from time to time. No one
-  other than the Agreement Steward has the right to modify this
-  Agreement. The Eclipse Foundation is the initial Agreement Steward.
-  The Eclipse Foundation may assign the responsibility to serve as the
-  Agreement Steward to a suitable separate entity. Each new version of
-  the Agreement will be given a distinguishing version number. The
-  Program (including Contributions) may always be distributed subject
-  to the version of the Agreement under which it was received. In
-  addition, after a new version of the Agreement is published,
-  Contributor may elect to distribute the Program (including its
-  Contributions) under the new version. Except as expressly stated in
-  Sections 2(a) and 2(b) above, Recipient receives no rights or
-  licenses to the intellectual property of any Contributor under this
-  Agreement, whether expressly, by implication, estoppel or otherwise.
-  All rights in the Program not expressly granted under this Agreement
-  are reserved.
-
-  This Agreement is governed by the laws of the State of New York and
-  the intellectual property laws of the United States of America. No
-  party to this Agreement will bring a legal action under this
-  Agreement more than one year after the cause of action arose. Each
-  party waives its rights to a jury trial in any resulting litigation.
-
-The complete text of the Common Public License is as follows:
-
-  Common Public License - v 1.0
-
-  THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON
-  PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-  THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-  1. DEFINITIONS
-
-  "Contribution" means:
-
-  a) in the case of the initial Contributor, the initial code and
-    documentation distributed under this Agreement, and
-
-  b) in the case of each subsequent Contributor:
-
-  i) changes to the Program, and
-
-  ii) additions to the Program;
-
-  where such changes and/or additions to the Program originate
-  from and are distributed by that particular Contributor. A
-  Contribution 'originates' from a Contributor if it was added to the
-  Program by such Contributor itself or anyone acting on such
-  Contributor's behalf. Contributions do not include additions to the
-  Program which: (i) are separate modules of software distributed in
-  conjunction with the Program under their own license agreement,
-  and (ii) are not derivative works of the Program.
-
-  "Contributor" means any person or entity that distributes the Program.
-
-  "Licensed Patents " mean patent claims licensable by a Contributor
-  which are necessarily infringed by the use or sale of its Contribution
-  alone or when combined with the Program.
-
-  "Program" means the Contributions distributed in accordance with this Agreement.
-
-  "Recipient" means anyone who receives the Program under this
-  Agreement, including all Contributors.
-
-  2. GRANT OF RIGHTS
-
-  a) Subject to the terms of this Agreement, each Contributor
-  hereby grants Recipient a non-exclusive, worldwide, royalty-free
-  copyright license to reproduce, prepare derivative works of, publicly
-  display, publicly perform, distribute and sublicense the Contribution
-  of such Contributor, if any, and such derivative works, in source code
-  and object code form.
-
-  b) Subject to the terms of this Agreement, each Contributor
-  hereby grants Recipient a non-exclusive, worldwide, royalty-free
-  patent license under Licensed Patents to make, use, sell, offer to
-  sell, import and otherwise transfer the Contribution of such
-  Contributor, if any, in source code and object code form. This patent
-  license shall apply to the combination of the Contribution and the
-  Program if, at the time the Contribution is added by the Contributor,
-  such addition of the Contribution causes such combination to be
-  covered by the Licensed Patents. The patent license shall not apply to
-  any other combinations which include the Contribution. No hardware per
-  se is licensed hereunder.
-
-  c) Recipient understands that although each Contributor grants
-  the licenses to its Contributions set forth herein, no assurances are
-  provided by any Contributor that the Program does not infringe the
-  patent or other intellectual property rights of any other entity. Each
-  Contributor disclaims any liability to Recipient for claims brought by
-  any other entity based on infringement of intellectual property rights
-  or otherwise. As a condition to exercising the rights and licenses
-  granted hereunder, each Recipient hereby assumes sole responsibility
-  to secure any other intellectual property rights needed, if any. For
-  example, if a third party patent license is required to allow
-  Recipient to distribute the Program, it is Recipient's responsibility
-  to acquire that license before distributing the Program.
-
-  d) Each Contributor represents that to its knowledge it has
-  sufficient copyright rights in its Contribution, if any, to grant the
-  copyright license set forth in this Agreement.
-
-  3. REQUIREMENTS
-
-  A Contributor may choose to distribute the Program in object code form
-  under its own license agreement, provided that:
-
-  a) it complies with the terms and conditions of this Agreement;
-    and
-
-  b) its license agreement:
-
-  i) effectively disclaims on behalf of all Contributors all
-  warranties and conditions, express and implied, including warranties
-  or conditions of title and non-infringement, and implied warranties or
-  conditions of merchantability and fitness for a particular purpose;
-
-  ii) effectively excludes on behalf of all Contributors all
-  liability for damages, including direct, indirect, special, incidental
-  and consequential damages, such as lost profits;
-
-  iii) states that any provisions which differ from this Agreement
-  are offered by that Contributor alone and not by any other party; and
-
-  iv) states that source code for the Program is available from
-  such Contributor, and informs licensees how to obtain it in a
-  reasonable manner on or through a medium customarily used for software
-  exchange.
-
-  When the Program is made available in source code form:
-
-  a) it must be made available under this Agreement; and 
-
-  b) a copy of this Agreement must be included with each copy of
-  the Program.
-
-  Contributors may not remove or alter any copyright notices contained
-  within the Program.
-
-  Each Contributor must identify itself as the originator of its
-  Contribution, if any, in a manner that reasonably allows subsequent
-  Recipients to identify the originator of the Contribution.
-
-  4. COMMERCIAL DISTRIBUTION
-
-  Commercial distributors of software may accept certain
-  responsibilities with respect to end users, business partners and the
-  like. While this license is intended to facilitate the commercial use
-  of the Program, the Contributor who includes the Program in a
-  commercial product offering should do so in a manner which does not
-  create potential liability for other Contributors. Therefore, if a
-  Contributor includes the Program in a commercial product offering,
-  such Contributor ("Commercial Contributor") hereby agrees to defend
-  and indemnify every other Contributor ("Indemnified Contributor")
-  against any losses, damages and costs (collectively "Losses") arising
-  from claims, lawsuits and other legal actions brought by a third party
-  against the Indemnified Contributor to the extent caused by the acts
-  or omissions of such Commercial Contributor in connection with its
-  distribution of the Program in a commercial product offering. The
-  obligations in this section do not apply to any claims or Losses
-  relating to any actual or alleged intellectual property
-  infringement. In order to qualify, an Indemnified Contributor must: a)
-  promptly notify the Commercial Contributor in writing of such claim,
-  and b) allow the Commercial Contributor to control, and cooperate with
-  the Commercial Contributor in, the defense and any related settlement
-  negotiations. The Indemnified Contributor may participate in any such
-  claim at its own expense.
-
-  For example, a Contributor might include the Program in a commercial
-  product offering, Product X. That Contributor is then a Commercial
-  Contributor. If that Commercial Contributor then makes performance
-  claims, or offers warranties related to Product X, those performance
-  claims and warranties are such Commercial Contributor's responsibility
-  alone. Under this section, the Commercial Contributor would have to
-  defend claims against the other Contributors related to those
-  performance claims and warranties, and if a court requires any other
-  Contributor to pay any damages as a result, the Commercial Contributor
-  must pay those damages.
-
-  5. NO WARRANTY
-
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-  PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
-  WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-  OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-  responsible for determining the appropriateness of using and
-  distributing the Program and assumes all risks associated with its
-  exercise of rights under this Agreement, including but not limited to
-  the risks and costs of program errors, compliance with applicable
-  laws, damage to or loss of data, programs or equipment, and
-  unavailability or interruption of operations.
-
-  6. DISCLAIMER OF LIABILITY
-
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
-  ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-  WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-  DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-  HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-  7. GENERAL
-
-  If any provision of this Agreement is invalid or unenforceable under
-  applicable law, it shall not affect the validity or enforceability of
-  the remainder of the terms of this Agreement, and without further
-  action by the parties hereto, such provision shall be reformed to the
-  minimum extent necessary to make such provision valid and enforceable.
-
-  If Recipient institutes patent litigation against a Contributor with
-  respect to a patent applicable to software (including a cross-claim or
-  counterclaim in a lawsuit), then any patent licenses granted by that
-  Contributor to such Recipient under this Agreement shall terminate as
-  of the date such litigation is filed. In addition, if Recipient
-  institutes patent litigation against any entity (including a
-  cross-claim or counterclaim in a lawsuit) alleging that the Program
-  itself (excluding combinations of the Program with other software or
-  hardware) infringes such Recipient's patent(s), then such Recipient's
-  rights granted under Section 2(b) shall terminate as of the date such
-  litigation is filed.
-
-  All Recipient's rights under this Agreement shall terminate if it
-  fails to comply with any of the material terms or conditions of this
-  Agreement and does not cure such failure in a reasonable period of
-  time after becoming aware of such noncompliance. If all Recipient's
-  rights under this Agreement terminate, Recipient agrees to cease use
-  and distribution of the Program as soon as reasonably
-  practicable. However, Recipient's obligations under this Agreement and
-  any licenses granted by Recipient relating to the Program shall
-  continue and survive.
-
-  Everyone is permitted to copy and distribute copies of this Agreement,
-  but in order to avoid inconsistency the Agreement is copyrighted and
-  may only be modified in the following manner. The Agreement Steward
-  reserves the right to publish new versions (including revisions) of
-  this Agreement from time to time. No one other than the Agreement
-  Steward has the right to modify this Agreement. IBM is the initial
-  Agreement Steward. IBM may assign the responsibility to serve as the
-  Agreement Steward to a suitable separate entity. Each new version of
-  the Agreement will be given a distinguishing version number. The
-  Program (including Contributions) may always be distributed subject to
-  the version of the Agreement under which it was received. In addition,
-  after a new version of the Agreement is published, Contributor may
-  elect to distribute the Program (including its Contributions) under
-  the new version. Except as expressly stated in Sections 2(a) and 2(b)
-  above, Recipient receives no rights or licenses to the intellectual
-  property of any Contributor under this Agreement, whether expressly,
-  by implication, estoppel or otherwise. All rights in the Program not
-  expressly granted under this Agreement are reserved.
-
-  This Agreement is governed by the laws of the State of New York and
-  the intellectual property laws of the United States of America. No
-  party to this Agreement will bring a legal action under this Agreement
-  more than one year after the cause of action arose. Each party waives
- its rights to a jury trial in any resulting litigation.
-
-The complete text of the GNU General Public License v2 is as follows:
-
-          GNU GENERAL PUBLIC LICENSE
-             Version 2, June 1991
-
-   Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                         59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-   Everyone is permitted to copy and distribute verbatim copies
-   of this license document, but changing it is not allowed.
-
-            Preamble
-
-    The licenses for most software are designed to take away your
-  freedom to share and change it.  By contrast, the GNU General Public
-  License is intended to guarantee your freedom to share and change free
-  software--to make sure the software is free for all its users.  This
-  General Public License applies to most of the Free Software
-  Foundation's software and to any other program whose authors commit to
-  using it.  (Some other Free Software Foundation software is covered by
-  the GNU Library General Public License instead.)  You can apply it to
-  your programs, too.
-
-    When we speak of free software, we are referring to freedom, not
-  price.  Our General Public Licenses are designed to make sure that you
-  have the freedom to distribute copies of free software (and charge for
-  this service if you wish), that you receive source code or can get it
-  if you want it, that you can change the software or use pieces of it
-  in new free programs; and that you know you can do these things.
-
-    To protect your rights, we need to make restrictions that forbid
-  anyone to deny you these rights or to ask you to surrender the rights.
-  These restrictions translate to certain responsibilities for you if you
-  distribute copies of the software, or if you modify it.
-
-    For example, if you distribute copies of such a program, whether
-  gratis or for a fee, you must give the recipients all the rights that
-  you have.  You must make sure that they, too, receive or can get the
-  source code.  And you must show them these terms so they know their
-  rights.
-
-    We protect your rights with two steps: (1) copyright the software, and
-  (2) offer you this license which gives you legal permission to copy,
-  distribute and/or modify the software.
-
-    Also, for each author's protection and ours, we want to make certain
-  that everyone understands that there is no warranty for this free
-  software.  If the software is modified by someone else and passed on, we
-  want its recipients to know that what they have is not the original, so
-  that any problems introduced by others will not reflect on the original
-  authors' reputations.
-
-    Finally, any free program is threatened constantly by software
-  patents.  We wish to avoid the danger that redistributors of a free
-  program will individually obtain patent licenses, in effect making the
-  program proprietary.  To prevent this, we have made it clear that any
-  patent must be licensed for everyone's free use or not licensed at all.
-
-    The precise terms and conditions for copying, distribution and
-  modification follow.
-
-          GNU GENERAL PUBLIC LICENSE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-    0. This License applies to any program or other work which contains
-  a notice placed by the copyright holder saying it may be distributed
-  under the terms of this General Public License.  The "Program", below,
-  refers to any such program or work, and a "work based on the Program"
-  means either the Program or any derivative work under copyright law:
-  that is to say, a work containing the Program or a portion of it,
-  either verbatim or with modifications and/or translated into another
-  language.  (Hereinafter, translation is included without limitation in
-  the term "modification".)  Each licensee is addressed as "you".
-
-  Activities other than copying, distribution and modification are not
-  covered by this License; they are outside its scope.  The act of
-  running the Program is not restricted, and the output from the Program
-  is covered only if its contents constitute a work based on the
-  Program (independent of having been made by running the Program).
-  Whether that is true depends on what the Program does.
-
-    1. You may copy and distribute verbatim copies of the Program's
-  source code as you receive it, in any medium, provided that you
-  conspicuously and appropriately publish on each copy an appropriate
-  copyright notice and disclaimer of warranty; keep intact all the
-  notices that refer to this License and to the absence of any warranty;
-  and give any other recipients of the Program a copy of this License
-  along with the Program.
-
-  You may charge a fee for the physical act of transferring a copy, and
-  you may at your option offer warranty protection in exchange for a fee.
-
-    2. You may modify your copy or copies of the Program or any portion
-  of it, thus forming a work based on the Program, and copy and
-  distribute such modifications or work under the terms of Section 1
-  above, provided that you also meet all of these conditions:
-
-      a) You must cause the modified files to carry prominent notices
-      stating that you changed the files and the date of any change.
-
-      b) You must cause any work that you distribute or publish, that in
-      whole or in part contains or is derived from the Program or any
-      part thereof, to be licensed as a whole at no charge to all third
-      parties under the terms of this License.
-
-      c) If the modified program normally reads commands interactively
-      when run, you must cause it, when started running for such
-      interactive use in the most ordinary way, to print or display an
-      announcement including an appropriate copyright notice and a
-      notice that there is no warranty (or else, saying that you provide
-      a warranty) and that users may redistribute the program under
-      these conditions, and telling the user how to view a copy of this
-      License.  (Exception: if the Program itself is interactive but
-      does not normally print such an announcement, your work based on
-      the Program is not required to print an announcement.)
-
-  These requirements apply to the modified work as a whole.  If
-  identifiable sections of that work are not derived from the Program,
-  and can be reasonably considered independent and separate works in
-  themselves, then this License, and its terms, do not apply to those
-  sections when you distribute them as separate works.  But when you
-  distribute the same sections as part of a whole which is a work based
-  on the Program, the distribution of the whole must be on the terms of
-  this License, whose permissions for other licensees extend to the
-  entire whole, and thus to each and every part regardless of who wrote it.
-
-  Thus, it is not the intent of this section to claim rights or contest
-  your rights to work written entirely by you; rather, the intent is to
-  exercise the right to control the distribution of derivative or
-  collective works based on the Program.
-
-  In addition, mere aggregation of another work not based on the Program
-  with the Program (or with a work based on the Program) on a volume of
-  a storage or distribution medium does not bring the other work under
-  the scope of this License.
-
-    3. You may copy and distribute the Program (or a work based on it,
-  under Section 2) in object code or executable form under the terms of
-  Sections 1 and 2 above provided that you also do one of the following:
-
-      a) Accompany it with the complete corresponding machine-readable
-      source code, which must be distributed under the terms of Sections
-      1 and 2 above on a medium customarily used for software interchange; or,
-
-      b) Accompany it with a written offer, valid for at least three
-      years, to give any third party, for a charge no more than your
-      cost of physically performing source distribution, a complete
-      machine-readable copy of the corresponding source code, to be
-      distributed under the terms of Sections 1 and 2 above on a medium
-      customarily used for software interchange; or,
-
-      c) Accompany it with the information you received as to the offer
-      to distribute corresponding source code.  (This alternative is
-      allowed only for noncommercial distribution and only if you
-      received the program in object code or executable form with such
-      an offer, in accord with Subsection b above.)
-
-  The source code for a work means the preferred form of the work for
-  making modifications to it.  For an executable work, complete source
-  code means all the source code for all modules it contains, plus any
-  associated interface definition files, plus the scripts used to
-  control compilation and installation of the executable.  However, as a
-  special exception, the source code distributed need not include
-  anything that is normally distributed (in either source or binary
-  form) with the major components (compiler, kernel, and so on) of the
-  operating system on which the executable runs, unless that component
-  itself accompanies the executable.
-
-  If distribution of executable or object code is made by offering
-  access to copy from a designated place, then offering equivalent
-  access to copy the source code from the same place counts as
-  distribution of the source code, even though third parties are not
-  compelled to copy the source along with the object code.
-
-    4. You may not copy, modify, sublicense, or distribute the Program
-  except as expressly provided under this License.  Any attempt
-  otherwise to copy, modify, sublicense or distribute the Program is
-  void, and will automatically terminate your rights under this License.
-  However, parties who have received copies, or rights, from you under
-  this License will not have their licenses terminated so long as such
-  parties remain in full compliance.
-
-    5. You are not required to accept this License, since you have not
-  signed it.  However, nothing else grants you permission to modify or
-  distribute the Program or its derivative works.  These actions are
-  prohibited by law if you do not accept this License.  Therefore, by
-  modifying or distributing the Program (or any work based on the
-  Program), you indicate your acceptance of this License to do so, and
-  all its terms and conditions for copying, distributing or modifying
-  the Program or works based on it.
-
-    6. Each time you redistribute the Program (or any work based on the
-  Program), the recipient automatically receives a license from the
-  original licensor to copy, distribute or modify the Program subject to
-  these terms and conditions.  You may not impose any further
-  restrictions on the recipients' exercise of the rights granted herein.
-  You are not responsible for enforcing compliance by third parties to
-  this License.
-
-    7. If, as a consequence of a court judgment or allegation of patent
-  infringement or for any other reason (not limited to patent issues),
-  conditions are imposed on you (whether by court order, agreement or
-  otherwise) that contradict the conditions of this License, they do not
-  excuse you from the conditions of this License.  If you cannot
-  distribute so as to satisfy simultaneously your obligations under this
-  License and any other pertinent obligations, then as a consequence you
-  may not distribute the Program at all.  For example, if a patent
-  license would not permit royalty-free redistribution of the Program by
-  all those who receive copies directly or indirectly through you, then
-  the only way you could satisfy both it and this License would be to
-  refrain entirely from distribution of the Program.
-
-  If any portion of this section is held invalid or unenforceable under
-  any particular circumstance, the balance of the section is intended to
-  apply and the section as a whole is intended to apply in other
-  circumstances.
-
-  It is not the purpose of this section to induce you to infringe any
-  patents or other property right claims or to contest validity of any
-  such claims; this section has the sole purpose of protecting the
-  integrity of the free software distribution system, which is
-  implemented by public license practices.  Many people have made
-  generous contributions to the wide range of software distributed
-  through that system in reliance on consistent application of that
-  system; it is up to the author/donor to decide if he or she is willing
-  to distribute software through any other system and a licensee cannot
-  impose that choice.
-
-  This section is intended to make thoroughly clear what is believed to
-  be a consequence of the rest of this License.
-
-    8. If the distribution and/or use of the Program is restricted in
-  certain countries either by patents or by copyrighted interfaces, the
-  original copyright holder who places the Program under this License
-  may add an explicit geographical distribution limitation excluding
-  those countries, so that distribution is permitted only in or among
-  countries not thus excluded.  In such case, this License incorporates
-  the limitation as if written in the body of this License.
-
-    9. The Free Software Foundation may publish revised and/or new versions
-  of the General Public License from time to time.  Such new versions will
-  be similar in spirit to the present version, but may differ in detail to
-  address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the Program
-  specifies a version number of this License which applies to it and "any
-  later version", you have the option of following the terms and conditions
-  either of that version or of any later version published by the Free
-  Software Foundation.  If the Program does not specify a version number of
-  this License, you may choose any version ever published by the Free Software
-  Foundation.
-
-    10. If you wish to incorporate parts of the Program into other free
-  programs whose distribution conditions are different, write to the author
-  to ask for permission.  For software which is copyrighted by the Free
-  Software Foundation, write to the Free Software Foundation; we sometimes
-  make exceptions for this.  Our decision will be guided by the two goals
-  of preserving the free status of all derivatives of our free software and
-  of promoting the sharing and reuse of software generally.
-
-            NO WARRANTY
-
-    11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-  FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-  OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-  PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-  OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-  TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-  PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-  REPAIR OR CORRECTION.
-
-    12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-  WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-  REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-  INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-  OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-  TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-  YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-  PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGES.
-
-           END OF TERMS AND CONDITIONS
-
-The complete text of the GNU Lesser General Public License 2.1 is as follows:
-
-        GNU LESSER GENERAL PUBLIC LICENSE
-             Version 2.1, February 1999
-
-   Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-   Everyone is permitted to copy and distribute verbatim copies
-   of this license document, but changing it is not allowed.
-
-  [This is the first released version of the Lesser GPL.  It also counts
-   as the successor of the GNU Library Public License, version 2, hence
-   the version number 2.1.]
-
-            Preamble
-
-    The licenses for most software are designed to take away your
-  freedom to share and change it.  By contrast, the GNU General Public
-  Licenses are intended to guarantee your freedom to share and change
-  free software--to make sure the software is free for all its users.
-
-    This license, the Lesser General Public License, applies to some
-  specially designated software packages--typically libraries--of the
-  Free Software Foundation and other authors who decide to use it.  You
-  can use it too, but we suggest you first think carefully about whether
-  this license or the ordinary General Public License is the better
-  strategy to use in any particular case, based on the explanations below.
-
-    When we speak of free software, we are referring to freedom of use,
-  not price.  Our General Public Licenses are designed to make sure that
-  you have the freedom to distribute copies of free software (and charge
-  for this service if you wish); that you receive source code or can get
-  it if you want it; that you can change the software and use pieces of
-  it in new free programs; and that you are informed that you can do
-  these things.
-
-    To protect your rights, we need to make restrictions that forbid
-  distributors to deny you these rights or to ask you to surrender these
-  rights.  These restrictions translate to certain responsibilities for
-  you if you distribute copies of the library or if you modify it.
-
-    For example, if you distribute copies of the library, whether gratis
-  or for a fee, you must give the recipients all the rights that we gave
-  you.  You must make sure that they, too, receive or can get the source
-  code.  If you link other code with the library, you must provide
-  complete object files to the recipients, so that they can relink them
-  with the library after making changes to the library and recompiling
-  it.  And you must show them these terms so they know their rights.
-
-    We protect your rights with a two-step method: (1) we copyright the
-  library, and (2) we offer you this license, which gives you legal
-  permission to copy, distribute and/or modify the library.
-
-    To protect each distributor, we want to make it very clear that
-  there is no warranty for the free library.  Also, if the library is
-  modified by someone else and passed on, the recipients should know
-  that what they have is not the original version, so that the original
-  author's reputation will not be affected by problems that might be
-  introduced by others.
-
-    Finally, software patents pose a constant threat to the existence of
-  any free program.  We wish to make sure that a company cannot
-  effectively restrict the users of a free program by obtaining a
-  restrictive license from a patent holder.  Therefore, we insist that
-  any patent license obtained for a version of the library must be
-  consistent with the full freedom of use specified in this license.
-
-    Most GNU software, including some libraries, is covered by the
-  ordinary GNU General Public License.  This license, the GNU Lesser
-  General Public License, applies to certain designated libraries, and
-  is quite different from the ordinary General Public License.  We use
-  this license for certain libraries in order to permit linking those
-  libraries into non-free programs.
-
-    When a program is linked with a library, whether statically or using
-  a shared library, the combination of the two is legally speaking a
-  combined work, a derivative of the original library.  The ordinary
-  General Public License therefore permits such linking only if the
-  entire combination fits its criteria of freedom.  The Lesser General
-  Public License permits more lax criteria for linking other code with
-  the library.
-
-    We call this license the "Lesser" General Public License because it
-  does Less to protect the user's freedom than the ordinary General
-  Public License.  It also provides other free software developers Less
-  of an advantage over competing non-free programs.  These disadvantages
-  are the reason we use the ordinary General Public License for many
-  libraries.  However, the Lesser license provides advantages in certain
-  special circumstances.
-
-    For example, on rare occasions, there may be a special need to
-  encourage the widest possible use of a certain library, so that it becomes
-  a de-facto standard.  To achieve this, non-free programs must be
-  allowed to use the library.  A more frequent case is that a free
-  library does the same job as widely used non-free libraries.  In this
-  case, there is little to gain by limiting the free library to free
-  software only, so we use the Lesser General Public License.
-
-    In other cases, permission to use a particular library in non-free
-  programs enables a greater number of people to use a large body of
-  free software.  For example, permission to use the GNU C Library in
-  non-free programs enables many more people to use the whole GNU
-  operating system, as well as its variant, the GNU/Linux operating
-  system.
-
-    Although the Lesser General Public License is Less protective of the
-  users' freedom, it does ensure that the user of a program that is
-  linked with the Library has the freedom and the wherewithal to run
-  that program using a modified version of the Library.
-
-    The precise terms and conditions for copying, distribution and
-  modification follow.  Pay close attention to the difference between a
-  "work based on the library" and a "work that uses the library".  The
-  former contains code derived from the library, whereas the latter must
-  be combined with the library in order to run.
-
-        GNU LESSER GENERAL PUBLIC LICENSE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-    0. This License Agreement applies to any software library or other
-  program which contains a notice placed by the copyright holder or
-  other authorized party saying it may be distributed under the terms of
-  this Lesser General Public License (also called "this License").
-  Each licensee is addressed as "you".
-
-    A "library" means a collection of software functions and/or data
-  prepared so as to be conveniently linked with application programs
-  (which use some of those functions and data) to form executables.
-
-    The "Library", below, refers to any such software library or work
-  which has been distributed under these terms.  A "work based on the
-  Library" means either the Library or any derivative work under
-  copyright law: that is to say, a work containing the Library or a
-  portion of it, either verbatim or with modifications and/or translated
-  straightforwardly into another language.  (Hereinafter, translation is
-  included without limitation in the term "modification".)
-
-    "Source code" for a work means the preferred form of the work for
-  making modifications to it.  For a library, complete source code means
-  all the source code for all modules it contains, plus any associated
-  interface definition files, plus the scripts used to control compilation
-  and installation of the library.
-
-    Activities other than copying, distribution and modification are not
-  covered by this License; they are outside its scope.  The act of
-  running a program using the Library is not restricted, and output from
-  such a program is covered only if its contents constitute a work based
-  on the Library (independent of the use of the Library in a tool for
-  writing it).  Whether that is true depends on what the Library does
-  and what the program that uses the Library does.
-  
-    1. You may copy and distribute verbatim copies of the Library's
-  complete source code as you receive it, in any medium, provided that
-  you conspicuously and appropriately publish on each copy an
-  appropriate copyright notice and disclaimer of warranty; keep intact
-  all the notices that refer to this License and to the absence of any
-  warranty; and distribute a copy of this License along with the
-  Library.
-
-    You may charge a fee for the physical act of transferring a copy,
-  and you may at your option offer warranty protection in exchange for a
-  fee.
-
-    2. You may modify your copy or copies of the Library or any portion
-  of it, thus forming a work based on the Library, and copy and
-  distribute such modifications or work under the terms of Section 1
-  above, provided that you also meet all of these conditions:
-
-      a) The modified work must itself be a software library.
-
-      b) You must cause the files modified to carry prominent notices
-      stating that you changed the files and the date of any change.
-
-      c) You must cause the whole of the work to be licensed at no
-      charge to all third parties under the terms of this License.
-
-      d) If a facility in the modified Library refers to a function or a
-      table of data to be supplied by an application program that uses
-      the facility, other than as an argument passed when the facility
-      is invoked, then you must make a good faith effort to ensure that,
-      in the event an application does not supply such function or
-      table, the facility still operates, and performs whatever part of
-      its purpose remains meaningful.
-
-      (For example, a function in a library to compute square roots has
-      a purpose that is entirely well-defined independent of the
-      application.  Therefore, Subsection 2d requires that any
-      application-supplied function or table used by this function must
-      be optional: if the application does not supply it, the square
-      root function must still compute square roots.)
-
-  These requirements apply to the modified work as a whole.  If
-  identifiable sections of that work are not derived from the Library,
-  and can be reasonably considered independent and separate works in
-  themselves, then this License, and its terms, do not apply to those
-  sections when you distribute them as separate works.  But when you
-  distribute the same sections as part of a whole which is a work based
-  on the Library, the distribution of the whole must be on the terms of
-  this License, whose permissions for other licensees extend to the
-  entire whole, and thus to each and every part regardless of who wrote
-  it.
-
-  Thus, it is not the intent of this section to claim rights or contest
-  your rights to work written entirely by you; rather, the intent is to
-  exercise the right to control the distribution of derivative or
-  collective works based on the Library.
-
-  In addition, mere aggregation of another work not based on the Library
-  with the Library (or with a work based on the Library) on a volume of
-  a storage or distribution medium does not bring the other work under
-  the scope of this License.
-
-    3. You may opt to apply the terms of the ordinary GNU General Public
-  License instead of this License to a given copy of the Library.  To do
-  this, you must alter all the notices that refer to this License, so
-  that they refer to the ordinary GNU General Public License, version 2,
-  instead of to this License.  (If a newer version than version 2 of the
-  ordinary GNU General Public License has appeared, then you can specify
-  that version instead if you wish.)  Do not make any other change in
-  these notices.
-
-    Once this change is made in a given copy, it is irreversible for
-  that copy, so the ordinary GNU General Public License applies to all
-  subsequent copies and derivative works made from that copy.
-
-    This option is useful when you wish to copy part of the code of
-  the Library into a program that is not a library.
-
-    4. You may copy and distribute the Library (or a portion or
-  derivative of it, under Section 2) in object code or executable form
-  under the terms of Sections 1 and 2 above provided that you accompany
-  it with the complete corresponding machine-readable source code, which
-  must be distributed under the terms of Sections 1 and 2 above on a
-  medium customarily used for software interchange.
-
-    If distribution of object code is made by offering access to copy
-  from a designated place, then offering equivalent access to copy the
-  source code from the same place satisfies the requirement to
-  distribute the source code, even though third parties are not
-  compelled to copy the source along with the object code.
-
-    5. A program that contains no derivative of any portion of the
-  Library, but is designed to work with the Library by being compiled or
-  linked with it, is called a "work that uses the Library".  Such a
-  work, in isolation, is not a derivative work of the Library, and
-  therefore falls outside the scope of this License.
-
-    However, linking a "work that uses the Library" with the Library
-  creates an executable that is a derivative of the Library (because it
-  contains portions of the Library), rather than a "work that uses the
-  library".  The executable is therefore covered by this License.
-  Section 6 states terms for distribution of such executables.
-
-    When a "work that uses the Library" uses material from a header file
-  that is part of the Library, the object code for the work may be a
-  derivative work of the Library even though the source code is not.
-  Whether this is true is especially significant if the work can be
-  linked without the Library, or if the work is itself a library.  The
-  threshold for this to be true is not precisely defined by law.
-
-    If such an object file uses only numerical parameters, data
-  structure layouts and accessors, and small macros and small inline
-  functions (ten lines or less in length), then the use of the object
-  file is unrestricted, regardless of whether it is legally a derivative
-  work.  (Executables containing this object code plus portions of the
-  Library will still fall under Section 6.)
-
-    Otherwise, if the work is a derivative of the Library, you may
-  distribute the object code for the work under the terms of Section 6.
-  Any executables containing that work also fall under Section 6,
-  whether or not they are linked directly with the Library itself.
-
-    6. As an exception to the Sections above, you may also combine or
-  link a "work that uses the Library" with the Library to produce a
-  work containing portions of the Library, and distribute that work
-  under terms of your choice, provided that the terms permit
-  modification of the work for the customer's own use and reverse
-  engineering for debugging such modifications.
-
-    You must give prominent notice with each copy of the work that the
-  Library is used in it and that the Library and its use are covered by
-  this License.  You must supply a copy of this License.  If the work
-  during execution displays copyright notices, you must include the
-  copyright notice for the Library among them, as well as a reference
-  directing the user to the copy of this License.  Also, you must do one
-  of these things:
-
-      a) Accompany the work with the complete corresponding
-      machine-readable source code for the Library including whatever
-      changes were used in the work (which must be distributed under
-      Sections 1 and 2 above); and, if the work is an executable linked
-      with the Library, with the complete machine-readable "work that
-      uses the Library", as object code and/or source code, so that the
-      user can modify the Library and then relink to produce a modified
-      executable containing the modified Library.  (It is understood
-      that the user who changes the contents of definitions files in the
-      Library will not necessarily be able to recompile the application
-      to use the modified definitions.)
-
-      b) Use a suitable shared library mechanism for linking with the
-      Library.  A suitable mechanism is one that (1) uses at run time a
-      copy of the library already present on the user's computer system,
-      rather than copying library functions into the executable, and (2)
-      will operate properly with a modified version of the library, if
-      the user installs one, as long as the modified version is
-      interface-compatible with the version that the work was made with.
-
-      c) Accompany the work with a written offer, valid for at
-      least three years, to give the same user the materials
-      specified in Subsection 6a, above, for a charge no more
-      than the cost of performing this distribution.
-
-      d) If distribution of the work is made by offering access to copy
-      from a designated place, offer equivalent access to copy the above
-      specified materials from the same place.
-
-      e) Verify that the user has already received a copy of these
-      materials or that you have already sent this user a copy.
-
-    For an executable, the required form of the "work that uses the
-  Library" must include any data and utility programs needed for
-  reproducing the executable from it.  However, as a special exception,
-  the materials to be distributed need not include anything that is
-  normally distributed (in either source or binary form) with the major
-  components (compiler, kernel, and so on) of the operating system on
-  which the executable runs, unless that component itself accompanies
-  the executable.
-
-    It may happen that this requirement contradicts the license
-  restrictions of other proprietary libraries that do not normally
-  accompany the operating system.  Such a contradiction means you cannot
-  use both them and the Library together in an executable that you
-  distribute.
-
-    7. You may place library facilities that are a work based on the
-  Library side-by-side in a single library together with other library
-  facilities not covered by this License, and distribute such a combined
-  library, provided that the separate distribution of the work based on
-  the Library and of the other library facilities is otherwise
-  permitted, and provided that you do these two things:
-
-      a) Accompany the combined library with a copy of the same work
-      based on the Library, uncombined with any other library
-      facilities.  This must be distributed under the terms of the
-      Sections above.
-
-      b) Give prominent notice with the combined library of the fact
-      that part of it is a work based on the Library, and explaining
-      where to find the accompanying uncombined form of the same work.
-
-    8. You may not copy, modify, sublicense, link with, or distribute
-  the Library except as expressly provided under this License.  Any
-  attempt otherwise to copy, modify, sublicense, link with, or
-  distribute the Library is void, and will automatically terminate your
-  rights under this License.  However, parties who have received copies,
-  or rights, from you under this License will not have their licenses
-  terminated so long as such parties remain in full compliance.
-
-    9. You are not required to accept this License, since you have not
-  signed it.  However, nothing else grants you permission to modify or
-  distribute the Library or its derivative works.  These actions are
-  prohibited by law if you do not accept this License.  Therefore, by
-  modifying or distributing the Library (or any work based on the
-  Library), you indicate your acceptance of this License to do so, and
-  all its terms and conditions for copying, distributing or modifying
-  the Library or works based on it.
-
-    10. Each time you redistribute the Library (or any work based on the
-  Library), the recipient automatically receives a license from the
-  original licensor to copy, distribute, link with or modify the Library
-  subject to these terms and conditions.  You may not impose any further
-  restrictions on the recipients' exercise of the rights granted herein.
-  You are not responsible for enforcing compliance by third parties with
-  this License.
-
-    11. If, as a consequence of a court judgment or allegation of patent
-  infringement or for any other reason (not limited to patent issues),
-  conditions are imposed on you (whether by court order, agreement or
-  otherwise) that contradict the conditions of this License, they do not
-  excuse you from the conditions of this License.  If you cannot
-  distribute so as to satisfy simultaneously your obligations under this
-  License and any other pertinent obligations, then as a consequence you
-  may not distribute the Library at all.  For example, if a patent
-  license would not permit royalty-free redistribution of the Library by
-  all those who receive copies directly or indirectly through you, then
-  the only way you could satisfy both it and this License would be to
-  refrain entirely from distribution of the Library.
-
-  If any portion of this section is held invalid or unenforceable under any
-  particular circumstance, the balance of the section is intended to apply,
-  and the section as a whole is intended to apply in other circumstances.
-
-  It is not the purpose of this section to induce you to infringe any
-  patents or other property right claims or to contest validity of any
-  such claims; this section has the sole purpose of protecting the
-  integrity of the free software distribution system which is
-  implemented by public license practices.  Many people have made
-  generous contributions to the wide range of software distributed
-  through that system in reliance on consistent application of that
-  system; it is up to the author/donor to decide if he or she is willing
-  to distribute software through any other system and a licensee cannot
-  impose that choice.
-
-  This section is intended to make thoroughly clear what is believed to
-  be a consequence of the rest of this License.
-
-    12. If the distribution and/or use of the Library is restricted in
-  certain countries either by patents or by copyrighted interfaces, the
-  original copyright holder who places the Library under this License may add
-  an explicit geographical distribution limitation excluding those countries,
-  so that distribution is permitted only in or among countries not thus
-  excluded.  In such case, this License incorporates the limitation as if
-  written in the body of this License.
-
-    13. The Free Software Foundation may publish revised and/or new
-  versions of the Lesser General Public License from time to time.
-  Such new versions will be similar in spirit to the present version,
-  but may differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the Library
-  specifies a version number of this License which applies to it and
-  "any later version", you have the option of following the terms and
-  conditions either of that version or of any later version published by
-  the Free Software Foundation.  If the Library does not specify a
-  license version number, you may choose any version ever published by
-  the Free Software Foundation.
-
-    14. If you wish to incorporate parts of the Library into other free
-  programs whose distribution conditions are incompatible with these,
-  write to the author to ask for permission.  For software which is
-  copyrighted by the Free Software Foundation, write to the Free
-  Software Foundation; we sometimes make exceptions for this.  Our
-  decision will be guided by the two goals of preserving the free status
-  of all derivatives of our free software and of promoting the sharing
-  and reuse of software generally.
-
-            NO WARRANTY
-
-    15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-  WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-  OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-  KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-  PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-  LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-  THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-    16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-  WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-  AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-  FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-  CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-  LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-  RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-  FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-  SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-  DAMAGES.
-
-           END OF TERMS AND CONDITIONS
-
-             How to Apply These Terms to Your New Libraries
-
-    If you develop a new library, and you want it to be of the greatest
-  possible use to the public, we recommend making it free software that
-  everyone can redistribute and change.  You can do so by permitting
-  redistribution under these terms (or, alternatively, under the terms of the
-  ordinary General Public License).
-
-    To apply these terms, attach the following notices to the library.  It is
-  safest to attach them to the start of each source file to most effectively
-  convey the exclusion of warranty; and each file should have at least the
-  "copyright" line and a pointer to where the full notice is found.
-
-      <one line to give the library's name and a brief idea of what it does.>
-      Copyright (C) <year>  <name of author>
-
-      This library is free software; you can redistribute it and/or
-      modify it under the terms of the GNU Lesser General Public
-      License as published by the Free Software Foundation; either
-      version 2.1 of the License, or (at your option) any later version.
-
-      This library is distributed in the hope that it will be useful,
-      but WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Lesser General Public License for more details.
-
-      You should have received a copy of the GNU Lesser General Public
-      License along with this library; if not, write to the Free Software
-      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-  Also add information on how to contact you by electronic and paper mail.
-
-  You should also get your employer (if you work as a programmer) or your
-  school, if any, to sign a "copyright disclaimer" for the library, if
-  necessary.  Here is a sample; alter the names:
-
-    Yoyodyne, Inc., hereby disclaims all copyright interest in the
-    library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-    <signature of Ty Coon>, 1 April 1990
-    Ty Coon, President of Vice
-
-  That's all there is to it!
-
-The following licenses cover code other than JRuby which is included with JRuby.
-
-Licenses listed below include:
-
-* GNU General Public License version 3
-* Apache 2.0 License
-* BSD License
-* Apache Software License Version 1.1
-* MIT License
-
-The complete text of the GNU General Public License version 3 is as follows:
-
-          GNU GENERAL PUBLIC LICENSE
-             Version 3, 29 June 2007
-
-   Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
-   Everyone is permitted to copy and distribute verbatim copies
-   of this license document, but changing it is not allowed.
-
-            Preamble
-
-    The GNU General Public License is a free, copyleft license for
-  software and other kinds of works.
-
-    The licenses for most software and other practical works are designed
-  to take away your freedom to share and change the works.  By contrast,
-  the GNU General Public License is intended to guarantee your freedom to
-  share and change all versions of a program--to make sure it remains free
-  software for all its users.  We, the Free Software Foundation, use the
-  GNU General Public License for most of our software; it applies also to
-  any other work released this way by its authors.  You can apply it to
-  your programs, too.
-
-    When we speak of free software, we are referring to freedom, not
-  price.  Our General Public Licenses are designed to make sure that you
-  have the freedom to distribute copies of free software (and charge for
-  them if you wish), that you receive source code or can get it if you
-  want it, that you can change the software or use pieces of it in new
-  free programs, and that you know you can do these things.
-
-    To protect your rights, we need to prevent others from denying you
-  these rights or asking you to surrender the rights.  Therefore, you have
-  certain responsibilities if you distribute copies of the software, or if
-  you modify it: responsibilities to respect the freedom of others.
-
-    For example, if you distribute copies of such a program, whether
-  gratis or for a fee, you must pass on to the recipients the same
-  freedoms that you received.  You must make sure that they, too, receive
-  or can get the source code.  And you must show them these terms so they
-  know their rights.
-
-    Developers that use the GNU GPL protect your rights with two steps:
-  (1) assert copyright on the software, and (2) offer you this License
-  giving you legal permission to copy, distribute and/or modify it.
-
-    For the developers' and authors' protection, the GPL clearly explains
-  that there is no warranty for this free software.  For both users' and
-  authors' sake, the GPL requires that modified versions be marked as
-  changed, so that their problems will not be attributed erroneously to
-  authors of previous versions.
-
-    Some devices are designed to deny users access to install or run
-  modified versions of the software inside them, although the manufacturer
-  can do so.  This is fundamentally incompatible with the aim of
-  protecting users' freedom to change the software.  The systematic
-  pattern of such abuse occurs in the area of products for individuals to
-  use, which is precisely where it is most unacceptable.  Therefore, we
-  have designed this version of the GPL to prohibit the practice for those
-  products.  If such problems arise substantially in other domains, we
-  stand ready to extend this provision to those domains in future versions
-  of the GPL, as needed to protect the freedom of users.
-
-    Finally, every program is threatened constantly by software patents.
-  States should not allow patents to restrict development and use of
-  software on general-purpose computers, but in those that do, we wish to
-  avoid the special danger that patents applied to a free program could
-  make it effectively proprietary.  To prevent this, the GPL assures that
-  patents cannot be used to render the program non-free.
-
-    The precise terms and conditions for copying, distribution and
-  modification follow.
-
-             TERMS AND CONDITIONS
-
-    0. Definitions.
-
-    "This License" refers to version 3 of the GNU General Public License.
-
-    "Copyright" also means copyright-like laws that apply to other kinds of
-  works, such as semiconductor masks.
- 
-    "The Program" refers to any copyrightable work licensed under this
-  License.  Each licensee is addressed as "you".  "Licensees" and
-  "recipients" may be individuals or organizations.
-
-    To "modify" a work means to copy from or adapt all or part of the work
-  in a fashion requiring copyright permission, other than the making of an
-  exact copy.  The resulting work is called a "modified version" of the
-  earlier work or a work "based on" the earlier work.
-
-    A "covered work" means either the unmodified Program or a work based
-  on the Program.
-
-    To "propagate" a work means to do anything with it that, without
-  permission, would make you directly or secondarily liable for
-  infringement under applicable copyright law, except executing it on a
-  computer or modifying a private copy.  Propagation includes copying,
-  distribution (with or without modification), making available to the
-  public, and in some countries other activities as well.
-
-    To "convey" a work means any kind of propagation that enables other
-  parties to make or receive copies.  Mere interaction with a user through
-  a computer network, with no transfer of a copy, is not conveying.
-
-    An interactive user interface displays "Appropriate Legal Notices"
-  to the extent that it includes a convenient and prominently visible
-  feature that (1) displays an appropriate copyright notice, and (2)
-  tells the user that there is no warranty for the work (except to the
-  extent that warranties are provided), that licensees may convey the
-  work under this License, and how to view a copy of this License.  If
-  the interface presents a list of user commands or options, such as a
-  menu, a prominent item in the list meets this criterion.
-
-    1. Source Code.
-
-    The "source code" for a work means the preferred form of the work
-  for making modifications to it.  "Object code" means any non-source
-  form of a work.
-
-    A "Standard Interface" means an interface that either is an official
-  standard defined by a recognized standards body, or, in the case of
-  interfaces specified for a particular programming language, one that
-  is widely used among developers working in that language.
-
-    The "System Libraries" of an executable work include anything, other
-  than the work as a whole, that (a) is included in the normal form of
-  packaging a Major Component, but which is not part of that Major
-  Component, and (b) serves only to enable use of the work with that
-  Major Component, or to implement a Standard Interface for which an
-  implementation is available to the public in source code form.  A
-  "Major Component", in this context, means a major essential component
-  (kernel, window system, and so on) of the specific operating system
-  (if any) on which the executable work runs, or a compiler used to
-  produce the work, or an object code interpreter used to run it.
-
-    The "Corresponding Source" for a work in object code form means all
-  the source code needed to generate, install, and (for an executable
-  work) run the object code and to modify the work, including scripts to
-  control those activities.  However, it does not include the work's
-  System Libraries, or general-purpose tools or generally available free
-  programs which are used unmodified in performing those activities but
-  which are not part of the work.  For example, Corresponding Source
-  includes interface definition files associated with source files for
-  the work, and the source code for shared libraries and dynamically
-  linked subprograms that the work is specifically designed to require,
-  such as by intimate data communication or control flow between those
-  subprograms and other parts of the work.
-
-    The Corresponding Source need not include anything that users
-  can regenerate automatically from other parts of the Corresponding
-  Source.
-
-    The Corresponding Source for a work in source code form is that
-  same work.
-
-    2. Basic Permissions.
-
-    All rights granted under this License are granted for the term of
-  copyright on the Program, and are irrevocable provided the stated
-  conditions are met.  This License explicitly affirms your unlimited
-  permission to run the unmodified Program.  The output from running a
-  covered work is covered by this License only if the output, given its
-  content, constitutes a covered work.  This License acknowledges your
-  rights of fair use or other equivalent, as provided by copyright law.
-
-    You may make, run and propagate covered works that you do not
-  convey, without conditions so long as your license otherwise remains
-  in force.  You may convey covered works to others for the sole purpose
-  of having them make modifications exclusively for you, or provide you
-  with facilities for running those works, provided that you comply with
-  the terms of this License in conveying all material for which you do
-  not control copyright.  Those thus making or running the covered works
-  for you must do so exclusively on your behalf, under your direction
-  and control, on terms that prohibit them from making any copies of
-  your copyrighted material outside their relationship with you.
-
-    Conveying under any other circumstances is permitted solely under
-  the conditions stated below.  Sublicensing is not allowed; section 10
-  makes it unnecessary.
-
-    3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-    No covered work shall be deemed part of an effective technological
-  measure under any applicable law fulfilling obligations under article
-  11 of the WIPO copyright treaty adopted on 20 December 1996, or
-  similar laws prohibiting or restricting circumvention of such
-  measures.
-
-    When you convey a covered work, you waive any legal power to forbid
-  circumvention of technological measures to the extent such circumvention
-  is effected by exercising rights under this License with respect to
-  the covered work, and you disclaim any intention to limit operation or
-  modification of the work as a means of enforcing, against the work's
-  users, your or third parties' legal rights to forbid circumvention of
-  technological measures.
-
-    4. Conveying Verbatim Copies.
-
-    You may convey verbatim copies of the Program's source code as you
-  receive it, in any medium, provided that you conspicuously and
-  appropriately publish on each copy an appropriate copyright notice;
-  keep intact all notices stating that this License and any
-  non-permissive terms added in accord with section 7 apply to the code;
-  keep intact all notices of the absence of any warranty; and give all
-  recipients a copy of this License along with the Program.
-
-    You may charge any price or no price for each copy that you convey,
-  and you may offer support or warranty protection for a fee.
-
-    5. Conveying Modified Source Versions.
-
-    You may convey a work based on the Program, or the modifications to
-  produce it from the Program, in the form of source code under the
-  terms of section 4, provided that you also meet all of these conditions:
-
-      a) The work must carry prominent notices stating that you modified
-      it, and giving a relevant date.
-
-      b) The work must carry prominent notices stating that it is
-      released under this License and any conditions added under section
-      7.  This requirement modifies the requirement in section 4 to
-      "keep intact all notices".
-
-      c) You must license the entire work, as a whole, under this
-      License to anyone who comes into possession of a copy.  This
-      License will therefore apply, along with any applicable section 7
-      additional terms, to the whole of the work, and all its parts,
-      regardless of how they are packaged.  This License gives no
-      permission to license the work in any other way, but it does not
-      invalidate such permission if you have separately received it.
-
-      d) If the work has interactive user interfaces, each must display
-      Appropriate Legal Notices; however, if the Program has interactive
-      interfaces that do not display Appropriate Legal Notices, your
-      work need not make them do so.
-
-    A compilation of a covered work with other separate and independent
-  works, which are not by their nature extensions of the covered work,
-  and which are not combined with it such as to form a larger program,
-  in or on a volume of a storage or distribution medium, is called an
-  "aggregate" if the compilation and its resulting copyright are not
-  used to limit the access or legal rights of the compilation's users
-  beyond what the individual works permit.  Inclusion of a covered work
-  in an aggregate does not cause this License to apply to the other
-  parts of the aggregate.
-
-    6. Conveying Non-Source Forms.
-
-    You may convey a covered work in object code form under the terms
-  of sections 4 and 5, provided that you also convey the
-  machine-readable Corresponding Source under the terms of this License,
-  in one of these ways:
-
-      a) Convey the object code in, or embodied in, a physical product
-      (including a physical distribution medium), accompanied by the
-      Corresponding Source fixed on a durable physical medium
-      customarily used for software interchange.
-
-      b) Convey the object code in, or embodied in, a physical product
-      (including a physical distribution medium), accompanied by a
-      written offer, valid for at least three years and valid for as
-      long as you offer spare parts or customer support for that product
-      model, to give anyone who possesses the object code either (1) a
-      copy of the Corresponding Source for all the software in the
-      product that is covered by this License, on a durable physical
-      medium customarily used for software interchange, for a price no
-      more than your reasonable cost of physically performing this
-      conveying of source, or (2) access to copy the
-      Corresponding Source from a network server at no charge.
-
-      c) Convey individual copies of the object code with a copy of the
-      written offer to provide the Corresponding Source.  This
-      alternative is allowed only occasionally and noncommercially, and
-      only if you received the object code with such an offer, in accord
-      with subsection 6b.
-
-      d) Convey the object code by offering access from a designated
-      place (gratis or for a charge), and offer equivalent access to the
-      Corresponding Source in the same way through the same place at no
-      further charge.  You need not require recipients to copy the
-      Corresponding Source along with the object code.  If the place to
-      copy the object code is a network server, the Corresponding Source
-      may be on a different server (operated by you or a third party)
-      that supports equivalent copying facilities, provided you maintain
-      clear directions next to the object code saying where to find the
-      Corresponding Source.  Regardless of what server hosts the
-      Corresponding Source, you remain obligated to ensure that it is
-      available for as long as needed to satisfy these requirements.
-
-      e) Convey the object code using peer-to-peer transmission, provided
-      you inform other peers where the object code and Corresponding
-      Source of the work are being offered to the general public at no
-      charge under subsection 6d.
-
-    A separable portion of the object code, whose source code is excluded
-  from the Corresponding Source as a System Library, need not be
-  included in conveying the object code work.
-
-    A "User Product" is either (1) a "consumer product", which means any
-  tangible personal property which is normally used for personal, family,
-  or household purposes, or (2) anything designed or sold for incorporation
-  into a dwelling.  In determining whether a product is a consumer product,
-  doubtful cases shall be resolved in favor of coverage.  For a particular
-  product received by a particular user, "normally used" refers to a
-  typical or common use of that class of product, regardless of the status
-  of the particular user or of the way in which the particular user
-  actually uses, or expects or is expected to use, the product.  A product
-  is a consumer product regardless of whether the product has substantial
-  commercial, industrial or non-consumer uses, unless such uses represent
-  the only significant mode of use of the product.
-
-    "Installation Information" for a User Product means any methods,
-  procedures, authorization keys, or other information required to install
-  and execute modified versions of a covered work in that User Product from
-  a modified version of its Corresponding Source.  The information must
-  suffice to ensure that the continued functioning of the modified object
-  code is in no case prevented or interfered with solely because
-  modification has been made.
-
-    If you convey an object code work under this section in, or with, or
-  specifically for use in, a User Product, and the conveying occurs as
-  part of a transaction in which the right of possession and use of the
-  User Product is transferred to the recipient in perpetuity or for a
-  fixed term (regardless of how the transaction is characterized), the
-  Corresponding Source conveyed under this section must be accompanied
-  by the Installation Information.  But this requirement does not apply
-  if neither you nor any third party retains the ability to install
-  modified object code on the User Product (for example, the work has
-  been installed in ROM).
-
-    The requirement to provide Installation Information does not include a
-  requirement to continue to provide support service, warranty, or updates
-  for a work that has been modified or installed by the recipient, or for
-  the User Product in which it has been modified or installed.  Access to a
-  network may be denied when the modification itself materially and
-  adversely affects the operation of the network or violates the rules and
-  protocols for communication across the network.
-
-    Corresponding Source conveyed, and Installation Information provided,
-  in accord with this section must be in a format that is publicly
-  documented (and with an implementation available to the public in
-  source code form), and must require no special password or key for
-  unpacking, reading or copying.
-
-    7. Additional Terms.
-
-    "Additional permissions" are terms that supplement the terms of this
-  License by making exceptions from one or more of its conditions.
-  Additional permissions that are applicable to the entire Program shall
-  be treated as though they were included in this License, to the extent
-  that they are valid under applicable law.  If additional permissions
-  apply only to part of the Program, that part may be used separately
-  under those permissions, but the entire Program remains governed by
-  this License without regard to the additional permissions.
-
-    When you convey a copy of a covered work, you may at your option
-  remove any additional permissions from that copy, or from any part of
-  it.  (Additional permissions may be written to require their own
-  removal in certain cases when you modify the work.)  You may place
-  additional permissions on material, added by you to a covered work,
-  for which you have or can give appropriate copyright permission.
-
-    Notwithstanding any other provision of this License, for material you
-  add to a covered work, you may (if authorized by the copyright holders of
-  that material) supplement the terms of this License with terms:
-
-      a) Disclaiming warranty or limiting liability differently from the
-      terms of sections 15 and 16 of this License; or
-
-      b) Requiring preservation of specified reasonable legal notices or
-      author attributions in that material or in the Appropriate Legal
-      Notices displayed by works containing it; or
-
-      c) Prohibiting misrepresentation of the origin of that material, or
-      requiring that modified versions of such material be marked in
-      reasonable ways as different from the original version; or
-
-      d) Limiting the use for publicity purposes of names of licensors or
-      authors of the material; or
-
-      e) Declining to grant rights under trademark law for use of some
-      trade names, trademarks, or service marks; or
-
-      f) Requiring indemnification of licensors and authors of that
-      material by anyone who conveys the material (or modified versions of
-      it) with contractual assumptions of liability to the recipient, for
-      any liability that these contractual assumptions directly impose on
-      those licensors and authors.
-
-    All other non-permissive additional terms are considered "further
-  restrictions" within the meaning of section 10.  If the Program as you
-  received it, or any part of it, contains a notice stating that it is
-  governed by this License along with a term that is a further
-  restriction, you may remove that term.  If a license document contains
-  a further restriction but permits relicensing or conveying under this
-  License, you may add to a covered work material governed by the terms
-  of that license document, provided that the further restriction does
-  not survive such relicensing or conveying.
-
-    If you add terms to a covered work in accord with this section, you
-  must place, in the relevant source files, a statement of the
-  additional terms that apply to those files, or a notice indicating
-  where to find the applicable terms.
-
-    Additional terms, permissive or non-permissive, may be stated in the
-  form of a separately written license, or stated as exceptions;
-  the above requirements apply either way.
-
-    8. Termination.
-
-    You may not propagate or modify a covered work except as expressly
-  provided under this License.  Any attempt otherwise to propagate or
-  modify it is void, and will automatically terminate your rights under
-  this License (including any patent licenses granted under the third
-  paragraph of section 11).
-
-    However, if you cease all violation of this License, then your
-  license from a particular copyright holder is reinstated (a)
-  provisionally, unless and until the copyright holder explicitly and
-  finally terminates your license, and (b) permanently, if the copyright
-  holder fails to notify you of the violation by some reasonable means
-  prior to 60 days after the cessation.
-
-    Moreover, your license from a particular copyright holder is
-  reinstated permanently if the copyright holder notifies you of the
-  violation by some reasonable means, this is the first time you have
-  received notice of violation of this License (for any work) from that
-  copyright holder, and you cure the violation prior to 30 days after
-  your receipt of the notice.
-
-    Termination of your rights under this section does not terminate the
-  licenses of parties who have received copies or rights from you under
-  this License.  If your rights have been terminated and not permanently
-  reinstated, you do not qualify to receive new licenses for the same
-  material under section 10.
-
-    9. Acceptance Not Required for Having Copies.
-
-    You are not required to accept this License in order to receive or
-  run a copy of the Program.  Ancillary propagation of a covered work
-  occurring solely as a consequence of using peer-to-peer transmission
-  to receive a copy likewise does not require acceptance.  However,
-  nothing other than this License grants you permission to propagate or
-  modify any covered work.  These actions infringe copyright if you do
-  not accept this License.  Therefore, by modifying or propagating a
-  covered work, you indicate your acceptance of this License to do so.
-
-    10. Automatic Licensing of Downstream Recipients.
-
-    Each time you convey a covered work, the recipient automatically
-  receives a license from the original licensors, to run, modify and
-  propagate that work, subject to this License.  You are not responsible
-  for enforcing compliance by third parties with this License.
-
-    An "entity transaction" is a transaction transferring control of an
-  organization, or substantially all assets of one, or subdividing an
-  organization, or merging organizations.  If propagation of a covered
-  work results from an entity transaction, each party to that
-  transaction who receives a copy of the work also receives whatever
-  licenses to the work the party's predecessor in interest had or could
-  give under the previous paragraph, plus a right to possession of the
-  Corresponding Source of the work from the predecessor in interest, if
-  the predecessor has it or can get it with reasonable efforts.
-
-    You may not impose any further restrictions on the exercise of the
-  rights granted or affirmed under this License.  For example, you may
-  not impose a license fee, royalty, or other charge for exercise of
-  rights granted under this License, and you may not initiate litigation
-  (including a cross-claim or counterclaim in a lawsuit) alleging that
-  any patent claim is infringed by making, using, selling, offering for
-  sale, or importing the Program or any portion of it.
-
-    11. Patents.
-
-    A "contributor" is a copyright holder who authorizes use under this
-  License of the Program or a work on which the Program is based.  The
-  work thus licensed is called the contributor's "contributor version".
-
-    A contributor's "essential patent claims" are all patent claims
-  owned or controlled by the contributor, whether already acquired or
-  hereafter acquired, that would be infringed by some manner, permitted
-  by this License, of making, using, or selling its contributor version,
-  but do not include claims that would be infringed only as a
-  consequence of further modification of the contributor version.  For
-  purposes of this definition, "control" includes the right to grant
-  patent sublicenses in a manner consistent with the requirements of
-  this License.
-
-    Each contributor grants you a non-exclusive, worldwide, royalty-free
-  patent license under the contributor's essential patent claims, to
-  make, use, sell, offer for sale, import and otherwise run, modify and
-  propagate the contents of its contributor version.
-
-    In the following three paragraphs, a "patent license" is any express
-  agreement or commitment, however denominated, not to enforce a patent
-  (such as an express permission to practice a patent or covenant not to
-  sue for patent infringement).  To "grant" such a patent license to a
-  party means to make such an agreement or commitment not to enforce a
-  patent against the party.
-
-    If you convey a covered work, knowingly relying on a patent license,
-  and the Corresponding Source of the work is not available for anyone
-  to copy, free of charge and under the terms of this License, through a
-  publicly available network server or other readily accessible means,
-  then you must either (1) cause the Corresponding Source to be so
-  available, or (2) arrange to deprive yourself of the benefit of the
-  patent license for this particular work, or (3) arrange, in a manner
-  consistent with the requirements of this License, to extend the patent
-  license to downstream recipients.  "Knowingly relying" means you have
-  actual knowledge that, but for the patent license, your conveying the
-  covered work in a country, or your recipient's use of the covered work
-  in a country, would infringe one or more identifiable patents in that
-  country that you have reason to believe are valid.
-  
-    If, pursuant to or in connection with a single transaction or
-  arrangement, you convey, or propagate by procuring conveyance of, a
-  covered work, and grant a patent license to some of the parties
-  receiving the covered work authorizing them to use, propagate, modify
-  or convey a specific copy of the covered work, then the patent license
-  you grant is automatically extended to all recipients of the covered
-  work and works based on it.
-
-    A patent license is "discriminatory" if it does not include within
-  the scope of its coverage, prohibits the exercise of, or is
-  conditioned on the non-exercise of one or more of the rights that are
-  specifically granted under this License.  You may not convey a covered
-  work if you are a party to an arrangement with a third party that is
-  in the business of distributing software, under which you make payment
-  to the third party based on the extent of your activity of conveying
-  the work, and under which the third party grants, to any of the
-  parties who would receive the covered work from you, a discriminatory
-  patent license (a) in connection with copies of the covered work
-  conveyed by you (or copies made from those copies), or (b) primarily
-  for and in connection with specific products or compilations that
-  contain the covered work, unless you entered into that arrangement,
-  or that patent license was granted, prior to 28 March 2007.
-
-    Nothing in this License shall be construed as excluding or limiting
-  any implied license or other defenses to infringement that may
-  otherwise be available to you under applicable patent law.
-
-    12. No Surrender of Others' Freedom.
-
-    If conditions are imposed on you (whether by court order, agreement or
-  otherwise) that contradict the conditions of this License, they do not
-  excuse you from the conditions of this License.  If you cannot convey a
-  covered work so as to satisfy simultaneously your obligations under this
-  License and any other pertinent obligations, then as a consequence you may
-  not convey it at all.  For example, if you agree to terms that obligate you
-  to collect a royalty for further conveying from those to whom you convey
-  the Program, the only way you could satisfy both those terms and this
-  License would be to refrain entirely from conveying the Program.
-
-    13. Use with the GNU Affero General Public License.
-
-    Notwithstanding any other provision of this License, you have
-  permission to link or combine any covered work with a work licensed
-  under version 3 of the GNU Affero General Public License into a single
-  combined work, and to convey the resulting work.  The terms of this
-  License will continue to apply to the part which is the covered work,
-  but the special requirements of the GNU Affero General Public License,
-  section 13, concerning interaction through a network will apply to the
-  combination as such.
-
-    14. Revised Versions of this License.
-
-    The Free Software Foundation may publish revised and/or new versions of
-  the GNU General Public License from time to time.  Such new versions will
-  be similar in spirit to the present version, but may differ in detail to
-  address new problems or concerns.
-
-    Each version is given a distinguishing version number.  If the
-  Program specifies that a certain numbered version of the GNU General
-  Public License "or any later version" applies to it, you have the
-  option of following the terms and conditions either of that numbered
-  version or of any later version published by the Free Software
-  Foundation.  If the Program does not specify a version number of the
-  GNU General Public License, you may choose any version ever published
-  by the Free Software Foundation.
-
-    If the Program specifies that a proxy can decide which future
-  versions of the GNU General Public License can be used, that proxy's
-  public statement of acceptance of a version permanently authorizes you
-  to choose that version for the Program.
-
-    Later license versions may give you additional or different
-  permissions.  However, no additional obligations are imposed on any
-  author or copyright holder as a result of your choosing to follow a
-  later version.
-
-    15. Disclaimer of Warranty.
-
-    THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-  APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-  HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-  OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-  PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-  IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-  ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-    16. Limitation of Liability.
-
-    IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-  WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-  THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-  GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-  USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-  DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-  PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-  EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-  SUCH DAMAGES.
-
-    17. Interpretation of Sections 15 and 16.
-
-    If the disclaimer of warranty and limitation of liability provided
-  above cannot be given local legal effect according to their terms,
-  reviewing courts shall apply local law that most closely approximates
-  an absolute waiver of all civil liability in connection with the
-  Program, unless a warranty or assumption of liability accompanies a
-  copy of the Program in return for a fee.
-
-           END OF TERMS AND CONDITIONS
-
-        How to Apply These Terms to Your New Programs
-
-    If you develop a new program, and you want it to be of the greatest
-  possible use to the public, the best way to achieve this is to make it
-  free software which everyone can redistribute and change under these terms.
-
-    To do so, attach the following notices to the program.  It is safest
-  to attach them to the start of each source file to most effectively
-  state the exclusion of warranty; and each file should have at least
-  the "copyright" line and a pointer to where the full notice is found.
-
-      <one line to give the program's name and a brief idea of what it does.>
-      Copyright (C) <year>  <name of author>
-
-      This program is free software: you can redistribute it and/or modify
-      it under the terms of the GNU General Public License as published by
-      the Free Software Foundation, either version 3 of the License, or
-      (at your option) any later version.
-
-      This program is distributed in the hope that it will be useful,
-      but WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-      GNU General Public License for more details.
-
-      You should have received a copy of the GNU General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-  Also add information on how to contact you by electronic and paper mail.
-
-    If the program does terminal interaction, make it output a short
-  notice like this when it starts in an interactive mode:
-
-      <program>  Copyright (C) <year>  <name of author>
-      This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-      This is free software, and you are welcome to redistribute it
-      under certain conditions; type `show c' for details.
-
-  The hypothetical commands `show w' and `show c' should show the appropriate
-  parts of the General Public License.  Of course, your program's commands
-  might be different; for a GUI interface, you would use an "about box".
-
-    You should also get your employer (if you work as a programmer) or school,
-  if any, to sign a "copyright disclaimer" for the program, if necessary.
-  For more information on this, and how to apply and follow the GNU GPL, see
-  <http://www.gnu.org/licenses/>.
-
-    The GNU General Public License does not permit incorporating your program
-  into proprietary programs.  If your program is a subroutine library, you
-  may consider it more useful to permit linking proprietary applications with
-  the library.  If this is what you want to do, use the GNU Lesser General
-  Public License instead of this License.  But first, please read
-  <http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
-The complete text of the Apache 2.0 License is as follows:
-
-                                Apache License
-                          Version 2.0, January 2004
-                       http://www.apache.org/licenses/
-
-  TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-  1. Definitions.
-
-     "License" shall mean the terms and conditions for use, reproduction,
-     and distribution as defined by Sections 1 through 9 of this document.
-
-     "Licensor" shall mean the copyright owner or entity authorized by
-     the copyright owner that is granting the License.
-
-     "Legal Entity" shall mean the union of the acting entity and all
-     other entities that control, are controlled by, or are under common
-     control with that entity. For the purposes of this definition,
-     "control" means (i) the power, direct or indirect, to cause the
-     direction or management of such entity, whether by contract or
-     otherwise, or (ii) ownership of fifty percent (50%) or more of the
-     outstanding shares, or (iii) beneficial ownership of such entity.
-
-     "You" (or "Your") shall mean an individual or Legal Entity
-     exercising permissions granted by this License.
-
-     "Source" form shall mean the preferred form for making modifications,
-     including but not limited to software source code, documentation
-     source, and configuration files.
-
-     "Object" form shall mean any form resulting from mechanical
-     transformation or translation of a Source form, including but
-     not limited to compiled object code, generated documentation,
-     and conversions to other media types.
-
-     "Work" shall mean the work of authorship, whether in Source or
-     Object form, made available under the License, as indicated by a
-     copyright notice that is included in or attached to the work
-     (an example is provided in the Appendix below).
-
-     "Derivative Works" shall mean any work, whether in Source or Object
-     form, that is based on (or derived from) the Work and for which the
-     editorial revisions, annotations, elaborations, or other modifications
-     represent, as a whole, an original work of authorship. For the purposes
-     of this License, Derivative Works shall not include works that remain
-     separable from, or merely link (or bind by name) to the interfaces of,
-     the Work and Derivative Works thereof.
-
-     "Contribution" shall mean any work of authorship, including
-     the original version of the Work and any modifications or additions
-     to that Work or Derivative Works thereof, that is intentionally
-     submitted to Licensor for inclusion in the Work by the copyright owner
-     or by an individual or Legal Entity authorized to submit on behalf of
-     the copyright owner. For the purposes of this definition, "submitted"
-     means any form of electronic, verbal, or written communication sent
-     to the Licensor or its representatives, including but not limited to
-     communication on electronic mailing lists, source code control systems,
-     and issue tracking systems that are managed by, or on behalf of, the
-     Licensor for the purpose of discussing and improving the Work, but
-     excluding communication that is conspicuously marked or otherwise
-     designated in writing by the copyright owner as "Not a Contribution."
-
-     "Contributor" shall mean Licensor and any individual or Legal Entity
-     on behalf of whom a Contribution has been received by Licensor and
-     subsequently incorporated within the Work.
-
-  2. Grant of Copyright License. Subject to the terms and conditions of
-     this License, each Contributor hereby grants to You a perpetual,
-     worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-     copyright license to reproduce, prepare Derivative Works of,
-     publicly display, publicly perform, sublicense, and distribute the
-     Work and such Derivative Works in Source or Object form.
-
-  3. Grant of Patent License. Subject to the terms and conditions of
-     this License, each Contributor hereby grants to You a perpetual,
-     worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-     (except as stated in this section) patent license to make, have made,
-     use, offer to sell, sell, import, and otherwise transfer the Work,
-     where such license applies only to those patent claims licensable
-     by such Contributor that are necessarily infringed by their
-     Contribution(s) alone or by combination of their Contribution(s)
-     with the Work to which such Contribution(s) was submitted. If You
-     institute patent litigation against any entity (including a
-     cross-claim or counterclaim in a lawsuit) alleging that the Work
-     or a Contribution incorporated within the Work constitutes direct
-     or contributory patent infringement, then any patent licenses
-     granted to You under this License for that Work shall terminate
-     as of the date such litigation is filed.
-
-  4. Redistribution. You may reproduce and distribute copies of the
-     Work or Derivative Works thereof in any medium, with or without
-     modifications, and in Source or Object form, provided that You
-     meet the following conditions:
-
-     (a) You must give any other recipients of the Work or
-         Derivative Works a copy of this License; and
-
-     (b) You must cause any modified files to carry prominent notices
-         stating that You changed the files; and
-
-     (c) You must retain, in the Source form of any Derivative Works
-         that You distribute, all copyright, patent, trademark, and
-         attribution notices from the Source form of the Work,
-         excluding those notices that do not pertain to any part of
-         the Derivative Works; and
-
-     (d) If the Work includes a "NOTICE" text file as part of its
-         distribution, then any Derivative Works that You distribute must
-         include a readable copy of the attribution notices contained
-         within such NOTICE file, excluding those notices that do not
-         pertain to any part of the Derivative Works, in at least one
-         of the following places: within a NOTICE text file distributed
-         as part of the Derivative Works; within the Source form or
-         documentation, if provided along with the Derivative Works; or,
-         within a display generated by the Derivative Works, if and
-         wherever such third-party notices normally appear. The contents
-         of the NOTICE file are for informational purposes only and
-         do not modify the License. You may add Your own attribution
-         notices within Derivative Works that You distribute, alongside
-         or as an addendum to the NOTICE text from the Work, provided
-         that such additional attribution notices cannot be construed
-         as modifying the License.
-
-     You may add Your own copyright statement to Your modifications and
-     may provide additional or different license terms and conditions
-     for use, reproduction, or distribution of Your modifications, or
-     for any such Derivative Works as a whole, provided Your use,
-     reproduction, and distribution of the Work otherwise complies with
-     the conditions stated in this License.
-
-  5. Submission of Contributions. Unless You explicitly state otherwise,
-     any Contribution intentionally submitted for inclusion in the Work
-     by You to the Licensor shall be under the terms and conditions of
-     this License, without any additional terms or conditions.
-     Notwithstanding the above, nothing herein shall supersede or modify
-     the terms of any separate license agreement you may have executed
-     with Licensor regarding such Contributions.
-
-  6. Trademarks. This License does not grant permission to use the trade
-     names, trademarks, service marks, or product names of the Licensor,
-     except as required for reasonable and customary use in describing the
-     origin of the Work and reproducing the content of the NOTICE file.
-
-  7. Disclaimer of Warranty. Unless required by applicable law or
-     agreed to in writing, Licensor provides the Work (and each
-     Contributor provides its Contributions) on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-     implied, including, without limitation, any warranties or conditions
-     of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-     PARTICULAR PURPOSE. You are solely responsible for determining the
-     appropriateness of using or redistributing the Work and assume any
-     risks associated with Your exercise of permissions under this License.
-
-  8. Limitation of Liability. In no event and under no legal theory,
-     whether in tort (including negligence), contract, or otherwise,
-     unless required by applicable law (such as deliberate and grossly
-     negligent acts) or agreed to in writing, shall any Contributor be
-     liable to You for damages, including any direct, indirect, special,
-     incidental, or consequential damages of any character arising as a
-     result of this License or out of the use or inability to use the
-     Work (including but not limited to damages for loss of goodwill,
-     work stoppage, computer failure or malfunction, or any and all
-     other commercial damages or losses), even if such Contributor
-     has been advised of the possibility of such damages.
-
-  9. Accepting Warranty or Additional Liability. While redistributing
-     the Work or Derivative Works thereof, You may choose to offer,
-     and charge a fee for, acceptance of support, warranty, indemnity,
-     or other liability obligations and/or rights consistent with this
-     License. However, in accepting such obligations, You may act only
-     on Your own behalf and on Your sole responsibility, not on behalf
-     of any other Contributor, and only if You agree to indemnify,
-     defend, and hold each Contributor harmless for any liability
-     incurred by, or claims asserted against, such Contributor by reason
-     of your accepting any such warranty or additional liability.
-
-  END OF TERMS AND CONDITIONS
-
-  APPENDIX: How to apply the Apache License to your work.
-
-     To apply the Apache License to your work, attach the following
-     boilerplate notice, with the fields enclosed by brackets "[]"
-     replaced with your own identifying information. (Don't include
-     the brackets!)  The text should be enclosed in the appropriate
-     comment syntax for the file format. We also recommend that a
-     file or class name and description of purpose be included on the
-     same "printed page" as the copyright notice for easier
-     identification within third-party archives.
-
-  Copyright [yyyy] [name of copyright owner]
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-The complete text of the BSD license can be is as follows:
-
-  Copyright (c) The Regents of the University of California.
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-  3. Neither the name of the University nor the names of its contributors
-     may be used to endorse or promote products derived from this software
-     without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-  SUCH DAMAGE.
-
-The complete text of the Apache Software License Version 1.1 is as follows:
-
- /*                                      
-  * ================================================================
-  *                   The Apache Software License, Version 1.1
-  * ================================================================
-  * 
-  *    Copyright (C) 2000-2002 The Apache Software Foundation. All
-  *    rights reserved.
-  * 
-  * Redistribution and use in source and binary forms, with or without 
-  * modification, are permitted provided that the following
-  * conditions are met:
-  * 
-  * 1. Redistributions of  source code must  retain the above copyright
-  *    notice, this list of conditions and the following disclaimer.
-  * 
-  * 2. Redistributions in binary form must reproduce the above copyright
-  *    notice, this list of conditions and the following disclaimer in
-  *    the documentation and/or other materials provided with the 
-  *    distribution.
-  * 
-  * 3. The end-user documentation included with the redistribution, if
-  *    any, must include  the following  acknowledgment:  "This product
-  *    includes  software developed  by the  Apache Software Foundation
-  *    (http://www.apache.org/)." Alternately, this  acknowledgment may
-  *    appear in the software itself, if and wherever such third-party
-  *    acknowledgments normally appear.
-  * 
-  * 4. The names "Ant" and  "Apache Software Foundation" must not be
-  *    used to endorse  or promote  products derived  from this software
-  *    without prior written permission. For written permission, please
-  *    contact apache@apache.org.
-  * 
-  * 5. Products derived from this software may not  be called "Apache",
-  *    nor may "Apache" appear  in their name,  without prior written
-  *    permission of the Apache Software Foundation.
-  * 
-  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
-  * OF MERCHANTABILITY AND FITNESS  FOR A PARTICULAR PURPOSE ARE 
-  * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION
-  * OR ITS CONTRIBUTORS BE LIABLE FOR  ANY DIRECT, INDIRECT, INCIDENTAL,
-  * SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLUDING, BUT NOT
-  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  * DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
-  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-  * TORT (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN ANY WAY OUT
-  * OF THE  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-  * OF SUCH DAMAGE.
-  * 
-  * This software  consists of voluntary contributions made by many
-  * individuals on behalf of the  Apache Software Foundation. For more
-  * information on the Apache Software Foundation, please see
-  * <http://www.apache.org/>.
-  *
-  */
-
-The complete text of the MIT license is as follows:
-
-  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.
-
-The complete text of the Eclipse Public License v1.0 is as follows:
-
-  Eclipse Public License - v 1.0
-  
-  THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
-  LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-  CONSTITUTES RECIPIENT’S ACCEPTANCE OF THIS AGREEMENT.
-  
-  1. DEFINITIONS
-  
-  "Contribution" means:
-  
-  a) in the case of the initial Contributor, the initial code and documentation
-  distributed under this Agreement, and
-  b) in the case of each subsequent Contributor:
-  
-  i) changes to the Program, and
-  
-  ii) additions to the Program;
-  
-  where such changes and/or additions to the Program originate from and are
-  distributed by that particular Contributor. A Contribution 'originates' from a
-  Contributor if it was added to the Program by such Contributor itself or anyone
-  acting on such Contributor’s behalf. Contributions do not include additions to
-  the Program which: (i) are separate modules of software distributed in
-  conjunction with the Program under their own license agreement, and (ii) are not
-  derivative works of the Program.
-  
-  "Contributor" means any person or entity that distributes the Program.
-  
-  "Licensed Patents " mean patent claims licensable by a Contributor which are
-  necessarily infringed by the use or sale of its Contribution alone or when
-  combined with the Program.
-  
-  "Program" means the Contributions distributed in accordance with this Agreement.
-  
-  "Recipient" means anyone who receives the Program under this Agreement,
-  including all Contributors.
-  
-  2. GRANT OF RIGHTS
-  
-  a) Subject to the terms of this Agreement, each Contributor hereby grants
-  Recipient a non-exclusive, worldwide, royalty-free copyright license to
-  reproduce, prepare derivative works of, publicly display, publicly perform,
-  distribute and sublicense the Contribution of such Contributor, if any, and such
-  derivative works, in source code and object code form.
-  
-  b) Subject to the terms of this Agreement, each Contributor hereby grants
-  Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
-  Patents to make, use, sell, offer to sell, import and otherwise transfer the
-  Contribution of such Contributor, if any, in source code and object code form.
-  This patent license shall apply to the combination of the Contribution and the
-  Program if, at the time the Contribution is added by the Contributor, such
-  addition of the Contribution causes such combination to be covered by the
-  Licensed Patents. The patent license shall not apply to any other combinations
-  which include the Contribution. No hardware per se is licensed hereunder.
-  
-  c) Recipient understands that although each Contributor grants the licenses to
-  its Contributions set forth herein, no assurances are provided by any
-  Contributor that the Program does not infringe the patent or other intellectual
-  property rights of any other entity. Each Contributor disclaims any liability to
-  Recipient for claims brought by any other entity based on infringement of
-  intellectual property rights or otherwise. As a condition to exercising the
-  rights and licenses granted hereunder, each Recipient hereby assumes sole
-  responsibility to secure any other intellectual property rights needed, if any.
-  For example, if a third party patent license is required to allow Recipient to
-  distribute the Program, it is Recipient’s responsibility to acquire that license
-  before distributing the Program.
-  
-  d) Each Contributor represents that to its knowledge it has sufficient copyright
-  rights in its Contribution, if any, to grant the copyright license set forth in
-  this Agreement.
-  
-  3. REQUIREMENTS
-  
-  A Contributor may choose to distribute the Program in object code form under its
-  own license agreement, provided that:
-  
-  a) it complies with the terms and conditions of this Agreement; and
-  
-  b) its license agreement:
-  
-  i) effectively disclaims on behalf of all Contributors all warranties and
-  conditions, express and implied, including warranties or conditions of title and
-  non-infringement, and implied warranties or conditions of merchantability and
-  fitness for a particular purpose;
-  
-  ii) effectively excludes on behalf of all Contributors all liability for
-  damages, including direct, indirect, special, incidental and consequential
-  damages, such as lost profits;
-  
-  iii) states that any provisions which differ from this Agreement are offered by
-  that Contributor alone and not by any other party; and
-  
-  iv) states that source code for the Program is available from such Contributor,
-  and informs licensees how to obtain it in a reasonable manner on or through a
-  medium customarily used for software exchange.
-  
-  When the Program is made available in source code form:
-  
-  a) it must be made available under this Agreement; and
-  b) a copy of this Agreement must be included with each copy of the Program.
-  
-  Contributors may not remove or alter any copyright notices contained within the
-  Program.
-  
-  Each Contributor must identify itself as the originator of its Contribution, if
-  any, in a manner that reasonably allows subsequent Recipients to identify the
-  originator of the Contribution.
-  
-  4. COMMERCIAL DISTRIBUTION
-  
-  Commercial distributors of software may accept certain responsibilities with
-  respect to end users, business partners and the like. While this license is
-  intended to facilitate the commercial use of the Program, the Contributor who
-  includes the Program in a commercial product offering should do so in a manner
-  which does not create potential liability for other Contributors. Therefore, if
-  a Contributor includes the Program in a commercial product offering, such
-  Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-  every other Contributor ("Indemnified Contributor") against any losses, damages
-  and costs (collectively "Losses") arising from claims, lawsuits and other legal
-  actions brought by a third party against the Indemnified Contributor to the
-  extent caused by the acts or omissions of such Commercial Contributor in
-  connection with its distribution of the Program in a commercial product
-  offering. The obligations in this section do not apply to any claims or Losses
-  relating to any actual or alleged intellectual property infringement. In order
-  to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-  Contributor in writing of such claim, and b) allow the Commercial Contributor to
-  control, and cooperate with the Commercial Contributor in, the defense and any
-  related settlement negotiations. The Indemnified Contributor may participate in
-  any such claim at its own expense.
-  
-  For example, a Contributor might include the Program in a commercial product
-  offering, Product X. That Contributor is then a Commercial Contributor. If that
-  Commercial Contributor then makes performance claims, or offers warranties
-  related to Product X, those performance claims and warranties are such
-  Commercial Contributor’s responsibility alone. Under this section, the
-  Commercial Contributor would have to defend claims against the other
-  Contributors related to those performance claims and warranties, and if a court
-  requires any other Contributor to pay any damages as a result, the Commercial
-  Contributor must pay those damages.
-  
-  5. NO WARRANTY
-  
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-  IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-  NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-  Recipient is solely responsible for determining the appropriateness of using and
-  distributing the Program and assumes all risks associated with its exercise of
-  rights under this Agreement , including but not limited to the risks and costs
-  of program errors, compliance with applicable laws, damage to or loss of data,
-  programs or equipment, and unavailability or interruption of operations.
-  
-  6. DISCLAIMER OF LIABILITY
-  
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-  CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-  PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-  OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-  GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-  
-  7. GENERAL
-  
-  If any provision of this Agreement is invalid or unenforceable under applicable
-  law, it shall not affect the validity or enforceability of the remainder of the
-  terms of this Agreement, and without further action by the parties hereto, such
-  provision shall be reformed to the minimum extent necessary to make such
-  provision valid and enforceable.
-  
-  If Recipient institutes patent litigation against any entity (including a
-  cross-claim or counterclaim in a lawsuit) alleging that the Program itself
-  (excluding combinations of the Program with other software or hardware)
-  infringes such Recipient’s patent(s), then such Recipient’s rights granted under
-  Section 2(b) shall terminate as of the date such litigation is filed.
-  
-  All Recipient’s rights under this Agreement shall terminate if it fails to
-  comply with any of the material terms or conditions of this Agreement and does
-  not cure such failure in a reasonable period of time after becoming aware of
-  such noncompliance. If all Recipient’s rights under this Agreement terminate,
-  Recipient agrees to cease use and distribution of the Program as soon as
-  reasonably practicable. However, Recipient’s obligations under this Agreement
-  and any licenses granted by Recipient relating to the Program shall continue and
-  survive.
-  
-  Everyone is permitted to copy and distribute copies of this Agreement, but in
-  order to avoid inconsistency the Agreement is copyrighted and may only be
-  modified in the following manner. The Agreement Steward reserves the right to
-  publish new versions (including revisions) of this Agreement from time to time.
-  No one other than the Agreement Steward has the right to modify this Agreement.
-  The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation
-  may assign the responsibility to serve as the Agreement Steward to a suitable
-  separate entity. Each new version of the Agreement will be given a
-  distinguishing version number. The Program (including Contributions) may always
-  be distributed subject to the version of the Agreement under which it was
-  received. In addition, after a new version of the Agreement is published,
-  Contributor may elect to distribute the Program (including its Contributions)
-  under the new version. Except as expressly stated in Sections 2(a) and 2(b)
-  above, Recipient receives no rights or licenses to the intellectual property of
-  any Contributor under this Agreement, whether expressly, by implication,
-  estoppel or otherwise. All rights in the Program not expressly granted under
-  this Agreement are reserved.
-  
-  This Agreement is governed by the laws of the State of New York and the
-  intellectual property laws of the United States of America. No party to this
-  Agreement will bring a legal action under this Agreement more than one year
-  after the cause of action arose. Each party waives its rights to a jury trial in
-  any resulting litigation.
-
---------------------------------------------------
-Library: cabin v0.9.0
-Url: https://github.com/jordansissel/ruby-cabin
-License: Apache-2.0
+==========
+Notice for: cabin-0.9.0
+----------
 
 Copyright 2011 Jordan Sissel
 
@@ -4010,64 +3034,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 
---------------------------------------------------
-Library: childprocess v0.9.0
-Url: http://github.com/enkessler/childprocess
-License: MIT
-
-Copyright (c) 2010-2015 Jari Bakken
-
-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.
-
---------------------------------------------------
-Library: chronic_duration v0.10.6
-Url: https://github.com/hpoydar/chronic_duration
-License: MIT
-
-Copyright (c) Henry Poydar
-
-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.
-
---------------------------------------------------
-Library: clamp v0.6.5
-Url: http://github.com/mdub/clamp
-License: MIT
+==========
+Notice for: clamp-1.3.2
+----------
 
 Copyright (c) 2010 Mike Williams <mdub@dogbiscuit.org>
 
@@ -4090,10 +3059,9 @@ 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.
 
---------------------------------------------------
-Library: coderay v1.1.2
-Url: http://coderay.rubychan.de
-License: MIT
+==========
+Notice for: coderay-1.1.3
+----------
 
 Copyright (C) 2005-2012 Kornelius Kalnbach <murphy@rubychan.de> (@murphy_karasu)
 
@@ -4117,11 +3085,9 @@ 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.
-
---------------------------------------------------
-Library: jackson-annotations v2.9.5
-Url: https://github.com/FasterXML/jackson-annotations
-License: Apache-2.0
+==========
+Notice for: com.fasterxml.jackson.core:jackson-annotations-2.15.4
+----------
 
 This copy of Jackson JSON processor annotations is licensed under the
 Apache (Software) License, version 2.0 ("the License").
@@ -4336,10 +3302,9 @@ http://www.apache.org/licenses/LICENSE-2.0
    See the License for the specific language governing permissions and
    limitations under the License.
 
---------------------------------------------------
-Library: jackson-core v2.9.5
-Url: https://github.com/FasterXML/jackson-core
-License: Apache-2.0
+==========
+Notice for: com.fasterxml.jackson.core:jackson-core-2.15.4
+----------
 
 # Jackson JSON processor
 
@@ -4564,11 +3529,9 @@ from the source code management (SCM) system project uses.
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
---------------------------------------------------
-Library: jackson-databind v2.9.5
-Url: https://github.com/FasterXML/jackson-databind
-License: Apache-2.0
+==========
+Notice for: com.fasterxml.jackson.core:jackson-databind-2.15.4
+----------
 
 # Jackson JSON processor
 
@@ -4802,11 +3765,9 @@ http://www.apache.org/licenses/LICENSE-2.0
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
---------------------------------------------------
-Library: jackson-dataformat-cbor v2.9.5
-Url: https://github.com/FasterXML/jackson-dataformats-binary
-License: Apache-2.0
+==========
+Notice for: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor-2.16.2
+----------
 
 This copy of Jackson JSON processor databind module is licensed under the
 Apache (Software) License, version 2.0 ("the License").
@@ -5019,11 +3980,9 @@ http://www.apache.org/licenses/LICENSE-2.0
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
---------------------------------------------------
-Library: jackson-module-afterburner v2.9.5
-Url: https://github.com/FasterXML/jackson-modules-base
-License: Apache-2.0
+==========
+Notice for: com.fasterxml.jackson.module:jackson-module-afterburner-2.15.4
+----------
 
 This copy of Jackson JSON processor databind module is licensed under the
 Apache (Software) License, version 2.0 ("the License").
@@ -5236,70 +4195,9 @@ http://www.apache.org/licenses/LICENSE-2.0
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
---------------------------------------------------
-Library: jnr-unixsocket v
-Url: "https://github.com/jnr/jnr-unixsocket"
-License: Apache-2.0
-
-source: https://github.com/jnr/jnr-unixsocket/search?q=copyright
-
-Files in this project are licensed under the Apache-2.0 License, and are variably copyright as follows:
-
-    Copyright (C) 2009 Wayne Meissner
-    Copyright (C) 2014 Greg Vanore
-    Copyright (C) 2016 Fritz Elfert
-    Copyright (C) 2016 Marcus Linke
-
-source: https://github.com/jnr/jnr-unixsocket/blob/jnr-unixsocket-0.18/LICENSE
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
---------------------------------------------------
-Library: jnr-x86asm v
-Url: "https://github.com/jnr/jnr-x86asm"
-License: MIT
-
-source: https://github.com/jnr/jnr-x86asm/blob/1.0.2/LICENSE
-
- Copyright (C) 2010 Wayne Meissner
- Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr@gmail.com>
-
- 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.
-
---------------------------------------------------
-Library: google-java-format v1.1
-Url: https://github.com/google/google-java-format
-License: Apache-2.0
+==========
+Notice for: com.google.googlejavaformat:google-java-format-1.22.0
+----------
 
 Copyright 2015 Google Inc.
 
@@ -5573,10 +4471,9 @@ Program             Directory
 <none yet>
 
 
---------------------------------------------------
-Library: guava v19.0
-Url: https://github.com/google/guava
-License: Apache-2.0
+==========
+Notice for: com.google.guava:guava-33.1.0-jre
+----------
 
 
                                  Apache License
@@ -5780,11 +4677,9 @@ License: Apache-2.0
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
---------------------------------------------------
-Library: commons-codec v1.10.0
-Url: http://commons.apache.org/proper/commons-codec/
-License: Apache-2.0
+==========
+Notice for: commons-codec:commons-codec-1.17.0
+----------
 
 Apache Commons Codec
 Copyright 2002-2017 The Apache Software Foundation
@@ -6006,11 +4901,9 @@ Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
---------------------------------------------------
-Library: commons-logging v1.2.0
-Url: http://commons.apache.org/proper/commons-logging/
-License: Apache-2.0
+==========
+Notice for: commons-logging:commons-logging-1.2.0
+----------
 
 Apache Commons Logging
 Copyright 2003-2016 The Apache Software Foundation
@@ -6220,11 +5113,9 @@ The Apache Software Foundation (http://www.apache.org/).
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
---------------------------------------------------
-Library: concurrent-ruby v1.0.5
-Url: http://www.concurrent-ruby.com
-License: MIT
+==========
+Notice for: concurrent-ruby-1.1.9
+----------
 
 Copyright (c) Jerry D'Antonio -- released under the MIT license.
 
@@ -6248,19 +5139,11 @@ 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. 
 
---------------------------------------------------
-Library: controls.js v
-Url: https://github.com/controlsjs/controls.js
-License: GPL-3.0-only
+==========
+Notice for: dalli-3.2.8
+----------
 
-404: Not Found
-
---------------------------------------------------
-Library: crack v0.4.3
-Url: http://github.com/jnunemaker/crack
-License: MIT
-
-Copyright (c) 2009 John Nunemaker
+Copyright (c) Peter M. Goldstein, Mike Perham
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -6281,12 +5164,53 @@ 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.
 
---------------------------------------------------
-Library: diff-lcs v1.3
-Url: https://github.com/halostatue/diff-lcs
-License: MIT
+==========
+Notice for: date-3.3.3
+----------
 
-Copyright 2004–2013 Austin Ziegler.
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+==========
+Notice for: diff-lcs-1.6.0
+----------
+
+source: https://github.com/halostatue/diff-lcs/blob/v1.5.0/License.md
+
+== License
+
+This software is available under three licenses: the GNU GPL version 2 (or at
+your option, a later version), the Perl Artistic license, or the MIT license.
+Note that my preference for licensing is the MIT license, but Algorithm::Diff
+was dually originally licensed with the Perl Artistic and the GNU GPL ("the
+same terms as Perl itself") and given that the Ruby implementation originally
+hewed pretty closely to the Perl version, I must maintain the additional
+licensing terms.
+
+* Copyright 2004–2013 Austin Ziegler.
+* Adapted from Algorithm::Diff (Perl) by Ned Konz and a Smalltalk version by
+  Mario I. Wolczko.
+
+=== MIT License
 
 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
@@ -6306,10 +5230,14 @@ 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.
 
---------------------------------------------------
-Library: domain_name v0.5.20180417
-Url: https://github.com/knu/ruby-domain_name
-License: BSD-2-Clause
+=== Perl Artistic License (version 2)
+See the file docs/artistic.txt in the main distribution.
+
+=== GNU GPL version 2
+See the file docs/COPYING.txt in the main distribution.
+==========
+Notice for: domain_name-0.6.20240107
+----------
 
 Copyright (c) 2011-2017 Akinori MUSHA
 
@@ -6390,10 +5318,9 @@ This file is generated from the Public Suffix List
 
 https://mozilla.org/MPL/2.0/
 
---------------------------------------------------
-Library: dotenv v2.4.0
-Url: https://github.com/bkeepers/dotenv
-License: MIT
+==========
+Notice for: dotenv-3.1.7
+----------
 
 Copyright (c) 2012 Brandon Keepers
 
@@ -6418,10 +5345,62 @@ 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.
 
---------------------------------------------------
-Library: edn v1.1.1
-Url: https://github.com/relevance/edn-ruby
-License: MIT
+==========
+Notice for: down-5.2.4
+----------
+
+The MIT License (MIT)
+
+Copyright (c) 2015 Janko Marohnić
+
+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.
+==========
+Notice for: e2mmap-0.1.0
+----------
+
+source: https://github.com/ruby/e2mmap/blob/master/LICENSE.txt
+
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+==========
+Notice for: edn-1.1.1
+----------
 
 Copyright (c) 2012 Relevance Inc & Clinton N. Dreisbach
 
@@ -6446,52 +5425,9 @@ 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.
 
---------------------------------------------------
-Library: elasticsearch-api v5.0.4
-Url: https://github.com/elastic/elasticsearch-ruby
-License: Apache-2.0
-
-source: https://github.com/elastic/elasticsearch-ruby/blob/v5.0.4/elasticsearch-transport/LICENSE.txt
-
-Copyright (c) 2013 Elasticsearch
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
---------------------------------------------------
-Library: elasticsearch-transport v5.0.4
-Url: https://github.com/elastic/elasticsearch-ruby
-License: Apache-2.0
-
-source: https://github.com/elastic/elasticsearch-ruby/blob/v5.0.4/elasticsearch/LICENSE.txt
-
-Copyright (c) 2013 Elasticsearch
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
---------------------------------------------------
-Library: elasticsearch v5.0.4
-Url: https://github.com/elastic/elasticsearch-ruby
-License: Apache-2.0
+==========
+Notice for: elasticsearch-7.17.11
+----------
 
 source: https://github.com/elastic/elasticsearch-ruby/blob/v5.0.4/elasticsearch-api/LICENSE.txt
 
@@ -6509,10 +5445,49 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
---------------------------------------------------
-Library: equalizer v0.0.10
-Url: https://github.com/dkubb/equalizer
-License: MIT
+==========
+Notice for: elasticsearch-api-7.17.11
+----------
+
+source: https://github.com/elastic/elasticsearch-ruby/blob/v5.0.4/elasticsearch-transport/LICENSE.txt
+
+Copyright (c) 2013 Elasticsearch
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+==========
+Notice for: elasticsearch-transport-7.17.11
+----------
+
+source: https://github.com/elastic/elasticsearch-ruby/blob/v5.0.4/elasticsearch/LICENSE.txt
+
+Copyright (c) 2013 Elasticsearch
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+==========
+Notice for: equalizer-0.0.11
+----------
 
 source: https://github.com/dkubb/equalizer/blob/v0.0.10/LICENSE
 
@@ -6538,10 +5513,9 @@ 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.
 
---------------------------------------------------
-Library: faraday v0.9.2
-Url: https://github.com/lostisland/faraday
-License: MIT
+==========
+Notice for: faraday-1.10.4
+----------
 
 source: https://github.com/lostisland/faraday/blob/v0.9.2/LICENSE.md
 
@@ -6553,10 +5527,182 @@ The above copyright notice and this permission notice shall be included in all c
 
 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.
 
---------------------------------------------------
-Library: ffi v1.9.23
-Url: https://github.com/ffi/ffi
-License: BSD-3-CLAUSE
+==========
+Notice for: faraday-em_http-1.0.0
+----------
+
+source: https://github.com/lostisland/faraday-em_http/blob/v1.0.0/LICENSE.md
+
+The MIT License (MIT)
+
+Copyright (c) 2020 Jan van der Pas
+
+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.
+
+
+==========
+Notice for: faraday-em_synchrony-1.0.0
+----------
+
+source: https://github.com/lostisland/faraday-em_synchrony/blob/v1.0.0/LICENSE.md
+
+
+The MIT License (MIT)
+
+Copyright (c) 2020 Jan van der Pas
+
+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.
+
+
+==========
+Notice for: faraday-excon-1.1.0
+----------
+
+source: https://github.com/lostisland/faraday-excon/blob/v1.0.0/LICENSE.md
+
+
+The MIT License (MIT)
+
+Copyright (c) 2020 Jan van der Pas
+
+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.
+
+
+==========
+Notice for: faraday-httpclient-1.0.1
+----------
+
+sourcE: https://github.com/lostisland/faraday-httpclient/blob/v1.0/LICENSE.md
+
+
+The MIT License (MIT)
+
+Copyright (c) 2020 Jan van der Pas
+
+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.
+
+
+==========
+Notice for: faraday-multipart-1.1.0
+----------
+
+source: https://github.com/lostisland/faraday-multipart/blob/v1.0.3/LICENSE.md
+
+
+The MIT License (MIT)
+
+Copyright (c) 2020 Jan van der Pas
+
+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.
+
+
+==========
+Notice for: faraday-net_http-1.0.2
+----------
+
+source: https://github.com/lostisland/faraday-net_http/blob/v1.0.0/LICENSE.md
+
+The MIT License (MIT)
+
+Copyright (c) 2020 Jan van der Pas
+
+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.
+
+
+==========
+Notice for: faraday-net_http_persistent-1.2.0
+----------
+
+source: https://github.com/lostisland/faraday-net_http_persistent/blob/v1.0.0/LICENSE.md
+
+The MIT License (MIT)
+
+Copyright (c) 2020 Jan van der Pas
+
+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.
+
+
+==========
+Notice for: faraday-patron-1.0.0
+----------
+
+source: https://github.com/lostisland/faraday-patron/blob/v1.0/LICENSE.md
+
+The MIT License (MIT)
+
+Copyright (c) 2020 Jan van der Pas
+
+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.
+
+==========
+Notice for: faraday-rack-1.0.0
+----------
+
+source: https://github.com/lostisland/faraday-rack/blob/v1.0.0/LICENSE.md
+
+The MIT License (MIT)
+
+Copyright (c) 2020 Jan van der Pas
+
+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.
+
+==========
+Notice for: faraday-retry-1.0.3
+----------
+
+source: https://github.com/lostisland/faraday-retry/blob/v1.0.3/LICENSE.md
+
+
+The MIT License (MIT)
+
+Copyright (c) 2020 Jan van der Pas
+
+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.
+
+
+==========
+Notice for: ffi-1.17.1
+----------
 
 source: https://github.com/ffi/ffi/blob/1.9.23/LICENSE
 
@@ -6585,10 +5731,9 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
---------------------------------------------------
-Library: filesize v0.0.4
-Url: https://github.com/dominikh
-License: MIT
+==========
+Notice for: filesize-0.2.0
+----------
 
 https://github.com/dominikh/filesize/blob/v0.0.4/LICENSE
 
@@ -6612,32 +5757,69 @@ 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.
 
---------------------------------------------------
-Library: filewatch v0.9.0
-Url: https://github.com/jordansissel/ruby-filewatch
-License: MIT
+==========
+Notice for: fileutils-1.7.3
+----------
 
-https://github.com/jordansissel/ruby-filewatch/blob/master/LICENSE
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
 
-License is MIT (very permissive).
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
 
---------------------------------------------------
-Library: ftw v0.0.48
-Url: https://github.com/jordansissel/ruby-ftw
-License: Apache-2.0
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+==========
+Notice for: gelfd2-0.4.1
+----------
 
-source: https://github.com/jordansissel/ruby-ftw/blob/master/ftw.gemspec#L19
+Copyright 2011-2013 John E. Vincent and contributors.
 
-Apache License (2.0)
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
---------------------------------------------------
-Library: gelf v3.0.0
-Url: https://github.com/graylog-labs/gelf-rb
-License: MIT
+http://www.apache.org/licenses/LICENSE-2.0
 
-source: https://github.com/graylog-labs/gelf-rb/blob/v3.0.0/LICENSE
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 
-Copyright (c) 2010-2016 Lennart Koopmann, Alexey Palazhchenko
+==========
+Notice for: gems-1.3.0
+----------
+
+source: https://github.com/rubygems/gems/blob/v0.8.3/LICENSE.md
+
+Copyright (c) 2011-2013 Erik Michaels-Ober
+
+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.
+
+==========
+Notice for: gene_pool-1.5.0
+----------
+
+Copyright (c) 2010-2011 Brad Pardee
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -6658,329 +5840,9 @@ 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.
 
---------------------------------------------------
-Library: gelfd v0.2.0
-Url: https://github.com/lusis/gelfd
-License: Apache-2.0
-
-source: https://github.com/lusis/gelfd/blob/master/LICENSE
-
-Copyright 2011-2013 John E. Vincent and contributors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
---------------------------------------------------
-Library: gems v0.8.3
-Url: https://github.com/rubygems/gems
-License: MIT
-
-source: https://github.com/rubygems/gems/blob/v0.8.3/LICENSE.md
-
-Copyright (c) 2011-2013 Erik Michaels-Ober
-
-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.
-
---------------------------------------------------
-Library: gmetric v0.1.3
-Url: https://github.com/igrigorik/gmetric
-License: MIT
-
-source: https://github.com/igrigorik/gmetric/blob/master/README.md
-
-The MIT License, Copyright (c) 2009 Ilya Grigorik
-
---------------------------------------------------
-Library: gradle-license-report v0.7.1
-Url: https://github.com/jk1/Gradle-License-Report
-License: Apache-2.0
-
-source: https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE
-
-                               Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
---------------------------------------------------
-Library: gserver v0.0.1
-Url: https://github.com/ruby/gserver/blob
-License: Ruby
-
-Source: https://github.com/ruby/gserver/blob/v0.0.1/LICENSE.txt
-
-Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
-You can redistribute it and/or modify it under either the terms of the
-2-clause BSDL (see the file BSDL), or the conditions below:
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or binary form,
-     provided that you do at least ONE of the following:
-
-       a) distribute the binaries and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-	  the software.
-
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under these terms.
-
-     For the list of those files and their copying conditions, see the
-     file LEGAL.
-
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
-
---------------------------------------------------
-Library: hitimes v1.2.6
-Url: https://github.com/copiousfreetime/hitimes
-License: ISC
+==========
+Notice for: hitimes-1.3.1
+----------
 
 source: https://github.com/copiousfreetime/hitimes/blob/v1.2.6/LICENSE
 
@@ -7000,10 +5862,37 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
---------------------------------------------------
-Library: http-cookie v1.0.3
-Url: https://github.com/sparklemotion/http-cookie
-License: MIT
+==========
+Notice for: http-3.3.0
+----------
+
+source: https://github.com/httprb/http/blob/v0.9.9/LICENSE.txt
+
+Copyright (c) 2011-2015 Tony Arcieri, Erik Michaels-Ober, Alexey V. Zapparov, Zachary Anker
+
+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.
+
+
+==========
+Notice for: http-cookie-1.0.8
+----------
 
 source: https://github.com/sparklemotion/http-cookie/blob/v1.0.3/LICENSE.txt
 
@@ -7032,10 +5921,9 @@ 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.
 
---------------------------------------------------
-Library: http-form_data v1.0.1
-Url: https://github.com/httprb/form_data
-License: MIT
+==========
+Notice for: http-form_data-2.3.0
+----------
 
 source: https://github.com/httprb/form_data/blob/v1.0.1/LICENSE.txt
 
@@ -7063,39 +5951,9 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
---------------------------------------------------
-Library: http v0.9.9
-Url: https://github.com/httprb/http
-License: MIT
-
-source: https://github.com/httprb/http/blob/v0.9.9/LICENSE.txt
-
-Copyright (c) 2011-2015 Tony Arcieri, Erik Michaels-Ober, Alexey V. Zapparov, Zachary Anker
-
-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.
-
-
---------------------------------------------------
-Library: http-parser.rb v0.6.0
-Url: https://github.com/tmm1/http_parser.rb
-License: MIT
+==========
+Notice for: http_parser.rb-0.6.0
+----------
 
 source: https://github.com/tmm1/http_parser.rb/blob/v0.6.0/LICENSE-MIT
 
@@ -7120,10 +5978,9 @@ 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.
 
---------------------------------------------------
-Library: i18n v0.6.9
-Url: https://github.com/svenfuchs/i18n
-License: MIT
+==========
+Notice for: i18n-1.14.7
+----------
 
 source: https://github.com/svenfuchs/i18n/blob/v0.6.9/MIT-LICENSE
 
@@ -7148,10 +6005,9 @@ 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.
 
---------------------------------------------------
-Library: insist v1.0.0
-Url: https://github.com/jordansissel/ruby-insist
-License: Apache-2.0
+==========
+Notice for: insist-1.0.0
+----------
 
 source: https://github.com/jordansissel/ruby-insist/blob/master/LICENSE
 
@@ -7169,31 +6025,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
---------------------------------------------------
-Library: invokebinder v1.7
-Url: https://github.com/headius/invokebinder
-License: Apache-2.0
-
-source: https://github.com/headius/invokebinder/search?q=copyright
-
-Copyright 2012-2014 headius.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
---------------------------------------------------
-Library: jar-dependencies v0.3.12
-Url: https://github.com/mkristian/jar-dependencies
-License: MIT
+==========
+Notice for: jar-dependencies-0.4.1
+----------
 
 source: https://github.com/mkristian/jar-dependencies/blob/0.3.12/MIT-LICENSE
 
@@ -7219,530 +6053,9 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
---------------------------------------------------
-Library: jay-yydebug v
-Url: https://github.com/jruby/jay-yydebug
-License: EPL-2.0|GPL-2.0|LGPL-2.1
-
-source: https://github.com/jruby/jruby/blob/master/COPYING
-
-JRuby is Copyright (c) 2007-2018 The JRuby project, and is released
-under a tri EPL/GPL/LGPL license. You can use it, redistribute it
-and/or modify it under the terms of the:
-
-  Eclipse Public License version 2.0
-    OR
-  GNU General Public License version 2
-    OR
-  GNU Lesser General Public License version 2.1
-
-bytelist (http://github.com/jruby/bytelist),
-jnr-posix (https://github.com/jnr/jnr-posix),
-jruby-openssl (https://github.com/jruby/jruby-openssl),
-jruby-readline (https://github.com/jruby/jruby-readline),
-psych (https://github.com/ruby/psych),
-yydebug (https://github.com/jruby/jay-yydebug/)
-are released under the same copyright/license.
-
-
---------------------------------------------------
-Library: jcodings v1.0.18
-Url: https://github.com/jruby/jcodings
-License: MIT
-
-source: https://github.com/jruby/jcodings/blob/master/LICENSE.txt
-
-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.
-
---------------------------------------------------
-Library: jdbc-derby v10.12.1.1
-Url: https://github.com/jruby/activerecord-jdbc-adapter
-License: Apache-2.0
-
-source: https://github.com/jruby/activerecord-jdbc-adapter/blob/master/jdbc-derby/LICENSE.txt
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
---------------------------------------------------
-Library: jffi v1.2.16
-Url: https://github.com/jnr/jffi
-License: Apache-2.0|LGPL-3.0
-
-source: https://github.com/jnr/jffi/blob/master/LICENSE
-
-Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-
-  Alternatively, you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
- 
-  This code is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-  version 3 for more details.
- 
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
-
---------------------------------------------------
-Library: jitescript v0.4.1
-Url: https://github.com/qmx/jitescript
-License: Apache-2.0
-
-  source: https://github.com/qmx/jitescript/blob/master/LICENSE
-
-                               Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-
---------------------------------------------------
-Library: jline2 v2.1.1
-Url: https://github.com/jline/jline2
-License: BSD-2-Clause
-
-source: https://github.com/jline/jline2/blob/master/LICENSE.txt
-
-Copyright (c) 2002-2016, the original author or authors.
-All rights reserved.
-
-http://www.opensource.org/licenses/bsd-license.php
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the following
-conditions are met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with
-the distribution.
-
-Neither the name of JLine nor the names of its contributors
-may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
---------------------------------------------------
-Library: jls-grok v0.11.4
-Url: https://github.com/jordansissel/ruby-grok
-License: Apache-2.0
+==========
+Notice for: jls-grok-0.11.5
+----------
 
 source: https://github.com/jordansissel/ruby-grok/blob/master/LICENSE
 
@@ -7948,10 +6261,9 @@ source: https://github.com/jordansissel/ruby-grok/blob/master/LICENSE
    See the License for the specific language governing permissions and
    limitations under the License.
 
---------------------------------------------------
-Library: jls-lumberjack v0.0.26
-Url: https://github.com/elastic/ruby-lumberjack
-License: Apache-2.0
+==========
+Notice for: jls-lumberjack-0.0.26
+----------
 
 source: https://github.com/elastic/ruby-lumberjack/blob/master/LICENSE
 
@@ -7970,10 +6282,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
---------------------------------------------------
-Library: jmespath v1.4.0
-Url: https://github.com/jmespath/jmespath.rb
-License: Apache-2.0
+==========
+Notice for: jmespath-1.6.2
+----------
 
 source: https://github.com/jmespath/jmespath.rb/blob/v1.4.0/LICENSE.txt
 
@@ -8152,512 +6463,279 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    incurred by, or claims asserted against, such Contributor by reason
    of your accepting any such warranty or additional liability.
 
---------------------------------------------------
-Library: jnr-constants v0.9.9
-Url: https://github.com/jnr/jnr-constants
-License: Apache-2.0|LGPL-3.0
+==========
+Notice for: jrjackson-0.4.20
+----------
 
-source: https://github.com/jnr/jnr-constants/blob/jnr-constants-0.9.9/LICENSE
+https://github.com/guyboertje/jrjackson/blob/v0.4.6/README.md
 
-Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+LICENSE applicable to this library:
 
-      http://www.apache.org/licenses/LICENSE-2.0
+Apache License 2.0 see http://www.apache.org/licenses/LICENSE-2.0
 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+==========
+Notice for: jruby-
+----------
 
+JRuby is Copyright (c) 2007-2018 The JRuby project, and is released
+under a tri EPL/GPL/LGPL license. You can use it, redistribute it
+and/or modify it under the terms of the:
 
-  Alternatively, you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  This code is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-  version 3 for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
-
---------------------------------------------------
-Library: jnr-enxio v0.16
-Url: https://github.com/jnr/jnr-enxio
-License: Apache-2.0|LGPL-3.0
-
-source: https://github.com/jnr/jnr-enxio/blob/jnr-enxio-0.16/LICENSE
-
-Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
---------------------------------------------------
-Library: jnr-ffi v2.1.7
-Url: https://github.com/jnr/jnr-ffi
-License: Apache-2.0|LGPL-3.0
-
-source: https://github.com/jnr/jnr-ffi/blob/master/LICENSE
-
-Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-
-  Alternatively, you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  This code is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-  version 3 for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
-
---------------------------------------------------
-Library: jnr-netdb v1.1.6
-Url: https://github.com/jnr/jnr-netdb
-License: Apache-2.0
-
-source: https://github.com/jnr/jnr-netdb/blob/master/LICENSE
-
-Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
---------------------------------------------------
-Library: jnr-posix v3.0.41
-Url: https://github.com/jnr/jnr-posix
-License: EPL-2.0|GPL-2.0|LGPL-2.1dependency
-
-source: https://github.com/jnr/jnr-posix/blob/master/LICENSE.txt
-
-jnr-posix is released under a tri EPL/GPL/LGPL license. You can use it,
-redistribute it and/or modify it under the terms of the:
-
-  Eclipse Public License version 1.0
+  Eclipse Public License version 2.0
+    OR
   GNU General Public License version 2
+    OR
   GNU Lesser General Public License version 2.1
 
+bytelist (http://github.com/jruby/bytelist),
+jnr-posix (https://github.com/jnr/jnr-posix),
+jruby-openssl (https://github.com/jruby/jruby-openssl),
+jruby-readline (https://github.com/jruby/jruby-readline),
+psych (https://github.com/ruby/psych),
+yydebug (https://github.com/jruby/jay-yydebug/)
+are released under the same copyright/license.
+
+Some additional libraries distributed with JRuby are not covered by
+JRuby's licence. Most of these libraries and their licenses are listed 
+below. Also see LICENSE.RUBY for most files found in lib/ruby/stdlib.
+
+ asm (http://asm.objectweb.org) is distributed under the BSD license and is
+
+   Copyright (c) 2000-2011 INRIA, France Telecom
+   All rights reserved.
+
+ jline2 (https://github.com/jline/jline2) is distributed under the BSD license:
+
+   Copyright (c) 2002-2012, the original author or authors.
+   All rights reserved.
+
+ jzlib (http://www.jcraft.com/jzlib/) is distributed under the BSD license:
+
+   Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved.
+
+ The "rake" library (https://github.com/ruby/rake) is distributed under
+ the MIT license, and has the following copyright:
+   
+   Copyright (c) 2003, 2004 Jim Weirich
+
+ jcodings (http://github.com/jruby/jcodings) and
+ joni (http://github.com/jruby/joni) are distributed
+ under the MIT license without copyright.
+
+ Bouncycastle is released under the MIT license:
+
+   Copyright (c) 2000 - 2006 The Legion Of The Bouncy Castle.
+
+ jnr-x86asm (https://github.com/jnr/jnr-x86asm) is distributed under the MIT
+ license with the following copyright:
+
+   Copyright (C) 2010 Wayne Meissner
+   Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr@gmail.com>
+
+ The following libraries are redistributed under the Apache Software
+ License v2.0, available below.
+   invokebinder (https://github.com/headius/invokebinder)
+   jffi (https://github.com/jnr/jffi)
+   jitescript (https://github.com/qmx/jitescript)
+   jnr-constants (http://github.com/jnr/jnr-constants)
+   jnr-enxio (https://github.com/jnr/jnr-enxio)
+   jnr-ffi (https://github.com/jnr/jnr-jffi)
+   jnr-netdb (http://github.com/jnr/jnr-netdb)
+   jnr-unixsocket (https://github.com/jnr/jnr-unixsocket)
+   joda-time (http://joda-time.sourceforge.net)
+   maven (http://maven.apache.org/)
+   nailgun (http://martiansoftware.com/nailgun)
+   options (https://github.com/headius/options)
+   snakeyaml (https://github.com/asomov/snakeyaml)
+   unsafe-fences (https://github.com/headius/unsafe-fences)
+
+ racc (runtime only, https://github.com/tenderlove/racc) is
+   distributed under the same license terms as the Ruby standard
+   library. This includes all files under lib/ruby/stdlib/racc.
+   See LICENSE.RUBY.
+
+ json-generator and json-parser (https://github.com/flori/json) native
+   extenstions under the same license terms as the Ruby standard library.
+   See LICENSE.RUBY
+
 The complete text of the Eclipse Public License is as follows:
 
-  Eclipse Public License - v 1.0
+  Eclipse Public License - v 2.0
 
-  THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-  PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-  OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+      THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+      PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+      OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
 
   1. DEFINITIONS
 
   "Contribution" means:
 
-      a) in the case of the initial Contributor, the initial code and
-         documentation distributed under this Agreement, and
+    a) in the case of the initial Contributor, the initial content
+       Distributed under this Agreement, and
 
-      b) in the case of each subsequent Contributor:
+    b) in the case of each subsequent Contributor:
+       i) changes to the Program, and
+       ii) additions to the Program;
+    where such changes and/or additions to the Program originate from
+    and are Distributed by that particular Contributor. A Contribution
+    "originates" from a Contributor if it was added to the Program by
+    such Contributor itself or anyone acting on such Contributor's behalf.
+    Contributions do not include changes or additions to the Program that
+    are not Modified Works.
 
-          i) changes to the Program, and
+  "Contributor" means any person or entity that Distributes the Program.
 
-          ii) additions to the Program;
-              where such changes and/or additions to the Program
-              originate from and are distributed by that particular
-              Contributor. A Contribution 'originates' from a
-              Contributor if it was added to the Program by such
-              Contributor itself or anyone acting on such
-              Contributor's behalf. Contributions do not include
-              additions to the Program which: (i) are separate modules
-              of software distributed in conjunction with the Program
-              under their own license agreement, and (ii) are not
-              derivative works of the Program.
+  "Licensed Patents" mean patent claims licensable by a Contributor which
+  are necessarily infringed by the use or sale of its Contribution alone
+  or when combined with the Program.
 
-  "Contributor" means any person or entity that distributes the Program.
+  "Program" means the Contributions Distributed in accordance with this
+  Agreement.
 
-  "Licensed Patents" mean patent claims licensable by a Contributor
-  which are necessarily infringed by the use or sale of its
-  Contribution alone or when combined with the Program.
+  "Recipient" means anyone who receives the Program under this Agreement
+  or any Secondary License (as applicable), including Contributors.
 
-  "Program" means the Contributions distributed in accordance with
-  this Agreement.
+  "Derivative Works" shall mean any work, whether in Source Code or other
+  form, that is based on (or derived from) the Program and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship.
 
-  "Recipient" means anyone who receives the Program under this
-  Agreement, including all Contributors.
+  "Modified Works" shall mean any work in Source Code or other form that
+  results from an addition to, deletion from, or modification of the
+  contents of the Program, including, for purposes of clarity any new file
+  in Source Code form that contains any contents of the Program. Modified
+  Works shall not include works that contain only declarations,
+  interfaces, types, classes, structures, or files of the Program solely
+  in each case in order to link to, bind by name, or subclass the Program
+  or Modified Works thereof.
+
+  "Distribute" means the acts of a) distributing or b) making available
+  in any manner that enables the transfer of a copy.
+
+  "Source Code" means the form of a Program preferred for making
+  modifications, including but not limited to software source code,
+  documentation source, and configuration files.
+
+  "Secondary License" means either the GNU General Public License,
+  Version 2.0, or any later versions of that license, including any
+  exceptions or additional permissions as identified by the initial
+  Contributor.
 
   2. GRANT OF RIGHTS
 
-      a) Subject to the terms of this Agreement, each Contributor
-         hereby grants Recipient a non-exclusive, worldwide,
-         royalty-free copyright license to reproduce, prepare
-         derivative works of, publicly display, publicly perform,
-         distribute and sublicense the Contribution of such
-         Contributor, if any, and such derivative works, in source
-         code and object code form.
+    a) Subject to the terms of this Agreement, each Contributor hereby
+    grants Recipient a non-exclusive, worldwide, royalty-free copyright
+    license to reproduce, prepare Derivative Works of, publicly display,
+    publicly perform, Distribute and sublicense the Contribution of such
+    Contributor, if any, and such Derivative Works.
 
-      b) Subject to the terms of this Agreement, each Contributor
-         hereby grants Recipient a non-exclusive, worldwide,
-         royalty-free patent license under Licensed Patents to make,
-         use, sell, offer to sell, import and otherwise transfer the
-         Contribution of such Contributor, if any, in source code and
-         object code form. This patent license shall apply to the
-         combination of the Contribution and the Program if, at the
-         time the Contribution is added by the Contributor, such
-         addition of the Contribution causes such combination to be
-         covered by the Licensed Patents. The patent license shall not
-         apply to any other combinations which include the
-         Contribution. No hardware per se is licensed hereunder.
+    b) Subject to the terms of this Agreement, each Contributor hereby
+    grants Recipient a non-exclusive, worldwide, royalty-free patent
+    license under Licensed Patents to make, use, sell, offer to sell,
+    import and otherwise transfer the Contribution of such Contributor,
+    if any, in Source Code or other form. This patent license shall
+    apply to the combination of the Contribution and the Program if, at
+    the time the Contribution is added by the Contributor, such addition
+    of the Contribution causes such combination to be covered by the
+    Licensed Patents. The patent license shall not apply to any other
+    combinations which include the Contribution. No hardware per se is
+    licensed hereunder.
 
-      c) Recipient understands that although each Contributor grants
-         the licenses to its Contributions set forth herein, no
-         assurances are provided by any Contributor that the Program
-         does not infringe the patent or other intellectual property
-         rights of any other entity. Each Contributor disclaims any
-         liability to Recipient for claims brought by any other entity
-         based on infringement of intellectual property rights or
-         otherwise. As a condition to exercising the rights and
-         licenses granted hereunder, each Recipient hereby assumes
-         sole responsibility to secure any other intellectual property
-         rights needed, if any. For example, if a third party patent
-         license is required to allow Recipient to distribute the
-         Program, it is Recipient's responsibility to acquire that
-         license before distributing the Program.
+    c) Recipient understands that although each Contributor grants the
+    licenses to its Contributions set forth herein, no assurances are
+    provided by any Contributor that the Program does not infringe the
+    patent or other intellectual property rights of any other entity.
+    Each Contributor disclaims any liability to Recipient for claims
+    brought by any other entity based on infringement of intellectual
+    property rights or otherwise. As a condition to exercising the
+    rights and licenses granted hereunder, each Recipient hereby
+    assumes sole responsibility to secure any other intellectual
+    property rights needed, if any. For example, if a third party
+    patent license is required to allow Recipient to Distribute the
+    Program, it is Recipient's responsibility to acquire that license
+    before distributing the Program.
 
-      d) Each Contributor represents that to its knowledge it has
-         sufficient copyright rights in its Contribution, if any, to
-         grant the copyright license set forth in this Agreement.
+    d) Each Contributor represents that to its knowledge it has
+    sufficient copyright rights in its Contribution, if any, to grant
+    the copyright license set forth in this Agreement.
+
+    e) Notwithstanding the terms of any Secondary License, no
+    Contributor makes additional grants to any Recipient (other than
+    those set forth in this Agreement) as a result of such Recipient's
+    receipt of the Program under the terms of a Secondary License
+    (if permitted under the terms of Section 3).
 
   3. REQUIREMENTS
 
-  A Contributor  may choose to  distribute the Program in  object code
-  form under its own license agreement, provided that:
+  3.1 If a Contributor Distributes the Program in any form, then:
 
-      a) it complies with the terms and conditions of this Agreement; and
+    a) the Program must also be made available as Source Code, in
+    accordance with section 3.2, and the Contributor must accompany
+    the Program with a statement that the Source Code for the Program
+    is available under this Agreement, and informs Recipients how to
+    obtain it in a reasonable manner on or through a medium customarily
+    used for software exchange; and
 
-      b) its license agreement:
+    b) the Contributor may Distribute the Program under a license
+    different than this Agreement, provided that such license:
+       i) effectively disclaims on behalf of all other Contributors all
+       warranties and conditions, express and implied, including
+       warranties or conditions of title and non-infringement, and
+       implied warranties or conditions of merchantability and fitness
+       for a particular purpose;
 
-          i) effectively disclaims on behalf of all Contributors all
-             warranties and conditions, express and implied, including
-             warranties or conditions of title and non-infringement,
-             and implied warranties or conditions of merchantability
-             and fitness for a particular purpose;
+       ii) effectively excludes on behalf of all other Contributors all
+       liability for damages, including direct, indirect, special,
+       incidental and consequential damages, such as lost profits;
 
-          ii) effectively excludes on behalf of all Contributors all
-              liability for damages, including direct, indirect,
-              special, incidental and consequential damages, such as
-              lost profits;
+       iii) does not attempt to limit or alter the recipients' rights
+       in the Source Code under section 3.2; and
 
-          iii) states that any provisions which differ from this
-               Agreement are offered by that Contributor alone and not
-               by any other party; and
+       iv) requires any subsequent distribution of the Program by any
+       party to be under a license that satisfies the requirements
+       of this section 3.
 
-          iv) states that source code for the Program is available
-              from such Contributor, and informs licensees how to
-              obtain it in a reasonable manner on or through a medium
-              customarily used for software exchange.
+  3.2 When the Program is Distributed as Source Code:
 
-  When the Program is made available in source code form:
+    a) it must be made available under this Agreement, or if the
+    Program (i) is combined with other material in a separate file or
+    files made available under a Secondary License, and (ii) the initial
+    Contributor attached to the Source Code the notice described in
+    Exhibit A of this Agreement, then the Program may be made available
+    under the terms of such Secondary Licenses, and
 
-      a) it must be made available under this Agreement; and
+    b) a copy of this Agreement must be included with each copy of
+    the Program.
 
-      b) a copy of this Agreement must be included with each copy of
-         the Program.
-
-  Contributors may not remove or alter any copyright notices contained
-  within the Program.
-
-  Each Contributor must identify itself as the originator of its
-  Contribution, if any, in a manner that reasonably allows subsequent
-  Recipients to identify the originator of the Contribution.
+  3.3 Contributors may not remove or alter any copyright, patent,
+  trademark, attribution notices, disclaimers of warranty, or limitations
+  of liability ("notices") contained within the Program from any copy of
+  the Program which they Distribute, provided that Contributors may add
+  their own appropriate notices.
 
   4. COMMERCIAL DISTRIBUTION
 
-  Commercial distributors of software may accept certain
-  responsibilities with respect to end users, business partners and
-  the like. While this license is intended to facilitate the
-  commercial use of the Program, the Contributor who includes the
-  Program in a commercial product offering should do so in a manner
-  which does not create potential liability for other Contributors.
-  Therefore, if a Contributor includes the Program in a commercial
-  product offering, such Contributor ("Commercial Contributor") hereby
-  agrees to defend and indemnify every other Contributor ("Indemnified
-  Contributor") against any losses, damages and costs (collectively
-  "Losses") arising from claims, lawsuits and other legal actions
-  brought by a third party against the Indemnified Contributor to the
-  extent caused by the acts or omissions of such Commercial
-  Contributor in connection with its distribution of the Program in a
-  commercial product offering. The obligations in this section do not
+  Commercial distributors of software may accept certain responsibilities
+  with respect to end users, business partners and the like. While this
+  license is intended to facilitate the commercial use of the Program,
+  the Contributor who includes the Program in a commercial product
+  offering should do so in a manner which does not create potential
+  liability for other Contributors. Therefore, if a Contributor includes
+  the Program in a commercial product offering, such Contributor
+  ("Commercial Contributor") hereby agrees to defend and indemnify every
+  other Contributor ("Indemnified Contributor") against any losses,
+  damages and costs (collectively "Losses") arising from claims, lawsuits
+  and other legal actions brought by a third party against the Indemnified
+  Contributor to the extent caused by the acts or omissions of such
+  Commercial Contributor in connection with its distribution of the Program
+  in a commercial product offering. The obligations in this section do not
   apply to any claims or Losses relating to any actual or alleged
-  intellectual property infringement. In order to qualify, an
-  Indemnified Contributor must: a) promptly notify the Commercial
-  Contributor in writing of such claim, and b) allow the Commercial
-  Contributor to control, and cooperate with the Commercial
-  Contributor in, the defense and any related settlement negotiations.
-  The Indemnified Contributor may participate in any such claim at its
-  own expense.
-
-  For example, a Contributor might include the Program in a commercial
-  product offering, Product X. That Contributor is then a Commercial
-  Contributor. If that Commercial Contributor then makes performance
-  claims, or offers warranties related to Product X, those performance
-  claims and warranties are such Commercial Contributor's
-  responsibility alone. Under this section, the Commercial Contributor
-  would have to defend claims against the other Contributors related
-  to those performance claims and warranties, and if a court requires
-  any other Contributor to pay any damages as a result, the Commercial
-  Contributor must pay those damages.
-
-  5. NO WARRANTY
-
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-  PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-  ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-  ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-  MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient
-  is solely responsible for determining the appropriateness of using
-  and distributing the Program and assumes all risks associated with
-  its exercise of rights under this Agreement , including but not
-  limited to the risks and costs of program errors, compliance with
-  applicable laws, damage to or loss of data, programs or equipment,
-  and unavailability or interruption of operations.
-
-  6. DISCLAIMER OF LIABILITY
-
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-  NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT,
-  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON
-  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-  THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-  GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-  DAMAGES.
-
-  7. GENERAL
-
-  If any provision of this Agreement is invalid or unenforceable under
-  applicable law, it shall not affect the validity or enforceability
-  of the remainder of the terms of this Agreement, and without further
-  action by the parties hereto, such provision shall be reformed to
-  the minimum extent necessary to make such provision valid and
-  enforceable.
-
-  If Recipient institutes patent litigation against any entity
-  (including a cross-claim or counterclaim in a lawsuit) alleging that
-  the Program itself (excluding combinations of the Program with other
-  software or hardware) infringes such Recipient's patent(s), then
-  such Recipient's rights granted under Section 2(b) shall terminate
-  as of the date such litigation is filed.
-
-  All Recipient's rights under this Agreement shall terminate if it
-  fails to comply with any of the material terms or conditions of this
-  Agreement and does not cure such failure in a reasonable period of
-  time after becoming aware of such noncompliance. If all Recipient's
-  rights under this Agreement terminate, Recipient agrees to cease use
-  and distribution of the Program as soon as reasonably practicable.
-  However, Recipient's obligations under this Agreement and any
-  licenses granted by Recipient relating to the Program shall continue
-  and survive.
-
-  Everyone is permitted to copy and distribute copies of this
-  Agreement, but in order to avoid inconsistency the Agreement is
-  copyrighted and may only be modified in the following manner. The
-  Agreement Steward reserves the right to publish new versions
-  (including revisions) of this Agreement from time to time. No one
-  other than the Agreement Steward has the right to modify this
-  Agreement. The Eclipse Foundation is the initial Agreement Steward.
-  The Eclipse Foundation may assign the responsibility to serve as the
-  Agreement Steward to a suitable separate entity. Each new version of
-  the Agreement will be given a distinguishing version number. The
-  Program (including Contributions) may always be distributed subject
-  to the version of the Agreement under which it was received. In
-  addition, after a new version of the Agreement is published,
-  Contributor may elect to distribute the Program (including its
-  Contributions) under the new version. Except as expressly stated in
-  Sections 2(a) and 2(b) above, Recipient receives no rights or
-  licenses to the intellectual property of any Contributor under this
-  Agreement, whether expressly, by implication, estoppel or otherwise.
-  All rights in the Program not expressly granted under this Agreement
-  are reserved.
-
-  This Agreement is governed by the laws of the State of New York and
-  the intellectual property laws of the United States of America. No
-  party to this Agreement will bring a legal action under this
-  Agreement more than one year after the cause of action arose. Each
-  party waives its rights to a jury trial in any resulting litigation.
-
-The complete text of the Common Public License is as follows:
-
-  Common Public License - v 1.0
-
-  THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON
-  PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-  THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-  1. DEFINITIONS
-
-  "Contribution" means:
-
-  a) in the case of the initial Contributor, the initial code and
-    documentation distributed under this Agreement, and
-
-  b) in the case of each subsequent Contributor:
-
-  i) changes to the Program, and
-
-  ii) additions to the Program;
-
-  where such changes and/or additions to the Program originate
-  from and are distributed by that particular Contributor. A
-  Contribution 'originates' from a Contributor if it was added to the
-  Program by such Contributor itself or anyone acting on such
-  Contributor's behalf. Contributions do not include additions to the
-  Program which: (i) are separate modules of software distributed in
-  conjunction with the Program under their own license agreement,
-  and (ii) are not derivative works of the Program.
-
-  "Contributor" means any person or entity that distributes the Program.
-
-  "Licensed Patents " mean patent claims licensable by a Contributor
-  which are necessarily infringed by the use or sale of its Contribution
-  alone or when combined with the Program.
-
-  "Program" means the Contributions distributed in accordance with this Agreement.
-
-  "Recipient" means anyone who receives the Program under this
-  Agreement, including all Contributors.
-
-  2. GRANT OF RIGHTS
-
-  a) Subject to the terms of this Agreement, each Contributor
-  hereby grants Recipient a non-exclusive, worldwide, royalty-free
-  copyright license to reproduce, prepare derivative works of, publicly
-  display, publicly perform, distribute and sublicense the Contribution
-  of such Contributor, if any, and such derivative works, in source code
-  and object code form.
-
-  b) Subject to the terms of this Agreement, each Contributor
-  hereby grants Recipient a non-exclusive, worldwide, royalty-free
-  patent license under Licensed Patents to make, use, sell, offer to
-  sell, import and otherwise transfer the Contribution of such
-  Contributor, if any, in source code and object code form. This patent
-  license shall apply to the combination of the Contribution and the
-  Program if, at the time the Contribution is added by the Contributor,
-  such addition of the Contribution causes such combination to be
-  covered by the Licensed Patents. The patent license shall not apply to
-  any other combinations which include the Contribution. No hardware per
-  se is licensed hereunder.
-
-  c) Recipient understands that although each Contributor grants
-  the licenses to its Contributions set forth herein, no assurances are
-  provided by any Contributor that the Program does not infringe the
-  patent or other intellectual property rights of any other entity. Each
-  Contributor disclaims any liability to Recipient for claims brought by
-  any other entity based on infringement of intellectual property rights
-  or otherwise. As a condition to exercising the rights and licenses
-  granted hereunder, each Recipient hereby assumes sole responsibility
-  to secure any other intellectual property rights needed, if any. For
-  example, if a third party patent license is required to allow
-  Recipient to distribute the Program, it is Recipient's responsibility
-  to acquire that license before distributing the Program.
-
-  d) Each Contributor represents that to its knowledge it has
-  sufficient copyright rights in its Contribution, if any, to grant the
-  copyright license set forth in this Agreement.
-
-  3. REQUIREMENTS
-
-  A Contributor may choose to distribute the Program in object code form
-  under its own license agreement, provided that:
-
-  a) it complies with the terms and conditions of this Agreement;
-    and
-
-  b) its license agreement:
-
-  i) effectively disclaims on behalf of all Contributors all
-  warranties and conditions, express and implied, including warranties
-  or conditions of title and non-infringement, and implied warranties or
-  conditions of merchantability and fitness for a particular purpose;
-
-  ii) effectively excludes on behalf of all Contributors all
-  liability for damages, including direct, indirect, special, incidental
-  and consequential damages, such as lost profits;
-
-  iii) states that any provisions which differ from this Agreement
-  are offered by that Contributor alone and not by any other party; and
-
-  iv) states that source code for the Program is available from
-  such Contributor, and informs licensees how to obtain it in a
-  reasonable manner on or through a medium customarily used for software
-  exchange.
-
-  When the Program is made available in source code form:
-
-  a) it must be made available under this Agreement; and 
-
-  b) a copy of this Agreement must be included with each copy of
-  the Program.
-
-  Contributors may not remove or alter any copyright notices contained
-  within the Program.
-
-  Each Contributor must identify itself as the originator of its
-  Contribution, if any, in a manner that reasonably allows subsequent
-  Recipients to identify the originator of the Contribution.
-
-  4. COMMERCIAL DISTRIBUTION
-
-  Commercial distributors of software may accept certain
-  responsibilities with respect to end users, business partners and the
-  like. While this license is intended to facilitate the commercial use
-  of the Program, the Contributor who includes the Program in a
-  commercial product offering should do so in a manner which does not
-  create potential liability for other Contributors. Therefore, if a
-  Contributor includes the Program in a commercial product offering,
-  such Contributor ("Commercial Contributor") hereby agrees to defend
-  and indemnify every other Contributor ("Indemnified Contributor")
-  against any losses, damages and costs (collectively "Losses") arising
-  from claims, lawsuits and other legal actions brought by a third party
-  against the Indemnified Contributor to the extent caused by the acts
-  or omissions of such Commercial Contributor in connection with its
-  distribution of the Program in a commercial product offering. The
-  obligations in this section do not apply to any claims or Losses
-  relating to any actual or alleged intellectual property
-  infringement. In order to qualify, an Indemnified Contributor must: a)
-  promptly notify the Commercial Contributor in writing of such claim,
-  and b) allow the Commercial Contributor to control, and cooperate with
-  the Commercial Contributor in, the defense and any related settlement
-  negotiations. The Indemnified Contributor may participate in any such
-  claim at its own expense.
+  intellectual property infringement. In order to qualify, an Indemnified
+  Contributor must: a) promptly notify the Commercial Contributor in
+  writing of such claim, and b) allow the Commercial Contributor to control,
+  and cooperate with the Commercial Contributor in, the defense and any
+  related settlement negotiations. The Indemnified Contributor may
+  participate in any such claim at its own expense.
 
   For example, a Contributor might include the Program in a commercial
   product offering, Product X. That Contributor is then a Commercial
@@ -8665,35 +6743,36 @@ The complete text of the Common Public License is as follows:
   claims, or offers warranties related to Product X, those performance
   claims and warranties are such Commercial Contributor's responsibility
   alone. Under this section, the Commercial Contributor would have to
-  defend claims against the other Contributors related to those
-  performance claims and warranties, and if a court requires any other
-  Contributor to pay any damages as a result, the Commercial Contributor
-  must pay those damages.
+  defend claims against the other Contributors related to those performance
+  claims and warranties, and if a court requires any other Contributor to
+  pay any damages as a result, the Commercial Contributor must pay
+  those damages.
 
   5. NO WARRANTY
 
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-  PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
-  WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-  OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-  responsible for determining the appropriateness of using and
-  distributing the Program and assumes all risks associated with its
-  exercise of rights under this Agreement, including but not limited to
-  the risks and costs of program errors, compliance with applicable
-  laws, damage to or loss of data, programs or equipment, and
-  unavailability or interruption of operations.
+  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+  PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
+  BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+  IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+  TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+  PURPOSE. Each Recipient is solely responsible for determining the
+  appropriateness of using and distributing the Program and assumes all
+  risks associated with its exercise of rights under this Agreement,
+  including but not limited to the risks and costs of program errors,
+  compliance with applicable laws, damage to or loss of data, programs
+  or equipment, and unavailability or interruption of operations.
 
   6. DISCLAIMER OF LIABILITY
 
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
-  ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-  WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-  DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-  HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+  PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+  SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+  PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+  EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGES.
 
   7. GENERAL
 
@@ -8703,15 +6782,10 @@ The complete text of the Common Public License is as follows:
   action by the parties hereto, such provision shall be reformed to the
   minimum extent necessary to make such provision valid and enforceable.
 
-  If Recipient institutes patent litigation against a Contributor with
-  respect to a patent applicable to software (including a cross-claim or
-  counterclaim in a lawsuit), then any patent licenses granted by that
-  Contributor to such Recipient under this Agreement shall terminate as
-  of the date such litigation is filed. In addition, if Recipient
-  institutes patent litigation against any entity (including a
-  cross-claim or counterclaim in a lawsuit) alleging that the Program
-  itself (excluding combinations of the Program with other software or
-  hardware) infringes such Recipient's patent(s), then such Recipient's
+  If Recipient institutes patent litigation against any entity
+  (including a cross-claim or counterclaim in a lawsuit) alleging that the
+  Program itself (excluding combinations of the Program with other software
+  or hardware) infringes such Recipient's patent(s), then such Recipient's
   rights granted under Section 2(b) shall terminate as of the date such
   litigation is filed.
 
@@ -8720,35 +6794,49 @@ The complete text of the Common Public License is as follows:
   Agreement and does not cure such failure in a reasonable period of
   time after becoming aware of such noncompliance. If all Recipient's
   rights under this Agreement terminate, Recipient agrees to cease use
-  and distribution of the Program as soon as reasonably
-  practicable. However, Recipient's obligations under this Agreement and
-  any licenses granted by Recipient relating to the Program shall
-  continue and survive.
+  and distribution of the Program as soon as reasonably practicable.
+  However, Recipient's obligations under this Agreement and any licenses
+  granted by Recipient relating to the Program shall continue and survive.
 
   Everyone is permitted to copy and distribute copies of this Agreement,
   but in order to avoid inconsistency the Agreement is copyrighted and
   may only be modified in the following manner. The Agreement Steward
   reserves the right to publish new versions (including revisions) of
   this Agreement from time to time. No one other than the Agreement
-  Steward has the right to modify this Agreement. IBM is the initial
-  Agreement Steward. IBM may assign the responsibility to serve as the
-  Agreement Steward to a suitable separate entity. Each new version of
-  the Agreement will be given a distinguishing version number. The
-  Program (including Contributions) may always be distributed subject to
-  the version of the Agreement under which it was received. In addition,
-  after a new version of the Agreement is published, Contributor may
-  elect to distribute the Program (including its Contributions) under
-  the new version. Except as expressly stated in Sections 2(a) and 2(b)
-  above, Recipient receives no rights or licenses to the intellectual
-  property of any Contributor under this Agreement, whether expressly,
-  by implication, estoppel or otherwise. All rights in the Program not
-  expressly granted under this Agreement are reserved.
+  Steward has the right to modify this Agreement. The Eclipse Foundation
+  is the initial Agreement Steward. The Eclipse Foundation may assign the
+  responsibility to serve as the Agreement Steward to a suitable separate
+  entity. Each new version of the Agreement will be given a distinguishing
+  version number. The Program (including Contributions) may always be
+  Distributed subject to the version of the Agreement under which it was
+  received. In addition, after a new version of the Agreement is published,
+  Contributor may elect to Distribute the Program (including its
+  Contributions) under the new version.
 
-  This Agreement is governed by the laws of the State of New York and
-  the intellectual property laws of the United States of America. No
-  party to this Agreement will bring a legal action under this Agreement
-  more than one year after the cause of action arose. Each party waives
- its rights to a jury trial in any resulting litigation.
+  Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+  receives no rights or licenses to the intellectual property of any
+  Contributor under this Agreement, whether expressly, by implication,
+  estoppel or otherwise. All rights in the Program not expressly granted
+  under this Agreement are reserved. Nothing in this Agreement is intended
+  to be enforceable by any entity that is not a Contributor or Recipient.
+  No third-party beneficiary rights are created under this Agreement.
+
+  Exhibit A - Form of Secondary Licenses Notice
+
+  "This Source Code may also be made available under the following
+  Secondary Licenses when the conditions for such availability set forth
+  in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+  version(s), and exceptions or additional permissions here}."
+
+    Simply including a copy of this Agreement, including this Exhibit A
+    is not sufficient to license the Source Code under Secondary Licenses.
+
+    If it is not possible or desirable to put the notice in a particular
+    file, then You may include the notice in a location (such as a LICENSE
+    file in a relevant directory) where a recipient would be likely to
+    look for such a notice.
+
+    You may add additional accurate notices of copyright ownership.
 
 The complete text of the GNU General Public License v2 is as follows:
 
@@ -9545,7 +7633,6 @@ Licenses listed below include:
 * GNU General Public License version 3
 * Apache 2.0 License
 * BSD License
-* Apache Software License Version 1.1
 * MIT License
 
 The complete text of the GNU General Public License version 3 is as follows:
@@ -10431,9 +8518,6 @@ The complete text of the Apache 2.0 License is as follows:
 
 The complete text of the BSD license can be is as follows:
 
-  Copyright (c) The Regents of the University of California.
-  All rights reserved.
-
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
   are met:
@@ -10446,75 +8530,17 @@ The complete text of the BSD license can be is as follows:
      may be used to endorse or promote products derived from this software
      without specific prior written permission.
 
-  THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-  SUCH DAMAGE.
-
-The complete text of the Apache Software License Version 1.1 is as follows:
-
- /*                                      
-  * ================================================================
-  *                   The Apache Software License, Version 1.1
-  * ================================================================
-  * 
-  *    Copyright (C) 2000-2002 The Apache Software Foundation. All
-  *    rights reserved.
-  * 
-  * Redistribution and use in source and binary forms, with or without 
-  * modification, are permitted provided that the following
-  * conditions are met:
-  * 
-  * 1. Redistributions of  source code must  retain the above copyright
-  *    notice, this list of conditions and the following disclaimer.
-  * 
-  * 2. Redistributions in binary form must reproduce the above copyright
-  *    notice, this list of conditions and the following disclaimer in
-  *    the documentation and/or other materials provided with the 
-  *    distribution.
-  * 
-  * 3. The end-user documentation included with the redistribution, if
-  *    any, must include  the following  acknowledgment:  "This product
-  *    includes  software developed  by the  Apache Software Foundation
-  *    (http://www.apache.org/)." Alternately, this  acknowledgment may
-  *    appear in the software itself, if and wherever such third-party
-  *    acknowledgments normally appear.
-  * 
-  * 4. The names "Ant" and  "Apache Software Foundation" must not be
-  *    used to endorse  or promote  products derived  from this software
-  *    without prior written permission. For written permission, please
-  *    contact apache@apache.org.
-  * 
-  * 5. Products derived from this software may not  be called "Apache",
-  *    nor may "Apache" appear  in their name,  without prior written
-  *    permission of the Apache Software Foundation.
-  * 
-  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
-  * OF MERCHANTABILITY AND FITNESS  FOR A PARTICULAR PURPOSE ARE 
-  * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION
-  * OR ITS CONTRIBUTORS BE LIABLE FOR  ANY DIRECT, INDIRECT, INCIDENTAL,
-  * SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLUDING, BUT NOT
-  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  * DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
-  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-  * TORT (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN ANY WAY OUT
-  * OF THE  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-  * OF SUCH DAMAGE.
-  * 
-  * This software  consists of voluntary contributions made by many
-  * individuals on behalf of the  Apache Software Foundation. For more
-  * information on the Apache Software Foundation, please see
-  * <http://www.apache.org/>.
-  *
-  */
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+  THE POSSIBILITY OF SUCH DAMAGE.
 
 The complete text of the MIT license is as follows:
 
@@ -10539,271 +8565,399 @@ The complete text of the MIT license is as follows:
   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
   OTHER DEALINGS IN THE SOFTWARE.
 
-The complete text of the Eclipse Public License v1.0 is as follows:
+The complete text of the GPL v2, and classpath exception:
 
-  Eclipse Public License - v 1.0
-  
-  THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
-  LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-  CONSTITUTES RECIPIENT’S ACCEPTANCE OF THIS AGREEMENT.
-  
-  1. DEFINITIONS
-  
-  "Contribution" means:
-  
-  a) in the case of the initial Contributor, the initial code and documentation
-  distributed under this Agreement, and
-  b) in the case of each subsequent Contributor:
-  
-  i) changes to the Program, and
-  
-  ii) additions to the Program;
-  
-  where such changes and/or additions to the Program originate from and are
-  distributed by that particular Contributor. A Contribution 'originates' from a
-  Contributor if it was added to the Program by such Contributor itself or anyone
-  acting on such Contributor’s behalf. Contributions do not include additions to
-  the Program which: (i) are separate modules of software distributed in
-  conjunction with the Program under their own license agreement, and (ii) are not
-  derivative works of the Program.
-  
-  "Contributor" means any person or entity that distributes the Program.
-  
-  "Licensed Patents " mean patent claims licensable by a Contributor which are
-  necessarily infringed by the use or sale of its Contribution alone or when
-  combined with the Program.
-  
-  "Program" means the Contributions distributed in accordance with this Agreement.
-  
-  "Recipient" means anyone who receives the Program under this Agreement,
-  including all Contributors.
-  
-  2. GRANT OF RIGHTS
-  
-  a) Subject to the terms of this Agreement, each Contributor hereby grants
-  Recipient a non-exclusive, worldwide, royalty-free copyright license to
-  reproduce, prepare derivative works of, publicly display, publicly perform,
-  distribute and sublicense the Contribution of such Contributor, if any, and such
-  derivative works, in source code and object code form.
-  
-  b) Subject to the terms of this Agreement, each Contributor hereby grants
-  Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
-  Patents to make, use, sell, offer to sell, import and otherwise transfer the
-  Contribution of such Contributor, if any, in source code and object code form.
-  This patent license shall apply to the combination of the Contribution and the
-  Program if, at the time the Contribution is added by the Contributor, such
-  addition of the Contribution causes such combination to be covered by the
-  Licensed Patents. The patent license shall not apply to any other combinations
-  which include the Contribution. No hardware per se is licensed hereunder.
-  
-  c) Recipient understands that although each Contributor grants the licenses to
-  its Contributions set forth herein, no assurances are provided by any
-  Contributor that the Program does not infringe the patent or other intellectual
-  property rights of any other entity. Each Contributor disclaims any liability to
-  Recipient for claims brought by any other entity based on infringement of
-  intellectual property rights or otherwise. As a condition to exercising the
-  rights and licenses granted hereunder, each Recipient hereby assumes sole
-  responsibility to secure any other intellectual property rights needed, if any.
-  For example, if a third party patent license is required to allow Recipient to
-  distribute the Program, it is Recipient’s responsibility to acquire that license
-  before distributing the Program.
-  
-  d) Each Contributor represents that to its knowledge it has sufficient copyright
-  rights in its Contribution, if any, to grant the copyright license set forth in
-  this Agreement.
-  
-  3. REQUIREMENTS
-  
-  A Contributor may choose to distribute the Program in object code form under its
-  own license agreement, provided that:
-  
-  a) it complies with the terms and conditions of this Agreement; and
-  
-  b) its license agreement:
-  
-  i) effectively disclaims on behalf of all Contributors all warranties and
-  conditions, express and implied, including warranties or conditions of title and
-  non-infringement, and implied warranties or conditions of merchantability and
-  fitness for a particular purpose;
-  
-  ii) effectively excludes on behalf of all Contributors all liability for
-  damages, including direct, indirect, special, incidental and consequential
-  damages, such as lost profits;
-  
-  iii) states that any provisions which differ from this Agreement are offered by
-  that Contributor alone and not by any other party; and
-  
-  iv) states that source code for the Program is available from such Contributor,
-  and informs licensees how to obtain it in a reasonable manner on or through a
-  medium customarily used for software exchange.
-  
-  When the Program is made available in source code form:
-  
-  a) it must be made available under this Agreement; and
-  b) a copy of this Agreement must be included with each copy of the Program.
-  
-  Contributors may not remove or alter any copyright notices contained within the
-  Program.
-  
-  Each Contributor must identify itself as the originator of its Contribution, if
-  any, in a manner that reasonably allows subsequent Recipients to identify the
-  originator of the Contribution.
-  
-  4. COMMERCIAL DISTRIBUTION
-  
-  Commercial distributors of software may accept certain responsibilities with
-  respect to end users, business partners and the like. While this license is
-  intended to facilitate the commercial use of the Program, the Contributor who
-  includes the Program in a commercial product offering should do so in a manner
-  which does not create potential liability for other Contributors. Therefore, if
-  a Contributor includes the Program in a commercial product offering, such
-  Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-  every other Contributor ("Indemnified Contributor") against any losses, damages
-  and costs (collectively "Losses") arising from claims, lawsuits and other legal
-  actions brought by a third party against the Indemnified Contributor to the
-  extent caused by the acts or omissions of such Commercial Contributor in
-  connection with its distribution of the Program in a commercial product
-  offering. The obligations in this section do not apply to any claims or Losses
-  relating to any actual or alleged intellectual property infringement. In order
-  to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-  Contributor in writing of such claim, and b) allow the Commercial Contributor to
-  control, and cooperate with the Commercial Contributor in, the defense and any
-  related settlement negotiations. The Indemnified Contributor may participate in
-  any such claim at its own expense.
-  
-  For example, a Contributor might include the Program in a commercial product
-  offering, Product X. That Contributor is then a Commercial Contributor. If that
-  Commercial Contributor then makes performance claims, or offers warranties
-  related to Product X, those performance claims and warranties are such
-  Commercial Contributor’s responsibility alone. Under this section, the
-  Commercial Contributor would have to defend claims against the other
-  Contributors related to those performance claims and warranties, and if a court
-  requires any other Contributor to pay any damages as a result, the Commercial
-  Contributor must pay those damages.
-  
-  5. NO WARRANTY
-  
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-  IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-  NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-  Recipient is solely responsible for determining the appropriateness of using and
-  distributing the Program and assumes all risks associated with its exercise of
-  rights under this Agreement , including but not limited to the risks and costs
-  of program errors, compliance with applicable laws, damage to or loss of data,
-  programs or equipment, and unavailability or interruption of operations.
-  
-  6. DISCLAIMER OF LIABILITY
-  
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-  CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-  PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-  OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-  GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-  
-  7. GENERAL
-  
-  If any provision of this Agreement is invalid or unenforceable under applicable
-  law, it shall not affect the validity or enforceability of the remainder of the
-  terms of this Agreement, and without further action by the parties hereto, such
-  provision shall be reformed to the minimum extent necessary to make such
-  provision valid and enforceable.
-  
-  If Recipient institutes patent litigation against any entity (including a
-  cross-claim or counterclaim in a lawsuit) alleging that the Program itself
-  (excluding combinations of the Program with other software or hardware)
-  infringes such Recipient’s patent(s), then such Recipient’s rights granted under
-  Section 2(b) shall terminate as of the date such litigation is filed.
-  
-  All Recipient’s rights under this Agreement shall terminate if it fails to
-  comply with any of the material terms or conditions of this Agreement and does
-  not cure such failure in a reasonable period of time after becoming aware of
-  such noncompliance. If all Recipient’s rights under this Agreement terminate,
-  Recipient agrees to cease use and distribution of the Program as soon as
-  reasonably practicable. However, Recipient’s obligations under this Agreement
-  and any licenses granted by Recipient relating to the Program shall continue and
-  survive.
-  
-  Everyone is permitted to copy and distribute copies of this Agreement, but in
-  order to avoid inconsistency the Agreement is copyrighted and may only be
-  modified in the following manner. The Agreement Steward reserves the right to
-  publish new versions (including revisions) of this Agreement from time to time.
-  No one other than the Agreement Steward has the right to modify this Agreement.
-  The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation
-  may assign the responsibility to serve as the Agreement Steward to a suitable
-  separate entity. Each new version of the Agreement will be given a
-  distinguishing version number. The Program (including Contributions) may always
-  be distributed subject to the version of the Agreement under which it was
-  received. In addition, after a new version of the Agreement is published,
-  Contributor may elect to distribute the Program (including its Contributions)
-  under the new version. Except as expressly stated in Sections 2(a) and 2(b)
-  above, Recipient receives no rights or licenses to the intellectual property of
-  any Contributor under this Agreement, whether expressly, by implication,
-  estoppel or otherwise. All rights in the Program not expressly granted under
-  this Agreement are reserved.
-  
-  This Agreement is governed by the laws of the State of New York and the
-  intellectual property laws of the United States of America. No party to this
-  Agreement will bring a legal action under this Agreement more than one year
-  after the cause of action arose. Each party waives its rights to a jury trial in
-  any resulting litigation.
+The GNU General Public License (GPL)
 
---------------------------------------------------
-Library: joda-time v
-Url: "http://www.joda.org/joda-time/"
-License: Apache-2.0
+Version 2, June 1991
 
-source: https://github.com/JodaOrg/joda-time/blob/v2.9.9/NOTICE.txt
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-This product includes software developed by
-Joda.org (http://www.joda.org/).
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
 
---------------------------------------------------
-Library: joni v
-Url: "https://github.com/jruby/joni/"
-License: MIT
+Preamble
 
-source: https://github.com/jruby/joni/blob/joni-2.1.16/LICENSE
+The licenses for most software are designed to take away your freedom to share
+and change it.  By contrast, the GNU General Public License is intended to
+guarantee your freedom to share and change free software--to make sure the
+software is free for all its users.  This General Public License applies to
+most of the Free Software Foundation's software and to any other program whose
+authors commit to using it.  (Some other Free Software Foundation software is
+covered by the GNU Library General Public License instead.) You can apply it to
+your programs, too.
 
-MIT License
+When we speak of free software, we are referring to freedom, not price.  Our
+General Public Licenses are designed to make sure that you have the freedom to
+distribute copies of free software (and charge for this service if you wish),
+that you receive source code or can get it if you want it, that you can change
+the software or use pieces of it in new free programs; and that you know you
+can do these things.
 
-Copyright (c) 2017 JRuby Team
+To protect your rights, we need to make restrictions that forbid anyone to deny
+you these rights or to ask you to surrender the rights.  These restrictions
+translate to certain responsibilities for you if you distribute copies of the
+software, or if you modify it.
 
-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:
+For example, if you distribute copies of such a program, whether gratis or for
+a fee, you must give the recipients all the rights that you have.  You must
+make sure that they, too, receive or can get the source code.  And you must
+show them these terms so they know their rights.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+We protect your rights with two steps: (1) copyright the software, and (2)
+offer you this license which gives you legal permission to copy, distribute
+and/or modify 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.
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software.  If the
+software is modified by someone else and passed on, we want its recipients to
+know that what they have is not the original, so that any problems introduced
+by others will not reflect on the original authors' reputations.
 
---------------------------------------------------
-Library: jrjackson v0.4.6
-Url: ""
-License: Apache-2.0
+Finally, any free program is threatened constantly by software patents.  We
+wish to avoid the danger that redistributors of a free program will
+individually obtain patent licenses, in effect making the program proprietary.
+To prevent this, we have made it clear that any patent must be licensed for
+everyone's free use or not licensed at all.
 
-https://github.com/guyboertje/jrjackson/blob/v0.4.6/README.md
+The precise terms and conditions for copying, distribution and modification
+follow.
 
-LICENSE applicable to this library:
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-Apache License 2.0 see http://www.apache.org/licenses/LICENSE-2.0
+0. This License applies to any program or other work which contains a notice
+placed by the copyright holder saying it may be distributed under the terms of
+this General Public License.  The "Program", below, refers to any such program
+or work, and a "work based on the Program" means either the Program or any
+derivative work under copyright law: that is to say, a work containing the
+Program or a portion of it, either verbatim or with modifications and/or
+translated into another language.  (Hereinafter, translation is included
+without limitation in the term "modification".) Each licensee is addressed as
+"you".
 
---------------------------------------------------
-Library: jruby-openssl v0.9.21
-Url: "https://github.com/jruby/jruby-openssl/"
-License: EPL-1.0
+Activities other than copying, distribution and modification are not covered by
+this License; they are outside its scope.  The act of running the Program is
+not restricted, and the output from the Program is covered only if its contents
+constitute a work based on the Program (independent of having been made by
+running the Program).  Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as
+you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this License
+and to the absence of any warranty; and give any other recipients of the
+Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may
+at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus
+forming a work based on the Program, and copy and distribute such modifications
+or work under the terms of Section 1 above, provided that you also meet all of
+these conditions:
+
+    a) You must cause the modified files to carry prominent notices stating
+    that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in whole or
+    in part contains or is derived from the Program or any part thereof, to be
+    licensed as a whole at no charge to all third parties under the terms of
+    this License.
+
+    c) If the modified program normally reads commands interactively when run,
+    you must cause it, when started running for such interactive use in the
+    most ordinary way, to print or display an announcement including an
+    appropriate copyright notice and a notice that there is no warranty (or
+    else, saying that you provide a warranty) and that users may redistribute
+    the program under these conditions, and telling the user how to view a copy
+    of this License.  (Exception: if the Program itself is interactive but does
+    not normally print such an announcement, your work based on the Program is
+    not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If identifiable
+sections of that work are not derived from the Program, and can be reasonably
+considered independent and separate works in themselves, then this License, and
+its terms, do not apply to those sections when you distribute them as separate
+works.  But when you distribute the same sections as part of a whole which is a
+work based on the Program, the distribution of the whole must be on the terms
+of this License, whose permissions for other licensees extend to the entire
+whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your
+rights to work written entirely by you; rather, the intent is to exercise the
+right to control the distribution of derivative or collective works based on
+the Program.
+
+In addition, mere aggregation of another work not based on the Program with the
+Program (or with a work based on the Program) on a volume of a storage or
+distribution medium does not bring the other work under the scope of this
+License.
+
+3. You may copy and distribute the Program (or a work based on it, under
+Section 2) in object code or executable form under the terms of Sections 1 and
+2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable source
+    code, which must be distributed under the terms of Sections 1 and 2 above
+    on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three years, to
+    give any third party, for a charge no more than your cost of physically
+    performing source distribution, a complete machine-readable copy of the
+    corresponding source code, to be distributed under the terms of Sections 1
+    and 2 above on a medium customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer to
+    distribute corresponding source code.  (This alternative is allowed only
+    for noncommercial distribution and only if you received the program in
+    object code or executable form with such an offer, in accord with
+    Subsection b above.)
+
+The source code for a work means the preferred form of the work for making
+modifications to it.  For an executable work, complete source code means all
+the source code for all modules it contains, plus any associated interface
+definition files, plus the scripts used to control compilation and installation
+of the executable.  However, as a special exception, the source code
+distributed need not include anything that is normally distributed (in either
+source or binary form) with the major components (compiler, kernel, and so on)
+of the operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the source
+code from the same place counts as distribution of the source code, even though
+third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as
+expressly provided under this License.  Any attempt otherwise to copy, modify,
+sublicense or distribute the Program is void, and will automatically terminate
+your rights under this License.  However, parties who have received copies, or
+rights, from you under this License will not have their licenses terminated so
+long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it.
+However, nothing else grants you permission to modify or distribute the Program
+or its derivative works.  These actions are prohibited by law if you do not
+accept this License.  Therefore, by modifying or distributing the Program (or
+any work based on the Program), you indicate your acceptance of this License to
+do so, and all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program),
+the recipient automatically receives a license from the original licensor to
+copy, distribute or modify the Program subject to these terms and conditions.
+You may not impose any further restrictions on the recipients' exercise of the
+rights granted herein.  You are not responsible for enforcing compliance by
+third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues), conditions
+are imposed on you (whether by court order, agreement or otherwise) that
+contradict the conditions of this License, they do not excuse you from the
+conditions of this License.  If you cannot distribute so as to satisfy
+simultaneously your obligations under this License and any other pertinent
+obligations, then as a consequence you may not distribute the Program at all.
+For example, if a patent license would not permit royalty-free redistribution
+of the Program by all those who receive copies directly or indirectly through
+you, then the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply and
+the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or
+other property right claims or to contest validity of any such claims; this
+section has the sole purpose of protecting the integrity of the free software
+distribution system, which is implemented by public license practices.  Many
+people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose that
+choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain
+countries either by patents or by copyrighted interfaces, the original
+copyright holder who places the Program under this License may add an explicit
+geographical distribution limitation excluding those countries, so that
+distribution is permitted only in or among countries not thus excluded.  In
+such case, this License incorporates the limitation as if written in the body
+of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the
+General Public License from time to time.  Such new versions will be similar in
+spirit to the present version, but may differ in detail to address new problems
+or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any later
+version", you have the option of following the terms and conditions either of
+that version or of any later version published by the Free Software Foundation.
+If the Program does not specify a version number of this License, you may
+choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs
+whose distribution conditions are different, write to the author to ask for
+permission.  For software which is copyrighted by the Free Software Foundation,
+write to the Free Software Foundation; we sometimes make exceptions for this.
+Our decision will be guided by the two goals of preserving the free status of
+all derivatives of our free software and of promoting the sharing and reuse of
+software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
+THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE
+STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE
+PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE,
+YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
+PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
+INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
+BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER
+OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible
+use to the public, the best way to achieve this is to make it free software
+which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program.  It is safest to attach
+them to the start of each source file to most effectively convey the exclusion
+of warranty; and each file should have at least the "copyright" line and a
+pointer to where the full notice is found.
+
+    One line to give the program's name and a brief idea of what it does.
+
+    Copyright (C) <year> <name of author>
+
+    This program is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the Free
+    Software Foundation; either version 2 of the License, or (at your option)
+    any later version.
+
+    This program is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+    more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc., 59
+    Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it
+starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author Gnomovision comes
+    with ABSOLUTELY NO WARRANTY; for details type 'show w'.  This is free
+    software, and you are welcome to redistribute it under certain conditions;
+    type 'show c' for details.
+
+The hypothetical commands 'show w' and 'show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may be
+called something other than 'show w' and 'show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.  Here
+is a sample; alter the names:
+
+    Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+    'Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+    signature of Ty Coon, 1 April 1989
+
+    Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General Public
+License instead of this License.
+
+"CLASSPATH" EXCEPTION TO THE GPL
+
+Certain source files distributed by Oracle America and/or its affiliates are
+subject to the following clarification and special exception to the GPL, but
+only where Oracle has expressly included in the particular source file's header
+the words "Oracle designates this particular file as subject to the "Classpath"
+exception as provided by Oracle in the LICENSE file that accompanied this code."
+
+    Linking this library statically or dynamically with other modules is making
+    a combined work based on this library.  Thus, the terms and conditions of
+    the GNU General Public License cover the whole combination.
+
+    As a special exception, the copyright holders of this library give you
+    permission to link this library with independent modules to produce an
+    executable, regardless of the license terms of these independent modules,
+    and to copy and distribute the resulting executable under terms of your
+    choice, provided that you also meet, for each linked independent module,
+    the terms and conditions of the license of that module.  An independent
+    module is a module which is not derived from or based on this library.  If
+    you modify this library, you may extend this exception to your version of
+    the library, but you are not obligated to do so.  If you do not wish to do
+    so, delete this exception statement from your version.
+
+The full text of the zlib licence:
+
+Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Jean-loup Gailly        Mark Adler
+jloup@gzip.org          madler@alumni.caltech.edu
+
+==========
+Notice for: jruby-jms-1.3.0
+----------
+
+Copyright 2008, 2009, 2010, 2011 J. Reid Morrison, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+==========
+Notice for: jruby-openssl-0.15.3
+----------
 
 source: https://github.com/jruby/jruby-openssl/blob/v0.9.21/LICENSE.txt
 
@@ -10844,49 +8998,9 @@ the terms of any one of the EPL, the GPL or the LGPL.
 
 JRuby-OpenSSL includes software by The Legion of the Bouncy Castle Inc.
 Please, visit (http://bouncycastle.org/license.html) for licensing details.
-
---------------------------------------------------
-Library: jruby-readline v
-Url: "https://github.com/jruby/jruby-readline"
-License: EPL-1.0
-
-source: https://github.com/jruby/jruby-readline/blob/1.2.2/License.txt
-
-JRuby-OpenSSL is distributed under the same license as JRuby (http://www.jruby.org/).
-
-Version: EPL 1.0/GPL 2.0/LGPL 2.1
-
-The contents of this file are subject to the Common Public
-License Version 1.0 (the "License"); you may not use this file
-except in compliance with the License. You may obtain a copy of
-the License at http://www.eclipse.org/legal/cpl-v10.html
-
-Software distributed under the License is distributed on an "AS
-IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-implied. See the License for the specific language governing
-rights and limitations under the License.
-
-Copyright (C) 2007 Ola Bini <ola.bini@gmail.com>
-
-Alternatively, the contents of this file may be used under the terms of
-either of the GNU General Public License Version 2 or later (the "GPL"),
-or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-in which case the provisions of the GPL or the LGPL are applicable instead
-of those above. If you wish to allow use of your version of this file only
-under the terms of either the GPL or the LGPL, and not to allow others to
-use your version of this file under the terms of the EPL, indicate your
-decision by deleting the provisions above and replace them with the notice
-and other provisions required by the GPL or the LGPL. If you do not delete
-the provisions above, a recipient may use your version of this file under
-the terms of any one of the EPL, the GPL or the LGPL.
-
-JRuby-OpenSSL includes software by the Legion of the Bouncy Castle
-(http://bouncycastle.org/license.html).
-
---------------------------------------------------
-Library: jruby-stdin-channel v0.2.0
-Url: "https://github.com/colinsurprenant/jruby-stdin-channel"
-License: Apache-2.0
+==========
+Notice for: jruby-stdin-channel-0.2.0
+----------
 
 source: https://github.com/colinsurprenant/jruby-stdin-channel/blob/v0.2.0/LICENSE.md
 
@@ -10901,11 +9015,9 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-
---------------------------------------------------
-Library: json-generator v
-Url: "https://github.com/tmattia/json-generator/"
-License: MIT
+==========
+Notice for: json-2.10.1
+----------
 
 source: https://github.com/tmattia/json-generator/blob/v0.1.0/LICENSE.txt
 
@@ -10931,53 +9043,35 @@ 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.
+==========
+Notice for: logger-1.6.6
+----------
 
---------------------------------------------------
-Library: json v1.8.6
-Url: z
-License: Ruby
-
-source: https://github.com/flori/json/blob/v1.8.6/README.md#license
-
-Ruby License, see https://www.ruby-lang.org/en/about/license.txt.
-
---------------------------------------------------
-Library: jzlib v
-Url: "http://www.jcraft.com/jzlib/"
-License: BSD
-
-source: https://github.com/ymnk/jzlib/blob/1.1.3/LICENSE.txt#L5-L29
-
-Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved.
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
 
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in
-     the documentation and/or other materials provided with the distribution.
-
-  3. The names of the authors may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
---------------------------------------------------
-Library: lru_redux v1.1.0
-Url: "https://github.com/SamSaffron/lru_redux/"
-License: MIT
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+==========
+Notice for: lru_redux-1.1.0
+----------
 
 source: https://github.com/SamSaffron/lru_redux/blob/v1.1.0/LICENSE.txt
 
@@ -11003,11 +9097,9 @@ 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.
-
---------------------------------------------------
-Library: mail v2.6.6
-Url: "https://github.com/mikel/mail/"
-License: MIT
+==========
+Notice for: mail-2.8.1
+----------
 
 source: https://github.com/mikel/mail/blob/2.6.6/MIT-LICENSE
 
@@ -11032,10 +9124,9 @@ 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.
 
---------------------------------------------------
-Library: manticore v0.6.1
-Url: "https://github.com/cheald/manticore/"
-License: MIT
+==========
+Notice for: manticore-0.9.1
+----------
 
 source: https://github.com/cheald/manticore/blob/v0.6.1/LICENSE.txt
 
@@ -11060,10 +9151,9 @@ 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.
 
---------------------------------------------------
-Library: march_hare v3.1.1
-Url: "https://github.com/ruby-amqp/march_hare/"
-License: MIT
+==========
+Notice for: march_hare-4.6.0
+----------
 
 source: https://github.com/ruby-amqp/march_hare/blob/v3.1.1/LICENSE
 
@@ -11089,10 +9179,9 @@ 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.
 
---------------------------------------------------
-Library: memoizable v0.4.2
-Url: "https://github.com/dkubb/memoizable/"
-License: MIT
+==========
+Notice for: memoizable-0.4.2
+----------
 
 source: https://github.com/dkubb/memoizable/blob/v0.4.2/LICENSE.md
 
@@ -11116,11 +9205,9 @@ 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.
-
---------------------------------------------------
-Library: method_source v0.8.2
-Url: "https://github.com/banister/method_source/"
-License: MIT
+==========
+Notice for: method_source-1.1.0
+----------
 
 source: https://github.com/banister/method_source/blob/v0.9.0/README.markdown#license
 
@@ -11145,10 +9232,9 @@ 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.
 
---------------------------------------------------
-Library: metriks v0.9.9.8
-Url: "https://github.com/eric/metriks/"
-License: MIT
+==========
+Notice for: metriks-0.9.9.8
+----------
 
 source: https://github.com/eric/metriks/blob/v0.9.9.8/LICENSE
 
@@ -11171,41 +9257,36 @@ 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.
+==========
+Notice for: mini_mime-1.1.5
+----------
 
---------------------------------------------------
-Library: mime-types v2.6.2
-Url: 
-License: MIT
+# source: https://github.com/discourse/mini_mime/blob/v1.1.5/LICENSE.txt
 
-source: https://github.com/mime-types/ruby-mime-types/blob/v2.6.2/Licence.rdoc
+The MIT License (MIT)
 
-* Copyright 2003–2015 Austin Ziegler.
-* Adapted from MIME::Types (Perl) by Mark Overmeer.
+Copyright (c) 2016 Discourse Construction Kit, Inc.
 
-=== MIT License
+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:
 
-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 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.
-
---------------------------------------------------
-Library: minitar v0.6.1
-Url: 
-License: RUBY|BSD-2-Clause
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+==========
+Notice for: minitar-1.0.2
+----------
 
 source: https://github.com/halostatue/minitar/blob/v0.6.1/Licence.md
 
@@ -11215,10 +9296,9 @@ terms of Ruby’s licence or the Simplified BSD licence.
 * Copyright 2004–2017 Austin Ziegler.
 * Portions copyright 2004 Mauricio Julio Fernández Pradier.
 
---------------------------------------------------
-Library: msgpack v1.2.4
-Url: "https://github.com/msgpack/msgpack-ruby"
-License: Apache-2.0
+==========
+Notice for: msgpack-1.8.0
+----------
 
 source: https://github.com/msgpack/msgpack-ruby/blob/v1.2.4/ext/msgpack/
 
@@ -11235,11 +9315,9 @@ source: https://github.com/msgpack/msgpack-ruby/blob/v1.2.4/ext/msgpack/
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-
---------------------------------------------------
-Library: multi_json v1.13.1
-Url: "https://github.com/intridea/multi_json"
-License: MIT
+==========
+Notice for: multi_json-1.15.0
+----------
 
 source: https://github.com/intridea/multi_json/blob/v1.13.1/LICENSE.md
 
@@ -11263,11 +9341,9 @@ 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.
-
---------------------------------------------------
-Library: multipart-post v2.0.0
-Url: "https://github.com/nicksieger/multipart-post"
-License: MIT
+==========
+Notice for: multipart-post-2.4.1
+----------
 
 source: https://github.com/nicksieger/multipart-post/blob/v2.0.0/README.md#license
 
@@ -11292,10 +9368,9 @@ 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.
 
---------------------------------------------------
-Library: murmurhash3 v0.1.6
-Url: "https://github.com/funny-falcon/"
-License: MIT
+==========
+Notice for: murmurhash3-0.1.6
+----------
 
 source: https://github.com/funny-falcon/murmurhash3-ruby/blob/v0.1.5/LICENSE
 
@@ -11322,10 +9397,9 @@ 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.
 
---------------------------------------------------
-Library: mustache v0.99.8
-Url: "https://github.com/mustache/mustache"
-License: MIT
+==========
+Notice for: mustache-0.99.8
+----------
 
 source: https://github.com/mustache/mustache/blob/v0.99.8/LICENSE
 
@@ -11350,21 +9424,37 @@ 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.
 
---------------------------------------------------
-Library: nailgun v
-Url: "http://martiansoftware.com/nailgun"
-License: Apache-2.0
+==========
+Notice for: mustermann-3.0.3
+----------
 
-source: https://github.com/facebook/nailgun/blob/nailgun-all-0.9.3/LICENSE.txt
+Copyright (c) 2013-2017 Konstantin Haase
+Copyright (c) 2016-2017 Zachary Scott
 
-Nailgun Copyright © 2004-2012, Martian Software, 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:
 
-Apache License
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
---------------------------------------------------
-Library: naught v1.1.0
-Url: "https://github.com/avdi/naught/"
-License: MIT
+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.
+
+==========
+Notice for: naught-1.1.0
+----------
 
 source: https://github.com/avdi/naught/blob/v1.1.0/LICENSE.txt
 
@@ -11391,10 +9481,196 @@ 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.
 
---------------------------------------------------
-Library: nokogiri v1.8.2
-Url: "http://nokogiri.org/"
-License: MIT
+==========
+Notice for: net-imap-0.5.6
+----------
+
+# source: https://github.com/ruby/net-imap/blob/v0.3.7/LICENSE.txt
+
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+-------------------------------------------------------------------------
+
+This software includes documentation which has been copied from the relevant
+RFCs.  The copied documentation is covered by the following licenses:
+
+RFC 3501 (Editor: M. Crispin)
+Full Copyright Statement
+
+   Copyright (C) The Internet Society (2003).  All Rights Reserved.
+
+   This document and translations of it may be copied and furnished to
+   others, and derivative works that comment on or otherwise explain it
+   or assist in its implementation may be prepared, copied, published
+   and distributed, in whole or in part, without restriction of any
+   kind, provided that the above copyright notice and this paragraph are
+   included on all such copies and derivative works.  However, this
+   document itself may not be modified in any way, such as by removing
+   the copyright notice or references to the Internet Society or other
+   Internet organizations, except as needed for the purpose of
+   developing Internet standards in which case the procedures for
+   copyrights defined in the Internet Standards process must be
+   followed, or as required to translate it into languages other than
+   English.
+
+   The limited permissions granted above are perpetual and will not be
+   revoked by the Internet Society or its successors or assigns.  v This
+   document and the information contained herein is provided on an "AS
+   IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING TASK
+   FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+   LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL
+   NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY
+   OR FITNESS FOR A PARTICULAR PURPOSE.
+
+
+RFC9051 (Editors: A. Melnikov, B. Leiba)
+Copyright Notice
+
+   Copyright (c) 2021 IETF Trust and the persons identified as the
+   document authors.  All rights reserved.
+
+   This document is subject to BCP 78 and the IETF Trust's Legal
+   Provisions Relating to IETF Documents
+   (https://trustee.ietf.org/license-info) in effect on the date of
+   publication of this document.  Please review these documents
+   carefully, as they describe your rights and restrictions with respect
+   to this document.  Code Components extracted from this document must
+   include Simplified BSD License text as described in Section 4.e of
+   the Trust Legal Provisions and are provided without warranty as
+   described in the Simplified BSD License.
+
+   This document may contain material from IETF Documents or IETF
+   Contributions published or made publicly available before November
+   10, 2008.  The person(s) controlling the copyright in some of this
+   material may not have granted the IETF Trust the right to allow
+   modifications of such material outside the IETF Standards Process.
+   Without obtaining an adequate license from the person(s) controlling
+   the copyright in such materials, this document may not be modified
+   outside the IETF Standards Process, and derivative works of it may
+   not be created outside the IETF Standards Process, except to format
+   it for publication as an RFC or to translate it into languages other
+   than English.
+==========
+Notice for: net-pop-0.1.2
+----------
+
+source: https://github.com/ruby/net-pop/blob/v0.1.2/LICENSE.txt
+
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+==========
+Notice for: net-protocol-0.2.2
+----------
+
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+==========
+Notice for: net-smtp-0.5.1
+----------
+
+# source: https://github.com/ruby/net-smtp/blob/v0.4.0/LICENSE.txt
+
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+==========
+Notice for: nio4r-2.7.4
+----------
+
+Released under the MIT license.
+
+Copyright, 2019, by Tony Arcieri.
+Copyright, 2019, by Samuel G. D. Williams.
+
+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.
+
+==========
+Notice for: nokogiri-1.18.3
+----------
 
 source: https://github.com/sparklemotion/nokogiri/blob/v1.8.2/LICENSE.md
 
@@ -11428,36 +9704,62 @@ 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.
 
---------------------------------------------------
-Library: numerizer v0.1.1
-Url: "https://github.com/jduff/numerizer/"
-License: MIT
+==========
+Notice for: openssl_pkcs8_pure-0.0.0.2
+----------
 
-FAKER
+- Copyright (c) 2017, T. Yamada
 
---------------------------------------------------
-Library: options v
-Url: https://github.com/headius/options
-License: Apache-2.0
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met: 
 
-source: https://github.com/headius/options/blob/options-1.4/src/main/java/com/headius/options/Option.java#L1-L13
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution. 
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-    http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+==========
+Notice for: org.apache.httpcomponents:httpclient-4.5.14
+----------
 
---------------------------------------------------
-Library: log4j-1.2-api v2.6.2
-Url: "https://logging.apache.org/log4j"
-License: Apache-2.0
+source: https://github.com/apache/httpcomponents-client/blob/4.5.x/NOTICE.txt
+
+Apache HttpComponents Client
+Copyright 1999-2021 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+==========
+Notice for: org.apache.httpcomponents:httpcore-4.4.16
+----------
+
+source: https://github.com/apache/httpcomponents-core/blob/4.4.x/NOTICE.txt
+
+Apache HttpComponents Core
+Copyright 2005-2021 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+==========
+Notice for: org.apache.logging.log4j:log4j-1.2-api-2.17.2
+----------
+
+source: https://github.com/apache/logging-log4j2/blob/rel/2.14.0/NOTICE.txt
 
 Apache Log4j
 Copyright 1999-2017 Apache Software Foundation
@@ -11476,11 +9778,11 @@ Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
 
 picocli (http://picocli.info)
 Copyright 2017 Remko Popma
+==========
+Notice for: org.apache.logging.log4j:log4j-api-2.17.2
+----------
 
---------------------------------------------------
-Library: log4j-api v2.6.2
-Url: "https://logging.apache.org/log4j"
-License: Apache-2.0
+source: https://git-wip-us.apache.org/repos/asf?p=logging-log4j2.git;a=blob;f=NOTICE.txt;h=bd95322f254fc6f691b47e77df8c21229f47b8d4;hb=HEAD
 
 Apache Log4j
 Copyright 1999-2017 Apache Software Foundation
@@ -11499,11 +9801,11 @@ Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
 
 picocli (http://picocli.info)
 Copyright 2017 Remko Popma
+==========
+Notice for: org.apache.logging.log4j:log4j-core-2.17.2
+----------
 
---------------------------------------------------
-Library: log4j-api v2.8.2
-Url: https://logging.apache.org/log4j/2.x/index.html
-License: Apache-2.0
+source: https://git-wip-us.apache.org/repos/asf?p=logging-log4j2.git;a=blob;f=NOTICE.txt;h=bd95322f254fc6f691b47e77df8c21229f47b8d4;hb=HEAD
 
 Apache Log4j
 Copyright 1999-2017 Apache Software Foundation
@@ -11522,11 +9824,11 @@ Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
 
 picocli (http://picocli.info)
 Copyright 2017 Remko Popma
+==========
+Notice for: org.apache.logging.log4j:log4j-jcl-2.17.2
+----------
 
---------------------------------------------------
-Library: log4j-api v2.9.1
-Url: https://logging.apache.org/log4j/2.x/index.html
-License: Apache-2.0
+source: https://github.com/apache/logging-log4j2/blob/rel/2.14.0/NOTICE.txt
 
 Apache Log4j
 Copyright 1999-2017 Apache Software Foundation
@@ -11545,11 +9847,11 @@ Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
 
 picocli (http://picocli.info)
 Copyright 2017 Remko Popma
+==========
+Notice for: org.apache.logging.log4j:log4j-slf4j-impl-2.17.2
+----------
 
---------------------------------------------------
-Library: log4j-core v2.8.2
-Url: https://logging.apache.org/log4j/2.x/index.html
-License: Apache-2.0
+source: https://git-wip-us.apache.org/repos/asf?p=logging-log4j2.git;a=blob;f=NOTICE.txt;h=bd95322f254fc6f691b47e77df8c21229f47b8d4;hb=HEAD
 
 Apache Log4j
 Copyright 1999-2017 Apache Software Foundation
@@ -11568,80 +9870,9 @@ Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
 
 picocli (http://picocli.info)
 Copyright 2017 Remko Popma
-
---------------------------------------------------
-Library: log4j-core v2.9.1
-Url: https://logging.apache.org/log4j/2.x/index.html
-License: Apache-2.0
-
-Apache Log4j
-Copyright 1999-2017 Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-ResolverUtil.java
-Copyright 2005-2006 Tim Fennell
-
-Dumbster SMTP test server
-Copyright 2004 Jason Paul Kitchen
-
-TypeUtil.java
-Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
-
-picocli (http://picocli.info)
-Copyright 2017 Remko Popma
-
---------------------------------------------------
-Library: log4j-slf4j-impl v2.8.2
-Url: https://logging.apache.org/log4j/2.x/index.html
-License: Apache-2.0
-
-Apache Log4j
-Copyright 1999-2017 Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-ResolverUtil.java
-Copyright 2005-2006 Tim Fennell
-
-Dumbster SMTP test server
-Copyright 2004 Jason Paul Kitchen
-
-TypeUtil.java
-Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
-
-picocli (http://picocli.info)
-Copyright 2017 Remko Popma
-
---------------------------------------------------
-Library: log4j-slf4j-impl v2.9.1
-Url: https://logging.apache.org/log4j/2.x/index.html
-License: Apache-2.0
-
-Apache Log4j
-Copyright 1999-2017 Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-ResolverUtil.java
-Copyright 2005-2006 Tim Fennell
-
-Dumbster SMTP test server
-Copyright 2004 Jason Paul Kitchen
-
-TypeUtil.java
-Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
-
-picocli (http://picocli.info)
-Copyright 2017 Remko Popma
-
---------------------------------------------------
-Library: commons-compiler v3.0.8
-Url: https://github.com/janino-compiler/janino
-License: BSD-3-Clause # Question: tweaked license on bullet point 3
+==========
+Notice for: org.codehaus.janino:janino-3.1.0
+----------
 
 Janino - An embedded Java[TM] compiler
 
@@ -11675,865 +9906,17 @@ IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
---------------------------------------------------
-Library: janino v3.0.8
-Url: https://github.com/janino-compiler/janino
-License: BSD-3-Clause # Question: tweaked license on bullet point 3
+==========
+Notice for: org.javassist:javassist-3.30.2-GA
+----------
 
-Janino - An embedded Java[TM] compiler
+Copyright (C) 1999-2019 by Shigeru Chiba, All rights reserved.
 
-Copyright (c) 2001-2016, Arno Unkrig
-Copyright (c) 2015-2016  TIBCO Software Inc.
-All rights reserved.
+This software is distributed under the Mozilla Public License Version 1.1, the GNU Lesser General Public License Version 2.1 or later, or the Apache License Version 2.0.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-   2. Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials
-      provided with the distribution.
-   3. Neither the name of JANINO nor the names of its contributors
-      may be used to endorse or promote products derived from this
-      software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
---------------------------------------------------
-Library: org.eclipse.core.commands v3.6.0
-Url: http://www.eclipse.org
-License: EPL-1.0
-
-Copyright © Eclipse Foundation, Inc. All Rights Reserved.
-
-Eclipse Public License - v 1.0
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-
---------------------------------------------------
-Library: org.eclipse.core.contenttype v3.4.100
-Url: http://www.eclipse.org
-License: EPL-1.0
-
-Copyright © Eclipse Foundation, Inc. All Rights Reserved.
-
-Eclipse Public License - v 1.0
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-
---------------------------------------------------
-Library: org.eclipse.core.expressions v3.4.300
-Url: http://www.eclipse.org
-License: EPL-1.0
-
-Copyright © Eclipse Foundation, Inc. All Rights Reserved.
-
-Eclipse Public License - v 1.0
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-
---------------------------------------------------
-Library: org.eclipse.core.filesystem v1.3.100
-Url: http://www.eclipse.org
-License: EPL-1.0
-
-Copyright © Eclipse Foundation, Inc. All Rights Reserved.
-
-Eclipse Public License - v 1.0
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-
---------------------------------------------------
-Library: org.eclipse.core.jobs v3.5.100
-Url: http://www.eclipse.org
-License: EPL-1.0
-
-Copyright © Eclipse Foundation, Inc. All Rights Reserved.
-
-Eclipse Public License - v 1.0
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-
---------------------------------------------------
-Library: org.eclipse.core.resources v3.7.100
-Url: http://www.eclipse.org
-License: EPL-1.0
-
-Copyright © Eclipse Foundation, Inc. All Rights Reserved.
-
-Eclipse Public License - v 1.0
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-
---------------------------------------------------
-Library: org.eclipse.core.runtime v3.7.0
-Url: http://www.eclipse.org
-License: EPL-1.0
-
-Copyright © Eclipse Foundation, Inc. All Rights Reserved.
-
-Eclipse Public License - v 1.0
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-
---------------------------------------------------
-Library: org.eclipse.equinox.app v1.3.100
-Url: http://www.eclipse.org/platform
-License: EPL-1.0
-
-  Copyright (c) 2012 Eclipse Foundation.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
-
---------------------------------------------------
-Library: org.eclipse.equinox.common v3.6.0
-Url: http://www.eclipse.org/platform
-License: EPL-1.0
-
-  Copyright (c) 2012 Eclipse Foundation.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
-
---------------------------------------------------
-Library: org.eclipse.equinox.preferences v3.4.1
-Url: http://www.eclipse.org/platform
-License: EPL-1.0
-
-  Copyright (c) 2012 Eclipse Foundation.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
-
---------------------------------------------------
-Library: org.eclipse.equinox.registry v3.5.101
-Url: http://www.eclipse.org/platform
-License: EPL-1.0
-
-  Copyright (c) 2012 Eclipse Foundation.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
-
---------------------------------------------------
-Library: org.eclipse.jdt.core v3.10.0
-Url: http://www.eclipse.org/jdt
-License: EPL-1.0
-
-  Copyright (c) 2012, 2016 Eclipse Foundation and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
-
---------------------------------------------------
-Library: org.eclipse.osgi v3.7.1
-Url: http://www.eclipse.org/jdt
-License: EPL-1.0
-
-  Copyright (c) 2012, 2017 Eclipse Foundation.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
-
---------------------------------------------------
-Library: org.eclipse.text v3.5.101
-Url: http://www.eclipse.org/jdt
-License: EPL-1.0
-
-Copyright © Eclipse Foundation, Inc. All Rights Reserved.
-
-Eclipse Public License - v 1.0
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-
---------------------------------------------------
-Library: jruby-complete v9.1.13.0
-Url: http://jruby.org/
-License: EPL-2.0
+==========
+Notice for: org.jruby:jruby-core-9.4.9.0
+----------
 
 JRuby is Copyright (c) 2007-2018 The JRuby project
 
@@ -12814,11 +10197,46 @@ Eclipse Public License - v 2.0
     look for such a notice.
 
     You may add additional accurate notices of copyright ownership.
+==========
+Notice for: org.logstash:jvm-options-parser-9.1.0
+----------
 
---------------------------------------------------
-Library: slf4j-api v1.7.25
-Url: http://www.slf4j.org/
-License: MIT
+Copyright (c) 2022 Elasticsearch B.V. <http://www.elastic.co>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+==========
+Notice for: org.reflections:reflections-0.10.2
+----------
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.
+
+Also licensed under BSD-2-Clause according to https://github.com/ronmamo/reflections/blob/0.9.11/pom.xml#L20-L22
+
+==========
+Notice for: org.slf4j:slf4j-api-1.7.30
+----------
 
 Copyright (c) 2004-2007 QOS.ch
 All rights reserved.
@@ -12841,11 +10259,25 @@ 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.
+==========
+Notice for: org.yaml:snakeyaml-2.2
+----------
 
---------------------------------------------------
-Library: paquet v0.2.1
-Url: https://github.com/elastic/logstash
-License: Apache-2.0
+Copyright (c) 2008, SnakeYAML
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+in compliance with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License
+is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+or implied. See the License for the specific language governing permissions and limitations under
+the License.
+
+==========
+Notice for: paquet-0.2.1
+----------
 
 Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
 
@@ -12860,11 +10292,9 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-
---------------------------------------------------
-Library: pleaserun v0.0.30
-Url: https://github.com/jordansissel/pleaserun
-License: Apache-2.0
+==========
+Notice for: pleaserun-0.0.32
+----------
 
 Copyright 2014 Jordan Sissel contributors.
 
@@ -12880,10 +10310,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
---------------------------------------------------
-Library: polyglot v0.3.5
-Url: http://github.com/cjheath/polyglot
-License: MIT
+==========
+Notice for: polyglot-0.3.5
+----------
 
 Copyright (c) 2007 Clifford Heath
 
@@ -12905,46 +10334,9 @@ 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.
-
---------------------------------------------------
-Library: poseidon v0.0.5
-Url: https://github.com/bpot/poseidon
-License: MIT
-
-Copyright (c) 2013 Bob Potter
-
-MIT License
-
-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.
-
---------------------------------------------------
-Library: prototype.js v
-Url: http://prototypejs.org
-License: MIT  TODO: Another jruby dependency that is not shipped with it
-
-TODO
-
---------------------------------------------------
-Library: pry v0.10.4
-Url: http://pryrepl.org
-License: MIT
+==========
+Notice for: pry-0.15.2
+----------
 
 Copyright (c) 2016 John Mair (banisterfiend)
 
@@ -12967,23 +10359,35 @@ 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.
 
---------------------------------------------------
-Library: psych v2.2.4
-Url: https://github.com/ruby/psych
-License: MIT
+==========
+Notice for: psych-5.2.2
+----------
 
-Copyright 2009 Aaron Patterson, et al.
+MIT License
 
-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:
+Copyright (c) 2009 Aaron Patterson, et al.
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+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 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.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
---------------------------------------------------
-Library: public_suffix v1.4.6
-Url: https://simonecarletti.com/code/publicsuffix-ruby
-License: MIT
+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.
+
+==========
+Notice for: public_suffix-5.1.1
+----------
 
 Copyright (c) 2009-2018 Simone Carletti <weppos@weppos.net>
 
@@ -13008,10 +10412,9 @@ 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.
 
---------------------------------------------------
-Library: puma v2.16.0
-Url: http://puma.io
-License: BSD-3-Clause
+==========
+Notice for: puma-6.6.0
+----------
 
 Some code copyright (c) 2005, Zed Shaw
 Copyright (c) 2011, Evan Phoenix
@@ -13040,24 +10443,62 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
---------------------------------------------------
-Library: racc v
-Url: https://github.com/tenderlove/racc
-License:  TODO: https://github.com/tenderlove/racc/blob/master/COPYING vs https://github.com/jruby/jruby/blob/master/COPYING#L89
+==========
+Notice for: racc-1.8.1
+----------
 
-TODO 
+source: https://github.com/ruby/racc/blob/master/COPYING
 
+Copyright (C) 2019 Yukihiro Matsumoto. All rights reserved.
 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
 
-Racc is distributed under the terms of the GNU Lesser General
-Public License version 2. Note that you do NOT need to follow
-LGPL for your own parser (racc outputs). You can distribute those
-files under any licenses you want.Racc is
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
 
---------------------------------------------------
-Library: rack-protection v1.5.5
-Url: http://github.com/rkh/rack-protection
-License: MIT
+==========
+Notice for: rack-3.1.10
+----------
+
+The MIT License (MIT)
+
+Copyright (C) 2007-2018 Christian Neukirchen <http://chneukirchen.org/infopage.html>
+
+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 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.
+==========
+Notice for: rack-protection-4.1.1
+----------
 
 The MIT License (MIT)
 
@@ -13082,37 +10523,85 @@ 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.
+==========
+Notice for: rack-session-2.1.0
+----------
 
---------------------------------------------------
-Library: rack v1.6.6
-Url: http://rack.github.io/
-License: MIT
+# MIT License
 
-The MIT License (MIT)
-
-Copyright (C) 2007-2018 Christian Neukirchen <http://chneukirchen.org/infopage.html>
+Copyright, 2007-2008, by Leah Neukirchen.  
+Copyright, 2007-2009, by Scytrin dai Kinthra.  
+Copyright, 2008, by Daniel Roethlisberger.  
+Copyright, 2009, by Joshua Peek.  
+Copyright, 2009, by Mickaël Riga.  
+Copyright, 2010, by Simon Chiang.  
+Copyright, 2010-2011, by José Valim.  
+Copyright, 2010-2013, by James Tucker.  
+Copyright, 2010-2019, by Aaron Patterson.  
+Copyright, 2011, by Max Cantor.  
+Copyright, 2011-2012, by Konstantin Haase.  
+Copyright, 2011, by Will Leinweber.  
+Copyright, 2011, by John Manoogian III.  
+Copyright, 2012, by Yun Huang Yong.  
+Copyright, 2012, by Ravil Bayramgalin.  
+Copyright, 2012, by Timothy Elliott.  
+Copyright, 2012, by Jamie Macey.  
+Copyright, 2012-2015, by Santiago Pastorino.  
+Copyright, 2013, by Andrew Cole.  
+Copyright, 2013, by Postmodern.  
+Copyright, 2013, by Vipul A M.  
+Copyright, 2013, by Charles Hornberger.  
+Copyright, 2014, by Michal Bryxí.  
+Copyright, 2015, by deepj.  
+Copyright, 2015, by Doug McInnes.  
+Copyright, 2015, by David Runger.  
+Copyright, 2015, by Francesco Rodríguez.  
+Copyright, 2015, by Yuichiro Kaneko.  
+Copyright, 2015, by Michael Sauter.  
+Copyright, 2016, by Kir Shatrov.  
+Copyright, 2016, by Yann Vanhalewyn.  
+Copyright, 2016, by Jian Weihang.  
+Copyright, 2017, by Jordan Raine.  
+Copyright, 2018, by Dillon Welch.  
+Copyright, 2018, by Yoshiyuki Hirano.  
+Copyright, 2019, by Krzysztof Rybka.  
+Copyright, 2019, by Frederick Cheung.  
+Copyright, 2019, by Adrian Setyadi.  
+Copyright, 2019, by Rafael Mendonça França.  
+Copyright, 2019-2020, by Pavel Rosicky.  
+Copyright, 2019, by Dima Fatko.  
+Copyright, 2019, by Oleh Demianiuk.  
+Copyright, 2020-2023, by Samuel Williams.  
+Copyright, 2020-2022, by Jeremy Evans.  
+Copyright, 2020, by Alex Speller.  
+Copyright, 2020, by Ryuta Kamizono.  
+Copyright, 2020, by Yudai Suzuki.  
+Copyright, 2020, by Bart de Water.  
+Copyright, 2020, by Alec Clarke.  
+Copyright, 2021, by Michael Coyne.  
+Copyright, 2022, by Philip Arndt.  
+Copyright, 2022, by Jon Dufresne.  
 
 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
+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 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 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.
-
---------------------------------------------------
-Library: rake v10.4.2
-Url: https://github.com/ruby/rake
-License: MIT
+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.
+==========
+Notice for: rake-13.2.1
+----------
 
 Copyright (c) Jim Weirich
 
@@ -13136,10 +10625,9 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
---------------------------------------------------
-Library: redis v3.3.5
-Url: https://github.com/redis/redis-rb
-License: MIT
+==========
+Notice for: redis-4.8.1
+----------
 
 Copyright (c) 2009 Ezra Zygmuntowicz
 
@@ -13161,11 +10649,105 @@ 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.
+==========
+Notice for: rexml-3.4.1
+----------
 
---------------------------------------------------
-Library: rspec-core v3.7.1
-Url: https://github.com/rspec/rspec-core
-License: MIT
+source: https://github.com/ruby/rexml/blob/v3.2.5/LICENSE.txt
+
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+==========
+Notice for: rspec-3.13.0
+----------
+
+source: https://github.com/rspec/rspec-metagem/blob/v3.12.0/LICENSE.md
+
+The MIT License (MIT)
+=====================
+
+Copyright © 2009 Chad Humphries, David Chelimsky
+Copyright © 2006 David Chelimsky, The RSpec Development Team
+Copyright © 2005 Steven Baker
+
+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.
+==========
+Notice for: rspec-collection_matchers-1.2.1
+----------
+
+source: https://github.com/rspec/rspec-collection_matchers/blob/v1.2.1/LICENSE.txt
+
+(The MIT License)
+
+Copyright (c) 2013 Hugo Barauna
+Copyright (c) 2012 David Chelimsky, Myron Marston
+Copyright (c) 2006 David Chelimsky, The RSpec Development Team
+Copyright (c) 2005 Steven Baker
+
+MIT License
+
+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.
+==========
+Notice for: rspec-core-3.13.3
+----------
+
+source: https://github.com/rspec/rspec-core/blob/v3.12.2/LICENSE.md
 
 The MIT License (MIT)
 =====================
@@ -13193,11 +10775,11 @@ 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.
+==========
+Notice for: rspec-expectations-3.13.3
+----------
 
---------------------------------------------------
-Library: rspec-expectations v3.7.0
-Url: https://github.com/rspec/rspec-expectations
-License: MIT
+source: https://github.com/rspec/rspec-expectations/blob/v3.12.3/LICENSE.md
 
 The MIT License (MIT)
 =====================
@@ -13224,11 +10806,11 @@ 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.
+==========
+Notice for: rspec-mocks-3.13.2
+----------
 
---------------------------------------------------
-Library: rspec-mocks v3.7.0
-Url: https://github.com/rspec/rspec-mocks
-License: MIT
+source: https://github.com/rspec/rspec-mocks/blob/v3.12.6/LICENSE.md
 
 The MIT License (MIT)
 =====================
@@ -13255,219 +10837,14 @@ 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.
+==========
+Notice for: rspec-support-3.13.2
+----------
 
---------------------------------------------------
-Library: rspec-sequencing v0.1.0
-Url: https://github.com/elastic/rspec-sequencing
-License: Apache-2.0
+source: https://github.com/rspec/rspec-support/blob/v3.12.1/LICENSE.md
 
-Copyright (c) 2016 Elasticsearch <http://www.elastic.co>
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
---------------------------------------------------
-Library: rspec-support v3.7.1
-Url: https://github.com/rspec/rspec-support
-License: MIT
+The MIT License (MIT)
+====================
 
 * Copyright © 2013 David Chelimsky, Myron Marston, Jon Rowe, Sam Phippen, Xavier Shay, Bradley Schaefer
 
@@ -13489,11 +10866,11 @@ 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.
+==========
+Notice for: rspec-wait-1.0.1
+----------
 
---------------------------------------------------
-Library: rspec-wait v0.0.9
-Url: https://github.com/laserlemon/rspec-wait
-License: MIT
+source: https://github.com/laserlemon/rspec-wait/blob/v0.0.9/LICENSE.txt
 
 Copyright (c) 2014 Steve Richert
 
@@ -13517,41 +10894,85 @@ 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.
+==========
+Notice for: ruby-maven-libs-3.9.9
+----------
 
---------------------------------------------------
-Library: rspec v3.7.0
-Url: https://github.com/rspec/rspec
-License: MIT
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-Copyright © 2009 Chad Humphries, David Chelimsky  
-Copyright © 2006 David Chelimsky, The RSpec Development Team  
-Copyright © 2005 Steven Baker
+1. Definitions.
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
 
-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:
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
 
-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.
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
 
---------------------------------------------------
-Library: ruby-progressbar v1.8.3
-Url: https://github.com/jfelchner/ruby-progressbar
-License: MIT
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+(a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
+(b) You must cause any modified files to carry prominent notices stating that You changed the files; and
+(c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+(d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Standard License Header
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+==========
+Notice for: ruby-progressbar-1.13.0
+----------
 
 Copyright (c) 2010-2016 The Kompanee, Ltd
 
@@ -13573,10 +10994,37 @@ 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.
 
---------------------------------------------------
-Library: rubyzip v1.2.1
-Url: https://github.com/rubyzip/rubyzip
-License: BSD-2-Clause-FreeBSD
+==========
+Notice for: ruby2_keywords-0.0.5
+----------
+
+source: https://github.com/ruby/ruby2_keywords/blob/v0.0.5/LICENSE
+
+Copyright 2019-2020 Nobuyoshi Nakada, Yusuke Endoh
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+==========
+Notice for: rubyzip-1.3.0
+----------
 
 Authors:
 
@@ -13645,12 +11093,37 @@ You can redistribute it and/or modify it under either the terms of the
      WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
      PURPOSE.
 
---------------------------------------------------
-Library: rumbster v1.1.0
-Url: https://github.com/aesterline/rumbster
-License: Apache-2.0
+==========
+Notice for: rufus-scheduler-3.0.9
+----------
 
-Copyright (c) 2011 Adam Esterline. See LICENSE.txt for further details.
+
+Copyright (c) 2005-2014, John Mettraux, jmettraux@gmail.com
+
+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.
+
+
+==========
+Notice for: semantic_logger-3.4.1
+----------
+
+Copyright 2012, 2013, 2014, 2015, 2016 Reid Morrison
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -13664,38 +11137,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
---------------------------------------------------
-Library: safe_yaml v1.0.4
-Url: https://github.com/dtao/safe_yaml
-License: MIT
-
-Copyright (c) 2013 Dan Tao
-
-MIT License
-
-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.
-
---------------------------------------------------
-Library: sequel v5.7.1
-Url: https://github.com/jeremyevans/sequel
-License: MIT
+==========
+Notice for: sequel-5.89.0
+----------
 
 Copyright (c) 2007-2008 Sharon Rosner
 Copyright (c) 2008-2018 Jeremy Evans
@@ -13717,10 +11161,9 @@ THE AUTHORS 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.
 
---------------------------------------------------
-Library: simple_oauth v0.3.1
-Url: https://github.com/laserlemon/simple_oauth
-License: MIT
+==========
+Notice for: simple_oauth-0.3.1
+----------
 
 Copyright (c) 2010-2013 Steve Richert, Erik Michaels-Ober
 
@@ -13743,10 +11186,9 @@ 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.
 
---------------------------------------------------
-Library: sinatra v1.4.8
-Url: https://github.com/sinatra/sinatra
-License: MIT
+==========
+Notice for: sinatra-4.1.1
+----------
 
 Copyright (c) 2007, 2008, 2009 Blake Mizerany
 Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015, 2016 Konstantin Haase
@@ -13772,76 +11214,9 @@ 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.
 
---------------------------------------------------
-Library: slop v3.6.0
-Url: https://github.com/leejarvis/slop
-License: MIT
-
-Copyright (c) 2012 Lee Jarvis
-
-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.
-
---------------------------------------------------
-Library: snakeyaml v1.18
-Url: https://bitbucket.org/asomov/snakeyaml/
-License: Apache-2.0
-
-Copyright (c) 2008, http://www.snakeyaml.org
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
---------------------------------------------------
-Library: snappy-jars v1.1.0.1.2
-Url: https://github.com/doxavore/snappy-jars
-License: Apache-2.0
-
-Copyright Doug Mayer (https://github.com/doxavore)
-
-README.md: "Per the real implementation, Apache License v2.0."
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
---------------------------------------------------
-Library: snappy v0.0.12
-Url: https://github.com/miyucy/snappy
-License: MIT
+==========
+Notice for: snappy-0.4.0
+----------
 
 Copyright (c) 2011-2013 miyucy
 
@@ -13866,35 +11241,29 @@ 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.
 
---------------------------------------------------
-Library: snmp v1.2.0
-Url: https://github.com/hallidave/ruby-snmp
-License: MIT
+==========
+Notice for: snappy-jars-1.1.0.1.2
+----------
 
-Copyright (c) 2004-2014 David R. Halliday
+Copyright Doug Mayer (https://github.com/doxavore)
 
-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:
+README.md: "Per the real implementation, Apache License v2.0."
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-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.
+    http://www.apache.org/licenses/LICENSE-2.0
 
---------------------------------------------------
-Library: spoon v0.0.6
-Url: https://github.com/headius/spoon
-License: Apache-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+==========
+Notice for: spoon-0.0.6
+----------
 
 Apache License
 
@@ -14041,10 +11410,9 @@ additional liability.
 
 END OF TERMS AND CONDITIONS
 
---------------------------------------------------
-Library: stud v0.0.23
-Url: https://github.com/jordansissel/ruby-stud
-License: Apache-2.0
+==========
+Notice for: stud-0.0.23
+----------
 
 Copyright 2012-2013 Jordan Sissel and contributors.
 
@@ -14060,10 +11428,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
---------------------------------------------------
-Library: thread_safe v0.3.6
-Url: https://github.com/ruby-concurrency/thread_safe
-License: Apache-2.0
+==========
+Notice for: thread_safe-0.3.6
+----------
 
 Apache License
 
@@ -14210,446 +11577,11 @@ additional liability.
 
 END OF TERMS AND CONDITIONS
 
---------------------------------------------------
-Library: tilt v2.0.8
-Url: https://github.com/rtomayko/tilt
-License: MIT
+==========
+Notice for: thwait-0.2.0
+----------
 
-Copyright (c) 2010-2016 Ryan Tomayko <http://tomayko.com/about>
-
-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 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.
-
---------------------------------------------------
-Library: timecop v0.9.1
-Url: https://github.com/travisjeffery/timecop
-License: MIT
-
-(The MIT License)
-
-Copyright (c) 2012 — Travis Jeffery, John Trupiano
-
-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.
-
---------------------------------------------------
-Library: treetop v1.4.15
-Url: https://github.com/cjheath/treetop
-License: MIT
-
-Copyright (c) 2007 Nathan Sobo.
-
-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.
-
---------------------------------------------------
-Library: twitter v5.15.0
-Url: https://github.com/sferik/twitter
-License: MIT
-
-Copyright (c) 2006-2015 Erik Michaels-Ober, John Nunemaker, Wynn Netherland, Steve Richert, Steve Agalloco
-
-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.
-
---------------------------------------------------
-Library: tzinfo-data v1.2018.4
-Url: https://github.com/tzinfo/tzinfo-data
-License: MIT
-
-Copyright (c) 2005-2018 Philip Ross
-
-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.
-
---------------------------------------------------
-Library: tzinfo v1.2.5
-Url: https://github.com/tzinfo/tzinfo
-License: MIT
-
-Copyright (c) 2005-2018 Philip Ross
-
-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.
-
---------------------------------------------------
-Library: unf v0.1.4
-Url: https://github.com/knu/ruby-unf
-License: BSD-2-Clause
-
-Copyright (c) 2011, 2012 Akinori MUSHA
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.	 IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
---------------------------------------------------
-Library: unsafe-fences v1.0
-Url: https://github.com/headius/unsafe-fences
-License: Apache-2.0
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
---------------------------------------------------
-Library: webhdfs v0.8.0
-Url: https://github.com/kzk/webhdfs
-License: Apache-2.0
-
-Copyright (C) 2012 Fluentd Project
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
---------------------------------------------------
-Library: webmock v1.21.0
-Url: https://github.com/bblimke/webmock
-License: MIT
-
-Copyright (c) 2009-2010 Bartosz Blimke
-
-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.
-
---------------------------------------------------
-Library: webrick v1.3.1
-Url: https://github.com/ruby/webrick
-License: BSD-2-Clause
+source: https://github.com/ruby/thwait/blob/master/LICENSE.txt
 
 Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
 
@@ -14673,11 +11605,201 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
+==========
+Notice for: tilt-2.6.0
+----------
 
---------------------------------------------------
-Library: xml-simple v1.1.5
-Url: https://github.com/maik/xml-simple
-License: BSD-2-Clause
+Copyright (c) 2010-2016 Ryan Tomayko <http://tomayko.com/about>
+
+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 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.
+
+==========
+Notice for: timeout-0.4.3
+----------
+
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+==========
+Notice for: treetop-1.6.14
+----------
+
+Copyright (c) 2007 Nathan Sobo.
+
+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.
+
+==========
+Notice for: twitter-6.2.0
+----------
+
+Copyright (c) 2006-2015 Erik Michaels-Ober, John Nunemaker, Wynn Netherland, Steve Richert, Steve Agalloco
+
+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.
+
+==========
+Notice for: tzinfo-2.0.6
+----------
+
+Copyright (c) 2005-2018 Philip Ross
+
+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.
+
+==========
+Notice for: tzinfo-data-1.2025.1
+----------
+
+Copyright (c) 2005-2018 Philip Ross
+
+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.
+
+==========
+Notice for: webhdfs-0.11.0
+----------
+
+Copyright (C) 2012 Fluentd Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+==========
+Notice for: webrick-1.9.1
+----------
+
+source: https://github.com/ruby/webrick/blob/v1.8.1/LICENSE.txt
+
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+==========
+Notice for: xml-simple-1.1.9
+----------
 
 Readme.md: 
 
diff --git a/README.md b/README.md
index ceeccd624..9daea3a65 100644
--- a/README.md
+++ b/README.md
@@ -16,32 +16,10 @@ For information about building the documentation, see the README in https://gith
 You can download officially released Logstash binaries, as well as debian/rpm packages for the
 supported platforms, from [downloads page](https://www.elastic.co/downloads/logstash).
 
-### Snapshot Builds
-
-For the daring, snapshot builds are available.
-These builds are created nightly and have undergone no formal QA, so they should **never** be run in production.
-
-| Complete, with X-Pack | Apache 2.0 licensed    |
-| --------------------- | ---------------------- |
-| [tar-complete][]      | [tar-oss][]            |
-| [zip-complete][]      | [zip-oss][]            |
-| [deb-complete][]      | [deb-oss][]            |
-| [rpm-complete][]      | [rpm-oss][]            |
-
-[tar-complete]: https://snapshots.elastic.co/downloads/logstash/logstash-7.0.0-SNAPSHOT.tar.gz
-[zip-complete]: https://snapshots.elastic.co/downloads/logstash/logstash-7.0.0-SNAPSHOT.zip
-[deb-complete]: https://snapshots.elastic.co/downloads/logstash/logstash-7.0.0-SNAPSHOT.deb
-[rpm-complete]: https://snapshots.elastic.co/downloads/logstash/logstash-7.0.0-SNAPSHOT.rpm
-[tar-oss]: https://snapshots.elastic.co/downloads/logstash/logstash-oss-7.0.0-SNAPSHOT.tar.gz
-[zip-oss]: https://snapshots.elastic.co/downloads/logstash/logstash-oss-7.0.0-SNAPSHOT.zip
-[deb-oss]: https://snapshots.elastic.co/downloads/logstash/logstash-oss-7.0.0-SNAPSHOT.deb
-[rpm-oss]: https://snapshots.elastic.co/downloads/logstash/logstash-oss-7.0.0-SNAPSHOT.rpm
-
 ## Need Help?
 
 - [Logstash Forum](https://discuss.elastic.co/c/logstash)
 - [Logstash Documentation](https://www.elastic.co/guide/en/logstash/current/index.html)
-- [#logstash on freenode IRC](https://webchat.freenode.net/?channels=logstash)
 - [Logstash Product Information](https://www.elastic.co/products/logstash)
 - [Elastic Support](https://www.elastic.co/subscriptions)
 
@@ -65,8 +43,8 @@ Logstash core will continue to exist under this repository and all related issue
 
 ### Prerequisites
 
-* Install JDK version 8. Make sure to set the `JAVA_HOME` environment variable to the path to your JDK installation directory. For example `set JAVA_HOME=<JDK_PATH>`
-* Install JRuby 9.1.x It is recommended to use a Ruby version manager such as [RVM](https://rvm.io/) or [rbenv](https://github.com/sstephenson/rbenv).
+* Install JDK version 11 or 17. Make sure to set the `JAVA_HOME` environment variable to the path to your JDK installation directory. For example `set JAVA_HOME=<JDK_PATH>`
+* Install JRuby 9.2.x It is recommended to use a Ruby version manager such as [RVM](https://rvm.io/) or [rbenv](https://github.com/sstephenson/rbenv).
 * Install `rake` and `bundler` tool using `gem install rake` and `gem install bundler` respectively.
 
 ### RVM install (optional)
@@ -96,21 +74,29 @@ The Logstash project includes the source code for all of Logstash, including the
 export OSS=true
 ```
 
-* To run Logstash from the repo you must first bootstrap the environment:
+* Set up the location of the source code to build
 
-```sh
-rake bootstrap
+``` sh
+export LOGSTASH_SOURCE=1
+export LOGSTASH_PATH=/YOUR/LOGSTASH/DIRECTORY
 ```
 
-* You can then use `bin/logstash` to start Logstash, but there are no plugins installed. To install default plugins, you can run:
+#### Install dependencies with `gradle` **(recommended)**[^1]
 
+* Install development dependencies
 ```sh
-rake plugin:install-default
+./gradlew installDevelopmentGems
 ```
 
-This will install the 80+ default plugins which makes Logstash ready to connect to multiple data sources, perform transformations and send the results to Elasticsearch and other destinations.
+* Install default plugins and other dependencies
 
-To verify your environment, run the following to send your first event:
+```sh
+./gradlew installDefaultGems
+```
+
+### Verify the installation
+
+To verify your environment, run the following to start Logstash and send your first event:
 
 ```sh
 bin/logstash -e 'input { stdin { } } output { stdout {} }'
@@ -159,7 +145,7 @@ Run the doc build script from within the `docs` repo. For example:
 
 ## Testing
 
-Most of the unit tests in Logstash are written using [rspec](http://rspec.info/) for the Ruby parts. For the Java parts, we use junit. For testing you can use the *test* `rake` tasks and the `bin/rspec` command, see instructions below:
+Most of the unit tests in Logstash are written using [rspec](http://rspec.info/) for the Ruby parts. For the Java parts, we use [junit](https://junit.org). For testing you can use the *test* `rake` tasks and the `bin/rspec` command, see instructions below:
 
 ### Core tests
 
@@ -184,6 +170,14 @@ Most of the unit tests in Logstash are written using [rspec](http://rspec.info/)
 
     ./gradlew check
 
+4- To execute a single Ruby test run:
+
+    SPEC_OPTS="-fd -P logstash-core/spec/logstash/api/commands/default_metadata_spec.rb" ./gradlew :logstash-core:rubyTests --tests org.logstash.RSpecTests
+
+5- To execute single spec for integration test, run:
+
+    ./gradlew integrationTests -PrubyIntegrationSpecs=specs/slowlog_spec.rb
+
 Sometimes you might find a change to a piece of Logstash code causes a test to hang. These can be hard to debug.
 
 If you set `LS_JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005"` you can connect to a running Logstash with your IDEs debugger which can be a great way of finding the issue.
@@ -192,7 +186,7 @@ If you set `LS_JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,
 
 To run the tests of all currently installed plugins:
 
-    rake test:plugin
+    rake test:plugins
 
 You can install the default set of plugins included in the logstash package:
 
@@ -237,7 +231,7 @@ rake artifact:deb_oss
 
 ## Using a Custom JRuby Distribution
 
-If you want the build to use a custom JRuby you can do so by setting a path to a custom 
+If you want the build to use a custom JRuby you can do so by setting a path to a custom
 JRuby distribution's source root via the `custom.jruby.path` Gradle property.
 
 E.g.
@@ -258,10 +252,38 @@ All contributions are welcome: ideas, patches, documentation, bug reports,
 complaints, and even something you drew up on a napkin.
 
 Programming is not a required skill. Whatever you've seen about open source and
-maintainers or community members  saying "send patches or die" - you will not
+maintainers or community members saying "send patches or die" - you will not
 see that here.
 
-It is more important to me that you are able to contribute.
+It is more important that you are able to contribute.
 
 For more information about contributing, see the
 [CONTRIBUTING](./CONTRIBUTING.md) file.
+
+## Footnotes
+
+[^1]: <details><summary>Use bundle instead of gradle to install dependencies</summary>
+
+    #### Alternatively, instead of using `gradle` you can also use `bundle`:
+
+    * Install development dependencies
+
+        ```sh
+        bundle config set --local path vendor/bundle
+        bundle install
+        ```
+
+    * Bootstrap the environment:
+
+        ```sh
+        rake bootstrap
+        ```
+
+    * You can then use `bin/logstash` to start Logstash, but there are no plugins installed. To install default plugins, you can run:
+
+        ```sh
+        rake plugin:install-default
+        ```
+
+    This will install the 80+ default plugins which makes Logstash ready to connect to multiple data sources, perform transformations and send the results to Elasticsearch and other destinations.
+    </details>
diff --git a/Rakefile b/Rakefile
index 71f49fe54..d6734b280 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,19 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 $: << File.join(File.dirname(__FILE__), "lib")
 $: << File.join(File.dirname(__FILE__), "logstash-core/lib")
@@ -19,5 +34,7 @@ Developing?
   `rake test:install-core`  installs any dependencies for testing Logstash core
   `rake test:core`          to run Logstash core tests
   `rake vendor:clean`       clean vendored dependencies used for Logstash development
+  `rake lint:report`        to run the Rubocop linter
+  `rake lint:format`        to automatically format the code
 HELP
 end
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..9f9060d96
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,6 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+For security vulnerabilities please only send reports to security@elastic.co.
+See https://www.elastic.co/community/security for more information.
diff --git a/bin/benchmark.bat b/bin/benchmark.bat
new file mode 100644
index 000000000..c7604bfc1
--- /dev/null
+++ b/bin/benchmark.bat
@@ -0,0 +1,10 @@
+@echo off
+setlocal enabledelayedexpansion
+
+cd /d "%~dp0.."
+for /f %%i in ('cd') do set RESULT=%%i
+
+"%JAVACMD%" -cp "!RESULT!\tools\benchmark-cli\build\libs\benchmark-cli.jar;*" ^
+  org.logstash.benchmark.cli.Main %*
+
+endlocal
diff --git a/bin/ingest-convert.sh b/bin/ingest-convert.sh
deleted file mode 100755
index 1205cebc5..000000000
--- a/bin/ingest-convert.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-java -cp "$(cd `dirname $0`/..; pwd)"'/tools/ingest-converter/build/libs/ingest-converter.jar:*' \
- org.logstash.ingest.Pipeline "$@"
diff --git a/bin/logstash b/bin/logstash
index ae23c5163..01881363a 100755
--- a/bin/logstash
+++ b/bin/logstash
@@ -1,7 +1,5 @@
 #!/bin/bash
-# Run logstash from source
-#
-# This is most useful when done from a git checkout.
+# Run logstash
 #
 # Usage:
 #   bin/logstash <command> [arguments]
@@ -58,9 +56,5 @@ if [ "$1" = "-V" ] || [ "$1" = "--version" ]; then
   fi
   echo "logstash $LOGSTASH_VERSION"
 else
-  unset CLASSPATH
-  for J in $(cd "${LOGSTASH_JARS}"; ls *.jar); do
-    CLASSPATH=${CLASSPATH}${CLASSPATH:+:}${LOGSTASH_JARS}/${J}
-  done
   exec "${JAVACMD}" ${JAVA_OPTS} -cp "${CLASSPATH}" org.logstash.Logstash "$@"
 fi
diff --git a/bin/logstash-keystore b/bin/logstash-keystore
index 8e0fdc020..b1e9ac354 100755
--- a/bin/logstash-keystore
+++ b/bin/logstash-keystore
@@ -6,6 +6,6 @@ setup
 
 # bin/logstash-keystore is a short lived ruby script thus we can use aggressive "faster starting JRuby options"
 # see https://github.com/jruby/jruby/wiki/Improving-startup-time
-export JRUBY_OPTS="$JRUBY_OPTS -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -X-C -Xcompile.invokedynamic=false"
+export JRUBY_OPTS="${JRUBY_OPTS---dev}"
 
 ruby_exec "${LOGSTASH_HOME}/lib/secretstore/cli.rb" "$@"
diff --git a/bin/logstash-plugin b/bin/logstash-plugin
index b357c749a..41921db0c 100755
--- a/bin/logstash-plugin
+++ b/bin/logstash-plugin
@@ -6,6 +6,6 @@ setup
 
 # bin/logstash-plugin is a short lived ruby script thus we can use aggressive "faster starting JRuby options"
 # see https://github.com/jruby/jruby/wiki/Improving-startup-time
-export JRUBY_OPTS="$JRUBY_OPTS -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -X-C -Xcompile.invokedynamic=false"
+export JRUBY_OPTS="${JRUBY_OPTS---dev}"
 
 ruby_exec "${LOGSTASH_HOME}/lib/pluginmanager/main.rb" "$@"
diff --git a/bin/logstash.bat b/bin/logstash.bat
index a04a5de9f..7015e8568 100644
--- a/bin/logstash.bat
+++ b/bin/logstash.bat
@@ -2,7 +2,11 @@
 setlocal enabledelayedexpansion
 set params='%*'
 
-call "%~dp0setup.bat" || exit /b 1
+
+if "%1" == "-V" goto version
+if "%1" == "--version" goto version
+
+1>&2 (call "%~dp0setup.bat") || exit /b 1
 if errorlevel 1 (
 	if not defined nopauseonerror (
 		pause
@@ -10,68 +14,26 @@ if errorlevel 1 (
 	exit /B %ERRORLEVEL%
 )
 
-if "%1" == "-V" goto version
-if "%1" == "--version" goto version
-
-rem iterate over the command line args and look for the argument
-rem after --path.settings to see if the jvm.options file is in
-rem that path and set LS_JVM_OPTIONS_CONFIG accordingly
-:loop
-for /F "usebackq tokens=1-2* delims= " %%A in (!params!) do (
-    set current=%%A
-    set next=%%B
-    set params='%%B %%C'
-
-    if "!current!" == "--path.settings" (
-    	if exist !next!\jvm.options (
-    	  set "LS_JVM_OPTIONS_CONFIG=!next!\jvm.options"
-    	)
-    )
-
-    if not "x!params!" == "x" (
-		goto loop
-	)
-)
-
-rem if explicit jvm.options is not found use default location
-if "%LS_JVM_OPTIONS_CONFIG%" == "" (
-  set LS_JVM_OPTIONS_CONFIG="%LS_HOME%\config\jvm.options"
-)
-
-rem extract the options from the JVM options file %LS_JVM_OPTIONS_CONFIG%
-rem such options are the lines beginning with '-', thus "findstr /b"
-if exist %LS_JVM_OPTIONS_CONFIG% (
-  for /F "usebackq delims=" %%a in (`findstr /b \- %LS_JVM_OPTIONS_CONFIG%`) do set options=!options! %%a
-  set "LS_JAVA_OPTS=!options! %LS_JAVA_OPTS%"
-) else (
-  echo "warning: no jvm.options file found"
-)
-set JAVA_OPTS=%LS_JAVA_OPTS%
-
-for %%i in ("%LS_HOME%\logstash-core\lib\jars\*.jar") do (
-	call :concat "%%i"
-)
-
-%JAVA% %JAVA_OPTS% -cp "%CLASSPATH%" org.logstash.Logstash %*
+"%JAVACMD%" %JAVA_OPTS% -cp "%CLASSPATH%" org.logstash.Logstash %*
 
 goto :end
 
 :version
-set "LOGSTASH_VERSION_FILE1=%LS_HOME%\logstash-core\versions-gem-copy.yml"
-set "LOGSTASH_VERSION_FILE2=%LS_HOME%\versions.yml"
+set LOGSTASH_VERSION_FILE1="%LS_HOME%\logstash-core\versions-gem-copy.yml"
+set LOGSTASH_VERSION_FILE2="%LS_HOME%\versions.yml"
 
 set "LOGSTASH_VERSION=Version not detected"
 if exist !LOGSTASH_VERSION_FILE1! (
 	rem this file is present in zip, deb and rpm artifacts and after bundle install
 	rem but might not be for a git checkout type install
-	for /F "tokens=1,2 delims=: " %%a in (!LOGSTASH_VERSION_FILE1!) do (
+	for /F "tokens=1,2 delims=: " %%a in ('type !LOGSTASH_VERSION_FILE1!') do (
 		if "%%a"=="logstash" set LOGSTASH_VERSION=%%b
 	)
 ) else (
 	if exist !LOGSTASH_VERSION_FILE2! (
 		rem this file is present for a git checkout type install
 		rem but its not in zip, deb and rpm artifacts (and in integration tests)
-		for /F "tokens=1,2 delims=: " %%a in (!LOGSTASH_VERSION_FILE2!) do (
+		for /F "tokens=1,2 delims=: " %%a in ('type !LOGSTASH_VERSION_FILE2!') do (
 			if "%%a"=="logstash" set LOGSTASH_VERSION=%%b
 		)
 	)
@@ -79,13 +41,6 @@ if exist !LOGSTASH_VERSION_FILE1! (
 echo logstash !LOGSTASH_VERSION!
 goto :end
 
-:concat
-IF not defined CLASSPATH (
-  set CLASSPATH="%~1"
-) ELSE (
-  set CLASSPATH=%CLASSPATH%;"%~1"
-)
-goto :eof
-
 :end
 endlocal
+exit /B %ERRORLEVEL%
diff --git a/bin/logstash.lib.sh b/bin/logstash.lib.sh
index 33c05fbc4..388e9650d 100755
--- a/bin/logstash.lib.sh
+++ b/bin/logstash.lib.sh
@@ -14,7 +14,7 @@
 # The following env var will be used by this script if set:
 #   LS_GEM_HOME and LS_GEM_PATH to overwrite the path assigned to GEM_HOME and GEM_PATH
 #   LS_JAVA_OPTS to append extra options to the JVM options provided by logstash
-#   JAVA_HOME to point to the java home
+#   LS_JAVA_HOME to point to the java home
 
 unset CDPATH
 # This unwieldy bit of scripting is to try to catch instances where Logstash
@@ -47,6 +47,7 @@ export LS_HOME="${LOGSTASH_HOME}"
 SINCEDB_DIR="${LOGSTASH_HOME}"
 export SINCEDB_DIR
 LOGSTASH_JARS=${LOGSTASH_HOME}/logstash-core/lib/jars
+JRUBY_HOME="${LOGSTASH_HOME}/vendor/jruby"
 
 # iterate over the command line args and look for the argument
 # after --path.settings to see if the jvm.options file is in
@@ -66,26 +67,62 @@ for i in "$@"; do
  fi
 done
 
-parse_jvm_options() {
-  if [ -f "$1" ]; then
-    echo "$(grep "^-" "$1" | tr '\n' ' ')"
+setup_bundled_jdk_part() {
+  OS_NAME="$(uname -s)"
+  if [ $OS_NAME = "Darwin" ]; then
+    BUNDLED_JDK_PART="jdk.app/Contents/Home"
+  else
+    BUNDLED_JDK_PART="jdk"
   fi
 }
 
+# Accepts 1 parameter which is the path the directory where logstash jar are contained.
+setup_classpath() {
+  local classpath="${1?classpath (and jar_directory) required}"
+  local jar_directory="${2}"
+  for J in $(cd "${jar_directory}"; ls *.jar); do
+    classpath=${classpath}${classpath:+:}${jar_directory}/${J}
+  done
+  echo "${classpath}"
+}
+
+# set up CLASSPATH once (we start more than one java process)
+CLASSPATH="${JRUBY_HOME}/lib/jruby.jar"
+CLASSPATH="$(setup_classpath $CLASSPATH $LOGSTASH_JARS)"
+
 setup_java() {
   # set the path to java into JAVACMD which will be picked up by JRuby to launch itself
   if [ -z "$JAVACMD" ]; then
-    if [ -x "$JAVA_HOME/bin/java" ]; then
-      JAVACMD="$JAVA_HOME/bin/java"
-    else
+    setup_bundled_jdk_part
+    JAVACMD_TEST=`command -v java`
+    if [ -n "$LS_JAVA_HOME" ]; then
+      echo "Using LS_JAVA_HOME defined java: ${LS_JAVA_HOME}."
+      if [ -x "$LS_JAVA_HOME/bin/java" ]; then
+        JAVACMD="$LS_JAVA_HOME/bin/java"
+        if [ -d "${LOGSTASH_HOME}/${BUNDLED_JDK_PART}" -a -x "${LOGSTASH_HOME}/${BUNDLED_JDK_PART}/bin/java" ]; then
+          if [ ! -e "${LOGSTASH_HOME}/JDK_VERSION" ]; then
+            echo "File ${LOGSTASH_HOME}/JDK_VERSION doesn't exists"
+            exit 1
+          fi
+          BUNDLED_JDK_VERSION=`cat "${LOGSTASH_HOME}/JDK_VERSION"`
+          echo "WARNING: Logstash comes bundled with the recommended JDK(${BUNDLED_JDK_VERSION}), but is overridden by the version defined in LS_JAVA_HOME. Consider clearing LS_JAVA_HOME to use the bundled JDK."
+        fi
+      else
+        echo "Invalid LS_JAVA_HOME, doesn't contain bin/java executable."
+      fi
+    elif [ -d "${LOGSTASH_HOME}/${BUNDLED_JDK_PART}" -a -x "${LOGSTASH_HOME}/${BUNDLED_JDK_PART}/bin/java" ]; then
+      echo "Using bundled JDK: ${LOGSTASH_HOME}/${BUNDLED_JDK_PART}"
+      JAVACMD="${LOGSTASH_HOME}/${BUNDLED_JDK_PART}/bin/java"
+    elif [ -n "$JAVACMD_TEST" ]; then
       set +e
       JAVACMD=`command -v java`
       set -e
+      echo "Using system java: $JAVACMD"
     fi
   fi
 
   if [ ! -x "$JAVACMD" ]; then
-    echo "could not find java; set JAVA_HOME or ensure java is in PATH"
+    echo "Could not find java; set LS_JAVA_HOME or ensure java is in PATH."
     exit 1
   fi
 
@@ -107,29 +144,20 @@ setup_java() {
     LS_GC_LOG_FILE="./logstash-gc.log"
   fi
 
-  # Set the initial JVM options from the jvm.options file.  Look in
-  # /etc/logstash first, and break if that file is found readable there.
-  if [ -z "$LS_JVM_OPTS" ]; then
-      for jvm_options in /etc/logstash/jvm.options \
-                        "$LOGSTASH_HOME"/config/jvm.options;
-                         do
-          if [ -r "$jvm_options" ]; then
-              LS_JVM_OPTS=$jvm_options
-              break
-          fi
-      done
-  fi
-  # then override with anything provided
-  LS_JAVA_OPTS="$(parse_jvm_options "$LS_JVM_OPTS") $LS_JAVA_OPTS"
-  JAVA_OPTS=$LS_JAVA_OPTS
-
   # jruby launcher uses JAVACMD as its java executable and JAVA_OPTS as the JVM options
   export JAVACMD
+
+  JAVA_OPTS=`exec "${JAVACMD}" -cp "${CLASSPATH}" org.logstash.launchers.JvmOptionsParser "$LOGSTASH_HOME" "$LS_JVM_OPTS"`
+  EXIT_CODE=$?
+  if [ $EXIT_CODE -ne 0 ]; then
+    exit $EXIT_CODE
+  fi
+
   export JAVA_OPTS
 }
 
 setup_vendored_jruby() {
-  JRUBY_BIN="${LOGSTASH_HOME}/vendor/jruby/bin/jruby"
+  JRUBY_BIN="${JRUBY_HOME}/bin/jruby"
 
   if [ ! -f "${JRUBY_BIN}" ] ; then
     echo "Unable to find JRuby."
@@ -139,7 +167,7 @@ setup_vendored_jruby() {
   fi
 
   if [ -z "$LS_GEM_HOME" ] ; then
-    export GEM_HOME="${LOGSTASH_HOME}/vendor/bundle/jruby/2.5.0"
+    export GEM_HOME="${LOGSTASH_HOME}/vendor/bundle/jruby/3.1.0"
   else
     export GEM_HOME=${LS_GEM_HOME}
   fi
@@ -158,8 +186,8 @@ setup_vendored_jruby() {
 }
 
 setup() {
-  setup_java
-  setup_vendored_jruby
+  >&2 setup_java
+  >&2 setup_vendored_jruby
 }
 
 ruby_exec() {
diff --git a/bin/pqcheck.bat b/bin/pqcheck.bat
new file mode 100644
index 000000000..deed8b173
--- /dev/null
+++ b/bin/pqcheck.bat
@@ -0,0 +1,29 @@
+@echo off
+setlocal enabledelayedexpansion 
+
+call "%~dp0setup.bat" || exit /b 1
+if errorlevel 1 (
+	if not defined nopauseonerror (
+		pause
+	)
+	exit /B %ERRORLEVEL%
+)
+
+
+set JAVA_OPTS=%LS_JAVA_OPTS%
+
+for %%i in ("%LS_HOME%\logstash-core\lib\jars\*.jar") do (
+	call :concat "%%i"
+)
+
+"%JAVACMD%" %JAVA_OPTS% org.logstash.ackedqueue.PqCheck %*
+
+:concat
+IF not defined CLASSPATH (
+  set CLASSPATH="%~1"
+) ELSE (
+  set CLASSPATH=%CLASSPATH%;"%~1"
+)
+goto :eof 
+
+endlocal
diff --git a/bin/pqrepair.bat b/bin/pqrepair.bat
new file mode 100644
index 000000000..59a6201c0
--- /dev/null
+++ b/bin/pqrepair.bat
@@ -0,0 +1,29 @@
+@echo off
+setlocal enabledelayedexpansion 
+
+call "%~dp0setup.bat" || exit /b 1
+if errorlevel 1 (
+	if not defined nopauseonerror (
+		pause
+	)
+	exit /B %ERRORLEVEL%
+)
+
+
+set JAVA_OPTS=%LS_JAVA_OPTS%
+
+for %%i in ("%LS_HOME%\logstash-core\lib\jars\*.jar") do (
+	call :concat "%%i"
+)
+
+"%JAVACMD%" %JAVA_OPTS% org.logstash.ackedqueue.PqRepair %*
+
+:concat
+IF not defined CLASSPATH (
+  set CLASSPATH="%~1"
+) ELSE (
+  set CLASSPATH=%CLASSPATH%;"%~1"
+)
+goto :eof 
+
+endlocal
diff --git a/bin/rspec b/bin/rspec
index b05b117c7..a0f817944 100755
--- a/bin/rspec
+++ b/bin/rspec
@@ -5,6 +5,6 @@ unset CDPATH
 setup
 
 # use faster starting JRuby options see https://github.com/jruby/jruby/wiki/Improving-startup-time
-export JRUBY_OPTS="$JRUBY_OPTS -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1"
+export JRUBY_OPTS="${JRUBY_OPTS---dev}"
 
 ruby_exec "${LOGSTASH_HOME}/lib/bootstrap/rspec.rb" "$@"
diff --git a/bin/ruby b/bin/ruby
index 342a1e3f3..666b2ff47 100755
--- a/bin/ruby
+++ b/bin/ruby
@@ -12,7 +12,7 @@
 #   DEBUG=1 to output debugging information
 
 # use faster starting JRuby options see https://github.com/jruby/jruby/wiki/Improving-startup-time
-export JRUBY_OPTS="$JRUBY_OPTS -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1"
+export JRUBY_OPTS="${JRUBY_OPTS---dev}"
 
 unset CDPATH
 
diff --git a/bin/setup.bat b/bin/setup.bat
index b846894a9..18b19e699 100644
--- a/bin/setup.bat
+++ b/bin/setup.bat
@@ -20,14 +20,29 @@ for %%I in ("%LS_HOME%..") do set LS_HOME=%%~dpfI
 
 rem ### 2: set java
 
-if defined JAVA_HOME (
-  set JAVA="%JAVA_HOME%\bin\java.exe"
+if defined LS_JAVA_HOME (
+  set JAVACMD=%LS_JAVA_HOME%\bin\java.exe
+  echo Using LS_JAVA_HOME defined java: %LS_JAVA_HOME%
+  if exist "%LS_HOME%\jdk" (
+    if not exist "%LS_HOME%\JDK_VERSION" (
+      echo "File %LS_HOME%\JDK_VERSION doesn't exists"
+      exit /b 1
+    )
+    set /p BUNDLED_JDK_VERSION=<"%LS_HOME%\JDK_VERSION"
+    echo "WARNING: Logstash comes bundled with the recommended JDK(%BUNDLED_JDK_VERSION%), but is overridden by the version defined in LS_JAVA_HOME. Consider clearing LS_JAVA_HOME to use the bundled JDK."
+  )
 ) else (
-  for %%I in (java.exe) do set JAVA="%%~$PATH:I"
+  if exist "%LS_HOME%\jdk" (
+    set JAVACMD=%LS_HOME%\jdk\bin\java.exe
+    echo "Using bundled JDK: !JAVACMD!"
+  ) else (
+    for %%I in (java.exe) do set JAVACMD="%%~$PATH:I"
+    echo "Using system java: !JAVACMD!"
+  )
 )
 
-if not exist %JAVA% (
-  echo could not find java; set JAVA_HOME or ensure java is in PATH 1>&2
+if not exist "%JAVACMD%" (
+  echo could not find java; set LS_JAVA_HOME or ensure java is in PATH 1>&2
   exit /b 1
 )
 
@@ -51,5 +66,50 @@ if not exist %JRUBY_BIN% (
   echo "could not find jruby in %LS_HOME%\vendor\jruby" 1>&2
   exit /b 1
 )
+rem iterate over the command line args and look for the argument
+rem after --path.settings to see if the jvm.options file is in
+rem that path and set LS_JVM_OPTS accordingly
+:loop
+for /F "usebackq tokens=1-2* delims= " %%A in (!params!) do (
+    set current=%%A
+    set next=%%B
+    set params='%%B %%C'
 
-set RUBYLIB=%LS_HOME%\lib
+    if "!current!" == "--path.settings" (
+    	if exist !next!\jvm.options (
+    	  set "LS_JVM_OPTS=!next!\jvm.options"
+    	)
+    )
+
+    if not "x!params!" == "x" (
+		goto loop
+	)
+)
+
+rem setup CLASSPATH for Java process
+set "JRUBY_HOME=%LS_HOME%\vendor\jruby"
+
+set "CLASSPATH=%JRUBY_HOME%\lib\jruby.jar"
+for %%i in ("%LS_HOME%\logstash-core\lib\jars\*.jar") do (
+	call :concat "%%i"
+)
+
+@setlocal
+for /F "usebackq delims=" %%a in (`CALL "%JAVACMD%" -cp "!CLASSPATH!" "org.logstash.launchers.JvmOptionsParser" "!LS_HOME!" "!LS_JVM_OPTS!" ^|^| echo jvm_options_parser_failed`) do set LS_JAVA_OPTS=%%a
+@endlocal & set "MAYBE_JVM_OPTIONS_PARSER_FAILED=%LS_JAVA_OPTS%" & set LS_JAVA_OPTS=%LS_JAVA_OPTS%
+
+if "%MAYBE_JVM_OPTIONS_PARSER_FAILED%" == "jvm_options_parser_failed" (
+  echo "error: jvm options parser failed; exiting"
+  exit /b 1
+)
+set JAVA_OPTS=%LS_JAVA_OPTS%
+
+:concat
+IF not defined CLASSPATH (
+  set CLASSPATH=%~1
+) ELSE (
+  set CLASSPATH=%CLASSPATH%;%~1
+)
+goto :eof
+
+set RUBYLIB=%LS_HOME%\lib
\ No newline at end of file
diff --git a/bin/system-install b/bin/system-install
index 5ac9a2ce2..7a2d37300 100755
--- a/bin/system-install
+++ b/bin/system-install
@@ -17,8 +17,8 @@ elif [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
   echo
   echo "OPTIONSFILE: Full path to a startup.options file"
   echo "OPTIONSFILE is required if STARTUPTYPE is specified, but otherwise looks first"
-  echo "in $LOGSTASH_HOME/config/startup.options and then /etc/logstash/startup.options"
-  echo "Last match wins"
+  echo "in /etc/logstash/startup.options and then "
+  echo "in $LOGSTASH_HOME/config/startup.options "
   echo
   echo "STARTUPTYPE: e.g. sysv, upstart, systemd, etc."
   echo "OPTIONSFILE is required to specify a STARTUPTYPE."
@@ -61,7 +61,7 @@ done
 
 # bin/logstash-plugin is a short lived ruby script thus we can use aggressive "faster starting JRuby options"
 # see https://github.com/jruby/jruby/wiki/Improving-startup-time
-export JRUBY_OPTS="$JRUBY_OPTS -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -X-C -Xcompile.invokedynamic=false"
+export JRUBY_OPTS="$JRUBY_OPTS $OPEN_JAVA_MODULES -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -X-C -Xcompile.invokedynamic=false"
 
 tempfile=$(mktemp)
 if [ "x${PRESTART}" == "x" ]; then
diff --git a/build.gradle b/build.gradle
index 5086ea303..87d139fb4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 buildscript {
+    ext {
+        snakeYamlVersion = '2.2'
+        shadowGradlePluginVersion = '8.1.1'
+    }
+
     repositories {
         mavenCentral()
         maven {
@@ -6,52 +30,79 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'org.yaml:snakeyaml:1.23'
-        classpath "gradle.plugin.com.github.jk1:gradle-license-report:0.7.1"
+        classpath "org.yaml:snakeyaml:${snakeYamlVersion}"
     }
 }
 
 plugins {
-    id "de.undercouch.download" version "3.2.0"
+    id "de.undercouch.download" version "4.0.4"
+    id "com.dorongold.task-tree" version "2.1.0"
 }
 
 apply plugin: 'de.undercouch.download'
+apply from: "rubyUtils.gradle"
 
-
-import de.undercouch.gradle.tasks.download.Download
-import de.undercouch.gradle.tasks.download.Verify
-import groovy.json.JsonSlurper
-import org.logstash.gradle.RubyGradleUtils
 import org.yaml.snakeyaml.Yaml
-
-import java.nio.file.Files
-import java.nio.file.Paths
+import de.undercouch.gradle.tasks.download.Download
+import groovy.json.JsonSlurper
+import org.logstash.gradle.tooling.ListProjectDependencies
+import org.logstash.gradle.tooling.ExtractBundledJdkVersion
+import org.logstash.gradle.tooling.SignAliasDefinitions
+import org.logstash.gradle.tooling.ToolingUtils
+import org.logstash.gradle.tooling.SnapshotArtifactURLs
 
 allprojects {
   group = 'org.logstash'
 
   apply plugin: 'java'
   apply plugin: 'idea'
+  apply plugin: 'java-library'
 
-  project.sourceCompatibility = JavaVersion.VERSION_1_8
-  project.targetCompatibility = JavaVersion.VERSION_1_8
+  java {
+      sourceCompatibility = JavaVersion.VERSION_11
+      targetCompatibility = JavaVersion.VERSION_11
+  }
 
-  tasks.withType(JavaCompile).all {
+  tasks.withType(JavaCompile).configureEach {
       options.compilerArgs.add("-Xlint:all")
       options.compilerArgs.add("-Xlint:-processing")
       options.compilerArgs.add("-Werror")
   }
 
-  tasks.withType(Javadoc) {
-      options.addStringOption("Xwerror", "-quiet")
+  tasks.withType(Javadoc).configureEach {
+      if (JavaVersion.current().compareTo(JavaVersion.VERSION_14) > 0) {
+          // with JDK 15 the -Xwerror undocumented feature becomes official with switch -Werror
+          options.addBooleanOption("Werror", true)
+      } else {
+          options.addBooleanOption("Xwerror", true)
+      }
+      options.addBooleanOption("Xdoclint:all,-missing", true)
+      if (JavaVersion.current().compareTo(JavaVersion.VERSION_1_9) > 0) {
+          options.addBooleanOption("html5", true)
+      }
+  }
+
+  tasks.withType(Copy).configureEach {
+      duplicatesStrategy = DuplicatesStrategy.EXCLUDE
   }
 
   clean {
       delete "${projectDir}/out/"
   }
 
-  //https://stackoverflow.com/questions/3963708/gradle-how-to-display-test-results-in-the-console-in-real-time
   tasks.withType(Test) {
+    // Add Exports to enable tests to run in JDK17
+    jvmArgs = [
+      "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+      "--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+      "--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
+      "--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+      "--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+      "--add-opens=java.base/java.lang=ALL-UNNAMED",
+      "--add-opens=java.base/java.util=ALL-UNNAMED"
+    ]
+    maxHeapSize = "2g"
+    //https://stackoverflow.com/questions/3963708/gradle-how-to-display-test-results-in-the-console-in-real-time
     testLogging {
       // set options for log level LIFECYCLE
       events "passed", "skipped", "failed", "standardOut"
@@ -83,46 +134,141 @@ allprojects {
 
 subprojects {
     repositories {
+        mavenCentral()
         maven {
             url 'https://plugins.gradle.org/m2/'
         }
     }
-    dependencies {
-        compile "gradle.plugin.com.github.jk1:gradle-license-report:0.7.1"
-    }
 
-    apply plugin: 'com.github.jk1.dependency-license-report'
-
-    licenseReport {
-        renderer = new com.github.jk1.license.render.CsvReportRenderer()
-        configurations = ['compile', 'runtime']
+    tasks.register("generateLicenseReport", ListProjectDependencies) {
+        outputs.dir "${buildDir}/reports/dependency-license"
     }
 }
 
-// fetch version from Logstash's master versions.yml file
-def versionMap = (Map) (new Yaml()).load(new File("${projectDir}/versions.yml").text)
 version = versionMap['logstash-core']
-def versionQualifier = System.getenv('VERSION_QUALIFIER')
-if (versionQualifier) {
-    version = "$version-$versionQualifier"
+
+tasks.register("configureArchitecture") {
+    String arch = System.properties['os.arch']
+    String beatsArch = arch
+    String esArch = arch
+    String osName = (System.properties['os.name'] ==~ /Mac OS X/) ? "darwin" : "linux"
+
+    // For aarch64 architectures, beats and elasticsearch name their artifacts differently
+    if (arch == "aarch64") {
+        beatsArch=(osName == "darwin") ? "aarch64" : "arm64"
+        esArch="aarch64"
+    } else if (arch == "amd64") {
+        beatsArch="x86_64"
+        esArch="x86_64"
+    }
+
+    project.ext.set("beatsArchitecture", "${osName}-${beatsArch}")
+    project.ext.set("esArchitecture", "${osName}-${esArch}")
 }
 
-String jRubyURL
-String jRubyVersion
-String jRubySha1
-Boolean doChecksum
+tasks.register("configureArtifactInfo") {
+    dependsOn configureArchitecture
+    description "Set the url to download stack artifacts for select stack version"
 
-if (versionMap["jruby-runtime-override"]) {
-    jRubyVersion = versionMap["jruby-runtime-override"]["version"]
-    jRubyURL = versionMap["jruby-runtime-override"]["url"]
-    doChecksum = false
-} else {
-    jRubyVersion = versionMap["jruby"]["version"]
-    jRubySha1 = versionMap["jruby"]["sha1"]
-    jRubyURL = "https://repo1.maven.org/maven2/org/jruby/jruby-dist/${jRubyVersion}/jruby-dist-${jRubyVersion}-bin.tar.gz"
-    doChecksum = true
+    doLast {
+        def splitVersion = version.split('\\.')
+        int major = splitVersion[0].toInteger()
+        int minor = splitVersion[1].toInteger()
+        String branch = "${major}.${minor}"
+        String fallbackMajorX = "${major}.x"
+        boolean isFallBackPreviousMajor = minor - 1 < 0
+        String fallbackBranch = isFallBackPreviousMajor ? "${major-1}.x" : "${major}.${minor-1}"
+        def qualifiedVersion = ""
+
+        for (b in [branch, fallbackMajorX, fallbackBranch]) {
+            def url = "https://storage.googleapis.com/artifacts-api/snapshots/${b}.json"
+            try {
+                def snapshotInfo = new JsonSlurper().parseText(url.toURL().text)
+                qualifiedVersion = snapshotInfo.version
+                println "ArtifactInfo version: ${qualifiedVersion}"
+                break
+            } catch (Exception e) {
+                println "Failed to fetch branch ${branch} from ${url}: ${e.message}"
+            }
+        }
+
+        project.ext.set("artifactApiVersion", qualifiedVersion)
+    }
 }
 
+tasks.register("markAliasDefinitions", SignAliasDefinitions) {
+    description "Create an hashes aliases file from original aliases yml definition"
+    hashedFile = project.file("${project.buildDir}/plugin_aliases_hashed.yml")
+}
+
+tasks.register("markTestAliasDefinitions", SignAliasDefinitions) {
+    description "Create an hashes aliases file for testing aliases yml definition"
+    stage SignAliasDefinitions.Stage.test
+    hashedFile = project.file("${project.buildDir}/plugin_aliases_hashed_test.yml")
+}
+
+tasks.register("copyPluginAlias", Copy) {
+    description "Copy the marked plugin_aliases.yml file to destination folders"
+    dependsOn = [copyPluginAlias_ruby, copyPluginAlias_java]
+}
+
+tasks.register("copyPluginAlias_ruby", Copy) {
+    description "Copy the marked plugin_aliases.yml file to destination folders"
+    dependsOn "markAliasDefinitions"
+
+    inputs.file("${buildDir}/plugin_aliases_hashed.yml")
+
+    from(markAliasDefinitions.hashedFile) {
+        rename "plugin_aliases_hashed.yml", "plugin_aliases.yml"
+    }
+    into "lib/pluginmanager/"
+}
+
+tasks.register("copyPluginAlias_java", Copy) {
+    description "Copy the marked plugin_aliases.yml file to destination folders"
+    dependsOn "markAliasDefinitions"
+
+    inputs.file("${buildDir}/plugin_aliases_hashed.yml")
+
+    from(markAliasDefinitions.hashedFile) {
+        rename "plugin_aliases_hashed.yml", "plugin_aliases.yml"
+    }
+    into "logstash-core/src/main/resources/org/logstash/plugins/"
+}
+
+tasks.register("copyPluginTestAlias") {
+    description "Copy the marked test plugin_aliases.yml file to destination folders"
+    dependsOn = [copyPluginTestAlias_ruby, copyPluginTestAlias_java]
+}
+
+tasks.register("copyPluginTestAlias_ruby", Copy) {
+    description "Copy the marked test plugin_aliases.yml file into Ruby's plugin_manager specs"
+    dependsOn "markTestAliasDefinitions"
+
+    inputs.file(markTestAliasDefinitions.hashedFile)
+
+    from(markTestAliasDefinitions.hashedFile) {
+        rename "plugin_aliases_hashed_test.yml", "plugin_aliases.yml"
+    }
+    into "spec/unit/plugin_manager/"
+}
+
+tasks.register("copyPluginTestAlias_java", Copy) {
+    description "Copy the marked test plugin_aliases.yml file into logstash-core's test resources"
+    dependsOn "markTestAliasDefinitions"
+
+    inputs.file("${buildDir}/plugin_aliases_hashed_test.yml")
+
+    from(markTestAliasDefinitions.hashedFile) {
+        rename "plugin_aliases_hashed_test.yml", "plugin_aliases.yml"
+    }
+    into "logstash-core/src/test/resources/org/logstash/plugins/"
+}
+
+tasks.findByPath(':logstash-core:processResources').dependsOn(copyPluginAlias)
+tasks.findByPath(':logstash-core:processTestResources').dependsOn(copyPluginTestAlias)
+
+
 // Tasks
 
 clean {
@@ -134,194 +280,123 @@ clean {
   delete "${projectDir}/qa/integration/.bundle"
   delete "${projectDir}/build/licenseReportFolders.txt"
   delete "${projectDir}/build/rubyDependencies.csv"
-}
 
-task bootstrap {}
-
-RubyGradleUtils rubyGradleUtils = new RubyGradleUtils(buildDir, projectDir)
-
-project(":logstash-core") {
-  ["rubyTests", "test"].each { tsk ->
-    tasks.getByPath(":logstash-core:" + tsk).configure {
-      dependsOn bootstrap
-    }
-  }
-}
-
-def jrubyTarPath = "${projectDir}/vendor/_/jruby-dist-${jRubyVersion}-bin.tar.gz"
-
-def customJRubyDir = project.hasProperty("custom.jruby.path") ? project.property("custom.jruby.path") : ""
-def customJRubyVersion = customJRubyDir == "" ? "" : Files.readAllLines(Paths.get(customJRubyDir, "VERSION")).get(0).trim()
-def customJRubyTar = customJRubyDir == "" ? "" : (customJRubyDir + "/maven/jruby-dist/target/jruby-dist-${customJRubyVersion}-bin.tar.gz")
-
-task downloadJRuby(type: Download) {
-    description "Download JRuby artifact from this specific URL: ${jRubyURL}"
-    src jRubyURL
-    onlyIfNewer true
-    inputs.file("${projectDir}/versions.yml")
-    outputs.file(jrubyTarPath)
-    dest new File("${projectDir}/vendor/_", "jruby-dist-${jRubyVersion}-bin.tar.gz")
-}
-
-downloadJRuby.onlyIf { customJRubyDir == "" }
-
-task verifyFile(dependsOn: downloadJRuby, type: Verify) {
-    description "Verify the SHA1 of the download JRuby artifact"
-    inputs.file(jrubyTarPath)
-    outputs.file(jrubyTarPath)
-    src new File(jrubyTarPath)
-    algorithm 'SHA-1'
-    checksum jRubySha1
-}
-
-verifyFile.onlyIf { customJRubyDir == "" }
-
-task buildCustomJRuby(type: Exec) {
-  description "Build tar.gz and .jar artifacts from JRuby source directory"
-  workingDir (customJRubyDir == "" ? "./" : customJRubyDir)
-  commandLine './mvnw', 'clean', 'install', '-Pdist', '-Pcomplete'
-  standardOutput = new ByteArrayOutputStream()
-  errorOutput = new ByteArrayOutputStream()
-  ext.output = {
-    standardOutput.toString() + errorOutput.toString()
-  }
-}
-
-buildCustomJRuby.onlyIf { customJRubyDir != "" }
-
-task installCustomJRuby(dependsOn: buildCustomJRuby, type: Copy) {
-  description "Install custom built JRuby in the vendor directory"
-  inputs.file(customJRubyTar)
-  outputs.dir("${projectDir}/vendor/jruby")
-  from tarTree(customJRubyTar == "" ? jrubyTarPath : customJRubyTar)
-  eachFile { f ->
-    f.path = f.path.replaceFirst("^jruby-${customJRubyVersion}", '')
-  }
-  exclude "**/stdlib/rdoc/**"
-  includeEmptyDirs = false
-  into "${projectDir}/vendor/jruby"
-}
-
-installCustomJRuby.onlyIf { customJRubyDir != "" }
-
-task downloadAndInstallJRuby(dependsOn: [verifyFile, installCustomJRuby], type: Copy) {
-    description "Install JRuby in the vendor directory"
-    inputs.file(jrubyTarPath)
-    outputs.dir("${projectDir}/vendor/jruby")
-    from tarTree(downloadJRuby.dest)
-    eachFile { f ->
-      f.path = f.path.replaceFirst("^jruby-${jRubyVersion}", '')
-    }
-    exclude "**/stdlib/rdoc/**"
-    includeEmptyDirs = false
-    into "${projectDir}/vendor/jruby"
-    doLast {
-      rubyGradleUtils.gem("rake", "12.3.1", "${projectDir}/vendor/bundle/jruby/2.5.0")
-      rubyGradleUtils.gem("json", "1.8.6", "${projectDir}/vendor/bundle/jruby/2.5.0")
-    }
-}
-
-downloadAndInstallJRuby.onlyIf { customJRubyDir == "" }
-
-task installDefaultGems(dependsOn: downloadAndInstallJRuby) {
-  inputs.files file("${projectDir}/Gemfile.template")
-  inputs.files fileTree("${projectDir}/rakelib")
-  inputs.files file("${projectDir}/versions.yml")
-  outputs.file("${projectDir}/Gemfile")
-  outputs.file("${projectDir}/Gemfile.lock")
-  outputs.dir("${projectDir}/logstash-core/lib/jars")
-  outputs.dir("${projectDir}/vendor/bundle/jruby/2.5.0")
-  doLast {
-    rubyGradleUtils.gem("rake", "12.3.1", "${projectDir}/vendor/bundle/jruby/2.5.0")
-    rubyGradleUtils.gem("json", "1.8.6", "${projectDir}/vendor/bundle/jruby/2.5.0")
-    rubyGradleUtils.rake('plugin:install-default')
-  }
+  delete "${projectDir}/lib/pluginmanager/plugin_aliases.yml"
+  delete "${projectDir}/spec/unit/plugin_manager/plugin_aliases.yml"
+  delete "${projectDir}/logstash-core/build/resources/test/org/logstash/plugins/plugin_aliases.yml"
+  delete "${projectDir}/logstash-core/build/resources/main/org/logstash/plugins/plugin_aliases.yml"
+  delete "${projectDir}/logstash-core/src/test/resources/org/logstash/plugins/plugin_aliases.yml"
+  delete "${projectDir}/logstash-core/src/main/resources/org/logstash/plugins/plugin_aliases.yml"
 }
 
 def assemblyDeps = [downloadAndInstallJRuby, assemble] + subprojects.collect {
   it.tasks.findByName("assemble")
 }
 
-task installTestGems(dependsOn: assemblyDeps) {
-  inputs.files file("${projectDir}/Gemfile.template")
-  inputs.files fileTree("${projectDir}/rakelib")
-  inputs.files file("${projectDir}/versions.yml")
-  outputs.file("${projectDir}/Gemfile")
-  outputs.file("${projectDir}/Gemfile.lock")
-  outputs.dir("${projectDir}/logstash-core/lib/jars")
-  outputs.dir("${projectDir}/vendor/bundle/jruby/2.5.0")
-  doLast {
-    rubyGradleUtils.gem("rake", "12.3.1", "${projectDir}/vendor/bundle/jruby/2.5.0")
-    rubyGradleUtils.gem("json", "1.8.6", "${projectDir}/vendor/bundle/jruby/2.5.0")
-    rubyGradleUtils.rake('test:install-core')
+tasks.register("bootstrap") {
+    dependsOn assemblyDeps
+    doLast {
+      setupJruby(projectDir, buildDir)
   }
 }
 
-task assembleTarDistribution(dependsOn: assemblyDeps) {
+
+tasks.register("installDefaultGems") {
+    dependsOn bootstrap
+    doLast {
+        rake(projectDir, buildDir, 'plugin:install-default')
+    }
+}
+
+tasks.register("installDevelopmentGems") {
+    dependsOn bootstrap
+    doLast {
+      rake(projectDir, buildDir, 'plugin:install-development-dependencies')
+  }
+}
+
+tasks.register("compileGrammar") {
+    dependsOn bootstrap
+    doLast {
+        rake(projectDir, buildDir, 'compile:grammar')
+    }
+}
+
+tasks.register("assembleTarDistribution") {
+  dependsOn bootstrap
   inputs.files fileTree("${projectDir}/rakelib")
   inputs.files fileTree("${projectDir}/bin")
   inputs.files fileTree("${projectDir}/config")
   inputs.files fileTree("${projectDir}/lib")
-  inputs.files fileTree("${projectDir}/modules")
   inputs.files fileTree("${projectDir}/logstash-core-plugin-api")
   inputs.files fileTree("${projectDir}/logstash-core/lib")
   inputs.files fileTree("${projectDir}/logstash-core/src")
   inputs.files fileTree("${projectDir}/x-pack")
   outputs.files file("${buildDir}/logstash-${project.version}-SNAPSHOT.tar.gz")
   doLast {
-    rubyGradleUtils.gem("rake", "12.3.1", "${projectDir}/vendor/bundle/jruby/2.5.0")
-    rubyGradleUtils.rake('artifact:tar')
+      rake(projectDir, buildDir, 'artifact:bundle_jdk_tar')
   }
 }
 
-task assembleOssTarDistribution(dependsOn: assemblyDeps) {
+tasks.register("assembleOssTarDistribution") {
+  dependsOn bootstrap
   inputs.files fileTree("${projectDir}/rakelib")
   inputs.files fileTree("${projectDir}/bin")
   inputs.files fileTree("${projectDir}/config")
   inputs.files fileTree("${projectDir}/lib")
-  inputs.files fileTree("${projectDir}/modules")
   inputs.files fileTree("${projectDir}/logstash-core-plugin-api")
   inputs.files fileTree("${projectDir}/logstash-core/lib")
   inputs.files fileTree("${projectDir}/logstash-core/src")
   doLast {
-    rubyGradleUtils.rake('artifact:tar_oss')
+      rake(projectDir, buildDir, 'artifact:archives_oss')
   }
 }
 
-task assembleZipDistribution(dependsOn: assemblyDeps) {
+tasks.register("assembleZipDistribution") {
+  dependsOn bootstrap
   inputs.files fileTree("${projectDir}/rakelib")
   inputs.files fileTree("${projectDir}/bin")
   inputs.files fileTree("${projectDir}/config")
   inputs.files fileTree("${projectDir}/lib")
-  inputs.files fileTree("${projectDir}/modules")
   inputs.files fileTree("${projectDir}/logstash-core-plugin-api")
   inputs.files fileTree("${projectDir}/logstash-core/lib")
   inputs.files fileTree("${projectDir}/logstash-core/src")
   inputs.files fileTree("${projectDir}/x-pack")
   outputs.files file("${buildDir}/logstash-${project.version}.zip")
   doLast {
-    rubyGradleUtils.rake('artifact:zip')
+      rake(projectDir, buildDir, 'artifact:archives')
   }
 }
 
-task assembleOssZipDistribution(dependsOn: assemblyDeps) {
+tasks.register("assembleOssZipDistribution") {
+  dependsOn bootstrap
   inputs.files fileTree("${projectDir}/rakelib")
   inputs.files fileTree("${projectDir}/bin")
   inputs.files fileTree("${projectDir}/config")
   inputs.files fileTree("${projectDir}/lib")
-  inputs.files fileTree("${projectDir}/modules")
   inputs.files fileTree("${projectDir}/logstash-core-plugin-api")
   inputs.files fileTree("${projectDir}/logstash-core/lib")
   inputs.files fileTree("${projectDir}/logstash-core/src")
   outputs.files file("${buildDir}/logstash-${project.version}.zip")
   doLast {
-    rubyGradleUtils.rake('artifact:zip_oss')
+      rake(projectDir, buildDir, 'artifact:archives_oss')
+
+  }
+}
+
+project(":logstash-core") {
+  ["rubyTests", "test"].each { tsk ->
+    tasks.getByPath(":logstash-core:" + tsk).configure {
+      dependsOn copyPluginTestAlias
+      dependsOn installDevelopmentGems
+    }
   }
 }
 
 def logstashBuildDir = "${buildDir}/logstash-${project.version}-SNAPSHOT"
 
-task unpackTarDistribution(dependsOn: assembleTarDistribution, type: Copy) {
+tasks.register("unpackTarDistribution", Copy) {
+  dependsOn assembleTarDistribution
   def tar = file("${buildDir}/logstash-${project.version}-SNAPSHOT.tar.gz")
   inputs.files tar
   outputs.files fileTree(logstashBuildDir)
@@ -329,19 +404,13 @@ task unpackTarDistribution(dependsOn: assembleTarDistribution, type: Copy) {
   into {buildDir}
 }
 
-def qaVendorPath = "${buildDir}/qa/integration/vendor"
-def qaBundledGemPath = "${qaVendorPath}/jruby/2.5.0"
-def qaBundleBin = "${qaBundledGemPath}/bin/bundle"
+def qaBuildPath = "${buildDir}/qa/integration"
+def qaVendorPath = "${qaBuildPath}/vendor"
 
-task installIntegrationTestBundler(dependsOn: unpackTarDistribution) {
-  outputs.files fileTree("${qaBundledGemPath}/gems/bundler-1.17.1")
-  doLast {
-    rubyGradleUtils.gem("bundler", "1.17.1", qaBundledGemPath)
-  }
-}
-
-task installIntegrationTestGems(dependsOn: installIntegrationTestBundler) {
-  inputs.files file("${projectDir}/qa/integration/Gemfile")
+tasks.register("installIntegrationTestGems") {
+  dependsOn assembleTarDistribution
+  def gemfilePath = file("${projectDir}/qa/integration/Gemfile")
+  inputs.files gemfilePath
   inputs.files file("${projectDir}/qa/integration/integration_tests.gemspec")
   inputs.files file("${logstashBuildDir}/Gemfile")
   inputs.files file("${logstashBuildDir}/Gemfile.lock")
@@ -349,30 +418,164 @@ task installIntegrationTestGems(dependsOn: installIntegrationTestBundler) {
   outputs.files fileTree("${qaVendorPath}")
   outputs.files file("${projectDir}/qa/integration/Gemfile.lock")
   doLast {
-    rubyGradleUtils.bundle(
-      "${projectDir}/qa/integration", qaBundleBin, ['install', '--path', qaVendorPath],
-      [LS_GEM_PATH: qaBundledGemPath, LS_GEM_HOME: qaBundledGemPath]
-    )
+      bundleQAGems(projectDir, qaBuildPath)
   }
 }
 
+tasks.register("downloadFilebeat") {
+    dependsOn  configureArtifactInfo
+    description "Download Filebeat Snapshot for current branch version: ${version}"
+
+    project.ext.set("versionFound", true)
+    inputs.file("${projectDir}/versions.yml")
+
+    doLast {
+        download {
+            String beatsVersion = project.ext.get("artifactApiVersion")
+            String downloadedFilebeatName = "filebeat-${beatsVersion}-${project.ext.get("beatsArchitecture")}"
+            project.ext.set("unpackedFilebeatName", downloadedFilebeatName)
+
+            def res = SnapshotArtifactURLs.packageUrls("beats", beatsVersion, downloadedFilebeatName)
+            project.ext.set("filebeatSnapshotUrl", System.getenv("FILEBEAT_SNAPSHOT_URL") ?: res.packageUrl)
+            project.ext.set("filebeatDownloadLocation", "${projectDir}/build/${downloadedFilebeatName}.tar.gz")
+
+            src project.ext.filebeatSnapshotUrl
+            onlyIfNewer true
+
+            dest new File(project.ext.filebeatDownloadLocation)
+            retries 3
+        }
+        System.out.println "Downloaded to ${project.ext.filebeatDownloadLocation}"
+    }
+}
+
+tasks.register("deleteLocalFilebeat", Delete) {
+    delete ('./build/filebeat')
+}
+
+tasks.register("copyFilebeat") {
+    dependsOn = [downloadFilebeat, deleteLocalFilebeat]
+    doLast {
+        copy {
+            from tarTree(resources.gzip(project.ext.filebeatDownloadLocation))
+            into "./build/"
+        }
+        file("./build/${project.ext.unpackedFilebeatName}").renameTo('./build/filebeat')
+        System.out.println "Unzipped ${project.ext.filebeatDownloadLocation} to ./build/filebeat"
+        System.out.println "Deleting ${project.ext.filebeatDownloadLocation}"
+        delete(project.ext.filebeatDownloadLocation)
+    }
+}
+
+tasks.register("checkEsSHA") {
+    dependsOn  configureArtifactInfo
+
+    description "Download ES version remote's fingerprint file"
+
+    doLast {
+        String esVersion = project.ext.get("artifactApiVersion")
+        String downloadedElasticsearchName = "elasticsearch-${esVersion}-${project.ext.get("esArchitecture")}"
+        String remoteSHA
+
+        def res = SnapshotArtifactURLs.packageUrls("elasticsearch", esVersion, downloadedElasticsearchName)
+        remoteSHA = res.packageShaUrl
+
+        def localESArchive = new File("${projectDir}/build/${downloadedElasticsearchName}.tar.gz")
+        if (localESArchive.exists()) {
+            // this create a file named localESArchive with ".SHA-512" postfix
+            ant.checksum(file: localESArchive, algorithm: "SHA-512", forceoverwrite: true)
+
+            File localESCalculatedSHAFile = new File("${projectDir}/build/${downloadedElasticsearchName}.tar.gz.SHA-512")
+            String localESCalculatedSHA = localESCalculatedSHAFile.text.trim()
+            def splitted = remoteSHA.split(' ')
+            String remoteSHACode = splitted[0]
+            if (localESCalculatedSHA != remoteSHACode) {
+                println "ES package calculated fingerprint is different from remote, deleting local archive"
+                delete(localESArchive)
+            }
+        }/* else {
+            mkdir project.buildDir
+            // touch the SHA file else downloadEs task doesn't start, this file his input for the other task
+            new File("${projectDir}/build/${downloadedElasticsearchName}.tar.gz.SHA-512").withWriter { w ->
+                w << "${downloadedElasticsearchName} not yet downloaded"
+                w.close()
+            }
+        }*/
+    }
+}
+
+tasks.register("downloadEs") {
+    dependsOn  = [configureArtifactInfo, checkEsSHA]
+
+    description "Download ES Snapshot for current branch version: ${version}"
+    inputs.file("${projectDir}/versions.yml")
+
+    doLast {
+        download {
+            String esVersion = project.ext.get("artifactApiVersion")
+            String downloadedElasticsearchName = "elasticsearch-${esVersion}-${project.ext.get("esArchitecture")}"
+
+            project.ext.set("unpackedElasticsearchName", "elasticsearch-${esVersion}")
+
+            def res = SnapshotArtifactURLs.packageUrls("elasticsearch", esVersion, downloadedElasticsearchName)
+            project.ext.set("elasticsearchSnapshotURL", System.getenv("ELASTICSEARCH_SNAPSHOT_URL") ?: res.packageUrl)
+            project.ext.set("elasticsearchDownloadLocation", "${projectDir}/build/${downloadedElasticsearchName}.tar.gz")
+
+            src project.ext.elasticsearchSnapshotURL
+            onlyIfNewer true
+            retries 3
+            dest new File(project.ext.elasticsearchDownloadLocation)
+        }
+
+        System.out.println "Downloaded to ${project.ext.elasticsearchDownloadLocation}"
+    }
+}
+
+
+tasks.register("deleteLocalEs", Delete) {
+    delete ('./build/elasticsearch')
+}
+
+tasks.register("copyEs") {
+    dependsOn = [downloadEs, deleteLocalEs]
+    doLast {
+        println "copyEs executing.."
+        copy {
+            from tarTree(resources.gzip(project.ext.elasticsearchDownloadLocation))
+            into "./build/"
+        }
+
+        file("./build/${project.ext.unpackedElasticsearchName}").renameTo('./build/elasticsearch')
+        println "Unzipped ${project.ext.elasticsearchDownloadLocation} to ./build/elasticsearch"
+        println "Deleting ${project.ext.elasticsearchDownloadLocation}"
+    }
+}
+
 def rubyIntegrationSpecs = project.hasProperty("rubyIntegrationSpecs") ? ((String) project.property("rubyIntegrationSpecs")).split(/\s+/).join(",") : "specs/**/*_spec.rb"
 def integrationTestPwd = "${projectDir}/qa/integration"
 
 project(":logstash-integration-tests") {
     tasks.getByPath(":logstash-integration-tests:integrationTests").configure {
-      systemProperty 'org.logstash.integration.specs', rubyIntegrationSpecs
-      environment "FEATURE_FLAG", System.getenv('FEATURE_FLAG')
-      workingDir integrationTestPwd
-      dependsOn installIntegrationTestGems
-  }
+        systemProperty 'org.logstash.integration.specs', rubyIntegrationSpecs
+        environment "FEATURE_FLAG", System.getenv('FEATURE_FLAG')
+        workingDir integrationTestPwd
+        dependsOn installIntegrationTestGems
+        dependsOn copyProductionLog4jConfiguration
+    }
 }
 
-task runIntegrationTests(dependsOn: [tasks.getByPath(":logstash-integration-tests:integrationTests")]) {}
+tasks.register("runIntegrationTests") {
+    dependsOn tasks.getByPath(":logstash-integration-tests:integrationTests")
+    dependsOn copyEs
+    dependsOn copyFilebeat
+    shouldRunAfter ":logstash-core:test"
+}
 
-task generateLicenseReport(type: JavaExec) {
-    dependsOn("generateLicenseReportInputs")
-    dependsOn(":dependencies-report:assemble")
+
+
+tasks.register("generateLicenseReport", JavaExec) {
+    dependsOn generateLicenseReportInputs
+    dependsOn ":dependencies-report:assemble"
 
     def jarFile = project('dependencies-report').getBuildDir().toString() + "/libs/dependencies-report.jar"
 
@@ -387,97 +590,338 @@ task generateLicenseReport(type: JavaExec) {
       licenseReportOutputCSV, noticePath
 }
 
-task generateLicenseReportInputs() {
+tasks.register("generateLicenseReportInputs") {
     dependsOn subprojects.generateLicenseReport
 
-    // write location of all license reports for subprojects containing artifacts that are distributed to single file
-    StringBuilder licenseReportFolders = new StringBuilder()
-    subprojects.findAll { s1 -> !s1.hasProperty("isDistributedArtifact") || s1.property("isDistributedArtifact") == 'true'}.each { s ->
-        s.tasks.findAll { t2 -> t2.getName() == "generateLicenseReport" }.each { t3 ->
-            licenseReportFolders.append(t3.outputs.files.asPath + "\n")
+    doLast {
+        // write location of all license reports for subprojects containing artifacts that are distributed to single file
+        StringBuilder licenseReportFolders = new StringBuilder()
+        subprojects.findAll { s1 -> !s1.hasProperty("isDistributedArtifact") || s1.property("isDistributedArtifact") == 'true' }.each { s ->
+            s.tasks.findAll { t2 -> t2.getName() == "generateLicenseReport" }.each { t3 ->
+                licenseReportFolders.append(t3.reportDir.toString() + "\n")
+            }
         }
-    }
 
-    if (gradle.startParameter.taskNames.contains("generateLicenseReport")) {
-        def licenseReportPath = project.getBuildDir().toString() + "/licenseReportFolders.txt"
-        def licenseReportFolder = new File(licenseReportPath)
-        licenseReportFolder.delete()
-        licenseReportFolder = new File(licenseReportPath)
-        licenseReportFolder.createNewFile()
-        if (licenseReportFolder.canWrite()) {
-            licenseReportFolder.text = licenseReportFolders.toString()
+        if (gradle.startParameter.taskNames.contains("generateLicenseReport")) {
+            if (!project.getBuildDir().exists()) {
+                project.getBuildDir().mkdirs()
+            }
+            def licenseReportPath = project.getBuildDir().toString() + "/licenseReportFolders.txt"
+            def licenseReportFolder = new File(licenseReportPath)
+            licenseReportFolder.delete()
+            licenseReportFolder = new File(licenseReportPath)
+            licenseReportFolder.createNewFile()
+            if (licenseReportFolder.canWrite()) {
+                licenseReportFolder.text = licenseReportFolders.toString()
+            }
         }
     }
 }
 
-task generatePluginsVersion(dependsOn: bootstrap) {
+tasks.register("generatePluginsVersion") {
+  dependsOn installDefaultGems
   doLast {
-    rubyGradleUtils.rake('generate_plugins_version')
+      rake(projectDir, buildDir, 'generate_plugins_version')
   }
 }
 
-// If you are running a JRuby snapshot we will skip the integrity check.
-verifyFile.onlyIf { doChecksum }
-bootstrap.dependsOn installTestGems
+bootstrap.dependsOn assemblyDeps
+// FIXME: adding the integration tests task to check will mean
+// that any registered task will be evaluated. This creates an issue
+// where the downloadES task may throw an error on versions where
+// Elasticsearch doesn't yet have a build we can fetch
+// So for now we'll remove this to unblock builds, but finding a way
+// to compartimentalize failures is needed going forward
+//check.dependsOn runIntegrationTest
 
-runIntegrationTests.shouldRunAfter tasks.getByPath(":logstash-core:test")
-check.dependsOn runIntegrationTests
 
-String artifactsVersionApi = "https://artifacts-api.elastic.co/v1/versions/"
-String apiResponse = artifactsVersionApi.toURL().text
-def dlVersions = new JsonSlurper().parseText(apiResponse)
-// the version string can be either '7.0.0' or '7.0.0-alpha1', i.e. with the qualifier.
-// in the normal PR type builds it is plain '7.0.0'
-// in the build invoked by the release manager it is '7.0.0-alpha1' etc.
-// the artifacts-api will return JSON like this: `{"versions":["5.6.13-SNAPSHOT","6.4.3-SNAPSHOT","6.5.0-SNAPSHOT","6.6.0-SNAPSHOT","7.0.0-alpha1-SNAPSHOT"]}`
-String qualifiedVersion = dlVersions['versions'].grep(~/^${version}.*/)[0]
-String downloadedElasticsearchName = "elasticsearch-${qualifiedVersion}"
-String elasticsearchSnapshotURL = System.getenv("ELASTICSEARCH_SNAPSHOT_URL") ?: "https://snapshots.elastic.co/downloads/elasticsearch/${downloadedElasticsearchName}.tar.gz"
-String elasticsearchDownloadLocation = "${projectDir}/build/${downloadedElasticsearchName}.tar.gz"
+def selectOsType() {
+    if (project.ext.has("jdk_bundle_os")) {
+        return project.ext.jdk_bundle_os
+    }
+    String osName = System.properties['os.name']
+    switch (osName.toLowerCase()) {
+        case ~/mac os x/:
+            return "darwin"
+        case ~/windows.*/:
+            return "windows"
+        case ~/linux/:
+            return "linux"
+        default:
+            throw new IllegalArgumentException("Can't determine OS type from name: $osName")
+    }
+}
 
-task downloadEs(type: Download) {
-    description "Download ES Snapshot for current branch version: ${version}"
-    doFirst {
-        if (qualifiedVersion == "null") {
-            throw new GradleException("could not find the current artifact from the artifact-api for version: ${version}, api response was: ${apiResponse}")
+def selectArch() {
+    if (project.ext.has("jdk_arch")) {
+        return project.ext.jdk_arch
+    }
+    String cpu_arch = System.properties["os.arch"]
+    switch (cpu_arch) {
+        case "amd64":
+        case "x86_64":
+            return "x86_64"
+        case "aarch64":
+        case "arm64":
+            return "arm64"
+        default:
+            throw new IllegalArgumentException("Can't handle os.arch of type $cpu_arch")
+    }
+}
+
+class JDKDetails {
+    final String revision
+    final String build
+    final String vendor
+    final int major
+    private final String osName
+    private final String extension
+    final String localPackageName
+    final String unpackedJdkName
+    private String arch
+
+    JDKDetails(versionYml, osName, jdkArch) {
+        revision = versionYml.bundled_jdk.revision
+        build = versionYml.bundled_jdk.build
+        vendor = versionYml.bundled_jdk.vendor
+        major = revision.split('\\.').first() as int
+        this.osName = osName
+
+        switch (osName) {
+            case "windows":
+                extension = "zip"
+                break
+            default:
+                extension = "tar.gz"
+        }
+        arch = parseJdkArchitecture(jdkArch)
+        unpackedJdkName = "jdk-${revision}-${osName}"
+        localPackageName = "${unpackedJdkName}-${arch}.${extension}"
+    }
+
+    String createDownloadUrl() {
+        return createElasticCatalogDownloadUrl()
+    }
+
+    // throws an error iff local version in versions.yml doesn't match the latest from JVM catalog.
+    void checkLocalVersionMatchingLatest() {
+        // retrieve the metadata from remote
+        def url = "https://jvm-catalog.elastic.co/jdk/latest_adoptiumjdk_${major}_${osName}"
+        def catalogMetadataUrl = URI.create(url).toURL()
+        def catalogConnection = catalogMetadataUrl.openConnection()
+        catalogConnection.requestMethod = 'GET'
+        assert catalogConnection.responseCode == 200
+
+        def metadataRetrieved = catalogConnection.content.text
+        def catalogMetadata = new JsonSlurper().parseText(metadataRetrieved)
+
+        if (catalogMetadata.version != revision || catalogMetadata.revision != build) {
+            throw new GradleException("Found new jdk version. Please update version.yml to ${catalogMetadata.version} build ${catalogMetadata.revision}")
         }
     }
-    src elasticsearchSnapshotURL
+
+    private String createElasticCatalogDownloadUrl() {
+        // Ask details to catalog https://jvm-catalog.elastic.co/jdk and return the url to download the JDK
+
+        // arch x86_64 is default, aarch64 if macos or linux
+        def url = "https://jvm-catalog.elastic.co/jdk/adoptiumjdk-${revision}+${build}-${osName}"
+
+        // Append the cpu's arch only if not x86_64, which is the default
+        if (arch == "aarch64") {
+            url += "-${arch}"
+        }
+        println "Retrieving JDK from catalog..."
+        def catalogMetadataUrl = URI.create(url).toURL()
+        def catalogConnection = catalogMetadataUrl.openConnection()
+        catalogConnection.requestMethod = 'GET'
+        if (catalogConnection.responseCode != 200) {
+            println "Can't find adoptiumjdk ${revision} for ${osName} on Elastic JVM catalog"
+            throw new GradleException("JVM not present on catalog")
+        }
+
+        def metadataRetrieved = catalogConnection.content.text
+        println "Retrieved!"
+
+        def catalogMetadata = new JsonSlurper().parseText(metadataRetrieved)
+        validateMetadata(catalogMetadata)
+
+        return catalogMetadata.url
+    }
+
+    //Verify that the artifact metadata correspond to the request, if not throws an error
+    private void validateMetadata(Map metadata) {
+        if (metadata.version != revision) {
+            throw new GradleException("Expected to retrieve a JDK for version ${revision} but received: ${metadata.version}")
+        }
+        if (!isSameArchitecture(metadata.architecture)) {
+            throw new GradleException("Expected to retrieve a JDK for architecture ${arch} but received: ${metadata.architecture}")
+        }
+    }
+
+    private boolean isSameArchitecture(String metadataArch) {
+        if (arch == 'x64') {
+            return metadataArch == 'x86_64'
+        }
+        return metadataArch == arch
+    }
+
+    private String parseJdkArchitecture(String jdkArch) {
+        switch (jdkArch) {
+            case "x86_64":
+                return "x64"
+                break
+            case "arm64":
+                return "aarch64"
+                break
+            default:
+                throw new GradleException("Can't handle CPU architechture: ${jdkArch}")
+        }
+    }
+}
+
+tasks.register("lint") {
+    description = "Lint Ruby source files. Use -PrubySource=file1.rb,file2.rb to specify files"
+    dependsOn installDevelopmentGems
+    doLast {
+        if (project.hasProperty("rubySource")) {
+            // Split the comma-separated files and pass them as separate arguments
+            def files = project.property("rubySource").split(",")
+            rake(projectDir, buildDir, "lint:report", *files)
+        } else {
+            rake(projectDir, buildDir, "lint:report")
+        }
+    }
+}
+
+tasks.register("downloadJdk", Download) {
+    // CLI project properties: -Pjdk_bundle_os=[windows|linux|darwin] -Pjdk_arch=[arm64|x86_64]
+
+    project.ext.set("versionFound", true)
+    String osName = selectOsType()
+
+    def versionYml = new Yaml().load(new File("$projectDir/versions.yml").text)
+    String jdkArch = selectArch()
+    def jdkDetails = new JDKDetails(versionYml, osName, jdkArch)
+
+    description "Download JDK ${jdkDetails.major}, OS: ${osName}"
+
+    // find url of build artifact
+    String artifactApiUrl = jdkDetails.createDownloadUrl()
+
+    project.ext.set("jdkURL", System.getenv("JDK_URL") ?: artifactApiUrl)
+    project.ext.set("jdkDownloadLocation", "${projectDir}/build/${jdkDetails.localPackageName}")
+    project.ext.set("jdkDirectory", "${projectDir}/build/${jdkDetails.unpackedJdkName}")
+
+    String jdkFolderName = ToolingUtils.jdkFolderName(osName)
+    project.ext.set("jdkBundlingDirectory", "${projectDir}/${jdkFolderName}")
+
+    src project.ext.jdkURL
     onlyIfNewer true
+    overwrite false
+    quiet true
     inputs.file("${projectDir}/versions.yml")
-    outputs.file(elasticsearchDownloadLocation)
-    dest new File(elasticsearchDownloadLocation)
+    outputs.file(project.ext.jdkDownloadLocation)
+    dest new File(project.ext.jdkDownloadLocation)
+
     doLast {
-        System.out.println "Downloaded to ${elasticsearchDownloadLocation}"
+        mkdir project.ext.jdkBundlingDirectory
+        println "Downloaded to ${project.ext.jdkDownloadLocation}"
     }
 }
 
-task deleteLocalEs(type: Delete) {
-    delete ('./build/elasticsearch')
+tasks.register("checkNewJdkVersion") {
+    def versionYml = new Yaml().load(new File("$projectDir/versions.yml").text)
+
+    // use Linux x86_64 as canary platform
+    def jdkDetails = new JDKDetails(versionYml, "linux", "x86_64")
+    // throws Gradle exception if local and remote doesn't match
+    jdkDetails.checkLocalVersionMatchingLatest()
 }
 
-task copyEs(type: Copy, dependsOn: [downloadEs, deleteLocalEs]) {
-    from tarTree(resources.gzip(elasticsearchDownloadLocation))
-    into "./build/"
+tasks.register("deleteLocalJdk", Delete) {
+    // CLI project properties: -Pjdk_bundle_os=[windows|linux|darwin]
+    String osName = selectOsType()
+    String jdkFolderName = ToolingUtils.jdkFolderName(osName)
+    String jdkBundlingDirectory = "${projectDir}/${jdkFolderName}"
+    delete jdkBundlingDirectory
+}
+
+// Cannot use tarTree as it does not handle symlinks
+tasks.register("untarJdk", Exec) {
+    dependsOn downloadJdk
+    description = "unpack the downloaded JDK's tar.gz"
+    commandLine 'tar', 'xf', project.ext.jdkDownloadLocation, '-C', project.ext.jdkBundlingDirectory, '--strip-components', '1'
+    inputs.file(project.ext.jdkDownloadLocation)
+    outputs.dir(project.ext.jdkBundlingDirectory)
+}
+
+tasks.register("unzipJdk", Copy) {
+    dependsOn downloadJdk
+    description = "unpack the downloaded JDK's zip"
+    String rootName = null
+    from(zipTree("$project.ext.jdkDownloadLocation")) {
+        eachFile { fcd ->
+            rootName = rootName ?: fcd.relativePath.segments[0]
+            fcd.relativePath = new RelativePath(true, fcd.relativePath.segments.drop(1))
+        }
+    }
+    into project.ext.jdkBundlingDirectory
     doLast {
-        file("./build/${downloadedElasticsearchName}").renameTo('./build/elasticsearch')
+        delete "${project.ext.jdkBundlingDirectory}/$rootName"
     }
 }
 
-Boolean oss = System.getenv('OSS').equals('true')
+tasks.register("decompressJdk") {
+    description = "unpack the downloaded JDK's (wrapper task for unzipJdk, untarJdk)"
+    String osName = selectOsType()
+    switch (osName) {
+        case "windows":
+            dependsOn ":unzipJdk"
+            break
+        default:
+            dependsOn ":untarJdk"
+    }
+}
 
-if (!oss) {
+tasks.register("copyJdk", Copy) {
+    dependsOn = [extractBundledJdkVersion, decompressJdk, bootstrap]
+    description = "Download, unpack and copy the JDK"
+    // CLI project properties: -Pjdk_bundle_os=[windows|linux|darwin] -Pjdk_arch=[arm64|x86_64]
+    doLast {
+        System.out.println "Download location is ${project.ext.jdkDownloadLocation}, Decompressing ${project.ext.jdkDirectory} to \"${project.ext.jdkBundlingDirectory}\""
+    }
+}
+
+tasks.register("extractBundledJdkVersion", ExtractBundledJdkVersion) {
+    dependsOn "decompressJdk"
+    osName = selectOsType()
+}
+
+tasks.register("javaTests") {
+    dependsOn ":logstash-core:javaTests"
+    dependsOn ":jvm-options-parser:test"
+}
+
+clean {
+    String jdkVersionFilename = tasks.findByName("extractBundledJdkVersion").outputFilename
+    delete "${projectDir}/${jdkVersionFilename}"
+}
+
+if (System.getenv('OSS') != 'true') {
   project(":logstash-xpack") {
     ["rubyTests", "rubyIntegrationTests", "test"].each { tsk ->
       tasks.getByPath(":logstash-xpack:" + tsk).configure {
-        dependsOn bootstrap
+        dependsOn installDevelopmentGems
       }
     }
-    tasks.getByPath(":logstash-xpack:rubyIntegrationTests").configure {
-      dependsOn copyEs
-    }
   }
-
-  task runXPackUnitTests(dependsOn: [tasks.getByPath(":logstash-xpack:rubyTests")]) {}
-  task runXPackIntegrationTests(dependsOn: [tasks.getByPath(":logstash-xpack:rubyIntegrationTests")]) {}
 }
+
+ tasks.register("runXPackUnitTests") {
+     dependsOn copyPluginTestAlias
+     dependsOn ":logstash-xpack:rubyTests"
+ }
+ tasks.register("runXPackIntegrationTests") {
+     dependsOn copyPluginTestAlias
+     dependsOn ":logstash-xpack:rubyIntegrationTests"
+ }
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 29e903be3..0e1e9fe80 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -1,12 +1,24 @@
-apply plugin: 'java'
-apply plugin: 'groovy'
-
-group = 'org.logstash.gradle'
+plugins {
+    id 'groovy'
+    id 'java'
+}
 
 repositories {
-  mavenCentral()
+    mavenCentral()
+}
+
+if ((JavaVersion.current().getMajorVersion() as int) >= 17) {
+    tasks.withType(Test).configureEach {
+        jvmArgs(["--add-opens=java.base/java.lang=ALL-UNNAMED",
+                 "--add-opens=java.base/java.util=ALL-UNNAMED"])
+    }
 }
 
 dependencies {
-  compile group: 'org.jruby', name: 'jruby-complete', version: '9.2.5.0'
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.2")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.2")
 }
+
+test {
+    useJUnitPlatform()
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/groovy/org/logstash/gradle/RubyGradleUtils.groovy b/buildSrc/src/main/groovy/org/logstash/gradle/RubyGradleUtils.groovy
deleted file mode 100644
index 53d26e45b..000000000
--- a/buildSrc/src/main/groovy/org/logstash/gradle/RubyGradleUtils.groovy
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.logstash.gradle
-
-import org.jruby.Ruby
-import org.jruby.embed.PathType
-import org.jruby.embed.ScriptingContainer
-
-final class RubyGradleUtils {
-
-  private final File buildDir
-
-  private final File projectDir
-
-  RubyGradleUtils(File buildDir, File projectDir) {
-    this.buildDir = buildDir
-    this.projectDir = projectDir
-  }
-
-  /**
-   * Executes a bundler bin script with given parameters.
-   * @param pwd Current worker directory to execute in
-   * @param bundleBin Bundler Bin Script
-   * @param args CLI Args to Use with Bundler
-   */
-  void bundle(String pwd, String bundleBin, Iterable<String> args) {
-    bundle(pwd, bundleBin, args, Collections.emptyMap())
-  }
-
-  /**
-   * Executes a bundler bin script with given parameters.
-   * @param pwd Current worker directory to execute in
-   * @param bundleBin Bundler Bin Script
-   * @param args CLI Args to Use with Bundler
-   * @param env Environment Variables to Set
-   */
-  void bundle(String pwd, String bundleBin, Iterable<String> args, Map<String, String> env) {
-    executeJruby { ScriptingContainer jruby ->
-      jruby.environment.putAll(env)
-      jruby.currentDirectory = pwd
-      jruby.argv = args.toList().toArray()
-      jruby.runScriptlet(PathType.ABSOLUTE, bundleBin)
-    }
-  }
-
-  /**
-   * Installs a Gem with the given version to the given path.
-   * @param gem Gem Name
-   * @param version Version to Install
-   * @param path Path to Install to
-   */
-  void gem(String gem, String version, String path) {
-    executeJruby { ScriptingContainer jruby ->
-      jruby.currentDirectory = projectDir
-      jruby.runScriptlet(
-        "require 'rubygems/commands/install_command'\n" +
-          "cmd = Gem::Commands::InstallCommand.new\n" +
-          "cmd.handle_options [\"--no-ri\", \"--no-rdoc\", '${gem}', '-v', '${version}', '-i', '${path}']\n" +
-          "begin \n" +
-          "  cmd.execute\n" +
-          "rescue Gem::SystemExitException => e\n" +
-          "  raise e unless e.exit_code == 0\n" +
-          "end"
-      )
-    }
-  }
-
-  /**
-   * Executes RSpec for a given plugin.
-   * @param plugin Plugin to run specs for
-   * @param args CLI arguments to pass to rspec
-   */
-  void rake(String task) {
-    executeJruby { ScriptingContainer jruby ->
-      jruby.currentDirectory = projectDir
-      jruby.runScriptlet("require 'rake'")
-      jruby.runScriptlet(
-        "rake = Rake.application\n" +
-          "rake.init\n" +
-          "rake.load_rakefile\n" +
-          "rake['${task}'].invoke"
-      )
-    }
-  }
-
-  /**
-   * Executes Closure using a fresh JRuby environment, safely tearing it down afterwards.
-   * @param block Closure to run
-   */
-  Object executeJruby(Closure<?> block) {
-    def jruby = new ScriptingContainer()
-    def env = jruby.environment
-    def gemDir = "${projectDir}/vendor/bundle/jruby/2.5.0".toString()
-    env.put "USE_RUBY", "1"
-    env.put "GEM_HOME", gemDir
-    env.put "GEM_SPEC_CACHE", "${buildDir}/cache".toString()
-    env.put "GEM_PATH", gemDir
-    try {
-      return block(jruby)
-    } finally {
-      jruby.terminate()
-      Ruby.clearGlobalRuntime()
-    }
-  }
-}
diff --git a/buildSrc/src/main/groovy/org/logstash/gradle/tooling/ExtractBundledJdkVersion.groovy b/buildSrc/src/main/groovy/org/logstash/gradle/tooling/ExtractBundledJdkVersion.groovy
new file mode 100644
index 000000000..da25f855c
--- /dev/null
+++ b/buildSrc/src/main/groovy/org/logstash/gradle/tooling/ExtractBundledJdkVersion.groovy
@@ -0,0 +1,53 @@
+package org.logstash.gradle.tooling
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.GradleException
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+
+abstract class ExtractBundledJdkVersion extends DefaultTask {
+
+    /**
+     * Defines the name of the output filename containing the JDK version.
+     * */
+    @Input
+    String outputFilename = "JDK_VERSION"
+
+    @Input
+    String osName
+
+    @OutputFile
+    File getJdkVersionFile() {
+        project.file("${project.projectDir}/${outputFilename}")
+    }
+
+    ExtractBundledJdkVersion() {
+        description = "Extracts IMPLEMENTOR_VERSION from JDK's release file"
+        group = "org.logstash.tooling"
+    }
+
+    @Internal
+    File getJdkReleaseFile() {
+        String jdkReleaseFilePath = ToolingUtils.jdkReleaseFilePath(osName)
+        return project.file("${project.projectDir}/${jdkReleaseFilePath}/release")
+    }
+
+    @TaskAction
+    def extractVersionFile() {
+        def sw = new StringWriter()
+        jdkReleaseFile.filterLine(sw) { it =~ /IMPLEMENTOR_VERSION=.*/ }
+        if (!sw.toString().empty) {
+            def groups = (sw.toString() =~ /^IMPLEMENTOR_VERSION=\"(.*)\"$/)
+            if (!groups.hasGroup()) {
+                throw new GradleException("Malformed IMPLEMENTOR_VERSION property in ${jdkReleaseFile}")
+            }
+
+            if (groups.size() < 1 || groups[0].size() < 2) {
+                throw new GradleException("Malformed IMPLEMENTOR_VERSION property in ${jdkReleaseFile}")
+            }
+            jdkVersionFile.write(groups[0][1])
+        }
+    }
+}
diff --git a/buildSrc/src/main/groovy/org/logstash/gradle/tooling/ListProjectDependencies.groovy b/buildSrc/src/main/groovy/org/logstash/gradle/tooling/ListProjectDependencies.groovy
new file mode 100644
index 000000000..f867483a0
--- /dev/null
+++ b/buildSrc/src/main/groovy/org/logstash/gradle/tooling/ListProjectDependencies.groovy
@@ -0,0 +1,57 @@
+package org.logstash.gradle.tooling
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.Input
+import org.gradle.api.artifacts.Dependency
+
+import java.nio.file.Files
+
+class ListProjectDependencies extends DefaultTask {
+
+    @Input
+    String report = 'licenses.csv'
+
+    @OutputFile
+    File reportFile = project.file("${project.buildDir}/reports/dependency-license/" + report)
+
+    @OutputDirectory
+    File reportDir = reportFile.toPath().parent.toFile()
+
+    ListProjectDependencies() {
+        description = "Lists the projects dependencies in a CSV file"
+        group = "org.logstash.tooling"
+    }
+
+    @TaskAction
+    def list() {
+        // collect all project's dependencies
+        Set<Dependency> moduleDeps = new HashSet<>()
+        moduleDeps.addAll(project.configurations.implementation.getAllDependencies())
+        moduleDeps.addAll(project.configurations.runtimeClasspath.getAllDependencies())
+        moduleDeps.addAll(project.configurations.runtimeOnly.getAllDependencies())
+
+        def depsInGAV = moduleDeps.collect {dep ->
+
+            // SelfResolvingDependency has no group or version information
+            if (!dep.group && !dep.version && dep.reason) {
+                def m = dep.reason =~ /DEPENDENCY: ([\w\.\-]+:[\w\.\-]+:[\w\.\-]+)/
+                if (m.matches()) return m[0][1]
+            }
+
+            "${dep.group}:${dep.name}:${dep.version}"
+        }
+
+        // output in a CSV to be read by dependencies-report tool
+        Files.createDirectories(reportFile.toPath().parent)
+        reportFile.withWriter('utf-8') { writer ->
+            writer.writeLine '"artifact","moduleUrl","moduleLicense","moduleLicenseUrl",'
+            depsInGAV.each { s ->
+                writer.writeLine "\"$s\",,,,"
+            }
+        }
+    }
+
+}
diff --git a/buildSrc/src/main/groovy/org/logstash/gradle/tooling/SignAliasDefinitions.groovy b/buildSrc/src/main/groovy/org/logstash/gradle/tooling/SignAliasDefinitions.groovy
new file mode 100644
index 000000000..546a4dad5
--- /dev/null
+++ b/buildSrc/src/main/groovy/org/logstash/gradle/tooling/SignAliasDefinitions.groovy
@@ -0,0 +1,51 @@
+package org.logstash.gradle.tooling
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+
+abstract class SignAliasDefinitions extends DefaultTask {
+
+    enum Stage {
+        main, test;
+    }
+
+    /**
+     * Relative path to the AliasRegistry.yml file to use, relative to project's root
+     * */
+    @Input
+    String registry = 'org/logstash/plugins/AliasRegistry.yml'
+
+    @InputFile
+    File getRegistryFullPath() {
+        String stagedRegistry = "logstash-core/src/${stage}/resources/${registry}"
+        project.file("${project.projectDir}/${stagedRegistry}")
+    }
+
+    /**
+     * Full file path to the file containing the marked AliasRegistry file
+     * */
+    @OutputFile
+    File hashedFile
+
+    private Stage stage = Stage.main
+
+    @TaskAction
+    def sign() {
+        String aliasesDefs = registryFullPath.text
+        String hash = aliasesDefs.digest('SHA-256')
+        String stagedRegistry = "logstash-core/src/${stage}/resources/${registry}"
+        hashedFile.withWriter('utf-8') { writer ->
+            writer.writeLine "#CHECKSUM: ${hash}"
+            writer.writeLine "# DON'T EDIT THIS FILE, PLEASE REFER TO ${stagedRegistry}"
+            writer.write aliasesDefs
+        }
+    }
+
+    SignAliasDefinitions stage(Stage stage) {
+        this.stage = stage
+        return this
+    }
+}
diff --git a/buildSrc/src/main/groovy/org/logstash/gradle/tooling/SnapshotArtifactURLs.groovy b/buildSrc/src/main/groovy/org/logstash/gradle/tooling/SnapshotArtifactURLs.groovy
new file mode 100644
index 000000000..349a8736f
--- /dev/null
+++ b/buildSrc/src/main/groovy/org/logstash/gradle/tooling/SnapshotArtifactURLs.groovy
@@ -0,0 +1,28 @@
+package org.logstash.gradle.tooling
+
+import groovy.json.JsonSlurper
+
+/**
+ * Helper class to obtain project specific (e.g. Elasticsearch or beats/filebeat) snapshot-DRA artifacts.
+ * We use it in all cases apart from release builds.
+ * */
+class SnapshotArtifactURLs {
+    /**
+     * Returns a list of the package and package SHA(512) URLs for a given project / version / downloadedPackageName
+     * */
+    static def packageUrls(String project, String projectVersion, String downloadedPackageName) {
+        String artifactSnapshotVersionsApiPrefix = "https://artifacts-snapshot.elastic.co"
+
+        // e.g. https://artifacts-snapshot.elastic.co/elasticsearch/latest/8.11.5-SNAPSHOT.json
+        String apiResponse = "${artifactSnapshotVersionsApiPrefix}/${project}/latest/${projectVersion}.json".toURL().text
+        def artifactUrls = new JsonSlurper().parseText(apiResponse)
+        String manifestUrl = artifactUrls["manifest_url"]
+        // e.g. https://artifacts-snapshot.elastic.co/elasticsearch/8.11.5-12345678/manifest-8.11.5-SNAPSHOT.json
+        apiResponse = manifestUrl.toURL().text
+        def packageArtifactUrls = new JsonSlurper().parseText(apiResponse)
+        String packageUrl = packageArtifactUrls["projects"]["${project}"]["packages"]["${downloadedPackageName}.tar.gz"]["url"]
+        String packageShaUrl = packageArtifactUrls["projects"]["${project}"]["packages"]["${downloadedPackageName}.tar.gz"]["sha_url"]
+
+        return ["packageUrl": packageUrl, "packageShaUrl": packageShaUrl]
+    }
+}
diff --git a/buildSrc/src/main/groovy/org/logstash/gradle/tooling/ToolingUtils.groovy b/buildSrc/src/main/groovy/org/logstash/gradle/tooling/ToolingUtils.groovy
new file mode 100644
index 000000000..197087dc8
--- /dev/null
+++ b/buildSrc/src/main/groovy/org/logstash/gradle/tooling/ToolingUtils.groovy
@@ -0,0 +1,11 @@
+package org.logstash.gradle.tooling
+
+class ToolingUtils {
+    static String jdkFolderName(String osName) {
+        return osName == "darwin" ? "jdk.app" : "jdk"
+    }
+
+    static String jdkReleaseFilePath(String osName) {
+        jdkFolderName(osName) + (osName == "darwin" ? "/Contents/Home/" : "")
+    }
+}
diff --git a/buildSrc/src/main/java/org/logstash/gradle/ExecLogOutputStream.java b/buildSrc/src/main/java/org/logstash/gradle/ExecLogOutputStream.java
deleted file mode 100644
index 2f39436bb..000000000
--- a/buildSrc/src/main/java/org/logstash/gradle/ExecLogOutputStream.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.logstash.gradle;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-
-/**
- * Stream that can be used to forward Gradle Exec task output to an arbitrary {@link PrintStream}.
- */
-public final class ExecLogOutputStream extends ByteArrayOutputStream {
-
-    /**
-     * Underlying {@link PrintStream} to flush output to.
-     */
-    private final PrintStream stream;
-
-    /**
-     * Ctor.
-     * @param stream PrintStream to flush to
-     */
-    public ExecLogOutputStream(final PrintStream stream) {
-        this.stream = stream;
-    }
-
-    @Override
-    public synchronized void flush() {
-        stream.print(toString());
-        reset();
-    }
-}
diff --git a/buildSrc/src/test/groovy/org/logstash/gradle/tooling/ExtractBundledJdkVersionTest.groovy b/buildSrc/src/test/groovy/org/logstash/gradle/tooling/ExtractBundledJdkVersionTest.groovy
new file mode 100644
index 000000000..35106de8b
--- /dev/null
+++ b/buildSrc/src/test/groovy/org/logstash/gradle/tooling/ExtractBundledJdkVersionTest.groovy
@@ -0,0 +1,52 @@
+package org.logstash.gradle.tooling
+
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.DisplayName
+import org.junit.jupiter.api.Test
+import org.gradle.api.*
+import org.gradle.testfixtures.ProjectBuilder
+
+
+class ExtractBundledJdkVersionTest {
+
+    ExtractBundledJdkVersion task
+
+    @BeforeEach
+    void setUp() {
+        Project project = ProjectBuilder.builder().build()
+        task = project.task('extract', type: ExtractBundledJdkVersion)
+        task.osName = "linux"
+
+        task.jdkReleaseFile.parentFile.mkdirs()
+    }
+
+    @Test
+    void "decode correctly"() {
+        task.jdkReleaseFile << """
+            |IMPLEMENTOR="Eclipse Adoptium"
+            |IMPLEMENTOR_VERSION="Temurin-11.0.14.1+1"
+        """.stripMargin().stripIndent()
+
+        task.extractVersionFile()
+
+        assert task.jdkVersionFile.text == "Temurin-11.0.14.1+1"
+    }
+
+    // There is some interoperability problem with JUnit5 Assertions.assertThrows and Groovy's string method names,
+    // the catching of the exception generates an invalid method name error if it's in string form
+    @DisplayName("decode throws error with malformed jdk/release content")
+    @Test
+    void decodeThrowsErrorWithMalformedJdkOrReleaseContent() {
+        task.jdkReleaseFile << """
+            |IMPLEMENTOR="Eclipse Adoptium"
+            |IMPLEMENTOR_VERSION=
+        """.stripMargin().stripIndent()
+
+        def thrown = Assertions.assertThrows(GradleException.class, {
+            task.extractVersionFile()
+        })
+        assert thrown.message.startsWith("Malformed IMPLEMENTOR_VERSION property in")
+    }
+
+}
diff --git a/buildSrc/src/test/groovy/org/logstash/gradle/tooling/ListProjectDependenciesTest.groovy b/buildSrc/src/test/groovy/org/logstash/gradle/tooling/ListProjectDependenciesTest.groovy
new file mode 100644
index 000000000..d0495332c
--- /dev/null
+++ b/buildSrc/src/test/groovy/org/logstash/gradle/tooling/ListProjectDependenciesTest.groovy
@@ -0,0 +1,43 @@
+package org.logstash.gradle.tooling
+
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.gradle.api.*
+import org.gradle.testfixtures.ProjectBuilder
+
+class ListProjectDependenciesTest {
+
+    static final TASK_NAME = 'generateLicenseReport'
+    Project project
+
+    @BeforeEach
+    void setUp() {
+        project = ProjectBuilder.builder().build()
+        project.getConfigurations().create("implementation")
+        project.getConfigurations().create("runtimeClasspath")
+        project.getConfigurations().create("runtimeOnly")
+    }
+
+    @Test
+    void "list dependencies"() {
+        // configure the project to have Jetty client as a dependency
+        project.getDependencies().add('implementation',
+                [group: "org.eclipse.jetty", name: "jetty-client", version: "9.4.43.v20210629", configuration: "implementation"])
+
+        // configure and execute the task
+        project.task(TASK_NAME, type: ListProjectDependencies) {
+            report = "test.csv"
+            reportFile = project.buildDir.toPath().resolve("test.csv").toFile()
+        }
+        def task = project.tasks.findByName(TASK_NAME)
+        task != null
+        task.list()
+
+        // Verify the CSV generated
+        List<String> fileContents = new File("${project.buildDir}/test.csv").readLines()
+        assert fileContents.size() == 2
+        assert fileContents[0] == '"artifact","moduleUrl","moduleLicense","moduleLicenseUrl",'
+        assert fileContents[1] == '"org.eclipse.jetty:jetty-client:9.4.43.v20210629",,,,'
+    }
+
+}
diff --git a/buildSrc/src/test/groovy/org/logstash/gradle/tooling/SignAliasDefinitionsTest.groovy b/buildSrc/src/test/groovy/org/logstash/gradle/tooling/SignAliasDefinitionsTest.groovy
new file mode 100644
index 000000000..8e19a1991
--- /dev/null
+++ b/buildSrc/src/test/groovy/org/logstash/gradle/tooling/SignAliasDefinitionsTest.groovy
@@ -0,0 +1,50 @@
+package org.logstash.gradle.tooling
+
+import org.gradle.api.Project
+import org.gradle.testfixtures.ProjectBuilder
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+import java.nio.file.Files
+import java.nio.file.Path
+
+class SignAliasDefinitionsTest {
+    Project project
+
+    @BeforeEach
+    void setUp() {
+        project = ProjectBuilder.builder().build()
+    }
+
+    @Test
+    void "test sign registry file adds header definition and SHA"() {
+        Path toSignFile = project.rootDir.toPath().resolve("logstash-core/src/test/resources/ToSign.yml")
+        Files.createDirectories(toSignFile.parent)
+
+        String someYaml = """
+            |input:
+            |  - alias: elastic_agent
+            |    from: beats
+        """.stripMargin().stripIndent()
+
+        toSignFile.toFile() << someYaml
+        assert Files.exists(toSignFile)
+
+        Path signedFile = project.buildDir.toPath().resolve("hashed_output.yml")
+        // necessary to avoid FileNotFoundException when the task try to write on the output file
+        Files.createDirectories(signedFile.parent)
+
+        def task = project.task("signerTask", type: SignAliasDefinitions) {
+            stage SignAliasDefinitions.Stage.test
+            registry = "ToSign.yml"
+            hashedFile = project.file("${project.buildDir}/hashed_output.yml")
+        }
+
+        // Exercise
+        task.sign()
+
+        // Verify
+        String hash = someYaml.digest('SHA-256')
+        assert signedFile.toFile().text.startsWith("#CHECKSUM: ${hash}")
+    }
+}
diff --git a/catalog-info.yaml b/catalog-info.yaml
new file mode 100644
index 000000000..143acb634
--- /dev/null
+++ b/catalog-info.yaml
@@ -0,0 +1,805 @@
+# *************************************************************
+# Declare Backstage Component that represents the Logstash tool
+# *************************************************************
+---
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: logstash
+  description: Logstash is a server-side data processing pipeline that ingests data from a multitude of sources simultaneously, transforms it, and then sends it to your favorite "stash."
+  annotations:
+    backstage.io/source-location: url:https://github.com/elastic/logstash/
+    github.com/project-slug: elastic/logstash
+    github.com/team-slug: elastic/logstash
+    buildkite.com/project-slug: elastic/logstash
+  tags:
+    - logstash
+    - dra
+  links:
+    - title: Logstash
+      url: https://elastic.co/logstash
+spec:
+  type: tool
+  owner: group:logstash
+  system: platform-ingest
+  lifecycle: production
+  dependsOn:
+    - resource:buildkite-logstash-serverless-integration-testing
+    - resource:logstash-snyk-report
+    - resource:logstash-dra-snapshot-pipeline
+    - resource:logstash-dra-staging-pipeline
+    - resource:logstash-linux-jdk-matrix-pipeline
+    - resource:logstash-windows-jdk-matrix-pipeline
+    - resource:logstash-benchmark-pipeline
+    - resource:logstash-health-report-tests-pipeline
+    - resource:logstash-jdk-availability-check-pipeline
+
+# ***********************************
+# Declare serverless IT pipeline
+# ***********************************
+---
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: buildkite-logstash-serverless-integration-testing
+  description: Buildkite pipeline for the Serverless Integration Test
+spec:
+  type: buildkite-pipeline
+  owner: group:logstash
+  system: platform-ingest
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: logstash-serverless-integration-testing
+    spec:
+      repository: elastic/logstash
+      pipeline_file: ".buildkite/serverless_integration_pipeline.yml"
+      maximum_timeout_in_minutes: 90
+      provider_settings:
+        trigger_mode: none # don't trigger jobs from github activity
+      env:
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
+        SLACK_NOTIFICATIONS_CHANNEL: '#logstash-build'
+        SLACK_NOTIFICATIONS_ON_SUCCESS: 'false'
+        SLACK_NOTIFICATIONS_SKIP_FOR_RETRIES: 'true'
+      teams:
+        logstash:
+          access_level: MANAGE_BUILD_AND_READ
+        ingest-eng-prod:
+          access_level: MANAGE_BUILD_AND_READ
+        everyone:
+          access_level: READ_ONLY
+      schedules:
+        Daily serverless test on core_serverless_test branch:
+          branch: main
+          cronline: "@daily"
+          message: "Run the serverless integration test every day."
+
+
+# ***********************************
+# Declare snyk-repo pipeline
+# ***********************************
+---
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: logstash-snyk-report
+  description: 'The logstash-snyk-report pipeline.'
+spec:
+  type: buildkite-pipeline
+  owner: group:logstash
+  system: platform-ingest
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: logstash-snyk-report-ci
+      description: ':logstash: The logstash-snyk-report :pipeline:'
+    spec:
+      repository: elastic/logstash
+      pipeline_file: ".buildkite/snyk_report_pipeline.yml"
+      maximum_timeout_in_minutes: 60
+      provider_settings:
+        trigger_mode: none # don't trigger jobs
+      env:
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
+        SLACK_NOTIFICATIONS_CHANNEL: '#logstash-build'
+        SLACK_NOTIFICATIONS_ON_SUCCESS: 'false'
+        SLACK_NOTIFICATIONS_SKIP_FOR_RETRIES: 'true'
+      teams:
+        ingest-fp:
+          access_level: MANAGE_BUILD_AND_READ
+        logstash:
+          access_level: MANAGE_BUILD_AND_READ
+        ingest-eng-prod:
+          access_level: MANAGE_BUILD_AND_READ
+        everyone:
+          access_level: READ_ONLY
+      schedules:
+        Daily Snyk scan:
+          branch: main
+          cronline: "@daily"
+          message: "Run the Logstash Snyk report every day."
+
+# ***********************************
+# SECTION START: DRA pipelines
+# ***********************************
+
+---
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: logstash-dra-snapshot-pipeline
+  description: 'Logstash DRA SNAPSHOT (Daily, Auto) pipeline'
+  links:
+    - title: 'Logstash DRA SNAPSHOT (Daily, Auto) pipeline'
+      url: https://buildkite.com/elastic/logstash-dra-snapshot-pipeline
+spec:
+  type: buildkite-pipeline
+  owner: group:logstash
+  system: platform-ingest
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: logstash-dra-snapshot-pipeline
+      description: ':logstash: The DRA SNAPSHOT pipeline'
+    spec:
+      repository: elastic/logstash
+      pipeline_file: ".buildkite/dra_pipeline.yml"
+      maximum_timeout_in_minutes: 120
+      skip_intermediate_builds: true
+      provider_settings:
+        trigger_mode: none
+      env:
+        WORKFLOW_TYPE: 'snapshot'
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
+        SLACK_NOTIFICATIONS_CHANNEL: '#logstash'
+        SLACK_NOTIFICATIONS_ON_SUCCESS: 'false'
+        SLACK_NOTIFICATIONS_SKIP_FOR_RETRIES: 'true'
+      teams:
+        ingest-fp:
+          access_level: MANAGE_BUILD_AND_READ
+        logstash:
+          access_level: MANAGE_BUILD_AND_READ
+        ingest-eng-prod:
+          access_level: MANAGE_BUILD_AND_READ
+        everyone:
+          access_level: READ_ONLY
+
+---
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: logstash-dra-staging-pipeline
+  description: 'Logstash DRA RELEASE (Staging) pipeline'
+  links:
+    - title: 'Logstash DRA RELEASE (Staging) pipeline'
+      url: https://buildkite.com/elastic/logstash-dra-staging-pipeline
+spec:
+  type: buildkite-pipeline
+  owner: group:logstash
+  system: platform-ingest
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: logstash-dra-staging-pipeline
+      description: ':logstash: The DRA RELEASE (Staging) pipeline'
+    spec:
+      repository: elastic/logstash
+      pipeline_file: ".buildkite/dra_pipeline.yml"
+      maximum_timeout_in_minutes: 120
+      skip_intermediate_builds: true
+      provider_settings:
+        trigger_mode: none
+      env:
+        WORKFLOW_TYPE: 'staging'
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
+        SLACK_NOTIFICATIONS_CHANNEL: '#logstash'
+        SLACK_NOTIFICATIONS_ON_SUCCESS: 'false'
+        SLACK_NOTIFICATIONS_SKIP_FOR_RETRIES: 'true'        
+      teams:
+        ingest-fp:
+          access_level: MANAGE_BUILD_AND_READ
+        logstash:
+          access_level: MANAGE_BUILD_AND_READ
+        ingest-eng-prod:
+          access_level: MANAGE_BUILD_AND_READ
+        everyone:
+          access_level: READ_ONLY
+
+# ***********************************
+# SECTION END: DRA pipelines
+# ***********************************
+
+# ***********************************
+# SECTION START: Pull requests
+# ***********************************
+
+---
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: logstash-pull-request-pipeline
+  description: 'Logstash Pull Request pipeline'
+  links:
+    - title: 'Logstash Pull Request pipeline'
+      url: https://buildkite.com/elastic/logstash-pull-request-pipeline
+spec:
+  type: buildkite-pipeline
+  owner: group:logstash
+  system: platform-ingest
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: logstash-pull-request-pipeline
+      description: ':logstash: Testing for Logstash Pull Requests'
+    spec:
+      repository: elastic/logstash
+      pipeline_file: ".buildkite/pull_request_pipeline.yml"
+      maximum_timeout_in_minutes: 120
+      provider_settings:
+        build_pull_request_forks: false
+        build_pull_requests: true # requires filter_enabled and filter_condition settings as below when used with buildkite-pr-bot
+        build_branches: false
+        build_tags: false
+        filter_enabled: true
+        filter_condition: >-
+          build.creator.name == 'elasticmachine' && build.pull_request.id != null
+      cancel_intermediate_builds: true
+      skip_intermediate_builds: true
+      env:
+        ELASTIC_PR_COMMENTS_ENABLED: 'true'
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
+        SLACK_NOTIFICATIONS_CHANNEL: '#logstash-build'
+        SLACK_NOTIFICATIONS_ON_SUCCESS: 'false'
+        SLACK_NOTIFICATIONS_SKIP_FOR_RETRIES: 'true'
+      teams:
+        ingest-fp:
+          access_level: MANAGE_BUILD_AND_READ
+        logstash:
+          access_level: MANAGE_BUILD_AND_READ
+        ingest-eng-prod:
+          access_level: MANAGE_BUILD_AND_READ
+        everyone:
+          access_level: READ_ONLY
+
+# ***********************************
+# SECTION END: Pull requests
+# ***********************************
+
+# *******************************
+# SECTION START: aarch64 pipeline
+# *******************************
+
+---
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: logstash-aarch64-pipeline
+  description: 'Logstash aarch64 pipeline'
+  links:
+    - title: 'Logstash aarch64 pipeline'
+      url: https://buildkite.com/elastic/logstash-aarch64-pipeline
+spec:
+  type: buildkite-pipeline
+  owner: group:logstash
+  system: platform-ingest
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: "Logstash aarch64 pipeline"
+      description: ':logstash: Exhaustive tests for the aarch64 architecture'
+    spec:
+      repository: elastic/logstash
+      pipeline_file: ".buildkite/aarch64_pipeline.yml"
+      maximum_timeout_in_minutes: 90
+      provider_settings:
+        trigger_mode: none
+      cancel_intermediate_builds: true
+      skip_intermediate_builds: true
+      env:
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
+        SLACK_NOTIFICATIONS_CHANNEL: '#logstash-build'
+        SLACK_NOTIFICATIONS_ON_SUCCESS: 'false'
+        SLACK_NOTIFICATIONS_SKIP_FOR_RETRIES: 'true'
+      teams:
+        ingest-fp:
+          access_level: MANAGE_BUILD_AND_READ
+        logstash:
+          access_level: MANAGE_BUILD_AND_READ
+        ingest-eng-prod:
+          access_level: MANAGE_BUILD_AND_READ
+        everyone:
+          access_level: READ_ONLY
+
+# *****************************
+# SECTION END: aarch64 pipeline
+# *****************************
+
+# *************************************************************
+# SECTION START: JDK matrix tests (Linux and Windows) pipelines
+# *************************************************************
+
+---
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: logstash-linux-jdk-matrix-pipeline
+  description: 'Logstash Linux JDK matrix pipeline'
+  links:
+    - title: 'Logstash Linux JDK matrix pipeline'
+      url: https://buildkite.com/elastic/logstash-linux-jdk-matrix-pipeline
+spec:
+  type: buildkite-pipeline
+  owner: group:logstash
+  system: platform-ingest
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: "Logstash Linux JDK matrix pipeline"
+      description: ':java: :linux: Test Logstash against a matrix of JDKs and Linux Distributions'
+    spec:
+      repository: elastic/logstash
+      pipeline_file: ".buildkite/linux_jdk_matrix_pipeline.yml"
+      maximum_timeout_in_minutes: 120
+      provider_settings:
+        trigger_mode: none
+      cancel_intermediate_builds: true
+      skip_intermediate_builds: true
+      env:
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
+        SLACK_NOTIFICATIONS_CHANNEL: '#logstash-build'
+        SLACK_NOTIFICATIONS_ON_SUCCESS: 'false'
+        SLACK_NOTIFICATIONS_SKIP_FOR_RETRIES: 'true'
+      teams:
+        ingest-fp:
+          access_level: MANAGE_BUILD_AND_READ
+        logstash:
+          access_level: MANAGE_BUILD_AND_READ
+        ingest-eng-prod:
+          access_level: MANAGE_BUILD_AND_READ
+        everyone:
+          access_level: READ_ONLY
+
+---
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: logstash-windows-jdk-matrix-pipeline
+  description: 'Logstash Windows JDK matrix pipeline'
+  links:
+    - title: 'Logstash Windows JDK matrix pipeline'
+      url: https://buildkite.com/elastic/logstash-windows-jdk-matrix-pipeline
+spec:
+  type: buildkite-pipeline
+  owner: group:logstash
+  system: platform-ingest
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: "Logstash Windows JDK matrix pipeline"
+      description: ':java: :windows: Test Logstash against a matrix of JDKs and Windows releases'
+    spec:
+      repository: elastic/logstash
+      pipeline_file: ".buildkite/windows_jdk_matrix_pipeline.yml"
+      maximum_timeout_in_minutes: 120
+      provider_settings:
+        trigger_mode: none
+      cancel_intermediate_builds: true
+      skip_intermediate_builds: true
+      env:
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
+        SLACK_NOTIFICATIONS_CHANNEL: '#logstash-build'
+        SLACK_NOTIFICATIONS_ON_SUCCESS: 'false'
+        SLACK_NOTIFICATIONS_SKIP_FOR_RETRIES: 'true'        
+      teams:
+        ingest-fp:
+          access_level: MANAGE_BUILD_AND_READ
+        logstash:
+          access_level: MANAGE_BUILD_AND_READ
+        ingest-eng-prod:
+          access_level: MANAGE_BUILD_AND_READ
+        everyone:
+          access_level: READ_ONLY
+
+# ***********************************************************
+# SECTION END: JDK matrix tests (Linux and Windows) pipelines
+# ***********************************************************
+
+# ****************************************
+# SECTION START: Exhaustive tests pipeline
+# ****************************************
+
+---
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: logstash-exhaustive-tests-pipeline
+  description: 'Logstash Exhaustive tests pipeline'
+  links:
+    - title: 'Logstash Exhaustive tests pipeline'
+      url: https://buildkite.com/elastic/logstash-exhaustive-tests-pipeline
+spec:
+  type: buildkite-pipeline
+  owner: group:logstash
+  system: platform-ingest
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: "Logstash Exhaustive tests pipeline"
+      description: '🔍 Run exhaustive tests against Logstash using different operating systems'
+    spec:
+      repository: elastic/logstash
+      pipeline_file: ".buildkite/exhaustive_tests_pipeline.yml"
+      provider_settings:
+        build_branches: true
+        build_pull_request_forks: false
+        build_pull_requests: false
+        build_tags: false
+        trigger_mode: code
+        filter_condition: >-
+          build.branch !~ /^backport.*$/ && build.branch !~ /^mergify\/bp\/.*$/
+        filter_enabled: true
+      cancel_intermediate_builds: false
+      skip_intermediate_builds: false
+      env:
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
+        SLACK_NOTIFICATIONS_CHANNEL: '#logstash-build'
+        SLACK_NOTIFICATIONS_ON_SUCCESS: 'false'
+        SLACK_NOTIFICATIONS_SKIP_FOR_RETRIES: 'true'        
+      teams:
+        ingest-fp:
+          access_level: MANAGE_BUILD_AND_READ
+        logstash:
+          access_level: MANAGE_BUILD_AND_READ
+        ingest-eng-prod:
+          access_level: MANAGE_BUILD_AND_READ
+        everyone:
+          access_level: READ_ONLY
+
+# **************************************
+# SECTION END: Exhaustive tests pipeline
+# **************************************
+
+# ********************************************
+# Declare supported plugin tests pipeline
+# ********************************************
+---
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: logstash-supported-plugins-test-pipeline
+  description: "Execute spec tests af all supported tier1 and tier2 plugins using the current branch's Logstash"
+  links:
+    - title: 'Logstash supported plugins test pipeline'
+      url: https://buildkite.com/elastic/logstash-supported-plugins-test-pipeline
+spec:
+  type: buildkite-pipeline
+  owner: group:logstash
+  system: platform-ingest
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: 'Logstash supported plugins test pipeline'
+      description: ':logstash: Supported plugins test pipeline'
+    spec:
+      repository: elastic/logstash
+      pipeline_file: ".buildkite/supported_plugins_test_pipeline.yml"
+      maximum_timeout_in_minutes: 90
+      skip_intermediate_builds: true
+      provider_settings:
+        trigger_mode: none
+      teams:
+        ingest-fp:
+          access_level: MANAGE_BUILD_AND_READ
+        logstash:
+          access_level: MANAGE_BUILD_AND_READ
+        ingest-eng-prod:
+          access_level: MANAGE_BUILD_AND_READ
+        everyone:
+          access_level: READ_ONLY
+
+# **************************************************************
+# SECTION START: Scheduler pipeline 
+# (Definitions for scheduled runs of various Logstash pipelines)
+# **************************************************************
+
+---
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: logstash-pipeline-scheduler
+  description: 'Scheduled runs of Logstash pipelines per release branch'
+  links:
+    - title: 'Scheduled runs of Logstash pipelines per release branch'
+      url: https://buildkite.com/elastic/logstash-pipeline-scheduler
+spec:
+  type: buildkite-pipeline
+  owner: group:logstash
+  system: platform-ingest
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: Logstash Pipeline Scheduler
+      description: ':alarm_clock: Scheduled runs of Logstash pipelines per release branch'
+    spec:
+      repository: elastic/logstash
+      pipeline_file: ".buildkite/trigger_pipelines.yml"
+      maximum_timeout_in_minutes: 240
+      schedules:
+        Daily Snapshot DRA:
+          branch: main
+          cronline: 30 02 * * *
+          message: Daily trigger of Snapshot DRA Pipeline per branch
+          env:
+            PIPELINES_TO_TRIGGER: 'logstash-dra-snapshot-pipeline'
+        Weekly JDK matrix:
+          branch: main
+          cronline: 0 1 * * 2
+          message: Weekly trigger of JDK matrix pipelines per branch
+          env:
+            PIPELINES_TO_TRIGGER: 'logstash-linux-jdk-matrix-pipeline,logstash-windows-jdk-matrix-pipeline'
+        AARCH64 Tests:
+          branch: main
+          cronline: 0 2 * * 1  # every Monday@2AM UTC
+          message: Weekly trigger of AARCH64 pipeline per branch
+          env:
+            PIPELINES_TO_TRIGGER: 'logstash-aarch64-pipeline'
+        Exhaustive Tests:
+          branch: main
+          cronline: 0 3 * * 1%2  # every other Wednesday@3AM UTC, see https://buildkite.com/docs/pipelines/scheduled-builds#schedule-intervals-crontab-time-syntax
+          message: Biweekly trigger of Exhaustive pipeline for non-main branches
+          env:
+            PIPELINES_TO_TRIGGER: 'logstash-exhaustive-tests-pipeline'
+            EXCLUDE_BRANCHES: 'main'
+      skip_intermediate_builds: true
+      provider_settings:
+        trigger_mode: none
+      env:
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'false'
+        SLACK_NOTIFICATIONS_CHANNEL: '#logstash-build'
+        SLACK_NOTIFICATIONS_ON_SUCCESS: 'false'
+      teams:
+        ingest-fp:
+          access_level: MANAGE_BUILD_AND_READ
+        logstash:
+          access_level: MANAGE_BUILD_AND_READ
+        ingest-eng-prod:
+          access_level: MANAGE_BUILD_AND_READ
+        everyone:
+          access_level: READ_ONLY
+
+# *******************************
+# SECTION END: Scheduler pipeline
+# *******************************
+
+# ***********************************
+# Declare Benchmark pipeline
+# ***********************************
+---
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: logstash-benchmark-pipeline
+  description: Buildkite pipeline for the Logstash benchmark
+  links:
+    - title: 'Logstash Benchmark (Daily, Auto) pipeline'
+      url: https://buildkite.com/elastic/logstash-benchmark-pipeline
+spec:
+  type: buildkite-pipeline
+  owner: group:logstash
+  system: platform-ingest
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: logstash-benchmark-pipeline
+      description: ':running: The Benchmark pipeline for snapshot version'
+    spec:
+      repository: elastic/logstash
+      pipeline_file: ".buildkite/benchmark_pipeline.yml"
+      maximum_timeout_in_minutes: 90
+      provider_settings:
+        trigger_mode: none # don't trigger jobs from github activity
+      env:
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'false'
+        SLACK_NOTIFICATIONS_CHANNEL: '#logstash-build'
+        SLACK_NOTIFICATIONS_ON_SUCCESS: 'false'
+        SLACK_NOTIFICATIONS_SKIP_FOR_RETRIES: 'true'
+      teams:
+        ingest-fp:
+          access_level: MANAGE_BUILD_AND_READ
+        logstash:
+          access_level: MANAGE_BUILD_AND_READ
+        ingest-eng-prod:
+          access_level: MANAGE_BUILD_AND_READ
+        everyone:
+          access_level: READ_ONLY
+      schedules:
+        Daily serverless test on core_serverless_test branch:
+          branch: main
+          cronline: 30 04 * * *
+          message: Daily trigger of Benchmark Pipeline
+
+# *******************************
+# SECTION END: Benchmark pipeline
+# *******************************
+
+# ***********************************
+# SECTION START: Benchmark Marathon
+# ***********************************
+---
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: logstash-benchmark-marathon-pipeline
+  description: Buildkite pipeline for benchmarking multi-version
+  links:
+    - title: 'Logstash Benchmark Marathon'
+      url: https://buildkite.com/elastic/logstash-benchmark-marathon-pipeline
+spec:
+  type: buildkite-pipeline
+  owner: group:logstash
+  system: platform-ingest
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: logstash-benchmark-marathon-pipeline
+      description: ':running: The Benchmark Marathon for multi-version'
+    spec:
+      repository: elastic/logstash
+      pipeline_file: ".buildkite/benchmark_marathon_pipeline.yml"
+      maximum_timeout_in_minutes: 480
+      provider_settings:
+        trigger_mode: none # don't trigger jobs from github activity
+      env:
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'false'
+        SLACK_NOTIFICATIONS_CHANNEL: '#logstash-build'
+        SLACK_NOTIFICATIONS_ON_SUCCESS: 'false'
+        SLACK_NOTIFICATIONS_SKIP_FOR_RETRIES: 'true'
+      teams:
+        ingest-fp:
+          access_level: MANAGE_BUILD_AND_READ
+        logstash:
+          access_level: MANAGE_BUILD_AND_READ
+        ingest-eng-prod:
+          access_level: MANAGE_BUILD_AND_READ
+        everyone:
+          access_level: READ_ONLY
+
+# *******************************
+# SECTION END: Benchmark Marathon
+# *******************************
+
+# ***********************************
+# Declare Health Report Tests pipeline
+# ***********************************
+---
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: logstash-health-report-tests-pipeline
+  description: Buildkite pipeline for the Logstash Health Report Tests
+  links:
+    - title: ':logstash Logstash Health Report Tests (Daily, Auto) pipeline'
+      url: https://buildkite.com/elastic/logstash-health-report-tests-pipeline
+spec:
+  type: buildkite-pipeline
+  owner: group:logstash
+  system: platform-ingest
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: logstash-health-report-tests-pipeline
+      description: ':logstash: Logstash Health Report tests :pipeline:'
+    spec:
+      repository: elastic/logstash
+      pipeline_file: ".buildkite/health_report_tests_pipeline.yml"
+      maximum_timeout_in_minutes: 30 # usually tests last max ~17mins
+      provider_settings:
+        trigger_mode: none # don't trigger jobs from github activity
+      env:
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
+        SLACK_NOTIFICATIONS_CHANNEL: '#logstash-build'
+        SLACK_NOTIFICATIONS_ON_SUCCESS: 'false'
+        SLACK_NOTIFICATIONS_SKIP_FOR_RETRIES: 'true'
+      teams:
+        ingest-fp:
+          access_level: MANAGE_BUILD_AND_READ
+        logstash:
+          access_level: MANAGE_BUILD_AND_READ
+        ingest-eng-prod:
+          access_level: MANAGE_BUILD_AND_READ
+        everyone:
+          access_level: READ_ONLY
+      schedules:
+        Daily Health Report tests on main branch:
+          branch: main
+          cronline: 30 20 * * *
+          message: Daily trigger of Health Report Tests Pipeline
+
+# *******************************
+# SECTION END: Health Report Tests pipeline
+# *******************************
+
+# ***********************************
+# Declare JDK check pipeline
+# ***********************************
+---
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: logstash-jdk-availability-check-pipeline
+  description: ":logstash: check availability of new JDK version"
+spec:
+  type: buildkite-pipeline
+  owner: group:logstash
+  system: platform-ingest
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: logstash-jdk-availability-check-pipeline
+    spec:
+      repository: elastic/logstash
+      pipeline_file: ".buildkite/jdk_availability_check_pipeline.yml"
+      maximum_timeout_in_minutes: 10
+      provider_settings:
+        trigger_mode: none # don't trigger jobs from github activity
+      env:
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
+        SLACK_NOTIFICATIONS_CHANNEL: '#logstash-build'
+        SLACK_NOTIFICATIONS_ON_SUCCESS: 'false'
+        SLACK_NOTIFICATIONS_SKIP_FOR_RETRIES: 'true'
+      teams:
+        logstash:
+          access_level: MANAGE_BUILD_AND_READ
+        ingest-eng-prod:
+          access_level: MANAGE_BUILD_AND_READ
+        everyone:
+          access_level: READ_ONLY
+      schedules:
+        Weekly JDK availability check (main):
+          branch: main
+          cronline: 0 2 * * 1  # every Monday@2AM UTC
+          message: Weekly trigger of JDK update availability pipeline per branch
+          env:
+            PIPELINES_TO_TRIGGER: 'logstash-jdk-availability-check-pipeline'
+        Weekly JDK availability check (8.19):
+          branch: "8.19"
+          cronline: 0 2 * * 1  # every Monday@2AM UTC
+          message: Weekly trigger of JDK update availability pipeline per branch
+          env:
+            PIPELINES_TO_TRIGGER: 'logstash-jdk-availability-check-pipeline'
+
+# *******************************
+# SECTION END: JDK check pipeline
+# *******************************
diff --git a/ci/acceptance_tests.sh b/ci/acceptance_tests.sh
index 67bd1af28..fa844c7ca 100755
--- a/ci/acceptance_tests.sh
+++ b/ci/acceptance_tests.sh
@@ -1,81 +1,58 @@
 #!/usr/bin/env bash
-set -e
-set -x
+set -eo pipefail
+
+function get_package_type {
+  # determines OS packaging system; at the moment either rpm or deb
+  source /etc/os-release
+
+  if [[ $ID == "ubuntu" || $ID == "debian" || $ID_LIKE == "debian" ]]; then
+    PACKAGE_TYPE="deb"
+  elif [[ $ID_LIKE == *"rhel"* || $ID_LIKE == *"fedora"* || $ID_LIKE == *"suse"* ]]; then
+    PACKAGE_TYPE="rpm"
+  else
+    echo "^^^ +++ Unsupported Linux distribution [$ID]. Acceptance packaging tests only support deb or rpm based distributions. Exiting."
+    exit 1
+  fi
+}
 
 # Since we are using the system jruby, we need to make sure our jvm process
 # uses at least 1g of memory, If we don't do this we can get OOM issues when
 # installing gems. See https://github.com/elastic/logstash/issues/5179
 export JRUBY_OPTS="-J-Xmx1g"
-export GRADLE_OPTS="-Xmx2g -Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info -Dfile.encoding=UTF-8"
+export GRADLE_OPTS="-Xmx4g -Dorg.gradle.console=plain -Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info -Dfile.encoding=UTF-8"
 export OSS=true
 
-SELECTED_TEST_SUITE=$1
-
-# The acceptance test in our CI infrastructure doesn't clear the workspace between run
-# this mean the lock of the Gemfile can be sticky from a previous run, before generating any package
-# we will clear them out to make sure we use the latest version of theses files
-# If we don't do this we will run into gem Conflict error.
-[ -f Gemfile ] && rm Gemfile
-[ -f Gemfile.lock ] && rm Gemfile.lock
-
-# When running these tests in a Jenkins matrix, in parallel, once one Vagrant job is done, the Jenkins ProcessTreeKiller will kill any other Vagrant processes with the same
-# BUILD_ID unless you set this magic flag:  https://wiki.jenkins.io/display/JENKINS/ProcessTreeKiller
-export BUILD_ID=dontKillMe
+if [ -n "$BUILD_JAVA_HOME" ]; then
+  GRADLE_OPTS="$GRADLE_OPTS -Dorg.gradle.java.home=$BUILD_JAVA_HOME"
+fi
 
 LS_HOME="$PWD"
 QA_DIR="$PWD/qa"
 
-# Always run the halt, even if the test times out or an exit is sent
-cleanup() {
-  cd $QA_DIR
-  bundle check || bundle install
-  bundle exec rake qa:vm:halt
-}
-trap cleanup EXIT
+cd $LS_HOME
 
-# Cleanup any stale VMs from old jobs first
-cleanup
+get_package_type
 
-if [[ $SELECTED_TEST_SUITE == $"redhat" ]]; then
-  echo "Generating the RPM, make sure you start with a clean environment before generating other packages."
-  cd $LS_HOME
-  rake artifact:rpm
-  echo "Acceptance: Installing dependencies"
-  cd $QA_DIR
-  bundle install
-
-  echo "Acceptance: Running the tests"
-  bundle exec rake qa:vm:setup["redhat"]
-  bundle exec rake qa:vm:ssh_config
-  bundle exec rake qa:acceptance:redhat
-  bundle exec rake qa:vm:halt["redhat"]
-elif [[ $SELECTED_TEST_SUITE == $"debian" ]]; then
-  echo "Generating the DEB, make sure you start with a clean environment before generating other packages."
-  cd $LS_HOME
-  rake artifact:deb
-  echo "Acceptance: Installing dependencies"
-  cd $QA_DIR
-  bundle install
-
-  echo "Acceptance: Running the tests"
-  bundle exec rake qa:vm:setup["debian"]
-  bundle exec rake qa:vm:ssh_config
-  bundle exec rake qa:acceptance:debian
-  bundle exec rake qa:vm:halt["debian"]
-elif [[ $SELECTED_TEST_SUITE == $"all" ]]; then
-  echo "Building Logstash artifacts"
-  cd $LS_HOME
-  rake artifact:all
-
-  echo "Acceptance: Installing dependencies"
-  cd $QA_DIR
-  bundle install
-
-  echo "Acceptance: Running the tests"
-  bundle exec rake qa:vm:setup
-  bundle exec rake qa:vm:ssh_config
-  bundle exec rake qa:acceptance:all
-  bundle exec rake qa:vm:halt
+# in CI (Buildkite), packaging artifacts are pre-built from a previous step
+if [[ $BUILDKITE == true ]]; then
+  export LS_ARTIFACTS_PATH="$HOME/build"
+  echo "--- Downloading artifacts from \"build/*${PACKAGE_TYPE}\" to $LS_ARTIFACTS_PATH"
+  set -x
+  # also creates build/ under $HOME
+  buildkite-agent artifact download "build/*${PACKAGE_TYPE}" $HOME
+  set +x
+  echo "--- Running gradle"
+  ./gradlew clean bootstrap
+else
+  echo "--- Detected a distribution that supports \033[33m[$PACKAGE_TYPE]\033[0m packages. Running gradle."
+  ./gradlew clean bootstrap
+  echo "--- Building Logstash artifacts"
+  rake artifact:$PACKAGE_TYPE
 fi
 
+echo "--- Acceptance: Installing dependencies"
+cd $QA_DIR
+bundle install
 
+echo "--- Acceptance: Running the tests"
+rake qa:acceptance:all
diff --git a/ci/bootstrap_dependencies.sh b/ci/bootstrap_dependencies.sh
new file mode 100644
index 000000000..9b4e972e0
--- /dev/null
+++ b/ci/bootstrap_dependencies.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+./gradlew installDefaultGems
diff --git a/ci/check_jdk_version_availability.sh b/ci/check_jdk_version_availability.sh
new file mode 100755
index 000000000..2ce40dc7b
--- /dev/null
+++ b/ci/check_jdk_version_availability.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+export GRADLE_OPTS="-Xmx4g -Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info -Dfile.encoding=UTF-8"
+
+echo "Checking local JDK version against latest remote from JVM catalog"
+./gradlew checkNewJdkVersion
\ No newline at end of file
diff --git a/ci/docker_acceptance_tests.sh b/ci/docker_acceptance_tests.sh
new file mode 100755
index 000000000..b1e62de2c
--- /dev/null
+++ b/ci/docker_acceptance_tests.sh
@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+set -e
+set -x
+
+# Since we are using the system jruby, we need to make sure our jvm process
+# uses at least 1g of memory, If we don't do this we can get OOM issues when
+# installing gems. See https://github.com/elastic/logstash/issues/5179
+export JRUBY_OPTS="-J-Xmx1g"
+export GRADLE_OPTS="-Xmx4g -Dorg.gradle.console=plain -Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info -Dfile.encoding=UTF-8"
+
+if [ -n "$BUILD_JAVA_HOME" ]; then
+  GRADLE_OPTS="$GRADLE_OPTS -Dorg.gradle.java.home=$BUILD_JAVA_HOME"
+fi
+
+# Can run either a specific flavor, or all flavors -
+# eg `ci/acceptance_tests.sh oss` will run tests for open source container
+#    `ci/acceptance_tests.sh full` will run tests for the default container
+#    `ci/acceptance_tests.sh wolfi` will run tests for the wolfi based container
+#    `ci/acceptance_tests.sh` will run tests for all containers
+SELECTED_TEST_SUITE=$1
+
+# The acceptance test in our CI infrastructure doesn't clear the workspace between run
+# this mean the lock of the Gemfile can be sticky from a previous run, before generating any package
+# we will clear them out to make sure we use the latest version of theses files
+# If we don't do this we will run into gem Conflict error.
+[ -f Gemfile ] && rm Gemfile
+[ -f Gemfile.lock ] && rm Gemfile.lock
+
+LS_HOME="$PWD"
+QA_DIR="$PWD/qa"
+
+cd $QA_DIR
+bundle check || bundle install
+
+echo "Building Logstash artifacts"
+cd $LS_HOME
+
+if [[ $SELECTED_TEST_SUITE == "oss" ]]; then
+  echo "--- Building $SELECTED_TEST_SUITE docker images"
+  cd $LS_HOME
+  rake artifact:docker_oss
+  echo "--- Acceptance: Installing dependencies"
+  cd $QA_DIR
+  bundle install
+
+  echo "--- Acceptance: Running the tests"
+  bundle exec rspec docker/spec/oss/*_spec.rb
+elif [[ $SELECTED_TEST_SUITE == "full" ]]; then
+  echo "--- Building $SELECTED_TEST_SUITE docker images"
+  cd $LS_HOME
+  rake artifact:build_docker_full
+  echo "--- Acceptance: Installing dependencies"
+  cd $QA_DIR
+  bundle install
+
+  echo "--- Acceptance: Running the tests"
+  bundle exec rspec docker/spec/full/*_spec.rb
+elif [[ $SELECTED_TEST_SUITE == "wolfi" ]]; then
+  echo "--- Building $SELECTED_TEST_SUITE docker images"
+  cd $LS_HOME
+  rake artifact:docker_wolfi
+  echo "--- Acceptance: Installing dependencies"
+  cd $QA_DIR
+  bundle install
+
+  echo "--- Acceptance: Running the tests"
+  bundle exec rspec docker/spec/wolfi/*_spec.rb
+else
+  echo "--- Building all docker images"
+  cd $LS_HOME
+  rake artifact:docker_only
+
+  echo "--- Acceptance: Installing dependencies"
+  cd $QA_DIR
+  bundle install
+
+  echo "--- Acceptance: Running the tests"
+  bundle exec rspec docker/spec/**/*_spec.rb
+fi
diff --git a/ci/docker_integration_tests.sh b/ci/docker_integration_tests.sh
deleted file mode 100755
index 0eb78569a..000000000
--- a/ci/docker_integration_tests.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-ci/docker_run.sh logstash-integration-tests ci/integration_tests.sh $@
diff --git a/ci/docker_license_check.sh b/ci/docker_license_check.sh
deleted file mode 100755
index a90d65bf2..000000000
--- a/ci/docker_license_check.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-export JRUBY_OPTS="-J-Xmx1g"
-export GRADLE_OPTS="-Xmx2g -Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info"
-
-ci/docker_run.sh logstash-license-check ci/license_check.sh -m 4G
diff --git a/ci/docker_prune.sh b/ci/docker_prune.sh
deleted file mode 100755
index cd18df436..000000000
--- a/ci/docker_prune.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash -i
-
-echo "Removing containers older then 8 hours"
-docker container prune -f --filter "until=8h"
-echo "Removing all images, except with the label of retention=keep"
-docker image prune -a -f --filter "label!=retention=keep"
diff --git a/ci/docker_run.sh b/ci/docker_run.sh
deleted file mode 100755
index 4963cc05a..000000000
--- a/ci/docker_run.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-# Syntax is docker_run.sh IMAGE_NAME SCRIPT_NAME *EXTRA_DOCKER_OPTS
-
-set -x # We want verbosity here, this mostly runs on CI and we want to easily debug stuff
-
-#Note - ensure that the -e flag is NOT set, and explicitly check the $? status to allow for clean up
-
-REMOVE_IMAGE=false
-if [ -z "$branch_specifier" ]; then
-    # manual
-    REMOVE_IMAGE=true
-    IMAGE_NAME="$1"
-else
-    IMAGE_NAME=$branch_specifier"-"$(date +%s%N)
-fi
-
-if [ "$OSS" == "true" ]; then
-  DOCKER_ENV_OPTS="${DOCKER_ENV_OPTS} --env OSS=true"
-fi
-
-echo "Running Docker CI build for '$IMAGE_NAME' "
-
-# Remove old docker cid just in case
-rm -f docker_cid
-
-docker build -t $IMAGE_NAME .
-exit_code=$?; [[ $exit_code != 0 ]] && exit $exit_code
-
-cleanup() {
-  if [ -e docker_cid ]; then
-    cat docker_cid | xargs docker rm --force -v
-  fi
-}
-trap cleanup EXIT
-
-# Run the command, skip the first argument, which is the image name
-docker run $DOCKER_ENV_OPTS --cidfile=docker_cid --sig-proxy=true --rm $IMAGE_NAME ${@:2}
-exit_code=$?
-
-# Remove the container cid since we ran cleanly, no need to force rm it if we got to this point
-rm docker_cid
-
-[[ $REMOVE_IMAGE == "true" ]] && docker rmi $IMAGE_NAME
-echo "exiting with code: '$exit_code'"
-exit $exit_code #preserve the exit code from the test run
diff --git a/ci/docker_unit_tests.sh b/ci/docker_unit_tests.sh
deleted file mode 100755
index c7557b5d8..000000000
--- a/ci/docker_unit_tests.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-ci/docker_run.sh logstash-unit-tests ci/unit_tests.sh $@
diff --git a/ci/docker_update_base_image.sh b/ci/docker_update_base_image.sh
deleted file mode 100755
index ab65ee6d7..000000000
--- a/ci/docker_update_base_image.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash -ie
-
-if docker rmi --force logstash-base ; then
-    echo "Removed existing logstash-base image, building logstash-base image from scratch."
-else
-    echo "Building logstash-base image from scratch." #Keep the global -e flag but allow the remove command to fail.
-fi
-
-docker build -f Dockerfile.base -t logstash-base .
-docker login --username=logstashci container-registry-test.elastic.co #will prompt for password
-docker tag logstash-base container-registry-test.elastic.co/logstash-test/logstash-base
-docker push container-registry-test.elastic.co/logstash-test/logstash-base
diff --git a/ci/integration_tests.sh b/ci/integration_tests.sh
index 4954d4420..318660bc9 100755
--- a/ci/integration_tests.sh
+++ b/ci/integration_tests.sh
@@ -5,35 +5,29 @@
 # uses at least 1g of memory, If we don't do this we can get OOM issues when
 # installing gems. See https://github.com/elastic/logstash/issues/5179
 export JRUBY_OPTS="-J-Xmx1g"
-export GRADLE_OPTS="-Xmx2g -Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info -Dfile.encoding=UTF-8"
+export GRADLE_OPTS="-Xmx2g -Dorg.gradle.jvmargs=-Xmx2g -Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info -Dfile.encoding=UTF-8"
 
 export SPEC_OPTS="--order rand --format documentation"
 export CI=true
-export OSS=true
+
+if [ -n "$BUILD_JAVA_HOME" ]; then
+  GRADLE_OPTS="$GRADLE_OPTS -Dorg.gradle.java.home=$BUILD_JAVA_HOME"
+fi
 
 if [[ $1 = "setup" ]]; then
  echo "Setup only, no tests will be run"
  exit 0
 
 elif [[ $1 == "split" ]]; then
-    cd qa/integration
-    glob1=(specs/*spec.rb)
-    glob2=(specs/**/*spec.rb)
-    all_specs=("${glob1[@]}" "${glob2[@]}")
+  # Source shared function for splitting integration tests
+  source "$(dirname "${BASH_SOURCE[0]}")/partition-files.lib.sh"
 
-    specs0=${all_specs[@]::$((${#all_specs[@]} / 2 ))}
-    specs1=${all_specs[@]:$((${#all_specs[@]} / 2 ))}
-    cd ../..
-    if [[ $2 == 0 ]]; then
-       echo "Running the first half of integration specs: $specs0"
-       ./gradlew runIntegrationTests -PrubyIntegrationSpecs="$specs0" --console=plain
-    elif [[ $2 == 1 ]]; then
-       echo "Running the second half of integration specs: $specs1"
-       ./gradlew runIntegrationTests -PrubyIntegrationSpecs="$specs1" --console=plain
-    else
-       echo "Error, must specify 0 or 1 after the split. For example ci/integration_tests.sh split 0"
-       exit 1
-    fi
+  index="${2:?index}"
+  count="${3:-2}"
+  specs=($(cd qa/integration; partition_files "${index}" "${count}" < <(find specs -name '*_spec.rb') ))
+
+  echo "Running integration tests partition[${index}] of ${count}: ${specs[*]}"
+  ./gradlew runIntegrationTests -PrubyIntegrationSpecs="${specs[*]}" --console=plain
 
 elif [[ !  -z  $@  ]]; then
     echo "Running integration tests 'rspec $@'"
diff --git a/ci/license_check.sh b/ci/license_check.sh
index f9632ecba..c552d797b 100755
--- a/ci/license_check.sh
+++ b/ci/license_check.sh
@@ -1,7 +1,12 @@
 #!/bin/bash -i
-export GRADLE_OPTS="-Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info -Dfile.encoding=UTF-8"
+export GRADLE_OPTS="-Xmx2g -Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info -Dfile.encoding=UTF-8"
 
 ./gradlew installDefaultGems
 bin/dependencies-report --csv report.csv
+
+result=$?
+
 # We want this to show on the CI server
 cat report.csv
+
+exit $result
diff --git a/ci/logstash_releases.json b/ci/logstash_releases.json
index 9175778f7..6c921f926 100644
--- a/ci/logstash_releases.json
+++ b/ci/logstash_releases.json
@@ -1,11 +1,15 @@
 {
   "releases": {
-    "5.x": "5.6.14",
-    "6.x": "6.6.0",
-    "7.x": "7.0.0-alpha2"
+    "7.current": "7.17.28",
+    "8.previous": "8.17.5",
+    "8.current": "8.18.0"
   },
   "snapshots": {
-    "6.x": "6.7.0-SNAPSHOT",
-    "7.x": "7.0.0-SNAPSHOT"
+    "7.current": "7.17.29-SNAPSHOT",
+    "8.previous": "8.17.6-SNAPSHOT",
+    "8.current": "8.18.1-SNAPSHOT",
+    "8.next": "8.19.0-SNAPSHOT",
+    "9.next": "9.0.1-SNAPSHOT",
+    "main": "9.1.0-SNAPSHOT"
   }
 }
diff --git a/ci/partition-files.lib.sh b/ci/partition-files.lib.sh
new file mode 100755
index 000000000..c974921da
--- /dev/null
+++ b/ci/partition-files.lib.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+# partition_files returns a consistent partition of the filenames given on stdin
+# Usage: partition_files <partition_index> <partition_count=2> < <(ls files)
+# partition_index: the zero-based index of the partition to select `[0,partition_count)`
+# partition_count: the number of partitions `[2,#files]`
+partition_files() (
+    set -e
+
+    local files
+    # ensure files is consistently sorted and distinct
+    IFS=$'\n' read -ra files -d '' <<<"$(cat - | sort | uniq)" || true
+
+    local partition_index="${1:?}"
+    local partition_count="${2:?}"
+
+    _error () { >&2 echo "ERROR: ${1:-UNSPECIFIED}"; exit 1; }
+
+    # safeguard against nonsense invocations
+    if (( ${#files[@]} < 2 )); then
+      _error "#files(${#files[@]}) must be at least 2 in order to partition"
+    elif ( ! [[ "${partition_count}" =~ ^[0-9]+$ ]] ) || (( partition_count < 2 )) || (( partition_count > ${#files[@]})); then
+      _error "partition_count(${partition_count}) must be a number that is at least 2 and not greater than #files(${#files[@]})"
+    elif ( ! [[ "${partition_index}" =~ ^[0-9]+$ ]] ) || (( partition_index < 0 )) || (( partition_index >= $partition_count )) ; then
+      _error "partition_index(${partition_index}) must be a number that is greater 0 and less than partition_count(${partition_count})"
+    fi
+
+    # round-robbin emit those in our selected partition
+    for index in "${!files[@]}"; do
+      partition="$(( index % partition_count ))"
+      if (( partition == partition_index )); then
+        echo "${files[$index]}"
+      fi
+    done
+)
+
+if [[ "$0" == "${BASH_SOURCE[0]}" ]]; then
+  if [[ "$1" == "test" ]]; then
+    status=0
+
+    SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+    file_list="$( cd "${SCRIPT_DIR}"; find . -type f )"
+
+    # for any legal partitioning into N partitions, we ensure that
+    # the combined output of `partition_files I N` where `I` is all numbers in
+    # the range `[0,N)` produces no repeats and no omissions, even if the
+    # input list is not consistently ordered.
+    for n in $(seq 2 $(wc -l <<<"${file_list}")); do
+      result=""
+      for i in $(seq 0 $(( n - 1 ))); do
+        for file in $(partition_files $i $n <<<"$( shuf <<<"${file_list}" )"); do
+          result+="${file}"$'\n'
+        done
+      done
+
+      repeated="$( uniq --repeated <<<"$( sort <<<"${result}" )" )"
+      if (( $(printf "${repeated}" | wc -l) > 0 )); then
+        status=1
+        echo "[n=${n}]FAIL(repeated):"$'\n'"${repeated}"
+      fi
+
+      missing=$( comm -23 <(sort <<<"${file_list}") <( sort <<<"${result}" ) )
+      if (( $(printf "${missing}" | wc -l) > 0 )); then
+        status=1
+        echo "[n=${n}]FAIL(omitted):"$'\n'"${missing}"
+      fi
+    done
+
+    if (( status > 0 )); then
+      echo "There were failures. The input list was:"
+      echo "${file_list}"
+    fi
+
+    exit "${status}"
+  else
+    partition_files $@
+  fi
+fi
\ No newline at end of file
diff --git a/ci/serverless/README.md b/ci/serverless/README.md
new file mode 100644
index 000000000..274eb2729
--- /dev/null
+++ b/ci/serverless/README.md
@@ -0,0 +1,138 @@
+The test cases against serverless Elasticsearch cover the following scenarios
+
+- es-output
+- es-input
+- es-filter
+- elastic-integration-filter (Logstash run ingest pipeline)
+- DLQ
+- central pipeline management
+- Kibana API for pipeline management (CPM)
+- Metricbeat monitoring
+- ~~Logstash legacy monitoring~~
+
+### Setup testing endpoint
+1. Go to https://console.qa.cld.elstc.co
+2. Create deployment. Choose AWS as cloud provider.
+3. [Create fully-managed project](https://docs.elastic.dev/serverless/create-project)
+   - save the credentials of superuser
+4. [Create API key](#create-api-key)
+   - save the api keys for metricbeat and elasticsearch
+   - get the elasticsearch and kibana endpoint from UI or [API](https://docs.elastic.dev/serverless/create-project#get-project)
+5. [Save credentials to Vault](#save-credentials-to-vault)
+
+
+### Create API key
+
+#### Logstash
+
+Plugin user
+```
+POST /_security/api_key
+{
+  "name": "plugin_user",
+  "expiration": "365d",   
+  "role_descriptors": { 
+    "plugin_user_role": {
+      "cluster": ["manage_index_templates", "monitor"], 
+      "indices": [
+        {
+          "names": [ "logstash", "logstash-*", "ecs-logstash", "ecs-logstash-*", "serverless*", "logs-*", "metrics-*", "synthetics-*", "traces-*" ], 
+          "privileges": ["manage", "write", "create_index", "read", "view_index_metadata"]  
+        }
+      ]
+    }
+  }
+}
+```
+
+Integration User
+```
+POST /_security/api_key
+{
+  "name": "integration_user",
+  "expiration": "365d",   
+  "role_descriptors": { 
+    "integration_user_role": {
+      "cluster": ["manage_index_templates", "read_pipeline", "monitor"]
+    }
+  }
+}
+```
+
+CPM User
+```
+POST /_security/api_key
+{
+  "name": "cpm_user",
+  "expiration": "365d",   
+  "role_descriptors": { 
+    "cpm_user_role": {
+      "cluster": ["manage_logstash_pipelines", "monitor"]
+    }
+  }
+}
+```
+
+Tester 
+```
+POST /_security/api_key
+{
+  "name": "tester_user",
+  "expiration": "365d",   
+  "role_descriptors": { 
+    "tester_user_role": {
+      "cluster": ["manage_index_templates", "manage_logstash_pipelines","manage_ingest_pipelines"], 
+      "indices": [
+        {
+          "names": [ "logstash", "logstash-*", "ecs-logstash", "ecs-logstash-*", "serverless*", "logs-*", "metrics-*", "synthetics-*", "traces-*", "*test*" ], 
+          "privileges": ["manage", "write", "create_index", "read", "view_index_metadata"]  
+        }
+      ]
+    }
+  }
+}
+```
+
+#### MetricBeat
+Grant metricbeat write permission.
+
+```
+POST /_security/api_key
+{
+  "name": "metricbeat_user", 
+  "role_descriptors": {
+    "metricbeat_user_role": { 
+      "cluster": ["monitor", "read_ilm", "read_pipeline"],
+      "index": [
+        {
+          "names": ["metricbeat-*"],
+          "privileges": ["view_index_metadata", "create_doc"]
+        }
+      ]
+    }
+  }
+}
+```
+
+### Save credentials to Vault
+
+[Setup Vault](https://github.com/elastic/infra/tree/master/docs/vault) if you haven't.
+
+The username, password, API key and hosts are stored in `secret/ci/elastic-logstash/serverless-test`.
+
+| Vault field                 |                                                         |
+|-----------------------------|---------------------------------------------------------|
+| es_host                     | Elasticsearch endpoint with port                        |
+| es_superuser                | username of superuser                                   |
+| es_superuser_pw             | password of superuser                                   |
+| kb_host                     | Kibana endpoint with port                               |
+| mb_api_key                  | id:api_key for for beats                                |  
+| plugin_api_key              | id:api_key for es-output/filter/input                   |
+| integration_api_key_encoded | base64 of api_key for elastic integration               |
+| tester_api_key_encoded      | base64 of api_key for the script to update testing data |
+| cpm_api_key                 | id:api_key for central pipeline management              |
+
+
+```bash
+vault write secret/ci/elastic-logstash/serverless-test es_host="REDACTED" es_superuser="REDACTED" es_superuser_pw="REDACTED" " kb_host="REDACTED" mb_api_key="REDACTED" plugin_api_key="REDACTED" integration_api_key_encoded="REDACTED" tester_api_key_encoded="REDACTED" cpm_api_key="REDACTED"
+```
\ No newline at end of file
diff --git a/ci/serverless/common.sh b/ci/serverless/common.sh
new file mode 100755
index 000000000..a0d5c90d1
--- /dev/null
+++ b/ci/serverless/common.sh
@@ -0,0 +1,158 @@
+#!/usr/bin/env bash
+set -ex
+
+export CURRENT_DIR="$(dirname "$0")"
+export INDEX_NAME="serverless_it_${BUILDKITE_BUILD_NUMBER:-`date +%s`}"
+# store all error messages
+export ERR_MSGS=()
+# numeric values representing the results of the checks. 0: pass, >0: fail
+export CHECKS=()
+
+setup_vault() {
+  vault_path=secret/ci/elastic-logstash/serverless-test
+  set +x
+  export ES_ENDPOINT=$(vault read -field=es_host "${vault_path}")
+  export ES_USER=$(vault read -field=es_superuser "${vault_path}") # dlq test
+  export ES_PW=$(vault read -field=es_superuser_pw "${vault_path}")
+  export KB_ENDPOINT=$(vault read -field=kb_host "${vault_path}")
+  export MB_API_KEY=$(vault read -field=mb_api_key "${vault_path}")
+  export PLUGIN_API_KEY=$(vault read -field=plugin_api_key "${vault_path}")
+  export INTEGRATION_API_KEY_ENCODED=$(vault read -field=integration_api_key_encoded "${vault_path}")
+  export TESTER_API_KEY_ENCODED=$(vault read -field=tester_api_key_encoded "${vault_path}")
+  export CPM_API_KEY=$(vault read -field=cpm_api_key "${vault_path}")
+  set -x
+}
+
+build_logstash() {
+  ./gradlew clean bootstrap assemble installDefaultGems
+}
+
+index_test_data() {
+  curl -X POST -H "Authorization: ApiKey $TESTER_API_KEY_ENCODED" "$ES_ENDPOINT/$INDEX_NAME/_bulk" \
+    -H 'x-elastic-product-origin: logstash' \
+    -H 'Content-Type: application/json' --data-binary @"$CURRENT_DIR/test_data/book.json"
+}
+
+# $1: check function
+run_cpm_logstash() {
+  # copy log4j
+  cp  "$CURRENT_DIR/../../config/log4j2.properties" "$CURRENT_DIR/config/log4j2.properties"
+
+  # run logstash
+  $CURRENT_DIR/../../bin/logstash --path.settings "$CURRENT_DIR/config" 2>/dev/null &
+  export LS_PID=$!
+
+  check_logstash_readiness
+
+  $1 # check function
+
+  kill "$LS_PID" || true
+}
+
+# $1: pipeline file
+# $2: check function
+# run_logstash 001_es-output.conf check_es_output
+run_logstash() {
+  $CURRENT_DIR/../../bin/logstash -f "$1" 2>/dev/null &
+  export LS_PID=$!
+
+  check_logstash_readiness
+
+  $2 # check function
+
+  kill "$LS_PID" || true
+}
+
+
+# $1: number of try
+# $n: check function with args - return non empty string as pass
+count_down_check() {
+    count=$1
+    while ! [[ $("${@:2}") ]] && [[ $count -gt 0 ]]; do
+        count=$(( count - 1 ))
+        sleep 1
+    done
+
+    [[ $count -eq 0 ]] && echo "1" && return
+
+    echo "Passed check!"
+    echo "0"
+}
+
+
+check_logstash_readiness() {
+  curl_logstash() {
+    [[ $(curl --silent localhost:9600) ]] && echo "0"
+  }
+  check_readiness() {
+    count_down_check 120 curl_logstash
+  }
+  add_check check_readiness "Failed readiness check."
+
+  [[ "${CHECKS[*]: -1}" -eq "1" ]] && exit 1
+
+  echo "Logstash is Up !"
+  return 0
+}
+
+# $1: jq filter
+# $2: expected value
+# check_logstash_api '.pipelines.main.plugins.outputs[0].documents.successes' '1'
+check_logstash_api() {
+  curl_node_stats() {
+    [[ $(curl --silent localhost:9600/_node/stats | jq "$1") -ge "$2" ]] && echo "0"
+  }
+
+  count_down_check 30 curl_node_stats "$1" "$2"
+}
+
+# add check result to CHECKS
+# $1: check function - expected the last char of result to be 0 or positive number
+# $2: err msg
+add_check() {
+  FEATURE_CHECK=$($1)
+  FEATURE_CHECK="${FEATURE_CHECK: -1}"
+
+  ERR_MSGS+=("$2")
+  CHECKS+=("$FEATURE_CHECK")
+}
+
+# check log if the line contains [ERROR] or [FATAL] and does not relate to "unreachable"
+check_err_log() {
+  LOG_FILE="$CURRENT_DIR/../../logs/logstash-plain.log"
+  LOG_CHECK=$(grep -E "\[ERROR\]|\[FATAL\]" "$LOG_FILE" | grep -cvE "unreachable|Connection refused") || true
+
+  ERR_MSGS+=("Found error in log")
+  CHECKS+=("$LOG_CHECK")
+}
+
+# if CHECKS[i] is 1, print ERR_MSGS[i]
+print_result() {
+  for i in "${!CHECKS[@]}"; do
+    [[ "${CHECKS[$i]}" -gt 0 ]] && echo "${ERR_MSGS[$i]}" || true
+  done
+}
+
+# exit 1 if one of the checks fails
+exit_with_code() {
+  for c in "${CHECKS[@]}"; do
+      [[ $c -gt 0 ]] && exit 1
+  done
+
+  exit 0
+}
+
+clean_up_and_get_result() {
+  [[ -n "$LS_PID" ]] && kill "$LS_PID" || true
+
+  check_err_log
+  print_result
+  exit_with_code
+}
+
+# common setup
+setup() {
+  setup_vault
+  build_logstash
+  trap clean_up_and_get_result INT TERM EXIT
+}
diff --git a/ci/serverless/config/logstash.yml b/ci/serverless/config/logstash.yml
new file mode 100644
index 000000000..0e6fe3027
--- /dev/null
+++ b/ci/serverless/config/logstash.yml
@@ -0,0 +1,4 @@
+xpack.management.enabled: true
+xpack.management.pipeline.id: ["gen_es"]
+xpack.management.elasticsearch.api_key: ${CPM_API_KEY}
+xpack.management.elasticsearch.hosts: ["${ES_ENDPOINT}"]
\ No newline at end of file
diff --git a/ci/serverless/cpm_tests.sh b/ci/serverless/cpm_tests.sh
new file mode 100755
index 000000000..14d2338bd
--- /dev/null
+++ b/ci/serverless/cpm_tests.sh
@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+set -ex
+
+source ./$(dirname "$0")/common.sh
+
+export PIPELINE_NAME='gen_es'
+
+# update pipeline and check response code
+index_pipeline() {
+  RESP_CODE=$(curl -s -w "%{http_code}" -X PUT -H "Authorization: ApiKey $TESTER_API_KEY_ENCODED" "$ES_ENDPOINT/_logstash/pipeline/$1" \
+                   -H 'x-elastic-product-origin: logstash' -H 'Content-Type: application/json' -d "$2")
+  if [[ $RESP_CODE -ge '400' ]]; then
+    echo "failed to update pipeline for Central Pipeline Management. Got $RESP_CODE from Elasticsearch"
+    exit 1
+  fi
+}
+
+# index pipeline to serverless ES
+index_cpm_pipelines() {
+  index_pipeline "$PIPELINE_NAME" '{
+    "pipeline": "input { generator { count => 100 } } output { elasticsearch { hosts => \"${ES_ENDPOINT}\" api_key => \"${PLUGIN_API_KEY}\" index=> \"${INDEX_NAME}\" } }",
+    "last_modified": "2023-07-04T22:22:22.222Z",
+    "pipeline_metadata": { "version": "1"},
+    "username": "log.stash",
+    "pipeline_settings": {"pipeline.batch.delay": "50"}
+  }'
+}
+
+check_es_output() {
+  check_logstash_api '.pipelines.gen_es.plugins.outputs[0].documents.successes' '100'
+}
+
+check_plugin() {
+  add_check check_es_output "Failed central pipeline management check."
+}
+
+delete_pipeline() {
+  curl -H "Authorization: ApiKey $TESTER_API_KEY_ENCODED" -H 'x-elastic-product-origin: logstash' -X DELETE "$ES_ENDPOINT/_logstash/pipeline/$PIPELINE_NAME"  -H 'Content-Type: application/json';
+}
+
+cpm_clean_up_and_get_result() {
+  delete_pipeline
+  clean_up_and_get_result
+}
+
+setup
+trap cpm_clean_up_and_get_result INT TERM EXIT
+index_cpm_pipelines
+run_cpm_logstash check_plugin
diff --git a/ci/serverless/dlq_rspec_tests.sh b/ci/serverless/dlq_rspec_tests.sh
new file mode 100755
index 000000000..54aa9c415
--- /dev/null
+++ b/ci/serverless/dlq_rspec_tests.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -ex
+
+source ./$(dirname "$0")/common.sh
+
+export JRUBY_OPTS="-J-Xmx1g"
+export SERVERLESS=true
+setup_vault
+
+./gradlew clean bootstrap assemble installDefaultGems unpackTarDistribution
+./gradlew :logstash-core:copyGemjar
+
+export GEM_PATH=vendor/bundle/jruby/3.1.0
+export GEM_HOME=vendor/bundle/jruby/3.1.0
+
+vendor/jruby/bin/jruby -S bundle install --with development
+
+vendor/jruby/bin/jruby -S bundle exec rspec -fd qa/integration/specs/dlq_spec.rb -e "using pipelines.yml"
diff --git a/ci/serverless/elastic_integration_filter_tests.sh b/ci/serverless/elastic_integration_filter_tests.sh
new file mode 100755
index 000000000..dbd3ab25f
--- /dev/null
+++ b/ci/serverless/elastic_integration_filter_tests.sh
@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+set -ex
+
+source ./$(dirname "$0")/common.sh
+
+deploy_ingest_pipeline() {
+  PIPELINE_RESP_CODE=$(curl -s -w "%{http_code}" -o /dev/null -X PUT -H "Authorization: ApiKey $TESTER_API_KEY_ENCODED" "$ES_ENDPOINT/_ingest/pipeline/integration-logstash_test.events-default" \
+    -H 'Content-Type: application/json' \
+    -H 'x-elastic-product-origin: logstash' \
+    --data-binary @"$CURRENT_DIR/test_data/ingest_pipeline.json")
+
+  TEMPLATE_RESP_CODE=$(curl -s -w "%{http_code}" -o /dev/null -X PUT -H "Authorization: ApiKey $TESTER_API_KEY_ENCODED" "$ES_ENDPOINT/_index_template/logs-serverless-default-template" \
+    -H 'Content-Type: application/json' \
+    -H 'x-elastic-product-origin: logstash' \
+    --data-binary @"$CURRENT_DIR/test_data/index_template.json")
+
+  # ingest pipeline is likely be there from the last run
+  # failing to update pipeline does not stop the test
+  if [[ $PIPELINE_RESP_CODE -ge '400' ]]; then
+    ERR_MSGS+=("Failed to update ingest pipeline. Got $PIPELINE_RESP_CODE")
+  fi
+
+  if [[ $TEMPLATE_RESP_CODE -ge '400' ]]; then
+    ERR_MSGS+=("Failed to update index template. Got $TEMPLATE_RESP_CODE")
+  fi
+}
+
+# processor should append 'serverless' to message
+check_integration_filter() {
+  check_logstash_api '.pipelines.main.plugins.filters[] | select(.id == "mutate1") | .events.out' '1'
+}
+
+get_doc_msg_length() {
+  curl -s -H "Authorization: ApiKey $TESTER_API_KEY_ENCODED" "$ES_ENDPOINT/logs-$INDEX_NAME.004-default/_search?size=1" -H 'x-elastic-product-origin: logstash' | jq '.hits.hits[0]._source.message | length'
+}
+
+# ensure no double run of ingest pipeline
+# message = ['ok', 'serverless*']
+validate_ds_doc() {
+   [[ $(get_doc_msg_length) -eq "2" ]] && echo "0"
+}
+
+check_doc_no_duplication() {
+  count_down_check 20 validate_ds_doc
+}
+
+check_plugin() {
+  add_check check_integration_filter "Failed ingest pipeline processor check."
+  add_check check_doc_no_duplication "Failed ingest pipeline duplication check."
+}
+
+setup
+# install plugin
+"$CURRENT_DIR/../../bin/logstash-plugin" install logstash-filter-elastic_integration
+deploy_ingest_pipeline
+run_logstash "$CURRENT_DIR/pipeline/004_integration-filter.conf" check_plugin
diff --git a/ci/serverless/es_filter_tests.sh b/ci/serverless/es_filter_tests.sh
new file mode 100755
index 000000000..c86866a10
--- /dev/null
+++ b/ci/serverless/es_filter_tests.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+set -ex
+
+source ./$(dirname "$0")/common.sh
+
+check_es_filter() {
+  check_logstash_api '.pipelines.main.plugins.filters[] | select(.id == "ok") | .events.out' '1'
+}
+
+check_plugin() {
+  add_check check_es_filter "Failed es-filter check."
+}
+
+setup
+index_test_data
+run_logstash "$CURRENT_DIR/pipeline/002_es-filter.conf" check_plugin
diff --git a/ci/serverless/es_input_tests.sh b/ci/serverless/es_input_tests.sh
new file mode 100755
index 000000000..5924ebd9b
--- /dev/null
+++ b/ci/serverless/es_input_tests.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+set -ex
+
+source ./$(dirname "$0")/common.sh
+
+check_es_input() {
+  check_logstash_api '.pipelines.main.plugins.inputs[0].events.out' '1'
+}
+
+check_plugin() {
+  add_check check_es_input "Failed es-input check."
+}
+
+setup
+index_test_data
+run_logstash "$CURRENT_DIR/pipeline/003_es-input.conf" check_plugin
diff --git a/ci/serverless/es_output_tests.sh b/ci/serverless/es_output_tests.sh
new file mode 100755
index 000000000..788fb786a
--- /dev/null
+++ b/ci/serverless/es_output_tests.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+set -ex
+
+source ./$(dirname "$0")/common.sh
+
+
+check_named_index() {
+  check_logstash_api '.pipelines.main.plugins.outputs[] | select(.id == "named_index") | .documents.successes' '1'
+}
+
+get_data_stream_count() {
+  curl -s -H "Authorization: ApiKey $TESTER_API_KEY_ENCODED" -H 'x-elastic-product-origin: logstash' "$ES_ENDPOINT/logs-$INDEX_NAME.001-default/_count" | jq '.count // 0'
+}
+
+compare_data_stream_count() {
+  [[ $(get_data_stream_count) -gt "$INITIAL_DATA_STREAM_CNT" ]] && echo "0"
+}
+
+check_data_stream_output() {
+  count_down_check 20 compare_data_stream_count
+}
+
+check_plugin() {
+  add_check check_named_index "Failed index check."
+  add_check check_data_stream_output "Failed data stream check."
+}
+
+setup
+export INITIAL_DATA_STREAM_CNT=$(get_data_stream_count)
+run_logstash "$CURRENT_DIR/pipeline/001_es-output.conf" check_plugin
\ No newline at end of file
diff --git a/ci/serverless/kibana_api_tests.sh b/ci/serverless/kibana_api_tests.sh
new file mode 100755
index 000000000..86e6f6df0
--- /dev/null
+++ b/ci/serverless/kibana_api_tests.sh
@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+
+# This test is always fail because the APIs are not ready and return "method [...] exists but is not available with the current configuration"
+set -ex
+
+source ./$(dirname "$0")/common.sh
+
+export PIPELINE_NAME="stdin_stdout"
+export EXIT_CODE="0"
+
+create_pipeline() {
+    RESP_CODE=$(curl -s -w "%{http_code}" -o /dev/null -X PUT -H "Authorization: ApiKey $TESTER_API_KEY_ENCODED" "$KB_ENDPOINT/api/logstash/pipeline/$PIPELINE_NAME" \
+      -H 'Content-Type: application/json' -H 'kbn-xsrf: logstash' -H 'x-elastic-product-origin: logstash' \
+      --data-binary @"$CURRENT_DIR/test_data/$PIPELINE_NAME.json")
+
+    if [[ RESP_CODE -ge '400' ]]; then
+      EXIT_CODE=$(( EXIT_CODE + 1 ))
+      echo "Fail to create pipeline."
+    fi
+}
+
+get_pipeline() {
+    RESP_BODY=$(curl -s -X GET -H "Authorization: ApiKey $TESTER_API_KEY_ENCODED" -H 'x-elastic-product-origin: logstash' \
+    "$KB_ENDPOINT/api/logstash/pipeline/$PIPELINE_NAME") \
+    SOURCE_BODY=$(cat "$CURRENT_DIR/test_data/$PIPELINE_NAME.json")
+
+    RESP_PIPELINE_NAME=$(echo "$RESP_BODY" | jq -r '.id')
+
+    RESP_PIPELINE=$(echo "$RESP_BODY" | jq -r '.pipeline')
+    SOURCE_PIPELINE=$(echo "$SOURCE_BODY" | jq -r '.pipeline')
+
+    RESP_SETTING=$(echo "$RESP_BODY" | jq -r '.settings')
+    SOURCE_SETTING=$(echo "$SOURCE_BODY" | jq -r '.settings')
+
+
+    # compare strings contain curly brackets
+    if [[ ("$RESP_PIPELINE_NAME" -ne "$PIPELINE_NAME") || ("$RESP_PIPELINE" != "$SOURCE_PIPELINE") || ("$RESP_SETTING" != "$SOURCE_SETTING") ]]; then
+      EXIT_CODE=$(( EXIT_CODE + 1 ))
+      echo "Fail to get pipeline."
+    fi
+
+}
+
+list_pipeline() {
+    RESP_BODY=$(curl -s -X GET -H "Authorization: ApiKey $TESTER_API_KEY_ENCODED" -H 'x-elastic-product-origin: logstash' \
+    "$KB_ENDPOINT/api/logstash/pipelines" | jq --arg name "$PIPELINE_NAME" '.pipelines[] | select(.id==$name)' )
+    if [[ -z "$RESP_BODY" ]]; then
+      EXIT_CODE=$(( EXIT_CODE + 1 ))
+      echo "Fail to list pipeline."
+    fi
+}
+
+delete_pipeline() {
+    RESP_CODE=$(curl -s -w "%{http_code}" -o /dev/null -X DELETE -H "Authorization: ApiKey $TESTER_API_KEY_ENCODED" -H 'x-elastic-product-origin: logstash' \
+    "$KB_ENDPOINT/api/logstash/pipeline/$PIPELINE_NAME" \
+      -H 'Content-Type: application/json' -H 'kbn-xsrf: logstash' \
+      --data-binary @"$CURRENT_DIR/test_data/$PIPELINE_NAME.json")
+
+    if [[ RESP_CODE -ge '400' ]]; then
+      EXIT_CODE=$(( EXIT_CODE + 1 ))
+      echo "Fail to delete pipeline."
+    fi
+}
+
+setup_vault
+
+create_pipeline
+get_pipeline
+list_pipeline
+delete_pipeline
+
+exit $EXIT_CODE
\ No newline at end of file
diff --git a/ci/serverless/metricbeat/metricbeat.yml b/ci/serverless/metricbeat/metricbeat.yml
new file mode 100644
index 000000000..1d4cf1cf7
--- /dev/null
+++ b/ci/serverless/metricbeat/metricbeat.yml
@@ -0,0 +1,19 @@
+metricbeat.config:
+  modules:
+    path: ${path.config}/modules.d/*.yml
+    reload.enabled: false
+
+output.elasticsearch:
+  hosts: ["${ES_ENDPOINT}"]
+  protocol: "https"
+  api_key: "${MB_API_KEY}"
+
+metricbeat.modules:
+  - module: logstash
+    metricsets:
+      - node
+      - node_stats
+    period: 10s
+    hosts:
+        - localhost:9600
+    xpack.enabled: true
\ No newline at end of file
diff --git a/ci/serverless/metricbeat_monitoring_tests.sh b/ci/serverless/metricbeat_monitoring_tests.sh
new file mode 100755
index 000000000..ce3e47dc7
--- /dev/null
+++ b/ci/serverless/metricbeat_monitoring_tests.sh
@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+set -ex
+
+source ./$(dirname "$0")/common.sh
+
+get_cpu_arch() {
+  local arch=$(uname -m)
+
+  if [ "$arch" == "arm64" ]; then
+    echo "aarch64"
+  else
+    echo "$arch"
+  fi
+}
+
+export INDEX_NAME=".monitoring-logstash-8-mb"
+export OS=$(uname -s | tr '[:upper:]' '[:lower:]')
+export ARCH=$(get_cpu_arch)
+export BEATS_VERSION=$(curl -s "https://api.github.com/repos/elastic/beats/tags" | jq -r '.[0].name' | cut -c 2-)
+
+start_metricbeat() {
+  cd "$CURRENT_DIR"
+
+  MB_FILENAME="metricbeat-$BEATS_VERSION-$OS-$ARCH"
+  MB_DL_URL="https://artifacts.elastic.co/downloads/beats/metricbeat/$MB_FILENAME.tar.gz"
+
+  if [[ ! -d "$MB_FILENAME" ]]; then
+      curl -o "$MB_FILENAME.tar.gz" "$MB_DL_URL"
+      tar -zxf "$MB_FILENAME.tar.gz"
+  fi
+
+  chmod go-w "metricbeat/metricbeat.yml"
+  "$MB_FILENAME/metricbeat" -c "metricbeat/metricbeat.yml" &
+  export MB_PID=$!
+  cd -
+}
+
+stop_metricbeat() {
+   [[ -n "$MB_PID" ]] && kill "$MB_PID" || true
+}
+
+get_monitor_count() {
+  curl -s -H "Authorization: ApiKey $TESTER_API_KEY_ENCODED" -H 'x-elastic-product-origin: logstash'  "$ES_ENDPOINT/$INDEX_NAME/_count" | jq '.count // 0'
+}
+
+compare_monitor_count() {
+  [[ $(get_monitor_count) -gt "$INITIAL_MONITOR_CNT" ]] && echo "0"
+}
+
+check_monitor_output() {
+  count_down_check 60 compare_monitor_count
+}
+
+check_plugin() {
+  add_check check_monitor_output "Failed metricbeat monitor check."
+}
+
+metricbeat_clean_up() {
+  exit_code=$?
+  ERR_MSGS+=("Unknown error!")
+  CHECKS+=("$exit_code")
+
+  stop_metricbeat
+
+  clean_up_and_get_result
+}
+
+setup
+trap metricbeat_clean_up INT TERM EXIT
+export INITIAL_MONITOR_CNT=$(get_monitor_count)
+
+start_metricbeat
+run_logstash "$CURRENT_DIR/pipeline/005_uptime.conf" check_plugin
diff --git a/ci/serverless/monitoring_tests.sh b/ci/serverless/monitoring_tests.sh
new file mode 100755
index 000000000..431fc5f2d
--- /dev/null
+++ b/ci/serverless/monitoring_tests.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+# Legacy monitoring is disabled. Serverless does not support /_monitoring/bulk, hence this test always fails to ingest metrics.
+set -ex
+
+source ./$(dirname "$0")/common.sh
+
+get_monitor_count() {
+  curl -s -H "Authorization: ApiKey $LS_ROLE_API_KEY_ENCODED" -H 'x-elastic-product-origin: logstash' "$ES_ENDPOINT/.monitoring-logstash-7-*/_count" | jq '.count'
+}
+
+compare_monitor_count() {
+   [[ $(get_monitor_count) -gt "$INITIAL_MONITOR_CNT" ]] && echo "0"
+}
+
+check_monitor() {
+  count_down_check 20 compare_monitor_count
+}
+
+check() {
+  add_check check_monitor "Failed monitor check."
+}
+
+setup
+export INITIAL_MONITOR_CNT=$(get_monitor_count)
+run_cpm_logstash check
diff --git a/ci/serverless/pipeline/001_es-output.conf b/ci/serverless/pipeline/001_es-output.conf
new file mode 100644
index 000000000..be38f9763
--- /dev/null
+++ b/ci/serverless/pipeline/001_es-output.conf
@@ -0,0 +1,25 @@
+input {
+    heartbeat {
+        interval => 1
+        add_field => {
+            "[data_stream][type]" => "logs"
+            "[data_stream][dataset]" => "${INDEX_NAME}.001"
+            "[data_stream][namespace]" => "default"
+        }
+    }
+}
+
+output {
+    elasticsearch {
+        id => "named_index"
+        hosts => ["${ES_ENDPOINT}"]
+        api_key => "${PLUGIN_API_KEY}"
+        index => "${INDEX_NAME}"
+    }
+
+    elasticsearch {
+        id => "data_stream"
+        hosts => ["${ES_ENDPOINT}"]
+        api_key => "${PLUGIN_API_KEY}"
+    }
+}
\ No newline at end of file
diff --git a/ci/serverless/pipeline/002_es-filter.conf b/ci/serverless/pipeline/002_es-filter.conf
new file mode 100644
index 000000000..f26756aeb
--- /dev/null
+++ b/ci/serverless/pipeline/002_es-filter.conf
@@ -0,0 +1,25 @@
+input {
+    heartbeat {
+        interval => 1
+    }
+}
+
+filter {
+    elasticsearch {
+        hosts => ["${ES_ENDPOINT}"]
+        api_key => "${PLUGIN_API_KEY}"
+        index => "${INDEX_NAME}"
+        query => "*"
+        add_field => {"check" => "good"}
+    }
+
+    if [check] == "good" {
+        mutate { id => "ok" }
+    }
+}
+
+output {
+    stdout {
+        codec => dots
+    }
+}
\ No newline at end of file
diff --git a/ci/serverless/pipeline/003_es-input.conf b/ci/serverless/pipeline/003_es-input.conf
new file mode 100644
index 000000000..5707dfe36
--- /dev/null
+++ b/ci/serverless/pipeline/003_es-input.conf
@@ -0,0 +1,14 @@
+input {
+  elasticsearch {
+    hosts => ["${ES_ENDPOINT}"]
+    api_key => "${PLUGIN_API_KEY}"
+    index => "${INDEX_NAME}"
+    size => 100
+    schedule => "*/10 * * * * *"
+  }
+}
+output {
+    stdout {
+        codec => dots
+    }
+}
\ No newline at end of file
diff --git a/ci/serverless/pipeline/004_integration-filter.conf b/ci/serverless/pipeline/004_integration-filter.conf
new file mode 100644
index 000000000..614bc6856
--- /dev/null
+++ b/ci/serverless/pipeline/004_integration-filter.conf
@@ -0,0 +1,33 @@
+input {
+    heartbeat {
+        interval => 1
+        add_field => {
+            "[data_stream][type]" => "logs"
+            "[data_stream][dataset]" => "${INDEX_NAME}.004"
+            "[data_stream][namespace]" => "default"
+        }
+    }
+}
+filter {
+    elastic_integration {
+        hosts => "${ES_ENDPOINT}"
+        api_key => "${INTEGRATION_API_KEY_ENCODED}"
+        remove_field => ["_version"]
+        add_field => {"ingested" => "ok"}
+    }
+
+    if ([ingested] == "ok") and ([message][1] =~ 'serverless' ) {
+        mutate { id => "mutate1" }
+    }
+}
+output {
+    stdout {
+        codec => dots
+    }
+
+    elasticsearch {
+        id => "data_stream"
+        hosts => ["${ES_ENDPOINT}"]
+        api_key => "${PLUGIN_API_KEY}"
+    }
+}
\ No newline at end of file
diff --git a/ci/serverless/pipeline/005_uptime.conf b/ci/serverless/pipeline/005_uptime.conf
new file mode 100644
index 000000000..b0a181281
--- /dev/null
+++ b/ci/serverless/pipeline/005_uptime.conf
@@ -0,0 +1,8 @@
+input {
+    exec { command => 'uptime' interval => 10 }
+}
+output {
+    stdout {
+        codec => dots
+    }
+}
\ No newline at end of file
diff --git a/ci/serverless/test_data/book.json b/ci/serverless/test_data/book.json
new file mode 100644
index 000000000..870054fa7
--- /dev/null
+++ b/ci/serverless/test_data/book.json
@@ -0,0 +1,14 @@
+{"index": {}}
+{"book_name": "The Great Gatsby", "author": "F. Scott Fitzgerald", "@timestamp": "1925-04-10T00:00:00"}
+{"index": {}}
+{"book_name": "To Kill a Mockingbird", "author": "Harper Lee", "@timestamp": "1960-07-11T00:00:00"}
+{"index": {}}
+{"book_name": "1984", "author": "George Orwell", "@timestamp": "1949-06-08T00:00:00"}
+{"index": {}}
+{"book_name": "Pride and Prejudice", "author": "Jane Austen", "@timestamp": "1813-01-28T00:00:00"}
+{"index": {}}
+{"book_name": "The Catcher in the Rye", "author": "J.D. Salinger", "@timestamp": "1951-07-16T00:00:00"}
+{"index": {}}
+{"book_name": "Moby Dick", "author": "Herman Melville", "@timestamp": "1851-10-18T00:00:00"}
+{"index": {}}
+{"book_name": "The Lord of the Rings", "author": "J.R.R. Tolkien", "@timestamp": "1954-07-29T00:00:00"}
diff --git a/ci/serverless/test_data/index_template.json b/ci/serverless/test_data/index_template.json
new file mode 100644
index 000000000..7f3959e3f
--- /dev/null
+++ b/ci/serverless/test_data/index_template.json
@@ -0,0 +1,10 @@
+{
+  "index_patterns": ["logs-serverless*"],
+  "data_stream": { },
+  "priority": 500,
+  "template": {
+    "settings": {
+      "index.default_pipeline": "integration-logstash_test.events-default"
+    }
+  }
+}
\ No newline at end of file
diff --git a/ci/serverless/test_data/ingest_pipeline.json b/ci/serverless/test_data/ingest_pipeline.json
new file mode 100644
index 000000000..a192b5c53
--- /dev/null
+++ b/ci/serverless/test_data/ingest_pipeline.json
@@ -0,0 +1,10 @@
+{
+  "processors": [
+    {
+      "append": {
+        "field": "message",
+        "value": ["serverless test ^_^ "]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/ci/serverless/test_data/stdin_stdout.json b/ci/serverless/test_data/stdin_stdout.json
new file mode 100644
index 000000000..d6e7acfb3
--- /dev/null
+++ b/ci/serverless/test_data/stdin_stdout.json
@@ -0,0 +1,6 @@
+{
+  "pipeline": "input { stdin {} } output { stdout {} }",
+  "settings": {
+    "queue.type": "persisted"
+  }
+}
\ No newline at end of file
diff --git a/ci/test_plugins.rb b/ci/test_plugins.rb
new file mode 100644
index 000000000..d4d87c079
--- /dev/null
+++ b/ci/test_plugins.rb
@@ -0,0 +1,379 @@
+# encoding: utf-8
+
+# Test the
+# - build (rspec unit testing),
+# - packaging (gem build)
+# - and deploy (bin/logstash-plugin install)
+# of a plugins inside the current Logstash, using its JRuby
+# Usage example:
+# bin/ruby ci/test_supported_plugins.rb -p logstash-integration-jdbc
+# bin/ruby ci/test_supported_plugins.rb -t tier1 -k input,codec,integration
+# bin/ruby ci/test_supported_plugins.rb -t tier1 -k input,codec,integration --split 1/3
+#
+# The script uses OS's temp folder unless the environment variable LOGSTASH_PLUGINS_TMP is specified.
+# The path of such variable should be absolute.
+
+require "open3"
+require "set"
+require 'optparse'
+require 'rake'
+
+ENV['LOGSTASH_PATH'] = File.expand_path('..', __dir__)
+ENV['LOGSTASH_SOURCE'] = '1'
+
+logstash_plugin_cli = ENV['LOGSTASH_PATH'] + "/bin/logstash-plugin"
+
+# it has to be out of logstash local close else plugins' Gradle script
+# would interfere with Logstash's one
+base_folder = ENV['LOGSTASH_PLUGINS_TMP'] || (require 'tmpdir'; Dir.tmpdir)
+puts "Using #{base_folder} as temporary clone folder"
+plugins_folder = File.join(base_folder, "plugin_clones")
+unless File.directory?(plugins_folder)
+  Dir.mkdir(plugins_folder)
+end
+
+class Plugin
+  attr_reader :plugins_folder, :plugin_name, :plugin_base_folder, :plugin_repository
+
+  # params:
+  #    plugin_definition
+  def initialize(plugins_folder, plugin_definition)
+    @plugin_name = plugin_definition.name
+    @plugins_folder = plugins_folder
+    @plugin_base_folder = "#{plugins_folder}/#{plugin_name}"
+    plugin_org = plugin_definition.organization || 'logstash-plugins'
+    @plugin_repository = "git@github.com:#{plugin_org}/#{plugin_name}.git"
+  end
+
+  def git_retrieve
+    if File.directory?(plugin_name)
+      puts "test plugins(git_retrieve)>> #{plugin_name} already cloned locally, proceed with updating... (at #{Time.new})"
+      Dir.chdir(plugin_name) do
+        system("git restore -- .")
+        puts "Cleaning following files"
+        system("git clean -n ")
+        puts "Proceed with cleaning"
+        system("git clean -Xf")
+      end
+      puts "test plugins(git_retrieve)>> #{plugin_name} updated"
+      return
+    end
+
+    puts "test plugins(git_retrieve)>> #{plugin_name} local clone doesn't exist, cloning... (at #{Time.new})"
+
+    
+    unless system("git clone #{plugin_repository}")
+      puts "Can't clone #{plugin_repository}"
+      exit 1
+    end
+    puts "#{plugin_name} cloned"
+  end
+
+  # return true if successed
+  def execute_rspec
+    # setup JRUBY_OPTS env var to open access to expected modules
+    # the content is the same of the file https://github.com/logstash-plugins/.ci/blob/main/dockerjdk17.env
+    ENV['JRUBY_OPTS'] = "-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED -J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED -J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED -J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED -J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED -J--add-opens=java.base/java.security=ALL-UNNAMED -J--add-opens=java.base/java.io=ALL-UNNAMED -J--add-opens=java.base/java.nio.channels=ALL-UNNAMED -J--add-opens=java.base/sun.nio.ch=ALL-UNNAMED -J--add-opens=java.management/sun.management=ALL-UNNAMED -Xregexp.interruptible=true -Xcompile.invokedynamic=true -Xjit.threshold=0 -J-XX:+PrintCommandLineFlags -v -W1"
+    ENV['USER'] = "logstash"
+
+    puts "test plugins(execute_rspec)>> bundle install"
+    return false unless system("#{ENV['LOGSTASH_PATH']}/bin/ruby -S bundle install")
+
+    unit_test_folders = Dir.glob('spec/**/*')
+        .select {|f| File.directory? f}
+        .select{|f| not f.include?('integration')}
+        .select{|f| not f.include?('benchmark')}
+        .join(" ")
+
+    puts "test plugins(execute_rspec)>> rake vendor (at #{Time.new})"
+    return false unless system("#{ENV['LOGSTASH_PATH']}/bin/ruby -S bundle exec rake vendor")
+    
+    puts "test plugins(execute_rspec)>> exec rspec"
+    rspec_command = "#{ENV['LOGSTASH_PATH']}/bin/ruby -S bundle exec rspec #{unit_test_folders} --tag ~integration --tag ~secure_integration"
+    puts "\t\t executing: #{rspec_command}\n from #{Dir.pwd}"
+    stdout, stderr, status = Open3.capture3(rspec_command)
+    if status != 0
+      puts "Error executing rspec"
+      puts "Stderr ----------------------"
+      puts stderr
+      puts "Stdout ----------------------"
+      puts stdout
+      puts "OEFStdout--------------------"
+      return false
+    end
+    return true
+  end
+
+  # Return nil in case of error or the file name of the generated gem file
+  def build_gem
+    gem_command = "#{ENV['LOGSTASH_PATH']}/bin/ruby -S gem build #{plugin_name}.gemspec"
+    system(gem_command)
+
+    gem_name = Dir.glob("#{plugin_name}*.gem").first
+    unless gem_name
+      puts "**error** gem not generated for plugin #{plugin_name}"
+      return nil
+    end
+
+    gem_file = File.join(plugin_base_folder, gem_name)
+    puts "gem_file generated: #{gem_file}"
+    gem_file
+  end
+
+  def install_gem(gem_file)
+    logstash_plugin_cli = ENV['LOGSTASH_PATH'] + "/bin/logstash-plugin"
+    stdout, stderr, status = Open3.capture3("#{logstash_plugin_cli} install #{gem_file}")
+    reg_exp = /Installing .*\nInstallation successful$/
+    if status != 0 && !reg_exp.match(stdout)
+      puts "Failed to install plugins:\n stdout:\n #{stdout} \nstderr:\n #{stderr}"
+      return false
+    else
+      puts "plugin #{plugin_name} successfully installed"
+      #system("#{logstash_plugin_cli} remove #{gem_name}")
+      return true
+    end
+  end
+end
+
+# reason could be a symbol, describing the phase that broke:
+# :unit_test, :gem_build, :gem_install
+FailureDetail = Struct.new(:plugin_name, :reason)
+
+# contains set of FailureDetail
+failed_plugins = [].to_set
+
+# Models plugin's metadata, organization is optional, if nil then it consider logstash-plugins as default.
+PluginDefinition = Struct.new(:name, :support, :type, :organization) do
+  def initialize(name, support, type, organization = "logstash-plugins")
+    super(name, support, type, organization)
+  end
+end
+PLUGIN_DEFINITIONS = [
+    PluginDefinition.new('logstash-input-azure_event_hubs', :tier1, :input),
+    PluginDefinition.new('logstash-input-beats', :tier1, :input),
+    PluginDefinition.new('logstash-input-elasticsearch', :tier1, :input),
+    PluginDefinition.new('logstash-input-file', :tier1, :input),
+    PluginDefinition.new('logstash-input-generator', :tier1, :input),
+    PluginDefinition.new('logstash-input-heartbeat', :tier1, :input),
+    PluginDefinition.new('logstash-input-http', :tier1, :input),
+    PluginDefinition.new('logstash-input-http_poller', :tier1, :input),
+    PluginDefinition.new('logstash-input-redis', :tier1, :input),
+    PluginDefinition.new('logstash-input-stdin', :tier1, :input),
+    PluginDefinition.new('logstash-input-syslog', :tier1, :input),
+    PluginDefinition.new('logstash-input-udp', :tier1, :input),
+    PluginDefinition.new('logstash-codec-avro', :tier1, :codec),
+    PluginDefinition.new('logstash-codec-cef', :tier1, :codec),
+    PluginDefinition.new('logstash-codec-es_bulk', :tier1, :codec),
+    PluginDefinition.new('logstash-codec-json', :tier1, :codec),
+    PluginDefinition.new('logstash-codec-json_lines', :tier1, :codec),
+    PluginDefinition.new('logstash-codec-line', :tier1, :codec),
+    PluginDefinition.new('logstash-codec-multiline', :tier1, :codec),
+    PluginDefinition.new('logstash-codec-plain', :tier1, :codec),
+    PluginDefinition.new('logstash-codec-rubydebug', :tier1, :codec),
+    PluginDefinition.new('logstash-filter-cidr', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-clone', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-csv', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-date', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-dissect', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-dns', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-drop', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-elasticsearch', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-fingerprint', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-geoip', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-grok', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-http', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-json', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-kv', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-memcached', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-mutate', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-prune', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-ruby', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-sleep', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-split', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-syslog_pri', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-translate', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-truncate', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-urldecode', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-useragent', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-uuid', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-xml', :tier1, :filter),
+    PluginDefinition.new('logstash-filter-elastic_integration', :tier1, :filter, 'elastic'),
+    PluginDefinition.new('logstash-output-elasticsearch', :tier1, :output), 
+    PluginDefinition.new('logstash-output-email', :tier1, :output), 
+    PluginDefinition.new('logstash-output-file', :tier1, :output), 
+    PluginDefinition.new('logstash-output-http', :tier1, :output),
+    PluginDefinition.new('logstash-output-redis', :tier1, :output), 
+    PluginDefinition.new('logstash-output-stdout', :tier1, :output), 
+    PluginDefinition.new('logstash-output-tcp', :tier1, :output), 
+    PluginDefinition.new('logstash-output-udp', :tier1, :output),
+    PluginDefinition.new('logstash-integration-jdbc', :tier1, :integration),
+    PluginDefinition.new('logstash-integration-kafka', :tier1, :integration),
+    PluginDefinition.new('logstash-integration-rabbitmq', :tier1, :integration),
+    PluginDefinition.new('logstash-integration-elastic_enterprise_search', :tier1, :integration),
+    PluginDefinition.new('logstash-integration-aws', :tier1, :integration),
+    # tier2
+    # Removed because of https://github.com/logstash-plugins/logstash-input-couchdb_changes/issues/51
+    #PluginDefinition.new('logstash-input-couchdb_changes', :tier2, :input),
+    PluginDefinition.new('logstash-input-gelf', :tier2, :input),     
+    PluginDefinition.new('logstash-input-graphite', :tier2, :input), 
+    PluginDefinition.new('logstash-input-jms', :tier2, :input),      
+    PluginDefinition.new('logstash-input-snmp', :tier2, :input),     
+    PluginDefinition.new('logstash-input-sqs', :tier2, :input),      
+    PluginDefinition.new('logstash-input-twitter', :tier2, :input),   
+    PluginDefinition.new('logstash-codec-collectd', :tier2, :codec),
+    PluginDefinition.new('logstash-codec-dots', :tier2, :codec),
+    PluginDefinition.new('logstash-codec-fluent', :tier2, :codec),
+    PluginDefinition.new('logstash-codec-graphite', :tier2, :codec),
+    PluginDefinition.new('logstash-codec-msgpack', :tier2, :codec),
+    PluginDefinition.new('logstash-codec-netflow', :tier2, :codec),
+    PluginDefinition.new('logstash-filter-aggregate', :tier2, :filter),  
+    PluginDefinition.new('logstash-filter-de_dot', :tier2, :filter),  
+    PluginDefinition.new('logstash-filter-throttle', :tier2, :filter), 
+    PluginDefinition.new('logstash-output-csv', :tier2, :output),
+    PluginDefinition.new('logstash-output-graphite', :tier2, :output),
+    # unsupported
+    PluginDefinition.new('logstash-input-rss', :unsupported, :input),
+]
+
+def validate_options!(options)
+  raise "plugin and tiers or kinds can't be specified at the same time" if (options[:tiers] || options[:kinds]) && options[:plugin]
+
+  options[:tiers].map! { |v| v.to_sym } if options[:tiers]
+  options[:kinds].map! { |v| v.to_sym } if options[:kinds]
+
+  raise "Invalid tier name expected tier1, tier2 or unsupported" if options[:tiers] && !(options[:tiers] - [:tier1, :tier2, :unsupported]).empty?
+  raise "Invalid kind name expected input, codec, filter, output, integration" if options[:kinds] && !(options[:kinds] - [:input, :codec, :filter, :output, :integration]).empty?
+end
+
+# @param tiers array of labels
+# @param kinds array of labels
+def select_by_tiers_and_kinds(tiers, kinds)
+  PLUGIN_DEFINITIONS.select { |plugin| tiers.include?(plugin.support) }
+        .select { |plugin| kinds.include?(plugin.type) }
+end
+
+# Return of PluginDefinitions given a list of plugin names
+def list_plugins_definitions(plugins)
+  PLUGIN_DEFINITIONS.select { |plugin| plugins.include?(plugin.name) }
+end
+
+def select_plugins_by_opts(options)
+  if options[:plugins]
+    return list_plugins_definitions(options[:plugins])
+  end
+
+  selected_tiers = options.fetch(:tiers, [:tier1, :tier2, :unsupported])
+  selected_kinds = options.fetch(:kinds, [:input, :codec, :filter, :output, :integration])
+  selected_partition = options.fetch(:split, "1/1")
+
+  select_plugins = select_by_tiers_and_kinds(selected_tiers, selected_kinds)
+  return split_by_partition(select_plugins, selected_partition)
+end
+
+# Return the partition corresponding to the definition of the given list
+def split_by_partition(list, partition_definition)
+  slice = partition_definition.split('/')[0].to_i
+  num_slices = partition_definition.split('/')[1].to_i
+
+  slice_size = list.size / num_slices
+  slice_start = (slice - 1) * slice_size
+  slice_end = slice == num_slices ? -1 : slice * slice_size - 1
+  return list[slice_start..slice_end]
+end
+
+def snapshot_logstash_artifacts!
+  stdout, stderr, status = Open3.capture3("git add --force -- Gemfile Gemfile.lock vendor/bundle")
+  if status != 0
+    puts "Error snapshotting Logstash on path: #{Dir.pwd}"
+    puts stderr
+    exit 1
+  end
+end
+
+def cleanup_logstash_snapshot
+  system("git restore --staged -- Gemfile Gemfile.lock vendor/bundle")
+end
+
+def restore_logstash_from_snapshot
+  system("git restore -- Gemfile Gemfile.lock vendor/bundle")
+  system("git clean -Xf -- Gemfile Gemfile.lock vendor/bundle")
+end
+
+def setup_logstash_for_development
+  system("./gradlew installDevelopmentGems")
+end
+
+option_parser = OptionParser.new do |opts|
+  opts.on '-t', '--tiers tier1,tier2,unsupported', Array, 'Use to select which tier to test. If no provided mean "all"'
+  opts.on '-k', '--kinds input,codec,filter,output', Array, 'Use to select which kind of plugin to test. If no provided mean "all"'
+  opts.on '-p', '--plugins plugin1,plugin2', Array, 'Use to select a specific set of plugins, conflict with either -t and -k'
+  opts.on '-sPARTITION', '--split=PARTITION', String, 'Use to partition the set of plugins to execute, for example -s 1/3 means "execute the first third of the selected plugin list"'
+  opts.on '-h', '--halt', 'Halt immediately on first error'
+end
+options = {}
+option_parser.parse!(into: options)
+
+validate_options!(options)
+
+plugins = select_plugins_by_opts(options)
+
+puts "test plugins(start)>> start at #{Time.new}"
+
+setup_logstash_for_development
+
+# save to local git for test isolation
+snapshot_logstash_artifacts!
+
+plugins.each do |plugin_definition|
+  restore_logstash_from_snapshot
+
+  plugin_name = plugin_definition.name
+
+  status = Dir.chdir(plugins_folder) do
+    plugin = Plugin.new(plugins_folder, plugin_definition)
+    plugin.git_retrieve
+
+    status = Dir.chdir(plugin_name) do
+      unless plugin.execute_rspec
+        failed_plugins << FailureDetail.new(plugin_name, :unit_test)
+        break :error
+      end
+
+      # build the gem and install into Logstash
+      gem_file = plugin.build_gem
+      unless gem_file
+        #puts "inserted into failed, because no gem file exists"
+        failed_plugins << FailureDetail.new(plugin_name, :gem_build)
+        break :error
+      end
+
+      # install the plugin
+      unless plugin.install_gem(gem_file)
+        #puts "inserted into failed, because the gem can't be installed"
+        failed_plugins << FailureDetail.new(plugin_name, :gem_install)
+        break :error
+      end
+      :success
+    end
+    status
+  end
+  # any of the verification subtask terminated with error
+  if status == :error
+    # break looping on plugins if immediate halt
+    break if options[:halt]
+  end
+end
+
+# restore original git status to avoid to accidentally commit build artifacts
+cleanup_logstash_snapshot
+
+if !failed_plugins.empty?
+  puts "########################################"
+  puts " Failed plugins:"
+  puts "----------------------------------------"
+  failed_plugins.each {|failure| puts "- #{failure}"}
+  puts "########################################"
+  exit 1
+else
+  puts "NO ERROR ON PLUGINS!"
+end
diff --git a/ci/test_plugins.sh b/ci/test_plugins.sh
new file mode 100755
index 000000000..542bd5d66
--- /dev/null
+++ b/ci/test_plugins.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+export JRUBY_OPTS="-J-Xmx1g"
+export GRADLE_OPTS="-Xmx4g -Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info -Dfile.encoding=UTF-8"
+
+./gradlew assemble
+
+vendor/jruby/bin/jruby ci/test_plugins.rb $@
diff --git a/ci/unit_tests.bat b/ci/unit_tests.bat
deleted file mode 100644
index e1c1148a6..000000000
--- a/ci/unit_tests.bat
+++ /dev/null
@@ -1,48 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-if "%WORKSPACE%" == "" (
-  echo Error: environment variable WORKSPACE must be defined. Aborting..
-  exit /B 1
-)
-
-:: see if %WORKSPACE% is already mapped to a drive
-for /f "tokens=1* delims==> " %%G IN ('subst') do (
-  set sdrive=%%G
-  :: removing extra space
-  set sdrive=!sdrive:~0,2!
-  set spath=%%H
-
-  if /I "!spath!" == "%WORKSPACE%" (
-    set use_drive=!sdrive!
-    goto :found_drive
-  )
-)
-
-:: no existing mapping
-:: try to assign "%WORKSPACE%" to the first drive letter which works
-for %%i in (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z) do (
-    set "drive=%%i:"
-    subst !drive! "%WORKSPACE%" >nul
-    if not errorlevel 1 (
-        set use_drive=!drive!
-        goto :found_drive
-    )
-)
-
-echo Error: unable to subst drive to path %WORKSPACE%. Aborting...
-exit /B 1
-
-:found_drive
-echo Using drive !use_drive! for %WORKSPACE%
-
-:: change current directory to that drive
-!use_drive!
-
-echo Running core tests..
-call .\gradlew.bat test --console=plain --no-daemon --info
-
-if errorlevel 1 (
-  echo Error: failed to run core tests. Aborting..
-  exit /B 1
-)
diff --git a/ci/unit_tests.ps1 b/ci/unit_tests.ps1
new file mode 100644
index 000000000..b070c61ff
--- /dev/null
+++ b/ci/unit_tests.ps1
@@ -0,0 +1,106 @@
+<#
+.SYNOPSIS
+    This is a gradle wrapper script to help run the Logstash unit tests on Windows.
+
+.PARAMETER UnnamedArgument1
+    Optionally allows to specify a subset of tests.
+    Allows values are "ruby" or "java".
+    If unset, all tests are executed.
+
+.EXAMPLE
+    .\ci\unit_tests.ps1
+    Runs all unit tests.
+
+    .\ci\unit_tests.ps1 java
+    Runs only Java unit tests.
+#>
+
+$selectedTestSuite="all"
+
+if ($args.Count -eq 1) {
+    $selectedTestSuite=$args[0]
+}
+
+$startingPath = Get-Location
+
+## Map a drive letter to the current path to avoid path length issues
+
+# First, check if there is already a mapping
+$currentDir = $PWD.Path
+$substOutput = subst
+
+# Filter the subst output based on the path
+$matchedLines = $substOutput | Where-Object { $_ -like "*$currentDir*" }
+
+if ($matchedLines) {
+    # $currentDir seems to be already mapped to another drive letter; switch to this drive
+    # Extract the drive letter from the matched lines
+    $driveLetter = $matchedLines | ForEach-Object {
+        # Split the line by colon and extract the drive letter
+        ($_ -split ':')[0]
+    }
+    $drivePath = "$driveLetter`:"
+
+    Write-Output "$currentDir is already mapped to $drivePath."
+    Set-Location -Path $drivePath
+    Write-Output "Changing drive to $drivePath."
+}
+else {
+    # $currentDir isn't mapped to a drive letter, let's find a free drive letter and change to it
+
+    # Loop through drive letters A to Z; we don't use the 'A'..'Z' for BWC with Windows 2016 / Powershell < 7
+    for ($driveLetterAscii = 65; $driveLetterAscii -le 90; $driveLetterAscii++) {
+        $drivePath = [char]$driveLetterAscii + ":"
+
+        # check if the drive letter is available
+        if (-not (Test-Path $drivePath)) {
+            # found a free drive letter, create the virtual drive mapping and switch to it
+            subst $drivePath $currentDir
+
+            Write-Output "Mapped $currentDir to $drivePath"
+            Set-Location -Path $drivePath
+            Write-Output "Changing drive to $drivePath."
+            # exit the loop since we found a free drive letter
+            break
+        }
+    }
+}
+
+if (Test-Path Env:BUILD_JAVA_HOME) {    
+    if (Test-Path Env:GRADLE_OPTS) {    
+        $env:GRADLE_OPTS=$env:GRADLE_OPTS + " " + "-Dorg.gradle.java.home=" + $env:BUILD_JAVA_HOME
+    } else {
+        $env:GRADLE_OPTS="-Dorg.gradle.java.home=" + $env:BUILD_JAVA_HOME
+    }
+}
+
+$testOpts = "GRADLE_OPTS: $env:GRADLE_OPTS, BUILD_JAVA_HOME: $env:BUILD_JAVA_HOME"
+
+try {
+    if ($selectedTestSuite -eq "java") {
+        Write-Host "~~~ :java: Running Java tests via Gradle using $testOpts"
+        $CIScript = ".\gradlew.bat javaTests --console=plain --no-daemon --info"
+        Invoke-Expression $CIScript
+    }
+    elseif ($selectedTestSuite -eq "ruby") {
+        Write-Host "~~~ :ruby: Running Ruby tests via Gradle using $testOpts"
+        $CIScript = ".\gradlew.bat rubyTests --console=plain --no-daemon --info"
+        Invoke-Expression $CIScript
+    }
+    else {
+        Write-Host "~~~ Running all tests via Gradle using $testOpts"
+        $CIScript = ".\gradlew.bat test --console=plain --no-daemon --info"
+        Invoke-Expression $CIScript
+    }
+
+    if ($LASTEXITCODE -ne 0) {
+        throw "Test script $CIScript failed with a non-zero code: $LASTEXITCODE"
+    }
+} catch {
+    # tests failed
+    Write-Host "^^^ +++"
+    exit 1
+}
+
+# switch back to the path when the script started
+Set-Location -Path $startingPath
diff --git a/ci/unit_tests.sh b/ci/unit_tests.sh
index ae0ad5921..82a670b07 100755
--- a/ci/unit_tests.sh
+++ b/ci/unit_tests.sh
@@ -5,21 +5,32 @@
 # uses at least 1g of memory, If we don't do this we can get OOM issues when
 # installing gems. See https://github.com/elastic/logstash/issues/5179
 export JRUBY_OPTS="-J-Xmx1g"
-export GRADLE_OPTS="-Xmx2g -Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info -Dfile.encoding=UTF-8"
+export GRADLE_OPTS="-Xmx4g -Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info -Dfile.encoding=UTF-8"
 
 export SPEC_OPTS="--order rand --format documentation"
 export CI=true
-export OSS=true
 export TEST_DEBUG=true
+# don't rely on bash booleans for truth checks, since some CI platforms don't have a way to specify env vars as boolean
+export ENABLE_SONARQUBE=${ENABLE_SONARQUBE:-"true"}
+
+if [ -n "$BUILD_JAVA_HOME" ]; then
+  GRADLE_OPTS="$GRADLE_OPTS -Dorg.gradle.java.home=$BUILD_JAVA_HOME"
+fi
 
 SELECTED_TEST_SUITE=$1
 
+SONAR_ARGS=()
+if [[ $(echo $ENABLE_SONARQUBE | tr '[:lower:]' '[:upper:]') == "TRUE" ]]; then
+  SONAR_ARGS=("jacocoTestReport")
+  export COVERAGE=true
+fi
+
 if [[ $SELECTED_TEST_SUITE == $"java" ]]; then
   echo "Running Java Tests"
-  ./gradlew javaTests --console=plain
+  ./gradlew javaTests "${SONAR_ARGS[@]}" --console=plain --warning-mode all
 elif [[ $SELECTED_TEST_SUITE == $"ruby" ]]; then
   echo "Running Ruby unit tests"
-  ./gradlew rubyTests --console=plain
+  ./gradlew rubyTests --console=plain --warning-mode all
 else
   echo "Running Java and Ruby unit tests"
   ./gradlew test --console=plain
diff --git a/config/jvm.options b/config/jvm.options
index 401f7154b..084ff034b 100644
--- a/config/jvm.options
+++ b/config/jvm.options
@@ -16,10 +16,6 @@
 ##
 ################################################################
 
-## GC configuration
--XX:+UseConcMarkSweepGC
--XX:CMSInitiatingOccupancyFraction=75
--XX:+UseCMSInitiatingOccupancyOnly
 
 ## Locale
 # Set the locale language
@@ -34,7 +30,7 @@
 ## basic
 
 # set the I/O temp directory
-#-Djava.io.tmpdir=$HOME
+#-Djava.io.tmpdir=${HOME}
 
 # set to headless, just in case
 -Djava.awt.headless=true
@@ -47,8 +43,6 @@
 
 # Turn on JRuby invokedynamic
 -Djruby.compile.invokedynamic=true
-# Force Compilation
--Djruby.jit.threshold=0
 
 ## heap dumps
 
@@ -61,16 +55,28 @@
 #-XX:HeapDumpPath=${LOGSTASH_HOME}/heapdump.hprof
 
 ## GC logging
-#-XX:+PrintGCDetails
-#-XX:+PrintGCTimeStamps
-#-XX:+PrintGCDateStamps
-#-XX:+PrintClassHistogram
-#-XX:+PrintTenuringDistribution
-#-XX:+PrintGCApplicationStoppedTime
-
-# log GC status to a file with time stamps
-# ensure the directory exists
-#-Xloggc:${LS_GC_LOG_FILE}
+#-Xlog:gc*,gc+age=trace,safepoint:file=${LS_GC_LOG_FILE}:utctime,pid,tags:filecount=32,filesize=64m
 
 # Entropy source for randomness
 -Djava.security.egd=file:/dev/urandom
+
+# Copy the logging context from parent threads to children
+-Dlog4j2.isThreadContextMapInheritable=true
+
+# FasterXML/jackson defaults
+#
+# Sets the maximum string length (in chars or bytes, depending on input context).
+# This limit is not exact and an exception will happen at sizes greater than this limit.
+# Some text values that are a little bigger than the limit may be treated as valid but no
+# text values with sizes less than or equal to this limit will be treated as invalid.
+# This value should be higher than `logstash.jackson.stream-read-constraints.max-number-length`.
+# The jackson library defaults to 20000000 or 20MB, whereas Logstash defaults to 200MB or 200000000 characters.
+#-Dlogstash.jackson.stream-read-constraints.max-string-length=200000000
+#
+# Sets the maximum number length (in chars or bytes, depending on input context).
+# The jackson library defaults to 1000, whereas Logstash defaults to 10000.
+#-Dlogstash.jackson.stream-read-constraints.max-number-length=10000
+#
+# Sets the maximum nesting depth. The depth is a count of objects and arrays that have not
+# been closed, `{` and `[` respectively.
+#-Dlogstash.jackson.stream-read-constraints.max-nesting-depth=1000
\ No newline at end of file
diff --git a/config/log4j2.properties b/config/log4j2.properties
index a9eed0a3e..92acf87be 100644
--- a/config/log4j2.properties
+++ b/config/log4j2.properties
@@ -4,7 +4,7 @@ name = LogstashPropertiesConfig
 appender.console.type = Console
 appender.console.name = plain_console
 appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n
+appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n
 
 appender.json_console.type = Console
 appender.json_console.name = json_console
@@ -14,23 +14,30 @@ appender.json_console.layout.eventEol = true
 
 appender.rolling.type = RollingFile
 appender.rolling.name = plain_rolling
-appender.rolling.fileName = ${sys:ls.logs}/logstash-${sys:ls.log.format}.log
-appender.rolling.filePattern = ${sys:ls.logs}/logstash-${sys:ls.log.format}-%d{yyyy-MM-dd}-%i.log.gz
+appender.rolling.fileName = ${sys:ls.logs}/logstash-plain.log
+appender.rolling.filePattern = ${sys:ls.logs}/logstash-plain-%d{yyyy-MM-dd}-%i.log.gz
 appender.rolling.policies.type = Policies
 appender.rolling.policies.time.type = TimeBasedTriggeringPolicy
 appender.rolling.policies.time.interval = 1
 appender.rolling.policies.time.modulate = true
 appender.rolling.layout.type = PatternLayout
-appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %-.10000m%n
+appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n
 appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
 appender.rolling.policies.size.size = 100MB
 appender.rolling.strategy.type = DefaultRolloverStrategy
 appender.rolling.strategy.max = 30
+appender.rolling.strategy.action.type = Delete
+appender.rolling.strategy.action.basepath = ${sys:ls.logs}
+appender.rolling.strategy.action.condition.type = IfFileName
+appender.rolling.strategy.action.condition.glob = logstash-plain-*
+appender.rolling.strategy.action.condition.nested_condition.type = IfLastModified
+appender.rolling.strategy.action.condition.nested_condition.age = 7D
+appender.rolling.avoid_pipelined_filter.type = PipelineRoutingFilter
 
 appender.json_rolling.type = RollingFile
 appender.json_rolling.name = json_rolling
-appender.json_rolling.fileName = ${sys:ls.logs}/logstash-${sys:ls.log.format}.log
-appender.json_rolling.filePattern = ${sys:ls.logs}/logstash-${sys:ls.log.format}-%d{yyyy-MM-dd}-%i.log.gz
+appender.json_rolling.fileName = ${sys:ls.logs}/logstash-json.log
+appender.json_rolling.filePattern = ${sys:ls.logs}/logstash-json-%d{yyyy-MM-dd}-%i.log.gz
 appender.json_rolling.policies.type = Policies
 appender.json_rolling.policies.time.type = TimeBasedTriggeringPolicy
 appender.json_rolling.policies.time.interval = 1
@@ -42,10 +49,37 @@ appender.json_rolling.policies.size.type = SizeBasedTriggeringPolicy
 appender.json_rolling.policies.size.size = 100MB
 appender.json_rolling.strategy.type = DefaultRolloverStrategy
 appender.json_rolling.strategy.max = 30
+appender.json_rolling.strategy.action.type = Delete
+appender.json_rolling.strategy.action.basepath = ${sys:ls.logs}
+appender.json_rolling.strategy.action.condition.type = IfFileName
+appender.json_rolling.strategy.action.condition.glob = logstash-json-*
+appender.json_rolling.strategy.action.condition.nested_condition.type = IfLastModified
+appender.json_rolling.strategy.action.condition.nested_condition.age = 7D
+appender.json_rolling.avoid_pipelined_filter.type = PipelineRoutingFilter
+
+appender.routing.type = PipelineRouting
+appender.routing.name = pipeline_routing_appender
+appender.routing.pipeline.type = RollingFile
+appender.routing.pipeline.name = appender-${ctx:pipeline.id}
+appender.routing.pipeline.fileName = ${sys:ls.logs}/pipeline_${ctx:pipeline.id}.log
+appender.routing.pipeline.filePattern = ${sys:ls.logs}/pipeline_${ctx:pipeline.id}.%i.log.gz
+appender.routing.pipeline.layout.type = PatternLayout
+appender.routing.pipeline.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n
+appender.routing.pipeline.policy.type = SizeBasedTriggeringPolicy
+appender.routing.pipeline.policy.size = 100MB
+appender.routing.pipeline.strategy.type = DefaultRolloverStrategy
+appender.routing.pipeline.strategy.max = 30
+appender.routing.pipeline.strategy.action.type = Delete
+appender.routing.pipeline.strategy.action.basepath = ${sys:ls.logs}
+appender.routing.pipeline.strategy.action.condition.type = IfFileName
+appender.routing.pipeline.strategy.action.condition.glob = pipeline_${ctx:pipeline.id}*.log.gz
+appender.routing.pipeline.strategy.action.condition.nested_condition.type = IfLastModified
+appender.routing.pipeline.strategy.action.condition.nested_condition.age = 7D
 
 rootLogger.level = ${sys:ls.log.level}
 rootLogger.appenderRef.console.ref = ${sys:ls.log.format}_console
 rootLogger.appenderRef.rolling.ref = ${sys:ls.log.format}_rolling
+rootLogger.appenderRef.routing.ref = pipeline_routing_appender
 
 # Slowlog
 
@@ -62,14 +96,14 @@ appender.json_console_slowlog.layout.eventEol = true
 
 appender.rolling_slowlog.type = RollingFile
 appender.rolling_slowlog.name = plain_rolling_slowlog
-appender.rolling_slowlog.fileName = ${sys:ls.logs}/logstash-slowlog-${sys:ls.log.format}.log
-appender.rolling_slowlog.filePattern = ${sys:ls.logs}/logstash-slowlog-${sys:ls.log.format}-%d{yyyy-MM-dd}-%i.log.gz
+appender.rolling_slowlog.fileName = ${sys:ls.logs}/logstash-slowlog-plain.log
+appender.rolling_slowlog.filePattern = ${sys:ls.logs}/logstash-slowlog-plain-%d{yyyy-MM-dd}-%i.log.gz
 appender.rolling_slowlog.policies.type = Policies
 appender.rolling_slowlog.policies.time.type = TimeBasedTriggeringPolicy
 appender.rolling_slowlog.policies.time.interval = 1
 appender.rolling_slowlog.policies.time.modulate = true
 appender.rolling_slowlog.layout.type = PatternLayout
-appender.rolling_slowlog.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %.10000m%n
+appender.rolling_slowlog.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n
 appender.rolling_slowlog.policies.size.type = SizeBasedTriggeringPolicy
 appender.rolling_slowlog.policies.size.size = 100MB
 appender.rolling_slowlog.strategy.type = DefaultRolloverStrategy
@@ -77,8 +111,8 @@ appender.rolling_slowlog.strategy.max = 30
 
 appender.json_rolling_slowlog.type = RollingFile
 appender.json_rolling_slowlog.name = json_rolling_slowlog
-appender.json_rolling_slowlog.fileName = ${sys:ls.logs}/logstash-slowlog-${sys:ls.log.format}.log
-appender.json_rolling_slowlog.filePattern = ${sys:ls.logs}/logstash-slowlog-${sys:ls.log.format}-%d{yyyy-MM-dd}-%i.log.gz
+appender.json_rolling_slowlog.fileName = ${sys:ls.logs}/logstash-slowlog-json.log
+appender.json_rolling_slowlog.filePattern = ${sys:ls.logs}/logstash-slowlog-json-%d{yyyy-MM-dd}-%i.log.gz
 appender.json_rolling_slowlog.policies.type = Policies
 appender.json_rolling_slowlog.policies.time.type = TimeBasedTriggeringPolicy
 appender.json_rolling_slowlog.policies.time.interval = 1
@@ -99,3 +133,33 @@ logger.slowlog.additivity = false
 
 logger.licensereader.name = logstash.licensechecker.licensereader
 logger.licensereader.level = error
+
+# Silence http-client by default
+logger.apache_http_client.name = org.apache.http
+logger.apache_http_client.level = fatal
+
+# Deprecation log
+appender.deprecation_rolling.type = RollingFile
+appender.deprecation_rolling.name = deprecation_plain_rolling
+appender.deprecation_rolling.fileName = ${sys:ls.logs}/logstash-deprecation.log
+appender.deprecation_rolling.filePattern = ${sys:ls.logs}/logstash-deprecation-%d{yyyy-MM-dd}-%i.log.gz
+appender.deprecation_rolling.policies.type = Policies
+appender.deprecation_rolling.policies.time.type = TimeBasedTriggeringPolicy
+appender.deprecation_rolling.policies.time.interval = 1
+appender.deprecation_rolling.policies.time.modulate = true
+appender.deprecation_rolling.layout.type = PatternLayout
+appender.deprecation_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n
+appender.deprecation_rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.deprecation_rolling.policies.size.size = 100MB
+appender.deprecation_rolling.strategy.type = DefaultRolloverStrategy
+appender.deprecation_rolling.strategy.max = 30
+
+logger.deprecation.name = org.logstash.deprecation
+logger.deprecation.level = WARN
+logger.deprecation.appenderRef.deprecation_rolling.ref = deprecation_plain_rolling
+logger.deprecation.additivity = false
+
+logger.deprecation_root.name = deprecation
+logger.deprecation_root.level = WARN
+logger.deprecation_root.appenderRef.deprecation_rolling.ref = deprecation_plain_rolling
+logger.deprecation_root.additivity = false
diff --git a/config/logstash.yml b/config/logstash.yml
index db8ca3cd0..aeeabaf87 100644
--- a/config/logstash.yml
+++ b/config/logstash.yml
@@ -53,10 +53,33 @@
 # events in memory. By default, logstash will refuse to quit until all
 # received events have been pushed to the outputs.
 #
-# WARNING: enabling this can lead to data loss during shutdown
+# WARNING: Enabling this can lead to data loss during shutdown
 #
 # pipeline.unsafe_shutdown: false
 #
+# Set the pipeline event ordering. Options are "auto" (the default), "true" or "false".
+# "auto" automatically enables ordering if the 'pipeline.workers' setting
+# is also set to '1', and disables otherwise.
+# "true" enforces ordering on the pipeline and prevent logstash from starting
+# if there are multiple workers.
+# "false" disables any extra processing necessary for preserving ordering.
+#
+# pipeline.ordered: auto
+#
+# Sets the pipeline's default value for `ecs_compatibility`, a setting that is
+# available to plugins that implement an ECS Compatibility mode for use with
+# the Elastic Common Schema.
+# Possible values are:
+# - disabled
+# - v1
+# - v8 (default)
+# Pipelines defined before Logstash 8 operated without ECS in mind. To ensure a
+# migrated pipeline continues to operate as it did before your upgrade, opt-OUT
+# of ECS for the individual pipeline in its `pipelines.yml` definition. Setting
+# it here will set the default for _all_ pipelines, including new ones.
+#
+# pipeline.ecs_compatibility: v8
+#
 # ------------ Pipeline Configuration Settings --------------
 #
 # Where to fetch the pipeline configuration for the main pipeline
@@ -77,6 +100,9 @@
 # config.reload.automatic: false
 #
 # How often to check if the pipeline configuration has changed (in seconds)
+# Note that the unit value (s) is required. Values without a qualifier (e.g. 60)
+# are treated as nanoseconds.
+# Setting the interval this way is not recommended and might change in later versions.
 #
 # config.reload.interval: 3s
 #
@@ -90,37 +116,70 @@
 #
 # config.support_escapes: false
 #
-# ------------ Module Settings ---------------
-# Define modules here.  Modules definitions must be defined as an array.
-# The simple way to see this is to prepend each `name` with a `-`, and keep
-# all associated variables under the `name` they are associated with, and
-# above the next, like this:
+# ------------ API Settings -------------
+# Define settings related to the HTTP API here.
 #
-# modules:
-#   - name: MODULE_NAME
-#     var.PLUGINTYPE1.PLUGINNAME1.KEY1: VALUE
-#     var.PLUGINTYPE1.PLUGINNAME1.KEY2: VALUE
-#     var.PLUGINTYPE2.PLUGINNAME1.KEY1: VALUE
-#     var.PLUGINTYPE3.PLUGINNAME3.KEY1: VALUE
+# The HTTP API is enabled by default. It can be disabled, but features that rely
+# on it will not work as intended.
 #
-# Module variable names must be in the format of
+# api.enabled: true
 #
-# var.PLUGIN_TYPE.PLUGIN_NAME.KEY
+# By default, the HTTP API is not secured and is therefore bound to only the
+# host's loopback interface, ensuring that it is not accessible to the rest of
+# the network.
+# When secured with SSL and Basic Auth, the API is bound to _all_ interfaces
+# unless configured otherwise.
 #
-# modules:
+# api.http.host: 127.0.0.1
 #
-# ------------ Cloud Settings ---------------
-# Define Elastic Cloud settings here.
-# Format of cloud.id is a base64 value e.g. dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRub3RhcmVhbCRpZGVudGlmaWVy
-# and it may have an label prefix e.g. staging:dXMtZ...
-# This will overwrite 'var.elasticsearch.hosts' and 'var.kibana.host'
-# cloud.id: <identifier>
+# The HTTP API web server will listen on an available port from the given range.
+# Values can be specified as a single port (e.g., `9600`), or an inclusive range
+# of ports (e.g., `9600-9700`).
 #
-# Format of cloud.auth is: <user>:<pass>
-# This is optional
-# If supplied this will overwrite 'var.elasticsearch.username' and 'var.elasticsearch.password'
-# If supplied this will overwrite 'var.kibana.username' and 'var.kibana.password'
-# cloud.auth: elastic:<password>
+# api.http.port: 9600-9700
+#
+# The HTTP API includes a customizable "environment" value in its response,
+# which can be configured here.
+#
+# api.environment: "production"
+#
+# The HTTP API can be secured with SSL (TLS). To do so, you will need to provide
+# the path to a password-protected keystore in p12 or jks format, along with credentials.
+#
+# api.ssl.enabled: false
+# api.ssl.keystore.path: /path/to/keystore.jks
+# api.ssl.keystore.password: "y0uRp4$$w0rD"
+#
+# The availability of SSL/TLS protocols depends on the JVM version. Certain protocols are
+# disabled by default and need to be enabled manually by changing `jdk.tls.disabledAlgorithms`
+# in the $JDK_HOME/conf/security/java.security configuration file.
+#
+# api.ssl.supported_protocols: [TLSv1.2,TLSv1.3]
+#
+# The HTTP API can be configured to require authentication. Acceptable values are
+#  - `none`:  no auth is required (default)
+#  - `basic`: clients must authenticate with HTTP Basic auth, as configured
+#             with `api.auth.basic.*` options below
+# api.auth.type: none
+#
+# When configured with `api.auth.type` `basic`, you must provide the credentials
+# that requests will be validated against. Usage of Environment or Keystore
+# variable replacements is encouraged (such as the value `"${HTTP_PASS}"`, which
+# resolves to the value stored in the keystore's `HTTP_PASS` variable if present
+# or the same variable from the environment)
+#
+# api.auth.basic.username: "logstash-user"
+# api.auth.basic.password: "s3cUreP4$$w0rD"
+#
+# When setting `api.auth.basic.password`, the password should meet
+# the default password policy requirements.
+# The default password policy requires non-empty minimum 8 char string that
+# includes a digit, upper case letter and lower case letter.
+# Policy mode sets Logstash to WARN or ERROR when HTTP authentication password doesn't
+# meet the password policy requirements.
+# The default is WARN. Setting to ERROR enforces stronger passwords (recommended).
+#
+# api.auth.basic.password_policy.mode: WARN
 #
 # ------------ Queuing Settings --------------
 #
@@ -129,8 +188,9 @@
 #
 # queue.type: memory
 #
-# If using queue.type: persisted, the directory path where the data files will be stored.
-# Default is path.data/queue
+# If `queue.type: persisted`, the directory path where the pipeline data files will be stored.
+# Each pipeline will group its PQ files in a subdirectory matching its `pipeline.id`.
+# Default is path.data/queue.
 #
 # path.queue:
 #
@@ -178,22 +238,34 @@
 # Default is 1024mb
 # dead_letter_queue.max_bytes: 1024mb
 
+# If using dead_letter_queue.enable: true, the interval in milliseconds where if no further events eligible for the DLQ
+# have been created, a dead letter queue file will be written. A low value here will mean that more, smaller, queue files
+# may be written, while a larger value will introduce more latency between items being "written" to the dead letter queue, and
+# being available to be read by the dead_letter_queue input when items are written infrequently.
+# Default is 5000.
+#
+# dead_letter_queue.flush_interval: 5000
+
+# If using dead_letter_queue.enable: true, controls which entries should be dropped to avoid exceeding the size limit.
+# Set the value to `drop_newer` (default) to stop accepting new events that would push the DLQ size over the limit.
+# Set the value to `drop_older` to remove queue pages containing the oldest events to make space for new ones.
+#
+# dead_letter_queue.storage_policy: drop_newer
+
+# If using dead_letter_queue.enable: true, the interval that events have to be considered valid. After the interval has
+# expired the events could be automatically deleted from the DLQ.
+# The interval could be expressed in days, hours, minutes or seconds, using as postfix notation like 5d,
+# to represent a five days interval.
+# The available units are respectively d, h, m, s for day, hours, minutes and seconds.
+# If not specified then the DLQ doesn't use any age policy for cleaning events.
+#
+# dead_letter_queue.retain.age: 1d
+
 # If using dead_letter_queue.enable: true, the directory path where the data files will be stored.
 # Default is path.data/dead_letter_queue
 #
 # path.dead_letter_queue:
 #
-# ------------ Metrics Settings --------------
-#
-# Bind address for the metrics REST endpoint
-#
-# http.host: "127.0.0.1"
-#
-# Bind port for the metrics REST endpoint, this option also accept a range
-# (9600-9700) and logstash will pick up the first available ports.
-#
-# http.port: 9600-9700
-#
 # ------------ Debugging Settings --------------
 #
 # Options for log.level:
@@ -203,29 +275,60 @@
 #   * info (default)
 #   * debug
 #   * trace
-#
 # log.level: info
+#
+# Options for log.format:
+#   * plain (default)
+#   * json
+#
+# log.format: plain
+# log.format.json.fix_duplicate_message_fields: true
+#
 # path.logs:
 #
 # ------------ Other Settings --------------
 #
+# Allow or block running Logstash as superuser (default: true). Windows are excluded from the checking
+# allow_superuser: false
+#
 # Where to find custom plugins
 # path.plugins: []
 #
+# Flag to output log lines of each pipeline in its separate log file. Each log filename contains the pipeline.name
+# Default is false
+# pipeline.separate_logs: false
+#
+# Determine where to allocate memory buffers, for plugins that leverage them.
+# Defaults to heap,but can be switched to direct if you prefer using direct memory space instead.
+# pipeline.buffer.type: heap
+#
 # ------------ X-Pack Settings (not applicable for OSS build)--------------
 #
 # X-Pack Monitoring
 # https://www.elastic.co/guide/en/logstash/current/monitoring-logstash.html
+# Flag to allow the legacy internal monitoring (default: false)
+#xpack.monitoring.allow_legacy_collection: false
 #xpack.monitoring.enabled: false
 #xpack.monitoring.elasticsearch.username: logstash_system
 #xpack.monitoring.elasticsearch.password: password
+#xpack.monitoring.elasticsearch.proxy: ["http://proxy:port"]
 #xpack.monitoring.elasticsearch.hosts: ["https://es1:9200", "https://es2:9200"]
-#xpack.monitoring.elasticsearch.ssl.certificate_authority: [ "/path/to/ca.crt" ]
+# an alternative to hosts + username/password settings is to use cloud_id/cloud_auth
+#xpack.monitoring.elasticsearch.cloud_id: monitoring_cluster_id:xxxxxxxxxx
+#xpack.monitoring.elasticsearch.cloud_auth: logstash_system:password
+# another authentication alternative is to use an Elasticsearch API key
+#xpack.monitoring.elasticsearch.api_key: "id:api_key"
+#xpack.monitoring.elasticsearch.ssl.certificate_authority: "/path/to/ca.crt"
+#xpack.monitoring.elasticsearch.ssl.ca_trusted_fingerprint: xxxxxxxxxx
 #xpack.monitoring.elasticsearch.ssl.truststore.path: path/to/file
 #xpack.monitoring.elasticsearch.ssl.truststore.password: password
+# use either keystore.path/keystore.password or certificate/key configurations
 #xpack.monitoring.elasticsearch.ssl.keystore.path: /path/to/file
 #xpack.monitoring.elasticsearch.ssl.keystore.password: password
-#xpack.monitoring.elasticsearch.ssl.verification_mode: certificate
+#xpack.monitoring.elasticsearch.ssl.certificate: /path/to/file
+#xpack.monitoring.elasticsearch.ssl.key: /path/to/key
+#xpack.monitoring.elasticsearch.ssl.verification_mode: full
+#xpack.monitoring.elasticsearch.ssl.cipher_suites: []
 #xpack.monitoring.elasticsearch.sniffing: false
 #xpack.monitoring.collection.interval: 10s
 #xpack.monitoring.collection.pipeline.details.enabled: true
@@ -236,12 +339,28 @@
 #xpack.management.pipeline.id: ["main", "apache_logs"]
 #xpack.management.elasticsearch.username: logstash_admin_user
 #xpack.management.elasticsearch.password: password
+#xpack.management.elasticsearch.proxy: ["http://proxy:port"]
 #xpack.management.elasticsearch.hosts: ["https://es1:9200", "https://es2:9200"]
-#xpack.management.elasticsearch.ssl.certificate_authority: [ "/path/to/ca.crt" ]
+# an alternative to hosts + username/password settings is to use cloud_id/cloud_auth
+#xpack.management.elasticsearch.cloud_id: management_cluster_id:xxxxxxxxxx
+#xpack.management.elasticsearch.cloud_auth: logstash_admin_user:password
+# another authentication alternative is to use an Elasticsearch API key
+#xpack.management.elasticsearch.api_key: "id:api_key"
+#xpack.management.elasticsearch.ssl.ca_trusted_fingerprint: xxxxxxxxxx
+#xpack.management.elasticsearch.ssl.certificate_authority: "/path/to/ca.crt"
 #xpack.management.elasticsearch.ssl.truststore.path: /path/to/file
 #xpack.management.elasticsearch.ssl.truststore.password: password
+# use either keystore.path/keystore.password or certificate/key configurations
 #xpack.management.elasticsearch.ssl.keystore.path: /path/to/file
 #xpack.management.elasticsearch.ssl.keystore.password: password
-#xpack.management.elasticsearch.ssl.verification_mode: certificate
+#xpack.management.elasticsearch.ssl.certificate: /path/to/file
+#xpack.management.elasticsearch.ssl.key: /path/to/certificate_key_file
+#xpack.management.elasticsearch.ssl.cipher_suites: []
+#xpack.management.elasticsearch.ssl.verification_mode: full
 #xpack.management.elasticsearch.sniffing: false
 #xpack.management.logstash.poll_interval: 5s
+
+# X-Pack GeoIP Database Management
+# https://www.elastic.co/guide/en/logstash/current/plugins-filters-geoip.html#plugins-filters-geoip-manage_update
+#xpack.geoip.downloader.enabled: true
+#xpack.geoip.downloader.endpoint: "https://geoip.elastic.co/v1/database"
diff --git a/config/pipelines.yml b/config/pipelines.yml
index 5ea696462..ed52b38ed 100644
--- a/config/pipelines.yml
+++ b/config/pipelines.yml
@@ -35,6 +35,15 @@
 #   # before dispatching an undersized batch to filters+outputs
 #   pipeline.batch.delay: 50
 #
+#   Set the pipeline event ordering. Options are "auto" (the default), "true" # #   or "false".
+#   "auto" automatically enables ordering if the 'pipeline.workers' setting
+#   is also set to '1', and disables otherwise.
+#   "true" enforces ordering on a pipeline and prevents logstash from starting
+#   a pipeline with multiple workers allocated.
+#   "false" disable any extra processing necessary for preserving ordering.
+#
+#   pipeline.ordered: auto
+#
 #   # Internal queuing model, "memory" for legacy in-memory based queuing and
 #   # "persisted" for disk-based acked queueing. Defaults is memory
 #   queue.type: memory
@@ -70,6 +79,30 @@
 #   will be dropped if they would increase the size of the dead letter queue beyond this setting.
 #   Default is 1024mb
 #   dead_letter_queue.max_bytes: 1024mb
+#
+#   If using dead_letter_queue.enable: true, the interval in milliseconds where if no further events eligible for the DLQ
+#   have been created, a dead letter queue file will be written. A low value here will mean that more, smaller, queue files
+#   may be written, while a larger value will introduce more latency between items being "written" to the dead letter queue, and
+#   being available to be read by the dead_letter_queue input when items are are written infrequently.
+#   Default is 5000.
+#
+#   dead_letter_queue.flush_interval: 5000
+
+#   If using dead_letter_queue.enable: true, controls which entries should be dropped to avoid exceeding the size limit.
+#   Set the value to `drop_newer` (default) to stop accepting new events that would push the DLQ size over the limit.
+#   Set the value to `drop_older` to remove queue pages containing the oldest events to make space for new ones.
+#
+#   dead_letter_queue.storage_policy: drop_newer
+
+#   If using dead_letter_queue.enable: true, the interval that events have to be considered valid. After the interval has
+#   expired the events could be automatically deleted from the DLQ.
+#   The interval could be expressed in days, hours, minutes or seconds, using as postfix notation like 5d,
+#   to represent a five days interval.
+#   The available units are respectively d, h, m, s for day, hours, minutes and seconds.
+#   If not specified then the DLQ doesn't use any age policy for cleaning events.
+#
+#   dead_letter_queue.retain.age: 1d
+
 #
 #   If using dead_letter_queue.enable: true, the directory path where the data files will be stored.
 #   Default is path.data/dead_letter_queue
diff --git a/devtools/label b/devtools/label
new file mode 100755
index 000000000..d81dcb012
--- /dev/null
+++ b/devtools/label
@@ -0,0 +1,79 @@
+#!/usr/bin/env python3
+"""Cherry pick and backport a PR"""
+from __future__ import print_function
+
+from builtins import input
+import sys
+import os
+import argparse
+from os.path import expanduser
+import re
+from subprocess import check_call, call, check_output
+import requests
+import json
+
+usage = """
+    Example usage:
+        ./devtools/label <pr_number>
+"""
+
+
+def main():
+    """Main"""
+    parser = argparse.ArgumentParser(
+        description="Adds a label to a pull request",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog=usage)
+    parser.add_argument("pr_number",
+                        help="The PR number being merged (e.g. 2345)")
+    args = parser.parse_args()
+
+    print(args)
+
+    create_label(parser, args)
+
+def create_label(parser, args):
+    info("Checking if GitHub API token is available in `~/.elastic/github.token`")
+    token = get_github_token()
+
+    if not token:
+        info("GitHub API token not available.")
+    else:
+        # initialize github
+        session = github_session(token)
+        base = "https://api.github.com/repos/elastic/logstash"
+
+        # add labels
+        labels = []
+
+        # get the version (vX.Y.Z) we are merging to
+        version = get_version(os.getcwd())
+        if version:
+            labels.append(version)
+
+        session.post(
+            base + "/issues/{}/labels".format(args.pr_number), json=labels)
+
+def get_version(base_dir):
+    with open(os.path.join(base_dir, "versions.yml"), "r") as f:
+        for line in f:
+            if line.startswith('logstash:'):
+                return "v" + line.split(':')[-1].strip()
+
+def get_github_token():
+    try:
+        token = open(expanduser("~/.elastic/github.token"), "r").read().strip()
+    except:
+        token = False
+    return token
+
+def github_session(token):
+    session = requests.Session()
+    session.headers.update({"Authorization": "token " + token})
+    return session
+
+def info(msg):
+    print("\nINFO: {}".format(msg))
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/docker/LICENSE b/docker/LICENSE
new file mode 100644
index 000000000..8dada3eda
--- /dev/null
+++ b/docker/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/docker/Makefile b/docker/Makefile
new file mode 100644
index 000000000..5fd218b67
--- /dev/null
+++ b/docker/Makefile
@@ -0,0 +1,215 @@
+SHELL=/bin/bash
+ELASTIC_REGISTRY ?= docker.elastic.co
+
+# Determine the version to build.
+ELASTIC_VERSION ?= $(shell ../vendor/jruby/bin/jruby bin/elastic-version)
+
+ifdef STAGING_BUILD_NUM
+  VERSION_TAG := $(ELASTIC_VERSION)-$(STAGING_BUILD_NUM)
+else
+  VERSION_TAG := $(ELASTIC_VERSION)
+endif
+
+ifdef DOCKER_ARCHITECTURE
+  ARCHITECTURE := $(DOCKER_ARCHITECTURE)
+else
+  ARCHITECTURE := $(shell uname -m)
+  # For MacOS
+  ifeq ($(ARCHITECTURE), arm64)
+	ARCHITECTURE := aarch64
+  endif
+endif
+
+IMAGE_FLAVORS ?= oss full wolfi
+DEFAULT_IMAGE_FLAVOR ?= full
+
+IMAGE_TAG := $(ELASTIC_REGISTRY)/logstash/logstash
+HTTPD ?= logstash-docker-artifact-server
+
+all: build-from-local-artifacts build-from-local-oss-artifacts public-dockerfiles
+
+# Build from artifacts on the local filesystem, using an http server (running
+# in a container) to provide the artifacts to the Dockerfile.
+build-from-local-full-artifacts: dockerfile
+	docker run --rm -d --name=$(HTTPD) \
+	           -p 8000:8000 --expose=8000 -v $(ARTIFACTS_DIR):/mnt \
+	           python:3 bash -c 'cd /mnt && python3 -m http.server'
+	timeout 120 bash -c 'until curl -s localhost:8000 > /dev/null; do sleep 1; done'
+	docker build --progress=plain --network=host -t $(IMAGE_TAG)-full:$(VERSION_TAG) -f $(ARTIFACTS_DIR)/Dockerfile-full data/logstash || \
+	  (docker kill $(HTTPD); false); \
+	docker tag $(IMAGE_TAG)-full:$(VERSION_TAG) $(IMAGE_TAG):$(VERSION_TAG);
+	docker kill $(HTTPD)
+
+build-from-local-oss-artifacts: dockerfile
+	docker run --rm -d --name=$(HTTPD) \
+	           -p 8000:8000 --expose=8000 -v $(ARTIFACTS_DIR):/mnt \
+	           python:3 bash -c 'cd /mnt && python3 -m http.server'
+	timeout 120 bash -c 'until curl -s localhost:8000 > /dev/null; do sleep 1; done'
+	docker build --progress=plain --network=host -t $(IMAGE_TAG)-oss:$(VERSION_TAG) -f $(ARTIFACTS_DIR)/Dockerfile-oss data/logstash || \
+	  (docker kill $(HTTPD); false);
+	-docker kill $(HTTPD)
+
+build-from-local-wolfi-artifacts: dockerfile
+	docker run --rm -d --name=$(HTTPD) \
+	           -p 8000:8000 --expose=8000 -v $(ARTIFACTS_DIR):/mnt \
+	           python:3 bash -c 'cd /mnt && python3 -m http.server'
+	timeout 120 bash -c 'until curl -s localhost:8000 > /dev/null; do sleep 1; done'
+	docker build --progress=plain --network=host -t $(IMAGE_TAG)-wolfi:$(VERSION_TAG) -f $(ARTIFACTS_DIR)/Dockerfile-wolfi data/logstash || \
+	  (docker kill $(HTTPD); false);
+	-docker kill $(HTTPD)
+
+COPY_FILES := $(ARTIFACTS_DIR)/docker/config/pipelines.yml $(ARTIFACTS_DIR)/docker/config/logstash-oss.yml $(ARTIFACTS_DIR)/docker/config/logstash-full.yml
+COPY_FILES += $(ARTIFACTS_DIR)/docker/config/log4j2.file.properties $(ARTIFACTS_DIR)/docker/config/log4j2.properties
+COPY_FILES += $(ARTIFACTS_DIR)/docker/env2yaml/env2yaml.go $(ARTIFACTS_DIR)/docker/env2yaml/go.mod $(ARTIFACTS_DIR)/docker/env2yaml/go.sum
+COPY_FILES += $(ARTIFACTS_DIR)/docker/pipeline/default.conf $(ARTIFACTS_DIR)/docker/bin/docker-entrypoint
+
+$(ARTIFACTS_DIR)/docker/config/pipelines.yml: data/logstash/config/pipelines.yml
+$(ARTIFACTS_DIR)/docker/config/logstash-oss.yml: data/logstash/config/logstash-oss.yml
+$(ARTIFACTS_DIR)/docker/config/logstash-full.yml: data/logstash/config/logstash-full.yml
+$(ARTIFACTS_DIR)/docker/config/log4j2.file.properties: data/logstash/config/log4j2.file.properties
+$(ARTIFACTS_DIR)/docker/config/log4j2.properties: data/logstash/config/log4j2.properties
+$(ARTIFACTS_DIR)/docker/pipeline/default.conf: data/logstash/pipeline/default.conf
+$(ARTIFACTS_DIR)/docker/bin/docker-entrypoint: data/logstash/bin/docker-entrypoint
+$(ARTIFACTS_DIR)/docker/env2yaml/env2yaml.go: data/logstash/env2yaml/env2yaml.go
+$(ARTIFACTS_DIR)/docker/env2yaml/go.mod: data/logstash/env2yaml/go.mod
+$(ARTIFACTS_DIR)/docker/env2yaml/go.sum: data/logstash/env2yaml/go.sum
+
+$(ARTIFACTS_DIR)/docker/%:
+	cp -f $< $@
+
+docker_paths:
+	mkdir -p $(ARTIFACTS_DIR)/docker/
+	mkdir -p $(ARTIFACTS_DIR)/docker/bin
+	mkdir -p $(ARTIFACTS_DIR)/docker/config
+	mkdir -p $(ARTIFACTS_DIR)/docker/env2yaml
+	mkdir -p $(ARTIFACTS_DIR)/docker/pipeline
+
+COPY_IRONBANK_FILES := $(ARTIFACTS_DIR)/ironbank/scripts/config/pipelines.yml $(ARTIFACTS_DIR)/ironbank/scripts/config/logstash.yml
+COPY_IRONBANK_FILES += $(ARTIFACTS_DIR)/ironbank/scripts/config/log4j2.file.properties $(ARTIFACTS_DIR)/ironbank/scripts/config/log4j2.properties
+COPY_IRONBANK_FILES += $(ARTIFACTS_DIR)/ironbank/scripts/pipeline/default.conf $(ARTIFACTS_DIR)/ironbank/scripts/bin/docker-entrypoint $(ARTIFACTS_DIR)/ironbank/scripts/go/src/env2yaml/env2yaml.go
+COPY_IRONBANK_FILES += $(ARTIFACTS_DIR)/ironbank/scripts/go/src/env2yaml/go.mod $(ARTIFACTS_DIR)/ironbank/scripts/go/src/env2yaml/go.sum $(ARTIFACTS_DIR)/ironbank/scripts/go/src/env2yaml/vendor/modules.txt $(ARTIFACTS_DIR)/ironbank/LICENSE $(ARTIFACTS_DIR)/ironbank/README.md
+
+$(ARTIFACTS_DIR)/ironbank/scripts/config/pipelines.yml: data/logstash/config/pipelines.yml
+$(ARTIFACTS_DIR)/ironbank/scripts/config/logstash.yml: data/logstash/config/logstash-full.yml
+$(ARTIFACTS_DIR)/ironbank/scripts/config/log4j2.file.properties: data/logstash/config/log4j2.file.properties
+$(ARTIFACTS_DIR)/ironbank/scripts/config/log4j2.properties: data/logstash/config/log4j2.properties
+$(ARTIFACTS_DIR)/ironbank/scripts/pipeline/default.conf: data/logstash/pipeline/default.conf
+$(ARTIFACTS_DIR)/ironbank/scripts/bin/docker-entrypoint: data/logstash/bin/docker-entrypoint
+$(ARTIFACTS_DIR)/ironbank/scripts/go/src/env2yaml/env2yaml.go: data/logstash/env2yaml/env2yaml.go
+$(ARTIFACTS_DIR)/ironbank/scripts/go/src/env2yaml/go.mod: ironbank/go/src/env2yaml/go.mod
+$(ARTIFACTS_DIR)/ironbank/scripts/go/src/env2yaml/go.sum: ironbank/go/src/env2yaml/go.sum
+$(ARTIFACTS_DIR)/ironbank/scripts/go/src/env2yaml/vendor/modules.txt: ironbank/go/src/env2yaml/vendor/modules.txt
+$(ARTIFACTS_DIR)/ironbank/LICENSE: ironbank/LICENSE
+$(ARTIFACTS_DIR)/ironbank/README.md: ironbank/README.md
+
+$(ARTIFACTS_DIR)/ironbank/%:
+	cp -f $< $@
+
+ironbank_docker_paths:
+	mkdir -p $(ARTIFACTS_DIR)/ironbank/
+	mkdir -p $(ARTIFACTS_DIR)/ironbank/scripts
+	mkdir -p $(ARTIFACTS_DIR)/ironbank/scripts/bin
+	mkdir -p $(ARTIFACTS_DIR)/ironbank/scripts/config
+	mkdir -p $(ARTIFACTS_DIR)/ironbank/scripts/go/src/env2yaml/vendor
+	mkdir -p $(ARTIFACTS_DIR)/ironbank/scripts/pipeline
+
+public-dockerfiles: public-dockerfiles_oss public-dockerfiles_full public-dockerfiles_wolfi public-dockerfiles_ironbank
+
+public-dockerfiles_full: templates/Dockerfile.erb docker_paths $(COPY_FILES)
+	../vendor/jruby/bin/jruby -S erb -T "-"\
+		created_date="${BUILD_DATE}" \
+		elastic_version="${ELASTIC_VERSION}" \
+		arch="${ARCHITECTURE}" \
+		version_tag="${VERSION_TAG}" \
+	  release="${RELEASE}" \
+		image_flavor="full" \
+		local_artifacts="false" \
+		templates/Dockerfile.erb > "${ARTIFACTS_DIR}/Dockerfile-full" && \
+	cd $(ARTIFACTS_DIR)/docker && \
+	cp $(ARTIFACTS_DIR)/Dockerfile-full Dockerfile && \
+	tar -zcf ../logstash-$(VERSION_TAG)-docker-build-context.tar.gz Dockerfile bin config env2yaml pipeline
+
+build-from-dockerfiles_full: public-dockerfiles_full
+	cd $(ARTIFACTS_DIR)/docker && \
+	mkdir -p dockerfile_build_full && cd dockerfile_build_full && \
+	tar -zxf ../../logstash-$(VERSION_TAG)-docker-build-context.tar.gz && \
+	sed 's/artifacts/snapshots/g' Dockerfile > Dockerfile.tmp && mv Dockerfile.tmp Dockerfile && \
+	docker build --progress=plain --network=host -t $(IMAGE_TAG)-dockerfile-full:$(VERSION_TAG) .
+
+public-dockerfiles_oss: templates/Dockerfile.erb docker_paths $(COPY_FILES)
+	../vendor/jruby/bin/jruby -S erb -T "-"\
+		created_date="${BUILD_DATE}" \
+		elastic_version="${ELASTIC_VERSION}" \
+		arch="${ARCHITECTURE}" \
+		version_tag="${VERSION_TAG}" \
+	  release="${RELEASE}" \
+		image_flavor="oss" \
+		local_artifacts="false" \
+		templates/Dockerfile.erb > "${ARTIFACTS_DIR}/Dockerfile-oss" && \
+	cd $(ARTIFACTS_DIR)/docker && \
+	cp $(ARTIFACTS_DIR)/Dockerfile-oss Dockerfile && \
+	tar -zcf ../logstash-oss-$(VERSION_TAG)-docker-build-context.tar.gz Dockerfile bin config env2yaml pipeline
+
+build-from-dockerfiles_oss: public-dockerfiles_oss
+	cd $(ARTIFACTS_DIR)/docker && \
+	mkdir -p dockerfile_build_oss && cd dockerfile_build_oss && \
+	tar -zxf ../../logstash-$(VERSION_TAG)-docker-build-context.tar.gz && \
+	sed 's/artifacts/snapshots/g' Dockerfile > Dockerfile.tmp && mv Dockerfile.tmp Dockerfile && \
+	docker build --progress=plain --network=host -t $(IMAGE_TAG)-dockerfile-oss:$(VERSION_TAG) .
+
+public-dockerfiles_wolfi: templates/Dockerfile.erb docker_paths $(COPY_FILES)
+	../vendor/jruby/bin/jruby -S erb -T "-"\
+		created_date="${BUILD_DATE}" \
+		elastic_version="${ELASTIC_VERSION}" \
+		arch="${ARCHITECTURE}" \
+		version_tag="${VERSION_TAG}" \
+	  release="${RELEASE}" \
+		image_flavor="wolfi" \
+		local_artifacts="false" \
+		templates/Dockerfile.erb > "${ARTIFACTS_DIR}/Dockerfile-wolfi" && \
+	cd $(ARTIFACTS_DIR)/docker && \
+	cp $(ARTIFACTS_DIR)/Dockerfile-wolfi Dockerfile && \
+	tar -zcf ../logstash-wolfi-$(VERSION_TAG)-docker-build-context.tar.gz Dockerfile bin config env2yaml pipeline
+
+build-from-dockerfiles_wolfi: public-dockerfiles_wolfi
+	cd $(ARTIFACTS_DIR)/docker && \
+	mkdir -p dockerfile_build_wolfi && cd dockerfile_build_wolfi && \
+	tar -zxf ../../logstash-$(VERSION_TAG)-docker-build-context.tar.gz && \
+	sed 's/artifacts/snapshots/g' Dockerfile > Dockerfile.tmp && mv Dockerfile.tmp Dockerfile && \
+	docker build --progress=plain --network=host -t $(IMAGE_TAG)-dockerfile-wolfi:$(VERSION_TAG) .
+
+public-dockerfiles_ironbank: templates/hardening_manifest.yaml.erb templates/IronbankDockerfile.erb ironbank_docker_paths $(COPY_IRONBANK_FILES)
+	../vendor/jruby/bin/jruby -S erb -T "-"\
+	  elastic_version="${ELASTIC_VERSION}" \
+	  templates/hardening_manifest.yaml.erb > $(ARTIFACTS_DIR)/ironbank/hardening_manifest.yaml && \
+	../vendor/jruby/bin/jruby -S erb -T "-"\
+		created_date="${BUILD_DATE}" \
+		elastic_version="${ELASTIC_VERSION}" \
+		arch="${ARCHITECTURE}" \
+		version_tag="${VERSION_TAG}" \
+	  release="${RELEASE}" \
+		image_flavor="ironbank" \
+		local_artifacts="false" \
+		templates/IronbankDockerfile.erb > "${ARTIFACTS_DIR}/Dockerfile-ironbank" && \
+	cd $(ARTIFACTS_DIR)/ironbank && \
+	cp $(ARTIFACTS_DIR)/Dockerfile-ironbank Dockerfile && \
+	tar -zcf ../logstash-ironbank-$(VERSION_TAG)-docker-build-context.tar.gz scripts Dockerfile hardening_manifest.yaml LICENSE README.md
+
+# Generate the Dockerfiles from ERB templates.
+dockerfile: templates/Dockerfile.erb
+	$(foreach FLAVOR, $(IMAGE_FLAVORS), \
+		../vendor/jruby/bin/jruby -S erb -T "-"\
+			created_date="${BUILD_DATE}" \
+			elastic_version="${ELASTIC_VERSION}" \
+			arch="${ARCHITECTURE}" \
+			version_tag="${VERSION_TAG}" \
+			image_flavor="${FLAVOR}" \
+			local_artifacts="${LOCAL_ARTIFACTS}" \
+			templates/Dockerfile.erb > "${ARTIFACTS_DIR}/Dockerfile-${FLAVOR}" ; \
+	)
+
+clean:
+	rm -f ${ARTIFACTS_DIR}/env2yaml/env2yaml-* ${ARTIFACTS_DIR}/Dockerfile
+
+
+.PHONY: clean push
diff --git a/docker/README.md b/docker/README.md
new file mode 100644
index 000000000..96658e539
--- /dev/null
+++ b/docker/README.md
@@ -0,0 +1,34 @@
+## Description
+
+This repository contains the official [Logstash][logstash] Docker image from
+[Elastic][elastic].
+
+Documentation can be found on the [Elastic website](https://www.elastic.co/guide/en/logstash/current/docker.html).
+
+[logstash]: https://www.elastic.co/products/logstash
+[elastic]: https://www.elastic.co/
+
+## Supported Docker versions
+
+The images have been tested on Docker version 18.09.2, build 6247962
+
+## Requirements
+A full build requires:
+* Docker
+* GNU Make
+* Python 3.5 with Virtualenv
+* JRuby 9.1+
+
+## Running a build
+To build an image check out the corresponding branch for the version and run the rake task
+Like this:
+```
+git checkout 7.0
+rake artifact:docker
+# and for the OSS package
+rake artifact:docker_oss
+```
+
+This image is built on [Ubuntu 20.04][ubuntu-20.04].
+
+[ubuntu-20.04]: https://hub.docker.com/_/ubuntu/
diff --git a/docker/bin/elastic-version b/docker/bin/elastic-version
new file mode 100755
index 000000000..3352cec34
--- /dev/null
+++ b/docker/bin/elastic-version
@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+#
+# Print the Elastic Stack version for the current branch, as defined in
+# the 'version.json' file.
+#
+require 'yaml'
+
+def get_hard_coded_version
+  version_info = YAML::safe_load(IO.read('../versions.yml'))
+  version_info['logstash']
+end
+
+def qualify(version)
+  qualifier = ENV['VERSION_QUALIFIER']
+  qualifier.nil? || qualifier.empty? ? version : [version, qualifier].join("-")
+end
+
+def get_version
+  version = get_hard_coded_version()
+  version = qualify(version)
+  ENV["RELEASE"] == "1" ? version : [version, "SNAPSHOT"].join("-")
+end
+
+puts get_version
diff --git a/docker/data/logstash/bin/docker-entrypoint b/docker/data/logstash/bin/docker-entrypoint
new file mode 100755
index 000000000..e2fd33c29
--- /dev/null
+++ b/docker/data/logstash/bin/docker-entrypoint
@@ -0,0 +1,31 @@
+#!/bin/bash -e
+
+# Map environment variables to entries in logstash.yml.
+# Note that this will mutate logstash.yml in place if any such settings are found.
+# This may be undesirable, especially if logstash.yml is bind-mounted from the
+# host system.
+env2yaml /usr/share/logstash/config/logstash.yml
+
+if [[ -n "$LOG_STYLE" ]]; then
+  case "$LOG_STYLE" in
+    console)
+      # This is the default. Nothing to do.
+      ;;
+    file)
+      # Overwrite the default config with the stack config. Do this as a
+      # copy, not a move, in case the container is restarted.
+      cp -f /usr/share/logstash/config/log4j2.file.properties /usr/share/logstash/config/log4j2.properties
+      ;;
+    *)
+      echo "ERROR: LOG_STYLE set to [$LOG_STYLE]. Expected [console] or [file]" >&2
+      exit 1 ;;
+  esac
+fi
+
+export LS_JAVA_OPTS="-Dls.cgroup.cpuacct.path.override=/ -Dls.cgroup.cpu.path.override=/ $LS_JAVA_OPTS"
+
+if [[ -z $1 ]] || [[ ${1:0:1} == '-' ]] ; then
+  exec logstash "$@"
+else
+  exec "$@"
+fi
diff --git a/docker/data/logstash/config/log4j2.file.properties b/docker/data/logstash/config/log4j2.file.properties
new file mode 100644
index 000000000..234b23db4
--- /dev/null
+++ b/docker/data/logstash/config/log4j2.file.properties
@@ -0,0 +1,147 @@
+status = error
+name = LogstashPropertiesConfig
+
+appender.console.type = Console
+appender.console.name = plain_console
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n
+
+appender.json_console.type = Console
+appender.json_console.name = json_console
+appender.json_console.layout.type = JSONLayout
+appender.json_console.layout.compact = true
+appender.json_console.layout.eventEol = true
+
+appender.rolling.type = RollingFile
+appender.rolling.name = plain_rolling
+appender.rolling.fileName = ${sys:ls.logs}/logstash-plain.log
+appender.rolling.filePattern = ${sys:ls.logs}/logstash-plain-%d{yyyy-MM-dd}-%i.log.gz
+appender.rolling.policies.type = Policies
+appender.rolling.policies.time.type = TimeBasedTriggeringPolicy
+appender.rolling.policies.time.interval = 1
+appender.rolling.policies.time.modulate = true
+appender.rolling.layout.type = PatternLayout
+appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n
+appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.rolling.policies.size.size = 100MB
+appender.rolling.strategy.type = DefaultRolloverStrategy
+appender.rolling.strategy.max = 30
+appender.rolling.avoid_pipelined_filter.type = PipelineRoutingFilter
+
+appender.json_rolling.type = RollingFile
+appender.json_rolling.name = json_rolling
+appender.json_rolling.fileName = ${sys:ls.logs}/logstash-json.log
+appender.json_rolling.filePattern = ${sys:ls.logs}/logstash-json-%d{yyyy-MM-dd}-%i.log.gz
+appender.json_rolling.policies.type = Policies
+appender.json_rolling.policies.time.type = TimeBasedTriggeringPolicy
+appender.json_rolling.policies.time.interval = 1
+appender.json_rolling.policies.time.modulate = true
+appender.json_rolling.layout.type = JSONLayout
+appender.json_rolling.layout.compact = true
+appender.json_rolling.layout.eventEol = true
+appender.json_rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.json_rolling.policies.size.size = 100MB
+appender.json_rolling.strategy.type = DefaultRolloverStrategy
+appender.json_rolling.strategy.max = 30
+appender.json_rolling.avoid_pipelined_filter.type = PipelineRoutingFilter
+
+appender.routing.type = PipelineRouting
+appender.routing.name = pipeline_routing_appender
+appender.routing.pipeline.type = RollingFile
+appender.routing.pipeline.name = appender-${ctx:pipeline.id}
+appender.routing.pipeline.fileName = ${sys:ls.logs}/pipeline_${ctx:pipeline.id}.log
+appender.routing.pipeline.filePattern = ${sys:ls.logs}/pipeline_${ctx:pipeline.id}.%i.log.gz
+appender.routing.pipeline.layout.type = PatternLayout
+appender.routing.pipeline.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n
+appender.routing.pipeline.policy.type = SizeBasedTriggeringPolicy
+appender.routing.pipeline.policy.size = 100MB
+appender.routing.pipeline.strategy.type = DefaultRolloverStrategy
+appender.routing.pipeline.strategy.max = 30
+
+rootLogger.level = ${sys:ls.log.level}
+rootLogger.appenderRef.console.ref = ${sys:ls.log.format}_console
+rootLogger.appenderRef.rolling.ref = ${sys:ls.log.format}_rolling
+rootLogger.appenderRef.routing.ref = pipeline_routing_appender
+
+# Slowlog
+
+appender.console_slowlog.type = Console
+appender.console_slowlog.name = plain_console_slowlog
+appender.console_slowlog.layout.type = PatternLayout
+appender.console_slowlog.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n
+
+appender.json_console_slowlog.type = Console
+appender.json_console_slowlog.name = json_console_slowlog
+appender.json_console_slowlog.layout.type = JSONLayout
+appender.json_console_slowlog.layout.compact = true
+appender.json_console_slowlog.layout.eventEol = true
+
+appender.rolling_slowlog.type = RollingFile
+appender.rolling_slowlog.name = plain_rolling_slowlog
+appender.rolling_slowlog.fileName = ${sys:ls.logs}/logstash-slowlog-plain.log
+appender.rolling_slowlog.filePattern = ${sys:ls.logs}/logstash-slowlog-plain-%d{yyyy-MM-dd}-%i.log.gz
+appender.rolling_slowlog.policies.type = Policies
+appender.rolling_slowlog.policies.time.type = TimeBasedTriggeringPolicy
+appender.rolling_slowlog.policies.time.interval = 1
+appender.rolling_slowlog.policies.time.modulate = true
+appender.rolling_slowlog.layout.type = PatternLayout
+appender.rolling_slowlog.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n
+appender.rolling_slowlog.policies.size.type = SizeBasedTriggeringPolicy
+appender.rolling_slowlog.policies.size.size = 100MB
+appender.rolling_slowlog.strategy.type = DefaultRolloverStrategy
+appender.rolling_slowlog.strategy.max = 30
+
+appender.json_rolling_slowlog.type = RollingFile
+appender.json_rolling_slowlog.name = json_rolling_slowlog
+appender.json_rolling_slowlog.fileName = ${sys:ls.logs}/logstash-slowlog-json.log
+appender.json_rolling_slowlog.filePattern = ${sys:ls.logs}/logstash-slowlog-json-%d{yyyy-MM-dd}-%i.log.gz
+appender.json_rolling_slowlog.policies.type = Policies
+appender.json_rolling_slowlog.policies.time.type = TimeBasedTriggeringPolicy
+appender.json_rolling_slowlog.policies.time.interval = 1
+appender.json_rolling_slowlog.policies.time.modulate = true
+appender.json_rolling_slowlog.layout.type = JSONLayout
+appender.json_rolling_slowlog.layout.compact = true
+appender.json_rolling_slowlog.layout.eventEol = true
+appender.json_rolling_slowlog.policies.size.type = SizeBasedTriggeringPolicy
+appender.json_rolling_slowlog.policies.size.size = 100MB
+appender.json_rolling_slowlog.strategy.type = DefaultRolloverStrategy
+appender.json_rolling_slowlog.strategy.max = 30
+
+logger.slowlog.name = slowlog
+logger.slowlog.level = trace
+logger.slowlog.appenderRef.console_slowlog.ref = ${sys:ls.log.format}_console_slowlog
+logger.slowlog.appenderRef.rolling_slowlog.ref = ${sys:ls.log.format}_rolling_slowlog
+logger.slowlog.additivity = false
+
+logger.licensereader.name = logstash.licensechecker.licensereader
+logger.licensereader.level = error
+
+# Silence http-client by default
+logger.apache_http_client.name = org.apache.http
+logger.apache_http_client.level = fatal
+
+# Deprecation log
+appender.deprecation_rolling.type = RollingFile
+appender.deprecation_rolling.name = deprecation_plain_rolling
+appender.deprecation_rolling.fileName = ${sys:ls.logs}/logstash-deprecation.log
+appender.deprecation_rolling.filePattern = ${sys:ls.logs}/logstash-deprecation-%d{yyyy-MM-dd}-%i.log.gz
+appender.deprecation_rolling.policies.type = Policies
+appender.deprecation_rolling.policies.time.type = TimeBasedTriggeringPolicy
+appender.deprecation_rolling.policies.time.interval = 1
+appender.deprecation_rolling.policies.time.modulate = true
+appender.deprecation_rolling.layout.type = PatternLayout
+appender.deprecation_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n
+appender.deprecation_rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.deprecation_rolling.policies.size.size = 100MB
+appender.deprecation_rolling.strategy.type = DefaultRolloverStrategy
+appender.deprecation_rolling.strategy.max = 30
+
+logger.deprecation.name = org.logstash.deprecation, deprecation
+logger.deprecation.level = WARN
+logger.deprecation.appenderRef.deprecation_rolling.ref = deprecation_plain_rolling
+logger.deprecation.additivity = false
+
+logger.deprecation_root.name = deprecation
+logger.deprecation_root.level = WARN
+logger.deprecation_root.appenderRef.deprecation_rolling.ref = deprecation_plain_rolling
+logger.deprecation_root.additivity = false
diff --git a/docker/data/logstash/config/log4j2.properties b/docker/data/logstash/config/log4j2.properties
new file mode 100644
index 000000000..663a01580
--- /dev/null
+++ b/docker/data/logstash/config/log4j2.properties
@@ -0,0 +1,16 @@
+status = error
+name = LogstashPropertiesConfig
+
+appender.console.type = Console
+appender.console.name = plain_console
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n
+
+appender.json_console.type = Console
+appender.json_console.name = json_console
+appender.json_console.layout.type = JSONLayout
+appender.json_console.layout.compact = true
+appender.json_console.layout.eventEol = true
+
+rootLogger.level = ${sys:ls.log.level}
+rootLogger.appenderRef.console.ref = ${sys:ls.log.format}_console
diff --git a/docker/data/logstash/config/logstash-full.yml b/docker/data/logstash/config/logstash-full.yml
new file mode 100644
index 000000000..949b46772
--- /dev/null
+++ b/docker/data/logstash/config/logstash-full.yml
@@ -0,0 +1,2 @@
+api.http.host: "0.0.0.0"
+xpack.monitoring.elasticsearch.hosts: [ "http://elasticsearch:9200" ]
diff --git a/docker/data/logstash/config/logstash-oss.yml b/docker/data/logstash/config/logstash-oss.yml
new file mode 100644
index 000000000..979a5ca84
--- /dev/null
+++ b/docker/data/logstash/config/logstash-oss.yml
@@ -0,0 +1 @@
+api.http.host: "0.0.0.0"
diff --git a/docker/data/logstash/config/pipelines.yml b/docker/data/logstash/config/pipelines.yml
new file mode 100644
index 000000000..aed22ce73
--- /dev/null
+++ b/docker/data/logstash/config/pipelines.yml
@@ -0,0 +1,6 @@
+# This file is where you define your pipelines. You can define multiple.
+# For more information on multiple pipelines, see the documentation:
+#   https://www.elastic.co/guide/en/logstash/current/multiple-pipelines.html
+
+- pipeline.id: main
+  path.config: "/usr/share/logstash/pipeline"
diff --git a/docker/data/logstash/env2yaml/env2yaml.go b/docker/data/logstash/env2yaml/env2yaml.go
new file mode 100644
index 000000000..dc2641edf
--- /dev/null
+++ b/docker/data/logstash/env2yaml/env2yaml.go
@@ -0,0 +1,198 @@
+// env2yaml
+//
+// Merge environment variables into logstash.yml.
+// For example, running Docker with:
+//
+//	docker run -e pipeline.workers=6
+//
+// or
+//
+//	docker run -e PIPELINE_WORKERS=6
+//
+// will cause logstash.yml to contain the line:
+//
+//	pipeline.workers: 6
+package main
+
+import (
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"os"
+	"strings"
+
+	"gopkg.in/yaml.v2"
+)
+
+var validSettings = []string{
+	"api.enabled",
+	"api.http.host",
+	"api.http.port",
+	"api.environment",
+	"node.name",
+	"path.data",
+	"pipeline.id",
+	"pipeline.workers",
+	"pipeline.output.workers",
+	"pipeline.batch.size",
+	"pipeline.batch.delay",
+	"pipeline.unsafe_shutdown",
+	"pipeline.ecs_compatibility",
+	"pipeline.ordered",
+	"pipeline.plugin_classloaders",
+	"pipeline.separate_logs",
+	"path.config",
+	"config.string",
+	"config.test_and_exit",
+	"config.reload.automatic",
+	"config.reload.interval",
+	"config.debug",
+	"config.support_escapes",
+	"config.field_reference.escape_style",
+	"queue.type",
+	"path.queue",
+	"queue.page_capacity",
+	"queue.max_events",
+	"queue.max_bytes",
+	"queue.checkpoint.acks",
+	"queue.checkpoint.writes",
+	"queue.checkpoint.interval",
+	"queue.drain",
+	"dead_letter_queue.enable",
+	"dead_letter_queue.max_bytes",
+	"dead_letter_queue.flush_interval",
+	"dead_letter_queue.storage_policy",
+	"dead_letter_queue.retain.age",
+	"path.dead_letter_queue",
+	"log.level",
+	"log.format",
+	"log.format.json.fix_duplicate_message_fields",
+	"metric.collect",
+	"path.logs",
+	"path.plugins",
+	"api.auth.type",
+	"api.auth.basic.username",
+	"api.auth.basic.password",
+	"api.auth.basic.password_policy.mode",
+	"api.auth.basic.password_policy.length.minimum",
+	"api.auth.basic.password_policy.include.upper",
+	"api.auth.basic.password_policy.include.lower",
+	"api.auth.basic.password_policy.include.digit",
+	"api.auth.basic.password_policy.include.symbol",
+	"allow_superuser",
+	"monitoring.cluster_uuid",
+	"xpack.monitoring.allow_legacy_collection",
+	"xpack.monitoring.enabled",
+	"xpack.monitoring.collection.interval",
+	"xpack.monitoring.elasticsearch.hosts",
+	"xpack.monitoring.elasticsearch.username",
+	"xpack.monitoring.elasticsearch.password",
+	"xpack.monitoring.elasticsearch.proxy",
+	"xpack.monitoring.elasticsearch.api_key",
+	"xpack.monitoring.elasticsearch.cloud_auth",
+	"xpack.monitoring.elasticsearch.cloud_id",
+	"xpack.monitoring.elasticsearch.sniffing",
+	"xpack.monitoring.elasticsearch.ssl.certificate_authority",
+	"xpack.monitoring.elasticsearch.ssl.ca_trusted_fingerprint",
+	"xpack.monitoring.elasticsearch.ssl.verification_mode",
+	"xpack.monitoring.elasticsearch.ssl.truststore.path",
+	"xpack.monitoring.elasticsearch.ssl.truststore.password",
+	"xpack.monitoring.elasticsearch.ssl.keystore.path",
+	"xpack.monitoring.elasticsearch.ssl.keystore.password",
+	"xpack.monitoring.elasticsearch.ssl.certificate",
+	"xpack.monitoring.elasticsearch.ssl.key",
+	"xpack.monitoring.elasticsearch.ssl.cipher_suites",
+	"xpack.management.enabled",
+	"xpack.management.logstash.poll_interval",
+	"xpack.management.pipeline.id",
+	"xpack.management.elasticsearch.hosts",
+	"xpack.management.elasticsearch.username",
+	"xpack.management.elasticsearch.password",
+	"xpack.management.elasticsearch.proxy",
+	"xpack.management.elasticsearch.api_key",
+	"xpack.management.elasticsearch.cloud_auth",
+	"xpack.management.elasticsearch.cloud_id",
+	"xpack.management.elasticsearch.sniffing",
+	"xpack.management.elasticsearch.ssl.certificate_authority",
+	"xpack.management.elasticsearch.ssl.ca_trusted_fingerprint",
+	"xpack.management.elasticsearch.ssl.verification_mode",
+	"xpack.management.elasticsearch.ssl.truststore.path",
+	"xpack.management.elasticsearch.ssl.truststore.password",
+	"xpack.management.elasticsearch.ssl.keystore.path",
+	"xpack.management.elasticsearch.ssl.keystore.password",
+	"xpack.management.elasticsearch.ssl.certificate",
+	"xpack.management.elasticsearch.ssl.key",
+	"xpack.management.elasticsearch.ssl.cipher_suites",
+	"xpack.geoip.download.endpoint",
+	"xpack.geoip.downloader.enabled",
+}
+
+// Given a setting name, return a downcased version with delimiters removed.
+func squashSetting(setting string) string {
+	downcased := strings.ToLower(setting)
+	de_dotted := strings.Replace(downcased, ".", "", -1)
+	de_underscored := strings.Replace(de_dotted, "_", "", -1)
+	return de_underscored
+}
+
+// Given a setting name like "pipeline.workers" or "PIPELINE_UNSAFE_SHUTDOWN",
+// return the canonical setting name. eg. 'pipeline.unsafe_shutdown'
+func normalizeSetting(setting string) (string, error) {
+	for _, validSetting := range validSettings {
+		if squashSetting(setting) == squashSetting(validSetting) {
+			return validSetting, nil
+		}
+	}
+	return "", errors.New("Invalid setting: " + setting)
+}
+
+func main() {
+	if len(os.Args) != 2 {
+		log.Fatalf("usage: env2yaml FILENAME")
+	}
+	settingsFilePath := os.Args[1]
+
+	settingsFile, err := ioutil.ReadFile(settingsFilePath)
+	if err != nil {
+		log.Fatalf("error: %v", err)
+	}
+
+	// Read the original settings file into a map.
+	settings := make(map[string]interface{})
+	err = yaml.Unmarshal(settingsFile, &settings)
+	if err != nil {
+		log.Fatalf("error: %v", err)
+	}
+
+	// Merge any valid settings found in the environment.
+	foundNewSettings := false
+	for _, line := range os.Environ() {
+		kv := strings.SplitN(line, "=", 2)
+		key := kv[0]
+		setting, err := normalizeSetting(key)
+		if err == nil {
+			foundNewSettings = true
+			log.Printf("Setting '%s' from environment.", setting)
+			// we need to keep ${KEY} in the logstash.yml to let Logstash decide using ${KEY}'s value from either keystore or environment
+			settings[setting] = fmt.Sprintf("${%s}", key)
+		}
+	}
+
+	if foundNewSettings {
+		output, err := yaml.Marshal(&settings)
+		if err != nil {
+			log.Fatalf("error: %v", err)
+		}
+
+		stat, err := os.Stat(settingsFilePath)
+		if err != nil {
+			log.Fatalf("error: %v", err)
+		}
+
+		err = ioutil.WriteFile(settingsFilePath, output, stat.Mode())
+		if err != nil {
+			log.Fatalf("error: %v", err)
+		}
+	}
+}
diff --git a/docker/data/logstash/env2yaml/go.mod b/docker/data/logstash/env2yaml/go.mod
new file mode 100644
index 000000000..760000742
--- /dev/null
+++ b/docker/data/logstash/env2yaml/go.mod
@@ -0,0 +1,5 @@
+module logstash/env2yaml
+
+go 1.21
+
+require gopkg.in/yaml.v2 v2.4.0
diff --git a/docker/data/logstash/env2yaml/go.sum b/docker/data/logstash/env2yaml/go.sum
new file mode 100644
index 000000000..75346616b
--- /dev/null
+++ b/docker/data/logstash/env2yaml/go.sum
@@ -0,0 +1,3 @@
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
diff --git a/docker/data/logstash/pipeline/default.conf b/docker/data/logstash/pipeline/default.conf
new file mode 100644
index 000000000..11ce14cdf
--- /dev/null
+++ b/docker/data/logstash/pipeline/default.conf
@@ -0,0 +1,12 @@
+input {
+  beats {
+    port => 5044
+  }
+}
+
+output {
+  stdout {
+    codec => rubydebug
+  }
+}
+
diff --git a/docker/examples/logstash.conf b/docker/examples/logstash.conf
new file mode 100644
index 000000000..4c20d126d
--- /dev/null
+++ b/docker/examples/logstash.conf
@@ -0,0 +1,14 @@
+input {
+  heartbeat {
+    interval => 5
+    message  => 'Hello from Logstash 💓'
+  }
+}
+
+output {
+  elasticsearch {
+    hosts    => [ 'elasticsearch' ]
+    user     => 'elastic'
+    password => 'changeme'
+  }
+}
diff --git a/docker/ironbank/LICENSE b/docker/ironbank/LICENSE
new file mode 100644
index 000000000..632c3abe2
--- /dev/null
+++ b/docker/ironbank/LICENSE
@@ -0,0 +1,280 @@
+ELASTIC LICENSE AGREEMENT
+
+PLEASE READ CAREFULLY THIS ELASTIC LICENSE AGREEMENT (THIS "AGREEMENT"), WHICH
+CONSTITUTES A LEGALLY BINDING AGREEMENT AND GOVERNS ALL OF YOUR USE OF ALL OF
+THE ELASTIC SOFTWARE WITH WHICH THIS AGREEMENT IS INCLUDED ("ELASTIC SOFTWARE")
+THAT IS PROVIDED IN OBJECT CODE FORMAT, AND, IN ACCORDANCE WITH SECTION 2 BELOW,
+CERTAIN OF THE ELASTIC SOFTWARE THAT IS PROVIDED IN SOURCE CODE FORMAT. BY
+INSTALLING OR USING ANY OF THE ELASTIC SOFTWARE GOVERNED BY THIS AGREEMENT, YOU
+ARE ASSENTING TO THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE
+WITH SUCH TERMS AND CONDITIONS, YOU MAY NOT INSTALL OR USE THE ELASTIC SOFTWARE
+GOVERNED BY THIS AGREEMENT. IF YOU ARE INSTALLING OR USING THE SOFTWARE ON
+BEHALF OF A LEGAL ENTITY, YOU REPRESENT AND WARRANT THAT YOU HAVE THE ACTUAL
+AUTHORITY TO AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT ON BEHALF OF
+SUCH ENTITY.
+
+Posted Date: April 20, 2018
+
+This Agreement is entered into by and between Elasticsearch BV ("Elastic") and
+You, or the legal entity on behalf of whom You are acting (as applicable,
+"You").
+
+1. OBJECT CODE END USER LICENSES, RESTRICTIONS AND THIRD PARTY OPEN SOURCE
+SOFTWARE
+
+  1.1 Object Code End User License. Subject to the terms and conditions of
+  Section 1.2 of this Agreement, Elastic hereby grants to You, AT NO CHARGE and
+  for so long as you are not in breach of any provision of this Agreement, a
+  License to the Basic Features and Functions of the Elastic Software.
+
+  1.2 Reservation of Rights; Restrictions. As between Elastic and You, Elastic
+  and its licensors own all right, title and interest in and to the Elastic
+  Software, and except as expressly set forth in Sections 1.1, and 2.1 of this
+  Agreement, no other license to the Elastic Software is granted to You under
+  this Agreement, by implication, estoppel or otherwise. You agree not to: (i)
+  reverse engineer or decompile, decrypt, disassemble or otherwise reduce any
+  Elastic Software provided to You in Object Code, or any portion thereof, to
+  Source Code, except and only to the extent any such restriction is prohibited
+  by applicable law, (ii) except as expressly permitted in this Agreement,
+  prepare derivative works from, modify, copy or use the Elastic Software Object
+  Code or the Commercial Software Source Code in any manner; (iii) except as
+  expressly permitted in Section 1.1 above, transfer, sell, rent, lease,
+  distribute, sublicense, loan or otherwise transfer, Elastic Software Object
+  Code, in whole or in part, to any third party; (iv) use Elastic Software
+  Object Code for providing time-sharing services, any software-as-a-service,
+  service bureau services or as part of an application services provider or
+  other service offering (collectively, "SaaS Offering") where obtaining access
+  to the Elastic Software or the features and functions of the Elastic Software
+  is a primary reason or substantial motivation for users of the SaaS Offering
+  to access and/or use the SaaS Offering ("Prohibited SaaS Offering"); (v)
+  circumvent the limitations on use of Elastic Software provided to You in
+  Object Code format that are imposed or preserved by any License Key, or (vi)
+  alter or remove any Marks and Notices in the Elastic Software. If You have any
+  question as to whether a specific SaaS Offering constitutes a Prohibited SaaS
+  Offering, or are interested in obtaining Elastic's permission to engage in
+  commercial or non-commercial distribution of the Elastic Software, please
+  contact elastic_license@elastic.co.
+
+  1.3 Third Party Open Source Software. The Commercial Software may contain or
+  be provided with third party open source libraries, components, utilities and
+  other open source software (collectively, "Open Source Software"), which Open
+  Source Software may have applicable license terms as identified on a website
+  designated by Elastic. Notwithstanding anything to the contrary herein, use of
+  the Open Source Software shall be subject to the license terms and conditions
+  applicable to such Open Source Software, to the extent required by the
+  applicable licensor (which terms shall not restrict the license rights granted
+  to You hereunder, but may contain additional rights). To the extent any
+  condition of this Agreement conflicts with any license to the Open Source
+  Software, the Open Source Software license will govern with respect to such
+  Open Source Software only. Elastic may also separately provide you with
+  certain open source software that is licensed by Elastic. Your use of such
+  Elastic open source software will not be governed by this Agreement, but by
+  the applicable open source license terms.
+
+2. COMMERCIAL SOFTWARE SOURCE CODE
+
+  2.1 Limited License. Subject to the terms and conditions of Section 2.2 of
+  this Agreement, Elastic hereby grants to You, AT NO CHARGE and for so long as
+  you are not in breach of any provision of this Agreement, a limited,
+  non-exclusive, non-transferable, fully paid up royalty free right and license
+  to the Commercial Software in Source Code format, without the right to grant
+  or authorize sublicenses, to prepare Derivative Works of the Commercial
+  Software, provided You (i) do not hack the licensing mechanism, or otherwise
+  circumvent the intended limitations on the use of Elastic Software to enable
+  features other than Basic Features and Functions or those features You are
+  entitled to as part of a Subscription, and (ii) use the resulting object code
+  only for reasonable testing purposes.
+
+  2.2 Restrictions. Nothing in Section 2.1 grants You the right to (i) use the
+  Commercial Software Source Code other than in accordance with Section 2.1
+  above, (ii) use a Derivative Work of the Commercial Software outside of a
+  Non-production Environment, in any production capacity, on a temporary or
+  permanent basis, or (iii) transfer, sell, rent, lease, distribute, sublicense,
+  loan or otherwise make available the Commercial Software Source Code, in whole
+  or in part, to any third party. Notwithstanding the foregoing, You may
+  maintain a copy of the repository in which the Source Code of the Commercial
+  Software resides and that copy may be publicly accessible, provided that you
+  include this Agreement with Your copy of the repository.
+
+3. TERMINATION
+
+  3.1 Termination. This Agreement will automatically terminate, whether or not
+  You receive notice of such Termination from Elastic, if You breach any of its
+  provisions.
+
+  3.2 Post Termination. Upon any termination of this Agreement, for any reason,
+  You shall promptly cease the use of the Elastic Software in Object Code format
+  and cease use of the Commercial Software in Source Code format. For the
+  avoidance of doubt, termination of this Agreement will not affect Your right
+  to use Elastic Software, in either Object Code or Source Code formats, made
+  available under the Apache License Version 2.0.
+
+  3.3 Survival. Sections 1.2, 2.2. 3.3, 4 and 5 shall survive any termination or
+  expiration of this Agreement.
+
+4. DISCLAIMER OF WARRANTIES AND LIMITATION OF LIABILITY
+
+  4.1 Disclaimer of Warranties. TO THE MAXIMUM EXTENT PERMITTED UNDER APPLICABLE
+  LAW, THE ELASTIC SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND,
+  AND ELASTIC AND ITS LICENSORS MAKE NO WARRANTIES WHETHER EXPRESSED, IMPLIED OR
+  STATUTORY REGARDING OR RELATING TO THE ELASTIC SOFTWARE. TO THE MAXIMUM EXTENT
+  PERMITTED UNDER APPLICABLE LAW, ELASTIC AND ITS LICENSORS SPECIFICALLY
+  DISCLAIM ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+  PURPOSE AND NON-INFRINGEMENT WITH RESPECT TO THE ELASTIC SOFTWARE, AND WITH
+  RESPECT TO THE USE OF THE FOREGOING. FURTHER, ELASTIC DOES NOT WARRANT RESULTS
+  OF USE OR THAT THE ELASTIC SOFTWARE WILL BE ERROR FREE OR THAT THE USE OF THE
+  ELASTIC SOFTWARE WILL BE UNINTERRUPTED.
+
+  4.2 Limitation of Liability. IN NO EVENT SHALL ELASTIC OR ITS LICENSORS BE
+  LIABLE TO YOU OR ANY THIRD PARTY FOR ANY DIRECT OR INDIRECT DAMAGES,
+  INCLUDING, WITHOUT LIMITATION, FOR ANY LOSS OF PROFITS, LOSS OF USE, BUSINESS
+  INTERRUPTION, LOSS OF DATA, COST OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY
+  SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OF ANY KIND, IN CONNECTION WITH
+  OR ARISING OUT OF THE USE OR INABILITY TO USE THE ELASTIC SOFTWARE, OR THE
+  PERFORMANCE OF OR FAILURE TO PERFORM THIS AGREEMENT, WHETHER ALLEGED AS A
+  BREACH OF CONTRACT OR TORTIOUS CONDUCT, INCLUDING NEGLIGENCE, EVEN IF ELASTIC
+  HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+5. MISCELLANEOUS
+
+  This Agreement completely and exclusively states the entire agreement of the
+  parties regarding the subject matter herein, and it supersedes, and its terms
+  govern, all prior proposals, agreements, or other communications between the
+  parties, oral or written, regarding such subject matter. This Agreement may be
+  modified by Elastic from time to time, and any such modifications will be
+  effective upon the "Posted Date" set forth at the top of the modified
+  Agreement. If any provision hereof is held unenforceable, this Agreement will
+  continue without said provision and be interpreted to reflect the original
+  intent of the parties. This Agreement and any non-contractual obligation
+  arising out of or in connection with it, is governed exclusively by Dutch law.
+  This Agreement shall not be governed by the 1980 UN Convention on Contracts
+  for the International Sale of Goods. All disputes arising out of or in
+  connection with this Agreement, including its existence and validity, shall be
+  resolved by the courts with jurisdiction in Amsterdam, The Netherlands, except
+  where mandatory law provides for the courts at another location in The
+  Netherlands to have jurisdiction. The parties hereby irrevocably waive any and
+  all claims and defenses either might otherwise have in any such action or
+  proceeding in any of such courts based upon any alleged lack of personal
+  jurisdiction, improper venue, forum non conveniens or any similar claim or
+  defense. A breach or threatened breach, by You of Section 2 may cause
+  irreparable harm for which damages at law may not provide adequate relief, and
+  therefore Elastic shall be entitled to seek injunctive relief without being
+  required to post a bond. You may not assign this Agreement (including by
+  operation of law in connection with a merger or acquisition), in whole or in
+  part to any third party without the prior written consent of Elastic, which
+  may be withheld or granted by Elastic in its sole and absolute discretion.
+  Any assignment in violation of the preceding sentence is void. Notices to
+  Elastic may also be sent to legal@elastic.co.
+
+6. DEFINITIONS
+
+  The following terms have the meanings ascribed:
+
+  6.1 "Affiliate" means, with respect to a party, any entity that controls, is
+  controlled by, or which is under common control with, such party, where
+  "control" means ownership of at least fifty percent (50%) of the outstanding
+  voting shares of the entity, or the contractual right to establish policy for,
+  and manage the operations of, the entity.
+
+  6.2 "Basic Features and Functions" means those features and functions of the
+  Elastic Software that are eligible for use under a Basic license, as set forth
+  at https://www.elastic.co/subscriptions, as may be modified by Elastic from
+  time to time.
+
+  6.3 "Commercial Software" means the Elastic Software Source Code in any file
+  containing a header stating the contents are subject to the Elastic License or
+  which is contained in the repository folder labeled "x-pack", unless a LICENSE
+  file present in the directory subtree declares a different license.
+
+  6.4 "Derivative Work of the Commercial Software" means, for purposes of this
+  Agreement, any modification(s) or enhancement(s) to the Commercial Software,
+  which represent, as a whole, an original work of authorship.
+
+  6.5 "License" means a limited, non-exclusive, non-transferable, fully paid up,
+  royalty free, right and license, without the right to grant or authorize
+  sublicenses, solely for Your internal business operations to (i) install and
+  use the applicable Features and Functions of the Elastic Software in Object
+  Code, and (ii) permit Contractors and Your Affiliates to use the Elastic
+  software as set forth in (i) above, provided that such use by Contractors must
+  be solely for Your benefit and/or the benefit of Your Affiliates, and You
+  shall be responsible for all acts and omissions of such Contractors and
+  Affiliates in connection with their use of the Elastic software that are
+  contrary to the terms and conditions of this Agreement.
+
+  6.6 "License Key" means a sequence of bytes, including but not limited to a
+  JSON blob, that is used to enable certain features and functions of the
+  Elastic Software.
+
+  6.7 "Marks and Notices" means all Elastic trademarks, trade names, logos and
+  notices present on the Documentation as originally provided by Elastic.
+
+  6.8 "Non-production Environment" means an environment for development, testing
+  or quality assurance, where software is not used for production purposes.
+
+  6.9 "Object Code" means any form resulting from mechanical transformation or
+  translation of Source Code form, including but not limited to compiled object
+  code, generated documentation, and conversions to other media types.
+
+  6.10 "Source Code" means the preferred form of computer software for making
+  modifications, including but not limited to software source code,
+  documentation source, and configuration files.
+
+  6.11 "Subscription" means the right to receive Support Services and a License
+  to the Commercial Software.
+
+  
+GOVERNMENT END USER ADDENDUM TO THE ELASTIC LICENSE AGREEMENT
+
+    This ADDENDUM TO THE ELASTIC LICENSE AGREEMENT (this "Addendum") applies
+only to U.S. Federal Government, State Government, and Local Government
+entities ("Government End Users") of the Elastic Software.  This Addendum is
+subject to, and hereby incorporated into, the Elastic License Agreement,
+which is being entered into as of even date herewith, by Elastic and You (the
+"Agreement").  This Addendum sets forth additional terms and conditions
+related to Your use of the Elastic Software. Capitalized terms not defined in
+this Addendum have the meaning set forth in the Agreement.
+
+    1. LIMITED LICENSE TO DISTRIBUTE (DSOP ONLY).  Subject to the terms and
+conditions of the Agreement (including this Addendum), Elastic grants the
+Department of Defense Enterprise DevSecOps Initiative (DSOP) a royalty-free,
+non-exclusive, non-transferable, limited license to reproduce and distribute
+the Elastic Software solely through a software distribution repository
+controlled and managed by DSOP, provided that DSOP: (i) distributes the
+Elastic Software complete and unmodified, inclusive of the Agreement
+(including this Addendum) and (ii) does not remove or alter any proprietary
+legends or notices contained in the Elastic Software.
+
+    2. CHOICE OF LAW.  The choice of law and venue provisions set forth shall
+prevail over those set forth in Section 5 of the Agreement.
+
+      "For U.S. Federal Government Entity End Users. This Agreement and any
+  non-contractual obligation arising out of or in connection with it, is
+  governed exclusively by U.S. Federal law.  To the extent permitted by
+  federal law, the laws of the State of Delaware (excluding Delaware choice
+  of law rules) will apply in the absence of applicable federal law.
+
+      For State and Local Government Entity End Users. This Agreement and any
+  non-contractual obligation arising out of or in connection with it, is
+  governed exclusively by the laws of the state in which you are located
+  without reference to conflict of laws.  Furthermore, the Parties agree that
+  the Uniform Computer Information Transactions Act or any version  thereof,
+  adopted by any state in  any form ('UCITA'), shall not apply to  this
+  Agreement and, to the extent that UCITA is applicable, the Parties agree to
+  opt out of the applicability of UCITA pursuant to the opt-out provision(s)
+  contained therein."
+
+    3. ELASTIC LICENSE MODIFICATION.  Section 5 of the Agreement is hereby
+amended to replace
+
+      "This Agreement may be modified by Elastic from time to time, and any
+  such modifications will be effective upon the "Posted Date" set forth at
+  the top of the modified Agreement."
+
+        with:
+
+      "This Agreement may be modified by Elastic from time to time; provided,
+  however, that any such modifications shall apply only to Elastic Software
+  that is installed after the "Posted Date" set forth at the top of the
+  modified Agreement." 
+  
+V100820.0
diff --git a/docker/ironbank/README.md b/docker/ironbank/README.md
new file mode 100644
index 000000000..9fade56b5
--- /dev/null
+++ b/docker/ironbank/README.md
@@ -0,0 +1,34 @@
+# Logstash
+Logstash is part of the [Elastic Stack](https://www.elastic.co/products) along with Elasticsearch, Kibana, and Beats. Logstash is a server-side data processing pipeline that ingests data from a multitude of sources simultaneously, transforms it, and then sends it to your favorite "stash." (Ours is Elasticsearch, naturally.). Logstash has over 200 plugins, and you can write your own very easily as well.
+
+For more info, see <https://www.elastic.co/products/logstash>
+
+### Installation instructions
+
+Please follow the documentation on [how to install Logstash with Docker](https://www.elastic.co/guide/en/logstash/current/docker.html).
+
+## Documentation and Getting Started
+
+You can find the documentation and getting started guides for Logstash
+on the [elastic.co site](https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html).
+
+### Where to file issues and PRs
+
+- [Issues](https://github.com/elastic/logstash/issues)
+- [PRs](https://github.com/elastic/logstash/pulls)
+
+**Please open new issues and pull requests for plugins under its own repository**
+
+For example, if you have to report an issue/enhancement for the Elasticsearch output, please do so [here](https://github.com/logstash-plugins/logstash-output-elasticsearch/issues).
+
+## Need Help?
+
+- [Logstash Forum](https://discuss.elastic.co/c/logstash)
+- [Logstash Documentation](https://www.elastic.co/guide/en/logstash/current/index.html)
+- [Elastic Support](https://www.elastic.co/subscriptions)
+
+## Project Principles
+
+* Community: If a newbie has a bad time, it's a bug.
+* Software: Make it work, then make it right, then make it fast.
+* Technology: If it doesn't do a thing today, we can make it do it tomorrow.
diff --git a/docker/ironbank/go/src/env2yaml/go.mod b/docker/ironbank/go/src/env2yaml/go.mod
new file mode 100644
index 000000000..a21d1f1af
--- /dev/null
+++ b/docker/ironbank/go/src/env2yaml/go.mod
@@ -0,0 +1,5 @@
+module env2yaml
+
+go 1.13
+
+require gopkg.in/yaml.v2 v2.3.0
diff --git a/docker/ironbank/go/src/env2yaml/go.sum b/docker/ironbank/go/src/env2yaml/go.sum
new file mode 100644
index 000000000..8fabe8daa
--- /dev/null
+++ b/docker/ironbank/go/src/env2yaml/go.sum
@@ -0,0 +1,3 @@
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/docker/ironbank/go/src/env2yaml/vendor/modules.txt b/docker/ironbank/go/src/env2yaml/vendor/modules.txt
new file mode 100644
index 000000000..bdd2db2d7
--- /dev/null
+++ b/docker/ironbank/go/src/env2yaml/vendor/modules.txt
@@ -0,0 +1,2 @@
+# gopkg.in/yaml.v2 v2.3.0
+gopkg.in/yaml.v2
diff --git a/docker/templates/Dockerfile.erb b/docker/templates/Dockerfile.erb
new file mode 100644
index 000000000..48fc4dc46
--- /dev/null
+++ b/docker/templates/Dockerfile.erb
@@ -0,0 +1,128 @@
+# This Dockerfile was generated from templates/Dockerfile.erb
+<%# image_flavor 'full', oss', 'wolfi' -%>
+<% if local_artifacts == 'false' -%>
+  <%   url_root = 'https://artifacts.elastic.co/downloads/logstash' -%>
+<% else -%>
+  <%   url_root = 'http://localhost:8000' -%>
+<% end -%>
+<% if image_flavor == 'oss' -%>
+  <%   tarball = "logstash-oss-#{elastic_version}-linux-#{arch}.tar.gz" -%>
+  <%   license = 'Apache 2.0' -%>
+<% else -%>
+  <%   tarball = "logstash-#{elastic_version}-linux-#{arch}.tar.gz" -%>
+  <%   license = 'Elastic License' -%>
+<% end -%>
+<% if image_flavor == 'full' || image_flavor == 'oss' -%>
+  <%   base_image = 'redhat/ubi9-minimal:latest' -%>
+  <%   go_image = 'golang:1.23' -%>
+  <%   package_manager = 'microdnf' -%>
+<% else -%>
+  <%   base_image = 'docker.elastic.co/wolfi/chainguard-base' -%>
+  <%   go_image = 'docker.elastic.co/wolfi/go:1.23' -%>
+  <%   package_manager = 'apk' -%>
+<% end -%>
+<%   locale = 'C.UTF-8' -%>
+
+# Build env2yaml
+FROM <%= go_image %> AS builder-env2yaml
+
+COPY env2yaml/env2yaml.go env2yaml/go.mod env2yaml/go.sum /tmp/go/src/env2yaml/
+
+WORKDIR /tmp/go/src/env2yaml
+
+RUN go build -trimpath
+
+# Build main image
+# Minimal distributions do not ship with en language packs.
+FROM <%= base_image %>
+
+ENV ELASTIC_CONTAINER=true
+ENV PATH=/usr/share/logstash/bin:$PATH
+ENV LANG=<%= locale %> LC_ALL=<%= locale %>
+
+WORKDIR /usr/share
+
+# Install packages
+RUN for iter in {1..10}; do \
+<% if image_flavor == 'full' || image_flavor == 'oss' -%>
+  <%= package_manager %> update -y && \
+  <%= package_manager %> install -y procps findutils tar gzip && \
+  <%= package_manager %> install -y openssl && \
+  <%= package_manager %> install -y which shadow-utils && \
+  <%= package_manager %> clean all && \
+<% else -%><%# 'wolfi' -%>
+  <%= package_manager %> add --no-cache curl bash openssl && \
+<% end -%>
+  exit_code=0 && break || \
+  exit_code=$? && echo "packaging error: retry $iter in 10s" && \
+  <%= package_manager %> clean all && sleep 10; \
+  done; \
+  (exit $exit_code)
+
+# Provide a non-root user to run the process
+# Add Logstash itself and set permissions
+<% if image_flavor == 'full' || image_flavor == 'oss' -%>
+RUN groupadd --gid 1000 logstash && \
+  adduser --uid 1000 --gid 1000 \
+  --home "/usr/share/logstash" \
+  --no-create-home \
+  logstash && \
+<% else -%><%# 'wolfi' -%>
+RUN addgroup -g 1000 logstash && \
+  adduser -u 1000 -G logstash \
+  --disabled-password \
+  --gecos "" \
+  --home "/usr/share/logstash" \
+  --shell "/sbin/nologin" \
+  --no-create-home \
+  logstash && \
+<% end -%>
+  curl -Lo - <%= url_root %>/<%= tarball %> | \
+  tar zxf - -C /usr/share && \
+  mv /usr/share/logstash-<%= elastic_version %> /usr/share/logstash && \
+  chown -R logstash:root /usr/share/logstash && \
+  chmod -R g=u /usr/share/logstash && \
+  mkdir /licenses && \
+  mv /usr/share/logstash/NOTICE.TXT /licenses/NOTICE.TXT && \
+  mv /usr/share/logstash/LICENSE.txt /licenses/LICENSE.txt && \
+  find /usr/share/logstash -type d -exec chmod g+s {} \; && \
+  ln -s /usr/share/logstash /opt/logstash
+
+COPY --from=builder-env2yaml /tmp/go/src/env2yaml/env2yaml /usr/local/bin/env2yaml
+COPY --chown=logstash:root config/pipelines.yml config/log4j2.properties config/log4j2.file.properties /usr/share/logstash/config/
+<% if image_flavor == 'oss' -%>
+COPY --chown=logstash:root config/logstash-oss.yml /usr/share/logstash/config/logstash.yml
+<% else -%><%# 'full', 'wolfi' -%>
+COPY --chown=logstash:root config/logstash-full.yml /usr/share/logstash/config/logstash.yml
+<% end -%>
+COPY --chown=logstash:root pipeline/default.conf /usr/share/logstash/pipeline/logstash.conf
+COPY --chmod=0755 bin/docker-entrypoint /usr/local/bin/
+
+WORKDIR /usr/share/logstash
+
+USER 1000
+
+EXPOSE 9600 5044
+
+LABEL org.label-schema.build-date=<%= created_date %> \
+  org.label-schema.license="<%= license %>" \
+  org.label-schema.name="logstash" \
+  org.label-schema.schema-version="1.0" \
+  org.label-schema.url="https://www.elastic.co/products/logstash" \
+  org.label-schema.vcs-url="https://github.com/elastic/logstash" \
+  org.label-schema.vendor="Elastic" \
+  org.label-schema.version="<%= elastic_version %>" \
+  org.opencontainers.image.created=<%= created_date %> \
+  org.opencontainers.image.description="Logstash is a free and open server-side data processing pipeline that ingests data from a multitude of sources, transforms it, and then sends it to your favorite 'stash.'" \
+  org.opencontainers.image.licenses="<%= license %>" \
+  org.opencontainers.image.title="logstash" \
+  org.opencontainers.image.vendor="Elastic" \
+  org.opencontainers.image.version="<%= elastic_version %>" \
+  description="Logstash is a free and open server-side data processing pipeline that ingests data from a multitude of sources, transforms it, and then sends it to your favorite 'stash.'" \
+  license="<%= license %>" \
+  maintainer="info@elastic.co" \
+  name="logstash" \
+  summary="Logstash is a free and open server-side data processing pipeline that ingests data from a multitude of sources, transforms it, and then sends it to your favorite 'stash.'" \
+  vendor="Elastic"
+
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint"]
diff --git a/docker/templates/IronbankDockerfile.erb b/docker/templates/IronbankDockerfile.erb
new file mode 100644
index 000000000..77f7ecab8
--- /dev/null
+++ b/docker/templates/IronbankDockerfile.erb
@@ -0,0 +1,65 @@
+# This Dockerfile was generated from templates/IronbankDockerfile.erb
+
+ARG BASE_REGISTRY=registry1.dso.mil
+ARG BASE_IMAGE=ironbank/redhat/ubi/ubi9
+ARG BASE_TAG=9.5
+ARG LOGSTASH_VERSION=<%= elastic_version %>
+ARG GOLANG_VERSION=1.21.8
+
+# stage 1: build env2yaml
+FROM ${BASE_REGISTRY}/google/golang/ubi9/golang-1.21:${GOLANG_VERSION} AS env2yaml
+
+ENV GOPATH=/go
+
+COPY scripts/go /go
+
+USER root
+
+RUN dnf-3 -y upgrade && dnf-3 install -y git && \
+  cd /go/src/env2yaml && \
+  go build
+
+# Final stage
+FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
+
+ARG LOGSTASH_VERSION
+
+ENV ELASTIC_CONTAINER true
+ENV PATH=/usr/share/logstash/bin:$PATH
+
+WORKDIR /usr/share
+
+COPY --from=env2yaml /go/src/env2yaml/env2yaml /usr/local/bin/env2yaml
+COPY scripts/config/* config/
+COPY scripts/pipeline/default.conf pipeline/logstash.conf
+COPY scripts/bin/docker-entrypoint /usr/local/bin/
+COPY logstash-${LOGSTASH_VERSION}-linux-x86_64.tar.gz /tmp/logstash.tar.gz
+
+RUN dnf -y upgrade && \
+  dnf install -y procps findutils tar gzip which shadow-utils && \
+  dnf clean all && \
+  groupadd --gid 1000 logstash && \
+  adduser --uid 1000 --gid 1000 --home-dir /usr/share/logstash --no-create-home logstash && \
+  tar -zxf /tmp/logstash.tar.gz -C /usr/share/ && \
+  mv /usr/share/logstash-${LOGSTASH_VERSION} /usr/share/logstash && \
+  chown -R 1000:0 /usr/share/logstash && \
+  chown --recursive logstash:logstash /usr/share/logstash/ && \
+  chown -R logstash:root /usr/share/logstash config/ pipeline/ && \
+  chmod -R g=u /usr/share/logstash && \
+  mv config/* /usr/share/logstash/config && \
+  mv pipeline /usr/share/logstash/pipeline && \
+  mkdir /licenses/ && \
+  mv /usr/share/logstash/NOTICE.TXT /licenses/NOTICE.TXT && \
+  mv /usr/share/logstash/LICENSE.txt /licenses/LICENSE.txt && \
+  ln -s /usr/share/logstash /opt/logstash && \
+  chmod 0755 /usr/local/bin/docker-entrypoint && \
+  rmdir config && \
+  rm /tmp/logstash.tar.gz
+
+WORKDIR /usr/share/logstash
+
+USER 1000
+
+EXPOSE 9600 5044
+
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint"]
diff --git a/docker/templates/hardening_manifest.yaml.erb b/docker/templates/hardening_manifest.yaml.erb
new file mode 100644
index 000000000..44c170838
--- /dev/null
+++ b/docker/templates/hardening_manifest.yaml.erb
@@ -0,0 +1,59 @@
+---
+apiVersion: v1
+
+# The repository name in registry1, excluding /ironbank/
+name: "elastic/logstash/logstash"
+
+# List of tags to push for the repository in registry1
+# The most specific version should be the first tag and will be shown
+# on ironbank.dsop.io
+tags:
+- "<%= elastic_version %>"
+- "latest"
+
+# Build args passed to Dockerfile ARGs
+args:
+  BASE_IMAGE: "redhat/ubi/ubi9"
+  BASE_TAG: "9.5"
+  LOGSTASH_VERSION: "<%= elastic_version %>"
+  GOLANG_VERSION: "1.21.8"
+
+# Docker image labels
+labels:
+  org.opencontainers.image.title: "logstash"
+  ## Human-readable description of the software packaged in the image
+  org.opencontainers.image.description: "Logstash is a free and open server-side data processing pipeline that ingests data from a multitude of sources, transforms it, and then sends it to your favorite 'stash.'"
+  ## License(s) under which contained software is distributed
+  org.opencontainers.image.licenses: "Elastic License"
+  ## URL to find more information on the image
+  org.opencontainers.image.url: "https://www.elastic.co/products/logstash"
+  ## Name of the distributing entity, organization or individual
+  org.opencontainers.image.vendor: "Elastic"
+  org.opencontainers.image.version: "<%= elastic_version %>"
+  ## Keywords to help with search (ex. "cicd,gitops,golang")
+  # mil.dso.ironbank.image.keywords: "FIXME"
+  ## This value can be "opensource" or "commercial"
+  # mil.dso.ironbank.image.type: "FIXME"
+  ## Product the image belongs to for grouping multiple images
+  mil.dso.ironbank.product.name: "Logstash"
+
+# List of resources to make available to the offline build context
+resources:
+- filename: logstash-<%= elastic_version %>-linux-x86_64.tar.gz
+  url: <artifact_path>/logstash-<%= elastic_version %>-linux-x86_64.tar.gz
+  validation:
+    type: sha512
+    value: <INSERT SHA512 VALUE FROM https://artifacts.elastic.co/downloads/logstash/logstash-<%= elastic_version %>-linux-x86_64.tar.gz.sha512>
+
+# List of project maintainers
+maintainers:
+- name: "Joao Duarte"
+  username: "joaodiasduarte"
+  email: "joao@elastic.co"
+- name: "Rob Bavey"
+  username: "robbavey"
+  email: "rob.bavey@elastic.co"
+- name: "Kaise Cheng"
+  username: "kaisecheng"
+  email: "kaise.cheng@elastic.co"
+
diff --git a/docs/docset.yml b/docs/docset.yml
new file mode 100644
index 000000000..b234d9849
--- /dev/null
+++ b/docs/docset.yml
@@ -0,0 +1,46 @@
+project: 'Logstash'
+cross_links:
+  - beats
+  - docs-content
+  - ecs
+  - elasticsearch
+  - integration-docs
+  - logstash-docs-md
+  - search-ui
+toc:
+  - toc: reference
+  - toc: release-notes
+  - toc: extend
+subs:
+  logstash-ref:   "https://www.elastic.co/guide/en/logstash/current"
+  ecloud:   "Elastic Cloud"
+  esf:   "Elastic Serverless Forwarder"
+  ess:   "Elasticsearch Service"
+  serverless-full:   "Elastic Cloud Serverless"
+  serverless-short:   "Serverless"
+  es-serverless:   "Elasticsearch Serverless"
+  agent:   "Elastic Agent"
+  fleet:   "Fleet"
+  integrations:   "Integrations"
+  stack:   "Elastic Stack"
+  xpack:   "X-Pack"
+  es:   "Elasticsearch"
+  kib:   "Kibana"
+  ls:   "Logstash"
+  beats:   "Beats"
+  filebeat:   "Filebeat"
+  metricbeat:   "Metricbeat"
+  winlogbeat:   "Winlogbeat"
+  security:   "X-Pack security"
+  security-features:   "security features"
+  monitoring:   "X-Pack monitoring"
+  monitor-features:   "monitoring features"
+  stack-monitor-features:   "Elastic Stack monitoring features"
+  ilm:   "index lifecycle management"
+  ilm-cap:   "Index lifecycle management"
+  ilm-init:   "ILM"
+  dlm:   "data lifecycle management"
+  dlm-init:   "DLM"
+  stack-version: "9.0.0"
+  major-version: "9.x"
+  docker-repo: "docker.elastic.co/logstash/logstash"
diff --git a/docs/extend/codec-new-plugin.md b/docs/extend/codec-new-plugin.md
new file mode 100644
index 000000000..6ab967c81
--- /dev/null
+++ b/docs/extend/codec-new-plugin.md
@@ -0,0 +1,636 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/codec-new-plugin.html
+---
+
+# How to write a Logstash codec plugin [codec-new-plugin]
+
+To develop a new codec for Logstash, build a self-contained Ruby gem whose source code lives in its own GitHub repository. The Ruby gem can then be hosted and shared on RubyGems.org. You can use the example codec implementation as a starting point. (If you’re unfamiliar with Ruby, you can find an excellent quickstart guide at [https://www.ruby-lang.org/en/documentation/quickstart/](https://www.ruby-lang.org/en/documentation/quickstart/).)
+
+## Get started [_get_started_2]
+
+Let’s step through creating a codec plugin using the [example codec plugin](https://github.com/logstash-plugins/logstash-codec-example/).
+
+### Create a GitHub repo for your new plugin [_create_a_github_repo_for_your_new_plugin_2]
+
+Each Logstash plugin lives in its own GitHub repository. To create a new repository for your plugin:
+
+1. Log in to GitHub.
+2. Click the **Repositories** tab. You’ll see a list of other repositories you’ve forked or contributed to.
+3. Click the green **New** button in the upper right.
+4. Specify the following settings for your new repo:
+
+    * **Repository name** — a unique name of the form `logstash-codec-pluginname`.
+    * **Public or Private** — your choice, but the repository must be Public if you want to submit it as an official plugin.
+    * **Initialize this repository with a README** — enables you to immediately clone the repository to your computer.
+
+5. Click **Create Repository**.
+
+
+### Use the plugin generator tool [_use_the_plugin_generator_tool_2]
+
+You can create your own Logstash plugin in seconds! The `generate` subcommand of `bin/logstash-plugin` creates the foundation for a new Logstash plugin with templatized files. It creates the correct directory structure, gemspec files, and dependencies so you can start adding custom code to process data with Logstash.
+
+For more information, see [Generating plugins](/reference/plugin-generator.md)
+
+
+### Copy the codec code [_copy_the_codec_code]
+
+Alternatively, you can use the examples repo we host on github.com
+
+1. **Clone your plugin.** Replace `GITUSERNAME` with your github username, and `MYPLUGINNAME` with your plugin name.
+
+    * `git clone https://github.com/GITUSERNAME/logstash-``codec-MYPLUGINNAME.git`
+
+        * alternately, via ssh: `git clone git@github.com:GITUSERNAME/logstash``-codec-MYPLUGINNAME.git`
+
+    * `cd logstash-codec-MYPLUGINNAME`
+
+2. **Clone the codec plugin example and copy it to your plugin branch.**
+
+    You don’t want to include the example .git directory or its contents, so delete it before you copy the example.
+
+    * `cd /tmp`
+    * `git clone https://github.com/logstash-plugins/logstash``-codec-example.git`
+    * `cd logstash-codec-example`
+    * `rm -rf .git`
+    * `cp -R * /path/to/logstash-codec-mypluginname/`
+
+3. **Rename the following files to match the name of your plugin.**
+
+    * `logstash-codec-example.gemspec`
+    * `example.rb`
+    * `example_spec.rb`
+
+        ```txt
+        cd /path/to/logstash-codec-mypluginname
+        mv logstash-codec-example.gemspec logstash-codec-mypluginname.gemspec
+        mv lib/logstash/codecs/example.rb lib/logstash/codecs/mypluginname.rb
+        mv spec/codecs/example_spec.rb spec/codecs/mypluginname_spec.rb
+        ```
+
+
+Your file structure should look like this:
+
+```txt
+$ tree logstash-codec-mypluginname
+├── Gemfile
+├── LICENSE
+├── README.md
+├── Rakefile
+├── lib
+│   └── logstash
+│       └── codecs
+│           └── mypluginname.rb
+├── logstash-codec-mypluginname.gemspec
+└── spec
+    └── codecs
+        └── mypluginname_spec.rb
+```
+
+For more information about the Ruby gem file structure and an excellent walkthrough of the Ruby gem creation process, see [http://timelessrepo.com/making-ruby-gems](http://timelessrepo.com/making-ruby-gems)
+
+
+### See what your plugin looks like [_see_what_your_plugin_looks_like_2]
+
+Before we dive into the details, open up the plugin file in your favorite text editor and take a look.
+
+```ruby
+require "logstash/codecs/base"
+require "logstash/codecs/line"
+
+# Add any asciidoc formatted documentation here
+class LogStash::Codecs::Example < LogStash::Codecs::Base
+
+  # This example codec will append a string to the message field
+  # of an event, either in the decoding or encoding methods
+  #
+  # This is only intended to be used as an example.
+  #
+  # input {
+  #   stdin { codec => example }
+  # }
+  #
+  # or
+  #
+  # output {
+  #   stdout { codec => example }
+  # }
+  config_name "example"
+
+  # Append a string to the message
+  config :append, :validate => :string, :default => ', Hello World!'
+
+  public
+  def register
+    @lines = LogStash::Codecs::Line.new
+    @lines.charset = "UTF-8"
+  end
+
+  public
+  def decode(data)
+    @lines.decode(data) do |line|
+      replace = { "message" => line["message"].to_s + @append }
+      yield LogStash::Event.new(replace)
+    end
+  end # def decode
+
+  public
+  def encode(event)
+    @on_event.call(event, event.get("message").to_s + @append + NL)
+  end # def encode
+
+end # class LogStash::Codecs::Example
+```
+
+
+
+## Coding codec plugins [_coding_codec_plugins]
+
+Now let’s take a line-by-line look at the example plugin.
+
+### `require` Statements [_require_statements_2]
+
+Logstash codec plugins require parent classes defined in `logstash/codecs/base` and logstash/namespace:
+
+```ruby
+require "logstash/codecs/base"
+require "logstash/namespace"
+```
+
+Of course, the plugin you build may depend on other code, or even gems. Just put them here along with these Logstash dependencies.
+
+
+
+## Plugin Body [_plugin_body_2]
+
+Let’s go through the various elements of the plugin itself.
+
+### `class` Declaration [_class_declaration_2]
+
+The codec plugin class should be a subclass of `LogStash::Codecs::Base`:
+
+```ruby
+class LogStash::Codecs::Example < LogStash::Codecs::Base
+```
+
+The class name should closely mirror the plugin name, for example:
+
+```ruby
+LogStash::Codecs::Example
+```
+
+
+### `config_name` [_config_name_2]
+
+```ruby
+  config_name "example"
+```
+
+This is the name your plugin will call inside the codec configuration block.
+
+If you set `config_name "example"` in your plugin code, the corresponding Logstash configuration block would need to look like this:
+
+
+
+## Configuration Parameters [_configuration_parameters_2]
+
+```ruby
+  config :variable_name, :validate => :variable_type, :default => "Default value", :required => boolean, :deprecated => boolean, :obsolete => string
+```
+
+The configuration, or `config` section allows you to define as many (or as few) parameters as are needed to enable Logstash to process events.
+
+There are several configuration attributes:
+
+* `:validate` - allows you to enforce passing a particular data type to Logstash for this configuration option, such as `:string`, `:password`, `:boolean`, `:number`, `:array`, `:hash`, `:path` (a file-system path), `uri`, `:codec` (since 1.2.0), `:bytes`.  Note that this also works as a coercion in that if I specify "true" for boolean (even though technically a string), it will become a valid boolean in the config.  This coercion works for the `:number` type as well where "1.2" becomes a float and "22" is an integer.
+* `:default` - lets you specify a default value for a parameter
+* `:required` - whether or not this parameter is mandatory (a Boolean `true` or
+* `:list` - whether or not this value should be a list of values. Will typecheck the list members, and convert scalars to one element lists. Note that this mostly obviates the array type, though if you need lists of complex objects that will be more suitable. `false`)
+* `:deprecated` - informational (also a Boolean `true` or `false`)
+* `:obsolete` - used to declare that a given setting has been removed and is no longer functioning. The idea is to provide an informed upgrade path to users who are still using a now-removed setting.
+
+
+## Plugin Methods [_plugin_methods_2]
+
+Logstash codecs must implement the `register` method, and the `decode` method or the `encode` method (or both).
+
+### `register` Method [_register_method_2]
+
+```ruby
+  public
+  def register
+  end # def register
+```
+
+The Logstash `register` method is like an `initialize` method. It was originally created to enforce having `super` called, preventing headaches for newbies. (Note: It may go away in favor of `initialize`, in conjunction with some enforced testing to ensure `super` is called.)
+
+`public` means the method can be called anywhere, not just within the class. This is the default behavior for methods in Ruby, but it is specified explicitly here anyway.
+
+You can also assign instance variables here (variables prepended by `@`). Configuration variables are now in scope as instance variables, like `@message`
+
+
+### `decode` Method [_decode_method]
+
+```ruby
+  public
+  def decode(data)
+    @lines.decode(data) do |line|
+      replace = { "message" => line["message"].to_s + @append }
+      yield LogStash::Event.new(replace)
+    end
+  end # def decode
+```
+
+The codec’s `decode` method is where data coming in from an input is transformed into an event.  There are complex examples like the [collectd](https://github.com/logstash-plugins/logstash-codec-collectd/blob/main/lib/logstash/codecs/collectd.rb#L386-L484) codec, and simpler examples like the [spool](https://github.com/logstash-plugins/logstash-codec-spool/blob/main/lib/logstash/codecs/spool.rb#L11-L16) codec.
+
+There must be a `yield` statement as part of the `decode` method which will return decoded events to the pipeline.
+
+
+### `encode` Method [_encode_method]
+
+```ruby
+  public
+  def encode(event)
+    @on_event.call(event, event.get("message").to_s + @append + NL)
+  end # def encode
+```
+
+The `encode` method takes an event and serializes it (*encodes*) into another format.  Good examples of `encode` methods include the simple [plain](https://github.com/logstash-plugins/logstash-codec-plain/blob/main/lib/logstash/codecs/plain.rb#L39-L46) codec, the slightly more involved [msgpack](https://github.com/logstash-plugins/logstash-codec-msgpack/blob/main/lib/logstash/codecs/msgpack.rb#L38-L46) codec, and even an [avro](https://github.com/logstash-plugins/logstash-codec-avro/blob/main/lib/logstash/codecs/avro.rb#L38-L45) codec.
+
+In most cases, your `encode` method should have an `@on_event.call()` statement. This call will output data per event in the described way.
+
+
+
+## Building the Plugin [_building_the_plugin_2]
+
+At this point in the process you have coded your plugin and are ready to build a Ruby Gem from it. The following information will help you complete the process.
+
+### External dependencies [_external_dependencies_2]
+
+A `require` statement in Ruby is used to include necessary code. In some cases your plugin may require additional files.  For example, the collectd plugin [uses](https://github.com/logstash-plugins/logstash-codec-collectd/blob/main/lib/logstash/codecs/collectd.rb#L148) the `types.db` file provided by collectd.  In the main directory of your plugin, a file called `vendor.json` is where these files are described.
+
+The `vendor.json` file contains an array of JSON objects, each describing a file dependency. This example comes from the [collectd](https://github.com/logstash-plugins/logstash-codec-collectd/blob/main/vendor.json) codec plugin:
+
+```txt
+[{
+        "sha1": "a90fe6cc53b76b7bdd56dc57950d90787cb9c96e",
+        "url": "http://collectd.org/files/collectd-5.4.0.tar.gz",
+        "files": [ "/src/types.db" ]
+}]
+```
+
+* `sha1` is the sha1 signature used to verify the integrity of the file referenced by `url`.
+* `url` is the address from where Logstash will download the file.
+* `files` is an optional array of files to extract from the downloaded file. Note that while tar archives can use absolute or relative paths, treat them as absolute in this array.  If `files` is not present, all files will be uncompressed and extracted into the vendor directory.
+
+Another example of the `vendor.json` file is the [`geoip` filter](https://github.com/logstash-plugins/logstash-filter-geoip/blob/main/vendor.json)
+
+The process used to download these dependencies is to call `rake vendor`.  This will be discussed further in the testing section of this document.
+
+Another kind of external dependency is on jar files.  This will be described in the "Add a `gemspec` file" section.
+
+
+### Deprecated features [_deprecated_features_2]
+
+As a plugin evolves, an option or feature may no longer serve the intended purpose, and the developer may want to *deprecate* its usage. Deprecation warns users about the option’s status, so they aren’t caught by surprise when it is removed in a later release.
+
+{{ls}} 7.6 introduced a *deprecation logger* to make handling those situations easier. You can use the [adapter](https://github.com/logstash-plugins/logstash-mixin-deprecation_logger_support) to ensure that your plugin can use the deprecation logger while still supporting older versions of {{ls}}. See the [readme](https://github.com/logstash-plugins/logstash-mixin-deprecation_logger_support/blob/main/README.md) for more information and for instructions on using the adapter.
+
+Deprecations are noted in the `logstash-deprecation.log` file in the `log` directory.
+
+
+### Add a Gemfile [_add_a_gemfile_2]
+
+Gemfiles allow Ruby’s Bundler to maintain the dependencies for your plugin. Currently, all we’ll need is the Logstash gem, for testing, but if you require other gems, you should add them in here.
+
+::::{tip}
+See [Bundler’s Gemfile page](http://bundler.io/gemfile.html) for more details.
+::::
+
+
+```ruby
+source 'https://rubygems.org'
+gemspec
+gem "logstash", :github => "elastic/logstash", :branch => "master"
+```
+
+
+
+## Add a `gemspec` file [_add_a_gemspec_file_2]
+
+Gemspecs define the Ruby gem which will be built and contain your plugin.
+
+::::{tip}
+More information can be found on the [Rubygems Specification page](http://guides.rubygems.org/specification-reference/).
+::::
+
+
+```ruby
+Gem::Specification.new do |s|
+  s.name = 'logstash-codec-example'
+  s.version = '0.1.0'
+  s.licenses = ['Apache License (2.0)']
+  s.summary = "This codec does x, y, z in Logstash"
+  s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
+  s.authors = ["Elastic"]
+  s.email = 'info@elastic.co'
+  s.homepage = "http://www.elastic.co/guide/en/logstash/current/index.html"
+  s.require_paths = ["lib"]
+
+  # Files
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
+   # Tests
+  s.test_files = s.files.grep(%r{^(test|spec|features)/})
+
+  # Special flag to let us know this is actually a logstash plugin
+  s.metadata = { "logstash_plugin" => "true", "logstash_group" => "codec" }
+
+  # Gem dependencies
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
+  s.add_development_dependency 'logstash-devutils'
+end
+```
+
+It is appropriate to change these values to fit your plugin. In particular, `s.name` and `s.summary` should reflect your plugin’s name and behavior.
+
+`s.licenses` and `s.version` are also important and will come into play when you are ready to publish your plugin.
+
+Logstash and all its plugins are licensed under [Apache License, version 2 ("ALv2")](https://github.com/elastic/logstash/blob/main/LICENSE.txt). If you make your plugin publicly available via [RubyGems.org](http://rubygems.org), please make sure to have this line in your gemspec:
+
+* `s.licenses = ['Apache License (2.0)']`
+
+The gem version, designated by `s.version`, helps track changes to plugins over time. You should use [semver versioning](http://semver.org/) strategy for version numbers.
+
+### Runtime and Development Dependencies [_runtime_and_development_dependencies_2]
+
+At the bottom of the `gemspec` file is a section with a comment: `Gem dependencies`.  This is where any other needed gems must be mentioned. If a gem is necessary for your plugin to function, it is a runtime dependency. If a gem are only used for testing, then it would be a development dependency.
+
+::::{note}
+You can also have versioning requirements for your dependencies—​including other Logstash plugins:
+
+```ruby
+  # Gem dependencies
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
+  s.add_development_dependency 'logstash-devutils'
+```
+
+This gemspec has a runtime dependency on the logstash-core-plugin-api and requires that it have a version number greater than or equal to version 1.60 and less than or equal to version 2.99.
+
+::::
+
+
+::::{important}
+All plugins have a runtime dependency on the `logstash-core-plugin-api` gem, and a development dependency on `logstash-devutils`.
+::::
+
+
+
+### Jar dependencies [_jar_dependencies_2]
+
+In some cases, such as the [Elasticsearch output plugin](https://github.com/logstash-plugins/logstash-output-elasticsearch/blob/main/logstash-output-elasticsearch.gemspec#L22-L23), your code may depend on a jar file.  In cases such as this, the dependency is added in the gemspec file in this manner:
+
+```ruby
+  # Jar dependencies
+  s.requirements << "jar 'org.elasticsearch:elasticsearch', '5.0.0'"
+  s.add_runtime_dependency 'jar-dependencies'
+```
+
+With these both defined, the install process will search for the required jar file at [http://mvnrepository.com](http://mvnrepository.com) and download the specified version.
+
+
+
+## Document your plugin [_document_your_plugin_2]
+
+Documentation is an important part of your plugin. All plugin documentation is rendered and placed in the [Logstash Reference](/reference/index.md) and the [Versioned plugin docs](logstash-docs-md://vpr/integration-plugins.md).
+
+See [Document your plugin](/extend/plugin-doc.md) for tips and guidelines.
+
+
+## Add Tests [_add_tests_2]
+
+Logstash loves tests. Lots of tests. If you’re using your new codec plugin in a production environment, you’ll want to have some tests to ensure you are not breaking any existing functionality.
+
+::::{note}
+A full exposition on RSpec is outside the scope of this document. Learn more about RSpec at [http://rspec.info](http://rspec.info)
+::::
+
+
+For help learning about tests and testing, look in the `spec/codecs/` directory of several other similar plugins.
+
+
+## Clone and test! [_clone_and_test_2]
+
+Now let’s start with a fresh clone of the plugin, build it and run the tests.
+
+* **Clone your plugin into a temporary location** Replace `GITUSERNAME` with your github username, and `MYPLUGINNAME` with your plugin name.
+
+    * `git clone https://github.com/GITUSERNAME/logstash-``codec-MYPLUGINNAME.git`
+
+        * alternately, via ssh: `git clone git@github.com:GITUSERNAME/logstash-``codec-MYPLUGINNAME.git`
+
+    * `cd logstash-codec-MYPLUGINNAME`
+
+
+Then, you’ll need to install your plugins dependencies with bundler:
+
+```
+bundle install
+```
+
+::::{important}
+If your plugin has an external file dependency described in `vendor.json`, you must download that dependency before running or testing.  You can do this by running:
+
+```
+rake vendor
+```
+
+::::
+
+
+And finally, run the tests:
+
+```
+bundle exec rspec
+```
+
+You should see a success message, which looks something like this:
+
+```
+Finished in 0.034 seconds
+1 example, 0 failures
+```
+
+Hooray! You’re almost there! (Unless you saw failures…​ you should fix those first).
+
+
+## Building and Testing [_building_and_testing_2]
+
+Now you’re ready to build your (well-tested) plugin into a Ruby gem.
+
+### Build [_build_2]
+
+You already have all the necessary ingredients, so let’s go ahead and run the build command:
+
+```sh
+gem build logstash-codec-example.gemspec
+```
+
+That’s it!  Your gem should be built and be in the same path with the name
+
+```sh
+logstash-codec-mypluginname-0.1.0.gem
+```
+
+The `s.version` number from your gemspec file will provide the gem version, in this case, `0.1.0`.
+
+
+### Test installation [_test_installation_2]
+
+You should test install your plugin into a clean installation of Logstash. Download the latest version from the [Logstash downloads page](https://www.elastic.co/downloads/logstash/).
+
+1. Untar and cd in to the directory:
+
+    ```sh
+    curl -O https://download.elastic.co/logstash/logstash/logstash-9.0.0.tar.gz
+    tar xzvf logstash-9.0.0.tar.gz
+    cd logstash-9.0.0
+    ```
+
+2. Using the plugin tool, we can install the gem we just built.
+
+    * Replace `/my/logstash/plugins` with  the correct path to the gem for your environment, and `0.1.0` with the correct version number from the gemspec file.
+
+        ```sh
+        bin/logstash-plugin install /my/logstash/plugins/logstash-codec-example/logstash-codec-example-0.1.0.gem
+        ```
+
+    * After running this, you should see feedback from Logstash that it was successfully installed:
+
+        ```sh
+        validating /my/logstash/plugins/logstash-codec-example/logstash-codec-example-0.1.0.gem >= 0
+        Valid logstash plugin. Continuing...
+        Successfully installed 'logstash-codec-example' with version '0.1.0'
+        ```
+
+        ::::{tip}
+        You can also use the Logstash plugin tool to determine which plugins are currently available:
+
+        ```sh
+        bin/logstash-plugin list
+        ```
+
+        Depending on what you have installed, you might see a short or long list of plugins: inputs, codecs, filters and outputs.
+
+        ::::
+
+3. Now try running Logstash with a simple configuration passed in via the command-line, using the `-e` flag.
+
+    ::::{note}
+    Your results will depend on what your codec plugin is designed to do.
+    ::::
+
+
+```sh
+bin/logstash -e 'input { stdin{ codec => example{}} } output {stdout { codec => rubydebug }}'
+```
+
+The example codec plugin will append the contents of `append` (which by default appends ", Hello World!")
+
+After starting Logstash, type something, for example "Random output string". The resulting output message field contents should be, "Random output string, Hello World!":
+
+```sh
+Random output string
+{
+       "message" => "Random output string, Hello World!",
+      "@version" => "1",
+    "@timestamp" => "2015-01-27T19:17:18.932Z",
+          "host" => "cadenza"
+}
+```
+
+Feel free to experiment and test this by changing the `append` parameter:
+
+```sh
+bin/logstash -e 'input { stdin{ codec => example{ append => ", I am appending this! }} } output {stdout { codec => rubydebug }}'
+```
+
+Congratulations! You’ve built, deployed and successfully run a Logstash codec.
+
+
+
+## Submitting your plugin to [RubyGems.org](http://rubygems.org) and [logstash-plugins](https://github.com/logstash-plugins) [_submitting_your_plugin_to_rubygems_orghttprubygems_org_and_logstash_pluginshttpsgithub_comlogstash_plugins_2]
+
+Logstash uses [RubyGems.org](http://rubygems.org) as its repository for all plugin artifacts. Once you have developed your new plugin, you can make it available to Logstash users by simply publishing it to RubyGems.org.
+
+### Licensing [_licensing_2]
+
+Logstash and all its plugins are licensed under [Apache License, version 2 ("ALv2")](https://github.com/elasticsearch/logstash/blob/main/LICENSE). If you make your plugin publicly available via [RubyGems.org](http://rubygems.org), please make sure to have this line in your gemspec:
+
+* `s.licenses = ['Apache License (2.0)']`
+
+
+### Publishing to [RubyGems.org](http://rubygems.org) [_publishing_to_rubygems_orghttprubygems_org_2]
+
+To begin, you’ll need an account on RubyGems.org
+
+* [Sign-up for a RubyGems account](https://rubygems.org/sign_up).
+
+After creating an account, [obtain](http://guides.rubygems.org/rubygems-org-api/#api-authorization) an API key from RubyGems.org. By default, RubyGems uses the file `~/.gem/credentials` to store your API key. These credentials will be used to publish the gem. Replace `username` and `password` with the credentials you created at RubyGems.org:
+
+```sh
+curl -u username:password https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials
+chmod 0600 ~/.gem/credentials
+```
+
+Before proceeding, make sure you have the right version in your gemspec file and commit your changes.
+
+* `s.version = '0.1.0'`
+
+To publish version 0.1.0 of your new logstash gem:
+
+```sh
+bundle install
+bundle exec rake vendor
+bundle exec rspec
+bundle exec rake publish_gem
+```
+
+::::{note}
+Executing `rake publish_gem`:
+
+1. Reads the version from the gemspec file (`s.version = '0.1.0'`)
+2. Checks in your local repository if a tag exists for that version. If the tag already exists, it aborts the process. Otherwise, it creates a new version tag in your local repository.
+3. Builds the gem
+4. Publishes the gem to RubyGems.org
+
+::::
+
+
+That’s it! Your plugin is published! Logstash users can now install your plugin by running:
+
+```sh
+bin/logstash-plugin install logstash-codec-mypluginname
+```
+
+
+
+## Contributing your source code to [logstash-plugins](https://github.com/logstash-plugins) [_contributing_your_source_code_to_logstash_pluginshttpsgithub_comlogstash_plugins_2]
+
+It is not required to contribute your source code to [logstash-plugins](https://github.com/logstash-plugins) github organization, but we always welcome new plugins!
+
+### Benefits [_benefits_2]
+
+Some of the many benefits of having your plugin in the logstash-plugins repository are:
+
+* **Discovery.** Your plugin will appear in the [Logstash Reference](/reference/index.md), where Logstash users look first for plugins and documentation.
+* **Documentation.** Your plugin documentation will automatically be added to the [Logstash Reference](/reference/index.md).
+* **Testing.** With our testing infrastructure, your plugin will be continuously tested against current and future releases of Logstash.  As a result, users will have the assurance that if incompatibilities arise, they will be quickly discovered and corrected.
+
+
+### Acceptance Guidelines [_acceptance_guidelines_2]
+
+* **Code Review.** Your plugin must be reviewed by members of the community for coherence, quality, readability, stability and security.
+* **Tests.** Your plugin must contain tests to be accepted.  These tests are also subject to code review for scope and completeness.  It’s ok if you don’t know how to write tests — we will guide you. We are working on publishing a guide to creating tests for Logstash which will make it easier.  In the meantime, you can refer to [http://betterspecs.org/](http://betterspecs.org/) for examples.
+
+To begin migrating your plugin to logstash-plugins, simply create a new [issue](https://github.com/elasticsearch/logstash/issues) in the Logstash repository. When the acceptance guidelines are completed, we will facilitate the move to the logstash-plugins organization using the recommended [github process](https://help.github.com/articles/transferring-a-repository/#transferring-from-a-user-to-an-organization).
diff --git a/docs/extend/community-maintainer.md b/docs/extend/community-maintainer.md
new file mode 100644
index 000000000..686d0012c
--- /dev/null
+++ b/docs/extend/community-maintainer.md
@@ -0,0 +1,193 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/community-maintainer.html
+---
+
+# Logstash Plugins Community Maintainer Guide [community-maintainer]
+
+This document, to be read by new Maintainers, should explain their responsibilities.  It was inspired by the [C4](http://rfc.zeromq.org/spec:22) document from the ZeroMQ project.  This document is subject to change and suggestions through Pull Requests and issues are strongly encouraged.
+
+
+## Contribution Guidelines [_contribution_guidelines]
+
+For general guidance around contributing to Logstash Plugins, see the [*Contributing to Logstash*](/extend/index.md) section.
+
+
+## Document Goals [_document_goals]
+
+To help make the Logstash plugins community participation easy with positive feedback.
+
+To increase diversity.
+
+To reduce code review, merge and release dependencies on the core team by providing support and tools to the Community and Maintainers.
+
+To support the natural life cycle of a plugin.
+
+To codify the roles and responsibilities of: Maintainers and Contributors with specific focus on patch testing, code review, merging and release.
+
+
+## Development Workflow [_development_workflow]
+
+All Issues and Pull Requests must be tracked using the Github issue tracker.
+
+The plugin uses the [Apache 2.0 license](http://www.apache.org/licenses/LICENSE-2.0). Maintainers should check whether a patch introduces code which has an incompatible license. Patch ownership and copyright is defined in the Elastic [Contributor License Agreement](https://www.elastic.co/contributor-agreement) (CLA).
+
+
+### Terminology [_terminology_2]
+
+A "Contributor" is a role a person assumes when providing a patch. Contributors will not have commit access to the repository. They need to sign the Elastic [Contributor License Agreement](https://www.elastic.co/contributor-agreement) before a patch can be reviewed. Contributors can add themselves to the plugin Contributor list.
+
+A "Maintainer" is a role a person assumes when maintaining a plugin and keeping it healthy, including triaging issues, and reviewing and merging patches.
+
+
+### Patch Requirements [_patch_requirements]
+
+A patch is a minimal and accurate answer to exactly one identified and agreed upon problem. It must conform to the [code style guidelines](https://github.com/elastic/logstash/blob/main/STYLE.md) and must include RSpec tests that verify the fitness of the solution.
+
+A patch will be automatically tested by a CI system that will report on the Pull Request status.
+
+A patch CLA will be automatically verified and reported on the Pull Request status.
+
+A patch commit message has a single short (less than 50 character) first line summarizing the change, a blank second line, and any additional lines as necessary for change explanation and rationale.
+
+A patch is mergeable when it satisfies the above requirements and has been reviewed positively by at least one other person.
+
+
+### Development Process [_development_process]
+
+A user will log an issue on the issue tracker describing the problem they face or observe with as much detail as possible.
+
+To work on an issue, a Contributor forks the plugin repository and then works on their forked repository and submits a patch by creating a pull request back to the plugin.
+
+Maintainers must not merge patches where the author has not signed the CLA.
+
+Before a patch can be accepted it should be reviewed. Maintainers should merge accepted patches without delay.
+
+Maintainers should not merge their own patches except in exceptional cases, such as non-responsiveness from other Maintainers or core team for an extended period (more than 2 weeks).
+
+Reviewer’s comments should not be based on personal preferences.
+
+The Maintainers should label Issues and Pull Requests.
+
+Maintainers should involve the core team if help is needed to reach consensus.
+
+Review non-source changes such as documentation in the same way as source code changes.
+
+
+### Branch Management [_branch_management]
+
+The plugin has a main branch that always holds the latest in-progress version and should always build.  Topic branches should kept to the minimum.
+
+
+### Changelog Management [_changelog_management]
+
+Every plugin should have a changelog (https://www.elastic.co/guide/en/logstash/current/CHANGELOG.html).  If not, please create one.  When changes are made to a plugin, make sure to include a changelog entry under the respective version to document the change.  The changelog should be easily understood from a user point of view.  As we iterate and release plugins rapidly, users use the changelog as a mechanism for deciding whether to update.
+
+Changes that are not user facing should be tagged as `internal:`.  For example:
+
+```markdown
+ - internal: Refactored specs for better testing
+ - config: Default timeout configuration changed from 10s to 5s
+```
+
+
+#### Detailed format of https://www.elastic.co/guide/en/logstash/current/CHANGELOG.html [_detailed_format_of_changelog_md]
+
+Sharing a similar format of https://www.elastic.co/guide/en/logstash/current/CHANGELOG.html in plugins ease readability for users. Please see following annotated example and see a concrete example in [logstash-filter-date](https://raw.githubusercontent.com/logstash-plugins/logstash-filter-date/main/https://www.elastic.co/guide/en/logstash/current/CHANGELOG.html).
+
+```markdown
+## 1.0.x                              <1>
+ - change description                 <2>
+ - tag: change description            <3>
+ - tag1,tag2: change description      <4>
+ - tag: Multi-line description        <5>
+   must be indented and can use
+   additional markdown syntax
+                                      <6>
+## 1.0.0                              <7>
+[...]
+```
+
+1. Latest version is the first line of https://www.elastic.co/guide/en/logstash/current/CHANGELOG.html. Each version identifier should be a level-2 header using `##`
+2. One change description is described as a list item using a dash `-` aligned under the version identifier
+3. One change can be tagged by a word and suffixed by `:`.<br> Common tags are `bugfix`, `feature`, `doc`, `test` or `internal`.
+4. One change can have multiple tags separated by a comma and suffixed by `:`
+5. A multi-line change description must be properly indented
+6. Please take care to **separate versions with an empty line**
+7. Previous version identifier
+
+
+
+### Continuous Integration [_continuous_integration]
+
+Plugins are setup with automated continuous integration (CI) environments and there should be a corresponding badge on each Github page.  If it’s missing, please contact the Logstash core team.
+
+Every Pull Request opened automatically triggers a CI run.  To conduct a manual run, comment “Jenkins, please test this.” on the Pull Request.
+
+
+## Versioning Plugins [_versioning_plugins]
+
+Logstash core and its plugins have separate product development lifecycles. Hence the versioning and release strategy for the core and plugins do not have to be aligned. In fact, this was one of our goals during the great separation of plugins work in Logstash 1.5.
+
+At times, there will be changes in core API in Logstash, which will require mass update of plugins to reflect the changes in core. However, this does not happen frequently.
+
+For plugins, we would like to adhere to a versioning and release strategy that can better inform our users, about any breaking changes to the Logstash configuration formats and functionality.
+
+Plugin releases follows a three-placed numbering scheme X.Y.Z. where X denotes a major release version which may break compatibility with existing configuration or functionality. Y denotes releases which includes features which are backward compatible. Z denotes releases which includes bug fixes and patches.
+
+
+### Changing the version [_changing_the_version]
+
+Version can be changed in the Gemspec, which needs to be associated with a changelog entry. Following this, we can publish the gem to RubyGem.org manually. At this point only the core developers can publish a gem.
+
+
+### Labeling [_labeling]
+
+Labeling is a critical aspect of maintaining plugins. All issues in GitHub should be labeled correctly so it can:
+
+* Provide good feedback to users/developers
+* Help prioritize changes
+* Be used in release notes
+
+Most labels are self explanatory, but here’s a quick recap of few important labels:
+
+* `bug`: Labels an issue as an unintentional defect
+* `needs details`: If a the issue reporter has incomplete details, please ask them for more info and label as needs details.
+* `missing cla`: Contributor License Agreement is missing and patch cannot be accepted without it
+* `adopt me`: Ask for help from the community to take over this issue
+* `enhancement`: New feature, not a bug fix
+* `needs tests`: Patch has no tests, and cannot be accepted without unit/integration tests
+* `docs`: Documentation related issue/PR
+
+
+## Logging [_logging]
+
+Although it’s important not to bog down performance with excessive logging, debug level logs can be immensely helpful when diagnosing and troubleshooting issues with Logstash.  Please remember to liberally add debug logs wherever it makes sense as users will be forever gracious.
+
+```shell
+@logger.debug("Logstash loves debug logs!", :actions => actions)
+```
+
+
+## Contributor License Agreement (CLA) Guidance [_contributor_license_agreement_cla_guidance]
+
+Why is a [CLA](https://www.elastic.co/contributor-agreement) required?
+:   We ask this of all Contributors in order to assure our users of the origin and continuing existence of the code. We are not asking Contributors to assign copyright to us, but to give us the right to distribute a Contributor’s code without restriction.
+
+Please make sure the CLA is signed by every Contributor prior to reviewing PRs and commits.
+:   Contributors only need to sign the CLA once and should sign with the same email as used in Github. If a Contributor signs the CLA after a PR is submitted, they can refresh the automated CLA checker by pushing another comment on the PR after 5 minutes of signing.
+
+
+## Need Help? [_need_help]
+
+Ping @logstash-core on Github to get the attention of the Logstash core team.
+
+
+## Community Administration [_community_administration]
+
+The core team is there to support the plugin Maintainers and overall ecosystem.
+
+Maintainers should propose Contributors to become a Maintainer.
+
+Contributors and Maintainers should follow the Elastic Community [Code of Conduct](https://www.elastic.co/community/codeofconduct).  The core team should block or ban "bad actors".
+
diff --git a/docs/extend/contribute-to-core.md b/docs/extend/contribute-to-core.md
new file mode 100644
index 000000000..fbc7043ca
--- /dev/null
+++ b/docs/extend/contribute-to-core.md
@@ -0,0 +1,11 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/contribute-to-core.html
+---
+
+# Extending Logstash core [contribute-to-core]
+
+We also welcome contributions and bug fixes to the Logstash core feature set.
+
+Please read through our [contribution](https://github.com/elastic/logstash/blob/main/CONTRIBUTING.md) guide, and the Logstash [readme](https://github.com/elastic/logstash/blob/main/README.md) document.
+
diff --git a/docs/extend/contributing-patch-plugin.md b/docs/extend/contributing-patch-plugin.md
new file mode 100644
index 000000000..a1621fd56
--- /dev/null
+++ b/docs/extend/contributing-patch-plugin.md
@@ -0,0 +1,386 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/contributing-patch-plugin.html
+---
+
+# Contributing a patch to a Logstash plugin [contributing-patch-plugin]
+
+This section discusses the information you need to know to successfully contribute a patch to a Logstash plugin.
+
+Each plugin defines its own configuration options. These control the behavior of the plugin to some degree. Configuration option definitions commonly include:
+
+* Data validation
+* Default value
+* Any required flags
+
+Plugins are subclasses of a Logstash base class. A plugin’s base class defines common configuration and methods.
+
+## Input plugins [contrib-patch-input]
+
+Input plugins ingest data from an external source. Input plugins are always associated with a codec. An input plugin always has an associated codec plugin. Input and codec plugins operate in conjunction to create a Logstash event and add that event to the processing queue. An input codec is a subclass of the `LogStash::Inputs::Base` class.
+
+### Input API [input-api]
+
+`#register() -> nil`
+:   Required. This API sets up resources for the plugin, typically the connection to the external source.
+
+`#run(queue) -> nil`
+:   Required. This API fetches or listens for source data, typically looping until stopped. Must handle errors inside the loop. Pushes any created events to the queue object specified in the method argument. Some inputs may receive batched data to minimize the external call overhead.
+
+`#stop() -> nil`
+:   Optional. Stops external connections and cleans up.
+
+
+
+## Codec plugins [contrib-patch-codec]
+
+Codec plugins decode input data that has a specific structure, such as JSON input data. A codec plugin is a subclass of `LogStash::Codecs::Base`.
+
+### Codec API [codec-api]
+
+`#register() -> nil`
+:   Identical to the API of the same name for input plugins.
+
+`#decode(data){|event| block} -> nil`
+:   Must be implemented. Used to create an Event from the raw data given in the method argument. Must handle errors. The caller must provide a Ruby block. The block is called with the created Event.
+
+`#encode(event) -> nil`
+:   Required.  Used to create a structured data object from the given Event. May handle errors. This method calls a block that was previously stored as @on_event with two arguments: the original event and the data object.
+
+
+
+## Filter plugins [contrib-patch-filter]
+
+A mechanism to change, mutate or merge one or more Events. A filter plugin is a subclass of the `LogStash::Filters::Base` class.
+
+### Filter API [filter-api]
+
+`#register() -> nil`
+:   Identical to the API of the same name for input plugins.
+
+`#filter(event) -> nil`
+:   Required. May handle errors. Used to apply a mutation function to the given event.
+
+
+
+## Output plugins [contrib-patch-output]
+
+A mechanism to send an event to an external destination. This process may require serialization. An output plugin is a subclass of the `LogStash::Outputs::Base` class.
+
+### Output API [output-api]
+
+`#register() -> nil`
+:   Identical to the API of the same name for input plugins.
+
+`#receive(event) -> nil`
+:   Required. Must handle errors. Used to prepare the given event for transmission to the external destination. Some outputs may buffer the prepared events to batch transmit to the destination.
+
+
+
+## Process [patch-process]
+
+A bug or feature is identified. An issue is created in the plugin repository. A patch is created and a pull request (PR) is submitted. After review and possible rework the PR is merged and the plugin is published.
+
+The [Community Maintainer Guide](/extend/community-maintainer.md) explains, in more detail, the process of getting a patch accepted, merged and published.  The Community Maintainer Guide also details the roles that contributors and maintainers are expected to perform.
+
+
+## Testing methodologies [test-methods]
+
+### Test driven development [tdd]
+
+Test driven development (TDD) describes a methodology for using tests to guide evolution of source code. For our purposes, we are use only a part of it. Before writing the fix, we create tests that illustrate the bug by failing. We stop when we have written enough code to make the tests pass and submit the fix and tests as a patch. It is not necessary to write the tests before the fix, but it is very easy to write a passing test afterwards that may not actually verify that the fault is really fixed especially if the fault can be triggered via multiple execution paths or varying input data.
+
+
+### RSpec framework [rspec]
+
+Logstash uses Rspec, a Ruby testing framework, to define and run the test suite. What follows is a summary of various sources.
+
+```ruby
+ 2 require "logstash/devutils/rspec/spec_helper"
+ 3 require "logstash/plugin"
+ 4
+ 5 describe "outputs/riemann" do
+ 6   describe "#register" do
+ 7     let(:output) do
+ 8       LogStash::Plugin.lookup("output", "riemann").new(configuration)
+ 9     end
+10
+11     context "when no protocol is specified" do
+12       let(:configuration) { Hash.new }
+13
+14       it "the method completes without error" do
+15         expect {output.register}.not_to raise_error
+16       end
+17     end
+18
+19     context "when a bad protocol is specified" do
+20       let(:configuration) { {"protocol" => "fake"} }
+21
+22       it "the method fails with error" do
+23         expect {output.register}.to raise_error
+24       end
+25     end
+26
+27     context "when the tcp protocol is specified" do
+28       let(:configuration) { {"protocol" => "tcp"} }
+29
+30       it "the method completes without error" do
+31         expect {output.register}.not_to raise_error
+32       end
+33     end
+34   end
+35
+36   describe "#receive" do
+37     let(:output) do
+38       LogStash::Plugin.lookup("output", "riemann").new(configuration)
+39     end
+40
+41     context "when operating normally" do
+42       let(:configuration) { Hash.new }
+43       let(:event) do
+44         data = {"message"=>"hello", "@version"=>"1",
+45                 "@timestamp"=>"2015-06-03T23:34:54.076Z",
+46                 "host"=>"vagrant-ubuntu-trusty-64"}
+47         LogStash::Event.new(data)
+48       end
+49
+50       before(:example) do
+51         output.register
+52       end
+53
+54       it "should accept the event" do
+55         expect { output.receive event }.not_to raise_error
+56       end
+57     end
+58   end
+59 end
+```
+
+```ruby
+describe(string){block} -> nil
+describe(Class){block} -> nil
+```
+
+With RSpec, we are always describing the plugin method behavior. The describe block is added in logical sections and can accept either an existing class name or a string. The string used in line 5 is the plugin name. Line 6 is the register method, line 36 is the receive method. It is a RSpec convention to prefix instance methods with one hash and class methods with one dot.
+
+```ruby
+context(string){block} -> nil
+```
+
+In RSpec, context blocks define sections that group tests by a variation.  The string should start with the word `when` and then detail the variation. See line 11.  The tests in the content block should should only be for that variation.
+
+```ruby
+let(symbol){block} -> nil
+```
+
+In RSpec, `let` blocks define resources for use in the test blocks. These resources are reinitialized for every test block. They are available as method calls inside the test block. Define `let` blocks in `describe` and `context` blocks, which scope the `let` block and any other nested blocks. You can use other `let` methods defined later within the `let` block body. See lines 7-9, which define the output resource and use the configuration method, defined with different variations in lines 12, 20 and 28.
+
+```ruby
+before(symbol){block} -> nil - symbol is one of :suite, :context, :example, but :all and :each are synonyms for :suite and :example respectively.
+```
+
+In RSpec, `before` blocks are used to further set up any resources that would have been initialized in a `let` block. You cannot define `let` blocks inside `before` blocks.
+
+You can also define `after` blocks, which are typically used to clean up any setup activity performed by a `before` block.
+
+```ruby
+it(string){block} -> nil
+```
+
+In RSpec, `it` blocks set the expectations that verify the behavior of the tested code. The string should not start with *it* or *should*, but needs to express the outcome of the expectation.  When put together the texts from the enclosing describe, `context` and `it` blocks should form a fairly readable sentence, as in lines 5, 6, 11 and 14:
+
+```ruby
+outputs/riemann
+#register when no protocol is specified the method completes without error
+```
+
+Readable code like this make the goals of tests easy to understand.
+
+```ruby
+expect(object){block} -> nil
+```
+
+In RSpec, the expect method verifies a statement that compares an actual result to an expected result. The `expect` method is usually paired with a call to the `to` or `not_to` methods. Use the block form when expecting errors or observing for changes. The `to` or `not_to` methods require a `matcher` object that encapsulates the expected value. The argument form of the `expect` method encapsulates the actual value. When put together the whole line tests the actual against the expected value.
+
+```ruby
+raise_error(error class|nil) -> matcher instance
+be(object) -> matcher instance
+eq(object) -> matcher instance
+eql(object) -> matcher instance
+  for more see http://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+```
+
+In RSpec, a matcher is an object generated by the equivalent method call (be, eq) that will be used to evaluate the expected against the actual values.
+
+
+
+## Putting it all together [all-together]
+
+This example fixes an [issue](https://github.com/logstash-plugins/logstash-output-zeromq/issues/9) in the ZeroMQ output plugin. The issue does not require knowledge of ZeroMQ.
+
+The activities in this example have the following prerequisites:
+
+* A minimal knowledge of Git and Github. See the [Github boot camp](https://help.github.com/categories/bootcamp/).
+* A text editor.
+* A JRuby [runtime](https://www.ruby-lang.org/en/documentation/installation/#managers) [environment](https://howistart.org/posts/ruby/1). The `chruby` tool manages Ruby versions.
+* JRuby 1.7.22 or later.
+* The `bundler` and `rake` gems installed.
+* ZeroMQ [installed](http://zeromq.org/intro:get-the-software).
+
+1. In Github, fork the ZeroMQ [output plugin repository](https://github.com/logstash-plugins/logstash-output-zeromq).
+2. On your local machine, [clone](https://help.github.com/articles/fork-a-repo/) the fork to a known folder such as `logstash/`.
+3. Open the following files in a text editor:
+
+    * `logstash-output-zeromq/lib/logstash/outputs/zeromq.rb`
+    * `logstash-output-zeromq/lib/logstash/util/zeromq.rb`
+    * `logstash-output-zeromq/spec/outputs/zeromq_spec.rb`
+
+4. According to the issue, log output in server mode must indicate `bound`. Furthermore, the test file contains no tests.
+
+    ::::{note}
+    Line 21 of `util/zeromq.rb` reads `@logger.info("0mq: #{server? ? 'connected' : 'bound'}", :address => address)`
+    ::::
+
+5. In the text editor, require `zeromq.rb` for the file `zeromq_spec.rb` by adding the following lines:
+
+    ```ruby
+    require "logstash/outputs/zeromq"
+    require "logstash/devutils/rspec/spec_helper"
+    ```
+
+6. The desired error message should read:
+
+    ```ruby
+    LogStash::Outputs::ZeroMQ when in server mode a 'bound' info line is logged
+    ```
+
+    To properly generate this message, add a `describe` block with the fully qualified class name as the argument, a context block, and an `it` block.
+
+    ```ruby
+    describe LogStash::Outputs::ZeroMQ do
+      context "when in server mode" do
+        it "a 'bound' info line is logged" do
+        end
+      end
+    end
+    ```
+
+7. To add the missing test, use an instance of the ZeroMQ output and a substitute logger. This example uses an RSpec feature called *test doubles* as the substitute logger.
+
+    Add the following lines to `zeromq_spec.rb`, after `describe LogStash::Outputs::ZeroMQ do` and before `context "when in server mode" do`:
+
+    ```ruby
+      let(:output) { described_class.new("mode" => "server", "topology" => "pushpull" }
+      let(:tracer) { double("logger") }
+    ```
+
+8. Add the body to the `it` block. Add the following five lines after the line `context "when in server mode" do`:
+
+    ```ruby
+          allow(tracer).to receive(:debug)<1>
+          output.logger = logger<2>
+          expect(tracer).to receive(:info).with("0mq: bound", {:address=>"tcp://127.0.0.1:2120"})<3>
+          output.register<4>
+          output.do_close<5>
+    ```
+
+
+1. Allow the double to receive `debug` method calls.
+2. Make the output use the test double.
+3. Set an expectation on the test to receive an `info` method call.
+4. Call `register` on the output.
+5. Call `do_close` on the output so the test does not hang.
+
+
+At the end of the modifications, the relevant code section reads:
+
+```ruby
+require "logstash/outputs/zeromq"
+require "logstash/devutils/rspec/spec_helper"
+
+describe LogStash::Outputs::ZeroMQ do
+  let(:output) { described_class.new("mode" => "server", "topology" => "pushpull") }
+  let(:tracer) { double("logger") }
+
+  context "when in server mode" do
+    it "a ‘bound’ info line is logged" do
+      allow(tracer).to receive(:debug)
+      output.logger = tracer
+      expect(tracer).to receive(:info).with("0mq: bound", {:address=>"tcp://127.0.0.1:2120"})
+      output.register
+      output.do_close
+    end
+  end
+end
+```
+
+To run this test:
+
+1. Open a terminal window
+2. Navigate to the cloned plugin folder
+3. The first time you run the test, run the command `bundle install`
+4. Run the command `bundle exec rspec`
+
+Assuming all prerequisites were installed correctly, the test fails with output similar to:
+
+```shell
+Using Accessor#strict_set for specs
+Run options: exclude {:redis=>true, :socket=>true, :performance=>true, :couchdb=>true, :elasticsearch=>true,
+:elasticsearch_secure=>true, :export_cypher=>true, :integration=>true, :windows=>true}
+
+LogStash::Outputs::ZeroMQ
+  when in server mode
+    a ‘bound’ info line is logged (FAILED - 1)
+
+Failures:
+
+  1) LogStash::Outputs::ZeroMQ when in server mode a ‘bound’ info line is logged
+     Failure/Error: output.register
+       Double "logger" received :info with unexpected arguments
+         expected: ("0mq: bound", {:address=>"tcp://127.0.0.1:2120"})
+              got: ("0mq: connected", {:address=>"tcp://127.0.0.1:2120"})
+     # ./lib/logstash/util/zeromq.rb:21:in `setup'
+     # ./lib/logstash/outputs/zeromq.rb:92:in `register'
+     # ./lib/logstash/outputs/zeromq.rb:91:in `register'
+     # ./spec/outputs/zeromq_spec.rb:13:in `(root)'
+     # /Users/guy/.gem/jruby/1.9.3/gems/rspec-wait-0.0.7/lib/rspec/wait.rb:46:in `(root)'
+
+Finished in 0.133 seconds (files took 1.28 seconds to load)
+1 example, 1 failure
+
+Failed examples:
+
+rspec ./spec/outputs/zeromq_spec.rb:10 # LogStash::Outputs::ZeroMQ when in server mode a ‘bound’ info line is logged
+
+Randomized with seed 2568
+```
+
+To correct the error, open the `util/zeromq.rb` file in your text editor and swap the positions of the words `connected` and `bound` on line 21. Line 21 now reads:
+
+```ruby
+@logger.info("0mq: #{server? ? 'bound' : 'connected'}", :address => address)
+```
+
+Run the test again with the `bundle exec rspec` command.
+
+The test passes with output similar to:
+
+```shell
+Using Accessor#strict_set for specs
+Run options: exclude {:redis=>true, :socket=>true, :performance=>true, :couchdb=>true, :elasticsearch=>true, :elasticsearch_secure=>true, :export_cypher=>true, :integration=>true, :windows=>true}
+
+LogStash::Outputs::ZeroMQ
+  when in server mode
+    a ‘bound’ info line is logged
+
+Finished in 0.114 seconds (files took 1.22 seconds to load)
+1 example, 0 failures
+
+Randomized with seed 45887
+```
+
+[Commit](https://help.github.com/articles/fork-a-repo/#next-steps) the changes to git and Github.
+
+Your pull request is visible from the [Pull Requests](https://github.com/logstash-plugins/logstash-output-zeromq/pulls) section of the original Github repository. The plugin maintainers review your work, suggest changes if necessary, and merge and publish a new version of the plugin.
+
+
diff --git a/docs/extend/create-logstash-plugins.md b/docs/extend/create-logstash-plugins.md
new file mode 100644
index 000000000..7dc5d5ba5
--- /dev/null
+++ b/docs/extend/create-logstash-plugins.md
@@ -0,0 +1,47 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/contributing-java-plugin.html
+---
+
+# Create Logstash plugins [contributing-java-plugin]
+
+Now you can write your own Java plugin for use with {{ls}}. We have provided instructions and GitHub examples to give you a head start.
+
+Native support for Java plugins in {{ls}} consists of several components:
+
+* Extensions to the Java execution engine to support running Java plugins in Logstash pipelines
+* APIs for developing Java plugins. The APIs are in the `co.elastic.logstash.api` package. A Java plugin might break if it references classes or specific concrete implementations of API interfaces outside that package. The implementation of classes outside of the API package may change at any time.
+* Tooling to automate the packaging and deployment of Java plugins in Logstash.
+
+
+## Process overview [_process_overview]
+
+Here are the steps:
+
+1. Choose the type of plugin you want to create: input, codec, filter, or output.
+2. Set up your environment.
+3. Code the plugin.
+4. Package and deploy the plugin.
+5. Run Logstash with your new plugin.
+
+
+### Let’s get started [_lets_get_started]
+
+Here are the example repos:
+
+* [Input plugin example](https://github.com/logstash-plugins/logstash-input-java_input_example)
+* [Codec plugin example](https://github.com/logstash-plugins/logstash-codec-java_codec_example)
+* [Filter plugin example](https://github.com/logstash-plugins/logstash-filter-java_filter_example)
+* [Output plugin example](https://github.com/logstash-plugins/logstash-output-java_output_example)
+
+Here are the instructions:
+
+* [How to write a Java input plugin](/extend/java-input-plugin.md)
+* [How to write a Java codec plugin](/extend/java-codec-plugin.md)
+* [How to write a Java filter plugin](/extend/java-filter-plugin.md)
+* [How to write a Java output plugin](/extend/java-output-plugin.md)
+
+
+
+
+
diff --git a/docs/extend/filter-new-plugin.md b/docs/extend/filter-new-plugin.md
new file mode 100644
index 000000000..333b7137e
--- /dev/null
+++ b/docs/extend/filter-new-plugin.md
@@ -0,0 +1,637 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/filter-new-plugin.html
+---
+
+# How to write a Logstash filter plugin [filter-new-plugin]
+
+To develop a new filter for Logstash, build a self-contained Ruby gem whose source code lives in its own GitHub repository. The Ruby gem can then be hosted and shared on RubyGems.org. You can use the example filter implementation as a starting point. (If you’re unfamiliar with Ruby, you can find an excellent quickstart guide at [https://www.ruby-lang.org/en/documentation/quickstart/](https://www.ruby-lang.org/en/documentation/quickstart/).)
+
+## Get started [_get_started_3]
+
+Let’s step through creating a filter plugin using the [example filter plugin](https://github.com/logstash-plugins/logstash-filter-example/).
+
+### Create a GitHub repo for your new plugin [_create_a_github_repo_for_your_new_plugin_3]
+
+Each Logstash plugin lives in its own GitHub repository. To create a new repository for your plugin:
+
+1. Log in to GitHub.
+2. Click the **Repositories** tab. You’ll see a list of other repositories you’ve forked or contributed to.
+3. Click the green **New** button in the upper right.
+4. Specify the following settings for your new repo:
+
+    * **Repository name** — a unique name of the form `logstash-filter-pluginname`.
+    * **Public or Private** — your choice, but the repository must be Public if you want to submit it as an official plugin.
+    * **Initialize this repository with a README** — enables you to immediately clone the repository to your computer.
+
+5. Click **Create Repository**.
+
+
+### Use the plugin generator tool [_use_the_plugin_generator_tool_3]
+
+You can create your own Logstash plugin in seconds! The `generate` subcommand of `bin/logstash-plugin` creates the foundation for a new Logstash plugin with templatized files. It creates the correct directory structure, gemspec files, and dependencies so you can start adding custom code to process data with Logstash.
+
+For more information, see [Generating plugins](/reference/plugin-generator.md)
+
+
+### Copy the filter code [_copy_the_filter_code]
+
+Alternatively, you can use the examples repo we host on github.com
+
+1. **Clone your plugin.** Replace `GITUSERNAME` with your github username, and `MYPLUGINNAME` with your plugin name.
+
+    * `git clone https://github.com/GITUSERNAME/logstash-``filter-MYPLUGINNAME.git`
+
+        * alternately, via ssh: `git clone git@github.com:GITUSERNAME/logstash``-filter-MYPLUGINNAME.git`
+
+    * `cd logstash-filter-MYPLUGINNAME`
+
+2. **Clone the filter plugin example and copy it to your plugin branch.**
+
+    You don’t want to include the example .git directory or its contents, so delete it before you copy the example.
+
+    * `cd /tmp`
+    * `git clone https://github.com/logstash-plugins/logstash``-filter-example.git`
+    * `cd logstash-filter-example`
+    * `rm -rf .git`
+    * `cp -R * /path/to/logstash-filter-mypluginname/`
+
+3. **Rename the following files to match the name of your plugin.**
+
+    * `logstash-filter-example.gemspec`
+    * `example.rb`
+    * `example_spec.rb`
+
+        ```txt
+        cd /path/to/logstash-filter-mypluginname
+        mv logstash-filter-example.gemspec logstash-filter-mypluginname.gemspec
+        mv lib/logstash/filters/example.rb lib/logstash/filters/mypluginname.rb
+        mv spec/filters/example_spec.rb spec/filters/mypluginname_spec.rb
+        ```
+
+
+Your file structure should look like this:
+
+```txt
+$ tree logstash-filter-mypluginname
+├── Gemfile
+├── LICENSE
+├── README.md
+├── Rakefile
+├── lib
+│   └── logstash
+│       └── filters
+│           └── mypluginname.rb
+├── logstash-filter-mypluginname.gemspec
+└── spec
+    └── filters
+        └── mypluginname_spec.rb
+```
+
+For more information about the Ruby gem file structure and an excellent walkthrough of the Ruby gem creation process, see [http://timelessrepo.com/making-ruby-gems](http://timelessrepo.com/making-ruby-gems)
+
+
+### See what your plugin looks like [_see_what_your_plugin_looks_like_3]
+
+Before we dive into the details, open up the plugin file in your favorite text editor and take a look.
+
+```ruby
+require "logstash/filters/base"
+require "logstash/namespace"
+
+# Add any asciidoc formatted documentation here
+# This example filter will replace the contents of the default
+# message field with whatever you specify in the configuration.
+#
+# It is only intended to be used as an example.
+class LogStash::Filters::Example < LogStash::Filters::Base
+
+  # Setting the config_name here is required. This is how you
+  # configure this filter from your Logstash config.
+  #
+  # filter {
+  #   example { message => "My message..." }
+  # }
+  config_name "example"
+
+  # Replace the message with this value.
+  config :message, :validate => :string, :default => "Hello World!"
+
+
+  public
+  def register
+    # Add instance variables
+  end # def register
+
+  public
+  def filter(event)
+
+    if @message
+      # Replace the event message with our message as configured in the
+      # config file.
+      event.set("message", @message)
+    end
+
+    # filter_matched should go in the last line of our successful code
+    filter_matched(event)
+  end # def filter
+
+end # class LogStash::Filters::Example
+```
+
+
+
+## Coding filter plugins [_coding_filter_plugins]
+
+Now let’s take a line-by-line look at the example plugin.
+
+### `require` Statements [_require_statements_3]
+
+Logstash filter plugins require parent classes defined in `logstash/filters/base` and logstash/namespace:
+
+```ruby
+require "logstash/filters/base"
+require "logstash/namespace"
+```
+
+Of course, the plugin you build may depend on other code, or even gems. Just put them here along with these Logstash dependencies.
+
+
+
+## Plugin Body [_plugin_body_3]
+
+Let’s go through the various elements of the plugin itself.
+
+### `class` Declaration [_class_declaration_3]
+
+The filter plugin class should be a subclass of `LogStash::Filters::Base`:
+
+```ruby
+class LogStash::Filters::Example < LogStash::Filters::Base
+```
+
+The class name should closely mirror the plugin name, for example:
+
+```ruby
+LogStash::Filters::Example
+```
+
+
+### `config_name` [_config_name_3]
+
+```ruby
+  config_name "example"
+```
+
+This is the name your plugin will call inside the filter configuration block.
+
+If you set `config_name "example"` in your plugin code, the corresponding Logstash configuration block would need to look like this:
+
+
+
+## Configuration Parameters [_configuration_parameters_3]
+
+```ruby
+  config :variable_name, :validate => :variable_type, :default => "Default value", :required => boolean, :deprecated => boolean, :obsolete => string
+```
+
+The configuration, or `config` section allows you to define as many (or as few) parameters as are needed to enable Logstash to process events.
+
+There are several configuration attributes:
+
+* `:validate` - allows you to enforce passing a particular data type to Logstash for this configuration option, such as `:string`, `:password`, `:boolean`, `:number`, `:array`, `:hash`, `:path` (a file-system path), `uri`, `:codec` (since 1.2.0), `:bytes`.  Note that this also works as a coercion in that if I specify "true" for boolean (even though technically a string), it will become a valid boolean in the config.  This coercion works for the `:number` type as well where "1.2" becomes a float and "22" is an integer.
+* `:default` - lets you specify a default value for a parameter
+* `:required` - whether or not this parameter is mandatory (a Boolean `true` or
+* `:list` - whether or not this value should be a list of values. Will typecheck the list members, and convert scalars to one element lists. Note that this mostly obviates the array type, though if you need lists of complex objects that will be more suitable. `false`)
+* `:deprecated` - informational (also a Boolean `true` or `false`)
+* `:obsolete` - used to declare that a given setting has been removed and is no longer functioning. The idea is to provide an informed upgrade path to users who are still using a now-removed setting.
+
+
+## Plugin Methods [_plugin_methods_3]
+
+Logstash filters must implement the `register` and `filter` methods.
+
+### `register` Method [_register_method_3]
+
+```ruby
+  public
+  def register
+  end # def register
+```
+
+The Logstash `register` method is like an `initialize` method. It was originally created to enforce having `super` called, preventing headaches for newbies. (Note: It may go away in favor of `initialize`, in conjunction with some enforced testing to ensure `super` is called.)
+
+`public` means the method can be called anywhere, not just within the class. This is the default behavior for methods in Ruby, but it is specified explicitly here anyway.
+
+You can also assign instance variables here (variables prepended by `@`). Configuration variables are now in scope as instance variables, like `@message`
+
+
+### `filter` Method [_filter_method]
+
+```ruby
+  public
+  def filter(event)
+
+    if @message
+      # Replace the event message with our message as configured in the
+      # config file.
+      event.set("message", @message)
+    end
+
+  # filter_matched should go in the last line of our successful code
+  filter_matched(event)
+end # def filter
+```
+
+The plugin’s `filter` method is where the actual filtering work takes place! Inside the `filter` method you can refer to the event data using the `Event` object. Event is the main object that encapsulates data flow internally in Logstash and provides an [API](/reference/event-api.md) for the plugin developers to interact with the event’s content.
+
+The `filter` method should also handle any [event dependent configuration](/reference/event-dependent-configuration.md) by explicitly calling the `sprintf` method available in Event class. For example:
+
+```ruby
+field_foo = event.sprintf(field)
+```
+
+Note that configuration variables are now in scope as instance variables, like `@message`
+
+```ruby
+  filter_matched(event)
+```
+
+Calling the `filter_matched` method upon successful execution of the plugin will ensure that any fields or tags added through the Logstash configuration for this filter will be handled correctly. For example, any `add_field`, `remove_field`, `add_tag` and/or `remove_tag` actions will be performed at this time.
+
+Event methods such as `event.cancel` are now available to control the workflow of the event being processed.
+
+
+
+## Building the Plugin [_building_the_plugin_3]
+
+At this point in the process you have coded your plugin and are ready to build a Ruby Gem from it. The following information will help you complete the process.
+
+### External dependencies [_external_dependencies_3]
+
+A `require` statement in Ruby is used to include necessary code. In some cases your plugin may require additional files.  For example, the collectd plugin [uses](https://github.com/logstash-plugins/logstash-codec-collectd/blob/main/lib/logstash/codecs/collectd.rb#L148) the `types.db` file provided by collectd.  In the main directory of your plugin, a file called `vendor.json` is where these files are described.
+
+The `vendor.json` file contains an array of JSON objects, each describing a file dependency. This example comes from the [collectd](https://github.com/logstash-plugins/logstash-codec-collectd/blob/main/vendor.json) codec plugin:
+
+```txt
+[{
+        "sha1": "a90fe6cc53b76b7bdd56dc57950d90787cb9c96e",
+        "url": "http://collectd.org/files/collectd-5.4.0.tar.gz",
+        "files": [ "/src/types.db" ]
+}]
+```
+
+* `sha1` is the sha1 signature used to verify the integrity of the file referenced by `url`.
+* `url` is the address from where Logstash will download the file.
+* `files` is an optional array of files to extract from the downloaded file. Note that while tar archives can use absolute or relative paths, treat them as absolute in this array.  If `files` is not present, all files will be uncompressed and extracted into the vendor directory.
+
+Another example of the `vendor.json` file is the [`geoip` filter](https://github.com/logstash-plugins/logstash-filter-geoip/blob/main/vendor.json)
+
+The process used to download these dependencies is to call `rake vendor`.  This will be discussed further in the testing section of this document.
+
+Another kind of external dependency is on jar files.  This will be described in the "Add a `gemspec` file" section.
+
+
+### Deprecated features [_deprecated_features_3]
+
+As a plugin evolves, an option or feature may no longer serve the intended purpose, and the developer may want to *deprecate* its usage. Deprecation warns users about the option’s status, so they aren’t caught by surprise when it is removed in a later release.
+
+{{ls}} 7.6 introduced a *deprecation logger* to make handling those situations easier. You can use the [adapter](https://github.com/logstash-plugins/logstash-mixin-deprecation_logger_support) to ensure that your plugin can use the deprecation logger while still supporting older versions of {{ls}}. See the [readme](https://github.com/logstash-plugins/logstash-mixin-deprecation_logger_support/blob/main/README.md) for more information and for instructions on using the adapter.
+
+Deprecations are noted in the `logstash-deprecation.log` file in the `log` directory.
+
+
+### Add a Gemfile [_add_a_gemfile_3]
+
+Gemfiles allow Ruby’s Bundler to maintain the dependencies for your plugin. Currently, all we’ll need is the Logstash gem, for testing, but if you require other gems, you should add them in here.
+
+::::{tip}
+See [Bundler’s Gemfile page](http://bundler.io/gemfile.html) for more details.
+::::
+
+
+```ruby
+source 'https://rubygems.org'
+gemspec
+gem "logstash", :github => "elastic/logstash", :branch => "master"
+```
+
+
+
+## Add a `gemspec` file [_add_a_gemspec_file_3]
+
+Gemspecs define the Ruby gem which will be built and contain your plugin.
+
+::::{tip}
+More information can be found on the [Rubygems Specification page](http://guides.rubygems.org/specification-reference/).
+::::
+
+
+```ruby
+Gem::Specification.new do |s|
+  s.name = 'logstash-filter-example'
+  s.version = '0.1.0'
+  s.licenses = ['Apache License (2.0)']
+  s.summary = "This filter does x, y, z in Logstash"
+  s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
+  s.authors = ["Elastic"]
+  s.email = 'info@elastic.co'
+  s.homepage = "http://www.elastic.co/guide/en/logstash/current/index.html"
+  s.require_paths = ["lib"]
+
+  # Files
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
+   # Tests
+  s.test_files = s.files.grep(%r{^(test|spec|features)/})
+
+  # Special flag to let us know this is actually a logstash plugin
+  s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
+
+  # Gem dependencies
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
+  s.add_development_dependency 'logstash-devutils'
+end
+```
+
+It is appropriate to change these values to fit your plugin. In particular, `s.name` and `s.summary` should reflect your plugin’s name and behavior.
+
+`s.licenses` and `s.version` are also important and will come into play when you are ready to publish your plugin.
+
+Logstash and all its plugins are licensed under [Apache License, version 2 ("ALv2")](https://github.com/elastic/logstash/blob/main/LICENSE.txt). If you make your plugin publicly available via [RubyGems.org](http://rubygems.org), please make sure to have this line in your gemspec:
+
+* `s.licenses = ['Apache License (2.0)']`
+
+The gem version, designated by `s.version`, helps track changes to plugins over time. You should use [semver versioning](http://semver.org/) strategy for version numbers.
+
+### Runtime and Development Dependencies [_runtime_and_development_dependencies_3]
+
+At the bottom of the `gemspec` file is a section with a comment: `Gem dependencies`.  This is where any other needed gems must be mentioned. If a gem is necessary for your plugin to function, it is a runtime dependency. If a gem are only used for testing, then it would be a development dependency.
+
+::::{note}
+You can also have versioning requirements for your dependencies—​including other Logstash plugins:
+
+```ruby
+  # Gem dependencies
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
+  s.add_development_dependency 'logstash-devutils'
+```
+
+This gemspec has a runtime dependency on the logstash-core-plugin-api and requires that it have a version number greater than or equal to version 1.60 and less than or equal to version 2.99.
+
+::::
+
+
+::::{important}
+All plugins have a runtime dependency on the `logstash-core-plugin-api` gem, and a development dependency on `logstash-devutils`.
+::::
+
+
+
+### Jar dependencies [_jar_dependencies_3]
+
+In some cases, such as the [Elasticsearch output plugin](https://github.com/logstash-plugins/logstash-output-elasticsearch/blob/main/logstash-output-elasticsearch.gemspec#L22-L23), your code may depend on a jar file.  In cases such as this, the dependency is added in the gemspec file in this manner:
+
+```ruby
+  # Jar dependencies
+  s.requirements << "jar 'org.elasticsearch:elasticsearch', '5.0.0'"
+  s.add_runtime_dependency 'jar-dependencies'
+```
+
+With these both defined, the install process will search for the required jar file at [http://mvnrepository.com](http://mvnrepository.com) and download the specified version.
+
+
+
+## Document your plugin [_document_your_plugin_3]
+
+Documentation is an important part of your plugin. All plugin documentation is rendered and placed in the [Logstash Reference](/reference/index.md) and the [Versioned plugin docs](logstash-docs-md://vpr/integration-plugins.md).
+
+See [Document your plugin](/extend/plugin-doc.md) for tips and guidelines.
+
+
+## Add Tests [_add_tests_3]
+
+Logstash loves tests. Lots of tests. If you’re using your new filter plugin in a production environment, you’ll want to have some tests to ensure you are not breaking any existing functionality.
+
+::::{note}
+A full exposition on RSpec is outside the scope of this document. Learn more about RSpec at [http://rspec.info](http://rspec.info)
+::::
+
+
+For help learning about tests and testing, look in the `spec/filters/` directory of several other similar plugins.
+
+
+## Clone and test! [_clone_and_test_3]
+
+Now let’s start with a fresh clone of the plugin, build it and run the tests.
+
+* **Clone your plugin into a temporary location** Replace `GITUSERNAME` with your github username, and `MYPLUGINNAME` with your plugin name.
+
+    * `git clone https://github.com/GITUSERNAME/logstash-``filter-MYPLUGINNAME.git`
+
+        * alternately, via ssh: `git clone git@github.com:GITUSERNAME/logstash-``filter-MYPLUGINNAME.git`
+
+    * `cd logstash-filter-MYPLUGINNAME`
+
+
+Then, you’ll need to install your plugins dependencies with bundler:
+
+```
+bundle install
+```
+
+::::{important}
+If your plugin has an external file dependency described in `vendor.json`, you must download that dependency before running or testing.  You can do this by running:
+
+```
+rake vendor
+```
+
+::::
+
+
+And finally, run the tests:
+
+```
+bundle exec rspec
+```
+
+You should see a success message, which looks something like this:
+
+```
+Finished in 0.034 seconds
+1 example, 0 failures
+```
+
+Hooray! You’re almost there! (Unless you saw failures…​ you should fix those first).
+
+
+## Building and Testing [_building_and_testing_3]
+
+Now you’re ready to build your (well-tested) plugin into a Ruby gem.
+
+### Build [_build_3]
+
+You already have all the necessary ingredients, so let’s go ahead and run the build command:
+
+```sh
+gem build logstash-filter-example.gemspec
+```
+
+That’s it!  Your gem should be built and be in the same path with the name
+
+```sh
+logstash-filter-mypluginname-0.1.0.gem
+```
+
+The `s.version` number from your gemspec file will provide the gem version, in this case, `0.1.0`.
+
+
+### Test installation [_test_installation_3]
+
+You should test install your plugin into a clean installation of Logstash. Download the latest version from the [Logstash downloads page](https://www.elastic.co/downloads/logstash/).
+
+1. Untar and cd in to the directory:
+
+    ```sh
+    curl -O https://download.elastic.co/logstash/logstash/logstash-9.0.0.tar.gz
+    tar xzvf logstash-9.0.0.tar.gz
+    cd logstash-9.0.0
+    ```
+
+2. Using the plugin tool, we can install the gem we just built.
+
+    * Replace `/my/logstash/plugins` with  the correct path to the gem for your environment, and `0.1.0` with the correct version number from the gemspec file.
+
+        ```sh
+        bin/logstash-plugin install /my/logstash/plugins/logstash-filter-example/logstash-filter-example-0.1.0.gem
+        ```
+
+    * After running this, you should see feedback from Logstash that it was successfully installed:
+
+        ```sh
+        validating /my/logstash/plugins/logstash-filter-example/logstash-filter-example-0.1.0.gem >= 0
+        Valid logstash plugin. Continuing...
+        Successfully installed 'logstash-filter-example' with version '0.1.0'
+        ```
+
+        ::::{tip}
+        You can also use the Logstash plugin tool to determine which plugins are currently available:
+
+        ```sh
+        bin/logstash-plugin list
+        ```
+
+        Depending on what you have installed, you might see a short or long list of plugins: inputs, codecs, filters and outputs.
+
+        ::::
+
+3. Now try running Logstash with a simple configuration passed in via the command-line, using the `-e` flag.
+
+    ::::{note}
+    Your results will depend on what your filter plugin is designed to do.
+    ::::
+
+
+```sh
+bin/logstash -e 'input { stdin{} } filter { example {} } output {stdout { codec => rubydebug }}'
+```
+
+Test your filter by sending input through `stdin` and output (after filtering) through `stdout` with the `rubydebug` codec, which enhances readability.
+
+In the case of the example filter plugin, any text you send will be replaced by the contents of the `message` configuration parameter, the default value being "Hello World!":
+
+```sh
+Testing 1, 2, 3
+{
+       "message" => "Hello World!",
+      "@version" => "1",
+    "@timestamp" => "2015-01-27T19:17:18.932Z",
+          "host" => "cadenza"
+}
+```
+
+Feel free to experiment and test this by changing the `message` parameter:
+
+```sh
+bin/logstash -e 'input { stdin{} } filter { example { message => "This is a new message!"} } output {stdout { codec => rubydebug }}'
+```
+
+Congratulations! You’ve built, deployed and successfully run a Logstash filter.
+
+
+
+## Submitting your plugin to [RubyGems.org](http://rubygems.org) and [logstash-plugins](https://github.com/logstash-plugins) [_submitting_your_plugin_to_rubygems_orghttprubygems_org_and_logstash_pluginshttpsgithub_comlogstash_plugins_3]
+
+Logstash uses [RubyGems.org](http://rubygems.org) as its repository for all plugin artifacts. Once you have developed your new plugin, you can make it available to Logstash users by simply publishing it to RubyGems.org.
+
+### Licensing [_licensing_3]
+
+Logstash and all its plugins are licensed under [Apache License, version 2 ("ALv2")](https://github.com/elasticsearch/logstash/blob/main/LICENSE). If you make your plugin publicly available via [RubyGems.org](http://rubygems.org), please make sure to have this line in your gemspec:
+
+* `s.licenses = ['Apache License (2.0)']`
+
+
+### Publishing to [RubyGems.org](http://rubygems.org) [_publishing_to_rubygems_orghttprubygems_org_3]
+
+To begin, you’ll need an account on RubyGems.org
+
+* [Sign-up for a RubyGems account](https://rubygems.org/sign_up).
+
+After creating an account, [obtain](http://guides.rubygems.org/rubygems-org-api/#api-authorization) an API key from RubyGems.org. By default, RubyGems uses the file `~/.gem/credentials` to store your API key. These credentials will be used to publish the gem. Replace `username` and `password` with the credentials you created at RubyGems.org:
+
+```sh
+curl -u username:password https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials
+chmod 0600 ~/.gem/credentials
+```
+
+Before proceeding, make sure you have the right version in your gemspec file and commit your changes.
+
+* `s.version = '0.1.0'`
+
+To publish version 0.1.0 of your new logstash gem:
+
+```sh
+bundle install
+bundle exec rake vendor
+bundle exec rspec
+bundle exec rake publish_gem
+```
+
+::::{note}
+Executing `rake publish_gem`:
+
+1. Reads the version from the gemspec file (`s.version = '0.1.0'`)
+2. Checks in your local repository if a tag exists for that version. If the tag already exists, it aborts the process. Otherwise, it creates a new version tag in your local repository.
+3. Builds the gem
+4. Publishes the gem to RubyGems.org
+
+::::
+
+
+That’s it! Your plugin is published! Logstash users can now install your plugin by running:
+
+```sh
+bin/logstash-plugin install logstash-filter-mypluginname
+```
+
+
+
+## Contributing your source code to [logstash-plugins](https://github.com/logstash-plugins) [_contributing_your_source_code_to_logstash_pluginshttpsgithub_comlogstash_plugins_3]
+
+It is not required to contribute your source code to [logstash-plugins](https://github.com/logstash-plugins) github organization, but we always welcome new plugins!
+
+### Benefits [_benefits_3]
+
+Some of the many benefits of having your plugin in the logstash-plugins repository are:
+
+* **Discovery.** Your plugin will appear in the [Logstash Reference](/reference/index.md), where Logstash users look first for plugins and documentation.
+* **Documentation.** Your plugin documentation will automatically be added to the [Logstash Reference](/reference/index.md).
+* **Testing.** With our testing infrastructure, your plugin will be continuously tested against current and future releases of Logstash.  As a result, users will have the assurance that if incompatibilities arise, they will be quickly discovered and corrected.
+
+
+### Acceptance Guidelines [_acceptance_guidelines_3]
+
+* **Code Review.** Your plugin must be reviewed by members of the community for coherence, quality, readability, stability and security.
+* **Tests.** Your plugin must contain tests to be accepted.  These tests are also subject to code review for scope and completeness.  It’s ok if you don’t know how to write tests — we will guide you. We are working on publishing a guide to creating tests for Logstash which will make it easier.  In the meantime, you can refer to [http://betterspecs.org/](http://betterspecs.org/) for examples.
+
+To begin migrating your plugin to logstash-plugins, simply create a new [issue](https://github.com/elasticsearch/logstash/issues) in the Logstash repository. When the acceptance guidelines are completed, we will facilitate the move to the logstash-plugins organization using the recommended [github process](https://help.github.com/articles/transferring-a-repository/#transferring-from-a-user-to-an-organization).
diff --git a/docs/extend/index.md b/docs/extend/index.md
new file mode 100644
index 000000000..9fd781332
--- /dev/null
+++ b/docs/extend/index.md
@@ -0,0 +1,58 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/contributing-to-logstash.html
+---
+
+# Contribute to Logstash [contributing-to-logstash]
+
+You can add your own input, codec, filter, or output plugins to Logstash.
+
+
+### Acceptance guidelines [plugin-acceptance]
+
+Start with the end in mind. These guidelines and best practices can help you build a better plugin, even if you choose not to share it with the world.
+
+* **Consistency.** Your plugin must be consistent in quality and naming conventions used by other plugins. The plugin name must be unique and in this format: `logstash-plugintype-pluginname`. If the plugin name is more than one word, separate words after plugin type with underscores. Example: *logstash-output-elastic_app_search*
+* **Documentation.** Documentation is a required component of your plugin. If we list your plugin in the Logstash Reference, we point to your documentation—​a readme.md, docs/index.asciidoc, or both—​in your plugin repo.
+* **Code Review.** Your plugin must be reviewed by members of the community for coherence, quality, readability, stability and security.
+* **Tests.** Your plugin must contain tests to be accepted. You can refer to [http://betterspecs.org/](http://betterspecs.org/) for examples.
+
+    * Step 1. Enable travis on your account
+    * Step 2. Import our standard travis.yml [https://github.com/logstash-plugins/.ci/blob/1.x/travis/travis.yml](https://github.com/logstash-plugins/.ci/blob/1.x/travis/travis.yml), as shown in the [fingerprint filter example](https://github.com/logstash-plugins/logstash-filter-fingerprint/blob/main/.travis.yml).
+    * Step 3. Have specs in the spec folder.
+
+
+
+## Add a plugin [add-plugin]
+
+Plugins can be developed and deployed independently of the Logstash core. Here are some documents to guide you through the process of coding, deploying, and sharing your plugin:
+
+* Write a new plugin
+
+    * [How to write a Logstash input plugin](/extend/input-new-plugin.md)
+    * [How to write a Logstash codec plugin](/extend/codec-new-plugin.md)
+    * [How to write a Logstash filter plugin](/extend/filter-new-plugin.md)
+    * [How to write a Logstash output plugin](/extend/output-new-plugin.md)
+    * [Community Maintainer’s Guide](/extend/community-maintainer.md)
+
+* [Document your plugin](/extend/plugin-doc.md)
+* [Publish your plugin to RubyGems.org](/extend/publish-plugin.md)
+* [List your plugin](/extend/plugin-listing.md)
+* Contribute a patch
+
+    * [Contributing a patch to a Logstash plugin](/extend/contributing-patch-plugin.md)
+    * [Extending Logstash core](/extend/contribute-to-core.md)
+
+
+
+#### Plugin Shutdown APIs [shutdown-apis]
+
+You have three options for shutting down a plugin: `stop`, `stop?`, and `close`.
+
+* Call the `stop` method from outside the plugin thread. This method signals the plugin to stop.
+* The `stop?` method returns `true` when the `stop` method has already been called for that plugin.
+* The `close` method performs final bookkeeping and cleanup after the plugin’s `run` method and the plugin’s thread both exit. The `close` method is a a new name for the method known as `teardown` in previous versions of Logstash.
+
+The `shutdown`, `finished`, `finished?`, `running?`, and `terminating?` methods are redundant and no longer present in the Plugin Base class.
+
+Sample code for the plugin shutdown APIs is [available](https://github.com/logstash-plugins/logstash-input-example/blob/main/lib/logstash/inputs/example.rb).
diff --git a/docs/extend/input-new-plugin.md b/docs/extend/input-new-plugin.md
new file mode 100644
index 000000000..35e4d057d
--- /dev/null
+++ b/docs/extend/input-new-plugin.md
@@ -0,0 +1,674 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/input-new-plugin.html
+---
+
+# How to write a Logstash input plugin [input-new-plugin]
+
+To develop a new input for Logstash, build a self-contained Ruby gem whose source code lives in its own GitHub repository. The Ruby gem can then be hosted and shared on RubyGems.org. You can use the example input implementation as a starting point. (If you’re unfamiliar with Ruby, you can find an excellent quickstart guide at [https://www.ruby-lang.org/en/documentation/quickstart/](https://www.ruby-lang.org/en/documentation/quickstart/).)
+
+## Get started [_get_started]
+
+Let’s step through creating an input plugin using the [example input plugin](https://github.com/logstash-plugins/logstash-input-example/).
+
+### Create a GitHub repo for your new plugin [_create_a_github_repo_for_your_new_plugin]
+
+Each Logstash plugin lives in its own GitHub repository. To create a new repository for your plugin:
+
+1. Log in to GitHub.
+2. Click the **Repositories** tab. You’ll see a list of other repositories you’ve forked or contributed to.
+3. Click the green **New** button in the upper right.
+4. Specify the following settings for your new repo:
+
+    * **Repository name** — a unique name of the form `logstash-input-pluginname`.
+    * **Public or Private** — your choice, but the repository must be Public if you want to submit it as an official plugin.
+    * **Initialize this repository with a README** — enables you to immediately clone the repository to your computer.
+
+5. Click **Create Repository**.
+
+
+### Use the plugin generator tool [_use_the_plugin_generator_tool]
+
+You can create your own Logstash plugin in seconds! The `generate` subcommand of `bin/logstash-plugin` creates the foundation for a new Logstash plugin with templatized files. It creates the correct directory structure, gemspec files, and dependencies so you can start adding custom code to process data with Logstash.
+
+For more information, see [Generating plugins](/reference/plugin-generator.md)
+
+
+### Copy the input code [_copy_the_input_code]
+
+Alternatively, you can use the examples repo we host on github.com
+
+1. **Clone your plugin.** Replace `GITUSERNAME` with your github username, and `MYPLUGINNAME` with your plugin name.
+
+    * `git clone https://github.com/GITUSERNAME/logstash-``input-MYPLUGINNAME.git`
+
+        * alternately, via ssh: `git clone git@github.com:GITUSERNAME/logstash``-input-MYPLUGINNAME.git`
+
+    * `cd logstash-input-MYPLUGINNAME`
+
+2. **Clone the input plugin example and copy it to your plugin branch.**
+
+    You don’t want to include the example .git directory or its contents, so delete it before you copy the example.
+
+    * `cd /tmp`
+    * `git clone https://github.com/logstash-plugins/logstash``-input-example.git`
+    * `cd logstash-input-example`
+    * `rm -rf .git`
+    * `cp -R * /path/to/logstash-input-mypluginname/`
+
+3. **Rename the following files to match the name of your plugin.**
+
+    * `logstash-input-example.gemspec`
+    * `example.rb`
+    * `example_spec.rb`
+
+        ```txt
+        cd /path/to/logstash-input-mypluginname
+        mv logstash-input-example.gemspec logstash-input-mypluginname.gemspec
+        mv lib/logstash/inputs/example.rb lib/logstash/inputs/mypluginname.rb
+        mv spec/inputs/example_spec.rb spec/inputs/mypluginname_spec.rb
+        ```
+
+
+Your file structure should look like this:
+
+```txt
+$ tree logstash-input-mypluginname
+├── Gemfile
+├── LICENSE
+├── README.md
+├── Rakefile
+├── lib
+│   └── logstash
+│       └── inputs
+│           └── mypluginname.rb
+├── logstash-input-mypluginname.gemspec
+└── spec
+    └── inputs
+        └── mypluginname_spec.rb
+```
+
+For more information about the Ruby gem file structure and an excellent walkthrough of the Ruby gem creation process, see [http://timelessrepo.com/making-ruby-gems](http://timelessrepo.com/making-ruby-gems)
+
+
+### See what your plugin looks like [_see_what_your_plugin_looks_like]
+
+Before we dive into the details, open up the plugin file in your favorite text editor and take a look.
+
+```ruby
+require "logstash/inputs/base"
+require "logstash/namespace"
+require "stud/interval"
+require "socket" # for Socket.gethostname
+
+# Add any asciidoc formatted documentation here
+# Generate a repeating message.
+#
+# This plugin is intended only as an example.
+
+class LogStash::Inputs::Example < LogStash::Inputs::Base
+  config_name "example"
+
+  # If undefined, Logstash will complain, even if codec is unused.
+  default :codec, "plain"
+
+  # The message string to use in the event.
+  config :message, :validate => :string, :default => "Hello World!"
+
+  # Set how frequently messages should be sent.
+  #
+  # The default, `1`, means send a message every second.
+  config :interval, :validate => :number, :default => 1
+
+  public
+  def register
+    @host = Socket.gethostname
+  end # def register
+
+  def run(queue)
+    Stud.interval(@interval) do
+      event = LogStash::Event.new("message" => @message, "host" => @host)
+      decorate(event)
+      queue << event
+    end # loop
+  end # def run
+
+end # class LogStash::Inputs::Example
+```
+
+
+
+## Coding input plugins [_coding_input_plugins]
+
+Now let’s take a line-by-line look at the example plugin.
+
+### `require` Statements [_require_statements]
+
+Logstash input plugins require parent classes defined in `logstash/inputs/base` and logstash/namespace:
+
+```ruby
+require "logstash/inputs/base"
+require "logstash/namespace"
+```
+
+Of course, the plugin you build may depend on other code, or even gems. Just put them here along with these Logstash dependencies.
+
+
+
+## Plugin Body [_plugin_body]
+
+Let’s go through the various elements of the plugin itself.
+
+### `class` Declaration [_class_declaration]
+
+The input plugin class should be a subclass of `LogStash::Inputs::Base`:
+
+```ruby
+class LogStash::Inputs::Example < LogStash::Inputs::Base
+```
+
+The class name should closely mirror the plugin name, for example:
+
+```ruby
+LogStash::Inputs::Example
+```
+
+
+### `config_name` [_config_name]
+
+```ruby
+  config_name "example"
+```
+
+This is the name your plugin will call inside the input configuration block.
+
+If you set `config_name "example"` in your plugin code, the corresponding Logstash configuration block would need to look like this:
+
+```js
+input {
+  example {...}
+}
+```
+
+
+
+## Configuration Parameters [_configuration_parameters]
+
+```ruby
+  config :variable_name, :validate => :variable_type, :default => "Default value", :required => boolean, :deprecated => boolean, :obsolete => string
+```
+
+The configuration, or `config` section allows you to define as many (or as few) parameters as are needed to enable Logstash to process events.
+
+There are several configuration attributes:
+
+* `:validate` - allows you to enforce passing a particular data type to Logstash for this configuration option, such as `:string`, `:password`, `:boolean`, `:number`, `:array`, `:hash`, `:path` (a file-system path), `uri`, `:codec` (since 1.2.0), `:bytes`.  Note that this also works as a coercion in that if I specify "true" for boolean (even though technically a string), it will become a valid boolean in the config.  This coercion works for the `:number` type as well where "1.2" becomes a float and "22" is an integer.
+* `:default` - lets you specify a default value for a parameter
+* `:required` - whether or not this parameter is mandatory (a Boolean `true` or
+* `:list` - whether or not this value should be a list of values. Will typecheck the list members, and convert scalars to one element lists. Note that this mostly obviates the array type, though if you need lists of complex objects that will be more suitable. `false`)
+* `:deprecated` - informational (also a Boolean `true` or `false`)
+* `:obsolete` - used to declare that a given setting has been removed and is no longer functioning. The idea is to provide an informed upgrade path to users who are still using a now-removed setting.
+
+
+## Plugin Methods [_plugin_methods]
+
+Logstash inputs must implement two main methods: `register` and `run`.
+
+### `register` Method [_register_method]
+
+```ruby
+  public
+  def register
+  end # def register
+```
+
+The Logstash `register` method is like an `initialize` method. It was originally created to enforce having `super` called, preventing headaches for newbies. (Note: It may go away in favor of `initialize`, in conjunction with some enforced testing to ensure `super` is called.)
+
+`public` means the method can be called anywhere, not just within the class. This is the default behavior for methods in Ruby, but it is specified explicitly here anyway.
+
+You can also assign instance variables here (variables prepended by `@`). Configuration variables are now in scope as instance variables, like `@message`
+
+
+### `run` Method [_run_method]
+
+The example input plugin has the following `run` Method:
+
+```ruby
+  def run(queue)
+    Stud.interval(@interval) do
+      event = LogStash::Event.new("message" => @message, "host" => @host)
+      decorate(event)
+      queue << event
+    end # loop
+  end # def run
+```
+
+The `run` method is where a stream of data from an input becomes an event.
+
+The stream can be plain or generated as with the [heartbeat](https://github.com/logstash-plugins/logstash-input-heartbeat/blob/main/lib/logstash/inputs/heartbeat.rb#L43-L61) input plugin.  In these cases, though no codec is used, [a default codec](https://github.com/logstash-plugins/logstash-input-heartbeat/blob/main/lib/logstash/inputs/heartbeat.rb#L17) must be set in the code to avoid errors.
+
+Here’s another example `run` method:
+
+```ruby
+  def run(queue)
+    while true
+      begin
+        # Based on some testing, there is no way to interrupt an IO.sysread nor
+        # IO.select call in JRuby.
+        data = $stdin.sysread(16384)
+        @codec.decode(data) do |event|
+          decorate(event)
+          event.set("host", @host) if !event.include?("host")
+          queue << event
+        end
+      rescue IOError, EOFError, LogStash::ShutdownSignal
+        # stdin closed or a requested shutdown
+        break
+      end
+    end # while true
+    finished
+  end # def run
+```
+
+In this example, the `data` is being sent to the codec defined in the configuration block to `decode` the data stream and return an event.
+
+In both examples, the resulting `event` is passed to the `decorate` method:
+
+```ruby
+      decorate(event)
+```
+
+This applies any tags you might have set in the input configuration block. For example, `tags => ["tag1", "tag2"]`.
+
+Also in both examples, the `event`, after being "decorated," is appended to the queue:
+
+```ruby
+      queue << event
+```
+
+This inserts the event into the pipeline.
+
+::::{tip}
+Because input plugins can range from simple to complex, it is helpful to see more examples of how they have been created:
+
+* [syslog](https://github.com/logstash-plugins/logstash-input-syslog/blob/main/lib/logstash/inputs/syslog.rb)
+* [zeromq](https://github.com/logstash-plugins/logstash-input-zeromq/blob/main/lib/logstash/inputs/zeromq.rb)
+* [stdin](https://github.com/logstash-plugins/logstash-input-stdin/blob/main/lib/logstash/inputs/stdin.rb)
+* [tcp](https://github.com/logstash-plugins/logstash-input-tcp/blob/main/lib/logstash/inputs/tcp.rb)
+
+There are many more more examples in the [logstash-plugin github repository](https://github.com/logstash-plugins?query=logstash-input).
+
+::::
+
+
+
+
+## Building the Plugin [_building_the_plugin]
+
+At this point in the process you have coded your plugin and are ready to build a Ruby Gem from it. The following information will help you complete the process.
+
+### External dependencies [_external_dependencies]
+
+A `require` statement in Ruby is used to include necessary code. In some cases your plugin may require additional files.  For example, the collectd plugin [uses](https://github.com/logstash-plugins/logstash-codec-collectd/blob/main/lib/logstash/codecs/collectd.rb#L148) the `types.db` file provided by collectd.  In the main directory of your plugin, a file called `vendor.json` is where these files are described.
+
+The `vendor.json` file contains an array of JSON objects, each describing a file dependency. This example comes from the [collectd](https://github.com/logstash-plugins/logstash-codec-collectd/blob/main/vendor.json) codec plugin:
+
+```txt
+[{
+        "sha1": "a90fe6cc53b76b7bdd56dc57950d90787cb9c96e",
+        "url": "http://collectd.org/files/collectd-5.4.0.tar.gz",
+        "files": [ "/src/types.db" ]
+}]
+```
+
+* `sha1` is the sha1 signature used to verify the integrity of the file referenced by `url`.
+* `url` is the address from where Logstash will download the file.
+* `files` is an optional array of files to extract from the downloaded file. Note that while tar archives can use absolute or relative paths, treat them as absolute in this array.  If `files` is not present, all files will be uncompressed and extracted into the vendor directory.
+
+Another example of the `vendor.json` file is the [`geoip` filter](https://github.com/logstash-plugins/logstash-filter-geoip/blob/main/vendor.json)
+
+The process used to download these dependencies is to call `rake vendor`.  This will be discussed further in the testing section of this document.
+
+Another kind of external dependency is on jar files.  This will be described in the "Add a `gemspec` file" section.
+
+
+### Deprecated features [_deprecated_features]
+
+As a plugin evolves, an option or feature may no longer serve the intended purpose, and the developer may want to *deprecate* its usage. Deprecation warns users about the option’s status, so they aren’t caught by surprise when it is removed in a later release.
+
+{{ls}} 7.6 introduced a *deprecation logger* to make handling those situations easier. You can use the [adapter](https://github.com/logstash-plugins/logstash-mixin-deprecation_logger_support) to ensure that your plugin can use the deprecation logger while still supporting older versions of {{ls}}. See the [readme](https://github.com/logstash-plugins/logstash-mixin-deprecation_logger_support/blob/main/README.md) for more information and for instructions on using the adapter.
+
+Deprecations are noted in the `logstash-deprecation.log` file in the `log` directory.
+
+
+### Add a Gemfile [_add_a_gemfile]
+
+Gemfiles allow Ruby’s Bundler to maintain the dependencies for your plugin. Currently, all we’ll need is the Logstash gem, for testing, but if you require other gems, you should add them in here.
+
+::::{tip}
+See [Bundler’s Gemfile page](http://bundler.io/gemfile.html) for more details.
+::::
+
+
+```ruby
+source 'https://rubygems.org'
+gemspec
+gem "logstash", :github => "elastic/logstash", :branch => "master"
+```
+
+
+
+## Add a `gemspec` file [_add_a_gemspec_file]
+
+Gemspecs define the Ruby gem which will be built and contain your plugin.
+
+::::{tip}
+More information can be found on the [Rubygems Specification page](http://guides.rubygems.org/specification-reference/).
+::::
+
+
+```ruby
+Gem::Specification.new do |s|
+  s.name = 'logstash-input-example'
+  s.version = '0.1.0'
+  s.licenses = ['Apache License (2.0)']
+  s.summary = "This input does x, y, z in Logstash"
+  s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
+  s.authors = ["Elastic"]
+  s.email = 'info@elastic.co'
+  s.homepage = "http://www.elastic.co/guide/en/logstash/current/index.html"
+  s.require_paths = ["lib"]
+
+  # Files
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
+   # Tests
+  s.test_files = s.files.grep(%r{^(test|spec|features)/})
+
+  # Special flag to let us know this is actually a logstash plugin
+  s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
+
+  # Gem dependencies
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
+  s.add_development_dependency 'logstash-devutils'
+end
+```
+
+It is appropriate to change these values to fit your plugin. In particular, `s.name` and `s.summary` should reflect your plugin’s name and behavior.
+
+`s.licenses` and `s.version` are also important and will come into play when you are ready to publish your plugin.
+
+Logstash and all its plugins are licensed under [Apache License, version 2 ("ALv2")](https://github.com/elastic/logstash/blob/main/LICENSE.txt). If you make your plugin publicly available via [RubyGems.org](http://rubygems.org), please make sure to have this line in your gemspec:
+
+* `s.licenses = ['Apache License (2.0)']`
+
+The gem version, designated by `s.version`, helps track changes to plugins over time. You should use [semver versioning](http://semver.org/) strategy for version numbers.
+
+### Runtime and Development Dependencies [_runtime_and_development_dependencies]
+
+At the bottom of the `gemspec` file is a section with a comment: `Gem dependencies`.  This is where any other needed gems must be mentioned. If a gem is necessary for your plugin to function, it is a runtime dependency. If a gem are only used for testing, then it would be a development dependency.
+
+::::{note}
+You can also have versioning requirements for your dependencies—​including other Logstash plugins:
+
+```ruby
+  # Gem dependencies
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
+  s.add_development_dependency 'logstash-devutils'
+```
+
+This gemspec has a runtime dependency on the logstash-core-plugin-api and requires that it have a version number greater than or equal to version 1.60 and less than or equal to version 2.99.
+
+::::
+
+
+::::{important}
+All plugins have a runtime dependency on the `logstash-core-plugin-api` gem, and a development dependency on `logstash-devutils`.
+::::
+
+
+
+### Jar dependencies [_jar_dependencies]
+
+In some cases, such as the [Elasticsearch output plugin](https://github.com/logstash-plugins/logstash-output-elasticsearch/blob/main/logstash-output-elasticsearch.gemspec#L22-L23), your code may depend on a jar file.  In cases such as this, the dependency is added in the gemspec file in this manner:
+
+```ruby
+  # Jar dependencies
+  s.requirements << "jar 'org.elasticsearch:elasticsearch', '5.0.0'"
+  s.add_runtime_dependency 'jar-dependencies'
+```
+
+With these both defined, the install process will search for the required jar file at [http://mvnrepository.com](http://mvnrepository.com) and download the specified version.
+
+
+
+## Document your plugin [_document_your_plugin]
+
+Documentation is an important part of your plugin. All plugin documentation is rendered and placed in the [Logstash Reference](/reference/index.md) and the [Versioned plugin docs](logstash-docs-md://vpr/integration-plugins.md).
+
+See [Document your plugin](/extend/plugin-doc.md) for tips and guidelines.
+
+
+## Add Tests [_add_tests]
+
+Logstash loves tests. Lots of tests. If you’re using your new input plugin in a production environment, you’ll want to have some tests to ensure you are not breaking any existing functionality.
+
+::::{note}
+A full exposition on RSpec is outside the scope of this document. Learn more about RSpec at [http://rspec.info](http://rspec.info)
+::::
+
+
+For help learning about tests and testing, look in the `spec/inputs/` directory of several other similar plugins.
+
+
+## Clone and test! [_clone_and_test]
+
+Now let’s start with a fresh clone of the plugin, build it and run the tests.
+
+* **Clone your plugin into a temporary location** Replace `GITUSERNAME` with your github username, and `MYPLUGINNAME` with your plugin name.
+
+    * `git clone https://github.com/GITUSERNAME/logstash-``input-MYPLUGINNAME.git`
+
+        * alternately, via ssh: `git clone git@github.com:GITUSERNAME/logstash-``input-MYPLUGINNAME.git`
+
+    * `cd logstash-input-MYPLUGINNAME`
+
+
+Then, you’ll need to install your plugins dependencies with bundler:
+
+```
+bundle install
+```
+
+::::{important}
+If your plugin has an external file dependency described in `vendor.json`, you must download that dependency before running or testing.  You can do this by running:
+
+```
+rake vendor
+```
+
+::::
+
+
+And finally, run the tests:
+
+```
+bundle exec rspec
+```
+
+You should see a success message, which looks something like this:
+
+```
+Finished in 0.034 seconds
+1 example, 0 failures
+```
+
+Hooray! You’re almost there! (Unless you saw failures…​ you should fix those first).
+
+
+## Building and Testing [_building_and_testing]
+
+Now you’re ready to build your (well-tested) plugin into a Ruby gem.
+
+### Build [_build]
+
+You already have all the necessary ingredients, so let’s go ahead and run the build command:
+
+```sh
+gem build logstash-input-example.gemspec
+```
+
+That’s it!  Your gem should be built and be in the same path with the name
+
+```sh
+logstash-input-mypluginname-0.1.0.gem
+```
+
+The `s.version` number from your gemspec file will provide the gem version, in this case, `0.1.0`.
+
+
+### Test installation [_test_installation]
+
+You should test install your plugin into a clean installation of Logstash. Download the latest version from the [Logstash downloads page](https://www.elastic.co/downloads/logstash/).
+
+1. Untar and cd in to the directory:
+
+    ```sh
+    curl -O https://download.elastic.co/logstash/logstash/logstash-9.0.0.tar.gz
+    tar xzvf logstash-9.0.0.tar.gz
+    cd logstash-9.0.0
+    ```
+
+2. Using the plugin tool, we can install the gem we just built.
+
+    * Replace `/my/logstash/plugins` with  the correct path to the gem for your environment, and `0.1.0` with the correct version number from the gemspec file.
+
+        ```sh
+        bin/logstash-plugin install /my/logstash/plugins/logstash-input-example/logstash-input-example-0.1.0.gem
+        ```
+
+    * After running this, you should see feedback from Logstash that it was successfully installed:
+
+        ```sh
+        validating /my/logstash/plugins/logstash-input-example/logstash-input-example-0.1.0.gem >= 0
+        Valid logstash plugin. Continuing...
+        Successfully installed 'logstash-input-example' with version '0.1.0'
+        ```
+
+        ::::{tip}
+        You can also use the Logstash plugin tool to determine which plugins are currently available:
+
+        ```sh
+        bin/logstash-plugin list
+        ```
+
+        Depending on what you have installed, you might see a short or long list of plugins: inputs, codecs, filters and outputs.
+
+        ::::
+
+3. Now try running Logstash with a simple configuration passed in via the command-line, using the `-e` flag.
+
+    ::::{note}
+    Your results will depend on what your input plugin is designed to do.
+    ::::
+
+
+```sh
+bin/logstash -e 'input { example{} } output {stdout { codec => rubydebug }}'
+```
+
+The example input plugin will send the contents of `message` (with a default message of "Hello World!") every second.
+
+```sh
+{
+       "message" => "Hello World!",
+      "@version" => "1",
+    "@timestamp" => "2015-01-27T19:17:18.932Z",
+          "host" => "cadenza"
+}
+```
+
+Feel free to experiment and test this by changing the `message` and `interval` parameters:
+
+```sh
+bin/logstash -e 'input { example{ message => "A different message" interval => 5 } } output {stdout { codec => rubydebug }}'
+```
+
+Congratulations! You’ve built, deployed and successfully run a Logstash input.
+
+
+
+## Submitting your plugin to [RubyGems.org](http://rubygems.org) and [logstash-plugins](https://github.com/logstash-plugins) [_submitting_your_plugin_to_rubygems_orghttprubygems_org_and_logstash_pluginshttpsgithub_comlogstash_plugins]
+
+Logstash uses [RubyGems.org](http://rubygems.org) as its repository for all plugin artifacts. Once you have developed your new plugin, you can make it available to Logstash users by simply publishing it to RubyGems.org.
+
+### Licensing [_licensing]
+
+Logstash and all its plugins are licensed under [Apache License, version 2 ("ALv2")](https://github.com/elasticsearch/logstash/blob/main/LICENSE). If you make your plugin publicly available via [RubyGems.org](http://rubygems.org), please make sure to have this line in your gemspec:
+
+* `s.licenses = ['Apache License (2.0)']`
+
+
+### Publishing to [RubyGems.org](http://rubygems.org) [_publishing_to_rubygems_orghttprubygems_org]
+
+To begin, you’ll need an account on RubyGems.org
+
+* [Sign-up for a RubyGems account](https://rubygems.org/sign_up).
+
+After creating an account, [obtain](http://guides.rubygems.org/rubygems-org-api/#api-authorization) an API key from RubyGems.org. By default, RubyGems uses the file `~/.gem/credentials` to store your API key. These credentials will be used to publish the gem. Replace `username` and `password` with the credentials you created at RubyGems.org:
+
+```sh
+curl -u username:password https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials
+chmod 0600 ~/.gem/credentials
+```
+
+Before proceeding, make sure you have the right version in your gemspec file and commit your changes.
+
+* `s.version = '0.1.0'`
+
+To publish version 0.1.0 of your new logstash gem:
+
+```sh
+bundle install
+bundle exec rake vendor
+bundle exec rspec
+bundle exec rake publish_gem
+```
+
+::::{note}
+Executing `rake publish_gem`:
+
+1. Reads the version from the gemspec file (`s.version = '0.1.0'`)
+2. Checks in your local repository if a tag exists for that version. If the tag already exists, it aborts the process. Otherwise, it creates a new version tag in your local repository.
+3. Builds the gem
+4. Publishes the gem to RubyGems.org
+
+::::
+
+
+That’s it! Your plugin is published! Logstash users can now install your plugin by running:
+
+```sh
+bin/logstash-plugin install logstash-input-mypluginname
+```
+
+
+
+## Contributing your source code to [logstash-plugins](https://github.com/logstash-plugins) [_contributing_your_source_code_to_logstash_pluginshttpsgithub_comlogstash_plugins]
+
+It is not required to contribute your source code to [logstash-plugins](https://github.com/logstash-plugins) github organization, but we always welcome new plugins!
+
+### Benefits [_benefits]
+
+Some of the many benefits of having your plugin in the logstash-plugins repository are:
+
+* **Discovery.** Your plugin will appear in the [Logstash Reference](/reference/index.md), where Logstash users look first for plugins and documentation.
+* **Documentation.** Your plugin documentation will automatically be added to the [Logstash Reference](/reference/index.md).
+* **Testing.** With our testing infrastructure, your plugin will be continuously tested against current and future releases of Logstash.  As a result, users will have the assurance that if incompatibilities arise, they will be quickly discovered and corrected.
+
+
+### Acceptance Guidelines [_acceptance_guidelines]
+
+* **Code Review.** Your plugin must be reviewed by members of the community for coherence, quality, readability, stability and security.
+* **Tests.** Your plugin must contain tests to be accepted.  These tests are also subject to code review for scope and completeness.  It’s ok if you don’t know how to write tests — we will guide you. We are working on publishing a guide to creating tests for Logstash which will make it easier.  In the meantime, you can refer to [http://betterspecs.org/](http://betterspecs.org/) for examples.
+
+To begin migrating your plugin to logstash-plugins, simply create a new [issue](https://github.com/elasticsearch/logstash/issues) in the Logstash repository. When the acceptance guidelines are completed, we will facilitate the move to the logstash-plugins organization using the recommended [github process](https://help.github.com/articles/transferring-a-repository/#transferring-from-a-user-to-an-organization).
diff --git a/docs/extend/java-codec-plugin.md b/docs/extend/java-codec-plugin.md
new file mode 100644
index 000000000..75c0562ed
--- /dev/null
+++ b/docs/extend/java-codec-plugin.md
@@ -0,0 +1,348 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/java-codec-plugin.html
+---
+
+# How to write a Java codec plugin [java-codec-plugin]
+
+::::{note}
+Java codecs are currently supported only for Java input and output plugins. They will not work with Ruby input or output plugins.
+::::
+
+
+To develop a new Java codec for Logstash, you write a new Java class that conforms to the Logstash Java Codecs API, package it, and install it with the logstash-plugin utility. We’ll go through each of those steps.
+
+
+## Set up your environment [_set_up_your_environment_2]
+
+
+### Copy the example repo [_copy_the_example_repo_2]
+
+Start by copying the [example codec plugin](https://github.com/logstash-plugins/logstash-codec-java_codec_example). The plugin API is currently part of the Logstash codebase so you must have a local copy of that available. You can obtain a copy of the Logstash codebase with the following `git` command:
+
+```shell
+git clone --branch <branch_name> --single-branch https://github.com/elastic/logstash.git <target_folder>
+```
+
+The `branch_name` should correspond to the version of Logstash containing the preferred revision of the Java plugin API.
+
+::::{note}
+The GA version of the Java plugin API is available in the `7.2` and later branches of the Logstash codebase.
+::::
+
+
+Specify the `target_folder` for your local copy of the Logstash codebase. If you do not specify `target_folder`, it defaults to a new folder called `logstash` under your current folder.
+
+
+### Generate the .jar file [_generate_the_jar_file_2]
+
+After you have obtained a copy of the appropriate revision of the Logstash codebase, you need to compile it to generate the .jar file containing the Java plugin API. From the root directory of your Logstash codebase ($LS_HOME), you can compile it with `./gradlew assemble` (or `gradlew.bat assemble` if you’re running on Windows). This should produce the `$LS_HOME/logstash-core/build/libs/logstash-core-x.y.z.jar` where `x`, `y`, and `z` refer to the version of Logstash.
+
+After you have successfully compiled Logstash, you need to tell your Java plugin where to find the `logstash-core-x.y.z.jar` file. Create a new file named `gradle.properties` in the root folder of your plugin project. That file should have a single line:
+
+```txt
+LOGSTASH_CORE_PATH=<target_folder>/logstash-core
+```
+
+where `target_folder` is the root folder of your local copy of the Logstash codebase.
+
+
+## Code the plugin [_code_the_plugin_2]
+
+The example codec plugin decodes messages separated by a configurable delimiter and encodes messages by writing their string  representation separated by a delimiter. For example, if the codec were configured with `/` as the delimiter, the input text `event1/event2/` would be decoded into two separate events with `message` fields of `event1` and `event2`,  respectively. Note that this is only an example codec and does not cover all the edge cases that a production-grade codec should cover.
+
+Let’s look at the main class in that codec filter:
+
+```java
+@LogstashPlugin(name="java_codec_example")
+public class JavaCodecExample implements Codec {
+
+    public static final PluginConfigSpec<String> DELIMITER_CONFIG =
+            PluginConfigSpec.stringSetting("delimiter", ",");
+
+    private final String id;
+    private final String delimiter;
+
+    public JavaCodecExample(final Configuration config, final Context context) {
+        this(config.get(DELIMITER_CONFIG));
+    }
+
+    private JavaCodecExample(String delimiter) {
+        this.id = UUID.randomUUID().toString();
+        this.delimiter = delimiter;
+    }
+
+    @Override
+    public void decode(ByteBuffer byteBuffer, Consumer<Map<String, Object>> consumer) {
+        // a not-production-grade delimiter decoder
+        byte[] byteInput = new byte[byteBuffer.remaining()];
+        byteBuffer.get(byteInput);
+        if (byteInput.length > 0) {
+            String input = new String(byteInput);
+            String[] split = input.split(delimiter);
+            for (String s : split) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("message", s);
+                consumer.accept(map);
+            }
+        }
+    }
+
+    @Override
+    public void flush(ByteBuffer byteBuffer, Consumer<Map<String, Object>> consumer) {
+        // if the codec maintains any internal state such as partially-decoded input, this
+        // method should flush that state along with any additional input supplied in
+        // the ByteBuffer
+
+        decode(byteBuffer, consumer); // this is a simplistic implementation
+    }
+
+    @Override
+    public void encode(Event event, OutputStream outputStream) throws IOException {
+        outputStream.write((event.toString() + delimiter).getBytes(Charset.defaultCharset()));
+    }
+
+    @Override
+    public Collection<PluginConfigSpec<?>> configSchema() {
+        // should return a list of all configuration options for this plugin
+        return Collections.singletonList(DELIMITER_CONFIG);
+    }
+
+    @Override
+    public Codec cloneCodec() {
+        return new JavaCodecExample(this.delimiter);
+    }
+
+    @Override
+    public String getId() {
+        return this.id;
+    }
+
+}
+```
+
+Let’s step through and examine each part of that class.
+
+
+### Class declaration [_class_declaration_6]
+
+```java
+@LogstashPlugin(name="java_codec_example")
+public class JavaCodecExample implements Codec {
+```
+
+Notes about the class declaration:
+
+* All Java plugins must be annotated with the `@LogstashPlugin` annotation. Additionally:
+
+    * The `name` property of the annotation must be supplied and defines the name of the plugin as it will be used in the Logstash pipeline definition. For example, this codec would be referenced in the codec section of the an appropriate input or output in the Logstash pipeline defintion as `codec => java_codec_example { }`
+    * The value of the `name` property must match the name of the class excluding casing and underscores.
+
+* The class must implement the `co.elastic.logstash.api.Codec` interface.
+* Java plugins may not be created in the `org.logstash` or `co.elastic.logstash` packages to prevent potential clashes with classes in Logstash itself.
+
+
+#### Plugin settings [_plugin_settings_2]
+
+The snippet below contains both the setting definition and the method referencing it:
+
+```java
+public static final PluginConfigSpec<String> DELIMITER_CONFIG =
+        PluginConfigSpec.stringSetting("delimiter", ",");
+
+@Override
+public Collection<PluginConfigSpec<?>> configSchema() {
+    return Collections.singletonList(DELIMITER_CONFIG);
+}
+```
+
+The `PluginConfigSpec` class allows developers to specify the settings that a plugin supports complete with setting  name, data type, deprecation status, required status, and default value. In this example, the `delimiter` setting defines the delimiter on which the codec will split events. It is not a required setting and if it is not explicitly  set, its default value will be `,`.
+
+The `configSchema` method must return a list of all settings that the plugin supports. The Logstash execution engine  will validate that all required settings are present and that no unsupported settings are present.
+
+
+#### Constructor and initialization [_constructor_and_initialization_2]
+
+```java
+private final String id;
+private final String delimiter;
+
+public JavaCodecExample(final Configuration config, final Context context) {
+    this(config.get(DELIMITER_CONFIG));
+}
+
+private JavaCodecExample(String delimiter) {
+    this.id = UUID.randomUUID().toString();
+    this.delimiter = delimiter;
+}
+```
+
+All Java codec plugins must have a constructor taking a `Configuration` and `Context` argument. This is the  constructor that will be used to instantiate them at runtime. The retrieval and validation of all plugin settings  should occur in this constructor. In this example, the delimiter to be used for delimiting events is retrieved from  its setting and stored in a local variable so that it can be used later in the `decode` and `encode` methods. The codec’s ID is initialized to a random UUID (as should be done for most codecs), and a local `encoder` variable is initialized to encode and decode with a specified character set.
+
+Any additional initialization may occur in the constructor as well. If there are any unrecoverable errors encountered in the configuration or initialization of the codec plugin, a descriptive exception should be thrown. The exception will be logged and will prevent Logstash from starting.
+
+
+### Codec methods [_codec_methods]
+
+```java
+@Override
+public void decode(ByteBuffer byteBuffer, Consumer<Map<String, Object>> consumer) {
+    // a not-production-grade delimiter decoder
+    byte[] byteInput = new byte[byteBuffer.remaining()];
+    byteBuffer.get(byteInput);
+    if (byteInput.length > 0) {
+        String input = new String(byteInput);
+        String[] split = input.split(delimiter);
+        for (String s : split) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("message", s);
+            consumer.accept(map);
+        }
+    }
+}
+
+@Override
+public void flush(ByteBuffer byteBuffer, Consumer<Map<String, Object>> consumer) {
+    // if the codec maintains any internal state such as partially-decoded input, this
+    // method should flush that state along with any additional input supplied in
+    // the ByteBuffer
+
+    decode(byteBuffer, consumer); // this is a simplistic implementation
+}
+
+@Override
+public void encode(Event event, OutputStream outputStream) throws IOException {
+    outputStream.write((event.toString() + delimiter).getBytes(Charset.defaultCharset()));
+}
+```
+
+The `decode`, `flush`, and `encode` methods provide the core functionality of the codec. Codecs may be used by inputs to decode a sequence or stream of bytes into events or by outputs to encode events into a sequence of bytes.
+
+The `decode` method decodes events from the specified `ByteBuffer` and passes them to the provided `Consumer`. The  input must provide a `ByteBuffer` that is ready for reading with `byteBuffer.position()` indicating the next position to read and `byteBuffer.limit()` indicating the first byte in the buffer that is not safe to read. Codecs must ensure that `byteBuffer.position()` reflects the last-read position before returning control to the input. The input is then responsible for returning the buffer to write mode via either `byteBuffer.clear()` or `byteBuffer.compact()` before resuming writes. In the example above, the `decode` method simply splits the incoming byte stream on the specified delimiter. A production-grade codec such as [`java-line`](https://github.com/elastic/logstash/blob/main/logstash-core/src/main/java/org/logstash/plugins/codecs/Line.java) would not make the simplifying assumption that the end of the supplied byte stream corresponded with the end of an event.
+
+Events should be constructed as instances of `Map<String, Object>` and pushed into the event pipeline via the `Consumer<Map<String, Object>>.accept()` method. To reduce allocations and GC pressure, codecs may reuse the same map instance by modifying its fields between calls to `Consumer<Map<String, Object>>.accept()` because the event pipeline will create events based on a copy of the map’s data.
+
+The `flush` method works in coordination with the `decode` method to decode all remaining events from the specified  `ByteBuffer` along with any internal state that may remain after previous calls to the `decode` method. As an example of internal state that a codec might maintain, consider an input stream of bytes `event1/event2/event3` with a  delimiter of `/`. Due to buffering or other reasons, the input might supply a partial stream of bytes such as  `event1/eve` to the codec’s `decode` method. In this case, the codec could save the beginning three characters `eve`  of the second event rather than assuming that the supplied byte stream ends on an event boundary. If the next call to `decode` supplied the `nt2/ev` bytes, the codec would prepend the saved `eve` bytes to produce the full `event2` event and then save the remaining `ev` bytes for decoding when the remainder of the bytes for that event were supplied. A call to `flush` signals the codec that the supplied bytes represent the end of an event stream and all remaining bytes should be decoded to events. The `flush` example above is a simplistic implementation that does not maintain any state about partially-supplied byte streams across calls to `decode`.
+
+The `encode` method encodes an event into a sequence of bytes and writes it into the specified `OutputStream`. Because a single codec instance is shared across all pipeline workers in the output stage of the Logstash pipeline, codecs should *not* retain state across calls to their `encode` methods.
+
+
+### cloneCodec method [_clonecodec_method]
+
+```java
+@Override
+public Codec cloneCodec() {
+    return new JavaCodecExample(this.delimiter);
+}
+```
+
+The `cloneCodec` method should return an identical instance of the codec with the exception of its ID. Because codecs may be stateful across calls to their `decode` methods, input plugins that are multi-threaded should use a separate instance of each codec via the `cloneCodec` method for each of their threads. Because a single codec instance is shared across all pipeline workers in the output stage of the Logstash pipeline, codecs should *not* retain state across calls to their `encode` methods. In the example above, the codec is cloned with the same delimiter but a different ID.
+
+
+### getId method [_getid_method_2]
+
+```java
+@Override
+public String getId() {
+    return id;
+}
+```
+
+For codec plugins, the `getId` method should always return the id that was set at instantiation time. This is typically an UUID.
+
+
+### Unit tests [_unit_tests_2]
+
+Lastly, but certainly not least importantly, unit tests are strongly encouraged. The example codec plugin includes an [example unit test](https://github.com/logstash-plugins/logstash-codec-java_codec_example/blob/main/src/test/java/org/logstashplugins/JavaCodecExampleTest.java) that you can use as a template for your own.
+
+
+## Package and deploy [_package_and_deploy_2]
+
+Java plugins are packaged as Ruby gems for dependency management and interoperability with Ruby plugins. Once they are packaged as gems, they may be installed with the `logstash-plugin` utility just as Ruby plugins are. Because no knowledge of Ruby or its toolchain should be required for Java plugin development, the procedure for packaging Java plugins as Ruby gems has been automated through a custom task in the Gradle build file provided with the example Java plugins. The following sections describe how to configure and execute that packaging task as well as how to install the packaged Java plugin in Logstash.
+
+
+### Configuring the Gradle packaging task [_configuring_the_gradle_packaging_task_2]
+
+The following section appears near the top of the `build.gradle` file supplied with the example Java plugins:
+
+```java
+// ===========================================================================
+// plugin info
+// ===========================================================================
+group                      'org.logstashplugins' // must match the package of the main plugin class
+version                    "${file("VERSION").text.trim()}" // read from required VERSION file
+description                = "Example Java filter implementation"
+pluginInfo.licenses        = ['Apache-2.0'] // list of SPDX license IDs
+pluginInfo.longDescription = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using \$LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
+pluginInfo.authors         = ['Elasticsearch']
+pluginInfo.email           = ['info@elastic.co']
+pluginInfo.homepage        = "http://www.elastic.co/guide/en/logstash/current/index.html"
+pluginInfo.pluginType      = "filter"
+pluginInfo.pluginClass     = "JavaFilterExample"
+pluginInfo.pluginName      = "java_filter_example"
+// ===========================================================================
+```
+
+You should configure the values above for your plugin.
+
+* The `version` value will be automatically read from the `VERSION` file in the root of your plugin’s codebase.
+* `pluginInfo.pluginType` should be set to one of `input`, `filter`, `codec`, or `output`.
+* `pluginInfo.pluginName` must match the name specified on the `@LogstashPlugin` annotation on the main plugin class. The Gradle packaging task will validate that and return an error if they do not match.
+
+
+### Running the Gradle packaging task [_running_the_gradle_packaging_task_2]
+
+Several Ruby source files along with a `gemspec` file and a `Gemfile` are required to package the plugin as a Ruby gem. These Ruby files are used only for defining the Ruby gem structure or at Logstash startup time to register the Java plugin. They are not used during runtime event processing. The Gradle packaging task automatically generates all of these files based on the values configured in the section above.
+
+You run the Gradle packaging task with the following command:
+
+```shell
+./gradlew gem
+```
+
+For Windows platforms: Substitute `gradlew.bat` for `./gradlew` as appropriate in the command.
+
+That task will produce a gem file in the root directory of your plugin’s codebase with the name `logstash-{{plugintype}}-<pluginName>-<version>.gem`
+
+
+### Installing the Java plugin in Logstash [_installing_the_java_plugin_in_logstash_2]
+
+After you have packaged your Java plugin as a Ruby gem, you can install it in Logstash with this command:
+
+```shell
+bin/logstash-plugin install --no-verify --local /path/to/javaPlugin.gem
+```
+
+For Windows platforms: Substitute backslashes for forward slashes as appropriate in the command.
+
+
+## Run Logstash with the Java codec plugin [_run_logstash_with_the_java_codec_plugin]
+
+To test the plugin, start Logstash with:
+
+```java
+echo "foo,bar" | bin/logstash -e 'input { java_stdin { codec => java_codec_example } }'
+```
+
+The expected Logstash output (excluding initialization) with the configuration above is:
+
+```txt
+{
+      "@version" => "1",
+       "message" => "foo",
+    "@timestamp" => yyyy-MM-ddThh:mm:ss.SSSZ,
+          "host" => "<yourHostName>"
+}
+{
+      "@version" => "1",
+       "message" => "bar\n",
+    "@timestamp" => yyyy-MM-ddThh:mm:ss.SSSZ,
+          "host" => "<yourHostName>"
+}
+```
+
+
+## Feedback [_feedback_2]
+
+If you have any feedback on Java plugin support in Logstash, please comment on our [main Github issue](https://github.com/elastic/logstash/issues/9215) or post in the [Logstash forum](https://discuss.elastic.co/c/logstash).
+
diff --git a/docs/extend/java-filter-plugin.md b/docs/extend/java-filter-plugin.md
new file mode 100644
index 000000000..69c68204b
--- /dev/null
+++ b/docs/extend/java-filter-plugin.md
@@ -0,0 +1,307 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/java-filter-plugin.html
+---
+
+# How to write a Java filter plugin [java-filter-plugin]
+
+To develop a new Java filter for Logstash, you write a new Java class that conforms to the Logstash Java Filters API, package it, and install it with the logstash-plugin utility. We’ll go through each of those steps.
+
+
+## Set up your environment [_set_up_your_environment_3]
+
+
+### Copy the example repo [_copy_the_example_repo_3]
+
+Start by copying the [example filter plugin](https://github.com/logstash-plugins/logstash-filter-java_filter_example). The plugin API is currently part of the Logstash codebase so you must have a local copy of that available. You can obtain a copy of the Logstash codebase with the following `git` command:
+
+```shell
+git clone --branch <branch_name> --single-branch https://github.com/elastic/logstash.git <target_folder>
+```
+
+The `branch_name` should correspond to the version of Logstash containing the preferred revision of the Java plugin API.
+
+::::{note}
+The GA version of the Java plugin API is available in the `7.2` and later branches of the Logstash codebase.
+::::
+
+
+Specify the `target_folder` for your local copy of the Logstash codebase. If you do not specify `target_folder`, it defaults to a new folder called `logstash` under your current folder.
+
+
+### Generate the .jar file [_generate_the_jar_file_3]
+
+After you have obtained a copy of the appropriate revision of the Logstash codebase, you need to compile it to generate the .jar file containing the Java plugin API. From the root directory of your Logstash codebase ($LS_HOME), you can compile it with `./gradlew assemble` (or `gradlew.bat assemble` if you’re running on Windows). This should produce the `$LS_HOME/logstash-core/build/libs/logstash-core-x.y.z.jar` where `x`, `y`, and `z` refer to the version of Logstash.
+
+After you have successfully compiled Logstash, you need to tell your Java plugin where to find the `logstash-core-x.y.z.jar` file. Create a new file named `gradle.properties` in the root folder of your plugin project. That file should have a single line:
+
+```txt
+LOGSTASH_CORE_PATH=<target_folder>/logstash-core
+```
+
+where `target_folder` is the root folder of your local copy of the Logstash codebase.
+
+
+## Code the plugin [_code_the_plugin_3]
+
+The example filter plugin allows one to configure a field in each event that will be reversed. For example, if the filter were  configured to reverse the `day_of_week` field, an event with `day_of_week: "Monday"` would be transformed to `day_of_week: "yadnoM"`. Let’s look at the main class in that example filter:
+
+```java
+@LogstashPlugin(name = "java_filter_example")
+public class JavaFilterExample implements Filter {
+
+    public static final PluginConfigSpec<String> SOURCE_CONFIG =
+            PluginConfigSpec.stringSetting("source", "message");
+
+    private String id;
+    private String sourceField;
+
+    public JavaFilterExample(String id, Configuration config, Context context) {
+        this.id = id;
+        this.sourceField = config.get(SOURCE_CONFIG);
+    }
+
+    @Override
+    public Collection<Event> filter(Collection<Event> events, FilterMatchListener matchListener) {
+        for (Event e : events) {
+            Object f = e.getField(sourceField);
+            if (f instanceof String) {
+                e.setField(sourceField, StringUtils.reverse((String)f));
+                matchListener.filterMatched(e);
+            }
+        }
+        return events;
+    }
+
+    @Override
+    public Collection<PluginConfigSpec<?>> configSchema() {
+        return Collections.singletonList(SOURCE_CONFIG);
+    }
+
+    @Override
+    public String getId() {
+        return this.id;
+    }
+
+    @Override
+    public void close() {
+        this.sourceField = null;
+        return;
+    }
+}
+```
+
+Let’s step through and examine each part of that class.
+
+
+### Class declaration [_class_declaration_7]
+
+```java
+@LogstashPlugin(name = "java_filter_example")
+public class JavaFilterExample implements Filter {
+```
+
+Notes about the class declaration:
+
+* All Java plugins must be annotated with the `@LogstashPlugin` annotation. Additionally:
+
+    * The `name` property of the annotation must be supplied and defines the name of the plugin as it will be used in the Logstash pipeline definition. For example, this filter would be referenced in the filter section of the Logstash pipeline defintion as `filter { java_filter_example => { .... } }`
+    * The value of the `name` property must match the name of the class excluding casing and underscores.
+
+* The class must implement the `co.elastic.logstash.api.Filter` interface.
+* Java plugins may not be created in the `org.logstash` or `co.elastic.logstash` packages to prevent potential clashes with classes in Logstash itself.
+
+
+### Plugin settings [_plugin_settings_3]
+
+The snippet below contains both the setting definition and the method referencing it:
+
+```java
+public static final PluginConfigSpec<String> SOURCE_CONFIG =
+        PluginConfigSpec.stringSetting("source", "message");
+
+@Override
+public Collection<PluginConfigSpec<?>> configSchema() {
+    return Collections.singletonList(SOURCE_CONFIG);
+}
+```
+
+The `PluginConfigSpec` class allows developers to specify the settings that a plugin supports complete with setting name, data type, deprecation status, required status, and default value. In this example, the `source` setting defines the name of the field in each event that will be reversed. It is not a required setting and if it is not explicitly set, its default value will be `message`.
+
+The `configSchema` method must return a list of all settings that the plugin supports. In a future phase of the Java plugin project, the Logstash execution engine will validate that all required settings are present and that no unsupported settings are present.
+
+
+### Constructor and initialization [_constructor_and_initialization_3]
+
+```java
+private String id;
+private String sourceField;
+
+public JavaFilterExample(String id, Configuration config, Context context) {
+    this.id = id;
+    this.sourceField = config.get(SOURCE_CONFIG);
+}
+```
+
+All Java filter plugins must have a constructor taking a `String` id and a `Configuration` and `Context` argument.  This is the constructor that will be used to instantiate them at runtime. The retrieval and validation of all plugin settings should occur in this constructor. In this example, the name of the field to be reversed in each event is  retrieved from its setting and stored in a local variable so that it can be used later in the `filter` method.
+
+Any additional initialization may occur in the constructor as well. If there are any unrecoverable errors encountered in the configuration or initialization of the filter plugin, a descriptive exception should be thrown. The exception will be logged and will prevent Logstash from starting.
+
+
+### Filter method [_filter_method_2]
+
+```java
+@Override
+public Collection<Event> filter(Collection<Event> events, FilterMatchListener matchListener) {
+    for (Event e : events) {
+        Object f = e.getField(sourceField);
+        if (f instanceof String) {
+            e.setField(sourceField, StringUtils.reverse((String)f));
+            matchListener.filterMatched(e);
+        }
+    }
+    return events;
+```
+
+Finally, we come to the `filter` method that is invoked by the Logstash execution engine on batches of events as they flow through the event processing pipeline. The events to be filtered are supplied in the `events` argument and the method should return a collection of filtered events. Filters may perform a variety of actions on events as they flow through the pipeline including:
+
+* Mutation — Fields in events may be added, removed, or changed by a filter. This is the most common scenario for  filters that perform various kinds of enrichment on events. In this scenario, the incoming `events` collection may be returned unmodified since the events in the collection are mutated in place.
+* Deletion — Events may be removed from the event pipeline by a filter so that subsequent filters and outputs  do not receive them. In this scenario, the events to be deleted must be removed from the collection of filtered events before it is returned.
+* Creation — A filter may insert new events into the event pipeline that will be seen only by subsequent filters and outputs. In this scenario, the new events must be added to the collection of filtered events before it is returned.
+* Observation — Events may pass unchanged by a filter through the event pipeline. This may be useful in scenarios where a filter performs external actions (e.g., updating an external cache) based on the events observed in the event pipeline. In this scenario, the incoming `events` collection may be returned unmodified since no changes were made.
+
+In the example above, the value of the `source` field is retrieved from each event and reversed if it is a string value. Because each event is mutated in place, the incoming `events` collection can be returned.
+
+The `matchListener` is the mechanism by which filters indicate which events "match". The common actions for filters  such as `add_field` and `add_tag` are applied only to events that are designated as "matching". Some filters such as the [grok filter](logstash-docs-md://lsr/plugins-filters-grok.md) have a clear definition  for what constitutes a matching event and will notify the listener only for matching events. Other filters such as the [UUID filter](logstash-docs-md://lsr/plugins-filters-uuid.md) have no specific match  criteria and should notify the listener for every event filtered. In this example, the filter notifies the match listener for any event that had a `String` value in its `source` field and was therefore able to be reversed.
+
+
+### getId method [_getid_method_3]
+
+```java
+@Override
+public String getId() {
+    return id;
+}
+```
+
+For filter plugins, the `getId` method should always return the id that was provided to the plugin through its constructor at instantiation time.
+
+
+### close method [_close_method]
+
+```java
+@Override
+public void close() {
+    // shutdown a resource that was instantiated during the filter initialization phase.
+    this.sourceField = null;
+    return;
+}
+```
+
+Filter plugins can use additional resources to perform operations, such as creating new database connections. Implementing the `close` method will allow the plugins to free up those resources when shutting down the pipeline.
+
+
+### Unit tests [_unit_tests_3]
+
+Lastly, but certainly not least importantly, unit tests are strongly encouraged. The example filter plugin includes an [example unit test](https://github.com/logstash-plugins/logstash-filter-java_filter_example/blob/main/src/test/java/org/logstashplugins/JavaFilterExampleTest.java) that you can use as a template for your own.
+
+
+## Package and deploy [_package_and_deploy_3]
+
+Java plugins are packaged as Ruby gems for dependency management and interoperability with Ruby plugins. Once they are packaged as gems, they may be installed with the `logstash-plugin` utility just as Ruby plugins are. Because no knowledge of Ruby or its toolchain should be required for Java plugin development, the procedure for packaging Java plugins as Ruby gems has been automated through a custom task in the Gradle build file provided with the example Java plugins. The following sections describe how to configure and execute that packaging task as well as how to install the packaged Java plugin in Logstash.
+
+
+### Configuring the Gradle packaging task [_configuring_the_gradle_packaging_task_3]
+
+The following section appears near the top of the `build.gradle` file supplied with the example Java plugins:
+
+```java
+// ===========================================================================
+// plugin info
+// ===========================================================================
+group                      'org.logstashplugins' // must match the package of the main plugin class
+version                    "${file("VERSION").text.trim()}" // read from required VERSION file
+description                = "Example Java filter implementation"
+pluginInfo.licenses        = ['Apache-2.0'] // list of SPDX license IDs
+pluginInfo.longDescription = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using \$LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
+pluginInfo.authors         = ['Elasticsearch']
+pluginInfo.email           = ['info@elastic.co']
+pluginInfo.homepage        = "http://www.elastic.co/guide/en/logstash/current/index.html"
+pluginInfo.pluginType      = "filter"
+pluginInfo.pluginClass     = "JavaFilterExample"
+pluginInfo.pluginName      = "java_filter_example"
+// ===========================================================================
+```
+
+You should configure the values above for your plugin.
+
+* The `version` value will be automatically read from the `VERSION` file in the root of your plugin’s codebase.
+* `pluginInfo.pluginType` should be set to one of `input`, `filter`, `codec`, or `output`.
+* `pluginInfo.pluginName` must match the name specified on the `@LogstashPlugin` annotation on the main plugin class. The Gradle packaging task will validate that and return an error if they do not match.
+
+
+### Running the Gradle packaging task [_running_the_gradle_packaging_task_3]
+
+Several Ruby source files along with a `gemspec` file and a `Gemfile` are required to package the plugin as a Ruby gem. These Ruby files are used only for defining the Ruby gem structure or at Logstash startup time to register the Java plugin. They are not used during runtime event processing. The Gradle packaging task automatically generates all of these files based on the values configured in the section above.
+
+You run the Gradle packaging task with the following command:
+
+```shell
+./gradlew gem
+```
+
+For Windows platforms: Substitute `gradlew.bat` for `./gradlew` as appropriate in the command.
+
+That task will produce a gem file in the root directory of your plugin’s codebase with the name `logstash-{{plugintype}}-<pluginName>-<version>.gem`
+
+
+### Installing the Java plugin in Logstash [_installing_the_java_plugin_in_logstash_3]
+
+After you have packaged your Java plugin as a Ruby gem, you can install it in Logstash with this command:
+
+```shell
+bin/logstash-plugin install --no-verify --local /path/to/javaPlugin.gem
+```
+
+For Windows platforms: Substitute backslashes for forward slashes as appropriate in the command.
+
+
+## Run Logstash with the Java filter plugin [_run_logstash_with_the_java_filter_plugin]
+
+The following is a minimal Logstash configuration that can be used to test that the Java filter plugin is correctly installed and functioning.
+
+```java
+input {
+  generator { message => "Hello world!" count => 1 }
+}
+filter {
+  java_filter_example {}
+}
+output {
+  stdout { codec => rubydebug }
+}
+```
+
+Copy the above Logstash configuration to a file such as `java_filter.conf`. Start Logstash with:
+
+```shell
+bin/logstash -f /path/to/java_filter.conf
+```
+
+The expected Logstash output (excluding initialization) with the configuration above is:
+
+```txt
+{
+      "sequence" => 0,
+      "@version" => "1",
+       "message" => "!dlrow olleH",
+    "@timestamp" => yyyy-MM-ddThh:mm:ss.SSSZ,
+          "host" => "<yourHostName>"
+}
+```
+
+
+## Feedback [_feedback_3]
+
+If you have any feedback on Java plugin support in Logstash, please comment on our [main Github issue](https://github.com/elastic/logstash/issues/9215) or post in the [Logstash forum](https://discuss.elastic.co/c/logstash).
+
diff --git a/docs/extend/java-input-plugin.md b/docs/extend/java-input-plugin.md
new file mode 100644
index 000000000..240a1be9e
--- /dev/null
+++ b/docs/extend/java-input-plugin.md
@@ -0,0 +1,341 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/java-input-plugin.html
+---
+
+# How to write a Java input plugin [java-input-plugin]
+
+To develop a new Java input for Logstash, you write a new Java class that conforms to the Logstash Java Inputs API, package it, and install it with the logstash-plugin utility. We’ll go through each of those steps.
+
+
+## Set up your environment [_set_up_your_environment]
+
+
+### Copy the example repo [_copy_the_example_repo]
+
+Start by copying the [example input plugin](https://github.com/logstash-plugins/logstash-input-java_input_example). The plugin API is currently part of the Logstash codebase so you must have a local copy of that available. You can obtain a copy of the Logstash codebase with the following `git` command:
+
+```shell
+git clone --branch <branch_name> --single-branch https://github.com/elastic/logstash.git <target_folder>
+```
+
+The `branch_name` should correspond to the version of Logstash containing the preferred revision of the Java plugin API.
+
+::::{note}
+The GA version of the Java plugin API is available in the `7.2` and later branches of the Logstash codebase.
+::::
+
+
+Specify the `target_folder` for your local copy of the Logstash codebase. If you do not specify `target_folder`, it defaults to a new folder called `logstash` under your current folder.
+
+
+### Generate the .jar file [_generate_the_jar_file]
+
+After you have obtained a copy of the appropriate revision of the Logstash codebase, you need to compile it to generate the .jar file containing the Java plugin API. From the root directory of your Logstash codebase ($LS_HOME), you can compile it with `./gradlew assemble` (or `gradlew.bat assemble` if you’re running on Windows). This should produce the `$LS_HOME/logstash-core/build/libs/logstash-core-x.y.z.jar` where `x`, `y`, and `z` refer to the version of Logstash.
+
+After you have successfully compiled Logstash, you need to tell your Java plugin where to find the `logstash-core-x.y.z.jar` file. Create a new file named `gradle.properties` in the root folder of your plugin project. That file should have a single line:
+
+```txt
+LOGSTASH_CORE_PATH=<target_folder>/logstash-core
+```
+
+where `target_folder` is the root folder of your local copy of the Logstash codebase.
+
+
+## Code the plugin [_code_the_plugin]
+
+The example input plugin generates a configurable number of simple events before terminating. Let’s look at the main class in the  example input.
+
+```java
+@LogstashPlugin(name="java_input_example")
+public class JavaInputExample implements Input {
+
+    public static final PluginConfigSpec<Long> EVENT_COUNT_CONFIG =
+            PluginConfigSpec.numSetting("count", 3);
+
+    public static final PluginConfigSpec<String> PREFIX_CONFIG =
+            PluginConfigSpec.stringSetting("prefix", "message");
+
+    private String id;
+    private long count;
+    private String prefix;
+    private final CountDownLatch done = new CountDownLatch(1);
+    private volatile boolean stopped;
+
+
+    public JavaInputExample(String id, Configuration config, Context context) {
+            this.id = id;
+        count = config.get(EVENT_COUNT_CONFIG);
+        prefix = config.get(PREFIX_CONFIG);
+    }
+
+    @Override
+    public void start(Consumer<Map<String, Object>> consumer) {
+        int eventCount = 0;
+        try {
+            while (!stopped && eventCount < count) {
+                eventCount++;
+                consumer.accept.push(Collections.singletonMap("message",
+                        prefix + " " + StringUtils.center(eventCount + " of " + count, 20)));
+            }
+        } finally {
+            stopped = true;
+            done.countDown();
+        }
+    }
+
+    @Override
+    public void stop() {
+        stopped = true; // set flag to request cooperative stop of input
+    }
+
+    @Override
+    public void awaitStop() throws InterruptedException {
+        done.await(); // blocks until input has stopped
+    }
+
+    @Override
+    public Collection<PluginConfigSpec<?>> configSchema() {
+        return Arrays.asList(EVENT_COUNT_CONFIG, PREFIX_CONFIG);
+    }
+
+    @Override
+    public String getId() {
+        return this.id;
+    }
+}
+```
+
+Let’s step through and examine each part of that class.
+
+
+### Class declaration [_class_declaration_5]
+
+```java
+@LogstashPlugin(name="java_input_example")
+public class JavaInputExample implements Input {
+```
+
+Notes about the class declaration:
+
+* All Java plugins must be annotated with the `@LogstashPlugin` annotation. Additionally:
+
+    * The `name` property of the annotation must be supplied and defines the name of the plugin as it will be used in the Logstash pipeline definition. For example, this input would be referenced in the input section of the Logstash pipeline defintion as `input { java_input_example => { .... } }`
+    * The value of the `name` property must match the name of the class excluding casing and underscores.
+
+* The class must implement the `co.elastic.logstash.api.Input` interface.
+* Java plugins may not be created in the `org.logstash` or `co.elastic.logstash` packages to prevent potential clashes with classes in Logstash itself.
+
+
+### Plugin settings [_plugin_settings]
+
+The snippet below contains both the setting definition and the method referencing it.
+
+```java
+public static final PluginConfigSpec<Long> EVENT_COUNT_CONFIG =
+        PluginConfigSpec.numSetting("count", 3);
+
+public static final PluginConfigSpec<String> PREFIX_CONFIG =
+        PluginConfigSpec.stringSetting("prefix", "message");
+
+@Override
+public Collection<PluginConfigSpec<?>> configSchema() {
+    return Arrays.asList(EVENT_COUNT_CONFIG, PREFIX_CONFIG);
+}
+```
+
+The `PluginConfigSpec` class allows developers to specify the settings that a plugin supports complete with setting  name, data type, deprecation status, required status, and default value. In this example, the `count` setting defines the number of events that will be generated and the `prefix` setting defines an optional prefix to include in the event field. Neither setting is required and if it is not explicitly set, the settings default to `3` and  `message`, respectively.
+
+The `configSchema` method must return a list of all settings that the plugin supports. In a future phase of the Java plugin project, the Logstash execution engine will validate that all required settings are present and that no unsupported settings are present.
+
+
+### Constructor and initialization [_constructor_and_initialization]
+
+```java
+private String id;
+private long count;
+private String prefix;
+
+public JavaInputExample(String id, Configuration config, Context context) {
+    this.id = id;
+    count = config.get(EVENT_COUNT_CONFIG);
+    prefix = config.get(PREFIX_CONFIG);
+}
+```
+
+All Java input plugins must have a constructor taking a `String` id and `Configuration` and `Context` argument. This is the constructor that will be used to instantiate them at runtime. The retrieval and validation of all plugin settings should occur in this constructor. In this example, the values of the two plugin settings are retrieved and stored in local variables for later use in the `start` method.
+
+Any additional initialization may occur in the constructor as well. If there are any unrecoverable errors encountered in the configuration or initialization of the input plugin, a descriptive exception should be thrown. The exception will be logged and will prevent Logstash from starting.
+
+
+### Start method [_start_method]
+
+```java
+@Override
+public void start(Consumer<Map<String, Object>> consumer) {
+    int eventCount = 0;
+    try {
+        while (!stopped && eventCount < count) {
+            eventCount++;
+            consumer.accept.push(Collections.singletonMap("message",
+                    prefix + " " + StringUtils.center(eventCount + " of " + count, 20)));
+        }
+    } finally {
+        stopped = true;
+        done.countDown();
+    }
+}
+```
+
+The `start` method begins the event-producing loop in an input. Inputs are flexible and may produce events through many different mechanisms including:
+
+* a pull mechanism such as periodic queries of external database
+* a push mechanism such as events sent from clients to a local network port
+* a timed computation such as a heartbeat
+* any other mechanism that produces a useful stream of events. Event streams may be either finite or infinite. If the input produces an infinite stream of events, this method should loop until a stop request is made through the `stop` method. If the input produces a finite stream of events, this method should terminate when the last event in the stream is produced or a stop request is made, whichever comes first.
+
+Events should be constructed as instances of `Map<String, Object>` and pushed into the event pipeline via the `Consumer<Map<String, Object>>.accept()` method. To reduce allocations and GC pressure, inputs may reuse the same map instance by modifying its fields between calls to `Consumer<Map<String, Object>>.accept()` because the event pipeline will create events based on a copy of the map’s data.
+
+
+### Stop and awaitStop methods [_stop_and_awaitstop_methods]
+
+```java
+private final CountDownLatch done = new CountDownLatch(1);
+private volatile boolean stopped;
+
+@Override
+public void stop() {
+    stopped = true; // set flag to request cooperative stop of input
+}
+
+@Override
+public void awaitStop() throws InterruptedException {
+    done.await(); // blocks until input has stopped
+}
+```
+
+The `stop` method notifies the input to stop producing events. The stop mechanism may be implemented in any way that honors the API contract though a `volatile boolean` flag works well for many use cases.
+
+Inputs stop both asynchronously and cooperatively. Use the `awaitStop` method to block until the input has  completed the stop process. Note that this method should **not** signal the input to stop as the `stop` method does. The awaitStop mechanism may be implemented in any way that honors the API contract though a `CountDownLatch` works well for many use cases.
+
+
+### getId method [_getid_method]
+
+```java
+@Override
+public String getId() {
+    return id;
+}
+```
+
+For input plugins, the `getId` method should always return the id that was provided to the plugin through its constructor at instantiation time.
+
+
+### Unit tests [_unit_tests]
+
+Lastly, but certainly not least importantly, unit tests are strongly encouraged. The example input plugin includes an [example unit test](https://github.com/logstash-plugins/logstash-input-java_input_example/blob/main/src/test/java/org/logstashplugins/JavaInputExampleTest.java) that you can use as a template for your own.
+
+
+## Package and deploy [_package_and_deploy]
+
+Java plugins are packaged as Ruby gems for dependency management and interoperability with Ruby plugins. Once they are packaged as gems, they may be installed with the `logstash-plugin` utility just as Ruby plugins are. Because no knowledge of Ruby or its toolchain should be required for Java plugin development, the procedure for packaging Java plugins as Ruby gems has been automated through a custom task in the Gradle build file provided with the example Java plugins. The following sections describe how to configure and execute that packaging task as well as how to install the packaged Java plugin in Logstash.
+
+
+### Configuring the Gradle packaging task [_configuring_the_gradle_packaging_task]
+
+The following section appears near the top of the `build.gradle` file supplied with the example Java plugins:
+
+```java
+// ===========================================================================
+// plugin info
+// ===========================================================================
+group                      'org.logstashplugins' // must match the package of the main plugin class
+version                    "${file("VERSION").text.trim()}" // read from required VERSION file
+description                = "Example Java filter implementation"
+pluginInfo.licenses        = ['Apache-2.0'] // list of SPDX license IDs
+pluginInfo.longDescription = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using \$LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
+pluginInfo.authors         = ['Elasticsearch']
+pluginInfo.email           = ['info@elastic.co']
+pluginInfo.homepage        = "http://www.elastic.co/guide/en/logstash/current/index.html"
+pluginInfo.pluginType      = "filter"
+pluginInfo.pluginClass     = "JavaFilterExample"
+pluginInfo.pluginName      = "java_filter_example"
+// ===========================================================================
+```
+
+You should configure the values above for your plugin.
+
+* The `version` value will be automatically read from the `VERSION` file in the root of your plugin’s codebase.
+* `pluginInfo.pluginType` should be set to one of `input`, `filter`, `codec`, or `output`.
+* `pluginInfo.pluginName` must match the name specified on the `@LogstashPlugin` annotation on the main plugin class. The Gradle packaging task will validate that and return an error if they do not match.
+
+
+### Running the Gradle packaging task [_running_the_gradle_packaging_task]
+
+Several Ruby source files along with a `gemspec` file and a `Gemfile` are required to package the plugin as a Ruby gem. These Ruby files are used only for defining the Ruby gem structure or at Logstash startup time to register the Java plugin. They are not used during runtime event processing. The Gradle packaging task automatically generates all of these files based on the values configured in the section above.
+
+You run the Gradle packaging task with the following command:
+
+```shell
+./gradlew gem
+```
+
+For Windows platforms: Substitute `gradlew.bat` for `./gradlew` as appropriate in the command.
+
+That task will produce a gem file in the root directory of your plugin’s codebase with the name `logstash-{{plugintype}}-<pluginName>-<version>.gem`
+
+
+### Installing the Java plugin in Logstash [_installing_the_java_plugin_in_logstash]
+
+After you have packaged your Java plugin as a Ruby gem, you can install it in Logstash with this command:
+
+```shell
+bin/logstash-plugin install --no-verify --local /path/to/javaPlugin.gem
+```
+
+For Windows platforms: Substitute backslashes for forward slashes as appropriate in the command.
+
+
+## Running Logstash with the Java input plugin [_running_logstash_with_the_java_input_plugin]
+
+The following is a minimal Logstash configuration that can be used to test that the Java input plugin is correctly installed and functioning.
+
+```java
+input {
+  java_input_example {}
+}
+output {
+  stdout { codec => rubydebug }
+}
+```
+
+Copy the above Logstash configuration to a file such as `java_input.conf`. Start {{ls}} with:
+
+```shell
+bin/logstash -f /path/to/java_input.conf
+```
+
+The expected Logstash output (excluding initialization) with the configuration above is:
+
+```txt
+{
+      "@version" => "1",
+       "message" => "message        1 of 3       ",
+    "@timestamp" => yyyy-MM-ddThh:mm:ss.SSSZ
+}
+{
+      "@version" => "1",
+       "message" => "message        2 of 3       ",
+    "@timestamp" => yyyy-MM-ddThh:mm:ss.SSSZ
+}
+{
+      "@version" => "1",
+       "message" => "message        3 of 3       ",
+    "@timestamp" => yyyy-MM-ddThh:mm:ss.SSSZ
+}
+```
+
+
+## Feedback [_feedback]
+
+If you have any feedback on Java plugin support in Logstash, please comment on our [main Github issue](https://github.com/elastic/logstash/issues/9215) or post in the [Logstash forum](https://discuss.elastic.co/c/logstash).
diff --git a/docs/extend/java-output-plugin.md b/docs/extend/java-output-plugin.md
new file mode 100644
index 000000000..e8e7a6040
--- /dev/null
+++ b/docs/extend/java-output-plugin.md
@@ -0,0 +1,311 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/java-output-plugin.html
+---
+
+# How to write a Java output plugin [java-output-plugin]
+
+To develop a new Java output for Logstash, you write a new Java class that conforms to the Logstash Java Outputs API, package it, and install it with the logstash-plugin utility. We’ll go through each of those steps.
+
+
+## Set up your environment [_set_up_your_environment_4]
+
+
+### Copy the example repo [_copy_the_example_repo_4]
+
+Start by copying the [example output plugin](https://github.com/logstash-plugins/logstash-output-java_output_example). The plugin API is currently part of the Logstash codebase so you must have a local copy of that available. You can obtain a copy of the Logstash codebase with the following `git` command:
+
+```shell
+git clone --branch <branch_name> --single-branch https://github.com/elastic/logstash.git <target_folder>
+```
+
+The `branch_name` should correspond to the version of Logstash containing the preferred revision of the Java plugin API.
+
+::::{note}
+The GA version of the Java plugin API is available in the `7.2` and later branches of the Logstash codebase.
+::::
+
+
+Specify the `target_folder` for your local copy of the Logstash codebase. If you do not specify `target_folder`, it defaults to a new folder called `logstash` under your current folder.
+
+
+### Generate the .jar file [_generate_the_jar_file_4]
+
+After you have obtained a copy of the appropriate revision of the Logstash codebase, you need to compile it to generate the .jar file containing the Java plugin API. From the root directory of your Logstash codebase ($LS_HOME), you can compile it with `./gradlew assemble` (or `gradlew.bat assemble` if you’re running on Windows). This should produce the `$LS_HOME/logstash-core/build/libs/logstash-core-x.y.z.jar` where `x`, `y`, and `z` refer to the version of Logstash.
+
+After you have successfully compiled Logstash, you need to tell your Java plugin where to find the `logstash-core-x.y.z.jar` file. Create a new file named `gradle.properties` in the root folder of your plugin project. That file should have a single line:
+
+```txt
+LOGSTASH_CORE_PATH=<target_folder>/logstash-core
+```
+
+where `target_folder` is the root folder of your local copy of the Logstash codebase.
+
+
+## Code the plugin [_code_the_plugin_4]
+
+The example output plugin prints events to the console using the event’s `toString` method. Let’s look at the main class in the example output:
+
+```java
+@LogstashPlugin(name = "java_output_example")
+public class JavaOutputExample implements Output {
+
+    public static final PluginConfigSpec<String> PREFIX_CONFIG =
+            PluginConfigSpec.stringSetting("prefix", "");
+
+    private final String id;
+    private String prefix;
+    private PrintStream printer;
+    private final CountDownLatch done = new CountDownLatch(1);
+    private volatile boolean stopped = false;
+
+    public JavaOutputExample(final String id, final Configuration configuration, final Context context) {
+        this(id, configuration, context, System.out);
+    }
+
+    JavaOutputExample(final String id, final Configuration config, final Context context, OutputStream targetStream) {
+        this.id = id;
+        prefix = config.get(PREFIX_CONFIG);
+        printer = new PrintStream(targetStream);
+    }
+
+    @Override
+    public void output(final Collection<Event> events) {
+      Iterator<Event> z = events.iterator();
+      while (z.hasNext() && !stopped) {
+          String s = prefix + z.next();
+          printer.println(s);
+        }
+    }
+
+    @Override
+    public void stop() {
+        stopped = true;
+        done.countDown();
+    }
+
+    @Override
+    public void awaitStop() throws InterruptedException {
+        done.await();
+    }
+
+    @Override
+    public Collection<PluginConfigSpec<?>> configSchema() {
+        return Collections.singletonList(PREFIX_CONFIG);
+    }
+
+    @Override
+    public String getId() {
+        return id;
+    }
+}
+```
+
+Let’s step through and examine each part of that class.
+
+
+### Class declaration [_class_declaration_8]
+
+```java
+@LogstashPlugin(name="java_output_example")
+public class JavaOutputExample implements Output {
+```
+
+Notes about the class declaration:
+
+* All Java plugins must be annotated with the `@LogstashPlugin` annotation. Additionally:
+
+    * The `name` property of the annotation must be supplied and defines the name of the plugin as it will be used in the Logstash pipeline definition. For example, this output would be referenced in the output section of the Logstash pipeline definition as `output { java_output_example => { .... } }`
+    * The value of the `name` property must match the name of the class excluding casing and underscores.
+
+* The class must implement the `co.elastic.logstash.api.Output` interface.
+* Java plugins may not be created in the `org.logstash` or `co.elastic.logstash` packages to prevent potential clashes with classes in Logstash itself.
+
+
+### Plugin settings [_plugin_settings_4]
+
+The snippet below contains both the setting definition and the method referencing it:
+
+```java
+public static final PluginConfigSpec<String> PREFIX_CONFIG =
+        PluginConfigSpec.stringSetting("prefix", "");
+
+@Override
+public Collection<PluginConfigSpec<?>> configSchema() {
+    return Collections.singletonList(PREFIX_CONFIG);
+}
+```
+
+The `PluginConfigSpec` class allows developers to specify the settings that a plugin supports complete with setting  name, data type, deprecation status, required status, and default value. In this example, the `prefix` setting defines an optional prefix to include in the output of the event. The setting is not required and if it is not explicitly set, it defaults to the empty string.
+
+The `configSchema` method must return a list of all settings that the plugin supports. In a future phase of the Java plugin project, the Logstash execution engine will validate that all required settings are present and that no unsupported settings are present.
+
+
+### Constructor and initialization [_constructor_and_initialization_4]
+
+```java
+private final String id;
+private String prefix;
+private PrintStream printer;
+
+public JavaOutputExample(final String id, final Configuration configuration, final Context context) {
+    this(configuration, context, System.out);
+}
+
+JavaOutputExample(final String id, final Configuration config, final Context context, OutputStream targetStream) {
+    this.id = id;
+    prefix = config.get(PREFIX_CONFIG);
+    printer = new PrintStream(targetStream);
+}
+```
+
+All Java output plugins must have a constructor taking a `String` id and a `Configuration` and `Context` argument. This is the constructor that will be used to instantiate them at runtime. The retrieval and validation of all plugin settings should occur in this constructor. In this example, the values of the `prefix` setting is retrieved and stored in a local variable for later use in the `output` method. In this example, a second, pacakge private constructor is defined that is useful for unit testing with a `Stream` other than `System.out`.
+
+Any additional initialization may occur in the constructor as well. If there are any unrecoverable errors encountered in the configuration or initialization of the output plugin, a descriptive exception should be thrown. The exception will be logged and will prevent Logstash from starting.
+
+
+### Output method [_output_method]
+
+```java
+@Override
+public void output(final Collection<Event> events) {
+    Iterator<Event> z = events.iterator();
+    while (z.hasNext() && !stopped) {
+        String s = prefix + z.next();
+        printer.println(s);
+    }
+}
+```
+
+Outputs may send events to local sinks such as the console or a file or to remote systems such as Elasticsearch or other external systems. In this example, the events are printed to the local console.
+
+
+### Stop and awaitStop methods [_stop_and_awaitstop_methods_2]
+
+```java
+private final CountDownLatch done = new CountDownLatch(1);
+private volatile boolean stopped;
+
+@Override
+public void stop() {
+    stopped = true;
+    done.countDown();
+}
+
+@Override
+public void awaitStop() throws InterruptedException {
+    done.await();
+}
+```
+
+The `stop` method notifies the output to stop sending events. The stop mechanism may be implemented in any way that honors the API contract though a `volatile boolean` flag works well for many use cases. Because this output example is so simple, its `output` method does not check for the stop flag.
+
+Outputs stop both asynchronously and cooperatively. Use the `awaitStop` method to block until the output has  completed the stop process. Note that this method should **not** signal the output to stop as the `stop` method  does. The awaitStop mechanism may be implemented in any way that honors the API contract though a `CountDownLatch` works well for many use cases.
+
+
+### getId method [_getid_method_4]
+
+```java
+@Override
+public String getId() {
+    return id;
+}
+```
+
+For output plugins, the `getId` method should always return the id that was provided to the plugin through its constructor at instantiation time.
+
+
+### Unit tests [_unit_tests_4]
+
+Lastly, but certainly not least importantly, unit tests are strongly encouraged. The example output plugin includes an [example unit test](https://github.com/logstash-plugins/logstash-output-java_output_example/blob/main/src/test/java/org/logstashplugins/JavaOutputExampleTest.java) that you can use as a template for your own.
+
+
+## Package and deploy [_package_and_deploy_4]
+
+Java plugins are packaged as Ruby gems for dependency management and interoperability with Ruby plugins. Once they are packaged as gems, they may be installed with the `logstash-plugin` utility just as Ruby plugins are. Because no knowledge of Ruby or its toolchain should be required for Java plugin development, the procedure for packaging Java plugins as Ruby gems has been automated through a custom task in the Gradle build file provided with the example Java plugins. The following sections describe how to configure and execute that packaging task as well as how to install the packaged Java plugin in Logstash.
+
+
+### Configuring the Gradle packaging task [_configuring_the_gradle_packaging_task_4]
+
+The following section appears near the top of the `build.gradle` file supplied with the example Java plugins:
+
+```java
+// ===========================================================================
+// plugin info
+// ===========================================================================
+group                      'org.logstashplugins' // must match the package of the main plugin class
+version                    "${file("VERSION").text.trim()}" // read from required VERSION file
+description                = "Example Java filter implementation"
+pluginInfo.licenses        = ['Apache-2.0'] // list of SPDX license IDs
+pluginInfo.longDescription = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using \$LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
+pluginInfo.authors         = ['Elasticsearch']
+pluginInfo.email           = ['info@elastic.co']
+pluginInfo.homepage        = "http://www.elastic.co/guide/en/logstash/current/index.html"
+pluginInfo.pluginType      = "filter"
+pluginInfo.pluginClass     = "JavaFilterExample"
+pluginInfo.pluginName      = "java_filter_example"
+// ===========================================================================
+```
+
+You should configure the values above for your plugin.
+
+* The `version` value will be automatically read from the `VERSION` file in the root of your plugin’s codebase.
+* `pluginInfo.pluginType` should be set to one of `input`, `filter`, `codec`, or `output`.
+* `pluginInfo.pluginName` must match the name specified on the `@LogstashPlugin` annotation on the main plugin class. The Gradle packaging task will validate that and return an error if they do not match.
+
+
+### Running the Gradle packaging task [_running_the_gradle_packaging_task_4]
+
+Several Ruby source files along with a `gemspec` file and a `Gemfile` are required to package the plugin as a Ruby gem. These Ruby files are used only for defining the Ruby gem structure or at Logstash startup time to register the Java plugin. They are not used during runtime event processing. The Gradle packaging task automatically generates all of these files based on the values configured in the section above.
+
+You run the Gradle packaging task with the following command:
+
+```shell
+./gradlew gem
+```
+
+For Windows platforms: Substitute `gradlew.bat` for `./gradlew` as appropriate in the command.
+
+That task will produce a gem file in the root directory of your plugin’s codebase with the name `logstash-{{plugintype}}-<pluginName>-<version>.gem`
+
+
+### Installing the Java plugin in Logstash [_installing_the_java_plugin_in_logstash_4]
+
+After you have packaged your Java plugin as a Ruby gem, you can install it in Logstash with this command:
+
+```shell
+bin/logstash-plugin install --no-verify --local /path/to/javaPlugin.gem
+```
+
+For Windows platforms: Substitute backslashes for forward slashes as appropriate in the command.
+
+
+## Running Logstash with the Java output plugin [_running_logstash_with_the_java_output_plugin]
+
+The following is a minimal Logstash configuration that can be used to test that the Java output plugin is correctly installed and functioning.
+
+```java
+input {
+  generator { message => "Hello world!" count => 1 }
+}
+output {
+  java_output_example {}
+}
+```
+
+Copy the above Logstash configuration to a file such as `java_output.conf`. Logstash should then be started with:
+
+```txt
+bin/logstash -f /path/to/java_output.conf
+```
+
+The expected Logstash output (excluding initialization) with the configuration above is:
+
+```txt
+{"@timestamp":"yyyy-MM-ddTHH:mm:ss.SSSZ","message":"Hello world!","@version":"1","host":"<yourHostname>","sequence":0}
+```
+
+
+## Feedback [_feedback_4]
+
+If you have any feedback on Java plugin support in Logstash, please comment on our [main Github issue](https://github.com/elastic/logstash/issues/9215) or post in the [Logstash forum](https://discuss.elastic.co/c/logstash).
diff --git a/docs/extend/output-new-plugin.md b/docs/extend/output-new-plugin.md
new file mode 100644
index 000000000..ab1929ff3
--- /dev/null
+++ b/docs/extend/output-new-plugin.md
@@ -0,0 +1,570 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/output-new-plugin.html
+---
+
+# How to write a Logstash output plugin [output-new-plugin]
+
+To develop a new output for Logstash, build a self-contained Ruby gem whose source code lives in its own GitHub repository. The Ruby gem can then be hosted and shared on RubyGems.org. You can use the example output implementation as a starting point. (If you’re unfamiliar with Ruby, you can find an excellent quickstart guide at [https://www.ruby-lang.org/en/documentation/quickstart/](https://www.ruby-lang.org/en/documentation/quickstart/).)
+
+## Get started [_get_started_4]
+
+Let’s step through creating an output plugin using the [example output plugin](https://github.com/logstash-plugins/logstash-output-example/).
+
+### Create a GitHub repo for your new plugin [_create_a_github_repo_for_your_new_plugin_4]
+
+Each Logstash plugin lives in its own GitHub repository. To create a new repository for your plugin:
+
+1. Log in to GitHub.
+2. Click the **Repositories** tab. You’ll see a list of other repositories you’ve forked or contributed to.
+3. Click the green **New** button in the upper right.
+4. Specify the following settings for your new repo:
+
+    * **Repository name** — a unique name of the form `logstash-output-pluginname`.
+    * **Public or Private** — your choice, but the repository must be Public if you want to submit it as an official plugin.
+    * **Initialize this repository with a README** — enables you to immediately clone the repository to your computer.
+
+5. Click **Create Repository**.
+
+
+### Use the plugin generator tool [_use_the_plugin_generator_tool_4]
+
+You can create your own Logstash plugin in seconds! The `generate` subcommand of `bin/logstash-plugin` creates the foundation for a new Logstash plugin with templatized files. It creates the correct directory structure, gemspec files, and dependencies so you can start adding custom code to process data with Logstash.
+
+For more information, see [Generating plugins](/reference/plugin-generator.md)
+
+
+### Copy the output code [_copy_the_output_code]
+
+Alternatively, you can use the examples repo we host on github.com
+
+1. **Clone your plugin.** Replace `GITUSERNAME` with your github username, and `MYPLUGINNAME` with your plugin name.
+
+    * `git clone https://github.com/GITUSERNAME/logstash-``output-MYPLUGINNAME.git`
+
+        * alternately, via ssh: `git clone git@github.com:GITUSERNAME/logstash``-output-MYPLUGINNAME.git`
+
+    * `cd logstash-output-MYPLUGINNAME`
+
+2. **Clone the output plugin example and copy it to your plugin branch.**
+
+    You don’t want to include the example .git directory or its contents, so delete it before you copy the example.
+
+    * `cd /tmp`
+    * `git clone https://github.com/logstash-plugins/logstash``-output-example.git`
+    * `cd logstash-output-example`
+    * `rm -rf .git`
+    * `cp -R * /path/to/logstash-output-mypluginname/`
+
+3. **Rename the following files to match the name of your plugin.**
+
+    * `logstash-output-example.gemspec`
+    * `example.rb`
+    * `example_spec.rb`
+
+        ```txt
+        cd /path/to/logstash-output-mypluginname
+        mv logstash-output-example.gemspec logstash-output-mypluginname.gemspec
+        mv lib/logstash/outputs/example.rb lib/logstash/outputs/mypluginname.rb
+        mv spec/outputs/example_spec.rb spec/outputs/mypluginname_spec.rb
+        ```
+
+
+Your file structure should look like this:
+
+```txt
+$ tree logstash-output-mypluginname
+├── Gemfile
+├── LICENSE
+├── README.md
+├── Rakefile
+├── lib
+│   └── logstash
+│       └── outputs
+│           └── mypluginname.rb
+├── logstash-output-mypluginname.gemspec
+└── spec
+    └── outputs
+        └── mypluginname_spec.rb
+```
+
+For more information about the Ruby gem file structure and an excellent walkthrough of the Ruby gem creation process, see [http://timelessrepo.com/making-ruby-gems](http://timelessrepo.com/making-ruby-gems)
+
+
+### See what your plugin looks like [_see_what_your_plugin_looks_like_4]
+
+Before we dive into the details, open up the plugin file in your favorite text editor and take a look.
+
+```ruby
+require "logstash/outputs/base"
+require "logstash/namespace"
+
+# Add any asciidoc formatted documentation here
+# An example output that does nothing.
+class LogStash::Outputs::Example < LogStash::Outputs::Base
+  config_name "example"
+
+  # This sets the concurrency behavior of this plugin. By default it is :legacy, which was the standard
+  # way concurrency worked before Logstash 2.4
+  #
+  # You should explicitly set it to either :single or :shared as :legacy will be removed in Logstash 6.0
+  #
+  # When configured as :single a single instance of the Output will be shared among the
+  # pipeline worker threads. Access to the `#multi_receive/#multi_receive_encoded/#receive` method will be synchronized
+  # i.e. only one thread will be active at a time making threadsafety much simpler.
+  #
+  # You can set this to :shared if your output is threadsafe. This will maximize
+  # concurrency but you will need to make appropriate uses of mutexes in `#multi_receive/#receive`.
+  #
+  # Only the `#multi_receive/#multi_receive_encoded` methods need to actually be threadsafe, the other methods
+  # will only be executed in a single thread
+  concurrency :single
+
+  public
+  def register
+  end # def register
+
+  public
+  # Takes an array of events
+  # Must be threadsafe if `concurrency :shared` is set
+  def multi_receive(events)
+  end # def multi_receive
+end # class LogStash::Outputs::Example
+```
+
+
+
+## Coding output plugins [_coding_output_plugins]
+
+Now let’s take a line-by-line look at the example plugin.
+
+### `require` Statements [_require_statements_4]
+
+Logstash output plugins require parent classes defined in `logstash/outputs/base` and logstash/namespace:
+
+```ruby
+require "logstash/outputs/base"
+require "logstash/namespace"
+```
+
+Of course, the plugin you build may depend on other code, or even gems. Just put them here along with these Logstash dependencies.
+
+
+
+## Plugin Body [_plugin_body_4]
+
+Let’s go through the various elements of the plugin itself.
+
+### `class` Declaration [_class_declaration_4]
+
+The output plugin class should be a subclass of `LogStash::Outputs::Base`:
+
+```ruby
+class LogStash::Outputs::Example < LogStash::Outputs::Base
+```
+
+The class name should closely mirror the plugin name, for example:
+
+```ruby
+LogStash::Outputs::Example
+```
+
+
+### `config_name` [_config_name_4]
+
+```ruby
+  config_name "example"
+```
+
+This is the name your plugin will call inside the output configuration block.
+
+If you set `config_name "example"` in your plugin code, the corresponding Logstash configuration block would need to look like this:
+
+
+
+## Configuration Parameters [_configuration_parameters_4]
+
+```ruby
+  config :variable_name, :validate => :variable_type, :default => "Default value", :required => boolean, :deprecated => boolean, :obsolete => string
+```
+
+The configuration, or `config` section allows you to define as many (or as few) parameters as are needed to enable Logstash to process events.
+
+There are several configuration attributes:
+
+* `:validate` - allows you to enforce passing a particular data type to Logstash for this configuration option, such as `:string`, `:password`, `:boolean`, `:number`, `:array`, `:hash`, `:path` (a file-system path), `uri`, `:codec` (since 1.2.0), `:bytes`.  Note that this also works as a coercion in that if I specify "true" for boolean (even though technically a string), it will become a valid boolean in the config.  This coercion works for the `:number` type as well where "1.2" becomes a float and "22" is an integer.
+* `:default` - lets you specify a default value for a parameter
+* `:required` - whether or not this parameter is mandatory (a Boolean `true` or
+* `:list` - whether or not this value should be a list of values. Will typecheck the list members, and convert scalars to one element lists. Note that this mostly obviates the array type, though if you need lists of complex objects that will be more suitable. `false`)
+* `:deprecated` - informational (also a Boolean `true` or `false`)
+* `:obsolete` - used to declare that a given setting has been removed and is no longer functioning. The idea is to provide an informed upgrade path to users who are still using a now-removed setting.
+
+
+## Plugin Methods [_plugin_methods_4]
+
+Logstash outputs must implement the `register` and `multi_receive` methods.
+
+### `register` Method [_register_method_4]
+
+```ruby
+  public
+  def register
+  end # def register
+```
+
+The Logstash `register` method is like an `initialize` method. It was originally created to enforce having `super` called, preventing headaches for newbies. (Note: It may go away in favor of `initialize`, in conjunction with some enforced testing to ensure `super` is called.)
+
+`public` means the method can be called anywhere, not just within the class. This is the default behavior for methods in Ruby, but it is specified explicitly here anyway.
+
+You can also assign instance variables here (variables prepended by `@`). Configuration variables are now in scope as instance variables, like `@message`
+
+
+
+## Building the Plugin [_building_the_plugin_4]
+
+At this point in the process you have coded your plugin and are ready to build a Ruby Gem from it. The following information will help you complete the process.
+
+### External dependencies [_external_dependencies_4]
+
+A `require` statement in Ruby is used to include necessary code. In some cases your plugin may require additional files.  For example, the collectd plugin [uses](https://github.com/logstash-plugins/logstash-codec-collectd/blob/main/lib/logstash/codecs/collectd.rb#L148) the `types.db` file provided by collectd.  In the main directory of your plugin, a file called `vendor.json` is where these files are described.
+
+The `vendor.json` file contains an array of JSON objects, each describing a file dependency. This example comes from the [collectd](https://github.com/logstash-plugins/logstash-codec-collectd/blob/main/vendor.json) codec plugin:
+
+```txt
+[{
+        "sha1": "a90fe6cc53b76b7bdd56dc57950d90787cb9c96e",
+        "url": "http://collectd.org/files/collectd-5.4.0.tar.gz",
+        "files": [ "/src/types.db" ]
+}]
+```
+
+* `sha1` is the sha1 signature used to verify the integrity of the file referenced by `url`.
+* `url` is the address from where Logstash will download the file.
+* `files` is an optional array of files to extract from the downloaded file. Note that while tar archives can use absolute or relative paths, treat them as absolute in this array.  If `files` is not present, all files will be uncompressed and extracted into the vendor directory.
+
+Another example of the `vendor.json` file is the [`geoip` filter](https://github.com/logstash-plugins/logstash-filter-geoip/blob/main/vendor.json)
+
+The process used to download these dependencies is to call `rake vendor`.  This will be discussed further in the testing section of this document.
+
+Another kind of external dependency is on jar files.  This will be described in the "Add a `gemspec` file" section.
+
+
+### Deprecated features [_deprecated_features_4]
+
+As a plugin evolves, an option or feature may no longer serve the intended purpose, and the developer may want to *deprecate* its usage. Deprecation warns users about the option’s status, so they aren’t caught by surprise when it is removed in a later release.
+
+{{ls}} 7.6 introduced a *deprecation logger* to make handling those situations easier. You can use the [adapter](https://github.com/logstash-plugins/logstash-mixin-deprecation_logger_support) to ensure that your plugin can use the deprecation logger while still supporting older versions of {{ls}}. See the [readme](https://github.com/logstash-plugins/logstash-mixin-deprecation_logger_support/blob/main/README.md) for more information and for instructions on using the adapter.
+
+Deprecations are noted in the `logstash-deprecation.log` file in the `log` directory.
+
+
+### Add a Gemfile [_add_a_gemfile_4]
+
+Gemfiles allow Ruby’s Bundler to maintain the dependencies for your plugin. Currently, all we’ll need is the Logstash gem, for testing, but if you require other gems, you should add them in here.
+
+::::{tip}
+See [Bundler’s Gemfile page](http://bundler.io/gemfile.html) for more details.
+::::
+
+
+```ruby
+source 'https://rubygems.org'
+gemspec
+gem "logstash", :github => "elastic/logstash", :branch => "master"
+```
+
+
+
+## Add a `gemspec` file [_add_a_gemspec_file_4]
+
+Gemspecs define the Ruby gem which will be built and contain your plugin.
+
+::::{tip}
+More information can be found on the [Rubygems Specification page](http://guides.rubygems.org/specification-reference/).
+::::
+
+
+```ruby
+Gem::Specification.new do |s|
+  s.name = 'logstash-output-example'
+  s.version = '0.1.0'
+  s.licenses = ['Apache License (2.0)']
+  s.summary = "This output does x, y, z in Logstash"
+  s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
+  s.authors = ["Elastic"]
+  s.email = 'info@elastic.co'
+  s.homepage = "http://www.elastic.co/guide/en/logstash/current/index.html"
+  s.require_paths = ["lib"]
+
+  # Files
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
+   # Tests
+  s.test_files = s.files.grep(%r{^(test|spec|features)/})
+
+  # Special flag to let us know this is actually a logstash plugin
+  s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
+
+  # Gem dependencies
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
+  s.add_development_dependency 'logstash-devutils'
+end
+```
+
+It is appropriate to change these values to fit your plugin. In particular, `s.name` and `s.summary` should reflect your plugin’s name and behavior.
+
+`s.licenses` and `s.version` are also important and will come into play when you are ready to publish your plugin.
+
+Logstash and all its plugins are licensed under [Apache License, version 2 ("ALv2")](https://github.com/elastic/logstash/blob/main/LICENSE.txt). If you make your plugin publicly available via [RubyGems.org](http://rubygems.org), please make sure to have this line in your gemspec:
+
+* `s.licenses = ['Apache License (2.0)']`
+
+The gem version, designated by `s.version`, helps track changes to plugins over time. You should use [semver versioning](http://semver.org/) strategy for version numbers.
+
+### Runtime and Development Dependencies [_runtime_and_development_dependencies_4]
+
+At the bottom of the `gemspec` file is a section with a comment: `Gem dependencies`.  This is where any other needed gems must be mentioned. If a gem is necessary for your plugin to function, it is a runtime dependency. If a gem are only used for testing, then it would be a development dependency.
+
+::::{note}
+You can also have versioning requirements for your dependencies—​including other Logstash plugins:
+
+```ruby
+  # Gem dependencies
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
+  s.add_development_dependency 'logstash-devutils'
+```
+
+This gemspec has a runtime dependency on the logstash-core-plugin-api and requires that it have a version number greater than or equal to version 1.60 and less than or equal to version 2.99.
+
+::::
+
+
+::::{important}
+All plugins have a runtime dependency on the `logstash-core-plugin-api` gem, and a development dependency on `logstash-devutils`.
+::::
+
+
+
+### Jar dependencies [_jar_dependencies_4]
+
+In some cases, such as the [Elasticsearch output plugin](https://github.com/logstash-plugins/logstash-output-elasticsearch/blob/main/logstash-output-elasticsearch.gemspec#L22-L23), your code may depend on a jar file.  In cases such as this, the dependency is added in the gemspec file in this manner:
+
+```ruby
+  # Jar dependencies
+  s.requirements << "jar 'org.elasticsearch:elasticsearch', '5.0.0'"
+  s.add_runtime_dependency 'jar-dependencies'
+```
+
+With these both defined, the install process will search for the required jar file at [http://mvnrepository.com](http://mvnrepository.com) and download the specified version.
+
+
+
+## Document your plugin [_document_your_plugin_4]
+
+Documentation is an important part of your plugin. All plugin documentation is rendered and placed in the [Logstash Reference](/reference/index.md) and the [Versioned plugin docs](logstash-docs-md://vpr/integration-plugins.md).
+
+See [Document your plugin](/extend/plugin-doc.md) for tips and guidelines.
+
+
+## Add Tests [_add_tests_4]
+
+Logstash loves tests. Lots of tests. If you’re using your new output plugin in a production environment, you’ll want to have some tests to ensure you are not breaking any existing functionality.
+
+::::{note}
+A full exposition on RSpec is outside the scope of this document. Learn more about RSpec at [http://rspec.info](http://rspec.info)
+::::
+
+
+For help learning about tests and testing, look in the `spec/outputs/` directory of several other similar plugins.
+
+
+## Clone and test! [_clone_and_test_4]
+
+Now let’s start with a fresh clone of the plugin, build it and run the tests.
+
+* **Clone your plugin into a temporary location** Replace `GITUSERNAME` with your github username, and `MYPLUGINNAME` with your plugin name.
+
+    * `git clone https://github.com/GITUSERNAME/logstash-``output-MYPLUGINNAME.git`
+
+        * alternately, via ssh: `git clone git@github.com:GITUSERNAME/logstash-``output-MYPLUGINNAME.git`
+
+    * `cd logstash-output-MYPLUGINNAME`
+
+
+Then, you’ll need to install your plugins dependencies with bundler:
+
+```
+bundle install
+```
+
+::::{important}
+If your plugin has an external file dependency described in `vendor.json`, you must download that dependency before running or testing.  You can do this by running:
+
+```
+rake vendor
+```
+
+::::
+
+
+And finally, run the tests:
+
+```
+bundle exec rspec
+```
+
+You should see a success message, which looks something like this:
+
+```
+Finished in 0.034 seconds
+1 example, 0 failures
+```
+
+Hooray! You’re almost there! (Unless you saw failures…​ you should fix those first).
+
+
+## Building and Testing [_building_and_testing_4]
+
+Now you’re ready to build your (well-tested) plugin into a Ruby gem.
+
+### Build [_build_4]
+
+You already have all the necessary ingredients, so let’s go ahead and run the build command:
+
+```sh
+gem build logstash-output-example.gemspec
+```
+
+That’s it!  Your gem should be built and be in the same path with the name
+
+```sh
+logstash-output-mypluginname-0.1.0.gem
+```
+
+The `s.version` number from your gemspec file will provide the gem version, in this case, `0.1.0`.
+
+
+### Test installation [_test_installation_4]
+
+You should test install your plugin into a clean installation of Logstash. Download the latest version from the [Logstash downloads page](https://www.elastic.co/downloads/logstash/).
+
+1. Untar and cd in to the directory:
+
+    ```sh
+    curl -O https://download.elastic.co/logstash/logstash/logstash-9.0.0.tar.gz
+    tar xzvf logstash-9.0.0.tar.gz
+    cd logstash-9.0.0
+    ```
+
+2. Using the plugin tool, we can install the gem we just built.
+
+    * Replace `/my/logstash/plugins` with  the correct path to the gem for your environment, and `0.1.0` with the correct version number from the gemspec file.
+
+        ```sh
+        bin/logstash-plugin install /my/logstash/plugins/logstash-output-example/logstash-output-example-0.1.0.gem
+        ```
+
+    * After running this, you should see feedback from Logstash that it was successfully installed:
+
+        ```sh
+        validating /my/logstash/plugins/logstash-output-example/logstash-output-example-0.1.0.gem >= 0
+        Valid logstash plugin. Continuing...
+        Successfully installed 'logstash-output-example' with version '0.1.0'
+        ```
+
+        ::::{tip}
+        You can also use the Logstash plugin tool to determine which plugins are currently available:
+
+        ```sh
+        bin/logstash-plugin list
+        ```
+
+        Depending on what you have installed, you might see a short or long list of plugins: inputs, codecs, filters and outputs.
+
+        ::::
+
+3. Now try running Logstash with a simple configuration passed in via the command-line, using the `-e` flag.
+
+    ::::{note}
+    Your results will depend on what your output plugin is designed to do.
+    ::::
+
+
+Congratulations! You’ve built, deployed and successfully run a Logstash output.
+
+
+
+## Submitting your plugin to [RubyGems.org](http://rubygems.org) and [logstash-plugins](https://github.com/logstash-plugins) [_submitting_your_plugin_to_rubygems_orghttprubygems_org_and_logstash_pluginshttpsgithub_comlogstash_plugins_4]
+
+Logstash uses [RubyGems.org](http://rubygems.org) as its repository for all plugin artifacts. Once you have developed your new plugin, you can make it available to Logstash users by simply publishing it to RubyGems.org.
+
+### Licensing [_licensing_4]
+
+Logstash and all its plugins are licensed under [Apache License, version 2 ("ALv2")](https://github.com/elasticsearch/logstash/blob/main/LICENSE). If you make your plugin publicly available via [RubyGems.org](http://rubygems.org), please make sure to have this line in your gemspec:
+
+* `s.licenses = ['Apache License (2.0)']`
+
+
+### Publishing to [RubyGems.org](http://rubygems.org) [_publishing_to_rubygems_orghttprubygems_org_4]
+
+To begin, you’ll need an account on RubyGems.org
+
+* [Sign-up for a RubyGems account](https://rubygems.org/sign_up).
+
+After creating an account, [obtain](http://guides.rubygems.org/rubygems-org-api/#api-authorization) an API key from RubyGems.org. By default, RubyGems uses the file `~/.gem/credentials` to store your API key. These credentials will be used to publish the gem. Replace `username` and `password` with the credentials you created at RubyGems.org:
+
+```sh
+curl -u username:password https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials
+chmod 0600 ~/.gem/credentials
+```
+
+Before proceeding, make sure you have the right version in your gemspec file and commit your changes.
+
+* `s.version = '0.1.0'`
+
+To publish version 0.1.0 of your new logstash gem:
+
+```sh
+bundle install
+bundle exec rake vendor
+bundle exec rspec
+bundle exec rake publish_gem
+```
+
+::::{note}
+Executing `rake publish_gem`:
+
+1. Reads the version from the gemspec file (`s.version = '0.1.0'`)
+2. Checks in your local repository if a tag exists for that version. If the tag already exists, it aborts the process. Otherwise, it creates a new version tag in your local repository.
+3. Builds the gem
+4. Publishes the gem to RubyGems.org
+
+::::
+
+
+That’s it! Your plugin is published! Logstash users can now install your plugin by running:
+
+```sh
+bin/logstash-plugin install logstash-output-mypluginname
+```
+
+
+
+## Contributing your source code to [logstash-plugins](https://github.com/logstash-plugins) [_contributing_your_source_code_to_logstash_pluginshttpsgithub_comlogstash_plugins_4]
+
+It is not required to contribute your source code to [logstash-plugins](https://github.com/logstash-plugins) github organization, but we always welcome new plugins!
+
+### Benefits [_benefits_4]
+
+Some of the many benefits of having your plugin in the logstash-plugins repository are:
+
+* **Discovery.** Your plugin will appear in the [Logstash Reference](/reference/index.md), where Logstash users look first for plugins and documentation.
+* **Documentation.** Your plugin documentation will automatically be added to the [Logstash Reference](/reference/index.md).
+* **Testing.** With our testing infrastructure, your plugin will be continuously tested against current and future releases of Logstash.  As a result, users will have the assurance that if incompatibilities arise, they will be quickly discovered and corrected.
+
+
+### Acceptance Guidelines [_acceptance_guidelines_4]
+
+* **Code Review.** Your plugin must be reviewed by members of the community for coherence, quality, readability, stability and security.
+* **Tests.** Your plugin must contain tests to be accepted.  These tests are also subject to code review for scope and completeness.  It’s ok if you don’t know how to write tests — we will guide you. We are working on publishing a guide to creating tests for Logstash which will make it easier.  In the meantime, you can refer to [http://betterspecs.org/](http://betterspecs.org/) for examples.
+
+To begin migrating your plugin to logstash-plugins, simply create a new [issue](https://github.com/elasticsearch/logstash/issues) in the Logstash repository. When the acceptance guidelines are completed, we will facilitate the move to the logstash-plugins organization using the recommended [github process](https://help.github.com/articles/transferring-a-repository/#transferring-from-a-user-to-an-organization).
diff --git a/docs/extend/plugin-doc.md b/docs/extend/plugin-doc.md
new file mode 100644
index 000000000..67658bfae
--- /dev/null
+++ b/docs/extend/plugin-doc.md
@@ -0,0 +1,172 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/plugin-doc.html
+---
+
+# Document your plugin [plugin-doc]
+
+Documentation is a required component of your plugin. Quality documentation with good examples contributes to the adoption of your plugin.
+
+The documentation that you write for your plugin will be generated and published in the [Logstash Reference](/reference/index.md) and the [Logstash Versioned Plugin Reference](logstash-docs-md://vpr/integration-plugins.md).
+
+::::{admonition} Plugin listing in {{ls}} Reference
+:class: note
+
+We may list your plugin in the [Logstash Reference](/reference/index.md) if it meets our [requirements and quality standards](/extend/index.md#plugin-acceptance). When we list your plugin, we point to *your* documentation—​a readme.md, docs/index.asciidoc, or both—​in your plugin repo. For more info on this option, see [List your plugin](/extend/plugin-listing.md).
+
+::::
+
+
+The following sections contain guidelines for documenting plugins hosted in the Github [logstash-plugins](https://github.com/logstash-plugins/) organization.
+
+## Documentation file [plugin-doc-file]
+
+Documentation belongs in a single file called *docs/index.asciidoc*. It belongs in a single file called *docs/index.asciidoc*. The [plugin generation utility](/reference/plugin-generator.md) creates a starter file for you.
+
+
+## Heading IDs [heading-ids]
+
+Format heading anchors with variables that can support generated IDs. This approach creates unique IDs when the [Logstash Versioned Plugin Reference](logstash-docs-md://vpr/integration-plugins.md) is built. Unique heading IDs are required to avoid duplication over multiple versions of a plugin.
+
+**Example**
+
+Don’t hardcode a plugin heading ID like this: `[[config_models]]`
+
+Instead, use variables to define it:
+
+```txt
+[id="plugins-{type}s-{plugin}-config_models"]
+==== Configuration models
+```
+
+If you hardcode an ID, the [Logstash Versioned Plugin Reference](logstash-docs-md://vpr/integration-plugins.md) builds correctly the first time. The second time the doc build runs, the ID is flagged as a duplicate, and the build fails.
+
+
+## Link formats [link-format]
+
+Correct link formatting is essential for directing users to the content you want them to see. Incorrect link formatting or duplicate links can break the documentation build. Let’s not do that.
+
+### Link to content in the same file [_link_to_content_in_the_same_file]
+
+Use angle brackets to format links to content in the same asciidoc file.
+
+**Example**
+
+This link:
+
+```txt
+<<plugins-{type}s-{plugin}-config_models>>
+```
+
+Points to this heading in the same file:
+
+```txt
+[id="plugins-{type}s-{plugin}-config_models"]
+==== Configuration models
+```
+
+
+### Link to content in the Logstash Reference Guide [_link_to_content_in_the_logstash_reference_guide]
+
+Use external link syntax for links that point to documentation for other plugins or content in the Logstash Reference Guide.
+
+**Examples**
+
+```txt
+{logstash-ref}/plugins-codecs-multiline.html[Multiline codec plugin]
+```
+
+```txt
+{logstash-ref}/getting-started-with-logstash.html
+```
+
+
+### Link text [_link_text]
+
+If you don’t specify link text, the URL is used as the link text.
+
+**Examples**
+
+If you want your link to display as {{logstash-ref}}/getting-started-with-logstash.html, use this format:
+
+```txt
+{logstash-ref}/getting-started-with-logstash.html
+```
+
+If you want your link to display as [Getting Started with Logstash](/reference/getting-started-with-logstash.md), use this format:
+
+```txt
+{logstash-ref}/getting-started-with-logstash.html[Getting Started with Logstash]
+```
+
+
+### Link to data type descriptions [_link_to_data_type_descriptions]
+
+We make an exception for links that point to data type descriptions, such as `<<boolean,boolean>>`, because they are used so frequently. We have a cleanup step in the conversion script that converts the links to the correct syntax.
+
+
+
+## Code samples [format-code]
+
+We all love code samples. Asciidoc supports code blocks and config examples. To include Ruby code, use the asciidoc `[source,ruby]` directive.
+
+Note that the hashmarks (#) are present to make the example render correctly. Don’t include the hashmarks in your asciidoc file.
+
+```txt
+# [source,ruby]
+# -----
+# match => {
+#  "field1" => "value1"
+#  "field2" => "value2"
+#  ...
+# }
+# -----
+```
+
+The sample above (with hashmarks removed) renders in the documentation like this:
+
+```ruby
+match => {
+  "field1" => "value1"
+  "field2" => "value2"
+  ...
+}
+```
+
+
+## Where’s my doc? [_wheres_my_doc]
+
+Plugin documentation goes through several steps before it gets published in the [Logstash Versioned Plugin Reference](logstash-docs-md://vpr/integration-plugins.md) and the [Logstash Reference](/reference/index.md).
+
+Here’s an overview of the workflow:
+
+* Be sure that you have signed the contributor license agreement (CLA) and have all necessary approvals and sign offs.
+* Merge the pull request for your plugin (including the `index.asciidoc` file, the `changelog.md` file, and the gemspec).
+* Wait for the continuous integration build to complete successfully.
+* Publish the plugin to [https://rubygems.org](https://rubygems.org).
+* A script detects the new or changed version, and picks up the `index.asciidoc` file for inclusion in the doc build.
+* The documentation for your new plugin is published in the [Logstash Versioned Plugin Reference](logstash-docs-md://vpr/integration-plugins.md).
+
+We’re not done yet.
+
+* For each release, we package the new and changed documentation files into a pull request to add or update content. (We sometimes package plugin docs between releases if we make significant changes to plugin documentation or add a new plugin.)
+* The script detects the new or changed version, and picks up the `index.asciidoc` file for inclusion in the doc build.
+* We create a pull request, and merge the new and changed content into the appropriate version branches.
+* For a new plugin, we add a link to the list of plugins in the [Logstash Reference](/reference/index.md).
+* The documentation for your new (or changed) plugin is published in the [Logstash Reference](/reference/index.md).
+
+### Documentation or plugin updates [_documentation_or_plugin_updates]
+
+When you make updates to your plugin or the documentation, consider bumping the version number in the changelog and gemspec (or version file). The version change triggers the doc build to pick up your changes for publishing.
+
+
+
+## Resources [_resources]
+
+For more asciidoc formatting tips, see the excellent reference at [https://github.com/elastic/docs#asciidoc-guide](https://github.com/elastic/docs#asciidoc-guide).
+
+For tips on contributing and changelog guidelines, see [CONTRIBUTING.md](https://github.com/elastic/logstash/blob/main/CONTRIBUTING.md#logstash-plugin-changelog-guidelines).
+
+For general information about contributing, see [Contributing to Logstash](/extend/index.md).
+
+
diff --git a/docs/extend/plugin-listing.md b/docs/extend/plugin-listing.md
new file mode 100644
index 000000000..48807a404
--- /dev/null
+++ b/docs/extend/plugin-listing.md
@@ -0,0 +1,23 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/plugin-listing.html
+---
+
+# List your plugin [plugin-listing]
+
+The [Logstash Reference](/reference/index.md) is the first place {{ls}} users look for plugins and documentation. If your plugin meets the [quality and acceptance guidelines](/extend/index.md#plugin-acceptance), we may be able to list it in the guide.
+
+The plugin source and documentation will continue to live in your repo, and we will direct users there.
+
+If you would like to have your plugin included in the [Logstash Reference](/reference/index.md), create a new [issue](https://github.com/elasticsearch/logstash/issues) in the Logstash repository with the following information:
+
+* Title: `PluginListing: <your-plugin-name>`
+* Body:
+
+    * Brief description of the plugin (what it is and what it does).
+    * Link to the plugin repository.
+    * Link to the README.md or docs/index.asciidoc.
+    * Describe how your plugin meets our [quality and acceptance guidelines](/extend/index.md#plugin-acceptance).
+
+* Labels: `docs`, `new-plugin`
+
diff --git a/docs/extend/publish-plugin.md b/docs/extend/publish-plugin.md
new file mode 100644
index 000000000..13294b2b5
--- /dev/null
+++ b/docs/extend/publish-plugin.md
@@ -0,0 +1,62 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/publish-plugin.html
+---
+
+# Publish your plugin to RubyGems.org [publish-plugin]
+
+Logstash uses [RubyGems.org](http://rubygems.org) as its repository for all plugin artifacts. After you have developed your new plugin, you can make it available to Logstash users by publishing it to RubyGems.org.
+
+## Licensing [_licensing_5]
+
+Logstash and all its plugins are licensed under [Apache License, version 2 ("ALv2")](https://github.com/elasticsearch/logstash/blob/main/LICENSE). If you make your plugin publicly available via [RubyGems.org](http://rubygems.org), please make sure to have this line in your gemspec:
+
+* `s.licenses = ['Apache License (2.0)']`
+
+
+## Publish to [RubyGems.org](http://rubygems.org) [_publish_to_rubygems_orghttprubygems_org]
+
+You’ll need an account on RubyGems.org
+
+* [Sign-up for a RubyGems account](https://rubygems.org/sign_up).
+
+After creating an account, [obtain](http://guides.rubygems.org/rubygems-org-api/#api-authorization) an API key from RubyGems.org. By default, RubyGems uses the file `~/.gem/credentials` to store your API key. These credentials will be used to publish the gem. Replace `username` and `password` with the credentials you created at RubyGems.org:
+
+```sh
+curl -u username:password https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials
+chmod 0600 ~/.gem/credentials
+```
+
+Before proceeding, make sure you have the right version in your gemspec file and commit your changes.
+
+* `s.version = '0.1.0'`
+
+To publish version 0.1.0 of your new logstash gem:
+
+```sh
+bundle install
+bundle exec rake vendor
+bundle exec rspec
+bundle exec rake publish_gem
+```
+
+::::{note}
+Execute `rake publish_gem`:
+
+1. Reads the version from the gemspec file (`s.version = '0.1.0'`)
+2. Checks in your local repository if a tag exists for that version. If the tag already exists, it aborts the process. Otherwise, it creates a new version tag in your local repository.
+3. Builds the gem
+4. Publishes the gem to RubyGems.org
+
+::::
+
+
+That’s it! Your plugin is published! Logstash users can now install your plugin by running:
+
+```sh
+bin/plugin install logstash-output-mypluginname
+```
+
+Where <plugintype> is `input`, `output`, `filter`, or `codec`, and <mypluginname> is the name of your new plugin.
+
+
diff --git a/docs/extend/toc.yml b/docs/extend/toc.yml
new file mode 100644
index 000000000..225f36590
--- /dev/null
+++ b/docs/extend/toc.yml
@@ -0,0 +1,18 @@
+toc:
+  - file: index.md
+  - file: input-new-plugin.md
+  - file: codec-new-plugin.md
+  - file: filter-new-plugin.md
+  - file: output-new-plugin.md
+  - file: community-maintainer.md
+  - file: plugin-doc.md
+  - file: publish-plugin.md
+  - file: plugin-listing.md
+  - file: contributing-patch-plugin.md
+  - file: contribute-to-core.md
+  - file: create-logstash-plugins.md
+    children:
+      - file: java-input-plugin.md
+      - file: java-codec-plugin.md
+      - file: java-filter-plugin.md
+      - file: java-output-plugin.md
\ No newline at end of file
diff --git a/docs/gs-index.asciidoc b/docs/gs-index.asciidoc
deleted file mode 100644
index 23c39dd8c..000000000
--- a/docs/gs-index.asciidoc
+++ /dev/null
@@ -1,39 +0,0 @@
-[[logstash-reference]]
-= Logstash Reference
-
-:branch:                5.4
-:major-version:         5.4
-:logstash_version:      5.4.0
-:elasticsearch_version: 5.4.0
-:docker-image:          docker.elastic.co/logstash/logstash:{logstash_version}
-
-//////////
-release-state can be: released | prerelease | unreleased
-//////////
-:release-state:  released
-
-:jdk:                   1.8.0
-:guide:                 https://www.elastic.co/guide/en/elasticsearch/guide/current/
-:ref:                   https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/
-:xpack:                 https://www.elastic.co/guide/en/x-pack/{branch}/
-:logstash:              https://www.elastic.co/guide/en/logstash/{branch}/
-:filebeat:              https://www.elastic.co/guide/en/beats/filebeat/{branch}/
-:lsissue:               https://github.com/elastic/logstash/issues/
-:security:              X-Pack Security
-:stack:                 https://www.elastic.co/guide/en/elastic-stack/current/
-
-[[introduction]]
-== Logstash Introduction
-
-Logstash is an open source data collection engine with real-time pipelining capabilities. Logstash can dynamically
-unify data from disparate sources and normalize the data into destinations of your choice. Cleanse and democratize all
-your data for diverse advanced downstream analytics and visualization use cases.
-
-While Logstash originally drove innovation in log collection, its capabilities extend well beyond that use case. Any
-type of event can be enriched and transformed with a broad array of input, filter, and output plugins, with many
-native codecs further simplifying the ingestion process. Logstash accelerates your insights by harnessing a greater
-volume and variety of data.
-
-include::static/introduction.asciidoc[]
-
-include::static/getting-started-with-logstash.asciidoc[]
\ No newline at end of file
diff --git a/docs/include/filter.asciidoc b/docs/include/filter.asciidoc
deleted file mode 100644
index 12b9596b0..000000000
--- a/docs/include/filter.asciidoc
+++ /dev/null
@@ -1,232 +0,0 @@
-==== Common Options
-
-// Contributors: You must conditionally code all internal links and IDs in this
-// file to make the common files work in both the LS Reference and the versioned
-// plugin docs
-
-The following configuration options are supported by all filter plugins:
-
-ifeval::["{versioned_docs}"!="true"]
-[cols="<,<,<",options="header",]
-|=======================================================================
-|Setting |Input type|Required
-| <<plugins-{type}s-{plugin}-add_field>> |{logstash-ref}/configuration-file-structure.html#hash[hash]|No
-| <<plugins-{type}s-{plugin}-add_tag>> |{logstash-ref}/configuration-file-structure.html#array[array]|No
-| <<plugins-{type}s-{plugin}-enable_metric>> |{logstash-ref}/configuration-file-structure.html#boolean[boolean]|No
-| <<plugins-{type}s-{plugin}-id>> |{logstash-ref}/configuration-file-structure.html#string[string]|No
-| <<plugins-{type}s-{plugin}-periodic_flush>> |{logstash-ref}/configuration-file-structure.html#boolean[boolean]|No
-| <<plugins-{type}s-{plugin}-remove_field>> |{logstash-ref}/configuration-file-structure.html#array[array]|No
-| <<plugins-{type}s-{plugin}-remove_tag>> |{logstash-ref}/configuration-file-structure.html#array[array]|No
-|=======================================================================
-endif::[]
-ifeval::["{versioned_docs}"=="true"]
-[cols="<,<,<",options="header",]
-|=======================================================================
-|Setting |Input type|Required
-| <<{version}-plugins-{type}s-{plugin}-add_field>> |{logstash-ref}/configuration-file-structure.html#hash[hash]|No
-| <<{version}-plugins-{type}s-{plugin}-add_tag>> |{logstash-ref}/configuration-file-structure.html#array[array]|No
-| <<{version}-plugins-{type}s-{plugin}-enable_metric>> |{logstash-ref}/configuration-file-structure.html#boolean[boolean]|No
-| <<{version}-plugins-{type}s-{plugin}-id>> |{logstash-ref}/configuration-file-structure.html#string[string]|No
-| <<{version}-plugins-{type}s-{plugin}-periodic_flush>> |{logstash-ref}/configuration-file-structure.html#boolean[boolean]|No
-| <<{version}-plugins-{type}s-{plugin}-remove_field>> |{logstash-ref}/configuration-file-structure.html#array[array]|No
-| <<{version}-plugins-{type}s-{plugin}-remove_tag>> |{logstash-ref}/configuration-file-structure.html#array[array]|No
-|=======================================================================
-endif::[]
-
-ifeval::["{versioned_docs}"!="true"]
-[id="plugins-{type}s-{plugin}-add_field"]
-endif::[]
-ifeval::["{versioned_docs}"=="true"]
-[id="{version}-plugins-{type}s-{plugin}-add_field"]
-endif::[]
-===== `add_field`
-
-  * Value type is {logstash-ref}/configuration-file-structure.html#hash[hash]
-  * Default value is `{}`
-
-If this filter is successful, add any arbitrary fields to this event.
-Field names can be dynamic and include parts of the event using the `%{field}`.
-
-Example:
-
-["source","json",subs="attributes"]
-    filter {
-      {plugin} {
-        add_field => { "foo_%\{somefield\}" => "Hello world, from %\{host\}" }
-      }
-    }
-    
-["source","json",subs="attributes"]
-    # You can also add multiple fields at once:
-    filter {
-      {plugin} {
-        add_field => {
-          "foo_%\{somefield\}" => "Hello world, from %\{host\}"
-          "new_field" => "new_static_value"
-        }
-      }
-    }
-
-If the event has field `"somefield" == "hello"` this filter, on success,
-would add field `foo_hello` if it is present, with the
-value above and the `%{host}` piece replaced with that value from the
-event. The second example would also add a hardcoded field.
-
-ifeval::["{versioned_docs}"!="true"]
-[id="plugins-{type}s-{plugin}-add_tag"]
-endif::[]
-ifeval::["{versioned_docs}"=="true"]
-[id="{version}-plugins-{type}s-{plugin}-add_tag"]
-endif::[]
-===== `add_tag`
-
-  * Value type is {logstash-ref}/configuration-file-structure.html#array[array]
-  * Default value is `[]`
-
-If this filter is successful, add arbitrary tags to the event.
-Tags can be dynamic and include parts of the event using the `%{field}`
-syntax.
-
-Example:
-
-["source","json",subs="attributes"]
-    filter {
-      {plugin} {
-        add_tag => [ "foo_%\{somefield\}" ]
-      }
-    }
-    
-["source","json",subs="attributes"]
-    # You can also add multiple tags at once:
-    filter {
-      {plugin} {
-        add_tag => [ "foo_%\{somefield\}", "taggedy_tag"]
-      }
-    }
-
-If the event has field `"somefield" == "hello"` this filter, on success,
-would add a tag `foo_hello` (and the second example would of course add a `taggedy_tag` tag).
-
-ifeval::["{versioned_docs}"!="true"]
-[id="plugins-{type}s-{plugin}-enable_metric"]
-endif::[]
-ifeval::["{versioned_docs}"=="true"]
-[id="{version}-plugins-{type}s-{plugin}-enable_metric"]
-endif::[]
-===== `enable_metric`
-
-  * Value type is {logstash-ref}/configuration-file-structure.html#boolean[boolean]
-  * Default value is `true`
-
-Disable or enable metric logging for this specific plugin instance
-by default we record all the metrics we can, but you can disable metrics collection
-for a specific plugin.
-
-ifeval::["{versioned_docs}"!="true"]
-[id="plugins-{type}s-{plugin}-id"]
-endif::[]
-ifeval::["{versioned_docs}"=="true"]
-[id="{version}-plugins-{type}s-{plugin}-id"]
-endif::[]
-===== `id`
-
-  * Value type is {logstash-ref}/configuration-file-structure.html#string[string]
-  * There is no default value for this setting.
-
-Add a unique `ID` to the plugin configuration. If no ID is specified, Logstash will generate one.
-It is strongly recommended to set this ID in your configuration. This is particularly useful
-when you have two or more plugins of the same type, for example, if you have 2 {plugin} filters.
-Adding a named ID in this case will help in monitoring Logstash when using the monitoring APIs.
-
-
-["source","json",subs="attributes"]
-    filter {
-      {plugin} {
-        id => "ABC"
-      }
-    }
-
-
-ifeval::["{versioned_docs}"!="true"]
-[id="plugins-{type}s-{plugin}-periodic_flush"]
-endif::[]
-ifeval::["{versioned_docs}"=="true"]
-[id="{version}-plugins-{type}s-{plugin}-periodic_flush"]
-endif::[]
-===== `periodic_flush`
-
-  * Value type is {logstash-ref}/configuration-file-structure.html#boolean[boolean]
-  * Default value is `false`
-
-Call the filter flush method at regular interval.
-Optional.
-
-ifeval::["{versioned_docs}"!="true"]
-[id="plugins-{type}s-{plugin}-remove_field"]
-endif::[]
-ifeval::["{versioned_docs}"=="true"]
-[id="{version}-plugins-{type}s-{plugin}-remove_field"]
-endif::[]
-===== `remove_field`
-
-  * Value type is {logstash-ref}/configuration-file-structure.html#array[array]
-  * Default value is `[]`
-
-If this filter is successful, remove arbitrary fields from this event.
-Fields names can be dynamic and include parts of the event using the %{field}
-Example:
-
-["source","json",subs="attributes"]
-    filter {
-      {plugin} {
-        remove_field => [ "foo_%\{somefield\}" ]
-      }
-    }
-    
-["source","json",subs="attributes"]
-    # You can also remove multiple fields at once:
-    filter {
-      {plugin} {
-        remove_field => [ "foo_%\{somefield\}", "my_extraneous_field" ]
-      }
-    }
-
-If the event has field `"somefield" == "hello"` this filter, on success,
-would remove the field with name `foo_hello` if it is present. The second
-example would remove an additional, non-dynamic field.
-
-ifeval::["{versioned_docs}"!="true"]
-[id="plugins-{type}s-{plugin}-remove_tag"]
-endif::[]
-ifeval::["{versioned_docs}"=="true"]
-[id="{version}-plugins-{type}s-{plugin}-remove_tag"]
-endif::[]
-===== `remove_tag`
-
-  * Value type is {logstash-ref}/configuration-file-structure.html#array[array]
-  * Default value is `[]`
-
-If this filter is successful, remove arbitrary tags from the event.
-Tags can be dynamic and include parts of the event using the `%{field}`
-syntax.
-
-Example:
-
-["source","json",subs="attributes"]
-    filter {
-      {plugin} {
-        remove_tag => [ "foo_%\{somefield\}" ]
-      }
-    }
-    
-["source","json",subs="attributes"]
-    # You can also remove multiple tags at once:
-    filter {
-      {plugin} {
-        remove_tag => [ "foo_%\{somefield\}", "sad_unwanted_tag"]
-      }
-    }
-
-If the event has field `"somefield" == "hello"` this filter, on success,
-would remove the tag `foo_hello` if it is present. The second example
-would remove a sad, unwanted tag as well.
diff --git a/docs/include/input.asciidoc b/docs/include/input.asciidoc
deleted file mode 100644
index 9c6a7b802..000000000
--- a/docs/include/input.asciidoc
+++ /dev/null
@@ -1,171 +0,0 @@
-==== Common Options
-
-// Contributors: You must conditionally code all internal links and IDs in this
-// file to make the common files work in both the LS Reference and the versioned
-// plugin docs
-
-The following configuration options are supported by all input plugins:
-
-[cols="<,<,<",options="header",]
-ifeval::["{versioned_docs}"!="true"]
-|=======================================================================
-|Setting |Input type|Required
-| <<plugins-{type}s-{plugin}-add_field>> |{logstash-ref}/configuration-file-structure.html#hash[hash]|No
-ifndef::no_codec[]
-| <<plugins-{type}s-{plugin}-codec>> |{logstash-ref}/configuration-file-structure.html#codec[codec]|No
-endif::no_codec[]
-| <<plugins-{type}s-{plugin}-enable_metric>> |{logstash-ref}/configuration-file-structure.html#boolean[boolean]|No
-| <<plugins-{type}s-{plugin}-id>> |{logstash-ref}/configuration-file-structure.html#string[string]|No
-| <<plugins-{type}s-{plugin}-tags>> |{logstash-ref}/configuration-file-structure.html#array[array]|No
-| <<plugins-{type}s-{plugin}-type>> |{logstash-ref}/configuration-file-structure.html#string[string]|No
-|=======================================================================
-endif::[]
-ifeval::["{versioned_docs}"=="true"]
-|=======================================================================
-|Setting |Input type|Required
-| <<{version}-plugins-{type}s-{plugin}-add_field>> |{logstash-ref}/configuration-file-structure.html#hash[hash]|No
-ifndef::no_codec[]
-| <<{version}-plugins-{type}s-{plugin}-codec>> |{logstash-ref}/configuration-file-structure.html#codec[codec]|No
-endif::no_codec[]
-| <<{version}-plugins-{type}s-{plugin}-enable_metric>> |{logstash-ref}/configuration-file-structure.html#boolean[boolean]|No
-| <<{version}-plugins-{type}s-{plugin}-id>> |{logstash-ref}/configuration-file-structure.html#string[string]|No
-| <<{version}-plugins-{type}s-{plugin}-tags>> |{logstash-ref}/configuration-file-structure.html#array[array]|No
-| <<{version}-plugins-{type}s-{plugin}-type>> |{logstash-ref}/configuration-file-structure.html#string[string]|No
-|=======================================================================
-endif::[]
-
-==== Details
-
-&nbsp;
-
-ifeval::["{versioned_docs}"!="true"]
-[id="plugins-{type}s-{plugin}-add_field"]
-endif::[]
-ifeval::["{versioned_docs}"=="true"]
-[id="{version}-plugins-{type}s-{plugin}-add_field"]
-endif::[]
-===== `add_field`
-
-  * Value type is {logstash-ref}/configuration-file-structure.html#hash[hash]
-  * Default value is `{}`
-
-Add a field to an event
-
-ifndef::no_codec[]
-ifeval::["{versioned_docs}"!="true"]
-[id="plugins-{type}s-{plugin}-codec"]
-endif::[]
-ifeval::["{versioned_docs}"=="true"]
-[id="{version}-plugins-{type}s-{plugin}-codec"]
-endif::[]
-===== `codec`
-
-  * Value type is {logstash-ref}/configuration-file-structure.html#codec[codec]
-ifdef::default_codec[]
-  * Default value is +"{default_codec}"+
-endif::[]
-ifndef::default_codec[]
-  * Default value is `"plain"`
-endif::[]
-
-The codec used for input data. Input codecs are a convenient method for decoding your data before it enters the input, without needing a separate filter in your Logstash pipeline.
-endif::no_codec[]
-
-
-ifeval::["{versioned_docs}"!="true"]
-[id="plugins-{type}s-{plugin}-enable_metric"]
-endif::[]
-ifeval::["{versioned_docs}"=="true"]
-[id="{version}-plugins-{type}s-{plugin}-enable_metric"]
-endif::[]
-===== `enable_metric`
-
-  * Value type is {logstash-ref}/configuration-file-structure.html#boolean[boolean]
-  * Default value is `true`
-
-Disable or enable metric logging for this specific plugin instance
-by default we record all the metrics we can, but you can disable metrics collection
-for a specific plugin.
-
-ifeval::["{versioned_docs}"!="true"]
-[id="plugins-{type}s-{plugin}-id"]
-endif::[]
-ifeval::["{versioned_docs}"=="true"]
-[id="{version}-plugins-{type}s-{plugin}-id"]
-endif::[]
-===== `id`
-
-  * Value type is {logstash-ref}/configuration-file-structure.html#string[string]
-  * There is no default value for this setting.
-
-Add a unique `ID` to the plugin configuration. If no ID is specified, Logstash will generate one.
-It is strongly recommended to set this ID in your configuration. This is particularly useful
-when you have two or more plugins of the same type, for example, if you have 2 {plugin} inputs.
-Adding a named ID in this case will help in monitoring Logstash when using the monitoring APIs.
-
-["source","json",subs="attributes"]
----------------------------------------------------------------------------------------------------
-input {
-  {plugin} {
-    id => "my_plugin_id"
-  }
-}
----------------------------------------------------------------------------------------------------
-
-
-ifeval::["{versioned_docs}"!="true"]
-[id="plugins-{type}s-{plugin}-tags"]
-endif::[]
-ifeval::["{versioned_docs}"=="true"]
-[id="{version}-plugins-{type}s-{plugin}-tags"]
-endif::[]
-===== `tags`
-
-  * Value type is {logstash-ref}/configuration-file-structure.html#array[array]
-  * There is no default value for this setting.
-
-Add any number of arbitrary tags to your event.
-
-This can help with processing later.
-
-ifeval::["{versioned_docs}"!="true"]
-[id="plugins-{type}s-{plugin}-type"]
-endif::[]
-ifeval::["{versioned_docs}"=="true"]
-[id="{version}-plugins-{type}s-{plugin}-type"]
-endif::[]
-===== `type`
-
-  * Value type is {logstash-ref}/configuration-file-structure.html#string[string]
-  * There is no default value for this setting.
-
-Add a `type` field to all events handled by this input.
-
-Types are used mainly for filter activation.
-
-The type is stored as part of the event itself, so you can
-also use the type to search for it in Kibana.
-
-If you try to set a type on an event that already has one (for
-example when you send an event from a shipper to an indexer) then
-a new input will not override the existing type. A type set at
-the shipper stays with that event for its life even
-when sent to another Logstash server.
-
-ifeval::["{type}"=="input" and "{plugin}"=="beats"]
-
-ifeval::["{versioned_docs}"!="true"]
-NOTE: The Beats shipper automatically sets the `type` field on the event.
-You cannot override this setting in the Logstash config. If you specify
-a setting for the <<plugins-inputs-beats-type,`type`>> config option in
-Logstash, it is ignored.
-endif::[]
-ifeval::["{versioned_docs}"=="true"]
-NOTE: The Beats shipper automatically sets the `type` field on the event.
-You cannot override this setting in the Logstash config. If you specify
-a setting for the <<{version}-plugins-inputs-beats-type,`type`>> config option in
-Logstash, it is ignored.
-endif::[]
-
-endif::[]
-
diff --git a/docs/include/output.asciidoc b/docs/include/output.asciidoc
deleted file mode 100644
index e546ce8ab..000000000
--- a/docs/include/output.asciidoc
+++ /dev/null
@@ -1,92 +0,0 @@
-==== Common Options
-
-// Contributors: You must conditionally code all internal links and IDs in this
-// file to make the common files work in both the LS Reference and the versioned
-// plugin docs
-
-The following configuration options are supported by all output plugins:
-
-ifeval::["{versioned_docs}"!="true"]
-[cols="<,<,<",options="header",]
-|=======================================================================
-|Setting |Input type|Required
-ifndef::no_codec[]
-| <<plugins-{type}s-{plugin}-codec>> |{logstash-ref}/configuration-file-structure.html#codec[codec]|No
-endif::no_codec[]
-| <<plugins-{type}s-{plugin}-enable_metric>> |{logstash-ref}/configuration-file-structure.html#boolean[boolean]|No
-| <<plugins-{type}s-{plugin}-id>> |{logstash-ref}/configuration-file-structure.html#string[string]|No
-|=======================================================================
-endif::[]
-ifeval::["{versioned_docs}"=="true"]
-[cols="<,<,<",options="header",]
-|=======================================================================
-|Setting |Input type|Required
-ifndef::no_codec[]
-| <<{version}-plugins-{type}s-{plugin}-codec>> |{logstash-ref}/configuration-file-structure.html#codec[codec]|No
-endif::no_codec[]
-| <<{version}-plugins-{type}s-{plugin}-enable_metric>> |{logstash-ref}/configuration-file-structure.html#boolean[boolean]|No
-| <<{version}-plugins-{type}s-{plugin}-id>> |{logstash-ref}/configuration-file-structure.html#string[string]|No
-|=======================================================================
-endif::[]
-
-ifndef::no_codec[]
-ifeval::["{versioned_docs}"!="true"]
-[id="plugins-{type}s-{plugin}-codec"]
-endif::[]
-ifeval::["{versioned_docs}"=="true"]
-[id="{version}-plugins-{type}s-{plugin}-codec"]
-endif::[]
-===== `codec`
-
-  * Value type is {logstash-ref}/configuration-file-structure.html#codec[codec]
-ifdef::default_codec[]
-  * Default value is +"{default_codec}"+
-endif::[]
-ifndef::default_codec[]
-  * Default value is `"plain"`
-endif::[]
-
-The codec used for output data. Output codecs are a convenient method for encoding your data before it leaves the output without needing a separate filter in your Logstash pipeline.
-endif::no_codec[]
-
-ifeval::["{versioned_docs}"!="true"]
-[id="plugins-{type}s-{plugin}-enable_metric"]
-endif::[]
-ifeval::["{versioned_docs}"=="true"]
-[id="{version}-plugins-{type}s-{plugin}-enable_metric"]
-endif::[]
-===== `enable_metric`
-
-  * Value type is {logstash-ref}/configuration-file-structure.html#boolean[boolean]
-  * Default value is `true`
-
-Disable or enable metric logging for this specific plugin instance.
-By default we record all the metrics we can, but you can disable metrics collection
-for a specific plugin.
-
-ifeval::["{versioned_docs}"!="true"]
-[id="plugins-{type}s-{plugin}-id"]
-endif::[]
-ifeval::["{versioned_docs}"=="true"]
-[id="{version}-plugins-{type}s-{plugin}-id"]
-endif::[]
-===== `id`
-
-  * Value type is {logstash-ref}/configuration-file-structure.html#string[string]
-  * There is no default value for this setting.
-
-Add a unique `ID` to the plugin configuration. If no ID is specified, Logstash will generate one.
-It is strongly recommended to set this ID in your configuration. This is particularly useful
-when you have two or more plugins of the same type. For example, if you have 2 {plugin} outputs.
-Adding a named ID in this case will help in monitoring Logstash when using the monitoring APIs.
-
-["source","json",subs="attributes"]
----------------------------------------------------------------------------------------------------
-output {
-  {plugin} {
-    id => "my_plugin_id"
-  }
-}
----------------------------------------------------------------------------------------------------
-
-
diff --git a/docs/include/plugin_header.asciidoc b/docs/include/plugin_header.asciidoc
deleted file mode 100644
index 9640b1c59..000000000
--- a/docs/include/plugin_header.asciidoc
+++ /dev/null
@@ -1,43 +0,0 @@
-ifeval::["{versioned_docs}"!="true"]
-++++
-<titleabbrev>{plugin}</titleabbrev>
-++++
-endif::[]
-ifeval::["{versioned_docs}"=="true"]
-++++
-<titleabbrev>{version}</titleabbrev>
-++++
-endif::[]
-
-* Plugin version: {version}
-* Released on: {release_date}
-* {changelog_url}[Changelog]
-
-ifeval::["{versioned_docs}"!="true"]
-
-For other versions, see the
-{lsplugindocs}/{type}-{plugin}-index.html[Versioned plugin docs].
-
-endif::[]
-
-ifeval::["{versioned_docs}"=="true"]
-
-For other versions, see the <<{type}-{plugin}-index,overview list>>.
-
-To learn more about Logstash, see the {logstash-ref}/index.html[Logstash Reference].
-
-endif::[]
-
-ifeval::[("{default_plugin}"=="0") and ("{versioned_docs}"!="true")]
-
-==== Installation
-
-For plugins not bundled by default, it is easy to install by running +bin/logstash-plugin install logstash-{type}-{plugin}+. See {logstash-ref}/working-with-plugins.html[Working with plugins] for more details.
-
-endif::[]
-
-==== Getting Help
-
-For questions about the plugin, open a topic in the http://discuss.elastic.co[Discuss] forums. For bugs or feature requests, open an issue in https://github.com/logstash-plugins/logstash-{type}-{plugin}[Github].
-For the list of Elastic supported plugins, please consult the https://www.elastic.co/support/matrix#matrix_logstash_plugins[Elastic Support Matrix].
-
diff --git a/docs/include/version-list-intro.asciidoc b/docs/include/version-list-intro.asciidoc
deleted file mode 100644
index 5ba89ed4b..000000000
--- a/docs/include/version-list-intro.asciidoc
+++ /dev/null
@@ -1,13 +0,0 @@
-[id="{type}-{plugin}-index"]
-
-== Versioned {plugin} {type} plugin docs
-++++
-<titleabbrev>{plugin}</titleabbrev>
-++++
-
-This page lists all available versions of the documentation for this plugin. 
-To see which version of the plugin you have installed, run `bin/logstash-plugin
-list --verbose`. 
-
-NOTE: Versioned plugin documentation is not available for plugins released prior
-to Logstash 6.0.
diff --git a/docs/index.asciidoc b/docs/index.asciidoc
deleted file mode 100644
index ea2d01af1..000000000
--- a/docs/index.asciidoc
+++ /dev/null
@@ -1,267 +0,0 @@
-[[logstash-reference]]
-= Logstash Reference
-
-:include-xpack:         true
-:lang:                  en
-:xls-repo-dir:          {docdir}/../x-pack/docs/{lang}
-:log-repo-dir:          {docdir}
-:plugins-repo-dir:      {docdir}/../../logstash-docs/docs
-:branch:                master
-:major-version:         7.x
-:logstash_version:      7.0.0-alpha2
-:elasticsearch_version: 7.0.0-alpha2
-:kibana_version:        7.0.0-alpha2
-:docker-repo:           docker.elastic.co/logstash/logstash
-:docker-image:          {docker-repo}:{logstash_version}
-
-//////////
-release-state can be: released | prerelease | unreleased
-//////////
-:release-state:         prerelease
-:versioned_docs:        false
-
-:jdk:                   1.8.0
-:lsissue:               https://github.com/elastic/logstash/issues
-:lsplugindocs:          https://www.elastic.co/guide/en/logstash-versioned-plugins/current
-
-include::{asciidoc-dir}/../../shared/attributes.asciidoc[]
-
-[[introduction]]
-== Logstash Introduction
-
-Logstash is an open source data collection engine with real-time pipelining capabilities. Logstash can dynamically
-unify data from disparate sources and normalize the data into destinations of your choice. Cleanse and democratize all
-your data for diverse advanced downstream analytics and visualization use cases.
-
-While Logstash originally drove innovation in log collection, its capabilities extend well beyond that use case. Any
-type of event can be enriched and transformed with a broad array of input, filter, and output plugins, with many
-native codecs further simplifying the ingestion process. Logstash accelerates your insights by harnessing a greater
-volume and variety of data.
-
-// The pass blocks here point to the correct repository for the edit links in the guide.
-
-// Introduction
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/introduction.asciidoc
-include::static/introduction.asciidoc[]
-
-// Glossary and core concepts go here
-
-// Getting Started with Logstash
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/getting-started-with-logstash.asciidoc
-include::static/getting-started-with-logstash.asciidoc[]
-
-// Advanced LS Pipelines
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/advanced-pipeline.asciidoc
-include::static/advanced-pipeline.asciidoc[]
-
-// Processing Pipeline
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/life-of-an-event.asciidoc
-include::static/life-of-an-event.asciidoc[]
-
-// Logstash setup
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/setting-up-logstash.asciidoc
-include::static/setting-up-logstash.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/settings-file.asciidoc
-include::static/settings-file.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/keystore.asciidoc
-include::static/keystore.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/running-logstash-command-line.asciidoc
-include::static/running-logstash-command-line.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/running-logstash.asciidoc
-include::static/running-logstash.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/docker.asciidoc
-include::static/docker.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/logging.asciidoc
-include::static/logging.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/shutdown.asciidoc
-include::static/shutdown.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/setting-up-xpack.asciidoc
-include::static/setup/setting-up-xpack.asciidoc[]
-
-// Upgrading Logstash
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/upgrading.asciidoc
-include::static/upgrading.asciidoc[]
-
-// Configuring Logstash
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/configuration.asciidoc
-include::static/configuration.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/field-reference.asciidoc
-include::static/field-reference.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/multiple-pipelines.asciidoc
-include::static/multiple-pipelines.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/pipeline-pipeline-config.asciidoc
-include::static/pipeline-pipeline-config.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/reloading-config.asciidoc
-include::static/reloading-config.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/managing-multiline-events.asciidoc
-include::static/managing-multiline-events.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/glob-support.asciidoc
-include::static/glob-support.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/ingest-convert.asciidoc
-include::static/ingest-convert.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/ls-ls-config.asciidoc
-include::static/ls-ls-config.asciidoc[]
-
-ifdef::include-xpack[]
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/management/configuring-centralized-pipelines.asciidoc
-include::static/management/configuring-centralized-pipelines.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/monitoring/configuring-logstash.asciidoc
-include::static/monitoring/configuring-logstash.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/security/logstash.asciidoc
-include::static/security/logstash.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/setup/configuring-xls.asciidoc
-include::static/setup/configuring-xls.asciidoc[]
-endif::include-xpack[]
-
-// Centralized configuration managements
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/config-management.asciidoc
-include::static/config-management.asciidoc[]
-
-// Working with Logstash Modules
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/modules.asciidoc
-include::static/modules.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/arcsight-module.asciidoc
-include::static/arcsight-module.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/netflow-module.asciidoc
-include::static/netflow-module.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/azure-module.asciidoc
-include::static/azure-module.asciidoc[]
-
-// Working with Filebeat Modules
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/filebeat-modules.asciidoc
-include::static/filebeat-modules.asciidoc[]
-
-// Data resiliency
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/resiliency.asciidoc
-include::static/resiliency.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/persistent-queues.asciidoc
-include::static/persistent-queues.asciidoc[]
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/dead-letter-queues.asciidoc
-include::static/dead-letter-queues.asciidoc[]
-
-// Transforming Data
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/transforming-data.asciidoc
-include::static/transforming-data.asciidoc[]
-
-// Deploying & Scaling
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/deploying.asciidoc
-include::static/deploying.asciidoc[]
-
-// Troubleshooting performance
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/performance-checklist.asciidoc
-include::static/performance-checklist.asciidoc[]
-
-// Monitoring overview
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/monitoring.asciidoc
-include::static/monitoring.asciidoc[]
-
-// Monitoring APIs
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/monitoring-apis.asciidoc
-include::static/monitoring-apis.asciidoc[]
-
-// Working with Plugins
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/plugin-manager.asciidoc
-include::static/plugin-manager.asciidoc[]
-
-// These files do their own pass blocks
-
-include::{plugins-repo-dir}/plugins/inputs.asciidoc[]
-include::{plugins-repo-dir}/plugins/outputs.asciidoc[]
-include::{plugins-repo-dir}/plugins/filters.asciidoc[]
-include::{plugins-repo-dir}/plugins/codecs.asciidoc[]
-
-// FAQ and Troubleshooting
-
-// :edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/faq.asciidoc
-include::static/best-practice.asciidoc[]
-
-// :edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/troubleshooting.asciidoc
-include::static/troubleshooting.asciidoc[]
-
-:edit_url:
-
-// Contributing to Logstash
-
-include::static/contributing-to-logstash.asciidoc[]
-
-include::static/input.asciidoc[]
-include::static/codec.asciidoc[]
-include::static/filter.asciidoc[]
-include::static/output.asciidoc[]
-
-// Contributing a Patch to a Logstash Plugin
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/contributing-patch.asciidoc
-include::static/contributing-patch.asciidoc[]
-
-// Logstash Community Maintainer Guide
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/maintainer-guide.asciidoc
-include::static/maintainer-guide.asciidoc[]
-
-// A space is necessary here ^^^
-
-
-// Submitting a Plugin
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/submitting-a-plugin.asciidoc
-include::static/submitting-a-plugin.asciidoc[]
-
-
-// Glossary of Terms
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/glossary.asciidoc
-include::static/glossary.asciidoc[]
-
-// This is in the pluginbody.asciidoc itself
-//
-
-// Breaking Changes
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/breaking-changes.asciidoc
-include::static/breaking-changes.asciidoc[]
-
-// Release Notes
-
-:edit_url: https://github.com/elastic/logstash/edit/{branch}/docs/static/releasenotes.asciidoc
-include::static/releasenotes.asciidoc[]
-
diff --git a/docs/index.x.asciidoc b/docs/index.x.asciidoc
deleted file mode 100644
index 35204eef5..000000000
--- a/docs/index.x.asciidoc
+++ /dev/null
@@ -1 +0,0 @@
-include::index.asciidoc[]
diff --git a/docs/reference/advanced-logstash-configurations.md b/docs/reference/advanced-logstash-configurations.md
new file mode 100644
index 000000000..13e46133c
--- /dev/null
+++ b/docs/reference/advanced-logstash-configurations.md
@@ -0,0 +1,14 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/configuration-advanced.html
+---
+
+# Advanced Logstash configurations [configuration-advanced]
+
+You can take {{ls}} beyond basic configuration to handle more advanced requirements, such as multiple pipelines, communication between {{ls}} pipelines, and multiple line events.
+
+
+
+
+
+
diff --git a/docs/reference/advanced-pipeline.md b/docs/reference/advanced-pipeline.md
new file mode 100644
index 000000000..ab0529765
--- /dev/null
+++ b/docs/reference/advanced-pipeline.md
@@ -0,0 +1,610 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/advanced-pipeline.html
+---
+
+# Parsing Logs with Logstash [advanced-pipeline]
+
+In [Stashing Your First Event](/reference/first-event.md), you created a basic Logstash pipeline to test your Logstash setup. In the real world, a Logstash pipeline is a bit more complex: it typically has one or more input, filter, and output plugins.
+
+In this section, you create a Logstash pipeline that uses Filebeat to take Apache web logs as input, parses those logs to create specific, named fields from the logs, and writes the parsed data to an Elasticsearch cluster. Rather than defining the pipeline configuration at the command line, you’ll define the pipeline in a config file.
+
+To get started, go [here](https://download.elastic.co/demos/logstash/gettingstarted/logstash-tutorial.log.gz) to download the sample data set used in this example. Unpack the file.
+
+## Configuring Filebeat to Send Log Lines to Logstash [configuring-filebeat]
+
+Before you create the Logstash pipeline, you’ll configure Filebeat to send log lines to Logstash. The [Filebeat](https://github.com/elastic/beats/tree/main/filebeat) client is a lightweight, resource-friendly tool that collects logs from files on the server and forwards these logs to your Logstash instance for processing. Filebeat is designed for reliability and low latency. Filebeat has a light resource footprint on the host machine, and the [`Beats input`](logstash-docs-md://lsr/plugins-inputs-beats.md) plugin minimizes the resource demands on the Logstash instance.
+
+::::{note}
+In a typical use case, Filebeat runs on a separate machine from the machine running your Logstash instance. For the purposes of this tutorial, Logstash and Filebeat are running on the same machine.
+::::
+
+
+The default Logstash installation includes the [`Beats input`](logstash-docs-md://lsr/plugins-inputs-beats.md) plugin. The Beats input plugin enables Logstash to receive events from the Elastic Beats framework, which means that any Beat written to work with the Beats framework, such as Packetbeat and Metricbeat, can also send event data to Logstash.
+
+To install Filebeat on your data source machine, download the appropriate package from the Filebeat [product page](https://www.elastic.co/downloads/beats/filebeat). You can also refer to [Filebeat quick start](beats://reference/filebeat/filebeat-installation-configuration.md) for additional installation instructions.
+
+After installing Filebeat, you need to configure it. Open the `filebeat.yml` file located in your Filebeat installation directory, and replace the contents with the following lines. Make sure `paths` points to the example Apache log file, `logstash-tutorial.log`, that you downloaded earlier:
+
+```yaml
+filebeat.inputs:
+- type: log
+  paths:
+    - /path/to/file/logstash-tutorial.log <1>
+output.logstash:
+  hosts: ["localhost:5044"]
+```
+
+1. Absolute path to the file or files that Filebeat processes.
+
+
+Save your changes.
+
+To keep the configuration simple, you won’t specify TLS/SSL settings as you would in a real world scenario.
+
+At the data source machine, run Filebeat with the following command:
+
+```shell
+sudo ./filebeat -e -c filebeat.yml -d "publish"
+```
+
+::::{note}
+If you run Filebeat as root, you need to change ownership of the configuration file (see [Config File Ownership and Permissions](beats://reference/libbeat/config-file-permissions.md) in the *Beats Platform Reference*).
+::::
+
+
+Filebeat will attempt to connect on port 5044. Until Logstash starts with an active Beats plugin, there won’t be any answer on that port, so any messages you see regarding failure to connect on that port are normal for now.
+
+
+## Configuring Logstash for Filebeat Input [_configuring_logstash_for_filebeat_input]
+
+Next, you create a Logstash configuration pipeline that uses the Beats input plugin to receive events from Beats.
+
+The following text represents the skeleton of a configuration pipeline:
+
+```json
+# The # character at the beginning of a line indicates a comment. Use
+# comments to describe your configuration.
+input {
+}
+# The filter part of this file is commented out to indicate that it is
+# optional.
+# filter {
+#
+# }
+output {
+}
+```
+
+This skeleton is non-functional, because the input and output sections don’t have any valid options defined.
+
+To get started, copy and paste the skeleton configuration pipeline into a file named `first-pipeline.conf` in your home Logstash directory.
+
+Next, configure your Logstash instance to use the Beats input plugin by adding the following lines to the `input` section of the `first-pipeline.conf` file:
+
+```json
+    beats {
+        port => "5044"
+    }
+```
+
+You’ll configure Logstash to write to Elasticsearch later. For now, you can add the following line to the `output` section so that the output is printed to stdout when you run Logstash:
+
+```json
+    stdout { codec => rubydebug }
+```
+
+When you’re done, the contents of `first-pipeline.conf` should look like this:
+
+```json
+input {
+    beats {
+        port => "5044"
+    }
+}
+# The filter part of this file is commented out to indicate that it is
+# optional.
+# filter {
+#
+# }
+output {
+    stdout { codec => rubydebug }
+}
+```
+
+To verify your configuration, run the following command:
+
+```shell
+bin/logstash -f first-pipeline.conf --config.test_and_exit
+```
+
+The `--config.test_and_exit` option parses your configuration file and reports any errors.
+
+If the configuration file passes the configuration test, start Logstash with the following command:
+
+```shell
+bin/logstash -f first-pipeline.conf --config.reload.automatic
+```
+
+The `--config.reload.automatic` option enables automatic config reloading so that you don’t have to stop and restart Logstash every time you modify the configuration file.
+
+As Logstash starts up, you might see one or more warning messages about Logstash ignoring the `pipelines.yml` file. You can safely ignore this warning. The `pipelines.yml` file is used for running [multiple pipelines](/reference/multiple-pipelines.md) in a single Logstash instance. For the examples shown here, you are running a single pipeline.
+
+If your pipeline is working correctly, you should see a series of events like the following written to the console:
+
+```json
+{
+    "@timestamp" => 2017-11-09T01:44:20.071Z,
+        "offset" => 325,
+      "@version" => "1",
+          "beat" => {
+            "name" => "My-MacBook-Pro.local",
+        "hostname" => "My-MacBook-Pro.local",
+         "version" => "6.0.0"
+    },
+          "host" => "My-MacBook-Pro.local",
+    "prospector" => {
+        "type" => "log"
+    },
+    "input" => {
+        "type" => "log"
+    },
+        "source" => "/path/to/file/logstash-tutorial.log",
+       "message" => "83.149.9.216 - - [04/Jan/2015:05:13:42 +0000] \"GET /presentations/logstash-monitorama-2013/images/kibana-search.png HTTP/1.1\" 200 203023 \"http://semicomplete.com/presentations/logstash-monitorama-2013/\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.77 Safari/537.36\"",
+          "tags" => [
+        [0] "beats_input_codec_plain_applied"
+    ]
+}
+...
+```
+
+
+### Parsing Web Logs with the Grok Filter Plugin [configuring-grok-filter]
+
+Now you have a working pipeline that reads log lines from Filebeat. However you’ll notice that the format of the log messages is not ideal. You want to parse the log messages to create specific, named fields from the logs. To do this, you’ll use the `grok` filter plugin.
+
+The [`grok`](logstash-docs-md://lsr/plugins-filters-grok.md) filter plugin is one of several plugins that are available by default in Logstash. For details on how to manage Logstash plugins, see the [reference documentation](/reference/working-with-plugins.md) for the plugin manager.
+
+The `grok` filter plugin enables you to parse the unstructured log data into something structured and queryable.
+
+Because the `grok` filter plugin looks for patterns in the incoming log data, configuring the plugin requires you to make decisions about how to identify the patterns that are of interest to your use case. A representative line from the web server log sample looks like this:
+
+```shell
+83.149.9.216 - - [04/Jan/2015:05:13:42 +0000] "GET /presentations/logstash-monitorama-2013/images/kibana-search.png
+HTTP/1.1" 200 203023 "http://semicomplete.com/presentations/logstash-monitorama-2013/" "Mozilla/5.0 (Macintosh; Intel
+Mac OS X 10_9_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.77 Safari/537.36"
+```
+
+The IP address at the beginning of the line is easy to identify, as is the timestamp in brackets. To parse the data, you can use the `%{{COMBINEDAPACHELOG}}` grok pattern, which structures lines from the Apache log using the following schema:
+
+**Information**
+:   **Field Name**
+
+IP Address
+:   `clientip`
+
+User ID
+:   `ident`
+
+User Authentication
+:   `auth`
+
+timestamp
+:   `timestamp`
+
+HTTP Verb
+:   `verb`
+
+Request body
+:   `request`
+
+HTTP Version
+:   `httpversion`
+
+HTTP Status Code
+:   `response`
+
+Bytes served
+:   `bytes`
+
+Referrer URL
+:   `referrer`
+
+User agent
+:   `agent`
+
+::::{tip}
+If you need help building grok patterns, try out the [Grok Debugger](docs-content://explore-analyze/query-filter/tools/grok-debugger.md). The Grok Debugger is an {{xpack}} feature under the Basic License and is therefore **free to use**.
+::::
+
+
+Edit the `first-pipeline.conf` file and replace the entire `filter` section with the following text:
+
+```json
+filter {
+    grok {
+        match => { "message" => "%{COMBINEDAPACHELOG}"}
+    }
+}
+```
+
+When you’re done, the contents of `first-pipeline.conf` should look like this:
+
+```json
+input {
+    beats {
+        port => "5044"
+    }
+}
+filter {
+    grok {
+        match => { "message" => "%{COMBINEDAPACHELOG}"}
+    }
+}
+output {
+    stdout { codec => rubydebug }
+}
+```
+
+Save your changes. Because you’ve enabled automatic config reloading, you don’t have to restart Logstash to pick up your changes. However, you do need to force Filebeat to read the log file from scratch. To do this, go to the terminal window where Filebeat is running and press Ctrl+C to shut down Filebeat. Then delete the Filebeat registry file. For example, run:
+
+```shell
+sudo rm data/registry
+```
+
+Since Filebeat stores the state of each file it harvests in the registry, deleting the registry file forces Filebeat to read all the files it’s harvesting from scratch.
+
+Next, restart Filebeat with the following command:
+
+```shell
+sudo ./filebeat -e -c filebeat.yml -d "publish"
+```
+
+There might be a slight delay before Filebeat begins processing events if it needs to wait for Logstash to reload the config file.
+
+After Logstash applies the grok pattern, the events will have the following JSON representation:
+
+```json
+{
+        "request" => "/presentations/logstash-monitorama-2013/images/kibana-search.png",
+          "agent" => "\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.77 Safari/537.36\"",
+         "offset" => 325,
+           "auth" => "-",
+          "ident" => "-",
+           "verb" => "GET",
+     "prospector" => {
+        "type" => "log"
+    },
+     "input" => {
+        "type" => "log"
+    },
+         "source" => "/path/to/file/logstash-tutorial.log",
+        "message" => "83.149.9.216 - - [04/Jan/2015:05:13:42 +0000] \"GET /presentations/logstash-monitorama-2013/images/kibana-search.png HTTP/1.1\" 200 203023 \"http://semicomplete.com/presentations/logstash-monitorama-2013/\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.77 Safari/537.36\"",
+           "tags" => [
+        [0] "beats_input_codec_plain_applied"
+    ],
+       "referrer" => "\"http://semicomplete.com/presentations/logstash-monitorama-2013/\"",
+     "@timestamp" => 2017-11-09T02:51:12.416Z,
+       "response" => "200",
+          "bytes" => "203023",
+       "clientip" => "83.149.9.216",
+       "@version" => "1",
+           "beat" => {
+            "name" => "My-MacBook-Pro.local",
+        "hostname" => "My-MacBook-Pro.local",
+         "version" => "6.0.0"
+    },
+           "host" => "My-MacBook-Pro.local",
+    "httpversion" => "1.1",
+      "timestamp" => "04/Jan/2015:05:13:42 +0000"
+}
+```
+
+Notice that the event includes the original message, but the log message is also broken down into specific fields.
+
+
+### Enhancing Your Data with the Geoip Filter Plugin [configuring-geoip-plugin]
+
+In addition to parsing log data for better searches, filter plugins can derive supplementary information from existing data. As an example, the [`geoip`](logstash-docs-md://lsr/plugins-filters-geoip.md) plugin looks up IP addresses, derives geographic location information from the addresses, and adds that location information to the logs.
+
+Configure your Logstash instance to use the `geoip` filter plugin by adding the following lines to the `filter` section of the `first-pipeline.conf` file:
+
+```json
+    geoip {
+        source => "clientip"
+    }
+```
+
+The `geoip` plugin configuration requires you to specify the name of the source field that contains the IP address to look up. In this example, the `clientip` field contains the IP address.
+
+Since filters are evaluated in sequence, make sure that the `geoip` section is after the `grok` section of the configuration file and that both the `grok` and `geoip` sections are nested within the `filter` section.
+
+When you’re done, the contents of `first-pipeline.conf` should look like this:
+
+```json
+input {
+    beats {
+        port => "5044"
+    }
+}
+ filter {
+    grok {
+        match => { "message" => "%{COMBINEDAPACHELOG}"}
+    }
+    geoip {
+        source => "clientip"
+    }
+}
+output {
+    stdout { codec => rubydebug }
+}
+```
+
+Save your changes. To force Filebeat to read the log file from scratch, as you did earlier, shut down Filebeat (press Ctrl+C), delete the registry file, and then restart Filebeat with the following command:
+
+```shell
+sudo ./filebeat -e -c filebeat.yml -d "publish"
+```
+
+Notice that the event now contains geographic location information:
+
+```json
+{
+        "request" => "/presentations/logstash-monitorama-2013/images/kibana-search.png",
+          "agent" => "\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.77 Safari/537.36\"",
+          "geoip" => {
+              "timezone" => "Europe/Moscow",
+                    "ip" => "83.149.9.216",
+              "latitude" => 55.7485,
+        "continent_code" => "EU",
+             "city_name" => "Moscow",
+          "country_name" => "Russia",
+         "country_code2" => "RU",
+         "country_code3" => "RU",
+           "region_name" => "Moscow",
+              "location" => {
+            "lon" => 37.6184,
+            "lat" => 55.7485
+        },
+           "postal_code" => "101194",
+           "region_code" => "MOW",
+             "longitude" => 37.6184
+    },
+    ...
+```
+
+
+### Indexing Your Data into Elasticsearch [indexing-parsed-data-into-elasticsearch]
+
+Now that the web logs are broken down into specific fields, you’re ready to get your data into Elasticsearch.
+
+::::{tip}
+{ess-leadin}
+::::
+
+
+The Logstash pipeline can index the data into an Elasticsearch cluster. Edit the `first-pipeline.conf` file and replace the entire `output` section with the following text:
+
+```json
+output {
+    elasticsearch {
+        hosts => [ "localhost:9200" ]
+    }
+}
+```
+
+With this configuration, Logstash uses http protocol to connect to Elasticsearch. The above example assumes that Logstash and Elasticsearch are running on the same instance. You can specify a remote Elasticsearch instance by using the `hosts` configuration to specify something like `hosts => [ "es-machine:9092" ]`.
+
+At this point, your `first-pipeline.conf` file has input, filter, and output sections properly configured, and looks something like this:
+
+```json
+input {
+    beats {
+        port => "5044"
+    }
+}
+ filter {
+    grok {
+        match => { "message" => "%{COMBINEDAPACHELOG}"}
+    }
+    geoip {
+        source => "clientip"
+    }
+}
+output {
+    elasticsearch {
+        hosts => [ "localhost:9200" ]
+    }
+}
+```
+
+Save your changes. To force Filebeat to read the log file from scratch, as you did earlier, shut down Filebeat (press Ctrl+C), delete the registry file, and then restart Filebeat with the following command:
+
+```shell
+sudo ./filebeat -e -c filebeat.yml -d "publish"
+```
+
+
+#### Testing Your Pipeline [testing-initial-pipeline]
+
+Now that the Logstash pipeline is configured to index the data into an Elasticsearch cluster, you can query Elasticsearch.
+
+Try a test query to Elasticsearch based on the fields created by the `grok` filter plugin. Replace $DATE with the current date, in YYYY.MM.DD format:
+
+```shell
+curl -XGET 'localhost:9200/logstash-$DATE/_search?pretty&q=response=200'
+```
+
+::::{note}
+The date used in the index name is based on UTC, not the timezone where Logstash is running. If the query returns `index_not_found_exception`, make sure that `logstash-$DATE` reflects the actual name of the index. To see a list of available indexes, use this query: `curl 'localhost:9200/_cat/indices?v'`.
+::::
+
+
+You should get multiple hits back. For example:
+
+```json
+{
+  "took": 50,
+  "timed_out": false,
+  "_shards": {
+    "total": 5,
+    "successful": 5,
+    "skipped": 0,
+    "failed": 0
+  },
+  "hits": {
+    "total": 98,
+    "max_score": 2.793642,
+    "hits": [
+      {
+        "_index": "logstash-2017.11.09",
+        "_type": "doc",
+        "_id": "3IzDnl8BW52sR0fx5wdV",
+        "_score": 2.793642,
+        "_source": {
+          "request": "/presentations/logstash-monitorama-2013/images/frontend-response-codes.png",
+          "agent": """"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.77 Safari/537.36"""",
+          "geoip": {
+            "timezone": "Europe/Moscow",
+            "ip": "83.149.9.216",
+            "latitude": 55.7485,
+            "continent_code": "EU",
+            "city_name": "Moscow",
+            "country_name": "Russia",
+            "country_code2": "RU",
+            "country_code3": "RU",
+            "region_name": "Moscow",
+            "location": {
+              "lon": 37.6184,
+              "lat": 55.7485
+            },
+            "postal_code": "101194",
+            "region_code": "MOW",
+            "longitude": 37.6184
+          },
+          "offset": 2932,
+          "auth": "-",
+          "ident": "-",
+          "verb": "GET",
+          "prospector": {
+            "type": "log"
+          },
+          "input": {
+            "type": "log"
+          },
+          "source": "/path/to/file/logstash-tutorial.log",
+          "message": """83.149.9.216 - - [04/Jan/2015:05:13:45 +0000] "GET /presentations/logstash-monitorama-2013/images/frontend-response-codes.png HTTP/1.1" 200 52878 "http://semicomplete.com/presentations/logstash-monitorama-2013/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.77 Safari/537.36"""",
+          "tags": [
+            "beats_input_codec_plain_applied"
+          ],
+          "referrer": """"http://semicomplete.com/presentations/logstash-monitorama-2013/"""",
+          "@timestamp": "2017-11-09T03:11:35.304Z",
+          "response": "200",
+          "bytes": "52878",
+          "clientip": "83.149.9.216",
+          "@version": "1",
+          "beat": {
+            "name": "My-MacBook-Pro.local",
+            "hostname": "My-MacBook-Pro.local",
+            "version": "6.0.0"
+          },
+          "host": "My-MacBook-Pro.local",
+          "httpversion": "1.1",
+          "timestamp": "04/Jan/2015:05:13:45 +0000"
+        }
+      },
+    ...
+```
+
+Try another search for the geographic information derived from the IP address. Replace $DATE with the current date, in YYYY.MM.DD format:
+
+```shell
+curl -XGET 'localhost:9200/logstash-$DATE/_search?pretty&q=geoip.city_name=Buffalo'
+```
+
+A few log entries come from Buffalo, so the query produces the following response:
+
+```json
+{
+  "took": 9,
+  "timed_out": false,
+  "_shards": {
+    "total": 5,
+    "successful": 5,
+    "skipped": 0,
+    "failed": 0
+  },
+  "hits": {
+    "total": 2,
+    "max_score": 2.6390574,
+    "hits": [
+      {
+        "_index": "logstash-2017.11.09",
+        "_type": "doc",
+        "_id": "L4zDnl8BW52sR0fx5whY",
+        "_score": 2.6390574,
+        "_source": {
+          "request": "/blog/geekery/disabling-battery-in-ubuntu-vms.html?utm_source=feedburner&utm_medium=feed&utm_campaign=Feed%3A+semicomplete%2Fmain+%28semicomplete.com+-+Jordan+Sissel%29",
+          "agent": """"Tiny Tiny RSS/1.11 (http://tt-rss.org/)"""",
+          "geoip": {
+            "timezone": "America/New_York",
+            "ip": "198.46.149.143",
+            "latitude": 42.8864,
+            "continent_code": "NA",
+            "city_name": "Buffalo",
+            "country_name": "United States",
+            "country_code2": "US",
+            "dma_code": 514,
+            "country_code3": "US",
+            "region_name": "New York",
+            "location": {
+              "lon": -78.8781,
+              "lat": 42.8864
+            },
+            "postal_code": "14202",
+            "region_code": "NY",
+            "longitude": -78.8781
+          },
+          "offset": 22795,
+          "auth": "-",
+          "ident": "-",
+          "verb": "GET",
+          "prospector": {
+            "type": "log"
+          },
+          "input": {
+            "type": "log"
+          },
+          "source": "/path/to/file/logstash-tutorial.log",
+          "message": """198.46.149.143 - - [04/Jan/2015:05:29:13 +0000] "GET /blog/geekery/disabling-battery-in-ubuntu-vms.html?utm_source=feedburner&utm_medium=feed&utm_campaign=Feed%3A+semicomplete%2Fmain+%28semicomplete.com+-+Jordan+Sissel%29 HTTP/1.1" 200 9316 "-" "Tiny Tiny RSS/1.11 (http://tt-rss.org/)"""",
+          "tags": [
+            "beats_input_codec_plain_applied"
+          ],
+          "referrer": """"-"""",
+          "@timestamp": "2017-11-09T03:11:35.321Z",
+          "response": "200",
+          "bytes": "9316",
+          "clientip": "198.46.149.143",
+          "@version": "1",
+          "beat": {
+            "name": "My-MacBook-Pro.local",
+            "hostname": "My-MacBook-Pro.local",
+            "version": "6.0.0"
+          },
+          "host": "My-MacBook-Pro.local",
+          "httpversion": "1.1",
+          "timestamp": "04/Jan/2015:05:29:13 +0000"
+        }
+      },
+     ...
+```
+
+If you are using Kibana to visualize your data, you can also explore the Filebeat data in Kibana:
+
+![Discovering Filebeat data in Kibana](images/kibana-filebeat-data.png)
+
+See the [Filebeat quick start docs](beats://reference/filebeat/filebeat-installation-configuration.md) for info about loading the Kibana index pattern for Filebeat.
+
+You’ve successfully created a pipeline that uses Filebeat to take Apache web logs as input, parses those logs to create specific, named fields from the logs, and writes the parsed data to an Elasticsearch cluster. Next, you learn how to create a pipeline that uses multiple input and output plugins.
+
+
diff --git a/docs/reference/config-examples.md b/docs/reference/config-examples.md
new file mode 100644
index 000000000..966576d67
--- /dev/null
+++ b/docs/reference/config-examples.md
@@ -0,0 +1,276 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/config-examples.html
+---
+
+# Logstash configuration examples [config-examples]
+
+These examples illustrate how you can configure Logstash to filter events, process Apache logs and syslog messages, and use conditionals to control what events are processed by a filter or output.
+
+::::{tip}
+If you need help building grok patterns, try out the [Grok Debugger](docs-content://explore-analyze/query-filter/tools/grok-debugger.md).
+::::
+
+
+
+## Configuring filters [filter-example]
+
+Filters are an in-line processing mechanism that provide the flexibility to slice and dice your data to fit your needs. Let’s take a look at some filters in action. The following configuration file sets up the `grok` and `date` filters.
+
+```ruby
+input { stdin { } }
+
+filter {
+  grok {
+    match => { "message" => "%{COMBINEDAPACHELOG}" }
+  }
+  date {
+    match => [ "timestamp" , "dd/MMM/yyyy:HH:mm:ss Z" ]
+  }
+}
+
+output {
+  elasticsearch { hosts => ["localhost:9200"] }
+  stdout { codec => rubydebug }
+}
+```
+
+Run Logstash with this configuration:
+
+```ruby
+bin/logstash -f logstash-filter.conf
+```
+
+Now, paste the following line into your terminal and press Enter so it will be processed by the stdin input:
+
+```ruby
+127.0.0.1 - - [11/Dec/2013:00:01:45 -0800] "GET /xampp/status.php HTTP/1.1" 200 3891 "http://cadenza/xampp/navi.php" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:25.0) Gecko/20100101 Firefox/25.0"
+```
+
+You should see something returned to stdout that looks like this:
+
+```ruby
+{
+        "message" => "127.0.0.1 - - [11/Dec/2013:00:01:45 -0800] \"GET /xampp/status.php HTTP/1.1\" 200 3891 \"http://cadenza/xampp/navi.php\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:25.0) Gecko/20100101 Firefox/25.0\"",
+     "@timestamp" => "2013-12-11T08:01:45.000Z",
+       "@version" => "1",
+           "host" => "cadenza",
+       "clientip" => "127.0.0.1",
+          "ident" => "-",
+           "auth" => "-",
+      "timestamp" => "11/Dec/2013:00:01:45 -0800",
+           "verb" => "GET",
+        "request" => "/xampp/status.php",
+    "httpversion" => "1.1",
+       "response" => "200",
+          "bytes" => "3891",
+       "referrer" => "\"http://cadenza/xampp/navi.php\"",
+          "agent" => "\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:25.0) Gecko/20100101 Firefox/25.0\""
+}
+```
+
+As you can see, Logstash (with help from the `grok` filter) was able to parse the log line (which happens to be in Apache "combined log" format) and break it up into many different discrete bits of information. This is extremely useful once you start querying and analyzing our log data. For example, you’ll be able to easily run reports on HTTP response codes, IP addresses, referrers, and so on. There are quite a few grok patterns included with Logstash out-of-the-box, so it’s quite likely if you need to parse a common log format, someone has already done the work for you. For more information, see the list of [Logstash grok patterns](https://github.com/logstash-plugins/logstash-patterns-core/tree/main/patterns) on GitHub.
+
+The other filter used in this example is the `date` filter. This filter parses out a timestamp and uses it as the timestamp for the event (regardless of when you’re ingesting the log data). You’ll notice that the `@timestamp` field in this example is set to December 11, 2013, even though Logstash is ingesting the event at some point afterwards. This is handy when backfilling logs. It gives you the ability to tell Logstash "use this value as the timestamp for this event".
+
+
+## Processing Apache logs [_processing_apache_logs]
+
+Let’s do something that’s actually **useful**: process apache2 access log files! We are going to read the input from a file on the localhost, and use a [conditional](/reference/event-dependent-configuration.md#conditionals) to process the event according to our needs. First, create a file called something like *logstash-apache.conf* with the following contents (you can change the log’s file path to suit your needs):
+
+```js
+input {
+  file {
+    path => "/tmp/access_log"
+    start_position => "beginning"
+  }
+}
+
+filter {
+  if [path] =~ "access" {
+    mutate { replace => { "type" => "apache_access" } }
+    grok {
+      match => { "message" => "%{COMBINEDAPACHELOG}" }
+    }
+  }
+  date {
+    match => [ "timestamp" , "dd/MMM/yyyy:HH:mm:ss Z" ]
+  }
+}
+
+output {
+  elasticsearch {
+    hosts => ["localhost:9200"]
+  }
+  stdout { codec => rubydebug }
+}
+```
+
+Then, create the input file you configured above (in this example, "/tmp/access_log") with the following log entries (or use some from your own webserver):
+
+```js
+71.141.244.242 - kurt [18/May/2011:01:48:10 -0700] "GET /admin HTTP/1.1" 301 566 "-" "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3"
+134.39.72.245 - - [18/May/2011:12:40:18 -0700] "GET /favicon.ico HTTP/1.1" 200 1189 "-" "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; InfoPath.2; .NET4.0C; .NET4.0E)"
+98.83.179.51 - - [18/May/2011:19:35:08 -0700] "GET /css/main.css HTTP/1.1" 200 1837 "http://www.safesand.com/information.htm" "Mozilla/5.0 (Windows NT 6.0; WOW64; rv:2.0.1) Gecko/20100101 Firefox/4.0.1"
+```
+
+Now, run Logstash with the -f flag to pass in the configuration file:
+
+```js
+bin/logstash -f logstash-apache.conf
+```
+
+Now you should see your apache log data in Elasticsearch! Logstash opened and read the specified input file, processing each event it encountered. Any additional lines logged to this file will also be captured, processed by Logstash as events, and stored in Elasticsearch. As an added bonus, they are stashed with the field "type" set to "apache_access" (this is done by the type ⇒ "apache_access" line in the input configuration).
+
+In this configuration, Logstash is only watching the apache access_log, but it’s easy enough to watch both the access_log and the error_log (actually, any file matching `*log`), by changing one line in the above configuration:
+
+```js
+input {
+  file {
+    path => "/tmp/*_log"
+...
+```
+
+When you restart Logstash, it will process both the error and access logs. However, if you inspect your data (using elasticsearch-kopf, perhaps), you’ll see that the access_log is broken up into discrete fields, but the error_log isn’t. That’s because we used a `grok` filter to match the standard combined apache log format and automatically split the data into separate fields. Wouldn’t it be nice **if** we could control how a line was parsed, based on its format? Well, we can…​
+
+Note that Logstash did not reprocess the events that were already seen in the access_log file. When reading from a file, Logstash saves its position and only processes new lines as they are added. Neat!
+
+
+## Using conditionals [using-conditionals]
+
+You use conditionals to control what events are processed by a filter or output. For example, you could label each event according to which file it appeared in (access_log, error_log, and other random files that end with "log").
+
+```ruby
+input {
+  file {
+    path => "/tmp/*_log"
+  }
+}
+
+filter {
+  if [path] =~ "access" {
+    mutate { replace => { type => "apache_access" } }
+    grok {
+      match => { "message" => "%{COMBINEDAPACHELOG}" }
+    }
+    date {
+      match => [ "timestamp" , "dd/MMM/yyyy:HH:mm:ss Z" ]
+    }
+  } else if [path] =~ "error" {
+    mutate { replace => { type => "apache_error" } }
+  } else {
+    mutate { replace => { type => "random_logs" } }
+  }
+}
+
+output {
+  elasticsearch { hosts => ["localhost:9200"] }
+  stdout { codec => rubydebug }
+}
+```
+
+This example labels all events using the `type` field, but doesn’t actually parse the `error` or `random` files. There are so many types of error logs that how they should be labeled really depends on what logs you’re working with.
+
+Similarly, you can use conditionals to direct events to particular outputs. For example, you could:
+
+* alert nagios of any apache events with status 5xx
+* record any 4xx status to Elasticsearch
+* record all status code hits via statsd
+
+To tell nagios about any http event that has a 5xx status code, you first need to check the value of the `type` field. If it’s apache, then you can check to see if the `status` field contains a 5xx error. If it is, send it to nagios. If it isn’t a 5xx error, check to see if the `status` field contains a 4xx error. If so, send it to Elasticsearch. Finally, send all apache status codes to statsd no matter what the `status` field contains:
+
+```js
+output {
+  if [type] == "apache" {
+    if [status] =~ /^5\d\d/ {
+      nagios { ...  }
+    } else if [status] =~ /^4\d\d/ {
+      elasticsearch { ... }
+    }
+    statsd { increment => "apache.%{status}" }
+  }
+}
+```
+
+
+## Processing Syslog messages [_processing_syslog_messages]
+
+Syslog is one of the most common use cases for Logstash, and one it handles exceedingly well (as long as the log lines conform roughly to RFC3164). Syslog is the de facto UNIX networked logging standard, sending messages from client machines to a local file, or to a centralized log server via rsyslog. For this example, you won’t need a functioning syslog instance; we’ll fake it from the command line so you can get a feel for what happens.
+
+First, let’s make a simple configuration file for Logstash + syslog, called *logstash-syslog.conf*.
+
+```ruby
+input {
+  tcp {
+    port => 5000
+    type => syslog
+  }
+  udp {
+    port => 5000
+    type => syslog
+  }
+}
+
+filter {
+  if [type] == "syslog" {
+    grok {
+      match => { "message" => "%{SYSLOGTIMESTAMP:syslog_timestamp} %{SYSLOGHOST:syslog_hostname} %{DATA:syslog_program}(?:\[%{POSINT:syslog_pid}\])?: %{GREEDYDATA:syslog_message}" }
+      add_field => [ "received_at", "%{@timestamp}" ]
+      add_field => [ "received_from", "%{host}" ]
+    }
+    date {
+      match => [ "syslog_timestamp", "MMM  d HH:mm:ss", "MMM dd HH:mm:ss" ]
+    }
+  }
+}
+
+output {
+  elasticsearch { hosts => ["localhost:9200"] }
+  stdout { codec => rubydebug }
+}
+```
+
+Run Logstash with this new configuration:
+
+```ruby
+bin/logstash -f logstash-syslog.conf
+```
+
+Normally, a client machine would connect to the Logstash instance on port 5000 and send its message. For this example, we’ll just telnet to Logstash and enter a log line (similar to how we entered log lines into STDIN earlier). Open another shell window to interact with the Logstash syslog input and enter the following command:
+
+```ruby
+telnet localhost 5000
+```
+
+Copy and paste the following lines as samples. (Feel free to try some of your own, but keep in mind they might not parse if the `grok` filter is not correct for your data).
+
+```ruby
+Dec 23 12:11:43 louis postfix/smtpd[31499]: connect from unknown[95.75.93.154]
+Dec 23 14:42:56 louis named[16000]: client 199.48.164.7#64817: query (cache) 'amsterdamboothuren.com/MX/IN' denied
+Dec 23 14:30:01 louis CRON[619]: (www-data) CMD (php /usr/share/cacti/site/poller.php >/dev/null 2>/var/log/cacti/poller-error.log)
+Dec 22 18:28:06 louis rsyslogd: [origin software="rsyslogd" swVersion="4.2.0" x-pid="2253" x-info="http://www.rsyslog.com"] rsyslogd was HUPed, type 'lightweight'.
+```
+
+Now you should see the output of Logstash in your original shell as it processes and parses messages!
+
+```ruby
+{
+                 "message" => "Dec 23 14:30:01 louis CRON[619]: (www-data) CMD (php /usr/share/cacti/site/poller.php >/dev/null 2>/var/log/cacti/poller-error.log)",
+              "@timestamp" => "2013-12-23T22:30:01.000Z",
+                "@version" => "1",
+                    "type" => "syslog",
+                    "host" => "0:0:0:0:0:0:0:1:52617",
+        "syslog_timestamp" => "Dec 23 14:30:01",
+         "syslog_hostname" => "louis",
+          "syslog_program" => "CRON",
+              "syslog_pid" => "619",
+          "syslog_message" => "(www-data) CMD (php /usr/share/cacti/site/poller.php >/dev/null 2>/var/log/cacti/poller-error.log)",
+             "received_at" => "2013-12-23 22:49:22 UTC",
+           "received_from" => "0:0:0:0:0:0:0:1:52617",
+    "syslog_severity_code" => 5,
+    "syslog_facility_code" => 1,
+         "syslog_facility" => "user-level",
+         "syslog_severity" => "notice"
+}
+```
+
diff --git a/docs/reference/config-setting-files.md b/docs/reference/config-setting-files.md
new file mode 100644
index 000000000..5ace59d73
--- /dev/null
+++ b/docs/reference/config-setting-files.md
@@ -0,0 +1,33 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/config-setting-files.html
+---
+
+# Logstash Configuration Files [config-setting-files]
+
+Logstash has two types of configuration files: *pipeline configuration files*, which define the Logstash processing pipeline, and *settings files*, which specify options that control Logstash startup and execution.
+
+## Pipeline Configuration Files [pipeline-config-files]
+
+You create pipeline configuration files when you define the stages of your Logstash processing pipeline. On deb and rpm, you place the pipeline configuration files in the `/etc/logstash/conf.d` directory. Logstash tries to load only files with `.conf` extension in the `/etc/logstash/conf.d directory` and ignores all other files.
+
+See [*Creating a {{ls}} pipeline*](/reference/creating-logstash-pipeline.md) for more info.
+
+
+## Settings Files [settings-files]
+
+The settings files are already defined in the Logstash installation. Logstash includes the following settings files:
+
+**`logstash.yml`**
+:   Contains Logstash configuration flags. You can set flags in this file instead of passing the flags at the command line. Any flags that you set at the command line override the corresponding settings in the `logstash.yml` file. See [logstash.yml](/reference/logstash-settings-file.md) for more info.
+
+**`pipelines.yml`**
+:   Contains the framework and instructions for running multiple pipelines in a single Logstash instance. See [Multiple Pipelines](/reference/multiple-pipelines.md) for more info.
+
+**`jvm.options`**
+:   Contains JVM configuration flags. Use this file to set initial and maximum values for total heap space. You can also use this file to set the locale for Logstash. Specify each flag on a separate line. All other settings in this file are considered expert settings.
+
+**`log4j2.properties`**
+:   Contains default settings for `log4j 2` library. See [Log4j2 configuration](/reference/logging.md#log4j2) for more info.
+
+
diff --git a/docs/reference/configuration-file-structure.md b/docs/reference/configuration-file-structure.md
new file mode 100644
index 000000000..5b0ee2072
--- /dev/null
+++ b/docs/reference/configuration-file-structure.md
@@ -0,0 +1,235 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/configuration-file-structure.html
+---
+
+# Structure of a pipeline [configuration-file-structure]
+
+A {{ls}} pipeline config file has a separate section for each type of plugin you want to add to the event processing pipeline. For example:
+
+```js
+# This is a comment. You should use comments to describe
+# parts of your configuration.
+input {
+  ...
+}
+
+filter {
+  ...
+}
+
+output {
+  ...
+}
+```
+
+Each section contains configuration options for one or more plugins. If you specify multiple filters, they are applied in the order they appear in the configuration file. If you specify multiple outputs, events are sent to each destination sequentially, in the order they appear in the configuration file.
+
+::::{tip}
+When you are ready to deploy a pipeline beyond your local machine, add the pipeline config file to [`logstash.yml`](/reference/logstash-settings-file.md) using the `pipeline.id` setting. When you are ready to deploy [multiple pipelines](/reference/multiple-pipelines.md), set up and configure your pipelines in the `pipelines.yml` file.
+::::
+
+
+
+## Plugin configuration [plugin_configuration]
+
+A plugin configuration consists of the plugin name followed by a block of settings for that plugin. For example, this input section configures two file inputs:
+
+```js
+input {
+  http {
+    port => 3333
+    tags => gateway
+  }
+  http {
+    port => 4444
+    tags => billing
+  }
+}
+```
+
+In this example, two settings are configured for each of the file inputs: *port* and *tags*.
+
+The settings you can configure vary according to the plugin type. For information about each plugin, see [Input Plugins](logstash-docs-md://lsr/input-plugins.md), [Output Plugins](logstash-docs-md://lsr/output-plugins.md), [Filter Plugins](logstash-docs-md://lsr/filter-plugins.md), and [Codec Plugins](logstash-docs-md://lsr/codec-plugins.md).
+
+
+## Value types [plugin-value-types]
+
+A plugin can require that the value for a setting be a certain type, such as boolean, list, or hash. The following value types are supported.
+
+## Array [array]
+
+This type is now mostly deprecated in favor of using a standard type like `string` with the plugin defining the `:list => true` property for better type checking. It is still needed to handle lists of hashes or mixed types where type checking is not desired.
+
+Example:
+
+```js
+  users => [ {id => 1, name => bob}, {id => 2, name => jane} ]
+```
+
+
+### Lists [list]
+
+Not a type in and of itself, but a property types can have. This makes it possible to type check multiple values. Plugin authors can enable list checking by specifying `:list => true` when declaring an argument.
+
+Example:
+
+```js
+  path => [ "/var/log/messages", "/var/log/*.log" ]
+  uris => [ "http://elastic.co", "http://example.net" ]
+```
+
+This example configures `path`, which is a `string` to be a list that contains an element for each of the three strings. It also will configure the `uris` parameter to be a list of URIs, failing if any of the URIs provided are not valid.
+
+
+### Boolean [boolean]
+
+A boolean must be either `true` or `false`. Note that the `true` and `false` keywords are not enclosed in quotes.
+
+Example:
+
+```js
+  ssl_enable => true
+```
+
+
+### Bytes [bytes]
+
+A bytes field is a string field that represents a valid unit of bytes. It is a convenient way to declare specific sizes in your plugin options. Both SI (k M G T P E Z Y) and Binary (Ki Mi Gi Ti Pi Ei Zi Yi) units are supported. Binary units are in base-1024 and SI units are in base-1000. This field is case-insensitive and accepts space between the value and the unit. If no unit is specified, the integer string represents the number of bytes.
+
+Examples:
+
+```js
+  my_bytes => "1113"   # 1113 bytes
+  my_bytes => "10MiB"  # 10485760 bytes
+  my_bytes => "100kib" # 102400 bytes
+  my_bytes => "180 mb" # 180000000 bytes
+```
+
+
+### Codec [codec]
+
+A codec is the name of Logstash codec used to represent the data. Codecs can be used in both inputs and outputs.
+
+Input codecs provide a convenient way to decode your data before it enters the input. Output codecs provide a convenient way to encode your data before it leaves the output. Using an input or output codec eliminates the need for a separate filter in your Logstash pipeline.
+
+A list of available codecs can be found at the [Codec Plugins](logstash-docs-md://lsr/codec-plugins.md) page.
+
+Example:
+
+```js
+  codec => "json"
+```
+
+
+### Hash [hash]
+
+A hash is a collection of key value pairs specified in the format `"field1" => "value1"`. Note that multiple key value entries are separated by spaces rather than commas.
+
+Example:
+
+```js
+match => {
+  "field1" => "value1"
+  "field2" => "value2"
+  ...
+}
+# or as a single line. No commas between entries:
+match => { "field1" => "value1" "field2" => "value2" }
+```
+
+
+### Number [number]
+
+Numbers must be valid numeric values (floating point or integer).
+
+Example:
+
+```js
+  port => 33
+```
+
+
+### Password [password]
+
+A password is a string with a single value that is not logged or printed.
+
+Example:
+
+```js
+  my_password => "password"
+```
+
+
+### URI [uri]
+
+A URI can be anything from a full URL like *http://elastic.co/* to a simple identifier like *foobar*. If the URI contains a password such as *http://user:pass@example.net* the password portion of the URI will not be logged or printed.
+
+Example:
+
+```js
+  my_uri => "http://foo:bar@example.net"
+```
+
+
+### Path [path]
+
+A path is a string that represents a valid operating system path.
+
+Example:
+
+```js
+  my_path => "/tmp/logstash"
+```
+
+
+### String [string]
+
+A string must be a single character sequence. Note that string values are enclosed in quotes, either double or single.
+
+### Escape sequences [_escape_sequences]
+
+By default, escape sequences are not enabled. If you wish to use escape sequences in quoted strings, you will need to set `config.support_escapes: true` in your `logstash.yml`. When `true`, quoted strings (double and single) will have this transformation:
+
+|     |     |
+| --- | --- |
+| Text | Result |
+| \r | carriage return (ASCII 13) |
+| \n | new line (ASCII 10) |
+| \t | tab (ASCII 9) |
+| \\ | backslash (ASCII 92) |
+| \" | double quote (ASCII 34) |
+| \' | single quote (ASCII 39) |
+
+Example:
+
+```js
+  name => "Hello world"
+  name => 'It\'s a beautiful day'
+```
+
+
+### Field reference [field-reference]
+
+A Field Reference is a special [String](#string) value representing the path to a field in an event, such as `@timestamp` or `[@timestamp]` to reference a top-level field, or `[client][ip]` to access a nested field. The [*Field References Deep Dive*](https://www.elastic.co/guide/en/logstash/current/field-references-deepdive.html) provides detailed information about the structure of Field References. When provided as a configuration option, Field References need to be quoted and special characters must be escaped following the same rules as [String](#string).
+
+
+## Comments [comments]
+
+Comments are the same as in perl, ruby, and python. A comment starts with a *#* character, and does not need to be at the beginning of a line. For example:
+
+```js
+# this is a comment
+
+input { # comments can appear at the end of a line, too
+  # ...
+}
+```
+
+::::{note}
+Comments containing environment variable `${var}` references in `config.string` are still evaluated. Remove the `$` sign to avoid pipeline loading failures.
+::::
+
+
+
+
diff --git a/docs/reference/configuring-centralized-pipelines.md b/docs/reference/configuring-centralized-pipelines.md
new file mode 100644
index 000000000..fc56a4a4f
--- /dev/null
+++ b/docs/reference/configuring-centralized-pipelines.md
@@ -0,0 +1,157 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/configuring-centralized-pipelines.html
+---
+
+# Configure Centralized Pipeline Management [configuring-centralized-pipelines]
+
+To configure [centralized pipeline management](/reference/logstash-centralized-pipeline-management.md):
+
+1. Verify that you are using a license that includes the pipeline management feature.
+
+    For more information, see [https://www.elastic.co/subscriptions](https://www.elastic.co/subscriptions) and [License management](docs-content://deploy-manage/license/manage-your-license-in-self-managed-cluster.md).
+
+2. Specify [configuration management settings](#configuration-management-settings) in the `logstash.yml` file. At a minimum, set:
+
+    * `xpack.management.enabled: true` to enable centralized configuration management.
+    * `xpack.management.elasticsearch.hosts` to specify the Elasticsearch instance that will store the Logstash pipeline configurations and metadata.
+    * `xpack.management.pipeline.id` to register the pipelines that you want to centrally manage.
+
+3. Restart Logstash.
+4. If your Elasticsearch cluster is protected with basic authentication, assign the built-in `logstash_admin` role as well as the `logstash_writer` role to any users who will use centralized pipeline management. See [Secure your connection](/reference/secure-connection.md) for more information.
+
+::::{note}
+Centralized management is disabled until you configure and enable {{security-features}}.
+::::
+
+
+::::{important}
+After you’ve configured Logstash to use centralized pipeline management, you can no longer specify local pipeline configurations. This means that the `pipelines.yml` file and settings like `path.config` and `config.string` are inactive when this feature is enabled.
+::::
+
+
+## Configuration Management Settings in Logstash [configuration-management-settings]
+
+
+You can set the following `xpack.management` settings in `logstash.yml` to enable [centralized pipeline management](/reference/logstash-centralized-pipeline-management.md). For more information about configuring Logstash, see [logstash.yml](/reference/logstash-settings-file.md).
+
+The following example shows basic settings that assume {{es}} and {{kib}} are installed on the localhost with basic AUTH enabled, but no SSL. If you’re using SSL, you need to specify additional SSL settings.
+
+```shell
+xpack.management.enabled: true
+xpack.management.elasticsearch.hosts: "http://localhost:9200/"
+xpack.management.elasticsearch.username: logstash_admin_user
+xpack.management.elasticsearch.password: t0p.s3cr3t
+xpack.management.logstash.poll_interval: 5s
+xpack.management.pipeline.id: ["apache", "cloudwatch_logs"]
+```
+
+`xpack.management.enabled`
+:   Set to `true` to enable {{xpack}} centralized configuration management for Logstash.
+
+`xpack.management.logstash.poll_interval`
+:   How often the Logstash instance polls for pipeline changes from Elasticsearch. The default is 5s.
+
+`xpack.management.pipeline.id`
+:   Specify a comma-separated list of pipeline IDs to register for centralized pipeline management. After changing this setting, you need to restart Logstash to pick up changes. Pipeline IDs support `*` as a [wildcard](#wildcard-in-pipeline-id) for matching multiple IDs
+
+`xpack.management.elasticsearch.hosts`
+:   The {{es}} instance that will store the Logstash pipeline configurations and metadata. This might be the same {{es}} instance specified in the `outputs` section in your Logstash configuration, or a different one. Defaults to `http://localhost:9200`.
+
+`xpack.management.elasticsearch.username` and `xpack.management.elasticsearch.password`
+:   If your {{es}} cluster is protected with basic authentication, these settings provide the username and password that the Logstash instance uses to authenticate for accessing the configuration data. The username you specify here should have the built-in `logstash_admin` and `logstash_system` roles. These roles provide access to system indices for managing configurations.
+
+::::{note}
+Starting with Elasticsearch version 7.10.0, the `logstash_admin` role inherits the `manage_logstash_pipelines` cluster privilege for centralized pipeline management. If a user has created their own roles and granted them access to the .logstash index, those roles will continue to work in 7.x but will need to be updated for 8.0.
+::::
+
+
+`xpack.management.elasticsearch.proxy`
+:   Optional setting that allows you to specify a proxy URL if Logstash needs to use a proxy to reach your Elasticsearch cluster.
+
+`xpack.management.elasticsearch.ssl.ca_trusted_fingerprint`
+:   Optional setting that enables you to specify the hex-encoded SHA-256 fingerprint of the certificate authority for your {{es}} instance.
+
+::::{note}
+A self-secured Elasticsearch cluster will provide the fingerprint of its CA to the console during setup.
+
+You can also get the SHA256 fingerprint of an Elasticsearch’s CA using the `openssl` command-line utility on the Elasticsearch host:
+
+```shell
+openssl x509 -fingerprint -sha256 -in $ES_HOME/config/certs/http_ca.crt
+```
+
+::::
+
+
+`xpack.management.elasticsearch.ssl.certificate_authority`
+:   Optional setting that enables you to specify a path to the `.pem` file for the certificate authority for your {{es}} instance.
+
+`xpack.management.elasticsearch.ssl.truststore.path`
+:   Optional setting that provides the path to the Java keystore (JKS) to validate the server’s certificate.
+
+::::{note}
+You cannot use this setting and `xpack.management.elasticsearch.ssl.certificate_authority` at the same time.
+::::
+
+
+`xpack.management.elasticsearch.ssl.truststore.password`
+:   Optional setting that provides the password to the truststore.
+
+`xpack.management.elasticsearch.ssl.keystore.path`
+:   Optional setting that provides the path to the Java keystore (JKS) to validate the client’s certificate.
+
+::::{note}
+You cannot use this setting and `xpack.management.elasticsearch.ssl.keystore.certificate` at the same time.
+::::
+
+
+`xpack.management.elasticsearch.ssl.keystore.password`
+:   Optional setting that provides the password to the keystore.
+
+`xpack.management.elasticsearch.ssl.certificate`
+:   Optional setting that provides the path to an SSL certificate to use to authenticate the client. This certificate should be an OpenSSL-style X.509 certificate file.
+
+::::{note}
+This setting can be used only if `xpack.management.elasticsearch.ssl.key` is set.
+::::
+
+
+`xpack.management.elasticsearch.ssl.key`
+:   Optional setting that provides the path to an OpenSSL-style RSA private key that corresponds to the `xpack.management.elasticsearch.ssl.certificate`.
+
+::::{note}
+This setting can be used only if `xpack.management.elasticsearch.ssl.certificate` is set.
+::::
+
+
+`xpack.management.elasticsearch.ssl.verification_mode`
+:   Option to validate the server’s certificate. Defaults to `full`. To disable, set to `none`. Disabling this severely compromises security.
+
+`xpack.management.elasticsearch.ssl.cipher_suites`
+:   Optional setting that provides the list of cipher suites to use, listed by priorities. Supported cipher suites vary depending on the Java and protocol versions.
+
+`xpack.management.elasticsearch.cloud_id`
+:   If you’re using {{es}} in {{ecloud}}, you should specify the identifier here. This setting is an alternative to `xpack.management.elasticsearch.hosts`. If `cloud_id` is configured, `xpack.management.elasticsearch.hosts` should not be used. This {{es}} instance will store the Logstash pipeline configurations and metadata.
+
+`xpack.management.elasticsearch.cloud_auth`
+:   If you’re using {{es}} in {{ecloud}}, you can set your auth credentials here. This setting is an alternative to both `xpack.management.elasticsearch.username` and `xpack.management.elasticsearch.password`. If `cloud_auth` is configured, those settings should not be used. The credentials you specify here should be for a user with the `logstash_admin` and `logstash_system` roles, which provide access to system indices for managing configurations.
+
+`xpack.management.elasticsearch.api_key`
+:   Authenticate using an Elasticsearch API key. Note that this option also requires using SSL. The API key Format is `id:api_key` where `id` and `api_key` are as returned by the Elasticsearch [Create API key API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-create-api-key).
+
+
+## Wildcard support in pipeline ID [wildcard-in-pipeline-id]
+
+
+Pipeline IDs must begin with a letter or underscore and contain only letters, underscores, dashes, and numbers. You can use `*` in `xpack.management.pipeline.id` to match any number of letters, underscores, dashes, and numbers.
+
+```shell
+xpack.management.pipeline.id: ["*logs", "*apache*", "tomcat_log"]
+```
+
+In this example, `"*logs"` matches all IDs ending in `logs`. `"*apache*"` matches any IDs with `apache` in the name.
+
+Wildcard in pipeline IDs is available starting with Elasticsearch 7.10. Logstash can pick up new pipeline without a restart if the new pipeline ID matches the wildcard pattern.
+
+
diff --git a/docs/reference/configuring-geoip-database-management.md b/docs/reference/configuring-geoip-database-management.md
new file mode 100644
index 000000000..df0f84a2a
--- /dev/null
+++ b/docs/reference/configuring-geoip-database-management.md
@@ -0,0 +1,68 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/configuring-geoip-database-management.html
+---
+
+# Configure GeoIP Database Management [configuring-geoip-database-management]
+
+To configure [GeoIP Database Management](/reference/logstash-geoip-database-management.md):
+
+1. Verify that you are using a license that includes the geoip database management feature.
+
+    For more information, see [https://www.elastic.co/subscriptions](https://www.elastic.co/subscriptions) and [License management](docs-content://deploy-manage/license/manage-your-license-in-self-managed-cluster.md).
+
+2. Specify [geoip database management settings](#geoip-database-management-settings) in the `logstash.yml` file to tune the configuration as-needed.
+
+## GeoIP database Management settings in {{ls}} [geoip-database-management-settings]
+
+
+You can set the following `xpack.geoip` settings in `logstash.yml` to configure the [geoip database manager](/reference/logstash-geoip-database-management.md). For more information about configuring Logstash, see [logstash.yml](/reference/logstash-settings-file.md).
+
+`xpack.geoip.downloader.enabled`
+:   (Boolean) If `true`, Logstash automatically downloads and manages updates for GeoIP2 databases from the `xpack.geoip.downloader.endpoint`. If `false`, Logstash does not manage GeoIP2 databases and plugins that need a GeoIP2 database must be configured to provide their own.
+
+`xpack.geoip.downloader.endpoint`
+:   (String) Endpoint URL used to download updates for GeoIP2 databases. For example, `https://mydomain.com/overview.json`. Defaults to `https://geoip.elastic.co/v1/database`. Note that Logstash will periodically make a GET request to `${xpack.geoip.downloader.endpoint}?elastic_geoip_service_tos=agree`, expecting the list of metadata about databases typically found in `overview.json`.
+
+`xpack.geoip.downloader.poll.interval`
+:   (Time Value) How often Logstash checks for GeoIP2 database updates at the `xpack.geoip.downloader.endpoint`. For example, `6h` to check every six hours. Defaults to `24h` (24 hours).
+
+
+## Offline and air-gapped environments [configuring-geoip-database-management-offline]
+
+If Logstash does not have access to the internet, or if you want to disable the database manager, set the `xpack.geoip.downloader.enabled` value to `false` in `logstash.yml`. When the database manager is disabled, plugins that require GeoIP lookups must be configured with their own source of GeoIP databases.
+
+### Using an HTTP proxy [_using_an_http_proxy]
+
+If you can’t connect directly to the Elastic GeoIP endpoint, consider setting up an HTTP proxy server. You can then specify the proxy with `http_proxy` environment variable.
+
+```sh
+export http_proxy="http://PROXY_IP:PROXY_PORT"
+```
+
+
+### Using a custom endpoint [_using_a_custom_endpoint]
+
+If you work in an air-gapped environment and can’t update your databases from the Elastic endpoint, You can then download databases from MaxMind and bootstrap the service.
+
+1. Download both `GeoLite2-ASN.mmdb` and `GeoLite2-City.mmdb` database files from the [MaxMind site](http://dev.maxmind.com/geoip/geoip2/geolite2).
+2. Copy both database files to a single directory.
+3. [Download {{es}}](https://www.elastic.co/downloads/elasticsearch).
+4. From your {{es}} directory, run:
+
+    ```sh
+    ./bin/elasticsearch-geoip -s my/database/dir
+    ```
+
+5. Serve the static database files from your directory. For example, you can use Docker to serve the files from nginx server:
+
+    ```sh
+    docker run -p 8080:80 -v my/database/dir:/usr/share/nginx/html:ro nginx
+    ```
+
+6. Specify the service’s endpoint URL in Logstash using the `xpack.geoip.download.endpoint=http://localhost:8080/overview.json` setting in `logstash.yml`.
+
+Logstash gets automatic updates from this service.
+
+
+
diff --git a/docs/reference/connecting-to-cloud.md b/docs/reference/connecting-to-cloud.md
new file mode 100644
index 000000000..34397c27f
--- /dev/null
+++ b/docs/reference/connecting-to-cloud.md
@@ -0,0 +1,47 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/connecting-to-cloud.html
+---
+
+# Sending data to Elastic Cloud (hosted Elasticsearch Service) [connecting-to-cloud]
+
+Our hosted {{ess}} on [Elastic Cloud](https://cloud.elastic.co/) simplifies safe, secure communication between {{ls}} and {{es}}. When you configure the Elasticsearch output plugin to use [`cloud_id`](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-cloud_id) with either the [`cloud_auth` option](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-cloud_auth) or the [`api_key` option](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-api_key), no additional SSL configuration is needed.
+
+Examples:
+
+* `output {elasticsearch { cloud_id => "<cloud id>" cloud_auth => "<cloud auth>" } }`
+* `output {elasticsearch { cloud_id => "<cloud id>" api_key => "<api key>" } }`
+
+{ess-leadin-short}
+
+## Cloud ID [cloud-id]
+
+{{ls}} uses the Cloud ID, found in the Elastic Cloud web console, to build the Elasticsearch and Kibana hosts settings. It is a base64 encoded text value of about 120 characters made up of upper and lower case letters and numbers. If you have several Cloud IDs, you can add a label, which is ignored internally, to help you tell them apart. To add a label you should prefix your Cloud ID with a label and a `:` separator in this format "<label>:<cloud-id>"
+
+
+## Cloud Auth [cloud-auth]
+
+Cloud Auth is optional. Construct this value by following this format "<username>:<password>". Use your Cloud username for the first part. Use your Cloud password for the second part, which is given once in the Cloud UI when you create a cluster. If you change your Cloud password in the Cloud UI, remember to change it here, too.
+
+
+## Using Cloud ID and Cloud Auth with plugins [cloud-id-plugins]
+
+The Elasticsearch input, output, and filter plugins support cloud_id and cloud_auth in their configurations.
+
+* [Elasticsearch input plugin](logstash-docs-md://lsr/plugins-inputs-elasticsearch.md#plugins-inputs-elasticsearch-cloud_id)
+* [Elasticsearch filter plugin](logstash-docs-md://lsr/plugins-filters-elasticsearch.md#plugins-filters-elasticsearch-cloud_id)
+* [Elasticsearch output plugin](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-cloud_id)
+
+
+## Sending {{ls}} management data to {{es}} Services [cloud-id-mgmt]
+
+These settings in the `logstash.yml` config file can help you get set up to send management data to Elastic Cloud:
+
+* `xpack.management.elasticsearch.cloud_id`
+* `xpack.management.elasticsearch.cloud_auth`
+
+You can use the `xpack.management.elasticsearch.cloud_id` setting as an alternative to `xpack.management.elasticsearch.hosts`.
+
+You can use the `xpack.management.elasticsearch.cloud_auth` setting as an alternative to both `xpack.management.elasticsearch.username` and `xpack.management.elasticsearch.password`. The credentials you specify here should be for a user with the logstash_admin role, which provides access to .logstash-* indices for managing configurations.
+
+
diff --git a/docs/reference/core-operations.md b/docs/reference/core-operations.md
new file mode 100644
index 000000000..d3ab5165f
--- /dev/null
+++ b/docs/reference/core-operations.md
@@ -0,0 +1,92 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/core-operations.html
+---
+
+# Performing Core Operations [core-operations]
+
+The plugins described in this section are useful for core operations, such as mutating and dropping events.
+
+[date filter](logstash-docs-md://lsr/plugins-filters-date.md)
+:   Parses dates from fields to use as Logstash timestamps for events.
+
+    The following config parses a field called `logdate` to set the Logstash timestamp:
+
+    ```json
+    filter {
+      date {
+        match => [ "logdate", "MMM dd yyyy HH:mm:ss" ]
+      }
+    }
+    ```
+
+
+[drop filter](logstash-docs-md://lsr/plugins-filters-drop.md)
+:   Drops events. This filter is typically used in combination with conditionals.
+
+    The following config drops `debug` level log messages:
+
+    ```json
+    filter {
+      if [loglevel] == "debug" {
+        drop { }
+      }
+    }
+    ```
+
+
+[fingerprint filter](logstash-docs-md://lsr/plugins-filters-fingerprint.md)
+:   Fingerprints fields by applying a consistent hash.
+
+    The following config fingerprints the `IP`, `@timestamp`, and `message` fields and adds the hash to a metadata field called `generated_id`:
+
+    ```json
+    filter {
+      fingerprint {
+        source => ["IP", "@timestamp", "message"]
+        method => "SHA1"
+        key => "0123"
+        target => "[@metadata][generated_id]"
+      }
+    }
+    ```
+
+
+[mutate filter](logstash-docs-md://lsr/plugins-filters-mutate.md)
+:   Performs general mutations on fields. You can rename, remove, replace, and modify fields in your events.
+
+    The following config renames the `HOSTORIP` field to `client_ip`:
+
+    ```json
+    filter {
+      mutate {
+        rename => { "HOSTORIP" => "client_ip" }
+      }
+    }
+    ```
+
+    The following config strips leading and trailing whitespace from the specified fields:
+
+    ```json
+    filter {
+      mutate {
+        strip => ["field1", "field2"]
+      }
+    }
+    ```
+
+
+[ruby filter](logstash-docs-md://lsr/plugins-filters-ruby.md)
+:   Executes Ruby code.
+
+    The following config executes Ruby code that cancels 90% of the events:
+
+    ```json
+    filter {
+      ruby {
+        code => "event.cancel if rand <= 0.90"
+      }
+    }
+    ```
+
+
diff --git a/docs/reference/creating-logstash-pipeline.md b/docs/reference/creating-logstash-pipeline.md
new file mode 100644
index 000000000..361ad6166
--- /dev/null
+++ b/docs/reference/creating-logstash-pipeline.md
@@ -0,0 +1,34 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/configuration.html
+---
+
+# Creating a Logstash Pipeline [configuration]
+
+You can create a pipeline by stringing together plugins--[inputs](logstash-docs-md://lsr/input-plugins.md), [outputs](logstash-docs-md://lsr/output-plugins.md), [filters](logstash-docs-md://lsr/filter-plugins.md), and sometimes [codecs](logstash-docs-md://lsr/codec-plugins.md)--in order to process data. To build a Logstash pipeline, create a config file to specify which plugins you want to use and the settings for each plugin.
+
+A very basic pipeline might contain only an input and an output. Most pipelines include at least one filter plugin because that’s where the "transform" part of the ETL (extract, transform, load) magic happens. You can reference event fields in a pipeline and use conditionals to process events when they meet certain criteria.
+
+Let’s step through creating a simple pipeline config on your local machine and then using it to run Logstash. Create a file named "logstash-simple.conf" and save it in the same directory as Logstash.
+
+```ruby
+input { stdin { } }
+output {
+  elasticsearch { cloud_id => "<cloud id>" api_key => "<api key>" }
+  stdout { codec => rubydebug }
+}
+```
+
+Then, run {{ls}} and specify the configuration file with the `-f` flag.
+
+```ruby
+bin/logstash -f logstash-simple.conf
+```
+
+Et voilà! Logstash reads the specified configuration file and outputs to both Elasticsearch and stdout. Before we move on to [more complex examples](/reference/config-examples.md), let’s take a look at what’s in a pipeline config file.
+
+
+
+
+
+
diff --git a/docs/reference/dashboard-monitoring-with-elastic-agent.md b/docs/reference/dashboard-monitoring-with-elastic-agent.md
new file mode 100644
index 000000000..9b3743cdc
--- /dev/null
+++ b/docs/reference/dashboard-monitoring-with-elastic-agent.md
@@ -0,0 +1,149 @@
+---
+navigation_title: "Collect monitoring data for dashboards"
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/dashboard-monitoring-with-elastic-agent.html
+---
+
+# Collect {{ls}} monitoring data for dashboards [dashboard-monitoring-with-elastic-agent]
+
+
+{{agent}} collects monitoring data from your {{ls}} instance, sends it directly to your monitoring cluster, and shows the data in {{ls}} dashboards.
+
+You can enroll {{agent}} in [{{fleet}}](docs-content://reference/fleet/install-fleet-managed-elastic-agent.md) for management from a central location, or you can run [{{agent}} standalone](docs-content://reference/fleet/install-standalone-elastic-agent.md).
+
+**Prerequisites**
+
+Complete these steps as you prepare to collect and ship monitoring data for dashboards:
+
+::::{dropdown} Disable default collection of {{ls}} monitoring metrics
+:name: disable-default-db
+
+Set `monitoring.enabled` to `false` in logstash.yml to disable default collection:
+
+```yaml
+monitoring.enabled: false
+```
+
+::::
+
+
+::::{dropdown} Specify the target cluster_uuid (optional)
+:name: define-cluster__uuid-db
+
+To bind the metrics of {{ls}} to a specific cluster, optionally define the `monitoring.cluster_uuid` in the configuration file (logstash.yml):
+
+```yaml
+monitoring.cluster_uuid: PRODUCTION_ES_CLUSTER_UUID
+```
+
+::::
+
+
+::::{dropdown}  Grant agent access to Elasticsearch (standalone agent only)
+:name: create-user-db
+
+
+Minimal permissions required to send Logstash monitoring data to Elasticsearch:
+
+* `monitor` cluster privilege
+* `auto_configure` and `create_doc` index privileges on `logs-*` and `metrics-*` indices.
+
+See [Grant standalone Elastic Agents access to Elasticsearch](docs-content://reference/fleet/grant-access-to-elasticsearch.md)
+
+::::
+
+
+
+## Install and configure {{agent}} [install-and-configure-db]
+
+Install and configure {{agent}} to collect {{ls}} monitoring data for dashboards. We’ll walk you through the process in these steps:
+
+* [Add the {{agent}} {{ls}} integration to monitor host logs and metrics](#add-logstash-integration-ead)
+* [Install and run an {{agent}} on your machine](#add-agent-to-fleet-ead)
+* [View assets](#view-assets-ead)
+* [Monitor {{ls}} logs and metrics](#view-data-dashboard)
+
+Check out [Installing {{agent}}](docs-content://reference/fleet/install-elastic-agents.md) in the *Fleet and Elastic Agent Guide* for more info.
+
+
+### Add the {{agent}} {{ls}} integration to monitor host logs and metrics [add-logstash-integration-ead]
+
+1. Go to the {{kib}} home page, and click **Add integrations**.
+
+    % TO DO: Use `:class: screenshot`
+    ![{{kib}} home page](images/kibana-home.png)
+
+2. In the query bar, search for **{{ls}}** and select the integration to see more details.
+3. Click **Add {{ls}}**.
+4. Configure the integration name and add a description (optional).
+5. Configure the integration to collect logs.
+
+    * Make sure that **Logs** is turned on if you want to collect logs from your {{ls}} instance. Be sure that the required settings are correctly configured.
+    * Under **Logs**, modify the log paths to match your {{ls}} environment.
+
+6. Configure the integration to collect metrics.
+
+    ::::{tip}
+    For the best experience with the {{ls}} dashboards, we recommend collecting all of the metrics. Turning off metrics will result in incomplete or missing visualizations.
+    ::::
+
+    * Make sure that **Metrics (Elastic Agent)** is turned on (default), and **Metrics (Stack Monitoring)** is turned off.
+    * Under **Metrics (Elastic Agent)**, make sure the {{ls}} URL setting points to your {{ls}} instance URLs.<br> By default, the integration collects {{ls}} monitoring metrics from `https://localhost:9600`. If that host and port number are not correct, update the `Logstash URL` setting. If you configured {{ls}} to use encrypted communications and/or a username and password, you must access it via HTTPS, and expand the **Advanced Settings** options, and fill in with the appropriate values for your {{ls}} instance.
+
+7. Click **Save and continue**.<br> This step takes a minute or two to complete. When it’s done, you’ll have an agent policy that contains a system integration policy for the configuration you just specified.
+8. In the popup, click **Add {{agent}} to your hosts** to open the **Add agent** flyout.
+
+    ::::{tip}
+    If you accidentally close the popup, go to **{{fleet}} > Agents** and click **Add agent**.
+    ::::
+
+
+
+## Install and run an {{agent}} on your machine [add-agent-to-fleet-ead]
+
+The **Add agent** flyout has two options: **Enroll in {{fleet}}** and **Run standalone**. Enrolling agents in {{fleet}} (default) provides a centralized management tool in {{kib}}, reducing management overhead.
+
+:::::::{tab-set}
+
+::::::{tab-item} Fleet-managed
+1. When the **Add Agent flyout** appears, stay on the **Enroll in fleet** tab.
+2. Skip the **Select enrollment token** step. The enrollment token you need is already selected.
+
+    ::::{note}
+    The enrollment token is specific to the {{agent}} policy that you just created. When you run the command to enroll the agent in {{fleet}}, you will pass in the enrollment token.
+    ::::
+
+3. Download, install, and enroll the {{agent}} on your host by selecting your host operating system and following the **Install {{agent}} on your host** step.
+
+It takes about a minute for {{agent}} to enroll in {{fleet}}, download the configuration specified in the policy you just created, and start collecting data.
+::::::
+
+::::::{tab-item} Run standalone
+1. When the **Add Agent flyout** appears, navigate to the **Run standalone** tab.
+2. Configure the agent. Follow the instructions in **Install Elastic Agent on your host**.
+3. After unpacking the binary, replace the `elastic-agent.yml` file with that supplied in the Add Agent flyout on the "Run standalone" tab, replacing the values of `ES_USERNAME` and `ES_PASSWORD` appropriately.
+4. Run `sudo ./elastic-agent install`
+::::::
+
+:::::::
+
+## View assets [view-assets-ead]
+
+After you have confirmed enrollment and data is coming in,  click **View assets** to access dashboards related to the {{ls}} integration.
+
+For traditional Stack Monitoring UI, the dashboards marked **[Logs {{ls}}]** are used to visualize the logs produced by your {{ls}} instances, with those marked **[Metrics {{ls}}]** for metrics dashboards. These are populated with data only if you selected the **Metrics (Elastic Agent)** checkbox.
+
+% TO DO: Use `:class: screenshot`
+![Integration assets](images/integration-assets-dashboards.png)
+
+A number of dashboards are included to view {{ls}} as a whole, and dashboards that allow you to drill-down into how {{ls}} is performing on a node, pipeline and plugin basis.
+
+
+## Monitor {{ls}} logs and metrics [view-data-dashboard]
+
+From the list of assets, open the **[Metrics {{ls}}] {{ls}} overview** dashboard to view overall performance. Then follow the navigation panel to further drill down into {{ls}} performance.
+
+% TO DO: Use `:class: screenshot`
+![The {{ls}} Overview dashboard in {{kib}} with various metrics from your monitored {ls}](images/integration-dashboard-overview.png)
+
+You can hover over any visualization to adjust its settings, or click the **Edit** button to make changes to the dashboard. To learn more, refer to [Dashboard and visualizations](docs-content://explore-analyze/dashboards.md).
diff --git a/docs/reference/data-deserialization.md b/docs/reference/data-deserialization.md
new file mode 100644
index 000000000..8db84e145
--- /dev/null
+++ b/docs/reference/data-deserialization.md
@@ -0,0 +1,105 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/data-deserialization.html
+---
+
+# Deserializing Data [data-deserialization]
+
+The plugins described in this section are useful for deserializing data into Logstash events.
+
+[avro codec](logstash-docs-md://lsr/plugins-codecs-avro.md)
+:   Reads serialized Avro records as Logstash events. This plugin deserializes individual Avro records. It is not for reading Avro files. Avro files have a unique format that must be handled upon input.
+
+    The following config deserializes input from Kafka:
+
+    ```json
+    input {
+      kafka {
+        codec => {
+          avro => {
+            schema_uri => "/tmp/schema.avsc"
+          }
+        }
+      }
+    }
+    ...
+    ```
+
+
+[csv filter](logstash-docs-md://lsr/plugins-filters-csv.md)
+:   Parses comma-separated value data into individual fields. By default, the filter autogenerates field names (column1, column2, and so on), or you can specify a list of names. You can also change the column separator.
+
+    The following config parses CSV data into the field names specified in the `columns` field:
+
+    ```json
+    filter {
+      csv {
+        separator => ","
+        columns => [ "Transaction Number", "Date", "Description", "Amount Debit", "Amount Credit", "Balance" ]
+      }
+    }
+    ```
+
+
+[fluent codec](logstash-docs-md://lsr/plugins-codecs-fluent.md)
+:   Reads the Fluentd `msgpack` schema.
+
+    The following config decodes logs received from `fluent-logger-ruby`:
+
+    ```json
+    input {
+      tcp {
+        codec => fluent
+        port => 4000
+      }
+    }
+    ```
+
+
+[json codec](logstash-docs-md://lsr/plugins-codecs-json.md)
+:   Decodes (via inputs) and encodes (via outputs) JSON formatted content, creating one event per element in a JSON array.
+
+    The following config decodes the JSON formatted content in a file:
+
+    ```json
+    input {
+      file {
+        path => "/path/to/myfile.json"
+        codec =>"json"
+    }
+    ```
+
+
+[protobuf codec](logstash-docs-md://lsr/plugins-codecs-protobuf.md)
+:   Reads protobuf encoded messages and converts them to Logstash events. Requires the protobuf definitions to be compiled as Ruby files. You can compile them by using the [ruby-protoc compiler](https://github.com/codekitchen/ruby-protocol-buffers).
+
+    The following config decodes events from a Kafka stream:
+
+    ```json
+    input
+      kafka {
+        zk_connect => "127.0.0.1"
+        topic_id => "your_topic_goes_here"
+        codec => protobuf {
+          class_name => "Animal::Unicorn"
+          include_path => ['/path/to/protobuf/definitions/UnicornProtobuf.pb.rb']
+        }
+      }
+    }
+    ```
+
+
+[xml filter](logstash-docs-md://lsr/plugins-filters-xml.md)
+:   Parses XML into fields.
+
+    The following config parses the whole XML document stored in the `message` field:
+
+    ```json
+    filter {
+      xml {
+        source => "message"
+      }
+    }
+    ```
+
+
diff --git a/docs/reference/dead-letter-queues.md b/docs/reference/dead-letter-queues.md
new file mode 100644
index 000000000..d2effd827
--- /dev/null
+++ b/docs/reference/dead-letter-queues.md
@@ -0,0 +1,255 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/dead-letter-queues.html
+---
+
+# Dead letter queues (DLQ) [dead-letter-queues]
+
+The dead letter queue (DLQ) is designed as a place to temporarily write events that cannot be processed. The DLQ gives you flexibility to investigate problematic events without blocking the pipeline or losing the events. Your pipeline keeps flowing, and the immediate problem is averted. But those events still need to be addressed.
+
+You can [process events from the DLQ](#es-proc-dlq) with the [`dead_letter_queue` input plugin](logstash-docs-md://lsr/plugins-inputs-dead_letter_queue.md) .
+
+Processing events does not delete items from the queue, and the DLQ sometimes needs attention. See [Track dead letter queue size](#dlq-size) and [Clear the dead letter queue](#dlq-clear) for more info.
+
+## How the dead letter queue works [dead-letter-how]
+
+By default, when Logstash encounters an event that it cannot process because the data contains a mapping error or some other issue, the Logstash pipeline either hangs or drops the unsuccessful event. In order to protect against data loss in this situation, you can [configure Logstash](#configuring-dlq) to write unsuccessful events to a dead letter queue instead of dropping them.
+
+::::{note}
+The dead letter queue is currently supported only for the [{{es}} output](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md) and [conditional statements evaluation](/reference/event-dependent-configuration.md#conditionals). The dead letter queue is used for documents with response codes of 400 or 404, both of which indicate an event that cannot be retried. It’s also used when a conditional evaluation encounter an error.
+::::
+
+
+Each event written to the dead letter queue includes the original event, metadata that describes the reason the event could not be processed, information about the plugin that wrote the event, and the timestamp when the event entered the dead letter queue.
+
+To process events in the dead letter queue, create a Logstash pipeline configuration that uses the [`dead_letter_queue` input plugin](logstash-docs-md://lsr/plugins-inputs-dead_letter_queue.md) to read from the queue. See [Processing events in the dead letter queue](#processing-dlq-events) for more information.
+
+![Diagram showing pipeline reading from the dead letter queue](images/dead_letter_queue.png)
+
+
+## {{es}} processing and the dead letter queue [es-proc-dlq]
+
+**HTTP request failure.** If the HTTP request fails (because {{es}} is unreachable or because it returned an HTTP error code), the {{es}} output retries the entire request indefinitely. In these scenarios, the dead letter queue has no opportunity to intercept.
+
+**HTTP request success.** The [{{es}} Bulk API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-bulk) can perform multiple actions using the same request. If the Bulk API request is successful, it returns `200 OK`, even if some documents in the batch have [failed](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-bulk#bulk-failures-ex). In this situation, the `errors` flag for the request will be `true`.
+
+The response body can include metadata indicating that one or more specific actions in the bulk request could not be performed, along with an HTTP-style status code per entry to indicate why the action could not be performed. If the DLQ is configured, individual indexing failures are routed there.
+
+Even if you regularly process events, events remain in the dead letter queue. The dead letter queue requires [manual intervention](#dlq-clear) to clear it.
+
+
+## Conditional statements and the dead letter queue [conditionals-dlq]
+
+When a conditional statement reaches an error in processing an event, such as comparing string and integer values, the event, as it is at the time of evaluation, is inserted into the dead letter queue.
+
+
+## Configuring {{ls}} to use dead letter queues [configuring-dlq]
+
+Dead letter queues are disabled by default. To enable dead letter queues, set the `dead_letter_queue_enable` option in the `logstash.yml` [settings file](/reference/logstash-settings-file.md):
+
+```yaml
+dead_letter_queue.enable: true
+```
+
+Dead letter queues are stored as files in the local directory of the Logstash instance. By default, the dead letter queue files are stored in `path.data/dead_letter_queue`. Each pipeline has a separate queue. For example, the dead letter queue for the `main` pipeline is stored in `LOGSTASH_HOME/data/dead_letter_queue/main` by default. The queue files are numbered sequentially: `1.log`, `2.log`, and so on.
+
+You can set `path.dead_letter_queue` in the `logstash.yml` file to specify a different path for the files:
+
+```yaml
+path.dead_letter_queue: "path/to/data/dead_letter_queue"
+```
+
+::::{tip}
+Use the local filesystem for data integrity and performance. Network File System (NFS) is not supported.
+::::
+
+
+Dead letter queue entries are written to a temporary file, which is then renamed to a dead letter queue segment file, which is then eligible for ingestion. The rename happens either when this temporary file is considered *full*, or when a period of time has elapsed since the last dead letter queue eligible event was written to the temporary file.
+
+This length of time can be set using the `dead_letter_queue.flush_interval` setting. This setting is in milliseconds, and defaults to 5000ms. A low value here will mean in the event of infrequent writes to the dead letter queue more, smaller, queue files may be written, while a larger value will introduce more latency between items being "written" to the dead letter queue, and being made available for reading by the dead_letter_queue input.
+
+```
+Note that this value cannot be set to lower than 1000ms.
+```
+```yaml
+dead_letter_queue.flush_interval: 5000
+```
+
+::::{note}
+You may not use the same `dead_letter_queue` path for two different Logstash instances.
+::::
+
+
+### File rotation [file-rotation]
+
+Dead letter queues have a built-in file rotation policy that manages the file size of the queue. When the file size reaches a preconfigured threshold, a new file is created automatically.
+
+
+### Size management [size-management]
+
+By default, the maximum size of each dead letter queue is set to 1024mb. To change this setting, use the `dead_letter_queue.max_bytes` option.  Entries will be dropped if they would increase the size of the dead letter queue beyond this setting. Use the `dead_letter_queue.storage_policy` option to control which entries should be dropped to avoid exceeding the size limit. Set the value to `drop_newer` (default) to stop accepting new values that would push the file size over the limit. Set the value to `drop_older` to remove the oldest events to make space for new ones.
+
+#### Age policy [age-policy]
+
+You can use the age policy to automatically control the volume of events in the dead letter queue. Use the `dead_letter_queue.retain.age` setting (in `logstash.yml` or `pipelines.yml`) to have {{ls}} remove events that are older than a value you define. Available time units are `d`, `h`, `m`, `s` respectively for days, hours, minutes and seconds. There is no default time unit, so you need to specify it.
+
+```yaml
+dead_letter_queue.retain.age: 2d
+```
+
+The age policy is verified and applied on event writes and during pipeline shutdown. For that reason, your dead-letter-queue folder may store expired events for longer than specified, and the reader pipeline could possibly encounter outdated events.
+
+
+
+### Automatic cleaning of consumed events [auto-clean]
+
+By default, the dead letter queue input plugin does not remove the events that it consumes. Instead, it commits a reference to avoid re-processing events. Use the `clean_consumed` setting in the dead letter queue input plugin in order to remove segments that have been fully consumed, freeing space while processing.
+
+```yaml
+input {
+  dead_letter_queue {
+  	path => "/path/to/data/dead_letter_queue"
+  	pipeline_id => "main"
+    clean_consumed => true
+  }
+}
+```
+
+
+
+## Processing events in the dead letter queue [processing-dlq-events]
+
+When you are ready to process events in the dead letter queue, you create a pipeline that uses the [`dead_letter_queue` input plugin](logstash-docs-md://lsr/plugins-inputs-dead_letter_queue.md) to read from the dead letter queue. The pipeline configuration that you use depends, of course, on what you need to do. For example, if the dead letter queue contains events that resulted from a mapping error in Elasticsearch, you can create a pipeline that reads the "dead" events, removes the field that caused the mapping issue, and re-indexes the clean events into Elasticsearch.
+
+The following example shows a simple pipeline that reads events from the dead letter queue and writes the events, including metadata, to standard output:
+
+```yaml
+input {
+  dead_letter_queue {
+    path => "/path/to/data/dead_letter_queue" <1>
+    commit_offsets => true <2>
+    pipeline_id => "main" <3>
+  }
+}
+
+output {
+  stdout {
+    codec => rubydebug { metadata => true }
+  }
+}
+```
+
+1. The path to the top-level directory containing the dead letter queue. This directory contains a separate folder for each pipeline that writes to the dead letter queue. To find the path to this directory, look at the `logstash.yml` [settings file](/reference/logstash-settings-file.md). By default, Logstash creates the `dead_letter_queue` directory under the location used for persistent storage (`path.data`), for example, `LOGSTASH_HOME/data/dead_letter_queue`. However, if `path.dead_letter_queue` is set, it uses that location instead.
+2. When `true`, saves the offset. When the pipeline restarts, it will continue reading from the position where it left off rather than reprocessing all the items in the queue. You can set `commit_offsets` to `false` when you are exploring events in the dead letter queue and want to iterate over the events multiple times.
+3. The ID of the pipeline that’s writing to the dead letter queue. The default is `"main"`.
+
+
+For another example, see [Example: Processing data that has mapping errors](#dlq-example).
+
+When the pipeline has finished processing all the events in the dead letter queue, it will continue to run and process new events as they stream into the queue. This means that you do not need to stop your production system to handle events in the dead letter queue.
+
+::::{note}
+Events emitted from the [`dead_letter_queue` input plugin](logstash-docs-md://lsr/plugins-inputs-dead_letter_queue.md) plugin will not be resubmitted to the dead letter queue if they cannot be processed correctly.
+::::
+
+
+
+## Reading from a timestamp [dlq-timestamp]
+
+When you read from the dead letter queue, you might not want to process all the events in the queue, especially if there are a lot of old events in the queue. You can start processing events at a specific point in the queue by using the `start_timestamp` option. This option configures the pipeline to start processing events based on the timestamp of when they entered the queue:
+
+```yaml
+input {
+  dead_letter_queue {
+    path => "/path/to/data/dead_letter_queue"
+    start_timestamp => "2017-06-06T23:40:37"
+    pipeline_id => "main"
+  }
+}
+```
+
+For this example, the pipeline starts reading all events that were delivered to the dead letter queue on or after June 6, 2017, at 23:40:37.
+
+
+## Example: Processing data that has mapping errors [dlq-example]
+
+In this example, the user attempts to index a document that includes geo_ip data, but the data cannot be processed because it contains a mapping error:
+
+```json
+{"geoip":{"location":"home"}}
+```
+
+Indexing fails because the Logstash output plugin expects a `geo_point` object in the `location` field, but the value is a string. The failed event is written to the dead letter queue, along with metadata about the error that caused the failure:
+
+```json
+{
+   "@metadata" => {
+    "dead_letter_queue" => {
+       "entry_time" => #<Java::OrgLogstash::Timestamp:0x5b5dacd5>,
+        "plugin_id" => "fb80f1925088497215b8d037e622dec5819b503e-4",
+      "plugin_type" => "elasticsearch",
+           "reason" => "Could not index event to Elasticsearch. status: 400, action: [\"index\", {:_id=>nil, :_index=>\"logstash-2017.06.22\", :_type=>\"doc\", :_routing=>nil}, 2017-06-22T01:29:29.804Z My-MacBook-Pro-2.local {\"geoip\":{\"location\":\"home\"}}], response: {\"index\"=>{\"_index\"=>\"logstash-2017.06.22\", \"_type\"=>\"doc\", \"_id\"=>\"AVzNayPze1iR9yDdI2MD\", \"status\"=>400, \"error\"=>{\"type\"=>\"mapper_parsing_exception\", \"reason\"=>\"failed to parse\", \"caused_by\"=>{\"type\"=>\"illegal_argument_exception\", \"reason\"=>\"illegal latitude value [266.30859375] for geoip.location\"}}}}"
+    }
+  },
+  "@timestamp" => 2017-06-22T01:29:29.804Z,
+    "@version" => "1",
+       "geoip" => {
+    "location" => "home"
+  },
+        "host" => "My-MacBook-Pro-2.local",
+     "message" => "{\"geoip\":{\"location\":\"home\"}}"
+}
+```
+
+To process the failed event, you create the following pipeline that reads from the dead letter queue and removes the mapping problem:
+
+```json
+input {
+  dead_letter_queue {
+    path => "/path/to/data/dead_letter_queue/" <1>
+  }
+}
+filter {
+  mutate {
+    remove_field => "[geoip][location]" <2>
+  }
+}
+output {
+  elasticsearch{
+    hosts => [ "localhost:9200" ] <3>
+  }
+}
+```
+
+1. The [`dead_letter_queue` input](logstash-docs-md://lsr/plugins-inputs-dead_letter_queue.md) reads from the dead letter queue.
+2. The `mutate` filter removes the problem field called `location`.
+3. The clean event is sent to Elasticsearch, where it can be indexed because the mapping issue is resolved.
+
+
+
+## Track dead letter queue size [dlq-size]
+
+Monitor the size of the dead letter queue before it becomes a problem. By checking it periodically, you can determine the maximum queue size that makes sense for each pipeline.
+
+The size of the DLQ for each pipeline is available in the node stats API.
+
+```txt
+pipelines.${pipeline_id}.dead_letter_queue.queue_size_in_bytes.
+```
+
+Where `{{pipeline_id}}` is the name of a pipeline with DLQ enabled.
+
+
+## Clear the dead letter queue [dlq-clear]
+
+The dead letter queue cannot be cleared with the upstream pipeline running.
+
+The dead letter queue is a directory of pages. To clear it, stop the pipeline and delete location/<file-name>.
+
+```txt
+${path.data}/dead_letter_queue/${pipeline_id}
+```
+
+Where `{{pipeline_id}}` is the name of a pipeline with DLQ enabled.
+
+The pipeline creates a new dead letter queue when it starts again.
diff --git a/docs/reference/deploying-scaling-logstash.md b/docs/reference/deploying-scaling-logstash.md
new file mode 100644
index 000000000..ea19ddaac
--- /dev/null
+++ b/docs/reference/deploying-scaling-logstash.md
@@ -0,0 +1,157 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/deploying-and-scaling.html
+---
+
+# Deploying and scaling Logstash [deploying-and-scaling]
+
+The Elastic Stack is used for tons of use cases, from operational log and metrics analytics, to enterprise and application search. Making sure your data gets scalably, durably, and securely transported to Elasticsearch is extremely important, especially for mission critical environments.
+
+The goal of this document is to highlight the most common architecture patterns for Logstash and how to effectively scale as your deployment grows. The focus will be around the operational log, metrics, and security analytics use cases because they tend to require larger scale deployments. The deploying and scaling recommendations provided here may vary based on your own requirements.
+
+
+## Getting Started [deploying-getting-started]
+
+For first time users, if you simply want to tail a log file to grasp the power of the Elastic Stack, we recommend trying [Filebeat Modules](beats://reference/filebeat/filebeat-modules-overview.md). Filebeat Modules enable you to quickly collect, parse, and index popular log types and view pre-built Kibana dashboards within minutes. [Metricbeat Modules](beats://reference/metricbeat/metricbeat-modules.md) provide a similar experience, but with metrics data. In this context, Beats will ship data directly to Elasticsearch where [Ingest Nodes](docs-content://manage-data/ingest/transform-enrich/ingest-pipelines.md) will process and index your data.
+
+![deploy1](images/deploy1.png)
+
+
+### Introducing Logstash [_introducing_logstash]
+
+What are the main benefits for integrating Logstash into your architecture?
+
+* Scale through ingestion spikes - Logstash has an adaptive disk-based buffering system that will absorb incoming throughput, therefore mitigating backpressure
+* Ingest from other data sources like databases, S3, or messaging queues
+* Emit data to multiple destinations like S3, HDFS, or write to a file
+* Compose more sophisticated processing pipelines with conditional dataflow logic
+
+
+## Scaling Ingest [scaling-ingest]
+
+Beats and Logstash make ingest awesome. Together, they provide a comprehensive solution that is scalable and resilient. What can you expect?
+
+* Horizontal scalability, high availability, and variable load handling
+* Message durability with at-least-once delivery guarantees
+* End-to-end secure transport with authentication and wire encryption
+
+
+### Beats and Logstash [_beats_and_logstash]
+
+Beats run across thousands of edge host servers, collecting, tailing, and shipping logs to Logstash. Logstash serves as the centralized streaming engine for data unification and enrichment. The [Beats input plugin](logstash-docs-md://lsr/plugins-inputs-beats.md) exposes a secure, acknowledgement-based endpoint for Beats to send data to Logstash.
+
+![deploy2](images/deploy2.png)
+
+::::{note}
+Enabling persistent queues is strongly recommended, and these architecture characteristics assume that they are enabled. We encourage you to review the [Persistent queues (PQ)](/reference/persistent-queues.md) documentation for feature benefits and more details on resiliency.
+::::
+
+
+
+### Scalability [_scalability]
+
+Logstash is horizontally scalable and can form groups of nodes running the same pipeline. Logstash’s adaptive buffering capabilities will facilitate smooth streaming even through variable throughput loads. If the Logstash layer becomes an ingestion bottleneck, simply add more nodes to scale out. Here are a few general recommendations:
+
+* Beats should [load balance](beats://reference/filebeat/elasticsearch-output.md#_loadbalance) across a group of Logstash nodes.
+* A minimum of two Logstash nodes are recommended for high availability.
+* It’s common to deploy just one Beats input per Logstash node, but multiple Beats inputs can also be deployed per Logstash node to expose independent endpoints for different data sources.
+
+
+### Resiliency [_resiliency]
+
+When using [Filebeat](https://www.elastic.co/products/beats/filebeat) or [Winlogbeat](https://www.elastic.co/products/beats/winlogbeat) for log collection within this ingest flow, **at-least-once delivery** is guaranteed. Both the communication protocols, from Filebeat or Winlogbeat to Logstash, and from Logstash to Elasticsearch, are synchronous and support acknowledgements. The other Beats don’t yet have support for acknowledgements.
+
+Logstash persistent queues provide protection across node failures. For disk-level resiliency in Logstash, it’s important to ensure disk redundancy. For on-premise deployments, it’s recommended that you configure RAID. When running in the cloud or a containerized environment, it’s recommended that you use persistent disks with replication strategies that reflect your data SLAs.
+
+::::{note}
+Make sure `queue.checkpoint.writes: 1` is set for at-least-once guarantees. For more details, see the [persistent queue durability](/reference/persistent-queues.md#durability-persistent-queues) documentation.
+::::
+
+
+
+### Processing [_processing]
+
+Logstash will commonly extract fields with [grok](logstash-docs-md://lsr/plugins-filters-grok.md) or [dissect](logstash-docs-md://lsr/plugins-filters-dissect.md), augment [geographical](logstash-docs-md://lsr/plugins-filters-geoip.md) info, and can further enrich events with [file](logstash-docs-md://lsr/plugins-filters-translate.md), [database](logstash-docs-md://lsr/plugins-filters-jdbc_streaming.md), or [Elasticsearch](logstash-docs-md://lsr/plugins-filters-elasticsearch.md) lookup datasets. Be aware that processing complexity can affect overall throughput and CPU utilization. Make sure to check out the other [available filter plugins](logstash-docs-md://lsr/filter-plugins.md).
+
+
+### Secure Transport [_secure_transport]
+
+Enterprise-grade security is available across the entire delivery chain.
+
+* Wire encryption is recommended for both the transport from [Beats to Logstash](beats://reference/filebeat/configuring-ssl-logstash.md) and from [Logstash to Elasticsearch](/reference/secure-connection.md).
+* There’s a wealth of security options when communicating with Elasticsearch including basic authentication, TLS, PKI, LDAP, AD, and other custom realms. To enable Elasticsearch security, see [Secure a cluster](docs-content://deploy-manage/security.md).
+
+
+### Monitoring [_monitoring]
+
+When running Logstash 5.2 or greater, the [Monitoring UI](https://www.elastic.co/products/x-pack/monitoring) provides deep visibility into your deployment metrics, helping observe performance and alleviate bottlenecks as you scale. Monitoring is an X-Pack feature under the Basic License and is therefore **free to use**. To get started, see [Monitoring Logstash](https://www.elastic.co/docs/api/doc/logstash/).
+
+If external monitoring is preferred, there are [monitoring APIs](monitoring-logstash.md) that return point-in-time metrics snapshots.
+
+
+## Adding Other Popular Sources [adding-other-sources]
+
+Users may have other mechanisms of collecting logging data, and it’s easy to integrate and centralize them into the Elastic Stack. Let’s walk through a few scenarios:
+
+![deploy3](images/deploy3.png)
+
+
+### TCP, UDP, and HTTP Protocols [_tcp_udp_and_http_protocols]
+
+The TCP, UDP, and HTTP protocols are common ways to feed data into Logstash. Logstash can expose endpoint listeners with the respective [TCP](logstash-docs-md://lsr/plugins-inputs-tcp.md), [UDP](logstash-docs-md://lsr/plugins-inputs-udp.md), and [HTTP](logstash-docs-md://lsr/plugins-inputs-http.md) input plugins. The data sources enumerated below are typically ingested through one of these three protocols.
+
+::::{note}
+The TCP and UDP protocols do not support application-level acknowledgements, so connectivity issues may result in data loss.
+::::
+
+
+For high availability scenarios, a third-party hardware or software load balancer, like HAProxy, should be added to fan out traffic to a group of Logstash nodes.
+
+
+### Network and Security Data [_network_and_security_data]
+
+Although Beats may already satisfy your data ingest use case, network and security datasets come in a variety of forms. Let’s touch on a few other ingestion points.
+
+* Network wire data - collect and analyze network traffic with [Packetbeat](https://www.elastic.co/products/beats/packetbeat).
+* Netflow v5/v9/v10 - Logstash understands data from Netflow/IPFIX exporters with the [Netflow codec](logstash-docs-md://lsr/plugins-codecs-netflow.md).
+* Nmap - Logstash accepts and parses Nmap XML data with the [Nmap codec](logstash-docs-md://lsr/plugins-codecs-nmap.md).
+* SNMP trap - Logstash has a native [SNMP trap input](logstash-docs-md://lsr/plugins-inputs-snmptrap.md).
+* CEF - Logstash accepts and parses CEF data from systems like Arcsight SmartConnectors with the [CEF codec](logstash-docs-md://lsr/plugins-codecs-cef.md).
+
+
+### Centralized Syslog Servers [_centralized_syslog_servers]
+
+Existing syslog server technologies like rsyslog and syslog-ng generally send syslog over to Logstash TCP or UDP endpoints for extraction, processing, and persistence. If the data format conforms to RFC3164, it can be fed directly to the [Logstash syslog input](logstash-docs-md://lsr/plugins-inputs-syslog.md).
+
+
+### Infrastructure & Application Data and IoT [_infrastructure_application_data_and_iot]
+
+Infrastructure and application metrics can be collected with [Metricbeat](https://www.elastic.co/products/beats/metricbeat), but applications can also send webhooks to a Logstash HTTP input or have metrics polled from an HTTP endpoint with the [HTTP poller input plugin](logstash-docs-md://lsr/plugins-inputs-http_poller.md).
+
+For applications that log with log4j2, it’s recommended to use the SocketAppender to send JSON to the Logstash TCP input. Alternatively, log4j2 can also log to a file for collection with FIlebeat. Usage of the log4j1 SocketAppender is not recommended.
+
+IoT devices like Raspberry Pis, smartphones, and connected vehicles often send telemetry data through one of these protocols.
+
+
+## Integrating with Messaging Queues [integrating-with-messaging-queues]
+
+If you are leveraging message queuing technologies as part of your existing infrastructure, getting that data into the Elastic Stack is easy. For existing users who are utilizing an external queuing layer like Redis or RabbitMQ just for data buffering with Logstash, it’s recommended to use Logstash persistent queues instead of an external queuing layer. This will help with overall ease of management by removing an unnecessary layer of complexity in your ingest architecture.
+
+For users who want to integrate data from existing Kafka deployments or require the underlying usage of ephemeral storage, Kafka can serve as a data hub where Beats can persist to and Logstash nodes can consume from.
+
+![deploy4](images/deploy4.png)
+
+The other TCP, UDP, and HTTP sources can persist to Kafka with Logstash as a conduit to achieve high availability in lieu of a load balancer. A group of Logstash nodes can then consume from topics with the [Kafka input](logstash-docs-md://lsr/plugins-inputs-kafka.md) to further transform and enrich the data in transit.
+
+
+### Resiliency and Recovery [_resiliency_and_recovery]
+
+When Logstash consumes from Kafka, persistent queues should be enabled and will add transport resiliency to mitigate the need for reprocessing during Logstash node failures. In this context, it’s recommended to use the default persistent queue disk allocation size `queue.max_bytes: 1GB`.
+
+If Kafka is configured to retain data for an extended period of time, data can be reprocessed from Kafka in the case of disaster recovery and reconciliation.
+
+
+### Other Messaging Queue Integrations [_other_messaging_queue_integrations]
+
+Although an additional queuing layer is not required, Logstash can consume from a myriad of other message queuing technologies like [RabbitMQ](logstash-docs-md://lsr/plugins-inputs-rabbitmq.md) and [Redis](logstash-docs-md://lsr/plugins-inputs-redis.md). It also supports ingestion from hosted queuing services like [Pub/Sub](logstash-docs-md://lsr/plugins-inputs-google_pubsub.md), [Kinesis](logstash-docs-md://lsr/plugins-inputs-kinesis.md), and [SQS](logstash-docs-md://lsr/plugins-inputs-sqs.md).
+
diff --git a/docs/reference/dir-layout.md b/docs/reference/dir-layout.md
new file mode 100644
index 000000000..be4c4eb85
--- /dev/null
+++ b/docs/reference/dir-layout.md
@@ -0,0 +1,59 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/dir-layout.html
+---
+
+# Logstash Directory Layout [dir-layout]
+
+This section describes the default directory structure that is created when you unpack the Logstash installation packages.
+
+## Directory Layout of `.zip` and `.tar.gz` Archives [zip-targz-layout]
+
+The `.zip` and `.tar.gz` packages are entirely self-contained. All files and directories are, by default, contained within the home directory — the directory created when unpacking the archive.
+
+This is very convenient because you don’t have to create any directories to start using Logstash, and uninstalling Logstash is as easy as removing the home directory.  However, it is advisable to change the default locations of the config and the logs directories so that you do not delete important data later on.
+
+| Type | Description | Default Location | Setting |
+| --- | --- | --- | --- |
+| home | Home directory of the Logstash installation. | ``{extract.path}`- Directory created by unpacking the archive` |  |
+| bin | Binary scripts, including `logstash` to start Logstash    and `logstash-plugin` to install plugins | ``{extract.path}/bin`` |  |
+| settings | Configuration files, including `logstash.yml` and `jvm.options` | ``{extract.path}/config`` | ``path.settings`` |
+| logs | Log files | ``{extract.path}/logs`` | ``path.logs`` |
+| plugins | Local, non Ruby-Gem plugin files. Each plugin is contained in a subdirectory. Recommended for development only. | ``{extract.path}/plugins`` | ``path.plugins`` |
+| data | Data files used by logstash and its plugins for any persistence needs. | ``{extract.path}/data`` | ``path.data`` |
+
+
+## Directory Layout of Debian and RPM Packages [deb-layout]
+
+The Debian package and the RPM package each place config files, logs, and the settings files in the appropriate locations for the system:
+
+| Type | Description | Default Location | Setting |
+| --- | --- | --- | --- |
+| home | Home directory of the Logstash installation. | ``/usr/share/logstash`` |  |
+| bin | Binary scripts including `logstash` to start Logstash    and `logstash-plugin` to install plugins | ``/usr/share/logstash/bin`` |  |
+| settings | Configuration files, including `logstash.yml` and `jvm.options` | ``/etc/logstash`` | ``path.settings`` |
+| conf | Logstash pipeline configuration files | ``/etc/logstash/conf.d/*.conf`` | `See `/etc/logstash/pipelines.yml`` |
+| logs | Log files | ``/var/log/logstash`` | ``path.logs`` |
+| plugins | Local, non Ruby-Gem plugin files. Each plugin is contained in a subdirectory. Recommended for development only. | ``/usr/share/logstash/plugins`` | ``path.plugins`` |
+| data | Data files used by logstash and its plugins for any persistence needs. | ``/var/lib/logstash`` | ``path.data`` |
+
+
+## Directory Layout of Docker Images [docker-layout]
+
+The Docker images are created from the `.tar.gz` packages, and follow a similar directory layout.
+
+| Type | Description | Default Location | Setting |
+| --- | --- | --- | --- |
+| home | Home directory of the Logstash installation. | ``/usr/share/logstash`` |  |
+| bin | Binary scripts, including `logstash` to start Logstash    and `logstash-plugin` to install plugins | ``/usr/share/logstash/bin`` |  |
+| settings | Configuration files, including `logstash.yml` and `jvm.options` | ``/usr/share/logstash/config`` | ``path.settings`` |
+| conf | Logstash pipeline configuration files | ``/usr/share/logstash/pipeline`` | ``path.config`` |
+| plugins | Local, non Ruby-Gem plugin files. Each plugin is contained in a subdirectory. Recommended for development only. | ``/usr/share/logstash/plugins`` | ``path.plugins`` |
+| data | Data files used by logstash and its plugins for any persistence needs. | ``/usr/share/logstash/data`` | ``path.data`` |
+
+::::{note}
+Logstash Docker containers do not create log files by default. They log to standard output.
+::::
+
+
+
diff --git a/docs/reference/docker-config.md b/docs/reference/docker-config.md
new file mode 100644
index 000000000..a481aed46
--- /dev/null
+++ b/docs/reference/docker-config.md
@@ -0,0 +1,130 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/docker-config.html
+---
+
+# Configuring Logstash for Docker [docker-config]
+
+Logstash differentiates between two types of configuration: [Settings and Pipeline Configuration](/reference/config-setting-files.md).
+
+## Pipeline Configuration [_pipeline_configuration]
+
+It is essential to place your pipeline configuration where it can be found by Logstash. By default, the container will look in `/usr/share/logstash/pipeline/` for pipeline configuration files.
+
+In this example we use a bind-mounted volume to provide the configuration via the `docker run` command:
+
+```sh
+docker run --rm -it -v ~/pipeline/:/usr/share/logstash/pipeline/ docker.elastic.co/logstash/logstash:9.0.0
+```
+
+Every file in the host directory `~/pipeline/` will then be parsed by Logstash as pipeline configuration.
+
+If you don’t provide configuration to Logstash, it will run with a minimal config that listens for messages from the [Beats input plugin](logstash-docs-md://lsr/plugins-inputs-beats.md) and echoes any that are received to `stdout`. In this case, the startup logs will be similar to the following:
+
+```text
+Sending Logstash logs to /usr/share/logstash/logs which is now configured via log4j2.properties.
+[2016-10-26T05:11:34,992][INFO ][logstash.inputs.beats    ] Beats inputs: Starting input listener {:address=>"0.0.0.0:5044"}
+[2016-10-26T05:11:35,068][INFO ][logstash.pipeline        ] Starting pipeline {"id"=>"main", "pipeline.workers"=>4, "pipeline.batch.size"=>125, "pipeline.batch.delay"=>5, "pipeline.max_inflight"=>500}
+[2016-10-26T05:11:35,078][INFO ][org.logstash.beats.Server] Starting server on port: 5044
+[2016-10-26T05:11:35,078][INFO ][logstash.pipeline        ] Pipeline main started
+[2016-10-26T05:11:35,105][INFO ][logstash.agent           ] Successfully started Logstash API endpoint {:port=>9600}
+```
+
+This is the default configuration for the image, defined in `/usr/share/logstash/pipeline/logstash.conf`.  If this is the behaviour that you are observing, ensure that your pipeline configuration is being picked up correctly, and that you are replacing either `logstash.conf` or the entire `pipeline` directory.
+
+
+## Settings [_settings]
+
+The image provides several methods for configuring settings. The conventional approach is to provide a custom `logstash.yml` file, but it’s also possible to use environment variables to define settings.
+
+### Bind-mounted settings files [docker-bind-mount-settings]
+
+Settings files can also be provided through bind-mounts. Logstash expects to find them at `/usr/share/logstash/config/`.
+
+It’s possible to provide an entire directory containing all needed files:
+
+```sh
+docker run --rm -it -v ~/settings/:/usr/share/logstash/config/ docker.elastic.co/logstash/logstash:9.0.0
+```
+
+Alternatively, a single file can be mounted:
+
+```sh
+docker run --rm -it -v ~/settings/logstash.yml:/usr/share/logstash/config/logstash.yml docker.elastic.co/logstash/logstash:9.0.0
+```
+
+::::{note}
+Bind-mounted configuration files will retain the same permissions and ownership within the container that they have on the host system. Be sure to set permissions such that the files will be readable and, ideally, not writeable by the container’s `logstash` user (UID 1000).
+::::
+
+
+
+### Custom Images [_custom_images]
+
+Bind-mounted configuration is not the only option, naturally. If you prefer the *Immutable Infrastructure* approach, you can prepare a custom image containing your configuration by using a `Dockerfile` like this one:
+
+```dockerfile
+FROM docker.elastic.co/logstash/logstash:9.0.0
+RUN rm -f /usr/share/logstash/pipeline/logstash.conf
+COPY pipeline/ /usr/share/logstash/pipeline/
+COPY config/ /usr/share/logstash/config/
+```
+
+Be sure to replace or delete `logstash.conf` in your custom image, so that you don’t retain the example config from the base image.
+
+
+### Environment variable configuration [docker-env-config]
+
+Under Docker, Logstash settings can be configured via environment variables. When the container starts, a helper process checks the environment for variables that can be mapped to Logstash settings. Settings that are found in the environment override those in the `logstash.yml` as the container starts up.
+
+For compatibility with container orchestration systems, these environment variables are written in all capitals, with underscores as word separators.
+
+Some example translations are shown here:
+
+**Environment Variable**
+:   **Logstash Setting**
+
+`PIPELINE_WORKERS`
+:   `pipeline.workers`
+
+`LOG_LEVEL`
+:   `log.level`
+
+`MONITORING_ENABLED`
+:   `monitoring.enabled`
+
+In general, any setting listed in the [settings documentation](/reference/logstash-settings-file.md) can be configured with this technique.
+
+::::{note}
+Defining settings with environment variables causes `logstash.yml` to be modified in place. This behaviour is likely undesirable if `logstash.yml` was bind-mounted from the host system. Thus, it is not recommended to combine the bind-mount technique with the environment variable technique. It is best to choose a single method for defining Logstash settings.
+::::
+
+
+
+
+## Docker defaults [_docker_defaults]
+
+The following settings have different default values when using the Docker images:
+
+`api.http.host`
+:   `0.0.0.0`
+
+`monitoring.elasticsearch.hosts`
+:   `http://elasticsearch:9200`
+
+::::{note}
+The setting `monitoring.elasticsearch.hosts` is not defined in the `-oss` image.
+::::
+
+
+These settings are defined in the default `logstash.yml`. They can be overridden with a [custom `logstash.yml`](#docker-bind-mount-settings) or via [environment variables](#docker-env-config).
+
+::::{important}
+If replacing `logstash.yml` with a custom version, be sure to copy the above defaults to the custom file if you want to retain them. If not, they will be "masked" by the new file.
+::::
+
+
+
+## Logging Configuration [_logging_configuration]
+
+Under Docker, Logstash logs go to standard output by default. To change this behaviour, use any of the techniques above to replace the file at `/usr/share/logstash/config/log4j2.properties`.
diff --git a/docs/reference/docker.md b/docs/reference/docker.md
new file mode 100644
index 000000000..d5b713a59
--- /dev/null
+++ b/docs/reference/docker.md
@@ -0,0 +1,55 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/docker.html
+---
+
+# Running Logstash on Docker [docker]
+
+Docker images for Logstash are available from the Elastic Docker registry. The base image is [Red Hat Universal Base Image 9 Minimal](https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/61832888c0d15aff4912fe0d).
+
+A list of all published Docker images and tags is available at [www.docker.elastic.co](https://www.docker.elastic.co). The source code is in [GitHub](https://github.com/elastic/logstash/tree/master).
+
+These images are free to use under the Elastic license. They contain open source and free commercial features and access to paid commercial features. [Start a 30-day trial](docs-content://deploy-manage/license/manage-your-license-in-self-managed-cluster.md) to try out all of the paid commercial features. See the [Subscriptions](https://www.elastic.co/subscriptions) page for information about Elastic license levels.
+
+## Pulling the image [_pulling_the_image]
+
+Obtaining Logstash for Docker is as simple as issuing a `docker
+pull` command against the Elastic Docker registry.
+
+
+```sh subs=true
+docker pull {{docker-repo}}:{{stack-version}}
+```
+
+Alternatively, you can download other Docker images that contain only features
+available under the Apache 2.0 license. To download the images, go to 
+[www.docker.elastic.co](https://www.docker.elastic.co). 
+
+
+## Verifying the image [_verifying_the_image]
+
+Although it's optional, we highly recommend verifying the signatures included with your downloaded Docker images to ensure that the images are valid.
+
+Elastic images are signed with [Cosign](https://docs.sigstore.dev/cosign/) which is part of the [Sigstore](https://www.sigstore.dev/) project. 
+Cosign supports container signing, verification, and storage in an OCI registry. 
+Install the appropriate Cosign application for your operating system.
+
+Run the following commands to verify the container image signature for {{ls}} v{{stack-version}}:
+
+```sh subs=true
+wget https://artifacts.elastic.co/cosign.pub <1>
+cosign verify --key cosign.pub {{docker-repo}}:{{stack-version}} <2>
+```
+
+1. Download the Elastic public key to verify container signature
+2. Verify the container against the Elastic public key
+
+The command prints the check results and the signature payload in JSON format, for example:
+
+```sh subs=true
+Verification for {{docker-repo}}:{{stack-version}} --
+The following checks were performed on each of these signatures:
+  - The cosign claims were validated
+  - Existence of the claims in the transparency log was verified offline
+  - The signatures were verified against the specified public key
+```
diff --git a/docs/reference/ecs-ls.md b/docs/reference/ecs-ls.md
new file mode 100644
index 000000000..c19a5f65d
--- /dev/null
+++ b/docs/reference/ecs-ls.md
@@ -0,0 +1,78 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/ecs-ls.html
+---
+
+# ECS in Logstash [ecs-ls]
+
+The [Elastic Common Schema (ECS)](ecs://reference/index.md) is an open source specification, developed with support from the Elastic user community. ECS defines a common set of fields to be used for storing event data, such as logs and metrics, in {{es}}. With ECS, users can normalize event data to better analyze, visualize, and correlate the data represented in their events.
+
+## ECS compatibility [ecs-compatibility]
+
+Many plugins implement an ECS-compatibility mode, which causes them to produce and manipulate events in a manner that is compatible with the Elastic Common Schema (ECS).
+
+Any plugin that supports this mode will also have an `ecs_compatibility` option, which allows you to configure which mode the individual plugin instance should operate in. If left unspecified for an individual plugin, the pipeline’s `pipeline.ecs_compatibility` setting will be observed. This allows you to configure plugins to use a specific version of ECS or to use their legacy non-ECS behavior.
+
+ECS compatibility modes do not prevent you from explicitly configuring a plugin in a manner that conflicts with ECS. Instead, they ensure that *implicit* configuration avoids conflicts.
+
+### Configuring ECS [ecs-configuration]
+
+In {{ls}} 8, all plugins are run in ECS compatibility v8 mode by default, but you can opt out at the plugin, pipeline, or system level to maintain legacy behavior. This can be helpful if you have very complex pipelines that were defined pre-ECS, to allow you to either upgrade them or to avoid doing so independently of your {{ls}} 8.x upgrade.
+
+#### Specific plugin instance [_specific_plugin_instance]
+
+Use a plugin’s `ecs_compatibility` option to override the default value on the plugin instance.
+
+For example, if you want a specific instance of the GeoIP Filter to behave without ECS compatibility, you can adjust its definition in your pipeline without affecting any other plugin instances.
+
+```text
+filter {
+  geoip {
+    source => "[host][ip]"
+    ecs_compatibility => disabled
+  }
+}
+```
+
+Alternatively, if you had a UDP input with a CEF codec, and wanted both to use an ECS mode while still running {{ls}} 7, you can adjust their definitions to specify the major version of ECS to use.
+
+```text
+input {
+  udp {
+    port => 1234
+    ecs_compatibility => v8
+    codec => cef {
+      ecs_compatibility => v8
+    }
+  }
+}
+```
+
+
+#### All plugins in a given pipeline [ecs-configuration-pipeline]
+
+If you wish to provide a specific default value for `ecs_compatibility` to *all* plugins in a pipeline, you can do so with the `pipeline.ecs_compatibility` setting in your pipeline definition in `config/pipelines.yml` or Central Management. This setting will be used unless overridden by a specific plugin instance. If unspecified for an individual pipeline, the global value will be used.
+
+For example, setting `pipeline.ecs_compatibility: disabled` for a pipeline *locks in* that pipeline’s pre-{{ls}} 8 behavior.
+
+```yaml
+- pipeline.id: my-legacy-pipeline
+  path.config: "/etc/path/to/legacy-pipeline.config"
+  pipeline.ecs_compatibility: disabled
+- pipeline.id: my-ecs-pipeline
+  path.config: "/etc/path/to/ecs-pipeline.config"
+  pipeline.ecs_compatibility: v8
+```
+
+
+#### All plugins in all pipelines [ecs-configuration-all]
+
+Similarly, you can set the default value for the whole {{ls}} process by setting the `pipeline.ecs_compatibility` value in `config/logstash.yml`.
+
+```yaml
+pipeline.ecs_compatibility: disabled
+```
+
+
+
+
diff --git a/docs/reference/environment-variables.md b/docs/reference/environment-variables.md
new file mode 100644
index 000000000..9fc8d8cdc
--- /dev/null
+++ b/docs/reference/environment-variables.md
@@ -0,0 +1,140 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/environment-variables.html
+---
+
+# Using environment variables [environment-variables]
+
+## Overview [_overview]
+
+* You can set environment variable references in the configuration for Logstash plugins by using `${var}`.
+* At Logstash startup, each reference is replaced by the value of the environment variable.
+* The replacement is case-sensitive.
+* References to undefined variables raise a Logstash configuration error.
+* You can give a default value by using the form `${var:default value}`. Logstash uses the default value if the environment variable is undefined.
+* You can add environment variable references in any plugin option type: string, number, boolean, array, or hash.
+* Environment variables for list-type URI parameters can support lists of space-delimited values. Currently, other non-URI based options do not support lists of values. See [Cross-plugin concepts and features](/reference/plugin-concepts.md)
+* Environment variables are immutable. If you update the environment variable, you’ll have to restart Logstash to pick up the updated value.
+* References to environment variables in `config.string` comments are evaluated during configuration parsing, and are therefore discouraged. Remove the `$` sign to avoid pipeline loading failures.
+
+
+## Examples [_examples]
+
+These examples show you how to use environment variables to set the values of some commonly used configuration options.
+
+### Setting the TCP port [_setting_the_tcp_port]
+
+Here’s an example that uses an environment variable to set the TCP port:
+
+```ruby
+input {
+  tcp {
+    port => "${TCP_PORT}"
+  }
+}
+```
+
+Now let’s set the value of `TCP_PORT`:
+
+```shell
+export TCP_PORT=12345
+```
+
+At startup, Logstash uses this configuration:
+
+```ruby
+input {
+  tcp {
+    port => 12345
+  }
+}
+```
+
+If the `TCP_PORT` environment variable is not set, Logstash returns a configuration error.
+
+You can fix this problem by specifying a default value:
+
+```ruby
+input {
+  tcp {
+    port => "${TCP_PORT:54321}"
+  }
+}
+```
+
+Now, instead of returning a configuration error if the variable is undefined, Logstash uses the default:
+
+```ruby
+input {
+  tcp {
+    port => 54321
+  }
+}
+```
+
+If the environment variable is defined, Logstash uses the value specified for the variable instead of the default.
+
+
+### Setting the value of a tag [_setting_the_value_of_a_tag]
+
+Here’s an example that uses an environment variable to set the value of a tag:
+
+```ruby
+filter {
+  mutate {
+    add_tag => [ "tag1", "${ENV_TAG}" ]
+  }
+}
+```
+
+Let’s set the value of `ENV_TAG`:
+
+```shell
+export ENV_TAG="tag2"
+```
+
+At startup, Logstash uses this configuration:
+
+```ruby
+filter {
+  mutate {
+    add_tag => [ "tag1", "tag2" ]
+  }
+}
+```
+
+
+### Setting a file path [_setting_a_file_path]
+
+Here’s an example that uses an environment variable to set the path to a log file:
+
+```ruby
+filter {
+  mutate {
+    add_field => {
+      "my_path" => "${HOME}/file.log"
+    }
+  }
+}
+```
+
+Let’s set the value of `HOME`:
+
+```shell
+export HOME="/path"
+```
+
+At startup, Logstash uses the following configuration:
+
+```ruby
+filter {
+  mutate {
+    add_field => {
+      "my_path" => "/path/file.log"
+    }
+  }
+}
+```
+
+
+
diff --git a/docs/reference/event-api.md b/docs/reference/event-api.md
new file mode 100644
index 000000000..38bfbd699
--- /dev/null
+++ b/docs/reference/event-api.md
@@ -0,0 +1,105 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/event-api.html
+---
+
+# Event API [event-api]
+
+This section is targeted for plugin developers and users of Logstash’s Ruby filter. Below we document recent changes (starting with version 5.0) in the way users have been accessing Logstash’s event based data in custom plugins and in the Ruby filter. Note that [Accessing event data and fields](/reference/event-dependent-configuration.md) data flow in Logstash’s config files — using [Field references](/reference/event-dependent-configuration.md#logstash-config-field-references) — is not affected by this change, and will continue to use existing syntax.
+
+
+## Event Object [_event_object]
+
+Event is the main object that encapsulates data flow internally in Logstash and provides an API for the plugin developers to interact with the event’s content. Typically, this API is used in plugins and in a Ruby filter to retrieve data and use it for transformations. Event object contains the original data sent to Logstash and any additional fields created during Logstash’s filter stages.
+
+In 5.0, we’ve re-implemented the Event class and its supporting classes in pure Java. Since Event is a critical component in data processing,  a rewrite in Java improves performance and provides efficient serialization when storing data on disk. For the most part, this change aims at keeping backward compatibility and is transparent to the users. To this extent we’ve updated and published most of the plugins in Logstash’s ecosystem to adhere to the new API changes. However, if you are maintaining a custom plugin, or have a Ruby filter, this change will affect you. The aim of this guide is to describe the new API and provide examples to migrate to the new changes.
+
+
+## Event API [_event_api]
+
+Prior to version 5.0, developers could access and manipulate event data by directly using Ruby hash syntax. For example, `event[field] = foo`. While this is powerful, our goal is to abstract the internal implementation details and provide well-defined getter and setter APIs.
+
+**Get API**
+
+The getter is a read-only access of field-based data in an Event.
+
+**Syntax:** `event.get(field)`
+
+**Returns:** Value for this field or nil if the field does not exist. Returned values could be a string, numeric or timestamp scalar value.
+
+`field` is a structured field sent to Logstash or created after the transformation process. `field` can also be a nested [field reference](https://www.elastic.co/guide/en/logstash/current/field-references-deepdive.html) such as `[field][bar]`.
+
+Examples:
+
+```ruby
+event.get("foo" ) # => "baz"
+event.get("[foo]") # => "zab"
+event.get("[foo][bar]") # => 1
+event.get("[foo][bar]") # => 1.0
+event.get("[foo][bar]") # =>  [1, 2, 3]
+event.get("[foo][bar]") # => {"a" => 1, "b" => 2}
+event.get("[foo][bar]") # =>  {"a" => 1, "b" => 2, "c" => [1, 2]}
+```
+
+Accessing @metadata
+
+```ruby
+event.get("[@metadata][foo]") # => "baz"
+```
+
+**Set API**
+
+This API can be used to mutate data in an Event.
+
+**Syntax:** `event.set(field, value)`
+
+**Returns:**  The current Event  after the mutation, which can be used for chainable calls.
+
+Examples:
+
+```ruby
+event.set("foo", "baz")
+event.set("[foo]", "zab")
+event.set("[foo][bar]", 1)
+event.set("[foo][bar]", 1.0)
+event.set("[foo][bar]", [1, 2, 3])
+event.set("[foo][bar]", {"a" => 1, "b" => 2})
+event.set("[foo][bar]", {"a" => 1, "b" => 2, "c" => [1, 2]})
+event.set("[@metadata][foo]", "baz")
+```
+
+Mutating a collection after setting it in the Event has an undefined behaviour and is not allowed.
+
+```ruby
+h = {"a" => 1, "b" => 2, "c" => [1, 2]}
+event.set("[foo][bar]", h)
+
+h["c"] = [3, 4]
+event.get("[foo][bar][c]") # => undefined
+
+Suggested way of mutating collections:
+
+h = {"a" => 1, "b" => 2, "c" => [1, 2]}
+event.set("[foo][bar]", h)
+
+h["c"] = [3, 4]
+event.set("[foo][bar]", h)
+
+# Alternatively,
+event.set("[foo][bar][c]", [3, 4])
+```
+
+
+## Ruby Filter [_ruby_filter]
+
+The [Ruby Filter](logstash-docs-md://lsr/plugins-filters-ruby.md) can be used to execute any ruby code and manipulate event data using the API described above. For example, using the new API:
+
+```ruby
+filter {
+  ruby {
+    code => 'event.set("lowercase_field", event.get("message").downcase)'
+  }
+}
+```
+
+This filter will lowercase the `message` field, and set it to a new field called `lowercase_field`
diff --git a/docs/reference/event-dependent-configuration.md b/docs/reference/event-dependent-configuration.md
new file mode 100644
index 000000000..9635bc8ff
--- /dev/null
+++ b/docs/reference/event-dependent-configuration.md
@@ -0,0 +1,517 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/event-dependent-configuration.html
+  - https://www.elastic.co/guide/en/logstash/current/field-references-deepdive.html
+---
+
+# Accessing event data and fields [event-dependent-configuration]
+
+A Logstash pipeline usually has three stages: inputs → filters → outputs. Inputs generate events, filters modify them, and outputs ship them elsewhere.
+
+All events have properties.
+For example, an Apache access log has properties like status code (200, 404), request path ("/", "index.html"), HTTP verb (GET, POST), client IP address, and so forth.
+Logstash calls these properties "fields."
+
+Event and data field types:
+- [Field references](#logstash-config-field-references)
+- [Sprintf format](#sprintf)
+- [Conditionals](#conditionals)
+
+
+::::{important}
+Some configuration options in Logstash require the existence of fields in order to function. Because inputs generate events, there are no fields to evaluate within the input block—​they do not exist yet!
+
+[Field references](#logstash-config-field-references), [sprintf format](#sprintf), and [conditionals](#conditionals) do not work in input blocks.
+These configuration options depend on events and fields, and therefore, work only within filter and output blocks.
+::::
+
+
+
+## Field references [logstash-config-field-references]
+
+When you need to refer to a field by name, you can use the Logstash [field reference syntax](https://www.elastic.co/guide/en/logstash/current/field-references-deepdive.html).
+
+The basic syntax to access a field is `[fieldname]`.
+If you are referring to a **top-level field**, you can omit the `[]` and use `fieldname`. To refer to a **nested field**, specify the full path to that field: `[top-level field][nested field]`.
+
+For example, this event has five top-level fields (agent, ip, request, response, ua) and three nested fields (status, bytes, os).
+
+```
+{
+  "agent": "Mozilla/5.0 (compatible; MSIE 9.0)",
+  "ip": "192.168.24.44",
+  "request": "/index.html"
+  "response": {
+    "status": 200,
+    "bytes": 52353
+  },
+  "ua": {
+    "os": "Windows 7"
+  }
+}
+```
+
+To reference the `os` field, specify `[ua][os]`. 
+To reference a top-level field such as `request`, specify the field name.
+
+
+### Why use field references? [field-reference-deep-dive]
+
+You might find situations in which you need to refer to a field or collection of fields by name. 
+You can accomplish this goal using the Logstash field reference syntax.
+
+The syntax to access a field specifies the entire path to the field, with each fragment wrapped in square brackets.
+When a field name contains square brackets, the brackets must be properly [ escaped](#formal-grammar-escape-sequences).
+
+Field references can be expressed literally within [conditional statements](#conditionals) in your pipeline configurations,
+as string arguments to your pipeline plugins, or within sprintf statements that will be used by your pipeline plugins:
+
+```
+filter {
+  #  +----literal----+     +----literal----+
+  #  |               |     |               |
+  if [@metadata][date] and [@metadata][time] {
+    mutate {
+      add_field {
+        "[@metadata][timestamp]" => "%{[@metadata][date]} %{[@metadata][time]}"
+      # |                      |    |  |               |    |               | |
+      # +----string-argument---+    |  +--field-ref----+    +--field-ref----+ |
+      #                             +-------- sprintf format string ----------+
+      }
+    }
+  }
+}
+```
+
+
+### Formal grammar [formal-grammar]
+
+Expand the section below if you would like to explore the formal grammar.
+
+::::{dropdown} Deep Dive: Formal grammar for field references 
+:name: formal grammar
+
+#### Field Reference Literal [formal-grammar-field-reference-literal]
+
+A _Field Reference Literal_ is a sequence of one or more _Path Fragments_ that can be used directly in Logstash pipeline [conditionals](#conditionals)  without any additional quoting.
+Example: `[request]`, `[response][status]`).
+
+```
+fieldReferenceLiteral
+  : ( pathFragment )+
+  ;
+```
+
+#### Field Reference (Event APIs) [formal-grammar-field-reference]
+
+The Event API's methods for manipulating the fields of an event or using the sprintf syntax are more flexible than the pipeline grammar in what they accept as a Field Reference.
+Top-level fields can be referenced directly by their _Field Name_ without the square brackets, and there is some support for _Composite Field References_, simplifying use of programmatically-generated Field References.
+
+A _Field Reference_ for use with the Event API is therefore one of:
+
+ - a single _Field Reference Literal_; OR
+ - a single _Field Name_ (referencing a top-level field); OR
+ - a single _Composite Field Reference_.
+
+```
+eventApiFieldReference
+  : fieldReferenceLiteral
+  | fieldName
+  | compositeFieldReference
+  ;
+```
+
+#### Path Fragment [formal-grammar-path-fragment]
+
+A _Path Fragment_ is a _Field Name_ wrapped in square brackets, such as `[request]`).
+
+```
+pathFragment
+  : '[' fieldName ']'
+  ;
+```
+
+#### Field Name [formal-grammar-field-name]
+
+A _Field Name_ is a sequence of characters that are _not_ square brackets (`[` or `]`).
+
+```
+fieldName
+  : ( ~( '[' | ']' ) )+
+  ;
+```
+
+#### Composite Field Reference [formal-grammar-event-api-composite-field-reference]
+
+In some cases, you may need to programmatically _compose_ a Field Reference from one or more Field References,
+such as when manipulating fields in a plugin or when using the Ruby Filter plugin and the Event API.
+
+```
+    fieldReference = "[path][to][deep nested field]"
+    compositeFieldReference = "[@metadata][#{fieldReference}][size]"
+    # => "[@metadata][[path][to][deep nested field]][size]"
+```
+
+##### Canonical Representations of Composite Field References [canonical-representations]
+
+| Acceptable _composite field reference_ | Canonical _field reference_ representation | 
+| ------------- | ------------- |
+| `[[deep][nesting]][field]`           | `[deep][nesting][field]`
+| `[foo][[bar]][bingo]`                | `[foo][bar][bingo]`
+| `[[ok]]`                             | `[ok]`
+
+
+A _Composite Field Reference_ is a sequence of one or more _Path Fragments_ or _Embedded Field References_.
+
+```
+compositeFieldReference
+  : ( pathFragment | embeddedFieldReference )+
+  ;
+```
+
+_Composite Field References_ are supported by the Event API, but are _not_ supported as literals in the Pipeline Configuration.
+
+
+#### Embedded Field Reference [formal-grammar-event-api-embedded-field-reference]
+
+```
+embeddedFieldReference
+  : '[' fieldReference ']'
+  ;
+```
+
+An _Embedded Field Reference_ is a _Field Reference_ that is itself wrapped in square brackets (`[` and `]`), and can be a component of a _Composite Field Reference_.
+::::
+
+### Escape sequences [formal-grammar-escape-sequences]
+
+For {{ls}} to reference a field whose name contains a character that has special meaning in the field reference grammar, the character must be escaped.
+Logstash can be globally configured to use one of two field reference escape modes:
+
+ - `none` (default): no escape sequence processing is done. Fields containing literal square brackets cannot be referenced by the Event API.
+ - `percent`: URI-style percent encoding of UTF-8 bytes. The left square bracket (`[`) is expressed as `%5B`, and the right square bracket (`]`) is expressed as `%5D`.
+ - `ampersand`: HTML-style ampersand encoding (`&#` + decimal unicode codepoint + `;`). The left square bracket (`[`) is expressed as `&#91;`, and the right square bracket (`]`) is expressed as `&#93;`.
+
+
+## sprintf format [sprintf]
+
+The field reference format is also used in what Logstash calls *sprintf format*. This format enables you to embed field values in other strings. For example, the statsd output has an *increment* setting that enables you to keep a count of apache logs by status code:
+
+```js
+output {
+  statsd {
+    increment => "apache.%{[response][status]}"
+  }
+}
+```
+
+Similarly, you can convert the UTC timestamp in the `@timestamp` field into a string.
+
+Instead of specifying a field name inside the curly braces, use the `%{{FORMAT}}` syntax where `FORMAT` is a [java time format](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/time/format/DateTimeFormatter.html#patterns).
+
+For example, if you want to use the file output to write logs based on the event’s UTC date and hour and the `type` field:
+
+```
+output {
+  file {
+    path => "/var/log/%{type}.%{{yyyy.MM.dd.HH}}"
+  }
+}
+```
+
+::::{note}
+* The sprintf format continues to support [deprecated joda time format](http://joda-time.sourceforge.net/apidocs/org/joda/time/format/DateTimeFormat.html) strings as well using the `%{+FORMAT}` syntax. These formats are not directly interchangeable, and we advise you to begin using the more modern Java Time format.
+* A Logstash timestamp represents an instant on the UTC-timeline, so using sprintf formatters will produce results that may not align with your machine-local timezone.
+::::
+
+You can generate a fresh timestamp by using `%{{TIME_NOW}}` syntax instead of relying on the value in `@timestamp`. This is particularly useful when you need to estimate the time span of each plugin.
+
+```js
+input {
+  heartbeat {
+    add_field => { "heartbeat_time" => "%{{TIME_NOW}}" }
+  }
+}
+filter {
+  mutate {
+    add_field => { "mutate_time" => "%{{TIME_NOW}}" }
+  }
+}
+```
+
+
+## Conditionals [conditionals]
+
+Sometimes you want to filter or output an event only under certain conditions. For that, you can use a conditional.
+
+Conditionals in Logstash look and act the same way they do in programming languages. Conditionals support `if`, `else if` and `else` statements and can be nested.
+
+The conditional syntax is:
+
+```js
+if EXPRESSION {
+  ...
+} else if EXPRESSION {
+  ...
+} else {
+  ...
+}
+```
+
+What’s an expression? Comparison tests, boolean logic, and so on!
+
+You can use these comparison operators:
+
+* equality: `==`,  `!=`,  `<`,  `>`,  `<=`, `>=`
+* regexp: `=~`, `!~` (checks a pattern on the right against a string value on the left)
+* inclusion: `in`, `not in`
+
+Supported boolean operators are:
+
+* `and`, `or`, `nand`, `xor`
+
+Supported unary operators are:
+
+* `!`
+
+Expressions can be long and complex. Expressions can contain other expressions, you can negate expressions with `!`, and you can group them with parentheses `(...)`.
+
+For example, this conditional uses the mutate filter to remove the field `secret` if the field `action` has a value of `login`:
+
+```js
+filter {
+  if [action] == "login" {
+    mutate { remove_field => "secret" }
+  }
+}
+```
+
+If an expression generates an error when it is evaluated, event processing stops and a warning message is written to the log. For example, comparing integer value `100` with string value `"100"` cannot be evaluated with certainty, and so processing stops and the error is logged.
+
+To capture the full content of the message at the time the error occurs, set the log level to `debug`. Check out [Logging](/reference/logging.md) for more information about how to configure logging and available log levels.
+
+You can specify multiple expressions in a single condition:
+
+```js
+output {
+  # Send production errors to pagerduty
+  if [loglevel] == "ERROR" and [deployment] == "production" {
+    pagerduty {
+    ...
+    }
+  }
+}
+```
+
+You can use the `in` operator to test whether a field contains a specific string, key, or list element. Note that the semantic meaning of `in` can vary, based on the target type. For example, when applied to a string. `in` means "is a substring of". When applied to a collection type, `in` means "collection contains the exact value".
+
+```js
+filter {
+  if [foo] in [foobar] {
+    mutate { add_tag => "field in field" }
+  }
+  if [foo] in "foo" {
+    mutate { add_tag => "field in string" }
+  }
+  if "hello" in [greeting] {
+    mutate { add_tag => "string in field" }
+  }
+  if [foo] in ["hello", "world", "foo"] {
+    mutate { add_tag => "field in list" }
+  }
+  if [missing] in [alsomissing] {
+    mutate { add_tag => "shouldnotexist" }
+  }
+  if !("foo" in ["hello", "world"]) {
+    mutate { add_tag => "shouldexist" }
+  }
+}
+```
+
+You use the `not in` conditional the same way. For example, you could use `not in` to only route events to Elasticsearch when `grok` is successful:
+
+```js
+output {
+  if "_grokparsefailure" not in [tags] {
+    elasticsearch { ... }
+  }
+}
+```
+
+You can check for the existence of a specific field, but there’s currently no way to differentiate between a field that doesn’t exist versus a field that’s simply false. 
+The expression `if [foo]` returns `false` when:
+
+* `[foo]` doesn’t exist in the event,
+* `[foo]` exists in the event, but is false, or
+* `[foo]` exists in the event, but is null
+
+For more complex examples, see [Using Conditionals](/reference/config-examples.md#using-conditionals).
+
+::::{note}
+Sprintf date/time format in conditionals is not currently supported. 
+A workaround using the `@metadata` field is available. 
+See [sprintf date/time format in conditionals](#date-time) for more details and an example.
+::::
+
+
+
+## The @metadata field [metadata]
+
+In Logstash, there is a special field called `@metadata`.  The contents of `@metadata` are not part of any of your events at output time, which makes it great to use for conditionals, or extending and building event fields with field reference and `sprintf` formatting.
+
+This configuration file yields events from STDIN.  Whatever you type becomes the `message` field in the event.  The `mutate` events in the filter block add a few fields, some nested in the `@metadata` field.
+
+```ruby
+input { stdin { } }
+
+filter {
+  mutate { add_field => { "show" => "This data will be in the output" } }
+  mutate { add_field => { "[@metadata][test]" => "Hello" } }
+  mutate { add_field => { "[@metadata][no_show]" => "This data will not be in the output" } }
+}
+
+output {
+  if [@metadata][test] == "Hello" {
+    stdout { codec => rubydebug }
+  }
+}
+```
+
+Let’s see what comes out:
+
+```ruby
+$ bin/logstash -f ../test.conf
+Pipeline main started
+asdf
+{
+    "@timestamp" => 2016-06-30T02:42:51.496Z,
+      "@version" => "1",
+          "host" => "example.com",
+          "show" => "This data will be in the output",
+       "message" => "asdf"
+}
+```
+
+The "asdf" typed in became the `message` field contents, and the conditional successfully evaluated the contents of the `test` field nested within the `@metadata` field.  But the output did not show a field called `@metadata`, or its contents.
+
+The `rubydebug` codec allows you to reveal the contents of the `@metadata` field if you add a config flag, `metadata => true`:
+
+```ruby
+    stdout { codec => rubydebug { metadata => true } }
+```
+
+Let’s see what the output looks like with this change:
+
+```ruby
+$ bin/logstash -f ../test.conf
+Pipeline main started
+asdf
+{
+    "@timestamp" => 2016-06-30T02:46:48.565Z,
+     "@metadata" => {
+           "test" => "Hello",
+        "no_show" => "This data will not be in the output"
+    },
+      "@version" => "1",
+          "host" => "example.com",
+          "show" => "This data will be in the output",
+       "message" => "asdf"
+}
+```
+
+Now you can see the `@metadata` field and its sub-fields.
+
+::::{important}
+Only the `rubydebug` codec allows you to show the contents of the `@metadata` field.
+::::
+
+
+Make use of the `@metadata` field any time you need a temporary field but do not want it to be in the final output.
+
+Perhaps one of the most common use cases for this new field is with the `date` filter and having a temporary timestamp.
+
+This configuration file has been simplified, but uses the timestamp format common to Apache and Nginx web servers.  In the past, you’d have to delete the timestamp field yourself, after using it to overwrite the `@timestamp` field.  With the `@metadata` field, this is no longer necessary:
+
+```ruby
+input { stdin { } }
+
+filter {
+  grok { match => [ "message", "%{HTTPDATE:[@metadata][timestamp]}" ] }
+  date { match => [ "[@metadata][timestamp]", "dd/MMM/yyyy:HH:mm:ss Z" ] }
+}
+
+output {
+  stdout { codec => rubydebug }
+}
+```
+
+Notice that this configuration puts the extracted date into the `[@metadata][timestamp]` field in the `grok` filter.  Let’s feed this configuration a sample date string and see what comes out:
+
+```ruby
+$ bin/logstash -f ../test.conf
+Pipeline main started
+02/Mar/2014:15:36:43 +0100
+{
+    "@timestamp" => 2014-03-02T14:36:43.000Z,
+      "@version" => "1",
+          "host" => "example.com",
+       "message" => "02/Mar/2014:15:36:43 +0100"
+}
+```
+
+That’s it!  No extra fields in the output, and a cleaner config file because you do not have to delete a "timestamp" field after conversion in the `date` filter.
+
+Another use case is the [CouchDB Changes input plugin](https://github.com/logstash-plugins/logstash-input-couchdb_changes). This plugin automatically captures CouchDB document field metadata into the `@metadata` field within the input plugin itself.  When the events pass through to be indexed by Elasticsearch, the Elasticsearch output plugin allows you to specify the `action` (delete, update, insert, etc.) and the `document_id`, like this:
+
+```ruby
+output {
+  elasticsearch {
+    action => "%{[@metadata][action]}"
+    document_id => "%{[@metadata][_id]}"
+    hosts => ["example.com"]
+    index => "index_name"
+    protocol => "http"
+  }
+}
+```
+
+
+### sprintf date/time format in conditionals [date-time]
+
+Sprintf date/time format in conditionals is not currently supported, but a workaround is available. Put the date calculation in a field so that you can use the field reference in a conditional.
+
+**Example**
+
+Using sprintf time format directly to add a field based on ingestion time *will not work*:
+
+```
+----------
+# non-working example
+filter{
+  if "%{+HH}:%{+mm}" < "16:30" {
+    mutate {
+      add_field => { "string_compare" => "%{+HH}:%{+mm} is before 16:30" }
+    }
+  }
+}
+----------
+```
+
+This workaround gives you the intended results:
+
+```js
+filter {
+  mutate{
+     add_field => {
+      "[@metadata][time]" => "%{+HH}:%{+mm}"
+     }
+  }
+  if [@metadata][time] < "16:30" {
+    mutate {
+      add_field => {
+        "string_compare" => "%{+HH}:%{+mm} is before 16:30"
+      }
+    }
+  }
+}
+```
diff --git a/docs/reference/execution-model.md b/docs/reference/execution-model.md
new file mode 100644
index 000000000..a56d2ba6c
--- /dev/null
+++ b/docs/reference/execution-model.md
@@ -0,0 +1,13 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/execution-model.html
+---
+
+# Execution Model [execution-model]
+
+The Logstash event processing pipeline coordinates the execution of inputs, filters, and outputs.
+
+Each input stage in the Logstash pipeline runs in its own thread. Inputs write events to a central queue that is either in memory (default) or on disk. Each pipeline worker thread takes a batch of events off this queue, runs the batch of events through the configured filters, and then runs the filtered events through any outputs. The size of the batch and number of pipeline worker threads are configurable (see [Tuning and profiling logstash pipeline performance](/reference/tuning-logstash.md)).
+
+By default, Logstash uses in-memory bounded queues between pipeline stages (input → filter and filter → output) to buffer events. If Logstash terminates unsafely, any events that are stored in memory will be lost. To help prevent data loss, you can enable Logstash to persist in-flight events to disk. See [Persistent queues (PQ)](/reference/persistent-queues.md) for more information.
+
diff --git a/docs/reference/field-extraction.md b/docs/reference/field-extraction.md
new file mode 100644
index 000000000..70c6840ca
--- /dev/null
+++ b/docs/reference/field-extraction.md
@@ -0,0 +1,102 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/field-extraction.html
+---
+
+# Extracting Fields and Wrangling Data [field-extraction]
+
+The plugins described in this section are useful for extracting fields and parsing unstructured data into fields.
+
+[dissect filter](logstash-docs-md://lsr/plugins-filters-dissect.md)
+:   Extracts unstructured event data into fields by using delimiters. The dissect filter does not use regular expressions and is very fast. However, if the structure of the data varies from line to line, the grok filter is more suitable.
+
+    For example, let’s say you have a log that contains the following message:
+
+    ```json
+    Apr 26 12:20:02 localhost systemd[1]: Starting system activity accounting tool...
+    ```
+
+    The following config dissects the message:
+
+    ```json
+    filter {
+      dissect {
+        mapping => { "message" => "%{ts} %{+ts} %{+ts} %{src} %{prog}[%{pid}]: %{msg}" }
+      }
+    }
+    ```
+
+    After the dissect filter is applied, the event will be dissected into the following fields:
+
+    ```json
+    {
+      "msg"        => "Starting system activity accounting tool...",
+      "@timestamp" => 2017-04-26T19:33:39.257Z,
+      "src"        => "localhost",
+      "@version"   => "1",
+      "host"       => "localhost.localdomain",
+      "pid"        => "1",
+      "message"    => "Apr 26 12:20:02 localhost systemd[1]: Starting system activity accounting tool...",
+      "type"       => "stdin",
+      "prog"       => "systemd",
+      "ts"         => "Apr 26 12:20:02"
+    }
+    ```
+
+
+[kv filter](logstash-docs-md://lsr/plugins-filters-kv.md)
+:   Parses key-value pairs.
+
+    For example, let’s say you have a log message that contains the following key-value pairs:
+
+    ```json
+    ip=1.2.3.4 error=REFUSED
+    ```
+
+    The following config parses the key-value pairs into fields:
+
+    ```json
+    filter {
+      kv { }
+    }
+    ```
+
+    After the filter is applied, the event in the example will have these fields:
+
+    * `ip: 1.2.3.4`
+    * `error: REFUSED`
+
+
+[grok filter](logstash-docs-md://lsr/plugins-filters-grok.md)
+:   Parses unstructured event data into fields. This tool is perfect for syslog logs, Apache and other webserver logs, MySQL logs, and in general, any log format that is generally written for humans and not computer consumption. Grok works by combining text patterns into something that matches your logs.
+
+    For example, let’s say you have an HTTP request log that contains the following message:
+
+    ```json
+    55.3.244.1 GET /index.html 15824 0.043
+    ```
+
+    The following config parses the message into fields:
+
+    ```json
+    filter {
+      grok {
+        match => { "message" => "%{IP:client} %{WORD:method} %{URIPATHPARAM:request} %{NUMBER:bytes} %{NUMBER:duration}" }
+      }
+    }
+    ```
+
+    After the filter is applied, the event in the example will have these fields:
+
+    * `client: 55.3.244.1`
+    * `method: GET`
+    * `request: /index.html`
+    * `bytes: 15824`
+    * `duration: 0.043`
+
+
+::::{tip}
+If you need help building grok patterns, try the [Grok Debugger](docs-content://explore-analyze/query-filter/tools/grok-debugger.md). The Grok Debugger is an {{xpack}} feature under the Basic License and is therefore **free to use**.
+::::
+
+
diff --git a/docs/reference/first-event.md b/docs/reference/first-event.md
new file mode 100644
index 000000000..45c73d1ad
--- /dev/null
+++ b/docs/reference/first-event.md
@@ -0,0 +1,68 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/first-event.html
+---
+
+# Stashing Your First Event [first-event]
+
+First, let’s test your Logstash installation by running the most basic *Logstash pipeline*.
+
+A Logstash pipeline has two required elements, `input` and `output`, and one optional element, `filter`. The input plugins consume data from a source, the filter plugins modify the data as you specify, and the output plugins write the data to a destination.
+
+![basic logstash pipeline](images/basic_logstash_pipeline.png)
+
+To test your Logstash installation, run the most basic Logstash pipeline.
+
+**MacOS, Linux**
+
+```sh
+cd logstash-9.0.0
+bin/logstash -e 'input { stdin { } } output { stdout {} }'
+```
+
+**Windows**
+
+```sh
+cd logstash-9.0.0
+.\bin\logstash.bat -e "input { stdin { } } output { stdout {} }"
+```
+
+The command might vary slightly, depending on the terminal or shell you are using.
+
+::::{note}
+The location of the `bin` directory varies by platform. See [Directory layout](/reference/dir-layout.md) to find the location of `bin\logstash` on your system.
+::::
+
+
+::::{admonition} macOS Gatekeeper warnings
+:class: important
+
+Apple’s rollout of stricter notarization requirements affected the notarization of the 9.0.0-beta1 {{ls}} artifacts. If macOS Catalina displays a dialog when you first run {{ls}} that interrupts it, you will need to take an action to allow it to run. To prevent Gatekeeper checks on the {{ls}} files, run the following command on the downloaded `.tar.gz` archive or the directory to which was extracted:
+
+```sh
+xattr -d -r com.apple.quarantine <archive-or-directory>
+```
+
+For example, if the `.tar.gz` file was extracted to the default logstash-9.0.0-beta1 directory, the command is:
+
+```sh
+xattr -d -r com.apple.quarantine logstash-9.0.0-beta1
+```
+
+Alternatively, you can add a security override if a Gatekeeper popup appears by following the instructions in the *How to open an app that hasn’t been notarized or is from an unidentified developer* section of [Safely open apps on your Mac](https://support.apple.com/en-us/HT202491).
+
+::::
+
+
+The `-e` flag enables you to specify a configuration directly from the command line. Specifying configurations at the command line lets you quickly test configurations without having to edit a file between iterations. The pipeline in the example takes input from the standard input, `stdin`, and moves that input to the standard output, `stdout`, in a structured format.
+
+After starting Logstash, wait until you see "Pipeline main started" and then enter `hello world` at the command prompt:
+
+```shell
+hello world
+2013-11-21T01:22:14.405+0000 0.0.0.0 hello world
+```
+
+Logstash adds timestamp and IP address information to the message. Exit Logstash by issuing a **CTRL-D** command in the shell where Logstash is running.
+
+Congratulations! You’ve created and run a basic Logstash pipeline. Next, you learn how to create a more realistic pipeline.
diff --git a/docs/reference/getting-started-with-logstash.md b/docs/reference/getting-started-with-logstash.md
new file mode 100644
index 000000000..d3ee34baf
--- /dev/null
+++ b/docs/reference/getting-started-with-logstash.md
@@ -0,0 +1,124 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html
+---
+
+# Getting started with Logstash [getting-started-with-logstash]
+
+This section guides you through the process of installing Logstash and verifying that everything is running properly. 
+After learning how to stash your first event, you can go on to create a more advanced pipeline that takes Apache web logs as input, parses the logs, and writes the parsed data to an Elasticsearch cluster. 
+Then you learn how to stitch together multiple input and output plugins to unify data from a variety of disparate sources.
+
+This section includes these topics:
+
+* [Java (JVM) version](#ls-jvm)
+* [Installing Logstash](/reference/installing-logstash.md)
+* [Stashing Your First Event](/reference/first-event.md)
+* [Parsing Logs with Logstash](/reference/advanced-pipeline.md)
+* [Stitching Together Multiple Input and Output Plugins](/reference/multiple-input-output-plugins.md)
+
+
+### Java (JVM) version [ls-jvm]
+
+{{ls}} requires one of these versions:
+
+* Java 17 
+* Java 21 (default).
+
+Use the [official Oracle distribution](http://www.oracle.com/technetwork/java/javase/downloads/index.html) or an open-source distribution, such as [OpenJDK](http://openjdk.java.net/). See the [Elastic Support Matrix](https://www.elastic.co/support/matrix#matrix_jvm) for the official word on supported versions across releases.
+
+::::{admonition} Bundled JDK
+:class: note
+
+:name: bundled-jdk
+
+{{ls}} offers architecture-specific [downloads](https://www.elastic.co/downloads/logstash) that include Adoptium Eclipse Temurin 21, a long term support (LTS) release of the JDK.
+
+Use the LS_JAVA_HOME environment variable if you want to use a JDK other than the version that is bundled. If you have the LS_JAVA_HOME environment variable set to use a custom JDK, Logstash will continue to use the JDK version you have specified, even after you upgrade.
+
+::::
+
+
+
+#### Check your Java version [check-jvm]
+
+Run this command:
+
+```shell
+java -version
+```
+
+On systems with Java installed, this command produces output similar to:
+
+```shell
+openjdk version "17.0.12" 2024-07-16
+OpenJDK Runtime Environment Temurin-17.0.12+7 (build 17.0.12+7)
+OpenJDK 64-Bit Server VM Temurin-17.0.12+7 (build 17.0.12+7, mixed mode)
+```
+
+
+#### `LS_JAVA_HOME` [java-home]
+
+{{ls}} includes a bundled JDK which has been verified to work with each specific version of {{ls}}, and generally provides the best performance and reliability. If you need to use a JDK other than the bundled version, then set the `LS_JAVA_HOME` environment variable to the version you want to use.
+
+On some Linux systems, you may need to have the `LS_JAVA_HOME` environment exported before installing {{ls}}, particularly if you installed Java from a tarball. {{ls}} uses Java during installation to automatically detect your environment and install the correct startup method (SysV init scripts, Upstart, or systemd). If {{ls}} is unable to find the `LS_JAVA_HOME` environment variable during package installation, you may get an error message, and {{ls}} will not start properly.
+
+
+#### Update JDK settings when upgrading from {{ls}} 7.11.x (or earlier)[jdk-upgrade]
+
+{{ls}} uses JDK 21 by default.
+If you are upgrading from {{ls}} 7.11.x (or earlier), you need to update Java settings in `jvm.options` and `log4j2.properties`.
+
+
+##### Updates to `jvm.options` [_updates_to_jvm_options]
+
+In the `config/jvm.options` file, remove all CMS related flags:
+
+```shell
+## GC configuration
+-XX:+UseConcMarkSweepGC
+-XX:CMSInitiatingOccupancyFraction=75
+-XX:+UseCMSInitiatingOccupancyOnly
+```
+
+For more information about how to use `jvm.options`, please refer to [JVM settings](/reference/jvm-settings.md).
+
+
+##### Updates to `log4j2.properties` [_updates_to_log4j2_properties]
+
+In the `config/log4j2.properties`:
+
+* Replace properties that start with `appender.rolling.avoid_pipelined_filter.*` with:
+
+    ```shell
+    appender.rolling.avoid_pipelined_filter.type = PipelineRoutingFilter
+    ```
+
+* Replace properties that start with `appender.json_rolling.avoid_pipelined_filter.*` with:
+
+    ```shell
+    appender.json_rolling.avoid_pipelined_filter.type = PipelineRoutingFilter
+    ```
+
+* Replace properties that start with `appender.routing.*` with:
+
+    ```shell
+    appender.routing.type = PipelineRouting
+    appender.routing.name = pipeline_routing_appender
+    appender.routing.pipeline.type = RollingFile
+    appender.routing.pipeline.name = appender-${ctx:pipeline.id}
+    appender.routing.pipeline.fileName = ${sys:ls.logs}/pipeline_${ctx:pipeline.id}.log
+    appender.routing.pipeline.filePattern = ${sys:ls.logs}/pipeline_${ctx:pipeline.id}.%i.log.gz
+    appender.routing.pipeline.layout.type = PatternLayout
+    appender.routing.pipeline.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n
+    appender.routing.pipeline.policy.type = SizeBasedTriggeringPolicy
+    appender.routing.pipeline.policy.size = 100MB
+    appender.routing.pipeline.strategy.type = DefaultRolloverStrategy
+    appender.routing.pipeline.strategy.max = 30
+    ```
+
+
+
+
+
+
diff --git a/docs/reference/glob-support.md b/docs/reference/glob-support.md
new file mode 100644
index 000000000..f47507224
--- /dev/null
+++ b/docs/reference/glob-support.md
@@ -0,0 +1,44 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/glob-support.html
+---
+
+# Glob Pattern Support [glob-support]
+
+Logstash supports the following patterns wherever glob patterns are allowed:
+
+**`*`**
+:   Match any file. You can also use an `*` to restrict other values in the glob. For example, `*conf` matches all files that end in `conf`. `*apache*` matches any files with `apache` in the name. This pattern does not match hidden files (dot files) on Unix-like operating systems. To match dot files, use a pattern like `{*,.*}`.
+
+**`**`**
+:   Match directories recursively.
+
+**`?`**
+:   Match any one character.
+
+**`[set]`**
+:   Match any one character in a set. For example, `[a-z]`. Also supports set negation (`[^a-z]`).
+
+**`{p,q}`**
+:   Match either literal `p` or literal `q`. The matching literal can be more than one character, and you can specify more than two literals. This pattern is the equivalent to using alternation with the vertical bar in regular expressions (`foo|bar`).
+
+**`\`**
+:   Escape the next metacharacter. This means that you cannot use a backslash in Windows as part of a glob. The pattern `c:\foo*` will not work, so use `foo*` instead.
+
+
+## Example Patterns [example-glob-patterns]
+
+Here are some common examples of glob patterns:
+
+`"/path/to/*.conf"`
+:   Matches config files ending in `.conf` in the specified path.
+
+`"/var/log/*.log"`
+:   Matches log files ending in `.log` in the specified path.
+
+`"/var/log/**/*.log"`
+:   Matches log files ending in `.log` in subdirectories under the specified path.
+
+`"/path/to/logs/{app1,app2,app3}/data.log"`
+:   Matches app log files in the `app1`, `app2`, and `app3` subdirectories under the specified path.
+
diff --git a/docs/reference/how-logstash-works.md b/docs/reference/how-logstash-works.md
new file mode 100644
index 000000000..ecd94269d
--- /dev/null
+++ b/docs/reference/how-logstash-works.md
@@ -0,0 +1,59 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/pipeline.html
+---
+
+# How Logstash Works [pipeline]
+
+The Logstash event processing pipeline has three stages: inputs → filters → outputs. Inputs generate events, filters modify them, and outputs ship them elsewhere. Inputs and outputs support codecs that enable you to encode or decode the data as it enters or exits the pipeline without having to use a separate filter.
+
+
+## Inputs [_inputs]
+
+You use inputs to get data into Logstash. Some of the more commonly-used inputs are:
+
+* **file**: reads from a file on the filesystem, much like the UNIX command `tail -0F`
+* **syslog**: listens on the well-known port 514 for syslog messages and parses according to the RFC3164 format
+* **redis**: reads from a redis server, using both redis channels and redis lists. Redis is often used as a "broker" in a centralized Logstash installation, which queues Logstash events from remote Logstash "shippers".
+* **beats**: processes events sent by [Beats](https://www.elastic.co/downloads/beats).
+
+For more information about the available inputs, see [Input Plugins](logstash-docs-md://lsr/input-plugins.md).
+
+
+## Filters [_filters]
+
+Filters are intermediary processing devices in the Logstash pipeline. You can combine filters with conditionals to perform an action on an event if it meets certain criteria. Some useful filters include:
+
+* **grok**: parse and structure arbitrary text. Grok is currently the best way in Logstash to parse unstructured log data into something structured and queryable. With 120 patterns built-in to Logstash, it’s more than likely you’ll find one that meets your needs!
+* **mutate**: perform general transformations on event fields. You can rename, remove, replace, and modify fields in your events.
+* **drop**: drop an event completely, for example, *debug* events.
+* **clone**: make a copy of an event, possibly adding or removing fields.
+* **geoip**: add information about geographical location of IP addresses (also displays amazing charts in Kibana!)
+
+For more information about the available filters, see [Filter Plugins](logstash-docs-md://lsr/filter-plugins.md).
+
+
+## Outputs [_outputs]
+
+Outputs are the final phase of the Logstash pipeline. An event can pass through multiple outputs, but once all output processing is complete, the event has finished its execution. Some commonly used outputs include:
+
+* **elasticsearch**: send event data to Elasticsearch. If you’re planning to save your data in an efficient, convenient, and easily queryable format…​ Elasticsearch is the way to go. Period. Yes, we’re biased :)
+* **file**: write event data to a file on disk.
+* **graphite**: send event data to graphite, a popular open source tool for storing and graphing metrics. [http://graphite.readthedocs.io/en/latest/](http://graphite.readthedocs.io/en/latest/)
+* **statsd**: send event data to statsd, a service that "listens for statistics, like counters and timers, sent over UDP and sends aggregates to one or more pluggable backend services". If you’re already using statsd, this could be useful for you!
+
+For more information about the available outputs, see [Output Plugins](logstash-docs-md://lsr/output-plugins.md).
+
+
+## Codecs [_codecs]
+
+Codecs are basically stream filters that can operate as part of an input or output. Codecs enable you to easily separate the transport of your messages from the serialization process. Popular codecs include `json`, `msgpack`, and `plain` (text).
+
+* **json**: encode or decode data in the JSON format.
+* **multiline**: merge multiple-line text events such as java exception and stacktrace messages into a single event.
+
+For more information about the available codecs, see [Codec Plugins](logstash-docs-md://lsr/codec-plugins.md).
+
+
+
+
diff --git a/docs/static/images/basic_logstash_pipeline.png b/docs/reference/images/basic_logstash_pipeline.png
similarity index 100%
rename from docs/static/images/basic_logstash_pipeline.png
rename to docs/reference/images/basic_logstash_pipeline.png
diff --git a/docs/reference/images/centralized_config.png b/docs/reference/images/centralized_config.png
new file mode 100644
index 000000000..4bb5d7469
Binary files /dev/null and b/docs/reference/images/centralized_config.png differ
diff --git a/docs/static/images/dead_letter_queue.png b/docs/reference/images/dead_letter_queue.png
similarity index 100%
rename from docs/static/images/dead_letter_queue.png
rename to docs/reference/images/dead_letter_queue.png
diff --git a/docs/static/images/deploy1.png b/docs/reference/images/deploy1.png
similarity index 100%
rename from docs/static/images/deploy1.png
rename to docs/reference/images/deploy1.png
diff --git a/docs/static/images/deploy2.png b/docs/reference/images/deploy2.png
similarity index 100%
rename from docs/static/images/deploy2.png
rename to docs/reference/images/deploy2.png
diff --git a/docs/static/images/deploy3.png b/docs/reference/images/deploy3.png
similarity index 100%
rename from docs/static/images/deploy3.png
rename to docs/reference/images/deploy3.png
diff --git a/docs/static/images/deploy4.png b/docs/reference/images/deploy4.png
similarity index 100%
rename from docs/static/images/deploy4.png
rename to docs/reference/images/deploy4.png
diff --git a/docs/reference/images/integration-assets-dashboards.png b/docs/reference/images/integration-assets-dashboards.png
new file mode 100644
index 000000000..e5eaf7dc4
Binary files /dev/null and b/docs/reference/images/integration-assets-dashboards.png differ
diff --git a/docs/reference/images/integration-dashboard-overview.png b/docs/reference/images/integration-dashboard-overview.png
new file mode 100644
index 000000000..1ee350ae2
Binary files /dev/null and b/docs/reference/images/integration-dashboard-overview.png differ
diff --git a/docs/static/images/kibana-filebeat-data.png b/docs/reference/images/kibana-filebeat-data.png
similarity index 100%
rename from docs/static/images/kibana-filebeat-data.png
rename to docs/reference/images/kibana-filebeat-data.png
diff --git a/docs/reference/images/kibana-home.png b/docs/reference/images/kibana-home.png
new file mode 100644
index 000000000..00efeacf5
Binary files /dev/null and b/docs/reference/images/kibana-home.png differ
diff --git a/docs/reference/images/monitoring-ui.png b/docs/reference/images/monitoring-ui.png
new file mode 100644
index 000000000..e748ef0ec
Binary files /dev/null and b/docs/reference/images/monitoring-ui.png differ
diff --git a/docs/reference/images/nodestats.png b/docs/reference/images/nodestats.png
new file mode 100644
index 000000000..6777a6b54
Binary files /dev/null and b/docs/reference/images/nodestats.png differ
diff --git a/docs/reference/images/overviewstats.png b/docs/reference/images/overviewstats.png
new file mode 100644
index 000000000..67a6ec656
Binary files /dev/null and b/docs/reference/images/overviewstats.png differ
diff --git a/docs/static/monitoring/images/pipeline-input-detail.png b/docs/reference/images/pipeline-input-detail.png
similarity index 100%
rename from docs/static/monitoring/images/pipeline-input-detail.png
rename to docs/reference/images/pipeline-input-detail.png
diff --git a/docs/reference/images/pipeline-tree.png b/docs/reference/images/pipeline-tree.png
new file mode 100644
index 000000000..5df4d3545
Binary files /dev/null and b/docs/reference/images/pipeline-tree.png differ
diff --git a/docs/static/images/pipeline_correct_load.png b/docs/reference/images/pipeline_correct_load.png
similarity index 100%
rename from docs/static/images/pipeline_correct_load.png
rename to docs/reference/images/pipeline_correct_load.png
diff --git a/docs/static/images/pipeline_overload.png b/docs/reference/images/pipeline_overload.png
similarity index 100%
rename from docs/static/images/pipeline_overload.png
rename to docs/reference/images/pipeline_overload.png
diff --git a/docs/reference/index.md b/docs/reference/index.md
new file mode 100644
index 000000000..e5c9c6b45
--- /dev/null
+++ b/docs/reference/index.md
@@ -0,0 +1,30 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/index.html
+  - https://www.elastic.co/guide/en/logstash/current/introduction.html
+  - https://www.elastic.co/guide/en/serverless/current/elasticsearch-ingest-data-through-logstash.html
+---
+
+# Logstash introduction [introduction]
+
+Logstash is an open source data collection engine with real-time pipelining capabilities.
+Logstash can dynamically unify data from disparate sources and normalize the data into destinations of your choice.
+Cleanse and democratize all your data for diverse advanced downstream analytics and visualization use cases.
+
+While Logstash originally drove innovation in log collection, its capabilities extend well beyond that use case.
+Any type of event can be enriched and transformed with a broad array of input, filter, and output plugins, with many native codecs further simplifying the ingestion process.
+Logstash accelerates your insights by harnessing a greater volume and variety of data.
+
+::::{admonition} {{ls}} to {{serverless-full}}
+You’ll use the {{ls}} [{{es}} output plugin](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md) to send data to {{serverless-full}}.
+Note these differences between {{es-serverless}} and both {{ess}} and self-managed {{es}}:
+
+* Use **API keys** to access {{serverless-full}} from {{ls}}. Any user-based security settings in your in your [{{es}} output plugin](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md) configuration are ignored and may cause errors.
+* {{serverless-full}} uses **data streams** and [{{dlm}} ({{dlm-init}})](docs-content://manage-data/lifecycle/data-stream.md) instead of {{ilm}} ({{ilm-init}}). Any {{ilm-init}} settings in your [{{es}} output plugin](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md) configuration are ignored and may cause errors.
+* **{{ls}} monitoring** is available through the [{{ls}} Integration](https://github.com/elastic/integrations/blob/main/packages/logstash/_dev/build/docs/README.md) in [Elastic Observability](docs-content://solutions/observability.md) on {{serverless-full}}.
+
+**Known issue for Logstash to Elasticsearch Serverless.**
+The logstash-output-elasticsearch `hosts` setting defaults to port :9200.
+Set the value to port :443 instead.
+
+::::
diff --git a/docs/reference/installing-logstash.md b/docs/reference/installing-logstash.md
new file mode 100644
index 000000000..1fb482bae
--- /dev/null
+++ b/docs/reference/installing-logstash.md
@@ -0,0 +1,129 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/installing-logstash.html
+---
+
+# Installing Logstash [installing-logstash]
+
+
+## Installing from a Downloaded Binary [installing-binary]
+
+The {{ls}} binaries are available from [https://www.elastic.co/downloads](https://www.elastic.co/downloads/logstash). Download the Logstash installation file for your host environment—​TAR.GZ, DEB, ZIP, or RPM.
+
+Unpack the file. Do not install Logstash into a directory path that contains colon (:) characters.
+
+::::{note}
+These packages are free to use under the Elastic license. They contain open source and free commercial features and access to paid commercial features. [Start a 30-day trial](docs-content://deploy-manage/license/manage-your-license-in-self-managed-cluster.md) to try out all of the paid commercial features. See the [Subscriptions](https://www.elastic.co/subscriptions) page for information about Elastic license levels.
+
+Alternatively, you can download an `oss` package, which contains only features that are available under the Apache 2.0 license.
+
+::::
+
+
+On supported Linux operating systems, you can use a package manager to install Logstash.
+
+
+## Installing from Package Repositories [package-repositories]
+
+We also have repositories available for APT and YUM based distributions. Note that we only provide binary packages, but no source packages, as the packages are created as part of the Logstash build.
+
+We have split the Logstash package repositories by version into separate urls to avoid accidental upgrades across major versions. For all 9.x.y releases use 9.x as version number.
+
+We use the PGP key [D88E42B4](https://pgp.mit.edu/pks/lookup?op=vindex&search=0xD27D666CD88E42B4), Elastic’s Signing Key, with fingerprint
+
+```
+4609 5ACC 8548 582C 1A26 99A9 D27D 666C D88E 42B4
+```
+to sign all our packages. It is available from [https://pgp.mit.edu](https://pgp.mit.edu).
+
+::::{note}
+When installing from a package repository (or from the DEB or RPM installation file), you will need to run Logstash as a service. Please refer to [Running Logstash as a Service](/reference/running-logstash.md) for more information.
+
+For testing purposes, you may still run Logstash from the command line, but you may need to define the default setting options (described in [Logstash Directory Layout](/reference/dir-layout.md)) manually. Please refer to [Running Logstash from the Command Line](/reference/running-logstash-command-line.md) for more information.
+
+::::
+
+
+
+### APT [_apt]
+
+Download and install the Public Signing Key:
+
+```
+wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo gpg --dearmor -o /usr/share/keyrings/elastic-keyring.gpg
+```
+
+You may need to install the `apt-transport-https` package on Debian before proceeding:
+
+```
+sudo apt-get install apt-transport-https
+```
+
+Save the repository definition to  /etc/apt/sources.list.d/elastic-{{major-version}}.list:
+
+```sh subs=true
+echo "deb [signed-by=/usr/share/keyrings/elastic-keyring.gpg] https://artifacts.elastic.co/packages/{{major-version}}/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic-{{major-version}}.list
+```
+
+::::{warning}
+Use the `echo` method described above to add the Logstash repository.
+Do not use `add-apt-repository` as it will add a `deb-src` entry as well, but we do not provide a source package. 
+If you have added the `deb-src` entry, you will see an error like the following:
+
+```
+    Unable to find expected entry 'main/source/Sources' in Release file (Wrong sources.list entry or malformed file)
+```
+
+Just delete the `deb-src` entry from the `/etc/apt/sources.list` file and the
+installation should work as expected.
+::::
+
+Run `sudo apt-get update` and the repository is ready for use. You can install
+it with:
+
+```sh subs=true
+sudo apt-get update && sudo apt-get install logstash
+```
+
+Check out [Running Logstash](running-logstash.md) for details about managing Logstash as a system service.
+
+
+### YUM [_yum]
+
+Download and install the public signing key:
+
+```sh
+sudo rpm --import https://artifacts.elastic.co/GPG-KEY-elasticsearch
+```
+
+Add the following in your `/etc/yum.repos.d/` directory
+in a file with a `.repo` suffix, for example `logstash.repo`
+
+```sh subs=true
+[logstash-{{major-version}}]
+name=Elastic repository for {{major-version}} packages
+baseurl=https://artifacts.elastic.co/packages/{{major-version}}/yum
+gpgcheck=1
+gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch
+enabled=1
+autorefresh=1
+type=rpm-md
+```
+And your repository is ready for use. You can install it with:
+
+```sh
+sudo yum install logstash
+```
+
+::::{warning}
+The repositories do not work with older rpm based distributions that still use RPM v3, like CentOS5.
+::::
+
+Check out [Running Logstash](running-logstash.md)  for managing Logstash as a system service.
+
+### Docker [_docker]
+
+Images are available for running Logstash as a Docker container. They are available from the Elastic Docker registry.
+
+See [Running Logstash on Docker](/reference/docker.md) for details on how to configure and run Logstash Docker containers.
+
diff --git a/docs/reference/jvm-settings.md b/docs/reference/jvm-settings.md
new file mode 100644
index 000000000..06632ca9e
--- /dev/null
+++ b/docs/reference/jvm-settings.md
@@ -0,0 +1,152 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/jvm-settings.html
+---
+
+# JVM settings [jvm-settings]
+
+Configure JVM settings in the `jvm.options` [settings file](/reference/config-setting-files.md#settings-files). JVM settings can also be set via the [`LS_JAVA_OPTS`](#ls-java-opts) environment variable.
+
+This file contains a line-delimited list of JVM arguments following a special syntax:
+
+* lines consisting of whitespace only are ignored
+* lines beginning with `#` are treated as comments and are ignored
+
+    ```text
+    # this is a comment
+    ```
+
+* lines beginning with a `-` are treated as a JVM option that applies independent of the version of the JVM
+
+    ```text
+    -Xmx2g
+    ```
+
+* lines beginning with a number followed by a `:` followed by a `-` are treated as a JVM option that applies only if the version of the JVM matches the number
+
+    ```text
+    8:-Xmx2g
+    ```
+
+* lines beginning with a number followed by a `-` followed by a `:` are treated as a JVM option that applies only if the version of the JVM is greater than or equal to the number
+
+    ```text
+    8-:-Xmx2g
+    ```
+
+* lines beginning with a number followed by a `-` followed by a number followed by a `:` are treated as a JVM option that applies only if the version of the JVM falls in the inclusive range of the two numbers
+
+    ```text
+    8-9:-Xmx2g
+    ```
+
+* all other lines are rejected
+
+## Setting the memory size [memory-size]
+
+The memory of the JVM executing {{ls}} can be divided in two zones: heap and off-heap memory. In the heap refers to Java heap, which contains all the Java objects created by {{ls}} during its operation, see [Setting the JVM heap size](#heap-size) for description on how to size it. What’s not part of the heap is named off-heap and consists of memory that can be used and controlled by {{ls}}, generally thread stacks, direct memory and memory mapped pages, check [Setting the off-heap size](#off-heap-size) for comprehensive descriptions. In off-heap space there is some space which is used by JVM and contains all the data structures functional to the execution of the virtual machine. This memory can’t be controlled by {{ls}} and the settings are rarely customized.
+
+### Setting the JVM heap size [heap-size]
+
+Here are some tips for adjusting the JVM heap size:
+
+* The recommended heap size for typical ingestion scenarios should be no less than 4GB and no more than 8GB.
+* CPU utilization can increase unnecessarily if the heap size is too low, resulting in the JVM constantly garbage collecting. You can check for this issue by doubling the heap size to see if performance improves.
+* Do not increase the heap size past the amount of physical memory. Some memory must be left to run the OS and other processes.  As a general guideline for most installations, don’t exceed 50-75% of physical memory. The more memory you have, the higher percentage you can use.
+* Set the minimum (Xms) and maximum (Xmx) heap allocation size to the same value to prevent the heap from resizing at runtime, which is a very costly process.
+* You can make more accurate measurements of the JVM heap by using either the `jmap` command line utility distributed with Java or by using VisualVM. For more info, see [Profiling the heap](/reference/tuning-logstash.md#profiling-the-heap).
+
+
+### Setting the off-heap size [off-heap-size]
+
+The operating system, persistent queue mmap pages, direct memory, and other processes require memory in addition to memory allocated to heap size.
+
+Internal JVM data structures, thread stacks, memory mapped files and direct memory for input/output (IO) operations are all parts of the off-heap JVM memory. Memory mapped files are not part of the Logstash’s process off-heap memory, but consume RAM when paging files from disk. These mapped files speed up the access to Persistent Queues pages, a performance improvement - or trade off - to reduce expensive disk operations such as read, write, and seek. Some network I/O operations also resort to in-process direct memory usage to avoid, for example, copying of buffers between network sockets. Input plugins such as Elastic Agent, Beats, TCP, and HTTP inputs, use direct memory. The zone for Thread stacks contains the list of stack frames for each Java thread created by the JVM; each frame keeps the local arguments passed during method calls. Read on [Setting the JVM stack size](#stacks-size) if the size needs to be adapted to the processing needs.
+
+Plugins, depending on their type (inputs, filters, and outputs), have different thread models. Every input plugin runs in its own thread and can potentially spawn others. For example, each JDBC input plugin launches a scheduler thread. Netty based plugins like TCP, Beats or HTTP input spawn a thread pool with 2 * number_of_cores threads. Output plugins may also start helper threads, such as a connection management thread for each {{es}} output instance. Every pipeline, also, has its own thread responsible to manage the pipeline lifecycle.
+
+To summarize, we have 3 categories of memory usage, where 2 can be limited by the JVM and the other relies on available, free memory:
+
+| Memory Type | Configured using | Used by |
+| --- | --- | --- |
+| JVM Heap | -Xmx | any normal object allocation |
+| JVM direct memory | -XX:MaxDirectMemorySize | beats, tcp and http inputs |
+| Native memory | N/A | Persistent Queue Pages, Thread Stacks |
+
+Keep these memory requirements in mind as you calculate your ideal memory allocation.
+
+
+### Buffer Allocation types [off-heap-buffers-allocation]
+
+Input plugins such as {{agent}}, {{beats}}, TCP, and HTTP allocate buffers in Java heap memory to read events from the network. Heap memory is the preferred allocation method, as it facilitates debugging memory usage problems (such as leaks and Out of Memory errors) through the analysis of heap dumps.
+
+Before version 9.0.0, {{ls}} defaulted to direct memory instead of heap for this purpose. To re-enable the previous behavior {{ls}} provides a `pipeline.buffer.type` setting in [logstash.yml](/reference/logstash-settings-file.md) that lets you control where to allocate memory buffers for plugins that use them.
+
+Performance should not be noticeably affected if you switch between `direct` and `heap`. While copying bytes from OS buffers to direct memory buffers is faster, {{ls}} Event objects produced by these plugins are allocated on the Java Heap, incurring the cost of copying from direct memory to heap memory, regardless of the setting.
+
+
+### Memory sizing [memory-size-calculation]
+
+Total JVM memory allocation must be estimated and is controlled indirectly using Java heap and direct memory settings. By default, a JVM’s off-heap direct memory limit is the same as the heap size. Check out [beats input memory usage](logstash-docs-md://lsr/plugins-inputs-beats.md#plugins-inputs-beats-memory). Consider setting `-XX:MaxDirectMemorySize` to half of the heap size or any value that can accommodate the load you expect these plugins to handle.
+
+As you make your capacity calculations, keep in mind that the JVM can’t consume the total amount of the host’s memory available, as the Operating System and other processes will require memory too.
+
+For a {{ls}} instance with persistent queue (PQ) enabled on multiple pipelines, we could estimate memory consumption using:
+
+```text
+pipelines number * (pipeline threads * stack size + 2 * PQ page size) + direct memory + Java heap
+```
+
+::::{note}
+Each Persistent Queue requires that at least head and tail pages are present and accessible in memory. The default page size is 64 MB so each PQ requires at least 128 MB of heap memory, which can be a significant source of memory consumption per pipeline. Note that the size of memory mapped file can’t be limited with an upper bound.
+::::
+
+
+::::{note}
+Stack size is a setting that depends on the JVM used, but could be customized with `-Xss` setting.
+::::
+
+
+::::{note}
+Direct memory space by default is big as much as Java heap, but can be customized with the `-XX:MaxDirectMemorySize` setting.
+::::
+
+
+**Example**
+
+Consider a {{ls}} instance running 10 pipelines, with simple input and output plugins that doesn’t start additional threads, it has 1 pipelines thread, 1 input plugin thread and 12 workers, summing up to 14. Keep in mind that, by default, JVM allocates direct memory equal to memory allocated for Java heap.
+
+The calculation results in:
+
+* native memory: 1.4Gb  [derived from 10 * (14 * 1Mb + 128Mb)]
+* direct memory: 4Gb
+* Java heap: 4Gb
+
+
+
+## Setting the JVM stack size [stacks-size]
+
+Large configurations may require additional JVM stack memory. If you see a stack overflow error, try increasing the JVM stack size. Add an entry similar to this one in the `jvm.options` [settings file](/reference/config-setting-files.md#settings-files):
+
+```sh
+-Xss4M
+```
+
+Note that the default stack size is different per platform and per OS flavor. You can find out what the default is by running:
+
+```sh
+java -XX:+PrintFlagsFinal -version | grep ThreadStackSize
+```
+
+Depending on the default stack size, start by multiplying by 4x, then 8x, and then 16x until the overflow error resolves.
+
+
+## Using `LS_JAVA_OPTS` [ls-java-opts]
+
+The `LS_JAVA_OPTS` environment variable can also be used to override JVM settings in the `jvm.options` file [settings file](/reference/config-setting-files.md#settings-files). The content of this variable is additive to options configured in the `jvm.options` file, and will override any settings that exist in both places.
+
+For example to set a different locale to launch {{ls}} instance:
+
+```sh
+LS_JAVA_OPTS="-Duser.country=DE -Duser.language=de" bin/logstash -e 'input { stdin { codec => json } }'
+```
diff --git a/docs/reference/keystore.md b/docs/reference/keystore.md
new file mode 100644
index 000000000..9aae6fd74
--- /dev/null
+++ b/docs/reference/keystore.md
@@ -0,0 +1,159 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/keystore.html
+---
+
+# Secrets keystore for secure settings [keystore]
+
+When you configure Logstash, you might need to specify sensitive settings or configuration, such as passwords. Rather than relying on file system permissions to protect these values, you can use the Logstash keystore to securely store secret values for use in configuration settings.
+
+After adding a key and its secret value to the keystore, you can use the key in place of the secret value when you configure sensitive settings.
+
+The syntax for referencing keys is identical to the syntax for [environment variables](/reference/environment-variables.md):
+
+```txt
+${KEY}
+```
+
+Where KEY is the name of the key.
+
+**Example**
+
+Imagine that the keystore contains a key called `ES_PWD` with the value `yourelasticsearchpassword`.
+
+In configuration files, use:
+
+```shell
+output { elasticsearch {...password => "${ES_PWD}" } } }
+```
+
+In `logstash.yml`, use:
+
+```shell
+xpack.management.elasticsearch.password: ${ES_PWD}
+```
+
+Notice that the Logstash keystore differs from the Elasticsearch keystore. Whereas the Elasticsearch keystore lets you store `elasticsearch.yml` values by name, the Logstash keystore lets you specify arbitrary names that you can reference in the Logstash configuration.
+
+::::{note}
+There are some configuration fields that have no secret meaning, so not every field could leverage the secret store for variables substitution. Plugin’s `id` field is a field of this kind
+::::
+
+
+::::{note}
+Referencing keystore data from `pipelines.yml` or the command line (`-e`) is not currently supported.
+::::
+
+
+::::{note}
+Referencing keystore data from [centralized pipeline management](/reference/logstash-centralized-pipeline-management.md) requires each Logstash deployment to have a local copy of the keystore.
+::::
+
+
+::::{note}
+The {{ls}} keystore needs to be protected, but the {{ls}} user must have access to the file. While most things in {{ls}} can be protected with `chown -R root:root <foo>`, the keystore itself must be accessible from the {{ls}} user. Use `chown logstash:root <keystore> && chmod 0600 <keystore>`.
+::::
+
+
+When Logstash parses the settings (`logstash.yml`) or configuration (`/etc/logstash/conf.d/*.conf`), it resolves keys from the keystore before resolving environment variables.
+
+
+## Keystore password [keystore-password]
+
+You can protect access to the Logstash keystore by storing a password in an environment variable called `LOGSTASH_KEYSTORE_PASS`. If you create the Logstash keystore after setting this variable, the keystore will be password protected. This means that the environment variable needs to be accessible to the running instance of Logstash. This environment variable must also be correctly set for any users who need to issue keystore commands (add, list, remove, etc.).
+
+Using a keystore password is recommended, but optional. The data will be encrypted even if you do not set a password. However, it is highly recommended to configure the keystore password and grant restrictive permissions to any files that may contain the environment variable value. If you choose not to set a password, then you can skip the rest of this section.
+
+For example:
+
+```sh
+set +o history
+export LOGSTASH_KEYSTORE_PASS=mypassword
+set -o history
+bin/logstash-keystore create
+```
+
+This setup requires the user running Logstash to have the environment variable `LOGSTASH_KEYSTORE_PASS=mypassword` defined. If the environment variable is not defined, Logstash cannot access the keystore.
+
+When you run Logstash from an RPM or DEB package installation, the environment variables are sourced from `/etc/sysconfig/logstash`.
+
+::::{note}
+You might need to create `/etc/sysconfig/logstash`. This file should be owned by `root` with `600` permissions. The expected format of `/etc/sysconfig/logstash` is `ENVIRONMENT_VARIABLE=VALUE`, with one entry per line.
+::::
+
+
+For other distributions, such as Docker or ZIP, see the documentation for your runtime environment (Windows, Docker, etc) to learn how to set the environment variable for the user that runs Logstash. Ensure that the environment variable (and thus the password) is only accessible to that user.
+
+
+## Keystore location [keystore-location]
+
+The keystore must be located in the Logstash `path.settings` directory. This is the same directory that contains the `logstash.yml` file. When performing any operation against the keystore, it is recommended to set `path.settings` for the keystore command. For example, to create a keystore on a RPM/DEB installation:
+
+```sh
+set +o history
+export LOGSTASH_KEYSTORE_PASS=mypassword
+set -o history
+sudo -E /usr/share/logstash/bin/logstash-keystore --path.settings /etc/logstash create
+```
+
+See [Logstash Directory Layout](/reference/dir-layout.md) for more about the default directory locations.
+
+::::{note}
+You will see a warning if the `path.settings` is not pointed to the same directory as the `logstash.yml`.
+::::
+
+
+
+## Create or overwrite a keystore [creating-keystore]
+
+The `create` command creates a new keystore or overwrites an existing keystore:
+
+```sh
+bin/logstash-keystore create
+```
+
+Creates the keystore in the directory defined in the `path.settings` setting.
+
+::::{important}
+If a keystore already exists, the `create` command can overwrite it (after a Y/N prompt). Selecting `Y` clears all keys and secrets that were previously stored.
+::::
+
+
+::::{tip}
+Set a [keystore password](#keystore-password) when you create the keystore.
+::::
+
+
+
+## Add keys [add-keys-to-keystore]
+
+To store sensitive values, such as authentication credentials for Elasticsearch, use the `add` command:
+
+```sh
+bin/logstash-keystore add ES_USER ES_PWD
+```
+
+When prompted, enter a value for each key.
+
+::::{note}
+Key values are limited to ASCII characters. It includes digits, letters, and a few special symbols.
+::::
+
+
+
+## List keys [list-settings]
+
+To list the keys defined in the keystore, use:
+
+```sh
+bin/logstash-keystore list
+```
+
+
+## Remove keys [remove-settings]
+
+To remove keys from the keystore, use:
+
+```sh
+bin/logstash-keystore remove ES_USER ES_PWD
+```
diff --git a/docs/reference/logging.md b/docs/reference/logging.md
new file mode 100644
index 000000000..90df52d04
--- /dev/null
+++ b/docs/reference/logging.md
@@ -0,0 +1,227 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/logging.html
+---
+
+# Logging [logging]
+
+Logstash emits internal logs during its operation, which are placed in `LS_HOME/logs` (or `/var/log/logstash` for DEB/RPM). The default logging level is `INFO`. Logstash’s logging framework is based on [Log4j 2 framework](http://logging.apache.org/log4j/2.x/), and much of its functionality is exposed directly to users.
+
+You can configure logging for a particular subsystem, module, or plugin.
+
+When you need to debug problems, particularly problems with plugins, consider increasing the logging level to `DEBUG` to get more verbose messages. For example, if you are debugging issues with Elasticsearch Output, you can increase log levels just for that component. This approach reduces noise from excessive logging and helps you focus on the problem area.
+
+You can configure logging using the `log4j2.properties` file or the Logstash API.
+
+* **`log4j2.properties` file.**  Changes made through the `log4j2.properties` file require you to restart Logstash for the changes to take effect.  Changes **persist** through subsequent restarts.
+* **Logging API.** Changes made through the Logging API are effective immediately without a restart. The changes **do not persist** after Logstash is restarted.
+
+## Log4j2 configuration [log4j2]
+
+Logstash ships with a `log4j2.properties` file with out-of-the-box settings, including logging to console. You can modify this file to change the rotation policy, type, and other [log4j2 configuration](https://logging.apache.org/log4j/2.x/manual/configuration.html#Loggers).
+
+You must restart Logstash to apply any changes that you make to this file. Changes to `log4j2.properties` persist after Logstash is restarted.
+
+Here’s an example using `outputs.elasticsearch`:
+
+```yaml
+logger.elasticsearchoutput.name = logstash.outputs.elasticsearch
+logger.elasticsearchoutput.level = debug
+```
+
+The previous example defines a name and level for the logger `logstash.outputs.elasticsearch`. The logger is usually identified by a Java class name, such as `org.logstash.dissect.Dissector`, for example.  It can also be a partial package path as in `org.logstash.dissect`.  For Ruby classes, like `LogStash::Outputs::Elasticsearch`, the logger name is obtained by lowercasing the full class name and replacing double colons with a single dot.
+
+::::{note}
+Consider using the default log4j configuration that is shipped with {{ls}}, as it is configured to work well for most deployments. The next section describes how the rolling strategy works in case you need to make adjustments.
+::::
+
+
+### Rollover settings [rollover]
+
+The `log4j2.properties` file has three appenders for writing to log files: one for plain text, one with json format, and one to split log lines on per pipeline basis when you set the `pipeline.separate_logs` value.
+
+These appenders define:
+
+* **triggering policies** that determine *if* a rollover should be performed, and
+* **rollover strategy**  to defines *how* the rollover should be done.
+
+By default, two triggering policies are defined—​time and size.
+
+* The **time** policy creates one file per day.
+* The **size** policy forces the creation of a new file after the file size surpasses 100 MB.
+
+The default strategy also performs file rollovers based on a **maximum number of files**. When the limit of 30 files has been reached, the first (oldest) file is removed to create space for the new file. Subsequent files are renumbered accordingly.
+
+Each file has a date, and files older than 7 days (default) are removed during rollover.
+
+```text
+appender.rolling.type = RollingFile <1>
+appender.rolling.name = plain_rolling
+appender.rolling.fileName = ${sys:ls.logs}/logstash-plain.log <2>
+appender.rolling.filePattern = ${sys:ls.logs}/logstash-plain-%d{yyyy-MM-dd}-%i.log.gz <3>
+appender.rolling.policies.type = Policies
+appender.rolling.policies.time.type = TimeBasedTriggeringPolicy <4>
+appender.rolling.policies.time.interval = 1
+appender.rolling.policies.time.modulate = true
+appender.rolling.layout.type = PatternLayout
+appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n
+appender.rolling.policies.size.type = SizeBasedTriggeringPolicy <5>
+appender.rolling.policies.size.size = 100MB
+appender.rolling.strategy.type = DefaultRolloverStrategy
+appender.rolling.strategy.max = 30 <6>
+appender.rolling.strategy.action.type = Delete <7>
+appender.rolling.strategy.action.basepath = ${sys:ls.logs}
+appender.rolling.strategy.action.condition.type = IfFileName
+appender.rolling.strategy.action.condition.glob = logstash-plain-* <8>
+appender.rolling.strategy.action.condition.nested_condition.type = IfLastModified
+appender.rolling.strategy.action.condition.nested_condition.age = 7D <9>
+```
+
+1. The appender type, which rolls older log files.
+2. Name of the current log file.
+3. Name’s format definition of the rolled files, in this case a date followed by an incremental number, up to 30 (by default).
+4. Time policy to trigger a rollover at the end of the day.
+5. Size policy to trigger a rollover once the plain text file reaches the size of 100 MB.
+6. Rollover strategy defines a maximum of 30 files.
+7. Action to execute during the rollover.
+8. The file set to consider by the action.
+9. Condition to execute the rollover action: older than 7 days.
+
+
+The rollover action can also enforce a disk usage limit, deleting older files to match the requested condition, as an example:
+
+```text
+appender.rolling.type = RollingFile
+...
+appender.rolling.strategy.action.condition.glob = pipeline_${ctx:pipeline.id}.*.log.gz
+appender.rolling.strategy.action.condition.nested_condition.type = IfAccumulatedFileSize
+appender.rolling.strategy.action.condition.nested_condition.exceeds = 5MB <1>
+```
+
+1. Deletes files if total accumulated compressed file size is over 5MB.
+
+
+
+
+## Logging APIs [_logging_apis]
+
+For temporary logging changes, modifying the `log4j2.properties` file and restarting Logstash leads to unnecessary downtime. Instead, you can dynamically update logging levels through the logging API. These settings are effective immediately and do not need a restart.
+
+::::{note}
+By default, the logging API attempts to bind to `tcp:9600`. If this port is already in use by another Logstash instance, you need to launch Logstash with the `--api.http.port` flag specified to bind to a different port. See [Command-Line Flags](/reference/running-logstash-command-line.md#command-line-flags) for more information.
+::::
+
+
+### Retrieve list of logging configurations [_retrieve_list_of_logging_configurations]
+
+To retrieve a list of logging subsystems available at runtime, you can do a `GET` request to `_node/logging`
+
+```js
+curl -XGET 'localhost:9600/_node/logging?pretty'
+```
+
+Example response:
+
+```js
+{
+...
+  "loggers" : {
+    "logstash.agent" : "INFO",
+    "logstash.api.service" : "INFO",
+    "logstash.basepipeline" : "INFO",
+    "logstash.codecs.plain" : "INFO",
+    "logstash.codecs.rubydebug" : "INFO",
+    "logstash.filters.grok" : "INFO",
+    "logstash.inputs.beats" : "INFO",
+    "logstash.instrument.periodicpoller.jvm" : "INFO",
+    "logstash.instrument.periodicpoller.os" : "INFO",
+    "logstash.instrument.periodicpoller.persistentqueue" : "INFO",
+    "logstash.outputs.stdout" : "INFO",
+    "logstash.pipeline" : "INFO",
+    "logstash.plugins.registry" : "INFO",
+    "logstash.runner" : "INFO",
+    "logstash.shutdownwatcher" : "INFO",
+    "org.logstash.Event" : "INFO",
+    "slowlog.logstash.codecs.plain" : "TRACE",
+    "slowlog.logstash.codecs.rubydebug" : "TRACE",
+    "slowlog.logstash.filters.grok" : "TRACE",
+    "slowlog.logstash.inputs.beats" : "TRACE",
+    "slowlog.logstash.outputs.stdout" : "TRACE"
+  }
+}
+```
+
+
+### Update logging levels [_update_logging_levels]
+
+Prepend the name of the subsystem, module, or plugin with `logger.`.
+
+Here is an example using `outputs.elasticsearch`:
+
+```js
+curl -XPUT 'localhost:9600/_node/logging?pretty' -H 'Content-Type: application/json' -d'
+{
+    "logger.logstash.outputs.elasticsearch" : "DEBUG"
+}
+'
+```
+
+While this setting is in effect, Logstash emits DEBUG-level logs for *all* the Elasticsearch outputs specified in your configuration. Please note this new setting is transient and will not survive a restart.
+
+::::{note}
+If you want logging changes to persist after a restart, add them to `log4j2.properties` instead.
+::::
+
+
+
+### Reset dynamic logging levels [_reset_dynamic_logging_levels]
+
+To reset any logging levels that may have been dynamically changed via the logging API, send a `PUT` request to `_node/logging/reset`. All logging levels will revert to the values specified in the `log4j2.properties` file.
+
+```js
+curl -XPUT 'localhost:9600/_node/logging/reset?pretty'
+```
+
+
+
+## Log file location [_log_file_location]
+
+You can specify the log file location using `--path.logs` setting.
+
+
+## Slowlog [_slowlog]
+
+Slowlog for Logstash adds the ability to log when a specific event takes an abnormal amount of time to make its way through the pipeline. Just like the normal application log, you can find slowlogs in your `--path.logs` directory. Slowlog is configured in the `logstash.yml` settings file with the following options:
+
+```yaml
+slowlog.threshold.warn (default: -1)
+slowlog.threshold.info (default: -1)
+slowlog.threshold.debug (default: -1)
+slowlog.threshold.trace (default: -1)
+```
+
+Slowlog is disabled by default. The default threshold values are set to `-1nanos` to represent an infinite threshold. No slowlog will be invoked.
+
+### Enable slowlog [_enable_slowlog]
+
+The `slowlog.threshold` fields use a time-value format which enables a wide range of trigger intervals. You can specify ranges using the following time units: `nanos` (nanoseconds), `micros` (microseconds), `ms` (milliseconds), `s` (second), `m` (minute), `h` (hour), `d` (day).
+
+Slowlog becomes more sensitive and logs more events as you raise the log level.
+
+Example:
+
+```yaml
+slowlog.threshold.warn: 2s
+slowlog.threshold.info: 1s
+slowlog.threshold.debug: 500ms
+slowlog.threshold.trace: 100ms
+```
+
+In this example:
+
+* If the log level is set to `warn`, the log shows events that took longer than 2s to process.
+* If the log level is set to `info`, the log shows events that took longer than 1s to process.
+* If the log level is set to `debug`, the log shows events that took longer than 500ms to process.
+* If the log level is set to `trace`, the log shows events that took longer than 100ms to process.
+
+The logs include the full event and filter configuration that are responsible for the slowness.
diff --git a/docs/reference/logstash-centralized-pipeline-management.md b/docs/reference/logstash-centralized-pipeline-management.md
new file mode 100644
index 000000000..524b53c65
--- /dev/null
+++ b/docs/reference/logstash-centralized-pipeline-management.md
@@ -0,0 +1,76 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/logstash-centralized-pipeline-management.html
+---
+
+# Centralized Pipeline Management [logstash-centralized-pipeline-management]
+
+The pipeline management feature centralizes the creation and management of Logstash configuration pipelines in {{kib}}.
+
+::::{note}
+Centralized pipeline management is a subscription feature. If you want to try the full set of features, you can activate a free 30-day trial. To view the status of your license, start a trial, or install a new license, open the {{kib}} main menu and click **Stack Management > License Management**. For more information, see [https://www.elastic.co/subscriptions](https://www.elastic.co/subscriptions) and [License Management](docs-content://deploy-manage/license/manage-your-license-in-self-managed-cluster.md).
+::::
+
+
+You can control multiple Logstash instances from the pipeline management UI in {{kib}}. You can add, edit, and delete pipeline configurations. On the Logstash side, you simply need to enable configuration management and register Logstash to use the centrally managed pipeline configurations.
+
+::::{important}
+After you configure {{ls}} to use centralized pipeline management, you can no longer specify local pipeline configurations. The `pipelines.yml` file and settings such as `path.config` and `config.string` are inactive when centralized pipeline management is enabled.
+::::
+
+
+## Manage pipelines [_manage_pipelines]
+
+Before using the pipeline management UI, you must:
+
+* [Configure centralized pipeline management](/reference/configuring-centralized-pipelines.md).
+* If {{kib}} is protected with basic authentication, make sure your {{kib}} user has the `logstash_admin` role as well as the `logstash_writer` role that you created when you [configured Logstash to use basic authentication](/reference/secure-connection.md). Additionally, in order to view (as read-only) non-centrally-managed pipelines in the pipeline management UI, make sure your {{kib}} user has the `monitoring_user` role as well.
+
+To manage Logstash pipelines in {{kib}}:
+
+1. Open {{kib}} in your browser and go to the Management tab. If you’ve set up configuration management correctly, you’ll see an area for managing Logstash.
+
+    ![centralized config](images/centralized_config.png)
+
+2. Click the **Pipelines** link.
+3. To add a new pipeline, click **Create pipeline** and specify values.
+
+    Pipeline ID
+    :   A name that uniquely identifies the pipeline. This is the ID that you used when you [configured centralized pipeline management](/reference/configuring-centralized-pipelines.md) and specified a list of pipeline IDs in the `xpack.management.pipeline.id` setting.
+
+    Description
+    :   A description of the pipeline configuration. This information is for your use.
+
+    Pipeline
+    :   The pipeline configuration. You can treat the editor in the pipeline management UI like any other editor. You don’t have to worry about whitespace or indentation.
+
+    Pipeline workers
+    :   The number of parallel workers used to run the filter and output stages of the pipeline.
+
+    Pipeline batch size
+    :   The maximum number of events an individual worker thread collects before executing filters and outputs.
+
+    Pipeline batch delay
+    :   Time in milliseconds to wait for each event before sending an undersized batch to pipeline workers.
+
+    Queue type
+    :   The internal queueing model for event buffering. Options are **memory** for in-memory queueing, or **persisted** for disk-based acknowledged queueing.
+
+    Queue max bytes
+    :   The total capacity of the queue when persistent queues are enabled.
+
+    Queue checkpoint writes
+    :   The maximum number of events written before a checkpoint is forced when persistent queues are enabled.
+
+
+### Pipeline behavior [_pipeline_behavior]
+
+* The pipeline configurations and metadata are stored in Elasticsearch. Any changes that you make to a pipeline definition are picked up and loaded automatically by all Logstash instances registered to use the pipeline. The changes are applied immediately. If Logstash is registered to use the pipeline, you do not have to restart Logstash to pick up the changes.
+* The pipeline runs on all Logstash instances that are registered to use the pipeline.  {{kib}} saves the new configuration, and Logstash will attempt to load it. There is no validation done at the UI level.
+* You need to check the local Logstash logs for configuration errors. If you’re using the Logstash monitoring feature in {{kib}}, use the Monitoring tab to check the status of your Logstash nodes.
+* You can specify multiple pipeline configurations that run in parallel on the same Logstash node.
+* If you edit and save a pipeline configuration, Logstash reloads the configuration in the background and continues processing events.
+* If you try to delete a pipeline that is running (for example, `apache`) in {{kib}}, Logstash will attempt to stop the pipeline. Logstash waits until all events have been fully processed by the pipeline. Before you delete a pipeline, make sure you understand your data sources. Stopping a pipeline may lead to data loss.
+
+
+
diff --git a/docs/reference/logstash-geoip-database-management.md b/docs/reference/logstash-geoip-database-management.md
new file mode 100644
index 000000000..2d18275df
--- /dev/null
+++ b/docs/reference/logstash-geoip-database-management.md
@@ -0,0 +1,78 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/logstash-geoip-database-management.html
+---
+
+# GeoIP Database Management [logstash-geoip-database-management]
+
+Logstash provides a mechanism for provisioning and maintaining GeoIP databases, which plugins can use to ensure that they have access to an always-up-to-date and EULA-compliant database for geo enrichment. This mechanism requires internet access or a network route to an Elastic GeoIP database service.
+
+If the database manager is enabled in `logstash.yml` (as it is by default), a plugin may subscribe to a database, triggering a download if a valid database is not already available. Logstash checks for updates every day. When an updated database is discovered, it is downloaded in the background and made available to the plugins that rely on it.
+
+The GeoIP databases are separately-licensed from MaxMind under the terms of an End User License Agreement, which prohibits a database from being used after an update has been available for more than 30 days. When Logstash cannot reach the database service for 30 days or more to validate that a managed database is up-to-date, that database is deleted and made unavailable to the plugins that subscribed to it.
+
+::::{note}
+GeoIP database management is a licensed feature of Logstash, and is only available in the Elastic-licensed complete distribution of Logstash.
+::::
+
+
+## Database Metrics [logstash-geoip-database-management-metrics]
+
+You can monitor the managed database’s status through the [Node Stats API](https://www.elastic.co/docs/api/doc/logstash/operation/operation-nodestats).
+
+The following request returns a JSON document containing database manager stats, including:
+
+* database status and freshness
+
+    * `geoip_download_manager.database.*.status`
+
+        * `init` : initial CC database status
+        * `up_to_date` : using up-to-date EULA database
+        * `to_be_expired` : 25 days without calling service
+        * `expired` : 30 days without calling service
+
+    * `fail_check_in_days` : number of days Logstash fails to call service since the last success
+
+* info about download successes and failures
+
+    * `geoip_download_manager.download_stats.successes` number of successful checks and downloads
+    * `geoip_download_manager.download_stats.failures` number of failed check or download
+    * `geoip_download_manager.download_stats.status`
+
+        * `updating` : check and download at the moment
+        * `succeeded` : last download succeed
+        * `failed` : last download failed
+
+
+```js
+curl -XGET 'localhost:9600/_node/stats/geoip_download_manager?pretty'
+```
+
+Example response:
+
+```js
+{
+  "geoip_download_manager" : {
+    "database" : {
+      "ASN" : {
+        "status" : "up_to_date",
+        "fail_check_in_days" : 0,
+        "last_updated_at": "2021-06-21T16:06:54+02:00"
+      },
+      "City" : {
+        "status" : "up_to_date",
+        "fail_check_in_days" : 0,
+        "last_updated_at": "2021-06-21T16:06:54+02:00"
+      }
+    },
+    "download_stats" : {
+      "successes" : 15,
+      "failures" : 1,
+      "last_checked_at" : "2021-06-21T16:07:03+02:00",
+      "status" : "succeeded"
+    }
+  }
+}
+```
+
+
diff --git a/docs/reference/logstash-monitoring-ui.md b/docs/reference/logstash-monitoring-ui.md
new file mode 100644
index 000000000..7df8d8ef8
--- /dev/null
+++ b/docs/reference/logstash-monitoring-ui.md
@@ -0,0 +1,24 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/logstash-monitoring-ui.html
+---
+
+# Monitoring UI [logstash-monitoring-ui]
+
+Use the {{stack}} {{monitor-features}} to view metrics and gain insight into how your {{ls}} deployment is running. In the overview dashboard, you can see all events received and sent by Logstash, plus info about memory usage and uptime:
+
+![Logstash monitoring overview dashboard in Kibana](images/overviewstats.png)
+
+Then you can drill down to see stats about a specific node:
+
+![Logstash monitoring node stats dashboard in Kibana](images/nodestats.png)
+
+::::{note}
+A {{ls}} node is considered unique based on its persistent UUID, which is written to the [`path.data`](/reference/logstash-settings-file.md) directory when the node starts.
+::::
+
+
+Before you can use the monitoring UI, [configure Logstash monitoring](/reference/monitoring-logstash-legacy.md).
+
+For information about using the Monitoring UI, see [{{monitoring}} in {{kib}}](docs-content://deploy-manage/monitor/monitoring-data/visualizing-monitoring-data.md).
+
diff --git a/docs/reference/logstash-pipeline-viewer.md b/docs/reference/logstash-pipeline-viewer.md
new file mode 100644
index 000000000..57c36936e
--- /dev/null
+++ b/docs/reference/logstash-pipeline-viewer.md
@@ -0,0 +1,51 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/logstash-pipeline-viewer.html
+---
+
+# Pipeline Viewer UI [logstash-pipeline-viewer]
+
+The pipeline viewer UI offers additional visibility into the behavior and performance of complex pipeline configurations. Use the pipeline viewer to visualize and monitor the behavior of complex Logstash pipeline configurations. You can see and interact with a tree view that illustrates the pipeline topology, data flow, and branching logic.
+
+The pipeline viewer highlights CPU% and event latency in cases where the values are anomalous. This information helps you quickly identify processing that is disproportionately slow.
+
+% TO DO: Use `:class: screenshot`
+![Pipeline Viewer](images/pipeline-tree.png)
+
+
+## Prerequisites [_prerequisites]
+
+Before using the pipeline viewer:
+
+* [Configure Logstash monitoring](monitoring-logstash.md).
+* Start the Logstash pipeline that you want to monitor.
+
+Logstash begins shipping metrics to the monitoring cluster.
+
+
+## View the pipeline [_view_the_pipeline]
+
+To view the pipeline:
+
+* Kibana → Monitoring → Logstash → Pipelines
+
+Each pipeline is identified by a pipeline ID (`main` by default). For each pipeline, you see the pipeline’s throughput and the number of nodes on which the pipeline is running during the selected time range.
+
+Many elements in the tree are clickable. For example, you can click the plugin name to expand the detail view.
+
+% TO DO: Use `:class: screenshot`
+![Pipeline Input Detail](images/pipeline-input-detail.png)
+
+Click the arrow beside a branch name to collapse or expand it.
+
+
+## Notes and best practices [_notes_and_best_practices]
+
+**Use semantic IDs.** Specify semantic IDs when you configure the stages in your Logstash pipeline. Otherwise, Logstash generates them for you. Semantic IDs help you identify configurations that are causing bottlenecks. For example, you may have several grok filters running in your pipeline. If you have specified semantic IDs, you can tell at a glance which filters are slow. Semantic IDs, such as `apacheParsingGrok` and `cloudwatchGrok`, point you to the grok filters that are causing bottlenecks.
+
+**Outliers.** Values and stats that are anomalously slow or otherwise out of line are highlighted. This doesn’t necessarily indicate a problem, but it highlights potential bottle necks so that you can find them quickly.
+
+Some plugins are slower than others due to the nature of the work they do. For instance, you may find that a grok filter that uses a complicated regexp runs a lot slower than a mutate filter that simply adds a field. The grok filter might be highlighted in this case, though it may not be possible to further optimize its work.
+
+**Versioning.** Version information is available from the dropdown list beside the pipeline ID. Logstash generates a new version each time you modify a pipeline, and stores multiple versions of the pipeline stats. Use this information to see how changes over time affect throughput and other metrics. Logstash does not store multiple versions of the pipeline configurations.
+
diff --git a/docs/reference/logstash-settings-file.md b/docs/reference/logstash-settings-file.md
new file mode 100644
index 000000000..31050d549
--- /dev/null
+++ b/docs/reference/logstash-settings-file.md
@@ -0,0 +1,96 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/logstash-settings-file.html
+---
+
+# logstash.yml [logstash-settings-file]
+
+You can set options in the Logstash settings file, `logstash.yml`, to control Logstash execution. For example, you can specify pipeline settings, the location of configuration files, logging options, and other settings. Most of the settings in the `logstash.yml` file are also available as [command-line flags](/reference/running-logstash-command-line.md#command-line-flags) when you run Logstash. Any flags that you set at the command line override the corresponding settings in the `logstash.yml` file.
+
+The `logstash.yml` file is written in [YAML](http://yaml.org/). Its location varies by platform (see [Logstash Directory Layout](/reference/dir-layout.md)). You can specify settings in hierarchical form or use flat keys. For example, to use hierarchical form to set the pipeline batch size and batch delay, you specify:
+
+```yaml
+pipeline:
+  batch:
+    size: 125
+    delay: 50
+```
+
+To express the same values as flat keys, you specify:
+
+```yaml
+pipeline.batch.size: 125
+pipeline.batch.delay: 50
+```
+
+The `logstash.yml` file also supports bash-style interpolation of environment variables and keystore secrets in setting values.
+
+```yaml
+pipeline:
+  batch:
+    size: ${BATCH_SIZE}
+    delay: ${BATCH_DELAY:50}
+node:
+  name: "node_${LS_NODE_NAME}"
+path:
+   queue: "/tmp/${QUEUE_DIR:queue}"
+```
+
+Note that the `${VAR_NAME:default_value}` notation is supported, setting a default batch delay of `50` and a default `path.queue` of `/tmp/queue` in the above example.
+
+The `logstash.yml` file includes these settings.
+
+| Setting | Description | Default value |
+| --- | --- | --- |
+| `node.name` | A descriptive name for the node. | Machine’s hostname |
+| `path.data` | The directory that Logstash and its plugins use for any persistent needs. | `LOGSTASH_HOME/data` |
+| `pipeline.id` | The ID of the pipeline. | `main` |
+| `pipeline.workers` | The number of workers that will, in parallel, execute the filter and outputstages of the pipeline. This setting uses the[`java.lang.Runtime.getRuntime.availableProcessors`](https://docs.oracle.com/javase/7/docs/api/java/lang/Runtime.md#availableProcessors())value as a default if not overridden by `pipeline.workers` in `pipelines.yml` or`pipeline.workers` from `logstash.yml`.  If you have modified this setting andsee that events are backing up, or that the CPU is not saturated, considerincreasing this number to better utilize machine processing power. | Number of the host’s CPU cores |
+| `pipeline.batch.size` | The maximum number of events an individual worker thread will collect from inputs  before attempting to execute its filters and outputs.  Larger batch sizes are generally more efficient, but come at the cost of increased memory  overhead. You may need to increase JVM heap space in the `jvm.options` config file.  See [Logstash Configuration Files](/reference/config-setting-files.md) for more info. | `125` |
+| `pipeline.batch.delay` | When creating pipeline event batches, how long in milliseconds to wait for  each event before dispatching an undersized batch to pipeline workers. | `50` |
+| `pipeline.unsafe_shutdown` | When set to `true`, forces Logstash to exit during shutdown even if there are still inflight events  in memory. By default, Logstash will refuse to quit until all received events  have been pushed to the outputs. Enabling this option can lead to data loss during shutdown. | `false` |
+| `pipeline.plugin_classloaders` | (Beta) Load Java plugins in independent classloaders to isolate their dependencies. | `false` |
+| `pipeline.ordered` | Set the pipeline event ordering. Valid options are:<br><br>* `auto`. Automatically enables ordering if the `pipeline.workers` setting is `1`, and disables otherwise.<br>* `true`. Enforces ordering on the pipeline and prevents Logstash from starting if there are multiple workers.<br>* `false`. Disables the processing required to preserve order. Ordering will not be guaranteed, but you save the processing cost of preserving order.<br> | `auto` |
+| `pipeline.ecs_compatibility` | Sets the pipeline’s default value for `ecs_compatibility`, a setting that is available to plugins that implement an ECS compatibility mode for use with the Elastic Common Schema. Possible values are:<br><br>* `disabled`<br>* `v1`<br>* `v8`<br><br>This option allows the [early opt-in (or preemptive opt-out) of ECS compatibility](/reference/ecs-ls.md) modes in plugins, which is scheduled to be on-by-default in a future major release of {{ls}}.<br><br>Values other than `disabled` are currently considered BETA, and may produce unintended consequences when upgrading {{ls}}.<br> | `disabled` |
+| `path.config` | The path to the Logstash config for the main pipeline. If you specify a directory or wildcard,  config files are read from the directory in alphabetical order. | Platform-specific. See [Logstash Directory Layout](/reference/dir-layout.md). |
+| `config.string` | A string that contains the pipeline configuration to use for the main pipeline. Use the same syntax as  the config file. | *N/A* |
+| `config.test_and_exit` | When set to `true`, checks that the configuration is valid and then exits. Note that grok patterns are not checked for  correctness with this setting. Logstash can read multiple config files from a directory. If you combine this  setting with `log.level: debug`, Logstash will log the combined config file, annotating  each config block with the source file it came from. | `false` |
+| `config.reload.automatic` | When set to `true`, periodically checks if the configuration has changed and reloads the configuration whenever it is changed.  This can also be triggered manually through the SIGHUP signal. | `false` |
+| `config.reload.interval` | How often in seconds Logstash checks the config files for changes. Note that the unit qualifier (`s`) is required. | `3s` |
+| `config.debug` | When set to `true`, shows the fully compiled configuration as a debug log message. You must also set `log.level: debug`.  WARNING: The log message will include any *password* options passed to plugin configs as plaintext, and may result  in plaintext passwords appearing in your logs! | `false` |
+| `config.support_escapes` | When set to `true`, quoted strings will process the following escape sequences: `\n` becomes a literal newline (ASCII 10). `\r` becomes a literal carriage return (ASCII 13). `\t` becomes a literal tab (ASCII 9). `\\` becomes a literal backslash `\`. `\"` becomes a literal double quotation mark. `\'` becomes a literal quotation mark. | `false` |
+| `config.field_reference.escape_style` | Provides a way to reference fields that contain [field reference special characters](https://www.elastic.co/guide/en/logstash/current/field-references-deepdive.html#formal-grammar-escape-sequences) `[` and `]`.<br><br>::::{note} <br>This feature is in **technical preview** and may change in the future.<br>::::<br><br><br>Current options are:<br><br>* `percent`: URI-style `%`+`HH` hexadecimal encoding of UTF-8 bytes (`[` → `%5B`; `]` → `%5D`)<br>* `ampersand`: HTML-style `&#`+`DD`+`;` encoding of decimal Unicode code-points (`[` → `&#91;`; `]` → `&#93;`)<br>* `none`: field names containing special characters *cannot* be referenced.<br> | `none` |
+| `queue.type` | The internal queuing model to use for event buffering. Specify `memory` for legacy in-memory based queuing, or `persisted` for disk-based ACKed queueing ([persistent queues](/reference/persistent-queues.md)). | `memory` |
+| `path.queue` | The directory path where the data files will be stored when persistent queues are enabled (`queue.type: persisted`). | `path.data/queue` |
+| `queue.page_capacity` | The size of the page data files used when persistent queues are enabled (`queue.type: persisted`). The queue data consists of append-only data files separated into pages. | 64mb |
+| `queue.max_events` | The maximum number of unread events in the queue when persistent queues are enabled (`queue.type: persisted`). | 0 (unlimited) |
+| `queue.max_bytes` | The total capacity of the queue (`queue.type: persisted`) in number of bytes. Make sure the capacity of your disk drive is greater than the value you specify here. If both `queue.max_events` and `queue.max_bytes` are specified, Logstash uses whichever criteria is reached first. | 1024mb (1g) |
+| `queue.checkpoint.acks` | The maximum number of ACKed events before forcing a checkpoint when persistent queues are enabled (`queue.type: persisted`). Specify `queue.checkpoint.acks: 0` to set this value to unlimited. | 1024 |
+| `queue.checkpoint.writes` | The maximum number of written events before forcing a checkpoint when persistent queues are enabled (`queue.type: persisted`). Specify `queue.checkpoint.writes: 0` to set this value to unlimited. | 1024 |
+| `queue.checkpoint.retry` | When enabled, Logstash will retry four times per attempted checkpoint write for any checkpoint writes that fail. Any subsequent errors are not retried. This is a workaround for failed checkpoint writes that have been seen only on Windows platform, filesystems with non-standard behavior such as SANs and is not recommended except in those specific circumstances. (`queue.type: persisted`) | `true` |
+| `queue.drain` | When enabled, Logstash waits until the persistent queue (`queue.type: persisted`) is drained before shutting down. | `false` |
+| `dead_letter_queue.enable` | Flag to instruct Logstash to enable the DLQ feature supported by plugins. | `false` |
+| `dead_letter_queue.max_bytes` | The maximum size of each dead letter queue. Entries will be dropped if they  would increase the size of the dead letter queue beyond this setting. | `1024mb` |
+| `dead_letter_queue.storage_policy` | Defines the action to take when the dead_letter_queue.max_bytes setting is reached: `drop_newer` stops accepting new values that would push the file size over the limit, and `drop_older` removes the oldest events to make space for new ones. | `drop_newer` |
+| `path.dead_letter_queue` | The directory path where the data files will be stored for the dead-letter queue. | `path.data/dead_letter_queue` |
+| `api.enabled` | The HTTP API is enabled by default. It can be disabled, but features that rely on it will not work as intended. | `true` |
+| `api.environment` | The API returns the provided string as a part of its response. Setting your environment may help to disambiguate between similarly-named nodes in production vs test environments. | `production` |
+| `api.http.host` | The bind address for the HTTP API endpoint.  By default, the {{ls}} HTTP API binds only to the local loopback interface.  When configured securely (`api.ssl.enabled: true` and `api.auth.type: basic`), the HTTP API binds to *all* available interfaces. | `"127.0.0.1"` |
+| `api.http.port` | The bind port for the HTTP API endpoint. | `9600-9700` |
+| `api.ssl.enabled` | Set to `true` to enable SSL on the HTTP API.  Doing so requires both `api.ssl.keystore.path` and `api.ssl.keystore.password` to be set. | `false` |
+| `api.ssl.keystore.path` | The path to a valid JKS or PKCS12 keystore for use in securing the {{ls}} API.  The keystore must be password-protected, and must contain a single certificate chain and a private key.  This setting is ignored unless `api.ssl.enabled` is set to `true`. | *N/A* |
+| `api.ssl.keystore.password` | The password to the keystore provided with `api.ssl.keystore.path`.  This setting is ignored unless `api.ssl.enabled` is set to `true`. | *N/A* |
+| `api.ssl.supported_protocols` | List of allowed SSL/TLS versions to use when establishing a secure connection. The availability of protocols depends on the JVM version. Certain protocols are disabled by default and need to be enabled manually by changing `jdk.tls.disabledAlgorithms` in the **$JDK_HOME/conf/security/java.security** configuration file. Possible values are:<br><br>* `TLSv1`<br>* `TLSv1.1`<br>* `TLSv1.2`<br>* `TLSv1.3`<br> | *N/A* |
+| `api.auth.type` | Set to `basic` to require HTTP Basic auth on the API using the credentials supplied with `api.auth.basic.username` and `api.auth.basic.password`. | `none` |
+| `api.auth.basic.username` | The username to require for HTTP Basic auth  Ignored unless `api.auth.type` is set to `basic`. | *N/A* |
+| `api.auth.basic.password` | The password to require for HTTP Basic auth. Ignored unless `api.auth.type` is set to `basic`. It should meet default password policy which requires non-empty minimum 8 char string that includes a digit, upper case letter and lower case letter. The default password policy can be customized by following options:<br><br>* Set `api.auth.basic.password_policy.include.digit` `REQUIRED` (default) to accept only passwords that include at least one digit or `OPTIONAL` to exclude from requirement.<br>* Set `api.auth.basic.password_policy.include.upper` `REQUIRED` (default) to accept only passwords that include at least one upper case letter or `OPTIONAL` to exclude from requirement.<br>* Set `api.auth.basic.password_policy.include.lower` `REQUIRED` (default) to accept only passwords that include at least one lower case letter or `OPTIONAL` to exclude from requirement.<br>* Set `api.auth.basic.password_policy.include.symbol` `REQUIRED` to accept only passwords that include at least one special character or `OPTIONAL` (default) to exclude from requirement.<br>* Set `api.auth.basic.password_policy.length.minimum` to a value from 9 to 1024 if you want to require more than the 8 character default setting for passwords.<br> | *N/A* |
+| `api.auth.basic.password_policy.mode` | Raises either `WARN` or `ERROR` message when password requirements are not met.Ignored unless `api.auth.type` is set to `basic`. | `WARN` |
+| `log.level` | The log level. Valid options are:<br><br>* `fatal`<br>* `error`<br>* `warn`<br>* `info`<br>* `debug`<br>* `trace`<br> | `info` |
+| `log.format` | The log format. Set to `json` to log in JSON format, or `plain` to use `Object#.inspect`. | `plain` |
+| `log.format.json.fix_duplicate_message_fields` | When the log format is `json` avoid collision of field names in log lines. | `true` |
+| `path.logs` | The directory where Logstash will write its log to. | `LOGSTASH_HOME/logs` |
+| `pipeline.separate_logs` | This a boolean setting to enable separation of logs per pipeline in different log files. If enabled Logstash will create a different log file for each pipeline,using the pipeline.id as name of the file. The destination directory is taken from the `path.log`s setting. When there are many pipelines configured in Logstash,separating each log lines per pipeline could be helpful in case you need to troubleshoot what’s happening in a single pipeline, without interference of the other ones. | `false` |
+| `path.plugins` | Where to find custom plugins. You can specify this setting multiple times to include  multiple paths. Plugins are expected to be in a specific directory hierarchy:  `PATH/logstash/TYPE/NAME.rb` where `TYPE` is `inputs`, `filters`, `outputs`, or `codecs`,  and `NAME` is the name of the plugin. | Platform-specific. See [Logstash Directory Layout](/reference/dir-layout.md). |
+| `allow_superuser` | Setting to `true` to allow or `false` to block running Logstash as a superuser. | `false` |
+| `pipeline.buffer.type` | Determine where to allocate memory buffers, for plugins that leverage them.Defaults to `heap` but can be switched to `direct` to instruct Logstash to prefer allocation of buffers in direct memory. | `heap` Check out [Buffer Allocation types](/reference/jvm-settings.md#off-heap-buffers-allocation) for more info. |
+
diff --git a/docs/reference/logstash-to-logstash-communications.md b/docs/reference/logstash-to-logstash-communications.md
new file mode 100644
index 000000000..6caaaee8b
--- /dev/null
+++ b/docs/reference/logstash-to-logstash-communications.md
@@ -0,0 +1,42 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/ls-to-ls.html
+---
+
+# Logstash-to-Logstash communications [ls-to-ls]
+
+{{ls}}-to-{{ls}} communication is available if you need to have one {{ls}} instance communicate with another {{ls}} instance. Implementing Logstash-to-Logstash communication can add complexity to your environment, but you may need it if the data path crosses network or firewall boundaries. However, we suggest you don’t implement unless it is strictly required.
+
+::::{note}
+If you are looking for information on connecting multiple pipelines within one Logstash instance, see [Pipeline-to-pipeline communication](/reference/pipeline-to-pipeline.md).
+::::
+
+
+Logstash-to-Logstash communication can be achieved in one of two ways:
+
+* [Logstash output to Logstash Input](#native-considerations)
+* [Lumberjack output to Beats input](#lumberjack-considerations)
+
+$$$native-considerations$$$**Logstash to Logstash considerations**
+
+This is the preferred method to implement Logstash-to-Logstash. It replaces [Logstash-to-Logstash: HTTP output to HTTP input](/reference/ls-to-ls-http.md) and has these considerations:
+
+* It relies on HTTP as the communication protocol between the Input and Output.
+* It supports multiple hosts, providing high availability by load balancing equally amongst the multiple destination hosts.
+* No connection information is added to events.
+
+Ready to see more configuration details? See [Logstash-to-Logstash: Output to Input](/reference/ls-to-ls-native.md).
+
+$$$lumberjack-considerations$$$**Lumberjack-Beats considerations**
+
+Lumberjack output to Beats input has been our standard approach for {{ls}}-to-{{ls}} communication, but our recommended approach is now [Logstash-to-Logstash: Output to Input](/reference/ls-to-ls-native.md). Before you implement the Lumberjack to Beats configuration, keep these points in mind:
+
+* Lumberjack to Beats provides high availability, but does not provide load balancing. The Lumberjack output plugin allows defining multiple output hosts for high availability, but instead of load-balancing between all output hosts, it falls back to one host on the list in the case of failure.
+* If you need a proxy between the Logstash instances, TCP proxy is the only option.
+* There’s no explicit way to exert back pressure back to the beats input.
+
+Ready to see more configuration details? See [Logstash-to-Logstash: Lumberjack output to Beats input](/reference/ls-to-ls-lumberjack.md).
+
+
+
+
diff --git a/docs/reference/lookup-enrichment.md b/docs/reference/lookup-enrichment.md
new file mode 100644
index 000000000..45d81bf8f
--- /dev/null
+++ b/docs/reference/lookup-enrichment.md
@@ -0,0 +1,236 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/lookup-enrichment.html
+---
+
+# Enriching Data with Lookups [lookup-enrichment]
+
+These plugins can help you enrich data with additional info, such as GeoIP and user agent info:
+
+* [dns filter](#dns-def)
+* [elasticsearch filter](#es-def)
+* [geoip filter](#geoip-def)
+* [http filter](#http-def)
+* [jdbc_static filter](#jdbc-static-def)
+* [jdbc_streaming filter](#jdbc-stream-def)
+* [memcached filter](#memcached-def)
+* [translate filter](#translate-def)
+* [useragent filter](#useragent-def)
+
+
+## Lookup plugins [lookup-plugins]
+
+$$$dns-def$$$dns filter
+:   The [dns filter plugin](logstash-docs-md://lsr/plugins-filters-dns.md) performs a standard or reverse DNS lookup.
+
+    The following config performs a reverse lookup on the address in the `source_host` field and replaces it with the domain name:
+
+    ```json
+    filter {
+      dns {
+        reverse => [ "source_host" ]
+        action => "replace"
+      }
+    }
+    ```
+
+
+$$$es-def$$$elasticsearch filter
+:   The [elasticsearch filter](logstash-docs-md://lsr/plugins-filters-elasticsearch.md) copies fields from previous log events in Elasticsearch to current events.
+
+    The following config shows a complete example of how this filter might be used.  Whenever Logstash receives an "end" event, it uses this Elasticsearch filter to find the matching "start" event based on some operation identifier. Then it copies the `@timestamp` field from the "start" event into a new field on the "end" event.  Finally, using a combination of the date filter and the ruby filter, the code in the example calculates the time duration in hours between the two events.
+
+    ```json
+          if [type] == "end" {
+             elasticsearch {
+                hosts => ["es-server"]
+                query => "type:start AND operation:%{[opid]}"
+                fields => { "@timestamp" => "started" }
+             }
+             date {
+                match => ["[started]", "ISO8601"]
+                target => "[started]"
+             }
+             ruby {
+                code => 'event.set("duration_hrs", (event.get("@timestamp") - event.get("started")) / 3600) rescue nil'
+            }
+          }
+    ```
+
+
+$$$geoip-def$$$geoip filter
+:   The [geoip filter](logstash-docs-md://lsr/plugins-filters-geoip.md) adds geographical information about the location of IP addresses. For example:
+
+    ```json
+    filter {
+      geoip {
+        source => "clientip"
+      }
+    }
+    ```
+
+    After the geoip filter is applied, the event will be enriched with geoip fields. For example:
+
+    ```json
+    filter {
+      geoip {
+        source => "clientip"
+      }
+    }
+    ```
+
+
+$$$http-def$$$http filter
+:   The [http filter](logstash-docs-md://lsr/plugins-filters-http.md) integrates with external web services/REST APIs, and enables lookup enrichment against any HTTP service or endpoint. This plugin is well suited for many enrichment use cases, such as social APIs, sentiment APIs, security feed APIs, and business service APIs.
+
+$$$jdbc-static-def$$$jdbc_static filter
+:   The [jdbc_static filter](logstash-docs-md://lsr/plugins-filters-jdbc_static.md) enriches events with data pre-loaded from a remote database.
+
+    The following example fetches data from a remote database, caches it in a local database, and uses lookups to enrich events with data cached in the local database.
+
+    ```json
+    filter {
+      jdbc_static {
+        loaders => [ <1>
+          {
+            id => "remote-servers"
+            query => "select ip, descr from ref.local_ips order by ip"
+            local_table => "servers"
+          },
+          {
+            id => "remote-users"
+            query => "select firstname, lastname, userid from ref.local_users order by userid"
+            local_table => "users"
+          }
+        ]
+        local_db_objects => [ <2>
+          {
+            name => "servers"
+            index_columns => ["ip"]
+            columns => [
+              ["ip", "varchar(15)"],
+              ["descr", "varchar(255)"]
+            ]
+          },
+          {
+            name => "users"
+            index_columns => ["userid"]
+            columns => [
+              ["firstname", "varchar(255)"],
+              ["lastname", "varchar(255)"],
+              ["userid", "int"]
+            ]
+          }
+        ]
+        local_lookups => [ <3>
+          {
+            id => "local-servers"
+            query => "select descr as description from servers WHERE ip = :ip"
+            parameters => {ip => "[from_ip]"}
+            target => "server"
+          },
+          {
+            id => "local-users"
+            query => "select firstname, lastname from users WHERE userid = :id"
+            parameters => {id => "[loggedin_userid]"}
+            target => "user" <4>
+          }
+        ]
+        # using add_field here to add & rename values to the event root
+        add_field => { server_name => "%{[server][0][description]}" }
+        add_field => { user_firstname => "%{[user][0][firstname]}" } <5>
+        add_field => { user_lastname => "%{[user][0][lastname]}" }
+        remove_field => ["server", "user"]
+        jdbc_user => "logstash"
+        jdbc_password => "example"
+        jdbc_driver_class => "org.postgresql.Driver"
+        jdbc_driver_library => "/tmp/logstash/vendor/postgresql-42.1.4.jar"
+        jdbc_connection_string => "jdbc:postgresql://remotedb:5432/ls_test_2"
+      }
+    }
+    ```
+
+    1. Queries an external database to fetch the dataset that will be cached locally.
+    2. Defines the columns, types, and indexes used to build the local database structure. The column names and types should match the external database.
+    3. Performs lookup queries on the local database to enrich the events.
+    4. Specifies the event field that will store the looked-up data. If the lookup returns multiple columns, the data is stored as a JSON object within the field.
+    5. Takes data from the JSON object and stores it in top-level event fields for easier analysis in Kibana.
+
+
+$$$jdbc-stream-def$$$jdbc_streaming filter
+:   The [jdbc_streaming filter](logstash-docs-md://lsr/plugins-filters-jdbc_streaming.md) enriches events with database data.
+
+    The following example executes a SQL query and stores the result set in a field called `country_details`:
+
+    ```json
+    filter {
+      jdbc_streaming {
+        jdbc_driver_library => "/path/to/mysql-connector-java-5.1.34-bin.jar"
+        jdbc_driver_class => "com.mysql.jdbc.Driver"
+        jdbc_connection_string => "jdbc:mysql://localhost:3306/mydatabase"
+        jdbc_user => "me"
+        jdbc_password => "secret"
+        statement => "select * from WORLD.COUNTRY WHERE Code = :code"
+        parameters => { "code" => "country_code"}
+        target => "country_details"
+      }
+    }
+    ```
+
+
+$$$memcached-def$$$memcached filter
+:   The [memcached filter](logstash-docs-md://lsr/plugins-filters-memcached.md) enables key/value lookup enrichment against a Memcached object caching system. It supports both read (GET) and write (SET) operations. It is a notable addition for security analytics use cases.
+
+$$$translate-def$$$translate filter
+:   The [translate filter](logstash-docs-md://lsr/plugins-filters-translate.md) replaces field contents based on replacement values specified in a hash or file. Currently supports these file types: YAML, JSON, and CSV.
+
+    The following example takes the value of the `response_code` field, translates it to a description based on the values specified in the dictionary, and then removes the `response_code` field from the event:
+
+    ```json
+    filter {
+      translate {
+        field => "response_code"
+        destination => "http_response"
+        dictionary => {
+          "200" => "OK"
+          "403" => "Forbidden"
+          "404" => "Not Found"
+          "408" => "Request Timeout"
+        }
+        remove_field => "response_code"
+      }
+    }
+    ```
+
+
+$$$useragent-def$$$useragent filter
+:   The [useragent filter](logstash-docs-md://lsr/plugins-filters-useragent.md) parses user agent strings into fields.
+
+    The following example takes the user agent string in the `agent` field, parses it into user agent fields, and adds the user agent fields to a new field called `user_agent`. It also removes the original `agent` field:
+
+    ```json
+    filter {
+      useragent {
+        source => "agent"
+        target => "user_agent"
+        remove_field => "agent"
+      }
+    }
+    ```
+
+    After the filter is applied, the event will be enriched with user agent fields. For example:
+
+    ```json
+            "user_agent": {
+              "os": "Mac OS X 10.12",
+              "major": "50",
+              "minor": "0",
+              "os_minor": "12",
+              "os_major": "10",
+              "name": "Firefox",
+              "os_name": "Mac OS X",
+              "device": "Other"
+            }
+    ```
+
+
diff --git a/docs/reference/ls-to-ls-http.md b/docs/reference/ls-to-ls-http.md
new file mode 100644
index 000000000..ceb9ae59d
--- /dev/null
+++ b/docs/reference/ls-to-ls-http.md
@@ -0,0 +1,137 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/ls-to-ls-http.html
+---
+
+# Logstash-to-Logstash: HTTP output to HTTP input [ls-to-ls-http]
+
+HTTP output to HTTP input is an alternative to the Lumberjack output to Beats input approach for Logstash-to-Logstash communication. This approach relies on the use of [http output](logstash-docs-md://lsr/plugins-outputs-http.md) to [http input](logstash-docs-md://lsr/plugins-inputs-http.md) plugins.
+
+::::{note}
+{{ls}}-to-{{ls}} using HTTP input/output plugins is now being deprecated in favor of [Logstash-to-Logstash: Output to Input](/reference/ls-to-ls-native.md).
+::::
+
+
+## Configuration overview [overview-http-http]
+
+To use the HTTP protocol to connect two Logstash instances:
+
+1. Configure the downstream (server) Logstash to use HTTP input
+2. Configure the upstream (client) Logstash to use HTTP output
+3. Secure the communication between HTTP input and HTTP output
+
+### Configure the downstream Logstash to use HTTP input [configure-downstream-logstash-http-input]
+
+Configure the HTTP input on the downstream (receiving) Logstash to receive connections. The minimum configuration requires these options:
+
+* `port` - To set a custom port.
+* `additional_codecs` - To set `application/json` to be `json_lines`.
+
+```json
+input {
+    http {
+        port => 8080
+        additional_codecs => { "application/json" => "json_lines" }
+    }
+}
+```
+
+
+### Configure the upstream Logstash to use HTTP output [configure-upstream-logstash-http-output]
+
+In order to obtain the best performance when sending data from one Logstash to another, the data needs to be batched and compressed. As such, the upstream Logstash (the sending Logstash) needs to be configured with these options:
+
+* `url` - The receiving Logstash.
+* `http_method` - Set to `post`.
+* `retry_non_idempotent` - Set to `true`, in order to retry failed events.
+* `format` - Set to `json_batch` to batch the data.
+* `http_compression` - Set to `true` to ensure the data is compressed.
+
+```json
+output {
+    http {
+        url => '<protocol>://<downstream-logstash>:<port>'
+        http_method => post
+        retry_non_idempotent => true
+        format => json_batch
+        http_compression => true
+    }
+}
+```
+
+
+### Secure Logstash to Logstash [securing-logstash-to-logstash-http]
+
+It is important that you secure the communication between Logstash instances. Use SSL/TLS mutual authentication in order to ensure that the upstream Logstash instance sends encrypted data to a trusted downstream Logstash instance, and vice versa.
+
+1. Create a certificate authority (CA) in order to sign the certificates that you plan to use between Logstash instances. Creating a correct SSL/TLS infrastructure is outside the scope of this document.
+
+    ::::{tip}
+    We recommend you use the [elasticsearch-certutil](elasticsearch://reference/elasticsearch/command-line-tools/certutil.md) tool to generate your certificates.
+    ::::
+
+2. Configure the downstream (receiving) Logstash to use SSL. Add these settings to the HTTP Input configuration:
+
+    * `ssl`: When set to `true`, it enables Logstash use of SSL/TLS
+    * `ssl_key`: Specifies the key that Logstash uses to authenticate with the client.
+    * `ssl_certificate`: Specifies the certificate that Logstash uses to authenticate with the client.
+    * `ssl_certificate_authorities`: Configures Logstash to trust any certificates signed by the specified CA.
+    * `ssl_verify_mode`:  Specifies whether Logstash server verifies the client certificate against the CA.
+
+    For example:
+
+    ```json
+    input {
+      http {
+        ...
+
+        ssl => true
+        ssl_key => "server.key.pk8"
+        ssl_certificate => "server.crt"
+        ssl_certificate_authorities => "ca.crt"
+        ssl_verify_mode => force_peer
+      }
+    }
+    ```
+
+3. Configure the upstream (sending) Logstash to use SSL. Add these settings to the HTTP output configuration:
+
+    * `cacert`: Configures the Logstash client to trust any certificates signed by the specified CA.
+    * `client_key`: Specifies the key the Logstash client uses to authenticate with the Logstash server.
+    * `client_cert`: Specifies the certificate that the Logstash client uses to authenticate to the Logstash server.
+
+    For example:
+
+    ```json
+    output {
+      http {
+        ...
+
+        cacert => "ca.crt"
+        client_key => "client.key.pk8"
+        client_cert => "client.crt"
+      }
+    }
+    ```
+
+4. If you would like an additional authentication step, you can also use basic user/password authentication in both Logstash instances:
+
+    * `user`: Sets the username to use for authentication.
+    * `password`: Sets the password to use for authentication.
+
+    For example, you would need to add the following to both Logstash instances:
+
+    ```json
+    ...
+      http {
+        ...
+
+        user => "your-user"
+        password => "your-secret"
+      }
+    ...
+    ```
+
+
+
+
diff --git a/docs/reference/ls-to-ls-lumberjack.md b/docs/reference/ls-to-ls-lumberjack.md
new file mode 100644
index 000000000..f223ea6d8
--- /dev/null
+++ b/docs/reference/ls-to-ls-lumberjack.md
@@ -0,0 +1,103 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/ls-to-ls-lumberjack.html
+---
+
+# Logstash-to-Logstash: Lumberjack output to Beats input [ls-to-ls-lumberjack]
+
+You can set up communication between two Logstash machines by connecting the Lumberjack output to the Beats input.
+
+Logstash-to-Logstash using Lumberjack and Beats has been our standard approach for {{ls}}-to-{{ls}}, and may still be the best option for more robust use cases.
+
+::::{note}
+Check out these [considerations](/reference/logstash-to-logstash-communications.md#lumberjack-considerations) before you implement Logstash-to-Logstash using Lumberjack and Beats.
+::::
+
+
+## Configuration overview [_configuration_overview]
+
+Use the Lumberjack protocol to connect two Logstash machines.
+
+1. Generate a trusted SSL certificate (required by the lumberjack protocol).
+2. Copy the SSL certificate to the upstream Logstash machine.
+3. Copy the SSL certificate and key to the downstream Logstash machine.
+4. Set the upstream Logstash machine to use the Lumberjack output to send data.
+5. Set the downstream Logstash machine to listen for incoming Lumberjack connections through the Beats input.
+6. Test it.
+
+### Generate a self-signed SSL certificate and key [generate-self-signed-cert]
+
+Use the `openssl req` command to generate a self-signed certificate and key. The `openssl req` command is available with some operating systems. You may need to install the openssl command line program for others.
+
+Run the following command:
+
+```shell
+openssl req -x509 -batch -nodes -newkey rsa:2048 -keyout lumberjack.key -out lumberjack.cert -subj /CN=localhost
+```
+
+where:
+
+* `lumberjack.key` is the name of the SSL key to be created
+* `lumberjack.cert` is the name of the SSL certificate to be created
+* `localhost` is the name of the upstream Logstash computer
+
+This command produces output similar to the following:
+
+```shell
+Generating a 2048 bit RSA private key
+.................................+++
+....................+++
+writing new private key to 'lumberjack.key'
+```
+
+
+### Copy the SSL certificate and key [copy-cert-key]
+
+Copy the SSL certificate to the upstream Logstash machine.
+
+Copy the SSL certificate and key to the downstream Logstash machine.
+
+
+### Start the upstream Logstash instance [save-cert-ls1]
+
+Start Logstash and generate test events:
+
+```shell
+bin/logstash -e 'input { generator { count => 5 } } output { lumberjack { codec => json hosts => "mydownstreamhost" ssl_certificate => "lumberjack.cert" port => 5000 } }'
+```
+
+This sample command sends five events to mydownstreamhost:5000 using the SSL certificate provided.
+
+
+### Start the downstream Logstash instance [save-cert-ls2]
+
+Start the downstream instance of Logstash:
+
+```shell
+bin/logstash -e 'input { beats { codec => json port => 5000 ssl_enabled => true ssl_certificate => "lumberjack.cert" ssl_key => "lumberjack.key"} }'
+```
+
+This sample command sets port 5000 to listen for incoming Beats input.
+
+
+### Verify the communication [test-ls-to-ls]
+
+Watch the downstream Logstash machine for the incoming events. You should see five incrementing events similar to the following:
+
+```shell
+{
+  "@timestamp" => 2018-02-07T12:16:39.415Z,
+  "sequence"   => 0
+  "tags"       => [
+    [0] "beats_input_codec_json_applied"
+  ],
+  "message"    => "Hello world",
+  "@version"   => "1",
+  "host"       => "ls1.semicomplete.com"
+}
+```
+
+If you see all five events with consistent fields and formatting, incrementing by one, then your configuration is correct.
+
+
+
diff --git a/docs/reference/ls-to-ls-native.md b/docs/reference/ls-to-ls-native.md
new file mode 100644
index 000000000..31c065469
--- /dev/null
+++ b/docs/reference/ls-to-ls-native.md
@@ -0,0 +1,133 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/ls-to-ls-native.html
+---
+
+# Logstash-to-Logstash: Output to Input [ls-to-ls-native]
+
+The Logstash output to Logstash input is the default approach for Logstash-to-Logstash communication.
+
+::::{note}
+Check out these [considerations](/reference/logstash-to-logstash-communications.md#native-considerations) before you implement {{ls}}-to-{{ls}}.
+::::
+
+
+## Configuration overview [overview-ls-ls]
+
+To connect two Logstash instances:
+
+1. Configure the downstream (server) Logstash to use Logstash input
+2. Configure the upstream (client) Logstash to use Logstash output
+3. Secure the communication between Logstash input and Logstash output
+
+### Configure the downstream Logstash to use Logstash input [configure-downstream-logstash-input]
+
+Configure the Logstash input on the downstream (receiving) Logstash to receive connections. The minimum configuration requires this option:
+
+* `port` - To set a custom port. The default is 9800 if none is provided.
+
+```json
+input {
+    logstash {
+        port => 9800
+    }
+}
+```
+
+
+### Configure the upstream Logstash to use Logstash output [configure-upstream-logstash-output]
+
+In order to obtain the best performance when sending data from one Logstash to another, the data is batched and compressed. As such, the upstream Logstash (the sending Logstash) only needs to be concerned about configuring the receiving endpoint with these options:
+
+* `hosts` - The receiving one or more Logstash host and port pairs. If no port specified, 9800 will be used.
+
+::::{note}
+{{ls}} load balances batched events to *all* of its configured downstream hosts. Any failures caused by network issues, back-pressure or other conditions, will result in the downstream host being isolated from load balancing for at least 60 seconds.
+::::
+
+
+```json
+output {
+    logstash {
+        hosts => ["10.0.0.123", "10.0.1.123:9800"]
+    }
+}
+```
+
+
+### Secure Logstash to Logstash [securing-logstash-to-logstash]
+
+It is important that you secure the communication between Logstash instances. Use SSL/TLS mutual authentication in order to ensure that the upstream Logstash instance sends encrypted data to a trusted downstream Logstash instance, and vice versa.
+
+1. Create a certificate authority (CA) in order to sign the certificates that you plan to use between Logstash instances. Creating a correct SSL/TLS infrastructure is outside the scope of this document.
+
+    ::::{tip}
+    We recommend you use the [elasticsearch-certutil](elasticsearch://reference/elasticsearch/command-line-tools/certutil.md) tool to generate your certificates.
+    ::::
+
+2. Configure the downstream (receiving) Logstash to use SSL. Add these settings to the Logstash input configuration:
+
+    * `ssl_enabled`: When set to `true`, it enables Logstash use of SSL/TLS
+    * `ssl_key`: Specifies the key that Logstash uses to authenticate with the client.
+    * `ssl_certificate`: Specifies the certificate that Logstash uses to authenticate with the client.
+    * `ssl_certificate_authorities`: Configures Logstash to trust any certificates signed by the specified CA.
+    * `ssl_client_authentication`: Specifies whether Logstash server verifies the client certificate against the CA.
+
+    For example:
+
+    ```json
+    input {
+      logstash {
+        ...
+
+        ssl_enabled => true
+        ssl_key => "server.pkcs8.key"
+        ssl_certificate => "server.crt"
+        ssl_certificate_authorities => "ca.crt"
+        ssl_client_authentication => required
+      }
+    }
+    ```
+
+3. Configure the upstream (sending) Logstash to use SSL. Add these settings to the Logstash output configuration:
+
+    * `ssl_key`: Specifies the key the Logstash client uses to authenticate with the Logstash server.
+    * `ssl_certificate`: Specifies the certificate that the Logstash client uses to authenticate to the Logstash server.
+    * `ssl_certificate_authorities`: Configures the Logstash client to trust any certificates signed by the specified CA.
+
+    For example:
+
+    ```json
+    output {
+      logstash {
+        ...
+
+        ssl_enabled => true
+        ssl_key => "client.pkcs8.key"
+        ssl_certificate => "client.crt"
+        ssl_certificate_authorities => "ca.crt"
+      }
+    }
+    ```
+
+4. If you would like an additional authentication step, you can also use basic user/password authentication in both Logstash instances:
+
+    * `username`: Sets the username to use for authentication.
+    * `password`: Sets the password to use for authentication.
+
+    For example, you would need to add the following to both Logstash instances:
+
+    ```json
+    ...
+      logstash {
+        ...
+
+        username => "your-user"
+        password => "your-secret"
+      }
+    ...
+    ```
+
+
+
+
diff --git a/docs/reference/managing-geoip-databases.md b/docs/reference/managing-geoip-databases.md
new file mode 100644
index 000000000..0073eeda1
--- /dev/null
+++ b/docs/reference/managing-geoip-databases.md
@@ -0,0 +1,14 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/geoip-database-management.html
+---
+
+# Managing GeoIP databases [geoip-database-management]
+
+Logstash provides GeoIP database management features to make it easier for you to use plugins that require an up-to-date database to enrich events with geographic data.
+
+* [Feature Overview](/reference/logstash-geoip-database-management.md)
+* [Configuration Guide](/reference/configuring-geoip-database-management.md)
+
+
+
diff --git a/docs/reference/managing-logstash.md b/docs/reference/managing-logstash.md
new file mode 100644
index 000000000..9f2fdd1fb
--- /dev/null
+++ b/docs/reference/managing-logstash.md
@@ -0,0 +1,13 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/config-management.html
+---
+
+# Managing Logstash [config-management]
+
+Logstash provides configuration management features to make it easier for you to manage updates to your configuration over time.
+
+The topics in this section describe Logstash configuration management features only. For information about other config management tools, such as Puppet and Chef, see the documentation for those projects.
+
+
+
diff --git a/docs/reference/memory-queue.md b/docs/reference/memory-queue.md
new file mode 100644
index 000000000..f1fc4cf98
--- /dev/null
+++ b/docs/reference/memory-queue.md
@@ -0,0 +1,65 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/memory-queue.html
+---
+
+# Memory queue [memory-queue]
+
+By default, Logstash uses in-memory bounded queues between pipeline stages (inputs → pipeline workers) to buffer events. If Logstash experiences a temporary machine failure, the contents of the memory queue will be lost. Temporary machine failures are scenarios where Logstash or its host machine are terminated abnormally, but are capable of being restarted.
+
+## Benefits of memory queues [mem-queue-benefits]
+
+The memory queue might be a good choice if you value throughput over data resiliency.
+
+* Easier configuration
+* Easier management and administration
+* Faster throughput
+
+
+## Limitations of memory queues [mem-queue-limitations]
+
+* Can lose data in abnormal termination
+* Don’t do well handling sudden bursts of data, where extra capacity in needed for {{ls}} to catch up
+
+::::{tip}
+Consider using [persistent queues](/reference/persistent-queues.md) to avoid these limitations.
+::::
+
+
+
+## Memory queue size [sizing-mem-queue]
+
+Memory queue size is not configured directly. Instead, it depends on how you have Logstash tuned.
+
+Its upper bound is defined by `pipeline.workers` (default: number of CPUs) times the `pipeline.batch.size` (default: 125) events. This value, called the "inflight count," determines maximum number of events that can be held in each memory queue.
+
+Doubling the number of workers OR doubling the batch size will effectively double the memory queue’s capacity (and memory usage). Doubling both will *quadruple* the capacity (and usage).
+
+::::{important}
+Each pipeline has its own queue.
+::::
+
+
+See [Tuning and profiling logstash pipeline performance](/reference/tuning-logstash.md) for more info on the effects of adjusting `pipeline.batch.size` and `pipeline.workers`.
+
+If you need to absorb bursts of traffic, consider using [persistent queues](/reference/persistent-queues.md) instead. Persistent queues are bound to allocated capacity on disk.
+
+### Settings that affect queue size [mq-settings]
+
+These values can be configured in `logstash.yml` and `pipelines.yml`.
+
+pipeline.batch.size
+:   Number events to retrieve from inputs before sending to filters+workers The default is 125.
+
+pipelines.workers
+:   Number of workers that will, in parallel, execute the filters+outputs stage of the pipeline. This value defaults to the number of the host’s CPU cores.
+
+
+
+## Back pressure [backpressure-mem-queue]
+
+When the queue is full, Logstash puts back pressure on the inputs to stall data flowing into Logstash. This mechanism helps Logstash control the rate of data flow at the input stage without overwhelming outputs like Elasticsearch.
+
+Each input handles back pressure independently.
+
+
diff --git a/docs/reference/monitoring-internal-collection-legacy.md b/docs/reference/monitoring-internal-collection-legacy.md
new file mode 100644
index 000000000..3a05407dc
--- /dev/null
+++ b/docs/reference/monitoring-internal-collection-legacy.md
@@ -0,0 +1,275 @@
+---
+navigation_title: "Legacy collection (deprecated)"
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/monitoring-internal-collection-legacy.html
+---
+
+# Collect {{ls}} monitoring data using legacy collectors [monitoring-internal-collection-legacy]
+
+
+::::{warning}
+Deprecated in 7.9.0.
+::::
+
+
+::::{note}
+Starting from version 9.0, legacy internal collection is behind a feature flag and is turned off by default. Set `xpack.monitoring.allow_legacy_collection` to `true` to allow access to the feature.
+::::
+
+
+Using [{{agent}} for monitoring](/reference/monitoring-logstash-with-elastic-agent.md) is a better alternative for most {{ls}} deployments.
+
+## Components for legacy collection [_components_for_legacy_collection]
+
+Monitoring {{ls}} with legacy collection uses these components:
+
+* [Collectors](#logstash-monitoring-collectors-legacy)
+* [Output](#logstash-monitoring-output-legacy)
+
+These pieces live outside of the default Logstash pipeline in a dedicated monitoring pipeline. This configuration ensures that all data and processing has a minimal impact on ordinary Logstash processing. Existing Logstash features, such as the [`elasticsearch` output](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md), can be reused to benefit from its retry policies.
+
+::::{note}
+The `elasticsearch` output that is used for monitoring {{ls}} is configured exclusively through settings found in `logstash.yml`. It is not configured by using anything from the Logstash configurations that might also be using their own separate `elasticsearch` outputs.
+::::
+
+
+The production {{es}} cluster should be configured to receive {{ls}} monitoring data. This configuration enables the production {{es}} cluster to add metadata (for example, its cluster UUID) to the Logstash monitoring data and then route it to the monitoring clusters. For more information  about typical monitoring architectures, see  [How monitoring works](docs-content://deploy-manage/monitor/stack-monitoring.md) in the [Elasticsearch Reference](docs-content://get-started/index.md).
+
+
+#### Collectors [logstash-monitoring-collectors-legacy]
+
+Collectors, as their name implies, collect things. In monitoring for Logstash, collectors are just [Inputs](/reference/how-logstash-works.md) in the same way that ordinary Logstash configurations provide inputs.
+
+Like monitoring for {{es}}, each collector can create zero or more monitoring documents. As it is currently implemented, each Logstash node runs two types of collectors: one for node stats and one for pipeline stats.
+
+| Collector | Data Types | Description |
+| --- | --- | --- |
+| Node Stats | `logstash_stats` | Gathers details about the running node, such as memory utilization and CPUusage (for example, `GET /_stats`).<br>This runs on every Logstash node with monitoring enabled. One commonfailure is that Logstash directories are copied with their `path.data` directoryincluded (`./data` by default), which copies the persistent UUID of the Logstashnode along with it. As a result, it generally appears that one or more Logstashnodes are failing to collect monitoring data, when in fact they are all reallymisreporting as the *same* Logstash node. Re-use `path.data` directories onlywhen upgrading Logstash, such that upgraded nodes replace the previous versions. |
+| Pipeline Stats | `logstash_state` | Gathers details about the node’s running pipelines, which powers theMonitoring Pipeline UI. |
+
+Per collection interval, which defaults to 10 seconds (`10s`), each collector is run. The failure of an individual collector does not impact any other collector. Each collector, as an ordinary Logstash input, creates a separate Logstash event in its isolated monitoring pipeline. The Logstash output then sends the data.
+
+The collection interval can be configured dynamically and you can also disable data collection. For more information about the configuration options for the collectors, see [Monitoring Settings](#monitoring-settings-legacy).
+
+::::{warning}
+Unlike {{es}} and {{kib}} monitoring, there is no `xpack.monitoring.collection.enabled` setting on Logstash. You must use the `xpack.monitoring.enabled` setting to enable and disable data collection.
+::::
+
+
+If gaps exist in the monitoring charts in {{kib}}, it is typically because either a collector failed or the monitoring cluster did not receive the data (for example, it was being restarted). In the event that a collector fails, a logged error should exist on the node that attempted to perform the collection.
+
+
+### Output [logstash-monitoring-output-legacy]
+
+Like all Logstash pipelines, the purpose of the dedicated monitoring pipeline is to send events to outputs. In the case of monitoring for Logstash, the output is always an `elasticsearch` output. However, unlike ordinary Logstash pipelines, the output is configured within the `logstash.yml` settings file via the `xpack.monitoring.elasticsearch.*` settings.
+
+Other than its unique manner of configuration, this `elasticsearch` output behaves like all `elasticsearch` outputs, including its ability to pause data collection when issues exist with the output.
+
+::::{important}
+It is critical that all Logstash nodes share the same setup. Otherwise, monitoring data might be routed in different ways or to different places.
+::::
+
+
+
+#### Default Configuration [logstash-monitoring-default-legacy]
+
+If a Logstash node does not explicitly define a monitoring output setting, the following default configuration is used:
+
+```yaml
+xpack.monitoring.elasticsearch.hosts: [ "http://localhost:9200" ]
+```
+
+All data produced by monitoring for Logstash is indexed in the monitoring cluster by using the `.monitoring-logstash` template, which is managed by the [exporters](docs-content://deploy-manage/monitor/stack-monitoring/es-monitoring-exporters.md) within {{es}}.
+
+If you are working with a cluster that has {{security}} enabled, extra steps are necessary to properly configure Logstash. For more information, see [*Monitoring {{ls}} (legacy)*](/reference/monitoring-logstash-legacy.md).
+
+::::{important}
+When discussing security relative to the `elasticsearch` output, it is critical to remember that all users are managed on the production cluster, which is identified in the `xpack.monitoring.elasticsearch.hosts` setting. This is particularly important to remember when you move from development environments to production environments, where you often have dedicated monitoring clusters.
+::::
+
+
+For more information about the configuration options for the output, see [Monitoring Settings](#monitoring-settings-legacy).
+
+
+## Configure {{ls}} monitoring with legacy collectors [configure-internal-collectors-legacy]
+
+
+To monitor Logstash nodes:
+
+1. Specify where to send monitoring data. This cluster is often referred to as the *production cluster*. For examples of typical monitoring architectures, see [How monitoring works](docs-content://deploy-manage/monitor/stack-monitoring.md).
+
+    ::::{important}
+    To visualize Logstash as part of the Elastic Stack (as shown in Step 6), send metrics to your *production* cluster. Sending metrics to a dedicated monitoring cluster will show the Logstash metrics under the *monitoring* cluster.
+    ::::
+
+2. Verify that the `xpack.monitoring.allow_legacy_collection` and `xpack.monitoring.collection.enabled` settings are `true` on the production cluster. If that setting is `false`, the collection of monitoring data is disabled in {{es}} and data is ignored from all other sources.
+3. Configure your Logstash nodes to send metrics by setting `xpack.monitoring.enabled` to `true` and specifying the destination {{es}} node(s) as `xpack.monitoring.elasticsearch.hosts` in `logstash.yml`. If {{security-features}} are enabled, you also need to specify the credentials for the [built-in `logstash_system` user](docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/built-in-users.md). For more information about these settings, see [Monitoring Settings](#monitoring-settings-legacy).
+
+    ```yaml
+    xpack.monitoring.allow_legacy_collection: true
+    xpack.monitoring.enabled: true
+    xpack.monitoring.elasticsearch.hosts: ["http://es-prod-node-1:9200", "http://es-prod-node-2:9200"] <1>
+    xpack.monitoring.elasticsearch.username: "logstash_system"
+    xpack.monitoring.elasticsearch.password: "changeme"
+    ```
+
+    1. If SSL/TLS is enabled on the production cluster, you must connect through HTTPS. As of v5.2.1, you can specify multiple Elasticsearch hosts as an array as well as specifying a single host as a string. If multiple URLs are specified, Logstash can round-robin requests to these production nodes.
+
+4. If SSL/TLS is enabled on the production {{es}} cluster, specify the trusted CA certificates that will be used to verify the identity of the nodes in the cluster.
+
+    To add a CA certificate to a Logstash node’s trusted certificates, you can specify the location of the PEM encoded certificate with the `certificate_authority` setting:
+
+    ```yaml
+    xpack.monitoring.elasticsearch.ssl.certificate_authority: /path/to/ca.crt
+    ```
+
+    To add a CA without having it loaded on disk, you can specify a hex-encoded SHA 256 fingerprint of the DER-formatted CA with the `ca_trusted_fingerprint` setting:
+
+    ```yaml
+    xpack.monitoring.elasticsearch.ssl.ca_trusted_fingerprint: 2cfe62e474fb381cc7773c84044c28c9785ac5d1940325f942a3d736508de640
+    ```
+
+    ::::{note}
+    A self-secured Elasticsearch cluster will provide the fingerprint of its CA to the console during setup.
+
+    You can also get the SHA256 fingerprint of an Elasticsearch’s CA using the `openssl` command-line utility on the Elasticsearch host:
+
+    ```shell
+    openssl x509 -fingerprint -sha256 -in $ES_HOME/config/certs/http_ca.crt
+    ```
+
+    ::::
+
+
+    Alternatively, you can configure trusted certificates using a truststore (a Java Keystore file that contains the certificates):
+
+    ```yaml
+    xpack.monitoring.elasticsearch.ssl.truststore.path: /path/to/file
+    xpack.monitoring.elasticsearch.ssl.truststore.password: password
+    ```
+
+    Also, optionally, you can set up client certificate using a keystore (a Java Keystore file that contains the certificate) or using a certificate and key file pair:
+
+    ```yaml
+    xpack.monitoring.elasticsearch.ssl.keystore.path: /path/to/file
+    xpack.monitoring.elasticsearch.ssl.keystore.password: password
+    ```
+
+    ```yaml
+    xpack.monitoring.elasticsearch.ssl.certificate: /path/to/certificate
+    xpack.monitoring.elasticsearch.ssl.key: /path/to/key
+    ```
+
+    Set sniffing to `true` to enable discovery of other nodes of the {{es}} cluster. It defaults to `false`.
+
+    ```yaml
+    xpack.monitoring.elasticsearch.sniffing: false
+    ```
+
+5. Restart your Logstash nodes.
+6. To verify your monitoring configuration, point your web browser at your {{kib}} host, and select **Stack Monitoring** from the side navigation. If this is an initial setup, select **set up with self monitoring** and click **Turn on monitoring**. Metrics reported from your Logstash nodes should be visible in the Logstash section. When security is enabled, to view the monitoring dashboards you must log in to {{kib}} as a user who has the `kibana_user` and `monitoring_user` roles.
+
+    ![Monitoring](images/monitoring-ui.png)
+
+
+
+## Monitoring settings for legacy collection [monitoring-settings-legacy]
+
+
+You can set the following `xpack.monitoring` settings in `logstash.yml` to control how monitoring data is collected from your Logstash nodes. However, the defaults work best in most circumstances. For more information about configuring Logstash, see [logstash.yml](/reference/logstash-settings-file.md).
+
+### General monitoring settings [monitoring-general-settings-legacy]
+
+`xpack.monitoring.enabled`
+:   Monitoring is disabled by default. Set to `true` to enable {{xpack}} monitoring.
+
+`xpack.monitoring.elasticsearch.hosts`
+:   The {{es}} instances that you want to ship your Logstash metrics to. This might be the same {{es}} instance specified in the `outputs` section in your Logstash configuration, or a different one. This is **not** the URL of your dedicated monitoring cluster. Even if you are using a dedicated monitoring cluster, the Logstash metrics must be routed through your production cluster. You can specify a single host as a string, or specify multiple hosts as an array. Defaults to `http://localhost:9200`.
+
+::::{note}
+If your Elasticsearch cluster is configured with dedicated master-eligible nodes, Logstash metrics should *not* be routed to these nodes, as doing so can create resource contention and impact the stability of the Elasticsearch cluster. Therefore, do not include such nodes in `xpack.monitoring.elasticsearch.hosts`.
+::::
+
+
+`xpack.monitoring.elasticsearch.proxy`
+:   The monitoring {{es}} instance and monitored Logstash can be separated by a proxy. To enable Logstash to connect to a proxied {{es}}, set this value to the URI of the intermediate proxy using the standard URI format, `<protocol>://<host>` for example `http://192.168.1.1`. An empty string is treated as if proxy was not set.
+
+`xpack.monitoring.elasticsearch.username` and `xpack.monitoring.elasticsearch.password`
+:   If your {{es}} is protected with basic authentication, these settings provide the username and password that the Logstash instance uses to authenticate for shipping monitoring data.
+
+
+### Monitoring collection settings [monitoring-collection-settings-legacy]
+
+`xpack.monitoring.collection.interval`
+:   Controls how often data samples are collected and shipped on the Logstash side. Defaults to `10s`. If you modify the collection interval, set the `xpack.monitoring.min_interval_seconds` option in `kibana.yml` to the same value.
+
+
+### Monitoring TLS/SSL settings [monitoring-ssl-settings-legacy]
+
+You can configure the following Transport Layer Security (TLS) or Secure Sockets Layer (SSL) settings. For more information, see [Configuring credentials for {{ls}} monitoring](/reference/secure-connection.md#ls-monitoring-user).
+
+`xpack.monitoring.elasticsearch.ssl.ca_trusted_fingerprint`
+:   Optional setting that enables you to specify the hex-encoded SHA-256 fingerprint of the certificate authority for your {{es}} instance.
+
+::::{note}
+A self-secured Elasticsearch cluster will provide the fingerprint of its CA to the console during setup.
+
+You can also get the SHA256 fingerprint of an Elasticsearch’s CA using the `openssl` command-line utility on the Elasticsearch host:
+
+```shell
+openssl x509 -fingerprint -sha256 -in $ES_HOME/config/certs/http_ca.crt
+```
+
+::::
+
+
+`xpack.monitoring.elasticsearch.ssl.certificate_authority`
+:   Optional setting that enables you to specify a path to the `.pem` file for the certificate authority for your {{es}} instance.
+
+`xpack.monitoring.elasticsearch.ssl.truststore.path`
+:   Optional settings that provide the paths to the Java keystore (JKS) to validate the server’s certificate.
+
+`xpack.monitoring.elasticsearch.ssl.truststore.password`
+:   Optional settings that provide the password to the truststore.
+
+`xpack.monitoring.elasticsearch.ssl.keystore.path`
+:   Optional settings that provide the paths to the Java keystore (JKS) to validate the client’s certificate.
+
+`xpack.monitoring.elasticsearch.ssl.keystore.password`
+:   Optional settings that provide the password to the keystore.
+
+`xpack.monitoring.elasticsearch.ssl.certificate`
+:   Optional setting that provides the path to an SSL certificate to use to authenticate the client. This certificate should be an OpenSSL-style X.509 certificate file.
+
+::::{note}
+This setting can be used only if `xpack.monitoring.elasticsearch.ssl.key` is set.
+::::
+
+
+`xpack.monitoring.elasticsearch.ssl.key`
+:   Optional setting that provides the path to an OpenSSL-style RSA private key that corresponds to the `xpack.monitoring.elasticsearch.ssl.certificate`.
+
+::::{note}
+This setting can be used only if `xpack.monitoring.elasticsearch.ssl.certificate` is set.
+::::
+
+
+`xpack.monitoring.elasticsearch.ssl.verification_mode`
+:   Option to validate the server’s certificate. Defaults to `full`. To disable, set to `none`. Disabling this severely compromises security.
+
+`xpack.monitoring.elasticsearch.ssl.cipher_suites`
+:   Optional setting that provides the list of cipher suites to use, listed by priorities. Supported cipher suites vary depending on the Java and protocol versions.
+
+
+### Additional settings [monitoring-additional-settings-legacy]
+
+`xpack.monitoring.elasticsearch.cloud_id`
+:   If you’re using {{es}} in {{ecloud}}, you should specify the identifier here. This setting is an alternative to `xpack.monitoring.elasticsearch.hosts`. If `cloud_id` is configured, `xpack.monitoring.elasticsearch.hosts` should not be used. The {{es}} instances that you want to ship your Logstash metrics to. This might be the same {{es}} instance specified in the `outputs` section in your Logstash configuration, or a different one.
+
+`xpack.monitoring.elasticsearch.cloud_auth`
+:   If you’re using {{es}} in {{ecloud}}, you can set your auth credentials here. This setting is an alternative to both `xpack.monitoring.elasticsearch.username` and `xpack.monitoring.elasticsearch.password`. If `cloud_auth` is configured, those settings should not be used.
+
+`xpack.monitoring.elasticsearch.api_key`
+:   Authenticate using an Elasticsearch API key. Note that this option also requires using SSL.
+
+The API key Format is `id:api_key` where `id` and `api_key` are as returned by the Elasticsearch [Create API key API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-create-api-key).
diff --git a/docs/reference/monitoring-logstash-legacy.md b/docs/reference/monitoring-logstash-legacy.md
new file mode 100644
index 000000000..a2bcd351f
--- /dev/null
+++ b/docs/reference/monitoring-logstash-legacy.md
@@ -0,0 +1,23 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/configuring-logstash.html
+---
+
+# Monitoring Logstash (Legacy) [configuring-logstash]
+
+Use the {{stack}} {{monitor-features}} to gain insight into the health of {{ls}} instances running in your environment. For an introduction to monitoring your Elastic stack, see [Monitoring a cluster](docs-content://deploy-manage/monitor.md) in the [Elasticsearch Reference](docs-content://get-started/index.md). Then, make sure that monitoring is enabled on your {{es}} cluster.
+
+These options for collecting {{ls}} metrics for stack monitoring have been available for a while:
+
+* [{{metricbeat}} collection](/reference/monitoring-with-metricbeat.md). Metricbeat collects monitoring data from your {{ls}} instance and sends it directly to your monitoring cluster. The benefit of Metricbeat collection is that the monitoring agent remains active even if the {{ls}} instance does not.
+* [Legacy collection (deprecated)](/reference/monitoring-internal-collection-legacy.md). Legacy collectors send monitoring data to your production cluster.
+
+For more features, dependability, and easier management, consider using:
+
+* [{{agent}} collection for Stack Monitoring](/reference/monitoring-with-elastic-agent.md). {{agent}} collects monitoring data from your {{ls}} instance and sends it directly to your monitoring cluster, and shows the data in {{ls}} Dashboards. The benefit of {{agent}} collection is that the monitoring agent remains active even if the {{ls}} instance does not, you can manage all your monitoring agents from a central location in {{fleet}}.
+
+
+
+
+
+
diff --git a/docs/reference/monitoring-logstash-with-elastic-agent.md b/docs/reference/monitoring-logstash-with-elastic-agent.md
new file mode 100644
index 000000000..fa8d7c129
--- /dev/null
+++ b/docs/reference/monitoring-logstash-with-elastic-agent.md
@@ -0,0 +1,20 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/monitoring-with-ea.html
+---
+
+# Monitoring Logstash with Elastic Agent [monitoring-with-ea]
+
+You can use {{agent}} to collect data about {{ls}} and ship it to the monitoring cluster. When you use {{agent}} collection, the monitoring agent remains active even if the {{ls}} instance does not. Plus you have the option to manage all of your monitoring agents from a central location in {{fleet}}.
+
+{{agent}} gives you a single, unified way to add monitoring for logs, metrics, and other types of data to a host. Each agent has a single policy you can update to add integrations for new data sources, security protections, and more.
+
+You can use {{agent}} to collect {{ls}} monitoring data on:
+
+* [{{ecloud}} or self-managed dashboards](/reference/dashboard-monitoring-with-elastic-agent.md).<br> {{agent}} collects monitoring data from your {{ls}} instance, sends it directly to your monitoring cluster, and shows the data in {{ls}} dashboards. {{ls}} dashboards include an extended range of metrics, including plugin drilldowns, and plugin specific dashboards for the dissect filter, the grok filter, and the elasticsearch output.
+* [{{ecloud}} dashboards (serverless)](/reference/serverless-monitoring-with-elastic-agent.md).<br> {{agent}} collects monitoring data from your {{ls}} instance, sends it to [Elastic serverless](docs-content://deploy-manage/deploy/elastic-cloud/serverless.md), and shows the data in {{ls}} dashboards in [Elastic Observability](docs-content://solutions/observability.md). {{ls}} dashboards include an extended range of metrics, including plugin drilldowns, and plugin specific dashboards for the dissect filter, the grok filter, and the elasticsearch output.
+* [{{stack}} monitoring](/reference/monitoring-with-elastic-agent.md).<br> Use the Elastic Stack monitoring features to gain insight into the health of {{ls}} instances running in your environment.
+
+
+
+
diff --git a/docs/reference/monitoring-logstash.md b/docs/reference/monitoring-logstash.md
new file mode 100644
index 000000000..79c9309d0
--- /dev/null
+++ b/docs/reference/monitoring-logstash.md
@@ -0,0 +1,97 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/monitoring-logstash.html
+---
+# Monitoring Logstash with APIs
+
+When you run Logstash, it automatically captures runtime metrics that you can use to monitor the health and performance of your Logstash deployment.
+
+The metrics collected by Logstash include:
+
+* Logstash node info, like pipeline settings, OS info, and JVM info.
+* Plugin info, including a list of installed plugins.
+* Node stats, like JVM stats, process stats, event-related stats, and pipeline runtime stats.
+* Hot threads.
+
+You can use monitoring APIs provided by Logstash to retrieve these metrics. These APIs are available by default without requiring any extra configuration.
+
+Alternatively, you can [configure Elastic Stack monitoring features](monitoring-logstash-legacy.md) to send
+data to a monitoring cluster.
+
+## APIs for monitoring Logstash [monitoring]
+
+Logstash provides monitoring APIs for retrieving runtime information about Logstash:
+
+* [Node info API](https://www.elastic.co/docs/api/doc/logstash/group/endpoint-node-info)
+* [Plugins info API](https://www.elastic.co/docs/api/doc/logstash/group/endpoint-plugin-info)
+* [Node stats API](https://www.elastic.co/docs/api/doc/logstash/group/endpoint-node-stats)
+* [Hot threads API](https://www.elastic.co/docs/api/doc/logstash/group/endpoint-hot-threads)
+* [Health report API](https://www.elastic.co/docs/api/doc/logstash/group/endpoint-health)
+
+You can use the root resource to retrieve general information about the Logstash instance, including
+the host and version.
+
+```
+curl -XGET 'localhost:9600/?pretty'
+```
+
+Example response:
+
+```json
+{
+   "host": "skywalker",
+   "version": "{logstash_version}",
+   "http_address": "127.0.0.1:9600"
+}
+```
+
+:::{note}
+By default, the monitoring API attempts to bind to `tcp:9600`.
+If this port is already in use by another Logstash instance, you need to launch Logstash with the `--api.http.port` flag specified to bind to a different port. For more information, go to [](running-logstash-command-line.md#command-line-flags)  
+:::
+
+## Securing the Logstash API [monitoring-api-security]
+
+The Logstash monitoring APIs are not secured by default, but you can configure Logstash to secure them in one of several ways to meet your organization's needs.
+
+You can enable SSL for the Logstash API by setting `api.ssl.enabled: true` in the `logstash.yml`, and providing the relevant keystore settings `api.ssl.keystore.path` and `api.ssl.keystore.password`:
+
+```yaml
+api.ssl.enabled: true
+api.ssl.keystore.path: /path/to/keystore.jks
+api.ssl.keystore.password: "s3cUr3p4$$w0rd"
+```
+
+The keystore must be in either jks or p12 format, and must contain both a certificate and a private key.
+Connecting clients receive this certificate, allowing them to authenticate the Logstash endpoint.
+
+You can also require HTTP Basic authentication by setting `api.auth.type: basic` in the `logstash.yml`, and providing the relevant credentials `api.auth.basic.username` and `api.auth.basic.password`:
+
+```yaml
+api.auth.type: basic
+api.auth.basic.username: "logstash"
+api.auth.basic.password: "s3cUreP4$$w0rD"
+```
+
+:::{note}
+Usage of `Keystore` or `Environment` or variable replacements is encouraged for password-type fields to avoid storing them in plain text.
+For example, specifying the value `"${HTTP_PASS}"` will resolve to the value stored in the [secure keystore's](keystore.md) `HTTP_PASS` variable if present or the same variable from the [environment](environment-variables.md).
+:::
+
+## Common options [monitoring-common-options]
+
+The following options can be applied to all of the Logstash monitoring APIs.
+
+### Pretty results
+
+When appending `?pretty=true` to any request made, the JSON returned will be pretty formatted (use it for debugging only!).
+
+### Human-readable output
+
+:::{note}
+The `human` option is supported for the hot threads API only.
+When you specify `human=true`, the results are returned in plain text instead of JSON format.
+The default is `false`.
+:::
+
+Statistics are returned in a format suitable for humans (for example, `"exists_time": "1h"` or `"size": "1kb"`) and for computers (for example, `"exists_time_in_millis": 3600000` or `"size_in_bytes": 1024`). The human-readable values can be turned off by adding `?human=false` to the query string. This makes sense when the stats results are being consumed by a monitoring tool, rather than intended for human consumption.  The default for the `human` flag is `false`.
diff --git a/docs/reference/monitoring-troubleshooting.md b/docs/reference/monitoring-troubleshooting.md
new file mode 100644
index 000000000..9ebe5d7f6
--- /dev/null
+++ b/docs/reference/monitoring-troubleshooting.md
@@ -0,0 +1,30 @@
+---
+navigation_title: "Troubleshooting"
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/monitoring-troubleshooting.html
+---
+
+# Troubleshooting monitoring in Logstash [monitoring-troubleshooting]
+
+
+
+## Logstash Monitoring Not Working After Upgrade [_logstash_monitoring_not_working_after_upgrade]
+
+When upgrading from older versions, the built-in `logstash_system` user is disabled for security reasons. To resume monitoring:
+
+1. Change the `logstash_system` password:
+
+    ```console
+    PUT _security/user/logstash_system/_password
+    {
+      "password": "newpassword"
+    }
+    ```
+
+2. Re-enable the `logstash_system` user:
+
+    ```console
+    PUT _security/user/logstash_system/_enable
+    ```
+
+
diff --git a/docs/reference/monitoring-with-elastic-agent.md b/docs/reference/monitoring-with-elastic-agent.md
new file mode 100644
index 000000000..58ab1e6ec
--- /dev/null
+++ b/docs/reference/monitoring-with-elastic-agent.md
@@ -0,0 +1,151 @@
+---
+navigation_title: "Collect monitoring data for stack monitoring"
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/monitoring-with-elastic-agent.html
+---
+
+# Collect {{ls}} monitoring data for stack monitoring [monitoring-with-elastic-agent]
+
+
+{{agent}} collects monitoring data from your {{ls}} instance and sends it directly to your monitoring cluster. With {{agent}} collection the monitoring agent remains active even if the {{ls}} instance does not.
+
+You can enroll {{agent}} in [{{fleet}}](docs-content://reference/fleet/install-fleet-managed-elastic-agent.md) for management from a central location, or you can run [{{agent}} standalone](docs-content://reference/fleet/install-standalone-elastic-agent.md).
+
+**Prerequisites**
+
+Complete these steps as you prepare to collect and ship monitoring data for stack monitoring:
+
+::::{dropdown} Set up {{es}} monitoring
+:name: set-up-monitoring-ea
+
+To bind {{ls}} metrics to an {{es}} cluster, set up [{{es}} monitoring](docs-content://deploy-manage/monitor/stack-monitoring.md). If you would like to create a dedicated monitoring cluster (optional), check out [{{es}} monitoring documentation](docs-content://deploy-manage/monitor/stack-monitoring/elasticsearch-monitoring-self-managed.md).
+
+::::
+
+
+::::{dropdown} Disable default collection of {{ls}} monitoring metrics
+:name: disable-default-include-ea
+
+Set `monitoring.enabled` to `false` in logstash.yml to disable default collection:
+
+```yaml
+monitoring.enabled: false
+```
+
+::::
+
+
+::::{dropdown} Specify the target cluster_uuid (optional)
+:name: define-cluster__uuid-ea
+
+To bind the metrics of {{ls}} to a specific cluster, optionally define the `monitoring.cluster_uuid` in the configuration file (logstash.yml):
+
+```yaml
+monitoring.cluster_uuid: PRODUCTION_ES_CLUSTER_UUID
+```
+
+::::
+
+
+::::{dropdown} Grant agent access to Elasticsearch (standalone agent only)
+:name: create-user-ea
+
+Minimal permissions required to send Logstash monitoring data to Elasticsearch:
+
+* `monitor` cluster privilege
+* `auto_configure` and `create_doc` index privileges on `logs-*` and `metrics-*` indices.
+
+See [Grant standalone Elastic Agents access to Elasticsearch](docs-content://reference/fleet/grant-access-to-elasticsearch.md)
+
+::::
+
+
+
+## Install and configure {{agent}} [install-and-configure-mon]
+
+When you have completed the prerequisites, install and configure {{agent}} to monitor host logs and metrics. We’ll walk you through the process in these steps:
+
+* [Add the {{agent}} {{ls}} integration](#add-logstash-integration-ea)
+* [Install and run an {{agent}} on your machine](#add-agent-to-fleet-ea)
+* [View assets](#view-assets)
+* [Monitor {{ls}} logs and metrics (Stack Monitoring)](#view-data-stack)
+
+Check out [Installing {{agent}}](docs-content://reference/fleet/install-elastic-agents.md) in the *Fleet and Elastic Agent Guide* for more info.
+
+
+### Add the {{agent}} {{ls}} integration [add-logstash-integration-ea]
+
+1. Go to the {{kib}} home page, and click **Add integrations**.
+
+    % TO DO: Use `:class: screenshot`
+    ![{{kib}} home page](images/kibana-home.png)
+
+2. In the query bar, search for **{{ls}}** and select the integration to see more details about it.
+3. Click **Add {{ls}}**.
+4. Configure the integration name and optionally add a description.
+5. Configure the integration to collect logs.
+
+    * Make sure that **Logs** is turned on if you want to collect logs from your {{ls}} instance, ensuring that the required settings are correctly configured:
+    * Under **Logs**, modify the log paths to match your {{ls}} environment.
+
+6. Configure the integration to collect metrics
+
+    ::::{tip}
+    For the best experience with Stack Monitoring, we recommend collecting both `node` and `node_stats`. Turning off either of these will result in incomplete or missing visualizations.
+    ::::
+
+    * Make sure that **Metrics (Stack Monitoring)** is turned on, and **Metrics (Elastic Agent)** is turned off, if you want to collect metrics from your {{ls}} instance.
+    * Under **Metrics (Stack Monitoring)**, make sure the hosts setting points to your {{ls}} host URLs. By default, the integration collects {{ls}} monitoring metrics from `localhost:9600`. If that host and port number are not correct, update the `hosts` setting. If you configured {{ls}} to use encrypted communications, you must access it via HTTPS. For example, use a `hosts` setting like `https://localhost:9600`.
+
+7. Choose where to add the integration policy.<br> Click **New hosts** to add it to new agent policy or **Existing hosts** to add it to an existing agent policy.
+8. In the popup, click **Add {{agent}} to your hosts** to open the **Add agent** flyout.
+
+    ::::{tip}
+    If you accidentally close the popup, go to **{{fleet}} > Agents**, then click **Add agent** to access the flyout.
+    ::::
+
+
+
+### Install and run an {{agent}} on your machine [add-agent-to-fleet-ea]
+
+The **Add agent** flyout has two options: **Enroll in {{fleet}}** and **Run standalone**. Enrolling agents in {{fleet}} (default) provides a centralized management tool in {{kib}}, reducing management overhead.
+
+:::::::{tab-set}
+
+::::::{tab-item} Fleet-managed
+1. When the **Add Agent flyout** appears, stay on the **Enroll in fleet** tab.
+2. Skip the **Select enrollment token** step. The enrollment token you need is already selected.
+
+    ::::{note}
+    The enrollment token is specific to the {{agent}} policy that you just created. When you run the command to enroll the agent in {{fleet}}, you will pass in the enrollment token.
+    ::::
+
+3. Download, install, and enroll the {{agent}} on your host by selecting your host operating system and following the **Install {{agent}} on your host** step.
+
+It takes about a minute for {{agent}} to enroll in {{fleet}}, download the configuration specified in the policy you just created, and start collecting data.
+::::::
+
+::::::{tab-item} Run standalone
+1. When the **Add Agent flyout** appears, navigate to the **Run standalone** tab.
+2. Configure the agent. Follow the instructions in **Install Elastic Agent on your host**.
+3. After unpacking the binary, replace the `elastic-agent.yml` file with that supplied in the Add Agent flyout on the "Run standalone" tab, replacing the values of `ES_USERNAME` and `ES_PASSWORD` appropriately.
+4. Run `sudo ./elastic-agent install`
+::::::
+
+:::::::
+
+## View assets [view-assets]
+
+After you have confirmed enrollment and data is coming in,  click **View assets** to access dashboards related to the {{ls}} integration.
+
+For traditional Stack Monitoring UI, the dashboards marked **[Logs {{ls}}]** are used to visualize the logs produced by your {{ls}} instances, with those marked **[Metrics {{ls}}]** for metrics dashboards. These are populated with data only if you selected the **Metrics (Elastic Agent)** checkbox.
+
+% TO DO: Use `:class: screenshot`
+![Integration assets](images/integration-assets-dashboards.png)
+
+A number of dashboards are included to view {{ls}} as a whole, and dashboards that allow you to drill-down into how {{ls}} is performing on a node, pipeline and plugin basis.
+
+
+### Monitor {{ls}} logs and metrics (Stack Monitoring) [view-data-stack]
+
+[View the monitoring data in {{kib}}](docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md), and navigate to the [monitoring UI](/reference/logstash-monitoring-ui.md).
diff --git a/docs/reference/monitoring-with-metricbeat.md b/docs/reference/monitoring-with-metricbeat.md
new file mode 100644
index 000000000..8fa3378e5
--- /dev/null
+++ b/docs/reference/monitoring-with-metricbeat.md
@@ -0,0 +1,160 @@
+---
+navigation_title: "{{metricbeat}} collection"
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/monitoring-with-metricbeat.html
+---
+
+# Collect {{ls}} monitoring data with {{metricbeat}} [monitoring-with-metricbeat]
+
+
+You can use {{metricbeat}} to collect data about {{ls}} and ship it to the monitoring cluster. The benefit of Metricbeat collection is that the monitoring agent remains active even if the {{ls}} instance does not.
+
+This step requires [{{es}} with {{metricbeat}} monitoring setup](docs-content://deploy-manage/monitor/stack-monitoring/collecting-monitoring-data-with-metricbeat.md).
+
+To collect and ship monitoring data:
+
+1. [Disable default collection of monitoring metrics](#disable-default)
+2. [Specify the target `cluster_uuid`](#define-cluster__uuid)
+3. [Install and configure {{metricbeat}} to collect monitoring data](#configure-metricbeat)
+
+Want to use {{agent}} instead? Refer to [Collect monitoring data for stack monitoring](/reference/monitoring-with-elastic-agent.md).
+
+
+## Disable default collection of {{ls}} monitoring metrics [disable-default]
+
+Set the `monitoring.enabled` to `false` in logstash.yml to disable to default monitoring:
+
+```yaml
+monitoring.enabled: false
+```
+
+
+## Determine target Elasticsearch cluster [define-cluster__uuid]
+
+You will need to determine which Elasticsearch cluster that {{ls}} will bind metrics to in the Stack Monitoring UI by specifying the `cluster_uuid`. When pipelines contain [{{es}} output plugins](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md), the `cluster_uuid` is automatically calculated, and the metrics should be bound without any additional settings.
+
+To override automatic values, or if your pipeline does not contain any [{{es}} output plugins](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md), you can bind the metrics of {{ls}} to a specific cluster, by defining the target cluster in the `monitoring.cluster_uuid` setting. in the configuration file (logstash.yml):
+
+```yaml
+monitoring.cluster_uuid: PRODUCTION_ES_CLUSTER_UUID
+```
+
+Refer to [{{es}} cluster stats page](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-stats) to figure out how to get your cluster `cluster_uuid`.
+
+
+## Install and configure {{metricbeat}} [configure-metricbeat]
+
+1. [Install {{metricbeat}}](beats://reference/metricbeat/metricbeat-installation-configuration.md) on the same server as {{ls}}.
+2. Enable the `logstash-xpack` module in {{metricbeat}}.<br>
+
+    To enable the default configuration in the {{metricbeat}} `modules.d` directory, run:
+
+    **deb or rpm:**<br>
+
+    ```sh
+    metricbeat modules enable logstash-xpack
+    ```
+
+    **linux or mac:**
+
+    ```sh
+    ./metricbeat modules enable logstash-xpack
+    ```
+
+    **win:**
+
+    ```sh
+    PS > .\metricbeat.exe modules enable logstash-xpack
+    ```
+
+    For more information, see [Specify which modules to run](beats://reference/metricbeat/configuration-metricbeat.md) and [beat module](beats://reference/metricbeat/metricbeat-module-beat.md).
+
+3. Configure the `logstash-xpack` module in {{metricbeat}}.<br>
+
+    The `modules.d/logstash-xpack.yml` file contains these settings:
+
+    ```yaml
+      - module: logstash
+        metricsets:
+          - node
+          - node_stats
+        period: 10s
+        hosts: ["localhost:9600"]
+        #username: "user"
+        #password: "secret"
+        xpack.enabled: true
+    ```
+
+   ::::{tip}
+   For the best experience with Stack Monitoring, we recommend collecting both `node` and `node_stats` metricsets. Turning off either of these will result in incomplete or missing visualizations.
+   ::::
+
+    Set the `hosts`, `username`, and `password` to authenticate with {{ls}}.
+
+    By default, the module collects {{ls}} monitoring data from `localhost:9600`.
+
+    To monitor multiple {{ls}} instances, specify a list of hosts, for example:
+
+    ```yaml
+    hosts: ["http://localhost:9601","http://localhost:9602","http://localhost:9603"]
+    ```
+
+    **Elastic security.** The Elastic {{security-features}} are enabled by default. You must provide a user ID and password so that {{metricbeat}} can collect metrics successfully:
+
+    1. Create a user on the production cluster that has the `remote_monitoring_collector` [built-in role](elasticsearch://reference/elasticsearch/roles.md).
+    2. Add the `username` and `password` settings to the module configuration file (`logstash-xpack.yml`).
+
+4. Optional: Disable the system module in the {{metricbeat}}.
+
+    By default, the [system module](beats://reference/metricbeat/metricbeat-module-system.md) is enabled. The information it collects, however, is not shown on the **Stack Monitoring** page in {{kib}}. Unless you want to use that information for other purposes, run the following command:
+
+    ```sh
+    metricbeat modules disable system
+    ```
+
+5. Identify where to send the monitoring data.<br>
+
+    ::::{tip}
+    In production environments, we strongly recommend using a separate cluster (referred to as the *monitoring cluster*) to store the data. Using a separate monitoring cluster prevents production cluster outages from impacting your ability to access your monitoring data. It also prevents monitoring activities from impacting the performance of your production cluster.
+    ::::
+
+
+    For example, specify the {{es}} output information in the {{metricbeat}} configuration file (`metricbeat.yml`):
+
+    ```yaml
+    output.elasticsearch:
+      # Array of hosts to connect to.
+      hosts: ["http://es-mon-1:9200", "http://es-mon2:9200"] <1>
+
+      # Optional protocol and basic auth credentials.
+      #protocol: "https"
+      #username: "elastic"
+      #password: "changeme"
+    ```
+
+    1. In this example, the data is stored on a monitoring cluster with nodes `es-mon-1` and `es-mon-2`.
+
+
+    If you configured the monitoring cluster to use encrypted communications, you must access it via HTTPS. For example, use a `hosts` setting like `https://es-mon-1:9200`.
+
+    ::::{important}
+    The {{es}} {{monitor-features}} use ingest pipelines, therefore the cluster that stores the monitoring data must have at least one ingest node.
+    ::::
+
+
+    **Elastic security.** The Elastic {{security-features}} are enabled by default. You must provide a user ID and password so that {{metricbeat}} can send metrics successfully:
+
+    1. Create a user on the monitoring cluster that has the `remote_monitoring_agent` [built-in role](elasticsearch://reference/elasticsearch/roles.md). Alternatively, use the `remote_monitoring_user` [built-in user](docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/built-in-users.md).
+
+        ::::{tip}
+        If you’re using index lifecycle management, the remote monitoring user requires additional privileges to create and read indices. For more information, see `<<feature-roles>>`.
+        ::::
+
+    2. Add the `username` and `password` settings to the {{es}} output information in the {{metricbeat}} configuration file.
+
+    For more information about these configuration options, see [Configure the {{es}} output](beats://reference/metricbeat/elasticsearch-output.md).
+
+6. [Start {{metricbeat}}](beats://reference/metricbeat/metricbeat-starting.md) to begin collecting monitoring data.
+7. [View the monitoring data in {{kib}}](docs-content://deploy-manage/monitor/stack-monitoring/kibana-monitoring-data.md).
+
+Your monitoring setup is complete.
diff --git a/docs/reference/multiline.md b/docs/reference/multiline.md
new file mode 100644
index 000000000..bd7f98f2f
--- /dev/null
+++ b/docs/reference/multiline.md
@@ -0,0 +1,113 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/multiline.html
+---
+
+# Managing Multiline Events [multiline]
+
+Several use cases generate events that span multiple lines of text. In order to correctly handle these multiline events, Logstash needs to know how to tell which lines are part of a single event.
+
+Multiline event processing is complex and relies on proper event ordering. The best way to guarantee ordered log processing is to implement the processing as early in the pipeline as possible.
+
+The [multiline](logstash-docs-md://lsr/plugins-codecs-multiline.md) codec is the preferred tool for handling multiline events in the Logstash pipeline. The multiline codec merges lines from a single input using a simple set of rules.
+
+::::{important}
+If you are using a Logstash input plugin that supports multiple hosts, such as the [beats](logstash-docs-md://lsr/plugins-inputs-beats.md) input plugin, you should not use the [multiline](logstash-docs-md://lsr/plugins-codecs-multiline.md) codec to handle multiline events. Doing so may result in the mixing of streams and corrupted event data. In this situation, you need to handle multiline events before sending the event data to Logstash.
+::::
+
+
+The most important aspects of configuring the multiline codec are the following:
+
+* The `pattern` option specifies a regular expression. Lines that match the specified regular expression are considered either continuations of a previous line or the start of a new multiline event. You can use [grok](logstash-docs-md://lsr/plugins-filters-grok.md) regular expression templates with this configuration option.
+* The `what` option takes two values: `previous` or `next`. The `previous` value specifies that lines that match the value in the `pattern` option are part of the previous line. The `next` value specifies that lines that match the value in the `pattern` option are part of the following line.* The `negate` option applies the multiline codec to lines that *do not* match the regular expression specified in the `pattern` option.
+
+See the full documentation for the [multiline](logstash-docs-md://lsr/plugins-codecs-multiline.md) codec plugin for more information on configuration options.
+
+## Examples of Multiline Codec Configuration [_examples_of_multiline_codec_configuration]
+
+The examples in this section cover the following use cases:
+
+* Combining a Java stack trace into a single event
+* Combining C-style line continuations into a single event
+* Combining multiple lines from time-stamped events
+
+### Java Stack Traces [_java_stack_traces]
+
+Java stack traces consist of multiple lines, with each line after the initial line beginning with whitespace, as in this example:
+
+```java
+Exception in thread "main" java.lang.NullPointerException
+        at com.example.myproject.Book.getTitle(Book.java:16)
+        at com.example.myproject.Author.getBookTitles(Author.java:25)
+        at com.example.myproject.Bootstrap.main(Bootstrap.java:14)
+```
+
+To consolidate these lines into a single event in Logstash, use the following configuration for the multiline codec:
+
+```json
+input {
+  stdin {
+    codec => multiline {
+      pattern => "^\s"
+      what => "previous"
+    }
+  }
+}
+```
+
+This configuration merges any line that begins with whitespace up to the previous line.
+
+
+### Line Continuations [_line_continuations]
+
+Several programming languages use the `\` character at the end of a line to denote that the line continues, as in this example:
+
+```c
+printf ("%10.10ld  \t %10.10ld \t %s\
+  %f", w, x, y, z );
+```
+
+To consolidate these lines into a single event in Logstash, use the following configuration for the multiline codec:
+
+```json
+input {
+  stdin {
+    codec => multiline {
+      pattern => "\\$"
+      what => "next"
+    }
+  }
+}
+```
+
+This configuration merges any line that ends with the `\` character with the following line.
+
+
+### Timestamps [_timestamps]
+
+Activity logs from services such as Elasticsearch typically begin with a timestamp, followed by information on the specific activity, as in this example:
+
+```shell
+[2015-08-24 11:49:14,389][INFO ][env                      ] [Letha] using [1] data paths, mounts [[/
+(/dev/disk1)]], net usable_space [34.5gb], net total_space [118.9gb], types [hfs]
+```
+
+To consolidate these lines into a single event in Logstash, use the following configuration for the multiline codec:
+
+```json
+input {
+  file {
+    path => "/var/log/someapp.log"
+    codec => multiline {
+      pattern => "^%{TIMESTAMP_ISO8601} "
+      negate => true
+      what => previous
+    }
+  }
+}
+```
+
+This configuration uses the `negate` option to specify that any line that does not begin with a timestamp belongs to the previous line.
+
+
+
diff --git a/docs/reference/multiple-input-output-plugins.md b/docs/reference/multiple-input-output-plugins.md
new file mode 100644
index 000000000..dae94433e
--- /dev/null
+++ b/docs/reference/multiple-input-output-plugins.md
@@ -0,0 +1,174 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/multiple-input-output-plugins.html
+---
+
+# Stitching Together Multiple Input and Output Plugins [multiple-input-output-plugins]
+
+The information you need to manage often comes from several disparate sources, and use cases can require multiple destinations for your data. Your Logstash pipeline can use multiple input and output plugins to handle these requirements.
+
+In this section, you create a Logstash pipeline that takes input from a Twitter feed and the Filebeat client, then sends the information to an Elasticsearch cluster as well as writing the information directly to a file.
+
+
+## Reading from a Twitter Feed [twitter-configuration]
+
+To add a Twitter feed, you use the [`twitter`](logstash-docs-md://lsr/plugins-inputs-twitter.md) input plugin. To configure the plugin, you need several pieces of information:
+
+* A *consumer key*, which uniquely identifies your Twitter app.
+* A *consumer secret*, which serves as the password for your Twitter app.
+* One or more *keywords* to search in the incoming feed. The example shows using "cloud" as a keyword, but you can use whatever you want.
+* An *oauth token*, which identifies the Twitter account using this app.
+* An *oauth token secret*, which serves as the password of the Twitter account.
+
+Visit [https://dev.twitter.com/apps](https://dev.twitter.com/apps) to set up a Twitter account and generate your consumer key and secret, as well as your access token and secret. See the docs for the [`twitter`](logstash-docs-md://lsr/plugins-inputs-twitter.md) input plugin if you’re not sure how to generate these keys.
+
+Like you did earlier when you worked on [Parsing Logs with Logstash](/reference/advanced-pipeline.md), create a config file (called `second-pipeline.conf`) that contains the skeleton of a configuration pipeline. If you want, you can reuse the file you created earlier, but make sure you pass in the correct config file name when you run Logstash.
+
+Add the following lines to the `input` section of the `second-pipeline.conf` file, substituting your values for the placeholder values shown here:
+
+```json
+    twitter {
+        consumer_key => "enter_your_consumer_key_here"
+        consumer_secret => "enter_your_secret_here"
+        keywords => ["cloud"]
+        oauth_token => "enter_your_access_token_here"
+        oauth_token_secret => "enter_your_access_token_secret_here"
+    }
+```
+
+
+## Configuring Filebeat to Send Log Lines to Logstash [configuring-lsf]
+
+As you learned earlier in [Configuring Filebeat to Send Log Lines to Logstash](/reference/advanced-pipeline.md#configuring-filebeat), the [Filebeat](https://github.com/elastic/beats/tree/main/filebeat) client is a lightweight, resource-friendly tool that collects logs from files on the server and forwards these logs to your Logstash instance for processing.
+
+After installing Filebeat, you need to configure it. Open the `filebeat.yml` file located in your Filebeat installation directory, and replace the contents with the following lines. Make sure `paths` points to your syslog:
+
+```shell
+filebeat.inputs:
+- type: log
+  paths:
+    - /var/log/*.log <1>
+  fields:
+    type: syslog <2>
+output.logstash:
+  hosts: ["localhost:5044"]
+```
+
+1. Absolute path to the file or files that Filebeat processes.
+2. Adds a field called `type` with the value `syslog` to the event.
+
+
+Save your changes.
+
+To keep the configuration simple, you won’t specify TLS/SSL settings as you would in a real world scenario.
+
+Configure your Logstash instance to use the Filebeat input plugin by adding the following lines to the `input` section of the `second-pipeline.conf` file:
+
+```json
+    beats {
+        port => "5044"
+    }
+```
+
+
+## Writing Logstash Data to a File [logstash-file-output]
+
+You can configure your Logstash pipeline to write data directly to a file with the [`file`](logstash-docs-md://lsr/plugins-outputs-file.md) output plugin.
+
+Configure your Logstash instance to use the `file` output plugin by adding the following lines to the `output` section of the `second-pipeline.conf` file:
+
+```json
+    file {
+        path => "/path/to/target/file"
+    }
+```
+
+
+## Writing to Multiple Elasticsearch Nodes [multiple-es-nodes]
+
+Writing to multiple Elasticsearch nodes lightens the resource demands on a given Elasticsearch node, as well as providing redundant points of entry into the cluster when a particular node is unavailable.
+
+To configure your Logstash instance to write to multiple Elasticsearch nodes, edit the `output` section of the `second-pipeline.conf` file to read:
+
+```json
+output {
+    elasticsearch {
+        hosts => ["IP Address 1:port1", "IP Address 2:port2", "IP Address 3"]
+    }
+}
+```
+
+Use the IP addresses of three non-master nodes in your Elasticsearch cluster in the host line. When the `hosts` parameter lists multiple IP addresses, Logstash load-balances requests across the list of addresses. Also note that the default port for Elasticsearch is `9200` and can be omitted in the configuration above.
+
+
+### Testing the Pipeline [testing-second-pipeline]
+
+At this point, your `second-pipeline.conf` file looks like this:
+
+```json
+input {
+    twitter {
+        consumer_key => "enter_your_consumer_key_here"
+        consumer_secret => "enter_your_secret_here"
+        keywords => ["cloud"]
+        oauth_token => "enter_your_access_token_here"
+        oauth_token_secret => "enter_your_access_token_secret_here"
+    }
+    beats {
+        port => "5044"
+    }
+}
+output {
+    elasticsearch {
+        hosts => ["IP Address 1:port1", "IP Address 2:port2", "IP Address 3"]
+    }
+    file {
+        path => "/path/to/target/file"
+    }
+}
+```
+
+Logstash is consuming data from the Twitter feed you configured, receiving data from Filebeat, and indexing this information to three nodes in an Elasticsearch cluster as well as writing to a file.
+
+At the data source machine, run Filebeat with the following command:
+
+```shell
+sudo ./filebeat -e -c filebeat.yml -d "publish"
+```
+
+Filebeat will attempt to connect on port 5044. Until Logstash starts with an active Beats plugin, there won’t be any answer on that port, so any messages you see regarding failure to connect on that port are normal for now.
+
+To verify your configuration, run the following command:
+
+```shell
+bin/logstash -f second-pipeline.conf --config.test_and_exit
+```
+
+The `--config.test_and_exit` option parses your configuration file and reports any errors. When the configuration file passes the configuration test, start Logstash with the following command:
+
+```shell
+bin/logstash -f second-pipeline.conf
+```
+
+Use the `grep` utility to search in the target file to verify that information is present:
+
+```shell
+grep syslog /path/to/target/file
+```
+
+Run an Elasticsearch query to find the same information in the Elasticsearch cluster:
+
+```shell
+curl -XGET 'localhost:9200/logstash-$DATE/_search?pretty&q=fields.type:syslog'
+```
+
+Replace $DATE with the current date, in YYYY.MM.DD format.
+
+To see data from the Twitter feed, try this query:
+
+```shell
+curl -XGET 'http://localhost:9200/logstash-$DATE/_search?pretty&q=client:iphone'
+```
+
+Again, remember to replace $DATE with the current date, in YYYY.MM.DD format.
+
diff --git a/docs/reference/multiple-pipelines.md b/docs/reference/multiple-pipelines.md
new file mode 100644
index 000000000..8ec037296
--- /dev/null
+++ b/docs/reference/multiple-pipelines.md
@@ -0,0 +1,33 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/multiple-pipelines.html
+---
+
+# Multiple Pipelines [multiple-pipelines]
+
+If you need to run more than one pipeline in the same process, Logstash provides a way to do this through a configuration file called `pipelines.yml`. This file must be placed in the `path.settings` folder and follows this structure:
+
+```yaml
+- pipeline.id: my-pipeline_1
+  path.config: "/etc/path/to/p1.config"
+  pipeline.workers: 3
+- pipeline.id: my-other-pipeline
+  path.config: "/etc/different/path/p2.cfg"
+  queue.type: persisted
+```
+
+This file is formatted in YAML and contains a list of dictionaries, where each dictionary describes a pipeline, and each key/value pair specifies a setting for that pipeline. The example shows two different pipelines described by their IDs and  configuration paths. For the first pipeline, the value of `pipeline.workers` is set to 3, while in the other, the persistent queue feature is enabled. The value of a setting that is not explicitly set in the `pipelines.yml` file will fall back to the default specified in the `logstash.yml` [settings file](/reference/logstash-settings-file.md).
+
+When you start Logstash without arguments, it will read the `pipelines.yml` file and instantiate all pipelines specified in the file. On the other hand, when you use `-e` or `-f`, Logstash ignores the `pipelines.yml` file and logs a warning about it.
+
+## Usage Considerations [multiple-pipeline-usage]
+
+Using multiple pipelines is especially useful if your current configuration has event flows that don’t share the same inputs/filters and outputs and are being separated from each other using tags and conditionals.
+
+Having multiple pipelines in a single instance also allows these event flows to have different performance and durability parameters (for example, different settings for pipeline workers and persistent queues). This separation means that a blocked output in one pipeline won’t exert backpressure in the other.
+
+That said, it’s important to take into account resource competition between the pipelines, given that the default values are tuned for a single pipeline. So, for example, consider reducing the number of pipeline workers used by each pipeline, because each pipeline will use 1 worker per CPU core by default.
+
+Persistent queues and dead letter queues are isolated per pipeline, with their locations namespaced by the `pipeline.id` value.
+
+
diff --git a/docs/reference/offline-plugins.md b/docs/reference/offline-plugins.md
new file mode 100644
index 000000000..1bbce3f6f
--- /dev/null
+++ b/docs/reference/offline-plugins.md
@@ -0,0 +1,78 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/offline-plugins.html
+---
+
+# Offline Plugin Management [offline-plugins]
+
+The Logstash [plugin manager](/reference/working-with-plugins.md) provides support for preparing offline plugin packs that you can use to install Logstash plugins on systems that don’t have Internet access.
+
+This procedure requires a staging machine running Logstash that has access to a public or [private Rubygems](/reference/private-rubygem.md) server. The staging machine downloads and packages all the files and dependencies required for offline installation.
+
+
+## Building Offline Plugin Packs [building-offline-packs]
+
+An *offline plugin pack* is a compressed file that contains all the plugins your offline Logstash installation requires, along with the dependencies for those plugins.
+
+To build an offline plugin pack:
+
+1. Make sure all the plugins that you want to package are installed on the staging server and that the staging server can access the Internet.
+2. Run the `bin/logstash-plugin prepare-offline-pack` subcommand to package the plugins and dependencies:
+
+    ```shell
+    bin/logstash-plugin prepare-offline-pack --output OUTPUT --overwrite [PLUGINS]
+    ```
+
+    where:
+
+    * `OUTPUT` specifies the zip file where the compressed plugin pack will be written. The default file is `/LOGSTASH_HOME/logstash-offline-plugins-9.0.0.zip`. If you are using 5.2.x and 5.3.0, this location should be a zip file whose contents will be overwritten.
+    * `[PLUGINS]` specifies one or more plugins that you want to include in the pack.
+    * `--overwrite` specifies if you want to override an existing file at the location
+
+
+Examples:
+
+```sh
+bin/logstash-plugin prepare-offline-pack logstash-input-beats <1>
+bin/logstash-plugin prepare-offline-pack logstash-filter-* <2>
+bin/logstash-plugin prepare-offline-pack logstash-filter-* logstash-input-beats <3>
+```
+
+1. Packages the Beats input plugin and any dependencies.
+2. Uses a wildcard to package all filter plugins and any dependencies.
+3. Packages all filter plugins, the Beats input plugin, and any dependencies.
+
+
+::::{note}
+Downloading all dependencies for the specified plugins may take some time, depending on the plugins listed.
+::::
+
+
+
+## Installing Offline Plugin Packs [installing-offline-packs]
+
+To install an offline plugin pack:
+
+1. Move the compressed bundle to the machine where you want to install the plugins.
+2. Run the `bin/logstash-plugin install` subcommand and pass in the file URI of the offline plugin pack.
+
+    ```sh
+    bin/logstash-plugin install file:///c:/path/to/logstash-offline-plugins-9.0.0.zip
+    ```
+
+    ```sh
+    bin/logstash-plugin install file:///path/to/logstash-offline-plugins-9.0.0.zip
+    ```
+
+    This command expects a file URI, so make sure you use forward slashes and specify the full path to the pack.
+
+
+
+## Updating Offline Plugins [updating-offline-packs]
+
+To update offline plugins, you update the plugins on the staging server and then use the same process that you followed to build and install the plugin pack:
+
+1. On the staging server, run the `bin/logstash-plugin update` subcommand to update the plugins. See [Updating plugins](/reference/working-with-plugins.md#updating-plugins).
+2. Create a new version of the plugin pack. See [Building Offline Plugin Packs](#building-offline-packs).
+3. Install the new version of the plugin pack. See [Installing Offline Plugin Packs](#installing-offline-packs).
+
diff --git a/docs/reference/performance-troubleshooting.md b/docs/reference/performance-troubleshooting.md
new file mode 100644
index 000000000..bbb7416a7
--- /dev/null
+++ b/docs/reference/performance-troubleshooting.md
@@ -0,0 +1,56 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/performance-troubleshooting.html
+---
+
+# Performance troubleshooting [performance-troubleshooting]
+
+You can use these troubleshooting tips to quickly diagnose and resolve Logstash performance problems. Advanced knowledge of pipeline internals is not required to understand this guide. However, the [pipeline documentation](/reference/how-logstash-works.md) is recommended reading if you want to go beyond these tips.
+
+You may be tempted to jump ahead and change settings like `pipeline.workers` (`-w`) as a first attempt to improve performance. In our experience, changing this setting makes it more difficult to troubleshoot performance problems because you increase the number of variables in play. Instead, make one change at a time and measure the results. Starting at the end of this list is a sure-fire way to create a confusing situation.
+
+
+## Performance checklist [_performance_checklist]
+
+1. **Check the performance of input sources and output destinations:**
+
+    * Logstash is only as fast as the services it connects to. Logstash can only consume and produce data as fast as its input and output destinations can!
+
+2. **Check system statistics:**
+
+    * CPU
+
+        * Note whether the CPU is being heavily used. On Linux/Unix, you can run `top -H` to see process statistics broken out by thread, as well as total CPU statistics.
+        * If CPU usage is high, skip forward to the section about checking the JVM heap and then read the section about tuning Logstash worker settings.
+
+    * Memory
+
+        * Be aware of the fact that Logstash runs on the Java VM. This means that Logstash will always use the maximum amount of memory you allocate to it.
+        * Look for other applications that use large amounts of memory and may be causing Logstash to swap to disk. This can happen if the total memory used by applications exceeds physical memory.
+
+    * I/O Utilization
+
+        * Monitor disk I/O to check for disk saturation.
+
+            * Disk saturation can happen if you’re using Logstash plugins (such as the file output) that may saturate your storage.
+            * Disk saturation can also happen if you’re encountering a lot of errors that force Logstash to generate large error logs.
+            * On Linux, you can use iostat, dstat, or something similar to monitor disk I/O.
+
+        * Monitor network I/O for network saturation.
+
+            * Network saturation can happen if you’re using inputs/outputs that perform a lot of network operations.
+            * On Linux, you can use a tool like dstat or iftop to monitor your network.
+
+3. **Check the JVM heap:**
+
+    * The recommended heap size for typical ingestion scenarios should be no less than 4GB and no more than 8GB.
+    * CPU utilization can increase unnecessarily if the heap size is too low, resulting in the JVM constantly garbage collecting. You can check for this issue by doubling the heap size to see if performance improves.
+    * Do not increase the heap size past the amount of physical memory. Some memory must be left to run the OS and other processes.  As a general guideline for most installations, don’t exceed 50-75% of physical memory. The more memory you have, the higher percentage you can use.
+    * Set the minimum (Xms) and maximum (Xmx) heap allocation size to the same value to prevent the heap from resizing at runtime, which is a very costly process.
+    * You can make more accurate measurements of the JVM heap by using either the `jmap` command line utility distributed with Java or by using VisualVM. For more info, see [Profiling the heap](/reference/tuning-logstash.md#profiling-the-heap).
+
+4. **Tune Logstash pipeline settings:**
+
+    * Continue on to [Tuning and profiling logstash pipeline performance](/reference/tuning-logstash.md) to learn about tuning individual pipelines.
+
+
diff --git a/docs/reference/performance-tuning.md b/docs/reference/performance-tuning.md
new file mode 100644
index 000000000..87fdd73cf
--- /dev/null
+++ b/docs/reference/performance-tuning.md
@@ -0,0 +1,14 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/performance-tuning.html
+---
+
+# Performance tuning [performance-tuning]
+
+This section includes the following information about tuning Logstash performance:
+
+* [Performance troubleshooting](/reference/performance-troubleshooting.md)
+* [Tuning and profiling logstash pipeline performance](/reference/tuning-logstash.md)
+
+
+
diff --git a/docs/reference/persistent-queues.md b/docs/reference/persistent-queues.md
new file mode 100644
index 000000000..028422088
--- /dev/null
+++ b/docs/reference/persistent-queues.md
@@ -0,0 +1,368 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/persistent-queues.html
+---
+
+# Persistent queues (PQ) [persistent-queues]
+
+A {{ls}} persistent queue helps protect against data loss during abnormal termination by storing the in-flight message queue to disk.
+
+## Benefits of persistent queues [persistent-queues-benefits]
+
+A persistent queue (PQ):
+
+* Helps protect against message loss during a normal shutdown and when Logstash is terminated abnormally. If Logstash is restarted while events are in-flight, Logstash attempts to deliver messages stored in the persistent queue until delivery succeeds at least once.
+* Can absorb bursts of events without needing an external buffering mechanism like Redis or Apache Kafka.
+
+::::{note}
+Persistent queues are disabled by default. To enable them, check out [Configuring persistent queues](#configuring-persistent-queues).
+::::
+
+
+
+## Limitations of persistent queues [persistent-queues-limitations]
+
+Persistent queues do not solve these problems:
+
+* Input plugins that do not use a request-response protocol cannot be protected from data loss. Tcp, udp, zeromq push+pull, and many other inputs do not have a mechanism to acknowledge receipt to the sender. (Plugins such as beats and http, which **do** have an acknowledgement capability, are well protected by this queue.)
+* Data may be lost if an abnormal shutdown occurs before the checkpoint file has been committed.
+* A persistent queue does not handle permanent machine failures such as disk corruption, disk failure, and machine loss. The data persisted to disk is not replicated.
+
+::::{tip}
+Use the local filesystem for data integrity and performance. Network File System (NFS) is not supported.
+::::
+
+
+
+## Configuring persistent queues [configuring-persistent-queues]
+
+To configure persistent queues, specify options in the Logstash [settings file](/reference/logstash-settings-file.md). Settings are applied to every pipeline.
+
+When you set values for capacity and sizing settings, remember that the value you set is applied *per pipeline* rather than a total to be shared among all pipelines.
+
+::::{tip}
+If you want to define values for a specific pipeline, use [`pipelines.yml`](/reference/multiple-pipelines.md).
+::::
+
+
+`queue.type`
+:   Specify `persisted` to enable persistent queues. By default, persistent queues are disabled (default: `queue.type: memory`).
+
+`path.queue`
+:   The directory path where the data files will be stored. By default, the files are stored in `path.data/queue`.
+
+`queue.page_capacity`
+:   The queue data consists of append-only files called "pages." This value sets the maximum size of a queue page in bytes. The default size of 64mb is a good value for most users, and changing this value is unlikely to have performance benefits. If you change the page capacity of an existing queue, the new size applies only to the new page.
+
+`queue.drain`
+:   Specify `true` if you want Logstash to wait until the persistent queue is drained before shutting down. The amount of time it takes to drain the queue depends on the number of events that have accumulated in the queue. Therefore, you should avoid using this setting unless the queue, even when full, is relatively small and can be drained quickly.
+
+`queue.max_events`
+:   The maximum number of events not yet read by the pipeline worker. The default is 0 (unlimited). We use this setting for internal testing. Users generally shouldn’t be changing this value.
+
+`queue.max_bytes`
+:   The total capacity of *each queue* in number of bytes. Unless overridden in `pipelines.yml` or central management, each persistent queue will be sized at the value of `queue.max_bytes` specified in `logstash.yml`. The default is 1024mb (1gb).
+
+    ::::{note}
+    Be sure that your disk has sufficient capacity to handle the cumulative total of `queue.max_bytes` across all persistent queues. The total of `queue.max_bytes` for *all* queues should be lower than the capacity of your disk.
+    ::::
+
+
+    ::::{tip}
+    If you are using persistent queues to protect against data loss, but don’t require much buffering, you can set `queue.max_bytes` to a smaller value as long as it is not less than the value of `queue.page_capacity`. A smaller value produces smaller queues and improves queue performance.
+    ::::
+
+
+`queue.checkpoint.acks`
+:   Sets the number of acked events before forcing a checkpoint. Default is `1024`. Set to `0` for unlimited.
+
+`queue.checkpoint.writes`
+:   Sets the maximum number of written events before a forced checkpoint. Default is `1024`. Set to `0` for unlimited.
+
+    To avoid losing data in the persistent queue, you can set `queue.checkpoint.writes: 1` to force a checkpoint after each event is written. Keep in mind that disk writes have a resource cost. Setting this value to `1` ensures maximum durability, but can severely impact performance. See [Controlling durability](#durability-persistent-queues) to better understand the trade-offs.
+
+
+`queue.checkpoint.interval`
+:   Sets the interval in milliseconds when a checkpoint is forced on the head page. Default is `1000`. Set to `0` to eliminate periodic checkpoints.
+
+
+## Configuration notes [pq-config-notes]
+
+Every situation and environment is different, and the "ideal" configuration varies. If you optimize for performance, you may increase your risk of losing data. If you optimize for data protection, you may impact performance.
+
+### Queue size [pq-size]
+
+You can control queue size with the `queue.max_events` and  `queue.max_bytes` settings. If both settings are specified, Logstash uses whichever criteria is reached first. See [Handling back pressure](#backpressure-persistent-queue) for behavior when queue limits are reached.
+
+Appropriate sizing for the queue depends on the use-case. As a general guiding principle, consider this formula to size your persistent queue.
+
+```txt
+Bytes Received Per Second = Incoming Events Per Second * Raw Event Byte Size
+Bytes Received Per Hour = Bytes Received per Second * 3600s
+Required Queue Capacity = (Bytes Received Per Hour * Tolerated Hours of Downtime) * Multiplication Factor <1>
+```
+
+1. To start, you can set the `Multiplication Factor` to `1.10`, and then refine it for specific data types as indicated in the tables below.
+
+
+#### Queue size by data type [sizing-by-type]
+
+{{ls}} serializes the events it receives before they are stored in the queue. This process results in added overhead to the event inside {{ls}}. This overhead depends on the type and the size of the `Original Event Size`. As such, the `Multiplication Factor` changes depending on your use case. These tables show examples of overhead by event type and how that affects the multiplication factor.
+
+**Raw string message**
+
+| Plaintext size (bytes) | Serialized {{ls}} event size (bytes) | Overhead (bytes) | Overhead (%) | Multiplication Factor |
+| --- | --- | --- | --- | --- |
+| 11 | 213 | `202` | `1836%` | `19.4` |
+| 1212 | 1416 | `204` | `17%` | `1.17` |
+| 10240 | 10452 | `212` | `2%` | `1.02` |
+
+**JSON document**
+
+| JSON document size (bytes) | Serialized {{ls}} event size (bytes) | Overhead (bytes) | Overhead (%) | Multiplication Factor |
+| --- | --- | --- | --- | --- |
+| 947 | 1133 | `186` | `20%` | `1.20` |
+| 2707 | 3206 | `499` | `18%` | `1.18` |
+| 6751 | 7388 | `637` | `9%` | `1.09` |
+| 58901 | 59693 | `792` | `1%` | `1.01` |
+
+**Example**
+
+Let’s consider a {{ls}} instance that receives 1000 EPS and each event is 1KB, or 3.5GB every hour. In order to tolerate a downstream component being unavailable for 12h without {{ls}} exerting back-pressure upstream, the persistent queue’s `max_bytes` would have to be set to 3.6*12*1.10 = 47.25GB, or about 50GB.
+
+
+
+### Smaller queue size [pq-lower-max_bytes]
+
+If you are using persistent queues to protect against data loss, but don’t require much buffering, you can set `queue.max_bytes` to a smaller value. A smaller value may produce smaller queues and improves queue performance.
+
+**Sample configuration**
+
+```yaml
+queue.type: persisted
+queue.max_bytes: 10mb
+```
+
+
+### Fewer checkpoints [pq-fewer-checkpoints]
+
+Setting `queue.checkpoint.writes` and `queue.checkpoint.acks` to `0` may yield maximum performance, but may have potential impact on durability.
+
+In a situation where Logstash is terminated or there is a hardware-level failure, any data that has not been checkpointed, is lost. See [Controlling durability](#durability-persistent-queues) to better understand the trade-offs.
+
+
+### PQs and pipeline-to-pipeline communication [pq-pline-pline]
+
+Persistent queues can play an important role in your [pipeline-to-pipeline](/reference/pipeline-to-pipeline.md) configuration.
+
+#### Use case: PQs and output isolator pattern [uc-isolator]
+
+Here is a real world use case described by a Logstash user.
+
+"*In our deployment, we use one pipeline per output, and each pipeline has a large PQ. This configuration allows a single output to stall without blocking the input (and thus all other outputs), until the operator can restore flow to the stalled output and let the queue drain.*"
+
+"*Our real-time outputs must be low-latency, and our bulk outputs must be consistent. We use PQs to protect against stalling the real-time outputs more so than to protect against data loss in the bulk outputs. (Although the protection is nice, too).*"
+
+
+
+
+## Troubleshooting persistent queues [troubleshooting-pqs]
+
+Symptoms of persistent queue problems include {{ls}} or one or more pipelines not starting successfully, accompanied by an error message similar to this one.
+
+```
+message=>"java.io.IOException: Page file size is too small to hold elements"
+```
+
+This error indicates that the head page (the oldest in a directory and the one with lowest page id) has a size < 18 bytes, the size of a page header.
+
+To research and resolve the issue:
+
+1. Identify the queue (or queues) that may be corrupt by checking log files, or running the `pqcheck` utility.
+2. Stop Logstash, and wait for it to shut down.
+3. Run `pqrepair <path>` for each of the corrupted queues.
+
+### `pqcheck` utility [pqcheck]
+
+```
+the `pqcheck` utility to identify which persistent queue--or queues--have been corrupted.
+```
+From LOGSTASH_HOME, run:
+
+```txt
+bin/pqcheck <queue_directory>
+```
+
+where `<queue_directory>` is the fully qualified path to the persistent queue location.
+
+The `pqcheck utility` reads through the checkpoint files in the given directory and outputs information about the current state of those files. The utility outputs this information for each checkpoint file:
+
+* Checkpoint file name
+* Whether or not the page file has been fully acknowledged. A fully acknowledged page file indicates that all events have been read and processed.
+* Page file name that the checkpoint file is referencing
+* Size of the page file. A page file with a size of 0 results in the output `NOT FOUND`. In this case, run `pqrepair` against the specified queue directory.
+* Page number
+* First unacknowledged page number (only relevant in the head checkpoint)
+* First unacknowledged event sequence number in the page
+* First event sequence number in the page
+* Number of events in the page
+* Whether or not the page has been fully acknowledged
+
+**Sample with healthy page file**
+
+This sample represents a healthy queue with three page files. In this sample, Logstash is currently writing to `page.2` as referenced by `checkpoint.head`. Logstash is reading from `page.0` as referenced by `checkpoint.0`.
+
+```txt
+ubuntu@bigger:/usr/share/logstash$ bin/pqcheck /var/lib/logstash/queue/main/
+Using bundled JDK: /usr/share/logstash/jdk
+OpenJDK 64-Bit Server VM warning: Option UseConcMarkSweepGC was deprecated in version 9.0 and will likely be removed in a future release.
+Checking queue dir: /var/lib/logstash/queue/main
+checkpoint.1, fully-acked: NO, page.1 size: 67108864
+  pageNum=1, firstUnackedPageNum=0, firstUnackedSeqNum=239675, minSeqNum=239675,
+  elementCount=218241, isFullyAcked=no
+checkpoint.head, fully-acked: NO, page.2 size: 67108864
+  pageNum=2, firstUnackedPageNum=0, firstUnackedSeqNum=457916, minSeqNum=457916, elementCount=11805, isFullyAcked=no
+checkpoint.0, fully-acked: NO, page.0 size: 67108864  <1>
+  pageNum=0, firstUnackedPageNum=0, firstUnackedSeqNum=176126, minSeqNum=1,
+  elementCount=239674, isFullyAcked=no <2>
+```
+
+1. Represents `checkpoint.0`, which refers to the page file `page.0`, and has a size of `67108864`.
+2. Continuing for `checkpoint.0`, these lines indicate that the page number is `0`, the first unacknowledged event is number `176126`, there are `239674` events in the page file, the first event in this page file is event number `1`, and the page file has not been fully acknowledged. That is, there are still events left in the page file that need to be ingested.
+
+
+**Sample with corrupted page file**
+
+If Logstash doesn’t start and/or `pqcheck` shows an anomaly, such as `NOT_FOUND` for a page, run `pqrepair` on the queue directory.
+
+```txt
+bin/pqcheck /var/lib/logstash/queue/main/
+Using bundled JDK: /usr/share/logstash/jdk
+OpenJDK 64-Bit Server VM warning: Option UseConcMarkSweepGC was deprecated in version 9.0 and will likely be removed in a future release.
+Checking queue dir: /var/lib/logstash/queue/main
+checkpoint.head, fully-acked: NO, page.2 size: NOT FOUND <1>
+  pageNum=2, firstUnackedPageNum=2, firstUnackedSeqNum=534041, minSeqNum=457916,
+  elementCount=76127, isFullyAcked=no
+```
+
+1. `NOT FOUND` is an indication of a corrupted page file. Run `pqrepair` against the specified queue directory.
+
+
+::::{note}
+If the queue shows `fully-acked: YES` and 0 bytes, you can safely delete the file.
+::::
+
+
+
+### `pqrepair` utility [pqrepair]
+
+The `pqrepair` utility tries to remove corrupt queue segments to bring the queue back into working order. It starts searching from the directory where is launched and looks for `data/queue/main`.
+
+::::{note}
+The queue may lose some data in this operation.
+::::
+
+
+From LOGSTASH_HOME, run:
+
+```txt
+bin/pqrepair <queue_directory>
+```
+
+where `<queue_directory>` is the fully qualified path to the persistent queue location.
+
+There is no output if the utility runs properly.
+
+The `pqrepair` utility requires write access to the directory. Folder permissions may cause problems when Logstash is run as a service. In this situation, use `sudo`.
+
+```txt
+/usr/share/logstash$ sudo -u logstash bin/pqrepair /var/lib/logstash/queue/main/
+```
+
+After you run `pqrepair`, restart Logstash to verify that the repair operation was successful.
+
+
+### Draining the queue [draining-pqs]
+
+You may encounter situations where you want to drain the queue. Examples include:
+
+* Pausing new ingestion. There may be situations where you want to stop new ingestion, but still keep a backlog of data.
+* PQ repair. You can drain the queue to route to a different PQ while repairing an old one.
+* Data or workflow migration. If you are moving off a disk/hardware and/or migrating to a new data flow, you may want to drain the existing queue.
+
+To drain the persistent queue:
+
+1. In the `logstash.yml` file, set `queue.drain: true`.
+2. Restart Logstash for this setting to take effect.
+3. Shutdown Logstash (using CTRL+C or SIGTERM), and wait for the queue to empty.
+
+
+
+## How persistent queues work [persistent-queues-architecture]
+
+The queue sits between the input and filter stages in the same process:
+
+input → queue → filter + output
+
+When an input has events ready to process, it writes them to the queue. When the write to the queue is successful, the input can send an acknowledgement to its data source.
+
+When processing events from the queue, Logstash acknowledges events as completed, within the queue, only after filters and outputs have completed. The queue keeps a record of events that have been processed by the pipeline. An event is recorded as processed (in this document, called "acknowledged" or "ACKed") if, and only if, the event has been processed completely by the Logstash pipeline.
+
+What does acknowledged mean? This means the event has been handled by all configured filters and outputs. For example, if you have only one output, Elasticsearch, an event is ACKed when the Elasticsearch output has successfully sent this event to Elasticsearch.
+
+During a normal shutdown (**CTRL+C** or SIGTERM), Logstash stops reading from the queue and finishes processing the in-flight events being processed by the filters and outputs. Upon restart, Logstash resumes processing the events in the persistent queue as well as accepting new events from inputs.
+
+If Logstash is abnormally terminated, any in-flight events will not have been ACKed and will be reprocessed by filters and outputs when Logstash is restarted. Logstash processes events in batches, so it is possible that for any given batch, some of that batch may have been successfully completed, but not recorded as ACKed, when an abnormal termination occurs.
+
+::::{note}
+If you override the default behavior by setting `drain.queue: true`, Logstash reads from the queue until it is emptied—​even after a controlled shutdown.
+::::
+
+
+For more details specific behaviors of queue writes and acknowledgement, see [Controlling durability](#durability-persistent-queues).
+
+### Handling back pressure [backpressure-persistent-queue]
+
+When the queue is full, Logstash puts back pressure on the inputs to stall data flowing into Logstash. This mechanism helps Logstash control the rate of data flow at the input stage without overwhelming outputs like Elasticsearch.
+
+Use `queue.max_bytes` setting to configure the total capacity of the queue on disk. The following example sets the total capacity of the queue to 8gb:
+
+```yaml
+queue.type: persisted
+queue.max_bytes: 8gb
+```
+
+With these settings specified, Logstash buffers events on disk until the size of the queue reaches 8gb. When the queue is full of unACKed events, and the size limit has been reached, Logstash no longer accepts new events.
+
+Each input handles back pressure independently. For example, when the [beats](logstash-docs-md://lsr/plugins-inputs-beats.md) input encounters back pressure, it no longer accepts new connections and waits until the persistent queue has space to accept more events. After the filter and output stages finish processing existing events in the queue and ACKs them, Logstash automatically starts accepting new events.
+
+
+### Controlling durability [durability-persistent-queues]
+
+Durability is a property of storage writes that ensures data will be available after it’s written.
+
+When the persistent queue feature is enabled, Logstash stores events on disk. Logstash commits to disk in a mechanism called *checkpointing*.
+
+The queue itself is a set of pages. There are two kinds of pages: head pages and tail pages. The head page is where new events are written. There is only one head page. When the head page is of a certain size (see `queue.page_capacity`), it becomes a tail page, and a new head page is created. Tail pages are immutable, and the head page is append-only. Second, the queue records details about itself (pages, acknowledgements, etc) in a separate file called a checkpoint file.
+
+When recording a checkpoint, Logstash:
+
+* Calls `fsync` on the head page.
+* Atomically writes to disk the current state of the queue.
+
+The process of checkpointing is atomic, which means any update to the file is saved if successful.
+
+::::{important}
+If Logstash is terminated, or if there is a hardware-level failure, any data that is buffered in the persistent queue, but not yet checkpointed, is lost.
+::::
+
+
+You can force Logstash to checkpoint more frequently by setting `queue.checkpoint.writes`. This setting specifies the maximum number of events that may be written to disk before forcing a checkpoint. The default is 1024. To ensure maximum durability and avoid data loss in the persistent queue, you can set `queue.checkpoint.writes: 1` to force a checkpoint after each event is written. Keep in mind that disk writes have a resource cost. Setting this value to `1` can severely impact performance.
+
+
+### Disk garbage collection [garbage-collection]
+
+On disk, the queue is stored as a set of pages where each page is one file. Each page can be at most `queue.page_capacity` in size. Pages are deleted (garbage collected) after all events in that page have been ACKed. If an older page has at least one event that is not yet ACKed, that entire page will remain on disk until all events in that page are successfully processed. Each page containing unprocessed events will count against the `queue.max_bytes` byte size.
+
+
+
diff --git a/docs/reference/pipeline-to-pipeline.md b/docs/reference/pipeline-to-pipeline.md
new file mode 100644
index 000000000..a05cd7b9a
--- /dev/null
+++ b/docs/reference/pipeline-to-pipeline.md
@@ -0,0 +1,215 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/pipeline-to-pipeline.html
+---
+
+# Pipeline-to-pipeline communication [pipeline-to-pipeline]
+
+When using the multiple pipeline feature of Logstash, you may want to connect multiple pipelines within the same Logstash instance. This configuration can be useful to isolate the execution of these pipelines, as well as to help break-up the logic of complex pipelines. The `pipeline` input/output enables a number of advanced architectural patterns discussed later in this document.
+
+If you need to set up communication *between* Logstash instances, use either [Logstash-to-Logstash](/reference/logstash-to-logstash-communications.md) communications, or an intermediary queue, such as Kafka or Redis.
+
+::::{tip}
+Persistent queues (PQs) can help keep data moving through pipelines. See [PQs and pipeline-to-pipeline communication](/reference/persistent-queues.md#pq-pline-pline) to learn how PQs can enhance your pipeline-to-pipeline communication strategy.
+::::
+
+
+## Configuration overview [pipeline-to-pipeline-overview]
+
+Use the `pipeline` input and `pipeline` output to connect two pipelines running within the same Logstash instance. These inputs use a client-server approach, where the `pipeline` input registers a virtual address that a `pipeline` output can connect to.
+
+1. Create a *downstream* pipeline that listens for events on a virtual address.
+2. Create an *upstream* pipeline that produces events, sending them through a `pipeline` output to one or more virtual addresses.
+
+Here is a simple example of this configuration.
+
+```yaml
+# config/pipelines.yml
+- pipeline.id: upstream
+  config.string: input { stdin {} } output { pipeline { send_to => [myVirtualAddress] } }
+- pipeline.id: downstream
+  config.string: input { pipeline { address => myVirtualAddress } }
+```
+
+### How it works [how-pipeline-to-pipeline-works]
+
+The `pipeline` input acts as a virtual server listening on a single virtual address in the local process. Only `pipeline` outputs running on the same local Logstash can send events to this address. Pipeline `outputs` can send events to a list of virtual addresses. A `pipeline` output will be blocked if the downstream pipeline is blocked or unavailable.
+
+When events are sent across pipelines, their data is fully copied. Modifications to an event in a downstream pipeline do not affect that event in any upstream pipelines.
+
+The `pipeline` plugin may be the most efficient way to communicate between pipelines, but it still incurs a performance cost. Logstash must duplicate each event in full on the Java heap for each downstream pipeline. Using this feature may affect the heap memory utilization of Logstash.
+
+
+### Delivery guarantees [delivery-guarantees]
+
+In its standard configuration the `pipeline` input/output has at-least-once delivery guarantees. The output will be blocked if the address is blocked or unavailable.
+
+By default, the `ensure_delivery` option on the `pipeline` output is set to `true.` If you change the `ensure_delivery` flag to `false`, an *unavailable* downstream pipeline causes the sent message to be discarded. Note that a pipeline is considered unavailable only when it is starting up or reloading, not when any of the plugins it may contain are blocked. A *blocked* downstream pipeline blocks the sending output/pipeline regardless of the value of the `ensure_delivery` flag. Use `ensure_delivery => false` when you want the ability to temporarily disable a downstream pipeline without blocking any upstream pipelines sending to it.
+
+These delivery guarantees also inform the shutdown behavior of this feature. When performing a pipeline reload, changes will be made immediately as the user requests, even if that means removing a downstream pipeline receiving events from an upstream pipeline. This will cause the upstream pipeline to block. You must restore the downstream pipeline to cleanly shut down Logstash. You may issue a force kill, but inflight events may be lost unless the persistent queue is enabled for that pipeline.
+
+
+### Avoid cycles [avoid-cycles]
+
+When you connect pipelines, keep the data flowing in one direction. Looping data or connecting the pipelines into a cyclic graph can cause problems. Logstash waits for each pipeline’s work to complete before shutting down. Pipeline loops can prevent Logstash from shutting down cleanly.
+
+
+
+## Architectural patterns [architectural-patterns]
+
+You can use the `pipeline` input and output to better organize code, streamline control flow, and isolate the performance of complex configurations. There are infinite ways to connect pipelines. The ones presented here offer some ideas.
+
+* [The distributor pattern](#distributor-pattern)
+* [The output isolator pattern](#output-isolator-pattern)
+* [The forked path pattern](#forked-path-pattern)
+* [The collector pattern](#collector-pattern)
+
+::::{note}
+These examples use `config.string` to illustrate the flows. You can also use configuration files for pipeline-to-pipeline communication.
+::::
+
+
+### The distributor pattern [distributor-pattern]
+
+You can use the distributor pattern in situations where there are multiple types of data coming through a single input, each with its own complex set of processing rules. With the distributor pattern one pipeline is used to route data to other pipelines based on type. Each type is routed to a pipeline with only the logic for handling that type. In this way each type’s logic can be isolated.
+
+As an example, in many organizations a single beats input may be used to receive traffic from a variety of sources, each with its own processing logic. A common way to deal with this type of data is to have a number of `if` conditions separating the traffic and processing each type differently. This approach can quickly get messy when configs are long and complex.
+
+Here is an example distributor pattern configuration.
+
+```yaml
+# config/pipelines.yml
+- pipeline.id: beats-server
+  config.string: |
+    input { beats { port => 5044 } }
+    output {
+        if [type] == apache {
+          pipeline { send_to => weblogs }
+        } else if [type] == system {
+          pipeline { send_to => syslog }
+        } else {
+          pipeline { send_to => fallback }
+        }
+    }
+- pipeline.id: weblog-processing
+  config.string: |
+    input { pipeline { address => weblogs } }
+    filter {
+       # Weblog filter statements here...
+    }
+    output {
+      elasticsearch { hosts => [es_cluster_a_host] }
+    }
+- pipeline.id: syslog-processing
+  config.string: |
+    input { pipeline { address => syslog } }
+    filter {
+       # Syslog filter statements here...
+    }
+    output {
+      elasticsearch { hosts => [es_cluster_b_host] }
+    }
+- pipeline.id: fallback-processing
+    config.string: |
+    input { pipeline { address => fallback } }
+    output { elasticsearch { hosts => [es_cluster_b_host] } }
+```
+
+Notice how following the flow of data is a simple due to the fact that each pipeline only works on a single specific task.
+
+
+### The output isolator pattern [output-isolator-pattern]
+
+You can use the output isolator pattern to prevent Logstash from becoming blocked if one of multiple outputs experiences a temporary failure. Logstash, by default, is blocked when any single output is down. This behavior is important in guaranteeing at-least-once delivery of data.
+
+For example, a server might be configured to send log data to both Elasticsearch and an HTTP endpoint. The HTTP endpoint might be frequently unavailable due to regular service or other reasons. In this scenario, data would be paused from sending to Elasticsearch any time the HTTP endpoint is down.
+
+Using the output isolator pattern and persistent queues, we can continue sending to Elasticsearch, even when one output is down.
+
+Here is an example of this scenario using the output isolator pattern.
+
+```yaml
+# config/pipelines.yml
+- pipeline.id: intake
+  config.string: |
+    input { beats { port => 5044 } }
+    output { pipeline { send_to => [es, http] } }
+- pipeline.id: buffered-es
+  queue.type: persisted
+  config.string: |
+    input { pipeline { address => es } }
+    output { elasticsearch { } }
+- pipeline.id: buffered-http
+  queue.type: persisted
+  config.string: |
+    input { pipeline { address => http } }
+    output { http { } }
+```
+
+In this architecture, each output has its own queue with its own tuning and settings. Note that this approach uses up to twice as much disk space and incurs three times as much serialization/deserialization cost as a single pipeline.
+
+If any of the persistent queues of the downstream pipelines (in the example above, `buffered-es` and `buffered-http`) become full, both outputs will stop.
+
+
+### The forked path pattern [forked-path-pattern]
+
+You can use the forked path pattern for situations where a single event must be processed more than once according to different sets of rules. Before the `pipeline` input and output were available, this need was commonly addressed through creative use of the `clone` filter and `if/else` rules.
+
+Let’s imagine a use case where we receive data and index the full event in our own systems, but publish a redacted version of the data to a partner’s S3 bucket. We might use the output isolator pattern described above to decouple our writes to either system. The distinguishing feature of the forked path pattern is the existence of additional rules in the downstream pipelines.
+
+Here is an example of the forked path configuration.
+
+```yaml
+# config/pipelines.yml
+- pipeline.id: intake
+  queue.type: persisted
+  config.string: |
+    input { beats { port => 5044 } }
+    output { pipeline { send_to => ["internal-es", "partner-s3"] } }
+- pipeline.id: buffered-es
+  queue.type: persisted
+  config.string: |
+    input { pipeline { address => "internal-es" } }
+    # Index the full event
+    output { elasticsearch { } }
+- pipeline.id: partner
+  queue.type: persisted
+  config.string: |
+    input { pipeline { address => "partner-s3" } }
+    filter {
+      # Remove the sensitive data
+      mutate { remove_field => 'sensitive-data' }
+    }
+    output { s3 { } } # Output to partner's bucket
+```
+
+
+### The collector pattern [collector-pattern]
+
+You can use the collector pattern when you want to define a common set of outputs and pre-output filters that many disparate pipelines might use. This pattern is the opposite of the distributor pattern. In this pattern many pipelines flow in to a single pipeline where they share outputs and processing. This pattern simplifies configuration at the cost of reducing isolation, since all data is sent through a single pipeline.
+
+Here is an example of the collector pattern.
+
+```yaml
+# config/pipelines.yml
+- pipeline.id: beats
+  config.string: |
+    input { beats { port => 5044 } }
+    output { pipeline { send_to => [commonOut] } }
+- pipeline.id: kafka
+  config.string: |
+    input { kafka { ... } }
+    output { pipeline { send_to => [commonOut] } }
+- pipeline.id: partner
+  # This common pipeline enforces the same logic whether data comes from Kafka or Beats
+  config.string: |
+    input { pipeline { address => commonOut } }
+    filter {
+      # Always remove sensitive data from all input sources
+      mutate { remove_field => 'sensitive-data' }
+    }
+    output { elasticsearch { } }
+```
+
+
+
diff --git a/docs/reference/plugin-concepts.md b/docs/reference/plugin-concepts.md
new file mode 100644
index 000000000..a721632cf
--- /dev/null
+++ b/docs/reference/plugin-concepts.md
@@ -0,0 +1,26 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/plugin-concepts.html
+---
+
+# Cross-plugin concepts and features [plugin-concepts]
+
+New section for concepts, features, and behaviours that apply to multiple plugins.
+
+## Space-deliminated URIs in list-type params [space-delimited-uris-in-list-params]
+
+List-type URI parameters will automatically expand strings that contain multiple whitespace-delimited URIs into separate entries. This behaviour enables the expansion of an arbitrary list of URIs from a single Environment- or Keystore-variable.
+
+These plugins and options support this functionality:
+
+* [Elasticsearch input plugin - `hosts`](logstash-docs-md://lsr/plugins-inputs-elasticsearch.md#plugins-inputs-elasticsearch-hosts)
+* [Elasticsearch output plugin - `hosts`](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-hosts)
+* [Elasticsearch filter plugin - `hosts`](logstash-docs-md://lsr/plugins-filters-elasticsearch.md#plugins-filters-elasticsearch-hosts)
+
+You can use this functionality to define an environment variable with multiple whitespace-delimited URIs and use it for the options above.
+
+**Example**
+
+```
+ES_HOSTS="es1.example.com es2.example.com:9201 es3.example.com:9201"
+```
diff --git a/docs/reference/plugin-generator.md b/docs/reference/plugin-generator.md
new file mode 100644
index 000000000..9361c1052
--- /dev/null
+++ b/docs/reference/plugin-generator.md
@@ -0,0 +1,18 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/plugin-generator.html
+---
+
+# Generating plugins [plugin-generator]
+
+You can create your own Logstash plugin in seconds! The generate subcommand of `bin/logstash-plugin` creates the foundation for a new Logstash plugin with templatized files. It creates the correct directory structure, gemspec files, and dependencies so you can start adding custom code to process data with Logstash.
+
+**Example Usage**
+
+```sh
+bin/logstash-plugin generate --type input --name xkcd --path ~/ws/elastic/plugins
+```
+
+* `--type`: Type of plugin - input, filter, output, or codec
+* `--name`: Name for the new plugin
+* `--path`: Directory path where the new plugin structure will be created. If you don’t specify a directory, the plugin is created in the current directory.
diff --git a/docs/reference/private-rubygem.md b/docs/reference/private-rubygem.md
new file mode 100644
index 000000000..ea3be84dc
--- /dev/null
+++ b/docs/reference/private-rubygem.md
@@ -0,0 +1,55 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/private-rubygem.html
+---
+
+# Private Gem Repositories [private-rubygem]
+
+The Logstash plugin manager connects to a Ruby gems repository to install and update Logstash plugins. By default, this repository is [http://rubygems.org](http://rubygems.org).
+
+Some use cases are unable to use the default repository, as in the following examples:
+
+* A firewall blocks access to the default repository.
+* You are developing your own plugins locally.
+* Airgap requirements on the local system.
+
+When you use a custom gem repository, be sure to make plugin dependencies available.
+
+Several open source projects enable you to run your own plugin server, among them:
+
+* [Geminabox](https://github.com/geminabox/geminabox)
+* [Gemirro](https://github.com/PierreRambaud/gemirro)
+* [Gemfury](https://gemfury.com/)
+* [Artifactory](http://www.jfrog.com/open-source/)
+
+## Editing the Gemfile [_editing_the_gemfile]
+
+The gemfile is a configuration file that specifies information required for plugin management. Each gem file has a `source` line that specifies a location for plugin content.
+
+By default, the gemfile’s `source` line reads:
+
+```shell
+# This is a Logstash generated Gemfile.
+# If you modify this file manually all comments and formatting will be lost.
+
+source "https://rubygems.org"
+```
+
+To change the source, edit the `source` line to contain your preferred source, as in the following example:
+
+```shell
+# This is a Logstash generated Gemfile.
+# If you modify this file manually all comments and formatting will be lost.
+
+source "https://my.private.repository"
+```
+
+After saving the new version of the gemfile, use [plugin management commands](/reference/working-with-plugins.md) normally.
+
+The following links contain further material on setting up some commonly used repositories:
+
+* [Geminabox](https://github.com/geminabox/geminabox/blob/master/README.md)
+* [Artifactory](https://www.jfrog.com/confluence/display/RTF/RubyGems+Repositories)
+* Running a [rubygems mirror](http://guides.rubygems.org/run-your-own-gem-server/)
+
+
diff --git a/docs/reference/processing.md b/docs/reference/processing.md
new file mode 100644
index 000000000..4837ab00b
--- /dev/null
+++ b/docs/reference/processing.md
@@ -0,0 +1,48 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/processing.html
+---
+
+# Processing Details [processing]
+
+Understanding how {{ls}} works and how components interrelate can help you make better decisions when you are setting up or adjusting your {{ls}} environment. This section is designed to elevate concepts to assist with that level of knowledge.
+
+::::{note}
+This is a new section. We’re still working on it.
+::::
+
+
+
+## Event ordering [event-ordering]
+
+By design and by default, {{ls}} does not guarantee event order. Reordering can occur in two places:
+
+* Events within a batch can be reordered during filter processing.
+* In-flight batches can be reordered when one or more batches are processed faster than others.
+
+When maintaining event order is important, use a single worker and set *pipeline.ordered ⇒ true*. This approach ensures that batches are computed one-after-the-other, and that events maintain their order within the batch.
+
+
+### *pipeline.ordered* setting [order-setting]
+
+The `pipeline.ordered` setting in [logstash.yml](/reference/logstash-settings-file.md) gives you more control over event ordering for single worker pipelines.
+
+`auto` automatically enables ordering if the `pipeline.workers` setting is also set to `1`. `true` will enforce ordering on the pipeline and prevent logstash from starting if there are multiple workers. `false` will disable the processing required to preserve order. Ordering will not be guaranteed, but you save the processing cost required to preserve order.
+
+
+## Java pipeline initialization time [pipeline-init-time]
+
+The Java pipeline initialization time appears in the startup logs at INFO level. Initialization time is the time it takes to compile the pipeline config and instantiate the compiled execution for all workers.
+
+
+## Reserved fields in {{ls}} events [reserved-fields]
+
+Some fields in {{ls}} events are reserved, or are required to adhere to a certain shape. Using these fields can cause runtime exceptions when the event API or plugins encounter incompatible values.
+
+|  |  |
+| --- | --- |
+| [`@metadata`](/reference/event-dependent-configuration.md#metadata) | A key/value map.<br>Ruby-based Plugin API: value is an[org.jruby.RubyHash](https://javadoc.io/static/org.jruby/jruby-core/9.2.5.0/org/jruby/RubyHash.html).<br>Java-based Plugin API: value is an[org.logstash.ConvertedMap](https://github.com/elastic/logstash/blob/main/logstash-core/src/main/java/org/logstash/ConvertedMap.java).<br>In serialized form (such as JSON): a key/value map where the keys must bestrings and the values are not constrained to a particular type. |
+| `@timestamp` | An object holding representation of a specific moment in time.<br>Ruby-based Plugin API: value is an[org.jruby.RubyTime](https://javadoc.io/static/org.jruby/jruby-core/9.2.5.0/org/jruby/RubyTime.html).<br>Java-based Plugin API: value is a[java.time.Instant](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/time/Instant.html).<br>In serialized form (such as JSON) or when setting with Event#set: anISO8601-compliant String value is acceptable. |
+| `@version` | A string, holding an integer value. |
+| `tags` | An array of distinct strings |
+
diff --git a/docs/reference/queues-data-resiliency.md b/docs/reference/queues-data-resiliency.md
new file mode 100644
index 000000000..4ccb7a1fa
--- /dev/null
+++ b/docs/reference/queues-data-resiliency.md
@@ -0,0 +1,21 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/resiliency.html
+---
+
+# Queues and data resiliency [resiliency]
+
+By default, Logstash uses [in-memory bounded queues](/reference/memory-queue.md) between pipeline stages (inputs → pipeline workers) to buffer events.
+
+As data flows through the event processing pipeline, Logstash may encounter situations that prevent it from delivering events to the configured output. For example, the data might contain unexpected data types, or Logstash might terminate abnormally.
+
+To guard against data loss and ensure that events flow through the pipeline without interruption, Logstash provides data resiliency features.
+
+* [Persistent queues (PQ)](/reference/persistent-queues.md) protect against data loss by storing events in an internal queue on disk.
+* [Dead letter queues (DLQ)](/reference/dead-letter-queues.md) provide on-disk storage for events that Logstash is unable to process so that you can evaluate them. You can easily reprocess events in the dead letter queue by using the `dead_letter_queue` input plugin.
+
+These resiliency features are disabled by default. To turn on these features, you must explicitly enable them in the Logstash [settings file](/reference/logstash-settings-file.md).
+
+
+
+
diff --git a/docs/reference/reloading-config.md b/docs/reference/reloading-config.md
new file mode 100644
index 000000000..93d28db6e
--- /dev/null
+++ b/docs/reference/reloading-config.md
@@ -0,0 +1,58 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/reloading-config.html
+---
+
+# Reloading the Config File [reloading-config]
+
+You can set Logstash to detect and reload configuration changes automatically.
+
+To enable automatic config reloading, start Logstash with the `--config.reload.automatic` (or `-r`) command-line option specified. For example:
+
+```shell
+bin/logstash -f apache.config --config.reload.automatic
+```
+
+::::{note}
+The `--config.reload.automatic` option is not available when you specify the `-e` flag to pass in configuration settings from the command-line.
+::::
+
+
+By default, Logstash checks for configuration changes every 3 seconds. To change this interval, use the `--config.reload.interval <interval>` option,  where `interval` specifies how often Logstash checks the config files for changes (in seconds).
+
+Note that the unit qualifier (`s`) is required.
+
+## Force reloading the config file [force-reload]
+
+If Logstash is already running without auto-reload enabled, you can force Logstash to reload the config file and restart the pipeline. Do this by sending a SIGHUP (signal hangup) to the process running Logstash. For example:
+
+```shell
+kill -SIGHUP 14175
+```
+
+Where 14175 is the ID of the process running Logstash.
+
+::::{note}
+This functionality is not supported on Windows OS.
+::::
+
+
+
+## How automatic config reloading works [_how_automatic_config_reloading_works]
+
+When Logstash detects a change in a config file, it stops the current pipeline by stopping all inputs, and it attempts to create a new pipeline that uses the updated configuration. After validating the syntax of the new configuration, Logstash verifies that all inputs and outputs can be initialized (for example, that all required ports are open). If the checks are successful, Logstash swaps the existing pipeline with the new pipeline. If the checks fail, the old pipeline continues to function, and the errors are propagated to the console.
+
+During automatic config reloading, the JVM is not restarted. The creating and swapping of pipelines all happens within the same process.
+
+Changes to [grok](logstash-docs-md://lsr/plugins-filters-grok.md) pattern files are also reloaded, but only when a change in the config file triggers a reload (or the pipeline is restarted).
+
+In general, Logstash is not watching or monitoring any configuration files used or referenced by inputs, filters or outputs.
+
+
+## Plugins that prevent automatic reloading [plugins-block-reload]
+
+Input and output plugins usually interact with OS resources. In some circumstances those resources can’t be released without a restart. For this reason some plugins can’t be simply updated and this prevents pipeline reload.
+
+The [stdin input](logstash-docs-md://lsr/plugins-inputs-stdin.md) plugin, for example, prevents reloading for these reasons.
+
+
diff --git a/docs/reference/running-logstash-command-line.md b/docs/reference/running-logstash-command-line.md
new file mode 100644
index 000000000..591d52e21
--- /dev/null
+++ b/docs/reference/running-logstash-command-line.md
@@ -0,0 +1,165 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/running-logstash-command-line.html
+---
+
+# Running Logstash from the Command Line [running-logstash-command-line]
+
+::::{admonition} macOS Gatekeeper warnings
+:class: important
+
+Apple’s rollout of stricter notarization requirements affected the notarization of the 9.0.0-beta1 {{ls}} artifacts. If macOS Catalina displays a dialog when you first run {{ls}} that interrupts it, you will need to take an action to allow it to run. To prevent Gatekeeper checks on the {{ls}} files, run the following command on the downloaded `.tar.gz` archive or the directory to which was extracted:
+
+```sh
+xattr -d -r com.apple.quarantine <archive-or-directory>
+```
+
+For example, if the `.tar.gz` file was extracted to the default logstash-9.0.0-beta1 directory, the command is:
+
+```sh
+xattr -d -r com.apple.quarantine logstash-9.0.0-beta1
+```
+
+Alternatively, you can add a security override if a Gatekeeper popup appears by following the instructions in the *How to open an app that hasn’t been notarized or is from an unidentified developer* section of [Safely open apps on your Mac](https://support.apple.com/en-us/HT202491).
+
+::::
+
+
+To run Logstash from the command line, use the following command:
+
+```shell
+bin/logstash [options]
+```
+
+To run Logstash from the Windows command line, use the following command:
+
+```shell
+bin/logstash.bat [options]
+```
+
+Where `options` are [command-line](#command-line-flags) flags that you can specify to control Logstash execution. The location of the `bin` directory varies by platform. See [Logstash Directory Layout](/reference/dir-layout.md) to find the location of `bin\logstash` on your system.
+
+The following example runs Logstash and loads the Logstash config defined in the `mypipeline.conf` file:
+
+```shell
+bin/logstash -f mypipeline.conf
+```
+
+Any flags that you set at the command line override the corresponding settings in [logstash.yml](/reference/logstash-settings-file.md), but the file itself is not changed. It remains as-is for subsequent Logstash runs.
+
+Specifying command line options is useful when you are testing Logstash. However, in a production environment, we recommend that you use [logstash.yml](/reference/logstash-settings-file.md) to control Logstash execution. Using the settings file makes it easier for you to specify multiple options, and it provides you with a single, versionable file that you can use to start up Logstash consistently for each run.
+
+## Command-Line Flags [command-line-flags]
+
+Logstash has the following flags. You can use the `--help` flag to display this information.
+
+**`--node.name NAME`**
+:   Specify the name of this Logstash instance. If no value is given it will default to the current hostname.
+
+**`-f, --path.config CONFIG_PATH`**
+:   Load the Logstash config from a specific file or directory. If a directory is given, all files in that directory will be concatenated in lexicographical order and then parsed as a single config file. Specifying this flag multiple times is not supported. If you specify this flag multiple times, Logstash uses the last occurrence (for example, `-f foo -f bar` is the same as `-f bar`).
+
+    You can specify wildcards ([globs](/reference/glob-support.md)) and any matched files will be loaded in the order described above. For example, you can use the wildcard feature to load specific files by name:
+
+    ```shell
+    bin/logstash --debug -f '/tmp/{one,two,three}'
+    ```
+
+    With this command, Logstash concatenates three config files, `/tmp/one`, `/tmp/two`, and `/tmp/three`, and parses them into a single config.
+
+
+**`-e, --config.string CONFIG_STRING`**
+:   Use the given string as the configuration data. Same syntax as the config file. If no input is specified, then the following is used as the default input: `input { stdin { type => stdin } }` and if no output is specified, then the following is used as the default output: `output { stdout { codec => rubydebug } }`. If you wish to use both defaults, please use the empty string for the `-e` flag. The default is nil.
+
+**`--plugin-classloaders`**
+:   (Beta) Load Java plugins in independent classloaders to isolate their dependencies.
+
+**`--pipeline.id ID`**
+:   Sets the ID of pipeline. The default is `main`.
+
+**`-w, --pipeline.workers COUNT`**
+:   Sets the number of pipeline workers to run. This option sets the number of workers that will, in parallel, execute the filter and output stages of the pipeline. If you find that events are backing up, or that  the CPU is not saturated, consider increasing this number to better utilize machine processing power. The default is the number of the host’s CPU cores.
+
+**`--pipeline.ordered ORDERED`**
+:   Preserves events order. Possible values are `auto` (default), `true` and `false`. This setting will work only when also using a single worker for the pipeline. Note that when enabled, it may impact the performance of the filters and output processing. The `auto` option will automatically enable ordering if the `pipeline.workers` setting is set to `1`. Use `true` to enable ordering on the pipeline and prevent logstash from starting if there are multiple workers. Use `false` to disable any extra processing necessary for preserving ordering.
+
+**`-b, --pipeline.batch.size SIZE`**
+:   Size of batches the pipeline is to work in. This option defines the maximum number of events an individual worker thread will collect from inputs before attempting to execute its filters and outputs. The default is 125 events. Larger batch sizes are generally more efficient, but come at the cost of increased memory overhead. You may need to increase JVM heap space in the `jvm.options` config file. See [Logstash Configuration Files](/reference/config-setting-files.md) for more info.
+
+**`-u, --pipeline.batch.delay DELAY_IN_MS`**
+:   When creating pipeline batches, how long to wait while polling for the next event. This option defines how long in milliseconds to wait while polling for the next event before dispatching an undersized batch to filters and outputs. The default is 50ms.
+
+**`--pipeline.ecs_compatibility MODE`**
+:   Sets the process default value for  ECS compatibility mode. Can be an ECS version like `v1` or `v8`, or `disabled`. The default is `v8`. Pipelines defined before Logstash 8 operated without ECS in mind. To ensure a migrated pipeline continues to operate as it did in older releases of Logstash, opt-OUT of ECS for the individual pipeline by setting `pipeline.ecs_compatibility: disabled` in its `pipelines.yml` definition. Using the command-line flag will set the default for *all* pipelines, including new ones. See [ECS compatibility](/reference/ecs-ls.md#ecs-compatibility) for more info.
+
+**`--pipeline.unsafe_shutdown`**
+:   Force Logstash to exit during shutdown even if there are still inflight events in memory. By default, Logstash will refuse to quit until all received events have been pushed to the outputs. Enabling this option can lead to data loss during shutdown.
+
+**`--path.data PATH`**
+:   This should point to a writable directory. Logstash will use this directory whenever it needs to store data. Plugins will also have access to this path. The default is the `data` directory under Logstash home.
+
+**`-p, --path.plugins PATH`**
+:   A path of where to find custom plugins. This flag can be given multiple times to include multiple paths. Plugins are expected to be in a specific directory hierarchy: `PATH/logstash/TYPE/NAME.rb` where `TYPE` is `inputs`, `filters`, `outputs`, or `codecs`, and `NAME` is the name of the plugin.
+
+**`-l, --path.logs PATH`**
+:   Directory to write Logstash internal logs to.
+
+**`--log.level LEVEL`**
+:   Set the log level for Logstash. Possible values are:
+
+    * `fatal`: log very severe error messages that will usually be followed by the application aborting
+    * `error`: log errors
+    * `warn`: log warnings
+    * `info`: log verbose info (this is the default)
+    * `debug`: log debugging info (for developers)
+    * `trace`: log finer-grained messages beyond debugging info
+
+
+**`--config.debug`**
+:   Show the fully compiled configuration as a debug log message (you must also have `--log.level=debug` enabled). WARNING: The log message will include any *password* options passed to plugin configs as plaintext, and may result in plaintext passwords appearing in your logs!
+
+**`-i, --interactive SHELL`**
+:   Drop to shell instead of running as normal. Valid shells are "irb" and "pry".
+
+**`-V, --version`**
+:   Emit the version of Logstash and its friends, then exit.
+
+**`-t, --config.test_and_exit`**
+:   Check configuration for valid syntax and then exit. Note that grok patterns are not checked for correctness with this flag. Logstash can read multiple config files from a directory. If you combine this flag with `--log.level=debug`, Logstash will log the combined config file, annotating each config block with the source file it came from.
+
+**`-r, --config.reload.automatic`**
+:   Monitor configuration changes and reload whenever the configuration is changed. NOTE: Use SIGHUP to manually reload the config. The default is false.
+
+**`--config.reload.interval RELOAD_INTERVAL`**
+:   How frequently to poll the configuration location for changes. The default value is "3s". Note that the unit qualifier (`s`) is required.
+
+**`--api.enabled ENABLED`**
+:   The HTTP API is enabled by default, but can be disabled by passing `false` to this option.
+
+**`--api.http.host HTTP_HOST`**
+:   Web API binding host. This option specifies the bind address for the metrics REST endpoint. The default is "127.0.0.1".
+
+**`--api.http.port HTTP_PORT`**
+:   Web API http port. This option specifies the bind port for the metrics REST endpoint. The default is 9600-9700. This setting accepts a range of the format 9600-9700. Logstash will pick up the first available port.
+
+**`--log.format FORMAT`**
+:   Specify if Logstash should write its own logs in JSON form (one event per line) or in plain text (using Ruby’s Object#inspect). The default is "plain".
+
+**`--log.format.json.fix_duplicate_message_fields ENABLED`**
+:   Avoid `message` field collision using JSON log format. Possible values are `true` (default) and `false`.
+
+**`--path.settings SETTINGS_DIR`**
+:   Set the directory containing the `logstash.yml` [settings file](/reference/logstash-settings-file.md) as well as the log4j logging configuration. This can also be set through the LS_SETTINGS_DIR environment variable. The default is the `config` directory under Logstash home.
+
+**`--enable-local-plugin-development`**
+:   This flag enables developers to update their local Gemfile without running into issues caused by a frozen lockfile. This flag can be helpful when you are developing/testing plugins locally.
+
+::::{note}
+This flag is for Logstash developers only. End users should not need it.
+::::
+
+
+**`-h, --help`**
+:   Print help
+
+
diff --git a/docs/reference/running-logstash-kubernetes.md b/docs/reference/running-logstash-kubernetes.md
new file mode 100644
index 000000000..a35dec203
--- /dev/null
+++ b/docs/reference/running-logstash-kubernetes.md
@@ -0,0 +1,9 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/running-logstash-kubernetes.html
+---
+
+# Running Logstash on Kubernetes [running-logstash-kubernetes]
+
+Check out the [QuickStart](docs-content://deploy-manage/deploy/cloud-on-k8s/install-using-yaml-manifest-quickstart.md) to install ECK and [Run {{ls}} on ECK](docs-content://deploy-manage/deploy/cloud-on-k8s/logstash.md) to deploy {{ls}} with ECK.
+
diff --git a/docs/reference/running-logstash-windows.md b/docs/reference/running-logstash-windows.md
new file mode 100644
index 000000000..66b0ec4ce
--- /dev/null
+++ b/docs/reference/running-logstash-windows.md
@@ -0,0 +1,198 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/running-logstash-windows.html
+---
+
+# Running Logstash on Windows [running-logstash-windows]
+
+Before reading this section, see [Installing Logstash](/reference/installing-logstash.md) to get started.  You also need to be familiar with [Running Logstash from the Command Line](/reference/running-logstash-command-line.md) as command line options are used to test running Logstash on Windows.
+
+::::{important}
+Specifying command line options is useful when you are testing Logstash. However, in a production environment, we recommend that you use [logstash.yml](/reference/logstash-settings-file.md) to control Logstash execution. Using the settings file makes it easier for you to specify multiple options, and it provides you with a single, versionable file that you can use to start up Logstash consistently for each run.
+::::
+
+
+Logstash is not started automatically after installation. How to start and stop Logstash on Windows depends on whether you want to run it manually, as a service (with [NSSM](https://nssm.cc/)), or run it as a scheduled task. This guide provides an example of some of the ways Logstash can run on Windows.
+
+::::{note}
+It is recommended to validate your configuration works by running Logstash manually before running Logstash as a service or a scheduled task.
+::::
+
+
+## Validating JVM prerequisites on Windows [running-logstash-windows-validation]
+
+After installing a [supported JVM](https://www.elastic.co/support/matrix#matrix_jvm), open a [PowerShell](https://docs.microsoft.com/en-us/powershell/) session and run the following commands to verify `LS_JAVA_HOME` is set and the Java version:
+
+### `Write-Host $env:LS_JAVA_HOME` [_write_host_envls_java_home]
+
+* The output should be pointed to where the JVM software is located, for example:
+
+    ```sh
+    PS C:\> Write-Host $env:LS_JAVA_HOME
+    C:\Program Files\Java\jdk-11.0.3
+    ```
+
+* If `LS_JAVA_HOME` is not set, perform one of the following:
+
+    * Set using the GUI:
+
+        * Navigate to the Windows [Environmental Variables](https://docs.microsoft.com/en-us/windows/win32/procthread/environment-variables) window
+        * In the Environmental Variables window, edit LS_JAVA_HOME to point to where the JDK software is located, for example: `C:\Program Files\Java\jdk-11.0.3`
+
+    * Set using PowerShell:
+
+        * In an Administrative PowerShell session, execute the following [SETX](https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/setx) commands:
+
+            ```sh
+            PS C:\Windows\system32> SETX /m LS_JAVA_HOME "C:\Program Files\Java\jdk-11.0.3"
+            PS C:\Windows\system32> SETX /m PATH "$env:PATH;C:\Program Files\Java\jdk-11.0.3\bin;"
+            ```
+
+        * Exit PowerShell, then open a new PowerShell session and run `Write-Host $env:LS_JAVA_HOME` to verify
+
+
+
+### `Java -version` [_java_version]
+
+* This command produces output similar to the following:
+
+    ```sh
+    PS C:\> Java -version
+    java version "11.0.3" 2019-04-16 LTS
+    Java(TM) SE Runtime Environment 18.9 (build 11.0.3+12-LTS)
+    Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.3+12-LTS, mixed mode)
+    ```
+
+
+Once you have [*Setting Up and Running Logstash*](/reference/setting-up-running-logstash.md) and validated JVM pre-requisites, you may proceed.
+
+::::{note}
+For the examples listed below, we are running Windows Server 2016, Java 11.0.3, have extracted the [Logstash ZIP package](https://www.elastic.co/downloads/logstash) to `C:\logstash-9.0.0\`, and using the example `syslog.conf` file shown below (stored in `C:\logstash-9.0.0\config\`).
+::::
+
+
+
+
+## Running Logstash manually [running-logstash-windows-manual]
+
+Logstash can be run manually using [PowerShell](https://docs.microsoft.com/en-us/powershell/).  Open an Administrative [PowerShell](https://docs.microsoft.com/en-us/powershell/) session, then run the following commands:
+
+```sh
+PS C:\Windows\system32> cd C:\logstash-9.0.0\
+PS C:\logstash-9.0.0> .\bin\logstash.bat -f .\config\syslog.conf
+```
+
+::::{note}
+In a production environment, we recommend that you use [logstash.yml](/reference/logstash-settings-file.md) to control Logstash execution.
+::::
+
+
+Wait for the following messages to appear, to confirm Logstash has started successfully:
+
+```sh
+[logstash.runner          ] Starting Logstash {"logstash.version"=>"9.0.0"}
+[logstash.inputs.udp      ] Starting UDP listener {:address=>"0.0.0.0:514"}
+[logstash.agent           ] Successfully started Logstash API endpoint {:port=>9600}
+```
+
+
+## Running Logstash as a service with NSSM [running-logstash-windows-nssm]
+
+::::{note}
+It is recommended to validate your configuration works by running Logstash manually before you proceed.
+::::
+
+
+Download [NSSM](https://nssm.cc/), then extract `nssm.exe` from `nssm-<version.number>\win64\nssm.exe` to `C:\logstash-9.0.0\bin\`. Then open an Administrative [PowerShell](https://docs.microsoft.com/en-us/powershell/) session, then run the following commands:
+
+```sh
+PS C:\Windows\system32> cd C:\logstash-9.0.0\
+PS C:\logstash-9.0.0> .\bin\nssm.exe install logstash
+```
+
+Once the `NSSM service installer` window appears, specify the following parameters in the `Application` tab:
+
+* In the `Application` tab:
+
+    * Path: Path to `logstash.bat`: `C:\logstash-9.0.0\bin\logstash.bat`
+    * Startup Directory: Path to the `bin` directory: `C:\logstash-9.0.0\bin`
+    * Arguments: For this example to start Logstash: `-f C:\logstash-9.0.0\config\syslog.conf`
+
+        ::::{note}
+        In a production environment, we recommend that you use [logstash.yml](/reference/logstash-settings-file.md) to control Logstash execution.
+        ::::
+
+* Review and make any changes necessary in the `Details` tab:
+
+    * Ensure `Startup Type` is set appropriately
+    * Set the `Display name` and `Description` fields to something relevant
+
+* Review any other required settings (for the example we aren’t making any other changes)
+
+    * Be sure to determine if you need to set the `Log on` user
+
+* Validate the `Service name` is set appropriately
+
+    * For this example, we will set ours to `logstash-syslog`
+
+* Click `Install Service`
+
+    * Click *OK* when the `Service "logstash-syslog" installed successfully!` window appears
+
+
+Once the service has been installed with NSSM, validate and start the service following the [PowerShell Managing Services](https://docs.microsoft.com/en-us/powershell/scripting/samples/managing-services) documentation.
+
+
+## Running Logstash with Task Scheduler [running-logstash-windows-scheduledtask]
+
+::::{note}
+It is recommended to validate your configuration works by running Logstash manually before you proceed.
+::::
+
+
+Open the Windows [Task Scheduler](https://docs.microsoft.com/en-us/windows/desktop/taskschd/task-scheduler-start-page), then click `Create Task` in the Actions window.  Specify the following parameters in the `Actions` tab:
+
+* In the `Actions` tab:
+
+    * Click `New`, then specify the following:
+    * Action: `Start a program`
+    * Program/script: `C:\logstash-9.0.0\bin\logstash.bat`
+    * Add arguments: `-f C:\logstash-9.0.0\config\syslog.conf`
+    * Start in: `C:\logstash-9.0.0\bin\`
+
+        ::::{note}
+        In a production environment, we recommend that you use [logstash.yml](/reference/logstash-settings-file.md) to control Logstash execution.
+        ::::
+
+* Review and make any changes necessary in the `General`, `Triggers`, `Conditions`, and `Settings` tabs.
+* Click `OK` to finish creating the scheduled task.
+* Once the new task has been created, either wait for it to run on the schedule or select the service then click `Run` to start the task.
+
+::::{note}
+Logstash can be stopped by selecting the service, then clicking `End` in the Task Scheduler window.
+::::
+
+
+
+## Example Logstash Configuration [running-logstash-windows-example]
+
+We will configure Logstash to listen for syslog messages over port 514 with this configuration (file name is `syslog.conf`):
+
+```yaml
+# Sample Logstash configuration for receiving
+# UDP syslog messages over port 514
+
+input {
+  udp {
+    port => 514
+    type => "syslog"
+  }
+}
+
+output {
+  elasticsearch { hosts => ["localhost:9200"] }
+  stdout { codec => rubydebug }
+}
+```
+
+
diff --git a/docs/reference/running-logstash.md b/docs/reference/running-logstash.md
new file mode 100644
index 000000000..4283b2d20
--- /dev/null
+++ b/docs/reference/running-logstash.md
@@ -0,0 +1,27 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/running-logstash.html
+---
+
+# Running Logstash as a Service on Debian or RPM [running-logstash]
+
+Logstash is not started automatically after installation. Starting and stopping Logstash depends on the init system of the underlying operating system, which is now systemd.
+
+As systemd is now the de-facto init system, here are some common operating systems and versions that use it.  This list is intended to be informative, not exhaustive.
+
+|     |     |     |
+| --- | --- | --- |
+| Distribution | Service System |  |
+| Ubuntu 16.04 and newer | [systemd](#running-logstash-systemd) |  |
+| Debian 8 "jessie" and newer | [systemd](#running-logstash-systemd) |  |
+| CentOS (and RHEL) 7 and newer | [systemd](#running-logstash-systemd) |  |
+
+## Running Logstash by Using Systemd [running-logstash-systemd]
+
+Distributions like Debian Jessie, Ubuntu 15.10+, and many of the SUSE derivatives use systemd and the `systemctl` command to start and stop services. Logstash places the systemd unit files in `/etc/systemd/system` for both deb and rpm. After installing the package, you can start up Logstash with:
+
+```sh
+sudo systemctl start logstash.service
+```
+
+
diff --git a/docs/reference/secure-connection.md b/docs/reference/secure-connection.md
new file mode 100644
index 000000000..0a35075b1
--- /dev/null
+++ b/docs/reference/secure-connection.md
@@ -0,0 +1,498 @@
+---
+navigation_title: "Secure your connection"
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/ls-security.html
+---
+
+# Secure your connection to {{es}} [ls-security]
+
+
+The Logstash {{es}} [output](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md), [input](logstash-docs-md://lsr/plugins-inputs-elasticsearch.md), and [filter](logstash-docs-md://lsr/plugins-filters-elasticsearch.md) plugins,  as well as [monitoring](monitoring-logstash.md) and central management, support authentication and encryption over HTTPS.
+
+{{es}} clusters are secured by default (starting in 8.0). You need to configure authentication credentials for Logstash in order to establish communication. Logstash throws an exception and the processing pipeline is halted if authentication fails.
+
+In addition to configuring authentication credentials for Logstash, you need to grant authorized users permission to access the Logstash indices.
+
+Security is enabled by default on the {{es}} cluster (starting in 8.0). You must enable TLS/SSL in the {{es}} output section of the Logstash configuration in order to allow Logstash to communicate with the {{es}} cluster.
+
+
+## {{es}} security on by default [es-security-on]
+
+{{es}} generates its own default self-signed Secure Sockets Layer (SSL) certificates at startup.
+
+{{ls}} must establish a Secure Sockets Layer (SSL) connection before it can transfer data to a secured {{es}} cluster. {{ls}} must have a copy of the certificate authority (CA) that signed the {{es}} cluster’s certificates. When a new {{es}} cluster is started up *without* dedicated certificates, it generates its own default self-signed Certificate Authority at startup. See [Starting the Elastic Stack with security enabled](docs-content://deploy-manage/deploy/self-managed/installing-elasticsearch.md) for more info.
+
+{{ess}} uses certificates signed by standard publicly trusted certificate authorities, and therefore setting a cacert is not necessary.
+
+::::{admonition} Security to {{serverless-full}} $$$serverless$$$
+:class: note
+
+{{es-serverless}} simplifies safe, secure communication between {{ls}} and {{es}}.
+
+Configure the [{{ls}} {{es}} output plugin](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md) to use [`cloud_id`](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-cloud_id) and an [`api_key`](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-api_key) to establish safe, secure communication between {{ls}} and {{es-serverless}}. No additional SSL configuration steps are needed.
+
+Configuration example:
+
+* `output {elasticsearch { cloud_id => "<cloud id>" api_key => "<api key>" } }`
+
+For more details, check out [Grant access using API keys](#ls-api-keys).
+
+::::
+
+
+::::{admonition} Security to hosted {{ess}} $$$hosted-ess$$$
+:class: note
+
+Our hosted {{ess}} on Elastic Cloud simplifies safe, secure communication between {{ls}} and {{es}}. When you configure the [{{ls}} {{es}} output plugin](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md) to use [`cloud_id`](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-cloud_id) with either the [`cloud_auth` option](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-cloud_auth) or the [`api_key` option](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-api_key), no additional SSL configuration steps are needed. {ess-leadin-short}
+
+Configuration example:
+
+* `output {elasticsearch { cloud_id => "<cloud id>" cloud_auth => "<cloud auth>" } }`
+* `output {elasticsearch { cloud_id => "<cloud id>" api_key => "<api key>" } }`
+
+For more details, check out [Grant access using API keys](#ls-api-keys) or [Sending data to Elastic Cloud (hosted Elasticsearch Service)](/reference/connecting-to-cloud.md).
+
+::::
+
+
+
+### Secure communication with an on-premise {{es}} cluster [es-security-onprem]
+
+If you are running {{es}} on your own hardware and using the Elasticsearch cluster’s default self-signed certificates, you need to complete a few more steps to establish secure communication between {{ls}} and {{es}}.
+
+You need to:
+
+* Copy the self-signed CA certificate from {{es}} and save it to {{ls}}.
+* Configure the elasticsearch-output plugin to use the certificate.
+
+These steps are not necessary if your cluster is using public trusted certificates.
+
+
+#### Copy and save the certificate [es-sec-copy-cert]
+
+By default an on-premise {{es}} cluster generates a self-signed CA and creates its own SSL certificates when it starts. Therefore {{ls}} needs its own copy of the self-signed CA from the {{es}} cluster in order for {{ls}} to validate the certificate presented by {{es}}.
+
+Copy the [self-signed CA certificate](docs-content://deploy-manage/deploy/self-managed/installing-elasticsearch.md#stack-security-certificates) from the {{es}} `config/certs` directory.
+
+Save it to a location that Logstash can access, such as `config/certs` on the {{ls}} instance.
+
+
+#### Configure the elasticsearch output [es-sec-plugin]
+
+Use the [`elasticsearch output`'s](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md) [`ssl_certificate_authorities` option](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-ssl_certificate_authorities) to point to the certificate’s location.
+
+**Example**
+
+```ruby
+output {
+  elasticsearch {
+    hosts => ["https://...] <1>
+    ssl_certificate_authorities => ['/etc/logstash/config/certs/ca.crt'] <2>
+  }
+}
+```
+
+1. Note that the `hosts` url must begin with `https`
+2. Path to the {{ls}} copy of the {{es}} certificate
+
+
+For more information about establishing secure communication with {{es}}, see [security is on by default](docs-content://deploy-manage/deploy/self-managed/installing-elasticsearch.md).
+
+
+### Configuring Logstash to use basic authentication [ls-http-auth-basic]
+
+Logstash needs to be able to manage index templates, create indices, and write and delete documents in the indices it creates.
+
+To set up authentication credentials for Logstash:
+
+1. Use the **Management > Roles** UI in {{kib}} or the `role` API to create a `logstash_writer` role. For **cluster** privileges, add `manage_index_templates` and `monitor`. For **indices** privileges, add `write`, `create`, and `create_index`.
+
+    Add `manage_ilm` for cluster and `manage` and `manage_ilm` for indices if you plan to use [index lifecycle management](docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-automate-rollover.md).
+
+    ```sh
+    POST _security/role/logstash_writer
+    {
+      "cluster": ["manage_index_templates", "monitor", "manage_ilm"], <1>
+      "indices": [
+        {
+          "names": [ "logstash-*" ], <2>
+          "privileges": ["write","create","create_index","manage","manage_ilm"]  <3>
+        }
+      ]
+    }
+    ```
+
+    1. The cluster needs the `manage_ilm` privilege if [index lifecycle management](docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-automate-rollover.md) is enabled.
+    2. If you use a custom Logstash index pattern, specify your custom pattern instead of the default `logstash-*` pattern.
+    3. If [index lifecycle management](docs-content://manage-data/lifecycle/index-lifecycle-management/tutorial-automate-rollover.md) is enabled, the role requires the `manage` and `manage_ilm` privileges to load index lifecycle policies, create rollover aliases, and create and manage rollover indices.
+
+2. Create a `logstash_internal` user and assign it the `logstash_writer` role. You can create users from the **Management > Users** UI in {{kib}} or through the `user` API:
+
+    ```sh
+    POST _security/user/logstash_internal
+    {
+      "password" : "x-pack-test-password",
+      "roles" : [ "logstash_writer"],
+      "full_name" : "Internal Logstash User"
+    }
+    ```
+
+3. Configure Logstash to authenticate as the `logstash_internal` user you just created. You configure credentials separately for each of the {{es}} plugins in your Logstash `.conf` file. For example:
+
+    ```js
+    input {
+      elasticsearch {
+        ...
+        user => logstash_internal
+        password => x-pack-test-password
+      }
+    }
+    filter {
+      elasticsearch {
+        ...
+        user => logstash_internal
+        password => x-pack-test-password
+      }
+    }
+    output {
+      elasticsearch {
+        ...
+        user => logstash_internal
+        password => x-pack-test-password
+      }
+    }
+    ```
+
+
+
+### Granting access to the indices Logstash creates [ls-user-access]
+
+To access the indices Logstash creates, users need the `read` and `view_index_metadata` privileges:
+
+1. Create a `logstash_reader` role that has the `read` and `view_index_metadata` privileges  for the Logstash indices. You can create roles from the **Management > Roles** UI in {{kib}} or through the `role` API:
+
+    ```sh
+    POST _security/role/logstash_reader
+    {
+      "cluster": ["manage_logstash_pipelines"],
+      "indices": [
+        {
+          "names": [ "logstash-*" ],
+          "privileges": ["read","view_index_metadata"]
+        }
+      ]
+    }
+    ```
+
+2. Assign your Logstash users the `logstash_reader` role. If the Logstash user will be using [centralized pipeline management](/reference/logstash-centralized-pipeline-management.md), also assign the `logstash_system` role. You can create and manage users from the **Management > Users** UI in {{kib}} or through the `user` API:
+
+    ```sh
+    POST _security/user/logstash_user
+    {
+      "password" : "x-pack-test-password",
+      "roles" : [ "logstash_reader", "logstash_system"], <1>
+      "full_name" : "Kibana User for Logstash"
+    }
+    ```
+
+    1. `logstash_system` is a built-in role that provides the necessary permissions to check the availability of the supported features of {{es}} cluster.
+
+
+
+### Configuring Logstash to use TLS/SSL encryption [ls-http-ssl]
+
+If TLS encryption is enabled on an on premise {{es}} cluster, you need to configure the `ssl` and `cacert` options in your Logstash `.conf` file:
+
+```js
+output {
+  elasticsearch {
+    ...
+    ssl_enabled => true
+    ssl_certificate_authorities => '/path/to/cert.pem' <1>
+  }
+}
+```
+
+1. The path to the local `.pem` file that contains the Certificate Authority’s certificate.
+
+
+::::{note}
+Hosted {{ess}} simplifies security. This configuration step is not necessary for hosted Elasticsearch Service on Elastic Cloud. {ess-leadin-short}
+::::
+
+
+
+### Configuring the {{es}} output to use PKI authentication [ls-http-auth-pki]
+
+The `elasticsearch` output supports PKI authentication. To use an X.509 client-certificate for authentication, you configure the `keystore` and `keystore_password` options in your Logstash `.conf` file:
+
+```js
+output {
+  elasticsearch {
+    ...
+    ssl_keystore_path => /path/to/keystore.jks
+    ssl_keystore_password => realpassword
+    ssl_truststore_path =>  /path/to/truststore.jks <1>
+    ssl_truststore_password =>  realpassword
+  }
+}
+```
+
+1. If you use a separate truststore, the truststore path and password are also required.
+
+
+
+### Configuring credentials for {{ls}} monitoring [ls-monitoring-user]
+
+If you want to monitor your Logstash instance with {{stack-monitor-features}}, and store the monitoring data in a secured {{es}} cluster, you must configure Logstash with a username and password for a user with the appropriate permissions.
+
+The {{security-features}} come preconfigured with a [`logstash_system` built-in user](docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/built-in-users.md) for this purpose. This user has the minimum permissions necessary for the monitoring function, and *should not* be used for any other purpose - it is specifically *not intended* for use within a Logstash pipeline.
+
+By default, the `logstash_system` user does not have a password. The user will not be enabled until you set a password. See [Setting built-in user passwords](docs-content://deploy-manage/users-roles/cluster-or-deployment-auth/built-in-users.md#set-built-in-user-passwords).
+
+Then configure the user and password in the `logstash.yml` configuration file:
+
+```yaml
+xpack.monitoring.elasticsearch.username: logstash_system
+xpack.monitoring.elasticsearch.password: t0p.s3cr3t
+```
+
+If you initially installed an older version of {{xpack}} and then upgraded, the `logstash_system` user may have defaulted to `disabled` for security reasons. You can enable the user through the `user` API:
+
+```console
+PUT _security/user/logstash_system/_enable
+```
+
+
+### Configuring credentials for Centralized Pipeline Management [ls-pipeline-management-user]
+
+If you plan to use Logstash [centralized pipeline management](/reference/logstash-centralized-pipeline-management.md), you need to configure the username and password that Logstash uses for managing configurations.
+
+You configure the user and password in the `logstash.yml` configuration file:
+
+```yaml
+xpack.management.elasticsearch.username: logstash_admin_user <1>
+xpack.management.elasticsearch.password: t0p.s3cr3t
+```
+
+1. The user you specify here must have the built-in `logstash_admin` role as well as the `logstash_writer` role that you created earlier.
+
+
+
+### Grant access using API keys [ls-api-keys]
+
+Instead of using usernames and passwords, you can use API keys to grant access to {{es}} resources. You can set API keys to expire at a certain time, and you can explicitly invalidate them. Any user with the `manage_api_key` or `manage_own_api_key` cluster privilege can create API keys.
+
+Tips for creating API keys:
+
+* API keys are tied to the cluster they are created in. If you are sending output to different clusters, be sure to create the correct kind of API key.
+* {{ls}} can send both collected data and monitoring information to {{es}}. If you are sending both to the same cluster, you can use the same API key. For different clusters, you need an API key per cluster.
+* A single cluster can share a key for ingestion and monitoring purposes.
+* A production cluster and a monitoring cluster require separate keys.
+
+::::{note}
+For security reasons, we recommend using a unique API key per {{ls}} instance. You can create as many API keys per user as necessary.
+::::
+
+
+
+#### Create an API key [ls-create-api-key]
+
+You can create API keys using either the [Create API key API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-create-api-key) or the [Kibana UI](docs-content://deploy-manage/api-keys/elasticsearch-api-keys.md). This section walks you through creating an API key using the [Create API key API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-create-api-key). The privileges needed are the same for either approach.
+
+Here is an example that shows how to create an API key for publishing to {{es}} using the [Elasticsearch output plugin](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md).
+
+```console
+POST /_security/api_key
+{
+  "name": "logstash_host001", <1>
+  "role_descriptors": {
+    "logstash_writer": { <2>
+      "cluster": ["monitor", "manage_ilm", "read_ilm"],
+      "index": [
+        {
+          "names": ["logstash-*"],
+          "privileges": ["view_index_metadata", "create_doc"]
+        }
+      ]
+    }
+  }
+}
+```
+
+1. Name of the API key
+2. Granted privileges
+
+
+The return value should look similar to this:
+
+```console-result
+{
+  "id":"TiNAGG4BaaMdaH1tRfuU", <1>
+  "name":"logstash_host001",
+  "api_key":"KnR6yE41RrSowb0kQ0HWoA" <2>
+}
+```
+
+1. Unique id for this API key
+2. Generated API key
+
+
+
+##### Create an API key for publishing [ls-api-key-publish]
+
+You’re in luck! The example we used in the [Create an API key](#ls-create-api-key) section creates an API key for publishing to {{es}} using the [Elasticsearch output plugin](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md).
+
+Here’s an example using the API key in your [Elasticsearch output plugin](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md) configuration.
+
+```ruby
+output {
+  elasticsearch {
+    api_key => "TiNAGG4BaaMdaH1tRfuU:KnR6yE41RrSowb0kQ0HWoA" <1>
+  }
+}
+```
+
+1. Format is `id:api_key` (as returned by [Create API key](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-create-api-key))
+
+
+
+##### Create an API key for reading [ls-api-key-input]
+
+Creating an API key to use for reading data from {{es}} is similar to creating an API key for publishing described earlier. You can use the example in the [Create an API key](#ls-create-api-key) section, granting the appropriate privileges.
+
+Here’s an example using the API key in your [Elasticsearch inputs plugin](logstash-docs-md://lsr/plugins-inputs-elasticsearch.md) configuration.
+
+```ruby
+input {
+  elasticsearch {
+    "api_key" => "TiNAGG4BaaMdaH1tRfuU:KnR6yE41RrSowb0kQ0HWoA" <1>
+  }
+}
+```
+
+1. Format is `id:api_key` (as returned by [Create API key](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-create-api-key))s
+
+
+
+##### Create an API key for filtering [ls-api-key-filter]
+
+Creating an API key to use for processing data from {{es}} is similar to creating an API key for publishing described earlier. You can use the example in the [Create an API key](#ls-create-api-key) section, granting the appropriate privileges.
+
+Here’s an example using the API key in your [Elasticsearch filter plugin](logstash-docs-md://lsr/plugins-filters-elasticsearch.md) configuration.
+
+```ruby
+filter {
+  elasticsearch {
+    api_key => "TiNAGG4BaaMdaH1tRfuU:KnR6yE41RrSowb0kQ0HWoA" <1>
+  }
+}
+```
+
+1. Format is `id:api_key` (as returned by [Create API key](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-create-api-key))
+
+
+
+##### Create an API key for monitoring [ls-api-key-monitor]
+
+To create an API key to use for sending monitoring data to {{es}}, use the [Create API key API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-create-api-key). For example:
+
+```console
+POST /_security/api_key
+{
+  "name": "logstash_host001", <1>
+  "role_descriptors": {
+    "logstash_monitoring": { <2>
+      "cluster": ["monitor"],
+      "index": [
+        {
+          "names": [".monitoring-ls-*"],
+          "privileges": ["create_index", "create"]
+        }
+      ]
+    }
+  }
+}
+```
+
+1. Name of the API key
+2. Granted privileges
+
+
+The return value should look similar to this:
+
+```console-result
+{
+  "id":"TiNAGG4BaaMdaH1tRfuU", <1>
+  "name":"logstash_host001",
+  "api_key":"KnR6yE41RrSowb0kQ0HWoA" <2>
+}
+```
+
+1. Unique id for this API key
+2. Generated API key
+
+
+Now you can use this API key in your logstash.yml configuration file:
+
+```yaml
+xpack.monitoring.elasticsearch.api_key: TiNAGG4BaaMdaH1tRfuU:KnR6yE41RrSowb0kQ0HWoA <1>
+```
+
+1. Format is `id:api_key` (as returned by [Create API key](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-create-api-key))
+
+
+
+##### Create an API key for central management [ls-api-key-man]
+
+To create an API key to use for central management, use the [Create API key API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-create-api-key). For example:
+
+```console
+POST /_security/api_key
+{
+  "name": "logstash_host001", <1>
+  "role_descriptors": {
+    "logstash_monitoring": { <2>
+      "cluster": ["monitor", "manage_logstash_pipelines"]
+    }
+  }
+}
+```
+
+1. Name of the API key
+2. Granted privileges
+
+
+The return value should look similar to this:
+
+```console-result
+{
+  "id":"TiNAGG4BaaMdaH1tRfuU", <1>
+  "name":"logstash_host001",
+  "api_key":"KnR6yE41RrSowb0kQ0HWoA" <2>
+}
+```
+
+1. Unique id for this API key
+2. Generated API key
+
+
+Now you can use this API key in your logstash.yml configuration file:
+
+```yaml
+xpack.management.elasticsearch.api_key: TiNAGG4BaaMdaH1tRfuU:KnR6yE41RrSowb0kQ0HWoA <1>
+```
+
+1. Format is `id:api_key` (as returned by [Create API key](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-create-api-key))
+
+
+
+#### Learn more about API keys [learn-more-api-keys]
+
+See the {{es}} API key documentation for more information:
+
+* [Create API key](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-create-api-key)
+* [Get API key information](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-get-api-key)
+* [Invalidate API key](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-security-invalidate-api-key)
+
+See [API Keys](docs-content://deploy-manage/api-keys/elasticsearch-api-keys.md) for info on managing API keys through {{kib}}.
diff --git a/docs/reference/serverless-monitoring-with-elastic-agent.md b/docs/reference/serverless-monitoring-with-elastic-agent.md
new file mode 100644
index 000000000..0b0346b6e
--- /dev/null
+++ b/docs/reference/serverless-monitoring-with-elastic-agent.md
@@ -0,0 +1,70 @@
+---
+navigation_title: "Collect monitoring data for dashboards ({{serverless-short}} )"
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/serverless-monitoring-with-elastic-agent.html
+---
+
+# Collect {{ls}} monitoring data for dashboards ({{serverless-short}}) [serverless-monitoring-with-elastic-agent]
+
+
+{{ls}} monitoring is available on {{serverless-full}} through the [{{ls}} Integration](https://github.com/elastic/integrations/blob/main/packages/logstash/_dev/build/docs/README.md) in [Elastic Observability](docs-content://solutions/observability.md). {{agent}} collects monitoring data from your {{ls}} instance, sends it directly to {{serverless-full}}, and shows the data in {{ls}} dashboards.
+
+You’ll need to have an [Elastic Observability](docs-content://solutions/observability.md) project. We’ll provide steps to help you create one.
+
+**Prerequisite**
+
+::::{dropdown} Disable default collection of {{ls}} monitoring metrics
+:name: disable-default-svrless
+
+Set `monitoring.enabled` to `false` in logstash.yml to disable default collection:
+
+```yaml
+monitoring.enabled: false
+```
+
+::::
+
+
+
+## Add and configure the {{ls}} integration [setup-project]
+
+**Add the {{ls}} integration**
+
+1. Log in to your [cloud.elastic.co](https://cloud.elastic.co/) account and create an Observability serverless project.
+2. Select **Get Started** from the main menu.
+3. Select **Start exploring** (near the bottom of the page).
+4. On the **Integrations** page, search for **{{ls}}** and select it to see details.
+5. Click **Add {{ls}}**.
+6. Follow the instructions to install {{agent}} and add the {{ls}} integration.
+
+For more info, check out the [Elastic Observability](docs-content://solutions/observability.md) docs.
+
+**Configure the integration to collect logs**
+
+* Make sure that **Logs** is ON if you want to collect logs from your {{ls}} instance. Check the settings to be sure that they are configured correctly.
+* Modify the log paths to match your {{ls}} environment.
+
+**Configure the integration to collect metrics**
+
+::::{tip}
+For the best experience with the Logstash dashboards, we recommend collecting all of the metrics. Turning off metrics will result in incomplete or missing visualizations.
+::::
+
+* Make sure that **Metrics (Elastic Agent)** is turned on (default), and **Metrics (Stack Monitoring)** is turned off.
+* Set the {{ls}} URL to point to your {{ls}} instance.<br> By default, the integration collects {{ls}} monitoring metrics from `https://localhost:9600`. If that host and port number are not correct, update the `Logstash URL` setting. If you configured {{ls}} to use encrypted communications and/or a username and password, you must access it using HTTPS. Expand the **Advanced Settings** options, and fill in the appropriate values for your {{ls}} instance.
+
+
+## View assets [view-assets-esvrless]
+
+1. Go to **Project settings → Integrations** to see your **Installed integrations**.
+2. Select the {{ls}} integration, and then select **Assets** to access dashboards for the {{ls}} integration.
+
+
+## Monitor {{ls}} logs and metrics [view-data-svrless]
+
+From the list of assets, open the **[Metrics {{ls}}] {{ls}} overview** dashboard to view overall performance. Then follow the navigation panel to further drill down into {{ls}} performance.
+
+% TO DO: Use `:class: screenshot`
+![The {{ls}} Overview dashboard in {{kib}} with various metrics from your monitored {ls}](images/integration-dashboard-overview.png)
+
+You can hover over any visualization to adjust its settings, or click the **Edit** button to make changes to the dashboard. To learn more, refer to [Dashboard and visualizations](docs-content://explore-analyze/dashboards.md).
diff --git a/docs/reference/setting-up-running-logstash.md b/docs/reference/setting-up-running-logstash.md
new file mode 100644
index 000000000..1fc32482b
--- /dev/null
+++ b/docs/reference/setting-up-running-logstash.md
@@ -0,0 +1,36 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/setup-logstash.html
+---
+
+# Setting up and running Logstash [setup-logstash]
+
+Before reading this section, see [Installing Logstash](/reference/installing-logstash.md) for basic installation instructions to get you started.
+
+This section includes additional information on how to set up and run Logstash, including:
+
+* [Logstash Directory Layout](/reference/dir-layout.md)
+* [Logstash Configuration Files](/reference/config-setting-files.md)
+* [logstash.yml](/reference/logstash-settings-file.md)
+* [Secrets keystore for secure settings](/reference/keystore.md)
+* [Running Logstash from the Command Line](/reference/running-logstash-command-line.md)
+* [Running Logstash as a Service on Debian or RPM](/reference/running-logstash.md)
+* [Running Logstash on Docker](/reference/docker.md)
+* [Configuring Logstash for Docker](/reference/docker-config.md)
+* [Running Logstash on Kubernetes](/reference/running-logstash-kubernetes.md)
+* [Running Logstash on Windows](/reference/running-logstash-windows.md)
+* [Logging](/reference/logging.md)
+* [Shutting Down Logstash](/reference/shutdown.md)
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/reference/shutdown.md b/docs/reference/shutdown.md
new file mode 100644
index 000000000..53a191640
--- /dev/null
+++ b/docs/reference/shutdown.md
@@ -0,0 +1,84 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/shutdown.html
+---
+
+# Shutting Down Logstash [shutdown]
+
+If you’re running {{ls}} as a service, use one of the following commands to stop it:
+
+* On systemd, use:
+
+    ```shell
+    systemctl stop logstash
+    ```
+
+
+If you’re running {{ls}} directly in the console on a POSIX system, you can stop it by sending SIGTERM to the {{ls}} process. For example:
+
+```shell
+kill -TERM {logstash_pid}
+```
+
+Alternatively, enter **Ctrl-C** in the console.
+
+## What Happens During a Controlled Shutdown? [_what_happens_during_a_controlled_shutdown]
+
+When you attempt to shut down a running Logstash instance, Logstash performs several steps before it can safely shut down. It must:
+
+* Stop all input, filter and output plugins
+* Process all in-flight events
+* Terminate the Logstash process
+
+The following conditions affect the shutdown process:
+
+* An input plugin receiving data at a slow pace.
+* A slow filter, like a Ruby filter executing `sleep(10000)` or an Elasticsearch filter that is executing a very heavy query.
+* A disconnected output plugin that is waiting to reconnect to flush in-flight events.
+
+These situations make the duration and success of the shutdown process unpredictable.
+
+Logstash has a stall detection mechanism that analyzes the behavior of the pipeline and plugins during shutdown. This mechanism produces periodic information about the count of inflight events in internal queues and a list of busy worker threads.
+
+To enable Logstash to forcibly terminate in the case of a stalled shutdown, use the `--pipeline.unsafe_shutdown` flag when you start Logstash.
+
+::::{warning}
+Unsafe shutdowns, force-kills of the Logstash process, or crashes of the Logstash process for any other reason may result in data loss (unless you’ve enabled Logstash to use [persistent queues](/reference/persistent-queues.md)). Shut down Logstash safely whenever possible.
+::::
+
+
+
+## Stall Detection Example [shutdown-stall-example]
+
+In this example, slow filter execution prevents the pipeline from performing a clean shutdown. Because Logstash is started with the `--pipeline.unsafe_shutdown` flag, the shutdown results in the loss of 20 events.
+
+::::{admonition}
+```shell
+bin/logstash -e 'input { generator { } } filter { ruby { code => "sleep 10000" } }
+  output { stdout { codec => dots } }' -w 1 --pipeline.unsafe_shutdown
+Pipeline main started
+^CSIGINT received. Shutting down the agent. {:level=>:warn}
+stopping pipeline {:id=>"main", :level=>:warn}
+Received shutdown signal, but pipeline is still waiting for in-flight events
+to be processed. Sending another ^C will force quit Logstash, but this may cause
+data loss. {:level=>:warn}
+{"inflight_count"=>125, "stalling_thread_info"=>{["LogStash::Filters::Ruby",
+{"code"=>"sleep 10000"}]=>[{"thread_id"=>19, "name"=>"[main]>worker0",
+"current_call"=>"(ruby filter code):1:in `sleep'"}]}} {:level=>:warn}
+The shutdown process appears to be stalled due to busy or blocked plugins.
+Check the logs for more information. {:level=>:error}
+{"inflight_count"=>125, "stalling_thread_info"=>{["LogStash::Filters::Ruby",
+{"code"=>"sleep 10000"}]=>[{"thread_id"=>19, "name"=>"[main]>worker0",
+"current_call"=>"(ruby filter code):1:in `sleep'"}]}} {:level=>:warn}
+{"inflight_count"=>125, "stalling_thread_info"=>{["LogStash::Filters::Ruby",
+{"code"=>"sleep 10000"}]=>[{"thread_id"=>19, "name"=>"[main]>worker0",
+"current_call"=>"(ruby filter code):1:in `sleep'"}]}} {:level=>:warn}
+Forcefully quitting logstash.. {:level=>:fatal}
+```
+
+::::
+
+
+When `--pipeline.unsafe_shutdown` isn’t enabled, Logstash continues to run and produce these reports periodically.
+
+
diff --git a/docs/reference/tips-best-practices.md b/docs/reference/tips-best-practices.md
new file mode 100644
index 000000000..f6003263f
--- /dev/null
+++ b/docs/reference/tips-best-practices.md
@@ -0,0 +1,118 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/tips.html
+---
+
+# Tips and best practices [tips]
+
+We are adding more tips and best practices, so please check back soon. If you have something to add, please:
+
+* create an issue at [https://github.com/elastic/logstash/issues](https://github.com/elastic/logstash/issues), or
+* create a pull request with your proposed changes at [https://github.com/elastic/logstash](https://github.com/elastic/logstash).
+
+Also check out the [Logstash discussion forum](https://discuss.elastic.co/c/logstash).
+
+
+## Command line [tip-cli]
+
+
+### Shell commands on Windows OS [tip-windows-cli]
+
+Command line examples often show single quotes. On Windows systems, replace a single quote `'` with a double quote `"`.
+
+**Example**
+
+Instead of:
+
+```
+bin/logstash -e 'input { stdin { } } output { stdout {} }'
+```
+
+Use this format on Windows systems:
+
+```
+bin\logstash -e "input { stdin { } } output { stdout {} }"
+```
+
+
+## Pipelines [tip-pipelines]
+
+
+### Pipeline management [tip-pipeline-mgmt]
+
+You can manage pipelines in a {{ls}} instance using either local pipeline configurations or [centralized pipeline management](/reference/configuring-centralized-pipelines.md) in {{kib}}.
+
+After you configure Logstash to use centralized pipeline management, you can no longer specify local pipeline configurations. The `pipelines.yml` file and settings such as `path.config` and `config.string` are inactive when centralized pipeline management is enabled.
+
+
+## Tips using filters [tip-filters]
+
+
+### Check to see if a boolean field exists [tip-check-field]
+
+You can use the mutate filter to see if a boolean field exists.
+
+{{ls}} supports [@metadata] fields—​fields that are not visible for output plugins and live only in the filtering state. You can use [@metadata] fields with the mutate filter to see if a field exists.
+
+```ruby
+filter {
+  mutate {
+    # we use a "temporal" field with a predefined arbitrary known value that
+    # lives only in filtering stage.
+    add_field => { "[@metadata][test_field_check]" => "a null value" }
+
+    # we copy the field of interest into that temporal field.
+    # If the field doesn't exist, copy is not executed.
+    copy => { "test_field" => "[@metadata][test_field_check]" }
+  }
+
+
+  # now we now if testField didn't exists, our field will have
+  # the initial arbitrary value
+  if [@metadata][test_field_check] == "a null value" {
+    # logic to execute when [test_field] did not exist
+    mutate { add_field => { "field_did_not_exist" => true }}
+  } else {
+    # logic to execute when [test_field] existed
+    mutate { add_field => { "field_did_exist" => true }}
+  }
+}
+```
+
+
+## Kafka [tip-kafka]
+
+
+### Kafka settings [tip-kafka-settings]
+
+
+#### Partitions per topic [tip-kafka-partitions]
+
+"How many partitions should I use per topic?"
+
+At least the number of {{ls}} nodes multiplied by consumer threads per node.
+
+Better yet, use a multiple of the above number. Increasing the number of partitions for an existing topic is extremely complicated. Partitions have a very low overhead. Using 5 to 10 times the number of partitions suggested by the first point is generally fine, so long as the overall partition count does not exceed 2000.
+
+Err on the side of over-partitioning up to a total 1000 partitions overall. Try not to exceed 1000 partitions.
+
+
+#### Consumer threads [tip-kafka-threads]
+
+"How many consumer threads should I configure?"
+
+Lower values tend to be more efficient and have less memory overhead. Try a value of `1` then iterate your way up. The value should in general be lower than the number of pipeline workers. Values larger than 4 rarely result in performance improvement.
+
+
+### Kafka input and persistent queue (PQ) [tip-kafka-pq-persist]
+
+
+#### Kafka offset commits [tip-kafka-offset-commit]
+
+"Does Kafka Input commit offsets only after the event has been safely persisted to the PQ?"
+
+"Does Kafa Input commit offsets only for events that have passed the pipeline fully?"
+
+No, we can’t make that guarantee. Offsets are committed to Kafka periodically. If writes to the PQ are slow or blocked, offsets for events that haven’t safely reached the PQ can be committed.
+
+
diff --git a/docs/reference/toc.yml b/docs/reference/toc.yml
new file mode 100644
index 000000000..ae97a9612
--- /dev/null
+++ b/docs/reference/toc.yml
@@ -0,0 +1,123 @@
+project: 'Logstash reference'
+toc:
+  - file: index.md
+  - file: getting-started-with-logstash.md
+    children:
+      - file: installing-logstash.md
+      - file: first-event.md
+      - file: advanced-pipeline.md
+      - file: multiple-input-output-plugins.md
+  - file: how-logstash-works.md
+    children:
+      - file: execution-model.md
+      - file: ecs-ls.md
+      - file: processing.md
+  - file: setting-up-running-logstash.md
+    children:
+      - file: dir-layout.md
+      - file: config-setting-files.md
+      - file: logstash-settings-file.md
+      - file: keystore.md
+      - file: running-logstash-command-line.md
+      - file: running-logstash.md
+      - file: docker.md
+      - file: docker-config.md
+      - file: running-logstash-kubernetes.md
+      - file: running-logstash-windows.md
+      - file: logging.md
+      - file: shutdown.md
+  - file: upgrading-logstash.md
+    children:
+      - file: upgrading-using-package-managers.md
+      - file: upgrading-using-direct-download.md
+      - file: upgrading-minor-versions.md
+  - file: creating-logstash-pipeline.md
+    children:
+      - file: configuration-file-structure.md
+      - file: event-dependent-configuration.md
+      - file: environment-variables.md
+      - file: connecting-to-cloud.md
+      - file: config-examples.md
+  - file: secure-connection.md
+  - file: advanced-logstash-configurations.md
+    children:
+      - file: multiple-pipelines.md
+      - file: pipeline-to-pipeline.md
+      - file: reloading-config.md
+      - file: multiline.md
+      - file: glob-support.md
+      # TO DO: Doesn't exist on master
+      # - file: ingest-converter.md
+  - file: logstash-to-logstash-communications.md
+    children:
+      - file: ls-to-ls-lumberjack.md
+      - file: ls-to-ls-http.md
+      - file: ls-to-ls-native.md
+  - file: managing-logstash.md
+    children:
+      - file: logstash-centralized-pipeline-management.md
+      - file: configuring-centralized-pipelines.md
+  - file: using-logstash-with-elastic-integrations.md
+  # TO DO: Not migrated
+  # - file: working-with-logstash-modules.md
+  #   children:
+      # TO DO: Doesn't exist on master
+      # - file: arcsight-module.md
+      # TO DO: Doesn't exist on master
+      # - file: netflow-module.md
+      # TO DO: Doesn't exist on master
+      # - file: azure-module.md
+  - file: working-with-filebeat-modules.md
+    children:
+      - file: use-ingest-pipelines.md
+      - file: use-filebeat-modules-kafka.md
+  - file: working-with-winlogbeat-modules.md
+  - file: queues-data-resiliency.md
+    children:
+      - file: memory-queue.md
+      - file: persistent-queues.md
+      - file: dead-letter-queues.md
+  - file: transforming-data.md
+    children:
+      - file: core-operations.md
+      - file: data-deserialization.md
+      - file: field-extraction.md
+      - file: lookup-enrichment.md
+  - file: deploying-scaling-logstash.md
+  - file: managing-geoip-databases.md
+    children:
+      - file: logstash-geoip-database-management.md
+      - file: configuring-geoip-database-management.md
+  - file: performance-tuning.md
+    children:
+      - file: performance-troubleshooting.md
+      - file: tuning-logstash.md
+  - file: monitoring-logstash-with-elastic-agent.md
+    children:
+      - file: dashboard-monitoring-with-elastic-agent.md
+      - file: serverless-monitoring-with-elastic-agent.md
+      - file: monitoring-with-elastic-agent.md
+  - file: monitoring-logstash-legacy.md
+    children:
+      - file: monitoring-with-metricbeat.md
+      - file: monitoring-internal-collection-legacy.md
+      - file: logstash-monitoring-ui.md
+      - file: logstash-pipeline-viewer.md
+      - file: monitoring-troubleshooting.md
+  - file: monitoring-logstash.md
+  - file: working-with-plugins.md
+    children:
+      - file: plugin-concepts.md
+      - file: plugin-generator.md
+      - file: offline-plugins.md
+      - file: private-rubygem.md
+      - file: event-api.md
+  - file: tips-best-practices.md
+    children:
+      - file: jvm-settings.md
+  # TO DO: Was not migrated
+  # - file: upgrading-with-persistent-queue-enabled.md
+  # TO DO: Was not migrated
+  # - file: multiline-filter-plugin.md
+  # TO DO: Was not migrated
+  # - file: field-references-deep-dive.md
\ No newline at end of file
diff --git a/docs/reference/transforming-data.md b/docs/reference/transforming-data.md
new file mode 100644
index 000000000..ba6325828
--- /dev/null
+++ b/docs/reference/transforming-data.md
@@ -0,0 +1,20 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/transformation.html
+---
+
+# Transforming data [transformation]
+
+With over 200 plugins in the Logstash plugin ecosystem, it’s sometimes challenging to choose the best plugin to meet your data processing needs. In this section, we’ve collected a list of popular plugins and organized them according to their processing capabilities:
+
+* [Performing Core Operations](/reference/core-operations.md)
+* [Deserializing Data](/reference/data-deserialization.md)
+* [Extracting Fields and Wrangling Data](/reference/field-extraction.md)
+* [Enriching Data with Lookups](/reference/lookup-enrichment.md)
+
+Also see [*Filter plugins*](logstash-docs-md://lsr/filter-plugins.md) and [*Codec plugins*](logstash-docs-md://lsr/codec-plugins.md) for the full list of available data processing plugins.
+
+
+
+
+
diff --git a/docs/reference/tuning-logstash.md b/docs/reference/tuning-logstash.md
new file mode 100644
index 000000000..d7958a026
--- /dev/null
+++ b/docs/reference/tuning-logstash.md
@@ -0,0 +1,78 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/tuning-logstash.html
+---
+
+# Tuning and profiling logstash pipeline performance [tuning-logstash]
+
+The [Flow Metrics](https://www.elastic.co/docs/api/doc/logstash/operation/operation-nodestats) in Logstash’s Monitoring API can provide excellent insight into how events are flowing through your pipelines. They can reveal whether your pipeline is constrained for resources, which parts of your pipeline are consuming the most resources, and provide useful feedback when tuning.
+
+
+## Worker utilization [tuning-logstash-worker-utilization]
+
+When a pipeline’s `worker_utilization` flow metric is consistently near 100, all of its workers are occupied processing the filters and outputs of the pipeline. We can see *which* plugins in the pipeline are consuming the available worker capacity by looking at the plugin-level `worker_utilization` and `worker_millis_per_event` flow metrics. Using this information, we can gain intuition about how to tune the pipeline’s settings to add resources, how to find and eliminate wasteful computation, or realize the need to scale up/out the capacity of downstream destinations.
+
+In general, plugins fit into one of two categories:
+
+* **CPU-bound**: plugins that perform computation on the contents of events *without* the use of the network or disk IO tend to benefit from incrementally increasing `pipeline.workers` as long as the process has available CPU; once CPU is exhausted additional concurrency can result in *lower* throughput as the pipeline workers contend for resources and the amount of time spent in context-switching increases.
+* **IO-bound**: plugins that use the network to either enrich events or transmit events tend to benefit from incrementally increasing `pipeline.workers` and/or tuning the `pipeline.batch.*` parameters described below. This allows them to make better use of network resources, as long as those external services are not exerting back-pressure (even if Logstash is using nearly all of its available CPU).
+
+The further a pipeline’s `worker_utilization` is from 100, the more time its workers are spending waiting for events to arrive in the queue. Because the volume of data in most pipelines is often inconsistent, the goal should be to tune the pipeline such that it has the resources to avoid propagating back-pressure to its inputs during peak periods.
+
+
+## Queue back-pressure [tuning-logstash-queue-backpressure]
+
+When a pipeline receives events faster than it can process them, the inputs eventually experience back-pressure that prevents them from receiving additional events. Depending on the input plugin being used, back-pressure can either propagate upstream or lead to data loss.
+
+A pipeline’s `queue_backpressure` flow metric reflects how much time the inputs are spending attempting to push events into the queue. The metric isn’t precisely comparable across pipelines, but instead allows you to compare a single pipeline’s current behaviour to *itself* over time. When this metric is growing, look *downstream* at the pipeline’s filters and outputs to see if they are using resources effectively, have sufficient resources allocated, or are experiencing back-pressure of their own.
+
+::::{note}
+A persisted queue offers durability guarantees and can absorb back-pressure for longer than the default in-memory queue, but once it is full it too propagates back-pressure. The `queue_persisted_growth_events` flow metric is useful measure of how much back-pressure is being actively absorbed by the persisted queue, and should trend toward zero (or less) over the pipeline’s lifetime. Negative numbers indicate that the queue is *shrinking*, and that the workers are catching up on lag that had previously developed.
+::::
+
+
+
+## Tuning-related settings [tuning-logstash-settings]
+
+The Logstash defaults are chosen to provide fast, safe performance for most users. However if you notice performance issues, you may need to modify some of the defaults. Logstash provides the following configurable options for tuning pipeline performance: `pipeline.workers`, `pipeline.batch.size`, and `pipeline.batch.delay`.
+
+For more information about setting these options, see [logstash.yml](/reference/logstash-settings-file.md).
+
+Make sure you’ve read the [Performance troubleshooting](/reference/performance-troubleshooting.md) before modifying these options.
+
+* The `pipeline.workers` setting determines how many threads to run for filter and output processing. If you find that events are backing up, or that the CPU is not saturated, consider increasing the value of this parameter to make better use of available processing power. Good results can even be found increasing this number past the number of available processors as these threads may spend significant time in an I/O wait state when writing to external systems.
+* The `pipeline.batch.size` setting defines the maximum number of events an individual worker thread collects from the queue before attempting to execute filters and outputs. Larger batch sizes are generally more efficient, but increase memory overhead. Output plugins can process each batch as a logical unit. The Elasticsearch output, for example, attempts to send a single [bulk request](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-bulk) for each batch received. Tuning the `pipeline.batch.size` setting adjusts the size of bulk requests sent to Elasticsearch.
+* The `pipeline.batch.delay` setting rarely needs to be tuned. This setting adjusts the latency of the Logstash pipeline. Pipeline batch delay is the maximum amount of time in milliseconds that a pipeline worker waits for each new event while its current batch is not yet full. After this time elapses without any more events becoming available, the worker begins to execute filters and outputs. The maximum time that the worker waits between receiving an event and processing that event in a filter is the product of the `pipeline.batch.delay` and `pipeline.batch.size` settings.
+
+
+## Notes on pipeline configuration and performance [_notes_on_pipeline_configuration_and_performance]
+
+If you plan to modify the default pipeline settings, take into account the following suggestions:
+
+* The total number of inflight events is determined by the product of the  `pipeline.workers` and `pipeline.batch.size` settings. This product is referred to as the *inflight count*. Keep the value of the inflight count in mind as you adjust the `pipeline.workers` and `pipeline.batch.size` settings. Pipelines that intermittently receive large events at irregular intervals require sufficient memory to handle these spikes. Set the JVM heap space accordingly in the `jvm.options` config file (See [Logstash Configuration Files](/reference/config-setting-files.md) for more info).
+* Measure each change to make sure it increases, rather than decreases, performance.
+* Ensure that you leave enough memory available to cope with a sudden increase in event size. For example, an application that generates exceptions that are represented as large blobs of text.
+* The number of workers may be set higher than the number of CPU cores since outputs often spend idle time in I/O wait conditions.
+* Threads in Java have names and you can use the `jstack`, `top`, and the VisualVM graphical tools to figure out which resources a given thread uses.
+* On Linux platforms, Logstash labels its threads with descriptive names. For example, inputs show up as `[base]<inputname`, and pipeline workers show up as `[base]>workerN`, where N is an integer. Where possible, other threads are also labeled to help you identify their purpose.
+
+
+## Profiling the heap [profiling-the-heap]
+
+When tuning Logstash you may have to adjust the heap size. You can use the [VisualVM](https://visualvm.github.io/) tool to profile the heap. The **Monitor** pane in particular is useful for checking whether your heap allocation is sufficient for the current workload. The screenshots below show sample **Monitor** panes. The first pane examines a Logstash instance configured with too many inflight events. The second pane examines a Logstash instance configured with an appropriate amount of inflight events. Note that the specific batch sizes used here are most likely not applicable to your specific workload, as the memory demands of Logstash vary in large part based on the type of messages you are sending.
+
+% TO DO: Use `:class: screenshot`
+![pipeline overload](images/pipeline_overload.png)
+
+% TO DO: Use `:class: screenshot`
+![pipeline correct load](images/pipeline_correct_load.png)
+
+In the first example we see that the CPU isn’t being used very efficiently. In fact, the JVM is often times having to stop the VM for “full GCs”. Full garbage collections are a common symptom of excessive memory pressure. This is visible in the spiky pattern on the CPU chart. In the more efficiently configured example, the GC graph pattern is more smooth, and the CPU is used in a more uniform manner. You can also see that there is ample headroom between the allocated heap size, and the maximum allowed, giving the JVM GC a lot of room to work with.
+
+Examining the in-depth GC statistics with a tool similar to the excellent [VisualGC](https://visualvm.github.io/plugins.html) plugin shows that the over-allocated VM spends very little time in the efficient Eden GC, compared to the time spent in the more resource-intensive Old Gen “Full” GCs.
+
+::::{note}
+As long as the GC pattern is acceptable, heap sizes that occasionally increase to the maximum are acceptable. Such heap size spikes happen in response to a burst of large events passing through the pipeline. In general practice, maintain a gap between the used amount of heap memory and the maximum. This document is not a comprehensive guide to JVM GC tuning. Read the official [Oracle guide](http://www.oracle.com/webfolder/technetwork/tutorials/obe/java/gc01/index.html) for more information on the topic. We also recommend reading [Debugging Java Performance](https://www.semicomplete.com/blog/geekery/debugging-java-performance/).
+::::
+
+
diff --git a/docs/reference/upgrading-logstash.md b/docs/reference/upgrading-logstash.md
new file mode 100644
index 000000000..dc33cb536
--- /dev/null
+++ b/docs/reference/upgrading-logstash.md
@@ -0,0 +1,85 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/upgrading-logstash.html
+---
+
+# Upgrading Logstash [upgrading-logstash]
+
+
+::::{admonition} Upgrade to {{ls}} 8.18 before upgrading to 9.0
+
+Upgrading to {{ls}} 8.18 gives you a head-start on new 9.0 features.
+This step helps reduce risk and makes roll backs easier if you hit a snag.
+
+::::
+
+
+## Before you upgrade {{ls}}
+
+* Upgrade {{ls}} to 8.18 for an easier upgrade to 9.0.
+* Check out the [breaking changes](/release-notes/breaking-changes.md) docs.
+* Read the [*Release Notes*](/release-notes/index.md).
+* If you’re upgrading other products in the stack, check out the [Elastic upgrade documentation](docs-content://deploy-manage/upgrade.md).
+
+## Upgrade tips and considerations
+
+* Test upgrades in a development environment before upgrading your production cluster.
+* If you use monitoring, re-use the data directory when you upgrade Logstash. Otherwise, the Logstash node is assigned a new persistent UUID and becomes a new node in the monitoring data.
+* If you use the [elastic_integration filter](logstash-docs-md://lsr/plugins-filters-elastic_integration.md) plugin in Logstash pipelines:
+    * Logstash and Elasticsearch must be on the same version.
+    * The recommended order for upgrading {{stack}} is ({es})-({ls})-({kib}) to ensure the best experience with {agent}-managed pipelines.
+    Note that this is different from the typical {{stack}} upgrade order.
+    See [when `elastic_integration` is in {{ls}} pipeline](#upgrading-when-elastic_integration-in-pipeline) section for details.
+
+
+## Ways to upgrade
+
+* [Upgrading using package managers](/reference/upgrading-using-package-managers.md)
+* [Upgrading using a direct download](/reference/upgrading-using-direct-download.md)
+
+
+## When to upgrade [_when_to_upgrade]
+
+Fresh installations should start with the same version across the Elastic Stack.
+
+Elasticsearch 9.0 does not require Logstash 9.0.
+An Elasticsearch 9.0 cluster can receive data from earlier versions of Logstash through the default HTTP communication layer.
+This provides some flexibility to decide when to upgrade Logstash relative to an Elasticsearch upgrade.
+It may or may not be convenient for you to upgrade them together, and it is not required to be done at the same time as long as Elasticsearch is upgraded first. However, there are special plugin cases for example, if your pipeline includes [elastic_integration filter](logstash-docs-md://lsr/plugins-filters-elastic_integration.md) plugin. See [when `elastic_integration` is in {{ls}} pipeline](#upgrading-when-elastic_integration-in-pipeline) section for details.
+
+You should upgrade in a timely manner to get the performance improvements that come with Logstash 9.0, but do so in the way that makes the most sense for your environment.
+
+
+## When not to upgrade [_when_not_to_upgrade]
+
+If any Logstash plugin that you require is not compatible with Logstash 9.0, then you should wait until it is ready before upgrading.
+
+Although we make great efforts to ensure compatibility, Logstash 9.0 is not completely backwards compatible. As noted in the Elastic Stack upgrade guide, you should not upgrade Logstash 9.0 before you upgrade Elasticsearch 9.0. This is both practical and because some Logstash 9.0 plugins may attempt to use features of Elasticsearch 9.0 that did not exist in earlier versions.
+
+For example, if you attempt to send the 8.x template to a cluster before Elasticsearch 9.0, then  all indexing likely fail. If you use your own custom template with Logstash, then this issue can be ignored.
+
+Another example is when your pipeline utilizes the [`elastic_integration` filter](logstash-docs-md://lsr/plugins-filters-elastic_integration.md) plugin. In such cases, the plugin may encounter issues loading and executing deprecated integrations or features that have been removed in newer versions. This can lead to disruptions in your pipeline’s functionality, especially if your workflow relies on these outdated components. For a comprehensive understanding of how to handle such scenarios and ensure compatibility, refer to the [when `elastic_integration` is in {{ls}} pipeline](#upgrading-when-elastic_integration-in-pipeline) section in this documentation.
+
+
+## When `elastic_integration` is in {{ls}} pipeline [upgrading-when-elastic_integration-in-pipeline]
+
+[elastic_integration filter](logstash-docs-md://lsr/plugins-filters-elastic_integration.md) plugin requires a special attention due to its dependencies on various components of the stack such as {{es}}, {{kib}} and {{ls}}. Any updates, deprecations, or changes in the stack products can directly impact the functionality of the plugin.
+
+**When upgrading {{es}}**
+
+This plugin is compiled with a specific version of {{es}} and embeds {{es}} Ingest Node components that match the `major.minor` stack version. Therefore, we recommend using a plugin version that aligns with the `major.minor` version of your stack.
+
+If the versions do not match, the plugin may encounter issues such as failing to load or execute pipelines. For example, if your {{es}} version is newer than the plugin, the plugin may not support new features introduced in the updated {{es}} version. Conversely, if your {{es}} version is older, the plugin may rely on features that have been deprecated or removed in your {{es}} version.
+
+**When upgrading {{kib}}**
+
+When you upgrade {{kib}}, {{kib}} downloads the latest version of the integrations through [Elastic Package Registry](docs-content://reference/fleet/index.md#package-registry-intro). As part of the upgrade process, you will also have the opportunity to review and upgrade your currently installed integrations to their latest versions. However, we strongly recommend upgrading the [elastic_integration filter](logstash-docs-md://lsr/plugins-filters-elastic_integration.md) plugin before upgrading {{kib}} and {{es}}. This is because [elastic_integration filter](logstash-docs-md://lsr/plugins-filters-elastic_integration.md) plugin pulls and processes the ingest pipelines associated with the installed integrations. These pipelines are then executed using the {{es}} Ingest Node components that the plugin was compiled with. If {{es}} or {{es}} is upgraded first, there is a risk of incompatibility between the plugin’s ingest componenets and the newer versions of {{es}}'s Ingest Node features or {{kib}}'s integration definitions.
+
+**When upgrading {{ls}}**
+
+This plugin is by default embedded in {{ls}} core. When you upgrade {{ls}}, new version of the plugin is installed. The plugin is backward compatible accross {{ls}} 8.x versions. However, if you are considering to upgrade {{ls}} only (not the plugin), there are exceptions cases, such as JDK compatibility which require matching certain {{ls}} versions. We recommend visiting [elastic_integration plugin requirements](logstash-docs-md://lsr/plugins-filters-elastic_integration.md#plugins-filters-elastic_integration-requirements) guide considering the {{ls}} version you are upgrading to.
+
+
+
+
+
diff --git a/docs/reference/upgrading-minor-versions.md b/docs/reference/upgrading-minor-versions.md
new file mode 100644
index 000000000..283d28642
--- /dev/null
+++ b/docs/reference/upgrading-minor-versions.md
@@ -0,0 +1,11 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/upgrading-minor-versions.html
+---
+
+# Upgrading between minor versions [upgrading-minor-versions]
+
+As a general rule, you can upgrade between minor versions (for example, 9.x to 9.y, where x < y) by simply installing the new release and restarting {{ls}}. {{ls}} typically maintains backwards compatibility for configuration settings and exported fields. Please review the [release notes](/release-notes/index.md) for potential exceptions.
+
+Upgrading between non-consecutive major versions (7.x to 9.x, for example) is not supported.
+
diff --git a/docs/reference/upgrading-using-direct-download.md b/docs/reference/upgrading-using-direct-download.md
new file mode 100644
index 000000000..5b7922763
--- /dev/null
+++ b/docs/reference/upgrading-using-direct-download.md
@@ -0,0 +1,18 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/upgrading-using-direct-download.html
+---
+
+# Upgrading using a direct download [upgrading-using-direct-download]
+
+This procedure downloads the relevant Logstash binaries directly from Elastic.
+
+1. Shut down your Logstash pipeline, including any inputs that send events to Logstash.
+2. Download the [Logstash installation file](https://www.elastic.co/downloads/logstash) that matches your host environment.
+3. Backup your `config/` and `data/` folders in a temporary space.
+4. Delete your Logstash directory.
+5. Unpack the installation file into the folder that contained the Logstash directory that you just deleted.
+6. Restore the `config/` and `data/` folders that were previously saved, overwriting the folders created during the unpack operation.
+7. Test your configuration file with the `logstash --config.test_and_exit -f <configuration-file>` command. Configuration options for some Logstash plugins have changed.
+8. Restart your Logstash pipeline after updating your configuration file.
+
diff --git a/docs/reference/upgrading-using-package-managers.md b/docs/reference/upgrading-using-package-managers.md
new file mode 100644
index 000000000..21b13644c
--- /dev/null
+++ b/docs/reference/upgrading-using-package-managers.md
@@ -0,0 +1,15 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/upgrading-using-package-managers.html
+---
+
+# Upgrading using package managers [upgrading-using-package-managers]
+
+This procedure uses [package managers](/reference/installing-logstash.md#package-repositories) to upgrade Logstash.
+
+1. Shut down your Logstash pipeline, including any inputs that send events to Logstash.
+2. Using the directions in the [Installing from Package Repositories](/reference/installing-logstash.md#package-repositories) section, update your repository links to point to the 9.x repositories.
+3. Run the `apt-get upgrade logstash` or `yum update logstash` command as appropriate for your operating system.
+4. Test your configuration file with the `logstash --config.test_and_exit -f <configuration-file>` command. Configuration options for some Logstash plugins have changed in the 9.x release.
+5. Restart your Logstash pipeline after you have updated your configuration file.
+
diff --git a/docs/reference/use-filebeat-modules-kafka.md b/docs/reference/use-filebeat-modules-kafka.md
new file mode 100644
index 000000000..04313050c
--- /dev/null
+++ b/docs/reference/use-filebeat-modules-kafka.md
@@ -0,0 +1,119 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/use-filebeat-modules-kafka.html
+---
+
+# Example: Set up Filebeat modules to work with Kafka and Logstash [use-filebeat-modules-kafka]
+
+This section shows how to set up {{filebeat}} [modules](beats://reference/filebeat/filebeat-modules-overview.md) to work with {{ls}} when you are using Kafka in between {{filebeat}} and {{ls}} in your publishing pipeline. The main goal of this example is to show how to load ingest pipelines from {{filebeat}} and use them with {{ls}}.
+
+The examples in this section show simple configurations with topic names hard coded. For a full list of configuration options, see documentation about configuring the [Kafka input plugin](logstash-docs-md://lsr/plugins-inputs-kafka.md). Also see [Configure the Kafka output](beats://reference/filebeat/kafka-output.md) in the *{{filebeat}} Reference*.
+
+## Set up and run {{filebeat}} [_set_up_and_run_filebeat]
+
+1. If you haven’t already set up the {{filebeat}} index template and sample {{kib}} dashboards, run the {{filebeat}} `setup` command to do that now:
+
+    ```shell
+    filebeat -e setup
+    ```
+
+    The `-e` flag is optional and sends output to standard error instead of syslog.
+
+    A connection to {{es}} and {{kib}} is required for this one-time setup step because {{filebeat}} needs to create the index template in {{es}} and load the sample dashboards into {{kib}}. For more information about configuring the connection to {{es}}, see the Filebeat [quick start](beats://reference/filebeat/filebeat-installation-configuration.md).
+
+    After the template and dashboards are loaded, you’ll see the message `INFO {{kib}} dashboards successfully loaded. Loaded dashboards`.
+
+2. Run the `modules enable` command to enable the modules that you want to run. For example:
+
+    ```shell
+    filebeat modules enable system
+    ```
+
+    You can further configure the module by editing the config file under the {{filebeat}} `modules.d` directory. For example, if the log files are not in the location expected by the module, you can set the `var.paths` option.
+
+    ::::{note}
+    You must enable at least one fileset in the module. **Filesets are disabled by default.**
+    ::::
+
+3. Run the `setup` command with the `--pipelines` and `--modules` options specified to load ingest pipelines for the modules you’ve enabled. This step also requires a connection to {{es}}. If you want use a {{ls}} pipeline instead of ingest node to parse the data, skip this step.
+
+    ```shell
+    filebeat setup --pipelines --modules system
+    ```
+
+4. Configure {{filebeat}} to send log lines to Kafka. To do this, in the `filebeat.yml` config file, disable the {{es}} output by commenting it out, and enable the Kafka output. For example:
+
+    ```yaml
+    #output.elasticsearch:
+      #hosts: ["localhost:9200"]
+    output.kafka:
+      hosts: ["kafka:9092"]
+      topic: "filebeat"
+      codec.json:
+        pretty: false
+    ```
+
+5. Start {{filebeat}}. For example:
+
+    ```shell
+    filebeat -e
+    ```
+
+    {{filebeat}} will attempt to send messages to {{ls}} and continue until {{ls}} is available to receive them.
+
+    ::::{note}
+    Depending on how you’ve installed {{filebeat}}, you might see errors related to file ownership or permissions when you try to run {{filebeat}} modules. See [Config File Ownership and Permissions](beats://reference/libbeat/config-file-permissions.md) in the *Beats Platform Reference* if you encounter errors related to file ownership or permissions.
+    ::::
+
+
+
+## Create and start the {{ls}} pipeline [_create_and_start_the_ls_pipeline]
+
+1. On the system where {{ls}} is installed, create a {{ls}} pipeline configuration that reads from a Kafka input and sends events to an {{es}} output:
+
+    ```yaml
+    input {
+      kafka {
+        bootstrap_servers => "myhost:9092"
+        topics => ["filebeat"]
+        codec => json
+      }
+    }
+
+    output {
+      if [@metadata][pipeline] {
+        elasticsearch {
+          hosts => "https://myEShost:9200"
+          manage_template => false
+          index => "%{[@metadata][beat]}-%{[@metadata][version]}-%{+YYYY.MM.dd}"
+          pipeline => "%{[@metadata][pipeline]}" <1>
+          user => "elastic"
+          password => "secret"
+        }
+      } else {
+        elasticsearch {
+          hosts => "https://myEShost:9200"
+          manage_template => false
+          index => "%{[@metadata][beat]}-%{[@metadata][version]}-%{+YYYY.MM.dd}"
+          user => "elastic"
+          password => "secret"
+        }
+      }
+    }
+    ```
+
+    1. Set the `pipeline` option to `%{[@metadata][pipeline]}`. This setting configures {{ls}} to select the correct ingest pipeline based on metadata passed in the event.
+
+2. Start {{ls}}, passing in the pipeline configuration file you just defined. For example:
+
+    ```shell
+    bin/logstash -f mypipeline.conf
+    ```
+
+    {{ls}} should start a pipeline and begin receiving events from the Kafka input.
+
+
+
+## Visualize the data [_visualize_the_data]
+
+To visualize the data in {{kib}}, launch the {{kib}} web interface by pointing your browser to port 5601. For example, [http://127.0.0.1:5601](http://127.0.0.1:5601). Click **Dashboards** then view the {{filebeat}} dashboards.
diff --git a/docs/reference/use-ingest-pipelines.md b/docs/reference/use-ingest-pipelines.md
new file mode 100644
index 000000000..05b381347
--- /dev/null
+++ b/docs/reference/use-ingest-pipelines.md
@@ -0,0 +1,65 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/use-ingest-pipelines.html
+---
+
+# Use ingest pipelines for parsing [use-ingest-pipelines]
+
+When you use {{filebeat}} modules with {{ls}}, you can use the ingest pipelines provided by {{filebeat}} to parse the data. You need to load the pipelines into {{es}} and configure {{ls}} to use them.
+
+**To load the ingest pipelines:**
+
+On the system where {{filebeat}} is installed, run the `setup` command with the `--pipelines` option specified to load ingest pipelines for specific modules. For example, the following command loads ingest pipelines for the system and nginx modules:
+
+```shell
+filebeat setup --pipelines --modules nginx,system
+```
+
+A connection to {{es}} is required for this setup step because {{filebeat}} needs to load the ingest pipelines into {{es}}. If necessary, you can temporarily disable your configured output and enable the {{es}} output before running the command.
+
+**To configure {{ls}} to use the pipelines:**
+
+On the system where {{ls}} is installed, create a {{ls}} pipeline configuration that reads from a {{ls}} input, such as {{beats}} or Kafka, and sends events to an {{es}} output. Set the `pipeline` option in the {{es}} output to `%{[@metadata][pipeline]}` to use the ingest pipelines that you loaded previously.
+
+Here’s an example configuration that reads data from the Beats input and uses {{filebeat}} ingest pipelines to parse data collected by modules:
+
+```yaml
+input {
+  beats {
+    port => 5044
+  }
+}
+
+output {
+  if [@metadata][pipeline] {
+    elasticsearch {
+      hosts => "https://061ab24010a2482e9d64729fdb0fd93a.us-east-1.aws.found.io:9243"
+      manage_template => false
+      index => "%{[@metadata][beat]}-%{[@metadata][version]}" <1>
+      action => "create" <2>
+      pipeline => "%{[@metadata][pipeline]}" <3>
+      user => "elastic"
+      password => "secret"
+    }
+  } else {
+    elasticsearch {
+      hosts => "https://061ab24010a2482e9d64729fdb0fd93a.us-east-1.aws.found.io:9243"
+      manage_template => false
+      index => "%{[@metadata][beat]}-%{[@metadata][version]}" <1>
+      action => "create"
+      user => "elastic"
+      password => "secret"
+    }
+  }
+}
+```
+
+1. If data streams are disabled in your configuration, set the `index` option to `%{[@metadata][beat]}-%{[@metadata][version]}-%{+YYYY.MM.dd}`. Data streams are enabled by default.
+2. If you are disabling the use of Data Streams on your configuration, you can remove this setting, or set it to a different value as appropriate.
+3. Configures {{ls}} to select the correct ingest pipeline based on metadata passed in the event.
+
+
+See the {{filebeat}} [Modules](beats://reference/filebeat/filebeat-modules-overview.md) documentation for more information about setting up and running modules.
+
+For a full example, see [Example: Set up {{filebeat}} modules to work with Kafka and {{ls}}](/reference/use-filebeat-modules-kafka.md).
+
diff --git a/docs/reference/using-logstash-with-elastic-integrations.md b/docs/reference/using-logstash-with-elastic-integrations.md
new file mode 100644
index 000000000..86ea4bb5f
--- /dev/null
+++ b/docs/reference/using-logstash-with-elastic-integrations.md
@@ -0,0 +1,87 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/ea-integrations.html
+---
+
+# Using Logstash with Elastic integrations [ea-integrations]
+
+You can take advantage of the extensive, built-in capabilities of Elastic {{integrations}}--such as managing data collection, transformation, and visualization—​and then use {{ls}} for additional data processing and output options. {{ls}} can further expand capabilities for use cases where you need additional processing, or if you need your data delivered to multiple destinations.
+
+
+## Elastic {{integrations}}: ingesting to visualizing [integrations-value]
+
+[Elastic {{integrations}}](integration-docs://reference/index.md) provide quick, end-to-end solutions for:
+
+* ingesting data from a variety of data sources,
+* ensuring compliance with the [Elastic Common Schema (ECS)][Elastic Common Schema (ECS)](ecs://reference/index.md)),
+* getting the data into the {{stack}}, and
+* visualizing it with purpose-built dashboards.
+
+{{integrations}} are available for [popular services and platforms](integration-docs://reference/all_integrations.md), such as Nginx, AWS, and MongoDB, as well as many generic input types like log files. Each integration includes pre-packaged assets to help reduce the time between ingest and insights.
+
+To see available integrations, go to the {{kib}} home page, and click **Add {{integrations}}**. You can use the query bar to search for integrations you may want to use. When you find an integration for your data source, the UI walks you through adding and configuring it.
+
+
+## Extend {{integrations}} with {{ls}} [integrations-and-ls]
+
+Logstash can run the ingest pipeline component of your Elastic integration when you use the Logstash `filter-elastic_integration` plugin in your {{ls}} pipeline.
+
+Adding the `filter-elastic_integration` plugin as the *first* filter plugin keeps the pipeline’s behavior as close as possible to the behavior you’d expect if the bytes were processed by the integration in {{es}}. The more you modify an event before calling the `elastic_integration` filter, the higher the risk that the modifications will have meaningful effect in how the event is transformed.
+
+::::{admonition} How to
+Create a {{ls}} pipeline that uses the [elastic_agent input](logstash-docs-md://lsr/plugins-inputs-elastic_agent.md) plugin, and the [elastic_integration filter](logstash-docs-md://lsr/plugins-filters-elastic_integration.md) plugin as the *first* filter in your {{ls}} pipeline. You can add more filters for additional processing, but they must come after the `logstash-filter-elastic_integration` plugin in your configuration. Add one or more output plugins to complete your pipeline.
+
+::::
+
+
+**Sample pipeline configuration**
+
+```ruby
+input {
+  elastic_agent {
+    port => 5044
+  }
+}
+
+filter {
+  elastic_integration{ <1>
+    cloud_id => "<cloud id>"
+    cloud_auth => "<your_cloud-auth"
+  }
+
+  translate { <2>
+    source => "[http][host]"
+    target => "[@metadata][tenant]"
+    dictionary_path => "/etc/conf.d/logstash/tenants.yml"
+  }
+}
+
+output { <3>
+  if [@metadata][tenant] == "tenant01" {
+    elasticsearch {
+      cloud_id => "<cloud id>"
+      api_key => "<api key>"
+    }
+  } else if [@metadata][tenant] == "tenant02" {
+    elasticsearch {
+      cloud_id => "<cloud id>"
+      api_key => "<api key>"
+    }
+  }
+}
+```
+
+1. Use `filter-elastic_integration` as the first filter in your pipeline
+2. You can use additional filters as long as they follow `filter-elastic_integration`
+3. Sample config to output data to multiple destinations
+
+
+
+### Using `filter-elastic_integration` with `output-elasticsearch` [es-tips]
+
+Elastic {{integrations}} are designed to work with [data streams](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-data-streams) and [ECS-compatible](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#_compatibility_with_the_elastic_common_schema_ecs) output. Be sure that these features are enabled in the [`output-elasticsearch`](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md) plugin.
+
+* Set [`data-stream`](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-data_stream) to `true`.<br> (Check out [Data streams](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-data-streams) for additional data streams settings.)
+* Set [`ecs-compatibility`](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-ecs_compatibility) to `v1` or `v8`.
+
+Check out the [`output-elasticsearch` plugin](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md) docs for additional settings.
diff --git a/docs/reference/working-with-filebeat-modules.md b/docs/reference/working-with-filebeat-modules.md
new file mode 100644
index 000000000..ebf3c65c5
--- /dev/null
+++ b/docs/reference/working-with-filebeat-modules.md
@@ -0,0 +1,13 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/filebeat-modules.html
+---
+
+# Working with Filebeat modules [filebeat-modules]
+
+{{filebeat}} comes packaged with pre-built [modules](beats://reference/filebeat/filebeat-modules.md) that contain the configurations needed to collect, parse, enrich, and visualize data from various log file formats. Each {{filebeat}} module consists of one or more filesets that contain ingest node pipelines, {{es}} templates, {{filebeat}} input configurations, and {{kib}} dashboards.
+
+You can use {{filebeat}} modules with {{ls}}, but you need to do some extra setup. The simplest approach is to [set up and use the ingest pipelines](/reference/use-ingest-pipelines.md) provided by {{filebeat}}.
+
+
+
diff --git a/docs/reference/working-with-plugins.md b/docs/reference/working-with-plugins.md
new file mode 100644
index 000000000..863d72cd2
--- /dev/null
+++ b/docs/reference/working-with-plugins.md
@@ -0,0 +1,145 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/working-with-plugins.html
+---
+
+# Working with plugins [working-with-plugins]
+
+::::{admonition} macOS Gatekeeper warnings
+:class: important
+
+Apple’s rollout of stricter notarization requirements affected the notarization of the 9.0.0-beta1 {{ls}} artifacts. If macOS Catalina displays a dialog when you first run {{ls}}, you need to take an action to allow it to run. To prevent Gatekeeper checks on the {{ls}} files, run the following command on the downloaded `.tar.gz` archive or the directory to which was extracted:
+
+```sh
+xattr -d -r com.apple.quarantine <archive-or-directory>
+```
+
+For example, if the `.tar.gz` file was extracted to the default logstash-9.0.0-beta1 directory, the command is:
+
+```sh
+xattr -d -r com.apple.quarantine logstash-9.0.0-beta1
+```
+
+Alternatively, you can add a security override if a Gatekeeper popup appears by following the instructions in the *How to open an app that hasn’t been notarized or is from an unidentified developer* section of [Safely open apps on your Mac](https://support.apple.com/en-us/HT202491).
+
+::::
+
+
+Logstash has a rich collection of input, filter, codec, and output plugins. Check out the [Elastic Support Matrix](https://www.elastic.co/support/matrix#matrix_logstash_plugins) to see which plugins are supported at various levels.
+
+Plugins are available in self-contained packages called gems and hosted on [RubyGems.org](https://rubygems.org/). Use the plugin manager script--`bin/logstash-plugin`--to manage plugins:
+
+* [Listing plugins](#listing-plugins)
+* [Adding plugins to your deployment](#installing-plugins)
+* [Updating plugins](#updating-plugins)
+* [Removing plugins](#removing-plugins)
+* [Advanced: Adding a locally built plugin](#installing-local-plugins)
+* [Advanced: Using `--path.plugins`](#installing-local-plugins-path)
+
+
+## No internet connection? [pointer-to-offline]
+
+If you don’t have an internet connection, check out [Offline Plugin Management](/reference/offline-plugins.md) for information on [building](/reference/offline-plugins.md#building-offline-packs), [installing](/reference/offline-plugins.md#installing-offline-packs), and [updating](/reference/offline-plugins.md#updating-offline-packs) offline plugin packs.
+
+
+### Proxy configuration [http-proxy]
+
+Most plugin manager commands require access to the internet to reach [RubyGems.org](https://rubygems.org). If your organization is behind a firewall, you can set these environments variables to configure Logstash to use your proxy.
+
+```shell
+export http_proxy=http://localhost:3128
+export https_proxy=http://localhost:3128
+```
+
+
+## Listing plugins [listing-plugins]
+
+Logstash release packages bundle common plugins. To list the plugins currently available in your deployment:
+
+```shell
+bin/logstash-plugin list <1>
+bin/logstash-plugin list --verbose <2>
+bin/logstash-plugin list '*namefragment*' <3>
+bin/logstash-plugin list --group output <4>
+```
+
+1. Lists all installed plugins
+2. Lists installed plugins with version information
+3. Lists all installed plugins containing a namefragment
+4. Lists all installed plugins for a particular group (input, filter, codec, output)
+
+
+
+## Adding plugins to your deployment [installing-plugins]
+
+When you have access to internet, you can retrieve plugins hosted on the [RubyGems.org](https://rubygems.org/)public repository and install them on top of your Logstash installation.
+
+```shell
+bin/logstash-plugin install logstash-input-github
+```
+
+After a plugin is successfully installed, you can use it in your configuration file.
+
+
+## Updating plugins [updating-plugins]
+
+Plugins have their own release cycles and are often released independently of Logstash’s core release cycle. Using the update subcommand you can get the latest version of the plugin.
+
+```shell
+bin/logstash-plugin update <1>
+bin/logstash-plugin update logstash-input-github <2>
+```
+
+1. updates all installed plugins
+2. updates only the plugin you specify
+
+
+
+### Major version plugin updates [updating-major]
+
+To avoid introducing breaking changes, the plugin manager updates only plugins for which newer *minor* or *patch* versions exist by default. If you wish to also include breaking changes, specify `--level=major`.
+
+```shell
+bin/logstash-plugin update --level=major <1>
+bin/logstash-plugin update --level=major logstash-input-github <2>
+```
+
+1. updates all installed plugins to latest, including major versions with breaking changes
+2. updates only the plugin you specify to latest, including major versions with breaking changes
+
+
+
+## Removing plugins [removing-plugins]
+
+If you need to remove plugins from your Logstash installation:
+
+```shell
+bin/logstash-plugin remove logstash-input-github
+```
+
+
+### Advanced: Adding a locally built plugin [installing-local-plugins]
+
+In some cases, you may want to install plugins which are not yet released and not hosted on RubyGems.org. Logstash provides you the option to install a locally built plugin which is packaged as a ruby gem. Using a file location:
+
+```shell
+bin/logstash-plugin install /path/to/logstash-output-kafka-1.0.0.gem
+```
+
+
+### Advanced: Using `--path.plugins` [installing-local-plugins-path]
+
+Using the Logstash `--path.plugins` flag, you can load a plugin source code located on your file system. Typically this is used by developers who are iterating on a custom plugin and want to test it before creating a ruby gem.
+
+The path needs to be in a  specific directory hierarchy: `PATH/logstash/TYPE/NAME.rb`, where TYPE is *inputs* *filters*, *outputs* or *codecs* and NAME is the name of the plugin.
+
+```shell
+# supposing the code is in /opt/shared/lib/logstash/inputs/my-custom-plugin-code.rb
+bin/logstash --path.plugins /opt/shared/lib
+```
+
+
+
+
+
+
diff --git a/docs/reference/working-with-winlogbeat-modules.md b/docs/reference/working-with-winlogbeat-modules.md
new file mode 100644
index 000000000..8061d2065
--- /dev/null
+++ b/docs/reference/working-with-winlogbeat-modules.md
@@ -0,0 +1,70 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/winlogbeat-modules.html
+---
+
+# Working with Winlogbeat modules [winlogbeat-modules]
+
+{{winlogbeat}} comes packaged with pre-built [modules](beats://reference/winlogbeat/winlogbeat-modules.md) that contain the configurations needed to collect, parse, enrich, and visualize data from various Windows logging providers. Each {{winlogbeat}} module consists of one or more filesets that contain ingest node pipelines, {{es}} templates, {{winlogbeat}} input configurations, and {{kib}} dashboards.
+
+You can use {{winlogbeat}} modules with {{ls}}, but you need to do some extra setup. The simplest approach is to [set up and use the ingest pipelines](#use-winlogbeat-ingest-pipelines) provided by {{winlogbeat}}.
+
+
+## Use ingest pipelines for parsing [use-winlogbeat-ingest-pipelines]
+
+When you use {{winlogbeat}} modules with {{ls}}, you can use the ingest pipelines provided by {{winlogbeat}} to parse the data. You need to load the pipelines into {{es}} and configure {{ls}} to use them.
+
+**To load the ingest pipelines:**
+
+On the system where {{winlogbeat}} is installed, run the `setup` command with the `--pipelines` option specified to load ingest pipelines for specific modules. For example, the following command loads ingest pipelines for the security and sysmon modules:
+
+```shell
+winlogbeat setup --pipelines --modules security,sysmon
+```
+
+A connection to {{es}} is required for this setup step because {{winlogbeat}} needs to load the ingest pipelines into {{es}}. If necessary, you can temporarily disable your configured output and enable the {{es}} output before running the command.
+
+**To configure {{ls}} to use the pipelines:**
+
+On the system where {{ls}} is installed, create a {{ls}} pipeline configuration that reads from a {{ls}} input, such as {{beats}} or Kafka, and sends events to an {{es}} output. Set the `pipeline` option in the {{es}} output to `%{[@metadata][pipeline]}` to use the ingest pipelines that you loaded previously.
+
+Here’s an example configuration that reads data from the Beats input and uses {{winlogbeat}} ingest pipelines to parse data collected by modules:
+
+```yaml
+input {
+  beats {
+    port => 5044
+  }
+}
+
+output {
+  if [@metadata][pipeline] {
+    elasticsearch {
+      hosts => "https://061ab24010a2482e9d64729fdb0fd93a.us-east-1.aws.found.io:9243"
+      manage_template => false
+      index => "%{[@metadata][beat]}-%{[@metadata][version]}" <1>
+      action => "create" <2>
+      pipeline => "%{[@metadata][pipeline]}" <3>
+      user => "elastic"
+      password => "secret"
+    }
+  } else {
+    elasticsearch {
+      hosts => "https://061ab24010a2482e9d64729fdb0fd93a.us-east-1.aws.found.io:9243"
+      manage_template => false
+      index => "%{[@metadata][beat]}-%{[@metadata][version]}" <1>
+      action => "create"
+      user => "elastic"
+      password => "secret"
+    }
+  }
+}
+```
+
+1. If data streams are disabled in your configuration, set the `index` option to `%{[@metadata][beat]}-%{[@metadata][version]}-%{+YYYY.MM.dd}`. Data streams are enabled by default.
+2. If you are disabling the use of Data Streams on your configuration, you can remove this setting, or set it to a different value as appropriate.
+3. Configures {{ls}} to select the correct ingest pipeline based on metadata passed in the event.
+
+
+See the {{winlogbeat}} [Modules](beats://reference/winlogbeat/winlogbeat-modules.md) documentation for more information about setting up and running modules.
+
diff --git a/docs/release-notes/breaking-changes.md b/docs/release-notes/breaking-changes.md
new file mode 100644
index 000000000..31a2f73c1
--- /dev/null
+++ b/docs/release-notes/breaking-changes.md
@@ -0,0 +1,295 @@
+---
+navigation_title: "Breaking changes"
+---
+
+# Logstash breaking changes [logstash-breaking-changes]
+Breaking changes can impact your Elastic applications, potentially disrupting normal operations. 
+Before you upgrade, carefully review the Logstash breaking changes and take the necessary steps to mitigate any issues. 
+
+% ## Next version [logstash-nextversion-breaking-changes]
+
+% ::::{dropdown} Title of breaking change
+% Description of the breaking change.
+% For more information, check [PR #](PR link).
+% **Impact**<br> Impact of the breaking change.
+% **Action**<br> Steps for mitigating deprecation impact.
+% ::::
+
+## 9.0.0 [logstash-900-breaking-changes]
+
+
+:::::{dropdown} Changes to SSL settings in {{ls}} plugins
+:name: ssl-deprecations-9.0.0
+
+We’ve removed deprecated SSL settings in some {{ls}} plugins, and have replaced them with updated settings. If your plugin configuration contains any of these obsolete options, the plugin may fail to start.
+
+::::{dropdown} `logstash-input-beats`
+:name: input-beats-ssl-9.0
+
+| Setting | Replaced by |
+| --- | --- |
+| cipher_suites | [`ssl_cipher_suites`](logstash-docs-md://lsr/plugins-inputs-beats.md#plugins-inputs-beats-ssl_cipher_suites) |
+| ssl | [`ssl_enabled`](logstash-docs-md://lsr/plugins-inputs-beats.md#plugins-inputs-beats-ssl_enabled) |
+| ssl_peer_metadata | `ssl_peer_metadata` option of [`enrich`](logstash-docs-md://lsr/plugins-inputs-beats.md#plugins-inputs-beats-enrich) |
+| ssl_verify_mode | [`ssl_client_authentication`](logstash-docs-md://lsr/plugins-inputs-beats.md#plugins-inputs-beats-ssl_client_authentication) |
+| tls_min_version | [`ssl_supported_protocols`](logstash-docs-md://lsr/plugins-inputs-beats.md#plugins-inputs-beats-ssl_supported_protocols) |
+| tls_max_version | [`ssl_supported_protocols`](logstash-docs-md://lsr/plugins-inputs-beats.md#plugins-inputs-beats-ssl_supported_protocols) |
+
+::::
+
+::::{dropdown} `logstash-input-elastic_agent`
+:name: input-elastic_agent-ssl-9.0
+
+| Setting | Replaced by |
+| --- | --- |
+| cipher_suites | [`ssl_cipher_suites`](logstash-docs-md://lsr/plugins-inputs-elastic_agent.md#plugins-inputs-elastic_agent-ssl_cipher_suites) |
+| ssl | [`ssl_enabled`](logstash-docs-md://lsr/plugins-inputs-elastic_agent.md#plugins-inputs-elastic_agent-ssl_enabled) |
+| ssl_peer_metadata | `ssl_peer_metadata` option of [`enrich`](logstash-docs-md://lsr/plugins-inputs-elastic_agent.md#plugins-inputs-elastic_agent-enrich) |
+| ssl_verify_mode | [`ssl_client_authentication`](logstash-docs-md://lsr/plugins-inputs-elastic_agent.md#plugins-inputs-elastic_agent-ssl_client_authentication) |
+| tls_min_version | [`ssl_supported_protocols`](logstash-docs-md://lsr/plugins-inputs-elastic_agent.md#plugins-inputs-elastic_agent-ssl_supported_protocols) |
+| tls_max_version | [`ssl_supported_protocols`](logstash-docs-md://lsr/plugins-inputs-elastic_agent.md#plugins-inputs-elastic_agent-ssl_supported_protocols) |
+
+::::
+
+
+::::{dropdown} `logstash-input-elasticsearch`
+:name: input-elasticsearch-ssl-9.0
+
+| Setting | Replaced by |
+| --- | --- |
+| ca_file | [`ssl_certificate_authorities`](logstash-docs-md://lsr/plugins-inputs-elasticsearch.md#plugins-inputs-elasticsearch-ssl_certificate_authorities) |
+| ssl | [`ssl_enabled`](logstash-docs-md://lsr/plugins-inputs-elasticsearch.md#plugins-inputs-elasticsearch-ssl_enabled) |
+| ssl_certificate_verification | [`ssl_verification_mode`](logstash-docs-md://lsr/plugins-inputs-elasticsearch.md#plugins-inputs-elasticsearch-ssl_verification_mode) |
+
+::::
+
+
+::::{dropdown} `logstash-input-elastic_serverless_forwarder`
+:name: input-elastic_serverless_forwarder-ssl-9.0
+
+| Setting | Replaced by |
+| --- | --- |
+| ssl | [`ssl_enabled`](logstash-docs-md://lsr/plugins-inputs-elastic_serverless_forwarder.md#plugins-inputs-elastic_serverless_forwarder-ssl_enabled) |
+
+::::
+
+
+::::{dropdown} `logstash-input-http`
+:name: input-http-ssl-9.0
+
+| Setting | Replaced by |
+| --- | --- |
+| cipher_suites | [`ssl_cipher_suites`](logstash-docs-md://lsr/plugins-inputs-http.md#plugins-inputs-http-ssl_cipher_suites) |
+| keystore | [`ssl_keystore_path`](logstash-docs-md://lsr/plugins-inputs-http.md#plugins-inputs-http-ssl_keystore_path) |
+| keystore_password | [`ssl_keystore_password`](logstash-docs-md://lsr/plugins-inputs-http.md#plugins-inputs-http-ssl_keystore_password) |
+| ssl | [`ssl_enabled`](logstash-docs-md://lsr/plugins-inputs-http.md#plugins-inputs-http-ssl_enabled) |
+| ssl_verify_mode | [`ssl_client_authentication`](logstash-docs-md://lsr/plugins-inputs-http.md#plugins-inputs-http-ssl_client_authentication) |
+| tls_max_version | [`ssl_supported_protocols`](logstash-docs-md://lsr/plugins-inputs-http.md#plugins-inputs-http-ssl_supported_protocols) |
+| tls_min_version | [`ssl_supported_protocols`](logstash-docs-md://lsr/plugins-inputs-http.md#plugins-inputs-http-ssl_supported_protocols) |
+| verify_mode | [`ssl_client_authentication`](logstash-docs-md://lsr/plugins-inputs-http.md#plugins-inputs-http-ssl_client_authentication) |
+
+::::
+
+
+::::{dropdown} `logstash-input-http_poller`
+:name: input-http_poller-ssl-9.0
+
+| Setting | Replaced by |
+| --- | --- |
+| cacert | [`ssl_certificate_authorities`](logstash-docs-md://lsr/plugins-inputs-http_poller.md#plugins-inputs-http_poller-ssl_certificate_authorities) |
+| client_cert | [`ssl_certificate`](logstash-docs-md://lsr/plugins-inputs-http_poller.md#plugins-inputs-http_poller-ssl_certificate) |
+| client_key | [`ssl_key`](logstash-docs-md://lsr/plugins-inputs-http_poller.md#plugins-inputs-http_poller-ssl_key) |
+| keystore | [`ssl_keystore_path`](logstash-docs-md://lsr/plugins-inputs-http_poller.md#plugins-inputs-http_poller-ssl_keystore_path) |
+| keystore_password | [`ssl_keystore_password`](logstash-docs-md://lsr/plugins-inputs-http_poller.md#plugins-inputs-http_poller-ssl_keystore_password) |
+| keystore_type | [`ssl_keystore_password`](logstash-docs-md://lsr/plugins-inputs-http_poller.md#plugins-inputs-http_poller-ssl_keystore_password) |
+| truststore | [`ssl_truststore_path`](logstash-docs-md://lsr/plugins-inputs-http_poller.md#plugins-inputs-http_poller-ssl_truststore_path) |
+| truststore_password | [`ssl_truststore_password`](logstash-docs-md://lsr/plugins-inputs-http_poller.md#plugins-inputs-http_poller-ssl_truststore_password) |
+| truststore_type | [`ssl_truststore_type`](logstash-docs-md://lsr/plugins-inputs-http_poller.md#plugins-inputs-http_poller-ssl_truststore_type) |
+
+::::
+
+
+::::{dropdown} `logstash-input-tcp`
+:name: input-tcp-ssl-9.0
+
+| Setting | Replaced by |
+| --- | --- |
+| ssl_cert | [`ssl_certificate`](logstash-docs-md://lsr/plugins-inputs-tcp.md#plugins-inputs-tcp-ssl_certificate) |
+| ssl_enable | [`ssl_enabled`](logstash-docs-md://lsr/plugins-inputs-tcp.md#plugins-inputs-tcp-ssl_enabled) |
+| ssl_verify | [`ssl_client_authentication`](logstash-docs-md://lsr/plugins-inputs-tcp.md#plugins-inputs-tcp-ssl_client_authentication) in `server` mode and [`ssl_verification_mode`](logstash-docs-md://lsr/plugins-inputs-tcp.md#plugins-inputs-tcp-ssl_verification_mode) in `client` mode |
+
+::::
+
+
+::::{dropdown} `logstash-filter-elasticsearch`
+:name: filter-elasticsearch-ssl-9.0
+
+| Setting | Replaced by |
+| --- | --- |
+| ca_file | [`ssl_certificate_authorities`](logstash-docs-md://lsr/plugins-filters-elasticsearch.md#plugins-filters-elasticsearch-ssl_certificate_authorities) |
+| keystore | [`ssl_keystore_path`](logstash-docs-md://lsr/plugins-filters-elasticsearch.md#plugins-filters-elasticsearch-ssl_keystore_path) |
+| keystore_password | [`ssl_keystore_password`](logstash-docs-md://lsr/plugins-filters-elasticsearch.md#plugins-filters-elasticsearch-ssl_keystore_password) |
+| ssl | [`ssl_enabled`](logstash-docs-md://lsr/plugins-filters-elasticsearch.md#plugins-filters-elasticsearch-ssl_enabled) |
+
+::::
+
+
+::::{dropdown} `logstash-filter-http`
+:name: filter-http-ssl-9.0
+
+| Setting | Replaced by |
+| --- | --- |
+| cacert | [`ssl_certificate_authorities`](logstash-docs-md://lsr/plugins-filters-http.md#plugins-filters-http-ssl_certificate_authorities) |
+| client_cert | [`ssl_certificate`](logstash-docs-md://lsr/plugins-filters-http.md#plugins-filters-http-ssl_certificate) |
+| client_key | [`ssl_key`](logstash-docs-md://lsr/plugins-filters-http.md#plugins-filters-http-ssl_key) |
+| keystore | [`ssl_keystore_path`](logstash-docs-md://lsr/plugins-filters-http.md#plugins-filters-http-ssl_keystore_path) |
+| keystore_password | [`ssl_keystore_password`](logstash-docs-md://lsr/plugins-filters-http.md#plugins-filters-http-ssl_keystore_password) |
+| keystore_type | [`ssl_keystore_type`](logstash-docs-md://lsr/plugins-filters-http.md#plugins-filters-http-ssl_keystore_type) |
+| truststore | [`ssl_truststore_path`](logstash-docs-md://lsr/plugins-filters-http.md#plugins-filters-http-ssl_truststore_path) |
+| truststore_password | [`ssl_truststore_password`](logstash-docs-md://lsr/plugins-filters-http.md#plugins-filters-http-ssl_truststore_password) |
+| truststore_type | [`ssl_truststore_type`](logstash-docs-md://lsr/plugins-filters-http.md#plugins-filters-http-ssl_truststore_type) |
+
+::::
+
+
+::::{dropdown} `logstash-output-elasticsearch`
+:name: output-elasticsearch-ssl-9.0
+
+| Setting | Replaced by |
+| --- | --- |
+| cacert | [`ssl_certificate_authorities`](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-ssl_certificate_authorities) |
+| keystore | [`ssl_keystore_path`](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-ssl_keystore_path) |
+| keystore_password | [`ssl_keystore_password`](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-ssl_keystore_password) |
+| ssl | [`ssl_enabled`](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-ssl_enabled) |
+| ssl_certificate_verification | [`ssl_verification_mode`](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-ssl_verification_mode) |
+| truststore | [`ssl_truststore_path`](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-ssl_truststore_path) |
+| truststore_password | [`ssl_truststore_password`](logstash-docs-md://lsr/plugins-outputs-elasticsearch.md#plugins-outputs-elasticsearch-ssl_truststore_password) |
+
+::::
+
+
+::::{dropdown} `logstash-output-http`
+:name: output-http-ssl-9.0
+
+| Setting | Replaced by |
+| --- | --- |
+| cacert | [`ssl_certificate_authorities`](logstash-docs-md://lsr/plugins-outputs-http.md#plugins-outputs-http-ssl_certificate_authorities) |
+| client_cert | [`ssl_certificate`](logstash-docs-md://lsr/plugins-outputs-http.md#plugins-outputs-http-ssl_certificate) |
+| client_key | [`ssl_key`](logstash-docs-md://lsr/plugins-outputs-http.md#plugins-outputs-http-ssl_key) |
+| keystore | [`ssl_keystore_path`](logstash-docs-md://lsr/plugins-outputs-http.md#plugins-outputs-http-ssl_keystore_path) |
+| keystore_password | [`ssl_keystore_password`](logstash-docs-md://lsr/plugins-outputs-http.md#plugins-outputs-http-ssl_keystore_password) |
+| keystore_type | [`ssl_keystore_password`](logstash-docs-md://lsr/plugins-outputs-http.md#plugins-outputs-http-ssl_keystore_password) |
+| truststore | [`ssl_truststore_path`](logstash-docs-md://lsr/plugins-outputs-http.md#plugins-outputs-http-ssl_truststore_path) |
+| truststore_password | [`ssl_truststore_password`](logstash-docs-md://lsr/plugins-outputs-http.md#plugins-outputs-http-ssl_truststore_password) |
+| truststore_type | [`ssl_truststore_type`](logstash-docs-md://lsr/plugins-outputs-http.md#plugins-outputs-http-ssl_truststore_type) |
+
+::::
+
+
+::::{dropdown} `logstash-output-tcp`
+:name: output-tcp-ssl-9.0
+
+| Setting | Replaced by |
+| --- | --- |
+| ssl_cacert | [`ssl_certificate_authorities`](logstash-docs-md://lsr/plugins-outputs-tcp.md#plugins-outputs-tcp-ssl_certificate_authorities) |
+| ssl_cert | [`ssl_certificate`](logstash-docs-md://lsr/plugins-outputs-tcp.md#plugins-outputs-tcp-ssl_certificate) |
+| ssl_enable | [`ssl_enabled`](logstash-docs-md://lsr/plugins-outputs-tcp.md#plugins-outputs-tcp-ssl_enabled) |
+| ssl_verify | [`ssl_client_authentication`](logstash-docs-md://lsr/plugins-outputs-tcp.md#plugins-outputs-tcp-ssl_client_authentication) in `server` mode and [`ssl_verification_mode`](logstash-docs-md://lsr/plugins-outputs-tcp.md#plugins-outputs-tcp-ssl_verification_mode) in `client` mode |
+::::
+:::::
+
+::::{dropdown} Pipeline buffer type defaults to `heap`
+:name: pipeline-buffer-type]
+
+We've improved memory configuration for certain {{ls}} plugins.
+Input plugins such as `elastic_agent`, `beats`, `tcp`, and `http` allocate buffers in Java memory to read events from the network.
+The default allocation method is `direct` memory rather than `heap` memory to simplify configuration, and to help facilitate debugging memory usage problems through the analysis of heap dumps.
+If you need to re-enable the previous behavior, change the `pipeline.buffer.type` setting in [logstash.yml](/reference/logstash-settings-file.md).
+Check out [off-heap-buffers-allocation](/reference/jvm-settings.md#off-heap-buffers-allocation) for details. [#16500](https://github.com/elastic/logstash/pull/16500)
+::::
+
+::::{dropdown} {{ls}} modules removed 
+:name: removed-modules
+
+We have removed the {{ls}} modules framework, and encourage users to try Elastic Integrations
+This includes the netflow, azure and arcsight modules, and the modules framework as a whole. [#16794](https://github.com/elastic/logstash/pull/16794)
+::::
+
+
+::::{dropdown} Deprecated configuration settings removed 
+:name:removed-params
+
+We have removed support for previously deprecated configuration settings:
+
+- **`http.*` prefixed settings for the {{ls}} API.** Settings prefixed by `http.*` have been replaced by the equivalent settings prefixed with `api.*`. [#16552](https://github.com/elastic/logstash/pull/16552)
+
+- **`event_api.tags.illegal`**
+Any events that include field named tags automatically rename the field _tags to avoid any clash
+with the reserved {{ls}} tags field. 
+Instead, {{ls}} generates `_tagsparsefailure` in the event `tags` and the illegal value is written to the `_tags` field. [#16461](https://github.com/elastic/logstash/pull/16461)
+::::
+
+::::{dropdown} Ingest converter removed 
+:name: removed-ingest-converter
+
+The ingest converter, which was used to convert ingest pipelines to {{ls}} pipelines, has been removed. [#16453](https://github.com/elastic/logstash/pull/16453)
+
+The `logstash-filter-elastic_integration` plugin offers similar functionality, and can help you use [Logstash to extend Elastic integrations](/reference/using-logstash-with-elastic-integrations.md).
+::::
+
+::::{dropdown} JDK11 not supported
+:name: jdk-11-support-drop
+
+JDK17 is the minimum version of the JDK required to run Logstash.
+For the best experience, we still recommend running {{ls}} using the bundled-jdk. 
+See [Logstash JVM requirements](/reference/getting-started-with-logstash.md#ls-jvm)
+for details. [#16443](https://github.com/elastic/logstash/pull/16443)
+::::
+
+::::{dropdown} Docker base image now UBI9 based
+:name: docker-base-image-change
+
+The base image for {{ls}} on Docker has been changed from Ubuntu to UBI9.
+If you create a Docker image based on the {{ls}} image and rely on it being Ubuntu based, you need to change your derived image to take account of this change. 
+For example, if your derived docker image installs additional packages using a package manager, UBI9 uses `microdnf`, rather than `apt`.
+[#16599](https://github.com/elastic/logstash/pull/16599)
+::::
+
+::::{dropdown} Cannot run {{ls}} as `superuser` by default
+:name: [disallow-superuser
+
+We've changed the default behavior to prevent users from accidentally running {{ls}} as a superuser.
+If you try to run {{ls}} as a superuser, it logs an error and fails to start, ensuring that users cannot run Logstash with elevated privileges by accident.
+
+You can change the value of the `allow_superuser` setting to `true` in [logstash.yml](/reference/logstash-settings-file.md) if you want to restore the previous behavior and allow {{ls}} to run with superuser privileges. [#16558](https://github.com/elastic/logstash/pull/16558)
+::::
+
+::::{dropdown} New setting required to continue using legacy internal monitoring
+:name: allow-legacy-monitoring
+
+To continue using deprecated internal collection to monitor {{ls}}, set `xpack.monitoring.allow_legacy_collection` to `true` in [logstash.yml](/reference/logstash-settings-file.md).
+We encourage you to move to [agent-driven monitoring](/reference/monitoring-logstash-with-elastic-agent.md), the latest, supported way to monitor Logstash [#16586](https://github.com/elastic/logstash/pull/16586)
+::::
+
+::::{dropdown} Avoiding JSON log lines collision
+:name: avoid-collision-on-json-fields
+
+We've improved the way we deal with duplicate `message` fields in `json` documents.
+Some code paths that log in `json` produce log events that include multiple instances of the  `message` field. (The JSON codec plugin is one example.)
+While this approach produces JSON that is technically valid, many clients do not parse this data correctly, and either crash or discard one of the fields.
+
+We recently introduced the option to fix duplicates, and made it the default behavior for `9.0` and later.
+To re-enable the previous behavior, change the `log.format.json.fix_duplicate_message_fields` setting in [logstash.yml](/reference/logstash-settings-file.md) to `false`.
+
+Check out [Logging in json format can write duplicate message fields](docs-content://troubleshoot/ingest/logstash.md) for more details about the issue. [#16578](https://github.com/elastic/logstash/pull/16578)
+::::
+
+::::{dropdown} Enterprise_search integration plugin is removed from default Logstash install
+:name: enterprise_search-deprecated-9.0
+
+We’ve removed the {{ls}} Enterprise_search integration plugin, and its component App Search and Workplace Search plugins from the default {{ls}} install. 
+These plugins will receive only security updates and critical fixes moving forward.
+
+We recommend using our native {{es}} tools for your Search use cases. For more details, please visit the [Search solution and use case documentation](docs-content://solutions/search.md).
+::::
+
diff --git a/docs/release-notes/deprecations.md b/docs/release-notes/deprecations.md
new file mode 100644
index 000000000..73dd40422
--- /dev/null
+++ b/docs/release-notes/deprecations.md
@@ -0,0 +1,29 @@
+---
+navigation_title: "Deprecations"
+---
+
+# Logstash deprecations [logstash-deprecations]
+Over time, certain Elastic functionality becomes outdated and is replaced or removed. To help with the transition, Elastic deprecates functionality for a period before removal, giving you time to update your applications. 
+
+Review the deprecated functionality for Logstash. 
+While deprecations have no immediate impact, we strongly encourage you update your implementation after you upgrade.
+
+% ## Next version [logstash-versionnext-deprecations]
+
+% ::::{dropdown} Deprecation title
+% Description of the deprecation.
+% For more information, check [PR #](PR link).
+% **Impact**<br> Impact of deprecation. 
+% **Action**<br> Steps for mitigating deprecation impact.
+% ::::
+
+% ## 9.0.0 [logstash-900-deprecations]
+
+% ::::{dropdown} Deprecation title
+% Description of the deprecation.
+% For more information, check [PR #](PR link).
+% **Impact**<br> Impact of deprecation. 
+% **Action**<br> Steps for mitigating deprecation impact.
+% ::::
+
+None at this time
\ No newline at end of file
diff --git a/docs/release-notes/index.md b/docs/release-notes/index.md
new file mode 100644
index 000000000..d03ecd552
--- /dev/null
+++ b/docs/release-notes/index.md
@@ -0,0 +1,96 @@
+---
+navigation_title: "Logstash"
+mapped_pages:
+  - https://www.elastic.co/guide/en/logstash/current/releasenotes.html
+  - https://www.elastic.co/guide/en/logstash/master/upgrading-logstash-9.0.html
+---
+
+# Logstash release notes [logstash-release-notes]
+
+Review the changes, fixes, and more in each version of Logstash.
+
+To check for security updates, go to [Security announcements for the Elastic stack](https://discuss.elastic.co/c/announcements/security-announcements/31).
+
+% Release notes include only features, enhancements, and fixes. Add breaking changes, deprecations, and known issues to the applicable release notes sections.
+
+% ## version.next [logstash-next-release-notes]
+
+% ### Features and enhancements [logstash-next-features-enhancements]
+% *
+
+% ### Fixes [logstash-next-fixes]
+% *
+
+## 9.0.0 [logstash-900-release-notes]
+
+### Features and enhancements [logstash-900-features-enhancements]
+
+* Use UBI9 as base image [#17174](https://github.com/elastic/logstash/pull/17174)
+* Improve plugins remove command to support multiple plugins [#17030](https://github.com/elastic/logstash/pull/17030)
+* Allow concurrent Batch deserialization [#17050](https://github.com/elastic/logstash/pull/17050)
+
+### Fixes [logstash-900-fixes]
+
+* Fix pqcheck and pqrepair on Windows [#17210](https://github.com/elastic/logstash/pull/17210)
+* Fix empty node stats pipelines [#17185](https://github.com/elastic/logstash/pull/17185)
+
+### Plugins [logstash-plugin-900-changes]
+
+**elastic_integration Filter - 9.0.0**
+
+* 9.0 prerelease compatible plugin version [#265](https://github.com/elastic/logstash-filter-elastic_integration/pull/265)
+
+**Elasticsearch Filter - 4.1.0**
+
+* Remove deprecated SSL settings [#183](https://github.com/logstash-plugins/logstash-filter-elasticsearch/pull/183)
+
+**Http Filter - 2.0.0**
+
+* Remove deprecated SSL settings [#54](https://github.com/logstash-plugins/logstash-filter-http/pull/54)
+
+**Beats Input - 7.0.1**
+
+* Remove deprecated SSL settings [#508](https://github.com/logstash-plugins/logstash-input-beats/pull/508)
+
+**Elastic_serverless_forwarder Input - 2.0.0**
+
+* Remove deprecated SSL settings [#11](https://github.com/logstash-plugins/logstash-input-elastic_serverless_forwarder/pull/11)
+
+* Promote from technical preview to GA [#10](https://github.com/logstash-plugins/logstash-input-elastic_serverless_forwarder/pull/10)
+
+**Elasticsearch Input - 5.0.0**
+
+* Remove deprecated SSL settings [#213](https://github.com/logstash-plugins/logstash-input-elasticsearch/pull/213)
+
+**Http Input - 4.1.0**
+
+* Remove deprecated SSL settings [#182](https://github.com/logstash-plugins/logstash-input-http/pull/182)
+
+**Http_poller Input - 6.0.0**
+
+* Remove deprecated SSL settings [#149](https://github.com/logstash-plugins/logstash-input-http_poller/pull/149)
+
+**Tcp Input - 7.0.0**
+
+* Remove deprecated SSL settings [#228](https://github.com/logstash-plugins/logstash-input-tcp/pull/228)
+
+**Kafka Integration - 11.6.0**
+
+* Support additional `oauth` and `sasl` configuration options for configuring kafka client [#189](https://github.com/logstash-plugins/logstash-integration-kafka/pull/189)
+
+**Snmp Integration - 4.0.6**
+
+* [DOC] Fix typo in snmptrap migration section [#74](https://github.com/logstash-plugins/logstash-integration-snmp/pull/74)
+
+**Elasticsearch Output - 12.0.2**
+
+* Remove deprecated SSL settings [#1197](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/1197)
+
+**Http Output - 6.0.0**
+
+* Remove deprecated SSL settings [#147](https://github.com/logstash-plugins/logstash-output-http/pull/147)
+
+**Tcp Output - 7.0.0**
+
+* Remove deprecated SSL settings [#58](https://github.com/logstash-plugins/logstash-output-tcp/pull/58)
+
diff --git a/docs/release-notes/known-issues.md b/docs/release-notes/known-issues.md
new file mode 100644
index 000000000..ccc59c38e
--- /dev/null
+++ b/docs/release-notes/known-issues.md
@@ -0,0 +1,14 @@
+---
+navigation_title: "Known issues"
+---
+
+# Logstash known issues [logstash-known-issues]
+
+Known issues are significant defects or limitations that may impact your implementation. 
+These issues are actively being worked on and will be addressed in a future release. 
+Review known issues to help you make informed decisions, such as upgrading to a new version.
+
+
+## 9.0.0
+
+None at this time
\ No newline at end of file
diff --git a/docs/release-notes/toc.yml b/docs/release-notes/toc.yml
new file mode 100644
index 000000000..a41006794
--- /dev/null
+++ b/docs/release-notes/toc.yml
@@ -0,0 +1,5 @@
+toc:
+  - file: index.md
+  - file: known-issues.md
+  - file: breaking-changes.md
+  - file: deprecations.md
\ No newline at end of file
diff --git a/docs/static/advanced-pipeline.asciidoc b/docs/static/advanced-pipeline.asciidoc
deleted file mode 100644
index da442a497..000000000
--- a/docs/static/advanced-pipeline.asciidoc
+++ /dev/null
@@ -1,862 +0,0 @@
-[[advanced-pipeline]]
-=== Parsing Logs with Logstash
-
-In <<first-event>>, you created a basic Logstash pipeline to test your Logstash setup. In the real world, a Logstash
-pipeline is a bit more complex: it typically has one or more input, filter, and output plugins.
-
-In this section, you create a Logstash pipeline that uses Filebeat to take Apache web logs as input, parses those
-logs to create specific, named fields from the logs, and writes the parsed data to an Elasticsearch cluster. Rather than
-defining the pipeline configuration at the command line, you'll define the pipeline in a config file.
-
-To get started, go https://download.elastic.co/demos/logstash/gettingstarted/logstash-tutorial.log.gz[here] to
-download the sample data set used in this example. Unpack the file.
-
-
-[[configuring-filebeat]]
-==== Configuring Filebeat to Send Log Lines to Logstash
-
-Before you create the Logstash pipeline, you'll configure Filebeat to send log lines to Logstash.
-The https://github.com/elastic/beats/tree/master/filebeat[Filebeat] client is a lightweight, resource-friendly tool
-that collects logs from files on the server and forwards these logs to your Logstash instance for processing.
-Filebeat is designed for reliability and low latency. Filebeat has a light resource footprint on the host machine,
-and the {logstash-ref}/plugins-inputs-beats.html[`Beats input`] plugin minimizes the resource demands on the Logstash
-instance.
-
-NOTE: In a typical use case, Filebeat runs on a separate machine from the machine running your
-Logstash instance. For the purposes of this tutorial, Logstash and Filebeat are running on the
-same machine.
-
-The default Logstash installation includes the {logstash-ref}/plugins-inputs-beats.html[`Beats input`] plugin. The Beats
-input plugin enables Logstash to receive events from the Elastic Beats framework, which means that any Beat written
-to work with the Beats framework, such as Packetbeat and Metricbeat, can also send event data to Logstash.
-
-To install Filebeat on your data source machine, download the appropriate package from the Filebeat https://www.elastic.co/downloads/beats/filebeat[product page]. You can also refer to
-{filebeat-ref}/filebeat-getting-started.html[Getting Started with Filebeat] in the Beats documentation for additional
-installation instructions.
-
-After installing Filebeat, you need to configure it. Open the `filebeat.yml` file located in your Filebeat installation
-directory, and replace the contents with the following lines. Make sure `paths` points to the example Apache log file,
-`logstash-tutorial.log`, that you downloaded earlier:
-
-[source,yaml]
---------------------------------------------------------------------------------
-filebeat.prospectors:
-- type: log
-  paths:
-    - /path/to/file/logstash-tutorial.log <1>
-output.logstash:
-  hosts: ["localhost:5044"]
---------------------------------------------------------------------------------
-
-<1> Absolute path to the file or files that Filebeat processes.
-
-Save your changes.
-
-To keep the configuration simple, you won't specify TLS/SSL settings as you would in a real world
-scenario.
-
-At the data source machine, run Filebeat with the following command:
-
-[source,shell]
---------------------------------------------------------------------------------
-sudo ./filebeat -e -c filebeat.yml -d "publish"
---------------------------------------------------------------------------------
-
-NOTE: If you run Filebeat as root, you need to change ownership of the configuration file (see
-{beats-ref}/config-file-permissions.html[Config File Ownership and Permissions]
-in the _Beats Platform Reference_).
-
-Filebeat will attempt to connect on port 5044. Until Logstash starts with an active Beats plugin, there
-won’t be any answer on that port, so any messages you see regarding failure to connect on that port are normal for now.
-
-==== Configuring Logstash for Filebeat Input
-
-Next, you create a Logstash configuration pipeline that uses the Beats input plugin to receive
-events from Beats.
-
-The following text represents the skeleton of a configuration pipeline:
-
-[source,json]
---------------------------------------------------------------------------------
-# The # character at the beginning of a line indicates a comment. Use
-# comments to describe your configuration.
-input {
-}
-# The filter part of this file is commented out to indicate that it is
-# optional.
-# filter {
-#
-# }
-output {
-}
---------------------------------------------------------------------------------
-
-This skeleton is non-functional, because the input and output sections don’t have any valid options defined.
-
-To get started, copy and paste the skeleton configuration pipeline into a file named `first-pipeline.conf` in your home
-Logstash directory.
-
-Next, configure your Logstash instance to use the Beats input plugin by adding the following lines to the `input` section
-of the `first-pipeline.conf` file:
-
-[source,json]
---------------------------------------------------------------------------------
-    beats {
-        port => "5044"
-    }
---------------------------------------------------------------------------------
-
-You'll configure Logstash to write to Elasticsearch later. For now, you can add the following line
-to the `output` section so that the output is printed to stdout when you run Logstash:
-
-[source,json]
---------------------------------------------------------------------------------
-    stdout { codec => rubydebug }
---------------------------------------------------------------------------------
-
-When you're done, the contents of `first-pipeline.conf` should look like this:
-
-[source,json]
---------------------------------------------------------------------------------
-input {
-    beats {
-        port => "5044"
-    }
-}
-# The filter part of this file is commented out to indicate that it is
-# optional.
-# filter {
-#
-# }
-output {
-    stdout { codec => rubydebug }
-}
---------------------------------------------------------------------------------
-
-To verify your configuration, run the following command:
-
-[source,shell]
---------------------------------------------------------------------------------
-bin/logstash -f first-pipeline.conf --config.test_and_exit
---------------------------------------------------------------------------------
-
-The `--config.test_and_exit` option parses your configuration file and reports any errors.
-
-If the configuration file passes the configuration test, start Logstash with the following command:
-
-[source,shell]
---------------------------------------------------------------------------------
-bin/logstash -f first-pipeline.conf --config.reload.automatic
---------------------------------------------------------------------------------
-
-The `--config.reload.automatic` option enables automatic config reloading so that you don't have to stop and restart Logstash
-every time you modify the configuration file.
-
-As Logstash starts up, you might see one or more warning messages about Logstash ignoring the `pipelines.yml` file. You
-can safely ignore this warning. The `pipelines.yml` file is used for running <<multiple-pipelines,multiple pipelines>>
-in a single Logstash instance. For the examples shown here, you are running a single pipeline.
-
-If your pipeline is working correctly, you should see a series of events like the following written to the console:
-
-[source,json]
---------------------------------------------------------------------------------
-{
-    "@timestamp" => 2017-11-09T01:44:20.071Z,
-        "offset" => 325,
-      "@version" => "1",
-          "beat" => {
-            "name" => "My-MacBook-Pro.local",
-        "hostname" => "My-MacBook-Pro.local",
-         "version" => "6.0.0"
-    },
-          "host" => "My-MacBook-Pro.local",
-    "prospector" => {
-        "type" => "log"
-    },
-        "source" => "/path/to/file/logstash-tutorial.log",
-       "message" => "83.149.9.216 - - [04/Jan/2015:05:13:42 +0000] \"GET /presentations/logstash-monitorama-2013/images/kibana-search.png HTTP/1.1\" 200 203023 \"http://semicomplete.com/presentations/logstash-monitorama-2013/\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.77 Safari/537.36\"",
-          "tags" => [
-        [0] "beats_input_codec_plain_applied"
-    ]
-}
-...
-
---------------------------------------------------------------------------------
-
-
-[float]
-[[configuring-grok-filter]]
-==== Parsing Web Logs with the Grok Filter Plugin
-
-Now you have a working pipeline that reads log lines from Filebeat. However you'll notice that the format of the log messages
-is not ideal. You want to parse the log messages to create specific, named fields from the logs.
-To do this, you'll use the `grok` filter plugin.
-
-The {logstash-ref}/plugins-filters-grok.html[`grok`] filter plugin is one of several plugins that are available by default in
-Logstash. For details on how to manage Logstash plugins, see the <<working-with-plugins,reference documentation>> for
-the plugin manager.
-
-The `grok` filter plugin enables you to parse the unstructured log data into something structured and queryable.
-
-Because the `grok` filter plugin looks for patterns in the incoming log data, configuring the plugin requires you to
-make decisions about how to identify the patterns that are of interest to your use case. A representative line from the
-web server log sample looks like this:
-
-[source,shell]
---------------------------------------------------------------------------------
-83.149.9.216 - - [04/Jan/2015:05:13:42 +0000] "GET /presentations/logstash-monitorama-2013/images/kibana-search.png
-HTTP/1.1" 200 203023 "http://semicomplete.com/presentations/logstash-monitorama-2013/" "Mozilla/5.0 (Macintosh; Intel
-Mac OS X 10_9_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.77 Safari/537.36"
---------------------------------------------------------------------------------
-
-The IP address at the beginning of the line is easy to identify, as is the timestamp in brackets. To parse the data, you can use the `%{COMBINEDAPACHELOG}` grok pattern, which structures lines from the Apache log using the following schema:
-
-[horizontal]
-*Information*:: *Field Name*
-IP Address:: `clientip`
-User ID:: `ident`
-User Authentication:: `auth`
-timestamp:: `timestamp`
-HTTP Verb:: `verb`
-Request body:: `request`
-HTTP Version:: `httpversion`
-HTTP Status Code:: `response`
-Bytes served:: `bytes`
-Referrer URL:: `referrer`
-User agent:: `agent`
-
-TIP: If you need help building grok patterns, try out the
-{kibana-ref}/xpack-grokdebugger.html[Grok Debugger]. The Grok Debugger is an
-{xpack} feature under the Basic License and is therefore *free to use*.
-
-Edit the `first-pipeline.conf` file and replace the entire `filter` section with the following text:
-
-[source,json]
---------------------------------------------------------------------------------
-filter {
-    grok {
-        match => { "message" => "%{COMBINEDAPACHELOG}"}
-    }
-}
---------------------------------------------------------------------------------
-
-When you're done, the contents of `first-pipeline.conf` should look like this:
-
-[source,json]
---------------------------------------------------------------------------------
-input {
-    beats {
-        port => "5044"
-    }
-}
-filter {
-    grok {
-        match => { "message" => "%{COMBINEDAPACHELOG}"}
-    }
-}
-output {
-    stdout { codec => rubydebug }
-}
---------------------------------------------------------------------------------
-
-Save your changes. Because you've enabled automatic config reloading, you don't have to restart Logstash to
-pick up your changes. However, you do need to force Filebeat to read the log file from scratch. To do this,
-go to the terminal window where Filebeat is running and press Ctrl+C to shut down Filebeat. Then delete the
-Filebeat registry file. For example, run:
-
-[source,shell]
---------------------------------------------------------------------------------
-sudo rm data/registry
---------------------------------------------------------------------------------
-
-Since Filebeat stores the state of each file it harvests in the registry, deleting the registry file forces
-Filebeat to read all the files it's harvesting from scratch.
-
-Next, restart Filebeat with the following command:
-
-[source,shell]
---------------------------------------------------------------------------------
-sudo ./filebeat -e -c filebeat.yml -d "publish"
---------------------------------------------------------------------------------
-
-There might be a slight delay before Filebeat begins processing events if it needs to wait for Logstash to reload the
-config file.
-
-After Logstash applies the grok pattern, the events will have the following JSON representation:
-
-[source,json]
---------------------------------------------------------------------------------
-{
-        "request" => "/presentations/logstash-monitorama-2013/images/kibana-search.png",
-          "agent" => "\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.77 Safari/537.36\"",
-         "offset" => 325,
-           "auth" => "-",
-          "ident" => "-",
-           "verb" => "GET",
-     "prospector" => {
-        "type" => "log"
-    },
-         "source" => "/path/to/file/logstash-tutorial.log",
-        "message" => "83.149.9.216 - - [04/Jan/2015:05:13:42 +0000] \"GET /presentations/logstash-monitorama-2013/images/kibana-search.png HTTP/1.1\" 200 203023 \"http://semicomplete.com/presentations/logstash-monitorama-2013/\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.77 Safari/537.36\"",
-           "tags" => [
-        [0] "beats_input_codec_plain_applied"
-    ],
-       "referrer" => "\"http://semicomplete.com/presentations/logstash-monitorama-2013/\"",
-     "@timestamp" => 2017-11-09T02:51:12.416Z,
-       "response" => "200",
-          "bytes" => "203023",
-       "clientip" => "83.149.9.216",
-       "@version" => "1",
-           "beat" => {
-            "name" => "My-MacBook-Pro.local",
-        "hostname" => "My-MacBook-Pro.local",
-         "version" => "6.0.0"
-    },
-           "host" => "My-MacBook-Pro.local",
-    "httpversion" => "1.1",
-      "timestamp" => "04/Jan/2015:05:13:42 +0000"
-}
---------------------------------------------------------------------------------
-
-Notice that the event includes the original message, but the log message is also broken down into specific fields.
-
-[float]
-[[configuring-geoip-plugin]]
-==== Enhancing Your Data with the Geoip Filter Plugin
-
-In addition to parsing log data for better searches, filter plugins can derive supplementary information from existing
-data. As an example, the {logstash-ref}/plugins-filters-geoip.html[`geoip`] plugin looks up IP addresses, derives geographic
-location information from the addresses, and adds that location information to the logs.
-
-Configure your Logstash instance to use the `geoip` filter plugin by adding the following lines to the `filter` section
-of the `first-pipeline.conf` file:
-
-[source,json]
---------------------------------------------------------------------------------
-    geoip {
-        source => "clientip"
-    }
---------------------------------------------------------------------------------
-
-The `geoip` plugin configuration requires you to specify the name of the source field that contains the IP address to look up. In this example, the `clientip` field contains the IP address.
-
-Since filters are evaluated in sequence, make sure that the `geoip` section is after the `grok` section of
-the configuration file and that both the `grok` and `geoip` sections are nested within the `filter` section.
-
-When you're done, the contents of `first-pipeline.conf` should look like this:
-
-[source,json]
---------------------------------------------------------------------------------
-input {
-    beats {
-        port => "5044"
-    }
-}
- filter {
-    grok {
-        match => { "message" => "%{COMBINEDAPACHELOG}"}
-    }
-    geoip {
-        source => "clientip"
-    }
-}
-output {
-    stdout { codec => rubydebug }
-}
---------------------------------------------------------------------------------
-
-Save your changes. To force Filebeat to read the log file from scratch, as you did earlier, shut down Filebeat (press Ctrl+C),
-delete the registry file, and then restart Filebeat with the following command:
-
-[source,shell]
---------------------------------------------------------------------------------
-sudo ./filebeat -e -c filebeat.yml -d "publish"
---------------------------------------------------------------------------------
-
-Notice that the event now contains geographic location information:
-
-[source,json]
---------------------------------------------------------------------------------
-{
-        "request" => "/presentations/logstash-monitorama-2013/images/kibana-search.png",
-          "agent" => "\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.77 Safari/537.36\"",
-          "geoip" => {
-              "timezone" => "Europe/Moscow",
-                    "ip" => "83.149.9.216",
-              "latitude" => 55.7485,
-        "continent_code" => "EU",
-             "city_name" => "Moscow",
-          "country_name" => "Russia",
-         "country_code2" => "RU",
-         "country_code3" => "RU",
-           "region_name" => "Moscow",
-              "location" => {
-            "lon" => 37.6184,
-            "lat" => 55.7485
-        },
-           "postal_code" => "101194",
-           "region_code" => "MOW",
-             "longitude" => 37.6184
-    },
-    ...
---------------------------------------------------------------------------------
-
-
-[float]
-[[indexing-parsed-data-into-elasticsearch]]
-==== Indexing Your Data into Elasticsearch
-
-Now that the web logs are broken down into specific fields, you're ready to get
-your data into Elasticsearch. 
-
-TIP: You can run Elasticsearch on your own hardware, or use our
-https://www.elastic.co/cloud/elasticsearch-service[hosted {es} Service] on
-Elastic Cloud. The Elasticsearch Service is available on both AWS and GCP.
-https://www.elastic.co/cloud/elasticsearch-service/signup[Try the {es} Service
-for free].
-
-The Logstash pipeline can index the data into an
-Elasticsearch cluster. Edit the `first-pipeline.conf` file and replace the entire `output` section with the following
-text:
-
-[source,json]
---------------------------------------------------------------------------------
-output {
-    elasticsearch {
-        hosts => [ "localhost:9200" ]
-    }
-}
---------------------------------------------------------------------------------
-
-With this configuration, Logstash uses http protocol to connect to Elasticsearch. The above example assumes that
-Logstash and Elasticsearch are running on the same instance. You can specify a remote Elasticsearch instance by using
-the `hosts` configuration to specify something like `hosts => [ "es-machine:9092" ]`.
-
-At this point, your `first-pipeline.conf` file has input, filter, and output sections properly configured, and looks
-something like this:
-
-[source,json]
---------------------------------------------------------------------------------
-input {
-    beats {
-        port => "5044"
-    }
-}
- filter {
-    grok {
-        match => { "message" => "%{COMBINEDAPACHELOG}"}
-    }
-    geoip {
-        source => "clientip"
-    }
-}
-output {
-    elasticsearch {
-        hosts => [ "localhost:9200" ]
-    }
-}
---------------------------------------------------------------------------------
-
-Save your changes. To force Filebeat to read the log file from scratch, as you did earlier, shut down Filebeat (press Ctrl+C),
-delete the registry file, and then restart Filebeat with the following command:
-
-[source,shell]
---------------------------------------------------------------------------------
-sudo ./filebeat -e -c filebeat.yml -d "publish"
---------------------------------------------------------------------------------
-
-[float]
-[[testing-initial-pipeline]]
-===== Testing Your Pipeline
-
-Now that the Logstash pipeline is configured to index the data into an
-Elasticsearch cluster, you can query Elasticsearch.
-
-Try a test query to Elasticsearch based on the fields created by the `grok` filter plugin.
-Replace $DATE with the current date, in YYYY.MM.DD format:
-
-[source,shell]
---------------------------------------------------------------------------------
-curl -XGET 'localhost:9200/logstash-$DATE/_search?pretty&q=response=200'
---------------------------------------------------------------------------------
-
-NOTE: The date used in the index name is based on UTC, not the timezone where Logstash is running.
-If the query returns `index_not_found_exception`, make sure that `logstash-$DATE` reflects the actual
-name of the index. To see a list of available indexes, use this query: `curl 'localhost:9200/_cat/indices?v'`.
-
-You should get multiple hits back. For example:
-
-[source,json]
---------------------------------------------------------------------------------
-{
-  "took": 50,
-  "timed_out": false,
-  "_shards": {
-    "total": 5,
-    "successful": 5,
-    "skipped": 0,
-    "failed": 0
-  },
-  "hits": {
-    "total": 98,
-    "max_score": 2.793642,
-    "hits": [
-      {
-        "_index": "logstash-2017.11.09",
-        "_type": "doc",
-        "_id": "3IzDnl8BW52sR0fx5wdV",
-        "_score": 2.793642,
-        "_source": {
-          "request": "/presentations/logstash-monitorama-2013/images/frontend-response-codes.png",
-          "agent": """"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.77 Safari/537.36"""",
-          "geoip": {
-            "timezone": "Europe/Moscow",
-            "ip": "83.149.9.216",
-            "latitude": 55.7485,
-            "continent_code": "EU",
-            "city_name": "Moscow",
-            "country_name": "Russia",
-            "country_code2": "RU",
-            "country_code3": "RU",
-            "region_name": "Moscow",
-            "location": {
-              "lon": 37.6184,
-              "lat": 55.7485
-            },
-            "postal_code": "101194",
-            "region_code": "MOW",
-            "longitude": 37.6184
-          },
-          "offset": 2932,
-          "auth": "-",
-          "ident": "-",
-          "verb": "GET",
-          "prospector": {
-            "type": "log"
-          },
-          "source": "/path/to/file/logstash-tutorial.log",
-          "message": """83.149.9.216 - - [04/Jan/2015:05:13:45 +0000] "GET /presentations/logstash-monitorama-2013/images/frontend-response-codes.png HTTP/1.1" 200 52878 "http://semicomplete.com/presentations/logstash-monitorama-2013/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.77 Safari/537.36"""",
-          "tags": [
-            "beats_input_codec_plain_applied"
-          ],
-          "referrer": """"http://semicomplete.com/presentations/logstash-monitorama-2013/"""",
-          "@timestamp": "2017-11-09T03:11:35.304Z",
-          "response": "200",
-          "bytes": "52878",
-          "clientip": "83.149.9.216",
-          "@version": "1",
-          "beat": {
-            "name": "My-MacBook-Pro.local",
-            "hostname": "My-MacBook-Pro.local",
-            "version": "6.0.0"
-          },
-          "host": "My-MacBook-Pro.local",
-          "httpversion": "1.1",
-          "timestamp": "04/Jan/2015:05:13:45 +0000"
-        }
-      },
-    ...
-
---------------------------------------------------------------------------------
-
-Try another search for the geographic information derived from the IP address.
-Replace $DATE with the current date, in YYYY.MM.DD format:
-
-[source,shell]
---------------------------------------------------------------------------------
-curl -XGET 'localhost:9200/logstash-$DATE/_search?pretty&q=geoip.city_name=Buffalo'
---------------------------------------------------------------------------------
-
-A few log entries come from Buffalo, so the query produces the following response:
-
-[source,json]
---------------------------------------------------------------------------------
-{
-  "took": 9,
-  "timed_out": false,
-  "_shards": {
-    "total": 5,
-    "successful": 5,
-    "skipped": 0,
-    "failed": 0
-  },
-  "hits": {
-    "total": 2,
-    "max_score": 2.6390574,
-    "hits": [
-      {
-        "_index": "logstash-2017.11.09",
-        "_type": "doc",
-        "_id": "L4zDnl8BW52sR0fx5whY",
-        "_score": 2.6390574,
-        "_source": {
-          "request": "/blog/geekery/disabling-battery-in-ubuntu-vms.html?utm_source=feedburner&utm_medium=feed&utm_campaign=Feed%3A+semicomplete%2Fmain+%28semicomplete.com+-+Jordan+Sissel%29",
-          "agent": """"Tiny Tiny RSS/1.11 (http://tt-rss.org/)"""",
-          "geoip": {
-            "timezone": "America/New_York",
-            "ip": "198.46.149.143",
-            "latitude": 42.8864,
-            "continent_code": "NA",
-            "city_name": "Buffalo",
-            "country_name": "United States",
-            "country_code2": "US",
-            "dma_code": 514,
-            "country_code3": "US",
-            "region_name": "New York",
-            "location": {
-              "lon": -78.8781,
-              "lat": 42.8864
-            },
-            "postal_code": "14202",
-            "region_code": "NY",
-            "longitude": -78.8781
-          },
-          "offset": 22795,
-          "auth": "-",
-          "ident": "-",
-          "verb": "GET",
-          "prospector": {
-            "type": "log"
-          },
-          "source": "/path/to/file/logstash-tutorial.log",
-          "message": """198.46.149.143 - - [04/Jan/2015:05:29:13 +0000] "GET /blog/geekery/disabling-battery-in-ubuntu-vms.html?utm_source=feedburner&utm_medium=feed&utm_campaign=Feed%3A+semicomplete%2Fmain+%28semicomplete.com+-+Jordan+Sissel%29 HTTP/1.1" 200 9316 "-" "Tiny Tiny RSS/1.11 (http://tt-rss.org/)"""",
-          "tags": [
-            "beats_input_codec_plain_applied"
-          ],
-          "referrer": """"-"""",
-          "@timestamp": "2017-11-09T03:11:35.321Z",
-          "response": "200",
-          "bytes": "9316",
-          "clientip": "198.46.149.143",
-          "@version": "1",
-          "beat": {
-            "name": "My-MacBook-Pro.local",
-            "hostname": "My-MacBook-Pro.local",
-            "version": "6.0.0"
-          },
-          "host": "My-MacBook-Pro.local",
-          "httpversion": "1.1",
-          "timestamp": "04/Jan/2015:05:29:13 +0000"
-        }
-      },
-     ...
-
---------------------------------------------------------------------------------
-
-If you are using Kibana to visualize your data, you can also explore the Filebeat data in Kibana:
-
-image::static/images/kibana-filebeat-data.png[Discovering Filebeat data in Kibana]
-
-See the {filebeat-ref}/filebeat-getting-started.html[Filebeat getting started docs] for info about loading the Kibana
-index pattern for Filebeat.
-
-You've successfully created a pipeline that uses Filebeat to take Apache web logs as input, parses those logs to
-create specific, named fields from the logs, and writes the parsed data to an Elasticsearch cluster. Next, you
-learn how to create a pipeline that uses multiple input and output plugins.
-
-[[multiple-input-output-plugins]]
-=== Stitching Together Multiple Input and Output Plugins
-
-The information you need to manage often comes from several disparate sources, and use cases can require multiple
-destinations for your data. Your Logstash pipeline can use multiple input and output plugins to handle these
-requirements.
-
-In this section, you create a Logstash pipeline that takes input from a Twitter feed and the Filebeat client, then
-sends the information to an Elasticsearch cluster as well as writing the information directly to a file.
-
-[float]
-[[twitter-configuration]]
-==== Reading from a Twitter Feed
-
-To add a Twitter feed, you use the {logstash-ref}/plugins-inputs-twitter.html[`twitter`] input plugin. To
-configure the plugin, you need several pieces of information:
-
-* A _consumer key_, which uniquely identifies your Twitter app.
-* A _consumer secret_, which serves as the password for your Twitter app.
-* One or more _keywords_ to search in the incoming feed. The example shows using "cloud" as a keyword, but you can use whatever you want.
-* An _oauth token_, which identifies the Twitter account using this app.
-* An _oauth token secret_, which serves as the password of the Twitter account.
-
-Visit https://dev.twitter.com/apps[https://dev.twitter.com/apps] to set up a Twitter account and generate your consumer
-key and secret, as well as your access token and secret. See the docs for the {logstash-ref}/plugins-inputs-twitter.html[`twitter`] input plugin if you're not sure how to generate these keys.
-
-Like you did earlier when you worked on <<advanced-pipeline>>, create a config file (called `second-pipeline.conf`) that
-contains the skeleton of a configuration pipeline. If you want, you can reuse the file you created earlier, but make
-sure you pass in the correct config file name when you run Logstash.
-
-Add the following lines to the `input` section of the `second-pipeline.conf` file, substituting your values for the
-placeholder values shown here:
-
-[source,json]
---------------------------------------------------------------------------------
-    twitter {
-        consumer_key => "enter_your_consumer_key_here"
-        consumer_secret => "enter_your_secret_here"
-        keywords => ["cloud"]
-        oauth_token => "enter_your_access_token_here"
-        oauth_token_secret => "enter_your_access_token_secret_here"
-    }
---------------------------------------------------------------------------------
-
-[float]
-[[configuring-lsf]]
-==== Configuring Filebeat to Send Log Lines to Logstash
-
-As you learned earlier in <<configuring-filebeat>>, the https://github.com/elastic/beats/tree/master/filebeat[Filebeat]
-client is a lightweight, resource-friendly tool that collects logs from files on the server and forwards these logs to your
-Logstash instance for processing.
-
-After installing Filebeat, you need to configure it. Open the `filebeat.yml` file located in your Filebeat installation
-directory, and replace the contents with the following lines. Make sure `paths` points to your syslog:
-
-[source,shell]
---------------------------------------------------------------------------------
-filebeat.prospectors:
-- type: log
-  paths:
-    - /var/log/*.log <1>
-  fields:
-    type: syslog <2>
-output.logstash:
-  hosts: ["localhost:5044"]
---------------------------------------------------------------------------------
-
-<1> Absolute path to the file or files that Filebeat processes.
-<2> Adds a field called `type` with the value `syslog` to the event.
-
-Save your changes.
-
-To keep the configuration simple, you won't specify TLS/SSL settings as you would in a real world
-scenario.
-
-Configure your Logstash instance to use the Filebeat input plugin by adding the following lines to the `input` section
-of the `second-pipeline.conf` file:
-
-[source,json]
---------------------------------------------------------------------------------
-    beats {
-        port => "5044"
-    }
---------------------------------------------------------------------------------
-
-[float]
-[[logstash-file-output]]
-==== Writing Logstash Data to a File
-
-You can configure your Logstash pipeline to write data directly to a file with the
-{logstash-ref}/plugins-outputs-file.html[`file`] output plugin.
-
-Configure your Logstash instance to use the `file` output plugin by adding the following lines to the `output` section
-of the `second-pipeline.conf` file:
-
-[source,json]
---------------------------------------------------------------------------------
-    file {
-        path => "/path/to/target/file"
-    }
---------------------------------------------------------------------------------
-
-[float]
-[[multiple-es-nodes]]
-==== Writing to Multiple Elasticsearch Nodes
-
-Writing to multiple Elasticsearch nodes lightens the resource demands on a given Elasticsearch node, as well as
-providing redundant points of entry into the cluster when a particular node is unavailable.
-
-To configure your Logstash instance to write to multiple Elasticsearch nodes, edit the `output` section of the `second-pipeline.conf` file to read:
-
-[source,json]
---------------------------------------------------------------------------------
-output {
-    elasticsearch {
-        hosts => ["IP Address 1:port1", "IP Address 2:port2", "IP Address 3"]
-    }
-}
---------------------------------------------------------------------------------
-
-Use the IP addresses of three non-master nodes in your Elasticsearch cluster in the host line. When the `hosts`
-parameter lists multiple IP addresses, Logstash load-balances requests across the list of addresses. Also note that
-the default port for Elasticsearch is `9200` and can be omitted in the configuration above.
-
-[float]
-[[testing-second-pipeline]]
-===== Testing the Pipeline
-
-At this point, your `second-pipeline.conf` file looks like this:
-
-[source,json]
---------------------------------------------------------------------------------
-input {
-    twitter {
-        consumer_key => "enter_your_consumer_key_here"
-        consumer_secret => "enter_your_secret_here"
-        keywords => ["cloud"]
-        oauth_token => "enter_your_access_token_here"
-        oauth_token_secret => "enter_your_access_token_secret_here"
-    }
-    beats {
-        port => "5044"
-    }
-}
-output {
-    elasticsearch {
-        hosts => ["IP Address 1:port1", "IP Address 2:port2", "IP Address 3"]
-    }
-    file {
-        path => "/path/to/target/file"
-    }
-}
---------------------------------------------------------------------------------
-
-Logstash is consuming data from the Twitter feed you configured, receiving data from Filebeat, and
-indexing this information to three nodes in an Elasticsearch cluster as well as writing to a file.
-
-At the data source machine, run Filebeat with the following command:
-
-[source,shell]
---------------------------------------------------------------------------------
-sudo ./filebeat -e -c filebeat.yml -d "publish"
---------------------------------------------------------------------------------
-
-Filebeat will attempt to connect on port 5044. Until Logstash starts with an active Beats plugin, there
-won’t be any answer on that port, so any messages you see regarding failure to connect on that port are normal for now.
-
-To verify your configuration, run the following command:
-
-[source,shell]
---------------------------------------------------------------------------------
-bin/logstash -f second-pipeline.conf --config.test_and_exit
---------------------------------------------------------------------------------
-
-The `--config.test_and_exit` option parses your configuration file and reports any errors. When the configuration file
-passes the configuration test, start Logstash with the following command:
-
-[source,shell]
---------------------------------------------------------------------------------
-bin/logstash -f second-pipeline.conf
---------------------------------------------------------------------------------
-
-Use the `grep` utility to search in the target file to verify that information is present:
-
-[source,shell]
---------------------------------------------------------------------------------
-grep syslog /path/to/target/file
---------------------------------------------------------------------------------
-
-Run an Elasticsearch query to find the same information in the Elasticsearch cluster:
-
-[source,shell]
---------------------------------------------------------------------------------
-curl -XGET 'localhost:9200/logstash-$DATE/_search?pretty&q=fields.type:syslog'
---------------------------------------------------------------------------------
-
-Replace $DATE with the current date, in YYYY.MM.DD format.
-
-To see data from the Twitter feed, try this query:
-
-[source,shell]
---------------------------------------------------------------------------------
-curl -XGET 'http://localhost:9200/logstash-$DATE/_search?pretty&q=client:iphone'
---------------------------------------------------------------------------------
-
-Again, remember to replace $DATE with the current date, in YYYY.MM.DD format.
diff --git a/docs/static/arcsight-module.asciidoc b/docs/static/arcsight-module.asciidoc
deleted file mode 100644
index eb2c148c4..000000000
--- a/docs/static/arcsight-module.asciidoc
+++ /dev/null
@@ -1,472 +0,0 @@
-[role="xpack"]
-[[arcsight-module]]
-=== Logstash ArcSight Module
-
-++++
-<titleabbrev>ArcSight Module</titleabbrev>
-++++
-
-NOTE: The Logstash ArcSight module is an
-https://www.elastic.co/products/x-pack[{xpack}] feature under the Basic License
-and is therefore free to use. Please contact
-mailto:arcsight@elastic.co[arcsight@elastic.co] for questions or more
-information.
-
-The Logstash ArcSight module enables you to easily integrate your ArcSight data with the Elastic Stack.
-With a single command, the module taps directly into the ArcSight Smart Connector or the Event Broker,
-parses and indexes the security events into Elasticsearch, and installs a suite of Kibana dashboards
-to get you exploring your data immediately.
-
-[[arcsight-prereqs]]
-==== Prerequisites
-
-These instructions assume that Logstash, Elasticsearch, and Kibana are already
-installed. The products you need are https://www.elastic.co/downloads[available
-to download] and easy to install. The Elastic Stack 5.6 (or later) and {xpack} are required for
-this module.   If you are using the Elastic Stack 6.2 and earlier, please see
-the https://www.elastic.co/guide/en/logstash/6.2/arcsight-module.html[instructions]
-for those versions.
-
-[[arcsight-architecture]]
-==== Deployment Architecture
-
-The Logstash ArcSight module understands CEF (Common Event Format), and can
-accept, enrich, and index these events for analysis on the Elastic Stack. ADP
-contains two core data collection components for data streaming:
-
-* The _Smart Connectors (SC)_ are edge log collectors that parse and normalize
-data to CEF prior to publishing to the Logstash receiver.
-* The _Event Broker_ is the central hub for incoming data and is based on
-open source Apache Kafka. The Logstash ArcSight module can consume directly from
-Event Broker topics.
-
-[[arcsight-getting-started-smartconnector]]
-==== Getting Started with the Smart Connector
-
-:smart_connect_host: smart_connect_host
-:smart_connect_port: smart_connect_port
-
-To get started, you can use a basic Elastic Stack setup that reads events from
-the Smart Connector directly.
-
-image::static/images/arcsight-diagram-smart-connectors.svg[ArcSight Smart Connector architecture]
-
-Smart Connector has been configured to publish ArcSight data (to TCP port `5000`) using the CEF syslog
-destination.
-
-NOTE: Logstash, Elasticsearch, and Kibana must run locally. Note that you can also run
-Elasticsearch, Kibana and Logstash on separate hosts to consume data from ArcSight.
-
-[[arcsight-instructions-smartconnector]]
-===== Instructions for Smart Connector
-
-. Start the Logstash ArcSight module by running the following command in the
-Logstash install directory with your respective Smart Connector host and port:
-+
-["source","shell",subs="attributes"]
------
-bin/logstash --modules arcsight --setup \
-  -M "arcsight.var.input.smartconnector.port={smart_connect_port}"  \
-  -M "arcsight.var.elasticsearch.hosts=localhost:9200"  \
-  -M "arcsight.var.kibana.host=localhost:5601"
------
-+
---
-
-The `--modules arcsight` option spins up an ArcSight CEF-aware Logstash
-pipeline for ingestion. The `--setup` option creates an `arcsight-*` index
-pattern in Elasticsearch and imports Kibana dashboards and visualizations. On
-subsequent module runs or when scaling out the Logstash deployment,
-the `--setup` option should be omitted to avoid overwriting the existing Kibana
-dashboards.
-
-See <<arcsight-module-config>> for more info.
---
-
-. Explore your data with Kibana:
-.. Open browser @ http://localhost:5601[http://localhost:5601] (username:
-  "elastic"; password: "{pwd}")
-.. Open the *[ArcSight] Network Overview Dashboard*
-.. See <<exploring-data-arcsight>> for additional details on data exploration.
-
-See <<configuring-arcsight>> if you want to specify additional options that
-control the behavior of the ArcSight module.
-
-[[arcsight-getting-started-eventbroker]]
-==== Getting Started with the Event Broker
-
-:event_broker_host: event_broker_host
-:event_broker_port: event_broker_port
-
-To get started, you can use a basic Elastic Stack setup that reads events from
-the Event Broker event stream.
-
-image::static/images/arcsight-diagram-adp.svg[ArcSight Event Broker architecture]
-
-By default, the Logstash ArcSight module consumes from the Event Broker "eb-cef" topic.
-For additional settings, see <<arcsight-module-config>>. Consuming from a
-secured Event Broker port is possible, see <<arcsight-module-config>>.
-
-NOTE: Logstash, Elasticsearch, and Kibana must run locally. Note that you can also run
-Elasticsearch, Kibana and Logstash on separate hosts to consume data from ArcSight.
-
-[[arcsight-instructions-eventbroker]]
-===== Instructions for Event Broker
-
-. Start the Logstash ArcSight module by running the following command in the
-Logstash install directory with your respective Event Broker host and port:
-+
-["source","shell",subs="attributes"]
------
-bin/logstash --modules arcsight --setup \
- -M "arcsight.var.input.eventbroker.bootstrap_servers={event_broker_host}:{event_broker_port}"  \
- -M "arcsight.var.elasticsearch.hosts=localhost:9200"  \
- -M "arcsight.var.kibana.host=localhost:5601"
------
-+
---
-The `--modules arcsight` option spins up an ArcSight CEF-aware Logstash
-pipeline for ingestion. The `--setup` option creates an `arcsight-*` index
-pattern in Elasticsearch and imports Kibana dashboards and visualizations. On
-subsequent module runs or when scaling out the Logstash deployment,
-the `--setup` option should be omitted to avoid overwriting the existing Kibana
-dashboards.
-
-See <<arcsight-module-config>> for more info.
---
-
-. Explore your data with Kibana:
-.. Open browser @ http://localhost:5601[http://localhost:5601] (username:
-  "elastic"; password: "{pwd}")
-.. Open the *[ArcSight] Network Overview Dashboard*
-.. See <<exploring-data-arcsight>> for additional details on data exploration.
-
-See <<configuring-arcsight>> if you want to specify additional options that
-control the behavior of the ArcSight module.
-
-[[exploring-data-arcsight]]
-==== Exploring Your Security Data
-Once the Logstash ArcSight module starts receiving events, you can immediately
-begin using the packaged Kibana dashboards to explore and visualize your
-security data. The dashboards rapidly accelerate the time and effort required
-for security analysts and operators to gain situational and behavioral insights
-on network, endpoint, and DNS events flowing through the environment. You can
-use the dashboards as-is, or tailor them to work better with existing use cases
-and business requirements.
-
-The dashboards have a navigation pane for context switching and drill downs
-across three core use cases:
-
-* *Network Data*
-** Dashboards: Network Overview, Network Suspicious Activity
-** Data Types: Network firewalls, intrusion systems, VPN devices
-
-* *Endpoint Data*
-** Dashboards: Endpoint Overview, Endpoint OS Activity
-** Data Types: Operating systems, applications, host intrusion systems
-
-* *DNS Data*
-** Dashboards: Microsoft DNS Overview
-** Data Types: Microsoft DNS devices
-
-[[network-dashboards-arsight]]
-===== Example Network Dashboards
-
-[role="screenshot"]
-image::static/images/arcsight-network-overview.png[Network overview dashboard]
-
-[role="screenshot"]
-image::static/images/arcsight-network-suspicious.png[Network suspicious activity dashboard]
-
-These Kibana visualizations enable you to quickly understand the top devices,
-endpoints, attackers, and targets. This insight, along with the ability to
-instantly drill down on a particular host, port, device, or time range, offers a
-holistic view across the entire environment to identify specific segments that
-may require immediate attention or action. You can easily discover answers to
-questions like:
-
-* Who are my attackers and what are they targeting?
-* Which of my devices or endpoints are the busiest and what services were
-rendered?
-* How many unique attackers, techniques, signatures, or targets were triggered
-at any given point in time?
-* What are the top sources, destinations, protocols, and behaviors that are
-causing the elevated count of failures?
-
-[[configuring-arcsight]]
-==== Configuring the Module
-
-You can specify additional options for the Logstash ArcSight module in the
-`logstash.yml` configuration file or with overrides through the command line
-like in the getting started. For more information about configuring modules, see
-<<logstash-modules>>.
-
-As an example, the following settings can be appended to `logstash.yml` to
-configure your module:
-
-["source","yaml",subs="attributes"]
------
-modules:
-  - name: arcsight
-    var.input.eventbroker.bootstrap_servers: "eb_host:39092"
-    var.input.eventbroker.topics: "eb_topic"
-    var.elasticsearch.hosts: "localhost:9200"
-    var.elasticsearch.username: "elastic"
-    var.elasticsearch.password: "{pwd}"
-    var.kibana.host: “localhost:5601”
-    var.kibana.username: "elastic"
-    var.kibana.password: "{pwd}"
------
-
-[[arcsight-module-config]]
-===== Logstash ArcSight Module Configuration Options
-
-The ArcSight module provides the following settings for configuring the behavior
-of the module. These settings include ArcSight-specific options plus common
-options that are supported by all Logstash modules.
-
-When you override a setting at the command line, remember to prefix the setting
-with the module name, for example, `arcsight.var.inputs` instead of `var.inputs`.
-
-If you don't specify configuration settings, Logstash uses the defaults.
-
-*ArcSight Module Options*
-
-*`var.inputs`*::
-+
---
-* Value type is <<string,string>>
-* Default value is "eventbroker"
---
-+
-Set the input(s) to expose for the Logstash ArcSight module. Valid settings are
-"eventbroker", "smartconnector", or "eventbroker,smartconnector" (exposes both
-inputs concurrently).
-
-*ArcSight Module Event Broker specific Options*
-
-*`var.input.eventbroker.bootstrap_servers`*::
-+
---
-* Value type is <<string,string>>
-* Default value is "localhost:39092"
---
-+
-A list of Event Broker URLs to use for establishing the initial connection to the cluster.
-This list should be in the form of `host1:port1,host2:port2`. These URLs are
-just used for the initial connection to discover the full cluster membership
-(which may change dynamically). This list need not contain the full set of
-servers. (You may want more than one in case a server is down.)
-
-*`var.input.eventbroker.topics`*::
-+
---
-* Value type is <<array,array>>
-* Default value is ["eb-cef"]
---
-+
-A list of Event Broker topics to subscribe to.
-
-*`var.input.eventbroker.security_protocol`*::
-+
---
-* Value can be any of: `PLAINTEXT`, `SSL`, `SASL_PLAINTEXT`, `SASL_SSL`
-* Default value is `"PLAINTEXT"`
---
-+
-Security protocol to use, which can be either of PLAINTEXT, SSL, SASL_PLAINTEXT, SASL_SSL. If you specify anything other than PLAINTEXT then you need to also specify some of the options listed below. When specifying `SSL` or `SASL_SSL` you should supply values for the options prefixed with `ssl_`, when specifying `SASL_PLAINTEXT` or `SASL_SSL` you should supply values for `jaas_path`, `kerberos_config`, `sasl_mechanism` and `sasl_kerberos_service_name`.
-
-*`var.input.eventbroker.ssl_key_password`*::
-+
---
-* Value type is <<password,password>>
-* There is no default value for this setting.
---
-+
-The password of the private key in the key store file.
-
-*`var.input.eventbroker.ssl_keystore_location`*::
-+
---
-* Value type is <<path,path>>
-* There is no default value for this setting.
---
-+
-If client authentication is required, this setting stores the keystore path.
-
-*`var.input.eventbroker.ssl_keystore_password`*::
-+
---
-* Value type is <<password,password>>
-* There is no default value for this setting.
---
-+
-If client authentication is required, this setting stores the keystore password.
-
-*`var.input.eventbroker.ssl_keystore_type`*::
-+
---
-* Value type is <<string,string>>
-* There is no default value for this setting.
---
-+
-The keystore type.
-
-*`var.input.eventbroker.ssl_truststore_location`*::
-+
---
-* Value type is <<path,path>>
-* There is no default value for this setting.
---
-+
-The JKS truststore path to validate the Kafka broker's certificate.
-
-*`var.input.eventbroker.ssl_truststore_password`*::
-+
---
-* Value type is <<password,password>>
-* There is no default value for this setting.
---
-+
-The truststore password.
-
-*`var.input.eventbroker.ssl_truststore_type`*::
-+
---
-* Value type is <<string,string>>
-* There is no default value for this setting.
---
-+
-The truststore type.
-
-*`var.input.eventbroker.sasl_kerberos_service_name`*::
-+
---
-* Value type is <<string,string>>
-* There is no default value for this setting.
---
-+
-The Kerberos principal name that Kafka broker runs as.
-This can be defined either in Kafka's JAAS config or in Kafka's config.
-
-*`var.input.eventbroker.sasl_mechanism`*::
-+
---
-* Value type is <<string,string>>
-* Default value is `"GSSAPI"`
---
-+
-http://kafka.apache.org/documentation.html#security_sasl[SASL mechanism] used for client connections.
-This may be any mechanism for which a security provider is available.
-GSSAPI is the default mechanism.
-
-*`var.input.eventbroker.jaas_path`*::
-+
---
-* Value type is <<path,path>>
-* There is no default value for this setting.
---
-+
-The Java Authentication and Authorization Service (JAAS) API supplies user authentication and authorization
-services for Kafka. This setting provides the path to the JAAS file. Sample JAAS file for Kafka client:
-+
-[source,java]
-----------------------------------
-KafkaClient {
-  com.sun.security.auth.module.Krb5LoginModule required
-  useTicketCache=true
-  renewTicket=true
-  serviceName="kafka";
-  };
-----------------------------------
-+
-
-Please note that specifying `jaas_path` and `kerberos_config` here will add these
-to the global JVM system properties. This means if you have multiple Kafka inputs,
-all of them would be sharing the same `jaas_path` and `kerberos_config`.
-If this is not desirable, you would have to run separate instances of Logstash on
-different JVM instances.
-
-
-*`var.input.eventbroker.kerberos_config`*::
-+
---
-* Value type is <<path,path>>
-* There is no default value for this setting.
---
-+
-Optional path to kerberos config file. This is krb5.conf style as detailed in https://web.mit.edu/kerberos/krb5-1.12/doc/admin/conf_files/krb5_conf.html
-
-*ArcSight Module Smart Connector specific Options*
-
-*`var.input.smartconnector.port`*::
-+
---
-* Value type is <<number,number>>
-* Default value is 5000
---
-+
-The TCP port to listen on when receiving data from SCs.
-
-*`var.input.smartconnector.ssl_enable`*::
-+
---
-* Value type is <<boolean,boolean>>
-* Default value is `false`
---
-+
-Enable SSL (must be set for other `ssl_` options to take effect).
-
-*`var.input.smartconnector.ssl_cert`*::
-+
---
-* Value type is <<path,path>>
-* There is no default value for this setting.
---
-+
-SSL certificate path.
-
-*`var.input.smartconnector.ssl_extra_chain_certs`*::
-+
---
-* Value type is <<array,array>>
-* Default value is `[]`
---
-+
-An Array of paths to extra X509 certificates to be added to the certificate chain.
-Useful when the CA chain is not necessary in the system store.
-
-*`var.input.smartconnector.ssl_key`*::
-+
---
-* Value type is <<path,path>>
-* There is no default value for this setting.
---
-+
-SSL key path
-
-*`var.input.smartconnector.ssl_key_passphrase`*::
-+
---
-* Value type is <<password,password>>
-* Default value is `nil`
---
-+
-SSL key passphrase
-
-*`var.input.smartconnector.ssl_verify`*::
-+
---
-* Value type is <<boolean,boolean>>
-* Default value is `true`
---
-+
-Verify the identity of the other end of the SSL connection against the CA.
-For input, sets the field `sslsubject` to that of the client certificate.
-
-:smart_connect_host!:
-:smart_connect_port!:
-:event_broker_host!:
-:event_broker_port!:
-
-include::shared-module-options.asciidoc[]
diff --git a/docs/static/azure-module.asciidoc b/docs/static/azure-module.asciidoc
deleted file mode 100644
index 96ac77970..000000000
--- a/docs/static/azure-module.asciidoc
+++ /dev/null
@@ -1,507 +0,0 @@
-[role="xpack"]
-[[azure-module]]
-=== Azure Module 
-experimental[]
-
-The https://azure.microsoft.com/en-us/overview/what-is-azure/[Microsoft Azure]
-module in Logstash helps you easily integrate your Azure activity logs and SQL
-diagnostic logs with the Elastic Stack. 
-
-image::static/images/azure-flow.png["Azure Work Flow",width="80%"]
-
-You can monitor your Azure cloud environments and SQL DB deployments with
-deep operational insights across multiple Azure subscriptions. You can explore
-the health of your infrastructure in real-time, accelerating root cause analysis
-and decreasing overall time to resolution. The Azure module helps you: 
-
-* Analyze infrastructure changes and authorization activity
-* Identify suspicious behaviors and potential malicious actors
-* Perform root-cause analysis by investigating user activity
-* Monitor and optimize your SQL DB deployments.
-
-NOTE: The Logstash Azure module is an
-https://www.elastic.co/products/x-pack[{xpack}] feature under the Basic License
-and is therefore free to use. Please contact
-mailto:monitor-azure@elastic.co[monitor-azure@elastic.co] for questions or more
-information.
-
-The Azure module uses the
-{logstash-ref}/plugins-inputs-azure_event_hubs.html[Logstash Azure Event Hubs
-input plugin] to consume data from Azure Event Hubs. The module taps directly into the
-Azure dashboard, parses and indexes events into Elasticsearch, and installs a
-suite of {kib} dashboards to help you start exploring your data immediately.   
-
-[[azure-dashboards]]
-==== Dashboards
-
-These {kib} dashboards are available and ready for you to use. You can use them as they are, or tailor them to meet your needs.
-
-===== Infrastructure activity monitoring
-
-* *Overview*. Top-level view into your Azure operations, including info about users, resource groups, service health, access, activities, and alerts. 
-
-* *Alerts*. Alert info, including activity, alert status, and alerts heatmap
-
-* *User Activity*. Info about system users, their activity, and requests.
-
-===== SQL Database monitoring
-
-* *SQL DB Overview*. Top-level view into your SQL Databases, including counts for databases, servers, resource groups, and subscriptions.
-
-* *SQL DB Database View*. Detailed info about each SQL Database, including wait time, errors, DTU and storage utilization, size, and read and write input/output.
-
-* *SQL DB Queries*. Info about SQL Database queries and performance. 
-
-[[azure-module-prereqs]]
-==== Prerequisites
-
-Azure Monitor enabled with Azure Event Hubs and the Elastic Stack are required
-for this module.
-
-[[azure-elk-prereqs]]
-===== Elastic prerequisites
-
-The instructions below assume that you have {ls}, {es}, and {kib} running locally. 
-You can also run {ls}, {es}, and {kib} on separate hosts. 
-
-The Elastic Stack version 6.4 (or later) is required for this module. 
-
-The Azure module uses the `azure_event_hubs` input plugin to consume logs and
-metrics from your Azure environment. It is installed by default with {ls} 6.4
-(or later). Basic understanding of the plugin and options is helpful when you
-set up the Azure module.  
-See the {logstash-ref}/plugins-inputs-azure_event_hubs.html[azure_event_hubs input
-plugin documentation] for more information. 
-
-Elastic products are https://www.elastic.co/downloads[available to download] and
-easy to install. 
-
-[[azure-prereqs]]
-===== Azure prerequisites
-
-Azure Monitor should be configured to stream logs to one or more Event Hubs. 
-Logstash will need to access these Event Hubs instances to consume your Azure logs and metrics.
-See <<azure-resources>> at the end of this topic for links to Microsoft Azure documentation.
-
-[[configuring-azure]]
-==== Configure the module
-
-Specify <<azure_config_options,options>> for the Logstash Azure module in the
-`logstash.yml` configuration file. 
-
-* *Basic configuration.* You can use the `logstash.yml` file to configure inputs from multiple Event Hubs that share the same configuration.
-Basic configuration is recommended for most use cases. 
-
-* *Advanced configuration.*  The advanced configuration is available for deployments where different Event Hubs
-require different configurations. The `logstash.yml` file holds your settings. Advanced configuration is not necessary or
-recommended for most use cases. 
-
-See the {logstash-ref}/plugins-inputs-azure_event_hubs.html[azure_event_hubs input plugin
-documentation] for more information about basic and advanced configuration
-models. 
-
-[[basic-config-sample]]
-===== Basic configuration sample
-
-The configuration in the `logstash.yml` file is shared between Event Hubs.
-Basic configuration is recommended for most use cases
-
-["source","shell",subs="attributes"]
------
-modules:
-  - name: azure
-    var.elasticsearch.hosts: localhost:9200
-    var.kibana.host: localhost:5601
-    var.input.azure_event_hubs.consumer_group: "logstash" <1>
-    var.input.azure_event_hubs.storage_connection: "DefaultEndpointsProtocol=https;AccountName=instance1..." <2>
-    var.input.azure_event_hubs.threads: 9 <3>
-    var.input.azure_event_hubs.event_hub_connections:
-      - "Endpoint=sb://...EntityPath=insights-operational-logs" <4>
-      - "Endpoint=sb://...EntityPath=insights-metrics-pt1m" <5>
-      - "Endpoint=sb://...EntityPath=insights-logs-blocks"
-      - "Endpoint=sb://...EntityPath=insights-logs-databasewaitstatistics"
-      - "Endpoint=sb://...EntityPath=insights-logs-errors"
-      - "Endpoint=sb://...EntityPath=insights-logs-querystoreruntimestatistics"
-      - "Endpoint=sb://...EntityPath=insights-logs-querystorewaitstatistics"
-      - "Endpoint=sb://...EntityPath=insights-logs-timeouts"
------
-
-<1> The `consumer_group` (optional) is highly recommended. See <<azure_best_practices>>.
-<2> The `storage_connection` (optional) sets the Azure Blob Storage connection for tracking processing state for Event Hubs when scaling out a deployment with multiple Logstash instances. See <<scaling-blob>> for additional details.
-<3> See <<azure_best_practices>> for guidelines on choosing an appropriate number of threads.
-<4> This connection sets up the consumption of Activity Logs. By default, Azure Monitor uses the `insights-operational-logs` Event Hub name. Make sure this matches the name of the Event Hub specified for Activity Logs.
-<5> This connection and the ones below set up the consumption of SQL DB diagnostic logs and metrics. By default, Azure Monitor uses all these different Event Hub names.
-
-The basic configuration requires the `var.input.azure_event_hubs.` prefix
-before a configuration option. 
-Notice the notation for the `threads` option. 
-
-[[adv-config-sample]]
-===== Advanced configuration sample
-
-Advanced configuration in the `logstash.yml` file supports Event Hub specific
-options. Advanced configuration is available for more granular tuning of
-threading and Blob Storage usage across multiple Event Hubs. Advanced
-configuration is not necessary or recommended for most use cases. Use it only if
-it is required for your deployment scenario. 
-
-You must define the `header` array with `name` in the first position. You can
-define other options in any order. The per Event Hub configuration takes
-precedence. Any values not defined per Event Hub use the global config value.  
-
-In this example `threads`, `consumer_group`, and `storage_connection` will be
-applied to each of the configured Event Hubs. Note that `decorate_events` is
-defined in both the global and per Event Hub configuration. The per Event Hub
-configuration takes precedence, and the global configuration is effectively
-ignored when the per Event Hub setting is present.
-
-["source","shell",subs="attributes"]
------
-modules:
-  - name: azure
-    var.elasticsearch.hosts: localhost:9200
-    var.kibana.host: localhost:5601
-    var.input.azure_event_hubs.decorate_events: true <1>
-    var.input.azure_event_hubs.threads: 9 <2>
-    var.input.azure_event_hubs.consumer_group: "logstash"
-    var.input.azure_event_hubs.storage_connection: "DefaultEndpointsProtocol=https;AccountName=instance1..."
-    var.input.azure_event_hubs.event_hubs:
-      - ["name",                                    "initial_position",  "storage_container",  "decorate_events",  "event_hub_connection"]                                   <3>
-      - ["insights-operational-logs",                 "TAIL",              "activity-logs1",    "true",             "Endpoint=sb://...EntityPath=insights-operational-logs"]
-      - ["insights-operational-logs",                 "TAIL",              "activity_logs2",<4>   "true",             "Endpoint=sb://...EntityPath=insights-operational-logs"] 
-      - ["insights-metrics-pt1m",                     "TAIL",              "dbmetrics",         "true",             "Endpoint=sb://...EntityPath=insights-metrics-pt1m"]
-      - ["insights-logs-blocks",                      "TAIL",              "dbblocks",          "true",             "Endpoint=sb://...EntityPath=insights-logs-blocks"]
-      - ["insights-logs-databasewaitstatistics",      "TAIL",              "dbwaitstats",       "false",            "Endpoint=sb://...EntityPath=insights-logs-databasewaitstatistics"]
-      - ["insights-logs-errors",                      "HEAD",              "dberrors",          "true",             "Endpoint=sb://...EntityPath=insights-logs-errors"
-      - ["insights-logs-querystoreruntimestatistics", "TAIL",              "dbstoreruntime",    "true",             "Endpoint=sb://...EntityPath=insights-logs-querystoreruntimestatistics"]
-      - ["insights-logs-querystorewaitstatistics",    "TAIL",              "dbstorewaitstats",  "true",             "Endpoint=sb://...EntityPath=insights-logs-querystorewaitstatistics"]
-      - ["insights-logs-timeouts",                    "TAIL",              "dbtimeouts",        "true",             "Endpoint=sb://...EntityPath=insights-logs-timeouts"]
------
-
-<1> You can specify global Event Hub options. They will be overridden by any configurations specified in the event_hubs option.
-<2> See <<azure_best_practices>> for guidelines on choosing an appropriate number of threads.
-<3> The header array must be defined with name in the first position. Other options can be defined in any order. The per Event Hub configuration takes precedence. Any values not defined per Event Hub use the global config value.
-<4> This enables consuming from a second Activity Logs Event Hub that uses a different Blob Storage container. This is necessary to avoid the offsets from the first insights-operational-logs from overwriting the offsets for the second insights-operational-logs.
-
-The advanced configuration doesn't require a prefix before a per Event Hub
-configuration option. Notice the notation for the `initial_position` option. 
-
-[[scaling-blob]]
-===== Scale Event Hub consumption
-
-An https://azure.microsoft.com/en-us/services/storage/blobs[Azure Blob Storage
-account] is an essential part of Azure-to-Logstash configuration. 
-It is required for users who want to scale out multiple {ls} instances to consume from Event Hubs.
-
-A Blob Storage account is a central location that enables multiple instances of
-{ls} to work together to process events. It records the
-offset (location) of processed events. On restart, {ls} resumes processing
-exactly where it left off.
-
-Configuration notes:
-
-*  A Blob Storage account is highly recommended for use with this module, and is
-likely required for production servers.
-* The `storage_connection` option passes the blob storage connection string. 
-* Configure all {ls} instances to use the same `storage_connection` to get the
-benefits of shared processing.
-
-Sample Blob Storage connection string:
-
-[source,text]
-----
-DefaultEndpointsProtocol=https;AccountName=logstash;AccountKey=ETOPnkd/hDAWidkEpPZDiXffQPku/SZdXhPSLnfqdRTalssdEuPkZwIcouzXjCLb/xPZjzhmHfwRCGo0SBSw==;EndpointSuffix=core.windows.net
-----
-
-Find the connection string to Blob Storage here: 
-https://portal.azure.com[Azure Portal]`-> Blob Storage account -> Access keys`.
-
-[[azure_best_practices]]
-===== Best practices
-
-Here are some guidelines to help you achieve a successful deployment, and avoid
-data conflicts that can cause lost events.
-
-* **Create a {ls} consumer group.** 
-Create a new consumer group specifically for {ls}. Do not use the $default or
-any other consumer group that might already be in use. Reusing consumer groups
-among non-related consumers can cause unexpected behavior and possibly lost
-events. All {ls} instances should use the same consumer group so that they can
-work together for processing events.
-* **Avoid overwriting offset with multiple Event Hubs.** 
-The offsets (position) of the Event Hubs are stored in the configured Azure Blob
-store. The Azure Blob store uses paths like a file system to store the offsets.
-If the paths between multiple Event Hubs overlap, then the offsets may be stored
-incorrectly. 
-To avoid duplicate file paths, use the advanced configuration model and make
-sure that at least one of these options is different per Event Hub:
-** storage_connection
-** storage_container (defaults to Event Hub name if not defined)
-** consumer_group
-* **Set number of threads correctly.** 
-The number of threads should equal the number of Event Hubs plus one (or more).
-Each Event Hub needs at least one thread. An additional thread is needed to help
-coordinate the other threads. The number of threads should not exceed the number of Event Hubs multiplied by the
-number of partitions per Event Hub plus one. Threads are
-currently  available only as a global setting.
-** Sample: Event Hubs = 4. Partitions on each Event Hub = 3.
-Minimum threads is 5 (4 Event Hubs plus one). Maximum threads is 13 (4 Event
-Hubs times 3 partitions plus one). 
-** If you're collecting activity logs from only one specified event hub instance,
-then only 2 threads (1 Event Hub plus one) are required.
-
-[[azure-module-setup]]
-==== Set up and run the module
-
-Be sure that the `logstash.yml` file is <<configuring-azure,configured correctly>>. 
-
-===== First time setup
-
-Run this command from the Logstash directory:
-
-["source","shell",subs="attributes"]
------
-bin/logstash --setup
------
-
-The `--modules azure` option starts a Logstash pipeline for ingestion from Azure
-Event Hubs. The `--setup` option creates an `azure-*` index pattern in
-Elasticsearch and imports Kibana dashboards and visualizations. 
-
-===== Subsequent starts
-
-Run this command from the Logstash directory:
-
-["source","shell",subs="attributes"]
------
-bin/logstash 
------
-
-NOTE: The `--setup` option is intended only for first-time setup. If you include
-`--setup` on subsequent runs, your existing Kibana dashboards will be
-overwritten.
-
-[[exploring-data-azure]]
-==== Explore your data
-When the Logstash Azure module starts receiving events, you can begin using the
-packaged Kibana dashboards to explore and visualize your data. 
-
-To explore your data with Kibana:
-
-. Open a browser to http://localhost:5601[http://localhost:5601] (username:
-  "elastic"; password: "{pwd}")
-. Click *Dashboard*.
-. Click *[Azure Monitor] Overview*.
-
-[[azure_config_options]]
-==== Configuration options
-
-NOTE: All Event Hubs options are common to both basic and advanced
-configurations, with the following exceptions. The basic configuration uses
-`event_hub_connections` to support multiple connections. The advanced
-configuration uses `event_hubs` and `event_hub_connection` (singular).
-
-[[azure_event_hubs]]
-===== `event_hubs`
-* Value type is <<array,array>>
-* No default value
-* Ignored for basic and command line configuration
-* Required for advanced configuration 
-
-Defines the per Event Hubs configuration for the <<adv-config-sample,advanced configuration>>. 
-
-The advanced configuration uses `event_hub_connection` instead of `event_hub_connections`. 
-The `event_hub_connection` option is defined per Event Hub.
-
-[[azure_event_hub_connections]]
-===== `event_hub_connections`
-* Value type is <<array,array>>
-* No default value
-* Required for basic and command line configuration
-* Ignored for advanced configuration
-
-List of connection strings that identifies the Event Hubs to be read. Connection
-strings include the EntityPath for the Event Hub. 
-
-
-[[azure_checkpoint_interval]]
-===== `checkpoint_interval`
-* Value type is <<number,number>>
-* Default value is `5` seconds
-* Set to `0` to disable.
-  
-Interval in seconds to write checkpoints during batch processing. Checkpoints
-tell {ls} where to resume processing after a restart. Checkpoints are
-automatically written at the end of each batch, regardless of this setting. 
-
-Writing checkpoints too frequently can slow down processing unnecessarily. 
-
-
-[[azure_consumer_group]]
-===== `consumer_group`
-* Value type is <<string,string>>
-* Default value is `$Default` 
-
-Consumer group used to read the Event Hub(s). Create a consumer group
-specifically for Logstash. Then ensure that all instances of Logstash use that
-consumer group so that they can work together properly.
-
-
-[[azure_decorate_events]]
-===== `decorate_events`
-
-* Value type is <<boolean,boolean>>
-* Default value is `false`
-
-Adds metadata about the Event Hub, including `Event Hub name`, `consumer_group`,
-`processor_host`, `partition`, `offset`, `sequence`, `timestamp`, and `event_size`.  
-
-
-[[azure_initial_position]]
-===== `initial_position`
-* Value type is <<string,string>>
-* Valid arguments are `beginning`, `end`, `look_back`
-* Default value is `beginning`
-
-When first reading from an Event Hub, start from this position: 
-
-* `beginning` reads all pre-existing events in the Event Hub 
-* `end` does not read any pre-existing events in the Event Hub 
-* `look_back` reads `end` minus a number of seconds worth of pre-existing events.
-You control the number of seconds using the `initial_position_look_back` option.
-
-If `storage_connection` is set, the `initial_position` value is used only
-the first time Logstash reads from the Event Hub.
-
-
-[[azure_initial_position_look_back]]
-===== `initial_position_look_back`
-* Value type is <<number,number>>
-* Default value is `86400`
-* Used only if `initial_position` is set to `look-back`
-
-Number of seconds to look back to find the initial position for pre-existing
-events. This option is used only if `initial_position` is set to `look_back`. If
-`storage_connection` is set, this configuration applies only the first time {ls}
-reads from the Event Hub. 
-
-
-[[azure_max_batch_size]]
-===== `max_batch_size`
-
-* Value type is <<number,number>>
-* Default value is `125`
-
-Maximum number of events retrieved and processed together. A checkpoint is
-created after each batch. Increasing this value may help with performance, but
-requires more memory. 
-
-
-[[azure_storage_connection]]
-===== `storage_connection`
-* Value type is <<string,string>>
-* No default value 
-
-Connection string for blob account storage. Blob account storage persists the
-offsets between restarts, and ensures that multiple instances of Logstash
-process different partitions. 
-When this value is set, restarts resume where processing left off.
-When this value is not set, the `initial_position` value is used on every restart.
-
-We strongly recommend that you define this value for production environments.
-
-
-[[azure_storage_container]]
-===== `storage_container`
-* Value type is <<string,string>>
-* Defaults to the Event Hub name if not defined
-
-Name of the storage container used to persist offsets and allow multiple instances of {ls}
-to work together. 
- 
-To avoid overwriting offsets, you can use different storage containers. This is
-particularly important if you are monitoring two Event Hubs with the same name.
-You can use the advanced configuration model to configure different storage
-containers. 
-
-
-[[azure_threads]]
-===== `threads`
-* Value type is <<number,number>>
-* Minimum value is `2`
-* Default value is `4`
-  
-Total number of threads used to process events. The value you set here applies
-to all Event Hubs. Even with advanced configuration, this value is a global
-setting, and can't be set per event hub. 
-
-The number of threads should be the number of Event Hubs plus one or more. 
-See <<azure_best_practices>> for more information.
-
-
-include::shared-module-options.asciidoc[]
-    
-==== Azure module schema
-
-This module reads data from the Azure Event Hub and adds some additional structure to the data for Activity Logs and SQL Diagnostics. The original data is always preserved and any data added or parsed will be namespaced under 'azure'. For example, 'azure.subscription' may have been parsed from a longer more complex URN.
-
-[cols="<,<,<",options="header",]
-|=======================================================================
-|Name |Description|Notes
-
-|azure.subscription 	|Azure subscription from which this data originates. 	|Some Activity Log events may not be associated with a subscription.
-|azure.group 	|Primary type of data. |Current values are either 'activity_log' or 'sql_diagnostics' 	
-|azure.category* 	|Secondary type of data specific to group from which the data originated 	|
-|azure.provider 	|Azure provider 	| 
-|azure.resource_group 	|Azure resource group 	| 
-|azure.resource_type 	|Azure resource type 	| 
-|azure.resource_name 	|Azure resource name 	| 
-|azure.database 	|Azure database name, for display purposes 	|SQL Diagnostics only
-|azure.db_unique_id 	|Azure database name that is guaranteed to be unique 	|SQL Diagnostics only
-|azure.server 	|Azure server for the database 	|SQL Diagnostics only
-|azure.server_and_database 	|Azure server and database combined 	|SQL Diagnostics only
-|azure.metadata 	|Any @metadata added by the plugins, for example var.input.azure_event_hubs.decorate_events: true 	
-|=======================================================================
-
-Notes:
-
-* Activity Logs can have the following categories: Administrative, ServiceHealth, Alert, Autoscale, Security
-* SQL Diagnostics can have the following categories: Metric, Blocks, Errors, Timeouts, QueryStoreRuntimeStatistics, QueryStoreWaitStatistics, DatabaseWaitStatistics, SQLInsights
-
-Microsoft documents Activity log schema
-https://docs.microsoft.com/en-us/azure/monitoring-and-diagnostics/monitoring-activity-log-schema[here].
-The SQL Diagnostics data is documented
-https://docs.microsoft.com/en-us/azure/sql-database/sql-database-metrics-diag-logging[here].
-Elastic does not own these data models, and as such, cannot make any
-assurances of information accuracy or passivity.
-
-===== Special note - Properties field
-
-Many of the logs contain a `properties` top level field. This is often where the
-most interesting data lives. There is not a fixed schema between log types for
-properties fields coming from different sources. 
-
-For example, one log may have
-`properties.type` where one log sets this a String type and another sets this an
-Integer type. To avoid mapping errors, the original properties field is moved to
-`<azure.group>_<azure_category>_properties.<original_key>`.  
-For example
-`properties.type` may end up as `sql_diagnostics_Errors_properties.type` or
-`activity_log_Security_properties.type` depending on the group/category where
-the event originated.
-
-[[azure-production]]
-==== Deploying the module in production 
-
-Use security best practices to secure your configuration.
-See {stack-ov}/elasticsearch-security.html[Securing the {stack}] for details and recommendations.
-
-[[azure-resources]]
-==== Microsoft Azure resources 
-
-Microsoft is the best source for the most up-to-date Azure information. 
-
-* https://docs.microsoft.com/en-us/azure/monitoring-and-diagnostics/monitoring-overview-azure-monitor[Overview of Azure Monitor]
-* https://docs.microsoft.com/en-us/azure/sql-database/sql-database-metrics-diag-logging[Azure SQL Database metrics and diagnostics logging]
-* https://docs.microsoft.com/en-us/azure/monitoring-and-diagnostics/monitoring-stream-activity-logs-event-hubs[Stream the Azure Activity Log to Event Hubs]
-
diff --git a/docs/static/best-practice.asciidoc b/docs/static/best-practice.asciidoc
deleted file mode 100644
index 2be607b14..000000000
--- a/docs/static/best-practice.asciidoc
+++ /dev/null
@@ -1,112 +0,0 @@
-[[tips]] 
-== Tips and Best Practices
-
-We are adding more tips and best practices, so please check back soon. 
-If you have something to add, please:
-
-* create an issue at
-https://github.com/elastic/logstash/issues, or
-* create a pull request with your proposed changes at https://github.com/elastic/logstash.
-
-// After merge, update PR link to link directly to this topic in GH
-
-Also check out the https://discuss.elastic.co/c/logstash[Logstash discussion
-forum].
-
-[float] 
-[[tip-cli]] 
-=== Command line
-
-[float] 
-[[tip-windows-cli]] 
-==== Shell commands on Windows OS
-
-Command line examples often show single quotes. 
-On Windows systems, replace a single quote `'` with a double quote `"`. 
-
-*Example*
-
-Instead of:
-
------
-bin/logstash -e 'input { stdin { } } output { stdout {} }'
------
-
-Use this format on Windows systems:
-
------
-bin\logstash -e "input { stdin { } } output { stdout {} }"
------
-
-[float]
-[[tip-pipelines]]
-=== Pipelines
-
-[float]
-[[tip-pipeline-mgmt]]
-==== Pipeline management
-
-You can manage pipelines in a {ls} instance using either local pipeline configurations or
-{logstash-ref}/configuring-centralized-pipelines.html[centralized pipeline management]
-in {kib}.
-
-After you configure Logstash to use centralized pipeline management, you can
-no longer specify local pipeline configurations. The `pipelines.yml` file and
-settings such as `path.config` and `config.string` are inactive when centralized
-pipeline management is enabled.
-
-[float]
-[[tip-kafka]]
-=== Kafka
-
-[float]
-[[tip-kafka-settings]]
-==== Kafka settings
-
-[float]
-[[tip-kafka-partitions]]
-===== Partitions per topic
-
-"How many partitions should I use per topic?"
-
-At least the number of {ls} nodes multiplied by consumer threads per node.
-
-Better yet, use a multiple of the above number. Increasing the number of
-partitions for an existing topic is extremely complicated. Partitions have a
-very low overhead. Using 5 to 10 times the number of partitions suggested by the
-first point is generally fine, so long as the overall partition count does not
-exceed 2000.
-
-Err on the side of over-partitioning up to a total 1000
-partitions overall. Try not to exceed 1000 partitions.
-
-[float]
-[[tip-kafka-threads]]
-===== Consumer threads
-
-"How many consumer threads should I configure?"
-
-Lower values tend to be more efficient and have less memory overhead. Try a
-value of `1` then iterate your way up. The value should in general be lower than
-the number of pipeline workers. Values larger than 4 rarely result in
-performance improvement.
-
-[float]
-[[tip-kafka-pq-persist]]
-==== Kafka input and persistent queue (PQ)
-
-[float]
-[[tip-kafka-offset-commit]]
-===== Kafka offset commits
-
-"Does Kafka Input commit offsets only after the event has been safely persisted to the PQ?"
-
-"Does Kafa Input commit offsets only for events that have passed the pipeline fully?"
-
-No, we can’t make that guarantee. Offsets are committed to Kafka periodically. If
-writes to the PQ are slow or blocked, offsets for events that haven’t safely
-reached the PQ can be committed.
-
-
-
-
diff --git a/docs/static/breaking-changes.asciidoc b/docs/static/breaking-changes.asciidoc
deleted file mode 100644
index 803cc8005..000000000
--- a/docs/static/breaking-changes.asciidoc
+++ /dev/null
@@ -1,75 +0,0 @@
-[[breaking-changes]]
-== Breaking Changes
-
-We strive to maintain backward compatibility between minor versions (6.x to 6.y,
-for example) so that you can upgrade without changing any configuration files.
-Breaking changes are usually introduced only between major versions (such as 5.x
-to 6.y). On occasion, we are forced to break compatibility within a given major release
-to ensure correctness of operation.
-
-This section covers the changes that you need to be aware of when migrating to
-Logstash 6.0.0 and later.
-
-NOTE: Migrating directly between non-consecutive major versions (1.x to
-6.x) is not recommended.
-
-See these topics for a description of breaking changes:
-
-* <<breaking-pq>>
-* <<breaking-6.0>>
-
-See also <<releasenotes>>. 
-
-[float]
-[[breaking-pq]]
-=== Breaking change across PQ versions prior to Logstash 6.3.0
-
-If you are upgrading from Logstash 6.2.x or any earlier version (including 5.x)
-and have the persistent queue enabled, we strongly recommend that you drain or
-delete the persistent queue before you upgrade. See <<upgrading-logstash-pqs>>
-for information and instructions.
-
-[float]
-[[breaking-6.0]]
-=== Breaking changes in 6.0
-
-Here are the breaking changes for 6.0. 
-
-[float]
-==== Changes in Logstash Core
-
-These changes can impact any instance of Logstash and are plugin agnostic, but only if you are using the features that are impacted.
-
-[float]
-===== Application Settings
-
-* The setting `config.reload.interval` has been changed to use time value strings such as `5m`, `10s` etc.
-  Previously, users had to convert this to a millisecond time value themselves.
-
-[float]
-===== RPM/Deb package changes
-
-* For `rpm` and `deb` release artifacts, config files that match the `*.conf` glob pattern must be in the conf.d folder,
-  or the files will not be loaded.
-
-[float]
-===== Command Line Interface behavior
-
-* The `-e` and `-f` CLI options are now mutually exclusive. This also applies to the corresponding long form options `config.string` and
-  `path.config`. This means any configurations  provided via `-e` will no longer be appended to the configurations provided via `-f`.
-* Configurations provided with `-f` or `config.path` will not be appended with `stdin` input and `stdout` output automatically.
-
-[float]
-===== List of plugins bundled with Logstash
-
-The following plugins were removed from the 5.0 default bundle based on usage data. You can still install these plugins manually:
-
-* logstash-codec-oldlogstashjson
-* logstash-input-couchdb_changes
-* logstash-input-irc
-* logstash-input-log4j
-* logstash-input-lumberjack
-* logstash-filter-uuid
-* logstash-output-xmpp
-* logstash-output-irc
-* logstash-output-statsd
diff --git a/docs/static/codec.asciidoc b/docs/static/codec.asciidoc
deleted file mode 100644
index 6b0fd558a..000000000
--- a/docs/static/codec.asciidoc
+++ /dev/null
@@ -1,15 +0,0 @@
-:register_method:	true
-:encode_method:		true
-:decode_method:		true
-:plugintype:    	codec
-:pluginclass:   	Codecs
-:pluginname:    	example
-:pluginnamecap: 	Example
-
-:blockinput:		true
-
-:getstarted: Let's step through creating a {plugintype} plugin using the https://github.com/logstash-plugins/logstash-codec-example/[example {plugintype} plugin].
-
-:methodheader: Logstash codecs must implement the `register` method, and the `decode` method or the `encode` method (or both).
-
-include::include/pluginbody.asciidoc[]
diff --git a/docs/static/config-management.asciidoc b/docs/static/config-management.asciidoc
deleted file mode 100644
index a5d3dd071..000000000
--- a/docs/static/config-management.asciidoc
+++ /dev/null
@@ -1,15 +0,0 @@
-[[config-management]]
-== Managing Logstash
-
-Logstash provides configuration management features to make it easier for you to
-manage updates to your configuration over time.
-
-The topics in this section describe Logstash configuration management features
-only. For information about other config management tools, such as Puppet and
-Chef, see the documentation for those projects. Also take a look at the
-https://forge.puppet.com/elastic/logstash[Logstash Puppet module documentation].
-
-ifdef::include-xpack[]
-:edit_url!:
-include::management/centralized-pipelines.asciidoc[]
-endif::include-xpack[]
diff --git a/docs/static/configuration.asciidoc b/docs/static/configuration.asciidoc
deleted file mode 100644
index 07d8e0c46..000000000
--- a/docs/static/configuration.asciidoc
+++ /dev/null
@@ -1,1086 +0,0 @@
-[[configuration]]
-== Configuring Logstash
-
-To configure Logstash, you create a config file that specifies which plugins you want to use and settings for each plugin.
-You can reference event fields in a configuration and use conditionals to process events when they meet certain
-criteria. When you run logstash, you use the `-f` to specify your config file.
-
-Let's step through creating a simple config file and using it to run Logstash. Create a file named "logstash-simple.conf" and save it in the same directory as Logstash.
-
-[source,ruby]
-----------------------------------
-input { stdin { } }
-output {
-  elasticsearch { hosts => ["localhost:9200"] }
-  stdout { codec => rubydebug }
-}
-----------------------------------
-
-Then, run logstash and specify the configuration file with the `-f` flag.
-
-[source,ruby]
-----------------------------------
-bin/logstash -f logstash-simple.conf
-----------------------------------
-
-Et voilà! Logstash reads  the specified configuration file and outputs to both Elasticsearch and stdout. Before we
-move on to some <<config-examples,more complex examples>>, let's take a closer look at what's in a config file.
-
-[[configuration-file-structure]]
-=== Structure of a Config File
-
-A Logstash config file has a separate section for each type of plugin you want to add to the event processing pipeline. For example:
-
-[source,js]
-----------------------------------
-# This is a comment. You should use comments to describe
-# parts of your configuration.
-input {
-  ...
-}
-
-filter {
-  ...
-}
-
-output {
-  ...
-}
-----------------------------------
-
-Each section contains the configuration options for one or more plugins. If you specify
-multiple filters, they are applied in the order of their appearance in the configuration file.
-
-
-[float]
-[[plugin_configuration]]
-=== Plugin Configuration
-
-The configuration of a plugin consists of the plugin name followed
-by a block of settings for that plugin. For example, this input section configures two file inputs:
-
-[source,js]
-----------------------------------
-input {
-  file {
-    path => "/var/log/messages"
-    type => "syslog"
-  }
-
-  file {
-    path => "/var/log/apache/access.log"
-    type => "apache"
-  }
-}
-----------------------------------
-
-In this example, two settings are configured for each of the file inputs: 'path' and 'type'.
-
-The settings you can configure vary according to the plugin type. For information about each plugin, see <<input-plugins,Input Plugins>>, <<output-plugins, Output Plugins>>, <<filter-plugins,Filter Plugins>>, and <<codec-plugins,Codec Plugins>>.
-
-[float]
-[[plugin-value-types]]
-=== Value Types
-
-A plugin can require that the value for a setting be a
-certain type, such as boolean, list, or hash. The following value
-types are supported.
-
-[[array]]
-==== Array
-
-This type is now mostly deprecated in favor of using a standard type like `string` with the plugin defining the `:list => true` property for better type checking. It is still needed to handle lists of hashes or mixed types where type checking is not desired.
-
-Example:
-
-[source,js]
-----------------------------------
-  users => [ {id => 1, name => bob}, {id => 2, name => jane} ]
-----------------------------------
-
-[[list]]
-[float]
-==== Lists
-
-Not a type in and of itself, but a property types can have.
-This makes it possible to type check multiple values.
-Plugin authors can enable list checking by specifying `:list => true` when declaring an argument.
-
-Example:
-
-[source,js]
-----------------------------------
-  path => [ "/var/log/messages", "/var/log/*.log" ]
-  uris => [ "http://elastic.co", "http://example.net" ]
-----------------------------------
-
-This example configures `path`, which is a `string` to be a list that contains an element for each of the three strings. It also will configure the `uris` parameter to be a list of URIs, failing if any of the URIs provided are not valid.
-
-
-[[boolean]]
-[float]
-==== Boolean
-
-A boolean must be either `true` or `false`. Note that the `true` and `false` keywords
-are not enclosed in quotes.
-
-Example:
-
-[source,js]
-----------------------------------
-  ssl_enable => true
-----------------------------------
-
-[[bytes]]
-[float]
-==== Bytes
-
-A bytes field is a string field that represents a valid unit of bytes. It is a
-convenient way to declare specific sizes in your plugin options. Both SI (k M G T P E Z Y)
-and Binary (Ki Mi Gi Ti Pi Ei Zi Yi) units are supported. Binary units are in
-base-1024 and SI units are in base-1000. This field is case-insensitive
-and accepts space between the value and the unit. If no unit is specified, the integer string
-represents the number of bytes.
-
-Examples:
-
-[source,js]
-----------------------------------
-  my_bytes => "1113"   # 1113 bytes
-  my_bytes => "10MiB"  # 10485760 bytes
-  my_bytes => "100kib" # 102400 bytes
-  my_bytes => "180 mb" # 180000000 bytes
-----------------------------------
-
-[[codec]]
-[float]
-==== Codec
-
-A codec is the name of Logstash codec used to represent the data. Codecs can be
-used in both inputs and outputs.
-
-Input codecs provide a convenient way to decode your data before it enters the input.
-Output codecs provide a convenient way to encode your data before it leaves the output.
-Using an input or output codec eliminates the need for a separate filter in your Logstash pipeline.
-
-A list of available codecs can be found at the <<codec-plugins,Codec Plugins>> page.
-
-Example:
-
-[source,js]
-----------------------------------
-  codec => "json"
-----------------------------------
-
-[[hash]]
-[float]
-==== Hash
-
-A hash is a collection of key value pairs specified in the format `"field1" => "value1"`.
-Note that multiple key value entries are separated by spaces rather than commas.
-
-Example:
-
-[source,js]
-----------------------------------
-match => {
-  "field1" => "value1"
-  "field2" => "value2"
-  ...
-}
-# or as a single line. No commas between entries:
-match => { "field1" => "value1" "field2" => "value2" }
-----------------------------------
-
-[[number]]
-[float]
-==== Number
-
-Numbers must be valid numeric values (floating point or integer).
-
-Example:
-
-[source,js]
-----------------------------------
-  port => 33
-----------------------------------
-
-[[password]]
-[float]
-==== Password
-
-A password is a string with a single value that is not logged or printed.
-
-Example:
-
-[source,js]
-----------------------------------
-  my_password => "password"
-----------------------------------
-
-[[uri]]
-[float]
-==== URI
-
-A URI can be anything from a full URL like 'http://elastic.co/' to a simple identifier
-like 'foobar'. If the URI contains a password such as 'http://user:pass@example.net' the password
-portion of the URI will not be logged or printed.
-
-Example:
-[source,js]
-----------------------------------
-  my_uri => "http://foo:bar@example.net"
-----------------------------------
-
-
-[[path]]
-[float]
-==== Path
-
-A path is a string that represents a valid operating system path.
-
-Example:
-
-[source,js]
-----------------------------------
-  my_path => "/tmp/logstash"
-----------------------------------
-
-[[string]]
-[float]
-==== String
-
-A string must be a single character sequence. Note that string values are
-enclosed in quotes, either double or single.
-
-===== Escape Sequences
-
-By default, escape sequences are not enabled. If you wish to use escape
-sequences in quoted strings, you will need to set
-`config.support_escapes: true` in your `logstash.yml`. When `true`, quoted
-strings (double and single) will have this transformation:
-
-|===========================
-| Text | Result
-| \r   | carriage return (ASCII 13)
-| \n   | new line (ASCII 10)
-| \t   | tab (ASCII 9)
-| \\   | backslash (ASCII 92)
-| \"   | double quote (ASCII 34)
-| \'   | single quote (ASCII 39)
-|===========================
-
-Example:
-
-[source,js]
-----------------------------------
-  name => "Hello world"
-  name => 'It\'s a beautiful day'
-----------------------------------
-
-[float]
-[[comments]]
-=== Comments
-
-Comments are the same as in perl, ruby, and python. A comment starts with a '#' character, and does not need to be at the beginning of a line. For example:
-
-[source,js]
-----------------------------------
-# this is a comment
-
-input { # comments can appear at the end of a line, too
-  # ...
-}
-----------------------------------
-
-[[event-dependent-configuration]]
-=== Accessing Event Data and Fields in the Configuration
-
-The logstash agent is a processing pipeline with 3 stages: inputs -> filters ->
-outputs. Inputs generate events, filters modify them, outputs ship them
-elsewhere.
-
-All events have properties. For example, an apache access log would have things
-like status code (200, 404), request path ("/", "index.html"), HTTP verb
-(GET, POST), client IP address, etc. Logstash calls these properties "fields."
-
-Some of the configuration options in Logstash require the existence of fields in
-order to function.  Because inputs generate events, there are no fields to
-evaluate within the input block--they do not exist yet!
-
-Because of their dependency on events and fields, the following configuration
-options will only work within filter and output blocks.
-
-IMPORTANT: Field references, sprintf format and conditionals, described below,
-will not work in an input block.
-
-[float]
-[[logstash-config-field-references]]
-==== Field References
-
-It is often useful to be able to refer to a field by name. To do this,
-you can use the Logstash <<field-references-deepdive,field reference syntax>>.
-
-The basic syntax to access a field is `[fieldname]`. If you are referring to a
-**top-level field**, you can omit the `[]` and simply use `fieldname`.
-To refer to a **nested field**, you specify
-the full path to that field: `[top-level field][nested field]`.
-
-For example, the following event has five top-level fields (agent, ip, request, response,
-ua) and three nested fields (status, bytes, os).
-
-[source,js]
-----------------------------------
-{
-  "agent": "Mozilla/5.0 (compatible; MSIE 9.0)",
-  "ip": "192.168.24.44",
-  "request": "/index.html"
-  "response": {
-    "status": 200,
-    "bytes": 52353
-  },
-  "ua": {
-    "os": "Windows 7"
-  }
-}
-
-----------------------------------
-
-To reference the `os` field, you specify `[ua][os]`. To reference a top-level
-field such as `request`, you can simply specify the field name.
-
-For more detailed information, see <<field-references-deepdive>>.
-
-[float]
-[[sprintf]]
-==== sprintf format
-
-The field reference format is also used in what Logstash calls 'sprintf format'. This format
-enables you to refer to field values from within other strings. For example, the
-statsd output has an 'increment' setting that enables you to keep a count of
-apache logs by status code:
-
-[source,js]
-----------------------------------
-output {
-  statsd {
-    increment => "apache.%{[response][status]}"
-  }
-}
-----------------------------------
-
-Similarly, you can convert the timestamp in the `@timestamp` field into a string. Instead of specifying a field name inside the curly braces, use the `+FORMAT` syntax where `FORMAT` is a http://joda-time.sourceforge.net/apidocs/org/joda/time/format/DateTimeFormat.html[time format].
-
-For example, if you want to use the file output to write to logs based on the
-event's date and hour and the `type` field:
-
-[source,js]
-----------------------------------
-output {
-  file {
-    path => "/var/log/%{type}.%{+yyyy.MM.dd.HH}"
-  }
-}
-----------------------------------
-
-[float]
-[[conditionals]]
-==== Conditionals
-
-Sometimes you only want to filter or output an event under
-certain conditions. For that, you can use a conditional.
-
-Conditionals in Logstash look and act the same way they do in programming
-languages. Conditionals support `if`, `else if` and `else` statements
-and can be nested.
-
-The conditional syntax is:
-
-[source,js]
-----------------------------------
-if EXPRESSION {
-  ...
-} else if EXPRESSION {
-  ...
-} else {
-  ...
-}
-----------------------------------
-
-What's an expression? Comparison tests, boolean logic, and so on!
-
-You can use the following comparison operators:
-
-* equality: `==`,  `!=`,  `<`,  `>`,  `<=`, `>=`
-* regexp: `=~`, `!~` (checks a pattern on the right against a string value on the left)
-* inclusion: `in`, `not in`
-
-The supported boolean operators are:
-
-* `and`, `or`, `nand`, `xor`
-
-The supported unary operators are:
-
-* `!`
-
-Expressions can be long and complex. Expressions can contain other expressions,
-you can negate expressions with `!`, and you can group them with parentheses `(...)`.
-
-For example, the following conditional uses the mutate filter to remove the field `secret` if the field
-`action` has a value of `login`:
-
-[source,js]
-----------------------------------
-filter {
-  if [action] == "login" {
-    mutate { remove_field => "secret" }
-  }
-}
-----------------------------------
-
-You can specify multiple expressions in a single condition:
-
-[source,js]
-----------------------------------
-output {
-  # Send production errors to pagerduty
-  if [loglevel] == "ERROR" and [deployment] == "production" {
-    pagerduty {
-    ...
-    }
-  }
-}
-----------------------------------
-
-You can use the `in` operator to test whether a field contains a specific string, key, or (for lists) element:
-
-[source,js]
-----------------------------------
-filter {
-  if [foo] in [foobar] {
-    mutate { add_tag => "field in field" }
-  }
-  if [foo] in "foo" {
-    mutate { add_tag => "field in string" }
-  }
-  if "hello" in [greeting] {
-    mutate { add_tag => "string in field" }
-  }
-  if [foo] in ["hello", "world", "foo"] {
-    mutate { add_tag => "field in list" }
-  }
-  if [missing] in [alsomissing] {
-    mutate { add_tag => "shouldnotexist" }
-  }
-  if !("foo" in ["hello", "world"]) {
-    mutate { add_tag => "shouldexist" }
-  }
-}
-----------------------------------
-
-You use the `not in` conditional the same way. For example,
-you could use `not in` to only route events to Elasticsearch
-when `grok` is successful:
-
-[source,js]
-----------------------------------
-output {
-  if "_grokparsefailure" not in [tags] {
-    elasticsearch { ... }
-  }
-}
-----------------------------------
-
-You can check for the existence of a specific field, but there's currently no way to differentiate between a field that
-doesn't exist versus a field that's simply false. The expression `if [foo]` returns `false` when:
-
-* `[foo]` doesn't exist in the event,
-* `[foo]` exists in the event, but is false, or
-* `[foo]` exists in the event, but is null
-
-For more complex examples, see <<using-conditionals, Using Conditionals>>.
-
-[float]
-[[metadata]]
-==== The @metadata field
-
-In Logstash 1.5 and later, there is a special field called `@metadata`.  The contents
-of `@metadata` will not be part of any of your events at output time, which
-makes it great to use for conditionals, or extending and building event fields
-with field reference and sprintf formatting.
-
-The following configuration file will yield events from STDIN.  Whatever is
-typed will become the `message` field in the event.  The `mutate` events in the
-filter block will add a few fields, some nested in the `@metadata` field.
-
-[source,ruby]
-----------------------------------
-input { stdin { } }
-
-filter {
-  mutate { add_field => { "show" => "This data will be in the output" } }
-  mutate { add_field => { "[@metadata][test]" => "Hello" } }
-  mutate { add_field => { "[@metadata][no_show]" => "This data will not be in the output" } }
-}
-
-output {
-  if [@metadata][test] == "Hello" {
-    stdout { codec => rubydebug }
-  }
-}
-
-----------------------------------
-
-Let's see what comes out:
-
-[source,ruby]
-----------------------------------
-
-$ bin/logstash -f ../test.conf
-Pipeline main started
-asdf
-{
-    "@timestamp" => 2016-06-30T02:42:51.496Z,
-      "@version" => "1",
-          "host" => "example.com",
-          "show" => "This data will be in the output",
-       "message" => "asdf"
-}
-
-----------------------------------
-
-The "asdf" typed in became the `message` field contents, and the conditional
-successfully evaluated the contents of the `test` field nested within the
-`@metadata` field.  But the output did not show a field called `@metadata`, or
-its contents.
-
-The `rubydebug` codec allows you to reveal the contents of the `@metadata` field
-if you add a config flag, `metadata => true`:
-
-[source,ruby]
-----------------------------------
-    stdout { codec => rubydebug { metadata => true } }
-----------------------------------
-
-Let's see what the output looks like with this change:
-
-[source,ruby]
-----------------------------------
-$ bin/logstash -f ../test.conf
-Pipeline main started
-asdf
-{
-    "@timestamp" => 2016-06-30T02:46:48.565Z,
-     "@metadata" => {
-           "test" => "Hello",
-        "no_show" => "This data will not be in the output"
-    },
-      "@version" => "1",
-          "host" => "example.com",
-          "show" => "This data will be in the output",
-       "message" => "asdf"
-}
-----------------------------------
-
-Now you can see the `@metadata` field and its sub-fields.
-
-IMPORTANT: Only the `rubydebug` codec allows you to show the contents of the
-`@metadata` field.
-
-Make use of the `@metadata` field any time you need a temporary field but do not
-want it to be in the final output.
-
-Perhaps one of the most common use cases for this new field is with the `date`
-filter and having a temporary timestamp.
-
-This configuration file has been simplified, but uses the timestamp format
-common to Apache and Nginx web servers.  In the past, you'd have to delete
-the timestamp field yourself, after using it to overwrite the `@timestamp`
-field.  With the `@metadata` field, this is no longer necessary:
-
-[source,ruby]
-----------------------------------
-input { stdin { } }
-
-filter {
-  grok { match => [ "message", "%{HTTPDATE:[@metadata][timestamp]}" ] }
-  date { match => [ "[@metadata][timestamp]", "dd/MMM/yyyy:HH:mm:ss Z" ] }
-}
-
-output {
-  stdout { codec => rubydebug }
-}
-----------------------------------
-
-Notice that this configuration puts the extracted date into the
-`[@metadata][timestamp]` field in the `grok` filter.  Let's feed this
-configuration a sample date string and see what comes out:
-
-[source,ruby]
-----------------------------------
-$ bin/logstash -f ../test.conf
-Pipeline main started
-02/Mar/2014:15:36:43 +0100
-{
-    "@timestamp" => 2014-03-02T14:36:43.000Z,
-      "@version" => "1",
-          "host" => "example.com",
-       "message" => "02/Mar/2014:15:36:43 +0100"
-}
-----------------------------------
-
-That's it!  No extra fields in the output, and a cleaner config file because you
-do not have to delete a "timestamp" field after conversion in the `date` filter.
-
-Another use case is the CouchDB Changes input plugin (See
-https://github.com/logstash-plugins/logstash-input-couchdb_changes).
-This plugin automatically captures CouchDB document field metadata into the
-`@metadata` field within the input plugin itself.  When the events pass through
-to be indexed by Elasticsearch, the Elasticsearch output plugin allows you to
-specify the `action` (delete, update, insert, etc.) and the `document_id`, like
-this:
-
-[source,ruby]
-----------------------------------
-output {
-  elasticsearch {
-    action => "%{[@metadata][action]}"
-    document_id => "%{[@metadata][_id]}"
-    hosts => ["example.com"]
-    index => "index_name"
-    protocol => "http"
-  }
-}
-----------------------------------
-
-[[environment-variables]]
-=== Using Environment Variables in the Configuration
-
-==== Overview
-
-* You can set environment variable references in the configuration for Logstash plugins by using `${var}`.
-* At Logstash startup, each reference will be replaced by the value of the environment variable.
-* The replacement is case-sensitive.
-* References to undefined variables raise a Logstash configuration error.
-* You can give a default value by using the form `${var:default value}`. Logstash uses the default value if the
-environment variable is undefined.
-* You can add environment variable references in any plugin option type : string, number, boolean, array, or hash.
-* Environment variables are immutable. If you update the environment variable, you'll have to restart Logstash to pick up the updated value.
-
-==== Examples
-
-The following examples show you how to use environment variables to set the values of some commonly used
-configuration options.
-
-===== Setting the TCP Port
-
-Here's an example that uses an environment variable to set the TCP port:
-
-[source,ruby]
-----------------------------------
-input {
-  tcp {
-    port => "${TCP_PORT}"
-  }
-}
-----------------------------------
-
-Now let's set the value of `TCP_PORT`:
-
-[source,shell]
-----
-export TCP_PORT=12345
-----
-
-At startup, Logstash uses the following configuration:
-
-[source,ruby]
-----------------------------------
-input {
-  tcp {
-    port => 12345
-  }
-}
-----------------------------------
-
-If the `TCP_PORT` environment variable is not set, Logstash returns a configuration error.
-
-You can fix this problem by specifying a default value:
-
-[source,ruby]
-----
-input {
-  tcp {
-    port => "${TCP_PORT:54321}"
-  }
-}
-----
-
-Now, instead of returning a configuration error if the variable is undefined, Logstash uses the default:
-
-[source,ruby]
-----
-input {
-  tcp {
-    port => 54321
-  }
-}
-----
-
-If the environment variable is defined, Logstash uses the value specified for the variable instead of the default.
-
-===== Setting the Value of a Tag
-
-Here's an example that uses an environment variable to set the value of a tag:
-
-[source,ruby]
-----
-filter {
-  mutate {
-    add_tag => [ "tag1", "${ENV_TAG}" ]
-  }
-}
-----
-
-Let's set the value of `ENV_TAG`:
-
-[source,shell]
-----
-export ENV_TAG="tag2"
-----
-
-At startup, Logstash uses the following configuration:
-
-[source,ruby]
-----
-filter {
-  mutate {
-    add_tag => [ "tag1", "tag2" ]
-  }
-}
-----
-
-===== Setting a File Path
-
-Here's an example that uses an environment variable to set the path to a log file:
-
-[source,ruby]
-----
-filter {
-  mutate {
-    add_field => {
-      "my_path" => "${HOME}/file.log"
-    }
-  }
-}
-----
-
-Let's set the value of `HOME`:
-
-[source,shell]
-----
-export HOME="/path"
-----
-
-At startup, Logstash uses the following configuration:
-
-[source,ruby]
-----
-filter {
-  mutate {
-    add_field => {
-      "my_path" => "/path/file.log"
-    }
-  }
-}
-----
-
-
-[[config-examples]]
-=== Logstash Configuration Examples
-The following examples illustrate how you can configure Logstash to filter events, process Apache logs and syslog messages, and use conditionals to control what events are processed by a filter or output.
-
-TIP: If you need help building grok patterns, try out the
-{kibana-ref}/xpack-grokdebugger.html[Grok Debugger]. The Grok Debugger is an
-{xpack} feature under the Basic License and is therefore *free to use*.
-
-[float]
-[[filter-example]]
-==== Configuring Filters
-Filters are an in-line processing mechanism that provide the flexibility to slice and dice your data to fit your needs. Let's take a look at some filters in action. The following configuration file sets up the `grok` and `date` filters.
-
-[source,ruby]
-----------------------------------
-input { stdin { } }
-
-filter {
-  grok {
-    match => { "message" => "%{COMBINEDAPACHELOG}" }
-  }
-  date {
-    match => [ "timestamp" , "dd/MMM/yyyy:HH:mm:ss Z" ]
-  }
-}
-
-output {
-  elasticsearch { hosts => ["localhost:9200"] }
-  stdout { codec => rubydebug }
-}
-----------------------------------
-
-Run Logstash with this configuration:
-
-[source,ruby]
-----------------------------------
-bin/logstash -f logstash-filter.conf
-----------------------------------
-
-Now, paste the following line into your terminal and press Enter so it will be
-processed by the stdin input:
-
-[source,ruby]
-----------------------------------
-127.0.0.1 - - [11/Dec/2013:00:01:45 -0800] "GET /xampp/status.php HTTP/1.1" 200 3891 "http://cadenza/xampp/navi.php" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:25.0) Gecko/20100101 Firefox/25.0"
-----------------------------------
-
-You should see something returned to stdout that looks like this:
-
-[source,ruby]
-----------------------------------
-{
-        "message" => "127.0.0.1 - - [11/Dec/2013:00:01:45 -0800] \"GET /xampp/status.php HTTP/1.1\" 200 3891 \"http://cadenza/xampp/navi.php\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:25.0) Gecko/20100101 Firefox/25.0\"",
-     "@timestamp" => "2013-12-11T08:01:45.000Z",
-       "@version" => "1",
-           "host" => "cadenza",
-       "clientip" => "127.0.0.1",
-          "ident" => "-",
-           "auth" => "-",
-      "timestamp" => "11/Dec/2013:00:01:45 -0800",
-           "verb" => "GET",
-        "request" => "/xampp/status.php",
-    "httpversion" => "1.1",
-       "response" => "200",
-          "bytes" => "3891",
-       "referrer" => "\"http://cadenza/xampp/navi.php\"",
-          "agent" => "\"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:25.0) Gecko/20100101 Firefox/25.0\""
-}
-----------------------------------
-
-As you can see, Logstash (with help from the `grok` filter) was able to parse the log line (which happens to be in Apache "combined log" format) and break it up into many different discrete bits of information. This is extremely useful once you start querying and analyzing our log data. For example, you'll be able to easily run reports on HTTP response codes, IP addresses, referrers, and so on. There are quite a few grok patterns included with Logstash out-of-the-box, so it's quite likely if you need to parse a common log format, someone has already done the work for you. For more information, see the list of https://github.com/logstash-plugins/logstash-patterns-core/tree/master/patterns[Logstash grok patterns] on GitHub.
-
-The other filter used in this example is the `date` filter. This filter parses out a timestamp and uses it as the timestamp for the event (regardless of when you're ingesting the log data). You'll notice that the `@timestamp` field in this example is set to December 11, 2013, even though Logstash is ingesting the event at some point afterwards. This is handy when backfilling logs. It gives you the ability to tell Logstash "use this value as the timestamp for this event".
-
-[float]
-==== Processing Apache Logs
-Let's do something that's actually *useful*: process apache2 access log files! We are going to read the input from a file on the localhost, and use a <<conditionals,conditional>> to process the event according to our needs. First, create a file called something like 'logstash-apache.conf' with the following contents (you can change the log's file path to suit your needs):
-
-[source,js]
-----------------------------------
-input {
-  file {
-    path => "/tmp/access_log"
-    start_position => "beginning"
-  }
-}
-
-filter {
-  if [path] =~ "access" {
-    mutate { replace => { "type" => "apache_access" } }
-    grok {
-      match => { "message" => "%{COMBINEDAPACHELOG}" }
-    }
-  }
-  date {
-    match => [ "timestamp" , "dd/MMM/yyyy:HH:mm:ss Z" ]
-  }
-}
-
-output {
-  elasticsearch {
-    hosts => ["localhost:9200"]
-  }
-  stdout { codec => rubydebug }
-}
-
-----------------------------------
-
-Then, create the input file you configured above (in this example, "/tmp/access_log") with the following log entries (or use some from your own webserver):
-
-[source,js]
-----------------------------------
-71.141.244.242 - kurt [18/May/2011:01:48:10 -0700] "GET /admin HTTP/1.1" 301 566 "-" "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3"
-134.39.72.245 - - [18/May/2011:12:40:18 -0700] "GET /favicon.ico HTTP/1.1" 200 1189 "-" "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; InfoPath.2; .NET4.0C; .NET4.0E)"
-98.83.179.51 - - [18/May/2011:19:35:08 -0700] "GET /css/main.css HTTP/1.1" 200 1837 "http://www.safesand.com/information.htm" "Mozilla/5.0 (Windows NT 6.0; WOW64; rv:2.0.1) Gecko/20100101 Firefox/4.0.1"
-----------------------------------
-
-Now, run Logstash with the -f flag to pass in the configuration file:
-
-[source,js]
-----------------------------------
-bin/logstash -f logstash-apache.conf
-----------------------------------
-
-Now you should see your apache log data in Elasticsearch! Logstash opened and read the specified input file, processing each event it encountered. Any additional lines logged to this file will also be captured, processed by Logstash as events, and stored in Elasticsearch. As an added bonus, they are stashed with the field "type" set to "apache_access" (this is done by the type => "apache_access" line in the input configuration).
-
-In this configuration, Logstash is only watching the apache access_log, but it's easy enough to watch both the access_log and the error_log (actually, any file matching `*log`), by changing one line in the above configuration:
-
-[source,js]
-----------------------------------
-input {
-  file {
-    path => "/tmp/*_log"
-...
-----------------------------------
-
-When you restart Logstash, it will process both the error and access logs. However, if you inspect your data (using elasticsearch-kopf, perhaps), you'll see that the access_log is broken up into discrete fields, but the error_log isn't. That's because we used a `grok` filter to match the standard combined apache log format and automatically split the data into separate fields. Wouldn't it be nice *if* we could control how a line was parsed, based on its format? Well, we can...
-
-Note that Logstash did not reprocess the events that were already seen in the access_log file. When reading from a file, Logstash saves its position and only processes new lines as they are added. Neat!
-
-[float]
-[[using-conditionals]]
-==== Using Conditionals
-You use conditionals to control what events are processed by a filter or output. For example, you could label each event according to which file it appeared in (access_log, error_log, and other random files that end with "log").
-
-[source,ruby]
-----------------------------------
-input {
-  file {
-    path => "/tmp/*_log"
-  }
-}
-
-filter {
-  if [path] =~ "access" {
-    mutate { replace => { type => "apache_access" } }
-    grok {
-      match => { "message" => "%{COMBINEDAPACHELOG}" }
-    }
-    date {
-      match => [ "timestamp" , "dd/MMM/yyyy:HH:mm:ss Z" ]
-    }
-  } else if [path] =~ "error" {
-    mutate { replace => { type => "apache_error" } }
-  } else {
-    mutate { replace => { type => "random_logs" } }
-  }
-}
-
-output {
-  elasticsearch { hosts => ["localhost:9200"] }
-  stdout { codec => rubydebug }
-}
-----------------------------------
-
-This example labels all events using the `type` field, but doesn't actually parse the `error` or `random` files. There are so many types of error logs that how they should be labeled really depends on what logs you're working with.
-
-Similarly, you can use conditionals to direct events to particular outputs. For example, you could:
-
-* alert nagios of any apache events with status 5xx
-* record any 4xx status to Elasticsearch
-* record all status code hits via statsd
-
-To tell nagios about any http event that has a 5xx status code, you
-first need to check the value of the `type` field. If it's apache, then you can
-check to see if the `status` field contains a 5xx error. If it is, send it to nagios. If it isn't
-a 5xx error, check to see if the `status` field contains a 4xx error. If so, send it to Elasticsearch.
-Finally, send all apache status codes to statsd no matter what the `status` field contains:
-
-[source,js]
-----------------------------------
-output {
-  if [type] == "apache" {
-    if [status] =~ /^5\d\d/ {
-      nagios { ...  }
-    } else if [status] =~ /^4\d\d/ {
-      elasticsearch { ... }
-    }
-    statsd { increment => "apache.%{status}" }
-  }
-}
-----------------------------------
-
-[float]
-==== Processing Syslog Messages
-Syslog is one of the most common use cases for Logstash, and one it handles exceedingly well (as long as the log lines conform roughly to RFC3164). Syslog is the de facto UNIX networked logging standard, sending messages from client machines to a local file, or to a centralized log server via rsyslog. For this example, you won't need a functioning syslog instance; we'll fake it from the command line so you can get a feel for what happens.
-
-First, let's make a simple configuration file for Logstash + syslog, called 'logstash-syslog.conf'.
-
-[source,ruby]
-----------------------------------
-input {
-  tcp {
-    port => 5000
-    type => syslog
-  }
-  udp {
-    port => 5000
-    type => syslog
-  }
-}
-
-filter {
-  if [type] == "syslog" {
-    grok {
-      match => { "message" => "%{SYSLOGTIMESTAMP:syslog_timestamp} %{SYSLOGHOST:syslog_hostname} %{DATA:syslog_program}(?:\[%{POSINT:syslog_pid}\])?: %{GREEDYDATA:syslog_message}" }
-      add_field => [ "received_at", "%{@timestamp}" ]
-      add_field => [ "received_from", "%{host}" ]
-    }
-    date {
-      match => [ "syslog_timestamp", "MMM  d HH:mm:ss", "MMM dd HH:mm:ss" ]
-    }
-  }
-}
-
-output {
-  elasticsearch { hosts => ["localhost:9200"] }
-  stdout { codec => rubydebug }
-}
-----------------------------------
-
-Run Logstash with this new configuration:
-
-[source,ruby]
-----------------------------------
-bin/logstash -f logstash-syslog.conf
-----------------------------------
-
-Normally, a client machine would connect to the Logstash instance on port 5000 and send its message. For this example, we'll just telnet to Logstash and enter a log line (similar to how we entered log lines into STDIN earlier). Open another shell window to interact with the Logstash syslog input and enter the following command:
-
-[source,ruby]
-----------------------------------
-telnet localhost 5000
-----------------------------------
-
-Copy and paste the following lines as samples. (Feel free to try some of your own, but keep in mind they might not parse if the `grok` filter is not correct for your data).
-
-[source,ruby]
-----------------------------------
-Dec 23 12:11:43 louis postfix/smtpd[31499]: connect from unknown[95.75.93.154]
-Dec 23 14:42:56 louis named[16000]: client 199.48.164.7#64817: query (cache) 'amsterdamboothuren.com/MX/IN' denied
-Dec 23 14:30:01 louis CRON[619]: (www-data) CMD (php /usr/share/cacti/site/poller.php >/dev/null 2>/var/log/cacti/poller-error.log)
-Dec 22 18:28:06 louis rsyslogd: [origin software="rsyslogd" swVersion="4.2.0" x-pid="2253" x-info="http://www.rsyslog.com"] rsyslogd was HUPed, type 'lightweight'.
-----------------------------------
-
-Now you should see the output of Logstash in your original shell as it processes and parses messages!
-
-[source,ruby]
-----------------------------------
-{
-                 "message" => "Dec 23 14:30:01 louis CRON[619]: (www-data) CMD (php /usr/share/cacti/site/poller.php >/dev/null 2>/var/log/cacti/poller-error.log)",
-              "@timestamp" => "2013-12-23T22:30:01.000Z",
-                "@version" => "1",
-                    "type" => "syslog",
-                    "host" => "0:0:0:0:0:0:0:1:52617",
-        "syslog_timestamp" => "Dec 23 14:30:01",
-         "syslog_hostname" => "louis",
-          "syslog_program" => "CRON",
-              "syslog_pid" => "619",
-          "syslog_message" => "(www-data) CMD (php /usr/share/cacti/site/poller.php >/dev/null 2>/var/log/cacti/poller-error.log)",
-             "received_at" => "2013-12-23 22:49:22 UTC",
-           "received_from" => "0:0:0:0:0:0:0:1:52617",
-    "syslog_severity_code" => 5,
-    "syslog_facility_code" => 1,
-         "syslog_facility" => "user-level",
-         "syslog_severity" => "notice"
-}
-----------------------------------
diff --git a/docs/static/contributing-patch.asciidoc b/docs/static/contributing-patch.asciidoc
deleted file mode 100644
index c126e0bdc..000000000
--- a/docs/static/contributing-patch.asciidoc
+++ /dev/null
@@ -1,397 +0,0 @@
-[[contributing-patch-plugin]]
-=== Contributing a Patch to a Logstash Plugin
-
-This section discusses the information you need to know to successfully contribute a patch to a Logstash plugin.
-
-Each plugin defines its own configuration options. These control the behaviour of the plugin to some degree. Configuration 
-option definitions commonly include:
-
-* Data validation
-* The default value
-* Any required flags
-
-Plugins are subclasses of a Logstash base class. A plugin's base class defines common configuration and methods.
-
-==== Input Plugins
-
-Input plugins ingest data from an external source. Input plugins are always associated with a codec. An input plugin 
-always has an associated codec plugin. Input and codec plugins operate in conjunction to create a Logstash event and add 
-that event to the processing queue. An input codec is a subclass of the `LogStash::Inputs::Base` class.
-
-.Input API
-[horizontal]
-`#register() -> nil`:: Required. This API sets up resources for the plugin, typically the connection to the 
-external source.
-`#run(queue) -> nil`:: Required. This API fetches or listens for source data, typically looping until stopped. Must handle 
-errors inside the loop. Pushes any created events to the queue object specified in the method argument. Some inputs may 
-receive batched data to minimize the external call overhead.
-`#stop() -> nil`:: Optional. Stops external connections and cleans up.
-
-==== Codec Plugins
-
-Codec plugins decode input data that has a specific structure, such as JSON input data. A codec plugin is a subclass of 
-`LogStash::Codecs::Base`.
-
-.Codec API
-[horizontal]
-`#register() -> nil`:: Identical to the API of the same name for input plugins.
-`#decode(data){|event| block} -> nil`:: Must be implemented. Used to create an Event from the raw data given in the method 
-argument. Must handle errors. The caller must provide a Ruby block. The block is called with the created Event.
-`#encode(event) -> nil`:: Required.  Used to create a structured data object from the given Event. May handle 
-errors. This method calls a block that was previously stored as @on_event with two arguments: the original event and the 
-data object.
-
-==== Filter Plugins
-
-A mechanism to change, mutate or merge one or more Events. A filter plugin is a subclass of the `LogStash::Filters::Base` 
-class.
-
-.Filter API
-[horizontal]
-`#register() -> nil`:: Identical to the API of the same name for input plugins.
-`#filter(event) -> nil`:: Required. May handle errors. Used to apply a mutation function to the given event.
-
-==== Output Plugins
-
-A mechanism to send an event to an external destination. This process may require serialization. An output plugin is a 
-subclass of the `LogStash::Outputs::Base` class.
-
-.Output API
-[horizontal]
-`#register() -> nil`:: Identical to the API of the same name for input plugins.
-`#receive(event) -> nil`:: Required. Must handle errors. Used to prepare the given event for transmission to 
-the external destination. Some outputs may buffer the prepared events to batch transmit to the destination.
-
-[[patch-process]]
-==== Process
-
-A bug or feature is identified. An issue is created in the plugin repository. A patch is created and a pull request (PR) 
-is submitted. After review and possible rework the PR is merged and the plugin is published.
-
-The <<community-maintainer,Community Maintainer Guide>> explains, in more detail, the process of getting a patch accepted, 
-merged and published.  The Community Maintainer Guide also details the roles that contributors and maintainers are 
-expected to perform.
-
-==== Testing Methodologies
-
-===== Test Driven Development
-
-Test Driven Development, colloquially known as TDD, describes a methodology for using tests to guide evolution of source
-code. For our purposes, we are only going to use a part of it, that is, before writing the fix - we create tests that 
-illustrate the bug by failing. We stop when we have written enough code to make the tests pass and submit the fix and 
-tests as a patch. It is not necessary to write the tests before the fix, but it is very easy to write a passing test 
-afterwards that may not actually verify that the fault is really fixed especially if the fault can be triggered via 
-multiple execution paths or varying input data.
-
-===== The RSpec Framework
-
-Logstash uses Rspec, a Ruby testing framework, to define and run the test suite. What follows is a summary of various 
-sources.
-
-. Rspec Example
-[source,ruby]
- 1 # encoding: utf-8
- 2 require "logstash/devutils/rspec/spec_helper"
- 3 require "logstash/plugin"
- 4
- 5 describe "outputs/riemann" do
- 6   describe "#register" do
- 7     let(:output) do
- 8       LogStash::Plugin.lookup("output", "riemann").new(configuration)
- 9     end
-10
-11     context "when no protocol is specified" do
-12       let(:configuration) { Hash.new }
-13
-14       it "the method completes without error" do
-15         expect {output.register}.not_to raise_error
-16       end
-17     end
-18
-19     context "when a bad protocol is specified" do
-20       let(:configuration) { {"protocol" => "fake"} }
-21
-22       it "the method fails with error" do
-23         expect {output.register}.to raise_error
-24       end
-25     end
-26
-27     context "when the tcp protocol is specified" do
-28       let(:configuration) { {"protocol" => "tcp"} }
-29
-30       it "the method completes without error" do
-31         expect {output.register}.not_to raise_error
-32       end
-33     end
-34   end
-35
-36   describe "#receive" do
-37     let(:output) do
-38       LogStash::Plugin.lookup("output", "riemann").new(configuration)
-39     end
-40
-41     context "when operating normally" do
-42       let(:configuration) { Hash.new }
-43       let(:event) do
-44         data = {"message"=>"hello", "@version"=>"1",
-45                 "@timestamp"=>"2015-06-03T23:34:54.076Z",
-46                 "host"=>"vagrant-ubuntu-trusty-64"}
-47         LogStash::Event.new(data)
-48       end
-49
-50       before(:example) do
-51         output.register
-52       end
-53
-54       it "should accept the event" do
-55         expect { output.receive event }.not_to raise_error
-56       end
-57     end
-58   end
-59 end
-
-.Describe blocks (lines 5, 6 and 36 in Example 1)
-[source,ruby]
-describe(string){block} -> nil
-describe(Class){block} -> nil
-
-With RSpec, we are always describing the plugin method behavior. The describe block is added in logical sections and can
-accept either an existing class name or a string. The string used in line 5 is the plugin name. Line 6 is the register 
-method, line 36 is the receive method. It is a RSpec convention to prefix instance methods with one hash and class 
-methods with one dot.
-
-.Context blocks (lines 11, 19, 27 and 41)
-[source,ruby]
-context(string){block} -> nil
-
-In RSpec, context blocks define sections that group tests by a variation.  The string should start with the word `when` 
-and then detail the variation. See line 11.  The tests in the content block should should only be for that variation.
-
-.Let blocks (lines 7, 12, 20, 28, 37, 42 and 43)
-[source,ruby]
-let(symbol){block} -> nil
-
-In RSpec, `let` blocks define resources for use in the test blocks. These resources are reinitialized for every test 
-block. They are available as method calls inside the test block. Define `let` blocks in `describe` and `context` blocks, 
-which scope the `let` block and any other nested blocks.
-You can use other `let` methods defined later within the `let` block body. See lines 7-9, which define the output resource 
-and use the configuration method, defined with different variations in lines 12, 20 and 28.
-
-.Before blocks (line 50)
-[source,ruby]
-before(symbol){block} -> nil - symbol is one of :suite, :context, :example, but :all and :each are synonyms for :suite and :example respectively.
-
-In RSpec, `before` blocks are used to further set up any resources that would have been initialized in a `let` block.
-You cannot define `let` blocks inside `before` blocks.
-
-You can also define `after` blocks, which are typically used to clean up any setup activity performed by a `before` block.
-
-.It blocks (lines 14, 22, 30 and 54)
-[source,ruby]
-it(string){block} -> nil
-
-In RSpec, `it` blocks set the expectations that verify the behavior of the tested code. The string should not start with 
-'it' or 'should', but needs to express the outcome of the expectation.  When put together the texts from the enclosing 
-describe, `context` and `it` blocks should form a fairly readable sentence, as in lines 5, 6, 11 and 14:
-
-[source,ruby]
-outputs/riemann 
-#register when no protocol is specified the method completes without error
-
-Readable code like this make the goals of tests easy to understand.
-
-.Expect method (lines 15, 23, 31, 55)
-[source,ruby]
-expect(object){block} -> nil
-
-In RSpec, the expect method verifies a statement that compares an actual result to an expected result. The `expect` method 
-is usually paired with a call to the `to` or `not_to` methods. Use the block form when expecting errors or observing for 
-changes. The `to` or `not_to` methods require a `matcher` object that encapsulates the expected value. The argument form 
-of the `expect` method encapsulates the actual value. When put together the whole line tests the actual against the 
-expected value.
-
-.Matcher methods (lines 15, 23, 31, 55)
-[source,ruby]
-raise_error(error class|nil) -> matcher instance
-be(object) -> matcher instance
-eq(object) -> matcher instance
-eql(object) -> matcher instance
-  for more see http://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-
-In RSpec, a matcher is an object generated by the equivalent method call (be, eq) that will be used to evaluate the 
-expected against the actual values.
-
-==== Putting it all together
-
-This example fixes an https://github.com/logstash-plugins/logstash-output-zeromq/issues/9[issue] in the ZeroMQ output 
-plugin. The issue does not require knowledge of ZeroMQ.
-
-The activities in this example have the following prerequisites:
-
---
-* A minimal knowledge of Git and Github. See the https://help.github.com/categories/bootcamp/[Github boot camp].
-* A text editor.
-* A JRuby https://www.ruby-lang.org/en/documentation/installation/#managers[runtime] 
-https://howistart.org/posts/ruby/1[environment]. The `chruby` tool manages Ruby versions.
-* JRuby 1.7.22 or later.
-* The `bundler` and `rake` gems installed. 
-* ZeroMQ http://zeromq.org/intro:get-the-software[installed].
---
-
-. In Github, fork the ZeroMQ https://github.com/logstash-plugins/logstash-output-zeromq[output plugin repository].
-
-. On your local machine, https://help.github.com/articles/fork-a-repo/[clone] the fork to a known folder such as
-`logstash/`.
-
-. Open the following files in a text editor:
-  * `logstash-output-zeromq/lib/logstash/outputs/zeromq.rb`
-  * `logstash-output-zeromq/lib/logstash/util/zeromq.rb`
-  * `logstash-output-zeromq/spec/outputs/zeromq_spec.rb`
-
-. According to the issue, log output in server mode must indicate `bound`. Furthermore, the test file contains no tests.
-+
-NOTE: Line 21 of `util/zeromq.rb` reads `@logger.info("0mq: #{server? ? 'connected' : 'bound'}", :address => address)`
-
-. In the text editor, set the file encoding and require `zeromq.rb` for the file `zeromq_spec.rb` by adding the following 
-lines:
-+
-[source,ruby]
-# encoding: utf-8
-require "logstash/outputs/zeromq"
-require "logstash/devutils/rspec/spec_helper"
-
-. The desired error message should read:
-+
-[source,ruby]
-LogStash::Outputs::ZeroMQ when in server mode a 'bound' info line is logged 
-+
-To properly generate this message, add a `describe` block with the fully qualified class name as the argument, a context 
-block, and an `it` block.
-+
-[source,ruby]
-describe LogStash::Outputs::ZeroMQ do
-  context "when in server mode" do
-    it "a 'bound' info line is logged" do
-    end
-  end
-end
-
-. To add the missing test, use an instance of the ZeroMQ output and a substitute logger. This example uses an RSpec feature 
-called _test doubles_ as the substitute logger.
-+
-Add the following lines to `zeromq_spec.rb`, after `describe LogStash::Outputs::ZeroMQ do` and before `context "when in 
-server mode" do`:
-[source,ruby]
-  let(:output) { described_class.new("mode" => "server", "topology" => "pushpull" }
-  let(:tracer) { double("logger") }
-
-. Add the body to the `it` block. Add the following five lines after the line `context "when in server mode" do`: 
-[source,ruby]
-      allow(tracer).to receive(:debug)<1>
-      output.logger = logger<2>
-      expect(tracer).to receive(:info).with("0mq: bound", {:address=>"tcp://127.0.0.1:2120"})<3>
-      output.register<4>
-      output.do_close<5>
-
-<1> Allow the double to receive `debug` method calls.
-<2> Make the output use the test double.
-<3> Set an expectation on the test to receive an `info` method call.
-<4> Call `register` on the output.
-<5> Call `do_close` on the output so the test does not hang.
-
-At the end of the modifications, the relevant code section reads:
-
-[source,ruby]
---------
-# encoding: utf-8
-require "logstash/outputs/zeromq"
-require "logstash/devutils/rspec/spec_helper"
-
-describe LogStash::Outputs::ZeroMQ do
-  let(:output) { described_class.new("mode" => "server", "topology" => "pushpull") }
-  let(:tracer) { double("logger") }
-
-  context "when in server mode" do
-    it "a ‘bound’ info line is logged" do
-      allow(tracer).to receive(:debug)
-      output.logger = tracer
-      expect(tracer).to receive(:info).with("0mq: bound", {:address=>"tcp://127.0.0.1:2120"})
-      output.register
-      output.do_close
-    end
-  end
-end
---------
-
-To run this test:
-
-. Open a terminal window
-. Navigate to the cloned plugin folder
-. The first time you run the test, run the command `bundle install`
-. Run the command `bundle exec rspec`
-
-Assuming all prerequisites were installed correctly, the test fails with output similar to:
-
-[source,shell]
---------
-Using Accessor#strict_set for specs
-Run options: exclude {:redis=>true, :socket=>true, :performance=>true, :couchdb=>true, :elasticsearch=>true, 
-:elasticsearch_secure=>true, :export_cypher=>true, :integration=>true, :windows=>true}
-
-LogStash::Outputs::ZeroMQ
-  when in server mode
-    a ‘bound’ info line is logged (FAILED - 1)
-
-Failures:
-
-  1) LogStash::Outputs::ZeroMQ when in server mode a ‘bound’ info line is logged
-     Failure/Error: output.register
-       Double "logger" received :info with unexpected arguments
-         expected: ("0mq: bound", {:address=>"tcp://127.0.0.1:2120"})
-              got: ("0mq: connected", {:address=>"tcp://127.0.0.1:2120"})
-     # ./lib/logstash/util/zeromq.rb:21:in `setup'
-     # ./lib/logstash/outputs/zeromq.rb:92:in `register'
-     # ./lib/logstash/outputs/zeromq.rb:91:in `register'
-     # ./spec/outputs/zeromq_spec.rb:13:in `(root)'
-     # /Users/guy/.gem/jruby/1.9.3/gems/rspec-wait-0.0.7/lib/rspec/wait.rb:46:in `(root)'
-
-Finished in 0.133 seconds (files took 1.28 seconds to load)
-1 example, 1 failure
-
-Failed examples:
-
-rspec ./spec/outputs/zeromq_spec.rb:10 # LogStash::Outputs::ZeroMQ when in server mode a ‘bound’ info line is logged
-
-Randomized with seed 2568
---------
-
-To correct the error, open the `util/zeromq.rb` file in your text editor and swap the positions of the words `connected` 
-and `bound` on line 21. Line 21 now reads:
-
-[source,ruby]
-@logger.info("0mq: #{server? ? 'bound' : 'connected'}", :address => address)
-
-Run the test again with the `bundle exec rspec` command.
-
-The test passes with output similar to:
-
-[source,shell]
---------
-Using Accessor#strict_set for specs
-Run options: exclude {:redis=>true, :socket=>true, :performance=>true, :couchdb=>true, :elasticsearch=>true, :elasticsearch_secure=>true, :export_cypher=>true, :integration=>true, :windows=>true}
-
-LogStash::Outputs::ZeroMQ
-  when in server mode
-    a ‘bound’ info line is logged
-
-Finished in 0.114 seconds (files took 1.22 seconds to load)
-1 example, 0 failures
-
-Randomized with seed 45887
---------
-
-https://help.github.com/articles/fork-a-repo/#next-steps[Commit] the changes to git and Github.
-
-Your pull request is visible from the https://github.com/logstash-plugins/logstash-output-zeromq/pulls[Pull Requests] 
-section of the original Github repository. The plugin maintainers review your work, suggest changes if necessary, and
-merge and publish a new version of the plugin.
diff --git a/docs/static/contributing-to-logstash.asciidoc b/docs/static/contributing-to-logstash.asciidoc
deleted file mode 100644
index 5c7206201..000000000
--- a/docs/static/contributing-to-logstash.asciidoc
+++ /dev/null
@@ -1,51 +0,0 @@
-[[contributing-to-logstash]]
-== Contributing to Logstash
-
-Before version 1.5, Logstash included all plugins in each release.  This made it
-easy to make use of any plugin, but it complicated plugin development--a new
-release of Logstash became necessary if a plugin needed patching.  Since version
-1.5, all plugins are independent of the Logstash core. Now you can add your own
-input, codec, filter, or output plugins to Logstash much more easily!
-
-[float]
-=== Adding plugins
-
-Since plugins can now be developed and deployed independently of the Logstash
-core, there are documents which guide you through the process of coding and
-deploying your own plugins:
-
-* <<plugin-generator,Generating a New Plugin>>
-* http://www.elasticsearch.org/guide/en/logstash/current/_how_to_write_a_logstash_input_plugin.html[How to write a Logstash input plugin]
-* http://www.elasticsearch.org/guide/en/logstash/current/_how_to_write_a_logstash_codec_plugin.html[How to write a Logstash codec plugin]
-* http://www.elasticsearch.org/guide/en/logstash/current/_how_to_write_a_logstash_filter_plugin.html[How to write a Logstash filter plugin]
-* http://www.elasticsearch.org/guide/en/logstash/current/_how_to_write_a_logstash_output_plugin.html[How to write a Logstash output plugin]
-* <<contributing-patch-plugin,Contributing a Patch to a Logstash Plugin>>
-* <<community-maintainer,Community Maintainer's Guide>>
-* <<submitting-plugin,Submitting a Plugin>>
-
-[float]
-==== Plugin Shutdown APIs
-
-Starting in Logstash 2.0, we changed how input plugins shut down to increase shutdown reliability. There are three methods
-for plugin shutdown: `stop`, `stop?`, and `close`.
-
-* Call the `stop` method from outside the plugin thread. This method signals the plugin to stop.
-* The `stop?` method returns `true` when the `stop` method has already been called for that plugin.
-* The `close` method performs final bookkeeping and cleanup after the plugin's `run` method and the plugin's thread both
-exit. The `close` method is a a new name for the method known as `teardown` in previous versions of Logstash.
-
-The `shutdown`, `finished`, `finished?`, `running?`, and `terminating?` methods are redundant and no longer present in the
-Plugin Base class.
-
-Sample code for the plugin shutdown APIs is https://github.com/logstash-plugins/logstash-input-example/blob/master/lib/logstash/inputs/example.rb[available].
-
-[float]
-=== Extending Logstash core
-
-We also welcome contributions and bug fixes to the Logstash core feature set.
-
-Please read through our
-https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md[contribution]
-guide, and the Logstash
-https://github.com/elastic/logstash/blob/master/README.md[readme]
-document.
diff --git a/docs/static/dead-letter-queues.asciidoc b/docs/static/dead-letter-queues.asciidoc
deleted file mode 100644
index 5b63cd7c5..000000000
--- a/docs/static/dead-letter-queues.asciidoc
+++ /dev/null
@@ -1,220 +0,0 @@
-[[dead-letter-queues]]
-=== Dead Letter Queues
-
-NOTE: The dead letter queue feature is currently supported for the
-<<plugins-outputs-elasticsearch>> output only. Additionally, The dead
-letter queue is only used where the response code is either 400
-or 404, both of which indicate an event that cannot be retried.   
-Support for additional outputs will be available in future releases of the 
-Logstash plugins. Before configuring Logstash to use this feature, refer to
-the output plugin documentation to verify that the plugin supports the dead
-letter queue feature.
-
-By default, when Logstash encounters an event that it cannot process because the
-data contains a mapping error or some other issue, the Logstash pipeline 
-either hangs or drops the unsuccessful event. In order to protect against data
-loss in this situation, you can <<configuring-dlq,configure Logstash>> to write
-unsuccessful events to a dead letter queue instead of dropping them. 
-
-Each event written to the dead letter queue includes the original event, along
-with metadata that describes the reason the event could not be processed,
-information about the plugin that wrote the event, and the timestamp for when
-the event entered the dead letter queue.
-
-To process events in the dead letter queue, you simply create a Logstash
-pipeline configuration that uses the
-<<plugins-inputs-dead_letter_queue,`dead_letter_queue` input plugin>> to read
-from the queue. 
-
-image::static/images/dead_letter_queue.png[Diagram showing pipeline reading from the dead letter queue]
-
-See <<processing-dlq-events>> for more information.
-
-[[configuring-dlq]]
-==== Configuring Logstash to Use Dead Letter Queues
-
-Dead letter queues are disabled by default. To enable dead letter queues, set
-the `dead_letter_queue_enable` option in the `logstash.yml`
-<<logstash-settings-file,settings file>>: 
-
-[source,yaml]
--------------------------------------------------------------------------------
-dead_letter_queue.enable: true
--------------------------------------------------------------------------------
-
-Dead letter queues are stored as files in the local directory of the Logstash
-instance. By default, the dead letter queue files are stored in
-`path.data/dead_letter_queue`. Each pipeline has a separate queue. For example,
-the dead letter queue for the `main` pipeline is stored in
-`LOGSTASH_HOME/data/dead_letter_queue/main` by default. The queue files are
-numbered sequentially: `1.log`, `2.log`, and so on.
-
-You can set `path.dead_letter_queue` in the `logstash.yml` file to
-specify a different path for the files:
-
-[source,yaml]
--------------------------------------------------------------------------------
-path.dead_letter_queue: "path/to/data/dead_letter_queue"
--------------------------------------------------------------------------------
-
-
-NOTE: You may not use the same `dead_letter_queue` path for two different
-Logstash instances.
-
-===== File Rotation
-
-Dead letter queues have a built-in file rotation policy that manages the file
-size of the queue. When the file size reaches a preconfigured threshold, a new
-file is created automatically.
-
-By default, the maximum size of each dead letter queue is set to 1024mb. To
-change this setting, use the `dead_letter_queue.max_bytes` option.  Entries
-will be dropped if they would increase the size of the dead letter queue beyond
-this setting. 
-
-[[processing-dlq-events]]
-==== Processing Events in the Dead Letter Queue
-
-When you are ready to process events in the dead letter queue, you create a
-pipeline that uses the
-<<plugins-inputs-dead_letter_queue,`dead_letter_queue` input plugin>> to read
-from the dead letter queue. The pipeline configuration that you use depends, of
-course, on what you need to do. For example, if the dead letter queue contains
-events that resulted from a mapping error in Elasticsearch, you can create a
-pipeline that reads the "dead" events, removes the field that caused the mapping
-issue, and re-indexes the clean events into Elasticsearch. 
-
-The following example shows a simple pipeline that reads events from the dead
-letter queue and writes the events, including metadata, to standard output: 
-
-[source,yaml]
---------------------------------------------------------------------------------
-input {
-  dead_letter_queue {
-    path => "/path/to/data/dead_letter_queue" <1>
-    commit_offsets => true <2>
-    pipeline_id => "main" <3>
-  }
-}
-
-output {
-  stdout {
-    codec => rubydebug { metadata => true }
-  }
-}
---------------------------------------------------------------------------------
-
-<1> The path to the top-level directory containing the dead letter queue. This
-directory contains a separate folder for each pipeline that writes to the dead
-letter queue. To find the path to this directory, look at the `logstash.yml`
-<<logstash-settings-file,settings file>>. By default, Logstash creates the
-`dead_letter_queue` directory under the location used for persistent
-storage (`path.data`), for example, `LOGSTASH_HOME/data/dead_letter_queue`.
-However, if `path.dead_letter_queue` is set, it uses that location instead.
-<2> When `true`, saves the offset. When the pipeline restarts, it will continue
-reading from the position where it left off rather than reprocessing all the
-items in the queue. You can set `commit_offsets` to `false` when you are
-exploring events in the dead letter queue and want to iterate over the events
-multiple times. 
-<3> The ID of the pipeline that's writing to the dead letter queue. The default
-is `"main"`.
-
-For another example, see <<dlq-example>>.
-
-When the pipeline has finished processing all the events in the dead letter
-queue, it will continue to run and process new events as they stream into the
-queue. This means that you do not need to stop your production system to handle
-events in the dead letter queue. 
-
-NOTE: Events emitted from the
-<<plugins-inputs-dead_letter_queue,`dead_letter_queue` input plugin>> plugin
-will not be resubmitted to the dead letter queue if they cannot be processed
-correctly.
-
-[[dlq-timestamp]]
-==== Reading From a Timestamp
-
-When you read from the dead letter queue, you might not want to process all the
-events in the queue, especially if there are a lot of old events in the queue.
-You can start processing events at a specific point in the queue by using the
-`start_timestamp` option. This option configures the pipeline to start
-processing events based on the timestamp of when they entered the queue:
-
-[source,yaml]
---------------------------------------------------------------------------------
-input {
-  dead_letter_queue {
-    path => "/path/to/data/dead_letter_queue" 
-    start_timestamp => 2017-06-06T23:40:37
-    pipeline_id => "main"
-  }
-}
---------------------------------------------------------------------------------
-
-For this example, the pipeline starts reading all events that were delivered to
-the dead letter queue on or after June 6, 2017, at 23:40:37. 
-
-[[dlq-example]]
-==== Example: Processing Data That Has Mapping Errors
-
-In this example, the user attempts to index a document that includes geo_ip data,
-but the data cannot be processed because it contains a mapping error:
-
-[source,json]
---------------------------------------------------------------------------------
-{"geoip":{"location":"home"}}
---------------------------------------------------------------------------------
-
-Indexing fails because the Logstash output plugin expects a `geo_point` object in
-the `location` field, but the value is a string. The failed event is written to
-the dead letter queue, along with metadata about the error that caused the
-failure:
-
-[source,json]
---------------------------------------------------------------------------------
-{
-   "@metadata" => {
-    "dead_letter_queue" => {
-       "entry_time" => #<Java::OrgLogstash::Timestamp:0x5b5dacd5>,
-        "plugin_id" => "fb80f1925088497215b8d037e622dec5819b503e-4",
-      "plugin_type" => "elasticsearch",
-           "reason" => "Could not index event to Elasticsearch. status: 400, action: [\"index\", {:_id=>nil, :_index=>\"logstash-2017.06.22\", :_type=>\"doc\", :_routing=>nil}, 2017-06-22T01:29:29.804Z My-MacBook-Pro-2.local {\"geoip\":{\"location\":\"home\"}}], response: {\"index\"=>{\"_index\"=>\"logstash-2017.06.22\", \"_type\"=>\"doc\", \"_id\"=>\"AVzNayPze1iR9yDdI2MD\", \"status\"=>400, \"error\"=>{\"type\"=>\"mapper_parsing_exception\", \"reason\"=>\"failed to parse\", \"caused_by\"=>{\"type\"=>\"illegal_argument_exception\", \"reason\"=>\"illegal latitude value [266.30859375] for geoip.location\"}}}}"
-    }
-  },
-  "@timestamp" => 2017-06-22T01:29:29.804Z,
-    "@version" => "1",
-       "geoip" => {
-    "location" => "home"
-  },
-        "host" => "My-MacBook-Pro-2.local",
-     "message" => "{\"geoip\":{\"location\":\"home\"}}"
-}
---------------------------------------------------------------------------------
-
-To process the failed event, you create the following pipeline that reads from
-the dead letter queue and removes the mapping problem:
-
-[source,json]
---------------------------------------------------------------------------------
-input { 
-  dead_letter_queue { 
-    path => "/path/to/data/dead_letter_queue/" <1>
-  } 
-} 
-filter {
-  mutate { 
-    remove_field => "[geoip][location]" <2>
-  } 
-} 
-output { 
-  elasticsearch{
-    hosts => [ "localhost:9200" ] <3>
-  } 
-}
---------------------------------------------------------------------------------
-
-<1> The <<plugins-inputs-dead_letter_queue,`dead_letter_queue` input>> reads from the dead letter queue.
-<2> The `mutate` filter removes the problem field called `location`.
-<3> The clean event is sent to Elasticsearch, where it can be indexed because
-the mapping issue is resolved.
-
diff --git a/docs/static/deploying.asciidoc b/docs/static/deploying.asciidoc
deleted file mode 100644
index 8813bd3c8..000000000
--- a/docs/static/deploying.asciidoc
+++ /dev/null
@@ -1,254 +0,0 @@
-[[deploying-and-scaling]]
-== Deploying and Scaling Logstash
-
-The Elastic Stack is used for tons of use cases, from operational log and
-metrics analytics, to enterprise and application search. Making sure your data
-gets scalably, durably, and securely transported to Elasticsearch is extremely
-important, especially for mission critical environments.
-
-The goal of this document is to highlight the most common architecture patterns
-for Logstash and how to effectively scale as your deployment grows. The focus
-will be around the operational log, metrics, and security analytics use cases
-because they tend to require larger scale deployments. The deploying and scaling
-recommendations provided here may vary based on your own requirements.
-
-[float]
-[[deploying-getting-started]]
-=== Getting Started
-
-For first time users, if you simply want to tail a log file to grasp the power
-of the Elastic Stack, we recommend trying
-{filebeat-ref}/filebeat-modules-overview.html[Filebeat Modules]. Filebeat Modules
-enable you to quickly collect, parse, and index popular log types and view
-pre-built Kibana dashboards within minutes.
-{metricbeat-ref}/metricbeat-modules.html[Metricbeat Modules] provide a similar
-experience, but with metrics data. In this context, Beats will ship data
-directly to Elasticsearch where {ref}/ingest.html[Ingest Nodes] will process
-and index your data.
-
-image::static/images/deploy1.png[]
-
-[float]
-==== Introducing Logstash
-What are the main benefits for integrating Logstash into your architecture?
-
-* Scale through ingestion spikes - Logstash has an adaptive disk-based
-buffering system that will absorb incoming throughput, therefore mitigating
-backpressure
-* Ingest from other data sources like databases, S3, or messaging queues
-* Emit data to multiple destinations like S3, HDFS, or write to a file
-* Compose more sophisticated processing pipelines with conditional dataflow logic
-
-[float]
-[[scaling-ingest]]
-=== Scaling Ingest
-
-Beats and Logstash make ingest awesome. Together, they provide a comprehensive
-solution that is scalable and resilient. What can you expect?
-
-* Horizontal scalability, high availability, and variable load handling
-* Message durability with at-least-once delivery guarantees
-* End-to-end secure transport with authentication and wire encryption
-
-[float]
-==== Beats and Logstash
-
-Beats run across thousands of edge host servers, collecting, tailing, and
-shipping logs to Logstash. Logstash serves as the centralized streaming
-engine for data unification and enrichment. The
-<<plugins-inputs-beats,Beats input plugin>> exposes a secure,
-acknowledgement-based endpoint for Beats to send data to Logstash.
-
-image::static/images/deploy2.png[]
-
-NOTE: Enabling persistent queues is strongly recommended, and these
-architecture characteristics assume that they are enabled. We encourage you to
-review the <<persistent-queues>> documentation for feature benefits and more
-details on resiliency.
-
-[float]
-==== Scalability
-
-Logstash is horizontally scalable and can form groups of nodes running the same
-pipeline. Logstash’s adaptive buffering capabilities will facilitate smooth
-streaming even through variable throughput loads. If the Logstash layer becomes
-an ingestion bottleneck, simply add more nodes to scale out. Here are a few
-general recommendations:
-
-* Beats should {filebeat-ref}/load-balancing.html[load balance] across a group of
-Logstash nodes.
-* A minimum of two Logstash nodes are recommended for high availability.
-* It’s common to deploy just one Beats input per Logstash node, but multiple
-Beats inputs can also be deployed per Logstash node to expose independent
-endpoints for different data sources.
-
-[float]
-==== Resiliency
-
-When using https://www.elastic.co/products/beats/filebeat[Filebeat] or
-https://www.elastic.co/products/beats/winlogbeat[Winlogbeat] for log collection
-within this ingest flow, *at-least-once delivery* is guaranteed. Both the
-communication protocols, from Filebeat or Winlogbeat to Logstash, and from
-Logstash to Elasticsearch, are synchronous and support acknowledgements. The
-other Beats don’t yet have support for acknowledgements.
-
-Logstash persistent queues provide protection across node failures. For
-disk-level resiliency in Logstash, it’s important to ensure disk redundancy.
-For on-premise deployments, it's recommended that you configure RAID. When
-running in the cloud or a containerized environment, it’s recommended that you
-use persistent disks with replication strategies that reflect your data SLAs.
-
-NOTE: Make sure `queue.checkpoint.writes: 1` is set for at-least-once
-guarantees. For more details, see the
-<<durability-persistent-queues,persistent queue durability>> documentation.
-
-[float]
-==== Processing
-
-Logstash will commonly extract fields with <<plugins-filters-grok,grok>> or
-<<plugins-filters-dissect,dissect>>, augment
-<<plugins-filters-geoip,geographical>> info, and can further enrich events with
-<<plugins-filters-translate,file>>, <<plugins-filters-jdbc_streaming,database>>,
-or <<plugins-filters-elasticsearch,Elasticsearch>> lookup datasets. Be aware
-that processing complexity can affect overall throughput and CPU utilization.
-Make sure to check out the other <<filter-plugins,available filter plugins>>.
-
-[float]
-==== Secure Transport
-
-Enterprise-grade security is available across the entire delivery chain.
-
-* Wire encryption is recommended for both the transport from
-{filebeat-ref}/configuring-ssl-logstash.html[Beats to Logstash] and from
-{logstash-ref}/ls-security.html[Logstash to Elasticsearch].
-* There’s a wealth of security options when communicating with Elasticsearch
-including basic authentication, TLS, PKI, LDAP, AD, and other custom realms.
-To enable Elasticsearch security, see 
-{stack-ov}/elasticsearch-security.html[Securing the {stack}].
-
-[float]
-==== Monitoring
-
-When running Logstash 5.2 or greater,
-the https://www.elastic.co/products/x-pack/monitoring[Monitoring UI] provides
-deep visibility into your deployment metrics, helping observe performance and
-alleviate bottlenecks as you scale. Monitoring is an X-Pack feature under the
-Basic License and is therefore *free to use*. To get started, see
-{logstash-ref}/monitoring-logstash.html[Monitoring Logstash].
-
-If external monitoring is preferred, there are <<monitoring,Monitoring APIs>>
-that return point-in-time metrics snapshots.
-
-[float]
-[[adding-other-sources]]
-=== Adding Other Popular Sources
-
-Users may have other mechanisms of collecting logging data, and it’s easy to
-integrate and centralize them into the Elastic Stack. Let’s walk through a few
-scenarios:
-
-image::static/images/deploy3.png[]
-
-[float]
-==== TCP, UDP, and HTTP Protocols
-
-The TCP, UDP, and HTTP protocols are common ways to feed data into Logstash.
-Logstash can expose endpoint listeners with the respective
-<<plugins-inputs-tcp,TCP>>, <<plugins-inputs-udp,UDP>>, and
-<<plugins-inputs-http,HTTP>> input plugins. The data sources enumerated below
-are typically ingested through one of these three protocols.
-
-NOTE: The TCP protocol does not support application-level acknowledgements, so
-connectivity issues may result in data loss.
-
-For high availability scenarios, a third-party hardware or software load
-balancer, like HAProxy, should be added to fan out traffic to a group of
-Logstash nodes.
-
-[float]
-==== Network and Security Data
-
-Although Beats may already satisfy your data ingest use case, network and
-security datasets come in a variety of forms. Let’s touch on a few other
-ingestion points.
-
-* Network wire data - collect and analyze network traffic with
-https://www.elastic.co/products/beats/packetbeat[Packetbeat].
-* Netflow v5/v9/v10 - Logstash understands data from Netflow/IPFIX exporters
-with the <<plugins-codecs-netflow,Netflow codec>>.
-* Nmap - Logstash accepts and parses Nmap XML data with the
-<<plugins-codecs-nmap,Nmap codec>>.
-* SNMP trap - Logstash has a native <<plugins-inputs-snmptrap,SNMP trap input>>.
-* CEF - Logstash accepts and parses CEF data from systems like Arcsight
-SmartConnectors with the <<plugins-codecs-cef,CEF codec>>. See this
-https://www.elastic.co/blog/integrating-elastic-stack-with-arcsight-siem-part-1[blog series]
-for more details.
-
-[float]
-==== Centralized Syslog Servers
-
-Existing syslog server technologies like rsyslog and syslog-ng generally send
-syslog over to Logstash TCP or UDP endpoints for extraction, processing, and
-persistence. If the data format conforms to RFC3164, it can be fed directly
-to the <<plugins-inputs-syslog,Logstash syslog input>>.
-
-[float]
-==== Infrastructure & Application Data and IoT
-
-Infrastructure and application metrics can be collected with
-https://www.elastic.co/products/beats/metricbeat[Metricbeat], but applications
-can also send webhooks to a Logstash HTTP input or have metrics polled from an
-HTTP endpoint with the <<plugins-inputs-http_poller,HTTP poller input plugin>>.
-
-For applications that log with log4j2, it’s recommended to use the
-SocketAppender to send JSON to the Logstash TCP input. Alternatively, log4j2
-can also log to a file for collection with FIlebeat. Usage of the log4j1
-SocketAppender is not recommended.
-
-IoT devices like Raspberry Pis, smartphones, and connected vehicles often send
-telemetry data through one of these protocols.
-
-[float]
-[[integrating-with-messaging-queues]]
-=== Integrating with Messaging Queues
-
-If you are leveraging message queuing technologies as part of your existing
-infrastructure, getting that data into the Elastic Stack is easy. For existing
-users who are utilizing an external queuing layer like Redis or RabbitMQ just
-for data buffering with Logstash, it’s recommended to use Logstash persistent
-queues instead of an external queuing layer. This will help with overall ease
-of management by removing an unnecessary layer of complexity in your ingest
-architecture.
-
-For users who want to integrate data from existing Kafka deployments or require
-the underlying usage of ephemeral storage, Kafka can serve as a data hub where
-Beats can persist to and Logstash nodes can consume from.
-
-image::static/images/deploy4.png[]
-
-The other TCP, UDP, and HTTP sources can persist to Kafka with Logstash as a
-conduit to achieve high availability in lieu of a load balancer. A group of
-Logstash nodes can then consume from topics with the
-<<plugins-inputs-kafka,Kafka input>> to further transform and enrich the data in
-transit.
-
-[float]
-==== Resiliency and Recovery
-
-When Logstash consumes from Kafka, persistent queues should be enabled and will
-add transport resiliency to mitigate the need for reprocessing during Logstash
-node failures. In this context, it’s recommended to use the default persistent
-queue disk allocation size `queue.max_bytes: 1GB`.
-
-If Kafka is configured to retain data for an extended period of time, data can
-be reprocessed from Kafka in the case of disaster recovery and reconciliation.
-
-[float]
-==== Other Messaging Queue Integrations
-
-Although an additional queuing layer is not required, Logstash can consume from
-a myriad of other message queuing technologies like
-<<plugins-inputs-rabbitmq,RabbitMQ>> and <<plugins-inputs-redis,Redis>>. It also
-supports ingestion from hosted queuing services like
-<<plugins-inputs-google_pubsub,Pub/Sub>>, <<plugins-inputs-kinesis,Kinesis>>, and
-<<plugins-inputs-sqs,SQS>>.
diff --git a/docs/static/docker.asciidoc b/docs/static/docker.asciidoc
deleted file mode 100644
index e0f76d114..000000000
--- a/docs/static/docker.asciidoc
+++ /dev/null
@@ -1,190 +0,0 @@
-[[docker]]
-=== Running Logstash on Docker
-Docker images for Logstash are available from the Elastic Docker
-registry. The base image is https://hub.docker.com/_/centos/[centos:7].
-
-A list of all published Docker images and tags is available at
-https://www.docker.elastic.co[www.docker.elastic.co]. The source code is in
-https://github.com/elastic/logstash-docker/tree/{branch}[GitHub].
-
-These images are free to use under the Elastic license. They contain open source 
-and free commercial features and access to paid commercial features.  
-{xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the 
-paid commercial features. See the 
-https://www.elastic.co/subscriptions[Subscriptions] page for information about 
-Elastic license levels.
-
-==== Pulling the image
-
-Obtaining Logstash for Docker is as simple as issuing a +docker
-pull+ command against the Elastic Docker registry.
-
-ifeval::["{release-state}"=="unreleased"]
-
-However, version {logstash_version} of Logstash has not yet been
-released, so no Docker image is currently available for this version.
-
-endif::[]
-
-ifeval::["{release-state}"!="unreleased"]
-
-["source","sh",subs="attributes"]
---------------------------------------------
-docker pull {docker-image}
---------------------------------------------
-
-Alternatively, you can download other Docker images that contain only features
-available under the Apache 2.0 license. To download the images, go to 
-https://www.docker.elastic.co[www.docker.elastic.co]. 
-
-endif::[]
-
-[[docker-config]]
-=== Configuring Logstash for Docker
-
-Logstash differentiates between two types of configuration:
-<<config-setting-files,Settings and Pipeline Configuration>>.
-
-==== Pipeline Configuration
-
-It is essential to place your pipeline configuration where it can be
-found by Logstash. By default, the container will look in
-+/usr/share/logstash/pipeline/+ for pipeline configuration files.
-
-In this example we use a bind-mounted volume to provide the
-configuration via the +docker run+ command:
-
-["source","sh",subs="attributes"]
---------------------------------------------
-docker run --rm -it -v ~/pipeline/:/usr/share/logstash/pipeline/ {docker-image}
---------------------------------------------
-
-Every file in the host directory +~/pipeline/+ will then be parsed
-by Logstash as pipeline configuration.
-
-If you don't provide configuration to Logstash, it will run with a
-minimal config that listens for messages from the
-<<plugins-inputs-beats,Beats input plugin>> and echoes any that are
-received to `stdout`. In this case, the startup logs will be similar
-to the following:
-
-["source","text"]
---------------------------------------------
-Sending Logstash logs to /usr/share/logstash/logs which is now configured via log4j2.properties.
-[2016-10-26T05:11:34,992][INFO ][logstash.inputs.beats    ] Beats inputs: Starting input listener {:address=>"0.0.0.0:5044"}
-[2016-10-26T05:11:35,068][INFO ][logstash.pipeline        ] Starting pipeline {"id"=>"main", "pipeline.workers"=>4, "pipeline.batch.size"=>125, "pipeline.batch.delay"=>5, "pipeline.max_inflight"=>500}
-[2016-10-26T05:11:35,078][INFO ][org.logstash.beats.Server] Starting server on port: 5044
-[2016-10-26T05:11:35,078][INFO ][logstash.pipeline        ] Pipeline main started
-[2016-10-26T05:11:35,105][INFO ][logstash.agent           ] Successfully started Logstash API endpoint {:port=>9600}
---------------------------------------------
-
-This is the default configuration for the image, defined in
-+/usr/share/logstash/pipeline/logstash.conf+.  If this is the
-behaviour that you are observing, ensure that your pipeline
-configuration is being picked up correctly, and that you are replacing
-either +logstash.conf+ or the entire +pipeline+ directory.
-
-==== Settings
-
-The image provides several methods for configuring settings. The conventional
-approach is to provide a custom `logstash.yml` file, but it's
-also possible to use environment variables to define settings.
-
-[[docker-bind-mount-settings]]
-===== Bind-mounted settings files
-
-Settings files can also be provided through bind-mounts. Logstash
-expects to find them at +/usr/share/logstash/config/+.
-
-It's possible to provide an entire directory containing all needed
-files:
-
-["source","sh",subs="attributes"]
---------------------------------------------
-docker run --rm -it -v ~/settings/:/usr/share/logstash/config/ {docker-image}
---------------------------------------------
-
-Alternatively, a single file can be mounted:
-
-["source","sh",subs="attributes"]
---------------------------------------------
-docker run --rm -it -v ~/settings/logstash.yml:/usr/share/logstash/config/logstash.yml {docker-image}
---------------------------------------------
-
-NOTE: Bind-mounted configuration files will retain the same permissions and
-ownership within the container that they have on the host system. Be sure
-to set permissions such that the files will be readable and, ideally, not
-writeable by the container's +logstash+ user (UID 1000).
-
-===== Custom Images
-
-Bind-mounted configuration is not the only option, naturally. If you
-prefer the _Immutable Infrastructure_ approach, you can prepare a
-custom image containing your configuration by using a +Dockerfile+
-like this one:
-
-["source","dockerfile",subs="attributes"]
---------------------------------------------
-FROM {docker-image}
-RUN rm -f /usr/share/logstash/pipeline/logstash.conf
-ADD pipeline/ /usr/share/logstash/pipeline/
-ADD config/ /usr/share/logstash/config/
---------------------------------------------
-
-Be sure to replace or delete `logstash.conf` in your custom image, so
-that you don't retain the example config from the base image.
-
-[[docker-env-config]]
-===== Environment variable configuration
-
-Under Docker, Logstash settings can be configured via environment
-variables. When the container starts, a helper process checks the environment
-for variables that can be mapped to Logstash settings. Settings that are found
-in the environment are merged into `logstash.yml` as the container starts up.
-
-For compatibility with container orchestration systems, these environment
-variables are written in all capitals, with underscores as word
-separators
-
-Some example translations are shown here:
-
-.Example Docker Environment Variables
-[horizontal]
-**Environment Variable**:: **Logstash Setting**
-`PIPELINE_WORKERS`:: `pipeline.workers`
-`LOG_LEVEL`:: `log.level`
-`XPACK_MONITORING_ENABLED`:: `xpack.monitoring.enabled`
-
-In general, any setting listed in the <<logstash-settings-file, settings
-documentation>> can be configured with this technique.
-
-NOTE: Defining settings with environment variables causes `logstash.yml` to
-be modified in place. This behaviour is likely undesirable if `logstash.yml` was
-bind-mounted from the host system. Thus, it is not recommended to
-combine the bind-mount technique with the environment variable technique. It
-is best to choose a single method for defining Logstash settings.
-
-==== Docker defaults
-The following settings have different default values when using the Docker
-images:
-
-[horizontal]
-`http.host`:: `0.0.0.0`
-`xpack.monitoring.elasticsearch.hosts`:: `http://elasticsearch:9200`
-
-NOTE: The setting `xpack.monitoring.elasticsearch.hosts` is not
-defined in the `-oss` image.
-
-These settings are defined in the default `logstash.yml`. They can be overridden
-with a <<docker-bind-mount-settings,custom `logstash.yml`>> or via
-<<docker-env-config,environment variables>>.
-
-IMPORTANT: If replacing `logstash.yml` with a custom version, be sure to copy the
-above defaults to the custom file if you want to retain them. If not, they will
-be "masked" by the new file.
-
-==== Logging Configuration
-
-Under Docker, Logstash logs go to standard output by default. To
-change this behaviour, use any of the techniques above to replace the
-file at +/usr/share/logstash/config/log4j2.properties+.
diff --git a/docs/static/event-api.asciidoc b/docs/static/event-api.asciidoc
deleted file mode 100644
index 59ad7c937..000000000
--- a/docs/static/event-api.asciidoc
+++ /dev/null
@@ -1,120 +0,0 @@
-[[event-api]]
-=== Event API
-
-This section is targeted for plugin developers and users of Logstash's Ruby filter. Below we document recent 
-changes (starting with version 5.0) in the way users have been accessing Logstash's event based data in 
-custom plugins and in the Ruby filter. Note that <<event-dependent-configuration>> 
-data flow in Logstash's config files -- using <<logstash-config-field-references>> -- is 
-not affected by this change, and will continue to use existing syntax.
-
-[float]
-==== Event Object
-
-Event is the main object that encapsulates data flow internally in Logstash and provides an API for the plugin 
-developers to interact with the event's content. Typically, this API is used in plugins and in a Ruby filter to 
-retrieve data and use it for transformations. Event object contains the original data sent to Logstash and any additional 
-fields created during Logstash's filter stages.
-
-In 5.0, we've re-implemented the Event class and its supporting classes in pure Java. Since Event is a critical component 
-in data processing,  a rewrite in Java improves performance and provides efficient serialization when storing data on disk. For the most part, this change aims at keeping backward compatibility and is transparent to the users. To this extent we've updated and published most of the plugins in Logstash's ecosystem to adhere to the new API changes. However, if you are maintaining a custom plugin, or have a Ruby filter, this change will affect you. The aim of this guide is to describe the new API and provide examples to migrate to the new changes.
-
-[float]
-==== Event API
-
-Prior to version 5.0, developers could access and manipulate event data by directly using Ruby hash syntax. For 
-example, `event[field] = foo`. While this is powerful, our goal is to abstract the internal implementation details 
-and provide well-defined getter and setter APIs.
-
-**Get API**
-
-The getter is a read-only access of field-based data in an Event.
-
-**Syntax:** `event.get(field)`
-
-**Returns:** Value for this field or nil if the field does not exist. Returned values could be a string, 
-numeric or timestamp scalar value.
-
-`field` is a structured field sent to Logstash or created after the transformation process. `field` can also 
-be a nested <<field-references-deepdive,field reference>> such as `[field][bar]`.
-
-Examples:
-
-[source,ruby]
---------------------------------------------------
-event.get("foo" ) # => "baz"
-event.get("[foo]") # => "zab"
-event.get("[foo][bar]") # => 1
-event.get("[foo][bar]") # => 1.0
-event.get("[foo][bar]") # =>  [1, 2, 3]
-event.get("[foo][bar]") # => {"a" => 1, "b" => 2}
-event.get("[foo][bar]") # =>  {"a" => 1, "b" => 2, "c" => [1, 2]}
---------------------------------------------------
-
-Accessing @metadata
-
-[source,ruby]
---------------------------------------------------
-event.get("[@metadata][foo]") # => "baz"
---------------------------------------------------
-
-**Set API**
-
-This API can be used to mutate data in an Event. 
-
-**Syntax:** `event.set(field, value)`
-
-**Returns:**  The current Event  after the mutation, which can be used for chainable calls.
-
-Examples:
-
-[source,ruby]
---------------------------------------------------
-event.set("foo", "baz")
-event.set("[foo]", "zab")
-event.set("[foo][bar]", 1)
-event.set("[foo][bar]", 1.0)
-event.set("[foo][bar]", [1, 2, 3])
-event.set("[foo][bar]", {"a" => 1, "b" => 2})
-event.set("[foo][bar]", {"a" => 1, "b" => 2, "c" => [1, 2]})
-event.set("[@metadata][foo]", "baz")
---------------------------------------------------
-
-Mutating a collection after setting it in the Event has an undefined behaviour and is not allowed.
-
-[source,ruby]
---------------------------------------------------
-h = {"a" => 1, "b" => 2, "c" => [1, 2]}
-event.set("[foo][bar]", h)
-
-h["c"] = [3, 4]
-event.get("[foo][bar][c]") # => undefined
-
-Suggested way of mutating collections:
-
-h = {"a" => 1, "b" => 2, "c" => [1, 2]}
-event.set("[foo][bar]", h)
-
-h["c"] = [3, 4]
-event.set("[foo][bar]", h)
-
-# Alternatively,
-event.set("[foo][bar][c]", [3, 4]) 
---------------------------------------------------
-
-[float]
-==== Ruby Filter
-
-The <<plugins-filters-ruby,Ruby Filter>> can be used to execute any ruby code and manipulate event data using the 
-API described above. For example, using the new API:
-
-[source,ruby]
---------------------------------------------------
-filter {
-  ruby {
-    code => 'event.set("lowercase_field", event.get("message").downcase)'
-  }  
-}    
---------------------------------------------------
-
-This filter will lowercase the `message` field, and set it to a new field called `lowercase_field`
-
diff --git a/docs/static/field-reference.asciidoc b/docs/static/field-reference.asciidoc
deleted file mode 100644
index fe48ecb33..000000000
--- a/docs/static/field-reference.asciidoc
+++ /dev/null
@@ -1,129 +0,0 @@
-[role="exclude",id="field-references-deepdive"]
-== Field References Deep Dive
-
-It is often useful to be able to refer to a field or collection of fields by name. To do this,
-you can use the Logstash field reference syntax.
-
-The syntax to access a field specifies the entire path to the field, with each fragment wrapped in square brackets.
-
-_Field References_ can be expressed literally within <<conditionals,_Conditional_>> statements in your pipeline configurations,
-as string arguments to your pipeline plugins, or within sprintf statements that will be used by your pipeline plugins:
-
-[source,pipelineconf]
-filter {
-  #  +----literal----+     +----literal----+
-  #  |               |     |               |
-  if [@metadata][date] and [@metadata][time] {
-    mutate {
-      add_field {
-        "[@metadata][timestamp]" => "%{[@metadata][date]} %{[@metadata][time]}"
-      # |                      |    |  |               |    |               | |
-      # +----string-argument---+    |  +--field-ref----+    +--field-ref----+ |
-      #                             +-------- sprintf format string ----------+
-      }
-    }
-  }
-}
-
-[float]
-[[formal-grammar]]
-=== Formal Grammar
-
-Below is the formal grammar of the Field Reference, with notes and examples.
-
-[float]
-[[formal-grammar-field-reference-literal]]
-==== Field Reference Literal
-
-A _Field Reference Literal_ is a sequence of one or more _Path Fragments_ that can be used directly in Logstash pipeline <<conditionals,conditionals>> without any additional quoting (e.g. `[request]`, `[response][status]`).
-
-[source,antlr]
-fieldReferenceLiteral
-  : ( pathFragment )+
-  ;
-
-[float]
-[[formal-grammar-field-reference]]
-==== Field Reference (Event APIs)
-
-The Event API's methods for manipulating the fields of an event or using the sprintf syntax are more flexible than the pipeline grammar in what they accept as a Field Reference.
-Top-level fields can be referenced directly by their _Field Name_ without the square brackets, and there is some support for _Composite Field References_, simplifying use of programmatically-generated Field References.
-
-A _Field Reference_ for use with the Event API is therefore one of:
-
- - a single _Field Reference Literal_; OR
- - a single _Field Name_ (referencing a top-level field); OR
- - a single _Composite Field Reference_.
-
-[source,antlr]
-eventApiFieldReference
-  : fieldReferenceLiteral
-  | fieldName
-  | compositeFieldReference
-  ;
-
-[float]
-[[formal-grammar-path-fragment]]
-==== Path Fragment
-
-A _Path Fragment_ is a _Field Name_ wrapped in square brackets (e.g., `[request]`).
-
-[source,antlr]
-pathFragment
-  : '[' fieldName ']'
-  ;
-
-[float]
-[[formal-grammar-field-name]]
-==== Field Name
-
-A _Field Name_ is a sequence of characters that are _not_ square brackets (`[` or `]`).
-
-[source,antlr]
-fieldName
-  : ( ~( '[' | ']' ) )+
-  ;
-
-[float]
-[[formal-grammar-event-api-composite-field-reference]]
-==== Composite Field Reference
-
-In some cases, it may be necessary to programmatically _compose_ a Field Reference from one or more Field References,
-such as when manipulating fields in a plugin or while using the Ruby Filter plugin and the Event API.
-
-[source,ruby]
-    fieldReference = "[path][to][deep nested field]"
-    compositeFieldReference = "[@metadata][#{fieldReference}][size]"
-    # => "[@metadata][[path][to][deep nested field]][size]"
-
-// NOTE: table below uses "plus for passthrough" quoting to prevent double square-brackets
-//       from being interpreted as asciidoc anchors when converted to HTML.
-[float]
-===== Canonical Representations of Composite Field References
-|===
-| Acceptable _Composite Field Reference_ | Canonical _Field Reference_ Representation
-
-| `+[[deep][nesting]][field]+`           | `+[deep][nesting][field]+`
-| `+[foo][[bar]][bingo]+`                | `+[foo][bar][bingo]+`
-| `+[[ok]]+`                             | `+[ok]+`
-|===
-
-A _Composite Field Reference_ is a sequence of one or more _Path Fragments_ or _Embedded Field References_.
-
-[source,antlr]
-compositeFieldReference
-  : ( pathFragment | embeddedFieldReference )+
-  ;
-
-_Composite Field References_ are supported by the Event API, but are _not_ supported as literals in the Pipeline Configuration.
-
-[float]
-[[formal-grammar-event-api-embedded-field-reference]]
-==== Embedded Field Reference
-
-[source,antlr]
-embeddedFieldReference
-  : '[' fieldReference ']'
-  ;
-
-An _Embedded Field Reference_ is a _Field Reference_ that is itself wrapped in square brackets (`[` and `]`), and can be a component of a _Composite Field Reference_.
diff --git a/docs/static/filebeat-modules.asciidoc b/docs/static/filebeat-modules.asciidoc
deleted file mode 100644
index 1b601f685..000000000
--- a/docs/static/filebeat-modules.asciidoc
+++ /dev/null
@@ -1,185 +0,0 @@
-[[filebeat-modules]]
-
-== Working with Filebeat Modules
-
-Filebeat comes packaged with pre-built  {filebeat-ref}/filebeat-modules.html[modules]
-that contain the configurations needed to collect, parse, enrich, and visualize
-data from various log file formats. Each Filebeat module consists of one or more
-filesets that contain ingest node pipelines, Elasticsearch templates, Filebeat
-prospector configurations, and Kibana dashboards.
-
-Filebeat modules are a great way to get started, but you might find that ingest
-pipelines don't offer the processing power that you require. If that's the case,
-you'll need to use Logstash.
-
-[float]
-[[graduating-to-Logstash]]
-=== Using Logstash instead of Ingest Node
-
-Logstash provides an <<ingest-converter,ingest pipeline conversion tool>>
-to help you migrate ingest pipeline definitions to Logstash configs. However,
-the tool does not currently support all the processors that are available for
-ingest node.
-
-You can follow the steps in this section to build and run Logstash
-configurations that parse the data collected by Filebeat modules. Then you'll be
-able to use the same dashboards available with Filebeat to visualize your data
-in Kibana.
-
-[float]
-==== Create and start the Logstash pipeline
-
-. Create a Logstash pipeline configuration that reads from the Beats input and
-parses the events.
-+
-See <<logstash-config-for-filebeat-modules>> for detailed examples.
-
-. Start Logstash, passing in the pipeline configuration file that parses the
-log. For example:
-+
-[source,shell]
-----------------------------------------------------------------------
-bin/logstash -f mypipeline.conf
-----------------------------------------------------------------------
-+
-You'll see the following message when Logstash is running and listening for
-input from Beats: 
-+
-[source,shell]
-----------------------------------------------------------------------
-[2017-10-13T00:01:15,413][INFO ][logstash.inputs.beats    ] Beats inputs: Starting input listener {:address=>"127.0.0.1:5044"}
-[2017-10-13T00:01:15,443][INFO ][logstash.pipeline        ] Pipeline started {"pipeline.id"=>"main"}
-----------------------------------------------------------------------
-
-
-The Logstash pipeline is now ready to receive events from Filebeat. Next, you
-set up and run Filebeat.
-
-[float]
-==== Set up and run Filebeat
-
-. If you haven't already set up the Filebeat index template and sample Kibana
-dashboards, run the Filebeat `setup` command to do that now: 
-+
-[source,shell]
-----------------------------------------------------------------------
-./filebeat -e setup
-----------------------------------------------------------------------
-+
-The `-e` flag is optional and sends output to standard error instead of syslog.
-+
-A connection to Elasticsearch and Kibana is required for this one-time setup
-step because Filebeat needs to create the index template in Elasticsearch and
-load the sample dashboards into Kibana. 
-+
-After the template and dashboards are loaded, you'll see the message `INFO
-Kibana dashboards successfully loaded. Loaded dashboards`.
-
-. Configure Filebeat to send log lines to Logstash. To do this, in the
-+filebeat.yml+ config file, disable the Elasticsearch output, and enable the
-Logstash output. For example:
-+
-[source,yaml]
------
-#output.elasticsearch:
-  #hosts: ["localhost:9200"]
-output.logstash:
-  hosts: ["localhost:5044"]
------
-
-. Run the `modules enable` command to enable the modules that you want to run.
-For example:
-+
-[source,shell]
-----------------------------------------------------------------------
-./filebeat modules enable nginx
-----------------------------------------------------------------------
-+
-You can further configure the module by editing the config file under the
-Filebeat `modules.d` directory. For example, if the log files are not in the
-location expected by the module, you can set the `var.paths` option.
-
-. Start Filebeat. For example, to start Filebeat in the foreground, use:
-+
-[source,shell]
-----------------------------------------------------------------------
-./filebeat -e
-----------------------------------------------------------------------
-+
-NOTE: Depending on how you've installed Filebeat, you might see errors
-related to file ownership or permissions when you try to run Filebeat modules.
-See {beats-ref}/config-file-permissions.html[Config File Ownership and Permissions]
-in the _Beats Platform Reference_ if you encounter errors related to file
-ownership or permissions.
-+
-See {filebeat-ref}/filebeat-starting.html[Starting Filebeat] for more info.
-
-[float]
-==== Visualize the data
-
-To visualize the data in Kibana, launch the Kibana web interface by pointing
-your browser to port 5601. For example,
-http://127.0.0.1:5601[http://127.0.0.1:5601]. 
-
-[[logstash-config-for-filebeat-modules]]
-=== Configuration Examples
-
-The examples in this section show you how to build Logstash pipelines that parse
-data sent collected by Filebeat modules:
-
-* <<parsing-apache2>>
-* <<parsing-mysql>>
-* <<parsing-nginx>>
-* <<parsing-system>>
-
-[[parsing-apache2]]
-==== Apache 2 Logs
-
-The Logstash pipeline configuration in this example shows how to ship and parse
-access and error logs collected by the
-{filebeat-ref}/filebeat-module-apache.html[`apache` Filebeat module].
-
-[source,json]
-----------------------------------------------------------------------------
-include::filebeat_modules/apache2/pipeline.conf[]
-----------------------------------------------------------------------------
-
-
-[[parsing-mysql]]
-==== MySQL Logs
-
-The Logstash pipeline configuration in this example shows how to ship and parse
-error and slowlog logs collected by the
-{filebeat-ref}/filebeat-module-mysql.html[`mysql` Filebeat module].
-
-[source,json]
-----------------------------------------------------------------------------
-include::filebeat_modules/mysql/pipeline.conf[]
-----------------------------------------------------------------------------
-
-
-[[parsing-nginx]]
-==== Nginx Logs
-
-The Logstash pipeline configuration in this example shows how to ship and parse
-access and error logs collected by the
-{filebeat-ref}/filebeat-module-nginx.html[`nginx` Filebeat module].
-
-[source,json]
-----------------------------------------------------------------------------
-include::filebeat_modules/nginx/pipeline.conf[]
-----------------------------------------------------------------------------
-
-
-[[parsing-system]]
-==== System Logs
-
-The Logstash pipeline configuration in this example shows how to ship and parse
-system logs collected by the
-{filebeat-ref}/filebeat-module-system.html[`system` Filebeat module].
-
-[source,json]
-----------------------------------------------------------------------------
-include::filebeat_modules/system/pipeline.conf[]
-----------------------------------------------------------------------------
-
diff --git a/docs/static/filter.asciidoc b/docs/static/filter.asciidoc
deleted file mode 100644
index ba20f5856..000000000
--- a/docs/static/filter.asciidoc
+++ /dev/null
@@ -1,14 +0,0 @@
-:register_method:	true
-:filter_method:		true
-:plugintype:    	filter
-:pluginclass:   	Filters
-:pluginname:    	example
-:pluginnamecap: 	Example
-
-:blockcodec:		true
-
-:getstarted: Let's step through creating a {plugintype} plugin using the https://github.com/logstash-plugins/logstash-filter-example/[example {plugintype} plugin].
-
-:methodheader: Logstash filters must implement the `register` and `filter` methods.
-
-include::include/pluginbody.asciidoc[]
diff --git a/docs/static/getting-started-with-logstash.asciidoc b/docs/static/getting-started-with-logstash.asciidoc
deleted file mode 100644
index a8b57c70a..000000000
--- a/docs/static/getting-started-with-logstash.asciidoc
+++ /dev/null
@@ -1,278 +0,0 @@
-[[getting-started-with-logstash]]
-== Getting Started with Logstash
-
-This section guides you through the process of installing Logstash and verifying that everything is running properly.
-After learning how to stash your first event, you go on to create a more advanced pipeline that takes Apache web logs as
-input, parses the logs, and writes the parsed data to an Elasticsearch cluster. Then you learn how to stitch together multiple input and output plugins to unify data from a variety of disparate sources.
-
-This section includes the following topics:
-
-* <<installing-logstash>>
-* <<first-event>>
-* {logstash-ref}/advanced-pipeline.html[Parsing Logs with Logstash]
-* {logstash-ref}/multiple-input-output-plugins.html[Stitching Together Multiple Input and Output Plugins]
-
-[[installing-logstash]]
-=== Installing Logstash
-
-NOTE: Logstash requires Java 8. Java 9 is not supported. Use the
-http://www.oracle.com/technetwork/java/javase/downloads/index.html[official Oracle distribution] or an open-source
-distribution such as http://openjdk.java.net/[OpenJDK].
-
-To check your Java version, run the following command:
-
-[source,shell]
-java -version
-
-On systems with Java installed, this command produces output similar to the following:
-
-[source,shell]
-java version "1.8.0_65"
-Java(TM) SE Runtime Environment (build 1.8.0_65-b17)
-Java HotSpot(TM) 64-Bit Server VM (build 25.65-b01, mixed mode)
-
-On some Linux systems, you may also need to have the `JAVA_HOME` environment
-exported before attempting the install, particularly if you installed Java from
-a tarball.  This is because Logstash uses Java during installation to
-automatically detect your environment and install the correct startup method
-(SysV init scripts, Upstart, or systemd).  If Logstash is unable to find the
-JAVA_HOME environment variable during package installation time, you may get an
-error message, and Logstash will be unable to start properly.
-
-[float]
-[[installing-binary]]
-=== Installing from a Downloaded Binary
-
-Download the https://www.elastic.co/downloads/logstash[Logstash installation file] that matches your host environment.
-Unpack the file. Do not install Logstash into a directory path that contains colon (:) characters.
-
-[NOTE]
---
-These packages are free to use under the Elastic license. They contain open 
-source and free commercial features and access to paid commercial features.  
-{xpack-ref}/license-management.html[Start a 30-day trial] to try out all of the 
-paid commercial features. See the 
-https://www.elastic.co/subscriptions[Subscriptions] page for information about 
-Elastic license levels. 
-
-Alternatively, you can download an `oss` package, which contains only features 
-that are available under the Apache 2.0 license. 
---
-
-On supported Linux operating systems, you can use a package manager to install Logstash.
-
-[float]
-[[package-repositories]]
-=== Installing from Package Repositories
-
-We also have repositories available for APT and YUM based distributions. Note
-that we only provide binary packages, but no source packages, as the packages
-are created as part of the Logstash build.
-
-We have split the Logstash package repositories by version into separate urls
-to avoid accidental upgrades across major versions. For all {major-version}.y
-releases use {major-version} as version number.
-
-We use the PGP key
-https://pgp.mit.edu/pks/lookup?op=vindex&search=0xD27D666CD88E42B4[D88E42B4],
-Elastic's Signing Key, with fingerprint
-
-    4609 5ACC 8548 582C 1A26 99A9 D27D 666C D88E 42B4
-
-to sign all our packages. It is available from https://pgp.mit.edu.
-
-[float]
-==== APT
-
-ifeval::["{release-state}"=="unreleased"]
-
-Version {logstash_version} of Logstash has not yet been released.
-
-endif::[]
-
-ifeval::["{release-state}"!="unreleased"]
-
-Download and install the Public Signing Key:
-
-[source,sh]
---------------------------------------------------
-wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add -
---------------------------------------------------
-
-You may need to install the `apt-transport-https` package on Debian before proceeding:
-
-[source,sh]
---------------------------------------------------
-sudo apt-get install apt-transport-https
---------------------------------------------------
-
-// THIS IS A NESTED STATEMENT - This block executes if release-state != unreleased and release-state == released
-
-ifeval::["{release-state}"=="released"]
-
-Save the repository definition to  +/etc/apt/sources.list.d/elastic-{major-version}.list+:
-
-["source","sh",subs="attributes"]
---------------------------------------------------
-echo "deb https://artifacts.elastic.co/packages/{major-version}/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic-{major-version}.list
---------------------------------------------------
-
-endif::[]
-
-// THIS IS A NESTED STATEMENT - This block executes if release-state != unreleased and release-state == prerelase
-
-ifeval::["{release-state}"=="prerelease"]
-
-Save the repository definition to  +/etc/apt/sources.list.d/elastic-{major-version}-prerelease.list+:
-
-["source","sh",subs="attributes"]
---------------------------------------------------
-echo "deb https://artifacts.elastic.co/packages/{major-version}-prerelease/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic-{major-version}-prerelease.list
---------------------------------------------------
-
-endif::[]
-
-[WARNING]
-==================================================
-Use the `echo` method described above to add the Logstash repository.  Do not
-use `add-apt-repository` as it will add a `deb-src` entry as well, but we do not
-provide a source package. If you have added the `deb-src` entry, you will see an
-error like the following:
-
-    Unable to find expected entry 'main/source/Sources' in Release file (Wrong sources.list entry or malformed file)
-
-Just delete the `deb-src` entry from the `/etc/apt/sources.list` file and the
-installation should work as expected.
-==================================================
-
-Run `sudo apt-get update` and the repository is ready for use. You can install
-it with:
-
-[source,sh]
---------------------------------------------------
-sudo apt-get update && sudo apt-get install logstash
---------------------------------------------------
-
-See {logstash-ref}/running-logstash.html[Running Logstash] for details about managing Logstash as a system service.
-
-endif::[]
-
-[float]
-==== YUM
-
-ifeval::["{release-state}"=="unreleased"]
-
-Version {logstash_version} of Logstash has not yet been released.
-
-endif::[]
-
-ifeval::["{release-state}"!="unreleased"]
-
-Download and install the public signing key:
-
-[source,sh]
---------------------------------------------------
-rpm --import https://artifacts.elastic.co/GPG-KEY-elasticsearch
---------------------------------------------------
-
-Add the following in your `/etc/yum.repos.d/` directory
-in a file with a `.repo` suffix, for example `logstash.repo`
-
-// THIS IS A NESTED STATEMENT - This block executes if release-state != unreleased and release-state == prerelase
-
-ifeval::["{release-state}"=="prerelease"]
-
-["source","sh",subs="attributes"]
---------------------------------------------------
-[logstash-{major-version}]
-name=Elastic repository for {major-version} packages
-baseurl=https://artifacts.elastic.co/packages/{major-version}-prerelease/yum
-gpgcheck=1
-gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch
-enabled=1
-autorefresh=1
-type=rpm-md
---------------------------------------------------
-
-endif::[]
-
-// THIS IS A NESTED STATEMENT - This block executes if release-state != unreleased and release-state == released
-
-ifeval::["{release-state}"=="released"]
-
-["source","sh",subs="attributes"]
---------------------------------------------------
-[logstash-{major-version}]
-name=Elastic repository for {major-version} packages
-baseurl=https://artifacts.elastic.co/packages/{major-version}/yum
-gpgcheck=1
-gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch
-enabled=1
-autorefresh=1
-type=rpm-md
---------------------------------------------------
-
-endif::[]
-
-And your repository is ready for use. You can install it with:
-
-[source,sh]
---------------------------------------------------
-sudo yum install logstash
---------------------------------------------------
-
-WARNING: The repositories do not work with older rpm based distributions
-         that still use RPM v3, like CentOS5.
-
-See the {logstash-ref}/running-logstash.html[Running Logstash] document for managing Logstash as a system service.
-
-endif::[]
-
-==== Docker
-
-Images are available for running Logstash as a Docker container. They are
-available from the Elastic Docker registry.
-
-See <<docker,Running Logstash on Docker>> for
-details on how to configure and run Logstash Docker containers.
-
-[[first-event]]
-=== Stashing Your First Event
-
-First, let's test your Logstash installation by running the most basic _Logstash pipeline_.
-
-A Logstash pipeline has two required elements, `input` and `output`, and one optional element, `filter`. The input
-plugins consume data from a source, the filter plugins modify the data as you specify, and the output plugins write
-the data to a destination.
-
-//TODO: REPLACE WITH NEW IMAGE
-
-image::static/images/basic_logstash_pipeline.png[]
-
-To test your Logstash installation, run the most basic Logstash pipeline. For
-example:
-
-["source","sh",subs="attributes"]
---------------------------------------------------
-cd logstash-{logstash_version}
-bin/logstash -e 'input { stdin { } } output { stdout {} }'
---------------------------------------------------
-
-NOTE: The location of the `bin` directory varies by platform. See {logstash-ref}/dir-layout.html[Directory layout]
-to find the location of `bin\logstash` on your system.
-
-The `-e` flag enables you to specify a configuration directly from the command line. Specifying configurations at the
-command line lets you quickly test configurations without having to edit a file between iterations.
-The pipeline in the example takes input from the standard input, `stdin`, and moves that input to the standard output,
-`stdout`, in a structured format.
-
-After starting Logstash, wait until you see "Pipeline main started" and then enter `hello world` at the command prompt:
-
-[source,shell]
-hello world
-2013-11-21T01:22:14.405+0000 0.0.0.0 hello world
-
-Logstash adds timestamp and IP address information to the message. Exit Logstash by issuing a *CTRL-D* command in the
-shell where Logstash is running.
-
-Congratulations! You've created and run a basic Logstash pipeline. Next, you learn how to create a more realistic pipeline.
diff --git a/docs/static/glob-support.asciidoc b/docs/static/glob-support.asciidoc
deleted file mode 100644
index 7f45279e2..000000000
--- a/docs/static/glob-support.asciidoc
+++ /dev/null
@@ -1,50 +0,0 @@
-[[glob-support]]
-=== Glob Pattern Support
-
-Logstash supports the following patterns wherever glob patterns are allowed:
-
-*`*`*::
-Match any file. You can also use an `*` to restrict other values in the glob.
-For example, `*conf` matches all files that end in `conf`. `*apache*` matches
-any files with `apache` in the name. This pattern does not match hidden files
-(dot files) on Unix-like operating systems. To match dot files, use a pattern
-like `{*,.*}`.
-
-*`**`*::
-Match directories recursively.
-
-*`?`*::
-Match any one character.
-
-*`[set]`*::
-Match any one character in a set. For example, `[a-z]`. Also supports set negation
-(`[^a-z]`).
-
-*`{p,q}`*::
-Match either literal `p` or literal `q`. The matching literal can be more than one
-character, and you can specify more than two literals. This pattern is the equivalent
-to using alternation with the vertical bar in regular expressions (`foo|bar`).
-
-*`\`*::
-Escape the next metacharacter. This means that you cannot use a backslash in Windows
-as part of a glob. The pattern `c:\foo*` will not work, so use `foo*` instead.
-
-[float]
-[[example-glob-patterns]]
-==== Example Patterns
-
-Here are some common examples of glob patterns: 
-
-`"/path/to/*.conf"`::
-Matches config files ending in `.conf` in the specified path.
-
-`"/var/log/*.log"`::
-Matches log files ending in `.log` in the specified path.
-
-`"/var/log/**/*.log`::
-Matches log files ending in `.log` in subdirectories under the specified path.
-
-`"/path/to/logs/{app1,app2,app3}/data.log"`::
-Matches app log files in the `app1`, `app2`, and `app3` subdirectories under the
-specified path.
-
diff --git a/docs/static/glossary.asciidoc b/docs/static/glossary.asciidoc
deleted file mode 100644
index 0fbea1cfa..000000000
--- a/docs/static/glossary.asciidoc
+++ /dev/null
@@ -1,79 +0,0 @@
-[[glossary]]
-== Glossary of Terms
-
-[[glossary-metadata]]@metadata ::
-  A special field for storing content that you don't want to include in output <<glossary-event,events>>. For example, the `@metadata`
-  field is useful for creating transient fields for use in <<glossary-conditional,conditional>> statements.
-    
-[[glossary-codec-plugin]]codec plugin::
-  A Logstash <<glossary-plugin,plugin>> that changes the data representation of an <<glossary-event,event>>. Codecs are essentially stream filters that can operate as part of an input or output. Codecs enable you to separate the transport of messages from the serialization process. Popular codecs include json, msgpack, and plain (text).
-  
-[[glossary-conditional]]conditional::
-  A control flow that executes certain actions based on whether a statement (also called a condition) is true or false. Logstash supports `if`, `else if`, and `else` statements. You can use conditional statements to apply filters and send events to a specific output based on conditions that you specify. 
-    
-[[glossary-event]]event::
-	A single unit of information, containing a timestamp plus additional data. An event arrives via an input, and is subsequently parsed, timestamped, and passed through the Logstash <<glossary-pipeline,pipeline>>.
-    
-[[glossary-field]]field::
-  An <<glossary-event,event>> property. For example, each event in an apache access log has properties, such as a status
-  code (200, 404), request path ("/", "index.html"), HTTP verb (GET, POST), client IP address, and so on. Logstash uses
-  the term "fields" to refer to these properties.
-  
-[[glossary-field-reference]]field reference::
-  A reference to an event <<glossary-field,field>>. This reference may appear in an output block or filter block in the
-  Logstash config file. Field references are typically wrapped in square (`[]`) brackets, for example `[fieldname]`. If
-  you are referring to a top-level field, you can omit the `[]` and simply use the field name. To refer to a nested
-  field, you specify the full path to that field: `[top-level field][nested field]`.
-
-[[glossary-filter-plugin]]filter plugin::
-  A Logstash <<glossary-plugin,plugin>> that performs intermediary processing on an <<glossary-event,event>>. Typically, filters act upon
-  event data after it has been ingested via inputs, by mutating, enriching, and/or modifying the data according to
-  configuration rules. Filters are often applied conditionally depending on the characteristics of the event. Popular
-  filter plugins include grok, mutate, drop, clone, and geoip. Filter stages are optional.
-  
-[[glossary-gem]]gem::
-  A self-contained package of code that's hosted on https://rubygems.org[RubyGems.org]. Logstash <<glossary-plugin,plugins>> are packaged as
-  Ruby Gems. You can use the Logstash <<glossary-plugin-manager,plugin manager>> to manage Logstash gems.
-  
-[[glossary-hot-thread]]hot thread::
-  A Java thread that has high CPU usage and executes for a longer than normal period of time.
-  
-[[glossary-input-plugin]]input plugin::
-  A Logstash <<glossary-plugin,plugin>> that reads <<glossary-event,event>> data from a specific source. Input plugins are the first stage in the Logstash event processing <<glossary-pipeline,pipeline>>. Popular input plugins include file, syslog, redis, and beats.
-  
-[[glossary-indexer]]indexer::
-	A Logstash instance that is tasked with interfacing with an Elasticsearch cluster in order to index <<glossary-event,event>> data.
-    
-[[glossary-message-broker]]message broker::
-  Also referred to as a _message buffer_ or _message queue_, a message broker is external software (such as Redis, Kafka, or RabbitMQ) that stores messages from the Logstash shipper instance as an intermediate store, waiting to be processed by the Logstash indexer instance.
- 
-[[glossary-output-plugin]]output plugin::
-  A Logstash <<glossary-plugin,plugin>> that writes <<glossary-event,event>> data to a specific destination. Outputs are the final stage in
-  the event <<glossary-pipeline,pipeline>>. Popular output plugins include elasticsearch, file, graphite, and
-  statsd.  
-  
-[[glossary-pipeline]]pipeline::
-  A term used to describe the flow of <<glossary-event,events>> through the Logstash workflow. A pipeline typically consists of a series of
-  input, filter, and output stages. <<glossary-input-plugin,Input>> stages get data from a source and generate events,
-  <<glossary-filter-plugin,filter>> stages, which are optional, modify the event data, and
-  <<glossary-output-plugin,output>> stages write the data to a destination. Inputs and outputs support <<glossary-codec-plugin,codecs>> that enable you to encode or decode the data as it enters or exits the pipeline without having to use
-  a separate filter. 
-  
-[[glossary-plugin]]plugin::
-  A self-contained software package that implements one of the stages in the Logstash event processing
-  <<glossary-pipeline,pipeline>>. The list of available plugins includes <<glossary-input-plugin,input plugins>>,
-  <<glossary-output-plugin,output plugins>>, <<glossary-codec-plugin,codec plugins>>, and
-  <<glossary-filter-plugin,filter plugins>>. The plugins are implemented as Ruby <<glossary-gem,gems>> and hosted on
-  https://rubygems.org[RubyGems.org]. You define the stages of an event processing <<glossary-pipeline,pipeline>> by configuring plugins. 
- 
-[[glossary-plugin-manager]]plugin manager::
-  Accessed via the `bin/logstash-plugin` script, the plugin manager enables you to manage the lifecycle of
-  <<glossary-plugin,plugins>> in your Logstash deployment. You can install, remove, and upgrade plugins by using the
-  plugin manager Command Line Interface (CLI).
-
-[[shipper]]shipper::
-	An instance of Logstash that send events to another instance of Logstash, or some other application.
-    
-[[worker]]worker::
-	The filter thread model used by Logstash, where each worker receives an <<glossary-event,event>> and applies all filters, in order, before emitting the event to the output queue. This allows scalability across CPUs because many filters are CPU intensive.
-
diff --git a/docs/static/images/arcsight-diagram-adp.svg b/docs/static/images/arcsight-diagram-adp.svg
deleted file mode 100644
index 997abd5f5..000000000
--- a/docs/static/images/arcsight-diagram-adp.svg
+++ /dev/null
@@ -1,414 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="923px" height="340px" viewBox="0 0 923 340" style="enable-background:new 0 0 923 340;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#00A9E5;}
-	.st1{fill:#444444;}
-	.st2{fill:#D9D9D9;}
-	.st3{fill:url(#SVGID_1_);}
-	.st4{fill:url(#SVGID_2_);}
-	.st5{fill:url(#SVGID_3_);}
-	.st6{fill:#231F20;}
-	.st7{fill:#00BFB3;}
-	.st8{fill:#019B8F;}
-	.st9{fill:#F9B110;}
-	.st10{fill:#FED10A;}
-	.st11{fill:url(#SVGID_4_);}
-	.st12{fill:url(#SVGID_5_);}
-	.st13{fill:#3EBEB0;}
-	.st14{fill:#F04E98;}
-	.st15{fill:url(#SVGID_6_);}
-	.st16{fill:#0078A0;}
-	.st17{fill:#353535;}
-</style>
-<g transform="translate(606 46)">
-	<path class="st0" d="M-499.4,43.1v-3.7l-15.6-6.5c-0.3,1.1,0,2.5-0.4,3.5L-499.4,43.1z M-534.5,24.9l17.2-7.3
-		c-0.3-1.2-0.8-2.3-1.3-3.4l-20.2,8.3v4.3l20.2,8.4c0.5-1,1.7-1.6,2.1-2.7L-534.5,24.9z M-499.4,6.3l-16.1,6.7
-		c0.5,1.1,0.9,2.3,1.3,3.4l14.8-6.2V6.3z M-527.4,0.1l-2.6,2.7c5,2.2,9.1,6.3,11.5,11.4l3.1-1.3C-518,7.3-522.2,2.8-527.4,0.1
-		 M-530.2,46.8l2.6,2.6c5.3-2.7,9.6-7.3,12.1-13l-3.1-1.3C-520.9,40.5-525.1,44.7-530.2,46.8"/>
-	<path class="st0" d="M-516.2,24.8c0,2.5-0.4,5-1,7.2l3.1,1.3c0.8-2.7,1.3-5.5,1.3-8.5c0-2.9-0.4-5.7-1.2-8.4l-3,1.3
-		C-516.6,19.9-516.2,22.3-516.2,24.8"/>
-	<path class="st0" d="M-515.7,37c0.5-1,1.3-3.2,1.6-4.3l-3.2-0.8c-0.3,1.1-0.7,2.2-1.2,3.2L-515.7,37z M-518.5,14.2
-		c0.5,1.1,0.9,2.3,1.3,3.4l3-1.3c-0.4-1.2-0.8-2.3-1.3-3.4L-518.5,14.2z"/>
-	<g transform="translate(70)">
-		<path class="st0" d="M-499.4,43.1v-3.7l-15.6-6.5c-0.3,1.1,0,2.5-0.4,3.5L-499.4,43.1z M-534.5,24.9l17.2-7.3
-			c-0.3-1.2-0.8-2.3-1.3-3.4l-20.2,8.3v4.3l20.2,8.4c0.5-1,1.7-1.6,2.1-2.7L-534.5,24.9z M-499.4,6.3l-16.1,6.7
-			c0.5,1.1,0.9,2.3,1.3,3.4l14.8-6.2V6.3z M-527.4,0.1l-2.6,2.7c5,2.2,9.1,6.3,11.5,11.4l3.1-1.3C-518,7.3-522.2,2.8-527.4,0.1
-			 M-530.2,46.8l2.6,2.6c5.3-2.7,9.6-7.3,12.1-13l-3.1-1.3C-520.9,40.5-525.1,44.7-530.2,46.8"/>
-		<path class="st0" d="M-516.2,24.8c0,2.5-0.4,5-1,7.2l3.1,1.3c0.8-2.7,1.3-5.5,1.3-8.5c0-2.9-0.4-5.7-1.2-8.4l-3,1.3
-			C-516.6,19.9-516.2,22.3-516.2,24.8"/>
-		<path class="st0" d="M-515.7,37c0.5-1,1.3-3.2,1.6-4.3l-3.2-0.8c-0.3,1.1-0.7,2.2-1.2,3.2L-515.7,37z M-518.5,14.2
-			c0.5,1.1,0.9,2.3,1.3,3.4l3-1.3c-0.4-1.2-0.8-2.3-1.3-3.4L-518.5,14.2z"/>
-	</g>
-	<g transform="translate(140)">
-		<path class="st0" d="M-499.4,43.1v-3.7l-15.6-6.5c-0.3,1.1,0,2.5-0.4,3.5L-499.4,43.1z M-534.5,24.9l17.2-7.3
-			c-0.3-1.2-0.8-2.3-1.3-3.4l-20.2,8.3v4.3l20.2,8.4c0.5-1,1.7-1.6,2.1-2.7L-534.5,24.9z M-499.4,6.3l-16.1,6.7
-			c0.5,1.1,0.9,2.3,1.3,3.4l14.8-6.2V6.3z M-527.4,0.1l-2.6,2.7c5,2.2,9.1,6.3,11.5,11.4l3.1-1.3C-518,7.3-522.2,2.8-527.4,0.1
-			 M-530.2,46.8l2.6,2.6c5.3-2.7,9.6-7.3,12.1-13l-3.1-1.3C-520.9,40.5-525.1,44.7-530.2,46.8"/>
-		<path class="st0" d="M-516.2,24.8c0,2.5-0.4,5-1,7.2l3.1,1.3c0.8-2.7,1.3-5.5,1.3-8.5c0-2.9-0.4-5.7-1.2-8.4l-3,1.3
-			C-516.6,19.9-516.2,22.3-516.2,24.8"/>
-		<path class="st0" d="M-515.7,37c0.5-1,1.3-3.2,1.6-4.3l-3.2-0.8c-0.3,1.1-0.7,2.2-1.2,3.2L-515.7,37z M-518.5,14.2
-			c0.5,1.1,0.9,2.3,1.3,3.4l3-1.3c-0.4-1.2-0.8-2.3-1.3-3.4L-518.5,14.2z"/>
-	</g>
-	<g transform="translate(210)">
-		<path class="st0" d="M-499.4,43.1v-3.7l-15.6-6.5c-0.3,1.1,0,2.5-0.4,3.5L-499.4,43.1z M-534.5,24.9l17.2-7.3
-			c-0.3-1.2-0.8-2.3-1.3-3.4l-20.2,8.3v4.3l20.2,8.4c0.5-1,1.7-1.6,2.1-2.7L-534.5,24.9z M-499.4,6.3l-16.1,6.7
-			c0.5,1.1,0.9,2.3,1.3,3.4l14.8-6.2V6.3z M-527.4,0.1l-2.6,2.7c5,2.2,9.1,6.3,11.5,11.4l3.1-1.3C-518,7.3-522.2,2.8-527.4,0.1
-			 M-530.2,46.8l2.6,2.6c5.3-2.7,9.6-7.3,12.1-13l-3.1-1.3C-520.9,40.5-525.1,44.7-530.2,46.8"/>
-		<path class="st0" d="M-516.2,24.8c0,2.5-0.4,5-1,7.2l3.1,1.3c0.8-2.7,1.3-5.5,1.3-8.5c0-2.9-0.4-5.7-1.2-8.4l-3,1.3
-			C-516.6,19.9-516.2,22.3-516.2,24.8"/>
-		<path class="st0" d="M-515.7,37c0.5-1,1.3-3.2,1.6-4.3l-3.2-0.8c-0.3,1.1-0.7,2.2-1.2,3.2L-515.7,37z M-518.5,14.2
-			c0.5,1.1,0.9,2.3,1.3,3.4l3-1.3c-0.4-1.2-0.8-2.3-1.3-3.4L-518.5,14.2z"/>
-	</g>
-	<g transform="translate(0 70)">
-		<path class="st0" d="M-499.4,43.1v-3.7l-15.6-6.5c-0.3,1.1,0,2.5-0.4,3.5L-499.4,43.1z M-534.5,24.9l17.2-7.3
-			c-0.3-1.2-0.8-2.3-1.3-3.4l-20.2,8.3v4.3l20.2,8.4c0.5-1,1.7-1.6,2.1-2.7L-534.5,24.9z M-499.4,6.3l-16.1,6.7
-			c0.5,1.1,0.9,2.3,1.3,3.4l14.8-6.2V6.3z M-527.4,0.1l-2.6,2.7c5,2.2,9.1,6.3,11.5,11.4l3.1-1.3C-518,7.3-522.2,2.8-527.4,0.1
-			 M-530.2,46.8l2.6,2.6c5.3-2.7,9.6-7.3,12.1-13l-3.1-1.3C-520.9,40.5-525.1,44.7-530.2,46.8"/>
-		<path class="st0" d="M-516.2,24.8c0,2.5-0.4,5-1,7.2l3.1,1.3c0.8-2.7,1.3-5.5,1.3-8.5c0-2.9-0.4-5.7-1.2-8.4l-3,1.3
-			C-516.6,19.9-516.2,22.3-516.2,24.8"/>
-		<path class="st0" d="M-515.7,37c0.5-1,1.3-3.2,1.6-4.3l-3.2-0.8c-0.3,1.1-0.7,2.2-1.2,3.2L-515.7,37z M-518.5,14.2
-			c0.5,1.1,0.9,2.3,1.3,3.4l3-1.3c-0.4-1.2-0.8-2.3-1.3-3.4L-518.5,14.2z"/>
-	</g>
-	<g transform="translate(70 70)">
-		<path class="st0" d="M-499.4,43.1v-3.7l-15.6-6.5c-0.3,1.1,0,2.5-0.4,3.5L-499.4,43.1z M-534.5,24.9l17.2-7.3
-			c-0.3-1.2-0.8-2.3-1.3-3.4l-20.2,8.3v4.3l20.2,8.4c0.5-1,1.7-1.6,2.1-2.7L-534.5,24.9z M-499.4,6.3l-16.1,6.7
-			c0.5,1.1,0.9,2.3,1.3,3.4l14.8-6.2V6.3z M-527.4,0.1l-2.6,2.7c5,2.2,9.1,6.3,11.5,11.4l3.1-1.3C-518,7.3-522.2,2.8-527.4,0.1
-			 M-530.2,46.8l2.6,2.6c5.3-2.7,9.6-7.3,12.1-13l-3.1-1.3C-520.9,40.5-525.1,44.7-530.2,46.8"/>
-		<path class="st0" d="M-516.2,24.8c0,2.5-0.4,5-1,7.2l3.1,1.3c0.8-2.7,1.3-5.5,1.3-8.5c0-2.9-0.4-5.7-1.2-8.4l-3,1.3
-			C-516.6,19.9-516.2,22.3-516.2,24.8"/>
-		<path class="st0" d="M-515.7,37c0.5-1,1.3-3.2,1.6-4.3l-3.2-0.8c-0.3,1.1-0.7,2.2-1.2,3.2L-515.7,37z M-518.5,14.2
-			c0.5,1.1,0.9,2.3,1.3,3.4l3-1.3c-0.4-1.2-0.8-2.3-1.3-3.4L-518.5,14.2z"/>
-	</g>
-	<g transform="translate(140 70)">
-		<path class="st0" d="M-499.4,43.1v-3.7l-15.6-6.5c-0.3,1.1,0,2.5-0.4,3.5L-499.4,43.1z M-534.5,24.9l17.2-7.3
-			c-0.3-1.2-0.8-2.3-1.3-3.4l-20.2,8.3v4.3l20.2,8.4c0.5-1,1.7-1.6,2.1-2.7L-534.5,24.9z M-499.4,6.3l-16.1,6.7
-			c0.5,1.1,0.9,2.3,1.3,3.4l14.8-6.2V6.3z M-527.4,0.1l-2.6,2.7c5,2.2,9.1,6.3,11.5,11.4l3.1-1.3C-518,7.3-522.2,2.8-527.4,0.1
-			 M-530.2,46.8l2.6,2.6c5.3-2.7,9.6-7.3,12.1-13l-3.1-1.3C-520.9,40.5-525.1,44.7-530.2,46.8"/>
-		<path class="st0" d="M-516.2,24.8c0,2.5-0.4,5-1,7.2l3.1,1.3c0.8-2.7,1.3-5.5,1.3-8.5c0-2.9-0.4-5.7-1.2-8.4l-3,1.3
-			C-516.6,19.9-516.2,22.3-516.2,24.8"/>
-		<path class="st0" d="M-515.7,37c0.5-1,1.3-3.2,1.6-4.3l-3.2-0.8c-0.3,1.1-0.7,2.2-1.2,3.2L-515.7,37z M-518.5,14.2
-			c0.5,1.1,0.9,2.3,1.3,3.4l3-1.3c-0.4-1.2-0.8-2.3-1.3-3.4L-518.5,14.2z"/>
-	</g>
-	<g transform="translate(210 70)">
-		<path class="st0" d="M-499.4,43.1v-3.7l-15.6-6.5c-0.3,1.1,0,2.5-0.4,3.5L-499.4,43.1z M-534.5,24.9l17.2-7.3
-			c-0.3-1.2-0.8-2.3-1.3-3.4l-20.2,8.3v4.3l20.2,8.4c0.5-1,1.7-1.6,2.1-2.7L-534.5,24.9z M-499.4,6.3l-16.1,6.7
-			c0.5,1.1,0.9,2.3,1.3,3.4l14.8-6.2V6.3z M-527.4,0.1l-2.6,2.7c5,2.2,9.1,6.3,11.5,11.4l3.1-1.3C-518,7.3-522.2,2.8-527.4,0.1
-			 M-530.2,46.8l2.6,2.6c5.3-2.7,9.6-7.3,12.1-13l-3.1-1.3C-520.9,40.5-525.1,44.7-530.2,46.8"/>
-		<path class="st0" d="M-516.2,24.8c0,2.5-0.4,5-1,7.2l3.1,1.3c0.8-2.7,1.3-5.5,1.3-8.5c0-2.9-0.4-5.7-1.2-8.4l-3,1.3
-			C-516.6,19.9-516.2,22.3-516.2,24.8"/>
-		<path class="st0" d="M-515.7,37c0.5-1,1.3-3.2,1.6-4.3l-3.2-0.8c-0.3,1.1-0.7,2.2-1.2,3.2L-515.7,37z M-518.5,14.2
-			c0.5,1.1,0.9,2.3,1.3,3.4l3-1.3c-0.4-1.2-0.8-2.3-1.3-3.4L-518.5,14.2z"/>
-	</g>
-</g>
-<path class="st1" d="M107.2,325l-1.6-4.1h-5.2l-1.6,4.1h-1.5l5.1-12.9h1.3l5.1,12.9H107.2z M105.1,319.6l-1.5-4
-	c-0.2-0.5-0.4-1.1-0.6-1.9c-0.1,0.6-0.3,1.2-0.6,1.9l-1.5,4H105.1z M114.7,315.2c0.4,0,0.8,0,1.2,0.1l-0.2,1.4
-	c-0.4-0.1-0.8-0.1-1.1-0.1c-0.8,0-1.4,0.3-2,0.9s-0.8,1.4-0.8,2.4v5.2h-1.5v-9.6h1.2l0.2,1.8h0.1c0.4-0.6,0.8-1.1,1.3-1.5
-	S114.1,315.2,114.7,315.2z M121.1,325.2c-1.4,0-2.5-0.4-3.2-1.3s-1.1-2.1-1.1-3.6c0-1.6,0.4-2.9,1.2-3.7s1.9-1.3,3.3-1.3
-	c0.5,0,0.9,0,1.4,0.1s0.8,0.2,1.1,0.4l-0.4,1.2c-0.3-0.1-0.7-0.2-1.1-0.3s-0.7-0.1-1-0.1c-2,0-2.9,1.2-2.9,3.7
-	c0,1.2,0.2,2.1,0.7,2.7s1.2,0.9,2.1,0.9c0.8,0,1.6-0.2,2.5-0.5v1.3C122.9,325,122.1,325.2,121.1,325.2z M133.3,321.6
-	c0,1.1-0.4,2-1.2,2.6s-1.9,0.9-3.3,0.9c-1.5,0-2.7-0.2-3.5-0.6v-1.4c0.5,0.2,1.1,0.4,1.7,0.5s1.2,0.2,1.8,0.2c1,0,1.7-0.2,2.2-0.6
-	s0.8-0.9,0.8-1.6c0-0.4-0.1-0.8-0.3-1.1s-0.5-0.5-0.9-0.8s-1.1-0.5-1.9-0.8c-1.2-0.4-2-0.9-2.6-1.5s-0.8-1.4-0.8-2.3
-	c0-1,0.4-1.8,1.1-2.4s1.7-0.9,3-0.9c1.3,0,2.5,0.2,3.5,0.7l-0.5,1.3c-1.1-0.4-2.1-0.7-3.1-0.7c-0.8,0-1.4,0.2-1.9,0.5
-	s-0.7,0.8-0.7,1.4c0,0.4,0.1,0.8,0.2,1.1s0.4,0.5,0.8,0.8s1,0.5,1.8,0.8c1.3,0.5,2.3,1,2.8,1.5S133.3,320.7,133.3,321.6z M137.2,325
-	h-1.5v-9.6h1.5V325z M135.6,312.8c0-0.3,0.1-0.6,0.2-0.7s0.4-0.2,0.6-0.2c0.2,0,0.4,0.1,0.6,0.2s0.3,0.4,0.3,0.7s-0.1,0.6-0.3,0.7
-	s-0.4,0.2-0.6,0.2c-0.2,0-0.5-0.1-0.6-0.2S135.6,313.1,135.6,312.8z M148.2,315.4v0.9l-1.8,0.2c0.2,0.2,0.3,0.5,0.4,0.8
-	s0.2,0.7,0.2,1.1c0,0.9-0.3,1.7-1,2.3s-1.5,0.8-2.7,0.8c-0.3,0-0.6,0-0.8-0.1c-0.6,0.3-0.9,0.7-0.9,1.2c0,0.3,0.1,0.5,0.3,0.6
-	s0.6,0.2,1.1,0.2h1.7c1,0,1.8,0.2,2.4,0.7s0.8,1.1,0.8,1.9c0,1.1-0.4,1.9-1.3,2.4s-2.1,0.8-3.7,0.8c-1.3,0-2.2-0.2-2.9-0.7
-	s-1-1.1-1-2c0-0.6,0.2-1.1,0.6-1.5s0.9-0.7,1.6-0.9c-0.2-0.1-0.5-0.3-0.6-0.5s-0.3-0.5-0.3-0.8c0-0.4,0.1-0.7,0.3-0.9
-	s0.5-0.5,0.9-0.8c-0.5-0.2-0.9-0.6-1.2-1s-0.5-1.1-0.5-1.7c0-1.1,0.3-1.9,0.9-2.4s1.5-0.9,2.7-0.9c0.5,0,1,0.1,1.4,0.2H148.2z
-	 M140.5,326.6c0,0.5,0.2,0.9,0.7,1.2s1.1,0.4,1.9,0.4c1.2,0,2.1-0.2,2.7-0.5s0.9-0.9,0.9-1.5c0-0.5-0.2-0.9-0.5-1.1
-	s-0.9-0.3-1.8-0.3h-1.7c-0.7,0-1.2,0.2-1.5,0.5S140.5,326,140.5,326.6z M141.3,318.5c0,0.7,0.2,1.2,0.6,1.5s0.9,0.5,1.6,0.5
-	c1.4,0,2.1-0.7,2.1-2.1c0-1.4-0.7-2.2-2.2-2.2c-0.7,0-1.2,0.2-1.6,0.6S141.3,317.7,141.3,318.5z M156.7,325v-6.2
-	c0-0.8-0.2-1.4-0.5-1.8s-0.9-0.6-1.7-0.6c-1,0-1.8,0.3-2.2,0.8s-0.7,1.5-0.7,2.7v5h-1.5v-13.7h1.5v4.1c0,0.5,0,0.9-0.1,1.2h0.1
-	c0.3-0.5,0.7-0.8,1.2-1.1s1.1-0.4,1.8-0.4c1.2,0,2.1,0.3,2.6,0.8s0.9,1.4,0.9,2.7v6.3H156.7z M164.3,324c0.3,0,0.5,0,0.7-0.1
-	s0.4-0.1,0.6-0.1v1.1c-0.2,0.1-0.4,0.1-0.7,0.2s-0.6,0.1-0.8,0.1c-1.9,0-2.8-1-2.8-2.9v-5.7h-1.4v-0.7l1.4-0.6l0.6-2.1h0.8v2.2h2.8
-	v1.1h-2.8v5.7c0,0.6,0.1,1,0.4,1.3S163.8,324,164.3,324z M182.7,318.5c0,2.1-0.6,3.7-1.7,4.9s-2.8,1.7-5,1.7h-3.6v-12.8h3.9
-	c2,0,3.6,0.6,4.7,1.7S182.7,316.5,182.7,318.5z M181.1,318.5c0-1.7-0.4-2.9-1.3-3.8s-2.1-1.3-3.7-1.3h-2.2v10.3h1.8
-	c1.8,0,3.1-0.4,4-1.3S181.1,320.2,181.1,318.5z M191.3,325l-0.3-1.4h-0.1c-0.5,0.6-1,1-1.4,1.2s-1.1,0.3-1.8,0.3
-	c-1,0-1.7-0.2-2.2-0.7s-0.8-1.2-0.8-2.1c0-1.9,1.6-3,4.7-3.1l1.6-0.1v-0.6c0-0.8-0.2-1.3-0.5-1.7s-0.8-0.5-1.6-0.5
-	c-0.8,0-1.7,0.2-2.7,0.7l-0.4-1.1c0.5-0.3,1-0.5,1.6-0.6s1.1-0.2,1.7-0.2c1.1,0,2,0.3,2.6,0.8s0.8,1.3,0.8,2.5v6.6H191.3z M188,324
-	c0.9,0,1.6-0.2,2.1-0.7s0.8-1.2,0.8-2.1v-0.9l-1.5,0.1c-1.2,0-2,0.2-2.5,0.5s-0.8,0.8-0.8,1.5c0,0.5,0.2,0.9,0.5,1.2
-	S187.4,324,188,324z M198.5,324c0.3,0,0.5,0,0.7-0.1s0.4-0.1,0.6-0.1v1.1c-0.2,0.1-0.4,0.1-0.7,0.2s-0.6,0.1-0.8,0.1
-	c-1.9,0-2.8-1-2.8-2.9v-5.7h-1.4v-0.7l1.4-0.6l0.6-2.1h0.8v2.2h2.8v1.1h-2.8v5.7c0,0.6,0.1,1,0.4,1.3S198,324,198.5,324z M207.6,325
-	l-0.3-1.4h-0.1c-0.5,0.6-1,1-1.4,1.2s-1.1,0.3-1.8,0.3c-1,0-1.7-0.2-2.2-0.7s-0.8-1.2-0.8-2.1c0-1.9,1.6-3,4.7-3.1l1.6-0.1v-0.6
-	c0-0.8-0.2-1.3-0.5-1.7s-0.8-0.5-1.6-0.5c-0.8,0-1.7,0.2-2.7,0.7l-0.4-1.1c0.5-0.3,1-0.5,1.6-0.6s1.1-0.2,1.7-0.2
-	c1.1,0,2,0.3,2.6,0.8s0.8,1.3,0.8,2.5v6.6H207.6z M204.3,324c0.9,0,1.6-0.2,2.1-0.7s0.8-1.2,0.8-2.1v-0.9l-1.5,0.1
-	c-1.2,0-2,0.2-2.5,0.5s-0.8,0.8-0.8,1.5c0,0.5,0.2,0.9,0.5,1.2S203.8,324,204.3,324z M224.8,315.9c0,1.3-0.4,2.3-1.3,3
-	s-2.2,1.1-3.8,1.1h-1.5v5.1h-1.5v-12.8h3.3C223.1,312.2,224.8,313.4,224.8,315.9z M218.1,318.7h1.3c1.3,0,2.3-0.2,2.9-0.6
-	s0.9-1.1,0.9-2.1c0-0.8-0.3-1.5-0.8-1.9s-1.4-0.6-2.6-0.6h-1.7V318.7z M228.7,325h-1.5v-13.7h1.5V325z M237.7,325l-0.3-1.4h-0.1
-	c-0.5,0.6-1,1-1.4,1.2s-1.1,0.3-1.8,0.3c-1,0-1.7-0.2-2.2-0.7s-0.8-1.2-0.8-2.1c0-1.9,1.6-3,4.7-3.1l1.6-0.1v-0.6
-	c0-0.8-0.2-1.3-0.5-1.7s-0.8-0.5-1.6-0.5c-0.8,0-1.7,0.2-2.7,0.7l-0.4-1.1c0.5-0.3,1-0.5,1.6-0.6s1.1-0.2,1.7-0.2
-	c1.1,0,2,0.3,2.6,0.8s0.8,1.3,0.8,2.5v6.6H237.7z M234.4,324c0.9,0,1.6-0.2,2.1-0.7s0.8-1.2,0.8-2.1v-0.9l-1.5,0.1
-	c-1.2,0-2,0.2-2.5,0.5s-0.8,0.8-0.8,1.5c0,0.5,0.2,0.9,0.5,1.2S233.8,324,234.4,324z M244.9,324c0.3,0,0.5,0,0.7-0.1
-	s0.4-0.1,0.6-0.1v1.1c-0.2,0.1-0.4,0.1-0.7,0.2s-0.6,0.1-0.8,0.1c-1.9,0-2.8-1-2.8-2.9v-5.7h-1.4v-0.7l1.4-0.6l0.6-2.1h0.8v2.2h2.8
-	v1.1h-2.8v5.7c0,0.6,0.1,1,0.4,1.3S244.4,324,244.9,324z M252.5,316.5H250v8.5h-1.5v-8.5h-1.7v-0.7l1.7-0.5v-0.5
-	c0-2.4,1-3.6,3.1-3.6c0.5,0,1.1,0.1,1.8,0.3l-0.4,1.2c-0.6-0.2-1-0.3-1.4-0.3c-0.6,0-1,0.2-1.2,0.5s-0.4,1-0.4,1.8v0.6h2.5V316.5z
-	 M262.6,320.2c0,1.6-0.4,2.8-1.2,3.7s-1.9,1.3-3.3,1.3c-0.9,0-1.6-0.2-2.3-0.6s-1.2-1-1.5-1.7s-0.5-1.6-0.5-2.7
-	c0-1.6,0.4-2.8,1.2-3.7s1.9-1.3,3.3-1.3c1.3,0,2.4,0.4,3.2,1.3S262.6,318.6,262.6,320.2z M255.2,320.2c0,1.2,0.2,2.2,0.7,2.8
-	s1.2,1,2.2,1s1.7-0.3,2.2-1s0.7-1.6,0.7-2.8c0-1.2-0.2-2.2-0.7-2.8s-1.2-1-2.2-1c-1,0-1.7,0.3-2.2,0.9S255.2,318.9,255.2,320.2z
-	 M269.5,315.2c0.4,0,0.8,0,1.2,0.1l-0.2,1.4c-0.4-0.1-0.8-0.1-1.1-0.1c-0.8,0-1.4,0.3-2,0.9s-0.8,1.4-0.8,2.4v5.2h-1.5v-9.6h1.2
-	l0.2,1.8h0.1c0.4-0.6,0.8-1.1,1.3-1.5S268.9,315.2,269.5,315.2z M284.7,325v-6.3c0-0.8-0.2-1.3-0.5-1.7s-0.8-0.6-1.5-0.6
-	c-0.9,0-1.6,0.3-2,0.8s-0.7,1.3-0.7,2.4v5.4h-1.5v-6.3c0-0.8-0.2-1.3-0.5-1.7s-0.8-0.6-1.5-0.6c-0.9,0-1.6,0.3-2,0.8
-	s-0.6,1.4-0.6,2.7v5.1h-1.5v-9.6h1.2l0.2,1.3h0.1c0.3-0.5,0.7-0.8,1.2-1.1s1.1-0.4,1.7-0.4c1.5,0,2.5,0.5,3,1.6h0.1
-	c0.3-0.5,0.7-0.9,1.2-1.2s1.2-0.4,1.9-0.4c1.1,0,1.9,0.3,2.4,0.8s0.8,1.5,0.8,2.7v6.3H284.7z"/>
-<g>
-	<path class="st2" d="M374,340H10c-5.5,0-10-4.5-10-10V10C0,4.5,4.5,0,10,0h364c5.5,0,10,4.5,10,10v266h27v-8l20,18l-20,18v-8h-27
-		v34C384,335.5,379.5,340,374,340z M10,2c-4.4,0-8,3.6-8,8v320c0,4.4,3.6,8,8,8h364c4.4,0,8-3.6,8-8v-36h31v5.5l15-13.5l-15-13.5
-		v5.5h-31V10c0-4.4-3.6-8-8-8H10z"/>
-</g>
-<path class="st1" d="M103.7,203.4c0,1.5-0.5,2.7-1.6,3.5s-2.6,1.3-4.5,1.3c-2,0-3.6-0.3-4.7-0.8v-1.9c0.7,0.3,1.5,0.5,2.3,0.7
-	s1.6,0.3,2.5,0.3c1.3,0,2.3-0.3,3-0.8s1-1.2,1-2.1c0-0.6-0.1-1.1-0.4-1.5s-0.6-0.7-1.2-1s-1.4-0.7-2.5-1.1c-1.6-0.6-2.7-1.2-3.4-2
-	s-1-1.8-1-3.1c0-1.3,0.5-2.4,1.5-3.2s2.3-1.2,3.9-1.2c1.7,0,3.3,0.3,4.7,0.9l-0.6,1.7c-1.4-0.6-2.8-0.9-4.1-0.9
-	c-1.1,0-1.9,0.2-2.5,0.7s-0.9,1.1-0.9,1.9c0,0.6,0.1,1.1,0.3,1.5s0.6,0.7,1.1,1s1.3,0.7,2.4,1c1.8,0.6,3,1.3,3.7,2.1
-	S103.7,202.3,103.7,203.4z M123.3,208v-8.4c0-1-0.2-1.8-0.7-2.3s-1.1-0.8-2-0.8c-1.2,0-2.1,0.3-2.7,1s-0.9,1.8-0.9,3.2v7.2h-1.9
-	v-8.4c0-1-0.2-1.8-0.7-2.3s-1.1-0.8-2.1-0.8c-1.2,0-2.1,0.4-2.7,1.1s-0.8,1.9-0.8,3.6v6.7H107v-12.8h1.6l0.3,1.8h0.1
-	c0.4-0.6,0.9-1.1,1.6-1.5s1.4-0.5,2.2-0.5c2,0,3.3,0.7,3.9,2.2h0.1c0.4-0.7,0.9-1.2,1.7-1.6s1.6-0.6,2.5-0.6c1.5,0,2.5,0.4,3.3,1.1
-	s1.1,1.9,1.1,3.6v8.4H123.3z M137.2,208l-0.4-1.8h-0.1c-0.6,0.8-1.3,1.3-1.9,1.6s-1.4,0.4-2.4,0.4c-1.3,0-2.3-0.3-3-1
-	s-1.1-1.6-1.1-2.8c0-2.6,2.1-4,6.2-4.1l2.2-0.1v-0.8c0-1-0.2-1.8-0.7-2.2s-1.1-0.7-2.1-0.7c-1.1,0-2.3,0.3-3.6,1l-0.6-1.5
-	c0.6-0.3,1.3-0.6,2.1-0.8s1.5-0.3,2.3-0.3c1.5,0,2.7,0.3,3.4,1s1.1,1.8,1.1,3.3v8.8H137.2z M132.8,206.6c1.2,0,2.2-0.3,2.9-1
-	s1-1.6,1-2.8v-1.2l-1.9,0.1c-1.5,0.1-2.7,0.3-3.3,0.7s-1,1.1-1,2c0,0.7,0.2,1.2,0.6,1.6S132,206.6,132.8,206.6z M148.5,194.9
-	c0.6,0,1.1,0,1.5,0.1l-0.3,1.8c-0.5-0.1-1-0.2-1.4-0.2c-1,0-1.9,0.4-2.7,1.3s-1.1,1.9-1.1,3.2v6.9h-1.9v-12.8h1.6l0.2,2.4h0.1
-	c0.5-0.8,1.1-1.5,1.7-1.9S147.7,194.9,148.5,194.9z M156.6,206.6c0.3,0,0.7,0,1-0.1s0.6-0.1,0.8-0.2v1.5c-0.2,0.1-0.5,0.2-0.9,0.3
-	s-0.8,0.1-1.1,0.1c-2.5,0-3.7-1.3-3.7-3.9v-7.6h-1.8v-0.9l1.8-0.8l0.8-2.7h1.1v3h3.7v1.5h-3.7v7.6c0,0.8,0.2,1.4,0.6,1.8
-	S155.9,206.6,156.6,206.6z M174.8,192.4c-1.9,0-3.4,0.6-4.5,1.9s-1.6,3-1.6,5.2c0,2.2,0.5,4,1.6,5.2s2.5,1.8,4.5,1.8
-	c1.2,0,2.6-0.2,4.1-0.6v1.7c-1.2,0.4-2.7,0.7-4.4,0.7c-2.5,0-4.5-0.8-5.8-2.3s-2.1-3.7-2.1-6.5c0-1.8,0.3-3.3,1-4.6s1.6-2.4,2.9-3.1
-	s2.7-1.1,4.4-1.1c1.8,0,3.4,0.3,4.7,1l-0.8,1.7C177.4,192.7,176.1,192.4,174.8,192.4z M193.4,201.6c0,2.1-0.5,3.7-1.6,4.9
-	s-2.5,1.8-4.4,1.8c-1.1,0-2.2-0.3-3.1-0.8s-1.6-1.3-2.1-2.3s-0.7-2.2-0.7-3.5c0-2.1,0.5-3.7,1.6-4.9s2.5-1.8,4.4-1.8
-	c1.8,0,3.2,0.6,4.3,1.8S193.4,199.5,193.4,201.6z M183.6,201.6c0,1.6,0.3,2.9,1,3.8s1.6,1.3,2.9,1.3s2.2-0.4,2.9-1.3s1-2.1,1-3.8
-	c0-1.6-0.3-2.9-1-3.7s-1.6-1.3-2.9-1.3c-1.3,0-2.2,0.4-2.9,1.3S183.6,199.9,183.6,201.6z M205.6,208v-8.3c0-1-0.2-1.8-0.7-2.3
-	s-1.2-0.8-2.2-0.8c-1.3,0-2.3,0.4-3,1.1s-0.9,1.9-0.9,3.6v6.7h-1.9v-12.8h1.6l0.3,1.8h0.1c0.4-0.6,1-1.1,1.7-1.5s1.5-0.5,2.4-0.5
-	c1.5,0,2.7,0.4,3.5,1.1s1.2,1.9,1.2,3.6v8.4H205.6z M220.3,208v-8.3c0-1-0.2-1.8-0.7-2.3s-1.2-0.8-2.2-0.8c-1.3,0-2.3,0.4-3,1.1
-	s-0.9,1.9-0.9,3.6v6.7h-1.9v-12.8h1.6l0.3,1.8h0.1c0.4-0.6,1-1.1,1.7-1.5s1.5-0.5,2.4-0.5c1.5,0,2.7,0.4,3.5,1.1s1.2,1.9,1.2,3.6
-	v8.4H220.3z M231.7,208.2c-1.9,0-3.4-0.6-4.5-1.7s-1.6-2.8-1.6-4.8c0-2.1,0.5-3.7,1.5-4.9s2.4-1.8,4.1-1.8c1.6,0,2.9,0.5,3.8,1.6
-	s1.4,2.5,1.4,4.2v1.2h-8.8c0,1.5,0.4,2.7,1.1,3.4s1.7,1.2,3.1,1.2c1.4,0,2.8-0.3,4.1-0.9v1.7c-0.7,0.3-1.3,0.5-2,0.6
-	S232.5,208.2,231.7,208.2z M231.1,196.6c-1,0-1.9,0.3-2.5,1s-1,1.6-1.1,2.8h6.7c0-1.2-0.3-2.2-0.8-2.8S232.1,196.6,231.1,196.6z
-	 M244.8,208.2c-1.9,0-3.3-0.6-4.3-1.7s-1.5-2.8-1.5-4.9c0-2.1,0.5-3.8,1.6-5s2.5-1.8,4.4-1.8c0.6,0,1.2,0.1,1.9,0.2s1.1,0.3,1.5,0.5
-	l-0.6,1.7c-0.4-0.2-0.9-0.3-1.4-0.4s-1-0.2-1.3-0.2c-2.6,0-3.9,1.7-3.9,5c0,1.6,0.3,2.8,1,3.6s1.6,1.3,2.8,1.3
-	c1.1,0,2.2-0.2,3.3-0.7v1.7C247.2,208,246.1,208.2,244.8,208.2z M255.3,206.6c0.3,0,0.7,0,1-0.1s0.6-0.1,0.8-0.2v1.5
-	c-0.2,0.1-0.5,0.2-0.9,0.3s-0.8,0.1-1.1,0.1c-2.5,0-3.7-1.3-3.7-3.9v-7.6h-1.8v-0.9l1.8-0.8l0.8-2.7h1.1v3h3.7v1.5h-3.7v7.6
-	c0,0.8,0.2,1.4,0.6,1.8S254.6,206.6,255.3,206.6z M270.7,201.6c0,2.1-0.5,3.7-1.6,4.9s-2.5,1.8-4.4,1.8c-1.1,0-2.2-0.3-3.1-0.8
-	s-1.6-1.3-2.1-2.3s-0.7-2.2-0.7-3.5c0-2.1,0.5-3.7,1.6-4.9s2.5-1.8,4.4-1.8c1.8,0,3.2,0.6,4.3,1.8S270.7,199.5,270.7,201.6z
-	 M260.9,201.6c0,1.6,0.3,2.9,1,3.8s1.6,1.3,2.9,1.3s2.2-0.4,2.9-1.3s1-2.1,1-3.8c0-1.6-0.3-2.9-1-3.7s-1.6-1.3-2.9-1.3
-	c-1.3,0-2.2,0.4-2.9,1.3S260.9,199.9,260.9,201.6z M280,194.9c0.6,0,1.1,0,1.5,0.1l-0.3,1.8c-0.5-0.1-1-0.2-1.4-0.2
-	c-1,0-1.9,0.4-2.7,1.3s-1.1,1.9-1.1,3.2v6.9h-1.9v-12.8h1.6l0.2,2.4h0.1c0.5-0.8,1.1-1.5,1.7-1.9S279.1,194.9,280,194.9z
-	 M292.2,204.5c0,1.2-0.4,2.1-1.3,2.8s-2.1,1-3.8,1c-1.7,0-3-0.3-4-0.8v-1.8c0.6,0.3,1.3,0.6,2,0.7s1.4,0.3,2,0.3
-	c1,0,1.8-0.2,2.3-0.5s0.8-0.8,0.8-1.5c0-0.5-0.2-0.9-0.7-1.3s-1.3-0.8-2.5-1.3c-1.2-0.4-2-0.8-2.5-1.2s-0.9-0.7-1.1-1.1
-	s-0.4-0.9-0.4-1.5c0-1,0.4-1.9,1.3-2.5s2-0.9,3.5-0.9c1.4,0,2.7,0.3,4.1,0.8l-0.7,1.6c-1.3-0.5-2.5-0.8-3.5-0.8
-	c-0.9,0-1.6,0.1-2.1,0.4s-0.7,0.7-0.7,1.2c0,0.3,0.1,0.6,0.3,0.9s0.5,0.5,0.8,0.7s1.1,0.5,2.2,0.9c1.5,0.6,2.6,1.1,3.1,1.7
-	S292.2,203.6,292.2,204.5z"/>
-<g>
-	
-		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="182.3609" y1="364.2212" x2="182.3609" y2="364.5577" gradientTransform="matrix(338 0 0 -208 -61446 75918)">
-		<stop  offset="0" style="stop-color:#00BFB3"/>
-		<stop  offset="1" style="stop-color:#31C8FA"/>
-	</linearGradient>
-	<path class="st3" d="M351,230H33c-6.1,0-11-4.9-11-11V31c0-6.1,4.9-11,11-11h318c6.1,0,11,4.9,11,11v188
-		C362,225.1,357.1,230,351,230z M33,22c-5,0-9,4-9,9v188c0,5,4,9,9,9h318c5,0,9-4,9-9V31c0-5-4-9-9-9H33z"/>
-</g>
-<g>
-	
-		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="182.3609" y1="363.8472" x2="182.3609" y2="364.1945" gradientTransform="matrix(338 0 0 -48 -61446 17748)">
-		<stop  offset="0" style="stop-color:#00BFB3"/>
-		<stop  offset="1" style="stop-color:#31C8FA"/>
-	</linearGradient>
-	<path class="st4" d="M351,300H33c-6.1,0-11-4.9-11-11v-28c0-6.1,4.9-11,11-11h318c6.1,0,11,4.9,11,11v28
-		C362,295.1,357.1,300,351,300z M33,252c-5,0-9,4-9,9v28c0,5,4,9,9,9h318c5,0,9-4,9-9v-28c0-5-4-9-9-9H33z"/>
-</g>
-<path class="st1" d="M131.6,284.3H122v-17.2h9.6v1.8H124v5.5h7.1v1.8H124v6.3h7.6V284.3z M137.9,284.3l-4.9-12.9h2.1l2.8,7.7
-	c0.6,1.8,1,3,1.1,3.5h0.1c0.1-0.4,0.4-1.3,0.8-2.6c0.5-1.3,1.5-4.2,3.1-8.6h2.1l-4.9,12.9H137.9z M152.6,284.5
-	c-1.9,0-3.4-0.6-4.5-1.7s-1.7-2.8-1.7-4.8c0-2.1,0.5-3.7,1.5-5c1-1.2,2.4-1.8,4.1-1.8c1.6,0,2.9,0.5,3.8,1.6
-	c0.9,1.1,1.4,2.5,1.4,4.2v1.2h-8.9c0,1.5,0.4,2.7,1.1,3.4c0.7,0.8,1.7,1.2,3.1,1.2c1.4,0,2.8-0.3,4.1-0.9v1.7
-	c-0.7,0.3-1.3,0.5-2,0.6C154.3,284.5,153.5,284.5,152.6,284.5z M152.1,272.8c-1,0-1.9,0.3-2.5,1s-1,1.6-1.1,2.8h6.7
-	c0-1.2-0.3-2.2-0.8-2.8C153.9,273.1,153.1,272.8,152.1,272.8z M169.5,284.3V276c0-1.1-0.2-1.8-0.7-2.4s-1.2-0.8-2.2-0.8
-	c-1.3,0-2.3,0.4-3,1.1c-0.6,0.7-0.9,1.9-0.9,3.6v6.8h-2v-12.9h1.6l0.3,1.8h0.1c0.4-0.6,1-1.1,1.7-1.5c0.7-0.3,1.5-0.5,2.4-0.5
-	c1.6,0,2.7,0.4,3.5,1.1c0.8,0.7,1.2,1.9,1.2,3.6v8.4H169.5z M179.7,282.9c0.3,0,0.7,0,1-0.1s0.6-0.1,0.8-0.2v1.5
-	c-0.2,0.1-0.5,0.2-0.9,0.3c-0.4,0.1-0.8,0.1-1.1,0.1c-2.5,0-3.7-1.3-3.7-3.9v-7.7h-1.8V272l1.8-0.8l0.8-2.8h1.1v3h3.7v1.5h-3.7v7.6
-	c0,0.8,0.2,1.4,0.6,1.8C178.5,282.7,179,282.9,179.7,282.9z M190.6,267.1h4.9c2.3,0,3.9,0.3,5,1c1,0.7,1.5,1.8,1.5,3.2
-	c0,1-0.3,1.9-0.9,2.5c-0.6,0.7-1.4,1.1-2.5,1.3v0.1c2.6,0.4,3.9,1.8,3.9,4.1c0,1.5-0.5,2.7-1.6,3.6c-1,0.9-2.5,1.3-4.4,1.3h-6V267.1
-	z M192.6,274.5h3.3c1.4,0,2.4-0.2,3-0.7c0.6-0.4,0.9-1.2,0.9-2.2c0-1-0.3-1.7-1-2.1c-0.7-0.4-1.8-0.6-3.3-0.6h-2.9V274.5z
-	 M192.6,276.2v6.4h3.6c1.4,0,2.4-0.3,3.1-0.8c0.7-0.5,1.1-1.4,1.1-2.5c0-1.1-0.4-1.9-1.1-2.4c-0.7-0.5-1.8-0.8-3.3-0.8H192.6z
-	 M211.8,271.2c0.6,0,1.1,0,1.5,0.1l-0.3,1.8c-0.5-0.1-1-0.2-1.4-0.2c-1,0-1.9,0.4-2.7,1.3s-1.1,1.9-1.1,3.2v6.9h-2v-12.9h1.6
-	l0.2,2.4h0.1c0.5-0.8,1.1-1.5,1.7-1.9C210.2,271.4,211,271.2,211.8,271.2z M226.4,277.9c0,2.1-0.5,3.7-1.6,4.9s-2.5,1.8-4.4,1.8
-	c-1.2,0-2.2-0.3-3.1-0.8s-1.6-1.3-2.1-2.3c-0.5-1-0.7-2.2-0.7-3.6c0-2.1,0.5-3.7,1.6-4.9c1.1-1.2,2.5-1.8,4.4-1.8
-	c1.8,0,3.2,0.6,4.3,1.8C225.9,274.2,226.4,275.8,226.4,277.9z M216.6,277.9c0,1.6,0.3,2.9,1,3.8s1.6,1.3,2.9,1.3
-	c1.3,0,2.3-0.4,2.9-1.3c0.7-0.9,1-2.1,1-3.8c0-1.6-0.3-2.9-1-3.7c-0.7-0.9-1.6-1.3-2.9-1.3c-1.3,0-2.2,0.4-2.9,1.3
-	C216.9,274.9,216.6,276.2,216.6,277.9z M231.7,277.7c0.3-0.5,0.9-1.1,1.5-1.9l4.2-4.4h2.3l-5.2,5.5l5.6,7.4h-2.4l-4.6-6.1l-1.5,1.3
-	v4.8h-1.9V266h1.9v9.7C231.7,276.1,231.7,276.8,231.7,277.7L231.7,277.7z M247.4,284.5c-1.9,0-3.4-0.6-4.5-1.7
-	c-1.1-1.2-1.7-2.8-1.7-4.8c0-2.1,0.5-3.7,1.5-5c1-1.2,2.4-1.8,4.1-1.8c1.6,0,2.9,0.5,3.8,1.6c0.9,1.1,1.4,2.5,1.4,4.2v1.2h-8.9
-	c0,1.5,0.4,2.7,1.1,3.4c0.7,0.8,1.7,1.2,3.1,1.2c1.4,0,2.8-0.3,4.1-0.9v1.7c-0.7,0.3-1.3,0.5-2,0.6
-	C249.1,284.5,248.3,284.5,247.4,284.5z M246.9,272.8c-1,0-1.9,0.3-2.5,1s-1,1.6-1.1,2.8h6.7c0-1.2-0.3-2.2-0.8-2.8
-	C248.7,273.1,247.9,272.8,246.9,272.8z M261.4,271.2c0.6,0,1.1,0,1.5,0.1l-0.3,1.8c-0.5-0.1-1-0.2-1.4-0.2c-1,0-1.9,0.4-2.7,1.3
-	s-1.1,1.9-1.1,3.2v6.9h-2v-12.9h1.6l0.2,2.4h0.1c0.5-0.8,1.1-1.5,1.7-1.9C259.8,271.4,260.6,271.2,261.4,271.2z"/>
-<path d="M411.6,318.9c-1.1,0-2,0.4-2.6,1.1s-1,1.7-1,3c0,1.3,0.3,2.3,0.9,3s1.5,1.1,2.6,1.1c0.7,0,1.5-0.1,2.4-0.4v1
-	c-0.7,0.3-1.5,0.4-2.6,0.4c-1.5,0-2.6-0.4-3.4-1.3s-1.2-2.2-1.2-3.8c0-1,0.2-1.9,0.6-2.7s0.9-1.4,1.7-1.8s1.6-0.6,2.6-0.6
-	c1,0,2,0.2,2.7,0.6l-0.5,1C413.1,319.1,412.4,318.9,411.6,318.9z M421.7,328h-5.6v-10h5.6v1h-4.4v3.2h4.1v1h-4.1v3.7h4.4V328z
-	 M425.1,328h-1.2v-10h5.6v1h-4.4v3.7h4.1v1h-4.1V328z"/>
-<g>
-	
-		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="184.8176" y1="364.0952" x2="184.8176" y2="364.4354" gradientTransform="matrix(318 0 0 -98 -58167 35868)">
-		<stop  offset="0" style="stop-color:#00BFB3"/>
-		<stop  offset="1" style="stop-color:#31C8FA"/>
-	</linearGradient>
-	<path class="st5" d="M754,220H456c-6.1,0-11-4.9-11-11v-78c0-6.1,4.9-11,11-11h298c6.1,0,11,4.9,11,11v78
-		C765,215.1,760.1,220,754,220z M456,122c-5,0-9,4-9,9v78c0,5,4,9,9,9h298c5,0,9-4,9-9v-78c0-5-4-9-9-9H456z"/>
-</g>
-<g transform="translate(181 143)">
-	<path class="st0" d="M322.4,18.9h-14.2c0.1,0.3,0.2,0.6,0.3,1c0.4,1.6,0.7,3.3,0.9,5c0.1,0.7,0.1,1.4,0.1,2.1s0,1.4-0.1,2.1
-		c-0.1,1.7-0.4,3.4-0.9,5c-0.1,0.3-0.2,0.6-0.3,1h14.2c4.5,0,8.1-3.6,8.1-8.1C330.5,22.5,326.9,18.9,322.4,18.9"/>
-	<path class="st6" d="M309.4,29.1c0.1-0.7,0.1-1.4,0.1-2.1c0-0.7,0-1.4-0.1-2.1c-0.1-1.7-0.4-3.4-0.9-5c-0.1-0.3-0.2-0.6-0.3-1h-22
-		c-0.8,2.6-1.2,5.3-1.2,8.1c0,2.8,0.4,5.5,1.2,8.1h22c0.1-0.3,0.2-0.6,0.3-1C308.9,32.5,309.2,30.8,309.4,29.1"/>
-	<path class="st7" d="M324.9,37.8h-17.7c-0.5,1.2-1.1,2.4-1.8,3.5c-1,1.7-2.3,3.2-3.6,4.6c-0.5,0.5-0.9,0.9-1.4,1.3
-		c-1,0.9-2,1.7-3.1,2.4c4.3,2.8,9.4,4.5,14.9,4.5c9.4,0,17.7-4.8,22.6-12C332.3,39.4,328.8,37.8,324.9,37.8"/>
-	<path class="st8" d="M305.4,41.3c0.7-1.1,1.3-2.3,1.8-3.5h-19.9c2.1,4.8,5.6,8.9,10,11.7c1.1-0.7,2.1-1.5,3.1-2.4
-		c0.5-0.4,1-0.9,1.4-1.3C303.1,44.5,304.3,42.9,305.4,41.3"/>
-	<path class="st9" d="M301.7,8.2c-0.5-0.5-0.9-0.9-1.4-1.3c-1-0.9-2-1.7-3.1-2.4c-4.4,2.9-7.8,6.9-10,11.7h19.9
-		c-0.5-1.2-1.1-2.4-1.8-3.5C304.3,11.1,303.1,9.5,301.7,8.2"/>
-	<path class="st10" d="M312.2,0c-5.5,0-10.7,1.6-14.9,4.5c1.1,0.7,2.1,1.5,3.1,2.4c0.5,0.4,1,0.9,1.4,1.3c1.4,1.4,2.6,2.9,3.6,4.6
-		c0.7,1.1,1.3,2.3,1.8,3.5h17.7c3.9,0,7.4-1.6,9.9-4.2C329.9,4.8,321.6,0,312.2,0"/>
-</g>
-<g>
-	
-		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="184.8176" y1="364.0952" x2="184.8176" y2="364.4354" gradientTransform="matrix(318 0 0 -98 -58167 35988)">
-		<stop  offset="0" style="stop-color:#00BFB3"/>
-		<stop  offset="1" style="stop-color:#31C8FA"/>
-	</linearGradient>
-	<path class="st11" d="M754,340H456c-6.1,0-11-4.9-11-11v-78c0-6.1,4.9-11,11-11h298c6.1,0,11,4.9,11,11v78
-		C765,335.1,760.1,340,754,340z M456,242c-5,0-9,4-9,9v78c0,5,4,9,9,9h298c5,0,9-4,9-9v-78c0-5-4-9-9-9H456z"/>
-</g>
-<g transform="translate(25 25)">
-	<path class="st10" d="M452.8,240h-7.5v27.5h22.5V255C467.8,247,460.8,240,452.8,240"/>
-	<path class="st6" d="M445.2,270.6c0,10.9,11.6,19.4,22.5,19.4v-22.5h-22.5V270.6z"/>
-	<polygon class="st7" points="472.8,290 487.8,290 487.8,267.5 472.8,267.5 	"/>
-	<polygon class="st8" points="467.8,290 472.8,290 472.8,267.5 467.8,267.5 	"/>
-</g>
-<path class="st1" d="M556.4,298v-17.1h2v15.3h7.6v1.8H556.4z M579.6,291.6c0,2.1-0.5,3.7-1.6,4.9s-2.5,1.8-4.4,1.8
-	c-1.1,0-2.2-0.3-3.1-0.8s-1.6-1.3-2.1-2.3s-0.7-2.2-0.7-3.5c0-2.1,0.5-3.7,1.6-4.9s2.5-1.8,4.4-1.8c1.8,0,3.2,0.6,4.3,1.8
-	S579.6,289.5,579.6,291.6z M569.8,291.6c0,1.6,0.3,2.9,1,3.8s1.6,1.3,2.9,1.3s2.2-0.4,2.9-1.3s1-2.1,1-3.8c0-1.6-0.3-2.9-1-3.7
-	s-1.6-1.3-2.9-1.3c-1.3,0-2.2,0.4-2.9,1.3S569.8,289.9,569.8,291.6z M593.5,285.2v1.2l-2.4,0.3c0.2,0.3,0.4,0.6,0.6,1.1
-	s0.3,0.9,0.3,1.5c0,1.3-0.4,2.3-1.3,3s-2,1.1-3.5,1.1c-0.4,0-0.7,0-1.1-0.1c-0.8,0.4-1.2,1-1.2,1.7c0,0.4,0.1,0.6,0.4,0.8
-	s0.8,0.3,1.5,0.3h2.3c1.4,0,2.5,0.3,3.2,0.9s1.1,1.4,1.1,2.6c0,1.4-0.6,2.5-1.7,3.3s-2.8,1.1-5,1.1c-1.7,0-3-0.3-3.9-0.9
-	s-1.4-1.5-1.4-2.6c0-0.8,0.2-1.5,0.8-2s1.2-1,2.1-1.2c-0.3-0.1-0.6-0.4-0.8-0.7s-0.3-0.7-0.3-1.1c0-0.5,0.1-0.9,0.4-1.2
-	s0.6-0.7,1.2-1c-0.7-0.3-1.2-0.7-1.6-1.4s-0.6-1.4-0.6-2.2c0-1.4,0.4-2.5,1.3-3.3s2-1.1,3.6-1.1c0.7,0,1.3,0.1,1.8,0.2H593.5z
-	 M583.3,300.2c0,0.7,0.3,1.2,0.9,1.6s1.4,0.5,2.5,0.5c1.6,0,2.8-0.2,3.6-0.7s1.2-1.2,1.2-2c0-0.7-0.2-1.2-0.6-1.4s-1.2-0.4-2.4-0.4
-	h-2.3c-0.9,0-1.6,0.2-2.1,0.6S583.3,299.4,583.3,300.2z M584.3,289.3c0,0.9,0.3,1.6,0.8,2s1.2,0.7,2.1,0.7c1.9,0,2.8-0.9,2.8-2.8
-	c0-1.9-1-2.9-2.9-2.9c-0.9,0-1.6,0.2-2.1,0.7S584.3,288.3,584.3,289.3z M604.4,294.5c0,1.2-0.4,2.1-1.3,2.8s-2.1,1-3.8,1
-	c-1.7,0-3-0.3-4-0.8v-1.8c0.6,0.3,1.3,0.6,2,0.7s1.4,0.3,2,0.3c1,0,1.8-0.2,2.3-0.5s0.8-0.8,0.8-1.5c0-0.5-0.2-0.9-0.7-1.3
-	s-1.3-0.8-2.5-1.3c-1.2-0.4-2-0.8-2.5-1.2s-0.9-0.7-1.1-1.1s-0.4-0.9-0.4-1.5c0-1,0.4-1.9,1.3-2.5s2-0.9,3.5-0.9
-	c1.4,0,2.7,0.3,4.1,0.8l-0.7,1.6c-1.3-0.5-2.5-0.8-3.5-0.8c-0.9,0-1.6,0.1-2.1,0.4s-0.7,0.7-0.7,1.2c0,0.3,0.1,0.6,0.3,0.9
-	s0.5,0.5,0.8,0.7s1.1,0.5,2.2,0.9c1.5,0.6,2.6,1.1,3.1,1.7S604.4,293.6,604.4,294.5z M611.8,296.6c0.3,0,0.7,0,1-0.1
-	s0.6-0.1,0.8-0.2v1.5c-0.2,0.1-0.5,0.2-0.9,0.3s-0.8,0.1-1.1,0.1c-2.5,0-3.7-1.3-3.7-3.9v-7.6h-1.8v-0.9l1.8-0.8l0.8-2.7h1.1v3h3.7
-	v1.5h-3.7v7.6c0,0.8,0.2,1.4,0.6,1.8S611.1,296.6,611.8,296.6z M624,298l-0.4-1.8h-0.1c-0.6,0.8-1.3,1.3-1.9,1.6s-1.4,0.4-2.4,0.4
-	c-1.3,0-2.3-0.3-3-1s-1.1-1.6-1.1-2.8c0-2.6,2.1-4,6.2-4.1l2.2-0.1v-0.8c0-1-0.2-1.8-0.7-2.2s-1.1-0.7-2.1-0.7c-1.1,0-2.3,0.3-3.6,1
-	l-0.6-1.5c0.6-0.3,1.3-0.6,2.1-0.8s1.5-0.3,2.3-0.3c1.5,0,2.7,0.3,3.4,1s1.1,1.8,1.1,3.3v8.8H624z M619.6,296.6c1.2,0,2.2-0.3,2.9-1
-	s1-1.6,1-2.8v-1.2l-1.9,0.1c-1.5,0.1-2.7,0.3-3.3,0.7s-1,1.1-1,2c0,0.7,0.2,1.2,0.6,1.6S618.8,296.6,619.6,296.6z M637.7,294.5
-	c0,1.2-0.4,2.1-1.3,2.8s-2.1,1-3.8,1c-1.7,0-3-0.3-4-0.8v-1.8c0.6,0.3,1.3,0.6,2,0.7s1.4,0.3,2,0.3c1,0,1.8-0.2,2.3-0.5
-	s0.8-0.8,0.8-1.5c0-0.5-0.2-0.9-0.7-1.3s-1.3-0.8-2.5-1.3c-1.2-0.4-2-0.8-2.5-1.2s-0.9-0.7-1.1-1.1s-0.4-0.9-0.4-1.5
-	c0-1,0.4-1.9,1.3-2.5s2-0.9,3.5-0.9c1.4,0,2.7,0.3,4.1,0.8l-0.7,1.6c-1.3-0.5-2.5-0.8-3.5-0.8c-0.9,0-1.6,0.1-2.1,0.4
-	s-0.7,0.7-0.7,1.2c0,0.3,0.1,0.6,0.3,0.9s0.5,0.5,0.8,0.7s1.1,0.5,2.2,0.9c1.5,0.6,2.6,1.1,3.1,1.7S637.7,293.6,637.7,294.5z
-	 M649.7,298v-8.3c0-1-0.2-1.8-0.7-2.3s-1.2-0.8-2.2-0.8c-1.4,0-2.3,0.4-3,1.1s-0.9,1.9-0.9,3.6v6.7h-1.9v-18.2h1.9v5.5
-	c0,0.7,0,1.2-0.1,1.7h0.1c0.4-0.6,0.9-1.1,1.6-1.5s1.5-0.5,2.4-0.5c1.6,0,2.7,0.4,3.5,1.1s1.2,1.9,1.2,3.6v8.4H649.7z"/>
-<g>
-	
-		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="184.8176" y1="364.0952" x2="184.8176" y2="364.4354" gradientTransform="matrix(318 0 0 -98 -58167 35748)">
-		<stop  offset="0" style="stop-color:#00BFB3"/>
-		<stop  offset="1" style="stop-color:#31C8FA"/>
-	</linearGradient>
-	<path class="st12" d="M754,100H456c-6.1,0-11-4.9-11-11V11c0-6.1,4.9-11,11-11h298c6.1,0,11,4.9,11,11v78
-		C765,95.1,760.1,100,754,100z M456,2c-5,0-9,4-9,9v78c0,5,4,9,9,9h298c5,0,9-4,9-9V11c0-5-4-9-9-9H456z"/>
-</g>
-<g transform="translate(27 25)">
-	<path class="st8" d="M464.2,22.8L445.8,45v5h2.3l20.6-24.7C467.3,24.4,465.8,23.6,464.2,22.8"/>
-	<path class="st13" d="M468.7,25.3L448.1,50h35.2C483.2,39.9,477.5,31,468.7,25.3"/>
-	<path class="st6" d="M445.8,45l18.5-22.2c-5.5-2.6-11.8-14.1-18.5-14.1V45z"/>
-	<path class="st14" d="M445.8,0v18.8c6.7,0,13,1.5,18.5,4.1l19-22.8H445.8z"/>
-</g>
-<path class="st1" d="M568.7,58h-2.3l-6.2-8.3l-1.8,1.6V58h-2V40.9h2v8.5l7.8-8.5h2.4l-6.9,7.4L568.7,58z M572.7,58h-1.9V45.2h1.9V58
-	z M570.6,41.7c0-0.4,0.1-0.8,0.3-1s0.5-0.3,0.8-0.3c0.3,0,0.6,0.1,0.8,0.3s0.3,0.5,0.3,1s-0.1,0.8-0.3,1s-0.5,0.3-0.8,0.3
-	c-0.3,0-0.6-0.1-0.8-0.3S570.6,42.1,570.6,41.7z M582.8,44.9c1.7,0,3,0.6,3.9,1.7s1.4,2.8,1.4,4.9s-0.5,3.7-1.4,4.9
-	s-2.2,1.8-3.9,1.8c-0.8,0-1.6-0.2-2.3-0.5s-1.3-0.8-1.7-1.4h-0.1l-0.4,1.7h-1.4V39.8h1.9v4.4c0,1,0,1.9-0.1,2.7h0.1
-	C579.7,45.6,581.1,44.9,582.8,44.9z M582.6,46.6c-1.3,0-2.3,0.4-2.9,1.1s-0.9,2-0.9,3.8s0.3,3.1,0.9,3.9s1.6,1.2,2.9,1.2
-	c1.2,0,2.1-0.4,2.7-1.3s0.9-2.1,0.9-3.8c0-1.7-0.3-2.9-0.9-3.7S583.8,46.6,582.6,46.6z M599.5,58l-0.4-1.8H599
-	c-0.6,0.8-1.3,1.3-1.9,1.6s-1.4,0.4-2.4,0.4c-1.3,0-2.3-0.3-3-1s-1.1-1.6-1.1-2.8c0-2.6,2.1-4,6.2-4.1l2.2-0.1v-0.8
-	c0-1-0.2-1.8-0.7-2.2s-1.1-0.7-2.1-0.7c-1.1,0-2.3,0.3-3.6,1l-0.6-1.5c0.6-0.3,1.3-0.6,2.1-0.8s1.5-0.3,2.3-0.3c1.5,0,2.7,0.3,3.4,1
-	s1.1,1.8,1.1,3.3V58H599.5z M595.1,56.6c1.2,0,2.2-0.3,2.9-1s1-1.6,1-2.8v-1.2l-1.9,0.1c-1.5,0.1-2.7,0.3-3.3,0.7s-1,1.1-1,2
-	c0,0.7,0.2,1.2,0.6,1.6S594.3,56.6,595.1,56.6z M613.7,58v-8.3c0-1-0.2-1.8-0.7-2.3s-1.2-0.8-2.2-0.8c-1.3,0-2.3,0.4-3,1.1
-	s-0.9,1.9-0.9,3.6V58h-1.9V45.2h1.6l0.3,1.8h0.1c0.4-0.6,1-1.1,1.7-1.5s1.5-0.5,2.4-0.5c1.5,0,2.7,0.4,3.5,1.1s1.2,1.9,1.2,3.6V58
-	H613.7z M627.5,58l-0.4-1.8h-0.1c-0.6,0.8-1.3,1.3-1.9,1.6s-1.4,0.4-2.4,0.4c-1.3,0-2.3-0.3-3-1s-1.1-1.6-1.1-2.8
-	c0-2.6,2.1-4,6.2-4.1l2.2-0.1v-0.8c0-1-0.2-1.8-0.7-2.2s-1.1-0.7-2.1-0.7c-1.1,0-2.3,0.3-3.6,1l-0.6-1.5c0.6-0.3,1.3-0.6,2.1-0.8
-	s1.5-0.3,2.3-0.3c1.5,0,2.7,0.3,3.4,1s1.1,1.8,1.1,3.3V58H627.5z M623.2,56.6c1.2,0,2.2-0.3,2.9-1s1-1.6,1-2.8v-1.2l-1.9,0.1
-	c-1.5,0.1-2.7,0.3-3.3,0.7s-1,1.1-1,2c0,0.7,0.2,1.2,0.6,1.6S622.4,56.6,623.2,56.6z"/>
-<g>
-	
-		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="188.8406" y1="364.2643" x2="188.8406" y2="364.5996" gradientTransform="matrix(138 0 0 -338 -25207 123348)">
-		<stop  offset="0" style="stop-color:#00BFB3"/>
-		<stop  offset="1" style="stop-color:#31C8FA"/>
-	</linearGradient>
-	<path class="st15" d="M912,340H794c-6.1,0-11-4.9-11-11V11c0-6.1,4.9-11,11-11h118c6.1,0,11,4.9,11,11v318
-		C923,335.1,918.1,340,912,340z M794,2c-5,0-9,4-9,9v318c0,5,4,9,9,9h118c5,0,9-4,9-9V11c0-5-4-9-9-9H794z"/>
-</g>
-<g transform="translate(45 123)">
-	<path class="st10" d="M820.3,25L808,12.7l10.5-10.5c2.9-2.9,7.6-2.9,10.5,0l1.8,1.8c2.9,2.9,2.9,7.6,0,10.5L820.3,25z"/>
-	<path class="st16" d="M795.7,25l-10.5,10.5c-2.9,2.9-2.9,7.6,0,10.5l1.8,1.8c2.9,2.9,7.6,2.9,10.5,0L808,37.3L795.7,25z"/>
-	<path class="st0" d="M818.5,23.2L797.5,2.2c-2.9-2.9-7.6-2.9-10.5,0l-1.8,1.8c-2.9,2.9-2.9,7.6,0,10.5L795.7,25l1.8-1.8
-		C803.3,17.4,812.7,17.4,818.5,23.2"/>
-	<path class="st17" d="M818.5,23.2c-5.8-5.8-15.2-5.8-21.1,0l-1.8,1.8L808,37.3L820.3,25L818.5,23.2z"/>
-	<path class="st7" d="M830.8,35.5l-7-7l-12.3,12.3l7,7c2.9,2.9,7.6,2.9,10.5,0l1.8-1.8C833.7,43.2,833.7,38.4,830.8,35.5"/>
-	<polygon class="st8" points="820.3,25 808,37.3 811.5,40.8 823.8,28.5 	"/>
-</g>
-<path class="st1" d="M829.8,210h-2.3l-4.6-7.5l-4.7,7.5h-2.1l5.7-9l-5.3-8.2h2.2l4.3,6.8l4.3-6.8h2.1L824,201L829.8,210z
-	 M830.8,204.5v-1.8h5.8v1.8H830.8z M850.8,197.9c0,1.7-0.6,3.1-1.8,4s-2.9,1.4-5.1,1.4h-2v6.7h-2v-17.1h4.4
-	C848.7,192.9,850.8,194.5,850.8,197.9z M841.9,201.6h1.8c1.8,0,3-0.3,3.8-0.9s1.2-1.5,1.2-2.7c0-1.1-0.4-2-1.1-2.5s-1.9-0.8-3.5-0.8
-	h-2.2V201.6z M862,210l-0.4-1.8h-0.1c-0.6,0.8-1.3,1.3-1.9,1.6s-1.4,0.4-2.4,0.4c-1.3,0-2.3-0.3-3-1s-1.1-1.6-1.1-2.8
-	c0-2.6,2.1-4,6.2-4.1l2.2-0.1v-0.8c0-1-0.2-1.8-0.7-2.2s-1.1-0.7-2.1-0.7c-1.1,0-2.3,0.3-3.6,1l-0.6-1.5c0.6-0.3,1.3-0.6,2.1-0.8
-	s1.5-0.3,2.3-0.3c1.5,0,2.7,0.3,3.4,1s1.1,1.8,1.1,3.3v8.8H862z M857.6,208.6c1.2,0,2.2-0.3,2.9-1s1-1.6,1-2.8v-1.2l-1.9,0.1
-	c-1.5,0.1-2.7,0.3-3.3,0.7s-1,1.1-1,2c0,0.7,0.2,1.2,0.6,1.6S856.8,208.6,857.6,208.6z M872.6,210.2c-1.9,0-3.3-0.6-4.3-1.7
-	s-1.5-2.8-1.5-4.9c0-2.1,0.5-3.8,1.6-5s2.5-1.8,4.4-1.8c0.6,0,1.2,0.1,1.9,0.2s1.1,0.3,1.5,0.5l-0.6,1.7c-0.4-0.2-0.9-0.3-1.4-0.4
-	s-1-0.2-1.3-0.2c-2.6,0-3.9,1.7-3.9,5c0,1.6,0.3,2.8,1,3.6s1.6,1.3,2.8,1.3c1.1,0,2.2-0.2,3.3-0.7v1.7
-	C875,210,873.9,210.2,872.6,210.2z M880.8,203.4c0.3-0.5,0.8-1.1,1.5-1.9l4.1-4.4h2.3l-5.2,5.5l5.6,7.4h-2.4l-4.5-6.1l-1.5,1.3v4.8
-	h-1.9v-18.2h1.9v9.7C880.8,201.9,880.8,202.5,880.8,203.4L880.8,203.4z"/>
-<g>
-	<polygon class="st1" points="556.4,178 565.9,178 565.9,176.2 558.3,176.2 558.3,169.9 565.4,169.9 565.4,168.2 558.3,168.2 
-		558.3,162.6 565.9,162.6 565.9,160.9 556.4,160.9 	"/>
-	<rect x="569.4" y="159.8" class="st1" width="1.9" height="18.2"/>
-	<path class="st1" d="M580.3,164.9c-0.8,0-1.5,0.1-2.3,0.3s-1.4,0.5-2.1,0.8l0.6,1.5c1.4-0.7,2.6-1,3.6-1c1,0,1.6,0.2,2.1,0.7
-		s0.7,1.2,0.7,2.2v0.8l-2.2,0.1c-4.1,0.1-6.2,1.5-6.2,4.1c0,1.2,0.4,2.1,1.1,2.8s1.7,1,3,1c1,0,1.7-0.1,2.4-0.4s1.3-0.8,1.9-1.6h0.1
-		l0.4,1.8h1.4v-8.8c0-1.5-0.4-2.6-1.1-3.3S581.8,164.9,580.3,164.9z M582.9,172.8c0,1.2-0.3,2.1-1,2.8s-1.6,1-2.9,1
-		c-0.8,0-1.4-0.2-1.8-0.6s-0.6-0.9-0.6-1.6c0-0.9,0.3-1.6,1-2s1.8-0.7,3.3-0.7l1.9-0.1V172.8z"/>
-	<path class="st1" d="M593.2,170.7c-1.1-0.4-1.9-0.7-2.2-0.9s-0.7-0.4-0.8-0.7s-0.3-0.5-0.3-0.9c0-0.5,0.2-0.9,0.7-1.2
-		s1.2-0.4,2.1-0.4c1,0,2.2,0.3,3.5,0.8l0.7-1.6c-1.3-0.6-2.7-0.8-4.1-0.8c-1.5,0-2.7,0.3-3.5,0.9s-1.3,1.4-1.3,2.5
-		c0,0.6,0.1,1.1,0.4,1.5s0.6,0.8,1.1,1.1s1.4,0.7,2.5,1.2c1.3,0.5,2.1,0.9,2.5,1.3s0.7,0.8,0.7,1.3c0,0.7-0.3,1.2-0.8,1.5
-		s-1.3,0.5-2.3,0.5c-0.7,0-1.3-0.1-2-0.3s-1.4-0.4-2-0.7v1.8c1,0.5,2.3,0.8,4,0.8c1.6,0,2.9-0.3,3.8-1s1.3-1.6,1.3-2.8
-		c0-0.9-0.3-1.6-0.8-2.1S594.7,171.3,593.2,170.7z"/>
-	<path class="st1" d="M604.4,176.6c-0.6,0-1.1-0.2-1.5-0.6s-0.6-1-0.6-1.8v-7.6h3.7v-1.5h-3.7v-3h-1.1l-0.8,2.7l-1.8,0.8v0.9h1.8
-		v7.6c0,2.6,1.2,3.9,3.7,3.9c0.3,0,0.7,0,1.1-0.1s0.7-0.2,0.9-0.3v-1.5c-0.2,0.1-0.4,0.1-0.8,0.2S604.8,176.6,604.4,176.6z"/>
-	<rect x="608.8" y="165.2" class="st1" width="1.9" height="12.8"/>
-	<path class="st1" d="M609.7,160.4c-0.3,0-0.6,0.1-0.8,0.3s-0.3,0.5-0.3,1c0,0.4,0.1,0.8,0.3,1s0.5,0.3,0.8,0.3
-		c0.3,0,0.6-0.1,0.8-0.3s0.3-0.5,0.3-1s-0.1-0.8-0.3-1S610,160.4,609.7,160.4z"/>
-	<path class="st1" d="M620,166.6c0.4,0,0.8,0.1,1.3,0.2s1,0.3,1.4,0.4l0.6-1.7c-0.4-0.2-0.8-0.3-1.5-0.5s-1.2-0.2-1.9-0.2
-		c-1.9,0-3.4,0.6-4.4,1.8s-1.6,2.8-1.6,5c0,2.1,0.5,3.7,1.5,4.9s2.5,1.7,4.3,1.7c1.3,0,2.4-0.2,3.2-0.7v-1.7
-		c-1.1,0.5-2.2,0.7-3.3,0.7c-1.2,0-2.2-0.4-2.8-1.3s-1-2.1-1-3.6C616.1,168.3,617.4,166.6,620,166.6z"/>
-	<path class="st1" d="M630.6,170.7c-1.1-0.4-1.9-0.7-2.2-0.9s-0.7-0.4-0.8-0.7s-0.3-0.5-0.3-0.9c0-0.5,0.2-0.9,0.7-1.2
-		s1.2-0.4,2.1-0.4c1,0,2.2,0.3,3.5,0.8l0.7-1.6c-1.3-0.6-2.7-0.8-4.1-0.8c-1.5,0-2.7,0.3-3.5,0.9s-1.3,1.4-1.3,2.5
-		c0,0.6,0.1,1.1,0.4,1.5s0.6,0.8,1.1,1.1s1.4,0.7,2.5,1.2c1.3,0.5,2.1,0.9,2.5,1.3s0.7,0.8,0.7,1.3c0,0.7-0.3,1.2-0.8,1.5
-		s-1.3,0.5-2.3,0.5c-0.7,0-1.3-0.1-2-0.3s-1.4-0.4-2-0.7v1.8c1,0.5,2.3,0.8,4,0.8c1.6,0,2.9-0.3,3.8-1s1.3-1.6,1.3-2.8
-		c0-0.9-0.3-1.6-0.8-2.1S632.2,171.3,630.6,170.7z"/>
-	<path class="st1" d="M642.6,164.9c-1.7,0-3.1,0.6-4.1,1.8s-1.5,2.9-1.5,4.9c0,2.1,0.5,3.7,1.6,4.8s2.6,1.7,4.5,1.7
-		c0.9,0,1.6-0.1,2.2-0.2s1.3-0.3,2-0.6v-1.7c-1.4,0.6-2.7,0.9-4.1,0.9c-1.3,0-2.3-0.4-3.1-1.2s-1.1-1.9-1.1-3.4h8.8v-1.2
-		c0-1.7-0.5-3.1-1.4-4.2S644.2,164.9,642.6,164.9z M639,170.3c0.1-1.2,0.5-2.1,1.1-2.8s1.4-1,2.5-1c1,0,1.8,0.3,2.3,1
-		s0.8,1.6,0.8,2.8H639z"/>
-	<path class="st1" d="M656,164.9c-0.8,0-1.5,0.1-2.3,0.3s-1.4,0.5-2.1,0.8l0.6,1.5c1.4-0.7,2.6-1,3.6-1c1,0,1.6,0.2,2.1,0.7
-		s0.7,1.2,0.7,2.2v0.8l-2.2,0.1c-4.1,0.1-6.2,1.5-6.2,4.1c0,1.2,0.4,2.1,1.1,2.8s1.7,1,3,1c1,0,1.7-0.1,2.4-0.4s1.3-0.8,1.9-1.6h0.1
-		l0.4,1.8h1.4v-8.8c0-1.5-0.4-2.6-1.1-3.3S657.5,164.9,656,164.9z M658.6,172.8c0,1.2-0.3,2.1-1,2.8s-1.6,1-2.9,1
-		c-0.8,0-1.4-0.2-1.8-0.6s-0.6-0.9-0.6-1.6c0-0.9,0.3-1.6,1-2s1.8-0.7,3.3-0.7l1.9-0.1V172.8z"/>
-	<path class="st1" d="M668.2,165.6c-0.7,0.5-1.2,1.1-1.7,1.9h-0.1l-0.2-2.4h-1.6V178h1.9v-6.9c0-1.3,0.4-2.3,1.1-3.2
-		s1.6-1.3,2.7-1.3c0.4,0,0.9,0.1,1.4,0.2l0.3-1.8c-0.5-0.1-1-0.1-1.5-0.1C669.6,164.9,668.8,165.1,668.2,165.6z"/>
-	<path class="st1" d="M679,166.6c0.4,0,0.8,0.1,1.3,0.2s1,0.3,1.4,0.4l0.6-1.7c-0.4-0.2-0.8-0.3-1.5-0.5s-1.2-0.2-1.9-0.2
-		c-1.9,0-3.4,0.6-4.4,1.8s-1.6,2.8-1.6,5c0,2.1,0.5,3.7,1.5,4.9s2.5,1.7,4.3,1.7c1.3,0,2.4-0.2,3.2-0.7v-1.7
-		c-1.1,0.5-2.2,0.7-3.3,0.7c-1.2,0-2.2-0.4-2.8-1.3s-1-2.1-1-3.6C675.1,168.3,676.4,166.6,679,166.6z"/>
-	<path class="st1" d="M694.8,166.1c-0.8-0.7-2-1.1-3.5-1.1c-0.9,0-1.7,0.2-2.4,0.5s-1.3,0.8-1.6,1.5h-0.1c0.1-0.4,0.1-1,0.1-1.7
-		v-5.5h-1.9V178h1.9v-6.7c0-1.7,0.3-2.9,0.9-3.6s1.6-1.1,3-1.1c1,0,1.8,0.3,2.2,0.8s0.7,1.3,0.7,2.3v8.3h1.9v-8.4
-		C696,168,695.6,166.8,694.8,166.1z"/>
-</g>
-</svg>
diff --git a/docs/static/images/arcsight-diagram-smart-connectors.svg b/docs/static/images/arcsight-diagram-smart-connectors.svg
deleted file mode 100644
index 2aaa74545..000000000
--- a/docs/static/images/arcsight-diagram-smart-connectors.svg
+++ /dev/null
@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="923px" height="340px" viewBox="0 0 923 340" style="enable-background:new 0 0 923 340;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:url(#SVGID_1_);}
-	.st1{fill:#00A9E5;}
-	.st2{fill:#231F20;}
-	.st3{fill:#00BFB3;}
-	.st4{fill:#019B8F;}
-	.st5{fill:#F9B110;}
-	.st6{fill:#FED10A;}
-	.st7{fill:#444444;}
-	.st8{fill:url(#SVGID_2_);}
-	.st9{fill:url(#SVGID_3_);}
-	.st10{fill:#3EBEB0;}
-	.st11{fill:#F04E98;}
-	.st12{fill:#0078A0;}
-	.st13{fill:url(#SVGID_4_);}
-	.st14{fill:#353535;}
-	.st15{fill:url(#SVGID_5_);}
-</style>
-<g>
-	<g>
-		
-			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-35.4937" y1="108.2211" x2="-35.4937" y2="107.8809" gradientTransform="matrix(318 0 0 98 11890 -10419)">
-			<stop  offset="0" style="stop-color:#00BFB3"/>
-			<stop  offset="1" style="stop-color:#31C8FA"/>
-		</linearGradient>
-		<path class="st0" d="M752,220H454c-6.1,0-11-4.9-11-11v-78c0-6.1,4.9-11,11-11h298c6.1,0,11,4.9,11,11v78
-			C763,215.1,758.1,220,752,220z M454,122c-5,0-9,4-9,9v78c0,5,4,9,9,9h298c5,0,9-4,9-9v-78c0-5-4-9-9-9H454z"/>
-	</g>
-	<path class="st1" d="M501.4,161.9h-14.2c0.1,0.3,0.2,0.6,0.3,1c0.4,1.6,0.7,3.3,0.9,5c0.1,0.7,0.1,1.4,0.1,2.1s0,1.4-0.1,2.1
-		c-0.1,1.7-0.4,3.4-0.9,5c-0.1,0.3-0.2,0.6-0.3,1h14.2c4.5,0,8.1-3.6,8.1-8.1S505.9,161.9,501.4,161.9"/>
-	<path class="st2" d="M488.4,172.1c0.1-0.7,0.1-1.4,0.1-2.1c0-0.7,0-1.4-0.1-2.1c-0.1-1.7-0.4-3.4-0.9-5c-0.1-0.3-0.2-0.6-0.3-1h-22
-		c-0.8,2.6-1.2,5.3-1.2,8.1s0.4,5.5,1.2,8.1h22c0.1-0.3,0.2-0.6,0.3-1C487.9,175.5,488.2,173.8,488.4,172.1"/>
-	<path class="st3" d="M503.9,180.8h-17.7c-0.5,1.2-1.1,2.4-1.8,3.5c-1,1.7-2.3,3.2-3.6,4.6c-0.5,0.5-0.9,0.9-1.4,1.3
-		c-1,0.9-2,1.7-3.1,2.4c4.3,2.8,9.4,4.5,14.9,4.5c9.4,0,17.7-4.8,22.6-12C511.3,182.4,507.8,180.8,503.9,180.8"/>
-	<path class="st4" d="M484.4,184.3c0.7-1.1,1.3-2.3,1.8-3.5h-19.9c2.1,4.8,5.6,8.9,10,11.7c1.1-0.7,2.1-1.5,3.1-2.4
-		c0.5-0.4,1-0.9,1.4-1.3C482.1,187.5,483.3,185.9,484.4,184.3"/>
-	<path class="st5" d="M480.7,151.2c-0.5-0.5-0.9-0.9-1.4-1.3c-1-0.9-2-1.7-3.1-2.4c-4.4,2.9-7.8,6.9-10,11.7h19.9
-		c-0.5-1.2-1.1-2.4-1.8-3.5C483.3,154.1,482.1,152.5,480.7,151.2"/>
-	<path class="st6" d="M491.2,143c-5.5,0-10.7,1.6-14.9,4.5c1.1,0.7,2.1,1.5,3.1,2.4c0.5,0.4,1,0.9,1.4,1.3c1.4,1.4,2.6,2.9,3.6,4.6
-		c0.7,1.1,1.3,2.3,1.8,3.5h17.7c3.9,0,7.4-1.6,9.9-4.2C508.9,147.8,500.6,143,491.2,143"/>
-	<path class="st7" d="M563.9,178h-9.6v-17.1h9.6v1.8h-7.6v5.5h7.1v1.8h-7.1v6.3h7.6V178z M569.4,178h-1.9v-18.2h1.9V178z M581.4,178
-		l-0.4-1.8h-0.1c-0.6,0.8-1.3,1.3-1.9,1.6s-1.4,0.4-2.4,0.4c-1.3,0-2.3-0.3-3-1s-1.1-1.6-1.1-2.8c0-2.6,2.1-4,6.2-4.1l2.2-0.1v-0.8
-		c0-1-0.2-1.8-0.7-2.2s-1.1-0.7-2.1-0.7c-1.1,0-2.3,0.3-3.6,1L574,166c0.6-0.3,1.3-0.6,2.1-0.8s1.5-0.3,2.3-0.3c1.5,0,2.7,0.3,3.4,1
-		s1.1,1.8,1.1,3.3v8.8H581.4z M577,176.6c1.2,0,2.2-0.3,2.9-1s1-1.6,1-2.8v-1.2l-1.9,0.1c-1.5,0.1-2.7,0.3-3.3,0.7s-1,1.1-1,2
-		c0,0.7,0.2,1.2,0.6,1.6S576.2,176.6,577,176.6z M595.1,174.5c0,1.2-0.4,2.1-1.3,2.8s-2.1,1-3.8,1s-3-0.3-4-0.8v-1.8
-		c0.6,0.3,1.3,0.6,2,0.7s1.4,0.3,2,0.3c1,0,1.8-0.2,2.3-0.5s0.8-0.8,0.8-1.5c0-0.5-0.2-0.9-0.7-1.3s-1.3-0.8-2.5-1.3
-		c-1.2-0.4-2-0.8-2.5-1.2s-0.9-0.7-1.1-1.1s-0.4-0.9-0.4-1.5c0-1,0.4-1.9,1.3-2.5s2-0.9,3.5-0.9c1.4,0,2.7,0.3,4.1,0.8l-0.7,1.6
-		c-1.3-0.5-2.5-0.8-3.5-0.8c-0.9,0-1.6,0.1-2.1,0.4s-0.7,0.7-0.7,1.2c0,0.3,0.1,0.6,0.3,0.9s0.5,0.5,0.8,0.7s1.1,0.5,2.2,0.9
-		c1.5,0.6,2.6,1.1,3.1,1.7S595.1,173.6,595.1,174.5z M602.4,176.6c0.3,0,0.7,0,1-0.1s0.6-0.1,0.8-0.2v1.5c-0.2,0.1-0.5,0.2-0.9,0.3
-		s-0.8,0.1-1.1,0.1c-2.5,0-3.7-1.3-3.7-3.9v-7.6h-1.8v-0.9l1.8-0.8l0.8-2.7h1.1v3h3.7v1.5h-3.7v7.6c0,0.8,0.2,1.4,0.6,1.8
-		S601.8,176.6,602.4,176.6z M608.7,178h-1.9v-12.8h1.9V178z M606.6,161.7c0-0.4,0.1-0.8,0.3-1s0.5-0.3,0.8-0.3s0.6,0.1,0.8,0.3
-		s0.3,0.5,0.3,1s-0.1,0.8-0.3,1s-0.5,0.3-0.8,0.3s-0.6-0.1-0.8-0.3S606.6,162.1,606.6,161.7z M618,178.2c-1.9,0-3.3-0.6-4.3-1.7
-		s-1.5-2.8-1.5-4.9c0-2.1,0.5-3.8,1.6-5s2.5-1.8,4.4-1.8c0.6,0,1.2,0.1,1.9,0.2s1.1,0.3,1.5,0.5l-0.6,1.7c-0.4-0.2-0.9-0.3-1.4-0.4
-		s-1-0.2-1.3-0.2c-2.6,0-3.9,1.7-3.9,5c0,1.6,0.3,2.8,1,3.6s1.6,1.3,2.8,1.3c1.1,0,2.2-0.2,3.3-0.7v1.7
-		C620.3,178,619.3,178.2,618,178.2z M632.5,174.5c0,1.2-0.4,2.1-1.3,2.8s-2.1,1-3.8,1s-3-0.3-4-0.8v-1.8c0.6,0.3,1.3,0.6,2,0.7
-		s1.4,0.3,2,0.3c1,0,1.8-0.2,2.3-0.5s0.8-0.8,0.8-1.5c0-0.5-0.2-0.9-0.7-1.3s-1.3-0.8-2.5-1.3c-1.2-0.4-2-0.8-2.5-1.2
-		s-0.9-0.7-1.1-1.1s-0.4-0.9-0.4-1.5c0-1,0.4-1.9,1.3-2.5s2-0.9,3.5-0.9c1.4,0,2.7,0.3,4.1,0.8l-0.7,1.6c-1.3-0.5-2.5-0.8-3.5-0.8
-		c-0.9,0-1.6,0.1-2.1,0.4s-0.7,0.7-0.7,1.2c0,0.3,0.1,0.6,0.3,0.9s0.5,0.5,0.8,0.7s1.1,0.5,2.2,0.9c1.5,0.6,2.6,1.1,3.1,1.7
-		S632.5,173.6,632.5,174.5z M641.1,178.2c-1.9,0-3.4-0.6-4.5-1.7s-1.6-2.8-1.6-4.8c0-2.1,0.5-3.7,1.5-4.9s2.4-1.8,4.1-1.8
-		c1.6,0,2.9,0.5,3.8,1.6s1.4,2.5,1.4,4.2v1.2H637c0,1.5,0.4,2.7,1.1,3.4s1.7,1.2,3.1,1.2c1.4,0,2.8-0.3,4.1-0.9v1.7
-		c-0.7,0.3-1.3,0.5-2,0.6S642,178.2,641.1,178.2z M640.6,166.6c-1,0-1.9,0.3-2.5,1s-1,1.6-1.1,2.8h6.7c0-1.2-0.3-2.2-0.8-2.8
-		S641.6,166.6,640.6,166.6z M657.1,178l-0.4-1.8h-0.1c-0.6,0.8-1.3,1.3-1.9,1.6s-1.4,0.4-2.4,0.4c-1.3,0-2.3-0.3-3-1
-		s-1.1-1.6-1.1-2.8c0-2.6,2.1-4,6.2-4.1l2.2-0.1v-0.8c0-1-0.2-1.8-0.7-2.2s-1.1-0.7-2.1-0.7c-1.1,0-2.3,0.3-3.6,1l-0.6-1.5
-		c0.6-0.3,1.3-0.6,2.1-0.8s1.5-0.3,2.3-0.3c1.5,0,2.7,0.3,3.4,1s1.1,1.8,1.1,3.3v8.8L657.1,178L657.1,178z M652.7,176.6
-		c1.2,0,2.2-0.3,2.9-1s1-1.6,1-2.8v-1.2l-1.9,0.1c-1.5,0.1-2.7,0.3-3.3,0.7s-1,1.1-1,2c0,0.7,0.2,1.2,0.6,1.6
-		S651.9,176.6,652.7,176.6z M668.4,164.9c0.6,0,1.1,0,1.5,0.1l-0.3,1.8c-0.5-0.1-1-0.2-1.4-0.2c-1,0-1.9,0.4-2.7,1.3
-		s-1.1,1.9-1.1,3.2v6.9h-1.9v-12.8h1.6l0.2,2.4h0.1c0.5-0.8,1.1-1.5,1.7-1.9S667.6,164.9,668.4,164.9z M677,178.2
-		c-1.9,0-3.3-0.6-4.3-1.7s-1.5-2.8-1.5-4.9c0-2.1,0.5-3.8,1.6-5s2.5-1.8,4.4-1.8c0.6,0,1.2,0.1,1.9,0.2s1.1,0.3,1.5,0.5l-0.6,1.7
-		c-0.4-0.2-0.9-0.3-1.4-0.4s-1-0.2-1.3-0.2c-2.6,0-3.9,1.7-3.9,5c0,1.6,0.3,2.8,1,3.6s1.6,1.3,2.8,1.3c1.1,0,2.2-0.2,3.3-0.7v1.7
-		C679.3,178,678.3,178.2,677,178.2z M692,178v-8.3c0-1-0.2-1.8-0.7-2.3s-1.2-0.8-2.2-0.8c-1.4,0-2.3,0.4-3,1.1s-0.9,1.9-0.9,3.6v6.7
-		h-1.9v-18.2h1.9v5.5c0,0.7,0,1.2-0.1,1.7h0.1c0.4-0.6,0.9-1.1,1.6-1.5s1.5-0.5,2.4-0.5c1.6,0,2.7,0.4,3.5,1.1s1.2,1.9,1.2,3.6v8.4
-		H692V178z"/>
-	<g>
-		
-			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-35.4937" y1="108.2211" x2="-35.4937" y2="107.8809" gradientTransform="matrix(318 0 0 98 11890 -10299)">
-			<stop  offset="0" style="stop-color:#00BFB3"/>
-			<stop  offset="1" style="stop-color:#31C8FA"/>
-		</linearGradient>
-		<path class="st8" d="M752,340H454c-6.1,0-11-4.9-11-11v-78c0-6.1,4.9-11,11-11h298c6.1,0,11,4.9,11,11v78
-			C763,335.1,758.1,340,752,340z M454,242c-5,0-9,4-9,9v78c0,5,4,9,9,9h298c5,0,9-4,9-9v-78c0-5-4-9-9-9H454z"/>
-	</g>
-	<path class="st6" d="M475.8,265h-7.5v27.5h22.5V280C490.8,272,483.8,265,475.8,265"/>
-	<path class="st2" d="M468.2,295.6c0,10.9,11.6,19.4,22.5,19.4v-22.5h-22.5V295.6z"/>
-	<polygon class="st3" points="495.8,315 510.8,315 510.8,292.5 495.8,292.5 	"/>
-	<polygon class="st4" points="490.8,315 495.8,315 495.8,292.5 490.8,292.5 	"/>
-	<path class="st7" d="M554.4,298v-17.1h2v15.3h7.6v1.8L554.4,298L554.4,298z M577.6,291.6c0,2.1-0.5,3.7-1.6,4.9s-2.5,1.8-4.4,1.8
-		c-1.1,0-2.2-0.3-3.1-0.8s-1.6-1.3-2.1-2.3s-0.7-2.2-0.7-3.5c0-2.1,0.5-3.7,1.6-4.9s2.5-1.8,4.4-1.8c1.8,0,3.2,0.6,4.3,1.8
-		S577.6,289.5,577.6,291.6z M567.8,291.6c0,1.6,0.3,2.9,1,3.8s1.6,1.3,2.9,1.3s2.2-0.4,2.9-1.3s1-2.1,1-3.8c0-1.6-0.3-2.9-1-3.7
-		s-1.6-1.3-2.9-1.3c-1.3,0-2.2,0.4-2.9,1.3S567.8,289.9,567.8,291.6z M591.5,285.2v1.2l-2.4,0.3c0.2,0.3,0.4,0.6,0.6,1.1
-		s0.3,0.9,0.3,1.5c0,1.3-0.4,2.3-1.3,3s-2,1.1-3.5,1.1c-0.4,0-0.7,0-1.1-0.1c-0.8,0.4-1.2,1-1.2,1.7c0,0.4,0.1,0.6,0.4,0.8
-		s0.8,0.3,1.5,0.3h2.3c1.4,0,2.5,0.3,3.2,0.9s1.1,1.4,1.1,2.6c0,1.4-0.6,2.5-1.7,3.3s-2.8,1.1-5,1.1c-1.7,0-3-0.3-3.9-0.9
-		s-1.4-1.5-1.4-2.6c0-0.8,0.2-1.5,0.8-2s1.2-1,2.1-1.2c-0.3-0.1-0.6-0.4-0.8-0.7s-0.3-0.7-0.3-1.1c0-0.5,0.1-0.9,0.4-1.2
-		s0.6-0.7,1.2-1c-0.7-0.3-1.2-0.7-1.6-1.4s-0.6-1.4-0.6-2.2c0-1.4,0.4-2.5,1.3-3.3s2-1.1,3.6-1.1c0.7,0,1.3,0.1,1.8,0.2h4.2V285.2z
-		 M581.3,300.2c0,0.7,0.3,1.2,0.9,1.6s1.4,0.5,2.5,0.5c1.6,0,2.8-0.2,3.6-0.7s1.2-1.2,1.2-2c0-0.7-0.2-1.2-0.6-1.4s-1.2-0.4-2.4-0.4
-		h-2.3c-0.9,0-1.6,0.2-2.1,0.6S581.3,299.4,581.3,300.2z M582.3,289.3c0,0.9,0.3,1.6,0.8,2s1.2,0.7,2.1,0.7c1.9,0,2.8-0.9,2.8-2.8
-		s-1-2.9-2.9-2.9c-0.9,0-1.6,0.2-2.1,0.7S582.3,288.3,582.3,289.3z M602.4,294.5c0,1.2-0.4,2.1-1.3,2.8s-2.1,1-3.8,1s-3-0.3-4-0.8
-		v-1.8c0.6,0.3,1.3,0.6,2,0.7s1.4,0.3,2,0.3c1,0,1.8-0.2,2.3-0.5s0.8-0.8,0.8-1.5c0-0.5-0.2-0.9-0.7-1.3s-1.3-0.8-2.5-1.3
-		c-1.2-0.4-2-0.8-2.5-1.2s-0.9-0.7-1.1-1.1s-0.4-0.9-0.4-1.5c0-1,0.4-1.9,1.3-2.5s2-0.9,3.5-0.9c1.4,0,2.7,0.3,4.1,0.8l-0.7,1.6
-		c-1.3-0.5-2.5-0.8-3.5-0.8c-0.9,0-1.6,0.1-2.1,0.4s-0.7,0.7-0.7,1.2c0,0.3,0.1,0.6,0.3,0.9s0.5,0.5,0.8,0.7s1.1,0.5,2.2,0.9
-		c1.5,0.6,2.6,1.1,3.1,1.7S602.4,293.6,602.4,294.5z M609.8,296.6c0.3,0,0.7,0,1-0.1s0.6-0.1,0.8-0.2v1.5c-0.2,0.1-0.5,0.2-0.9,0.3
-		s-0.8,0.1-1.1,0.1c-2.5,0-3.7-1.3-3.7-3.9v-7.6h-1.8v-0.9l1.8-0.8l0.8-2.7h1.1v3h3.7v1.5h-3.7v7.6c0,0.8,0.2,1.4,0.6,1.8
-		S609.1,296.6,609.8,296.6z M622,298l-0.4-1.8h-0.1c-0.6,0.8-1.3,1.3-1.9,1.6s-1.4,0.4-2.4,0.4c-1.3,0-2.3-0.3-3-1s-1.1-1.6-1.1-2.8
-		c0-2.6,2.1-4,6.2-4.1l2.2-0.1v-0.8c0-1-0.2-1.8-0.7-2.2s-1.1-0.7-2.1-0.7c-1.1,0-2.3,0.3-3.6,1l-0.6-1.5c0.6-0.3,1.3-0.6,2.1-0.8
-		s1.5-0.3,2.3-0.3c1.5,0,2.7,0.3,3.4,1s1.1,1.8,1.1,3.3v8.8H622z M617.6,296.6c1.2,0,2.2-0.3,2.9-1s1-1.6,1-2.8v-1.2l-1.9,0.1
-		c-1.5,0.1-2.7,0.3-3.3,0.7s-1,1.1-1,2c0,0.7,0.2,1.2,0.6,1.6S616.8,296.6,617.6,296.6z M635.7,294.5c0,1.2-0.4,2.1-1.3,2.8
-		s-2.1,1-3.8,1s-3-0.3-4-0.8v-1.8c0.6,0.3,1.3,0.6,2,0.7s1.4,0.3,2,0.3c1,0,1.8-0.2,2.3-0.5s0.8-0.8,0.8-1.5c0-0.5-0.2-0.9-0.7-1.3
-		s-1.3-0.8-2.5-1.3c-1.2-0.4-2-0.8-2.5-1.2s-0.9-0.7-1.1-1.1s-0.4-0.9-0.4-1.5c0-1,0.4-1.9,1.3-2.5s2-0.9,3.5-0.9
-		c1.4,0,2.7,0.3,4.1,0.8l-0.7,1.6c-1.3-0.5-2.5-0.8-3.5-0.8c-0.9,0-1.6,0.1-2.1,0.4s-0.7,0.7-0.7,1.2c0,0.3,0.1,0.6,0.3,0.9
-		s0.5,0.5,0.8,0.7s1.1,0.5,2.2,0.9c1.5,0.6,2.6,1.1,3.1,1.7S635.7,293.6,635.7,294.5z M647.7,298v-8.3c0-1-0.2-1.8-0.7-2.3
-		s-1.2-0.8-2.2-0.8c-1.4,0-2.3,0.4-3,1.1s-0.9,1.9-0.9,3.6v6.7H639v-18.2h1.9v5.5c0,0.7,0,1.2-0.1,1.7h0.1c0.4-0.6,0.9-1.1,1.6-1.5
-		s1.5-0.5,2.4-0.5c1.6,0,2.7,0.4,3.5,1.1s1.2,1.9,1.2,3.6v8.4h-1.9V298z"/>
-	<g>
-		
-			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="-35.4937" y1="108.2211" x2="-35.4937" y2="107.8809" gradientTransform="matrix(318 0 0 98 11890 -10539)">
-			<stop  offset="0" style="stop-color:#00BFB3"/>
-			<stop  offset="1" style="stop-color:#31C8FA"/>
-		</linearGradient>
-		<path class="st9" d="M752,100H454c-6.1,0-11-4.9-11-11V11c0-6.1,4.9-11,11-11h298c6.1,0,11,4.9,11,11v78
-			C763,95.1,758.1,100,752,100z M454,2c-5,0-9,4-9,9v78c0,5,4,9,9,9h298c5,0,9-4,9-9V11c0-5-4-9-9-9H454z"/>
-	</g>
-	<path class="st4" d="M489.2,47.8L470.8,70v5h2.3l20.6-24.7C492.3,49.4,490.8,48.6,489.2,47.8"/>
-	<path class="st10" d="M493.7,50.3L473.1,75h35.2C508.2,64.9,502.5,56,493.7,50.3"/>
-	<path class="st2" d="M470.8,70l18.5-22.2c-5.5-2.6-11.8-14.1-18.5-14.1V70z"/>
-	<path class="st11" d="M470.8,25v18.8c6.7,0,13,1.5,18.5,4.1l19-22.8L470.8,25L470.8,25z"/>
-	<path class="st7" d="M566.7,58h-2.3l-6.2-8.3l-1.8,1.6V58h-2V40.9h2v8.5l7.8-8.5h2.4l-6.9,7.4L566.7,58z M570.7,58h-1.9V45.2h1.9
-		V58z M568.6,41.7c0-0.4,0.1-0.8,0.3-1s0.5-0.3,0.8-0.3s0.6,0.1,0.8,0.3s0.3,0.5,0.3,1s-0.1,0.8-0.3,1S570,43,569.7,43
-		s-0.6-0.1-0.8-0.3S568.6,42.1,568.6,41.7z M580.8,44.9c1.7,0,3,0.6,3.9,1.7s1.4,2.8,1.4,4.9s-0.5,3.7-1.4,4.9s-2.2,1.8-3.9,1.8
-		c-0.8,0-1.6-0.2-2.3-0.5s-1.3-0.8-1.7-1.4h-0.1l-0.4,1.7h-1.4V39.8h1.9v4.4c0,1,0,1.9-0.1,2.7h0.1
-		C577.7,45.6,579.1,44.9,580.8,44.9z M580.6,46.6c-1.3,0-2.3,0.4-2.9,1.1s-0.9,2-0.9,3.8s0.3,3.1,0.9,3.9s1.6,1.2,2.9,1.2
-		c1.2,0,2.1-0.4,2.7-1.3s0.9-2.1,0.9-3.8s-0.3-2.9-0.9-3.7S581.8,46.6,580.6,46.6z M597.5,58l-0.4-1.8H597c-0.6,0.8-1.3,1.3-1.9,1.6
-		s-1.4,0.4-2.4,0.4c-1.3,0-2.3-0.3-3-1s-1.1-1.6-1.1-2.8c0-2.6,2.1-4,6.2-4.1l2.2-0.1v-0.8c0-1-0.2-1.8-0.7-2.2s-1.1-0.7-2.1-0.7
-		c-1.1,0-2.3,0.3-3.6,1L590,46c0.6-0.3,1.3-0.6,2.1-0.8s1.5-0.3,2.3-0.3c1.5,0,2.7,0.3,3.4,1s1.1,1.8,1.1,3.3V58H597.5z M593.1,56.6
-		c1.2,0,2.2-0.3,2.9-1s1-1.6,1-2.8v-1.2l-1.9,0.1c-1.5,0.1-2.7,0.3-3.3,0.7s-1,1.1-1,2c0,0.7,0.2,1.2,0.6,1.6S592.3,56.6,593.1,56.6
-		z M611.7,58v-8.3c0-1-0.2-1.8-0.7-2.3s-1.2-0.8-2.2-0.8c-1.3,0-2.3,0.4-3,1.1s-0.9,1.9-0.9,3.6V58H603V45.2h1.6l0.3,1.8h0.1
-		c0.4-0.6,1-1.1,1.7-1.5s1.5-0.5,2.4-0.5c1.5,0,2.7,0.4,3.5,1.1s1.2,1.9,1.2,3.6V58H611.7z M625.5,58l-0.4-1.8H625
-		c-0.6,0.8-1.3,1.3-1.9,1.6s-1.4,0.4-2.4,0.4c-1.3,0-2.3-0.3-3-1s-1.1-1.6-1.1-2.8c0-2.6,2.1-4,6.2-4.1l2.2-0.1v-0.8
-		c0-1-0.2-1.8-0.7-2.2s-1.1-0.7-2.1-0.7c-1.1,0-2.3,0.3-3.6,1L618,46c0.6-0.3,1.3-0.6,2.1-0.8s1.5-0.3,2.3-0.3c1.5,0,2.7,0.3,3.4,1
-		s1.1,1.8,1.1,3.3V58H625.5z M621.2,56.6c1.2,0,2.2-0.3,2.9-1s1-1.6,1-2.8v-1.2l-1.9,0.1c-1.5,0.1-2.7,0.3-3.3,0.7s-1,1.1-1,2
-		c0,0.7,0.2,1.2,0.6,1.6S620.4,56.6,621.2,56.6z"/>
-</g>
-<g>
-	<path class="st12" d="M840.7,148l-10.5,10.5c-2.9,2.9-2.9,7.6,0,10.5l1.8,1.8c2.9,2.9,7.6,2.9,10.5,0l10.5-10.5L840.7,148z"/>
-	<g>
-		<g>
-			
-				<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="-30.558" y1="107.1173" x2="-30.558" y2="106.7821" gradientTransform="matrix(138 0 0 338 5070 -35979)">
-				<stop  offset="0" style="stop-color:#00BFB3"/>
-				<stop  offset="1" style="stop-color:#31C8FA"/>
-			</linearGradient>
-			<path class="st13" d="M912,340H794c-6.1,0-11-4.9-11-11V11c0-6.1,4.9-11,11-11h118c6.1,0,11,4.9,11,11v318
-				C923,335.1,918.1,340,912,340z M794,2c-5,0-9,4-9,9v318c0,5,4,9,9,9h118c5,0,9-4,9-9V11c0-5-4-9-9-9H794z"/>
-		</g>
-		<path class="st6" d="M865.3,148L853,135.7l10.5-10.5c2.9-2.9,7.6-2.9,10.5,0l1.8,1.8c2.9,2.9,2.9,7.6,0,10.5L865.3,148z"/>
-		<path class="st1" d="M863.5,146.2l-21.1-21.1c-2.9-2.9-7.6-2.9-10.5,0l-1.8,1.8c-2.9,2.9-2.9,7.6,0,10.5l10.5,10.5l1.8-1.8
-			C848.3,140.4,857.7,140.4,863.5,146.2"/>
-		<path class="st14" d="M863.5,146.2c-5.8-5.8-15.2-5.8-21.1,0l-1.8,1.8l12.3,12.3l12.3-12.3L863.5,146.2z"/>
-		<path class="st3" d="M875.8,158.5l-7-7l-12.3,12.3l7,7c2.9,2.9,7.6,2.9,10.5,0l1.8-1.8C878.7,166.2,878.7,161.4,875.8,158.5"/>
-		<polygon class="st4" points="865.3,148 853,160.3 856.5,163.8 868.8,151.5 		"/>
-		<path class="st7" d="M829.8,210h-2.3l-4.6-7.5l-4.7,7.5h-2.1l5.7-9l-5.3-8.2h2.2l4.3,6.8l4.3-6.8h2.1L824,201L829.8,210z
-			 M830.8,204.5v-1.8h5.8v1.8H830.8z M850.8,197.9c0,1.7-0.6,3.1-1.8,4s-2.9,1.4-5.1,1.4h-2v6.7h-2v-17.1h4.4
-			C848.7,192.9,850.8,194.5,850.8,197.9z M841.9,201.6h1.8c1.8,0,3-0.3,3.8-0.9c0.8-0.6,1.2-1.5,1.2-2.7c0-1.1-0.4-2-1.1-2.5
-			s-1.9-0.8-3.5-0.8h-2.2L841.9,201.6L841.9,201.6z M862,210l-0.4-1.8h-0.1c-0.6,0.8-1.3,1.3-1.9,1.6s-1.4,0.4-2.4,0.4
-			c-1.3,0-2.3-0.3-3-1s-1.1-1.6-1.1-2.8c0-2.6,2.1-4,6.2-4.1l2.2-0.1v-0.8c0-1-0.2-1.8-0.7-2.2s-1.1-0.7-2.1-0.7
-			c-1.1,0-2.3,0.3-3.6,1l-0.6-1.5c0.6-0.3,1.3-0.6,2.1-0.8s1.5-0.3,2.3-0.3c1.5,0,2.7,0.3,3.4,1s1.1,1.8,1.1,3.3v8.8L862,210
-			L862,210z M857.6,208.6c1.2,0,2.2-0.3,2.9-1s1-1.6,1-2.8v-1.2l-1.9,0.1c-1.5,0.1-2.7,0.3-3.3,0.7s-1,1.1-1,2
-			c0,0.7,0.2,1.2,0.6,1.6S856.8,208.6,857.6,208.6z M872.6,210.2c-1.9,0-3.3-0.6-4.3-1.7s-1.5-2.8-1.5-4.9c0-2.1,0.5-3.8,1.6-5
-			s2.5-1.8,4.4-1.8c0.6,0,1.2,0.1,1.9,0.2s1.1,0.3,1.5,0.5l-0.6,1.7c-0.4-0.2-0.9-0.3-1.4-0.4s-1-0.2-1.3-0.2c-2.6,0-3.9,1.7-3.9,5
-			c0,1.6,0.3,2.8,1,3.6s1.6,1.3,2.8,1.3c1.1,0,2.2-0.2,3.3-0.7v1.7C875,210,873.9,210.2,872.6,210.2z M880.8,203.4
-			c0.3-0.5,0.8-1.1,1.5-1.9l4.1-4.4h2.3l-5.2,5.5l5.6,7.4h-2.4l-4.5-6.1l-1.5,1.3v4.8h-1.9v-18.2h1.9v9.7
-			C880.8,201.9,880.8,202.5,880.8,203.4L880.8,203.4z"/>
-	</g>
-</g>
-<g>
-	
-		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="-36.2964" y1="106.9789" x2="-36.2964" y2="106.7929" gradientTransform="matrix(-428.5052 0 0 338 -15337.7012 -35979)">
-		<stop  offset="0" style="stop-color:#00BFB3"/>
-		<stop  offset="1" style="stop-color:#31C8FA"/>
-	</linearGradient>
-	<path class="st15" d="M374,340H10c-5.5,0-10-4.5-10-10V10C0,4.5,4.5,0,10,0h364c5.5,0,10,4.5,10,10v266h27v-8l20,18l-20,18v-8h-27
-		v34C384,335.5,379.5,340,374,340z M10,2c-4.4,0-8,3.6-8,8v320c0,4.4,3.6,8,8,8h364c4.4,0,8-3.6,8-8v-36h31v5.5l15-13.5l-15-13.5
-		v5.5h-31V10c0-4.4-3.6-8-8-8H10z"/>
-</g>
-<path class="st7" d="M55.7,293l-2.1-5.4h-6.9l-2.1,5.4h-2l6.8-17.2h1.7l6.7,17.2H55.7z M53,285.8l-2-5.3c-0.3-0.7-0.5-1.5-0.8-2.5
-	c-0.2,0.8-0.4,1.6-0.7,2.5l-2,5.3H53z M65.7,279.9c0.6,0,1.1,0,1.5,0.1l-0.3,1.8c-0.5-0.1-1-0.2-1.4-0.2c-1,0-1.9,0.4-2.7,1.3
-	s-1.1,1.9-1.1,3.2v6.9h-1.9v-12.8h1.6l0.2,2.4h0.1c0.5-0.8,1.1-1.5,1.7-1.9S64.9,279.9,65.7,279.9z M74.8,293.2
-	c-1.9,0-3.3-0.6-4.3-1.7s-1.5-2.8-1.5-4.9s0.5-3.8,1.6-5s2.5-1.8,4.4-1.8c0.6,0,1.2,0.1,1.9,0.2s1.1,0.3,1.5,0.5l-0.6,1.7
-	c-0.4-0.2-0.9-0.3-1.4-0.4s-1-0.2-1.3-0.2c-2.6,0-3.9,1.7-3.9,5c0,1.6,0.3,2.8,1,3.6s1.6,1.3,2.8,1.3c1.1,0,2.2-0.2,3.3-0.7v1.7
-	C77.2,293,76.1,293.2,74.8,293.2z M91,288.4c0,1.5-0.5,2.7-1.6,3.5s-2.6,1.3-4.5,1.3c-2,0-3.6-0.3-4.7-0.8v-1.9
-	c0.7,0.3,1.5,0.5,2.3,0.7s1.6,0.3,2.5,0.3c1.3,0,2.3-0.3,3-0.8s1-1.2,1-2.1c0-0.6-0.1-1.1-0.4-1.5s-0.6-0.7-1.2-1s-1.4-0.7-2.5-1.1
-	c-1.6-0.6-2.7-1.2-3.4-2s-1-1.8-1-3.1c0-1.3,0.5-2.4,1.5-3.2s2.3-1.2,3.9-1.2c1.7,0,3.3,0.3,4.7,0.9l-0.6,1.7
-	c-1.4-0.6-2.8-0.9-4.1-0.9c-1.1,0-1.9,0.2-2.5,0.7s-0.9,1.1-0.9,1.9c0,0.6,0.1,1.1,0.3,1.5s0.6,0.7,1.1,1s1.3,0.7,2.4,1
-	c1.8,0.6,3,1.3,3.7,2.1S91,287.3,91,288.4z M96.2,293h-1.9v-12.8h1.9V293z M94.1,276.7c0-0.4,0.1-0.8,0.3-1s0.5-0.3,0.8-0.3
-	s0.6,0.1,0.8,0.3s0.3,0.5,0.3,1s-0.1,0.8-0.3,1s-0.5,0.3-0.8,0.3s-0.6-0.1-0.8-0.3S94.1,277.1,94.1,276.7z M110.8,280.2v1.2
-	l-2.4,0.3c0.2,0.3,0.4,0.6,0.6,1.1s0.3,0.9,0.3,1.5c0,1.3-0.4,2.3-1.3,3s-2,1.1-3.5,1.1c-0.4,0-0.7,0-1.1-0.1
-	c-0.8,0.4-1.2,1-1.2,1.7c0,0.4,0.1,0.6,0.4,0.8s0.8,0.3,1.5,0.3h2.3c1.4,0,2.5,0.3,3.2,0.9s1.1,1.4,1.1,2.6c0,1.4-0.6,2.5-1.7,3.3
-	s-2.8,1.1-5,1.1c-1.7,0-3-0.3-3.9-0.9s-1.4-1.5-1.4-2.6c0-0.8,0.2-1.5,0.8-2s1.2-1,2.1-1.2c-0.3-0.1-0.6-0.4-0.8-0.7
-	s-0.3-0.7-0.3-1.1c0-0.5,0.1-0.9,0.4-1.2s0.6-0.7,1.2-1c-0.7-0.3-1.2-0.7-1.6-1.4s-0.6-1.4-0.6-2.2c0-1.4,0.4-2.5,1.3-3.3
-	s2-1.1,3.6-1.1c0.7,0,1.3,0.1,1.8,0.2h4.2V280.2z M100.6,295.2c0,0.7,0.3,1.2,0.9,1.6s1.4,0.5,2.5,0.5c1.6,0,2.8-0.2,3.6-0.7
-	s1.2-1.2,1.2-2c0-0.7-0.2-1.2-0.6-1.4s-1.2-0.4-2.4-0.4h-2.3c-0.9,0-1.6,0.2-2.1,0.6S100.6,294.4,100.6,295.2z M101.6,284.3
-	c0,0.9,0.3,1.6,0.8,2s1.2,0.7,2.1,0.7c1.9,0,2.8-0.9,2.8-2.8s-1-2.9-2.9-2.9c-0.9,0-1.6,0.2-2.1,0.7S101.6,283.3,101.6,284.3z
-	 M122.3,293v-8.3c0-1-0.2-1.8-0.7-2.3s-1.2-0.8-2.2-0.8c-1.4,0-2.3,0.4-3,1.1s-0.9,1.9-0.9,3.6v6.7h-1.9v-18.2h1.9v5.5
-	c0,0.7,0,1.2-0.1,1.7h0.1c0.4-0.6,0.9-1.1,1.6-1.5s1.5-0.5,2.4-0.5c1.6,0,2.7,0.4,3.5,1.1s1.2,1.9,1.2,3.6v8.4h-1.9V293z
-	 M132.3,291.6c0.3,0,0.7,0,1-0.1s0.6-0.1,0.8-0.2v1.5c-0.2,0.1-0.5,0.2-0.9,0.3s-0.8,0.1-1.1,0.1c-2.5,0-3.7-1.3-3.7-3.9v-7.6h-1.8
-	v-0.9l1.8-0.8l0.8-2.7h1.1v3h3.7v1.5h-3.7v7.6c0,0.8,0.2,1.4,0.6,1.8S131.7,291.6,132.3,291.6z M152.9,288.4c0,1.5-0.5,2.7-1.6,3.5
-	s-2.6,1.3-4.5,1.3c-2,0-3.6-0.3-4.7-0.8v-1.9c0.7,0.3,1.5,0.5,2.3,0.7s1.6,0.3,2.5,0.3c1.3,0,2.3-0.3,3-0.8s1-1.2,1-2.1
-	c0-0.6-0.1-1.1-0.4-1.5s-0.6-0.7-1.2-1s-1.4-0.7-2.5-1.1c-1.6-0.6-2.7-1.2-3.4-2s-1-1.8-1-3.1c0-1.3,0.5-2.4,1.5-3.2
-	s2.3-1.2,3.9-1.2c1.7,0,3.3,0.3,4.7,0.9l-0.6,1.7c-1.4-0.6-2.8-0.9-4.1-0.9c-1.1,0-1.9,0.2-2.5,0.7s-0.9,1.1-0.9,1.9
-	c0,0.6,0.1,1.1,0.3,1.5s0.6,0.7,1.1,1s1.3,0.7,2.4,1c1.8,0.6,3,1.3,3.7,2.1S152.9,287.3,152.9,288.4z M172.4,293v-8.4
-	c0-1-0.2-1.8-0.7-2.3s-1.1-0.8-2-0.8c-1.2,0-2.1,0.3-2.7,1s-0.9,1.8-0.9,3.2v7.2h-1.9v-8.4c0-1-0.2-1.8-0.7-2.3s-1.1-0.8-2.1-0.8
-	c-1.2,0-2.1,0.4-2.7,1.1s-0.8,1.9-0.8,3.6v6.7H156V280h1.6l0.3,1.8h0.1c0.4-0.6,0.9-1.1,1.6-1.5s1.4-0.5,2.2-0.5
-	c2,0,3.3,0.7,3.9,2.2h0.1c0.4-0.7,0.9-1.2,1.7-1.6s1.6-0.6,2.5-0.6c1.5,0,2.5,0.4,3.3,1.1s1.1,1.9,1.1,3.6v8.4L172.4,293L172.4,293z
-	 M186.3,293l-0.4-1.8h-0.1c-0.6,0.8-1.3,1.3-1.9,1.6s-1.4,0.4-2.4,0.4c-1.3,0-2.3-0.3-3-1s-1.1-1.6-1.1-2.8c0-2.6,2.1-4,6.2-4.1
-	l2.2-0.1v-0.8c0-1-0.2-1.8-0.7-2.2s-1.1-0.7-2.1-0.7c-1.1,0-2.3,0.3-3.6,1l-0.6-1.5c0.6-0.3,1.3-0.6,2.1-0.8s1.5-0.3,2.3-0.3
-	c1.5,0,2.7,0.3,3.4,1s1.1,1.8,1.1,3.3v8.8H186.3z M181.9,291.6c1.2,0,2.2-0.3,2.9-1s1-1.6,1-2.8v-1.2l-1.9,0.1
-	c-1.5,0.1-2.7,0.3-3.3,0.7s-1,1.1-1,2c0,0.7,0.2,1.2,0.6,1.6S181.1,291.6,181.9,291.6z M197.6,279.9c0.6,0,1.1,0,1.5,0.1l-0.3,1.8
-	c-0.5-0.1-1-0.2-1.4-0.2c-1,0-1.9,0.4-2.7,1.3s-1.1,1.9-1.1,3.2v6.9h-1.9v-12.8h1.6l0.2,2.4h0.1c0.5-0.8,1.1-1.5,1.7-1.9
-	S196.8,279.9,197.6,279.9z M205.7,291.6c0.3,0,0.7,0,1-0.1s0.6-0.1,0.8-0.2v1.5c-0.2,0.1-0.5,0.2-0.9,0.3s-0.8,0.1-1.1,0.1
-	c-2.5,0-3.7-1.3-3.7-3.9v-7.6H200v-0.9l1.8-0.8l0.8-2.7h1.1v3h3.7v1.5h-3.7v7.6c0,0.8,0.2,1.4,0.6,1.8S205.1,291.6,205.7,291.6z
-	 M223.9,277.4c-1.9,0-3.4,0.6-4.5,1.9s-1.6,3-1.6,5.2s0.5,4,1.6,5.2s2.5,1.8,4.5,1.8c1.2,0,2.6-0.2,4.1-0.6v1.7
-	c-1.2,0.4-2.7,0.7-4.4,0.7c-2.5,0-4.5-0.8-5.8-2.3s-2.1-3.7-2.1-6.5c0-1.8,0.3-3.3,1-4.6s1.6-2.4,2.9-3.1s2.7-1.1,4.4-1.1
-	c1.8,0,3.4,0.3,4.7,1l-0.8,1.7C226.5,277.7,225.2,277.4,223.9,277.4z M242.5,286.6c0,2.1-0.5,3.7-1.6,4.9s-2.5,1.8-4.4,1.8
-	c-1.1,0-2.2-0.3-3.1-0.8s-1.6-1.3-2.1-2.3s-0.7-2.2-0.7-3.5c0-2.1,0.5-3.7,1.6-4.9s2.5-1.8,4.4-1.8c1.8,0,3.2,0.6,4.3,1.8
-	S242.5,284.5,242.5,286.6z M232.7,286.6c0,1.6,0.3,2.9,1,3.8s1.6,1.3,2.9,1.3s2.2-0.4,2.9-1.3s1-2.1,1-3.8c0-1.6-0.3-2.9-1-3.7
-	s-1.6-1.3-2.9-1.3c-1.3,0-2.2,0.4-2.9,1.3S232.7,284.9,232.7,286.6z M254.7,293v-8.3c0-1-0.2-1.8-0.7-2.3s-1.2-0.8-2.2-0.8
-	c-1.3,0-2.3,0.4-3,1.1s-0.9,1.9-0.9,3.6v6.7H246v-12.8h1.6l0.3,1.8h0.1c0.4-0.6,1-1.1,1.7-1.5s1.5-0.5,2.4-0.5
-	c1.5,0,2.7,0.4,3.5,1.1s1.2,1.9,1.2,3.6v8.4h-2.1V293z M269.4,293v-8.3c0-1-0.2-1.8-0.7-2.3s-1.2-0.8-2.2-0.8c-1.3,0-2.3,0.4-3,1.1
-	s-0.9,1.9-0.9,3.6v6.7h-1.9v-12.8h1.6l0.3,1.8h0.1c0.4-0.6,1-1.1,1.7-1.5s1.5-0.5,2.4-0.5c1.5,0,2.7,0.4,3.5,1.1s1.2,1.9,1.2,3.6
-	v8.4h-2.1V293z M280.8,293.2c-1.9,0-3.4-0.6-4.5-1.7s-1.6-2.8-1.6-4.8c0-2.1,0.5-3.7,1.5-4.9s2.4-1.8,4.1-1.8c1.6,0,2.9,0.5,3.8,1.6
-	s1.4,2.5,1.4,4.2v1.2h-8.8c0,1.5,0.4,2.7,1.1,3.4s1.7,1.2,3.1,1.2s2.8-0.3,4.1-0.9v1.7c-0.7,0.3-1.3,0.5-2,0.6
-	S281.6,293.2,280.8,293.2z M280.2,281.6c-1,0-1.9,0.3-2.5,1s-1,1.6-1.1,2.8h6.7c0-1.2-0.3-2.2-0.8-2.8S281.3,281.6,280.2,281.6z
-	 M293.9,293.2c-1.9,0-3.3-0.6-4.3-1.7s-1.5-2.8-1.5-4.9s0.5-3.8,1.6-5s2.5-1.8,4.4-1.8c0.6,0,1.2,0.1,1.9,0.2s1.1,0.3,1.5,0.5
-	l-0.6,1.7c-0.4-0.2-0.9-0.3-1.4-0.4s-1-0.2-1.3-0.2c-2.6,0-3.9,1.7-3.9,5c0,1.6,0.3,2.8,1,3.6s1.6,1.3,2.8,1.3
-	c1.1,0,2.2-0.2,3.3-0.7v1.7C296.3,293,295.3,293.2,293.9,293.2z M304.4,291.6c0.3,0,0.7,0,1-0.1s0.6-0.1,0.8-0.2v1.5
-	c-0.2,0.1-0.5,0.2-0.9,0.3s-0.8,0.1-1.1,0.1c-2.5,0-3.7-1.3-3.7-3.9v-7.6h-1.8v-0.9l1.8-0.8l0.8-2.7h1.1v3h3.7v1.5h-3.7v7.6
-	c0,0.8,0.2,1.4,0.6,1.8S303.8,291.6,304.4,291.6z M319.8,286.6c0,2.1-0.5,3.7-1.6,4.9s-2.5,1.8-4.4,1.8c-1.1,0-2.2-0.3-3.1-0.8
-	s-1.6-1.3-2.1-2.3s-0.7-2.2-0.7-3.5c0-2.1,0.5-3.7,1.6-4.9s2.5-1.8,4.4-1.8c1.8,0,3.2,0.6,4.3,1.8S319.8,284.5,319.8,286.6z
-	 M310,286.6c0,1.6,0.3,2.9,1,3.8s1.6,1.3,2.9,1.3s2.2-0.4,2.9-1.3s1-2.1,1-3.8c0-1.6-0.3-2.9-1-3.7s-1.6-1.3-2.9-1.3
-	s-2.2,0.4-2.9,1.3S310,284.9,310,286.6z M329.1,279.9c0.6,0,1.1,0,1.5,0.1l-0.3,1.8c-0.5-0.1-1-0.2-1.4-0.2c-1,0-1.9,0.4-2.7,1.3
-	s-1.1,1.9-1.1,3.2v6.9h-1.9v-12.8h1.6l0.2,2.4h0.1c0.5-0.8,1.1-1.5,1.7-1.9S328.3,279.9,329.1,279.9z M341.3,289.5
-	c0,1.2-0.4,2.1-1.3,2.8s-2.1,1-3.8,1c-1.7,0-3-0.3-4-0.8v-1.8c0.6,0.3,1.3,0.6,2,0.7s1.4,0.3,2,0.3c1,0,1.8-0.2,2.3-0.5
-	s0.8-0.8,0.8-1.5c0-0.5-0.2-0.9-0.7-1.3s-1.3-0.8-2.5-1.3c-1.2-0.4-2-0.8-2.5-1.2s-0.9-0.7-1.1-1.1s-0.4-0.9-0.4-1.5
-	c0-1,0.4-1.9,1.3-2.5s2-0.9,3.5-0.9c1.4,0,2.7,0.3,4.1,0.8l-0.7,1.6c-1.3-0.5-2.5-0.8-3.5-0.8c-0.9,0-1.6,0.1-2.1,0.4
-	s-0.7,0.7-0.7,1.2c0,0.3,0.1,0.6,0.3,0.9s0.5,0.5,0.8,0.7s1.1,0.5,2.2,0.9c1.5,0.6,2.6,1.1,3.1,1.7S341.3,288.6,341.3,289.5z"/>
-<path class="st1" d="M78.8,73.9L78.8,73.9c-0.5-1.7-1.1-3.3-1.8-4.8l-4.3,1.8c0.3,0.7,0.6,1.4,0.9,2.2c-0.3-0.7-0.6-1.5-0.9-2.2
-	L44.4,82.6v6l28.4,11.7l0,0l0,0l0,0c-3.4,7.4-9.3,13.3-16.4,16.3l3.7,3.7c7.2-3.6,13.1-9.8,16.6-17.4l0,0c0.1-0.2,0.2-0.4,0.3-0.7
-	c0-0.1,0.1-0.1,0.1-0.2l0,0v-0.1v0.1l22.5,9.3v-5.2l-20.9-8.6c0.1-0.3,0.2-0.5,0.2-0.7h-0.1c1-3.5,1.6-7.3,1.6-11.2
-	C80.6,81.6,80,77.6,78.8,73.9L78.8,73.9l20.8-8.7v-5.4L77,69.1C77.7,70.7,78.3,72.3,78.8,73.9z M74.5,95.8
-	C74.5,95.8,74.5,95.9,74.5,95.8l-24.2-9.9l24.2-10.2c-0.2-0.8-0.5-1.5-0.7-2.2c0.3,0.7,0.5,1.5,0.7,2.2l1.2-0.5l-1.2,0.5
-	c0.9,3.1,1.4,6.5,1.4,10C76,89.2,75.5,92.6,74.5,95.8L74.5,95.8z"/>
-<path class="st1" d="M72.7,70.9l4.3-1.8c-3.5-7.9-9.5-14.2-16.8-17.9l-3.6,3.7C63.7,57.9,69.4,63.6,72.7,70.9z"/>
-<path class="st1" d="M152.7,70.9l4.3-1.8c-3.5-7.9-9.5-14.2-16.8-17.9l-3.6,3.7C143.7,57.9,149.4,63.6,152.7,70.9z"/>
-<path class="st1" d="M158.8,73.9L158.8,73.9c-0.5-1.7-1.1-3.3-1.8-4.8l-4.3,1.8c0.3,0.7,0.6,1.4,0.9,2.2c-0.3-0.7-0.6-1.5-0.9-2.2
-	l-28.3,11.7v6l28.4,11.7l0,0l0,0l0,0c-3.4,7.4-9.3,13.3-16.4,16.3l3.7,3.7c7.2-3.6,13.1-9.8,16.6-17.4l0,0c0.1-0.2,0.2-0.4,0.3-0.7
-	c0-0.1,0.1-0.1,0.1-0.2l0,0v-0.1v0.1l22.5,9.3v-5.2l-20.9-8.6c0.1-0.3,0.2-0.5,0.2-0.7h-0.1c1-3.5,1.6-7.3,1.6-11.2
-	C160.6,81.6,160,77.6,158.8,73.9L158.8,73.9l20.8-8.7v-5.4L157,69.1C157.7,70.7,158.3,72.3,158.8,73.9z M154.5,95.8
-	C154.5,95.8,154.5,95.9,154.5,95.8l-24.2-9.9l24.2-10.2c-0.2-0.8-0.5-1.5-0.7-2.2c0.3,0.7,0.5,1.5,0.7,2.2l1.2-0.5l-1.2,0.5
-	c0.9,3.1,1.4,6.5,1.4,10C156,89.2,155.5,92.6,154.5,95.8L154.5,95.8z"/>
-<path class="st1" d="M232.7,70.9l4.3-1.8c-3.5-7.9-9.5-14.2-16.8-17.9l-3.6,3.7C223.7,57.9,229.4,63.6,232.7,70.9z"/>
-<path class="st1" d="M238.8,73.9L238.8,73.9c-0.5-1.7-1.1-3.3-1.8-4.8l-4.3,1.8c0.3,0.7,0.6,1.4,0.9,2.2c-0.3-0.7-0.6-1.5-0.9-2.2
-	l-28.3,11.7v6l28.4,11.7l0,0l0,0l0,0c-3.4,7.4-9.3,13.3-16.4,16.3l3.7,3.7c7.2-3.6,13.1-9.8,16.6-17.4l0,0c0.1-0.2,0.2-0.4,0.3-0.7
-	c0-0.1,0.1-0.1,0.1-0.2l0,0v-0.1v0.1l22.5,9.3v-5.2l-20.9-8.6c0.1-0.3,0.2-0.5,0.2-0.7h-0.1c1-3.5,1.6-7.3,1.6-11.2
-	C240.6,81.6,240,77.6,238.8,73.9L238.8,73.9l20.8-8.7v-5.4L237,69.1C237.7,70.7,238.3,72.3,238.8,73.9z M234.5,95.8
-	C234.5,95.8,234.5,95.9,234.5,95.8l-24.2-9.9l24.2-10.2c-0.2-0.8-0.5-1.5-0.7-2.2c0.3,0.7,0.5,1.5,0.7,2.2l1.2-0.5l-1.2,0.5
-	c0.9,3.1,1.4,6.5,1.4,10C236,89.2,235.5,92.6,234.5,95.8L234.5,95.8z"/>
-<path class="st1" d="M312.7,70.9l4.3-1.8c-3.5-7.9-9.5-14.2-16.8-17.9l-3.6,3.7C303.7,57.9,309.4,63.6,312.7,70.9z"/>
-<path class="st1" d="M339.7,65.2v-5.4l-22.6,9.3c0.7,1.5,1.3,3.2,1.8,4.8l0,0c-0.5-1.7-1.1-3.3-1.8-4.8l-4.3,1.8
-	c0.3,0.7,0.6,1.4,0.9,2.2c-0.3-0.7-0.6-1.5-0.9-2.2l-28.3,11.7v6l28.4,11.7l0,0l0,0l0,0c-3.4,7.4-9.3,13.3-16.4,16.3l3.7,3.7
-	c7.2-3.6,13.1-9.8,16.6-17.4l0,0c0.1-0.2,0.2-0.4,0.3-0.7c0-0.1,0.1-0.1,0.1-0.2l0,0v-0.1v0.1l22.5,9.3v-5.2l-20.9-8.6
-	c0.1-0.3,0.2-0.5,0.2-0.7h-0.1c1-3.5,1.6-7.3,1.6-11.2c0-4.1-0.6-8-1.7-11.8l0,0L339.7,65.2z M314.5,95.8
-	C314.5,95.8,314.5,95.9,314.5,95.8l-24.2-9.9l24.2-10.2c-0.2-0.8-0.5-1.5-0.7-2.2c0.3,0.7,0.5,1.5,0.7,2.2l1.2-0.5l-1.2,0.5
-	c0.9,3.1,1.4,6.5,1.4,10C316,89.2,315.5,92.6,314.5,95.8L314.5,95.8z"/>
-<path class="st1" d="M78.8,183.9L78.8,183.9c-0.5-1.7-1.1-3.3-1.8-4.8l-4.3,1.8c0.3,0.7,0.6,1.4,0.9,2.2c-0.3-0.7-0.6-1.5-0.9-2.2
-	l-28.3,11.7v6l28.4,11.7l0,0l0,0l0,0c-3.4,7.4-9.3,13.3-16.4,16.3l3.7,3.7c7.2-3.6,13.1-9.8,16.6-17.4l0,0c0.1-0.2,0.2-0.4,0.3-0.7
-	c0-0.1,0.1-0.1,0.1-0.2l0,0v-0.1v0.1l22.5,9.3v-5.2l-20.9-8.6c0.1-0.3,0.2-0.5,0.2-0.7h-0.1c1-3.5,1.6-7.3,1.6-11.2
-	C80.6,191.6,80,187.6,78.8,183.9L78.8,183.9l20.8-8.7v-5.4L77,179.1C77.7,180.7,78.3,182.3,78.8,183.9z M74.5,205.8
-	C74.5,205.8,74.5,205.9,74.5,205.8l-24.2-9.9l24.2-10.2c-0.2-0.8-0.5-1.5-0.7-2.2c0.3,0.7,0.5,1.5,0.7,2.2l1.2-0.5l-1.2,0.5
-	c0.9,3.1,1.4,6.5,1.4,10C76,199.2,75.5,202.6,74.5,205.8L74.5,205.8z"/>
-<path class="st1" d="M77.1,179.1c-3.5-7.9-9.5-14.2-16.8-17.9l-3.6,3.7c7,3,12.7,8.8,16.1,16L77.1,179.1z"/>
-<path class="st1" d="M157.1,179.1c-3.5-7.9-9.5-14.2-16.8-17.9l-3.6,3.7c7,3,12.7,8.8,16.1,16L157.1,179.1z"/>
-<path class="st1" d="M158.8,183.9L158.8,183.9c-0.5-1.7-1.1-3.3-1.8-4.8l-4.3,1.8c0.3,0.7,0.6,1.4,0.9,2.2c-0.3-0.7-0.6-1.5-0.9-2.2
-	l-28.3,11.7v6l28.4,11.7l0,0l0,0l0,0c-3.4,7.4-9.3,13.3-16.4,16.3l3.7,3.7c7.2-3.6,13.1-9.8,16.6-17.4l0,0c0.1-0.2,0.2-0.4,0.3-0.7
-	c0-0.1,0.1-0.1,0.1-0.2l0,0v-0.1v0.1l22.5,9.3v-5.2l-20.9-8.6c0.1-0.3,0.2-0.5,0.2-0.7h-0.1c1-3.5,1.6-7.3,1.6-11.2
-	C160.6,191.6,160,187.6,158.8,183.9L158.8,183.9l20.8-8.7v-5.4l-22.6,9.3C157.7,180.7,158.3,182.3,158.8,183.9z M154.5,205.8
-	C154.5,205.8,154.5,205.9,154.5,205.8l-24.2-9.9l24.2-10.2c-0.2-0.8-0.5-1.5-0.7-2.2c0.3,0.7,0.5,1.5,0.7,2.2l1.2-0.5l-1.2,0.5
-	c0.9,3.1,1.4,6.5,1.4,10C156,199.2,155.5,202.6,154.5,205.8L154.5,205.8z"/>
-<path class="st1" d="M237.1,179.1c-3.5-7.9-9.5-14.2-16.8-17.9l-3.6,3.7c7,3,12.7,8.8,16.1,16L237.1,179.1z"/>
-<path class="st1" d="M238.8,183.9L238.8,183.9c-0.5-1.7-1.1-3.3-1.8-4.8l-4.3,1.8c0.3,0.7,0.6,1.4,0.9,2.2c-0.3-0.7-0.6-1.5-0.9-2.2
-	l-28.3,11.7v6l28.4,11.7l0,0l0,0l0,0c-3.4,7.4-9.3,13.3-16.4,16.3l3.7,3.7c7.2-3.6,13.1-9.8,16.6-17.4l0,0c0.1-0.2,0.2-0.4,0.3-0.7
-	c0-0.1,0.1-0.1,0.1-0.2l0,0v-0.1v0.1l22.5,9.3v-5.2l-20.9-8.6c0.1-0.3,0.2-0.5,0.2-0.7h-0.1c1-3.5,1.6-7.3,1.6-11.2
-	C240.6,191.6,240,187.6,238.8,183.9L238.8,183.9l20.8-8.7v-5.4l-22.6,9.3C237.7,180.7,238.3,182.3,238.8,183.9z M234.5,205.8
-	C234.5,205.8,234.5,205.9,234.5,205.8l-24.2-9.9l24.2-10.2c-0.2-0.8-0.5-1.5-0.7-2.2c0.3,0.7,0.5,1.5,0.7,2.2l1.2-0.5l-1.2,0.5
-	c0.9,3.1,1.4,6.5,1.4,10C236,199.2,235.5,202.6,234.5,205.8L234.5,205.8z"/>
-<path class="st1" d="M317.1,179.1c-3.5-7.9-9.5-14.2-16.8-17.9l-3.6,3.7c7,3,12.7,8.8,16.1,16L317.1,179.1z"/>
-<path class="st1" d="M318.8,183.9L318.8,183.9c-0.5-1.7-1.1-3.3-1.8-4.8l-4.3,1.8c0.3,0.7,0.6,1.4,0.9,2.2c-0.3-0.7-0.6-1.5-0.9-2.2
-	l-28.3,11.7v6l28.4,11.7l0,0l0,0l0,0c-3.4,7.4-9.3,13.3-16.4,16.3l3.7,3.7c7.2-3.6,13.1-9.8,16.6-17.4l0,0c0.1-0.2,0.2-0.4,0.3-0.7
-	c0-0.1,0.1-0.1,0.1-0.2l0,0v-0.1v0.1l22.5,9.3v-5.2l-20.9-8.6c0.1-0.3,0.2-0.5,0.2-0.7h-0.1c1-3.5,1.6-7.3,1.6-11.2
-	C320.6,191.6,320,187.6,318.8,183.9L318.8,183.9l20.8-8.7v-5.4l-22.6,9.3C317.7,180.7,318.3,182.3,318.8,183.9z M314.5,205.8
-	C314.5,205.8,314.5,205.9,314.5,205.8l-24.2-9.9l24.2-10.2c-0.2-0.8-0.5-1.5-0.7-2.2c0.3,0.7,0.5,1.5,0.7,2.2l1.2-0.5l-1.2,0.5
-	c0.9,3.1,1.4,6.5,1.4,10C316,199.2,315.5,202.6,314.5,205.8L314.5,205.8z"/>
-<path d="M411.6,318.9c-1.1,0-2,0.4-2.6,1.1s-1,1.7-1,3s0.3,2.3,0.9,3s1.5,1.1,2.6,1.1c0.7,0,1.5-0.1,2.4-0.4v1
-	c-0.7,0.3-1.5,0.4-2.6,0.4c-1.5,0-2.6-0.4-3.4-1.3s-1.2-2.2-1.2-3.8c0-1,0.2-1.9,0.6-2.7s0.9-1.4,1.7-1.8s1.6-0.6,2.6-0.6
-	s2,0.2,2.7,0.6l-0.5,1C413.1,319.1,412.4,318.9,411.6,318.9z M421.7,328h-5.6v-10h5.6v1h-4.4v3.2h4.1v1h-4.1v3.7h4.4V328z
-	 M425.1,328h-1.2v-10h5.6v1h-4.4v3.7h4.1v1h-4.1V328z"/>
-</svg>
diff --git a/docs/static/images/arcsight-network-overview.png b/docs/static/images/arcsight-network-overview.png
deleted file mode 100644
index c350fd3bf..000000000
Binary files a/docs/static/images/arcsight-network-overview.png and /dev/null differ
diff --git a/docs/static/images/arcsight-network-suspicious.png b/docs/static/images/arcsight-network-suspicious.png
deleted file mode 100644
index 348bfe964..000000000
Binary files a/docs/static/images/arcsight-network-suspicious.png and /dev/null differ
diff --git a/docs/static/images/azure-flow.png b/docs/static/images/azure-flow.png
deleted file mode 100644
index e89eacbe2..000000000
Binary files a/docs/static/images/azure-flow.png and /dev/null differ
diff --git a/docs/static/images/deploy_1.png b/docs/static/images/deploy_1.png
deleted file mode 100644
index 9b0485bf8..000000000
Binary files a/docs/static/images/deploy_1.png and /dev/null differ
diff --git a/docs/static/images/deploy_2.png b/docs/static/images/deploy_2.png
deleted file mode 100644
index e3753f48f..000000000
Binary files a/docs/static/images/deploy_2.png and /dev/null differ
diff --git a/docs/static/images/deploy_3.png b/docs/static/images/deploy_3.png
deleted file mode 100644
index 96bc119c3..000000000
Binary files a/docs/static/images/deploy_3.png and /dev/null differ
diff --git a/docs/static/images/deploy_4.png b/docs/static/images/deploy_4.png
deleted file mode 100644
index b31344594..000000000
Binary files a/docs/static/images/deploy_4.png and /dev/null differ
diff --git a/docs/static/images/deploy_5.png b/docs/static/images/deploy_5.png
deleted file mode 100644
index 02bf2b76b..000000000
Binary files a/docs/static/images/deploy_5.png and /dev/null differ
diff --git a/docs/static/images/deploy_6.png b/docs/static/images/deploy_6.png
deleted file mode 100644
index 7bbb78dd6..000000000
Binary files a/docs/static/images/deploy_6.png and /dev/null differ
diff --git a/docs/static/images/deploy_7.png b/docs/static/images/deploy_7.png
deleted file mode 100644
index 837d40022..000000000
Binary files a/docs/static/images/deploy_7.png and /dev/null differ
diff --git a/docs/static/images/logstash-module-overview.png b/docs/static/images/logstash-module-overview.png
deleted file mode 100644
index 67e6609d6..000000000
Binary files a/docs/static/images/logstash-module-overview.png and /dev/null differ
diff --git a/docs/static/images/logstash.png b/docs/static/images/logstash.png
deleted file mode 100644
index 802f8426f..000000000
Binary files a/docs/static/images/logstash.png and /dev/null differ
diff --git a/docs/static/images/netflow-conversation-partners.png b/docs/static/images/netflow-conversation-partners.png
deleted file mode 100644
index d2a7a79e5..000000000
Binary files a/docs/static/images/netflow-conversation-partners.png and /dev/null differ
diff --git a/docs/static/images/netflow-geo-location.png b/docs/static/images/netflow-geo-location.png
deleted file mode 100644
index 354f74e26..000000000
Binary files a/docs/static/images/netflow-geo-location.png and /dev/null differ
diff --git a/docs/static/images/netflow-overview.png b/docs/static/images/netflow-overview.png
deleted file mode 100644
index 72b6b4808..000000000
Binary files a/docs/static/images/netflow-overview.png and /dev/null differ
diff --git a/docs/static/images/netflow-traffic-analysis.png b/docs/static/images/netflow-traffic-analysis.png
deleted file mode 100644
index 2fc78c971..000000000
Binary files a/docs/static/images/netflow-traffic-analysis.png and /dev/null differ
diff --git a/docs/static/include/pluginbody.asciidoc b/docs/static/include/pluginbody.asciidoc
deleted file mode 100644
index 88e14779f..000000000
--- a/docs/static/include/pluginbody.asciidoc
+++ /dev/null
@@ -1,1303 +0,0 @@
-
-
-=== How to write a Logstash {plugintype} plugin
-
-To develop a new {plugintype} for Logstash, you build a self-contained Ruby gem
-whose source code lives in its own GitHub repository. The Ruby gem can then be
-hosted and shared on RubyGems.org. You can use the example {plugintype}
-implementation as a starting point. (If you're unfamiliar with
-Ruby, you can find an excellent quickstart guide at
-https://www.ruby-lang.org/en/documentation/quickstart/[].)
-
-==== Get started
-
-{getstarted}
-
-==== Create a GitHub repo for your new plugin
-Each Logstash plugin lives in its own GitHub repository. To create a new repository for your plugin:
-
-. Log in to GitHub.
-. Click the **Repositories** tab. You'll see a list of other repositories you've forked or contributed to.
-. Click the green **New** button in the upper right.
-. Specify the following settings for your new repo:
-** **Repository name** -- a unique name of the form +logstash-pass:attributes[{plugintype}]-pluginname+.
-** **Public or Private** -- your choice, but the repository must be Public if you want to submit it as an official plugin.
-** **Initialize this repository with a README** -- enables you to immediately clone the repository to your computer.
-. Click **Create Repository**.
-
-==== Use the plugin generator tool
-
-You can now create your own Logstash plugin in seconds! The `generate` subcommand of `bin/logstash-plugin` creates the foundation 
-for a new Logstash plugin with templatized files. It creates the correct directory structure, gemspec files, and dependencies so you 
-can start adding custom code to process data with Logstash.
-
-For more information, see <<plugin-generator>>
-
-==== Copy the {plugintype} code
-
-Alternatively, you can use the examples repo we host on github.com
-
-. **Clone your plugin.** Replace `GITUSERNAME` with your github username, and
-`MYPLUGINNAME` with your plugin name.
-** `git clone https://github.com/GITUSERNAME/logstash-`+pass:attributes[{plugintype}]-MYPLUGINNAME.git+
-*** alternately, via ssh: `git clone git@github.com:GITUSERNAME/logstash`+-pass:attributes[{plugintype}]-MYPLUGINNAME.git+
-** +cd logstash-pass:attributes[{plugintype}]-MYPLUGINNAME+
-
-. **Clone the {inputtype} plugin example and copy it to your plugin branch.**
-+
-You don't want to include the example .git directory or its contents, so delete
-it before you copy the example.
-+
-** `cd /tmp`
-** `git clone https://github.com/logstash-plugins/logstash`+-{plugintype}-{pluginname}.git+
-** +cd logstash-pass:attributes[{plugintype}]-pass:attributes[{pluginname}]+
-** +rm -rf .git+
-** +cp -R * /path/to/logstash-pass:attributes[{plugintype}]-mypluginname/+
-
-. **Rename the following files to match the name of your plugin.**
-** +logstash-pass:attributes[{plugintype}]-pass:attributes[{pluginname}].gemspec+
-** +pass:attributes[{pluginname}].rb+
-** +pass:attributes[{pluginname}]_spec.rb+
-+
-[source,txt]
-[subs="attributes"]
-----
-cd /path/to/logstash-{plugintype}-mypluginname
-mv logstash-{plugintype}-{pluginname}.gemspec logstash-{plugintype}-mypluginname.gemspec
-mv lib/logstash/{plugintype}s/example.rb lib/logstash/{plugintype}s/mypluginname.rb
-mv spec/{plugintype}s/{pluginname}_spec.rb spec/{plugintype}s/mypluginname_spec.rb
-----
-
-Your file structure should look like this:
-
-[source,txt]
-[subs="attributes"]
-----------------------------------
-$ tree logstash-{plugintype}-mypluginname
-├── Gemfile
-├── LICENSE
-├── README.md
-├── Rakefile
-├── lib
-│   └── logstash
-│       └── {plugintype}s
-│           └── mypluginname.rb
-├── logstash-{plugintype}-mypluginname.gemspec
-└── spec
-    └── {plugintype}s
-        └── mypluginname_spec.rb
-----------------------------------
-
-For more information about the Ruby gem file structure and an excellent
-walkthrough of the Ruby gem creation process, see
-http://timelessrepo.com/making-ruby-gems
-
-==== See what your plugin looks like
-
-Before we dive into the details, open up the plugin file in your favorite text editor
-and take a look.
-
-// /////////////////////////////////////////////////////////////////////////////
-// Input (conditionally recognized by the presence of the run_method attribute)
-// /////////////////////////////////////////////////////////////////////////////
-ifdef::run_method[]
-ifndef::blockinput[]
-[source,ruby]
-[subs="attributes"]
-----------------------------------
-# encoding: utf-8
-require "logstash/{plugintype}s/base"
-require "logstash/namespace"
-require "stud/interval"
-require "socket" # for Socket.gethostname
-
-# Add any asciidoc formatted documentation here
-# Generate a repeating message.
-#
-# This plugin is intended only as an example.
-
-class LogStash::{pluginclass}::{pluginnamecap} < LogStash::{pluginclass}::Base
-  config_name "example"
-
-  # If undefined, Logstash will complain, even if codec is unused.
-  default :codec, "plain"
-
-  # The message string to use in the event.
-  config :message, :validate => :string, :default => "Hello World!"
-
-  # Set how frequently messages should be sent.
-  #
-  # The default, `1`, means send a message every second.
-  config :interval, :validate => :number, :default => 1
-
-  public
-  def register
-    @host = Socket.gethostname
-  end # def register
-
-  def run(queue)
-    Stud.interval(@interval) do
-      event = LogStash::Event.new("message" => @message, "host" => @host)
-      decorate(event)
-      queue << event
-    end # loop
-  end # def run
-
-end # class LogStash::{pluginclass}::{pluginnamecap}
-----------------------------------
-endif::blockinput[]
-endif::run_method[]
-
-// /////////////////////////////////////////////////////////////////////////////
-// Codec (conditionally recognized by the presence of the encode_method
-// attribute)
-// /////////////////////////////////////////////////////////////////////////////
-ifdef::encode_method[]
-ifndef::blockcodec[]
-[source,ruby]
-[subs="attributes"]
-----------------------------------
-# encoding: utf-8
-require "logstash/{plugintype}s/base"
-require "logstash/codecs/line"
-
-# Add any asciidoc formatted documentation here
-class LogStash::{pluginclass}::{pluginnamecap} < LogStash::{pluginclass}::Base
-
-  # This example codec will append a string to the message field
-  # of an event, either in the decoding or encoding methods
-  #
-  # This is only intended to be used as an example.
-  #
-  # input {
-  #   stdin { codec => example }
-  # }
-  #
-  # or
-  #
-  # output {
-  #   stdout { codec => example }
-  # }
-  config_name "example"
-
-  # Append a string to the message
-  config :append, :validate => :string, :default => ', Hello World!'
-
-  public
-  def register
-    @lines = LogStash::Codecs::Line.new
-    @lines.charset = "UTF-8"
-  end
-
-  public
-  def decode(data)
-    @lines.decode(data) do |line|
-      replace = { "message" => line["message"].to_s + @append }
-      yield LogStash::Event.new(replace)
-    end
-  end # def decode
-
-  public
-  def encode(event)
-    @on_event.call(event, event.get("message").to_s + @append + NL)
-  end # def encode
-
-end # class LogStash::{pluginclass}::{pluginnamecap}
-----------------------------------
-endif::blockcodec[]
-endif::encode_method[]
-
-// /////////////////////////////////////////////////////////////////////////////
-// Filter (conditionally recognized by the presence of the filter_method
-// attribute)
-// /////////////////////////////////////////////////////////////////////////////
-ifdef::filter_method[]
-ifndef::blockfilter[]
-[source,ruby]
-[subs="attributes"]
-----------------------------------
-# encoding: utf-8
-require "logstash/{plugintype}s/base"
-require "logstash/namespace"
-
-# Add any asciidoc formatted documentation here
-# This example filter will replace the contents of the default
-# message field with whatever you specify in the configuration.
-#
-# It is only intended to be used as an example.
-class LogStash::{pluginclass}::{pluginnamecap} < LogStash::{pluginclass}::Base
-
-  # Setting the config_name here is required. This is how you
-  # configure this {plugintype} from your Logstash config.
-  #
-  # {plugintype} {
-  #   {pluginname} { message => "My message..." }
-  # }
-  config_name "example"
-
-  # Replace the message with this value.
-  config :message, :validate => :string, :default => "Hello World!"
-
-
-  public
-  def register
-    # Add instance variables
-  end # def register
-
-  public
-  def filter(event)
-
-    if @message
-      # Replace the event message with our message as configured in the
-      # config file.
-      event.set("message", @message)
-    end
-
-    # filter_matched should go in the last line of our successful code
-    filter_matched(event)
-  end # def {plugintype}
-
-end # class LogStash::{pluginclass}::{pluginnamecap}
-----------------------------------
-endif::blockfilter[]
-endif::filter_method[]
-
-// /////////////////////////////////////////////////////////////////////////////
-// Output (conditionally recognized by the presence of the receive_method
-// attribute)
-// /////////////////////////////////////////////////////////////////////////////
-ifdef::multi_receive_method[]
-[source,ruby]
-[subs="attributes"]
-----------------------------------
-# encoding: utf-8
-require "logstash/{plugintype}s/base"
-require "logstash/namespace"
-
-# Add any asciidoc formatted documentation here
-# An example output that does nothing.
-class LogStash::{pluginclass}::{pluginnamecap} < LogStash::{pluginclass}::Base
-  config_name "example"
-
-  # This sets the concurrency behavior of this plugin. By default it is :legacy, which was the standard
-  # way concurrency worked before Logstash 2.4
-  # 
-  # You should explicitly set it to either :single or :shared as :legacy will be removed in Logstash 6.0
-  # 
-  # When configured as :single a single instance of the Output will be shared among the
-  # pipeline worker threads. Access to the `#multi_receive/#multi_receive_encoded/#receive` method will be synchronized
-  # i.e. only one thread will be active at a time making threadsafety much simpler.
-  # 
-  # You can set this to :shared if your output is threadsafe. This will maximize
-  # concurrency but you will need to make appropriate uses of mutexes in `#multi_receive/#receive`.
-  #
-  # Only the `#multi_receive/#multi_receive_encoded` methods need to actually be threadsafe, the other methods
-  # will only be executed in a single thread
-  concurrency :single
-  
-  public
-  def register    
-  end # def register
-
-  public
-  # Takes an array of events
-  # Must be threadsafe if `concurrency :shared` is set
-  def multi_receive(events)
-  end # def multi_receive
-end # class LogStash::{pluginclass}::{pluginnamecap}
-----------------------------------
-endif::multi_receive_method[]
-
-==== Coding {plugintype} plugins
-
-Now let's take a line-by-line look at the example plugin.
-
-==== `encoding`
-
-It seems like a small thing, but remember to specify the encoding at the
-beginning of your plugin code:
-
-[source,sh]
-----------------------------------
-# encoding: utf-8
-----------------------------------
-
-Logstash depends on things being in UTF-8, so we put this here to tell the Ruby
-interpreter that we’re going to be using the UTF-8 encoding.
-
-==== `require` Statements
-
-Logstash {plugintype} plugins require parent classes defined in
-+logstash/pass:attributes[{plugintype}]s/base+ and logstash/namespace:
-
-[source,ruby]
-[subs="attributes"]
-----------------------------------
-require "logstash/{plugintype}s/base"
-require "logstash/namespace"
-----------------------------------
-
-Of course, the plugin you build may depend on other code, or even gems. Just put
-them here along with these Logstash dependencies.
-
-==== Plugin Body
-
-Let's go through the various elements of the plugin itself.
-
-==== Inline Documentation
-Logstash provides infrastructure to automatically generate documentation for
-plugins. We use the asciidoc format to write documentation so _any_ comments in
-the source code will be first converted into asciidoc and then into html.
-
-All plugin documentation is then rendered and placed in
-http://www.elasticsearch.org/guide/en/logstash/current/index.html[the Logstash section of the Elasticsearch Guide].
-
-The inline documentation can include code blocks and config examples! To include
-Ruby code, use the asciidoc `[source,ruby]` directive:
-
-[source,txt]
-[subs="attributes"]
-----------------------------------
-# Using hashes:
-# [source,ruby]
-# ----------------------------------
-# match => {
-#  "field1" => "value1"
-#  "field2" => "value2"
-#  ...
-# }
-# ----------------------------------
-----------------------------------
-
-In the rendered HTML document, this block would look like:
-
-[]
-=========================
-Using hashes:
-[source,ruby]
-----------------------------------
-match => {
-  "field1" => "value1"
-  "field2" => "value2"
-  ...
- }
-----------------------------------
-=========================
-
-
-TIP: For more asciidoc formatting tips, see the excellent reference at
-https://github.com/elastic/docs#asciidoc-guide
-
-==== `class` Declaration
-The {plugintype} plugin class should be a subclass of
-+LogStash::pass:attributes[{pluginclass}]::Base+:
-
-[source,ruby]
-[subs="attributes"]
-----------------------------------
-class LogStash::{pluginclass}::{pluginnamecap} < LogStash::{pluginclass}::Base
-----------------------------------
-
-The class name should closely mirror the plugin name, for example:
-[source,ruby]
-[subs="attributes"]
-----
-LogStash::{pluginclass}::{pluginnamecap}
-----
-
-==== `config_name`
-[source,ruby]
-[subs="attributes"]
-----------------------------------
-  config_name "{pluginname}"
-----------------------------------
-This is the name your plugin will call inside the {plugintype} configuration
-block.
-
-If you set +config_name "pass:attributes[{pluginname}]"+ in your plugin code,
-the corresponding Logstash configuration block would need to look like this:
-
-// /////////////////////////////////////////////////////////////////////////////
-// If encode_method is NOT defined (not a codec)
-// /////////////////////////////////////////////////////////////////////////////
-ifndef::encode_method[]
-ifndef::blockcodec[]
-[source,js]
-[subs="attributes"]
-----------------------------------
-{plugintype} {
-  {pluginname} {...}
-}
-----------------------------------
-endif::blockcodec[]
-endif::encode_method[]
-
-// /////////////////////////////////////////////////////////////////////////////
-// If encode_method IS defined (for codecs only)
-// /////////////////////////////////////////////////////////////////////////////
-ifdef::encode_method[]
-ifndef::blockinput[]
-[source,js]
-[subs="attributes"]
-----------------------------------
-input {
-  codec => {pluginname} {...}
-}
-----------------------------------
-
-Or if using the codec in an output block:
-
-[source,js]
-[subs="attributes"]
-----------------------------------
-output {
-  codec => {pluginname} {...}
-}
-----------------------------------
-endif::blockinput[]
-endif::encode_method[]
-
-==== Configuration Parameters
-[source,ruby]
-----------------------------------
-  config :variable_name, :validate => :variable_type, :default => "Default value", :required => boolean, :deprecated => boolean, :obsolete => string
-----------------------------------
-The configuration, or `config` section allows you to define as many (or as few)
-parameters as are needed to enable Logstash to process events.
-
-There are several configuration attributes:
-
-* `:validate` - allows you to enforce passing a particular data type to Logstash
-for this configuration option, such as `:string`, `:password`, `:boolean`,
-`:number`, `:array`, `:hash`, `:path` (a file-system path), `uri`, `:codec` (since
-1.2.0), `:bytes`.  Note that this also works as a coercion 
-in that if I specify "true" for boolean (even though technically a string), it
-will become a valid boolean in the config.  This coercion works for the
-`:number` type as well where "1.2" becomes a float and "22" is an integer.
-* `:default` - lets you specify a default value for a parameter
-* `:required` - whether or not this parameter is mandatory (a Boolean `true` or
-* `:list` - whether or not this value should be a list of values. Will typecheck the list members, and convert scalars to one element lists. Note that this mostly obviates the array type, though if you need lists of complex objects that will be more suitable.
-`false`)
-* `:deprecated` - informational (also a Boolean `true` or `false`)
-* `:obsolete` - used to declare that a given setting has been removed and is no longer functioning. The idea is to provide an informed upgrade path to users who are still using a now-removed setting.
-
-==== Plugin Methods
-
-{methodheader}
-
-// /////////////////////////////////////////////////////////////////////////////
-// If register_method is defined (should be all types)
-// /////////////////////////////////////////////////////////////////////////////
-ifdef::register_method[]
-
-==== `register` Method
-[source,ruby]
-[subs="attributes"]
-----------------------------------
-  public
-  def register
-  end # def register
-----------------------------------
-
-The Logstash `register` method is like an `initialize` method. It was originally
-created to enforce having `super` called, preventing headaches for newbies.
-(Note: It may go away in favor of `initialize`, in conjunction with some
-enforced testing to ensure `super` is called.)
-
-`public` means the method can be called anywhere, not just within the class.
-This is the default behavior for methods in Ruby, but it is specified explicitly
-here anyway.
-
-You can also assign instance variables here (variables prepended by `@`).
-Configuration variables are now in scope as instance variables, like `@message`
-
-endif::register_method[]
-
-// /////////////////////////////////////////////////////////////////////////////
-// If filter_method is defined (should only be for filter plugin page)
-// /////////////////////////////////////////////////////////////////////////////
-ifdef::filter_method[]
-ifndef::blockfilter[]
-
-==== `filter` Method
-
-[source,ruby]
-[subs="attributes"]
-----------------------------------
-  public
-  def filter(event)
-
-    if @message
-      # Replace the event message with our message as configured in the
-      # config file.
-      event.set("message", @message)
-    end
-
-  # filter_matched should go in the last line of our successful code
-  filter_matched(event)
-end # def filter
-----------------------------------
-The plugin's `filter` method is where the actual filtering work takes place!
-Inside the `filter` method you can refer to the event data using the `Event`
-object. Event is the main object that encapsulates data flow internally in Logstash 
-and provides an <<event-api, API>> for the plugin developers to interact with the 
-event's content.
-
-The `filter` method should also handle any <<event-dependent-configuration, event dependent configuration>> by 
-explicitly calling the `sprintf` method available in Event class. For example:
-
-[source,ruby]
-----------------------------------
-field_foo = event.sprintf(field)
-----------------------------------
-
-Note that configuration variables are now in scope as instance variables, like
-`@message`
-
-[source,ruby]
-----------------------------------
-  filter_matched(event)
-----------------------------------
-Calling the `filter_matched` method upon successful execution of the plugin will
-ensure that any fields or tags added through the Logstash configuration for this
-filter will be handled correctly. For example, any `add_field`, `remove_field`,
-`add_tag` and/or `remove_tag` actions will be performed at this time.
-
-Event methods such as `event.cancel` are now available to control the workflow
-of the event being processed.
-endif::blockfilter[]
-endif::filter_method[]
-
-// /////////////////////////////////////////////////////////////////////////////
-// If decode_method is defined (should only be for codec plugin page)
-// /////////////////////////////////////////////////////////////////////////////
-ifdef::decode_method[]
-ifndef::blockcodec[]
-
-==== `decode` Method
-
-[source,ruby]
-[subs="attributes"]
-----------------------------------
-  public
-  def decode(data)
-    @lines.decode(data) do |line|
-      replace = { "message" => line["message"].to_s + @append }
-      yield LogStash::Event.new(replace)
-    end
-  end # def decode
-----------------------------------
-The codec's `decode` method is where data coming in from an input is transformed
-into an event.  There are complex examples like the
-https://github.com/logstash-plugins/logstash-codec-collectd/blob/master/lib/logstash/codecs/collectd.rb#L386-L484[collectd]
-codec, and simpler examples like the https://github.com/logstash-plugins/logstash-codec-spool/blob/master/lib/logstash/codecs/spool.rb#L11-L16[spool]
-codec.
-
-There must be a `yield` statement as part of the `decode` method which will
-return decoded events to the pipeline.
-endif::blockcodec[]
-endif::decode_method[]
-
-// /////////////////////////////////////////////////////////////////////////////
-// If encode_method is defined (should only be for codec plugin page)
-// /////////////////////////////////////////////////////////////////////////////
-ifdef::encode_method[]
-ifndef::blockcodec[]
-
-==== `encode` Method
-
-[source,ruby]
-[subs="attributes"]
-----------------------------------
-  public
-  def encode(event)
-    @on_event.call(event, event.get("message").to_s + @append + NL)
-  end # def encode
-----------------------------------
-The `encode` method takes an event and serializes it (_encodes_) into another
-format.  Good examples of `encode` methods include the simple https://github.com/logstash-plugins/logstash-codec-plain/blob/master/lib/logstash/codecs/plain.rb#L39-L46[plain]
-codec, the slightly more involved https://github.com/logstash-plugins/logstash-codec-msgpack/blob/master/lib/logstash/codecs/msgpack.rb#L38-L46[msgpack]
-codec, and even an https://github.com/logstash-plugins/logstash-codec-avro/blob/master/lib/logstash/codecs/avro.rb#L38-L45[avro]
-codec.
-
-In most cases, your `encode` method should have an `@on_event.call()` statement.
-This call will output data per event in the described way.
-endif::blockcodec[]
-endif::encode_method[]
-
-// /////////////////////////////////////////////////////////////////////////////
-// If run_method is defined (should only be for input plugin page)
-// /////////////////////////////////////////////////////////////////////////////
-ifdef::run_method[]
-ifndef::blockinput[]
-
-==== `run` Method
-
-The {pluginname} input plugin has the following `run` Method:
-
-[source,ruby]
-[subs="attributes"]
-----------------------------------
-  def run(queue)
-    Stud.interval(@interval) do
-      event = LogStash::Event.new("message" => @message, "host" => @host)
-      decorate(event)
-      queue << event
-    end # loop
-  end # def run
-----------------------------------
-The `run` method is where a stream of data from an input becomes an event.
-
-The stream can be plain or generated as with the
-https://github.com/logstash-plugins/logstash-input-heartbeat/blob/master/lib/logstash/inputs/heartbeat.rb#L43-L61[heartbeat]
-input plugin.  In these cases, though no codec is used,
-https://github.com/logstash-plugins/logstash-input-heartbeat/blob/master/lib/logstash/inputs/heartbeat.rb#L17[a default codec]
-must be set in the code to avoid errors.
-
-Here's another example `run` method:
-[source,ruby]
-[subs="attributes"]
-----------------------------------
-  def run(queue)
-    while true
-      begin
-        # Based on some testing, there is no way to interrupt an IO.sysread nor
-        # IO.select call in JRuby.
-        data = $stdin.sysread(16384)
-        @codec.decode(data) do |event|
-          decorate(event)
-          event.set("host", @host) if !event.include?("host")
-          queue << event
-        end
-      rescue IOError, EOFError, LogStash::ShutdownSignal
-        # stdin closed or a requested shutdown
-        break
-      end
-    end # while true
-    finished
-  end # def run
-----------------------------------
-In this example, the `data` is being sent to the codec defined in the
-configuration block to `decode` the data stream and return an event.
-
-In both examples, the resulting `event` is passed to the `decorate` method:
-[source,ruby]
-[subs="attributes"]
-----------------------------------
-      decorate(event)
-----------------------------------
-This applies any tags you might have set in the input configuration block. For
-example, `tags => ["tag1", "tag2"]`.
-
-Also in both examples, the `event`, after being "decorated," is appended to the
-queue:
-[source,ruby]
-[subs="attributes"]
-----------------------------------
-      queue << event
-----------------------------------
-
-This inserts the event into the pipeline.
-
-[TIP]
-======
-Because input plugins can range from simple to complex, it is helpful to see
-more examples of how they have been created:
-
- - https://github.com/logstash-plugins/logstash-input-syslog/blob/master/lib/logstash/inputs/syslog.rb[syslog]
- - https://github.com/logstash-plugins/logstash-input-zeromq/blob/master/lib/logstash/inputs/zeromq.rb[zeromq]
- - https://github.com/logstash-plugins/logstash-input-stdin/blob/master/lib/logstash/inputs/stdin.rb[stdin]
- - https://github.com/logstash-plugins/logstash-input-tcp/blob/master/lib/logstash/inputs/tcp.rb[tcp]
-
-There are many more more examples in the https://github.com/logstash-plugins?query=logstash-input[logstash-plugin github repository].
-======
-endif::blockinput[]
-endif::run_method[]
-
-// /////////////////////////////////////////////////////////////////////////////
-// If multi_receive_method is defined (should only be for output plugin page)
-// /////////////////////////////////////////////////////////////////////////////
-ifdef::receive_method[]
-
-==== `receive` Method
-
-[source,ruby]
-[subs="attributes"]
-----------------------------------
-  public
-  def receive(event)
-  end # def event
-----------------------------------
-This empty `receive` method does absolutely nothing, which is valid code from
-the https://github.com/logstash-plugins/logstash-output-null/blob/master/lib/logstash/outputs/null.rb[null]
-output plugin.
-
-The `receive` method _receives_ events from the pipeline and further processes
-them before sending them to their final destination.  These destinations can
-be as varied as https://github.com/logstash-plugins/logstash-output-file/blob/master/lib/logstash/outputs/file.rb[files],
-https://github.com/logstash-plugins/logstash-output-elasticsearch/blob/master/lib/logstash/outputs/elasticsearch.rb[elasticsearch],
-https://github.com/logstash-plugins/logstash-output-email/blob/master/lib/logstash/outputs/email.rb[email],
-https://github.com/logstash-plugins/logstash-output-rabbitmq/blob/master/lib/logstash/outputs/rabbitmq.rb[RabbitMQ],
-https://github.com/logstash-plugins/logstash-output-tcp/blob/master/lib/logstash/outputs/tcp.rb[tcp],
-https://github.com/logstash-plugins/logstash-output-stdout/blob/master/lib/logstash/outputs/stdout.rb[stdout],
-and dozens more!
-
-Output plugins do not require you to make use of codecs, but you can use a
-codec by including code similar to this:
-[source,ruby]
-[subs="attributes"]
-----------------------------------
-  public
-  def receive(event)
-    return unless output?(event)
-    @codec.encode(event)
-  end # def receive
-----------------------------------
-
-For more examples of output plugins, see the https://github.com/logstash-plugins?query=logstash-output[logstash-plugin github repository].
-
-endif::receive_method[]
-
-// Teardown is now in the base class... can be pruned?
-// /////////////////////////////////////////////////////////////////////////////
-// If close_method is defined (should only be for input or output plugin page)
-// /////////////////////////////////////////////////////////////////////////////
-// ifdef::close_method[]
-// [float]
-// ==== `close` Method
-// [source,ruby]
-// [subs="attributes"]
-// ----------------------------------
-// public
-// def close
-//   @udp.close if @udp && !@udp.closed?
-// end
-// ----------------------------------
-// The `close` method is not present in all input or output plugins.  It is
-// called when a shutdown happens to ensure that sockets, files, connections and
-// threads are all closed down properly.  If your plugin uses these connections,
-// you should include a close method.
-// endif::close_method[]
-
-==== Building the Plugin
-
-At this point in the process you have coded your plugin and are ready to build
-a Ruby Gem from it.  The following steps will help you complete the process.
-
-==== External dependencies
-
-A `require` statement in Ruby is used to include necessary code. In some cases
-your plugin may require additional files.  For example, the collectd plugin
-https://github.com/logstash-plugins/logstash-codec-collectd/blob/master/lib/logstash/codecs/collectd.rb#L148[uses]
-the `types.db` file provided by collectd.  In the main directory of your plugin,
-a file called `vendor.json` is where these files are described.
-
-The `vendor.json` file contains an array of JSON objects, each describing a file
-dependency. This example comes from the
-https://github.com/logstash-plugins/logstash-codec-collectd/blob/master/vendor.json[collectd]
-codec plugin:
-
-[source,txt]
-----------------------------------
-[{
-        "sha1": "a90fe6cc53b76b7bdd56dc57950d90787cb9c96e",
-        "url": "http://collectd.org/files/collectd-5.4.0.tar.gz",
-        "files": [ "/src/types.db" ]
-}]
-----------------------------------
-
-** `sha1` is the sha1 signature used to verify the integrity of the file
-referenced by `url`.
-** `url` is the address from where Logstash will download the file.
-** `files` is an optional array of files to extract from the downloaded file.
-Note that while tar archives can use absolute or relative paths, treat them as
-absolute in this array.  If `files` is not present, all files will be
-uncompressed and extracted into the vendor directory.
-
-Another example of the `vendor.json` file is the
-https://github.com/logstash-plugins/logstash-filter-geoip/blob/master/vendor.json[`geoip` filter]
-
-The process used to download these dependencies is to call `rake vendor`.  This
-will be discussed further in the testing section of this document.
-
-Another kind of external dependency is on jar files.  This will be described
-in the "Add a `gemspec` file" section.
-
-==== Add a Gemfile
-
-Gemfiles allow Ruby's Bundler to maintain the dependencies for your plugin.
-Currently, all we'll need is the Logstash gem, for testing, but if you require
-other gems, you should add them in here.
-
-TIP: See http://bundler.io/gemfile.html[Bundler's Gemfile page] for more details.
-
-[source,ruby]
-[subs="attributes"]
-----------------------------------
-source 'https://rubygems.org'
-gemspec
-gem "logstash", :github => "elastic/logstash", :branch => "{branch}"
-----------------------------------
-
-==== Add a `gemspec` file
-Gemspecs define the Ruby gem which will be built and contain your plugin.
-
-TIP: More information can be found on the
-http://guides.rubygems.org/specification-reference/[Rubygems Specification page].
-
-[source,ruby]
-[subs="attributes"]
-----------------------------------
-Gem::Specification.new do |s|
-  s.name = 'logstash-{plugintype}-{pluginname}'
-  s.version = '0.1.0'
-  s.licenses = ['Apache License (2.0)']
-  s.summary = "This {plugintype} does x, y, z in Logstash"
-  s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
-  s.authors = ["Elastic"]
-  s.email = 'info@elastic.co'
-  s.homepage = "http://www.elastic.co/guide/en/logstash/current/index.html"
-  s.require_paths = ["lib"]
-
-  # Files
-  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
-   # Tests
-  s.test_files = s.files.grep(%r{^(test|spec|features)/})
-
-  # Special flag to let us know this is actually a logstash plugin
-  s.metadata = { "logstash_plugin" => "true", "logstash_group" => "{plugintype}" }
-
-  # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
-  s.add_development_dependency 'logstash-devutils'
-end
-----------------------------------
-
-It is appropriate to change these values to fit your plugin. In particular,
-`s.name` and `s.summary` should reflect your plugin's name and behavior.
-
-`s.licenses` and `s.version` are also important and will come into play when
-you are ready to publish your plugin.
-
-Logstash and all its plugins are licensed under
-https://github.com/elastic/logstash/blob/master/LICENSE[Apache License, version 2 ("ALv2")].
-If you make your plugin publicly available via http://rubygems.org[RubyGems.org],
-please make sure to have this line in your gemspec:
-
-* `s.licenses = ['Apache License (2.0)']`
-
-The gem version, designated by `s.version`, helps track changes to plugins over
-time. You should use http://semver.org/[semver versioning] strategy for version numbers. 
-
-==== Runtime & Development Dependencies
-
-At the bottom of the `gemspec` file is a section with a comment:
-`Gem dependencies`.  This is where any other needed gems must be mentioned. If
-a gem is necessary for your plugin to function, it is a runtime dependency. If
-a gem are only used for testing, then it would be a development dependency.
-
-[NOTE]
-=========================
-You can also have versioning requirements for your dependencies--including other
-Logstash plugins:
-
-[source,ruby]
-[subs="attributes"]
-----------------------------------
-  # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
-  s.add_development_dependency 'logstash-devutils'
-----------------------------------
-This gemspec has a runtime dependency on the logstash-core-plugin-api and requires that
-it have a version number greater than or equal to version 1.60 and less than or equal to version 2.99.
-=========================
-
-
-IMPORTANT: All plugins have a runtime dependency on the `logstash-core-plugin-api` gem, and
-a development dependency on `logstash-devutils`.
-
-==== Jar dependencies
-
-In some cases, such as the
-https://github.com/logstash-plugins/logstash-output-elasticsearch/blob/master/logstash-output-elasticsearch.gemspec#L22-L23[Elasticsearch output plugin],
-your code may depend on a jar file.  In cases such as this, the dependency is
-added in the gemspec file in this manner:
-
-[source,ruby]
-[subs="attributes"]
-----------------------------------
-  # Jar dependencies
-  s.requirements << "jar 'org.elasticsearch:elasticsearch', '5.0.0'"
-  s.add_runtime_dependency 'jar-dependencies'
-----------------------------------
-
-With these both defined, the install process will search for the required jar
-file at http://mvnrepository.com and download the specified version.
-
-==== Add Tests
-
-Logstash loves tests. Lots of tests. If you're using your new {plugintype}
-plugin in a production environment, you'll want to have some tests to ensure you
-are not breaking any existing functionality.
-
-NOTE: A full exposition on RSpec is outside the scope of this document. Learn
-more about RSpec at http://rspec.info
-
-For help learning about tests and testing, look in the
-+spec/pass:attributes[{plugintype}]s/+ directory of several other similar
-plugins.
-
-==== Clone and test!
-
-Now let's start with a fresh clone of the plugin, build it and run the tests.
-
-* **Clone your plugin into a temporary location** Replace `GITUSERNAME` with
-your github username, and `MYPLUGINNAME` with your plugin name.
-** `git clone https://github.com/GITUSERNAME/logstash-`+pass:attributes[{plugintype}]-MYPLUGINNAME.git+
-*** alternately, via ssh: `git clone git@github.com:GITUSERNAME/logstash-`+pass:attributes[{plugintype}]-MYPLUGINNAME.git+
-** +cd logstash-pass:attributes[{plugintype}]-MYPLUGINNAME+
-
-Then, you'll need to install your plugins dependencies with bundler:
-
-----------------------------------
-bundle install
-----------------------------------
-
-[IMPORTANT]
-======
-
-If your plugin has an external file dependency described in `vendor.json`, you
-must download that dependency before running or testing.  You can do this by
-running:
-
-----------------------------------
-rake vendor
-----------------------------------
-======
-
-And finally, run the tests:
-
-----------------------------------
-bundle exec rspec
-----------------------------------
-
-You should see a success message, which looks something like this:
-
-----------------------------------
-Finished in 0.034 seconds
-1 example, 0 failures
-----------------------------------
-
-Hooray! You're almost there! (Unless you saw failures... you should fix those
-  first).
-
-==== Building and Testing
-
-Now you're ready to build your (well-tested) plugin into a Ruby gem.
-
-==== Build
-You already have all the necessary ingredients, so let's go ahead and run the
-build command:
-
-[source,sh]
-[subs="attributes"]
-----------------------------------
-gem build logstash-{plugintype}-{pluginname}.gemspec
-----------------------------------
-
-That's it!  Your gem should be built and be in the same path with the name
-[source,sh]
-[subs="attributes"]
-----------------------------------
-logstash-{plugintype}-mypluginname-0.1.0.gem
-----------------------------------
-The `s.version` number from your gemspec file will provide the gem version, in
-this case, `0.1.0`.
-
-==== Test installation
-
-You should test install your plugin into a clean installation of Logstash.
-Download the latest version from the
-https://www.elastic.co/downloads/logstash/[Logstash downloads page].
-
-. Untar and cd in to the directory:
-+
-[source,sh]
-[subs="attributes"]
-----------------------------------
-curl -O https://download.elastic.co/logstash/logstash/logstash-{logstash_version}.tar.gz
-tar xzvf logstash-{logstash_version}.tar.gz
-cd logstash-{logstash_version}
-----------------------------------
-. Using the plugin tool, we can install the gem we just built.
-+
-* Replace `/my/logstash/plugins` with  the correct path to the gem for your
-environment, and `0.1.0` with the correct version number from the gemspec file.
-+
-[source,sh]
-[subs="attributes"]
-----------------------------------
-bin/logstash-plugin install /my/logstash/plugins/logstash-{plugintype}-{pluginname}/logstash-{plugintype}-{pluginname}-0.1.0.gem
-----------------------------------
-+
-* After running this, you should see feedback from Logstash that it was
-successfully installed:
-+
-[source,sh]
-[subs="attributes"]
-----------------------------------
-validating /my/logstash/plugins/logstash-{plugintype}-{pluginname}/logstash-{plugintype}-{pluginname}-0.1.0.gem >= 0
-Valid logstash plugin. Continuing...
-Successfully installed 'logstash-{plugintype}-{pluginname}' with version '0.1.0'
-----------------------------------
-+
-[TIP]
-=======
-You can also use the Logstash plugin tool to determine which plugins are
-currently available:
-
-[source,sh]
-----------------------------------
-bin/logstash-plugin list
-----------------------------------
-Depending on what you have installed, you might see a short or long list of
-plugins: inputs, codecs, filters and outputs.
-=======
-+
-. Now try running Logstash with a simple configuration passed in via the
-command-line, using the `-e` flag.
-[NOTE]
-Your results will depend on what your {plugintype} plugin is designed to do.
-
-ifdef::run_method[]
-ifndef::blockinput[]
-[source,sh]
-[subs="attributes"]
-----------------------------------
-bin/logstash -e 'input { {pluginname}{} } output {stdout { codec => rubydebug }}'
-----------------------------------
-
-The {pluginname} {plugintype} plugin will send the contents of `message` (with a
-default message of "Hello World!") every second.
-
-[source,sh]
-[subs="attributes"]
-----------------------------------
-{
-       "message" => "Hello World!",
-      "@version" => "1",
-    "@timestamp" => "2015-01-27T19:17:18.932Z",
-          "host" => "cadenza"
-}
-----------------------------------
-
-Feel free to experiment and test this by changing the `message` and `interval` parameters:
-[source,sh]
-[subs="attributes"]
-----------------------------------
-bin/logstash -e 'input { {pluginname}{ message => "A different message" interval => 5 } } output {stdout { codec => rubydebug }}'
-----------------------------------
-endif::blockinput[]
-endif::run_method[]
-
-ifdef::encode_method[]
-ifndef::blockcodec[]
-[source,sh]
-[subs="attributes"]
-----------------------------------
-bin/logstash -e 'input { stdin{ codec => {pluginname}{}} } output {stdout { codec => rubydebug }}'
-----------------------------------
-
-The {pluginname} {plugintype} plugin will append the contents of `append` (which
-by default appends ", Hello World!")
-
-After starting Logstash, type something, for example "Random output string".
-The resulting output message field contents should be,
-"Random output string, Hello World!":
-
-[source,sh]
-[subs="attributes"]
-----------------------------------
-Random output string
-{
-       "message" => "Random output string, Hello World!",
-      "@version" => "1",
-    "@timestamp" => "2015-01-27T19:17:18.932Z",
-          "host" => "cadenza"
-}
-----------------------------------
-
-Feel free to experiment and test this by changing the `append` parameter:
-[source,sh]
-[subs="attributes"]
-----------------------------------
-bin/logstash -e 'input { stdin{ codec => {pluginname}{ append => ", I am appending this! }} } output {stdout { codec => rubydebug }}'
-----------------------------------
-
-endif::blockcodec[]
-endif::encode_method[]
-
-ifdef::filter_method[]
-ifndef::blockfilter[]
-[source,sh]
-[subs="attributes"]
-----------------------------------
-bin/logstash -e 'input { stdin{} } {plugintype} { {pluginname} {} } output {stdout { codec => rubydebug }}'
-----------------------------------
-
-Test your filter by sending input through `stdin` and output (after filtering)
-through `stdout` with the `rubydebug` codec, which enhances readability.
-
-In the case of the {pluginname} {plugintype} plugin, any text you send will be
-replaced by the contents of the `message` configuration parameter, the default
-value being "Hello World!":
-
-[source,sh]
-[subs="attributes"]
-----------------------------------
-Testing 1, 2, 3
-{
-       "message" => "Hello World!",
-      "@version" => "1",
-    "@timestamp" => "2015-01-27T19:17:18.932Z",
-          "host" => "cadenza"
-}
-----------------------------------
-
-Feel free to experiment and test this by changing the `message` parameter:
-[source,sh]
-[subs="attributes"]
-----------------------------------
-bin/logstash -e 'input { stdin{} } {plugintype} { {pluginname} { message => "This is a new message!"} } output {stdout { codec => rubydebug }}'
-----------------------------------
-
-endif::blockfilter[]
-endif::filter_method[]
-
-ifdef::receive_method[]
-
-It is harder to display console proof of a working output--with the notable
-exception of the `stdout` plugin.
-
-[source,sh]
-[subs="attributes"]
-----------------------------------
-bin/logstash -e 'input { stdin {} } output { {pluginname}{} }'
-----------------------------------
-
-Depending on your plugin, you may or may not be immediately able to tell it is
-working.  If your output plugin sends to a network socket, you may want to set
-up a listener to test the results.  Through your testing, you should be able to
-verify that your target is receiving the expected results.
-
-endif::receive_method[]
-
-Congratulations! You've built, deployed and successfully run a Logstash
-{plugintype}.
-
-==== Submitting your plugin to http://rubygems.org[RubyGems.org] and https://github.com/logstash-plugins[logstash-plugins]
-
-Logstash uses http://rubygems.org[RubyGems.org] as its repository for all plugin
-artifacts. Once you have developed your new plugin, you can make it available to
-Logstash users by simply publishing it to RubyGems.org.
-
-==== Licensing
-Logstash and all its plugins are licensed under
-https://github.com/elasticsearch/logstash/blob/master/LICENSE[Apache License, version 2 ("ALv2")].
-If you make your plugin publicly available via http://rubygems.org[RubyGems.org],
-please make sure to have this line in your gemspec:
-
-* `s.licenses = ['Apache License (2.0)']`
-
-==== Publishing to http://rubygems.org[RubyGems.org]
-
-To begin, you’ll need an account on RubyGems.org
-
-* https://rubygems.org/sign_up[Sign-up for a RubyGems account].
-
-After creating an account,
-http://guides.rubygems.org/rubygems-org-api/#api-authorization[obtain] an API
-key from RubyGems.org. By default, RubyGems uses the file `~/.gem/credentials`
-to store your API key. These credentials will be used to publish the gem.
-Replace `username` and `password` with the credentials you created at
-RubyGems.org:
-
-[source,sh]
-----------------------------------
-curl -u username:password https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials
-chmod 0600 ~/.gem/credentials
-----------------------------------
-
-Before proceeding, make sure you have the right version in your gemspec file
-and commit your changes.
-
-* `s.version = '0.1.0'`
-
-To publish version 0.1.0 of your new logstash gem:
-
-[source,sh]
-----------------------------------
-bundle install
-bundle exec rake vendor
-bundle exec rspec
-bundle exec rake publish_gem
-----------------------------------
-
-[NOTE]
-========
-Executing `rake publish_gem`:
-
-. Reads the version from the gemspec file (`s.version = '0.1.0'`)
-. Checks in your local repository if a tag exists for that version. If the tag
-already exists, it aborts the process. Otherwise, it creates a new version tag
-in your local repository.
-. Builds the gem
-. Publishes the gem to RubyGems.org
-========
-
-That's it! Your plugin is published! Logstash users can now install your plugin
-by running:
-
-[source,sh]
-[subs="attributes"]
-----------------------------------
-bin/logstash-plugin install logstash-{plugintype}-mypluginname
-----------------------------------
-
-==== Contributing your source code to https://github.com/logstash-plugins[logstash-plugins]
-
-It is not required to contribute your source code to
-https://github.com/logstash-plugins[logstash-plugins] github organization, but
-we always welcome new plugins!
-
-==== Benefits
-
-Some of the many benefits of having your plugin in the logstash-plugins
-repository are:
-
-* **Discovery** Your plugin will appear in the http://www.elasticsearch.org/guide/en/logstash/current/index.html[Logstash Reference],
-where Logstash users look first for plugins and documentation.
-* **Documentation** Your plugin documentation will automatically be added to the
- http://www.elasticsearch.org/guide/en/logstash/current/index.html[Logstash Reference].
-* **Testing** With our testing infrastructure, your plugin will be continuously
-tested against current and future releases of Logstash.  As a result, users will
-have the assurance that if incompatibilities arise, they will be quickly
-discovered and corrected.
-
-==== Acceptance Guidelines
-
-* **Code Review** Your plugin must be reviewed by members of the community for
-coherence, quality, readability, stability and security.
-* **Tests** Your plugin must contain tests to be accepted.  These tests are also
-subject to code review for scope and completeness.  It's ok if you don't know
-how to write tests -- we will guide you. We are working on publishing a guide to
-creating tests for Logstash which will make it easier.  In the meantime, you can
-refer to http://betterspecs.org/ for examples.
-
-To begin migrating your plugin to logstash-plugins, simply create a new
-https://github.com/elasticsearch/logstash/issues[issue] in
-the Logstash repository. When the acceptance guidelines are completed, we will
-facilitate the move to the logstash-plugins organization using the recommended
-https://help.github.com/articles/transferring-a-repository/#transferring-from-a-user-to-an-organization[github process].
-
-
diff --git a/docs/static/ingest-convert.asciidoc b/docs/static/ingest-convert.asciidoc
deleted file mode 100644
index b263faebd..000000000
--- a/docs/static/ingest-convert.asciidoc
+++ /dev/null
@@ -1,90 +0,0 @@
-[[ingest-converter]]
-=== Converting Ingest Node Pipelines
-
-After implementing {ref}/ingest.html[ingest] pipelines to parse your data, you
-might decide that you want to take advantage of the richer transformation
-capabilities in Logstash. For example, you may need to use Logstash instead of
-ingest pipelines if you want to:
-
-* Ingest from more inputs. Logstash can natively ingest data from many other
-sources like TCP, UDP, syslog, and relational databases.
-
-* Use multiple outputs. Ingest node was designed to only support Elasticsearch
-as an output, but you may want to use more than one output. For example, you may
-want to archive your incoming data to S3 as well as indexing it in
-Elasticsearch.
-
-* Take advantage of the richer transformation capabilities in Logstash, such as
-external lookups.
-
-* Use the persistent queue feature to handle spikes when ingesting data (from
-Beats and other sources).
-
-To make it easier for you to migrate your configurations, Logstash provides an
-ingest pipeline conversion tool. The conversion tool takes the ingest pipeline
-definition as input and, when possible, creates the equivalent Logstash
-configuration as output. 
-
-See <<ingest-converter-limitations>> for a full list of tool limitations.
-
-[[ingest-converter-run]]
-==== Running the tool
-
-You'll find the conversion tool in the `bin` directory of your Logstash
-installation. See <<dir-layout>> to find the location of `bin` on your system.
-
-To run the conversion tool, use the following command:
-
-[source,shell]
------
-bin/ingest-convert.sh --input INPUT_FILE_URI --output OUTPUT_FILE_URI [--append-stdio]
------
-
-Where:
-
-* `INPUT_FILE_URI` is a file URI that specifies the full path to the JSON file
-that defines the ingest node pipeline. 
-
-* `OUTPUT_FILE_URI` is the file URI of the Logstash DSL file that will be
-generated by the tool.
-
-* `--append-stdio` is an optional flag that adds stdin and stdout sections to
-the config instead of adding the default Elasticsearch output.
-
-This command expects a file URI, so make sure you use forward slashes and
-specify the full path to the file.
-
-For example:
-
-[source,text]
------
-bin/ingest-convert.sh --input file:///tmp/ingest/apache.json --output file:///tmp/ingest/apache.conf
------
-
-
-[[ingest-converter-limitations]]
-==== Limitations
-
-* Painless script conversion is not supported.
-
-* Only a subset of available processors are
-<<ingest-converter-supported-processors,supported>> for conversion. For
-processors that are not supported, the tool produces a warning and continues
-with a best-effort conversion. 
-
-[[ingest-converter-supported-processors]]
-==== Supported Processors
-
-The following ingest node processors are currently supported for conversion by
-the tool:
-
-* Append
-* Convert
-* Date
-* GeoIP
-* Grok
-* Gsub
-* Json
-* Lowercase
-* Rename
-* Set
diff --git a/docs/static/input.asciidoc b/docs/static/input.asciidoc
deleted file mode 100644
index d84275b51..000000000
--- a/docs/static/input.asciidoc
+++ /dev/null
@@ -1,12 +0,0 @@
-:register_method:	true
-:run_method:		true
-:plugintype:    	input
-:pluginclass:   	Inputs
-:pluginname:    	example
-:pluginnamecap: 	Example
-
-:getstarted: Let's step through creating an {plugintype} plugin using the https://github.com/logstash-plugins/logstash-input-example/[example {plugintype} plugin].
-
-:methodheader: Logstash inputs must implement two main methods: `register` and `run`.
-
-include::include/pluginbody.asciidoc[]
diff --git a/docs/static/introduction.asciidoc b/docs/static/introduction.asciidoc
deleted file mode 100644
index e1bc7bc4c..000000000
--- a/docs/static/introduction.asciidoc
+++ /dev/null
@@ -1,122 +0,0 @@
-[float]
-[[power-of-logstash]]
-== The Power of Logstash
-
-*The ingestion workhorse for Elasticsearch and more*
-
-Horizontally scalable data processing pipeline with strong Elasticsearch and Kibana synergy
-
-*Pluggable pipeline architecture*
-
-Mix, match, and orchestrate different inputs, filters, and outputs to play in pipeline harmony
-
-*Community-extensible and developer-friendly plugin ecosystem*
-
-Over 200 plugins available, plus the flexibility of creating and contributing your own
-
-image:static/images/logstash.png[]
-
-[float]
-== Logstash Loves Data
-
-Collect more, so you can know more. Logstash welcomes data of all shapes and sizes.
-
-[float]
-=== Logs and Metrics
-
-Where it all started.
-
-* Handle all types of logging data
-** Easily ingest a multitude of web logs like {logstash-ref}/advanced-pipeline.html[Apache], and application
-logs like {logstash-ref}/plugins-inputs-log4j.html[log4j] for Java
-** Capture many other log formats like {logstash-ref}/plugins-inputs-syslog.html[syslog], networking and firewall logs, and more
-* Enjoy complementary secure log forwarding capabilities with https://www.elastic.co/products/beats/filebeat[Filebeat]
-* Collect metrics from {logstash-ref}/plugins-inputs-ganglia.html[Ganglia], {logstash-ref}/plugins-codecs-collectd.html[collectd],
-{logstash-ref}/plugins-codecs-netflow.html[NetFlow], {logstash-ref}/plugins-inputs-jmx.html[JMX], and many other infrastructure
-and application platforms over {logstash-ref}/plugins-inputs-tcp.html[TCP] and {logstash-ref}/plugins-inputs-udp.html[UDP]
-
-[float]
-=== The Web
-
-Unlock the World Wide Web.
-
-* Transform {logstash-ref}/plugins-inputs-http.html[HTTP requests] into events
-** Consume from web service firehoses like {logstash-ref}/plugins-inputs-twitter.html[Twitter] for social sentiment analysis
-** Webhook support for GitHub, HipChat, JIRA, and countless other applications
-** Enables many https://www.elastic.co/products/x-pack/alerting[Watcher] alerting use cases
-* Create events by polling {logstash-ref}/plugins-inputs-http_poller.html[HTTP endpoints] on demand
-** Universally capture health, performance, metrics, and other types of data from web application interfaces
-** Perfect for scenarios where the control of polling is preferred over receiving
-
-[float]
-=== Data Stores and Streams
-
-Discover more value from the data you already own.
-
-* Better understand your data from any relational database or NoSQL store with a
-{logstash-ref}/plugins-inputs-jdbc.html[JDBC] interface 
-* Unify diverse data streams from messaging queues like Apache {logstash-ref}/plugins-outputs-kafka.html[Kafka],
-{logstash-ref}/plugins-outputs-rabbitmq.html[RabbitMQ], and {logstash-ref}/plugins-outputs-sqs.html[Amazon SQS]
-
-[float]
-=== Sensors and IoT
-
-Explore an expansive breadth of other data.
-
-* In this age of technological advancement, the massive IoT world unleashes endless use cases through capturing and
-harnessing data from connected sensors.
-* Logstash is the common event collection backbone for ingestion of data shipped from mobile devices to intelligent
-homes, connected vehicles, healthcare sensors, and many other industry specific applications.
-
-[float]
-== Easily Enrich Everything
-
-The better the data, the better the knowledge. Clean and transform your data during ingestion to gain near real-time
-insights immediately at index or output time. Logstash comes out-of-box with many aggregations and mutations along
-with pattern matching, geo mapping, and dynamic lookup capabilities.
-
-* {logstash-ref}/plugins-filters-grok.html[Grok] is the bread and butter of Logstash filters and is used ubiquitously to derive
-structure out of unstructured data. Enjoy a wealth of integrated patterns aimed to help quickly resolve web, systems,
-networking, and other types of event formats.
-* Expand your horizons by deciphering {logstash-ref}/plugins-filters-geoip.html[geo coordinates] from IP addresses, normalizing
-{logstash-ref}/plugins-filters-date.html[date] complexity, simplifying {logstash-ref}/plugins-filters-kv.html[key-value pairs] and
-{logstash-ref}/plugins-filters-csv.html[CSV] data, {logstash-ref}/plugins-filters-fingerprint.html[fingerprinting](anonymizing) sensitive information,
-and further enriching your data with {logstash-ref}/plugins-filters-translate.html[local lookups] or Elasticsearch
-{logstash-ref}/plugins-filters-elasticsearch.html[queries].
-* Codecs are often used to ease the processing of common event structures like {logstash-ref}/plugins-codecs-json.html[JSON]
-and {logstash-ref}/plugins-codecs-multiline.html[multiline] events.
-
-See {logstash-ref}/transformation.html[Transforming Data] for an overview of some of the popular data processing plugins.
-
-[float]
-== Choose Your Stash
-
-Route your data where it matters most. Unlock various downstream analytical and operational use cases by storing,
-analyzing, and taking action on your data.
-
-*Analysis*
-
-* {logstash-ref}/plugins-outputs-elasticsearch.html[Elasticsearch]
-* Data stores such as {logstash-ref}/plugins-outputs-mongodb.html[MongoDB] and {logstash-ref}/plugins-outputs-riak.html[Riak]
-
-*Archiving*
-
-* {logstash-ref}/plugins-outputs-webhdfs.html[HDFS]
-* {logstash-ref}/plugins-outputs-s3.html[S3]
-
-*Monitoring*
-
-* {logstash-ref}/plugins-outputs-nagios.html[Nagios]
-* {logstash-ref}/plugins-outputs-ganglia.html[Ganglia]
-* {logstash-ref}/plugins-outputs-zabbix.html[Zabbix]
-* {logstash-ref}/plugins-outputs-graphite.html[Graphite]
-* {logstash-ref}/plugins-outputs-datadog.html[Datadog]
-* {logstash-ref}/plugins-outputs-cloudwatch.html[CloudWatch]
-
-*Alerting*
-
-* https://www.elastic.co/products/watcher[Watcher] with Elasticsearch
-* {logstash-ref}/plugins-outputs-email.html[Email]
-* {logstash-ref}/plugins-outputs-pagerduty.html[Pagerduty]
-* {logstash-ref}/plugins-outputs-irc.html[IRC]
-* {logstash-ref}/plugins-outputs-sns.html[SNS]
diff --git a/docs/static/keystore.asciidoc b/docs/static/keystore.asciidoc
deleted file mode 100644
index d40b5a07f..000000000
--- a/docs/static/keystore.asciidoc
+++ /dev/null
@@ -1,161 +0,0 @@
-[[keystore]]
-=== Secrets keystore for secure settings
-
-When you configure Logstash, you might need to specify sensitive settings or
-configuration, such as passwords. Rather than relying on file system permissions
-to protect these values, you can use the Logstash keystore to securely store
-secret values for use in configuration settings.
-
-After adding a key and its secret value to the keystore, you can use the key in
-place of the secret value when you configure sensitive settings.
-
-The syntax for referencing keys is identical to the syntax for
-<<environment-variables, environment variables>>:
-
-`${KEY}`
-
-Where KEY is the name of the key.
-
-For example, imagine that the keystore contains a key called `ES_PWD` with the
-value `yourelasticsearchpassword`:
-
-* In configuration files, use: `output { elasticsearch {...password => "${ES_PWD}" } } }`
-* In `logstash.yml`, use: `xpack.management.elasticsearch.password: ${ES_PWD}`
-
-Notice that the Logstash keystore differs from the Elasticsearch keystore.
-Whereas the Elasticsearch keystore lets you store `elasticsearch.yml` values by
-name, the Logstash keystore lets you specify arbitrary names that you
-can reference in the Logstash configuration. 
-
-NOTE: Referencing keystore data from `pipelines.yml` or the command line (`-e`)
-is not currently supported.
-
-NOTE: Referencing keystore data from {logstash-ref}/logstash-centralized-pipeline-management.html[centralized pipeline management]
-requires each Logstash deployment to have a local copy of the keystore.
-
-When Logstash parses the settings (`logstash.yml`) or configuration
-(`/etc/logstash/conf.d/*.conf`), it resolves keys from the keystore before
-resolving environment variables.
-
-// TODO: add keystore-command to running-logstash-command-line.asciidoc
-// To create and manage keys, use the `keystore` command. See the
-// <<keystore-command,command reference>> for the full command syntax, including
-// optional flags.
-
-[float]
-[[keystore-password]]
-=== Keystore password
-
-You can protect access to the Logstash keystore by storing a password in an
-environment variable called `LOGSTASH_KEYSTORE_PASS`. If you create the Logstash
-keystore after setting this variable, the keystore will be password protected.
-This means that the environment variable needs to be accessible to the running
-instance of Logstash. This environment variable must also be correctly set for
-any users who need to issue keystore commands (add, list, remove, etc.).
-
-Using a keystore password is recommended, but optional. The data will be encrypted even if you
-do not set a password. However, it is highly recommended to configure the
-keystore password and grant restrictive permissions to any files that may
-contain the environment variable value. If you choose not to set a password, then
-you can skip the rest of this section. 
-
-For example:
-[source,sh]
---------------------------------------------------
-set +o history
-export LOGSTASH_KEYSTORE_PASS=mypassword
-set -o history
-bin/logstash-keystore create
---------------------------------------------------
-
-This setup requires the user running Logstash to have the environment variable
-`LOGSTASH_KEYSTORE_PASS=mypassword` defined. If the environment variable is not defined,
-Logstash cannot access the the keystore.
-
-When you run Logstash from an RPM or DEB package installation, the environment
-variables are sourced from `/etc/sysconfig/logstash`.
-
-NOTE: You might need to create `/etc/sysconfig/logstash`. This file should be
-owned by `root` with `600` permissions. The expected format of
-`/etc/sysconfig/logstash` is `ENVIRONMENT_VARIABLE=VALUE`, with one entry per
-line.
-
-For other distributions, such as Docker or ZIP, see the documentation for your
-runtime environment (Windows, Docker, etc) to learn how to set the
-environment variable for the user that runs Logstash. Ensure that the
-environment variable (and thus the password) is only accessible to that user.
-
-[float]
-[[keystore-location]]
-=== Keystore location
-
-The keystore must be located in Logstash's `path.settings` directory. This is
-the same directory that contains the `logstash.yml` file. When performing any
-operation against the keystore, it is recommended to set `path.settings` for the
-keystore command. For example, to create a keystore on a RPM/DEB installation:
-
-["source","sh",subs="attributes"]
-----------------------------------------------------------------
-set +o history
-export LOGSTASH_KEYSTORE_PASS=mypassword
-set -o history
-sudo -E /usr/share/logstash/bin/logstash-keystore --path.settings /etc/logstash create
-----------------------------------------------------------------
-
-See <<dir-layout>> for more about the default directory locations.
-
-NOTE: You will see a warning if the `path.settings` is not pointed to the same directory
-as the `logstash.yml`.
-
-[float]
-[[creating-keystore]]
-=== Create a keystore
-
-To create a secrets keystore, use the `create`:
-
-["source","sh",subs="attributes"]
-----------------------------------------------------------------
-bin/logstash-keystore create
-----------------------------------------------------------------
-
-Creates the keystore in the directory defined by the `path.settings`
-configuration setting.
-
-NOTE: It is recommended that you set a <<keystore-password,keystore password>>
-when creating the keystore.
-
-[float]
-[[add-keys-to-keystore]]
-=== Add keys
-
-To store sensitive values, such as authentication credentials for Elasticsearch,
-use the `add` command:
-
-["source","sh",subs="attributes"]
-----------------------------------------------------------------
-bin/logstash-keystore add ES_PWD
-----------------------------------------------------------------
-
-When prompted, enter a value for the key.
-
-[float]
-[[list-settings]]
-=== List keys
-
-To list the keys defined in the keystore, use:
-
-["source","sh",subs="attributes"]
-----------------------------------------------------------------
-bin/logstash-keystore list
-----------------------------------------------------------------
-
-[float]
-[[remove-settings]]
-=== Remove keys
-
-To remove a key from the keystore, use:
-
-["source","sh",subs="attributes"]
-----------------------------------------------------------------
-bin/logstash-keystore remove ES_PWD
-----------------------------------------------------------------
diff --git a/docs/static/life-of-an-event.asciidoc b/docs/static/life-of-an-event.asciidoc
deleted file mode 100644
index 608994cac..000000000
--- a/docs/static/life-of-an-event.asciidoc
+++ /dev/null
@@ -1,98 +0,0 @@
-[[pipeline]]
-== How Logstash Works
-
-The Logstash event processing pipeline has three stages: inputs -> filters ->
-outputs. Inputs generate events, filters modify them, and outputs ship them
-elsewhere. Inputs and outputs support codecs that enable you to encode or decode
-the data as it enters or exits the pipeline without having to use a separate
-filter.
-
-[float]
-=== Inputs
-You use inputs to get data into Logstash. Some of the more commonly-used inputs
-are:
-
-* *file*: reads from a file on the filesystem, much like the UNIX command
-`tail -0F`
-* *syslog*: listens on the well-known port 514 for syslog messages and parses
-according to the RFC3164 format
-* *redis*: reads from a redis server, using both redis channels and redis lists.
-Redis is often used as a "broker" in a centralized Logstash installation, which
-queues Logstash events from remote Logstash "shippers".
-* *beats*: processes events sent by https://www.elastic.co/downloads/beats[Beats].
-
-For more information about the available inputs, see
-<<input-plugins,Input Plugins>>.
-
-[float]
-=== Filters
-Filters are intermediary processing devices in the Logstash pipeline. You can
-combine filters with conditionals to perform an action on an event if it meets
-certain criteria. Some useful filters include:
-
-* *grok*: parse and structure arbitrary text. Grok is currently the best way in
-Logstash to parse unstructured log data into something structured and queryable.
-With 120 patterns built-in to Logstash, it's more than likely you'll find one
-that meets your needs!
-* *mutate*: perform general transformations on event fields. You can rename,
-remove, replace, and modify fields in your events.
-* *drop*: drop an event completely, for example, 'debug' events.
-* *clone*: make a copy of an event, possibly adding or removing fields.
-* *geoip*: add information about geographical location of IP addresses (also
-displays amazing charts in Kibana!)
-
-For more information about the available filters, see
-<<filter-plugins,Filter Plugins>>.
-
-[float]
-=== Outputs
-Outputs are the final phase of the Logstash pipeline. An event can pass through
-multiple outputs, but once all output processing is complete, the event has
-finished its execution. Some commonly used outputs include:
-
-* *elasticsearch*: send event data to Elasticsearch. If you're planning to save
-your data in an efficient, convenient, and easily queryable format...
-Elasticsearch is the way to go. Period. Yes, we're biased :)
-* *file*: write event data to a file on disk.
-* *graphite*: send event data to graphite, a popular open source tool for
-storing and graphing metrics. http://graphite.readthedocs.io/en/latest/
-* *statsd*: send event data to statsd, a service that "listens for statistics,
-like counters and timers, sent over UDP and sends aggregates to one or more
-pluggable backend services". If you're already using statsd, this could be
-useful for you!
-
-For more information about the available outputs, see
-<<output-plugins,Output Plugins>>.
-
-[float]
-=== Codecs
-Codecs are basically stream filters that can operate as part of an input or
-output. Codecs enable you to easily separate the transport of your messages from
-the serialization process. Popular codecs include `json`, `msgpack`, and `plain`
-(text).
-
-* *json*: encode or decode data in the JSON format.
-* *multiline*: merge multiple-line text events such as java exception and
-stacktrace messages into a single event.
-
-For more information about the available codecs, see
-<<codec-plugins,Codec Plugins>>.
-
-[[execution-model]]
-=== Execution Model
-
-The Logstash event processing pipeline coordinates the execution of inputs,
-filters, and outputs.
-
-Each input stage in the Logstash pipeline runs in its own thread. Inputs write
-events to a central queue that is either in memory (default) or on disk. Each
-pipeline worker thread takes a batch of events off this queue, runs the batch of
-events through the configured filters, and then runs the filtered events through
-any outputs. The size of the batch and number of pipeline worker threads are
-configurable (see <<tuning-logstash>>).
-
-By default, Logstash uses in-memory bounded queues between pipeline stages
-(input → filter and filter → output) to buffer events. If Logstash terminates
-unsafely, any events that are stored in memory will be lost. To help prevent data
-loss, you can enable Logstash to persist in-flight events to disk. See
-<<persistent-queues>> for more information.
diff --git a/docs/static/logging.asciidoc b/docs/static/logging.asciidoc
deleted file mode 100644
index 8e78ff284..000000000
--- a/docs/static/logging.asciidoc
+++ /dev/null
@@ -1,174 +0,0 @@
-[[logging]]
-=== Logging
-
-Logstash emits internal logs during its operation, which are placed in `LS_HOME/logs` (or `/var/log/logstash` for
-DEB/RPM). The default logging level is `INFO`. Logstash's logging framework is based on
-http://logging.apache.org/log4j/2.x/[Log4j 2 framework], and much of its functionality is exposed directly to users.
-
-You can configure logging for a particular subsystem, module, or plugin.
-
-When you need to debug problems, particularly problems with plugins, consider
-increasing the logging level to `DEBUG` to get more verbose messages. For
-example, if you are debugging issues with Elasticsearch Output, you can increase
-log levels just for that component. This approach reduces noise from
-excessive logging and helps you focus on the problem area.
-
-You can configure logging using the `log4j2.properties` file or the Logstash API.
-
-* *`log4j2.properties` file.*  Changes made through the `log4j2.properties`
-file require you to restart Logstash for the changes to take effect.  Changes *persist*
-through subsequent restarts. 
-* *Logging API.* Changes made through the Logging API are effective immediately 
-without a restart. The changes *do not persist* after Logstash
-is restarted.
-
-[[log4j2]]
-==== Log4j2 configuration
-
-Logstash ships with a `log4j2.properties` file with out-of-the-box settings. You
-can modify this file to change the rotation policy, type, and other
-https://logging.apache.org/log4j/2.x/manual/configuration.html#Loggers[log4j2
-configuration]. 
-
-You must restart Logstash to apply any changes that you make to
-this file.
-Changes to `log4j2.properties` persist after Logstash is restarted.
-
-Here's an example using `outputs.elasticsearch`:
-
-[source,yaml]
---------------------------------------------------
-logger.elasticsearchoutput.name = logstash.outputs.elasticsearch
-logger.elasticsearchoutput.level = debug
---------------------------------------------------
-
-==== Logging APIs
-
-For temporary logging changes, modifying the `log4j2.properties` file and restarting Logstash leads to unnecessary
-downtime. Instead, you can dynamically update logging levels through the logging API. These settings are effective
-immediately and do not need a restart. 
-
-NOTE: By default, the logging API attempts to bind to `tcp:9600`. If this port is already in use by another Logstash
-instance, you need to launch Logstash with the `--http.port` flag specified to bind to a different port. See
-<<command-line-flags>> for more information.
-
-===== Retrieve list of logging configurations
-
-To retrieve a list of logging subsystems available at runtime, you can do a `GET` request to `_node/logging`
-
-[source,js]
---------------------------------------------------
-curl -XGET 'localhost:9600/_node/logging?pretty'
---------------------------------------------------
-
-Example response:
-
-["source","js"]
---------------------------------------------------
-{
-...
-  "loggers" : {
-    "logstash.agent" : "INFO",
-    "logstash.api.service" : "INFO",
-    "logstash.basepipeline" : "INFO",
-    "logstash.codecs.plain" : "INFO",
-    "logstash.codecs.rubydebug" : "INFO",
-    "logstash.filters.grok" : "INFO",
-    "logstash.inputs.beats" : "INFO",
-    "logstash.instrument.periodicpoller.jvm" : "INFO",
-    "logstash.instrument.periodicpoller.os" : "INFO",
-    "logstash.instrument.periodicpoller.persistentqueue" : "INFO",
-    "logstash.outputs.stdout" : "INFO",
-    "logstash.pipeline" : "INFO",
-    "logstash.plugins.registry" : "INFO",
-    "logstash.runner" : "INFO",
-    "logstash.shutdownwatcher" : "INFO",
-    "org.logstash.Event" : "INFO",
-    "slowlog.logstash.codecs.plain" : "TRACE",
-    "slowlog.logstash.codecs.rubydebug" : "TRACE",
-    "slowlog.logstash.filters.grok" : "TRACE",
-    "slowlog.logstash.inputs.beats" : "TRACE",
-    "slowlog.logstash.outputs.stdout" : "TRACE"
-  }
-}
---------------------------------------------------
-
-===== Update logging levels
-
-Prepend the name of the subsystem, module, or plugin with `logger.`. 
-
-Here is an example using `outputs.elasticsearch`:
-
-[source,js]
---------------------------------------------------
-curl -XPUT 'localhost:9600/_node/logging?pretty' -H 'Content-Type: application/json' -d'
-{
-    "logger.logstash.outputs.elasticsearch" : "DEBUG"
-}
-'
---------------------------------------------------
-
-While this setting is in effect, Logstash emits DEBUG-level logs for __all__ the Elasticsearch outputs
-specified in your configuration. Please note this new setting is transient and will not survive a restart.
-
-NOTE: If you want logging changes to persist after a restart, add them to `log4j2.properties` instead. 
-
-===== Reset dynamic logging levels
-
-To reset any logging levels that may have been dynamically changed via the logging API, send a `PUT` request to
-`_node/logging/reset`. All logging levels will revert to the values specified in the `log4j2.properties` file.
-
-[source,js]
---------------------------------------------------
-curl -XPUT 'localhost:9600/_node/logging/reset?pretty'
---------------------------------------------------
-
-==== Log file location
-
-You can specify the log file location using `--path.logs` setting.
-
-==== Slowlog
-
-Slowlog for Logstash adds the ability to log when a specific event takes an abnormal amount of time to make its way
-through the pipeline. Just like the normal application log, you can find slowlogs in your `--path.logs` directory.
-Slowlog is configured in the `logstash.yml` settings file with the following options:
-
-[source,yaml]
-------------------------------
-slowlog.threshold.warn (default: -1)
-slowlog.threshold.info (default: -1)
-slowlog.threshold.debug (default: -1)
-slowlog.threshold.trace (default: -1)
-------------------------------
-
-Slowlog is disabled by default. The default threshold values are set to
-`-1nanos` to represent an infinite threshold. No slowlog will be invoked. 
-
-===== Enable slowlog
-
-The `slowlog.threshold` fields use a time-value format which enables a wide
-range of trigger intervals. You can specify ranges using the following time
-units: `nanos` (nanoseconds), `micros` (microseconds), `ms` (milliseconds), `s`
-(second), `m` (minute), `h` (hour), `d` (day).
-
-Slowlog becomes more sensitive and logs more events as you raise the log level. 
-
-Example:
-
-[source,yaml]
-------------------------------
-slowlog.threshold.warn: 2s
-slowlog.threshold.info: 1s
-slowlog.threshold.debug: 500ms
-slowlog.threshold.trace: 100ms
-------------------------------
-
-In this example:
-
-* If the log level is set to `warn`, the log shows events that took longer than 2 seconds to process.
-* If the log level is set to `info`, the log shows events that took longer than 1s to process.
-* If the log level is set to `trace`, the log shows events that took longer than 100ms to process.
-* If the log level is set to `debug`, the log shows events that took longer than 500ms to process.
-
-The logs include the full event and filter configuration that are responsible
-for the slowness.
diff --git a/docs/static/logstash-glossary.asciidoc b/docs/static/logstash-glossary.asciidoc
deleted file mode 100644
index d184899f3..000000000
--- a/docs/static/logstash-glossary.asciidoc
+++ /dev/null
@@ -1,132 +0,0 @@
-== Glossary
-Logstash Glossary
-
-apache ::
-	A very common open source web server application, which produces logs easily consumed by Logstash (Apache Common/Combined Log Format).
-
-agent ::
-	An invocation of Logstash with a particular configuration, allowing it to operate as a "shipper", a "collector", or a combination of functionalities.
-
-
-broker ::
-	An intermediary used in a multi-tiered Logstash deployment which allows a queueing mechanism to be used. Examples of brokers are Redis, RabbitMQ, and Apache Kafka. This pattern is a common method of building fault-tolerance into a Logstash architecture.
-
-buffer::
-	Within Logstash, a temporary storage area where events can queue up, waiting to be processed. The default queue size is 20 events, but it is not recommended to increase this, as Logstash is not designed to operate as a queueing mechanism.
-
-centralized::
-	A configuration of Logstash in which the Logstash agent, input and output sources live on multiple machines, and the pipeline passes through these tiers.
-
-codec::
-	A Logstash plugin which works within an input or output plugin, and usually aims to serialize or deserialize data flowing through the Logstash pipeline. A common example is the JSON codec, which allows Logstash inputs to receive data which arrives in JSON format, or output event data in JSON format.
-
-collector::
-	An instance of Logstash which receives external events from another instance of Logstash, or perhaps some other client, either remote or local.
-
-conditional::
-	In a computer programming context, a control flow which executes certain actions based on true/false values of a statement (called the condition). Often expressed in the form of "if ... then ... (elseif ...) else". Logstash has built-in conditionals to allow users control of the plugin pipeline.
-
-elasticsearch::
-	An open-source, Lucene-based, RESTful search and analytics engine written in Java, with supported clients in various languages such as Perl, Python, Ruby, Java, etc.
-
-event::
-	In Logstash parlance, a single unit of information, containing a timestamp plus additional data. An event arrives via an input, and is subsequently parsed, timestamped, and passed through the Logstash pipeline.
-
-field::
-	A data point (often a key-value pair) within a full Logstash event, e.g. "timestamp", "message", "hostname", "ipaddress". Also used to describe a key-value pair in Elasticsearch.
-
-file::
-	A resource storing binary data (which might be text, image, application, etc.) on a physical storage media. In the Logstash context, a common input source which monitors a growing collection of text-based log lines.
-
-filter:
-	An intermediary processing mechanism in the Logstash pipeline. Typically, filters act upon event data after it has been ingested via inputs, by mutating, enriching, and/or modifying the data according to configuration rules. The second phase of the typical Logstash pipeline (inputs->filters->outputs).
-
-fluentd::
-	Like Logstash, another open-source tool for collecting logs and events, with plugins to extend functionality.
-
-ganglia::
-	A scalable, distributed monitoring system suitable for large clusters. Logstash features both an input and an output to enable reading from, and writing to Ganglia.
-
-graphite::
-	A highly-scalable realtime graphing application, which presents graphs through web interfaces. Logstash provides an output which ships event data to Graphite for visualization.
-
-heka::
-	An open-source event processing system developed by Mozilla and often compared to Logstash.
-
-index::
-	An index can be seen as a named collection of documents in Elasticsearch which are available for searching and querying. It is a logical namespace which maps to one or more primary shards and can have zero or more replica shards.
-
-indexer::
-	Refers to a Logstash instance which is tasked with interfacing with an Elasticsearch cluster in order to index event data.
-
-input::
-	The means for ingesting data into Logstash. Inputs allow users to pull data from files, network sockets, other applications, etc. The initial phase of the typical Logstash pipeline (inputs->filters->outputs).
-
-jar / jarfile::
-	A packaging method for Java libraries. Since Logstash runs on the JRuby runtime environment, it is possible to use these Java libraries to provide extra functionality to Logstash.
-
-java::
-	An object-oriented programming language popular for its flexibility, extendability and portability.
-
-jRuby:
-	JRuby is a 100% Java implementation of the Ruby programming language, which allows Ruby to run in the JVM. Logstash typically runs in JRuby, which provides it with a fast, extensible runtime environment.
-
-kibana::
-	A visual tool for viewing time-based data which has been stored in Elasticsearch. Kibana features a powerful set of functionality based on panels which query Elasticsearch in different ways.
-
-log::
-	A snippet of textual information emitted by a device, ostensibly with some pertinent information about the status of said device.
-
-log4j::
-	A very common Java-based logging utility.
-
-Logstash::
-	An application which offers a powerful data processing pipeline, allowing users to consume information from various sources, enrich the data, and output it to any number of other sources.
-
-lumberjack::
-	A protocol for shipping logs from one location to another, in a secure and optimized manner. Also the (deprecated) name of a software application, now known as Logstash Forwarder (LSF).
-
-output::
-	The means for passing event data out of Logstash into other applications, network endpoints, files, etc. The last phase of the typical Logstash pipeline (inputs->filters->outputs).
-
-pipeline::
-	A term used to describe the flow of events through the Logstash workflow. The pipeline typically consists of a series of inputs, filters, and outputs.
-
-plugin::
-	A generic term referring to an input, codec, filter, or output which extends basic Logstash functionality.
-
-redis::
-	An open-source key-value store and cache which is often used in conjunction with Logstash as a message broker.
-
-ruby::
-	A popular, open-source, object-oriented programming language in which Logstash is implemented.
-
-shell::
-	A command-line interface to an operating system.
-
-shipper::
-	An instance of Logstash which send events to another instance of Logstash, or some other application.
-
-statsd::
-	A network daemon for aggregating statistics, such as counters and timers, and shipping over UDP to backend services, such as Graphite or Datadog. Logstash provides an output to statsd.
-
-stdin::
-	An I/O stream providing input to a software application. In Logstash, an input which receives data from this stream.
-
-stdout::
-	An I/O stream producing output from a software application. In Logstash, an output which produces data from this stream.
-
-syslog::
-	A popular method for logging messages from a computer. The standard is somewhat loose, but Logstash has tools (input, grok patterns) to make this simpler.
-
-standalone::
-	A configuration of Logstash in which the Logstash agent, input and output sources typically live on the same host machine.
-
-thread::
-	Parallel sequences of execution within a process which allow a computer to perform several tasks simultaneously, in a multi-processor environment. Logstash takes advantage of this functionality, by specifying the "-w" flag
-
-type::
-	In Elasticsearch type, a type can be compared to a table in a relational database. Each type has a list of fields that can be specified for documents of that type. The mapping defines how each field in the document is analyzed. To index documents, it is required to specify both an index and a type.
-
-worker::
-	The filter thread model used by Logstash, where each worker receives an event and applies all filters, in order, before emitting the event to the output queue. This allows scalability across CPUs because many filters are CPU intensive (permitting that we have thread safety).
diff --git a/docs/static/ls-ls-config.asciidoc b/docs/static/ls-ls-config.asciidoc
deleted file mode 100644
index 9b2b63ca4..000000000
--- a/docs/static/ls-ls-config.asciidoc
+++ /dev/null
@@ -1,98 +0,0 @@
-[[ls-to-ls]]
-=== Logstash-to-Logstash Communication
-
-You can set up communication between two Logstash machines by connecting the Lumberjack output to the Beats input. You may need this configuration if the data path crosses network or firewall boundaries, for example. If you don't have a compelling need for Logstash-to-Logstash communication, then don't implement it.
-
-If you are looking for information on connecting multiple pipelines within one
-Logstash instance, see <<pipeline-to-pipeline>>.
-
-==== Configuration overview
-
-Use the Lumberjack protocol to connect two Logstash machines.
-
-. Generate a trusted SSL certificate (required by the lumberjack protocol).
-. Copy the SSL certificate to the upstream Logstash machine.
-. Copy the SSL certificate and key to the downstream Logstash machine.
-. Set the upstream Logstash machine to use the Lumberjack output to send data.
-. Set the downstream Logstash machine to listen for incoming Lumberjack connections through the Beats input.
-. Test it.
-
-[[generate-self-signed-cert]]
-===== Generate a self-signed SSL certificate and key
-
-Use the `openssl req` command to generate a self-signed certificate and key. The `openssl req` command is available with some operating systems. You may need to install the openssl command line program for others.
-
-Run the following command:
-
-[source,shell]
-----
-openssl req -x509 -batch -nodes -newkey rsa:2048 -keyout lumberjack.key -out lumberjack.cert -subj /CN=localhost
-----
-
-where:
-
-* `lumberjack.key` is the name of the SSL key to be created
-* `lumberjack.cert` is the name of the SSL certificate to be created
-* `localhost` is the name of the upstream Logstash computer
-
-
-This command produces output similar to the following:
-
-[source,shell]
-----
-Generating a 2048 bit RSA private key
-.................................+++
-....................+++
-writing new private key to 'lumberjack.key'
-----
-
-[[copy-cert-key]]
-===== Copy the SSL certificate and key
-
-Copy the SSL certificate to the upstream Logstash machine.
-
-Copy the SSL certificate and key to the downstream Logstash machine.
-
-[[save-cert-ls1]]
-===== Start the upstream Logstash instance
-
-Start Logstash and generate test events:
-
-[source,shell]
-----
-bin/logstash -e 'input { generator { count => 5 } } output { lumberjack { codec => json hosts => "mydownstreamhost" ssl_certificate => "lumberjack.cert" port => 5000 } }'
-----
-
-This sample command sends five events to mydownstreamhost:5000 using the SSL certificate provided.
-
-[[save-cert-ls2]]
-===== Start the downstream Logstash instance
-
-Start the downstream instance of Logstash:
-
-[source,shell]
-----
-bin/logstash -e 'input { beats { codec => json port => 5000 ssl => true ssl_certificate => "lumberjack.cert" ssl_key => "lumberjack.key"} }'
-----
-
-This sample command sets port 5000 to listen for incoming Beats input.
-
-[[test-ls-to-ls]]
-===== Verify the communication
-
-Watch the downstream Logstash machine for the incoming events. You should see five incrementing events similar to the following:
-
-[source,shell]
-----
-{
-  "@timestamp" => 2018-02-07T12:16:39.415Z,
-  "sequence"   => 0
-  "tags"       => [
-    [0] "beats_input_codec_json_applied"
-  ],
-  "message"    => "Hello world",
-  "@version"   => "1",
-  "host"       => "ls1.semicomplete.com"
-}
-----
-If you see all five events with consistent fields and formatting, incrementing by one, then your configuration is correct.
diff --git a/docs/static/maintainer-guide.asciidoc b/docs/static/maintainer-guide.asciidoc
deleted file mode 100644
index 7d3e0c9a0..000000000
--- a/docs/static/maintainer-guide.asciidoc
+++ /dev/null
@@ -1,222 +0,0 @@
-[[community-maintainer]]
-=== Logstash Plugins Community Maintainer Guide
-
-This document, to be read by new Maintainers, should explain their responsibilities.  It was inspired by the
-http://rfc.zeromq.org/spec:22[C4] document from the ZeroMQ project.  This document is subject to change and suggestions
-through Pull Requests and issues are strongly encouraged.
-
-[float]
-=== Contribution Guidelines
-
-For general guidance around contributing to Logstash Plugins, see the
-https://www.elastic.co/guide/en/logstash/current/contributing-to-logstash.html[_Contributing to Logstash_] section.
-
-[float]
-=== Document Goals
-
-To help make the Logstash plugins community participation easy with positive feedback.
-
-To increase diversity.
-
-To reduce code review, merge and release dependencies on the core team by providing support and tools to the Community and
-Maintainers.
-
-To support the natural life cycle of a plugin.
-
-To codify the roles and responsibilities of: Maintainers and Contributors with specific focus on patch testing, code
-review, merging and release.
-
-[float]
-=== Development Workflow
-
-All Issues and Pull Requests must be tracked using the Github issue tracker.
-
-The plugin uses the http://www.apache.org/licenses/LICENSE-2.0[Apache 2.0 license]. Maintainers should check whether a
-patch introduces code which has an incompatible license. Patch ownership and copyright is defined in the Elastic
-https://www.elastic.co/contributor-agreement[Contributor License Agreement] (CLA).
-
-[float]
-==== Terminology
-
-A "Contributor" is a role a person assumes when providing a patch. Contributors will not have commit access to the
-repository. They need to sign the Elastic https://www.elastic.co/contributor-agreement[Contributor License Agreement]
-before a patch can be reviewed. Contributors can add themselves to the plugin Contributor list.
-
-A "Maintainer" is a role a person assumes when maintaining a plugin and keeping it healthy, including triaging issues, and
-reviewing and merging patches.
-
-[float]
-==== Patch Requirements
-
-A patch is a minimal and accurate answer to exactly one identified and agreed upon problem. It must conform to the
-https://github.com/elastic/logstash/blob/master/STYLE.md[code style guidelines] and must include RSpec tests that verify
-the fitness of the solution.
-
-A patch will be automatically tested by a CI system that will report on the Pull Request status.
-
-A patch CLA will be automatically verified and reported on the Pull Request status.
-
-A patch commit message has a single short (less than 50 character) first line summarizing the change, a blank second line,
-and any additional lines as necessary for change explanation and rationale.
-
-A patch is mergeable when it satisfies the above requirements and has been reviewed positively by at least one other
-person.
-
-[float]
-==== Development Process
-
-A user will log an issue on the issue tracker describing the problem they face or observe with as much detail as possible.
-
-To work on an issue, a Contributor forks the plugin repository and then works on their forked repository and submits a
-patch by creating a pull request back to the plugin.
-
-Maintainers must not merge patches where the author has not signed the CLA.
-
-Before a patch can be accepted it should be reviewed. Maintainers should merge accepted patches without delay.
-
-Maintainers should not merge their own patches except in exceptional cases, such as non-responsiveness from other
-Maintainers or core team for an extended period (more than 2 weeks).
-
-Reviewer’s comments should not be based on personal preferences.
-
-The Maintainers should label Issues and Pull Requests.
-
-Maintainers should involve the core team if help is needed to reach consensus.
-
-Review non-source changes such as documentation in the same way as source code changes.
-
-[float]
-==== Branch Management
-
-The plugin has a master branch that always holds the latest in-progress version and should always build.  Topic branches
-should kept to the minimum.
-
-[float]
-==== Changelog Management
-
-Every plugin should have a changelog (CHANGELOG.md).  If not, please create one.  When changes are made to a plugin, make sure to include a changelog entry under the respective version to document the change.  The changelog should be easily understood from a user point of view.  As we iterate and release plugins rapidly, users use the changelog as a mechanism for deciding whether to update.
-
-Changes that are not user facing should be tagged as `internal:`.  For example:
-
-[source,markdown]
- - internal: Refactored specs for better testing
- - config: Default timeout configuration changed from 10s to 5s
-
-[float]
-===== Detailed format of CHANGELOG.md
-
-Sharing a similar format of CHANGELOG.md in plugins ease readability for users.
-Please see following annotated example and see a concrete example in https://raw.githubusercontent.com/logstash-plugins/logstash-filter-date/master/CHANGELOG.md[logstash-filter-date].
-
-[source,markdown]
-----
-## 1.0.x                              // <1> <2>
- - change description                 // <3>
- - tag: change description            // <3> <4>
- - tag1,tag2: change description      // <3> <5>
- - tag: Multi-line description        // <3> <6>
-   must be indented and can use
-   additional markdown syntax
-                                      // <7>
-## 1.0.0                              // <8>
-[...]
-
-----
-<1> Latest version is the first line of CHANGELOG.md
-<2> Each version identifier should be a level-2 header using `##`
-<3> One change description is described as a list item using a dash `-` aligned under the version identifier
-<4> One change can be tagged by a word and suffixed by `:`. +
-    Common tags are `bugfix`, `feature`, `doc`, `test` or `internal`.
-<5> One change can have multiple tags separated by a comma and suffixed by `:`
-<6> A multi-line change description must be properly indented
-<7> Please take care to *separate versions with an empty line*
-<8> Previous version identifier
-
-[float]
-==== Continuous Integration
-
-Plugins are setup with automated continuous integration (CI) environments and there should be a corresponding badge on each Github page.  If it’s missing, please contact the Logstash core team.
-
-Every Pull Request opened automatically triggers a CI run.  To conduct a manual run, comment “Jenkins, please test this.” on the Pull Request.
-
-[float]
-=== Versioning Plugins
-
-Logstash core and its plugins have separate product development lifecycles. Hence the versioning and release strategy for
-the core and plugins do not have to be aligned. In fact, this was one of our goals during the great separation of plugins
-work in Logstash 1.5.
-
-At times, there will be changes in core API in Logstash, which will require mass update of plugins to reflect the changes
-in core. However, this does not happen frequently.
-
-For plugins, we would like to adhere to a versioning and release strategy that can better inform our users, about any
-breaking changes to the Logstash configuration formats and functionality.
-
-Plugin releases follows a three-placed numbering scheme X.Y.Z. where X denotes a major release version which may break
-compatibility with existing configuration or functionality. Y denotes releases which includes features which are backward
-compatible. Z denotes releases which includes bug fixes and patches.
-
-[float]
-==== Changing the version
-
-Version can be changed in the Gemspec, which needs to be associated with a changelog entry. Following this, we can publish
-the gem to RubyGem.org manually. At this point only the core developers can publish a gem.
-
-[float]
-==== Labeling
-
-Labeling is a critical aspect of maintaining plugins. All issues in GitHub should be labeled correctly so it can:
-
-* Provide good feedback to users/developers
-* Help prioritize changes
-* Be used in release notes
-
-Most labels are self explanatory, but here’s a quick recap of few important labels:
-
-* `bug`: Labels an issue as an unintentional defect
-* `needs details`: If a the issue reporter has incomplete details, please ask them for more info and label as needs
-details.
-* `missing cla`: Contributor License Agreement is missing and patch cannot be accepted without it
-* `adopt me`: Ask for help from the community to take over this issue
-* `enhancement`: New feature, not a bug fix
-* `needs tests`: Patch has no tests, and cannot be accepted without unit/integration tests
-* `docs`: Documentation related issue/PR
-
-[float]
-=== Logging
-
-Although it’s important not to bog down performance with excessive logging, debug level logs can be immensely helpful when
-diagnosing and troubleshooting issues with Logstash.  Please remember to liberally add debug logs wherever it makes sense
-as users will be forever gracious.
-
-[source,shell]
-@logger.debug("Logstash loves debug logs!", :actions => actions)
-
-[float]
-=== Contributor License Agreement (CLA) Guidance
-
-[qanda]
-Why is a https://www.elastic.co/contributor-agreement[CLA] required?::
-     We ask this of all Contributors in order to assure our users of the origin and continuing existence of the code. We
-     are not asking Contributors to assign copyright to us, but to give us the right to distribute a Contributor’s code
-     without restriction.
-
-Please make sure the CLA is signed by every Contributor prior to reviewing PRs and commits.::
-     Contributors only need to sign the CLA once and should sign with the same email as used in Github. If a Contributor
-     signs the CLA after a PR is submitted, they can refresh the automated CLA checker by pushing another
-     comment on the PR after 5 minutes of signing.
-
-[float]
-=== Need Help?
-
-Ping @logstash-core on Github to get the attention of the Logstash core team.
-
-[float]
-=== Community Administration
-
-The core team is there to support the plugin Maintainers and overall ecosystem.
-
-Maintainers should propose Contributors to become a Maintainer.
-
-Contributors and Maintainers should follow the Elastic Community https://www.elastic.co/community/codeofconduct[Code of
-Conduct].  The core team should block or ban "bad actors".
diff --git a/docs/static/management/centralized-pipelines.asciidoc b/docs/static/management/centralized-pipelines.asciidoc
deleted file mode 100644
index 619ba884f..000000000
--- a/docs/static/management/centralized-pipelines.asciidoc
+++ /dev/null
@@ -1,115 +0,0 @@
-[role="xpack"]
-[[logstash-centralized-pipeline-management]]
-=== Centralized Pipeline Management
-
-The pipeline management feature centralizes the creation and
-management of Logstash configuration pipelines in {kib}. 
-
-NOTE: Centralized pipeline management is an {xpack} feature that is not included
-with the basic license. If you want to try all of the features, you can start a
-30-day trial. At the end of the trial period, you can purchase a subscription to
-keep using the full functionality of the {xpack} components. For more
-information, see https://www.elastic.co/subscriptions and
-{stack-ov}/license-management.html[License
-Management].
-
-You can control multiple Logstash instances from the pipeline management UI in
-{kib}. You can add, edit, and delete pipeline configurations. On the Logstash
-side, you simply need to enable configuration management and register Logstash
-to use the centrally managed pipeline configurations.
-
-IMPORTANT: After you configure {ls} to use centralized pipeline management, you can
-no longer specify local pipeline configurations. The `pipelines.yml` file and
-settings such as `path.config` and `config.string` are inactive when centralized
-pipeline management is enabled.
-
-==== Manage pipelines
-
-Before using the pipeline management UI, you must:
-
-* <<configuring-centralized-pipelines, Configure centralized pipeline management>>.
-* If {kib} is protected with basic authentication, make sure your {kib} user has
-the `logstash_admin` role as well as the `logstash_writer` role that you created
-when you <<ls-security,configured Logstash to use basic authentication>>. Additionally,
-in order to view (as read-only) non-centrally-managed pipelines in the pipeline management
-UI, make sure your {kib} user has the `monitoring_user` role as well.
-
-To manage Logstash pipelines in {kib}:
-
-. Open {kib} in your browser and go to the Management tab. If you've set up
-configuration management correctly, you'll see an area for managing Logstash.
-+
-image::static/management/images/centralized_config.png[]
-
-. Click the *Pipelines* link.
-
-. To add a new pipeline, click *Create pipeline* and specify values.
-+
---
-[horizontal]
-Pipeline ID::
-A name that uniquely identifies the pipeline. This is the ID that you used when
-you
-<<configuring-centralized-pipelines,configured centralized pipeline management>>
-and specified a list of pipeline IDs in the `xpack.management.pipeline.id`
-setting.
-
-Description::
-A description of the pipeline configuration. This information is for your use.
-
-Pipeline::
-The pipeline configuration. You can treat the editor in the pipeline management
-UI like any other editor. You don't have to worry about whitespace or indentation.
-
-Pipeline workers::
-The number of parallel workers used to run the filter and output stages of the pipeline. 
-
-Pipeline batch size::
-The maximum number of events an individual worker thread collects before
-executing filters and outputs.
-
-Pipeline batch delay::
-Time in milliseconds to wait for each event before sending an undersized
-batch to pipeline workers.
-
-Queue type::
-The internal queueing model for event buffering. Options are *memory* for
-in-memory queueing, or *persisted* for disk-based acknowledged queueing. 
-
-Queue max bytes::
-The total capacity of the queue.
-
-Queue checkpoint writes::
-The maximum number of events written before a checkpoint is forced when
-persistent queues are enabled.
-
---
-
-===== Pipeline behavior
-
-* The pipeline configurations and metadata are stored in Elasticsearch. Any
-changes that you make to a pipeline definition are picked up and loaded
-automatically by all Logstash instances registered to use the pipeline. The
-changes are applied immediately. If Logstash is registered to use the pipeline,
-you do not have to restart Logstash to pick up the changes.
-
-* The pipeline runs on all Logstash instances that are registered to use the
-pipeline.  {kib} saves the new configuration, and Logstash will attempt to load
-it. There is no validation done at the UI level.
-
-* You need to check the local Logstash logs for configuration errors. If you're
-using the Logstash monitoring feature in {xpack}, use the Monitoring tab to
-check the status of your Logstash nodes.
-
-* You can specify multiple pipeline configurations that run in parallel on the
-same Logstash node.
-
-* If you edit and save a pipeline configuration, Logstash reloads
-the configuration in the background and continues processing events.
-
-* If you try to delete a pipeline that is running (for example, `apache`) in {kib}, Logstash will
-attempt to stop the pipeline. Logstash waits until all
-events have been fully processed by the pipeline. Before you delete a pipeline,
-make sure you understand your data sources. Stopping a pipeline may
-lead to data loss.
-
diff --git a/docs/static/management/configuring-centralized-pipelines.asciidoc b/docs/static/management/configuring-centralized-pipelines.asciidoc
deleted file mode 100644
index 2804ed359..000000000
--- a/docs/static/management/configuring-centralized-pipelines.asciidoc
+++ /dev/null
@@ -1,45 +0,0 @@
-[role="xpack"]
-[[configuring-centralized-pipelines]]
-=== Configuring Centralized Pipeline Management
-++++
-<titleabbrev>Centralized Pipeline Management</titleabbrev>
-++++
-
-To configure
-{logstash-ref}/logstash-centralized-pipeline-management.html[centralized pipeline management]:
-
-. Verify that you are using a license that includes the pipeline management 
-feature.
-+
---
-For more information, see https://www.elastic.co/subscriptions and 
-{xpack-ref}/license-management.html[License Management].
---
-
-. Specify 
-<<configuration-management-settings,configuration management settings>> in the
-`logstash.yml` file. At a
-minimum, set:
-+
-* `xpack.management.enabled: true` to enable centralized configuration
-management.
-* `xpack.management.elasticsearch.hosts` to specify the Elasticsearch
-instance that will store the Logstash pipeline configurations and metadata.
-* `xpack.management.pipeline.id` to register the pipelines that you want to
-centrally manage.
-
-. Restart Logstash.
-
-. If your Elasticsearch cluster is protected with basic authentication, assign
-the `logstash_admin` role to any users who will use centralized pipeline
-management. See <<ls-security>>.
-
-NOTE: Centralized management is disabled until you configure and enable
-{security}.
-
-IMPORTANT: After you've configured Logstash to use centralized pipeline
-management, you can no longer specify local pipeline configurations. This means
-that the `pipelines.yml` file and settings like `path.config` and
-`config.string` are inactive when this feature is enabled.
-
-include::{log-repo-dir}/static/settings/configuration-management-settings.asciidoc[]
diff --git a/docs/static/management/images/centralized_config.png b/docs/static/management/images/centralized_config.png
deleted file mode 100644
index f50da3129..000000000
Binary files a/docs/static/management/images/centralized_config.png and /dev/null differ
diff --git a/docs/static/management/images/new_pipeline.png b/docs/static/management/images/new_pipeline.png
deleted file mode 100644
index b3778e295..000000000
Binary files a/docs/static/management/images/new_pipeline.png and /dev/null differ
diff --git a/docs/static/managing-multiline-events.asciidoc b/docs/static/managing-multiline-events.asciidoc
deleted file mode 100644
index 0e98f8c0c..000000000
--- a/docs/static/managing-multiline-events.asciidoc
+++ /dev/null
@@ -1,113 +0,0 @@
-[[multiline]]
-=== Managing Multiline Events
-
-Several use cases generate events that span multiple lines of text. In order to correctly handle these multiline events,
-Logstash needs to know how to tell which lines are part of a single event.
-
-Multiline event processing is complex and relies on proper event ordering. The best way to guarantee ordered log
-processing is to implement the processing as early in the pipeline as possible.
-
-The <<plugins-codecs-multiline>> codec is the preferred tool for handling multiline events
-in the Logstash pipeline. The multiline codec merges lines from a single input using
-a simple set of rules.
-
-IMPORTANT: If you are using a Logstash input plugin that supports multiple hosts, such as
-the <<plugins-inputs-beats>> input plugin, you should not use the
-<<plugins-codecs-multiline>> codec to handle multiline events. Doing so may result in the
-mixing of streams and corrupted event data. In this situation, you need to handle multiline
-events before sending the event data to Logstash.
-
-The most important aspects of configuring the multiline codec are the following:
-
-* The `pattern` option specifies a regular expression. Lines that match the specified regular expression are considered
-either continuations of a previous line or the start of a new multiline event. You can use
-{logstash-ref}/plugins-filters-grok.html[grok] regular expression templates with this configuration option.
-* The `what` option takes two values: `previous` or `next`. The `previous` value specifies that lines that match the
-value in the `pattern` option are part of the previous line. The `next` value specifies that lines that match the value
-in the `pattern` option are part of the following line.* The `negate` option applies the multiline codec to lines that
-_do not_ match the regular expression specified in the `pattern` option.
-
-See the full documentation for the <<plugins-codecs-multiline>> codec plugin for more information
-on configuration options.
-
-==== Examples of Multiline Codec Configuration
-
-The examples in this section cover the following use cases:
-
-* Combining a Java stack trace into a single event
-* Combining C-style line continuations into a single event
-* Combining multiple lines from time-stamped events
-
-===== Java Stack Traces
-
-Java stack traces consist of multiple lines, with each line after the initial line beginning with whitespace, as in
-this example:
-
-[source,java]
-Exception in thread "main" java.lang.NullPointerException
-        at com.example.myproject.Book.getTitle(Book.java:16)
-        at com.example.myproject.Author.getBookTitles(Author.java:25)
-        at com.example.myproject.Bootstrap.main(Bootstrap.java:14)
-
-To consolidate these lines into a single event in Logstash, use the following configuration for the multiline codec:
-
-[source,json]
-input {
-  stdin {
-    codec => multiline {
-      pattern => "^\s"
-      what => "previous"
-    }
-  }
-}
-
-This configuration merges any line that begins with whitespace up to the previous line.
-
-===== Line Continuations
-
-Several programming languages use the `\` character at the end of a line to denote that the line continues, as in this
-example:
-
-[source,c]
-printf ("%10.10ld  \t %10.10ld \t %s\
-  %f", w, x, y, z );
-
-To consolidate these lines into a single event in Logstash, use the following configuration for the multiline codec:
-
-[source,json]
-input {
-  stdin {
-    codec => multiline {
-      pattern => "\\$"
-      what => "next"
-    }
-  }
-}
-
-This configuration merges any line that ends with the `\` character with the following line.
-
-===== Timestamps
-
-Activity logs from services such as Elasticsearch typically begin with a timestamp, followed by information on the
-specific activity, as in this example:
-
-[source,shell]
-[2015-08-24 11:49:14,389][INFO ][env                      ] [Letha] using [1] data paths, mounts [[/
-(/dev/disk1)]], net usable_space [34.5gb], net total_space [118.9gb], types [hfs]
-
-To consolidate these lines into a single event in Logstash, use the following configuration for the multiline codec:
-
-[source,json]
-input {
-  file {
-    path => "/var/log/someapp.log"
-    codec => multiline {
-      pattern => "^%{TIMESTAMP_ISO8601} "
-      negate => true
-      what => previous
-    }
-  }
-}
-
-This configuration uses the `negate` option to specify that any line that does not begin with a timestamp belongs to
-the previous line.
diff --git a/docs/static/modules.asciidoc b/docs/static/modules.asciidoc
deleted file mode 100644
index 97375825b..000000000
--- a/docs/static/modules.asciidoc
+++ /dev/null
@@ -1,211 +0,0 @@
-[[logstash-modules]]
-== Working with Logstash Modules
-
-Logstash modules provide a quick, end-to-end solution for ingesting data and
-visualizing it with purpose-built dashboards.
-
-These modules are available:
-
-* <<connecting-to-cloud,Elastic Cloud>>
-* <<arcsight-module>>
-* <<netflow-module>>
-* <<azure-module, Microsoft Azure Module>>
-
-Each module comes pre-packaged with Logstash configurations, Kibana dashboards,
-and other meta files that make it easier for you to set up the Elastic Stack for
-specific use cases or data sources.
-
-You can think of modules as providing three essential functions that make it
-easier for you to get started. When you run a module, it will:
-
-. Create the Elasticsearch index.
-
-. Set up the Kibana dashboards, including the index pattern, searches, and
-visualizations required to visualize your data in Kibana.
-
-. Run the Logstash pipeline with the configurations required to read and parse
-the data.
-
-image::static/images/logstash-module-overview.png[Logstash modules overview]
-
-[float]
-[[running-logstash-modules]]
-=== Running modules
-
-To run a module and set up dashboards, you specify the following options:
-
-[source,shell]
-----
-bin/logstash --modules MODULE_NAME --setup [-M "CONFIG_SETTING=VALUE"]
-----
-
-
-//TODO: For 6.0, show how to run multiple modules
-
-Where:
-
-* `--modules` runs the Logstash module specified by `MODULE_NAME`.
-
-* `-M "CONFIG_SETTING=VALUE"` is optional and overrides the specified
-configuration setting. You can specify multiple overrides. Each override must
-start with `-M`. See <<overriding-logstash-module-settings>> for more info.
-
-* `--setup` creates an index pattern in Elasticsearch and imports Kibana
-dashboards and visualizations. Running `--setup` is a one-time setup step. Omit
-this option for subsequent runs of the module to avoid overwriting existing
-Kibana dashboards.
-
-For example, the following command runs the Netflow module with the default
-settings, and sets up the netflow index pattern and dashboards:
-
-[source,shell]
-----
-bin/logstash --modules netflow --setup 
-----
-
-The following command runs the Netflow module and overrides the Elasticsearch
-`host` setting. Here it's assumed that you've already run the setup step.
-
-[source,shell]
-----
-bin/logstash --modules netflow -M "netflow.var.elasticsearch.host=es.mycloud.com"
-----
-
-
-[float]
-[[configuring-logstash-modules]]
-=== Configuring modules
-
-To configure a module, you can either
-<<setting-logstash-module-config,specify configuration settings>> in the
-`logstash.yml` <<logstash-settings-file,settings file>>, or use command-line overrides to
-<<overriding-logstash-module-settings,specify settings at the command line>>.
-
-[float]
-[[setting-logstash-module-config]]
-==== Specify module settings in `logstash.yml`
-
-To specify module settings in the `logstash.yml`
-<<logstash-settings-file,settings file>> file, you add a module definition to
-the modules array. Each module definition begins with a dash (-) and is followed
-by `name: module_name` then a series of name/value pairs that specify module
-settings. For example:
-
-[source,shell]
-----
-modules:
-- name: netflow
-  var.elasticsearch.hosts: "es.mycloud.com"
-  var.elasticsearch.username: "foo"
-  var.elasticsearch.password: "password"
-  var.kibana.host: "kb.mycloud.com"
-  var.kibana.username: "foo"
-  var.kibana.password: "password"
-  var.input.tcp.port: 5606
-----
-
-For a list of available module settings, see the documentation for the module.
-
-[float]
-[[overriding-logstash-module-settings]]
-==== Specify module settings at the command line
-
-You can override module settings by specifying one or more configuration
-overrides when you start Logstash. To specify an override, you use the `-M`
-command line option:
-
-[source,shell]
-----
--M MODULE_NAME.var.PLUGINTYPE1.PLUGINNAME1.KEY1=VALUE
-----
-
-Notice that the fully-qualified setting name includes the module name.
-
-You can specify multiple overrides. Each override must start with `-M`. 
-
-The following command runs the Netflow module and overrides both the
-Elasticsearch `host` setting and the `udp.port` setting:
-
-[source,shell]
-----
-bin/logstash --modules netflow -M "netflow.var.input.udp.port=3555" -M "netflow.var.elasticsearch.hosts=my-es-cloud"
-----
-
-Any settings defined in the command line are ephemeral and will not persist across
-subsequent runs of Logstash. If you want to persist a configuration, you need to
-set it in the `logstash.yml` <<logstash-settings-file,settings file>>.
-
-Settings that you specify at the command line are merged with any settings 
-specified in the `logstash.yml` file. If an option is set in both
-places, the value specified at the command line takes precedence. 
-
-[[connecting-to-cloud]]
-=== Using Elastic Cloud
-
-Logstash comes with two settings that simplify using modules with https://cloud.elastic.co/[Elastic Cloud].
-The Elasticsearch and Kibana hostnames in Elastic Cloud may be hard to set
-in the Logstash config or on the commandline, so a Cloud ID can be used instead.
-
-NOTE: Cloud ID applies only when a Logstash module is enabled, otherwise
-specifying Cloud ID has no effect. Cloud ID applies to data that gets sent via
-the module, to runtime metrics sent via {xpack} monitoring, and to the endpoint
-used by {xpack} central management features of Logstash, unless explicit
-overrides to {xpack} settings are specified in `logstash.yml`.
-
-==== Cloud ID
-
-The Cloud ID, which can be found in the Elastic Cloud web console, is used by
-Logstash to build the Elasticsearch and Kibana hosts settings.
-It is a base64 encoded text value of about 120 characters made up of upper and
-lower case letters and numbers.
-If you have several Cloud IDs, you can add a label, which is ignored
-internally, to help you tell them apart. To add a label you should prefix your
-Cloud ID with a label and a `:` separator in this format "<label>:<cloud-id>"
-
-`cloud.id` will overwrite these settings:
-----
-var.elasticsearch.hosts
-var.kibana.host
-----
-
-==== Cloud Auth
-This is optional. Construct this value by following this format "<username>:<password>".
-Use your Cloud username for the first part. Use your Cloud password for the second part,
-which is given once in the Cloud UI when you create a cluster.
-As your Cloud password is changeable, if you change it in the Cloud UI remember to change it here too.
-
-`cloud.auth` when specified will overwrite these settings:
-----
-var.elasticsearch.username
-var.elasticsearch.password
-var.kibana.username
-var.kibana.password
-----
-
-Example:
-
-These settings can be specified in the `logstash.yml` <<logstash-settings-file,settings file>>.
-They should be added separately from any module configuration settings you may have added before.
-
-["source","yaml",subs="attributes"]
-----
-# example with a label
-cloud.id: "staging:dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRub3RhcmVhbCRpZGVudGlmaWVy"
-cloud.auth: "elastic:{pwd}"
-----
-
-["source","yaml",subs="attributes"]
-----
-# example without a label
-cloud.id: "dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRub3RhcmVhbCRpZGVudGlmaWVy"
-cloud.auth: "elastic:{pwd}"
-----
-
-These settings can be also specified at the command line, like this:
-
-["source","sh",subs="attributes,callouts"]
-----
-bin/logstash --modules netflow -M "netflow.var.input.udp.port=3555" --cloud.id <cloud-id> --cloud.auth <cloud.auth>
-----
-
-
diff --git a/docs/static/monitoring-apis.asciidoc b/docs/static/monitoring-apis.asciidoc
deleted file mode 100644
index 33e301da2..000000000
--- a/docs/static/monitoring-apis.asciidoc
+++ /dev/null
@@ -1,760 +0,0 @@
-[[monitoring]]
-== Monitoring APIs
-
-Logstash provides the following monitoring APIs to retrieve runtime metrics
-about Logstash:
-
-* <<node-info-api>>
-* <<plugins-api>>
-* <<node-stats-api>>
-* <<hot-threads-api>>
-
-
-You can use the root resource to retrieve general information about the Logstash instance, including
-the host and version.
-
-[source,js]
---------------------------------------------------
-curl -XGET 'localhost:9600/?pretty'
---------------------------------------------------
-
-Example response:
-
-["source","js",subs="attributes"]
---------------------------------------------------
-{
-   "host": "skywalker",
-   "version": "{logstash_version}",
-   "http_address": "127.0.0.1:9600"
-}
---------------------------------------------------
-
-NOTE: By default, the monitoring API attempts to bind to `tcp:9600`. If this port is already in use by another Logstash
-instance, you need to launch Logstash with the `--http.port` flag specified to bind to a different port. See
-<<command-line-flags>> for more information.
-
-[float]
-[[monitoring-common-options]]
-=== Common Options
-
-The following options can be applied to all of the Logstash monitoring APIs.
-
-[float]
-==== Pretty Results
-
-When appending `?pretty=true` to any request made, the JSON returned
-will be pretty formatted (use it for debugging only!).
-
-[float]
-==== Human-Readable Output
-
-NOTE: For Logstash {logstash_version}, the `human` option is supported for the <<hot-threads-api>>
-only. When you specify `human=true`, the results are returned in plain text instead of
-JSON format. The default is false.
-
-Statistics are returned in a format suitable for humans
-(eg `"exists_time": "1h"` or `"size": "1kb"`) and for computers
-(eg `"exists_time_in_millis": 3600000` or `"size_in_bytes": 1024`).
-The human-readable values can be turned off by adding `?human=false`
-to the query string. This makes sense when the stats results are
-being consumed by a monitoring tool, rather than intended for human
-consumption.  The default for the `human` flag is
-`false`.
-
-[[node-info-api]]
-=== Node Info API
-
-The node info API retrieves information about the node.
-
-[source,js]
---------------------------------------------------
-curl -XGET 'localhost:9600/_node/<types>'
---------------------------------------------------
-
-Where `<types>` is optional and specifies the types of node info you want to return.
-
-You can limit the info that's returned by combining any of the following types in a comma-separated list:
-
-[horizontal]
-<<node-pipeline-info,`pipelines`>>::
-Gets pipeline-specific information and settings for each pipeline.
-<<node-os-info,`os`>>::
-Gets node-level info about the OS.
-<<node-jvm-info,`jvm`>>::
-Gets node-level JVM info, including info about threads.
-
-See <<monitoring-common-options, Common Options>> for a list of options that can be applied to all
-Logstash monitoring APIs.
-
-[[node-pipeline-info]]
-==== Pipeline Info
-
-The following request returns a JSON document that shows pipeline info, such as the number of workers,
-batch size, and batch delay:
-
-[source,js]
---------------------------------------------------
-curl -XGET 'localhost:9600/_node/pipelines?pretty'
---------------------------------------------------
-
-If you want to view additional information about a pipeline, such as stats for each configured input, filter,
-or output stage, see the <<pipeline-stats>> section under the <<node-stats-api>>.
-
-Example response:
-
-["source","js",subs="attributes"]
---------------------------------------------------
-{
-  "pipelines" : {
-    "test" : {
-      "workers" : 1,
-      "batch_size" : 1,
-      "batch_delay" : 5,
-      "config_reload_automatic" : false,
-      "config_reload_interval" : 3
-    },
-    "test2" : {
-      "workers" : 8,
-      "batch_size" : 125,
-      "batch_delay" : 5,
-      "config_reload_automatic" : false,
-      "config_reload_interval" : 3
-    }
-  }
---------------------------------------------------
-
-You can see the info for a specific pipeline by including the pipeline ID. In
-the following example, the ID of the pipeline is `test`:
-
-[source,js]
---------------------------------------------------
-curl -XGET 'localhost:9600/_node/pipelines/test?pretty'
---------------------------------------------------
-
-Example response:
-
-[source,json]
---------------------------------------------------
-{
-  "pipelines" : {
-    "test" : {
-      "workers" : 1,
-      "batch_size" : 1,
-      "batch_delay" : 5,
-      "config_reload_automatic" : false,
-      "config_reload_interval" : 3
-    }
-  }
-------------------------------------------------
-
-If you specify an invalid pipeline ID, the request returns a 404 Not Found error.
-
-[[node-os-info]]
-==== OS Info
-
-The following request returns a JSON document that shows the OS name, architecture, version, and
-available processors:
-
-[source,js]
---------------------------------------------------
-curl -XGET 'localhost:9600/_node/os?pretty'
---------------------------------------------------
-
-Example response:
-
-[source,js]
---------------------------------------------------
-{
-  "os": {
-    "name": "Mac OS X",
-    "arch": "x86_64",
-    "version": "10.12.4",
-    "available_processors": 8
-  }
---------------------------------------------------
-
-[[node-jvm-info]]
-==== JVM Info
-
-The following request returns a JSON document that shows node-level JVM stats, such as the JVM process id, version,
-VM info, memory usage, and info about garbage collectors:
-
-[source,js]
---------------------------------------------------
-curl -XGET 'localhost:9600/_node/jvm?pretty'
---------------------------------------------------
-
-Example response:
-
-[source,js]
---------------------------------------------------
-{
-  "jvm": {
-    "pid": 59616,
-    "version": "1.8.0_65",
-    "vm_name": "Java HotSpot(TM) 64-Bit Server VM",
-    "vm_version": "1.8.0_65",
-    "vm_vendor": "Oracle Corporation",
-    "start_time_in_millis": 1484251185878,
-    "mem": {
-      "heap_init_in_bytes": 268435456,
-      "heap_max_in_bytes": 1037959168,
-      "non_heap_init_in_bytes": 2555904,
-      "non_heap_max_in_bytes": 0
-    },
-    "gc_collectors": [
-      "ParNew",
-      "ConcurrentMarkSweep"
-    ]
-  }
-}
---------------------------------------------------
-
-[[plugins-api]]
-=== Plugins Info API
-
-The plugins info API gets information about all Logstash plugins that are currently installed.
-This API basically returns the output of running the `bin/logstash-plugin list --verbose` command.
-
-[source,js]
---------------------------------------------------
-curl -XGET 'localhost:9600/_node/plugins?pretty'
---------------------------------------------------
-
-See <<monitoring-common-options, Common Options>> for a list of options that can be applied to all
-Logstash monitoring APIs.
-
-The output is a JSON document.
-
-Example response:
-
-["source","js",subs="attributes"]
---------------------------------------------------
-{
-  "total": 93,
-  "plugins": [
-    {
-      "name": "logstash-codec-cef",
-      "version": "4.1.2"
-    },
-    {
-      "name": "logstash-codec-collectd",
-      "version": "3.0.3"
-    },
-    {
-      "name": "logstash-codec-dots",
-      "version": "3.0.2"
-    },
-    {
-      "name": "logstash-codec-edn",
-      "version": "3.0.2"
-    },
-    .
-    .
-    .
-  ]
---------------------------------------------------
-
-[[node-stats-api]]
-=== Node Stats API
-
-The node stats API retrieves runtime stats about Logstash.
-
-[source,js]
---------------------------------------------------
-curl -XGET 'localhost:9600/_node/stats/<types>'
---------------------------------------------------
-
-Where `<types>` is optional and specifies the types of stats you want to return.
-
-By default, all stats are returned. You can limit the info that's returned by combining any of the following types in a comma-separated list:
-
-[horizontal]
-<<jvm-stats,`jvm`>>::
-Gets JVM stats, including stats about threads, memory usage, garbage collectors,
-and uptime.
-<<process-stats,`process`>>::
-Gets process stats, including stats about file descriptors, memory consumption, and CPU usage.
-<<event-stats,`events`>>::
-Gets event-related statistics for the Logstash instance (regardless of how many
-pipelines were created and destroyed).
-<<pipeline-stats,`pipelines`>>::
-Gets runtime stats about each Logstash pipeline.
-<<reload-stats,`reloads`>>::
-Gets runtime stats about config reload successes and failures.
-<<os-stats,`os`>>::
-Gets runtime stats about cgroups when Logstash is running in a container.
-
-See <<monitoring-common-options, Common Options>> for a list of options that can be applied to all
-Logstash monitoring APIs.
-
-[[jvm-stats]]
-==== JVM Stats
-
-The following request returns a JSON document containing JVM stats:
-
-[source,js]
---------------------------------------------------
-curl -XGET 'localhost:9600/_node/stats/jvm?pretty'
---------------------------------------------------
-
-Example response:
-
-[source,js]
---------------------------------------------------
-{
-  "jvm" : {
-    "threads" : {
-      "count" : 49,
-      "peak_count" : 50
-    },
-    "mem" : {
-      "heap_used_percent" : 14,
-      "heap_committed_in_bytes" : 309866496,
-      "heap_max_in_bytes" : 1037959168,
-      "heap_used_in_bytes" : 151686096,
-      "non_heap_used_in_bytes" : 122486176,
-      "non_heap_committed_in_bytes" : 133222400,
-      "pools" : {
-        "survivor" : {
-          "peak_used_in_bytes" : 8912896,
-          "used_in_bytes" : 288776,
-          "peak_max_in_bytes" : 35782656,
-          "max_in_bytes" : 35782656,
-          "committed_in_bytes" : 8912896
-        },
-        "old" : {
-          "peak_used_in_bytes" : 148656848,
-          "used_in_bytes" : 148656848,
-          "peak_max_in_bytes" : 715849728,
-          "max_in_bytes" : 715849728,
-          "committed_in_bytes" : 229322752
-        },
-        "young" : {
-          "peak_used_in_bytes" : 71630848,
-          "used_in_bytes" : 2740472,
-          "peak_max_in_bytes" : 286326784,
-          "max_in_bytes" : 286326784,
-          "committed_in_bytes" : 71630848
-        }
-      }
-    },
-    "gc" : {
-      "collectors" : {
-        "old" : {
-          "collection_time_in_millis" : 607,
-          "collection_count" : 12
-        },
-        "young" : {
-          "collection_time_in_millis" : 4904,
-          "collection_count" : 1033
-        }
-      }
-    },
-    "uptime_in_millis" : 1809643
-  }
---------------------------------------------------
-
-[[process-stats]]
-==== Process Stats
-
-The following request returns a JSON document containing process stats:
-
-[source,js]
---------------------------------------------------
-curl -XGET 'localhost:9600/_node/stats/process?pretty'
---------------------------------------------------
-
-Example response:
-
-[source,js]
---------------------------------------------------
-{
-  "process" : {
-    "open_file_descriptors" : 184,
-    "peak_open_file_descriptors" : 185,
-    "max_file_descriptors" : 10240,
-    "mem" : {
-      "total_virtual_in_bytes" : 5486125056
-    },
-    "cpu" : {
-      "total_in_millis" : 657136,
-      "percent" : 2,
-      "load_average" : {
-        "1m" : 2.38134765625
-      }
-    }
-  }
---------------------------------------------------
-
-[[event-stats]]
-==== Event Stats
-
-The following request returns a JSON document containing event-related statistics
-for the Logstash instance:
-
-[source,js]
---------------------------------------------------
-curl -XGET 'localhost:9600/_node/stats/events?pretty'
---------------------------------------------------
-
-Example response:
-
-[source,js]
---------------------------------------------------
-{
-  "events" : {
-    "in" : 293658,
-    "filtered" : 293658,
-    "out" : 293658,
-    "duration_in_millis" : 2324391,
-    "queue_push_duration_in_millis" : 343816
-  }
---------------------------------------------------
-
-[[pipeline-stats]]
-==== Pipeline Stats
-
-The following request returns a JSON document containing pipeline stats,
-including:
-
-* the number of events that were input, filtered, or output by each pipeline
-* stats for each configured filter or output stage
-* info about config reload successes and failures
-(when <<reloading-config,config reload>> is enabled)
-* info about the persistent queue (when
-<<persistent-queues,persistent queues>> are enabled)
-
-[source,js]
---------------------------------------------------
-curl -XGET 'localhost:9600/_node/stats/pipelines?pretty'
---------------------------------------------------
-
-Example response:
-
-[source,js]
---------------------------------------------------
-{
-  "pipelines" : {
-    "test" : {
-      "events" : {
-        "duration_in_millis" : 365495,
-        "in" : 216485,
-        "filtered" : 216485,
-        "out" : 216485,
-        "queue_push_duration_in_millis" : 342466
-      },
-      "plugins" : {
-        "inputs" : [ {
-          "id" : "35131f351e2dc5ed13ee04265a8a5a1f95292165-1",
-          "events" : {
-            "out" : 216485,
-            "queue_push_duration_in_millis" : 342466
-          },
-          "name" : "beats"
-        } ],
-        "filters" : [ {
-          "id" : "35131f351e2dc5ed13ee04265a8a5a1f95292165-2",
-          "events" : {
-            "duration_in_millis" : 55969,
-            "in" : 216485,
-            "out" : 216485
-          },
-          "failures" : 216485,
-          "patterns_per_field" : {
-            "message" : 1
-          },
-          "name" : "grok"
-        }, {
-          "id" : "35131f351e2dc5ed13ee04265a8a5a1f95292165-3",
-          "events" : {
-            "duration_in_millis" : 3326,
-            "in" : 216485,
-            "out" : 216485
-          },
-          "name" : "geoip"
-        } ],
-        "outputs" : [ {
-          "id" : "35131f351e2dc5ed13ee04265a8a5a1f95292165-4",
-          "events" : {
-            "duration_in_millis" : 278557,
-            "in" : 216485,
-            "out" : 216485
-          },
-          "name" : "elasticsearch"
-        } ]
-      },
-      "reloads" : {
-        "last_error" : null,
-        "successes" : 0,
-        "last_success_timestamp" : null,
-        "last_failure_timestamp" : null,
-        "failures" : 0
-      },
-      "queue" : {
-        "type" : "memory"
-      }
-    },
-    "test2" : {
-      "events" : {
-        "duration_in_millis" : 2222229,
-        "in" : 87247,
-        "filtered" : 87247,
-        "out" : 87247,
-        "queue_push_duration_in_millis" : 1532
-      },
-      "plugins" : {
-        "inputs" : [ {
-          "id" : "d7ea8941c0fc48ac58f89c84a9da482107472b82-1",
-          "events" : {
-            "out" : 87247,
-            "queue_push_duration_in_millis" : 1532
-          },
-          "name" : "twitter"
-        } ],
-        "filters" : [ ],
-        "outputs" : [ {
-          "id" : "d7ea8941c0fc48ac58f89c84a9da482107472b82-2",
-          "events" : {
-            "duration_in_millis" : 139545,
-            "in" : 87247,
-            "out" : 87247
-          },
-          "name" : "elasticsearch"
-        } ]
-      },
-      "reloads" : {
-        "last_error" : null,
-        "successes" : 0,
-        "last_success_timestamp" : null,
-        "last_failure_timestamp" : null,
-        "failures" : 0
-      },
-      "queue" : {
-        "type" : "memory"
-      }
-    }
-  }
---------------------------------------------------
-
-You can see the stats for a specific pipeline by including the pipeline ID. In
-the following example, the ID of the pipeline is `test`:
-
-[source,js]
---------------------------------------------------
-curl -XGET 'localhost:9600/_node/stats/pipelines/test?pretty'
---------------------------------------------------
-
-Example response:
-
-[source,js]
---------------------------------------------------
-{
-    "test" : {
-      "events" : {
-        "duration_in_millis" : 365495,
-        "in" : 216485,
-        "filtered" : 216485,
-        "out" : 216485,
-        "queue_push_duration_in_millis" : 342466
-      },
-      "plugins" : {
-        "inputs" : [ {
-          "id" : "35131f351e2dc5ed13ee04265a8a5a1f95292165-1",
-          "events" : {
-            "out" : 216485,
-            "queue_push_duration_in_millis" : 342466
-          },
-          "name" : "beats"
-        } ],
-        "filters" : [ {
-          "id" : "35131f351e2dc5ed13ee04265a8a5a1f95292165-2",
-          "events" : {
-            "duration_in_millis" : 55969,
-            "in" : 216485,
-            "out" : 216485
-          },
-          "failures" : 216485,
-          "patterns_per_field" : {
-            "message" : 1
-          },
-          "name" : "grok"
-        }, {
-          "id" : "35131f351e2dc5ed13ee04265a8a5a1f95292165-3",
-          "events" : {
-            "duration_in_millis" : 3326,
-            "in" : 216485,
-            "out" : 216485
-          },
-          "name" : "geoip"
-        } ],
-        "outputs" : [ {
-          "id" : "35131f351e2dc5ed13ee04265a8a5a1f95292165-4",
-          "events" : {
-            "duration_in_millis" : 278557,
-            "in" : 216485,
-            "out" : 216485
-          },
-          "name" : "elasticsearch"
-        } ]
-      },
-      "reloads" : {
-        "last_error" : null,
-        "successes" : 0,
-        "last_success_timestamp" : null,
-        "last_failure_timestamp" : null,
-        "failures" : 0
-      },
-      "queue" : {
-        "type" : "memory"
-      }
-    }
-  }
-}
---------------------------------------------------
-
-[[reload-stats]]
-==== Reload Stats
-
-The following request returns a JSON document that shows info about config reload successes and failures.
-
-[source,js]
---------------------------------------------------
-curl -XGET 'localhost:9600/_node/stats/reloads?pretty'
---------------------------------------------------
-
-Example response:
-
-[source,js]
---------------------------------------------------
-{
-  "reloads": {
-    "successes": 0,
-    "failures": 0
-  }
-}
---------------------------------------------------
-
-[[os-stats]]
-==== OS Stats
-
-When Logstash is running in a container, the following request returns a JSON document that
-contains cgroup information to give you a more accurate view of CPU load, including whether
-the container is being throttled.
-
-[source,js]
---------------------------------------------------
-curl -XGET 'localhost:9600/_node/stats/os?pretty'
---------------------------------------------------
-
-Example response:
-
-[source,js]
---------------------------------------------------
-{
-  "os" : {
-    "cgroup" : {
-      "cpuacct" : {
-        "control_group" : "/elastic1",
-        "usage_nanos" : 378477588075
-                },
-      "cpu" : {
-        "control_group" : "/elastic1",
-        "cfs_period_micros" : 1000000,
-        "cfs_quota_micros" : 800000,
-        "stat" : {
-          "number_of_elapsed_periods" : 4157,
-          "number_of_times_throttled" : 460,
-          "time_throttled_nanos" : 581617440755
-        }
-      }
-    }
-  }
---------------------------------------------------
-
-
-[[hot-threads-api]]
-=== Hot Threads API
-
-The hot threads API gets the current hot threads for Logstash. A hot thread is a
-Java thread that has high CPU usage and executes for a longer than normal period
-of time.
-
-[source,js]
---------------------------------------------------
-curl -XGET 'localhost:9600/_node/hot_threads?pretty'
---------------------------------------------------
-
-The output is a JSON document that contains a breakdown of the top hot threads for
-Logstash.
-
-Example response:
-
-["source","sh",subs="attributes"]
---------------------------------------------------
-{
-  "hot_threads" : {
-    "time" : "2017-06-06T18:25:28-07:00",
-    "busiest_threads" : 3,
-    "threads" : [ {
-      "name" : "Ruby-0-Thread-7",
-      "percent_of_cpu_time" : 0.0,
-      "state" : "timed_waiting",
-      "path" : "/path/to/logstash-{logstash_version}/vendor/bundle/jruby/1.9/gems/puma-2.16.0-java/lib/puma/thread_pool.rb:187",
-      "traces" : [ "java.lang.Object.wait(Native Method)", "org.jruby.RubyThread.sleep(RubyThread.java:1002)", "org.jruby.RubyKernel.sleep(RubyKernel.java:803)" ]
-    }, {
-      "name" : "[test2]>worker3",
-      "percent_of_cpu_time" : 0.85,
-      "state" : "waiting",
-      "traces" : [ "sun.misc.Unsafe.park(Native Method)", "java.util.concurrent.locks.LockSupport.park(LockSupport.java:175)", "java.util.concurrent.locks.AbstractQueuedSynchronizer.parkAndCheckInterrupt(AbstractQueuedSynchronizer.java:836)" ]
-    }, {
-      "name" : "[test2]>worker2",
-      "percent_of_cpu_time" : 0.85,
-      "state" : "runnable",
-      "traces" : [ "org.jruby.RubyClass.allocate(RubyClass.java:225)", "org.jruby.RubyClass.newInstance(RubyClass.java:856)", "org.jruby.RubyClass$INVOKER$i$newInstance.call(RubyClass$INVOKER$i$newInstance.gen)" ]
-    } ]
-  }
-}
---------------------------------------------------
-
-The parameters allowed are:
-
-[horizontal]
-`threads`:: 	        The number of hot threads to return. The default is 10.
-`human`:: 	            If true, returns plain text instead of JSON format. The default is false.
-`ignore_idle_threads`:: If true, does not return idle threads. The default is true.
-
-See <<monitoring-common-options, Common Options>> for a list of options that can be applied to all
-Logstash monitoring APIs.
-
-You can use the `?human` parameter to return the document in a human-readable format.
-
-[source,js]
---------------------------------------------------
-curl -XGET 'localhost:9600/_node/hot_threads?human=true'
---------------------------------------------------
-
-Example of a human-readable response:
-
-["source","js",subs="attributes"]
---------------------------------------------------
- ::: {}
- Hot threads at 2017-06-06T18:31:17-07:00, busiestThreads=3:
- ================================================================================
- 0.0 % of cpu usage, state: timed_waiting, thread name: 'Ruby-0-Thread-7'
- /path/to/logstash-{logstash_version}/vendor/bundle/jruby/1.9/gems/puma-2.16.0-java/lib/puma/thread_pool.rb:187
-	 java.lang.Object.wait(Native Method)
-	 org.jruby.RubyThread.sleep(RubyThread.java:1002)
-	 org.jruby.RubyKernel.sleep(RubyKernel.java:803)
- --------------------------------------------------------------------------------
- 0.0 % of cpu usage, state: waiting, thread name: 'defaultEventExecutorGroup-5-4'
-	 sun.misc.Unsafe.park(Native Method)
-	 java.util.concurrent.locks.LockSupport.park(LockSupport.java:175)
-	 java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject.await(AbstractQueuedSynchronizer.java:2039)
- --------------------------------------------------------------------------------
- 0.05 % of cpu usage, state: timed_waiting, thread name: '[test]-pipeline-manager'
-	 java.lang.Object.wait(Native Method)
-	 java.lang.Thread.join(Thread.java:1253)
-	 org.jruby.internal.runtime.NativeThread.join(NativeThread.java:75)
-
---------------------------------------------------
diff --git a/docs/static/monitoring.asciidoc b/docs/static/monitoring.asciidoc
deleted file mode 100644
index f52093f10..000000000
--- a/docs/static/monitoring.asciidoc
+++ /dev/null
@@ -1,22 +0,0 @@
-[[monitoring-logstash]]
-== Monitoring Logstash
-
-When you run Logstash, it automatically captures runtime metrics that you can
-use to monitor the health and performance of your Logstash deployment.
-
-The metrics collected by Logstash include:
-
-* Logstash node info, like pipeline settings, OS info, and JVM info.
-* Plugin info, including a list of installed plugins.
-* Node stats, like JVM stats, process stats, event-related stats, and pipeline
-runtime stats.
-* Hot threads.
-
-You can use the basic <<monitoring,monitoring APIs>> provided by Logstash
-to retrieve these metrics. These APIs are available by default without
-requiring any extra configuration.
-
-ifdef::include-xpack[]
-:edit_url!:
-include::monitoring/index.asciidoc[]
-endif::include-xpack[]
diff --git a/docs/static/monitoring/collectors.asciidoc b/docs/static/monitoring/collectors.asciidoc
deleted file mode 100644
index 323c4d55b..000000000
--- a/docs/static/monitoring/collectors.asciidoc
+++ /dev/null
@@ -1,48 +0,0 @@
-[role="xpack"]
-[[logstash-monitoring-collectors]]
-==== Collectors
-
-Collectors, as their name implies, collect things. In {monitoring} for Logstash, 
-collectors are just <<pipeline,Inputs>> in the same way that ordinary Logstash 
-configurations provide inputs.
-
-Like {monitoring} for {es}, each collector can create zero or more monitoring 
-documents. As it is currently implemented, each Logstash node runs two types of 
-collectors: one for node stats and one for pipeline stats.
-
-[options="header"]
-|=======================
-| Collector       | Data Types | Description
-| Node Stats      | `logstash_stats`
-| Gathers details about the running node, such as memory utilization and CPU
-usage (for example, `GET /_stats`).
-+
-This runs on every Logstash node with {monitoring} enabled. One common
-failure is that Logstash directories are copied with their `path.data` directory
-included (`./data` by default), which copies the persistent UUID of the Logstash
-node along with it. As a result, it generally appears that one or more Logstash
-nodes are failing to collect monitoring data, when in fact they are all really
-misreporting as the _same_ Logstash node. Re-use `path.data` directories only 
-when upgrading Logstash, such that upgraded nodes replace the previous versions.
-| Pipeline Stats | `logstash_state`
-| Gathers details about the node's running pipelines, which powers the 
-Monitoring Pipeline UI.
-|=======================
-
-Per collection interval, which defaults to 10 seconds (`10s`), each collector is
-run. The failure of an individual collector does not impact any other collector. 
-Each collector, as an ordinary Logstash input, creates a separate Logstash event 
-in its isolated monitoring pipeline. The Logstash output then sends the data.
-
-The collection interval can be configured dynamically and you can also disable 
-data collection. For more information about the configuration options for the 
-collectors, see <<monitoring-settings>>.
-
-WARNING: Unlike {monitoring} for {es} and {kib}, there is no 
-`xpack.monitoring.collection.enabled` setting on Logstash. You must use the 
-`xpack.monitoring.enabled` setting to enable and disable data collection. 
-
-If gaps exist in the monitoring charts in {kib}, it is typically because either 
-a collector failed or the monitoring cluster did not receive the data (for 
-example, it was being restarted). In the event that a collector fails, a logged 
-error should exist on the node that attempted to perform the collection.
diff --git a/docs/static/monitoring/configuring-logstash.asciidoc b/docs/static/monitoring/configuring-logstash.asciidoc
deleted file mode 100644
index d1a69cd1d..000000000
--- a/docs/static/monitoring/configuring-logstash.asciidoc
+++ /dev/null
@@ -1,106 +0,0 @@
-[role="xpack"]
-[[configuring-logstash]]
-=== Configuring Monitoring for Logstash Nodes
-++++
-<titleabbrev>{monitoring}</titleabbrev>
-++++
-
-To monitor Logstash nodes:
-
-. Identify where to send monitoring data. This cluster is often referred to as
-the _production cluster_. For examples of typical monitoring architectures, see
-{xpack-ref}/how-monitoring-works.html[How Monitoring Works].
-+
---
-IMPORTANT: To visualize Logstash as part of the Elastic Stack (as shown in Step
-6), send metrics to your _production_ cluster. Sending metrics to a dedicated
-monitoring cluster will show the Logstash metrics under the _monitoring_ cluster.
-
---
-
-. Verify that the `xpack.monitoring.collection.enabled` setting is `true` on the
-production cluster. If that setting is `false`, the collection of monitoring data
-is disabled in {es} and data is ignored from all other sources.
-
-. Configure your Logstash nodes to send metrics by setting the
-`xpack.monitoring.elasticsearch.hosts` in `logstash.yml`. If {security} is enabled,
-you also need to specify the credentials for the 
-{stack-ov}/built-in-users.html[built-in `logstash_system` user]. For more information about these settings, see <<monitoring-settings>>.
-+
---
-[source,yaml]
---------------------------------------------------
-xpack.monitoring.elasticsearch.hosts: ["http://es-prod-node-1:9200", "http://es-prod-node-2:9200"] <1>
-xpack.monitoring.elasticsearch.username: "logstash_system" <2>
-xpack.monitoring.elasticsearch.password: "changeme"
---------------------------------------------------
-<1> If SSL/TLS is enabled on the production cluster, you must
-connect through HTTPS. As of v5.2.1, you can specify multiple
-Elasticsearch hosts as an array as well as specifying a single
-host as a string. If multiple URLs are specified, Logstash
-can round-robin requests to these production nodes.
-<2> If {security} is disabled on the production cluster, you can omit these 
-`username` and `password` settings. 
---
-
-. If SSL/TLS is enabled on the production {es} cluster, specify the trusted
-CA certificates that will be used to verify the identity of the nodes
-in the cluster.
-+
---
-To add a CA certificate to a Logstash node's trusted certificates, you
-can specify the location of the PEM encoded certificate with the
-`certificate_authority` setting:
-
-[source,yaml]
---------------------------------------------------
-xpack.monitoring.elasticsearch.ssl.certificate_authority: /path/to/ca.crt
---------------------------------------------------
-
-Alternatively, you can configure trusted certificates using a truststore
-(a Java Keystore file that contains the certificates):
-
-[source,yaml]
---------------------------------------------------
-xpack.monitoring.elasticsearch.ssl.truststore.path: /path/to/file
-xpack.monitoring.elasticsearch.ssl.truststore.password: password
---------------------------------------------------
-
-Also, optionally, you can set up client certificate using a keystore
-(a Java Keystore file that contains the certificate):
-
-[source,yaml]
---------------------------------------------------
-xpack.monitoring.elasticsearch.ssl.keystore.path: /path/to/file
-xpack.monitoring.elasticsearch.ssl.keystore.password: password
---------------------------------------------------
-
-Set sniffing to `true` to enable discovery of other nodes of the {es} cluster.
-It defaults to `false`.
-
-[source,yaml]
---------------------------------------------------
-xpack.monitoring.elasticsearch.sniffing: false
---------------------------------------------------
-
---
-
-. Restart your Logstash nodes.
-
-. To verify your {monitoring} configuration, point your web browser at your {kib}
-host, and select **Monitoring** from the side navigation. Metrics reported from
-your Logstash nodes should be visible in the Logstash section. When security is
-enabled, to view the monitoring dashboards you must log in to {kib} as a user
-who has the `kibana_user` and `monitoring_user` roles.
-+
-image:static/monitoring/images/monitoring-ui.png["Monitoring",link="monitoring/images/monitoring-ui.png"]
-
-[float]
-[[monitoring-upgraded-logstash]]
-==== Re-enabling Logstash Monitoring After Upgrading
-
-When upgrading from older versions of {xpack}, the built-in `logstash_system`
-user is disabled for security reasons. To resume monitoring,
-{xpack-ref}/monitoring-troubleshooting.html[change the password and re-enable the logstash_system user].
-
-include::{log-repo-dir}/static/settings/monitoring-settings.asciidoc[]
diff --git a/docs/static/monitoring/images/monitoring-ui.png b/docs/static/monitoring/images/monitoring-ui.png
deleted file mode 100644
index a1c65dfc2..000000000
Binary files a/docs/static/monitoring/images/monitoring-ui.png and /dev/null differ
diff --git a/docs/static/monitoring/images/nodestats.png b/docs/static/monitoring/images/nodestats.png
deleted file mode 100644
index 858749f1d..000000000
Binary files a/docs/static/monitoring/images/nodestats.png and /dev/null differ
diff --git a/docs/static/monitoring/images/overviewstats.png b/docs/static/monitoring/images/overviewstats.png
deleted file mode 100644
index 495c95ec3..000000000
Binary files a/docs/static/monitoring/images/overviewstats.png and /dev/null differ
diff --git a/docs/static/monitoring/images/pipeline-diagram.png b/docs/static/monitoring/images/pipeline-diagram.png
deleted file mode 100644
index c6ed3195a..000000000
Binary files a/docs/static/monitoring/images/pipeline-diagram.png and /dev/null differ
diff --git a/docs/static/monitoring/images/pipeline-filter-detail.png b/docs/static/monitoring/images/pipeline-filter-detail.png
deleted file mode 100644
index dc9d1cf22..000000000
Binary files a/docs/static/monitoring/images/pipeline-filter-detail.png and /dev/null differ
diff --git a/docs/static/monitoring/images/pipeline-output-detail.png b/docs/static/monitoring/images/pipeline-output-detail.png
deleted file mode 100644
index 83392eaab..000000000
Binary files a/docs/static/monitoring/images/pipeline-output-detail.png and /dev/null differ
diff --git a/docs/static/monitoring/images/pipeline-tree.png b/docs/static/monitoring/images/pipeline-tree.png
deleted file mode 100644
index 2643c755a..000000000
Binary files a/docs/static/monitoring/images/pipeline-tree.png and /dev/null differ
diff --git a/docs/static/monitoring/images/pipeline-viewer-detail-drawer.png b/docs/static/monitoring/images/pipeline-viewer-detail-drawer.png
deleted file mode 100644
index cbae2f919..000000000
Binary files a/docs/static/monitoring/images/pipeline-viewer-detail-drawer.png and /dev/null differ
diff --git a/docs/static/monitoring/images/pipeline-viewer-overview.png b/docs/static/monitoring/images/pipeline-viewer-overview.png
deleted file mode 100644
index 4dcf638ca..000000000
Binary files a/docs/static/monitoring/images/pipeline-viewer-overview.png and /dev/null differ
diff --git a/docs/static/monitoring/index.asciidoc b/docs/static/monitoring/index.asciidoc
deleted file mode 100644
index c0041415d..000000000
--- a/docs/static/monitoring/index.asciidoc
+++ /dev/null
@@ -1,5 +0,0 @@
-include::intro.asciidoc[]
-include::monitoring-overview.asciidoc[]
-include::monitoring-ui.asciidoc[]
-include::pipeline-viewer.asciidoc[]
-include::troubleshooting.asciidoc[]
diff --git a/docs/static/monitoring/intro.asciidoc b/docs/static/monitoring/intro.asciidoc
deleted file mode 100644
index f267c137e..000000000
--- a/docs/static/monitoring/intro.asciidoc
+++ /dev/null
@@ -1,19 +0,0 @@
-
-Alternatively, you can <<configuring-logstash,configure {monitoring}>> to send
-data to a monitoring cluster.
-
-NOTE: Monitoring is an {xpack} feature under the Basic License and is therefore
-*free to use*.
-
-You can use the <<logstash-monitoring-ui,monitoring UI>> in {xpack} to view the
-metrics and gain insight into how your Logstash deployment is running.
-
-The <<logstash-pipeline-viewer,pipeline viewer>> in {xpack} offers additional
-visibility into the behavior and performance of complex pipeline configurations.
-It shows a graph representation of the overall pipeline topology, data flow, and
-branching logic, overlaid with important metrics, like events per second, for
-each plugin in the view.
-
-This documentation focuses on the {monitoring} infrastructure and setup in
-Logstash. For an introduction to monitoring your Elastic stack, including {es}
-and {kib}, see {xpack-ref}/xpack-monitoring.html[Monitoring the Elastic Stack].
diff --git a/docs/static/monitoring/monitoring-output.asciidoc b/docs/static/monitoring/monitoring-output.asciidoc
deleted file mode 100644
index 45b3008f3..000000000
--- a/docs/static/monitoring/monitoring-output.asciidoc
+++ /dev/null
@@ -1,45 +0,0 @@
-[role="xpack"]
-[[logstash-monitoring-output]]
-==== Output
-
-Like all Logstash pipelines, the purpose of the dedicated monitoring pipeline is 
-to send events to outputs. In the case of {monitoring} for Logstash, the output 
-is always an `elasticsearch` output. However, unlike ordinary Logstash pipelines, 
-the output is configured within the `logstash.yml` settings file via the
-`xpack.monitoring.elasticsearch.*` settings.
-
-Other than its unique manner of configuration, this `elasticsearch` output
-behaves like all `elasticsearch` outputs, including its ability to pause data 
-collection when issues exist with the output.
-
-IMPORTANT: It is critical that all Logstash nodes share the same setup. 
-Otherwise, monitoring data might be routed in different ways or to different places.
-
-[[logstash-monitoring-default]]
-===== Default Configuration
-
-If a Logstash node does not explicitly define an {monitoring} output setting, 
-the following default configuration is used:
-
-[source,yaml]
----------------------------------------------------
-xpack.monitoring.elasticsearch.hosts: [ "http://localhost:9200" ]
----------------------------------------------------
-
-All data produced by {monitoring} for Logstash is indexed in the monitoring 
-cluster by using the `.monitoring-logstash` template, which is managed by the
-{ref}/es-monitoring-exporters.html[exporters] within {es}. 
-
-If you are working with a cluster that has {security} enabled, extra steps are 
-necessary to properly configure Logstash. For more information, see 
-<<configuring-logstash>>. 
-
-IMPORTANT: When discussing security relative to the `elasticsearch` output, it
-is critical to remember that all users are managed on the production cluster, 
-which is identified in the `xpack.monitoring.elasticsearch.hosts` setting.
-This is particularly important to remember when you move from development 
-environments to production environments, where you often have dedicated 
-monitoring clusters.
-
-For more information about the configuration options for the output, see 
-<<monitoring-settings>>.
\ No newline at end of file
diff --git a/docs/static/monitoring/monitoring-overview.asciidoc b/docs/static/monitoring/monitoring-overview.asciidoc
deleted file mode 100644
index e5a18f3c8..000000000
--- a/docs/static/monitoring/monitoring-overview.asciidoc
+++ /dev/null
@@ -1,35 +0,0 @@
-[role="xpack"]
-[[logstash-monitoring-overview]]
-=== {monitoring} Overview
-++++
-<titleabbrev>Overview</titleabbrev>
-++++
-
-This section deals with Logstash, including an explanation of its internal parts
-at a high level. {monitoring} for Logstash represents a total of two pieces:
-
-* <<logstash-monitoring-collectors,Collectors>>
-* <<logstash-monitoring-output,Output>>
-
-These pieces are created when {monitoring} for Logstash is enabled, and they 
-live outside of the default Logstash pipeline in a dedicated monitoring
-pipeline. This configuration means that all data and processing has a minimal 
-impact on ordinary Logstash processing. As a secondary benefit of existing in a 
-separate pipeline, existing Logstash features, such as the 
-<<plugins-outputs-elasticsearch,`elasticsearch` output>>, can be reused to 
-benefit from its retry policies. 
-
-NOTE: The `elasticsearch` output that is used by {monitoring} for Logstash is 
-configured exclusively via settings found in `logstash.yml`. It is not 
-configured by using anything from the Logstash configurations that might also be 
-using their own separate `elasticsearch` outputs.
-
-The {es} cluster that is configured for use with {monitoring} for Logstash is 
-expected to be the production cluster. This configuration enables the production 
-{es} cluster to add metadata (for example, its cluster UUID) to the Logstash
-monitoring data then route it to the monitoring clusters. For more information 
-about typical monitoring architectures, see 
-{xpack-ref}/how-monitoring-works.html[How Monitoring Works]. 
-
-include::collectors.asciidoc[]
-include::monitoring-output.asciidoc[]
diff --git a/docs/static/monitoring/monitoring-ui.asciidoc b/docs/static/monitoring/monitoring-ui.asciidoc
deleted file mode 100644
index 73062b904..000000000
--- a/docs/static/monitoring/monitoring-ui.asciidoc
+++ /dev/null
@@ -1,25 +0,0 @@
-[role="xpack"]
-[[logstash-monitoring-ui]]
-=== Monitoring UI
-
-When running Logstash 5.2 or greater, you can use the
-https://www.elastic.co/products/x-pack/monitoring[monitoring feature in X-Pack]
-to gain deep visibility into metrics about your Logstash deployment. In the
-overview dashboard, you can see all events received and sent by Logstash, plus
-info about memory usage and uptime:
-
-image::static/monitoring/images/overviewstats.png[Logstash monitoring overview dashboard in Kibana]
-
-Then you can drill down to see stats about a specific node:
-
-image::static/monitoring/images/nodestats.png[Logstash monitoring node stats dashboard in Kibana]
-
-NOTE: A Logstash node is considered unique based on its persistent UUID, which
-is written to the <<logstash-settings-file,`path.data`>> directory when the node
-starts.
-
-Before you can use the monitoring UI,
-<<configuring-logstash, configure Logstash monitoring>>.
-
-For information about using the Monitoring UI, see
-{kibana-ref}/xpack-monitoring.html[{monitoring} in {kib}].
diff --git a/docs/static/monitoring/pipeline-viewer.asciidoc b/docs/static/monitoring/pipeline-viewer.asciidoc
deleted file mode 100644
index f7a6d86ad..000000000
--- a/docs/static/monitoring/pipeline-viewer.asciidoc
+++ /dev/null
@@ -1,73 +0,0 @@
-[role="xpack"]
-[[logstash-pipeline-viewer]]
-=== Pipeline Viewer UI
-
-Use the pipeline viewer to visualize and monitor the behavior of complex
-Logstash pipeline configurations. You can see and interact with a tree view 
-that illustrates the pipeline topology, data flow, and branching logic. 
-
-The pipeline viewer highlights CPU% and event latency in cases where the values
-are anomalous. This information helps you quickly identify processing that is
-disproportionately slow.
-
-[role="screenshot"]
-image::static/monitoring/images/pipeline-tree.png[Pipeline Viewer]
-
-[float]
-==== Prerequisites
-
-Before using the pipeline viewer:
-
-* <<monitoring-logstash,Configure Logstash monitoring>>.
-* Start the Logstash pipeline that you want to monitor.
-
-Logstash begins shipping metrics to the monitoring cluster.
-
-[float]
-==== View the pipeline
-
-To view the pipeline:
-
-* Kibana -> Monitoring -> Logstash -> Pipelines
-
-Each pipeline is identified by a pipeline ID (`main` by default). For each
-pipeline, you see the pipeline's throughput and the number
-of nodes on which the pipeline is running during the selected time range.
-
-Many elements in the tree are clickable. 
-For example, you can click the plugin name to expand the detail view.
-
-[role="screenshot"]
-image::static/monitoring/images/pipeline-input-detail.png[Pipeline Input Detail]
-
-Click the arrow beside a branch name to collapse or expand it.  
-
-[float]
-==== Notes and best practices
-
-*Use semantic IDs.* 
-Specify semantic IDs when you configure the stages in your Logstash pipeline.
-Otherwise, Logstash generates them for you. Semantic IDs help you identify
-configurations that are causing bottlenecks. For example, you may have several
-grok filters running in your pipeline. If you have specified semantic IDs, you
-can tell at a glance which filters are slow. Semantic IDs, such as
-`apacheParsingGrok` and `cloudwatchGrok`, point you to the grok filters that are
-causing bottlenecks.
-
-*Outliers.*
-Values and stats that are anomalously slow or otherwise out of line are highlighted.
-This doesn't necessarily indicate a problem, but it highlights potential
-bottle necks so that you can find them quickly.
-
-Some plugins are slower than others due to the nature of the work they do. For
-instance, you may find that a grok filter that uses a complicated regexp runs a
-lot slower than a mutate filter that simply adds a field. The grok filter might
-be highlighted in this case, though it may not be possible to further optimize
-its work.
-
-*Versioning.*
-Version information is available from the dropdown list beside the pipeline ID.
-Logstash generates a new version each time you modify a pipeline, and
-stores multiple versions of the pipeline stats. Use this information to see how
-changes over time affect throughput and other metrics. Logstash does not store
-multiple versions of the pipeline configurations. 
diff --git a/docs/static/monitoring/troubleshooting.asciidoc b/docs/static/monitoring/troubleshooting.asciidoc
deleted file mode 100644
index d4ae09a20..000000000
--- a/docs/static/monitoring/troubleshooting.asciidoc
+++ /dev/null
@@ -1,36 +0,0 @@
-[role="xpack"]
-[[monitoring-troubleshooting]]
-=== Troubleshooting {monitoring} in Logstash
-++++
-<titleabbrev>Troubleshooting</titleabbrev>
-++++
-
-
-[float]
-==== Logstash Monitoring Not Working After Upgrade
-
-When upgrading from older versions, the built-in `logstash_system` user is
-disabled for security reasons. To resume monitoring:
-
-. Change the `logstash_system` password:
-+
---
-[source, sh]
----------------------------------------------------------------
-PUT _xpack/security/user/logstash_system/_password
-{
-  "password": "newpassword"
-}
----------------------------------------------------------------
-//CONSOLE
---
-
-. Re-enable the `logstash_system` user:
-+
---
-[source, sh]
----------------------------------------------------------------
-PUT _xpack/security/user/logstash_system/_enable
----------------------------------------------------------------
-//CONSOLE
---
diff --git a/docs/static/multiple-pipelines.asciidoc b/docs/static/multiple-pipelines.asciidoc
deleted file mode 100644
index 59abeb408..000000000
--- a/docs/static/multiple-pipelines.asciidoc
+++ /dev/null
@@ -1,31 +0,0 @@
-[[multiple-pipelines]]
-=== Multiple Pipelines
-
-If you need to run more than one pipeline in the same process, Logstash provides a way to do this through a configuration file called `pipelines.yml`.
-This file must be placed in the `path.settings` folder and follows this structure:
-
-[source,yaml]
--------------------------------------------------------------------------------
-- pipeline.id: my-pipeline_1
-  path.config: "/etc/path/to/p1.config"
-  pipeline.workers: 3
-- pipeline.id: my-other-pipeline
-  path.config: "/etc/different/path/p2.cfg"
-  queue.type: persisted
--------------------------------------------------------------------------------
-
-This file is formatted in YAML and contains a list of dictionaries, where each dictionary describes a pipeline, and each key/value pair specifies a setting for that pipeline. The example shows two different pipelines described by their IDs and  configuration paths. For the first pipeline, the value of `pipeline.workers` is set to 3, while in the other, the persistent queue feature is enabled.
-The value of a setting that is not explicitly set in the `pipelines.yml` file will fall back to the default specified in the `logstash.yml` <<logstash-settings-file,settings file>>.
-
-When you start Logstash without arguments, it will read the `pipelines.yml` file and instantiate all pipelines specified in the file. On the other hand, when you use `-e` or `-f`, Logstash ignores the `pipelines.yml` file and logs a warning about it.
-
-[[multiple-pipeline-usage]]
-==== Usage Considerations
-
-Using multiple pipelines is especially useful if your current configuration has event flows that don't share the same inputs/filters and outputs and are being separated from each other using tags and conditionals.
-
-Having multiple pipelines in a single instance also allows these event flows to have different performance and durability parameters (for example, different settings for pipeline workers and persistent queues). This separation means that a blocked output in one pipeline won't exert backpressure in the other.
-
-That said, it's important to take into account resource competition between the pipelines, given that the default values are tuned for a single pipeline. So, for example, consider reducing the number of pipeline workers used by each pipeline, because each pipeline will use 1 worker per CPU core by default.
-
-Persistent queues and dead letter queues are isolated per pipeline, with their locations namespaced by the `pipeline.id` value.
\ No newline at end of file
diff --git a/docs/static/netflow-module.asciidoc b/docs/static/netflow-module.asciidoc
deleted file mode 100644
index 404df31fb..000000000
--- a/docs/static/netflow-module.asciidoc
+++ /dev/null
@@ -1,188 +0,0 @@
-[[netflow-module]]
-=== Logstash Netflow Module
-
-++++
-<titleabbrev>Netflow Module</titleabbrev>
-++++
-
-The Logstash Netflow module simplifies the collection, normalization, and
-visualization of network flow data. With a single command, the module parses
-network flow data, indexes the events into Elasticsearch, and installs a suite
-of Kibana dashboards to get you exploring your data immediately.
-
-Logstash modules support Netflow Version 5 and 9.
-
-==== What is Flow Data?
-
-Netflow is a type of data record streamed from capable network devices. It
-contains information about connections traversing the device, and includes
-source IP addresses and ports, destination IP addresses and ports, types of
-service, VLANs, and other information that can be encoded into frame and
-protocol headers. With Netflow data, network operators can go beyond monitoring
-simply the volume of data crossing their networks. They can understand where the
-traffic originated, where it is going, and what services or applications it is
-part of.
-
-[[netflow-requirements]]
-===== Requirements
-
-These instructions assume you have already installed Elastic Stack
-(Logstash, Elasticsearch, and Kibana) version 5.6 or higher. The products you
-need are https://www.elastic.co/downloads[available to download] and easy to
-install.
-
-[[netflow-getting-started]]
-==== Getting Started
-
-. Start the Logstash Netflow module by running the following command in the
-Logstash installation directory:
-+
-[source,shell]
------
-bin/logstash --modules netflow --setup -M netflow.var.input.udp.port=NNNN
------
-+
-Where `NNNN` is the UDP port on which Logstash will listen for network traffic
-data. If you don't specify a port, Logstash listens on port 2055 by default.
-+
-The `--modules netflow` option spins up a Netflow-aware Logstash pipeline
-for ingestion.
-+
-The `--setup` option creates a `netflow-*` index pattern in Elasticsearch and
-imports Kibana dashboards and visualizations. Running `--setup` is a one-time
-setup step. Omit this option for subsequent runs of the module to avoid
-overwriting existing Kibana dashboards.
-+
-The command shown here assumes that you're running Elasticsearch and Kibana on
-your localhost. If you're not, you need to specify additional connection
-options. See <<configuring-netflow>>.
-
-. Explore your data in Kibana:
-.. Open your browser and navigate to
-http://localhost:5601[http://localhost:5601]. If security is enabled, you'll
-need to specify the Kibana username and password that you used when you set up
-security.
-.. Open *Netflow: Network Overview Dashboard*.
-.. See <<exploring-data-netflow>> for additional details on data exploration.
-
-[[exploring-data-netflow]]
-==== Exploring Your Data
-
-Once the Logstash Netflow module starts processing events, you can immediately
-begin using the packaged Kibana dashboards to explore and visualize your
-network flow data.
-
-You can use the dashboards as-is, or tailor them to work better with existing
-use cases and business requirements.
-
-[[network-dashboards-netflow]]
-===== Example Dashboards
-
-On the *Overview* dashboard, you can see a summary of basic traffic data and set
-up filters before you drill down to gain deeper insight into the data.
-
-[role="screenshot"]
-image::static/images/netflow-overview.png[Netflow overview dashboard]
-
-For example, on the *Conversation Partners* dashboard, you can see the source
-and destination addresses of the client and server in any conversation.
-
-[role="screenshot"]
-image::static/images/netflow-conversation-partners.png[Netflow conversation partners dashboard]
-
-On the *Traffic Analysis* dashboard, you can identify high volume conversations
-by viewing the traffic volume in bytes.
-
-[role="screenshot"]
-image::static/images/netflow-traffic-analysis.png[Netflow traffic analysis dashboard]
-
-Then you can go to the *Geo Location* dashboard where you can visualize the
-location of destinations and sources on a heat map.
-
-[role="screenshot"]
-image::static/images/netflow-geo-location.png[Netflow geo location dashboard]
-
-
-[[configuring-netflow]]
-==== Configuring the Module
-
-You can further refine the behavior of the Logstash Netflow module by specifying
-settings in the `logstash.yml` settings file, or overriding settings at the
-command line.
-
-For example, the following configuration in the `logstash.yml` file sets
-Logstash to listen on port 9996 for network traffic data:
-[source,yaml]
------
-modules:
-  - name: netflow
-    var.input.udp.port: 9996
------
-
-To specify the same settings at the command line, you use:
-
-[source,shell]
------
-bin/logstash --modules netflow -M netflow.var.input.udp.port=9996
------
-
-For more information about configuring modules, see
-<<logstash-modules>>.
-
-[[netflow-module-config]]
-===== Configuration Options
-
-The Netflow module provides the following settings for configuring the behavior
-of the module. These settings include Netflow-specific options plus common
-options that are supported by all Logstash modules.
-
-When you override a setting at the command line, remember to prefix the setting
-with the module name, for example,  `netflow.var.input.udp.port` instead of
-`var.input.udp.port`.
-
-If you don't specify configuration settings, Logstash uses the defaults.
-
-*Netflow Options*
-
-*`var.input.udp.port:`*::
-+
---
-* Value type is <<number,number>>
-* Default value is 2055.
---
-+
-Sets the UDP port on which Logstash listens for network traffic data. Although
-2055 is the default for this setting, some devices use ports in the range of
-9995 through 9998, with 9996 being the most commonly used alternative.
-
-*`var.input.udp.workers:`*::
-+
---
-* Value type is <<number,number>>
-* Default value is 2.
---
-+
-Number of threads processing packets.
-
-*`var.input.udp.receive_buffer_bytes:`*::
-+
---
-* Value type is <<number,number>>
-* Default value is 212992.
---
-+
-The socket receive buffer size in bytes.
-The operating system will use the max allowed value if receive_buffer_bytes is larger than allowed.
-Consult your operating system documentation if you need to increase this max allowed value.
-
-*`var.input.udp.queue_size:`*::
-+
---
-* Value type is <<number,number>>
-* Default value is 2000.
---
-+
-This is the number of unprocessed UDP packets you can hold in memory before
-packets will start dropping.
-
-include::shared-module-options.asciidoc[]
diff --git a/docs/static/offline-plugins.asciidoc b/docs/static/offline-plugins.asciidoc
deleted file mode 100644
index ca6976b83..000000000
--- a/docs/static/offline-plugins.asciidoc
+++ /dev/null
@@ -1,88 +0,0 @@
-[[offline-plugins]]
-=== Offline Plugin Management
-
-The Logstash <<working-with-plugins,plugin manager>> provides support for preparing offline plugin packs that you can
-use to install Logstash plugins on systems that don't have Internet access. 
-
-This procedure requires a staging machine running Logstash that has access to a public or
-<<private-rubygem,private Rubygems>> server. The staging machine downloads and packages all the files and dependencies
-required for offline installation.
-
-[[building-offline-packs]]
-[float]
-=== Building Offline Plugin Packs
-
-An _offline plugin pack_ is a compressed file that contains all the plugins your offline Logstash installation requires,
-along with the dependencies for those plugins.
-
-To build an offline plugin pack:
-
-. Make sure all the plugins that you want to package are installed on the staging server and that the staging server can
-access the Internet.
-
-. Run the `bin/logstash-plugin prepare-offline-pack` subcommand to package the plugins and dependencies:
-+
-[source, shell]
--------------------------------------------------------------------------------
-bin/logstash-plugin prepare-offline-pack --output OUTPUT [PLUGINS] --overwrite
--------------------------------------------------------------------------------
-+
-where:
-+
-* `OUTPUT` specifies the zip file where the compressed plugin pack will be written. The default file is
-+/LOGSTASH_HOME/logstash-offline-plugins-{logstash_version}.zip+. If you are using 5.2.x and 5.3.0, this location should be a zip file whose contents will be overwritten.
-* `[PLUGINS]` specifies one or more plugins that you want to include in the pack.
-* `--overwrite` specifies if you want to override an existing file at the location
-
-Examples:
-
-["source","sh",subs="attributes"]
--------------------------------------------------------------------------------
-bin/logstash-plugin prepare-offline-pack logstash-input-beats <1>
-bin/logstash-plugin prepare-offline-pack logstash-filter-* <2>
-bin/logstash-plugin prepare-offline-pack logstash-filter-* logstash-input-beats <3>
--------------------------------------------------------------------------------
-<1> Packages the Beats input plugin and any dependencies.
-<2> Uses a wildcard to package all filter plugins and any dependencies.
-<3> Packages all filter plugins, the Beats input plugin, and any dependencies.
-
-NOTE: Downloading all dependencies for the specified plugins may take some time, depending on the plugins listed.
-
-[[installing-offline-packs]]
-[float]
-=== Installing Offline Plugin Packs
-
-To install an offline plugin pack:
-
-. Move the compressed bundle to the machine where you want to install the plugins.
-
-. Run the `bin/logstash-plugin install` subcommand and pass in the file URI of
-the offline plugin pack. 
-+
-["source","sh",subs="attributes"]
-.Windows example:
--------------------------------------------------------------------------------
-bin/logstash-plugin install file:///c:/path/to/logstash-offline-plugins-{logstash_version}.zip
--------------------------------------------------------------------------------
-+
-["source","sh",subs="attributes"]
-.Linux example:
--------------------------------------------------------------------------------
-bin/logstash-plugin install file:///path/to/logstash-offline-plugins-{logstash_version}.zip
--------------------------------------------------------------------------------
-+
-This command expects a file URI, so make sure you use forward slashes and
-specify the full path to the pack.
-
-[float]
-=== Updating Offline Plugins
-
-To update offline plugins, you update the plugins on the staging server and then use the same process that you followed to
-build and install the plugin pack:
-
-. On the staging server, run the `bin/logstash-plugin update` subcommand to update the plugins. See <<updating-plugins>>.
-
-. Create a new version of the plugin pack. See <<building-offline-packs>>.
-
-. Install the new version of the plugin pack. See <<installing-offline-packs>>.
-
diff --git a/docs/static/output.asciidoc b/docs/static/output.asciidoc
deleted file mode 100644
index 0f9b1b1c0..000000000
--- a/docs/static/output.asciidoc
+++ /dev/null
@@ -1,14 +0,0 @@
-:register_method:	true
-:multi_receive_method:	true
-:plugintype:    	output
-:pluginclass:   	Outputs
-:pluginname:    	example
-:pluginnamecap: 	Example
-
-:blockfilter:		true
-
-:getstarted: Let's step through creating an {plugintype} plugin using the https://github.com/logstash-plugins/logstash-output-example/[example {plugintype} plugin].
-
-:methodheader: Logstash outputs must implement the `register` and `multi_receive` methods.
-
-include::include/pluginbody.asciidoc[]
diff --git a/docs/static/performance-checklist.asciidoc b/docs/static/performance-checklist.asciidoc
deleted file mode 100644
index 0a54eeae0..000000000
--- a/docs/static/performance-checklist.asciidoc
+++ /dev/null
@@ -1,103 +0,0 @@
-[[performance-tuning]]
-== Performance Tuning
-
-This section includes the following information about tuning Logstash
-performance:
-
-* <<performance-troubleshooting>>
-* <<tuning-logstash>>
-
-[[performance-troubleshooting]]
-=== Performance Troubleshooting Guide
-
-You can use this troubleshooting guide to quickly diagnose and resolve Logstash performance problems. Advanced knowledge of pipeline internals is not required to understand this guide. However, the <<pipeline,pipeline documentation>> is recommended reading if you want to go beyond this guide.
-
-You may be tempted to jump ahead and change settings like `pipeline.workers` (`-w`) as a first attempt to improve performance. In our experience, changing this setting makes it more difficult to troubleshoot performance problems because you increase the number of variables in play. Instead, make one change at a time and measure the results. Starting at the end of this list is a sure-fire way to create a confusing situation.
-
-[float]
-==== Performance Checklist
-
-. *Check the performance of input sources and output destinations:*
-+
-* Logstash is only as fast as the services it connects to. Logstash can only consume and produce data as fast as its input and output destinations can!
-
-. *Check system statistics:*
-+
-* CPU
-** Note whether the CPU is being heavily used. On Linux/Unix, you can run `top -H` to see process statistics broken out by thread, as well as total CPU statistics.
-** If CPU usage is high, skip forward to the section about checking the JVM heap and then read the section about tuning Logstash worker settings.
-* Memory
-** Be aware of the fact that Logstash runs on the Java VM. This means that Logstash will always use the maximum amount of memory you allocate to it.
-** Look for other applications that use large amounts of memory and may be causing Logstash to swap to disk. This can happen if the total memory used by applications exceeds physical memory.
-* I/O Utilization
-** Monitor disk I/O to check for disk saturation.
-*** Disk saturation can happen if you’re using Logstash plugins (such as the file output) that may saturate your storage.
-*** Disk saturation can also happen if you're encountering a lot of errors that force Logstash to generate large error logs.
-*** On Linux, you can use iostat, dstat, or something similar to monitor disk I/O.
-** Monitor network I/O for network saturation.
-*** Network saturation can happen if you’re using inputs/outputs that perform a lot of network operations.
-*** On Linux, you can use a tool like dstat or iftop to monitor your network.
-
-. *Check the JVM heap:*
-+
-* Often times CPU utilization can go through the roof if the heap size is too low, resulting in the JVM constantly garbage collecting.
-* A quick way to check for this issue is to double the heap size and see if performance improves. Do not increase the heap size past the amount of physical memory. Leave at least 1GB free for the OS and other processes.
-* You can make more accurate measurements of the JVM heap by using either the `jmap` command line utility distributed with Java or by using VisualVM. For more info, see <<profiling-the-heap>>.
-* Always make sure to set the minimum (Xms) and maximum (Xmx) heap allocation size to the same value to prevent the heap from resizing at runtime, which is a very costly process.
-
-. *Tune Logstash worker settings:*
-+
-* Begin by scaling up the number of pipeline workers by using the `-w` flag. This will increase the number of threads available for filters and outputs. It is safe to scale this up to a multiple of CPU cores, if need be, as the threads can become idle on I/O.
-* You may also tune the output batch size. For many outputs, such as the Elasticsearch output, this setting will correspond to the size of I/O operations. In the case of the Elasticsearch output, this setting corresponds to the batch size.
-
-[[tuning-logstash]]
-=== Tuning and Profiling Logstash Performance
-
-The Logstash defaults are chosen to provide fast, safe performance for most
-users. However if you notice performance issues, you may need to modify
-some of the defaults. Logstash provides the following configurable options
-for tuning pipeline performance: `pipeline.workers`, `pipeline.batch.size`, and `pipeline.batch.delay`. For more information about setting these options, see <<logstash-settings-file>>.
-
-Make sure you've read the <<performance-troubleshooting>> before modifying these options.
-
-* The `pipeline.workers` setting determines how many threads to run for filter and output processing. If you find that events are backing up, or that the CPU is not saturated, consider increasing the value of this parameter to make better use of available processing power. Good results can even be found increasing this number past the number of available processors as these threads may spend significant time in an I/O wait state when writing to external systems. Legal values for this parameter are positive integers.
-
-* The `pipeline.batch.size` setting defines the maximum number of events an individual worker thread collects before attempting to execute filters and outputs. Larger batch sizes are generally more efficient, but increase memory overhead. Some hardware configurations require you to increase JVM heap space in the `jvm.options` config file to avoid performance degradation. (See <<config-setting-files>> for more info.) Values in excess of the optimum range cause performance degradation due to frequent garbage collection or JVM crashes related to out-of-memory exceptions. Output plugins can process each batch as a logical unit. The Elasticsearch output, for example, issues https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html[bulk requests] for each batch received. Tuning the `pipeline.batch.size` setting adjusts the size of bulk requests sent to Elasticsearch.
-
-* The `pipeline.batch.delay` setting rarely needs to be tuned. This setting adjusts the latency of the Logstash pipeline. Pipeline batch delay is the maximum amount of time in milliseconds that Logstash waits for new messages after receiving an event in the current pipeline worker thread. After this time elapses, Logstash begins to execute filters and outputs.The maximum time that Logstash waits between receiving an event and processing that event in a filter is the product of the `pipeline.batch.delay` and  `pipeline.batch.size` settings.
-
-[float]
-==== Notes on Pipeline Configuration and Performance
-
-If you plan to modify the default pipeline settings, take into account the
-following suggestions:
-
-* The total number of inflight events is determined by the product of the  `pipeline.workers` and `pipeline.batch.size` settings. This product is referred to as the _inflight count_.  Keep the value of the inflight count in mind as you adjust the `pipeline.workers` and `pipeline.batch.size` settings. Pipelines that intermittently receive large events at irregular intervals require sufficient memory to handle these spikes. Set the JVM heap space accordingly in the `jvm.options` config file. (See <<config-setting-files>> for more info.)
-
-* Measure each change to make sure it increases, rather than decreases, performance.
-
-* Ensure that you leave enough memory available to cope with a sudden increase in event size. For example, an application that generates exceptions that are represented as large blobs of text.
-
-* The number of workers may be set higher than the number of CPU cores since outputs often spend idle time in I/O wait conditions.
-
-* Threads in Java have names and you can use the `jstack`, `top`, and the VisualVM graphical tools to figure out which resources a given thread uses.
-
-* On Linux platforms, Logstash labels all the threads it can with something descriptive. For example, inputs show up as `[base]<inputname`, and pipeline workers show up as `[base]>workerN`, where N is an integer.  Where possible, other threads are also labeled to help you identify their purpose.
-
-[float]
-[[profiling-the-heap]]
-==== Profiling the Heap
-
-When tuning Logstash you may have to adjust the heap size. You can use the https://visualvm.github.io/[VisualVM] tool to profile the heap. The *Monitor* pane in particular is useful for checking whether your heap allocation is sufficient for the current workload. The screenshots below show sample *Monitor* panes. The first pane examines a Logstash instance configured with too many inflight events. The second pane examines a Logstash instance configured with an appropriate amount of inflight events. Note that the specific batch sizes used here are most likely not applicable to your specific workload, as the memory demands of Logstash vary in large part based on the type of messages you are sending.
-
-image::static/images/pipeline_overload.png[]
-
-image::static/images/pipeline_correct_load.png[]
-
-In the first example we see that the CPU isn’t being used very efficiently. In fact, the JVM is often times having to stop the VM for “full GCs”. Full garbage collections are a common symptom of excessive memory pressure. This is visible in the spiky pattern on the CPU chart. In the more efficiently configured example, the GC graph pattern is more smooth, and the CPU is used in a more uniform manner. You can also see that there is ample headroom between the allocated heap size, and the maximum allowed, giving the JVM GC a lot of room to work with.
-
-Examining the in-depth GC statistics with a tool similar to the excellent https://visualvm.github.io/plugins.html[VisualGC] plugin shows that the over-allocated VM spends very little time in the efficient Eden GC, compared to the time spent in the more resource-intensive Old Gen “Full” GCs.
-
-NOTE: As long as the GC pattern is acceptable, heap sizes that occasionally increase to the maximum are acceptable. Such heap size spikes happen in response to a burst of large events passing through the pipeline. In general practice, maintain a gap between the used amount of heap memory and the maximum.
-This document is not a comprehensive guide to JVM GC tuning. Read the official http://www.oracle.com/webfolder/technetwork/tutorials/obe/java/gc01/index.html[Oracle guide] for more information on the topic. We also recommend reading http://www.semicomplete.com/blog/geekery/debugging-java-performance.html[Debugging Java Performance].
-
diff --git a/docs/static/persistent-queues.asciidoc b/docs/static/persistent-queues.asciidoc
deleted file mode 100644
index c4cf10ba5..000000000
--- a/docs/static/persistent-queues.asciidoc
+++ /dev/null
@@ -1,170 +0,0 @@
-[[persistent-queues]]
-=== Persistent Queues
-
-By default, Logstash uses in-memory bounded queues between pipeline stages
-(inputs → pipeline workers) to buffer events. The size of these in-memory
-queues is fixed and not configurable. If Logstash experiences a temporary
-machine failure, the contents of the in-memory queue will be lost. Temporary machine
-failures are scenarios where Logstash or its host machine are terminated
-abnormally but are capable of being restarted. 
-
-In order to protect against data loss during abnormal termination, Logstash has
-a persistent queue feature which will store the message queue on disk.
-Persistent queues provide durability of data within Logstash.
-
-Persistent queues are also useful for Logstash deployments that need large buffers.
-Instead of deploying and managing a message broker, such as Redis, RabbitMQ, or
-Apache Kafka, to facilitate a buffered publish-subscriber model, you can enable
-persistent queues to buffer events on disk and remove the message broker.
-
-In summary, the benefits of enabling persistent queues are as follows:
-
-* Absorbs bursts of events without needing an external buffering mechanism like
-Redis or Apache Kafka.
-* Provides an at-least-once delivery guarantee against message loss during
-a normal shutdown as well as when Logstash is terminated abnormally. If Logstash
-is restarted while events are in-flight, Logstash will attempt to deliver
-messages stored in the persistent queue until delivery succeeds at least once.
-+
-NOTE: You must set `queue.checkpoint.writes: 1` explicitly to guarantee
-maximum durability for all input events. See <<durability-persistent-queues>>.
-
-[[persistent-queues-limitations]]
-==== Limitations of Persistent Queues
-
-The following are problems not solved by the persistent queue feature:
-
-* Input plugins that do not use a request-response protocol cannot be protected from data loss. For example: tcp, udp, zeromq push+pull, and many other inputs do not have a mechanism to acknowledge receipt to the sender. Plugins such as beats and http, which *do* have an acknowledgement capability, are well protected by this queue.
-* It does not handle permanent machine failures such as disk corruption, disk failure, and machine loss. The data persisted to disk is not replicated.
-
-[[persistent-queues-architecture]]
-==== How Persistent Queues Work
-
-The queue sits between the input and filter stages in the same
-process:
-
-input → queue → filter + output 
-
-When an input has events ready to process, it writes them to the queue. When
-the write to the queue is successful, the input can send an acknowledgement to
-its data source.
-
-When processing events from the queue, Logstash acknowledges events as
-completed, within the queue, only after filters and outputs have completed.
-The queue keeps a record of events that have been processed by the pipeline.
-An event is recorded as processed (in this document, called "acknowledged" or
-"ACKed") if, and only if, the event has been processed completely by the
-Logstash pipeline. 
-
-What does acknowledged mean? This means the event has been handled by all
-configured filters and outputs. For example, if you have only one output,
-Elasticsearch, an event is ACKed when the Elasticsearch output has successfully
-sent this event to Elasticsearch. 
-
-During a normal shutdown (*CTRL+C* or SIGTERM), Logstash will stop reading
-from the queue and will finish processing the in-flight events being processed
-by the filters and outputs. Upon restart, Logstash will resume processing the
-events in the persistent queue as well as accepting new events from inputs.
-
-If Logstash is abnormally terminated, any in-flight events will not have been
-ACKed and will be reprocessed by filters and outputs when Logstash is
-restarted. Logstash processes events in batches, so it is possible
-that for any given batch, some of that batch may have been successfully
-completed, but not recorded as ACKed, when an abnormal termination occurs.
-
-For more details specific behaviors of queue writes and acknowledgement, see 
-<<durability-persistent-queues>>.
-
-[[configuring-persistent-queues]]
-==== Configuring Persistent Queues
-
-To configure persistent queues, you can specify the following options in the
-Logstash <<logstash-settings-file,settings file>>:
-
-* `queue.type`: Specify `persisted` to enable persistent queues. By default, persistent queues are disabled (default: `queue.type: memory`).
-* `path.queue`: The directory path where the data files will be stored. By default, the files are stored in `path.data/queue`. 
-* `queue.page_capacity`: The maximum size of a queue page in bytes. The queue data consists of append-only files called "pages". The default size is 64mb. Changing this value is unlikely to have performance benefits.
-* `queue.drain`: Specify `true` if you want Logstash to wait until the persistent queue is drained before shutting down. The amount of time it takes to drain the queue depends on the number of events that have accumulated in the queue. Therefore, you should avoid using this setting unless the queue, even when full, is relatively small and can be drained quickly. 
-// Technically, I know, this isn't "maximum number of events" it's really maximum number of events not yet read by the pipeline worker. We only use this for testing and users generally shouldn't be setting this.
-* `queue.max_events`:  The maximum number of events that are allowed in the queue. The default is 0 (unlimited).
-* `queue.max_bytes`: The total capacity of the queue in number of bytes. The
-default is 1024mb (1gb). Make sure the capacity of your disk drive is greater
-than the value you specify here.
-+
-TIP: If you are using persistent queues to protect against data loss, but don't
-require much buffering, you can set `queue.max_bytes` to a smaller value, such
-as 10mb, to produce smaller queues and improve queue performance. 
-
-If both `queue.max_events` and 
-`queue.max_bytes` are specified, Logstash uses whichever criteria is reached
-first. See <<backpressure-persistent-queue>> for behavior when these queue limits are reached.
-
-You can also control when the checkpoint file gets updated by setting `queue.checkpoint.writes`. See <<durability-persistent-queues>>.
-
-Example configuration:
-
-[source, yaml]
-queue.type: persisted
-queue.max_bytes: 4gb 
-
-[[backpressure-persistent-queue]]
-==== Handling Back Pressure
-
-When the queue is full, Logstash puts back pressure on the inputs to stall data
-flowing into Logstash. This mechanism helps Logstash control the rate of data
-flow at the input stage without overwhelming outputs like Elasticsearch.
-
-Use `queue.max_bytes` setting to configure the total capacity of the queue on
-disk. The following example sets the total capacity of the queue to 8gb:
-
-[source, yaml]
-queue.type: persisted
-queue.max_bytes: 8gb
-
-With these settings specified, Logstash will buffer events on disk until the
-size of the queue reaches 8gb. When the queue is full of unACKed events, and
-the size limit has been reached, Logstash will no longer accept new events. 
-
-Each input handles back pressure independently. For example, when the
-<<plugins-inputs-beats,beats>> input encounters back pressure, it no longer
-accepts new connections and waits until the persistent queue has space to accept
-more events. After the filter and output stages finish processing existing
-events in the queue and ACKs them, Logstash automatically starts accepting new
-events.
-
-[[durability-persistent-queues]]
-==== Controlling Durability
-
-Durability is a property of storage writes that ensures data will be available after it's written.
-
-When the persistent queue feature is enabled, Logstash will store events on
-disk. Logstash commits to disk in a mechanism called checkpointing.
-
-To discuss durability, we need to introduce a few details about how the persistent queue is implemented.
-
-First, the queue itself is a set of pages. There are two kinds of pages: head pages and tail pages. The head page is where new events are written. There is only one head page. When the head page is of a certain size (see `queue.page_capacity`), it becomes a tail page, and a new head page is created. Tail pages are immutable, and the head page is append-only. 
-Second, the queue records details about itself (pages, acknowledgements, etc) in a separate file called a checkpoint file.
-
-When recording a checkpoint, Logstash will:
-
-* Call fsync on the head page.
-* Atomically write to disk the current state of the queue.
-
-The process of checkpointing is atomic, which means any update to the file is saved if successful.
-
-If Logstash is terminated, or if there is a hardware-level failure, any data
-that is buffered in the persistent queue, but not yet checkpointed, is lost.
-
-You can force Logstash to checkpoint more frequently by setting
-`queue.checkpoint.writes`. This setting specifies the maximum number of events
-that may be written to disk before forcing a checkpoint. The default is 1024. To
-ensure maximum durability and avoid losing data in the persistent queue, you can
-set `queue.checkpoint.writes: 1` to force a checkpoint after each event is
-written. Keep in mind that disk writes have a resource cost. Setting this value
-to `1` can severely impact performance. 
-
-[[garbage-collection]]
-==== Disk Garbage Collection
-
-On disk, the queue is stored as a set of pages where each page is one file. Each page can be at most `queue.page_capacity` in size. Pages are deleted (garbage collected) after all events in that page have been ACKed. If an older page has at least one event that is not yet ACKed, that entire page will remain on disk until all events in that page are successfully processed. Each page containing unprocessed events will count against the `queue.max_bytes` byte size.
-
diff --git a/docs/static/pipeline-pipeline-config.asciidoc b/docs/static/pipeline-pipeline-config.asciidoc
deleted file mode 100644
index 9148fc68e..000000000
--- a/docs/static/pipeline-pipeline-config.asciidoc
+++ /dev/null
@@ -1,206 +0,0 @@
-[[pipeline-to-pipeline]]
-=== Pipeline-to-Pipeline Communication (Beta)
-
-When using the multiple pipeline feature of Logstash, you may want to connect multiple pipelines within the same Logstash instance. This configuration can be useful to isolate the execution of these pipelines, as well as to help break-up the logic of complex pipelines. The `pipeline` input/output enables a number of advanced architectural patterns discussed later in this document.
-
-If you need to set up communication _between_ Logstash instances, use either {logstash-ref}/ls-to-ls.html[Logstash-to-Logstash] communications, or an intermediary queue, such as Kafka or Redis.
-
-[[pipeline-to-pipeline-overview]]
-==== Configuration overview
-
-Use the `pipeline` input and `pipeline` output to connect two pipelines running within the same Logstash instance. These inputs use a client-server approach, where the `pipeline` input registers a virtual address that a `pipeline` output can connect to.
-
-. Create a 'downstream' pipeline that listens for events on a virtual address.
-. Create an 'upstream' pipeline that produces events, sending them through a `pipeline` output to one or more virtual addresses.
-
-Here is a simple example of this configuration.
-
-[source,yaml]
-----
-# config/pipelines.yml
-- pipeline.id: upstream
-  config.string: input { stdin {} } output { pipeline { send_to => [myVirtualAddress] } }
-- pipeline.id: downstream
-  config.string: input { pipeline { address => myVirtualAddress } }
-----
-
-[[how-pipeline-to-pipeline-works]]
-===== How it works
-
-The `pipeline` input acts as a virtual server listening on a single virtual address in the local process. Only `pipeline` outputs running on the same local Logstash can send events to this address. Pipeline `outputs` can send events to a list of virtual addresses. A `pipeline` output will be blocked if the downstream pipeline is blocked or unavailable.
-
-When events are sent across pipelines, their data is fully copied. Modifications to an event in a downstream pipeline do not affect that event in any upstream pipelines.
-
-The `pipeline` plugin may be the most efficient way to communicate between pipelines, but it still incurs a performance cost. Logstash must duplicate each event in full on the Java heap for each downstream pipeline. Using this feature may affect the heap memory utilization of Logstash.
-
-[[delivery-guarantees]]
-===== Delivery Guarantees
-In its standard configuration the `pipeline` input/output has at-least-once delivery guarantees. The output will be blocked if the address is blocked or unavailable.
-
-By default, the `ensure_delivery` option on the `pipeline` output is set to `true.` If you change the `ensure_delivery` flag to `false`, an unavailable downstream pipeline causes the sent message to be discarded. Use `ensure_delivery => false` when you want the ability to temporarily disable a downstream pipeline without the upstream one waiting for it.
-
-A blocked downstream pipeline blocks the sending output/pipeline regardless of the value of the `ensure_delivery` flag.
-
-These delivery guarantees also inform the shutdown behavior of this feature. When performing a pipeline reload, changes will be made immediately as the user requests, even if that means removing a downstream pipeline an upstream pipeline sends to. This will cause the upstream pipeline to block. You must restore the downstream pipeline to cleanly shutdown Logstash. You may issue a force kill, but inflight events may be lost, unless the persistent queue is in use.
-
-[[avoid-cycles]]
-===== Avoid cycles
-
-When you connect pipelines, keep the data flowing in one direction. Looping data or connecting the pipelines into a cyclic graph can cause problems. Logstash waits for each pipeline's work to complete before shutting down. Pipeline loops can prevent Logstash from shutting down cleanly.
-
-[[architectural-patterns]]
-==== Architectural patterns
-
-You can use the `pipeline` input and output to better organize code, streamline control flow, and isolate the performance of complex configurations. There are infinite ways to connect pipelines. The ones presented here offer some ideas.
-
-* <<distributor-pattern>>
-* <<output-isolator-pattern>>
-* <<forked-path-pattern>>
-* <<collector-pattern>>
-
-[[distributor-pattern]]
-===== The distributor pattern
-
-You can use the distributor pattern in situations where there are multiple types of data coming through a single input, each with its own complex set of processing rules. With the distributor pattern one pipeline is used to route data to other pipelines based on type. Each type is routed to a pipeline with only the logic for handling that type. In this way each type's logic can be isolated.
-
-As an example, in many organizations a single beats input may be used to receive traffic from a variety of sources, each with its own processing logic. A common way to deal with this type of data is to have a number of `if` conditions separating the traffic and processing each type differently. This approach can quickly get messy when configs are long and complex.
-
-Here is an example distributor pattern configuration.
-
-[source,yaml]
-----
-# config/pipelines.yml
-- pipeline.id: beats-server
-  config.string: |
-    input { beats { port => 5044 } }
-    output {
-        if [type] == apache {
-          pipeline { send_to => weblogs }
-        } else if [type] == system {
-          pipeline { send_to => syslog }
-        } else {
-          pipeline { send_to => fallback }
-        }
-    }
-- pipeline.id: weblog-processing
-  config.string: |
-    input { pipeline { address => weblogs } }
-    filter {
-       # Weblog filter statements here...
-    }
-    output {
-      elasticsearch { hosts => [es_cluster_a_host] }
-    }
-- pipeline.id: syslog-processing
-  config.string: |
-    input { pipeline { address => syslog } }
-    filter {
-       # Syslog filter statements here...
-    }
-    output {
-      elasticsearch { hosts => [es_cluster_b_host] }
-    }
-- pipeline.id: fallback-processing
-    config.string: |
-    input { pipeline { address => fallback } }
-    output { elasticsearch { hosts => [es_cluster_b_host] } }
-----
-
-Notice how following the flow of data is a simple due to the fact that each pipeline only works on a single specific task.
-
-[[output-isolator-pattern]]
-===== The output isolator pattern
-
-You can use the output isolator pattern to prevent Logstash from becoming blocked if one of multiple outputs experiences a temporary failure. Logstash, by default, is blocked when any single output is down. This behavior is important in guaranteeing at-least-once delivery of data. 
-
-For example, a server might be configured to send log data to both Elasticsearch and an HTTP endpoint. The HTTP endpoint might be frequently unavailable due to regular service or other reasons. In this scenario, data would be paused from sending to Elasticsearch any time the HTTP endpoint is down. 
-
-Using the output isolator pattern and persistent queues, we can continue sending to Elasticsearch, even when one output is down.
-
-Here is an example of this scenario using the output isolator pattern. 
-
-[source,yaml]
-----
-# config/pipelines.yml
-- pipeline.id: intake
-  queue.type: persisted
-  config.string: |
-    input { beats { port => 5044 } }
-    output { pipeline { send_to => [es, http] } }
-- pipeline.id: buffered-es
-  queue.type: persisted
-  config.string: |
-    input { pipeline { address => es } }
-    output { elasticsearch { } }
-- pipeline.id: buffered-http
-  queue.type: persisted
-  config.string: |
-    input { pipeline { address => http } }
-    output { http { } }
-----
-
-In this architecture, each stage has its own queue with its own tuning and settings. Note that this approach uses up to three times as much disk space and incurs three times as much serialization/deserialization cost as a single pipeline.
-
-[[forked-path-pattern]]
-===== The forked path pattern
-
-You can use the forked path pattern for situations where a single event must be processed more than once according to different sets of rules. Before the `pipeline` input and output were available, this need was commonly addressed through creative use of the `clone` filter and `if/else` rules.
-
-Let's imagine a use case where we receive data and index the full event in our own systems, but publish a redacted version of the data to a partner's S3 bucket. We might use the output isolator pattern described above to decouple our writes to either system. The distinguishing feature of the forked path pattern is the existence of additional rules in the downstream pipelines.
-
-Here is an example of the forked path configuration.
-
-[source,yaml]
-----
-# config/pipelines.yml
-- pipeline.id: intake
-  queue.type: persisted
-  config.string: |
-    input { beats { port => 5044 } }
-    output { pipeline { send_to => ["internal-es", "partner-s3"] } }
-- pipeline.id: buffered-es
-  queue.type: persisted
-  config.string: |
-    input { pipeline { address => "internal-es" } }
-    # Index the full event
-    output { elasticsearch { } }
-- pipeline.id: partner
-  queue.type: persisted
-  config.string: |
-    input { pipeline { address => "partner-s3" } }
-    filter {
-      # Remove the sensitive data
-      mutate { remove_field => 'sensitive-data' }
-    }
-    output { s3 { } } # Output to partner's bucket
-----
-
-[[collector-pattern]]
-===== The collector pattern
-
-You can use the collector pattern when you want to define a common set of outputs and pre-output filters that many disparate pipelines might use. This pattern is the opposite of the distributor pattern. In this pattern many pipelines flow in to a single pipeline where they share outputs and processing. This pattern simplifies configuration at the cost of reducing isolation, since all data is sent through a single pipeline.
-
-Here is an example of the collector pattern.
-
-[source,yaml]
-----
-# config/pipelines.yml
-- pipeline.id: beats
-  config.string: |
-    input { beats { port => 5044 } }
-    output { pipeline { send_to => [commonOut] } }
-- pipeline.id: kafka
-  config.string: |
-    input { kafka { ... } }
-    output { pipeline { send_to => [commonOut] } }
-- pipeline.id: partner
-  # This common pipeline enforces the same logic whether data comes from Kafka or Beats
-  config.string: |
-    input { pipeline { address => commonOut } }
-    filter {
-      # Always remove sensitive data from all input sources
-      mutate { remove_field => 'sensitive-data' }
-    }
-    output { elasticsearch { } }
-----
-
diff --git a/docs/static/plugin-generator.asciidoc b/docs/static/plugin-generator.asciidoc
deleted file mode 100644
index cd18d1d67..000000000
--- a/docs/static/plugin-generator.asciidoc
+++ /dev/null
@@ -1,19 +0,0 @@
-[[plugin-generator]]
-=== Generating Plugins
-
-You can now create your own Logstash plugin in seconds! The generate subcommand of `bin/logstash-plugin` creates the foundation 
-for a new Logstash plugin with templatized files. It creates the correct directory structure, gemspec files, and dependencies so you 
-can start adding custom code to process data with Logstash.
-
-**Example Usage**
-
-[source,sh]
---------------------------------------------
-bin/logstash-plugin generate --type input --name xkcd --path ~/ws/elastic/plugins
--------------------------------------------
-
-* `--type`: Type of plugin - input, filter, output, or codec
-* `--name`: Name for the new plugin
-* `--path`: Directory path where the new plugin structure will be created. If not specified, it will be
-created in the current directory.
-
diff --git a/docs/static/plugin-manager.asciidoc b/docs/static/plugin-manager.asciidoc
deleted file mode 100644
index 629ac1a24..000000000
--- a/docs/static/plugin-manager.asciidoc
+++ /dev/null
@@ -1,136 +0,0 @@
-[[working-with-plugins]]
-== Working with plugins
-
-Logstash has a rich collection of input, filter, codec and output plugins. Plugins are available as self-contained
-packages called gems and hosted on RubyGems.org. The plugin manager accessed via `bin/logstash-plugin` script is used to manage the
-lifecycle of plugins in your Logstash deployment. You can install, remove and upgrade plugins using the Command Line
-Interface (CLI) invocations described below.
-
-[float]
-[[http-proxy]]
-=== Proxy configuration
-
-The majority of the plugin manager commands require access to the internet to reach https://rubygems.org[RubyGems.org].
-If your organization is behind a firewall you can set these environments variables to configure Logstash to use your proxy.
-
-[source, shell]
-----------------------------------
-export http_proxy=http://localhost:3128
-export https_proxy=http://localhost:3128
-----------------------------------
-
-[float]
-[[listing-plugins]]
-=== Listing plugins
-
-Logstash release packages bundle common plugins so you can use them out of the box. To list the plugins currently
-available in your deployment:
-
-[source,shell]
-----------------------------------
-bin/logstash-plugin list <1>
-bin/logstash-plugin list --verbose <2>
-bin/logstash-plugin list '*namefragment*' <3>
-bin/logstash-plugin list --group output <4>
-----------------------------------
-<1> Will list all installed plugins
-
-<2> Will list installed plugins with version information
-
-<3> Will list all installed plugins containing a namefragment
-
-<4> Will list all installed plugins for a particular group (input, filter, codec, output)
-
-[float]
-[[installing-plugins]]
-=== Adding plugins to your deployment
-
-The most common situation when dealing with plugin installation is when you have access to internet. Using this method,
-you will be able to retrieve plugins hosted on the public repository (RubyGems.org) and install on top of your Logstash
-installation.
-
-[source,shell]
-----------------------------------
-bin/logstash-plugin install logstash-output-kafka
-----------------------------------
-
-Once the plugin is successfully installed, you can start using it in your configuration file.
-
-[[installing-local-plugins]]
-[float]
-==== Advanced: Adding a locally built plugin
-
-In some cases, you want to install plugins which have not yet been released and not hosted on RubyGems.org. Logstash
-provides you the option to install a locally built plugin which is packaged as a ruby gem. Using a file location:
-
-[source,shell]
-----------------------------------
-bin/logstash-plugin install /path/to/logstash-output-kafka-1.0.0.gem
-----------------------------------
-
-[[installing-local-plugins-path]]
-[float]
-==== Advanced: Using `--path.plugins`
-
-Using the Logstash `--path.plugins` flag, you can load a plugin source code located on your file system. Typically this is used by
-developers who are iterating on a custom plugin and want to test it before creating a ruby gem.
-
-The path needs to be in a  specific directory hierarchy: `PATH/logstash/TYPE/NAME.rb`, where TYPE is 'inputs' 'filters', 'outputs' or 'codecs' and NAME is the name of the plugin.
-
-[source,shell]
-----------------------------------
-# supposing the code is in /opt/shared/lib/logstash/inputs/my-custom-plugin-code.rb
-bin/logstash --path.plugins /opt/shared/lib
-----------------------------------
-
-[[updating-plugins]]
-[float]
-=== Updating plugins
-
-Plugins have their own release cycle and are often released independent of Logstash’s core release cycle. Using the update
-subcommand you can get the latest version of the plugin.
-
-[source,shell]
-----------------------------------
-bin/logstash-plugin update <1>
-bin/logstash-plugin update logstash-output-kafka <2>
-----------------------------------
-<1> will update all installed plugins
-
-<2> will update only this plugin
-
-[[removing-plugins]]
-[float]
-=== Removing plugins
-
-If you need to remove plugins from your Logstash installation:
-
-[source,shell]
-----------------------------------
-bin/logstash-plugin remove logstash-output-kafka
-----------------------------------
-
-[[proxy-plugins]]
-[float]
-=== Proxy Support
-
-The previous sections relied on Logstash being able to communicate with RubyGems.org. In certain environments, Forwarding
-Proxy is used to handle HTTP requests. Logstash Plugins can be installed and updated through a Proxy by setting the
-`HTTP_PROXY` environment variable:
-
-[source,shell]
-----------------------------------
-export HTTP_PROXY=http://127.0.0.1:3128
-
-bin/logstash-plugin install logstash-output-kafka
-----------------------------------
-
-Once set, plugin commands install, update can be used through this proxy.
-
-include::plugin-generator.asciidoc[]
-
-include::offline-plugins.asciidoc[]
-
-include::private-gem-repo.asciidoc[]
-
-include::event-api.asciidoc[]
diff --git a/docs/static/private-gem-repo.asciidoc b/docs/static/private-gem-repo.asciidoc
deleted file mode 100644
index dd96f63a6..000000000
--- a/docs/static/private-gem-repo.asciidoc
+++ /dev/null
@@ -1,53 +0,0 @@
-[[private-rubygem]]
-=== Private Gem Repositories
-
-The Logstash plugin manager connects to a Ruby gems repository to install and update Logstash plugins. By default, this
-repository is http://rubygems.org.
-
-Some use cases are unable to use the default repository, as in the following examples:
-
-* A firewall blocks access to the default repository.
-* You are developing your own plugins locally.
-* Airgap requirements on the local system.
-
-When you use a custom gem repository, be sure to make plugin dependencies available.
-
-Several open source projects enable you to run your own plugin server, among them:
-
-* https://github.com/geminabox/geminabox[Geminabox]
-* https://github.com/PierreRambaud/gemirro[Gemirro]
-* https://gemfury.com/[Gemfury]
-* http://www.jfrog.com/open-source/[Artifactory]
-
-==== Editing the Gemfile
-
-The gemfile is a configuration file that specifies information required for plugin management. Each gem file has a
-`source` line that specifies a location for plugin content.
-
-By default, the gemfile's `source` line reads:
-
-[source,shell]
-----------
-# This is a Logstash generated Gemfile.
-# If you modify this file manually all comments and formatting will be lost.
-
-source "https://rubygems.org"
-----------
-
-To change the source, edit the `source` line to contain your preferred source, as in the following example:
-
-[source,shell]
-----------
-# This is a Logstash generated Gemfile.
-# If you modify this file manually all comments and formatting will be lost.
-
-source "https://my.private.repository"
-----------
-
-After saving the new version of the gemfile, use <<working-with-plugins,plugin management commands>> normally.
-
-The following links contain further material on setting up some commonly used repositories:
-
-* https://github.com/geminabox/geminabox/blob/master/README.markdown[Geminabox]
-* https://www.jfrog.com/confluence/display/RTF/RubyGems+Repositories[Artifactory]
-* Running a http://guides.rubygems.org/run-your-own-gem-server/[rubygems mirror]
diff --git a/docs/static/releasenotes.asciidoc b/docs/static/releasenotes.asciidoc
deleted file mode 100644
index e6aaa71a5..000000000
--- a/docs/static/releasenotes.asciidoc
+++ /dev/null
@@ -1,17 +0,0 @@
-[[releasenotes]]
-== Release Notes
-
-This section summarizes the changes in the following releases:
-
-* <<logstash-7-0-0-alpha1,Logstash 7.0.0-alpha1>>
-* <<logstash-7-0-0-alpha2,Logstash 7.0.0-alpha2>>
-
-[[logstash-7-0-0-alpha1]]
-=== Logstash 7.0.0-alpha1 Release Notes
-
-Placeholder for alpha1 release notes
-
-[[logstash-7-0-0-alpha2]]
-=== Logstash 7.0.0-alpha2 Release Notes
-
-Placeholder for alpha2 release notes
diff --git a/docs/static/reloading-config.asciidoc b/docs/static/reloading-config.asciidoc
deleted file mode 100644
index 1a16a379c..000000000
--- a/docs/static/reloading-config.asciidoc
+++ /dev/null
@@ -1,46 +0,0 @@
-[[reloading-config]]
-=== Reloading the Config File
-
-Starting with Logstash 2.3, you can set Logstash to detect and reload configuration
-changes automatically.
-
-To enable automatic config reloading, start Logstash with the `--config.reload.automatic` (or `-r`)
-command-line option specified. For example:
-
-[source,shell]
-----------------------------------
-bin/logstash –f apache.config --config.reload.automatic
-----------------------------------
-
-NOTE: The `--config.reload.automatic` option is not available when you specify the `-e` flag to pass
-in  configuration settings from the command-line.
-
-By default, Logstash checks for configuration changes every 3 seconds. To change this interval,
-use the `--config.reload.interval <interval>` option,  where `interval` specifies how often Logstash
-checks the config files for changes. 
-
-If Logstash is already running without auto-reload enabled, you can force Logstash to
-reload the config file and restart the pipeline by sending a SIGHUP (signal hangup) to the
-process running Logstash. For example:
-
-[source,shell]
-----------------------------------
-kill -1 14175
-----------------------------------
-
-Where 14175 is the ID of the process running Logstash.
-
-==== How Automatic Config Reloading Works
-
-When Logstash detects a change in a config file, it stops the current pipeline by stopping
-all inputs, and it attempts to create a new pipeline that uses the updated configuration.
-After validating the syntax of the new configuration, Logstash verifies that all inputs
-and outputs can be initialized (for example, that all required ports are open). If the checks
-are successful, Logstash swaps the existing pipeline with the new pipeline. If the checks
-fail, the old pipeline continues to function, and the errors are propagated to the console.
-
-During automatic config reloading, the JVM is not restarted. The creating and swapping of
-pipelines all happens within the same process. 
-
-Changes to <<plugins-filters-grok,grok>> pattern files are also reloaded, but only when
-a change in the config file triggers a reload (or the pipeline is restarted).  
diff --git a/docs/static/resiliency.asciidoc b/docs/static/resiliency.asciidoc
deleted file mode 100644
index ebc85e4e2..000000000
--- a/docs/static/resiliency.asciidoc
+++ /dev/null
@@ -1,23 +0,0 @@
-[[resiliency]]
-== Data Resiliency
-
-As data flows through the event processing pipeline, Logstash may encounter
-situations that prevent it from delivering events to the configured
-output. For example, the data might contain unexpected data types, or
-Logstash might terminate abnormally. 
-
-To guard against data loss and ensure that events flow through the
-pipeline without interruption, Logstash provides the following data resiliency
-features. 
-
-* <<persistent-queues>> protect against data loss by storing events in an
-internal queue on disk. 
-
-* <<dead-letter-queues>> provide on-disk storage for events that Logstash is
-unable to process. You can easily reprocess events in the dead letter queue by
-using the `dead_letter_queue` input plugin.
-
-//TODO: Make dead_letter_queue an active link after the plugin docs are published.
-
-These resiliency features are disabled by default. To turn on these features,
-you must explicitly enable them in the Logstash <<logstash-settings-file,settings file>>.
diff --git a/docs/static/roadmap/index.asciidoc b/docs/static/roadmap/index.asciidoc
deleted file mode 100644
index b52e27167..000000000
--- a/docs/static/roadmap/index.asciidoc
+++ /dev/null
@@ -1,183 +0,0 @@
-= Logstash Roadmap
-
-:ISSUES:  https://github.com/elastic/logstash/issues/
-:LABELS:  https://github.com/elastic/logstash/labels/
-
-== Overview
-
-Welcome to the Logstash roadmap page!
-
-While GitHub is great for sharing our work, it can be difficult to get an
-overview of the current state of affairs from an issues list. This page outlines
-major themes for our future plans, with pointers to additional resources if you
-want to contribute to the Logstash project.
-
-We will not track concrete milestones on this page, because we often make
-adjustments to our timelines based on community feedback. For the latest release
-status information, please search for the {LABELS}roadmap[roadmap] tag in
-GitHub.
-
-== Resiliency
-[float]
-=== status: ongoing; v2.x
-
-The Logstash team is committed to continuously improving the resiliency of
-Logstash. As with any modular system, Logstash has many moving parts and a
-multitude of deployment architectures, all of which need to be considered in the
-context of resiliency. Our resiliency project is an ongoing effort to identify
-and enhance areas where Logstash can provide additional resiliency guarantees.
-You can follow this effort on GitHub by searching for issues that have the
-{LABELS}resiliency[resiliency] tag.
-
-*Event persistence ({ISSUES}2605[#2605]).* Logstash relies on bounded in-memory
-queues between pipeline stages to buffer events (see the
-http://www.elastic.co/guide/en/logstash/current/pipeline.html#_fault_tolerance[documentation]
-for more information). Currently, these queues are not persisted to disk.
-To prevent loss in the event of a plugin crash or a restart, we plan to persist
-these queues to disk.
-
-*Variable internal queues ({ISSUES}2606[#2606]).* Logstash currently uses
-fixed-sized queues between pipeline stages. When the processing rates differ
-widely between stages (such as parsing and indexing), users typically deploy a
-message broker, such as Redis or RabbitMQ, to provide an external queueing
-mechanism. We plan to offer a built-in alternative to using an external message
-broker by adding a variable queueing option to Logstash.
-
-*Dead letter queue (https://github.com/elastic/logstash/issues/2607[#2607]).*
-Today, when Logstash cannot process an event due to an error, it has two
-choices: drop or retry. If the condition is temporary (for example,  the next
-stage in the pipeline is temporarily overloaded), retry is a good approach.
-However, if the failure is permanent (such as  bad encoding or a mapping error)
-retrying could cause an indefinite stall in processing. In this case, dropping
-the event is preferred. As a third option, we plan to introduce a dead letter
-queue (DLQ), which will store events that could stall the pipeline. Users can
-then examine these events and resolve problems as needed. The DLQ could also
-receive events that abuse the grok filter (e.g. runaway regular expressions
-which cause expensive backtracking), failures in grok patterns, date filters,
-and so on.
-
-*End-to-end acknowledgement of message delivery ({ISSUES}2609[#2609]).* Logstash
-currently does not provide end-to-end delivery guarantees. When a plugin fails
-to process an event, it does not signal to an earlier stage in the pipeline that
-an error has occurred. In the longer term, we plan to introduce an optional
-notification mechanism to give operators an easier way to track and replay
-failed events.
-
-*Known issues affecting resiliency.* There are certain categories of defects
-that affect resiliency, such as plugin crashes, failures in retry logic, and
-exhausting system resources. We respond to critical bug requests in real-time
-and perform weekly triaging of less urgent requests. All known issues are
-flagged with the
-https://github.com/elastic/logstash/labels/resiliency[resiliency] tag.
-
-*Known unknowns.* If we don’t know it’s happening, it’s hard for us to fix it!
-Please report your issues in GitHub, under the
-https://github.com/elastic/logstash/issues[Logstash] or
-individual https://github.com/logstash-plugins/[Logstash plugin] repositories.
-
-== Manageability
-[float]
-=== status: ongoing; v2.x
-
-As Logstash deployments scale up, managing and monitoring multiple Logstash
-instances using configuration and log files can become challenging. Our
-manageability project aims to improve this experience by adding functionality
-that makes administration of Logstash more efficient and less error-prone. You
-can follow this effort on GitHub by searching for issues that have the
-{LABELS}manageability[manageability] tag.
-
-*Better Defaults.*  Today, some Logstash defaults are geared toward the development experience, rather than production environments. We plan to audit and re-evaluate a number of defaults to alleviate the burden of tuning Logstash performance in production ({ISSUES}1512[#1512]). In addition, we are undertaking additional benchmarking to evaluate the performance of node, transport, and HTTP protocols in the Elasticsearch output to provide additional confirmation for our proposal to switch the default from node to HTTP (https://github.com/logstash-plugins/logstash-output-elasticsearch/issues/150[#150]).
-
-*Logstash Monitoring API ({ISSUES}2611[#2611]).* Today, most Logstash monitoring
-functions are accomplished by tailing logs or outputting debug messages. As a
-result, it is hard to monitor the Logstash health and track success or failure
-of events passing through the pipeline. We plan to introduce a Logstash
-monitoring API to improve visibility into pipeline activity and provide
-performance metrics such as number of events processed, success/failure rates,
-and time spent in each plugin.
-
-*Logstash Management API ({ISSUES}2612[#2612]).* Currently, updating the
-Logstash configuration requires editing a configuration file and restarting
-the Logstash process. This means you either have to temporarily halt the
-pipeline or accept an interruption in processing. While file-based configuration
-management will continue to be supported, we plan to add a robust Logstash
-management API that enables you to update the configuration dynamically without
-restarting the Logstash process. As the API matures, it will provide us with a
-strong foundation for building a user interface for monitoring and managing
-Logstash.
-
-*Clustering ({ISSUES}2632[#2632]).* In large-scale Logstash deployments, users
-run multiple instances of Logstash to horizontally scale event processing.
-Currently, this requires manual management of individual configuration files, or
-custom/3rd party configuration automation tools, some of which are maintained
-and supported by us (e.g. puppet-logstash). We plan to introduce an option to
-centrally store and manage Logstash configuration options to provide an
-alternative for scaling out your deployment that doesn’t rely on manual
-configuration file management or or 3rd party configuration management tools.
-
-*High availability and load balancing ({ISSUES}2633[#2633]).* Currently, if a
-specific instance of Logstash becomes overloaded or unavailable, it can result
-in a performance degradation or outage until the problem is resolved, unless you
-use a dedicated load balancer to distribute traffic over the available
-instances. In a clustered deployment, we have the option of automatically
-distributing the load between instances based on the latest cluster state. This
-is a complex use case that will require input from the community on current
-approaches to implementing HA and load balancing of Logstash instances.
-
-== Performance
-[float]
-=== status: ongoing; v1.5, v2.x
-
-In the 1.5 release, we significantly improved the performance of the Grok
-filter, which is used to parse text via regular expressions. Based on our
-internal benchmarks, parsing common log formats, such as Apache logs, was 2x
-faster in Logstash 1.5 compared to previous versions. We also sped up JSON
-serialization and deserialization. In future releases of Logstash, we plan to
-incorporate additional JRuby optimizations to make the code even more efficient.
-We also plan to seek community feedback in terms of prioritizing other aspects
-of performance, such as startup time, resource utilization, and pipeline
-latency. You can follow our benchmarking and performance improvements in this issue ({ISSUES}3499[#3499]).
-
-== Windows Support
-[float]
-=== status: ongoing; v1.5, v2.x
-
-Leading up to the 1.5 release, we greatly improved automated Windows testing of
-Logstash. As a result of this testing, we identified and
-https://github.com/elastic/logstash/issues?q=is%3Aissue+label%3Awindows+is%3Aclosed[resolved]
-a number of critical issues affecting the Windows platform, pertaining to
-initial setup, upgrade, and file input plugin. You can follow the outstanding
-issues we are still working on using the GitHub
-https://github.com/elastic/logstash/issues?q=is%3Aissue+label%3Awindows+is%3Aopen[windows]
-label.
-
-== Plugin Framework
-[float]
-=== status: completed; v1.5
-
-Logstash has a rich collection of 165+ plugins, which are developed by
-Elasticsearch and contributed by the community. Previously, most commonly-used
-plugins were bundled with Logstash to make the getting started experience
-easier. However, there was no way to update plugins outside of the Logstash
-release cycle. In Logstash 1.5, we created a powerful plugin framework based on
-https://rubygems.org/[RubyGems.org] to facilitate per-plugin installation and
-updates. We will continue to distribute commonly-used plugins with Logstash, but
-now users will be able to install new plugins and receive plugin updates at any
-time. Read more about these changes in the
-http://www.elastic.co/blog/plugin-ecosystem-changes/[Logstash Plugin Ecosystem Changes]
-announcement.
-
-== New Plugins
-[float]
-=== status: ongoing
-
-Logstash plugins are continuously added to the Logstash plugin ecosystem, both
-by us and by our wonderful community of plugin contributors. Recent additions
-include https://github.com/logstash-plugins?query=kafka[Kafka],
-https://github.com/logstash-plugins?query=couchdb[CouchDB], and
-https://github.com/logstash-plugins/logstash-input-rss[RSS], just to name a few.
-In Logstash 1.5, we made it easier than ever to add and maintain plugins by
-putting each plugin into its own repository (see "Plugin Framework" section).
-We also greatly improved the S3, Twitter, RabbitMQ plugins. To follow requests
-for new Logstash plugins or contribute to the discussion, look for issues that
-have the {LABELS}new-plugin[new-plugin] tag in Github.
diff --git a/docs/static/running-logstash-command-line.asciidoc b/docs/static/running-logstash-command-line.asciidoc
deleted file mode 100644
index f0e839197..000000000
--- a/docs/static/running-logstash-command-line.asciidoc
+++ /dev/null
@@ -1,181 +0,0 @@
-[[running-logstash-command-line]]
-=== Running Logstash from the Command Line
-
-To run Logstash from the command line, use the following command:
-
-[source,shell]
-----
-bin/logstash [options]
-----
-
-Where `options` are <<command-line-flags,command-line>> flags that you can
-specify to control Logstash execution. The location of the `bin` directory
-varies by platform. See <<dir-layout>> to find the location of `bin\logstash` on
-your system.
-
-The following example runs Logstash and loads the Logstash config defined in
-the `mypipeline.conf` file:
-
-[source,shell]
-----
-bin/logstash -f mypipeline.conf
-----
-
-Any flags that you set at the command line override the corresponding settings
-in <<logstash-settings-file>>, but the file
-itself is not changed. It remains as-is for subsequent Logstash runs.
-
-Specifying command line options is useful when you are testing Logstash.
-However, in a production environment, we recommend that you use
-<<logstash-settings-file>> to control Logstash execution. Using
-the settings file makes it easier for you to specify multiple options, and it
-provides you with a single, versionable file that you can use to start up
-Logstash consistently for each run.
-
-[[command-line-flags]]
-==== Command-Line Flags
-
-Logstash has the following flags. You can use the `--help` flag to display this information.
-
-*`--node.name NAME`*::
-  Specify the name of this Logstash instance. If no value is given it will default to the current
-  hostname.
-
-*`-f, --path.config CONFIG_PATH`*::
-Load the Logstash config from a specific file or directory. If a directory is given, all
-files in that directory will be concatenated in lexicographical order and then parsed as a
-single config file. Specifying this flag multiple times is not supported. If you specify
-this flag multiple times, Logstash uses the last occurrence (for example, `-f foo -f bar`
-is the same as `-f bar`).
-+
-You can specify wildcards (<<glob-support,globs>>) and any matched files will
-be loaded in the order described above. For example, you can use the wildcard feature to
-load specific files by name:
-+
-[source,shell]
----------------------------------------------
-bin/logstash --debug -f '/tmp/{one,two,three}'
----------------------------------------------
-+
-With this command, Logstash concatenates three config files, `/tmp/one`, `/tmp/two`, and
-`/tmp/three`, and parses them into a single config.
-
-*`-e, --config.string CONFIG_STRING`*::
-  Use the given string as the configuration data. Same syntax as the config file. If no
-  input is specified, then the following is used as the default input:
-  `input { stdin { type => stdin } }` and if no output is specified, then the
-  following is used as the default output: `output { stdout { codec => rubydebug } }`.
-  If you wish to use both defaults, please use the empty string for the `-e` flag.
-  The default is nil.
-
-*`--java-execution`*::
-  Use the Java execution engine instead of the default Ruby execution engine.
-
-*`--modules`*::
-  Launch the named module.  Works in conjunction with the `-M` option to assign values to
-  default variables for the specified module.  If `--modules` is used on the command line,
-  any modules in `logstash.yml` will be ignored, as will any settings there.  This flag is
-  mutually exclusive to the `-f` and `-e` flags.  Only one of `-f`, `-e`, or `--modules` may
-  be specified.  Multiple modules can be specified by separating them with a comma, or by
-  invoking the `--modules` flag multiple times.
-
-*`-M, --modules.variable`*::
-  Assign a value to a configurable option for a module.  The format for assigning variables is
-  `-M "MODULE_NAME.var.PLUGIN_TYPE.PLUGIN_NAME.KEY_NAME=value"` for Logstash variables. For other
-  settings, it will be `-M "MODULE_NAME.KEY_NAME.SUB_KEYNAME=value"`.  The `-M` flag can be used
-  as many times as is necessary. If no `-M` options are specified, then the default value for
-  that setting will be used.  The `-M` flag is only used in conjunction with the `--modules`
-  flag.  It will be ignored if the `--modules` flag is absent.
-
-*`--pipeline.id ID`*::
-  Sets the ID of pipeline. The default is `main`.
-
-*`-w, --pipeline.workers COUNT`*::
-  Sets the number of pipeline workers to run. This option sets the number of workers that will,
-  in parallel, execute the filter and output stages of the pipeline. If you find that events are
-  backing up, or that  the CPU is not saturated, consider increasing this number to better utilize
-  machine processing power. The default is the number of the host's CPU cores.
-
-*`-b, --pipeline.batch.size SIZE`*::
-  Size of batches the pipeline is to work in. This option defines the maximum number of events an
-  individual worker thread will collect from inputs before attempting to execute its filters and outputs.
-  The default is 125 events. Larger batch sizes are generally more efficient, but come at the cost of
-  increased memory overhead. You may need to increase JVM heap space in the `jvm.options` config file.
-  See <<config-setting-files>> for more info.
-
-*`-u, --pipeline.batch.delay DELAY_IN_MS`*::
-  When creating pipeline batches, how long to wait while polling for the next event. This option defines
-  how long in milliseconds to wait while polling for the next event before dispatching an undersized batch
-  to filters and outputs. The default is 50ms.
-
-*`--pipeline.unsafe_shutdown`*::
-  Force Logstash to exit during shutdown even if there are still inflight events
-  in memory. By default, Logstash will refuse to quit until all received events
-  have been pushed to the outputs. Enabling this option can lead to data loss during shutdown.
-
-*`--path.data PATH`*::
-  This should point to a writable directory. Logstash will use this directory whenever it needs to store
-  data. Plugins will also have access to this path. The default is the `data` directory under
-  Logstash home.
-
-*`-p, --path.plugins PATH`*::
-  A path of where to find custom plugins. This flag can be given multiple times to include
-  multiple paths. Plugins are expected to be in a specific directory hierarchy:
-  `PATH/logstash/TYPE/NAME.rb` where `TYPE` is `inputs`, `filters`, `outputs`, or `codecs`,
-  and `NAME` is the name of the plugin.
-
-*`-l, --path.logs PATH`*::
-  Directory to write Logstash internal logs to.
-
-*`--log.level LEVEL`*::
- Set the log level for Logstash. Possible values are:
-* `fatal`: log very severe error messages that will usually be followed by the application aborting
-* `error`: log errors
-* `warn`: log warnings
-* `info`: log verbose info (this is the default)
-* `debug`: log debugging info (for developers)
-* `trace`: log finer-grained messages beyond debugging info
-
-*`--config.debug`*::
-  Show the fully compiled configuration as a debug log message (you must also have `--log.level=debug` enabled).
-  WARNING: The log message will include any 'password' options passed to plugin configs as plaintext, and may result
-  in plaintext passwords appearing in your logs!
-
-*`-i, --interactive SHELL`*::
-  Drop to shell instead of running as normal. Valid shells are "irb" and "pry".
-
-*`-V, --version`*::
-  Emit the version of Logstash and its friends, then exit.
-
-*`-t, --config.test_and_exit`*::
-  Check configuration for valid syntax and then exit. Note that grok patterns are not checked for
-  correctness with this flag. Logstash can read multiple config files from a directory. If you combine this
-  flag with `--log.level=debug`, Logstash will log the combined config file, annotating
-  each config block with the source file it came from.
-
-*`-r, --config.reload.automatic`*::
-  Monitor configuration changes and reload whenever the configuration is changed.
-  NOTE: Use SIGHUP to manually reload the config. The default is false.
-
-*`--config.reload.interval RELOAD_INTERVAL`*::
-  How frequently to poll the configuration location for changes. The default value is "3s".
-
-*`--http.host HTTP_HOST`*::
-  Web API binding host. This option specifies the bind address for the metrics REST endpoint. The default is "127.0.0.1".
-
-*`--http.port HTTP_PORT`*::
-  Web API http port. This option specifies the bind port for the metrics REST endpoint. The default is 9600-9700.
-  This setting accepts a range of the format 9600-9700. Logstash will pick up the first available port.
-
-*`--log.format FORMAT`*::
-   Specify if Logstash should write its own logs in JSON form (one event per line) or in plain text
-   (using Ruby's Object#inspect). The default is "plain".
-
-*`--path.settings SETTINGS_DIR`*::
-  Set the directory containing the `logstash.yml` <<logstash-settings-file,settings file>> as well
-  as the log4j logging configuration. This can also be set through the LS_SETTINGS_DIR environment variable.
-  The default is the `config` directory under Logstash home.
-
-*`-h, --help`*::
-  Print help
-
diff --git a/docs/static/running-logstash.asciidoc b/docs/static/running-logstash.asciidoc
deleted file mode 100644
index a7a1e70d8..000000000
--- a/docs/static/running-logstash.asciidoc
+++ /dev/null
@@ -1,53 +0,0 @@
-[[running-logstash]]
-=== Running Logstash as a Service on Debian or RPM
-
-Logstash is not started automatically after installation. How to start and stop Logstash depends on whether your system
-uses systemd, upstart, or SysV.
-
-Here are some common operating systems and versions, and the corresponding
-startup styles they use.  This list is intended to be informative, not exhaustive.
-
-|=======================================================================
-| Distribution | Service System |
-| Ubuntu 16.04 and newer | <<running-logstash-systemd,systemd>> |
-| Ubuntu 12.04 through 15.10 | <<running-logstash-upstart,upstart>> |
-| Debian 8 "jessie" and newer | <<running-logstash-systemd,systemd>> |
-| Debian 7 "wheezy" and older | <<running-logstash-sysv,sysv>> |
-| CentOS (and RHEL) 7 and newer | <<running-logstash-systemd,systemd>> |
-| CentOS (and RHEL) 6 | <<running-logstash-upstart,upstart>> |
-|=======================================================================
-
-[[running-logstash-systemd]]
-==== Running Logstash by Using Systemd
-
-Distributions like Debian Jessie, Ubuntu 15.10+, and many of the SUSE derivatives use systemd and the
-`systemctl` command to start and stop services. Logstash places the systemd unit files in `/etc/systemd/system` for both deb and rpm. After installing the package, you can start up Logstash with:
-
-[source,sh]
---------------------------------------------
-sudo systemctl start logstash.service
--------------------------------------------
-
-[[running-logstash-upstart]]
-==== Running Logstash by Using Upstart
-
-For systems that use upstart, you can start Logstash with:
-
-[source,sh]
---------------------------------------------
-sudo initctl start logstash
--------------------------------------------
-
-The auto-generated configuration file for upstart systems is `/etc/init/logstash.conf`.
-
-[[running-logstash-sysv]]
-==== Running Logstash by Using SysV
-
-For systems that use SysV, you can start Logstash with:
-
-[source,sh]
---------------------------------------------
-sudo /etc/init.d/logstash start
--------------------------------------------
-
-The auto-generated configuration file for SysV systems is `/etc/init.d/logstash`.
diff --git a/docs/static/security/logstash.asciidoc b/docs/static/security/logstash.asciidoc
deleted file mode 100644
index d1376cc31..000000000
--- a/docs/static/security/logstash.asciidoc
+++ /dev/null
@@ -1,255 +0,0 @@
-[role="xpack"]
-[[ls-security]]
-=== Configuring Security in Logstash
-++++
-<titleabbrev>{security}</titleabbrev>
-++++
-
-The Logstash {es} plugins (
-{logstash-ref}/plugins-outputs-elasticsearch.html[output],
-{logstash-ref}/plugins-inputs-elasticsearch.html[input],
-{logstash-ref}/plugins-filters-elasticsearch.html[filter]
-and {logstash-ref}/monitoring-logstash.html[monitoring])
-support authentication and encryption over HTTP.
-
-To use Logstash with a secured cluster, you need to configure authentication
-credentials for Logstash. Logstash throws an exception and the processing
-pipeline is halted if authentication fails.
-
-If encryption is enabled on the cluster, you also need to enable TLS/SSL in the
-Logstash configuration.
-
-If you want to monitor your Logstash instance with {monitoring}, and store the
-monitoring data in a secured {es} cluster, you must configure Logstash
-with a username and password for a user with the appropriate permissions.
-
-In addition to configuring authentication credentials for Logstash, you need
-to grant authorized users permission to access the Logstash indices.
-
-[float]
-[[ls-http-auth-basic]]
-==== Configuring Logstash to use Basic Authentication
-
-Logstash needs to be able to manage index templates, create indices,
-and write and delete documents in the indices it creates.
-
-To set up authentication credentials for Logstash:
-
-. Create a `logstash_writer` role that has the `manage_index_templates` and
-`monitor` cluster privileges, and the `write`, `delete`, and `create_index`
-privileges  for the Logstash indices. You can create roles from the **Management >
-Roles** UI in {kib} or through the `role` API:
-+
-[source, sh]
----------------------------------------------------------------
-POST _xpack/security/role/logstash_writer
-{
-  "cluster": ["manage_index_templates", "monitor"],
-  "indices": [
-    {
-      "names": [ "logstash-*" ], <1>
-      "privileges": ["write","delete","create_index"]
-    }
-  ]
-}
----------------------------------------------------------------
-
-<1> If you use a custom Logstash index pattern, specify that pattern
-instead of the default `logstash-*` pattern.
-
-. Create a `logstash_internal` user and assign it the `logstash_writer` role.
-You can create users from the **Management > Users** UI in {kib} or through
-the `user` API:
-+
-[source, sh]
----------------------------------------------------------------
-POST _xpack/security/user/logstash_internal
-{
-  "password" : "x-pack-test-password",
-  "roles" : [ "logstash_writer"],
-  "full_name" : "Internal Logstash User"
-}
----------------------------------------------------------------
-
-. Configure Logstash to authenticate as the `logstash_internal` user you just
-created. You configure credentials separately for each of the {es} plugins in
-your Logstash `.conf` file. For example:
-+
-[source,js]
---------------------------------------------------
-input {
-  elasticsearch {
-    ...
-    user => logstash_internal
-    password => x-pack-test-password
-  }
-}
-filter {
-  elasticsearch {
-    ...
-    user => logstash_internal
-    password => x-pack-test-password
-  }
-}
-output {
-  elasticsearch {
-    ...
-    user => logstash_internal
-    password => x-pack-test-password
-  }
-}
---------------------------------------------------
-
-[float]
-[[ls-user-access]]
-==== Granting Users Access to the Logstash Indices
-
-To access the indices Logstash creates, users need the `read` and
-`view_index_metadata` privileges:
-
-. Create a `logstash_reader` role that has the `read` and `view_index_metadata`
-privileges  for the Logstash indices. You can create roles from the
-**Management > Roles** UI in {kib} or through the `role` API:
-+
-[source, sh]
----------------------------------------------------------------
-POST _xpack/security/role/logstash_reader
-{
-  "indices": [
-    {
-      "names": [ "logstash-*" ], <1>
-      "privileges": ["read","view_index_metadata"]
-    }
-  ]
-}
----------------------------------------------------------------
-
-<1> If you use a custom Logstash index pattern, specify that pattern
-instead of the default `logstash-*` pattern.
-
-. Assign your Logstash users the `logstash_reader` role. If the Logstash user
-will be using
-{logstash-ref}/logstash-centralized-pipeline-management.html[centralized pipeline management],
-also assign the `logstash_admin` role. You can create and manage users from the
-**Management > Users** UI in {kib} or through the `user` API:
-+
-[source, sh]
----------------------------------------------------------------
-POST _xpack/security/user/logstash_user
-{
-  "password" : "x-pack-test-password",
-  "roles" : [ "logstash_reader", "logstash_admin"], <1>
-  "full_name" : "Kibana User for Logstash"
-}
----------------------------------------------------------------
-
-<1> `logstash_admin` is a built-in role that provides access to `.logstash-*`
-indices for managing configurations.
-
-[float]
-[[ls-http-auth-pki]]
-==== Configuring the {es} Output to use PKI Authentication
-
-The `elasticsearch` output supports PKI authentication. To use an X.509
-client-certificate for authentication, you configure the `keystore` and
-`keystore_password` options in your Logstash `.conf` file:
-
-[source,js]
---------------------------------------------------
-output {
-  elasticsearch {
-    ...
-    keystore => /path/to/keystore.jks
-    keystore_password => realpassword
-    truststore =>  /path/to/truststore.jks <1>
-    truststore_password =>  realpassword
-  }
-}
---------------------------------------------------
-<1> If you use a separate truststore, the truststore path and password are
-also required.
-
-[float]
-[[ls-http-ssl]]
-==== Configuring Logstash to use TLS Encryption
-
-If TLS encryption is enabled on the {es} cluster, you need to
-configure the `ssl` and `cacert` options in your Logstash `.conf` file:
-
-[source,js]
---------------------------------------------------
-output {
-  elasticsearch {
-    ...
-    ssl => true
-    cacert => '/path/to/cert.pem' <1>
-  }
-}
---------------------------------------------------
-<1> The path to the local `.pem` file that contains the Certificate
-    Authority's certificate.
-
-[float]
-[[ls-monitoring-user]]
-==== Configuring Credentials for Logstash Monitoring
-
-If you plan to ship Logstash {logstash-ref}/monitoring-logstash.html[monitoring]
-data to a secure cluster, you need to configure the username and password that
-Logstash uses to authenticate for shipping monitoring data.
-
-{security} comes preconfigured with a
-{stack-ov}/built-in-users.html[`logstash_system` built-in user]
-for this purpose. This user has the minimum permissions necessary for the
-monitoring function, and _should not_ be used for any other purpose - it is
-specifically _not intended_ for use within a Logstash pipeline.
-
-By default, the `logstash_system` user does not have a password. The user will
-not be enabled until you set a password. Set the password through the change
-password API:
-
-[source,js]
----------------------------------------------------------------------
-PUT _xpack/security/user/logstash_system/_password
-{
-  "password": "t0p.s3cr3t"
-}
----------------------------------------------------------------------
-// CONSOLE
-
-Then configure the user and password in the `logstash.yml` configuration file:
-
-[source,yaml]
-----------------------------------------------------------
-xpack.monitoring.elasticsearch.username: logstash_system
-xpack.monitoring.elasticsearch.password: t0p.s3cr3t
-----------------------------------------------------------
-
-If you initially installed an older version of {xpack}, and then upgraded, the
-`logstash_system` user may have defaulted to `disabled` for security reasons.
-You can enable the user through the `user` API:
-
-[source,js]
----------------------------------------------------------------------
-PUT _xpack/security/user/logstash_system/_enable
----------------------------------------------------------------------
-// CONSOLE
-
-[float]
-[[ls-pipeline-management-user]]
-==== Configuring Credentials for Centralized Pipeline Management
-
-If you plan to use Logstash
-{logstash-ref}/logstash-centralized-pipeline-management.html[centralized pipeline management],
-you need to configure the username and password that Logstash uses for managing
-configurations.
-
-You configure the user and password in the `logstash.yml` configuration file:
-
-[source,yaml]
-----------------------------------------------------------
-xpack.management.elasticsearch.username: logstash_admin_user <1>
-xpack.management.elasticsearch.password: t0p.s3cr3t
-----------------------------------------------------------
-
-<1> The user you specify here must have the built-in `logstash_admin` role as
-well as the `logstash_writer` role that you created earlier.
diff --git a/docs/static/setting-up-logstash.asciidoc b/docs/static/setting-up-logstash.asciidoc
deleted file mode 100644
index b50b7649d..000000000
--- a/docs/static/setting-up-logstash.asciidoc
+++ /dev/null
@@ -1,200 +0,0 @@
-[[setup-logstash]]
-== Setting Up and Running Logstash
-
-Before reading this section, see <<installing-logstash>> for basic installation instructions to get you started.
-
-This section includes additional information on how to set up and run Logstash, including:
-
-* <<dir-layout>>
-* <<config-setting-files>>
-* <<logstash-settings-file>>
-* <<keystore>>
-* <<running-logstash-command-line>>
-* <<running-logstash>>
-* <<docker>>
-* <<docker-config>>
-* <<logging>>
-* <<shutdown>>
-
-
-[[dir-layout]]
-=== Logstash Directory Layout
-
-This section describes the default directory structure that is created when you unpack the Logstash installation packages.
-
-[[zip-targz-layout]]
-==== Directory Layout of `.zip` and `.tar.gz` Archives
-
-The `.zip` and `.tar.gz` packages are entirely self-contained. All files and
-directories are, by default, contained within the home directory -- the directory
-created when unpacking the archive.
-
-This is very convenient because you don't have to create any directories to start using Logstash, and uninstalling
-Logstash is as easy as removing the home directory.  However, it is advisable to change the default locations of the
-config and the logs directories so that you do not delete important data later on.
-
-[cols="<h,<,<m,<m",options="header",]
-|=======================================================================
-| Type | Description | Default Location | Setting
-| home
-  | Home directory of the Logstash installation.
-  | `{extract.path}`- Directory created by unpacking the archive
- d|
-
-| bin
-  | Binary scripts, including `logstash` to start Logstash
-    and `logstash-plugin` to install plugins
-  | `{extract.path}/bin`
- d|
-
-| settings
-  | Configuration files, including `logstash.yml` and `jvm.options`
-  | `{extract.path}/config`
-  | `path.settings`
-
-| logs
-  | Log files
-  | `{extract.path}/logs`
-  | `path.logs`
-
-| plugins
-  | Local, non Ruby-Gem plugin files. Each plugin is contained in a subdirectory. Recommended for development only.
-  | `{extract.path}/plugins`
-  | `path.plugins`
-
-| data
-  | Data files used by logstash and its plugins for any persistence needs.
-  | `{extract.path}/data`
-  | `path.data`
-
-|=======================================================================
-
-[[deb-layout]]
-==== Directory Layout of Debian and RPM Packages
-
-The Debian package and the RPM package each place config files, logs, and the settings files in the appropriate
-locations for the system:
-
-[cols="<h,<,<m,<m",options="header",]
-|=======================================================================
-| Type | Description | Default Location | Setting
-| home
-  | Home directory of the Logstash installation.
-  | `/usr/share/logstash`
- d|
-
-| bin
-  | Binary scripts including `logstash` to start Logstash
-    and `logstash-plugin` to install plugins
-  | `/usr/share/logstash/bin`
- d|
-
-| settings
-  | Configuration files, including `logstash.yml`, `jvm.options`, and `startup.options`
-  | `/etc/logstash`
-  | `path.settings`
-
-| conf
-  | Logstash pipeline configuration files
-  | `/etc/logstash/conf.d/*.conf`
-  | See `/etc/logstash/pipelines.yml`
-
-| logs
-  | Log files
-  | `/var/log/logstash`
-  | `path.logs`
-
-| plugins
-  | Local, non Ruby-Gem plugin files. Each plugin is contained in a subdirectory. Recommended for development only.
-  | `/usr/share/logstash/plugins`
-  | `path.plugins`
-
-| data
-  | Data files used by logstash and its plugins for any persistence needs.
-  | `/var/lib/logstash`
-  | `path.data`
-
-|=======================================================================
-
-[[docker-layout]]
-==== Directory Layout of Docker Images
-
-The Docker images are created from the `.tar.gz` packages, and follow a
-similar directory layout.
-
-[cols="<h,<,<m,<m",options="header",]
-|=======================================================================
-| Type | Description | Default Location | Setting
-| home
-  | Home directory of the Logstash installation.
-  | `/usr/share/logstash`
- d|
-
-| bin
-  | Binary scripts, including `logstash` to start Logstash
-    and `logstash-plugin` to install plugins
-  | `/usr/share/logstash/bin`
- d|
-
-| settings
-  | Configuration files, including `logstash.yml` and `jvm.options`
-  | `/usr/share/logstash/config`
-  | `path.settings`
-
-| conf
-  | Logstash pipeline configuration files
-  | `/usr/share/logstash/pipeline`
-  | `path.config`
-
-| plugins
-  | Local, non Ruby-Gem plugin files. Each plugin is contained in a subdirectory. Recommended for development only.
-  | `/usr/share/logstash/plugins`
-  | `path.plugins`
-
-| data
-  | Data files used by logstash and its plugins for any persistence needs.
-  | `/usr/share/logstash/data`
-  | `path.data`
-
-|=======================================================================
-
-NOTE: Logstash Docker containers do not create log files by default. They log
-to standard output.
-
-[[config-setting-files]]
-=== Logstash Configuration Files
-
-Logstash has two types of configuration files: _pipeline configuration files_, which define the Logstash processing
-pipeline, and _settings files_, which specify options that control Logstash startup and execution.
-
-==== Pipeline Configuration Files
-
-You create pipeline configuration files when you define the stages of your Logstash processing pipeline. On deb and
-rpm, you place the pipeline configuration files in the `/etc/logstash/conf.d` directory. Logstash tries to load only
-files with `.conf` extension in the `/etc/logstash/conf.d directory` and ignores all other files.
-
-See <<configuration>> for more info.
-
-==== Settings Files
-
-The settings files are already defined in the Logstash installation. Logstash includes the following settings files:
-
-*`logstash.yml`*::
-  Contains Logstash configuration flags. You can set flags in this file instead of passing the flags at the command
-  line. Any flags that you set at the command line override the corresponding settings in the `logstash.yml` file. See <<logstash-settings-file>> for more info.
-*`pipelines.yml`*::
-  Contains the framework and instructions for running multiple pipelines in a single Logstash instance. See <<multiple-pipelines>> for more info.
-*`jvm.options`*::
-  Contains JVM configuration flags. Use this file to set initial and maximum values for
-  total heap space. You can also use this file to set the locale for Logstash.
-  Specify each flag on a separate line. All other settings in this file are
-  considered expert settings.
-*`log4j2.properties`*:: Contains default settings for `log4j 2` library. See <<log4j2>> for more info.
-*`startup.options` (Linux)*::
-  Contains options used by the `system-install` script in `/usr/share/logstash/bin` to build the appropriate startup
-  script for your system. When you install the Logstash package, the `system-install` script executes at the end of the
-  installation process and uses the settings specified in `startup.options` to set options such as the user, group,
-  service name, and service description. By default, Logstash services are installed under the user `logstash`. The `startup.options` file makes it easier for you to install multiple instances of the Logstash service. You can copy
-  the file and change the values for specific settings. Note that the `startup.options` file is not read at startup. If
-  you want to change the Logstash startup script (for example, to change the Logstash user or read from a different
-  configuration path), you must re-run the `system-install` script (as root) to pass in the new settings.
diff --git a/docs/static/settings-file.asciidoc b/docs/static/settings-file.asciidoc
deleted file mode 100644
index 306f23e04..000000000
--- a/docs/static/settings-file.asciidoc
+++ /dev/null
@@ -1,239 +0,0 @@
-[[logstash-settings-file]]
-=== logstash.yml
-
-You can set options in the Logstash settings file, `logstash.yml`, to control Logstash execution. For example,
-you can specify pipeline settings, the location of configuration files, logging options, and other settings.
-Most of the settings in the `logstash.yml` file are also available as <<command-line-flags,command-line flags>>
-when you run Logstash. Any flags that you set at the command line override the corresponding settings in the
-`logstash.yml` file.
-
-The `logstash.yml` file is written in http://yaml.org/[YAML]. Its location varies by platform (see
-<<dir-layout>>). You can specify settings in hierarchical form or use flat keys. For example, to use
-hierarchical form to set the pipeline batch size and batch delay, you specify:
-
-[source,yaml]
--------------------------------------------------------------------------------------
-pipeline:
-  batch:
-    size: 125
-    delay: 50
--------------------------------------------------------------------------------------
-
-To express the same values as flat keys, you specify:
-
-[source,yaml]
--------------------------------------------------------------------------------------
-pipeline.batch.size: 125
-pipeline.batch.delay: 50
--------------------------------------------------------------------------------------
-
-The `logstash.yml` file also supports bash-style interpolation of environment variables in
-setting values.
-
-[source,yaml]
--------------------------------------------------------------------------------------
-pipeline:
-  batch:
-    size: ${BATCH_SIZE}
-    delay: ${BATCH_DELAY:50}
-node:
-  name: "node_${LS_NODE_NAME}"
-path:
-   queue: "/tmp/${QUEUE_DIR:queue}"
--------------------------------------------------------------------------------------
-
-Note that the `${VAR_NAME:default_value}` notation is supported, setting a default batch delay
-of `50` and a default `path.queue` of `/tmp/queue` in the above example.
-
-Modules may also be specified in the `logstash.yml` file. The modules definition will have
-this format:
-
-[source,yaml]
--------------------------------------------------------------------------------------
-modules:
-  - name: MODULE_NAME1
-    var.PLUGIN_TYPE1.PLUGIN_NAME1.KEY1: VALUE
-    var.PLUGIN_TYPE1.PLUGIN_NAME1.KEY2: VALUE
-    var.PLUGIN_TYPE2.PLUGIN_NAME2.KEY1: VALUE
-    var.PLUGIN_TYPE3.PLUGIN_NAME3.KEY1: VALUE
-  - name: MODULE_NAME2
-    var.PLUGIN_TYPE1.PLUGIN_NAME1.KEY1: VALUE
-    var.PLUGIN_TYPE1.PLUGIN_NAME1.KEY2: VALUE
--------------------------------------------------------------------------------------
-
-IMPORTANT: If the <<command-line-flags,command-line flag>> `--modules` is used, any modules defined in the `logstash.yml` file will be ignored.
-
-The `logstash.yml` file includes the following settings. If you are using X-Pack, also see {logstash-ref}/settings-xpack.html[X-Pack Settings in Logstash].
-
-[options="header"]
-|=======================================================================
-| Setting | Description | Default value
-
-| `node.name`
-| A descriptive name for the node.
-| Machine's hostname
-
-| `path.data`
-| The directory that Logstash and its plugins use for any persistent needs.
-|`LOGSTASH_HOME/data`
-
-| `pipeline.id`
-| The ID of the pipeline.
-| `main`
-
-| `pipeline.java_execution`
-| Use the Java execution engine.
-| false
-
-| `pipeline.workers`
-| The number of workers that will, in parallel, execute the filter and output stages of the pipeline.
-  If you find that events are backing up, or that the
-  CPU is not saturated, consider increasing this number to better utilize machine processing power.
-| Number of the host's CPU cores
-
-| `pipeline.batch.size`
-| The maximum number of events an individual worker thread will collect from inputs
-  before attempting to execute its filters and outputs.
-  Larger batch sizes are generally more efficient, but come at the cost of increased memory
-  overhead. You may need to increase JVM heap space in the `jvm.options` config file.
-  See <<config-setting-files>> for more info.
-| `125`
-
-| `pipeline.batch.delay`
-| When creating pipeline event batches, how long in milliseconds to wait for
-  each event before dispatching an undersized batch to pipeline workers.
-| `50`
-
-| `pipeline.unsafe_shutdown`
-| When set to `true`, forces Logstash to exit during shutdown even if there are still inflight events
-  in memory. By default, Logstash will refuse to quit until all received events
-  have been pushed to the outputs. Enabling this option can lead to data loss during shutdown.
-| `false`
-
-| `path.config`
-| The path to the Logstash config for the main pipeline. If you specify a directory or wildcard,
-  config files are read from the directory in alphabetical order.
-| Platform-specific. See <<dir-layout>>.
-
-| `config.string`
-| A string that contains the pipeline configuration to use for the main pipeline. Use the same syntax as
-  the config file.
-| None
-
-| `config.test_and_exit`
-| When set to `true`, checks that the configuration is valid and then exits. Note that grok patterns are not checked for
-  correctness with this setting. Logstash can read multiple config files from a directory. If you combine this
-  setting with `log.level: debug`, Logstash will log the combined config file, annotating
-  each config block with the source file it came from.
-| `false`
-
-| `config.reload.automatic`
-| When set to `true`, periodically checks if the configuration has changed and reloads the configuration whenever it is changed.
-  This can also be triggered manually through the SIGHUP signal.
-| `false`
-
-| `config.reload.interval`
-| How often in seconds Logstash checks the config files for changes.
-| `3s`
-
-| `config.debug`
-| When set to `true`, shows the fully compiled configuration as a debug log message. You must also set `log.level: debug`.
-  WARNING: The log message will include any 'password' options passed to plugin configs as plaintext, and may result
-  in plaintext passwords appearing in your logs!
-| `false`
-
-| `config.support_escapes`
-| When set to `true`, quoted strings will process the following escape sequences: `\n` becomes a literal newline (ASCII 10). `\r` becomes a literal carriage return (ASCII 13). `\t` becomes a literal tab (ASCII 9). `\\` becomes a literal backslash `\`. `\"` becomes a literal double quotation mark. `\'` becomes a literal quotation mark.
-| `false`
-
-| `modules`
-| When configured, `modules` must be in the nested YAML structure described above this table.
-| None
-
-| `queue.type`
-| The internal queuing model to use for event buffering. Specify `memory` for legacy in-memory based queuing, or `persisted` for disk-based ACKed queueing (<<persistent-queues,persistent queues>>).
-| `memory`
-
-| `path.queue`
-| The directory path where the data files will be stored when persistent queues are enabled (`queue.type: persisted`).
-| `path.data/queue`
-
-| `queue.page_capacity`
-| The size of the page data files used when persistent queues are enabled (`queue.type: persisted`). The queue data consists of append-only data files separated into pages.
-| 64mb
-
-| `queue.max_events`
-| The maximum number of unread events in the queue when persistent queues are enabled (`queue.type: persisted`).
-| 0 (unlimited)
-
-| `queue.max_bytes`
-| The total capacity of the queue in number of bytes. Make sure the capacity of your disk drive is greater than the value you specify here. If both `queue.max_events` and `queue.max_bytes` are specified, Logstash uses whichever criteria is reached first.
-| 1024mb (1g)
-
-| `queue.checkpoint.acks`
-| The maximum number of ACKed events before forcing a checkpoint when persistent queues are enabled (`queue.type: persisted`). Specify `queue.checkpoint.acks: 0` to set this value to unlimited.
-|1024
-
-| `queue.checkpoint.writes`
-| The maximum number of written events before forcing a checkpoint when persistent queues are enabled (`queue.type: persisted`). Specify `queue.checkpoint.writes: 0` to set this value to unlimited.
-| 1024
-
-| `queue.checkpoint.retry`
-| When enabled, Logstash will retry once per attempted checkpoint write for any checkpoint writes that fail. Any subsequent errors are not retried. This is a workaround for failed checkpoint writes that have been seen only on filesystems with non-standard behavior such as SANs and is not recommended except in those specific circumstances.
-| `false`
-
-| `queue.drain`
-| When enabled, Logstash waits until the persistent queue is drained before shutting down.
-| `false`
-
-| `dead_letter_queue.enable`
-| Flag to instruct Logstash to enable the DLQ feature supported by plugins.
-| `false`
-
-| `dead_letter_queue.max_bytes`
-| The maximum size of each dead letter queue. Entries will be dropped if they
-  would increase the size of the dead letter queue beyond this setting.
-| `1024mb`
-
-| `path.dead_letter_queue`
-| The directory path where the data files will be stored for the dead-letter queue.
-| `path.data/dead_letter_queue`
-
-| `http.host`
-| The bind address for the metrics REST endpoint.
-| `"127.0.0.1"`
-
-| `http.port`
-| The bind port for the metrics REST endpoint.
-| `9600`
-
-| `log.level`
-a|
-The log level. Valid options are:
-
-* `fatal`
-* `error`
-* `warn`
-* `info`
-* `debug`
-* `trace`
-
-| `info`
-
-| `log.format`
-| The log format. Set to `json` to log in JSON format, or `plain` to use `Object#.inspect`.
-| `plain`
-
-| `path.logs`
-| The directory where Logstash will write its log to.
-| `LOGSTASH_HOME/logs`
-
-| `path.plugins`
-| Where to find custom plugins. You can specify this setting multiple times to include
-  multiple paths. Plugins are expected to be in a specific directory hierarchy:
-  `PATH/logstash/TYPE/NAME.rb` where `TYPE` is `inputs`, `filters`, `outputs`, or `codecs`,
-  and `NAME` is the name of the plugin.
-| Platform-specific. See <<dir-layout>>.
-
-|=======================================================================
-
diff --git a/docs/static/settings/configuration-management-settings.asciidoc b/docs/static/settings/configuration-management-settings.asciidoc
deleted file mode 100644
index 14c1db3b0..000000000
--- a/docs/static/settings/configuration-management-settings.asciidoc
+++ /dev/null
@@ -1,80 +0,0 @@
-[role="xpack"]
-[[configuration-management-settings]]
-==== Configuration Management Settings in Logstash
-++++
-<titleabbrev>Configuration Management Settings</titleabbrev>
-++++
-
-You can set the following `xpack.management` settings in `logstash.yml` to
-enable
-<<logstash-centralized-pipeline-management,centralized pipeline management>>.
-For more information about configuring Logstash, see <<logstash-settings-file>>.
-
-The following example shows basic settings that assume {es} and {kib} are
-installed on the localhost with basic AUTH enabled, but no SSL. If you're using
-SSL, you need to specify additional SSL settings.
-
-[source,shell]
------
-xpack.management.enabled: true
-xpack.management.elasticsearch.hosts: "http://localhost:9200/"
-xpack.management.elasticsearch.username: logstash_admin_user
-xpack.management.elasticsearch.password: t0p.s3cr3t
-xpack.management.logstash.poll_interval: 5s
-xpack.management.pipeline.id: ["apache", "cloudwatch_logs"]
------
-
-
-`xpack.management.enabled`::
-
-Set to `true` to enable {xpack} centralized configuration management for
-Logstash.
-
-`xpack.management.logstash.poll_interval`::
-
-How often the Logstash instance polls for pipeline changes from Elasticsearch.
-The default is 5s.
-
-`xpack.management.pipeline.id`::
-
-Specify a comma-separated list of pipeline IDs to register for centralized
-pipeline management. After changing this setting, you need to restart Logstash
-to pick up changes.
-
-`xpack.management.elasticsearch.hosts`::
-
-The {es} instance that will store the Logstash pipeline configurations and
-metadata. This might be the same {es} instance specified in the `outputs`
-section in your Logstash configuration, or a different one. Defaults to
-`http://localhost:9200`.
-
-`xpack.management.elasticsearch.username` and `xpack.management.elasticsearch.password`::
-
-If your {es} cluster is protected with basic authentication, these settings
-provide the username and password that the Logstash instance uses to
-authenticate for accessing the configuration data. The username you specify here
-should have the `logstash_admin` role, which provides access to `.logstash-*`
-indices for managing configurations. 
-
-`xpack.management.elasticsearch.ssl.certificate_authority`::
-
-Optional setting that enables you to specify a path to the `.pem` file for the
-certificate authority for your {es} instance.
-
-`xpack.management.elasticsearch.ssl.truststore.path`::
-
-Optional setting that provides the path to the Java keystore (JKS) to validate
-the server’s certificate.
-
-`xpack.management.elasticsearch.ssl.truststore.password`::
-
-Optional setting that provides the password to the truststore.
-
-`xpack.management.elasticsearch.ssl.keystore.path`::
-
-Optional setting that provides the path to the Java keystore (JKS) to validate
-the client’s certificate.
-
-`xpack.management.elasticsearch.ssl.keystore.password`::
-
-Optional setting that provides the password to the keystore.
diff --git a/docs/static/settings/monitoring-settings.asciidoc b/docs/static/settings/monitoring-settings.asciidoc
deleted file mode 100644
index ecf579353..000000000
--- a/docs/static/settings/monitoring-settings.asciidoc
+++ /dev/null
@@ -1,77 +0,0 @@
-[role="xpack"]
-[[monitoring-settings]]
-==== Monitoring Settings in Logstash
-++++
-<titleabbrev>Monitoring Settings</titleabbrev>
-++++
-
-You can set the following `xpack.monitoring` settings in `logstash.yml` to
-control how monitoring data is collected from your Logstash nodes. However, the
-defaults work best in most circumstances. For more information about configuring
-Logstash, see <<logstash-settings-file>>.
-
-[float]
-[[monitoring-general-settings]]
-===== General Monitoring Settings
-
-`xpack.monitoring.enabled`::
-
-Monitoring is disabled by default. Set to `true` to enable {xpack} monitoring.
-
-`xpack.monitoring.elasticsearch.hosts`::
-
-The {es} instances that you want to ship your Logstash metrics to. This might be
-the same {es} instance specified in the `outputs` section in your Logstash
-configuration, or a different one. This is *not* the URL of your dedicated
-monitoring cluster. Even if you are using a dedicated monitoring cluster, the
-Logstash metrics must be routed through your production cluster. You can specify
-a single host as a string, or specify multiple hosts as an array. Defaults to
-`http://localhost:9200`.
-
-`xpack.monitoring.elasticsearch.username` and `xpack.monitoring.elasticsearch.password`::
-
-If your {es} is protected with basic authentication, these settings provide the
-username and password that the Logstash instance uses to authenticate for
-shipping monitoring data.
-
-
-[float]
-[[monitoring-collection-settings]]
-==== Monitoring Collection Settings
-
-`xpack.monitoring.collection.interval`::
-
-Controls how often data samples are collected and shipped on the Logstash side.
-Defaults to `10s`. If you modify the collection interval, set the 
-`xpack.monitoring.min_interval_seconds` option in `kibana.yml` to the same value.
-
-[float]
-[[monitoring-ssl-settings]]
-===== {monitoring} TLS/SSL Settings
-
-You can configure the following Transport Layer Security (TLS) or
-Secure Sockets Layer (SSL) settings. For more information, see 
-<<ls-monitoring-user>>.
-
-`xpack.monitoring.elasticsearch.ssl.certificate_authority`::
-
-Optional setting that enables you to specify a path to the `.pem` file for the
-certificate authority for your {es} instance.
-
-`xpack.monitoring.elasticsearch.ssl.truststore.path`::
-
-Optional settings that provide the paths to the Java keystore (JKS) to validate
-the server’s certificate.
-
-`xpack.monitoring.elasticsearch.ssl.truststore.password`::
-
-Optional settings that provide the password to the truststore.
-
-`xpack.monitoring.elasticsearch.ssl.keystore.path`::
-
-Optional settings that provide the paths to the Java keystore (JKS) to validate
-the client’s certificate.
-
-`xpack.monitoring.elasticsearch.ssl.keystore.password`::
-
-Optional settings that provide the password to the keystore.
diff --git a/docs/static/setup/configuring-xls.asciidoc b/docs/static/setup/configuring-xls.asciidoc
deleted file mode 100644
index 9017c24d7..000000000
--- a/docs/static/setup/configuring-xls.asciidoc
+++ /dev/null
@@ -1,10 +0,0 @@
-[role="xpack"]
-[[settings-xpack]]
-=== {xpack} Settings in Logstash
-++++
-<titleabbrev>{xpack} Settings</titleabbrev>
-++++
-
-include::{asciidoc-dir}/../../shared/settings.asciidoc[]
-
-For more Logstash configuration settings, see <<logstash-settings-file>>.
diff --git a/docs/static/setup/images/LogstashFlow.jpg b/docs/static/setup/images/LogstashFlow.jpg
deleted file mode 100644
index b5cca7256..000000000
Binary files a/docs/static/setup/images/LogstashFlow.jpg and /dev/null differ
diff --git a/docs/static/setup/setting-up-xpack.asciidoc b/docs/static/setup/setting-up-xpack.asciidoc
deleted file mode 100644
index 29e3ac233..000000000
--- a/docs/static/setup/setting-up-xpack.asciidoc
+++ /dev/null
@@ -1,12 +0,0 @@
-[role="xpack"]
-[[setup-xpack]]
-=== Setting Up X-Pack
-
-{xpack} is an Elastic Stack extension that provides security, alerting,
-monitoring, machine learning, pipeline management, and many other capabilities. 
-By default, when you install Logstash, {xpack} is installed. 
-
-If you want to try all of the {xpack} features, you can 
-{xpack-ref}/license-management.html[start a 30-day trial]. At the end of the 
-trial period, you can purchase a subscription to keep using the full 
-functionality of the {xpack} components. For more information, see https://www.elastic.co/subscriptions.
diff --git a/docs/static/shared-module-options.asciidoc b/docs/static/shared-module-options.asciidoc
deleted file mode 100644
index 3e9b2eb12..000000000
--- a/docs/static/shared-module-options.asciidoc
+++ /dev/null
@@ -1,181 +0,0 @@
-*Common options*
-
-The following configuration options are supported by all modules:
-
-*`var.elasticsearch.hosts`*::
-+
---
-* Value type is <<uri,uri>>
-* Default value is "localhost:9200"
---
-+
-Sets the host(s) of the Elasticsearch cluster. For each host, you must specify
-the hostname and port. For example, "myhost:9200". If given an <<array,array>>,
-Logstash will load balance requests across the hosts specified in the hosts
-parameter. It is important to exclude {ref}/modules-node.html[dedicated master
-nodes] from the hosts list to prevent Logstash from sending bulk requests to the
-master nodes. So this parameter should only reference either data or client
-nodes in Elasticsearch.
-+
-Any special characters present in the URLs here MUST be URL escaped! This means #
-should be put in as %23 for instance.
-
-*`var.elasticsearch.username`*::
-+
---
-* Value type is <<string,string>>
-* Default value is "elastic"
---
-+
-The username to authenticate to a secure Elasticsearch cluster.
-
-*`var.elasticsearch.password`*::
-+
---
-* Value type is <<string,string>>
-* Default value is "changeme"
---
-+
-The password to authenticate to a secure Elasticsearch cluster.
-
-*`var.elasticsearch.ssl.enabled`*::
-+
---
-* Value type is <<boolean,boolean>>
-* There is no default value for this setting.
---
-+
-Enable SSL/TLS secured communication to the Elasticsearch cluster. Leaving this
-unspecified will use whatever scheme is specified in the URLs listed in `hosts`.
-If no explicit protocol is specified, plain HTTP will be used. If SSL is
-explicitly disabled here, the plugin will refuse to start if an HTTPS URL is
-given in hosts.
-
-*`var.elasticsearch.ssl.verification_mode`*::
-+
---
-* Value type is <<string,string>>
-* Default value is "strict"
---
-+
-The hostname verification setting when communicating with Elasticsearch. Set to
-`disable` to turn off hostname verification. Disabling this has serious security
-concerns.
-
-*`var.elasticsearch.ssl.certificate_authority`*::
-+
---
-* Value type is <<string,string>>
-* There is no default value for this setting
---
-+
-The path to an X.509 certificate to use to validate SSL certificates when
-communicating with Elasticsearch.
-
-*`var.elasticsearch.ssl.certificate`*::
-+
---
-* Value type is <<string,string>>
-* There is no default value for this setting
---
-+
-The path to an X.509 certificate to use for client authentication when
-communicating with Elasticsearch.
-
-*`var.elasticsearch.ssl.key`*::
-+
---
-* Value type is <<string,string>>
-* There is no default value for this setting
---
-+
-The path to the certificate key for client authentication when communicating
-with Elasticsearch.
-
-*`var.kibana.host`*::
-+
---
-* Value type is <<string,string>>
-* Default value is "localhost:5601"
---
-+
-Sets the hostname and port of the Kibana instance to use for importing
-dashboards and visualizations. For example: "myhost:5601".
-
-*`var.kibana.scheme`*::
-+
---
-* Value type is <<string,string>>
-* Default value is "http"
---
-+
-Sets the protocol to use for reaching the Kibana instance. The options are:
-"http" or "https". The default is "http". 
-
-*`var.kibana.username`*::
-+
---
-* Value type is <<string,string>>
-* Default value is "elastic"
---
-+
-The username to authenticate to a secured Kibana instance.
-
-*`var.kibana.password`*::
-+
---
-* Value type is <<string,string>>
-* Default value is "changeme"
---
-+
-The password to authenticate to a secure Kibana instance.
-
-*`var.kibana.ssl.enabled`*::
-+
---
-* Value type is <<boolean,boolean>>
-* Default value is false
---
-+
-Enable SSL/TLS secured communication to the Kibana instance.
-
-*`var.kibana.ssl.verification_mode`*::
-+
---
-* Value type is <<string,string>>
-* Default value is "strict"
---
-+
-The hostname verification setting when communicating with Kibana. Set to
-`disable` to turn off hostname verification. Disabling this has serious security
-concerns.
-
-*`var.kibana.ssl.certificate_authority`*::
-+
---
-* Value type is <<string,string>>
-* There is no default value for this setting
---
-+
-The path to an X.509 certificate to use to validate SSL certificates when
-communicating with Kibana.
-
-*`var.kibana.ssl.certificate`*::
-+
---
-* Value type is <<string,string>>
-* There is no default value for this setting
---
-+
-The path to an X.509 certificate to use for client authentication when
-communicating with Kibana.
-
-*`var.kibana.ssl.key`*::
-+
---
-* Value type is <<string,string>>
-* There is no default value for this setting
---
-+
-The path to the certificate key for client authentication when communicating
-with Kibana.
diff --git a/docs/static/shutdown.asciidoc b/docs/static/shutdown.asciidoc
deleted file mode 100644
index 6ac9d0207..000000000
--- a/docs/static/shutdown.asciidoc
+++ /dev/null
@@ -1,97 +0,0 @@
-[[shutdown]]
-=== Shutting Down Logstash
-
-If you're running {ls} as a service, use one of the following commands to stop it:
-
-* On systemd, use:
-+
-[source,shell]
-----
-systemctl stop logstash
-----
-
-* On upstart, use: 
-+
-[source,shell]
-----
-initctl stop logstash
-----
-
-* On sysv, use: 
-+
-[source,shell]
-----
-/etc/init.d/logstash stop
-----
-
-If you're running {ls} directly in the console on a POSIX system, you can stop 
-it by sending SIGTERM to the {ls} process. For example:
-
-[source,shell]
-----
-kill -TERM {logstash_pid}
-----
-
-Alternatively, enter *Ctrl-C* in the console.
-
-
-
-==== What Happens During a Controlled Shutdown?
-
-When you attempt to shut down a running Logstash instance, Logstash performs several steps before it can safely shut down. It must:
-
-* Stop all input, filter and output plugins
-* Process all in-flight events
-* Terminate the Logstash process
-
-The following conditions affect the shutdown process:
-
-* An input plugin receiving data at a slow pace.
-* A slow filter, like a Ruby filter executing `sleep(10000)` or an Elasticsearch filter that is executing a very heavy
-query.
-* A disconnected output plugin that is waiting to reconnect to flush in-flight events.
-
-These situations make the duration and success of the shutdown process unpredictable.
-
-Logstash has a stall detection mechanism that analyzes the behavior of the pipeline and plugins during shutdown.
-This mechanism produces periodic information about the count of inflight events in internal queues and a list of busy
-worker threads.
-
-To enable Logstash to forcibly terminate in the case of a stalled shutdown, use the `--pipeline.unsafe_shutdown` flag when
-you start Logstash.
-
-WARNING: Unsafe shutdowns, force-kills of the Logstash process, or crashes of the Logstash process for any other reason may result in data loss (unless you've
-enabled Logstash to use <<persistent-queues,persistent queues>>). Shut down
-Logstash safely whenever possible.
-
-[[shutdown-stall-example]]
-==== Stall Detection Example
-
-In this example, slow filter execution prevents the pipeline from performing a clean shutdown. Because Logstash is
-started with the `--pipeline.unsafe_shutdown` flag, the shutdown results in the loss of 20 events.
-
-========
-[source,shell]
-bin/logstash -e 'input { generator { } } filter { ruby { code => "sleep 10000" } } 
-  output { stdout { codec => dots } }' -w 1 --pipeline.unsafe_shutdown
-Pipeline main started
-^CSIGINT received. Shutting down the agent. {:level=>:warn}
-stopping pipeline {:id=>"main", :level=>:warn}
-Received shutdown signal, but pipeline is still waiting for in-flight events
-to be processed. Sending another ^C will force quit Logstash, but this may cause
-data loss. {:level=>:warn}
-{"inflight_count"=>125, "stalling_thread_info"=>{["LogStash::Filters::Ruby", 
-{"code"=>"sleep 10000"}]=>[{"thread_id"=>19, "name"=>"[main]>worker0", 
-"current_call"=>"(ruby filter code):1:in `sleep'"}]}} {:level=>:warn}
-The shutdown process appears to be stalled due to busy or blocked plugins. 
-Check the logs for more information. {:level=>:error}
-{"inflight_count"=>125, "stalling_thread_info"=>{["LogStash::Filters::Ruby", 
-{"code"=>"sleep 10000"}]=>[{"thread_id"=>19, "name"=>"[main]>worker0", 
-"current_call"=>"(ruby filter code):1:in `sleep'"}]}} {:level=>:warn}
-{"inflight_count"=>125, "stalling_thread_info"=>{["LogStash::Filters::Ruby", 
-{"code"=>"sleep 10000"}]=>[{"thread_id"=>19, "name"=>"[main]>worker0", 
-"current_call"=>"(ruby filter code):1:in `sleep'"}]}} {:level=>:warn}
-Forcefully quitting logstash.. {:level=>:fatal}
-========
-
-When `--pipeline.unsafe_shutdown` isn't enabled, Logstash continues to run and produce these reports periodically.
\ No newline at end of file
diff --git a/docs/static/spec/openapi/logstash-api.yaml b/docs/static/spec/openapi/logstash-api.yaml
new file mode 100644
index 000000000..1a7879960
--- /dev/null
+++ b/docs/static/spec/openapi/logstash-api.yaml
@@ -0,0 +1,2341 @@
+
+openapi: 3.1.0
+info:
+  title: Logstash APIs
+  description: |
+    When you run Logstash, it automatically captures runtime metrics that you can use to monitor the health and performance of your Logstash deployment.
+    The metrics collected by Logstash include:
+    
+    - Health report.
+    - Hot threads.
+    - Logstash node info, like pipeline settings, OS info, and JVM info.
+    - Node stats, like JVM stats, process stats, event-related stats, and pipeline runtime stats.
+    - Plugins info, including a list of installed plugins.
+
+
+    The APIs that retrieve these metrics are available by default, with no extra configuration needed.
+
+    ## Documentation source and versions
+
+    This documentation is derived from the `main` branch of the [logstash](https://github.com/elastic/logstash) repository.
+    It is provided under license [Attribution-NonCommercial-NoDerivatives 4.0 International](https://creativecommons.org/licenses/by-nc-nd/4.0/).
+  version: '1.0'
+  x-doc-license:
+    name: Attribution-NonCommercial-NoDerivatives 4.0 International
+    url: https://creativecommons.org/licenses/by-nc-nd/4.0/
+  x-feedbackLink:
+    label: Feedback
+    url: https://github.com/elastic/docs-content/issues/new?assignees=&labels=feedback%2Ccommunity&projects=&template=api-feedback.yaml&title=%5BFeedback%5D%3A+
+servers:
+  - url: /
+security:
+  - {}           # Allows requests without authentication
+  - BasicAuth: [] # Allows requests with Basic Authentication
+tags:
+  - name: health
+    x-displayName: Health report
+    # description:
+    # externalDocs:
+    #   description:
+    #   url:
+  - name: hot threads
+    x-displayName: Hot threads
+    # description:
+    # externalDocs:
+    #   description:
+    #   url:
+  - name: node info
+    x-displayName: Node info
+    description: |
+      Logstash node info, like pipeline settings, OS info, and JVM info.
+    # externalDocs:
+    #   description:
+    #   url:
+  - name: node stats
+    x-displayName: Node stats
+    description: |
+      Node stats, like JVM stats, process stats, event-related stats, and pipeline runtime stats.
+    # externalDocs:
+    #   description:
+    #   url:
+  - name: plugin info
+    x-displayName: Plugins info
+    description: |
+      Plugin info, including a list of installed plugins.
+    # externalDocs:
+    #   description:
+    #   url:
+paths:
+  /_node/jvm:
+    get:
+      summary: Gets node-level JVM info
+      description: |
+        Show node-level JVM stats, such as the JVM process id, version, VM info, memory usage, and info about garbage collectors.
+      operationId: nodeInfoJVM
+      tags:
+        - node info
+      parameters:
+        - $ref: "#/components/parameters/pretty"
+      responses:
+        '200':
+          description: Indicates a successful call
+          content:
+            application/json:
+              schema:
+                allOf:
+#                  - $ref: '#/components/schemas/Common'
+#                  - $ref: '#/components/schemas/PipelineSettings'
+                  - type: object
+                    properties:
+                      jvm:
+                        type: object
+                        properties:
+                          pid:
+                            type: integer
+                          version:
+                            type: string
+                          vm_name:
+                            type: string
+                          vm_version:
+                            type: string
+                          vm_vendor:
+                            type: string
+                          start_time_in_millis:
+                            type: integer
+                          mem:
+                            type: object
+                            properties:
+                              heap_init_in_bytes:
+                                type: integer
+                              heap_max_in_bytes:
+                                type: integer
+                              non_heap_init_in_bytes:
+                                type: integer
+                              non_heap_max_in_bytes:
+                                type: integer
+                          gc_collectors:
+                            type: array
+                            items:
+                              type: string
+              example:
+                jvm:
+                  pid: 84013
+                  version: "21.0.4"
+                  vm_name: "OpenJDK 64-Bit Server VM"
+                  vm_version: "21.0.4"
+                  vm_vendor: "Eclipse Adoptium"
+                  start_time_in_millis: 1630980000000
+                  mem:
+                    heap_init_in_bytes: 1073741824
+                    heap_max_in_bytes: 1073741824
+                    non_heap_init_in_bytes: 2555904
+                    non_heap_max_in_bytes: 0
+                  gc_collectors:
+                    - "G1 Young Generation"
+                    - "G1 Concurrent GC"
+                    - "G1 Old Generation"
+
+  /_node/os:
+    get:
+      summary: Get node-level OS info
+      description: |
+        Get the operating system (OS) name, architecture, version, and available processors.
+      operationId: nodeInfoOS
+      tags:
+        - node info
+      parameters:
+        - $ref: "#/components/parameters/pretty"
+      responses:
+        '200':
+          description: Indicates a successful call
+          content:
+            application/json:
+              schema:
+                allOf:
+#                  - $ref: '#/components/schemas/Common'
+#                  - $ref: '#/components/schemas/PipelineSettings'
+                  - $ref: '#/components/schemas/OSStats'
+              example:
+                os:
+                  name: "Mac OS X"
+                  arch: "aarch64"
+                  version: "15.3.1"
+                  available_processors: 12
+
+  /_node/pipelines:
+    get:
+      summary: Get settings for pipelines
+      description: |
+        Get information and settings for all pipelines.
+      operationId: nodeInfoPipelines
+      tags:
+        - node info
+      parameters:
+        - $ref: "#/components/parameters/pretty"
+      responses:
+        '200':
+          description: Indicates a successful call
+          content:
+            application/json:
+              schema:
+                allOf:
+#                  - $ref: '#/components/schemas/Common'
+#                  - $ref: '#/components/schemas/PipelineSettings'
+                  - type: object
+                    properties:
+                      pipelines:
+                        type: object
+                        additionalProperties:
+                          $ref: '#/components/schemas/NodeInfoPipeline'
+              example:
+                pipelines:
+                  aggregation-pipeline:
+                    workers: 1
+                    batch_size: 125
+                    batch_delay: 50
+                    config_reload_automatic: false
+                    config_reload_interval: 3
+                    dead_letter_queue_enabled: false
+                  ingestion-pipeline:
+                    workers: 8
+                    batch_size: 125
+                    batch_delay: 5
+                    config_reload_automatic: false
+                    config_reload_interval: 3
+                    dead_letter_queue_enabled: false
+
+  /_node/pipelines/{pipeline_name}:
+    get:
+      summary: Get settings for a pipeline
+      description: Get information and settings for all pipelines.
+      operationId: nodeInfoPipeline
+      tags:
+        - node info
+      parameters:
+        - name: pipeline_name
+          in: path
+          required: true
+          schema:
+            type: string
+          description: The name of the pipeline to retrieve information for.
+        - $ref: "#/components/parameters/pretty"
+      responses:
+        '200':
+          description: Indicates a successful call
+          content:
+            application/json:
+              schema:
+                allOf:
+#                  - $ref: '#/components/schemas/Common'
+#                  - $ref: '#/components/schemas/PipelineSettings'
+                  - type: object
+                    properties:
+                      pipelines:
+                        type: object
+                        additionalProperties:
+                          $ref: '#/components/schemas/NodeInfoPipeline'
+              example:
+                pipelines:
+                  aggregation-pipeline:
+                    workers: 1
+                    batch_size: 125
+                    batch_delay: 50
+                    config_reload_automatic: false
+                    config_reload_interval: 3
+                    dead_letter_queue_enabled: false
+
+  /_node/plugins:
+    get:
+      summary: Get plugin info
+      description: >
+        Get information about all Logstash plugins that are currently installed.
+        This API returns the same output you get by running the `bin/logstash-plugin list --verbose` command.
+      operationId: nodePlugins
+      tags:
+        - plugin info
+      parameters:
+        - $ref: "#/components/parameters/pretty"
+      responses:
+        '200':
+          description: Indicates a successful call
+          content:
+            application/json:
+              schema:
+                allOf:
+#                  - $ref: '#/components/schemas/Common'
+#                  - $ref: '#/components/schemas/PipelineSettings'
+                  - type: object
+                    properties:
+                      total:
+                        type: integer
+                      plugins:
+                        type: array
+                        items:
+                          type: object
+                          properties:
+                            name:
+                              type: string
+                            version:
+                              type: string
+
+              examples:
+                nodePluginsExample1:
+                  value:
+                    total: 4
+                    plugins:
+                      - name: logstash-codec-cef
+                        version: 6.2.8
+                      - name: logstash-codec-collectd
+                        version: 3.0.3
+                      - name: logstash-codec-dots
+                        version: 3.0.2
+                      - name: logstash-coded-edn
+                        version: 3.0.2
+
+  /_node/stats:
+    get:
+      summary: Get node statistics
+      description: Get node statistics including information about the JVM, process, events, flow, and queue.
+      operationId: nodeStats
+      tags:
+        - node stats
+      parameters:
+        - $ref: "#/components/parameters/pretty"
+      responses:
+        "200":
+          description: A JSON object containing pipelines statistics.
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: "#/components/schemas/Common"
+                  - $ref: '#/components/schemas/PipelineSettings'
+                  - $ref: '#/components/schemas/JVMStats'
+                  - $ref: '#/components/schemas/ProcessStats'
+                  - $ref: '#/components/schemas/EventsStats'
+                  - $ref: '#/components/schemas/NodeStatsFlow'
+                  - $ref: "#/components/schemas/PipelinesStats"
+                  - $ref: '#/components/schemas/ReloadStats'
+                  - $ref: '#/components/schemas/OSStats'
+                  - $ref: '#/components/schemas/QueueStats'
+              example:
+                host: Mac
+                version: 9.1.0
+                http_address: 127.0.0.1:9600
+                id: 46e32c2e-b41f-45b7-84c1-1642457f3eba
+                name: Mac
+                ephemeral_id: 1752e2fe-7710-44d0-a2f8-a3005b6273c8
+                snapshot:
+                status: green
+                pipeline:
+                  workers: 12
+                  batch_size: 125
+                  batch_delay: 50
+                jvm:
+                  threads:
+                    count: 47
+                    peak_count: 47
+                  mem:
+                    heap_used_percent: 20
+                    heap_committed_in_bytes: 1073741824
+                    heap_max_in_bytes: 1073741822
+                    heap_used_in_bytes: 222298112
+                    non_heap_used_in_bytes: 170675352
+                    non_heap_committed_in_bytes: 176553984
+                    pools:
+                      survivor:
+                        max_in_bytes: -1
+                        peak_used_in_bytes: 42991616
+                        peak_max_in_bytes: -1
+                        committed_in_bytes: 26214400
+                        used_in_bytes: 26214400
+                      old:
+                        max_in_bytes: 1073741824
+                        peak_used_in_bytes: 96468992
+                        peak_max_in_bytes: 1073741824
+                        committed_in_bytes: 848297984
+                        used_in_bytes: 96468992
+                      young:
+                        max_in_bytes: -1
+                        peak_used_in_bytes: 329252864
+                        peak_max_in_bytes: -1
+                        committed_in_bytes: 199229440
+                        used_in_bytes: 99614720
+                  gc:
+                    collectors:
+                      old:
+                        collection_time_in_millis: 0
+                        collection_count: 0
+                      young:
+                        collection_time_in_millis: 49
+                        collection_count: 7
+                  uptime_in_millis: 14712
+                process:
+                  open_file_descriptors: 87
+                  peak_open_file_descriptors: 87
+                  max_file_descriptors: 10240
+                  mem:
+                    total_virtual_in_bytes: 425113862144
+                  cpu:
+                    total_in_millis: 20823
+                    percent: 0
+                    load_average:
+                      1m: 4.07177734375
+                events:
+                  in: 1
+                  filtered: 1
+                  out: 1
+                  duration_in_millis: 6
+                  queue_push_duration_in_millis: 0
+                flow:
+                  input_throughput:
+                    current: 0.0776
+                    lifetime: 0.0776
+                  filter_throughput:
+                    current: 0.07759
+                    lifetime: 0.07759
+                  output_throughput:
+                    current: 0.07759
+                    lifetime: 0.07759
+                  queue_backpressure:
+                    current: 0
+                    lifetime: 0
+                  worker_concurrency:
+                    current: 0.0004656
+                    lifetime: 0.0004656
+                pipelines:
+                  heartbeat-ruby-stdout:
+                    events:
+                      queue_push_duration_in_millis: 0
+                      filtered: 1
+                      out: 1
+                      duration_in_millis: 6
+                      in: 1
+                    flow:
+                      worker_concurrency:
+                        current: 0.0004779
+                        lifetime: 0.0004779
+                      filter_throughput:
+                        current: 0.07963
+                        lifetime: 0.07963
+                      worker_utilization:
+                        current: 0.003982
+                        lifetime: 0.003982
+                      queue_backpressure:
+                        current: 0
+                        lifetime: 0
+                      output_throughput:
+                        current: 0.07963
+                        lifetime: 0.07963
+                      input_throughput:
+                        current: 0.07962
+                        lifetime: 0.07962
+                    plugins:
+                      inputs:
+                        - id: c9ca46e359d73146590ca8af40092342afa922f3cbf07adc4b5009e346cb19f7
+                          flow:
+                            throughput:
+                              current: 0.07963
+                              lifetime: 0.07963
+                          name: heartbeat
+                          events:
+                            queue_push_duration_in_millis: 0
+                            out: 1
+                      codecs:
+                        - id: be3a3aba-ee75-4978-af58-d22b856d0e35
+                          name: rubydebug
+                        - id: plain_22e7b41b-756a-4b52-b03c-a30b31bb6266
+                          name: plain
+                          decode:
+                            out: 0
+                            duration_in_millis: 0
+                            writes_in: 0
+                          encode:
+                            duration_in_millis: 0
+                            writes_in: 0
+                      filters:
+                        - id: 585fa932a4fd506055ead07ee5ebcb3033c27c82ba90cbee73d6ac7e9357333a
+                          flow:
+                            worker_utilization:
+                              current: 0.0006636
+                              lifetime: 0.0006636
+                            worker_millis_per_event:
+                              current: 1
+                              lifetime: 1
+                          name: ruby
+                          events:
+                            out: 1
+                            in: 1
+                            duration_in_millis: 1
+                      outputs:
+                        - id: c4f801c8f170b4cb0679f704413773acd5f291929f42302d0a56361400c3741b
+                          flow:
+                            worker_utilization:
+                              current: 0.001991
+                              lifetime: 0.001991
+                            worker_millis_per_event:
+                              current: 3
+                              lifetime: 3
+                          name: stdout
+                          events:
+                            out: 1
+                            in: 1
+                            duration_in_millis: 3
+                    reloads:
+                      last_failure_timestamp:
+                      successes: 0
+                      last_success_timestamp:
+                      last_error:
+                      failures: 0
+                    queue:
+                      type: memory
+                      events_count: 0
+                      queue_size_in_bytes: 0
+                      max_queue_size_in_bytes: 0
+                    pipeline:
+                      workers: 12
+                      batch_size: 125
+                      batch_delay: 50
+                    hash: c11e0502ebf98956dffa371775fd1cb719f85f819ee166b770b3e982da1c999d
+                    ephemeral_id: cd90b521-c192-437e-a49e-62fabebde7e2
+                reloads:
+                  successes: 0
+                  failures: 0
+                os: { }
+                queue:
+                  events_count: 0
+
+  /_node/stats/events:
+    get:
+      summary: Get events statistics
+      description: Get statistics related to event processing.
+      operationId: nodeStatsEvents
+      tags:
+        - node stats
+      parameters:
+        - $ref: "#/components/parameters/pretty"
+      responses:
+        "200":
+          description: A JSON object containing events statistics.
+          content:
+            application/json:
+              schema:
+                allOf:
+#                  - $ref: "#/components/schemas/Common"
+#                  - $ref: '#/components/schemas/PipelineSettings'
+                  - $ref: "#/components/schemas/EventsStats"
+              example:
+                events:
+                  duration_in_millis: 1109
+                  in: 56
+                  filtered: 56
+                  out: 56
+                  queue_push_duration_in_millis: 2
+
+  /_node/stats/flow:
+    get:
+      summary: Get flow statistics
+      description: Get throughput and backpressure details.
+      operationId: nodeStatsFlow
+      tags:
+        - node stats
+      parameters:
+        - $ref: "#/components/parameters/pretty"
+      responses:
+        "200":
+          description: |
+            Flow rates provide visibility into how a Logstash instance or an individual pipeline is currently performing relative to itself over time. This allows us to attach meaning to the cumulative-value metrics that are also presented by this API, and to determine whether an instance or pipeline is behaving better or worse than it has in the past.
+
+            The following flow rates are available for the logstash process as a whole and for each of its pipelines individually. In addition, pipelines may have [additional flow rates](https://www.elastic.co/guide/en/logstash/current/node-stats-api.html#pipeline-flow-rates) depending on their configuration.
+          content:
+            application/json:
+              schema:
+                allOf:
+#                  - $ref: "#/components/schemas/Common"
+#                  - $ref: '#/components/schemas/PipelineSettings'
+                  - $ref: "#/components/schemas/NodeStatsFlow"
+              example:
+                flow:
+                  input_throughput:
+                    current: 0.07381
+                    last_1_minute: 0.01572
+                    last_5_minutes: 0.01618
+                    last_15_minutes: 0.0173
+                    lifetime: 0.01701
+                  filter_throughput:
+                    current: 0.07379
+                    last_1_minute: 0.01572
+                    last_5_minutes: 0.01618
+                    last_15_minutes: 0.0173
+                    lifetime: 0.01701
+                  output_throughput:
+                    current: 0.07379
+                    last_1_minute: 0.01572
+                    last_5_minutes: 0.01618
+                    last_15_minutes: 0.0173
+                    lifetime: 0.01701
+                  queue_backpressure:
+                    current: 0.00007379
+                    last_1_minute: 0.00001572
+                    last_5_minutes: 0.00004532
+                    last_15_minutes: 0.00005407
+                    lifetime: 0.00006464
+                  worker_concurrency:
+                    current: 0.0001476
+                    last_1_minute: 0.0001257
+                    last_5_minutes: 0.000246
+                    last_15_minutes: 0.0002941
+                    lifetime: 0.000242
+
+  /_node/stats/geoip_download_manager:
+    get:
+      summary: Get geoip databases statistics
+      description: Get license checks and download status of [Geoip filter plugin](https://www.elastic.co/guide/en/logstash/current/plugins-filters-geoip.html).
+      operationId: nodeStatsGeoIPDownloadManager
+      tags:
+        - node stats
+      parameters:
+        - $ref: "#/components/parameters/pretty"
+      responses:
+        "200":
+          description: A JSON object containing geoip database license and download status.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  geoip_download_manager:
+                    type: object
+                    properties:
+                      database:
+                        type: object
+                        properties:
+                          ASN:
+                            $ref: "#/components/schemas/GeoIPDBLicenseStats"
+                          CITY:
+                            $ref: "#/components/schemas/GeoIPDBLicenseStats"
+                      download_stats:
+                        type: object
+                        properties:
+                          successes:
+                            description: "The number of successful checks and downloads"
+                            type: integer
+                          failures:
+                            description: "The number of failed check or downloads"
+                            type: integer
+                          last_checked_at:
+                            type: string
+                            format: date-time
+                          status:
+                            description: "The last download status."
+                            type: string
+                            enum: [ "succeeded", "failed", "updating" ]
+
+  /_node/stats/jvm:
+    get:
+      summary: Get JVM statistics
+      description: Get threads count, garbage collators(GC) and memory details.
+      operationId: nodeStatsJVM
+      tags:
+        - node stats
+      parameters:
+        - $ref: "#/components/parameters/pretty"
+      responses:
+        "200":
+          description: A JSON object containing jvm statistics.
+          content:
+            application/json:
+              schema:
+                allOf:
+#                  - $ref: "#/components/schemas/Common"
+#                  - $ref: '#/components/schemas/PipelineSettings'
+                  - $ref: "#/components/schemas/JVMStats"
+              example:
+                jvm:
+                  threads:
+                    count: 117
+                    peak_count: 119
+                  mem:
+                    heap_used_percent: 4
+                    heap_committed_in_bytes: 245366784
+                    heap_max_in_bytes: 4294967294
+                    heap_used_in_bytes: 206685392
+                    non_heap_used_in_bytes: 175223280
+                    non_heap_committed_in_bytes: 196739072
+                    pools:
+                      young:
+                        committed_in_bytes: 92274688
+                        max_in_bytes: -1
+                        used_in_bytes: 69206016
+                        peak_max_in_bytes: -1
+                        peak_used_in_bytes: 171966464
+                      old:
+                        committed_in_bytes: 146800640
+                        max_in_bytes: 4294967296
+                        used_in_bytes: 131187920
+                        peak_max_in_bytes: 4294967296
+                        peak_used_in_bytes: 135186368
+                      survivor:
+                        committed_in_bytes: 6291456
+                        max_in_bytes: -1
+                        used_in_bytes: 6291456
+                        peak_max_in_bytes: -1
+                        peak_used_in_bytes: 23068672
+                  gc:
+                    collectors:
+                      young:
+                        collection_count: 37
+                        collection_time_in_millis: 192
+                      old:
+                        collection_count: 0
+                        collection_time_in_millis: 0
+                  uptime_in_millis: 2512572
+
+  /_node/stats/os:
+    get:
+      summary: Get Cgroup statistics
+      description: Get a more accurate view of CPU statistics from control groups (Cgroup) if available.
+      operationId: nodeStatsOS
+      tags:
+        - node stats
+      parameters:
+        - $ref: "#/components/parameters/pretty"
+      responses:
+        "200":
+          description: A JSON object containing OS statistics.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  os:
+                    type: object
+                    properties:
+                      cgroup:
+                        type: object
+                        properties:
+                          cpuacct:
+                            type: object
+                            properties:
+                              control_group:
+                                type: string
+                              usage_nanos:
+                                type: integer
+                                format: int64
+                          cpu:
+                            type: object
+                            properties:
+                              control_group:
+                                type: string
+                              cfs_period_micros:
+                                type: integer
+                                format: int64
+                              cfs_quota_micros:
+                                type: integer
+                                format: int64
+                              stat:
+                                type: object
+                                properties:
+                                  number_of_elapsed_periods:
+                                    type: integer
+                                    format: int64
+                                  number_of_times_throttled:
+                                    type: integer
+                                    format: int64
+                                  time_throttled_nanos:
+                                    type: integer
+                                    format: int64
+              example:
+                os:
+                  cgroup:
+                    cpuacct:
+                      control_group: "/elastic1"
+                      usage_nanos: 378477588075
+                    cpu:
+                      control_group: "/elastic1"
+                      cfs_period_micros: 1000000
+                      cfs_quota_micros: 800000
+                      stat:
+                        number_of_elapsed_periods: 4157
+                        number_of_times_throttled: 460
+                        time_throttled_nanos: 581617440755
+
+  /_node/stats/pipelines:
+    get:
+      summary: Get statistics for pipelines
+      description: Get pipeline performance metrics and plugin details.
+      operationId: nodeStatsPipelines
+      tags:
+        - node stats
+      parameters:
+        - $ref: "#/components/parameters/pretty"
+      responses:
+        "200":
+          description: |
+            A JSON object containing pipelines statistics.
+            
+            - the number of events that were input, filtered, or output by each pipeline
+            - the current and lifetime [flow rates](https://www.elastic.co/guide/en/logstash/current/node-stats-api.html#flow-stats for each pipeline
+            - stats for each configured filter or output stage
+            - info about config reload successes and failures (when [config reload](https://www.elastic.co/guide/en/logstash/current/reloading-config.html) is enabled)
+            - info about the persistent queue (when [persistent queues](https://www.elastic.co/guide/en/logstash/current/persistent-queues.html) are enabled)
+
+          content:
+            application/json:
+              schema:
+                allOf:
+#                  - $ref: "#/components/schemas/Common"
+#                  - $ref: '#/components/schemas/PipelineSettings'
+                  - $ref: "#/components/schemas/PipelinesStats"
+              example:
+                pipelines:
+                  beats-es:
+                    events:
+                      duration_in_millis: 365495
+                      in: 216610
+                      filtered: 216485
+                      out: 216485
+                      queue_push_duration_in_millis: 342466
+                    flow:
+                      input_throughput:
+                        current: 603.1
+                        lifetime: 575.4
+                      filter_throughput:
+                        current: 604.2
+                        lifetime: 575.1
+                      output_throughput:
+                        current: 604.8
+                        lifetime: 575.1
+                      queue_backpressure:
+                        current: 0.214
+                        lifetime: 0.937
+                      worker_concurrency:
+                        current: 0.941
+                        lifetime: 0.9709
+                      worker_utilization:
+                        current: 93.092
+                        lifetime: 92.187
+                    plugins:
+                      inputs:
+                        - id: 35131f351e2dc5ed13ee04265a8a5a1f95292165-1
+                          events:
+                            out: 216485
+                            queue_push_duration_in_millis: 342466
+                          flow:
+                            throughput:
+                              current: 603.1
+                              lifetime: 590.7
+                          name: beats
+                      filters:
+                        - id: 35131f351e2dc5ed13ee04265a8a5a1f95292165-2
+                          events:
+                            duration_in_millis: 55969
+                            in: 216485
+                            out: 216485
+                          failures: 216485
+                          patterns_per_field:
+                            message: 1
+                          flow:
+                            worker_utilization:
+                              current: 16.71
+                              lifetime: 15.27
+                            worker_millis_per_event:
+                              current: 2829
+                              lifetime: 0.2585
+                          name: grok
+                        - id: 35131f351e2dc5ed13ee04265a8a5a1f95292165-3
+                          events:
+                            duration_in_millis: 3326
+                            in: 216485
+                            out: 216485
+                          flow:
+                            worker_utilization:
+                              current: 1.042
+                              lifetime: 0.9076
+                            worker_millis_per_event:
+                              current: 0.01763
+                              lifetime: 0.01536
+                          name: geoip
+                      outputs:
+                        - id: 35131f351e2dc5ed13ee04265a8a5a1f95292165-4
+                          events:
+                            duration_in_millis: 278557
+                            in: 216485
+                            out: 216485
+                          flow:
+                            worker_utilization:
+                              current: 75.34
+                              lifetime: 76.01
+                            worker_millis_per_event:
+                              current: 1.276
+                              lifetime: 1.287
+                          name: elasticsearch
+                    reloads:
+                      last_error:
+                      successes: 0
+                      last_success_timestamp:
+                      last_failure_timestamp:
+                      failures: 0
+                    queue:
+                      type: memory
+                    pipeline:
+                      workers: 4
+                      batch_size: 125
+                      batch_delay: 50
+                  heartbeat-ruby-stdout:
+                    events:
+                      queue_push_duration_in_millis: 159
+                      in: 45
+                      duration_in_millis: 341
+                      filtered: 45
+                      out: 45
+                    flow:
+                      filter_throughput:
+                        current: 0
+                        last_1_minute: 0.01614
+                        last_5_minutes: 0.01627
+                        last_15_minutes: 0.01643
+                        lifetime: 0.0167
+                      queue_persisted_growth_bytes:
+                        current: 0
+                        last_1_minute: 4.068
+                        last_5_minutes: 4.101
+                        last_15_minutes: 4.14
+                        lifetime: 4.214
+                      queue_persisted_growth_events:
+                        current: 0
+                        last_1_minute: 0
+                        last_5_minutes: 0
+                        last_15_minutes: 0
+                        lifetime: 0
+                      queue_backpressure:
+                        current: 0
+                        last_1_minute: 1.614e-05
+                        last_5_minutes: 2.278e-05
+                        last_15_minutes: 4.272e-05
+                        lifetime: 5.901e-05
+                      output_throughput:
+                        current: 0
+                        last_1_minute: 0.01614
+                        last_5_minutes: 0.01627
+                        last_15_minutes: 0.01643
+                        lifetime: 0.0167
+                      worker_utilization:
+                        current: 0
+                        last_1_minute: 0.0004036
+                        last_5_minutes: 0.0006239
+                        last_15_minutes: 0.0009858
+                        lifetime: 0.001055
+                      worker_concurrency:
+                        current: 0
+                        last_1_minute: 4.843e-05
+                        last_5_minutes: 7.486e-05
+                        last_15_minutes: 0.0001183
+                        lifetime: 0.0001266
+                      input_throughput:
+                        current: 0
+                        last_1_minute: 0.01614
+                        last_5_minutes: 0.01627
+                        last_15_minutes: 0.01643
+                        lifetime: 0.0167
+                    plugins:
+                      inputs:
+                        - id: c9ca46e359d73146590ca8af40092342afa922f3cbf07adc4b5009e346cb19f7
+                          events:
+                            queue_push_duration_in_millis: 159
+                            out: 45
+                          name: heartbeat
+                          flow:
+                            throughput:
+                              current: 0
+                              last_1_minute: 0.01614
+                              last_5_minutes: 0.01627
+                              last_15_minutes: 0.01643
+                              lifetime: 0.0167
+                      codecs:
+                        - id: plain_b0090202-daac-428e-8355-18c35a0826cb
+                          decode:
+                            writes_in: 0
+                            duration_in_millis: 0
+                            out: 0
+                          name: plain
+                          encode:
+                            writes_in: 0
+                            duration_in_millis: 0
+                        - id: 6bff4bc6-3a8c-494c-aa65-d16e1eb09578
+                          name: rubydebug
+                      filters:
+                        - id: 585fa932a4fd506055ead07ee5ebcb3033c27c82ba90cbee73d6ac7e9357333a
+                          events:
+                            in: 45
+                            duration_in_millis: 86
+                            out: 45
+                          name: ruby
+                          flow:
+                            worker_utilization:
+                              current: 0
+                              last_1_minute: 0.0001345
+                              last_5_minutes: 0.0001627
+                              last_15_minutes: 0.0002191
+                              lifetime: 0.000266
+                            worker_millis_per_event:
+                              last_1_minute: 1
+                              last_5_minutes: 1.2
+                              last_15_minutes: 1.6
+                              lifetime: 1.911
+                      outputs:
+                        - id: c4f801c8f170b4cb0679f704413773acd5f291929f42302d0a56361400c3741b
+                          events:
+                            in: 45
+                            duration_in_millis: 216
+                            out: 45
+                          name: stdout
+                          flow:
+                            worker_utilization:
+                              current: 0
+                              last_1_minute: 0.000269
+                              last_5_minutes: 0.000434
+                              last_15_minutes: 0.0006663
+                              lifetime: 0.000668
+                            worker_millis_per_event:
+                              last_1_minute: 2
+                              last_5_minutes: 3.2
+                              last_15_minutes: 4.867
+                              lifetime: 4.8
+                    reloads:
+                      last_failure_timestamp:
+                      successes: 0
+                      failures: 0
+                      last_success_timestamp:
+                      last_error:
+                    queue:
+                      events: 0
+                      capacity:
+                        max_queue_size_in_bytes: 1073741824
+                        max_unread_events: 0
+                        queue_size_in_bytes: 11341
+                        page_capacity_in_bytes: 67108864
+                      data:
+                        free_space_in_bytes: 60833390592
+                        path: "/path/to/logstash/data/queue/heartbeat-ruby-stdout"
+                        storage_type: apfs
+                      type: persisted
+                      events_count: 0
+                      queue_size_in_bytes: 11341
+                      max_queue_size_in_bytes: 1073741824
+                    pipeline:
+                      workers: 12
+                      batch_size: 125
+                      batch_delay: 50
+                    hash: c11e0502ebf98956dffa371775fd1cb719f85f819ee166b770b3e982da1c999d
+                    ephemeral_id: 6a218b06-9655-4ddc-84e9-d5bfa51e5dc7
+
+  /_node/stats/pipelines/{pipeline_name}:
+    get:
+      summary: Get statistics for a pipeline
+      description: Get performance metrics and plugin details for a pipeline.
+      operationId: nodeStatsPipeline
+      tags:
+        - node stats
+      parameters:
+        - name: pipeline_name
+          in: path
+          required: true
+          schema:
+            type: string
+          description: The name of the pipeline to retrieve information for.
+        - $ref: "#/components/parameters/pretty"
+      responses:
+        "200":
+          description: A JSON object containing a single pipeline statistics.
+          content:
+            application/json:
+              schema:
+                allOf:
+#                  - $ref: "#/components/schemas/Common"
+#                  - $ref: '#/components/schemas/PipelineSettings'
+                  - $ref: "#/components/schemas/PipelinesStats"
+              examples:
+                PipelineWithPersistedQueue:
+                  description: A pipeline with a persisted queue.
+                  value:
+                    pipelines:
+                      heartbeat-ruby-stdout:
+                        events:
+                          queue_push_duration_in_millis: 159
+                          in: 45
+                          duration_in_millis: 341
+                          filtered: 45
+                          out: 45
+                        flow:
+                          filter_throughput:
+                            current: 0
+                            last_1_minute: 0.01614
+                            last_5_minutes: 0.01627
+                            last_15_minutes: 0.01643
+                            lifetime: 0.0167
+                          queue_persisted_growth_bytes:
+                            current: 0
+                            last_1_minute: 4.068
+                            last_5_minutes: 4.101
+                            last_15_minutes: 4.14
+                            lifetime: 4.214
+                          queue_persisted_growth_events:
+                            current: 0
+                            last_1_minute: 0
+                            last_5_minutes: 0
+                            last_15_minutes: 0
+                            lifetime: 0
+                          queue_backpressure:
+                            current: 0
+                            last_1_minute: 1.614e-05
+                            last_5_minutes: 2.278e-05
+                            last_15_minutes: 4.272e-05
+                            lifetime: 5.901e-05
+                          output_throughput:
+                            current: 0
+                            last_1_minute: 0.01614
+                            last_5_minutes: 0.01627
+                            last_15_minutes: 0.01643
+                            lifetime: 0.0167
+                          worker_utilization:
+                            current: 0
+                            last_1_minute: 0.0004036
+                            last_5_minutes: 0.0006239
+                            last_15_minutes: 0.0009858
+                            lifetime: 0.001055
+                          worker_concurrency:
+                            current: 0
+                            last_1_minute: 4.843e-05
+                            last_5_minutes: 7.486e-05
+                            last_15_minutes: 0.0001183
+                            lifetime: 0.0001266
+                          input_throughput:
+                            current: 0
+                            last_1_minute: 0.01614
+                            last_5_minutes: 0.01627
+                            last_15_minutes: 0.01643
+                            lifetime: 0.0167
+                        plugins:
+                          inputs:
+                            - id: c9ca46e359d73146590ca8af40092342afa922f3cbf07adc4b5009e346cb19f7
+                              events:
+                                queue_push_duration_in_millis: 159
+                                out: 45
+                              name: heartbeat
+                              flow:
+                                throughput:
+                                  current: 0
+                                  last_1_minute: 0.01614
+                                  last_5_minutes: 0.01627
+                                  last_15_minutes: 0.01643
+                                  lifetime: 0.0167
+                          codecs:
+                            - id: plain_b0090202-daac-428e-8355-18c35a0826cb
+                              decode:
+                                writes_in: 0
+                                duration_in_millis: 0
+                                out: 0
+                              name: plain
+                              encode:
+                                writes_in: 0
+                                duration_in_millis: 0
+                            - id: 6bff4bc6-3a8c-494c-aa65-d16e1eb09578
+                              name: rubydebug
+                          filters:
+                            - id: 585fa932a4fd506055ead07ee5ebcb3033c27c82ba90cbee73d6ac7e9357333a
+                              events:
+                                in: 45
+                                duration_in_millis: 86
+                                out: 45
+                              name: ruby
+                              flow:
+                                worker_utilization:
+                                  current: 0
+                                  last_1_minute: 0.0001345
+                                  last_5_minutes: 0.0001627
+                                  last_15_minutes: 0.0002191
+                                  lifetime: 0.000266
+                                worker_millis_per_event:
+                                  last_1_minute: 1
+                                  last_5_minutes: 1.2
+                                  last_15_minutes: 1.6
+                                  lifetime: 1.911
+                          outputs:
+                            - id: c4f801c8f170b4cb0679f704413773acd5f291929f42302d0a56361400c3741b
+                              events:
+                                in: 45
+                                duration_in_millis: 216
+                                out: 45
+                              name: stdout
+                              flow:
+                                worker_utilization:
+                                  current: 0
+                                  last_1_minute: 0.000269
+                                  last_5_minutes: 0.000434
+                                  last_15_minutes: 0.0006663
+                                  lifetime: 0.000668
+                                worker_millis_per_event:
+                                  last_1_minute: 2
+                                  last_5_minutes: 3.2
+                                  last_15_minutes: 4.867
+                                  lifetime: 4.8
+                        reloads:
+                          last_failure_timestamp:
+                          successes: 0
+                          failures: 0
+                          last_success_timestamp:
+                          last_error:
+                        queue:
+                          events: 0
+                          capacity:
+                            max_queue_size_in_bytes: 1073741824
+                            max_unread_events: 0
+                            queue_size_in_bytes: 11341
+                            page_capacity_in_bytes: 67108864
+                          data:
+                            free_space_in_bytes: 60833390592
+                            path: "/path/to/logstash/data/queue/heartbeat-ruby-stdout"
+                            storage_type: apfs
+                          type: persisted
+                          events_count: 0
+                          queue_size_in_bytes: 11341
+                          max_queue_size_in_bytes: 1073741824
+                        pipeline:
+                          workers: 12
+                          batch_size: 125
+                          batch_delay: 50
+                        hash: c11e0502ebf98956dffa371775fd1cb719f85f819ee166b770b3e982da1c999d
+                        ephemeral_id: 6a218b06-9655-4ddc-84e9-d5bfa51e5dc7
+
+                PipelineWithMemoryQueue:
+                  description: A pipeline with a memory queue.
+                  value:
+                    pipelines:
+                      heartbeat-ruby-stdout:
+                        events:
+                          duration_in_millis: 14
+                          filtered: 2
+                          in: 2
+                          queue_push_duration_in_millis: 0
+                          out: 2
+                        flow:
+                          input_throughput:
+                            current: 0.09877
+                            last_1_minute: 0.01661
+                            lifetime: 0.03094
+                          output_throughput:
+                            current: 0.09877
+                            last_1_minute: 0.01661
+                            lifetime: 0.03094
+                          worker_utilization:
+                            current: 0.002469
+                            last_1_minute: 0.001384
+                            lifetime: 0.001805
+                          filter_throughput:
+                            current: 0.09877
+                            last_1_minute: 0.01661
+                            lifetime: 0.03094
+                          worker_concurrency:
+                            current: 0.0002963
+                            last_1_minute: 0.0001661
+                            lifetime: 0.0002166
+                          queue_backpressure:
+                            current: 0
+                            last_1_minute: 0
+                            lifetime: 0
+                        plugins:
+                          inputs:
+                            - id: c9ca46e359d73146590ca8af40092342afa922f3cbf07adc4b5009e346cb19f7
+                              events:
+                                queue_push_duration_in_millis: 0
+                                out: 2
+                              name: heartbeat
+                              flow:
+                                throughput:
+                                  current: 0.09876
+                                  last_1_minute: 0.01661
+                                  lifetime: 0.03094
+                          codecs:
+                            - id: 8b2798ec-d828-445a-a5c3-b0ebe2ec142a
+                              name: rubydebug
+                            - id: plain_dc12bcf8-1c2e-4f28-b55d-a82ab127d00a
+                              encode:
+                                duration_in_millis: 0
+                                writes_in: 0
+                              name: plain
+                              decode:
+                                duration_in_millis: 0
+                                writes_in: 0
+                                out: 0
+                          filters:
+                            - id: 585fa932a4fd506055ead07ee5ebcb3033c27c82ba90cbee73d6ac7e9357333a
+                              events:
+                                duration_in_millis: 4
+                                in: 2
+                                out: 2
+                              name: ruby
+                              flow:
+                                worker_millis_per_event:
+                                  current: 1
+                                  last_1_minute: 4
+                                  lifetime: 2
+                                worker_utilization:
+                                  current: 0.000823
+                                  last_1_minute: 0.0005537
+                                  lifetime: 0.0005157
+                          outputs:
+                            - id: c4f801c8f170b4cb0679f704413773acd5f291929f42302d0a56361400c3741b
+                              events:
+                                duration_in_millis: 7
+                                in: 2
+                                out: 2
+                              name: stdout
+                              flow:
+                                worker_millis_per_event:
+                                  current: 3
+                                  last_1_minute: 4
+                                  lifetime: 3.5
+                                worker_utilization:
+                                  current: 0.002469
+                                  last_1_minute: 0.0005537
+                                  lifetime: 0.0009025
+                        reloads:
+                          successes: 0
+                          last_failure_timestamp:
+                          failures: 0
+                          last_success_timestamp:
+                          last_error:
+                        queue:
+                          type: memory
+                          events_count: 0
+                          queue_size_in_bytes: 0
+                          max_queue_size_in_bytes: 0
+                        pipeline:
+                          workers: 12
+                          batch_size: 125
+                          batch_delay: 50
+                        hash: c11e0502ebf98956dffa371775fd1cb719f85f819ee166b770b3e982da1c999d
+                        ephemeral_id: c91bff2b-c92b-45ac-8c74-04783f6cc1dd
+
+
+
+
+  /_node/stats/process:
+    get:
+      summary: Get process statistics
+      description: Get system-level process statistics.
+      operationId: nodeStatsProcess
+      tags:
+        - node stats
+      parameters:
+        - $ref: "#/components/parameters/pretty"
+      responses:
+        "200":
+          description: A JSON object containing process statistics.
+          content:
+            application/json:
+              schema:
+                allOf:
+#                  - $ref: "#/components/schemas/Common"
+#                  - $ref: '#/components/schemas/PipelineSettings'
+                  - $ref: "#/components/schemas/ProcessStats"
+              example:
+                process:
+                  open_file_descriptors: 221
+                  peak_open_file_descriptors: 221
+                  max_file_descriptors: 10240
+                  mem:
+                    total_virtual_in_bytes: 428771917824
+                  cpu:
+                    total_in_millis: 74913
+                    percent: 0
+                    load_average:
+                      1m: 6.06201171875
+
+
+  /_node/stats/reloads:
+    get:
+      summary: Get config reload statistics
+      description: Get information about config reload successes and failures.
+      operationId: nodeStatsReloads
+      tags:
+        - node stats
+      parameters:
+        - $ref: "#/components/parameters/pretty"
+      responses:
+        "200":
+          description: A JSON object containing process statistics.
+          content:
+            application/json:
+              schema:
+                allOf:
+#                  - $ref: "#/components/schemas/Common"
+#                  - $ref: '#/components/schemas/PipelineSettings'
+                  - $ref: "#/components/schemas/ReloadStats"
+              example:
+                reloads:
+                  successes: 0
+                  failures: 0
+  /_node/hot_threads:
+    get:
+      summary: Get hot threads
+      description: >
+        Get information about current hot threads for Logstash.
+        A hot thread is a Java thread that has high CPU usage and takes longer than normal to execute.
+      operationId: nodeHotThreads
+      tags:
+        - hot threads
+      parameters:
+        - name: threads
+          in: query
+          schema:
+            type: integer
+            default: 10
+          description: The number of hot threads to return.
+        - name: stacktrace_size
+          in: query
+          schema:
+            type: integer
+            default: 50
+          description: The depth of the stack trace to report for each thread.
+        - name: ignore_idle_threads
+          in: query
+          schema:
+            type: boolean
+            default: true
+          description: If true, does not return idle threads.
+        - $ref: "#/components/parameters/pretty"
+        - name: human
+          in: query
+          schema:
+            type: boolean
+          description: If you append `?human=true` to the request, the JSON returned will be in a human-readable format.
+      responses:
+        '200':
+          description: Indicates a successful call
+          content:
+            application/json:
+              schema:
+                allOf:
+#                  - $ref: '#/components/schemas/Common'
+#                  - $ref: '#/components/schemas/PipelineSettings'
+                  - type: object
+                    properties:
+                      hot_threads:
+                        type: object
+                        properties:
+                          time:
+                            type: string
+                          busiest_threads:
+                            type: integer
+                          threads:
+                            type: array
+                            items:
+                              $ref: '#/components/schemas/Thread'
+              examples:
+                nodeHotThreadsExample1:
+                  value:
+                    hot_threads:
+                      time: 2025-01-06T18:25:28-07:00
+                      busiest_threads: 3
+                      threads:
+                        - name: Ruby-0-Thread-7
+                          thread_id: 37
+                          percent_of_cpu_time: 0.0
+                          state: timed_waiting
+                          traces:
+                            - "java.lang.Object.wait(Native Method)"
+                            - "org.jruby.RubyThread.sleep(RubyThread.java:1002)"
+                            - "org.jruby.RubyKernel.sleep(RubyKernel.java:803)"
+                        - name: "[test2]>worker3"
+                          thread_id: 10
+                          percent_of_cpu_time: 0.85
+                          state: waiting
+                          traces:
+                            - "sun.misc.Unsafe.park(Native Method)"
+                            - "java.util.concurrent.locks.LockSupport.park(LockSupport.java:175)"
+                            - "java.util.concurrent.locks.AbstractQueuedSynchronizer.parkAndCheckInterrupt(AbstractQueuedSynchronizer.java:836)"
+                        - name: "[test2]>worker2"
+                          thread_id: 11
+                          percent_of_cpu_time: 0.85
+                          state: runnable
+                          traces:
+                            - "org.jruby.RubyClass.allocate(RubyClass.java:225)"
+                            - "org.jruby.RubyClass.newInstance(RubyClass.java:856)"
+                            - "org.jruby.RubyClass$INVOKER$i$newInstance.call(RubyClass$INVOKER$i$newInstance.gen)"
+
+  /_health_report:
+    get:
+      summary: Get health status
+      description: |
+        The health API returns a report with the health status of Logstash and the pipelines that are running inside of it. 
+        The report contains a list of indicators that compose Logstash functionality.
+
+        Each indicator has a health status of: green, unknown, yellow, or red. 
+        The indicator provides an explanation and metadata describing the reason for its current health status.
+
+        The top-level status is controlled by the worst indicator status.
+
+        In the event that an indicator status is non-green, a list of impacts may be present in the indicator result which detail the functionalities that are negatively affected by the health issue. 
+        Each impact carries with it a severity level, an area of the system that is affected, and a simple description of the impact on the system.
+
+        Some health indicators can determine the root cause of a health problem and prescribe a set of steps that can be performed in order to improve the health of the system. 
+        The root cause and remediation steps are encapsulated in a diagnosis. 
+        A diagnosis contains a cause detailing a root cause analysis, an action containing a brief description of the steps to take to fix the problem, and the URL for detailed troubleshooting help.
+        
+        NOTE: The health indicators perform root cause analysis of non-green health statuses. 
+        This can be computationally expensive when called frequently.
+
+      operationId: healthReport
+      tags:
+        - health
+      parameters:
+        - $ref: "#/components/parameters/pretty"
+      responses:
+        '200':
+          description: Indicates a successful call
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: '#/components/schemas/Common'
+                  - type: object
+                    properties:
+                      symptom:
+                        type: string
+                        example: "3 indicators are healthy"
+                      indicators:
+                        description: Information about the health of Logstash indicators.
+                        type: object
+                        properties:
+                          pipelines:
+                            type: object
+                            properties:
+                              status:
+                                $ref: '#/components/schemas/Status'
+                              symptom:
+                                type: string
+                              indicators:
+                                type: object
+                                additionalProperties:
+                                  description: "pipeline name"
+                                  type: object
+                                  properties:
+                                    status:
+                                      $ref: '#/components/schemas/Status'
+                                    symptom:
+                                      type: string
+                                      description: "A message providing information about the current health status."
+                                      example: "The pipeline is healthy"
+                                    details:
+                                      type: object
+                                      description: "An object that contains additional information about the indicator that has led to the current health status result."
+                                      properties:
+                                        status:
+                                          type: object
+                                          properties:
+                                            state:
+                                              type: string
+                                              enum:
+                                                - LOADING
+                                                - RUNNING
+                                                - FINISHED
+                                                - TERMINATED
+                                        flow:
+                                          type: object
+                                          properties:
+                                            worker_utilization:
+                                              $ref: '#/components/schemas/FlowWindows'
+                                    impacts:
+                                      type: array
+                                      description: "If a non-healthy status is returned, indicators may include a list of impacts that this health status will have on Logstash."
+                                      items:
+                                        type: object
+                                        properties:
+                                          id:
+                                            type: string
+                                            description: |
+                                              A unique identifier that may appear associated with a known impacts or issue.
+                                              This ID follows a structured format that helps identify the specific problem.
+                                            example: "logstash:health:pipeline:flow:impact:blocked_processing"
+                                          severity:
+                                            type: integer
+                                            minimum: 1
+                                            maximum: 10
+                                            description: "How important this impact is to the functionality of Logstash. A value of 1 is the highest severity, with larger values indicating lower severity."
+                                          description:
+                                            type: string
+                                            description: "A description of the impact on Logstash."
+                                          impact_areas:
+                                            type: array
+                                            description: "The areas of Logstash affected by the health status. Possible values are:"
+                                            example: ["pipeline_execution"]
+                                            items:
+                                              type: string
+                                    diagnosis:
+                                      type: array
+                                      items:
+                                        type: object
+                                        properties:
+                                          id:
+                                            type: string
+                                            description: |
+                                              A unique identifier that may appear associated with a known diagnosis or issue.
+                                              This ID follows a structured format that helps identify the specific problem.
+                                            example: "logstash:health:pipeline:flow:worker_utilization:diagnosis:5m-blocked"
+                                          cause:
+                                            type: string
+                                            description: "A description of a root cause of this health problem."
+                                          action:
+                                            type: string
+                                            description: "A brief description of the steps that should be taken to remediate the problem. A more detailed step-by-step guide to remediate the problem is provided by the `help_url` field."
+                                          help_url:
+                                            type: string
+                                            format: uri
+                                            description: "A link to the troubleshooting guide that will fix the health problem."
+              examples:
+                normalTerminatedCase:
+                  description: "The pipeline has finished without errors or interruptions."
+                  value:
+                    symptom: "1 indicator is concerning (`pipelines`)"
+                    indicators:
+                      pipelines:
+                        status: "yellow"
+                        symptom: "1 indicator is concerning (`normal-completion-pipeline`)"
+                        indicators:
+                          normal-completion-pipeline:
+                            status: "yellow"
+                            symptom: "The pipeline is concerning; 1 area is impacted and 1 diagnosis is available"
+                            diagnosis:
+                              - cause: "pipeline has finished running because its inputs have been closed and events have been processed"
+                                action: "if you expect this pipeline to run indefinitely, you will need to configure its inputs to continue receiving or fetching events"
+                            impacts:
+                              - impact_areas: ["pipeline_execution"]
+                            details:
+                              status:
+                                state: "FINISHED"
+                abnormalTerminatedCase:
+                  description: "The pipeline is terminated with errors."
+                  value:
+                    status: "red"
+                    symptom: "1 indicator is unhealthy (`pipelines`)"
+                    indicators:
+                      pipelines:
+                        status: "red"
+                        symptom: "1 indicator is unhealthy (`abnormal-termination-pipeline`)"
+                        indicators:
+                          abnormal-termination-pipeline:
+                            status: "red"
+                            symptom: "The pipeline is unhealthy; 1 area is impacted and 1 diagnosis is available"
+                            diagnosis:
+                              - cause: "pipeline is not running, likely because it has encountered an error"
+                                action: "view logs to determine the cause of abnormal pipeline shutdown"
+                            impacts:
+                              - description: "the pipeline is not currently processing"
+                                impact_areas: [ "pipeline_execution" ]
+                            details:
+                              status:
+                                state: "TERMINATED"
+                backpressureCase:
+                  description: "A pipeline is blocked by slow downstream processing."
+                  value:
+                    status: "red"
+                    symptom: "1 indicator is unhealthy (`pipelines`)"
+                    indicators:
+                      pipelines:
+                        status: "red"
+                        symptom: "1 indicator is unhealthy (`blocked-pipeline`)"
+                        indicators:
+                          blocked-pipeline:
+                            status: "red"
+                            symptom: "The pipeline is unhealthy; 1 area is impacted and 1 diagnosis is available"
+                            diagnosis:
+                              - id: "logstash:health:pipeline:flow:worker_utilization:diagnosis:5m-blocked"
+                                cause: "pipeline workers have been completely blocked for at least five minutes"
+                                action: "address bottleneck or add resources"
+                            impacts:
+                              - id: "logstash:health:pipeline:flow:impact:blocked_processing"
+                                severity: 1
+                                description: "the pipeline is blocked"
+                                impact_areas: [ "pipeline_execution" ]
+                            details:
+                              status:
+                                state: "RUNNING"
+                              flow:
+                                worker_utilization:
+                                  last_1_minute: 100.0
+                                  last_5_minutes: 100.0
+components:
+  parameters:
+    pretty:
+      name: pretty
+      in: query
+      schema:
+        type: boolean
+      description: >
+        If you append `?pretty=true` to the request, the JSON returned will be pretty formatted. Use it for debugging only!
+  securitySchemes:
+    BasicAuth:
+      type: http
+      scheme: basic
+  schemas:
+    Common:
+      type: object
+      properties:
+        host:
+          type: string
+          description: The name of the host machine.
+        version:
+          type: string
+          description: The version of the Logstash instance.
+        http_address:
+          type: string
+          description: The HTTP address where the Logstash instance is accessible, including the port number.
+        id:
+          type: string
+          description: A unique identifier (uuid) for the Logstash instance.
+        name:
+          type: string
+          description: The name of the Logstash instance.
+        ephemeral_id:
+          type: string
+          description: A unique identifier for the ephemeral session of the Logstash instance.
+        snapshot:
+          type: boolean
+          nullable: true
+        status:
+          $ref: '#/components/schemas/Status'
+
+    PipelineSettings:
+      type: object
+      properties:
+        pipeline:
+          type: object
+          properties:
+            workers:
+              type: integer
+            batch_size:
+              type: integer
+            batch_delay:
+              type: integer
+
+    NodeInfoPipeline:
+      type: object
+      properties:
+        workers:
+          type: integer
+        batch_size:
+          type: integer
+        batch_delay:
+          type: integer
+        config_reload_automatic:
+          type: boolean
+        config_reload_interval:
+          type: integer
+        dead_letter_queue_enabled:
+          type: boolean
+
+    Status:
+      type: string
+      description: |
+        Health status of Logstash, based on the aggregated status of all indicators.
+        Statuses are:
+        
+        - `green`: Logstash is healthy.
+        - `unknown`: Logstash health could not be determined.
+        - `yellow`: The functionality of Logstash is in a degraded state and may need remediation to avoid the health becoming red.
+        - `red`: Logstash is experiencing an outage or certain features are unavailable for use.
+      enum:
+        - green
+        - red
+        - unknown
+        - yellow
+
+    FlowWindows:
+      type: object
+      description: |
+        When the rate for a given flow metric window is infinite, it is presented as a string.
+        This occurs when the numerator metric has changed during the window without a change in the rate’s denominator metric.
+      properties:
+        current:
+          oneOf:
+            - type: number
+              format: double
+            - type: string
+              enum: ["Infinity"]
+          description: "The most recent ~10s."
+        last_1_minute:
+          oneOf:
+            - type: number
+              format: double
+            - type: string
+              enum: ["Infinity"]
+        last_5_minutes:
+          oneOf:
+            - type: number
+              format: double
+            - type: string
+              enum: ["Infinity"]
+        last_15_minutes:
+          oneOf:
+            - type: number
+              format: double
+            - type: string
+              enum: ["Infinity"]
+        last_1_hour:
+          oneOf:
+            - type: number
+              format: double
+            - type: string
+              enum: ["Infinity"]
+        last_24_hours:
+          oneOf:
+            - type: number
+              format: double
+            - type: string
+              enum: ["Infinity"]
+        lifetime:
+          oneOf:
+            - type: number
+              format: double
+            - type: string
+              enum: ["Infinity"]
+          description: "The lifetime of the relevant pipeline or process."
+    FlowStatsPart1:
+      type: object
+      properties:
+        input_throughput:
+          description: |
+            This metric is expressed in events-per-second, and is the rate of events being pushed into the pipeline(s) queue(s) relative to wall-clock time (`events.in` / second). It includes events that are blocked by the queue and have not yet been accepted.
+          allOf: # need to use allOf to keep the description
+            - $ref: "#/components/schemas/FlowWindows"
+        filter_throughput:
+          description: |
+            This metric is expressed in events-per-second, and is the rate of events flowing through the filter phase of the pipeline(s) relative to wall-clock time (`events.filtered` / second).
+          allOf: # need to use allOf to keep the description
+            - $ref: "#/components/schemas/FlowWindows"
+        output_throughput:
+          description: |
+            This metric is expressed in events-per-second, and is the rate of events flowing through the output phase of the pipeline(s) relative to wall-clock time (`events.out` / second).
+          allOf: # need to use allOf to keep the description
+            - $ref: "#/components/schemas/FlowWindows"
+        queue_backpressure:
+          description: |
+            This is a unitless metric representing the cumulative time spent by all inputs blocked pushing events into their pipeline’s queue, relative to wall-clock time (queue_push_duration_in_millis / millisecond). It is typically most useful when looking at the stats for an individual pipeline.
+
+            While a "zero" value indicates no back-pressure to the queue, the magnitude of this metric is highly dependent on the shape of the pipelines and their inputs. It cannot be used to compare one pipeline to another or even one process to itself if the quantity or shape of its pipelines changes. A pipeline with only one single-threaded input may contribute up to 1.00, a pipeline whose inputs have hundreds of inbound connections may contribute much higher numbers to this combined value.
+
+            Additionally, some amount of back-pressure is both normal and expected for pipelines that are pulling data, as this back-pressure allows them to slow down and pull data at a rate its downstream pipeline can tolerate.
+          allOf: # need to use allOf to keep the description
+            - $ref: "#/components/schemas/FlowWindows"
+        worker_concurrency:
+          description: |
+            This is a unitless metric representing the cumulative time spent by all workers relative to wall-clock time (duration_in_millis / millisecond).
+
+            A pipeline is considered "saturated" when its worker_concurrency flow metric approaches its available pipeline.workers, because it indicates that all of its available workers are being kept busy. Tuning a saturated pipeline to have more workers can often work to increase that pipeline’s throughput and decrease back-pressure to its queue, unless the pipeline is experiencing back-pressure from its outputs.
+
+            A process is also considered "saturated" when its top-level worker_concurrency flow metric approaches the cumulative pipeline.workers across all pipelines, and similarly can be addressed by tuning the individual pipelines that are saturated.
+          allOf: # need to use allOf to keep the description
+            - $ref: "#/components/schemas/FlowWindows"
+    FlowStatsPart2:
+      type: object
+      properties:
+        worker_utilization:
+          description: |
+            This is a unitless metric that indicates the percentage of available worker time being used by this individual plugin (duration / (uptime * `pipeline.workers`). It is useful for identifying which plugins in a pipeline are using the available worker resources.
+
+            A pipeline is considered "saturated" when `worker_utilization` approaches 100, because it indicates that all of its workers are being kept busy. This is typically an indication of either downstream back-pressure or insufficient resources allocated to the pipeline. Tuning a saturated pipeline to have more workers can often work to increase that pipeline’s throughput and decrease back-pressure to its queue, unless the pipeline is experiencing back-pressure from its outputs.
+
+            A pipeline is considered "starved" when `worker_utilization` approaches 0, because it indicates that none of its workers are being kept busy. This is typically an indication that the inputs are not receiving or retrieving enough volume to keep the pipeline workers busy. Tuning a starved pipeline to have fewer workers can help it to consume less memory and CPU, freeing up resources for other pipelines.
+          allOf: # need to use allOf to keep the description
+            - $ref: "#/components/schemas/FlowWindows"
+    FlowStatsPart3:
+      type: object
+      properties:
+        queue_persisted_growth_bytes:
+          description: |
+            This metric is expressed in bytes-per-second, and is the rate of change of the size of the persistent queue on disk, relative to wall-clock time (`queue.queue_size_in_bytes` / second). A positive number indicates that the queue size-on-disk is growing, and a negative number indicates that the queue is shrinking.
+
+            NOTE: The size of a PQ on disk includes both unacknowledged events and previously-acknowledged events from pages that contain one or more unprocessed events. This means it grows gradually as individual events are added, but shrinks in large chunks each time a whole page of processed events is reclaimed (read more: [PQ disk garbage collection](https://www.elastic.co/guide/en/logstash/current/persistent-queues.html#garbage-collection)).
+          allOf: # need to use allOf to keep the description
+            - $ref: "#/components/schemas/FlowWindows"
+        queue_persisted_growth_events:
+          description: |
+            This metric is expressed in events-per-second, and is the rate of change of the number of unacknowledged events in the queue, relative to wall-clock time (`queue.events_count` / second). A positive number indicates that the queue’s event-count is growing, and a negative number indicates that the queue is shrinking.
+          allOf: # need to use allOf to keep the description
+            - $ref: "#/components/schemas/FlowWindows"
+    PipelineMQFlowStats:
+      type: object
+      allOf:
+        - $ref: "#/components/schemas/FlowStatsPart1"
+        - $ref: "#/components/schemas/FlowStatsPart2"
+    PipelinePQFlowStats:
+      type: object
+      allOf:
+        - $ref: "#/components/schemas/FlowStatsPart1"
+        - $ref: "#/components/schemas/FlowStatsPart2"
+        - $ref: "#/components/schemas/FlowStatsPart3"
+    PipelineFlowStats:
+      type: object
+      description: |
+        Each pipeline’s entry in the API response includes a number of pipeline-scoped [flow rates](https://www.elastic.co/guide/en/logstash/current/node-stats-api.html#flow-stats) such as `input_throughput`, `worker_concurrency`, and `queue_backpressure` to provide visibility into the flow of events through the pipeline.
+        
+        When configured with a [persistent queue](https://www.elastic.co/guide/en/logstash/current/persistent-queues.html, the pipeline’s flow will include additional rates to provide visibility into the health of the pipeline’s persistent queue:
+      properties:
+        flow:
+          type: object
+          oneOf:
+            - $ref: "#/components/schemas/PipelineMQFlowStats" # For memory queue
+            - $ref: "#/components/schemas/PipelinePQFlowStats" # For persisted queue
+
+    NodeStatsFlow:
+      type: object
+      properties:
+        flow:
+          $ref: "#/components/schemas/FlowStatsPart1"
+
+    Thread:
+      type: object
+      properties:
+        name:
+          type: string
+        thread_id:
+          type: integer
+        percent_of_cpu_time:
+          type: number
+          format: double
+        state:
+          type: string
+        traces:
+          type: array
+          items:
+            type: string
+
+    EventsStats:
+      type: object
+      properties:
+        events:
+          type: object
+          properties:
+            in:
+              type: integer
+              format: int64
+            filtered:
+              type: integer
+              format: int64
+            out:
+              type: integer
+              format: int64
+            duration_in_millis:
+              type: integer
+              format: int64
+            queue_push_duration_in_millis:
+              type: integer
+              format: int64
+
+    JVMStats:
+      type: object
+      properties:
+        jvm:
+          type: object
+          properties:
+            threads:
+              type: object
+              properties:
+                count:
+                  type: integer
+                  description: The number of active JVM threads.
+                peak_count:
+                  type: integer
+                  description: The peak number of active JVM threads.
+            mem:
+              type: object
+              properties:
+                heap_used_percent:
+                  type: integer
+                  description: The percentage of heap memory used.
+                heap_committed_in_bytes:
+                  type: integer
+                  format: int64
+                  description: The committed heap memory in bytes.
+                heap_max_in_bytes:
+                  type: integer
+                  format: int64
+                  description: The maximum heap memory in bytes.
+                heap_used_in_bytes:
+                  type: integer
+                  format: int64
+                  description: The used heap memory in bytes.
+                non_heap_used_in_bytes:
+                  type: integer
+                  format: int64
+                  description: The used non-heap memory in bytes.
+                non_heap_committed_in_bytes:
+                  type: integer
+                  format: int64
+                  description: The committed non-heap memory in bytes.
+                pools:
+                  $ref: "#/components/schemas/JVMMemoryPools"
+            gc:
+              type: object
+              properties:
+                collectors:
+                  $ref: "#/components/schemas/JVMGCCollectors"
+            uptime_in_millis:
+              type: integer
+              format: int64
+              description: The JVM uptime in milliseconds.
+    JVMMemoryPool:
+      type: object
+      properties:
+        peak_used_in_bytes:
+          type: integer
+          format: int64
+        used_in_bytes:
+          type: integer
+          format: int64
+        peak_max_in_bytes:
+          type: integer
+          format: int64
+        max_in_bytes:
+          type: integer
+          format: int64
+        committed_in_bytes:
+          type: integer
+          format: int64
+    JVMMemoryPools:
+      type: object
+      properties:
+        survivor:
+          $ref: "#/components/schemas/JVMMemoryPool"
+        old:
+          $ref: "#/components/schemas/JVMMemoryPool"
+        young:
+          $ref: "#/components/schemas/JVMMemoryPool"
+    JVMGCCollector:
+      type: object
+      properties:
+        collection_time_in_millis:
+          type: integer
+          format: int64
+        collection_count:
+          type: integer
+    JVMGCCollectors:
+      type: object
+      properties:
+        old:
+          $ref: "#/components/schemas/JVMGCCollector"
+        young:
+          $ref: "#/components/schemas/JVMGCCollector"
+
+    OSStats:
+      type: object
+      properties:
+        os:
+          type: object
+          properties:
+            name:
+              type: string
+            arch:
+              type: string
+            version:
+              type: string
+            available_processors:
+              type: integer
+
+    ProcessStats:
+      type: object
+      properties:
+        process:
+          type: object
+          properties:
+            open_file_descriptors:
+              type: integer
+            peak_open_file_descriptors:
+              type: integer
+            max_file_descriptors:
+              type: integer
+            mem:
+              type: object
+              properties:
+                total_virtual_in_bytes:
+                  type: integer
+            cpu:
+              type: object
+              properties:
+                total_in_millis:
+                  type: integer
+                percent:
+                  type: integer
+                load_average:
+                  type: object
+                  properties:
+                    "1m":
+                      type: number
+
+    ThroughputStats:
+      type: object
+      properties:
+        throughput:
+          description: |
+            This metric is expressed in events-per-second, and is the rate of events this input plugin is pushing into the pipeline’s queue relative to wall-clock time (`events.in` / second). It includes events that are blocked by the queue and have not yet been accepted.
+          allOf: # need to use allOf to keep the description
+            - $ref: "#/components/schemas/FlowWindows"
+    WorkerStats:
+      type: object
+      properties:
+        worker_utilization:
+          description: |
+            This is a unitless metric that indicates the percentage of available worker time being used by this individual plugin (`duration` / (`uptime` * `pipeline.workers`). It is useful for identifying which plugins in a pipeline are using the available worker resources.
+          allOf: # need to use allOf to keep the description
+            - $ref: "#/components/schemas/FlowWindows"
+        worker_millis_per_event:
+          description: |
+            This metric is expressed in worker-millis-spent-per-event (`duration_in_millis` / `events.in`) with higher scores indicating more resources spent per event. It is especially useful for identifying issues with plugins that operate on a small subset of events. An "Infinity" value for a given flow window indicates that worker millis have been spent without any events completing processing; this can indicate a plugin that is either stuck or handling only empty batches.
+          allOf: # need to use allOf to keep the description
+            - $ref: "#/components/schemas/FlowWindows"
+
+    InputPluginEventsStats:
+      type: object
+      properties:
+        out:
+          type: integer
+          format: int64
+        queue_push_duration_in_millis:
+          type: integer
+          format: int64
+    InputPluginStats:
+      type: object
+      properties:
+        id:
+          type: string
+        name:
+          type: string
+        flow:
+          $ref: "#/components/schemas/ThroughputStats"
+        events:
+          $ref: "#/components/schemas/InputPluginEventsStats"
+    FilterOutputPluginEventsStats:
+      type: object
+      properties:
+        in:
+          type: integer
+          format: int64
+        out:
+          type: integer
+          format: int64
+        duration_in_millis:
+          type: integer
+          format: int64
+    FilterOutputPluginStats:
+      type: object
+      properties:
+        id:
+          type: string
+        name:
+          type: string
+        flow:
+          $ref: "#/components/schemas/WorkerStats"
+        events:
+          $ref: "#/components/schemas/FilterOutputPluginEventsStats"
+    CodecPluginStats:
+      type: object
+      properties:
+        id:
+          type: string
+        name:
+          type: string
+        decode:
+          type: object
+          properties:
+            duration_in_millis:
+              type: integer
+            writes_in:
+              type: integer
+            out:
+              type: integer
+        encode:
+          type: object
+          properties:
+            duration_in_millis:
+              type: integer
+            writes_in:
+              type: integer
+
+    PipelinesStats:
+      type: object
+      properties:
+        pipelines:
+          type: object
+          description: |
+            A map where each key is a user-defined pipeline name, and the value contains the metrics for that pipeline.
+          additionalProperties:
+            description: "Metrics of each plugin in the pipeline, flow statistics, event statistics and queue statistics."
+            type: object
+            allOf:
+              - $ref: "#/components/schemas/EventsStats"
+              - $ref: "#/components/schemas/PipelineFlowStats"
+              - type: object
+                properties:
+                  plugins:
+                    type: object
+                    properties:
+                      inputs:
+                        type: array
+                        items:
+                          $ref: "#/components/schemas/InputPluginStats"
+                      codecs:
+                        type: array
+                        items:
+                          $ref: "#/components/schemas/CodecPluginStats"
+                      filters:
+                        type: array
+                        items:
+                          $ref: "#/components/schemas/FilterOutputPluginStats"
+                      outputs:
+                        type: array
+                        items:
+                          $ref: "#/components/schemas/FilterOutputPluginStats"
+              - $ref: "#/components/schemas/PipelineReloadStats"
+              - $ref: "#/components/schemas/PipelineQueueStats"
+              - $ref: "#/components/schemas/PipelineSettings"
+              - type: object
+                properties:
+                  hash:
+                    type: string
+                    description: "A unique hash identifier."
+                  ephemeral_id:
+                    type: string
+                    format: uuid
+                    description: "A temporary unique identifier for the instance."
+
+    PipelineReloadStats:
+      type: object
+      properties:
+        reloads:
+          type: object
+          properties:
+            last_error:
+              type: string
+              nullable: true
+            successes:
+              type: integer
+              format: int64
+            last_success_timestamp:
+              type: string
+              format: date-time
+              nullable: true
+            last_failure_timestamp:
+              type: string
+              format: date-time
+              nullable: true
+            failures:
+              type: integer
+              format: int64
+
+    ReloadStats:
+      type: object
+      properties:
+        reloads:
+          type: object
+          properties:
+            successes:
+              type: integer
+              format: int64
+            failures:
+              type: integer
+              format: int64
+
+    PipelineQueueStats:
+      type: object
+      properties:
+        queue:
+          type: object
+          oneOf:
+            - type: object
+              description: "The metrics of persisted queue."
+              properties:
+                type:
+                  type: string
+                  enum:
+                    - persisted
+                capacity:
+                  type: object
+                  properties:
+                    max_unread_events:
+                      type: integer
+                      format: int64
+                    page_capacity_in_bytes:
+                      type: integer
+                      format: int64
+                    max_queue_size_in_bytes:
+                      type: integer
+                      format: int64
+                    queue_size_in_bytes:
+                      type: integer
+                      format: int64
+                data:
+                  type: object
+                  properties:
+                    path:
+                      type: string
+                    free_space_in_bytes:
+                      type: integer
+                      format: int64
+                    storage_type:
+                      type: string
+                events:
+                  type: integer
+                  format: int64
+                events_count:
+                  type: integer
+                  format: int64
+                queue_size_in_bytes:
+                  type: integer
+                  format: int64
+                max_queue_size_in_bytes:
+                  type: integer
+                  format: int64
+            - type: object
+              description: "The metrics of memory queue."
+              properties:
+                type:
+                  type: string
+                  enum:
+                    - memory
+                events_count:
+                  type: integer
+                  format: int64
+                queue_size_in_bytes:
+                  type: integer
+                  format: int64
+                max_queue_size_in_bytes:
+                  type: integer
+                  format: int64
+          discriminator:
+            propertyName: type
+    QueueStats:
+      type: object
+      properties:
+        queue:
+          type: object
+          properties:
+            events_count:
+              type: integer
+              format: int64
+
+    GeoIPDBLicenseStats:
+      type: object
+      properties:
+        status:
+          type: string
+          enum: [ "init", "up_to_date", "to_be_expired", "expired" ]
+          description: The status of the database license.
+        fail_check_in_days:
+          type: integer
+          description: The number of days since the last successful check.
+        last_updated_at:
+          type: string
+          format: date-time
+          description: The last update timestamp.
\ No newline at end of file
diff --git a/docs/static/spec/openapi/redocly.yaml b/docs/static/spec/openapi/redocly.yaml
new file mode 100644
index 000000000..139a503ba
--- /dev/null
+++ b/docs/static/spec/openapi/redocly.yaml
@@ -0,0 +1,52 @@
+extends:
+  - recommended
+rules:
+# Built-in rules
+ # Descriptions
+  parameter-description: warn
+  tag-description: warn
+  operation-description: off
+ # Document info
+  info-contact: warn
+  info-license: warn
+ # Examples
+  no-invalid-media-type-examples:
+    severity: warn
+    allowAdditionalProperties: false
+  no-invalid-schema-examples:
+    severity: warn
+    allowAdditionalProperties: false
+ # Operations
+  operation-operationId: error
+  operation-operationId-unique: error
+  operation-operationId-url-safe: warn
+  operation-summary: warn
+ # Parameters
+  path-parameters-defined: warn
+ # Paths
+  no-ambiguous-paths: warn
+  no-identical-paths: error
+  path-excludes-patterns:
+    severity: error
+    patterns:
+      - ^\/internal
+ # Responses
+  operation-4xx-response: off
+  operation-2xx-response: off
+ # Schema
+  spec: off
+  spec-strict-refs: off
+ # Tags
+  operation-tag-defined: off
+  tags-alphabetical: off
+  operation-singular-tag: off
+# Custom rules
+  rule/operation-summary-length:
+    subject:
+      type: Operation
+      property: summary
+    message: Operation summary must have a minimum of 5 and maximum of 45 characters
+    severity: warn
+    assertions:
+      maxLength: 45
+      minLength: 5
\ No newline at end of file
diff --git a/docs/static/submitting-a-plugin.asciidoc b/docs/static/submitting-a-plugin.asciidoc
deleted file mode 100644
index 8de77da37..000000000
--- a/docs/static/submitting-a-plugin.asciidoc
+++ /dev/null
@@ -1,107 +0,0 @@
-[[submitting-plugin]]
-=== Submitting your plugin to RubyGems.org and the logstash-plugins repository
-
-Logstash uses http://rubygems.org[RubyGems.org] as its repository for all plugin
-artifacts. Once you have developed your new plugin, you can make it available to
-Logstash users by simply publishing it to RubyGems.org.
-
-==== Licensing
-Logstash and all its plugins are licensed under
-https://github.com/elasticsearch/logstash/blob/master/LICENSE[Apache License, version 2 ("ALv2")].
-If you make your plugin publicly available via http://rubygems.org[RubyGems.org],
-please make sure to have this line in your gemspec:
-
-* `s.licenses = ['Apache License (2.0)']`
-
-==== Publishing to http://rubygems.org[RubyGems.org]
-
-To begin, you’ll need an account on RubyGems.org
-
-* https://rubygems.org/sign_up[Sign-up for a RubyGems account].
-
-After creating an account,
-http://guides.rubygems.org/rubygems-org-api/#api-authorization[obtain] an API
-key from RubyGems.org. By default, RubyGems uses the file `~/.gem/credentials`
-to store your API key. These credentials will be used to publish the gem.
-Replace `username` and `password` with the credentials you created at
-RubyGems.org:
-
-[source,sh]
-----------------------------------
-curl -u username:password https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials
-chmod 0600 ~/.gem/credentials
-----------------------------------
-
-Before proceeding, make sure you have the right version in your gemspec file
-and commit your changes.
-
-* `s.version = '0.1.0'`
-
-To publish version 0.1.0 of your new logstash gem:
-
-[source,sh]
-----------------------------------
-bundle install
-bundle exec rake vendor
-bundle exec rspec
-bundle exec rake publish_gem
-----------------------------------
-
-[NOTE]
-========
-Executing `rake publish_gem`:
-
-. Reads the version from the gemspec file (`s.version = '0.1.0'`)
-. Checks in your local repository if a tag exists for that version. If the tag
-already exists, it aborts the process. Otherwise, it creates a new version tag
-in your local repository.
-. Builds the gem
-. Publishes the gem to RubyGems.org
-========
-
-That's it! Your plugin is published! Logstash users can now install your plugin
-by running:
-
-[source,sh]
-[subs="attributes"]
-----------------------------------
-bin/plugin install logstash-{plugintype}-mypluginname
-----------------------------------
-
-==== Contributing your source code to https://github.com/logstash-plugins[logstash-plugins]
-
-It is not required to contribute your source code to
-https://github.com/logstash-plugins[logstash-plugins] github organization, but
-we always welcome new plugins!
-
-==== Benefits
-
-Some of the many benefits of having your plugin in the logstash-plugins
-repository are:
-
-* **Discovery** Your plugin will appear in the http://www.elasticsearch.org/guide/en/logstash/current/index.html[Logstash Reference],
-where Logstash users look first for plugins and documentation.
-* **Documentation** Your plugin documentation will automatically be added to the
- http://www.elasticsearch.org/guide/en/logstash/current/index.html[Logstash Reference].
-* **Testing** With our testing infrastructure, your plugin will be continuously
-tested against current and future releases of Logstash.  As a result, users will
-have the assurance that if incompatibilities arise, they will be quickly
-discovered and corrected.
-
-==== Acceptance Guidelines
-
-* **Code Review** Your plugin must be reviewed by members of the community for
-coherence, quality, readability, stability and security.
-* **Tests** Your plugin must contain tests to be accepted.  These tests are also
-subject to code review for scope and completeness.  It's ok if you don't know
-how to write tests -- we will guide you. We are working on publishing a guide to
-creating tests for Logstash which will make it easier.  In the meantime, you can
-refer to http://betterspecs.org/ for examples.
-
-To begin migrating your plugin to logstash-plugins, simply create a new
-https://github.com/elasticsearch/logstash/issues[issue] in
-the Logstash repository. When the acceptance guidelines are completed, we will
-facilitate the move to the logstash-plugins organization using the recommended
-https://help.github.com/articles/transferring-a-repository/#transferring-from-a-user-to-an-organization[github process].
-
-
diff --git a/docs/static/transforming-data.asciidoc b/docs/static/transforming-data.asciidoc
deleted file mode 100644
index cc2d67448..000000000
--- a/docs/static/transforming-data.asciidoc
+++ /dev/null
@@ -1,619 +0,0 @@
-[[transformation]]
-== Transforming Data
-
-With over 200 plugins in the Logstash plugin ecosystem, it's sometimes
-challenging to choose the best plugin to meet your data processing needs.
-In this section, we've collected a list of popular plugins and organized them
-according to their processing capabilities:
-
-* <<core-operations>>
-* <<data-deserialization>>
-* <<field-extraction>>
-* <<lookup-enrichment>>
-
-Also see <<filter-plugins>> and <<codec-plugins>> for the full list of available
-data processing plugins.
-
-[[core-operations]]
-=== Performing Core Operations
-
-The plugins described in this section are useful for core operations, such as
-mutating and dropping events.
-
-<<plugins-filters-date,date filter>>::
-
-Parses dates from fields to use as Logstash timestamps for events.
-+
-The following config parses a field called `logdate` to set the Logstash
-timestamp:
-+
-[source,json]
---------------------------------------------------------------------------------
-filter {
-  date {
-    match => [ "logdate", "MMM dd yyyy HH:mm:ss" ]
-  }
-}
---------------------------------------------------------------------------------
-
-
-<<plugins-filters-drop,drop filter>>::
-
-Drops events. This filter is typically used in combination with conditionals.
-+
-The following config drops `debug` level log messages:
-+
-[source,json]
---------------------------------------------------------------------------------
-filter {
-  if [loglevel] == "debug" {
-    drop { }
-  }
-}
---------------------------------------------------------------------------------
-
-
-<<plugins-filters-fingerprint,fingerprint filter>>::
-
-Fingerprints fields by applying a consistent hash.
-+
-The following config fingerprints the `IP`, `@timestamp`, and `message` fields
-and adds the hash to a metadata field called `generated_id`:
-+
-[source,json]
---------------------------------------------------------------------------------
-filter {
-  fingerprint {
-    source => ["IP", "@timestamp", "message"]
-    method => "SHA1"
-    key => "0123"
-    target => "[@metadata][generated_id]"
-  }
-}
---------------------------------------------------------------------------------
-
-
-<<plugins-filters-mutate,mutate filter>>::
-
-Performs general mutations on fields. You can rename, remove, replace, and
-modify fields in your events.
-+
-The following config renames the `HOSTORIP` field to `client_ip`:
-+
-[source,json]
---------------------------------------------------------------------------------
-filter {
-  mutate {
-    rename => { "HOSTORIP" => "client_ip" }
-  }
-}
---------------------------------------------------------------------------------
-+
-The following config strips leading and trailing whitespace from the specified
-fields:
-+
-[source,json]
---------------------------------------------------------------------------------
-filter {
-  mutate {
-    strip => ["field1", "field2"]
-  }
-}
---------------------------------------------------------------------------------
-
-
-<<plugins-filters-ruby,ruby filter>>::
-
-Executes Ruby code.
-+
-The following config executes Ruby code that cancels 90% of the events:
-+
-[source,json]
---------------------------------------------------------------------------------
-filter {
-  ruby {
-    code => "event.cancel if rand <= 0.90"
-  }
-}
---------------------------------------------------------------------------------
-
-
-[[data-deserialization]]
-=== Deserializing Data
-
-The plugins described in this section are useful for deserializing data into
-Logstash events.
-
-<<plugins-codecs-avro,avro codec>>::
-
-Reads serialized Avro records as Logstash events. This plugin deserializes
-individual Avro records. It is not for reading Avro files. Avro files have a
-unique format that must be handled upon input.
-+
-The following config deserializes input from Kafka:
-+
-[source,json]
-----------------------------------
-input {
-  kafka {
-    codec => {
-      avro => {
-        schema_uri => "/tmp/schema.avsc"
-      }
-    }
-  }
-}
-...
-----------------------------------
-
-
-<<plugins-filters-csv,csv filter>>::
-
-Parses comma-separated value data into individual fields. By default, the
-filter autogenerates field names (column1, column2, and so on), or you can specify
-a list of names. You can also change the column separator.
-+
-The following config parses CSV data into the field names specified in the
-`columns` field:
-+
-[source,json]
---------------------------------------------------------------------------------
-filter {
-  csv {
-    separator => ","
-    columns => [ "Transaction Number", "Date", "Description", "Amount Debit", "Amount Credit", "Balance" ]
-  }
-}
---------------------------------------------------------------------------------
-
-<<plugins-codecs-fluent,fluent codec>>::
-
-Reads the Fluentd `msgpack` schema.
-+
-The following config decodes logs received from `fluent-logger-ruby`:
-+
-[source,json]
---------------------------------------------------------------------------------
-input {
-  tcp {
-    codec => fluent
-    port => 4000
-  }
-}
---------------------------------------------------------------------------------
-
-
-<<plugins-codecs-json,json codec>>::
-
-Decodes (via inputs) and encodes (via outputs) JSON formatted content, creating
-one event per element in a JSON array.
-+
-The following config decodes the JSON formatted content in a file:
-+
-[source,json]
---------------------------------------------------------------------------------
-input {
-  file {
-    path => "/path/to/myfile.json"
-    codec =>"json"
-}
---------------------------------------------------------------------------------
-
-
-<<plugins-codecs-protobuf,protobuf codec>>::
-
-Reads protobuf encoded messages and converts them to Logstash events. Requires
-the protobuf definitions to be compiled as Ruby files. You can compile them by
-using the
-https://github.com/codekitchen/ruby-protocol-buffers[ruby-protoc compiler].
-+
-The following config decodes events from a Kafka stream:
-+
-[source,json]
---------------------------------------------------------------------------------
-input
-  kafka {
-    zk_connect => "127.0.0.1"
-    topic_id => "your_topic_goes_here"
-    codec => protobuf {
-      class_name => "Animal::Unicorn"
-      include_path => ['/path/to/protobuf/definitions/UnicornProtobuf.pb.rb']
-    }
-  }
-}
---------------------------------------------------------------------------------
-
-
-<<plugins-filters-xml,xml filter>>::
-
-Parses XML into fields.
-+
-The following config parses the whole XML document stored in the `message` field:
-+
-[source,json]
---------------------------------------------------------------------------------
-filter {
-  xml {
-    source => "message"
-  }
-}
---------------------------------------------------------------------------------
-
-
-[[field-extraction]]
-=== Extracting Fields and Wrangling Data
-
-The plugins described in this section are useful for extracting fields and
-parsing unstructured data into fields.
-
-<<plugins-filters-dissect,dissect filter>>::
-
-Extracts unstructured event data into fields by using delimiters. The dissect
-filter does not use regular expressions and is very fast. However, if the
-structure of the data varies from line to line, the grok filter is more
-suitable.
-+
-For example, let's say you have a log that contains the following message:
-+
-[source,json]
---------------------------------------------------------------------------------
-Apr 26 12:20:02 localhost systemd[1]: Starting system activity accounting tool...
---------------------------------------------------------------------------------
-+
-The following config dissects the message:
-+
-[source,json]
---------------------------------------------------------------------------------
-filter {
-  dissect {
-    mapping => { "message" => "%{ts} %{+ts} %{+ts} %{src} %{prog}[%{pid}]: %{msg}" }
-  }
-}
---------------------------------------------------------------------------------
-+
-After the dissect filter is applied, the event will be dissected into the following
-fields:
-+
-[source,json]
---------------------------------------------------------------------------------
-{
-  "msg"        => "Starting system activity accounting tool...",
-  "@timestamp" => 2017-04-26T19:33:39.257Z,
-  "src"        => "localhost",
-  "@version"   => "1",
-  "host"       => "localhost.localdomain",
-  "pid"        => "1",
-  "message"    => "Apr 26 12:20:02 localhost systemd[1]: Starting system activity accounting tool...",
-  "type"       => "stdin",
-  "prog"       => "systemd",
-  "ts"         => "Apr 26 12:20:02"
-}
---------------------------------------------------------------------------------
-
-<<plugins-filters-kv,kv filter>>::
-
-Parses key-value pairs.
-+
-For example, let's say you have a log message that contains the following
-key-value pairs:
-+
-[source,json]
---------------------------------------------------------------------------------
-ip=1.2.3.4 error=REFUSED
---------------------------------------------------------------------------------
-+
-The following config parses the key-value pairs into fields:
-+
-[source,json]
---------------------------------------------------------------------------------
-filter {
-  kv { }
-}
---------------------------------------------------------------------------------
-+
-After the filter is applied, the event in the example will have these fields:
-+
-* `ip: 1.2.3.4`
-* `error: REFUSED`
-
-
-<<plugins-filters-grok,grok filter>>::
-
-Parses unstructured event data into fields. This tool is perfect for syslog
-logs, Apache and other webserver logs, MySQL logs, and in general, any log
-format that is generally written for humans and not computer consumption.
-Grok works by combining text patterns into something that matches your
-logs.
-+
-For example, let's say you have an HTTP request log that contains
-the following message:
-+
-[source,json]
---------------------------------------------------------------------------------
-55.3.244.1 GET /index.html 15824 0.043
---------------------------------------------------------------------------------
-+
-The following config parses the message into fields:
-+
-[source,json]
---------------------------------------------------------------------------------
-filter {
-  grok {
-    match => { "message" => "%{IP:client} %{WORD:method} %{URIPATHPARAM:request} %{NUMBER:bytes} %{NUMBER:duration}" }
-  }
-}
---------------------------------------------------------------------------------
-+
-After the filter is applied, the event in the example will have these fields:
-+
-* `client: 55.3.244.1`
-* `method: GET`
-* `request: /index.html`
-* `bytes: 15824`
-* `duration: 0.043`
-
-TIP: If you need help building grok patterns, try out the
-{kibana-ref}/xpack-grokdebugger.html[Grok Debugger]. The Grok Debugger is an
-{xpack} feature under the Basic License and is therefore *free to use*.
-
-[[lookup-enrichment]]
-=== Enriching Data with Lookups
-
-The plugins described in this section are useful for enriching data with
-additional info, such as GeoIP and user agent info.
-
-<<plugins-filters-dns,dns filter>>::
-
-Performs a standard or reverse DNS lookup.
-+
-The following config performs a reverse lookup on the address in the
-`source_host` field and replaces it with the domain name:
-+
-[source,json]
---------------------------------------------------------------------------------
-filter {
-  dns {
-    reverse => [ "source_host" ]
-    action => "replace"
-  }
-}
---------------------------------------------------------------------------------
-
-
-<<plugins-filters-elasticsearch,elasticsearch filter>>::
-
-Copies fields from previous log events in Elasticsearch to current events.
-+
-The following config shows a complete example of how this filter might
-be used.  Whenever Logstash receives an "end" event, it uses this Elasticsearch
-filter to find the matching "start" event based on some operation identifier.
-Then it copies the `@timestamp` field from the "start" event into a new field on
-the "end" event.  Finally, using a combination of the date filter and the
-ruby filter, the code in the example calculates the time duration in hours
-between the two events.
-+
-[source,json]
---------------------------------------------------
-      if [type] == "end" {
-         elasticsearch {
-            hosts => ["es-server"]
-            query => "type:start AND operation:%{[opid]}"
-            fields => { "@timestamp" => "started" }
-         }
-         date {
-            match => ["[started]", "ISO8601"]
-            target => "[started]"
-         }
-         ruby {
-            code => 'event.set("duration_hrs", (event.get("@timestamp") - event.get("started")) / 3600) rescue nil'
-         }
-      }
---------------------------------------------------
-
-
-<<plugins-filters-geoip,geoip filter>>::
-
-Adds geographical information about the location of IP addresses. For example:
-+
-[source,json]
---------------------------------------------------------------------------------
-filter {
-  geoip {
-    source => "clientip"
-  }
-}
---------------------------------------------------------------------------------
-+
-After the geoip filter is applied, the event will be enriched with geoip fields.
-For example:
-+
-[source,json]
---------------------------------------------------------------------------------
-          "geoip" => {
-              "timezone" => "Europe/Moscow",
-                    "ip" => "83.149.9.216",
-              "latitude" => 55.7522,
-        "continent_code" => "EU",
-             "city_name" => "Moscow",
-         "country_code2" => "RU",
-          "country_name" => "Russia",
-              "dma_code" => nil,
-         "country_code3" => "RU",
-           "region_name" => "Moscow",
-              "location" => [
-            [0] 37.6156,
-            [1] 55.7522
-        ],
-           "postal_code" => "101194",
-             "longitude" => 37.6156,
-           "region_code" => "MOW"
-    }
---------------------------------------------------------------------------------
-
-
-<<plugins-filters-jdbc_static,jdbc_static filter>>::
-
-Enriches events with data pre-loaded from a remote database.
-+
-The following example fetches data from a remote database, caches it in a local
-database, and uses lookups to enrich events with data cached in the local
-database.
-+
-["source","json",subs="callouts"]
------
-filter {
-  jdbc_static {
-    loaders => [ <1>
-      {
-        id => "remote-servers"
-        query => "select ip, descr from ref.local_ips order by ip"
-        local_table => "servers"
-      },
-      {
-        id => "remote-users"
-        query => "select firstname, lastname, userid from ref.local_users order by userid"
-        local_table => "users"
-      }
-    ]
-    local_db_objects => [ <2>
-      {
-        name => "servers"
-        index_columns => ["ip"]
-        columns => [
-          ["ip", "varchar(15)"],
-          ["descr", "varchar(255)"]
-        ]
-      },
-      {
-        name => "users"
-        index_columns => ["userid"]
-        columns => [
-          ["firstname", "varchar(255)"],
-          ["lastname", "varchar(255)"],
-          ["userid", "int"]
-        ]
-      }
-    ]
-    local_lookups => [ <3>
-      {
-        id => "local-servers"
-        query => "select descr as description from servers WHERE ip = :ip"
-        parameters => {ip => "[from_ip]"}
-        target => "server"
-      },
-      {
-        id => "local-users" 
-        query => "select firstname, lastname from users WHERE userid = :id"
-        parameters => {id => "[loggedin_userid]"}
-        target => "user" <4>
-      }
-    ]
-    # using add_field here to add & rename values to the event root
-    add_field => { server_name => "%{[server][0][description]}" }
-    add_field => { user_firstname => "%{[user][0][firstname]}" } <5>
-    add_field => { user_lastname => "%{[user][0][lastname]}" } <5>
-    remove_field => ["server", "user"]
-    jdbc_user => "logstash"
-    jdbc_password => "example"
-    jdbc_driver_class => "org.postgresql.Driver"
-    jdbc_driver_library => "/tmp/logstash/vendor/postgresql-42.1.4.jar"
-    jdbc_connection_string => "jdbc:postgresql://remotedb:5432/ls_test_2"
-  }
-}
------
-<1> Queries an external database to fetch the dataset that will be cached
-locally.
-<2> Defines the columns, types, and indexes used to build the local database
-structure. The column names and types should match the external database.
-<3> Performs lookup queries on the local database to enrich the events.
-<4> Specifies the event field that will store the looked-up data. If the lookup
-returns multiple columns, the data is stored as a JSON object within the field.
-<5> Takes data from the JSON object and stores it in top-level event fields for
-easier analysis in Kibana.
-
-<<plugins-filters-jdbc_streaming,jdbc_streaming filter>>::
-
-Enriches events with database data.
-+
-The following example executes a SQL query and stores the result set in a field
-called `country_details`:
-+
-[source,json]
---------------------------------------------------------------------------------
-filter {
-  jdbc_streaming {
-    jdbc_driver_library => "/path/to/mysql-connector-java-5.1.34-bin.jar"
-    jdbc_driver_class => "com.mysql.jdbc.Driver"
-    jdbc_connection_string => "jdbc:mysql://localhost:3306/mydatabase"
-    jdbc_user => "me"
-    jdbc_password => "secret"
-    statement => "select * from WORLD.COUNTRY WHERE Code = :code"
-    parameters => { "code" => "country_code"}
-    target => "country_details"
-  }
-}
---------------------------------------------------------------------------------
-
-
-<<plugins-filters-translate,translate filter>>::
-
-Replaces field contents based on replacement values specified in a hash or file.
-Currently supports these file types: YAML, JSON, and CSV.
-+
-The following example takes the value of the `response_code` field, translates
-it to a description based on the values specified in the dictionary, and then
-removes the `response_code` field from the event:
-+
-[source,json]
---------------------------------------------------------------------------------
-filter {
-  translate {
-    field => "response_code"
-    destination => "http_response"
-    dictionary => {
-      "200" => "OK"
-      "403" => "Forbidden"
-      "404" => "Not Found"
-      "408" => "Request Timeout"
-    }
-    remove_field => "response_code"
-  }
-}
---------------------------------------------------------------------------------
-
-
-<<plugins-filters-useragent,useragent filter>>::
-
-Parses user agent strings into fields.
-+
-The following example takes the user agent string in the `agent` field, parses
-it into user agent fields, and adds the user agent fields to a new field called
-`user_agent`. It also removes the original `agent` field:
-+
-[source,json]
---------------------------------------------------------------------------------
-filter {
-  useragent {
-    source => "agent"
-    target => "user_agent"
-    remove_field => "agent"
-  }
-}
---------------------------------------------------------------------------------
-+
-After the filter is applied, the event will be enriched with user agent fields.
-For example:
-+
-[source,json]
---------------------------------------------------------------------------------
-        "user_agent": {
-          "os": "Mac OS X 10.12",
-          "major": "50",
-          "minor": "0",
-          "os_minor": "12",
-          "os_major": "10",
-          "name": "Firefox",
-          "os_name": "Mac OS X",
-          "device": "Other"
-        }
---------------------------------------------------------------------------------
diff --git a/docs/static/troubleshooting.asciidoc b/docs/static/troubleshooting.asciidoc
deleted file mode 100644
index 6e06d0065..000000000
--- a/docs/static/troubleshooting.asciidoc
+++ /dev/null
@@ -1,262 +0,0 @@
-[[troubleshooting]] 
-== Troubleshooting Common Problems
-
-We are adding more troubleshooting tips, so please check back soon. If you
-have something to add, please:
-
-* create an issue at
-https://github.com/elastic/logstash/issues, or
-* create a pull request with your proposed changes at https://github.com/elastic/logstash.
-
-// After merge, update PR link to link directly to this topic in GH
-
-Also check out the https://discuss.elastic.co/c/logstash[Logstash discussion
-forum].
-
-
-[float] 
-[[ts-install]] 
-== Installation and setup
-
-
-[float] 
-[[ts-temp-dir]] 
-=== Inaccessible temp directory
-
-Certain versions of the JRuby runtime and libraries
-in certain plugins (the Netty network library in the TCP input, for example) copy
-executable files to the temp directory. This situation causes subsequent failures when
-`/tmp` is mounted `noexec`. 
-
-*Sample error*
-
------
-[2018-03-25T12:23:01,149][ERROR][org.logstash.Logstash ]
-java.lang.IllegalStateException: org.jruby.exceptions.RaiseException:
-(LoadError) Could not load FFI Provider: (NotImplementedError) FFI not
-available: java.lang.UnsatisfiedLinkError: /tmp/jffi5534463206038012403.so:
-/tmp/jffi5534463206038012403.so: failed to map segment from shared object:
-Operation not permitted
------
-
-*Possible solutions*
-
-* Change setting to mount `/tmp` with `exec`.
-* Specify an alternate directory using the `-Djava.io.tmpdir` setting in the `jvm.options` file.
- 
-
-[float] 
-[[ts-ingest]] 
-== Data ingestion
-
-[float] 
-[[ts-429]] 
-=== Error response code 429
-
-A `429` message indicates that an application is busy handling other requests. For
-example, Elasticsearch sends a `429` code to notify Logstash (or other indexers)
-that the bulk failed because the ingest queue is full. Logstash will retry sending documents.
-
-*Possible actions*
-
-Check {es} to see if it needs attention.
-
-* {ref}/cluster-stats.html
-* {ref}/es-monitoring.html
-
-*Sample error*
-
------
-[2018-08-21T20:05:36,111][INFO ][logstash.outputs.elasticsearch] retrying
-failed action with response code: 429
-({"type"=>"es_rejected_execution_exception", "reason"=>"rejected execution of
-org.elasticsearch.transport.TransportService$7@85be457 on
-EsThreadPoolExecutor[bulk, queue capacity = 200,
-org.elasticsearch.common.util.concurrent.EsThreadPoolExecutor@538c9d8a[Running,
-pool size = 16, active threads = 16, queued tasks = 200, completed tasks =
-685]]"})
------
-
-
-[float] 
-[[ts-performance]] 
-== General performance tuning
-
-For general performance tuning tips and guidelines, see <<performance-tuning>>.
-
-
-
-
-
-
-
-[float] 
-[[ts-kafka]] 
-== Common Kafka support issues and solutions
- 
-[float] 
-[[ts-kafka-timeout]] 
-=== Kafka session timeout issues (input side)
-
-*Symptoms* 
-
-Throughput issues and duplicate event processing {ls} logs warnings:
-
------
-[2017-10-18T03:37:59,302][WARN][org.apache.kafka.clients.consumer.internals.ConsumerCoordinator]
-Auto offset commit failed for group clap_tx1: Commit cannot be completed since
-the group has already rebalanced and assigned the partitions to another member.
------
-
-The time between subsequent calls to `poll()` was longer than the
-configured `session.timeout.ms`, which typically implies that the poll loop is
-spending too much time processing messages. You can address this by
-increasing the session timeout or by reducing the maximum size of batches
-returned in `poll()` with `max.poll.records`. 
-
------
-[INFO][org.apache.kafka.clients.consumer.internals.ConsumerCoordinator] Revoking
-previously assigned partitions [] for group log-ronline-node09
-`[2018-01-29T14:54:06,485][INFO]`[org.apache.kafka.clients.consumer.internals.ConsumerCoordinator]
-Setting newly assigned partitions [elk-pmbr-9] for group log-pmbr 
------
-
-*Background*
-
-Kafka tracks the individual consumers in a consumer group (for example, a number
-of {ls} instances) and tries to give each consumer one or more specific
-partitions of data in the topic they’re consuming. In order to achieve this,
-Kafka tracks whether or not a consumer ({ls} Kafka input thread) is making
-progress on their assigned partition, and reassigns partitions that have not
-made progress in a set timeframe. 
-
-When {ls} requests more events from the Kafka Broker than it can process within
-the timeout, it triggers reassignment of partitions. Reassignment of partitions
-takes time, and can cause duplicate processing of events and significant
-throughput problems. 
-
-*Possible solutions*
-
-* Reduce the number of records per request that {ls} polls from the Kafka Broker in one request,
-* Reduce the number of Kafka input threads, and/or 
-* Increase the relevant timeouts in the Kafka Consumer configuration.
-
-*Details*
-
-The `max_poll_records` option sets the number of records to be pulled in one request.
-If it exceeds the default value of 500, try reducing it. 
-
-The `consumer_threads` option sets the number of input threads. If the value exceeds
-the number of pipeline workers configured in the `logstash.yml` file, it should
-certainly be reduced.  
-If the value is greater than 4, try reducing it to `4` or less if the client has
-the time/resources for it. Try starting with a value of `1`, and then
-incrementing from there to find the optimal performance. 
-
-The `session_timeout_ms` option sets the relevant timeout. Set it to a value
-that ensures that the number of events in `max_poll_records` can be safely
-processed within the time limit. 
-
------
-EXAMPLE
-Pipeline throughput is `10k/s` and `max_poll_records` is set to 1k =>. The value
-must be at least 100ms if `consumer_threads` is set to `1`. If it is set to a
-higher value `n`, then the minimum session timeout increases proportionally to
-`n * 100ms`.
------
-
-In practice the value must be set much higher than the theoretical value because
-the behavior of the outputs and filters in a pipeline follows a distribution.
-The value should also be higher than the maximum time you expect your outputs to
-stall. The default setting is `10s == 10000ms`. If you are experiencing
-periodic problems with an output that can stall because of load or similar
-effects (such as the Elasticsearch output), there is little downside to
-increasing this value significantly to say `60s`. 
-
-From a performance perspective, decreasing the `max_poll_records` value is preferable
-to increasing the timeout value. Increasing the timeout is your only option if the
-client’s issues are caused by periodically stalling outputs. Check logs for
-evidence of stalling outputs, such as `ES output logging status 429`.
-
-[float] 
-[[ts-kafka-many-offset-commits]] 
-=== Large number of offset commits (Kafka input side)
-
-*Symptoms*
-
-Logstash’s Kafka Input is causing a much higher number of commits to
-the offset topic than expected. Often the complaint also mentions redundant
-offset commits where the same offset is committed repeatedly.
-
-*Solution*
-
-For Kafka Broker versions 0.10.2.1 to 1.0.x: The problem is caused by a bug in
-Kafka. https://issues.apache.org/jira/browse/KAFKA-6362 The client’s best option
-is upgrading their Kafka Brokers to version 1.1 or newer. 
-
-For older versions of
-Kafka or if the above does not fully resolve the issue: The problem can also be
-caused by setting the value for `poll_timeout_ms` too low relative to the rate
-at which the Kafka Brokers receive events themselves (or if Brokers periodically
-idle between receiving bursts of events). Increasing the value set for
-`poll_timeout_ms` proportionally decreases the number of offsets commits in
-this scenario. For example, raising it by 10x will lead to 10x fewer offset commits.
-
-
-[float] 
-[[ts-kafka-codec-errors-input]] 
-=== Codec Errors in Kafka Input (before Plugin Version 6.3.4 only) 
-
-*Symptoms*
-
-Logstash Kafka input randomly logs errors from the configured codec and/or reads
-events incorrectly (partial reads, mixing data between multiple events etc.).
-
------
-Log example:  [2018-02-05T13:51:25,773][FATAL][logstash.runner          ] An
-unexpected error occurred! {:error=>#<TypeError: can't convert nil into String>,
-:backtrace=>["org/jruby/RubyArray.java:1892:in `join'",
-"org/jruby/RubyArray.java:1898:in `join'",
-"/usr/share/logstash/logstash-core/lib/logstash/util/buftok.rb:87:in `extract'",
-"/usr/share/logstash/vendor/bundle/jruby/1.9/gems/logstash-codec-line-3.0.8/lib/logstash/codecs/line.rb:38:in
-`decode'",
-"/usr/share/logstash/vendor/bundle/jruby/1.9/gems/logstash-input-kafka-5.1.11/lib/logstash/inputs/kafka.rb:241:in
-`thread_runner'",
-"file:/usr/share/logstash/vendor/jruby/lib/jruby.jar!/jruby/java/java_ext/java.lang.rb:12:in
-`each'",
-"/usr/share/logstash/vendor/bundle/jruby/1.9/gems/logstash-input-kafka-5.1.11/lib/logstash/inputs/kafka.rb:240:in
-`thread_runner'"]} 
------
-
-*Background*
-
-There was a bug in the way the Kafka Input plugin was handling codec instances
-when running on multiple threads (`consumer_threads` set to > 1).
-https://github.com/logstash-plugins/logstash-input-kafka/issues/210 
-
-*Solution*
-
-* Upgrade Kafka Input plugin to v. 6.3.4 or later. 
-* If (and only if) upgrading is not possible, set `consumer_threads` to `1`.
-
-
-[float] 
-[[ts-other]] 
-== Other issues
-
-Coming soon
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/static/upgrading.asciidoc b/docs/static/upgrading.asciidoc
deleted file mode 100644
index 6a7863d0f..000000000
--- a/docs/static/upgrading.asciidoc
+++ /dev/null
@@ -1,103 +0,0 @@
-[[upgrading-logstash]]
-== Upgrading Logstash
-
-[IMPORTANT]
-===========================================
-Before upgrading Logstash:
-
-* Consult the <<breaking-changes,breaking changes>> docs.
-* Test upgrades in a development environment before upgrading your production cluster.
-
-While upgrading Logstash:
-
-* If you use {monitoring}, you must re-use the data directory when you
-upgrade Logstash. Otherwise, the Logstash node is assigned a new persistent UUID
-and becomes a new node in the monitoring data.
-===========================================
-
-If you're upgrading other products in the stack, also read the
-{stack-ref}/index.html[Elastic Stack Installation and Upgrade Guide]. Want an
-upgrade list that's tailored to your stack? Try out our
-{upgrade_guide}[Interactive Upgrade Guide].
-
-See the following topics for information about upgrading Logstash:
-
-* <<upgrading-using-package-managers>>
-* <<upgrading-using-direct-download>>
-* <<upgrading-logstash-pqs>>
-* <<upgrading-logstash-5.0>>
-
-[[upgrading-using-package-managers]]
-=== Upgrading Using Package Managers
-
-This procedure uses <<package-repositories,package managers>> to upgrade Logstash.
-
-1. Shut down your Logstash pipeline, including any inputs that send events to Logstash.
-2. Using the directions in the _Package Repositories_ section, update your repository links to point to the 5.x repositories
-instead of the previous version.
-3. Run the `apt-get upgrade logstash` or `yum update logstash` command as appropriate for your operating system.
-4. Test your configuration file with the `logstash --config.test_and_exit -f <configuration-file>` command. Configuration options for
-some Logstash plugins have changed in the 5.x release.
-5. Restart your Logstash pipeline after updating your configuration file.
-
-[[upgrading-using-direct-download]]
-=== Upgrading Using a Direct Download
-
-This procedure downloads the relevant Logstash binaries directly from Elastic.
-
-1. Shut down your Logstash pipeline, including any inputs that send events to Logstash.
-2. Download the https://www.elastic.co/downloads/logstash[Logstash installation file] that matches your host environment.
-3. Unpack the installation file into your Logstash directory.
-4. Test your configuration file with the `logstash --config.test_and_exit -f <configuration-file>` command. Configuration options for
-some Logstash plugins have changed in the 5.x release.
-5. Restart your Logstash pipeline after updating your configuration file.
-
-[[upgrading-logstash-pqs]]
-=== Upgrading with Persistent Queues Enabled
-
-Upgrading Logstash with persistent queues enabled is supported. The persistent
-queue directory is self-contained and can be read by a new Logstash instance
-running the same pipeline. You can safely shut down the original Logstash
-instance, spin up a new instance, and set `path.queue` in the `logstash.yml`
-<<logstash-settings-file,settings file>> to point to the original queue directory.
-You can also use a mounted drive to make this workflow easier.
-
-Keep in mind that only one Logstash instance can write to `path.queue`. You
-cannot have the original instance and the new instance writing to the queue at
-the same time.
-
-[[upgrading-logstash-5.0]]
-=== Upgrading Logstash to 5.0
-
-Before upgrading Logstash, remember to read the <<breaking-changes,breaking changes>>.
-
-If you are installing Logstash with other components in the Elastic Stack, also see the
-{stack-ref}/index.html[Elastic Stack installation and upgrade documentation].
-
-==== When to Upgrade
-
-Fresh installations can and should start with the same version across the Elastic Stack.
-
-Elasticsearch 5.0 does not require Logstash 5.0. An Elasticsearch 5.0 cluster will happily receive data from a
-Logstash 2.x instance via the default HTTP communication layer. This provides some flexibility to decide when to upgrade
-Logstash relative to an Elasticsearch upgrade. It may or may not be convenient for you to upgrade them together, and it
-is
-not required to be done at the same time as long as Elasticsearch is upgraded first.
-
-You should upgrade in a timely manner to get the performance improvements that come with Logstash 5.0, but do so in
-the way that makes the most sense for your environment.
-
-==== When Not to Upgrade
-
-If any Logstash plugin that you require is not compatible with Logstash 5.0, then you should wait until it is ready
-before upgrading.
-
-Although we make great efforts to ensure compatibility, Logstash 5.0 is not completely backwards compatible. As noted
-in the Elastic Stack upgrade guide, Logstash 5.0 should not be upgraded before Elasticsearch 5.0. This is both
-practical and because some Logstash 5.0 plugins may attempt to use features of Elasticsearch 5.0 that did not exist
-in earlier versions. For example, if you attempt to send the 5.x template to a cluster before Elasticsearch 5.0, then it
-will not be able to use it and all indexing will fail likely fail. If you use your own, custom template with Logstash,
-then this issue can be ignored.
-
-Note the Elasticsearch Output Index Template change in the <<breaking-changes>> documentation for further insight into
-this change and how it impacts operations.
diff --git a/gradle.properties b/gradle.properties
index 6b1823d86..9a8e756f6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,7 @@
+org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
 org.gradle.daemon=false
+
+## from default 30 secs to 2 minutes network timeouts
+systemProp.org.gradle.internal.http.connectionTimeout=120000
+systemProp.org.gradle.internal.http.socketTimeout=120000
+systemProp.org.gradle.internal.http.idleConnectionTimeout=120000
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 28861d273..e6441136f 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 115e6ac0a..b82aa23a4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index cccdd3d51..1aa94a426 100755
--- a/gradlew
+++ b/gradlew
@@ -1,78 +1,127 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,92 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index e95643d6a..7101f8e46 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,4 +1,20 @@
-@if "%DEBUG%" == "" @echo off
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -9,25 +25,29 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -35,48 +55,36 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/lib/bootstrap/bundler.rb b/lib/bootstrap/bundler.rb
index 305fbdc0f..aa34aec17 100644
--- a/lib/bootstrap/bundler.rb
+++ b/lib/bootstrap/bundler.rb
@@ -1,6 +1,22 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
-require "fileutils"
+# work around https://github.com/jruby/jruby/issues/8579
+require_relative './patches/jar_dependencies'
 
 module LogStash
   module Bundler
@@ -15,10 +31,10 @@ module LogStash
         end
       end
 
-      # In recent versions (currently 1.17.1) Bundler calls reset_paths! early during
-      # Bundler::CLI.start (https://github.com/bundler/bundler/blob/v1.17.1/lib/bundler/cli.rb#L39)
+      # In recent versions (currently 1.17.3) Bundler calls reset_paths! early during
+      # Bundler::CLI.start (https://github.com/bundler/bundler/blob/v1.17.3/lib/bundler/cli.rb#L39)
       # This breaks our setting up of gemfile and bundle paths, the without group setting etc
-      # We need to tone down this very aggressive resetter (https://github.com/bundler/bundler/blob/v1.17.1/lib/bundler.rb#L487-L500)
+      # We need to tone down this very aggressive resetter (https://github.com/bundler/bundler/blob/v1.17.3/lib/bundler.rb#L487-L500)
       # So we reimplement it here to only nullify the definition object, so that it can be computed
       # again if necessary with all the configuration in place.
       ::Bundler.module_exec do
@@ -38,7 +54,8 @@ module LogStash
       end
     end
 
-    def setup!(options = {})
+    # prepare bundler's environment variables, but do not invoke ::Bundler::setup
+    def prepare(options = {})
       options = {:without => [:development]}.merge(options)
       options[:without] = Array(options[:without])
 
@@ -57,8 +74,15 @@ module LogStash
       # in the context of Bundler.setup it looks like this is useless here because Gemfile path can only be specified using
       # the ENV, see https://github.com/bundler/bundler/blob/v1.8.3/lib/bundler/shared_helpers.rb#L103
       ::Bundler.settings.set_local(:gemfile, Environment::GEMFILE_PATH)
-
+      ::Bundler.settings.set_local(:frozen, true) unless options[:allow_gemfile_changes]
       ::Bundler.reset!
+    end
+
+    # After +Bundler.setup+ call, all +load+ or +require+ of the gems would be allowed only if they are part of
+    # the Gemfile or Ruby's standard library
+    # To install a new plugin which is not part of Gemfile, DO NOT call setup!
+    def setup!(options = {})
+      prepare(options)
       ::Bundler.setup
     end
 
@@ -79,7 +103,6 @@ module LogStash
                  :jobs => 12, :all => false, :package => false, :without => [:development]}.merge(options)
       options[:without] = Array(options[:without])
       options[:update] = Array(options[:update]) if options[:update]
-
       ::Gem.clear_paths
       ENV['GEM_HOME'] = ENV['GEM_PATH'] = LogStash::Environment.logstash_gem_home
       ::Gem.paths = ENV
@@ -91,15 +114,16 @@ module LogStash
       require "bundler"
       require "bundler/cli"
 
+      require "fileutils"
       # create Gemfile from template iff it does not exist
-      unless ::File.exists?(Environment::GEMFILE_PATH)
+      unless ::File.exist?(Environment::GEMFILE_PATH)
         FileUtils.copy(
           ::File.join(Environment::LOGSTASH_HOME, "Gemfile.template"), Environment::GEMFILE_PATH
         )
       end
       # create Gemfile.jruby-1.9.lock from template iff a template exists it itself does not exist
-      lock_template = ::File.join(ENV["LOGSTASH_HOME"], "Gemfile.jruby-2.5.lock.release")
-      if ::File.exists?(lock_template) && !::File.exists?(Environment::LOCKFILE)
+      lock_template = ::File.join(ENV["LOGSTASH_HOME"], "Gemfile.jruby-3.1.lock.release")
+      if ::File.exist?(lock_template) && !::File.exist?(Environment::LOCKFILE)
         FileUtils.copy(lock_template, Environment::LOCKFILE)
       end
 
@@ -113,12 +137,23 @@ module LogStash
       ::Bundler.settings.set_local(:without, options[:without])
       ::Bundler.settings.set_local(:force, options[:force])
 
-      if !debug?
-        # Will deal with transient network errors
-        execute_bundler_with_retry(options)
-      else
-        options[:verbose] = true
-        execute_bundler(options)
+      # This env setting avoids the warning given when bundler is run as root, as is required
+      # to update plugins when logstash is run as a service
+      # Note: Using `ENV`s here because ::Bundler.settings.set_local or `bundle config`
+      # is not being respected with `Bundler::CLI.start`?
+      # (set_global *does*, but that seems too drastic a change)
+      with_env({"BUNDLE_PATH" => LogStash::Environment::BUNDLE_DIR,
+                "BUNDLE_GEMFILE" => LogStash::Environment::GEMFILE_PATH,
+                "BUNDLE_SILENCE_ROOT_WARNING" => "true",
+                "BUNDLE_WITHOUT" => options[:without].join(":")}) do
+        if !debug?
+          # Will deal with transient network errors
+          execute_bundler_with_retry(options)
+        else
+          options[:verbose] = true
+          execute_bundler(options)
+          ""
+        end
       end
     end
 
@@ -160,16 +195,65 @@ module LogStash
       ::Bundler::CLI.start(bundler_arguments(options))
     end
 
+    def specific_platforms(platforms = ::Gem.platforms)
+      platforms.find_all {|plat| plat.is_a?(::Gem::Platform) && plat.os == 'java' && !plat.cpu.nil?}
+    end
+
+    def genericize_platform
+      output = LogStash::Bundler.invoke!({:add_platform => 'java'})
+      specific_platforms.each do |platform|
+        output << LogStash::Bundler.invoke!({:remove_platform => platform})
+      end
+      output
+    end
+
     def debug?
       ENV["DEBUG"]
     end
 
+    # @param plugin_names [Array] logstash plugin names that are going to update
+    # @return [Array] gem names that plugins depend on, including logstash plugins
+    def expand_logstash_mixin_dependencies(plugin_names); require 'set'
+      plugin_names = Array(plugin_names) if plugin_names.is_a?(String)
+
+      # get gem names in Gemfile.lock. If file doesn't exist, it will be generated
+      lockfile_gems = ::Bundler::definition.specs.to_a.map { |stub_spec| stub_spec.name }.to_set
+
+      # get the array of dependencies which are eligible to update. Bundler unlock these gems in update process
+      # exclude the gems which are not in lock file. They should not be part of unlock gems.
+      # The core libs, logstash-core logstash-core-plugin-api, are not expected to update when user do plugins update
+      # constraining the transitive dependency updates to only those Logstash maintain
+      unlock_libs = plugin_names.flat_map { |plugin_name| fetch_plugin_dependencies(plugin_name) }
+                                .uniq
+                                .select { |lib_name| lockfile_gems.include?(lib_name) }
+                                .select { |lib_name| lib_name.start_with?("logstash-mixin-") }
+
+      unlock_libs + plugin_names
+    end
+
+    # get all dependencies of a single plugin, considering all versions >= current
+    # @param plugin_name [String] logstash plugin name
+    # @return [Array] gem names that plugin depends on
+    def fetch_plugin_dependencies(plugin_name)
+      old_spec = ::Gem::Specification.find_all_by_name(plugin_name).last
+      require_version = old_spec ? ">= #{old_spec.version}" : nil
+      dep = ::Gem::Dependency.new(plugin_name, require_version)
+      new_specs, errors = ::Gem::SpecFetcher.fetcher.spec_for_dependency(dep)
+
+      raise(errors.first.error) if errors.length > 0
+
+      new_specs.map { |spec, source| spec }
+               .flat_map(&:dependencies)
+               .select {|spec| spec.type == :runtime }
+               .map(&:name)
+               .uniq
+    end
+
     # build Bundler::CLI.start arguments array from the given options hash
     # @param option [Hash] the invoke! options hash
     # @return [Array<String>] Bundler::CLI.start string arguments array
     def bundler_arguments(options = {})
       arguments = []
-
       if options[:install]
         arguments << "install"
         arguments << "--clean" if options[:clean]
@@ -177,26 +261,47 @@ module LogStash
           arguments << "--local"
           arguments << "--no-prune" # From bundler docs: Don't remove stale gems from the cache.
         end
+        if options[:force]
+          arguments << "--redownload"
+        end
       elsif options[:update]
         arguments << "update"
-        arguments << options[:update]
+        arguments << expand_logstash_mixin_dependencies(options[:update])
+        arguments << "--#{options[:level] || 'minor'}"
         arguments << "--local" if options[:local]
+        arguments << "--conservative" if options[:conservative]
       elsif options[:clean]
         arguments << "clean"
       elsif options[:package]
         arguments << "package"
         arguments << "--all" if options[:all]
+      elsif options[:add_platform]
+        arguments << "lock"
+        arguments << "--add_platform"
+        arguments << options[:add_platform]
+      elsif options[:remove_platform]
+        arguments << "lock"
+        arguments << "--remove_platform"
+        arguments << options[:remove_platform]
       end
 
       arguments << "--verbose" if options[:verbose]
-
       arguments.flatten
     end
 
-   # capture any $stdout from the passed block. also trap any exception in that block, in which case the trapped exception will be returned
+    def with_env(modifications)
+      backup_env = ENV.to_hash
+      ENV.replace(backup_env.merge(modifications))
+
+      yield
+    ensure
+      ENV.replace(backup_env)
+    end
+
+    # capture any $stdout from the passed block. also trap any exception in that block, in which case the trapped exception will be returned
     # @param [Proc] the code block to execute
     # @return [String, Exception] the captured $stdout string and any trapped exception or nil if none
-    def capture_stdout(&block)
+    def capture_stdout(&block); require 'stringio'
       old_stdout = $stdout
       $stdout = StringIO.new("", "w")
       begin
@@ -209,6 +314,5 @@ module LogStash
     ensure
       $stdout = old_stdout
     end
-
   end
 end
diff --git a/lib/bootstrap/environment.rb b/lib/bootstrap/environment.rb
index 71d99b8ad..47b62dca2 100644
--- a/lib/bootstrap/environment.rb
+++ b/lib/bootstrap/environment.rb
@@ -1,8 +1,23 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # bootstrap.rb contains the minimal code to be able to launch Bundler to eventually be able
 # to retrieve the core code in the logstash-core gem which can live under different paths
 # depending on the launch context (local dev, packaged, etc)
-
 require_relative "bundler"
 require_relative "rubygems"
 require "pathname"
@@ -37,12 +52,12 @@ module LogStash
     end
 
     def oss_only?
-      return true if ENV['OSS']=="true"
+      return true if ENV['OSS'] == "true"
 
-      !File.exists?(File.join(LogStash::Environment::LOGSTASH_HOME, "x-pack"))
+      !File.exist?(File.join(LogStash::Environment::LOGSTASH_HOME, "x-pack"))
     end
 
-    def windows?
+    def win_platform?
       ::Gem.win_platform?
     end
 
@@ -57,19 +72,20 @@ module LogStash
     def pattern_path(path)
       return ::File.join(LOGSTASH_HOME, "patterns", path)
     end
-
   end
 end
 
-# when launched as a script, not require'd, (currently from bin/logstash and bin/logstash-plugin) the first
-# argument is the path of a Ruby file to require and a LogStash::Runner class is expected to be
-# defined and exposing the LogStash::Runner#main instance method which will be called with the current ARGV
-# currently lib/logstash/runner.rb and lib/pluginmanager/main.rb are called using this.
+# when launched as a script, not require'd, (currently from bin/logstash)
 if $0 == __FILE__
-  LogStash::Bundler.setup!({:without => [:build, :development]})
+  bundler_options = {:without => [:build, :development]}
+  ## Check for dev flags - this needs to be done before the runner is invoked to set bundler options
+  if ARGV.include?("--enable-local-plugin-development")
+    bundler_options[:allow_gemfile_changes] = true
+  end
+  LogStash::Bundler.setup!(bundler_options)
   require_relative "patches/jar_dependencies"
 
-  require ARGV.shift
+  require 'logstash/runner'
   exit_status = LogStash::Runner.run("bin/logstash", ARGV)
   exit(exit_status || 0)
 end
diff --git a/lib/bootstrap/patches/gems.rb b/lib/bootstrap/patches/gems.rb
index 94154a513..8c15eeae1 100644
--- a/lib/bootstrap/patches/gems.rb
+++ b/lib/bootstrap/patches/gems.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "gems"
 
 # This patch is necessary to avoid encoding problems when Net:HTTP return stuff in ASCII format, but
@@ -13,4 +29,3 @@ module Gems
     end
   end
 end
-
diff --git a/lib/bootstrap/patches/jar_dependencies.rb b/lib/bootstrap/patches/jar_dependencies.rb
index 2908ab73a..0aaa46941 100644
--- a/lib/bootstrap/patches/jar_dependencies.rb
+++ b/lib/bootstrap/patches/jar_dependencies.rb
@@ -1,15 +1,57 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "jar_dependencies"
 
-def require_jar( *args )
+def require_jar(*args)
   return nil unless Jars.require?
-  result = Jars.require_jar( *args )
+  result = Jars.require_jar(*args)
   if result.is_a? String
-    # JAR_DEBUG=1 will now show theses
-    Jars.debug { "--- jar coordinate #{args[0..-2].join( ':' )} already loaded with version #{result} - omit version #{args[-1]}" }
+    # JARS_VERBOSE=true will show these
+    Jars.debug { "--- jar coordinate #{args[0..-2].join(':')} already loaded with version #{result} - omit version #{args[-1]}" }
     Jars.debug { "    try to load from #{caller.join("\n\t")}" }
     return false
   end
   Jars.debug { "    register #{args.inspect} - #{result == true}" }
   result
 end
+
+# work around https://github.com/jruby/jruby/issues/8579
+# the ruby maven 3.9.3 + maven-libs 3.9.9 gems will output unnecessary text we need to trim down during `load_from_maven`
+# remove everything from "--" until the end of the line
+# the `[...-5]` is just to remove the color changing characters from the end of the string that exist before "--"
+require 'jars/installer'
+
+class ::Jars::Installer
+  def self.load_from_maven(file)
+    Jars.debug { "[load_from_maven] called with arguments: #{file.inspect}" }
+    result = []
+    ::File.read(file).each_line do |line|
+      if line.match?(/ --/)
+        Jars.debug { "[load_from_maven] line: #{line.inspect}" }
+        fixed_line = line.strip.gsub(/ --.+?$/, "")[0...-5]
+        Jars.debug { "[load_from_maven] fixed_line: #{fixed_line.inspect}" }
+        dep = ::Jars::Installer::Dependency.new(fixed_line)
+      else
+        dep = ::Jars::Installer::Dependency.new(line)
+      end
+      result << dep if dep && dep.scope == :runtime
+    end
+    Jars.debug { "[load_from_maven] returned: #{result.inspect}" }
+    result
+  end
+end
diff --git a/lib/bootstrap/patches/remote_fetcher.rb b/lib/bootstrap/patches/remote_fetcher.rb
deleted file mode 100644
index d780d15c4..000000000
--- a/lib/bootstrap/patches/remote_fetcher.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'rubygems/remote_fetcher' 
-
-class Gem::RemoteFetcher
-  def api_endpoint(uri)
-    host = uri.host
-
-    begin
-      res = @dns.getresource "_rubygems._tcp.#{host}",
-                             Resolv::DNS::Resource::IN::SRV
-    rescue Resolv::ResolvError, SocketError => e # patch adds SocketError to list of possible exceptions
-      verbose "Getting SRV record failed: #{e}"
-      uri
-    else
-      target = res.target.to_s.strip
-
-      if /\.#{Regexp.quote(host)}\z/ =~ target
-        return URI.parse "#{uri.scheme}://#{target}#{uri.path}"
-      end
-
-      uri
-    end
-  end
-end
diff --git a/lib/bootstrap/rspec.rb b/lib/bootstrap/rspec.rb
index 4bda1ac38..782455135 100755
--- a/lib/bootstrap/rspec.rb
+++ b/lib/bootstrap/rspec.rb
@@ -1,16 +1,37 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "environment"
 LogStash::Bundler.setup!({:without => [:build]})
 require "logstash-core"
 require "logstash/environment"
 
-$LOAD_PATH.unshift(File.join(LogStash::Environment::LOGSTASH_CORE, "spec"))
+# Bundler + gemspec already setup $LOAD_PATH << '.../lib'
+# but since we load specs from 2 locations we need to hook up these:
+[LogStash::Environment::LOGSTASH_HOME, LogStash::Environment::LOGSTASH_CORE].each do |path|
+  spec_path = File.join(path, "spec")
+  $LOAD_PATH.unshift(spec_path) unless $LOAD_PATH.include?(spec_path)
+end
 
 require "rspec/core"
 require "rspec"
 require 'ci/reporter/rake/rspec_loader'
 
-RSpec.world.reset # if multiple rspec runs occur in a single process, the RSpec "world" state needs to be reset.
+RSpec.clear_examples # if multiple rspec runs occur in a single process, the RSpec "world" state needs to be reset.
 
 status = RSpec::Core::Runner.run(ARGV.empty? ? ($JUNIT_ARGV || ["spec"]) : ARGV).to_i
 if ENV["IS_JUNIT_RUN"]
diff --git a/lib/bootstrap/rubygems.rb b/lib/bootstrap/rubygems.rb
index 985b2cf88..c0fd7dbdb 100644
--- a/lib/bootstrap/rubygems.rb
+++ b/lib/bootstrap/rubygems.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module LogStash
   module Rubygems
     extend self
@@ -13,6 +29,7 @@ module LogStash
       require_relative "patches/gems"
       Gems.versions(plugin)
     end
+
     # Take a gem package and extract it to a specific target
     # @param [String] Gem file, this must be a path
     # @param [String, String] Return a Gem::Package and the installed path
@@ -26,7 +43,7 @@ module LogStash
       # - User build his own gem with a fix
       # - User doesnt increment the version
       # - User install the same version but different code or dependencies multiple times..
-      basename  = ::File.basename(file, '.gem')
+      basename = ::File.basename(file, '.gem')
       unique = SecureRandom.hex(4)
       target_path = ::File.expand_path(::File.join(path, unique, basename))
 
@@ -35,6 +52,5 @@ module LogStash
 
       return [package, target_path]
     end
-
   end
 end
diff --git a/lib/bootstrap/util/compress.rb b/lib/bootstrap/util/compress.rb
index 1d9f04b22..7bac73812 100644
--- a/lib/bootstrap/util/compress.rb
+++ b/lib/bootstrap/util/compress.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "zip"
 require "rubygems/package"
 require "fileutils"
@@ -6,12 +22,10 @@ require "zlib"
 require "stud/temporary"
 
 module LogStash
-
   class CompressError < StandardError; end
 
   module Util
     module Zip
-
       extend self
 
       # Extract a zip file into a destination directory.
@@ -37,7 +51,7 @@ module LogStash
         raise CompressError.new("File #{target} exist") if ::File.exist?(target)
         ::Zip::File.open(target, ::Zip::File::CREATE) do |zipfile|
           Dir.glob("#{dir}/**/*").each do |file|
-            path_in_zip = file.gsub("#{dir}/","")
+            path_in_zip = file.gsub("#{dir}/", "")
             zipfile.add(path_in_zip, file)
           end
         end
@@ -45,7 +59,6 @@ module LogStash
     end
 
     module Tar
-
       extend self
 
       # Extract a tar.gz file into a destination directory.
@@ -81,14 +94,14 @@ module LogStash
         Stud::Temporary.file do |tar_file|
           ::Gem::Package::TarWriter.new(tar_file) do |tar|
             Dir.glob("#{dir}/**/*").each do |file|
-              name = file.gsub("#{dir}/","")
+              name = file.gsub("#{dir}/", "")
               stats = ::File.stat(file)
               mode  = stats.mode
 
               if ::File.directory?(file)
                 tar.mkdir(name, mode)
               else # is a file to be added
-                tar.add_file(name,mode) do |out|
+                tar.add_file(name, mode) do |out|
                   File.open(file, "rb") do |fd|
                     chunk = nil
                     size = 0
diff --git a/lib/pluginmanager/bundler/logstash_injector.rb b/lib/pluginmanager/bundler/logstash_injector.rb
index 33286a74a..2b0597074 100644
--- a/lib/pluginmanager/bundler/logstash_injector.rb
+++ b/lib/pluginmanager/bundler/logstash_injector.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "bootstrap/environment"
 require "bundler"
 require "bundler/definition"
@@ -10,7 +26,6 @@ require "pluginmanager/gemfile"
 require "rubygems/specification"
 require "pathname"
 
-
 # This class cannot be in the logstash namespace, because of the way the DSL
 # class interact with the other libraries
 module Bundler
@@ -77,6 +92,10 @@ module Bundler
 
           builder.eval_gemfile("bundler file", gemfile.generate())
           definition = builder.to_definition(lockfile_path, {})
+          LogStash::Bundler.specific_platforms(definition.platforms).each do |specific_platform|
+            definition.remove_platform(specific_platform)
+          end
+          definition.add_platform(Gem::Platform.new('java'))
           definition.lock(lockfile_path)
           gemfile.save
         rescue => e
diff --git a/lib/pluginmanager/bundler/logstash_uninstall.rb b/lib/pluginmanager/bundler/logstash_uninstall.rb
index d77bd9512..3e32d9ece 100644
--- a/lib/pluginmanager/bundler/logstash_uninstall.rb
+++ b/lib/pluginmanager/bundler/logstash_uninstall.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "bootstrap/environment"
 require "bundler"
 require "bundler/definition"
@@ -18,55 +34,50 @@ module Bundler
       @lockfile_path = lockfile_path
     end
 
-    # To be uninstalled the candidate gems need to be standalone.
-    def dependants_gems(gem_name)
-      builder = Dsl.new
-      builder.eval_gemfile("original gemfile", File.read(gemfile_path))
-      definition = builder.to_definition(lockfile_path, {})
+    def uninstall!(gems_to_remove)
+      gems_to_remove = Array(gems_to_remove)
 
-      definition.specs
-        .select { |spec| spec.dependencies.collect(&:name).include?(gem_name) }
-        .collect(&:name).sort.uniq
-    end
-
-    def uninstall!(gem_name)
-      unfreeze_gemfile do
-
-        dependencies_from = dependants_gems(gem_name)
-
-        if dependencies_from.size > 0
-          display_cant_remove_message(gem_name, dependencies_from)
-          false
-        else
-          remove_gem(gem_name)
-          true
+      unsatisfied_dependency_mapping = Dsl.evaluate(gemfile_path, lockfile_path, {}).specs.each_with_object({}) do |spec, memo|
+        next if gems_to_remove.include?(spec.name)
+        deps = spec.runtime_dependencies.collect(&:name)
+        deps.intersection(gems_to_remove).each do |missing_dependency|
+          memo[missing_dependency] ||= []
+          memo[missing_dependency] << spec.name
         end
       end
+      if unsatisfied_dependency_mapping.any?
+        unsatisfied_dependency_mapping.each { |gem_to_remove, gems_depending_on_removed| display_cant_remove_message(gem_to_remove, gems_depending_on_removed) }
+        LogStash::PluginManager.ui.info("No plugins were removed.")
+        return false
+      end
+
+      with_mutable_gemfile do |gemfile|
+        gems_to_remove.each { |gem_name| gemfile.remove(gem_name) }
+
+        builder = Dsl.new
+        builder.eval_gemfile(::File.join(::File.dirname(gemfile_path), "gemfile to changes"), gemfile.generate)
+
+        # build a definition, providing an intentionally-empty "unlock" mapping
+        # to ensure that all gem versions remain locked
+        definition = builder.to_definition(lockfile_path, {})
+
+        # lock the definition and save our modified gemfile
+        definition.lock(lockfile_path)
+        gemfile.save
+
+        gems_to_remove.each do |gem_name|
+          LogStash::PluginManager.ui.info("Successfully removed #{gem_name}")
+        end
+
+        return true
+      end
     end
 
-    def remove_gem(gem_name)
-      builder = Dsl.new
-      file = File.new(gemfile_path, "r+")
-
-      gemfile = LogStash::Gemfile.new(file).load
-      gemfile.remove(gem_name)
-      builder.eval_gemfile("gemfile to changes", gemfile.generate)
-
-      definition = builder.to_definition(lockfile_path, {})
-      definition.lock(lockfile_path)
-      gemfile.save
-
-      LogStash::PluginManager.ui.info("Successfully removed #{gem_name}")
-    ensure
-      file.close if file
-    end
-
     def display_cant_remove_message(gem_name, dependencies_from)
-        message =<<-eos
-Failed to remove \"#{gem_name}\" because the following plugins or libraries depend on it:
-
-* #{dependencies_from.join("\n* ")}
-        eos
+        message = <<~EOS
+          Failed to remove \"#{gem_name}\" because the following plugins or libraries depend on it:
+          * #{dependencies_from.join("\n* ")}
+        EOS
         LogStash::PluginManager.ui.info(message)
     end
 
@@ -78,10 +89,22 @@ Failed to remove \"#{gem_name}\" because the following plugins or libraries depe
       end
     end
 
-    def self.uninstall!(gem_name, options = { :gemfile => LogStash::Environment::GEMFILE, :lockfile => LogStash::Environment::LOCKFILE })
-      gemfile_path = options[:gemfile]
-      lockfile_path = options[:lockfile]
-      LogstashUninstall.new(gemfile_path, lockfile_path).uninstall!(gem_name)
+    ##
+    # Yields a mutable gemfile backed by an open, writable file handle.
+    # It is the responsibility of the caller to send `LogStash::Gemfile#save` to persist the result.
+    # @yieldparam [LogStash::Gemfile]
+    def with_mutable_gemfile
+      unfreeze_gemfile do
+        File.open(gemfile_path, 'r+') do |file|
+          yield LogStash::Gemfile.new(file).load
+        end
+      end
+    end
+
+    def self.uninstall!(gem_names, options={})
+      gemfile_path = options[:gemfile] || LogStash::Environment::GEMFILE
+      lockfile_path = options[:lockfile] || LogStash::Environment::LOCKFILE
+      LogstashUninstall.new(gemfile_path, lockfile_path).uninstall!(Array(gem_names))
     end
   end
 end
diff --git a/lib/pluginmanager/command.rb b/lib/pluginmanager/command.rb
index fa4d40dc8..5603dc383 100644
--- a/lib/pluginmanager/command.rb
+++ b/lib/pluginmanager/command.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 class LogStash::PluginManager::Command < Clamp::Command
   def gemfile
     @gemfile ||= LogStash::Gemfile.new(File.new(LogStash::Environment::GEMFILE_PATH, 'r+')).load
@@ -22,7 +38,7 @@ class LogStash::PluginManager::Command < Clamp::Command
   end
 
   # Each plugin install for a gemfile create a path with a unique id.
-  # we must clear what is not currently used in the 
+  # we must clear what is not currently used in the
   def remove_unused_locally_installed_gems!
     used_path = gemfile.locally_installed_gems.collect { |gem| gem.options[:path] }
 
@@ -31,6 +47,31 @@ class LogStash::PluginManager::Command < Clamp::Command
     end
   end
 
+  def remove_orphan_dependencies!
+    locked_gem_names = ::Bundler::LockfileParser.new(File.read(LogStash::Environment::LOCKFILE)).specs.map(&:full_name).to_set
+    orphan_gem_specs = ::Gem::Specification.each
+                                           .reject(&:stubbed?) # skipped stubbed (uninstalled) gems
+                                           .reject(&:default_gem?) # don't touch jruby-included default gems
+                                           .reject{ |spec| locked_gem_names.include?(spec.full_name) }
+                                           .sort
+
+    inactive_plugins, orphaned_dependencies = orphan_gem_specs.partition { |spec| LogStash::PluginManager.logstash_plugin_gem_spec?(spec) }
+
+    # uninstall plugins first, to limit damage should one fail to uninstall
+    inactive_plugins.each { |plugin| uninstall_gem!("inactive plugin", plugin) }
+    orphaned_dependencies.each { |dep| uninstall_gem!("orphaned dependency", dep) }
+  end
+
+  def uninstall_gem!(desc, spec)
+    require "rubygems/uninstaller"
+    Gem::DefaultUserInteraction.use_ui(debug? ? Gem::DefaultUserInteraction.ui : Gem::SilentUI.new) do
+      Gem::Uninstaller.new(spec.name, version: spec.version, force: true, executables: true).uninstall
+    end
+    puts "cleaned #{desc} #{spec.name} (#{spec.version})"
+  rescue Gem::InstallError => e
+    report_exception("Failed to uninstall `#{spec.full_name}`", e)
+  end
+
   def relative_path(path)
     require "pathname"
     ::Pathname.new(path).relative_path_from(::Pathname.new(LogStash::Environment::LOGSTASH_HOME)).to_s
diff --git a/lib/pluginmanager/errors.rb b/lib/pluginmanager/errors.rb
index 691c8b675..f506cfb68 100644
--- a/lib/pluginmanager/errors.rb
+++ b/lib/pluginmanager/errors.rb
@@ -1,10 +1,27 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module LogStash module PluginManager
     class PluginManagerError < StandardError; end
     class PluginNotFoundError < PluginManagerError; end
     class UnpackablePluginError < PluginManagerError; end
     class FileNotFoundError < PluginManagerError; end
     class InvalidPackError < PluginManagerError; end
+
     class InstallError < PluginManagerError
       attr_reader :original_exception
 
diff --git a/lib/pluginmanager/gem_installer.rb b/lib/pluginmanager/gem_installer.rb
index 5a770cd9d..e5560a780 100644
--- a/lib/pluginmanager/gem_installer.rb
+++ b/lib/pluginmanager/gem_installer.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/ui"
 require "pathname"
 require "rubygems/package"
@@ -10,7 +26,7 @@ module LogStash module PluginManager
   # - Generate the specifications
   # - Copy the data in the right folders
   class GemInstaller
-    GEM_HOME = Pathname.new(::File.join(LogStash::Environment::BUNDLE_DIR, "jruby", "2.5.0"))
+    GEM_HOME = Pathname.new(::File.join(LogStash::Environment::BUNDLE_DIR, "jruby", "3.1.0"))
     SPECIFICATIONS_DIR = "specifications"
     GEMS_DIR = "gems"
     CACHE_DIR = "cache"
@@ -38,7 +54,13 @@ module LogStash module PluginManager
 
     private
     def spec
-      @gem.spec
+      gem_spec = @gem.spec
+      def gem_spec.for_cache
+        spec = dup
+        spec.test_files = nil
+        spec
+      end
+      gem_spec
     end
 
     def spec_dir
diff --git a/lib/pluginmanager/gemfile.rb b/lib/pluginmanager/gemfile.rb
index d0ab77048..7e295a9fc 100644
--- a/lib/pluginmanager/gemfile.rb
+++ b/lib/pluginmanager/gemfile.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module LogStash
   class GemfileError < StandardError; end
 
@@ -99,7 +115,7 @@ module LogStash
     end
 
     def to_s
-      [sources_to_s, gemspec_to_s, gems_to_s].select{|s| !s.empty?}.join("\n") + "\n"
+      [sources_to_s, gemspec_to_s, gems_to_s].select {|s| !s.empty?}.join("\n") + "\n"
     end
 
     # @return [Gem] found gem or nil if not found
@@ -117,8 +133,8 @@ module LogStash
     # update existing or add new
     def update_gem(_gem)
       if old = find_gem(_gem.name)
-        # always overwrite requirements if specified
-        old.requirements = _gem.requirements unless no_constrains?(_gem.requirements)
+        # always overwrite requirements
+        old.requirements = _gem.requirements
         # but merge options
         old.options = old.options.merge(_gem.options)
       else
@@ -164,21 +180,21 @@ module LogStash
 
     def sources_to_s
       return "" if @sources.empty?
-      @sources.map{|source| "source #{source.inspect}"}.join("\n")
+      @sources.map {|source| "source #{source.inspect}"}.join("\n")
     end
 
     def gems_to_s
       return "" if @gems.empty?
       @gems.map do |gem|
-        requirements = gem.requirements.empty? ? nil : gem.requirements.map{|r| r.inspect}.join(", ")
-        options = gem.options.empty? ? nil : gem.options.map{|k, v| "#{k.inspect} => #{v.inspect}"}.join(", ")
+        requirements = gem.requirements.empty? ? nil : gem.requirements.map {|r| r.inspect}.join(", ")
+        options = gem.options.empty? ? nil : gem.options.map {|k, v| "#{k.inspect} => #{v.inspect}"}.join(", ")
         "gem " + [gem.name.inspect, requirements, options].compact.join(", ")
       end.join("\n")
     end
 
     def gemspec_to_s
       return "" if @gemspec.empty?
-      options = @gemspec.map{|k, v| "#{k.inspect} => #{v.inspect}"}.join(", ")
+      options = @gemspec.map {|k, v| "#{k.inspect} => #{v.inspect}"}.join(", ")
       "gemspec #{options}"
     end
   end
@@ -221,7 +237,7 @@ module LogStash
 
     def initialize(name, requirements = [], options = {})
       @name = name
-      @requirements = requirements.map{|r| r.to_s.strip}.select{|r| !r.empty?}
+      @requirements = requirements.map {|r| r.to_s.strip}.select {|r| !r.empty?}
       @options = options
     end
 
diff --git a/lib/pluginmanager/generate.rb b/lib/pluginmanager/generate.rb
index 6717682e0..b49e2afce 100644
--- a/lib/pluginmanager/generate.rb
+++ b/lib/pluginmanager/generate.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/command"
 require "pluginmanager/templates/render_context"
 require "erb"
@@ -8,7 +24,7 @@ require "pathname"
 
 class LogStash::PluginManager::Generate < LogStash::PluginManager::Command
 
-  TYPES = [ "input", "filter", "output", "codec" ]
+  TYPES = ["input", "filter", "output", "codec"]
 
   option "--type", "TYPE", "Type of the plugin {input, filter, codec, output}s", :required => true
   option "--name", "PLUGIN", "Name of the new plugin", :required => true
@@ -42,17 +58,17 @@ class LogStash::PluginManager::Generate < LogStash::PluginManager::Command
 
   def transform_r(source, target)
     Dir.entries(source).each do |entry|
-      next if [ ".", ".." ].include?(entry)
+      next if [".", ".."].include?(entry)
       source_entry = File.join(source, entry)
       target_entry = File.join(target, entry)
 
       if File.directory?(source_entry)
-        FileUtils.mkdir(target_entry) unless File.exists?(target_entry)
+        FileUtils.mkdir(target_entry) unless File.exist?(target_entry)
         transform_r(source_entry, target_entry)
       else
         # copy the new file, in case of being an .erb file should render first
         if source_entry.end_with?("erb")
-          target_entry = target_entry.gsub(/.erb$/,"").gsub("example", name)
+          target_entry = target_entry.gsub(/.erb$/, "").gsub("example", name)
           File.open(target_entry, "w") { |f| f.write(render(source_entry)) }
         else
           FileUtils.cp(source_entry, target_entry)
@@ -76,13 +92,14 @@ class LogStash::PluginManager::Generate < LogStash::PluginManager::Command
       :author => git_data.author,
       :email  => git_data.email,
       :min_version => "2.0",
+      :logstash_path => File.expand_path('../..', File.dirname(__FILE__))
     }
   end
 
   def get_git_info
     git = OpenStruct.new
-    git.author = %x{ git config --get user.name  }.strip rescue "your_username"
-    git.email  = %x{ git config --get user.email }.strip rescue "your_username@example.com"
+    git.author = %x{git config --get user.name}.strip rescue "your_username"
+    git.email  = %x{git config --get user.email}.strip rescue "your_username@example.com"
     git
   end
 
diff --git a/lib/pluginmanager/install.rb b/lib/pluginmanager/install.rb
index 43631a8c6..d0392f76b 100644
--- a/lib/pluginmanager/install.rb
+++ b/lib/pluginmanager/install.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/command"
 require "pluginmanager/install_strategy_factory"
 require "pluginmanager/ui"
@@ -14,6 +30,7 @@ class LogStash::PluginManager::Install < LogStash::PluginManager::Command
   option "--preserve", :flag, "preserve current gem options", :default => false
   option "--development", :flag, "install all development dependencies of currently installed plugins", :default => false
   option "--local", :flag, "force local-only plugin installation. see bin/logstash-plugin package|unpack", :default => false
+  option "--[no-]conservative", :flag, "do a conservative update of plugin's dependencies", :default => true
 
   # the install logic below support installing multiple plugins with each a version specification
   # but the argument parsing does not support it for now so currently if specifying --version only
@@ -54,13 +71,15 @@ class LogStash::PluginManager::Install < LogStash::PluginManager::Command
       gems = plugins_development_gems
     else
       gems = plugins_gems
-      verify_remote!(gems) if !local? && verify?
+      gems = verify_remote!(gems) if !local? && verify?
     end
 
     check_for_integrations(gems)
+    update_logstash_mixin_dependencies(gems)
     install_gems_list!(gems)
     remove_unused_locally_installed_gems!
     remove_unused_integration_overlaps!
+    remove_orphan_dependencies!
   end
 
   private
@@ -107,12 +126,30 @@ class LogStash::PluginManager::Install < LogStash::PluginManager::Command
   # Check if the specified gems contains
   # the logstash `metadata`
   def verify_remote!(gems)
+    gems_swap = {}
     options = { :rubygems_source => gemfile.gemset.sources }
     gems.each do |plugin, version|
       puts("Validating #{[plugin, version].compact.join("-")}")
       next if validate_plugin(plugin, version, options)
+
+      signal_usage_error("Installs of an alias doesn't require version specification --version") if version
+
+      # if the plugin is an alias then fallback to the original name
+      if LogStash::PluginManager::ALIASES.has_key?(plugin)
+        resolved_plugin = LogStash::PluginManager::ALIASES[plugin]
+        if validate_plugin(resolved_plugin, version, options)
+          puts "Remapping alias #{plugin} to #{resolved_plugin}"
+          gems_swap[plugin] = resolved_plugin
+          next
+        end
+      end
       signal_error("Installation aborted, verification failed for #{plugin} #{version}")
     end
+
+    # substitute in gems the list the alias plugin with the original
+    gems.collect do |plugin, version|
+      [gems_swap.fetch(plugin, plugin), version]
+    end
   end
 
   def validate_plugin(plugin, version, options)
@@ -141,6 +178,28 @@ class LogStash::PluginManager::Install < LogStash::PluginManager::Command
     version ? [plugins_arg << version] : plugins_arg.map { |plugin| [plugin, nil] }
   end
 
+  def local_gem?
+    plugins_arg.any? { |plugin_arg| LogStash::PluginManager.plugin_file?(plugin_arg) }
+  end
+
+  def update_logstash_mixin_dependencies(install_list)
+    return if !verify? || preserve? || development? || local? || local_gem?
+
+    puts "Resolving mixin dependencies"
+    LogStash::Bundler.prepare
+    plugins_to_update = install_list.map(&:first)
+    unlock_dependencies = LogStash::Bundler.expand_logstash_mixin_dependencies(plugins_to_update) - plugins_to_update
+
+    if unlock_dependencies.any?
+      puts "Updating mixin dependencies #{unlock_dependencies.join(', ')}"
+      LogStash::Bundler.invoke! update: unlock_dependencies,
+                                rubygems_source: gemfile.gemset.sources,
+                                conservative: conservative?
+    end
+
+    unlock_dependencies
+  end
+
   # install_list will be an array of [plugin name, version, options] tuples, version it
   # can be nil at this point we know that plugins_arg is not empty and if the
   # --version is specified there is only one plugin in plugins_arg
@@ -155,7 +214,9 @@ class LogStash::PluginManager::Install < LogStash::PluginManager::Command
       plugin_gem = gemfile.find(plugin)
       if preserve?
         puts("Preserving Gemfile gem options for plugin #{plugin}") if plugin_gem && !plugin_gem.options.empty?
-        gemfile.update(plugin, version, options)
+        # if the plugin exists and no version was specified, keep the existing requirements
+        requirements = (plugin_gem && version.nil? ? plugin_gem.requirements : [version]).compact
+        gemfile.update(plugin, *requirements, options)
       else
         gemfile.overwrite(plugin, version, options)
       end
@@ -168,9 +229,12 @@ class LogStash::PluginManager::Install < LogStash::PluginManager::Command
     bundler_options[:without] = [] if development?
     bundler_options[:rubygems_source] = gemfile.gemset.sources
     bundler_options[:local] = true if local?
-
-    output = LogStash::Bundler.invoke!(bundler_options)
-
+    output = nil
+    # Unfreeze the bundle when installing gems
+    Bundler.settings.temporary({:frozen => false}) do
+      output = LogStash::Bundler.invoke!(bundler_options)
+      output << LogStash::Bundler.genericize_platform.to_s
+    end
     puts("Installation successful")
   rescue => exception
     gemfile.restore!
diff --git a/lib/pluginmanager/install_strategy_factory.rb b/lib/pluginmanager/install_strategy_factory.rb
index 81da776e1..01e657305 100644
--- a/lib/pluginmanager/install_strategy_factory.rb
+++ b/lib/pluginmanager/install_strategy_factory.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/ui"
 require "pluginmanager/x_pack_interceptor"
 require "pluginmanager/pack_fetch_strategy/repository"
diff --git a/lib/pluginmanager/list.rb b/lib/pluginmanager/list.rb
index c87332bd3..c5f5bab1f 100644
--- a/lib/pluginmanager/list.rb
+++ b/lib/pluginmanager/list.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'rubygems/spec_fetcher'
 require "pluginmanager/command"
 
@@ -7,6 +23,7 @@ class LogStash::PluginManager::List < LogStash::PluginManager::Command
   parameter "[PLUGIN]", "Part of plugin name to search for, leave empty for all plugins"
 
   option "--installed", :flag, "List only explicitly installed plugins using bin/logstash-plugin install ...", :default => false
+  option "--[no-]expand", :flag, "Expand integration plugins and aliases", :default => true
   option "--verbose", :flag, "Also show plugin version number", :default => false
   option "--group", "NAME", "Filter plugins per group: input, output, filter, codec or integration" do |arg|
     raise(ArgumentError, "should be one of: input, output, filter, codec, integration") unless ['input', 'output', 'filter', 'codec', 'pack', 'integration'].include?(arg)
@@ -18,32 +35,44 @@ class LogStash::PluginManager::List < LogStash::PluginManager::Command
 
     signal_error("No plugins found") if filtered_specs.empty?
 
-    filtered_specs.sort_by{|spec| spec.name}.each do |spec|
+    installed_plugin_names = filtered_specs.collect {|spec| spec.name}
+
+    filtered_specs.sort_by {|spec| spec.name}.each do |spec|
       line = "#{spec.name}"
       line += " (#{spec.version})" if verbose?
       puts(line)
-      if spec.metadata.fetch("logstash_group", "") == "integration"
-        integration_plugins = spec.metadata.fetch("integration_plugins", "").split(",")
-        integration_plugins.each_with_index do |integration_plugin, i|
-          if i == integration_plugins.size - 1
-            puts(" └── #{integration_plugin}")
-          else
-            puts(" ├── #{integration_plugin}")
-          end
+      if expand?
+        active_aliases = LogStash::PluginManager.find_aliases(spec.name)
+                                                .reject {|alias_name| installed_plugin_names.include?(alias_name)}
+        display_children(active_aliases.map {|alias_name| "#{alias_name} (alias)"})
+
+        if spec.metadata.fetch("logstash_group", "") == "integration"
+          integration_plugins = spec.metadata.fetch("integration_plugins", "").split(",")
+          display_children(integration_plugins)
         end
       end
     end
   end
 
+  def display_children(children)
+    if children.any?
+      most, last = children[0...-1], children[-1]
+      most.each do |entry|
+        puts(" ├── #{entry}")
+      end
+      puts(" └── #{last}")
+    end
+  end
+
   def filtered_specs
     @filtered_specs ||= begin
                           # start with all locally installed plugin gems regardless of the Gemfile content
                           specs = LogStash::PluginManager.find_plugins_gem_specs
 
                           # apply filters
-                          specs = specs.select{|spec| gemfile.find(spec.name)} if installed?
-                          specs = specs.select{|spec| spec_matches_search?(spec) } if plugin
-                          specs = specs.select{|spec| spec.metadata['logstash_group'] == group} if group
+                          specs = specs.select {|spec| gemfile.find(spec.name)} if installed?
+                          specs = specs.select {|spec| spec_matches_search?(spec) } if plugin
+                          specs = specs.select {|spec| spec.metadata['logstash_group'] == group} if group
 
                           specs
                         end
diff --git a/lib/pluginmanager/main.rb b/lib/pluginmanager/main.rb
index 598df0d38..5be3b9a83 100644
--- a/lib/pluginmanager/main.rb
+++ b/lib/pluginmanager/main.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 $LOAD_PATH.unshift(File.expand_path(File.join(__FILE__, "..", "..")))
 
 require "bootstrap/environment"
diff --git a/lib/pluginmanager/offline_plugin_packager.rb b/lib/pluginmanager/offline_plugin_packager.rb
index c4cd6cf24..305adb588 100644
--- a/lib/pluginmanager/offline_plugin_packager.rb
+++ b/lib/pluginmanager/offline_plugin_packager.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/ui"
 require "pluginmanager/errors"
 require "bootstrap/environment"
@@ -66,7 +82,7 @@ module LogStash module PluginManager
         if specs.size > 0
           specs
         else
-          raise LogStash::PluginManager::PluginNotFoundError, "Cannot find plugins matching: `#{plugin_pattern}`"
+          raise LogStash::PluginManager::PluginNotFoundError, "Cannot find plugins matching: `#{plugin_pattern}`. Please install these before creating the offline pack"
         end
       end.flatten
     end
diff --git a/lib/pluginmanager/pack.rb b/lib/pluginmanager/pack.rb
index 2f0072819..94a74db3b 100644
--- a/lib/pluginmanager/pack.rb
+++ b/lib/pluginmanager/pack.rb
@@ -1,9 +1,25 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "pack_command"
 
 class LogStash::PluginManager::Pack < LogStash::PluginManager::PackCommand
-  option "--tgz", :flag, "compress package as a tar.gz file", :default => !LogStash::Environment.windows?
-  option "--zip", :flag, "compress package as a zip file", :default => LogStash::Environment.windows?
+  option "--tgz", :flag, "compress package as a tar.gz file", :default => !LogStash::Environment.win_platform?
+  option "--zip", :flag, "compress package as a zip file", :default => LogStash::Environment.win_platform?
   option "--[no-]clean", :flag, "clean up the generated dump of plugins", :default => true
   option "--overwrite", :flag, "Overwrite a previously generated package file", :default => false
 
@@ -25,7 +41,7 @@ class LogStash::PluginManager::Pack < LogStash::PluginManager::PackCommand
   def delete_target_file?
     return true if overwrite?
     puts("File #{target_file} exist, do you want to overwrite it? (Y/N)")
-    ( "y" == STDIN.gets.strip.downcase ? true : false)
+    ("y" == STDIN.gets.strip.downcase ? true : false)
   end
 
   def validate_target_file
diff --git a/lib/pluginmanager/pack_command.rb b/lib/pluginmanager/pack_command.rb
index 3f4ed0b38..2113a8bd4 100644
--- a/lib/pluginmanager/pack_command.rb
+++ b/lib/pluginmanager/pack_command.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "bootstrap/util/compress"
 require "fileutils"
 
@@ -12,7 +28,7 @@ class LogStash::PluginManager::PackCommand < LogStash::PluginManager::Command
   end
 
   def signal_deprecation_warning_for_pack
-  message =<<-EOS
+  message = <<-EOS
 The pack and the unpack command are now deprecated and will be removed in a future version of Logstash.
 See the `prepare-offline-pack` to update your workflow. You can get documentation about this by running `bin/logstash-plugin prepare-offline-pack --help`
   EOS
diff --git a/lib/pluginmanager/pack_fetch_strategy/repository.rb b/lib/pluginmanager/pack_fetch_strategy/repository.rb
index 52d1e3cee..dd13f9a20 100644
--- a/lib/pluginmanager/pack_fetch_strategy/repository.rb
+++ b/lib/pluginmanager/pack_fetch_strategy/repository.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # In the context of the plugin manager no dependencies are currently loaded.
 # So we have to manually require the version file
 require_relative "../../../logstash-core/lib/logstash/version"
diff --git a/lib/pluginmanager/pack_fetch_strategy/uri.rb b/lib/pluginmanager/pack_fetch_strategy/uri.rb
index 9dfc19828..3c296a01d 100644
--- a/lib/pluginmanager/pack_fetch_strategy/uri.rb
+++ b/lib/pluginmanager/pack_fetch_strategy/uri.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/utils/http_client"
 require "pluginmanager/pack_installer/local"
 require "pluginmanager/pack_installer/remote"
@@ -11,7 +27,7 @@ module LogStash module PluginManager module PackFetchStrategy
     class << self
       def get_installer_for(plugin_name)
         begin
-          uri =  URI.parse(plugin_name)
+          uri = URI.parse(plugin_name)
 
           if local?(uri)
             PluginManager.ui.debug("Local file: #{uri.path}")
diff --git a/lib/pluginmanager/pack_installer/local.rb b/lib/pluginmanager/pack_installer/local.rb
index d5df1f1c5..7d7f82892 100644
--- a/lib/pluginmanager/pack_installer/local.rb
+++ b/lib/pluginmanager/pack_installer/local.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/ui"
 require "pluginmanager/bundler/logstash_injector"
 require "pluginmanager/gem_installer"
diff --git a/lib/pluginmanager/pack_installer/pack.rb b/lib/pluginmanager/pack_installer/pack.rb
index 3090472db..fd3c67ea6 100644
--- a/lib/pluginmanager/pack_installer/pack.rb
+++ b/lib/pluginmanager/pack_installer/pack.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/errors"
 
 module LogStash module PluginManager module PackInstaller
@@ -23,7 +39,7 @@ module LogStash module PluginManager module PackInstaller
     class GemInformation
       EXTENSION = ".gem"
       SPLIT_CHAR = "-"
-      JAVA_PLATFORM_RE = /-java/
+      JAVA_PLATFORM_RE = /-java$/
       DEPENDENCIES_DIR_RE = /dependencies/
 
       attr_reader :file, :name, :version, :platform
diff --git a/lib/pluginmanager/pack_installer/remote.rb b/lib/pluginmanager/pack_installer/remote.rb
index 37cb52973..8e60e0e75 100644
--- a/lib/pluginmanager/pack_installer/remote.rb
+++ b/lib/pluginmanager/pack_installer/remote.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/pack_installer/local"
 require "pluginmanager/utils/downloader"
 require "fileutils"
diff --git a/lib/pluginmanager/prepare_offline_pack.rb b/lib/pluginmanager/prepare_offline_pack.rb
index 0860c3b60..11446a30f 100644
--- a/lib/pluginmanager/prepare_offline_pack.rb
+++ b/lib/pluginmanager/prepare_offline_pack.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/command"
 require "pluginmanager/errors"
 
@@ -29,7 +45,7 @@ class LogStash::PluginManager::PrepareOfflinePack < LogStash::PluginManager::Com
         signal_error("Package creation cancelled: You must specify the zip extension for the provided filename: #{output}.")
       end
 
-      if ::File.exists?(output)
+      if ::File.exist?(output)
         if overwrite?
           File.delete(output)
         else
@@ -60,7 +76,7 @@ You need to specify at least one plugin or use a wildcard expression.
 
 Examples:
 bin/logstash-plugin prepare-offline-pack logstash-input-beats
-bin/logstash-plugin prepare-offline-pack logstash-filter-jdbc logstash-input-beats
+bin/logstash-plugin prepare-offline-pack logstash-filter-kv logstash-input-beats
 bin/logstash-plugin prepare-offline-pack logstash-filter-*
 bin/logstash-plugin prepare-offline-pack logstash-filter-* logstash-input-beats
 
@@ -73,4 +89,3 @@ EOS
     end
   end
 end
-
diff --git a/lib/pluginmanager/proxy_support.rb b/lib/pluginmanager/proxy_support.rb
index 14688c80a..88430591f 100644
--- a/lib/pluginmanager/proxy_support.rb
+++ b/lib/pluginmanager/proxy_support.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "uri"
 require "java"
 require "erb"
@@ -7,7 +23,6 @@ require "fileutils"
 require "stud/temporary"
 require "jar-dependencies"
 
-
 # This is a bit of a hack, to make sure that all of our call pass to a specific proxies.
 # We do this before any jar-dependences check is done, meaning we have to silence him.
 module Jars
@@ -40,8 +55,8 @@ def apply_env_proxy_settings(settings)
   scheme = settings[:protocol].downcase
   java.lang.System.setProperty("#{scheme}.proxyHost", settings[:host])
   java.lang.System.setProperty("#{scheme}.proxyPort", settings[:port].to_s)
-  java.lang.System.setProperty("#{scheme}.proxyUsername", settings[:username].to_s)
-  java.lang.System.setProperty("#{scheme}.proxyPassword", settings[:password].to_s)
+  java.lang.System.setProperty("#{scheme}.proxyUser", settings[:username].to_s)
+  java.lang.System.setProperty("#{scheme}.proxyPass", settings[:password].to_s)
 end
 
 def extract_proxy_values_from_uri(proxy_uri)
@@ -97,11 +112,11 @@ def configure_proxy
     FileUtils.mkdir_p(SETTINGS_TARGET)
     target = ::File.join(SETTINGS_TARGET, "settings.xml")
     template = ::File.read(SETTINGS_TEMPLATE)
-    template_content = ERB.new(template, 3).result(ProxyTemplateData.new(proxies).get_binding)
+    template_content = ERB.new(template).result(ProxyTemplateData.new(proxies).get_binding)
 
     if ::File.exist?(target)
       if template_content != ::File.read(target)
-        puts "WARNING: A maven settings file already exist at #{target}, please review the content to make sure it include your proxies configuration."
+        puts "WARNING: A maven settings file already exist at #{target}, please review the content to make sure it includes your proxies configuration."
       end
     else
       ::File.open(target, "w") { |f| f.write(template_content) }
diff --git a/lib/pluginmanager/remove.rb b/lib/pluginmanager/remove.rb
index f193bcd52..48d832abc 100644
--- a/lib/pluginmanager/remove.rb
+++ b/lib/pluginmanager/remove.rb
@@ -1,37 +1,73 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/bundler/logstash_uninstall"
 require "pluginmanager/x_pack_interceptor.rb"
 require "pluginmanager/command"
 
 class LogStash::PluginManager::Remove < LogStash::PluginManager::Command
-  parameter "PLUGIN", "plugin name"
+  parameter "PLUGIN ...", "plugin name(s)"
 
   def execute
+    signal_error("One or more plugins must be specified") if plugin_list.empty?
     signal_error("File #{LogStash::Environment::GEMFILE_PATH} does not exist or is not writable, aborting") unless File.writable?(LogStash::Environment::GEMFILE_PATH)
 
-    ##
-    # Need to setup the bundler status to enable uninstall of plugins
-    # installed as local_gems, otherwise gem:specification is not
-    # finding the plugins
-    ##
-    LogStash::Bundler.setup!({:without => [:build, :development]})
+    LogStash::Bundler.prepare({:without => [:build, :development]})
 
-    # If a user is attempting to uninstall X-Pack, present helpful output to guide
-    # them toward the OSS-only distribution of Logstash
-    LogStash::PluginManager::XPackInterceptor::Remove.intercept!(plugin)
+    plugin_list.each do |plugin|
+      if LogStash::PluginManager::ALIASES.has_key?(plugin)
+        unless LogStash::PluginManager.installed_plugin?(plugin, gemfile)
+          aliased_plugin = LogStash::PluginManager::ALIASES[plugin]
+          puts "Cannot remove the alias #{plugin}, which is an alias for #{aliased_plugin}; if you wish to remove it, you must remove the aliased plugin instead."
+          return
+        end
+      end
 
-    # if the plugin is provided by an integration plugin. abort.
-    if integration_plugin = LogStash::PluginManager.which_integration_plugin_provides(plugin, gemfile)
-      signal_error("This plugin is already provided by '#{integration_plugin.name}' so it can't be removed individually")
+      # If a user is attempting to uninstall X-Pack, present helpful output to guide
+      # them toward the OSS-only distribution of Logstash
+      LogStash::PluginManager::XPackInterceptor::Remove.intercept!(plugin)
+
+      # if the plugin is provided by an integration plugin. abort.
+      if integration_plugin = LogStash::PluginManager.which_integration_plugin_provides(plugin, gemfile)
+        signal_error("The plugin `#{plugin}` is provided by '#{integration_plugin.name}' so it can't be removed individually")
+      end
+
+      not_installed_message = "The plugin `#{plugin}` has not been previously installed"
+      plugin_gem_spec = LogStash::PluginManager.find_plugins_gem_specs(plugin).any?
+      if plugin_gem_spec
+        # make sure this is an installed plugin and present in Gemfile.
+        # it is not possible to uninstall a dependency not listed in the Gemfile, for example a dependent codec
+        signal_error(not_installed_message) unless LogStash::PluginManager.installed_plugin?(plugin, gemfile)
+      else
+        # locally installed plugins are not recoginized by ::Gem::Specification
+        # we may ::Bundler.setup to reload but it resets all dependencies so we get error message for future bundler operations
+        # error message: `Bundler::GemNotFound: Could not find rubocop-1.60.2... in locally installed gems`
+        # instead we make sure Gemfile has a definition and ::Gem::Specification recognizes local gem
+        signal_error(not_installed_message) unless !!gemfile.find(plugin)
+
+        local_gem = gemfile.locally_installed_gems.detect { |local_gem| local_gem.name == plugin }
+        signal_error(not_installed_message) unless local_gem
+      end
     end
 
-    # make sure this is an installed plugin and present in Gemfile.
-    # it is not possible to uninstall a dependency not listed in the Gemfile, for example a dependent codec
-    signal_error("This plugin has not been previously installed") unless LogStash::PluginManager.installed_plugin?(plugin, gemfile)
-
-    exit(1) unless ::Bundler::LogstashUninstall.uninstall!(plugin)
-
+    exit(1) unless ::Bundler::LogstashUninstall.uninstall!(plugin_list)
+    LogStash::Bundler.genericize_platform
     remove_unused_locally_installed_gems!
+    remove_orphan_dependencies!
   rescue => exception
     report_exception("Operation aborted, cannot remove plugin", exception)
   end
diff --git a/lib/pluginmanager/templates/codec-plugin/.ruby-version b/lib/pluginmanager/templates/codec-plugin/.ruby-version
new file mode 120000
index 000000000..67c664308
--- /dev/null
+++ b/lib/pluginmanager/templates/codec-plugin/.ruby-version
@@ -0,0 +1 @@
+../../../../.ruby-version
\ No newline at end of file
diff --git a/lib/pluginmanager/templates/codec-plugin/Gemfile b/lib/pluginmanager/templates/codec-plugin/Gemfile
deleted file mode 100644
index 06618cefa..000000000
--- a/lib/pluginmanager/templates/codec-plugin/Gemfile
+++ /dev/null
@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
diff --git a/lib/pluginmanager/templates/codec-plugin/Gemfile.erb b/lib/pluginmanager/templates/codec-plugin/Gemfile.erb
new file mode 100644
index 000000000..857ba5949
--- /dev/null
+++ b/lib/pluginmanager/templates/codec-plugin/Gemfile.erb
@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+gemspec
+
+logstash_path = ENV['LOGSTASH_PATH'] || '<%= logstash_path %>'
+
+if Dir.exist?(logstash_path)
+  gem 'logstash-core', :path => "#{logstash_path}/logstash-core"
+  gem 'logstash-core-plugin-api', :path => "#{logstash_path}/logstash-core-plugin-api"
+end
diff --git a/lib/pluginmanager/templates/codec-plugin/README.md b/lib/pluginmanager/templates/codec-plugin/README.md
index a75e88df9..31ac2be8f 100644
--- a/lib/pluginmanager/templates/codec-plugin/README.md
+++ b/lib/pluginmanager/templates/codec-plugin/README.md
@@ -13,7 +13,7 @@ Logstash provides infrastructure to automatically generate documentation for thi
 
 ## Need Help?
 
-Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum.
+Need help? Try the https://discuss.elastic.co/c/logstash discussion forum.
 
 ## Developing
 
@@ -83,4 +83,4 @@ Programming is not a required skill. Whatever you've seen about open source and
 
 It is more important to the community that you are able to contribute.
 
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.
+For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/main/CONTRIBUTING.md) file.
diff --git a/lib/pluginmanager/templates/codec-plugin/docs/index.asciidoc b/lib/pluginmanager/templates/codec-plugin/docs/index.asciidoc
new file mode 100644
index 000000000..e9c5cbb80
--- /dev/null
+++ b/lib/pluginmanager/templates/codec-plugin/docs/index.asciidoc
@@ -0,0 +1,102 @@
+:plugin: example
+:type: codec
+// Update header with plugin name
+
+///////////////////////////////////////////
+START - GENERATED VARIABLES, DO NOT EDIT!
+///////////////////////////////////////////
+:version: %VERSION%
+:release_date: %RELEASE_DATE%
+:changelog_url: %CHANGELOG_URL%
+:include_path: ../../../../logstash/docs/include
+///////////////////////////////////////////
+END - GENERATED VARIABLES, DO NOT EDIT!
+///////////////////////////////////////////
+
+[id="plugins-{type}s-{plugin}"]
+
+=== Example codec plugin
+
+include::{include_path}/plugin_header.asciidoc[]
+
+==== Description
+
+Add plugin description here
+
+// Format anchors and links to support generated ids for versioning
+// Sample anchor: [id="plugins-{type}s-{plugin}-setting_name"]
+// Sample link: <<plugins-{type}s-{plugin}-setting_name>>
+
+[id="plugins-{type}s-{plugin}-options"]
+==== Example Codec Configuration Options
+
+[cols="<,<,<",options="header",]
+|=======================================================================
+|Setting |Input type|Required
+| <<plugins-{type}s-{plugin}-a_setting_name>> |<<boolean,boolean>>|No
+| <<plugins-{type}s-{plugin}-another_setting_name>> |<<hash,hash>>|No
+| <<plugins-{type}s-{plugin}-setting_name_3>> |<<string,string>>|No
+| <<plugins-{type}s-{plugin}-setting_name_4>> |<<number,number>>|No
+| <<plugins-{type}s-{plugin}-setting_name_5>> |<<array,array>>|No
+| <<plugins-{type}s-{plugin}-setting_name_6>> |<<bytes,bytes>>|No
+| <<plugins-{type}s-{plugin}-setting_name_7>> |<<path,path>>|No
+|=======================================================================
+
+[id="plugins-{type}s-{plugin}-a_setting_name"]
+===== `a_setting_name` 
+
+  * Value type is <<boolean,boolean>>
+  * Default value is `true`
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-another_setting_name"]
+===== `another_setting_name` 
+
+  * Value type is <<hash,hash>>
+  * Default value is `{}`
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-setting_name_3"]
+===== `setting_name_3` 
+
+  * Value type is <<string,string>>
+  * Default value is `{}`
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-setting_name_4"]
+===== `setting_name_4` 
+
+  * Value type is <<number,number>>
+  * Default value is `0`
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-setting_name_5"]
+===== `setting_name_5` 
+
+  * Value type is <<array,array>>
+  * Default value is {}
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-setting_name_6"]
+===== `setting_name_6` 
+
+  * Value type is <<bytes,bytes>>
+  * Default value is {}
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-setting_name_7"]
+===== `setting_name_7` 
+
+  * Value type is <<path,path>>
+  * Default value is {}
+
+Add description here
+
+// The full list of Value Types is here: 
+// https://www.elastic.co/guide/en/logstash/current/configuration-file-structure.html
diff --git a/lib/pluginmanager/templates/codec-plugin/lib/logstash/codecs/example.rb.erb b/lib/pluginmanager/templates/codec-plugin/lib/logstash/codecs/example.rb.erb
index 5fb97fec1..a534a6f59 100644
--- a/lib/pluginmanager/templates/codec-plugin/lib/logstash/codecs/example.rb.erb
+++ b/lib/pluginmanager/templates/codec-plugin/lib/logstash/codecs/example.rb.erb
@@ -1,19 +1,19 @@
 # encoding: utf-8
 require "logstash/codecs/base"
 
-# This <%= @plugin_name %> codec will append a string to the message field
+# This <%= plugin_name %> codec will append a string to the message field
 # of an event, either in the decoding or encoding methods
 #
 # This is only intended to be used as an example.
 #
 # input {
-#   stdin { codec => <%= @plugin_name %> }
+#   stdin { codec => <%= plugin_name %> }
 # }
 #
 # or
 #
 # output {
-#   stdout { codec => <%= @plugin_name %> }
+#   stdout { codec => <%= plugin_name %> }
 # }
 #
 class LogStash::Codecs::<%= classify(plugin_name) %> < LogStash::Codecs::Base
@@ -25,7 +25,7 @@ class LogStash::Codecs::<%= classify(plugin_name) %> < LogStash::Codecs::Base
   config :append, :validate => :string, :default => ', Hello World!'
 
   def register
-    @lines = LogStash::Codecs::Line.new
+    @lines = LogStash::Plugin.lookup("codec", "line").new
     @lines.charset = "UTF-8"
   end # def register
 
diff --git a/lib/pluginmanager/templates/codec-plugin/logstash-codec-example.gemspec.erb b/lib/pluginmanager/templates/codec-plugin/logstash-codec-example.gemspec.erb
index bbd02dab0..653060ff8 100644
--- a/lib/pluginmanager/templates/codec-plugin/logstash-codec-example.gemspec.erb
+++ b/lib/pluginmanager/templates/codec-plugin/logstash-codec-example.gemspec.erb
@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.name          = 'logstash-codec-<%= plugin_name %>'
   s.version       = '0.1.0'
   s.licenses      = ['Apache-2.0']
-  s.summary       = 'TODO: Write a short summary, because Rubygems requires one.'
+  s.summary       = 'Logstash Codec Plugin for <%= classify(plugin_name) %>'
   s.description   = 'TODO: Write a longer description or delete this line.'
   s.homepage      = 'TODO: Put your plugin''s website or public repo URL here.'
   s.authors       = ['<%= author %>']
diff --git a/lib/pluginmanager/templates/codec-plugin/spec/spec_helper.rb b/lib/pluginmanager/templates/codec-plugin/spec/spec_helper.rb
index dc64aba12..f7516daf1 100644
--- a/lib/pluginmanager/templates/codec-plugin/spec/spec_helper.rb
+++ b/lib/pluginmanager/templates/codec-plugin/spec/spec_helper.rb
@@ -1,2 +1,18 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/devutils/rspec/spec_helper"
diff --git a/lib/pluginmanager/templates/filter-plugin/.ruby-version b/lib/pluginmanager/templates/filter-plugin/.ruby-version
new file mode 120000
index 000000000..67c664308
--- /dev/null
+++ b/lib/pluginmanager/templates/filter-plugin/.ruby-version
@@ -0,0 +1 @@
+../../../../.ruby-version
\ No newline at end of file
diff --git a/lib/pluginmanager/templates/filter-plugin/Gemfile b/lib/pluginmanager/templates/filter-plugin/Gemfile
deleted file mode 100644
index 06618cefa..000000000
--- a/lib/pluginmanager/templates/filter-plugin/Gemfile
+++ /dev/null
@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
diff --git a/lib/pluginmanager/templates/filter-plugin/Gemfile.erb b/lib/pluginmanager/templates/filter-plugin/Gemfile.erb
new file mode 100644
index 000000000..a94020f8c
--- /dev/null
+++ b/lib/pluginmanager/templates/filter-plugin/Gemfile.erb
@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+gemspec
+
+logstash_path = ENV['LOGSTASH_PATH'] || '<%= logstash_path %>'
+
+if Dir.exist?(logstash_path)
+  gem 'logstash-core', :path => "#{logstash_path}/logstash-core"
+  gem 'logstash-core-plugin-api', :path => "#{logstash_path}/logstash-core-plugin-api"
+end
+
diff --git a/lib/pluginmanager/templates/filter-plugin/README.md b/lib/pluginmanager/templates/filter-plugin/README.md
index f5301aca0..9fd9be34d 100644
--- a/lib/pluginmanager/templates/filter-plugin/README.md
+++ b/lib/pluginmanager/templates/filter-plugin/README.md
@@ -13,7 +13,7 @@ Logstash provides infrastructure to automatically generate documentation for thi
 
 ## Need Help?
 
-Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum.
+Need help? Try the https://discuss.elastic.co/c/logstash discussion forum.
 
 ## Developing
 
@@ -83,4 +83,4 @@ Programming is not a required skill. Whatever you've seen about open source and
 
 It is more important to the community that you are able to contribute.
 
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.
+For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/main/CONTRIBUTING.md) file.
diff --git a/lib/pluginmanager/templates/filter-plugin/docs/index.asciidoc b/lib/pluginmanager/templates/filter-plugin/docs/index.asciidoc
new file mode 100644
index 000000000..fca3730ac
--- /dev/null
+++ b/lib/pluginmanager/templates/filter-plugin/docs/index.asciidoc
@@ -0,0 +1,87 @@
+:plugin: example
+:type: filter
+// Update header with plugin name
+
+///////////////////////////////////////////
+START - GENERATED VARIABLES, DO NOT EDIT!
+///////////////////////////////////////////
+:version: %VERSION%
+:release_date: %RELEASE_DATE%
+:changelog_url: %CHANGELOG_URL%
+:include_path: ../../../../logstash/docs/include
+///////////////////////////////////////////
+END - GENERATED VARIABLES, DO NOT EDIT!
+///////////////////////////////////////////
+
+[id="plugins-{type}s-{plugin}"]
+
+=== Example filter plugin
+
+include::{include_path}/plugin_header.asciidoc[]
+
+==== Description
+
+Add plugin description here
+
+// Format anchors and links to support generated ids for versioning
+// Sample anchor: [id="plugins-{type}s-{plugin}-setting_name"]
+// Sample link: <<plugins-{type}s-{plugin}-setting_name>>
+
+[id="plugins-{type}s-{plugin}-options"]
+==== Example Filter Configuration Options
+
+[cols="<,<,<",options="header",]
+|=======================================================================
+|Setting |Input type|Required
+| <<plugins-{type}s-{plugin}-a_setting_name>> |<<boolean,boolean>>|No
+| <<plugins-{type}s-{plugin}-another_setting_name>> |<<hash,hash>>|No
+| <<plugins-{type}s-{plugin}-setting_name_3>> |<<string,string>>|No
+| <<plugins-{type}s-{plugin}-setting_name_4>> |<<number,number>>|No
+| <<plugins-{type}s-{plugin}-setting_name_5>> |<<array,array>>|No
+|=======================================================================
+
+[id="plugins-{type}s-{plugin}-a_setting_name"]
+===== `a_setting_name` 
+
+  * Value type is <<boolean,boolean>>
+  * Default value is `true`
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-another_setting_name"]
+===== `another_setting_name` 
+
+  * Value type is <<hash,hash>>
+  * Default value is `{}`
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-setting_name_3"]
+===== `setting_name_3` 
+
+  * Value type is <<string,string>>
+  * Default value is `{}`
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-setting_name_4"]
+===== `setting_name_4` 
+
+  * Value type is <<number,number>>
+  * Default value is `0`
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-setting_name_5"]
+===== `setting_name_5` 
+
+  * Value type is <<array,array>>
+  * Default value is {}
+
+Add description here
+
+// The full list of Value Types is here: 
+// https://www.elastic.co/guide/en/logstash/current/configuration-file-structure.html
+
+[id="plugins-{type}s-{plugin}-common-options"]
+include::{include_path}/{type}.asciidoc[]
diff --git a/lib/pluginmanager/templates/filter-plugin/lib/logstash/filters/example.rb.erb b/lib/pluginmanager/templates/filter-plugin/lib/logstash/filters/example.rb.erb
index 690a711bf..6428370dc 100644
--- a/lib/pluginmanager/templates/filter-plugin/lib/logstash/filters/example.rb.erb
+++ b/lib/pluginmanager/templates/filter-plugin/lib/logstash/filters/example.rb.erb
@@ -1,17 +1,17 @@
 # encoding: utf-8
 require "logstash/filters/base"
 
-# This <%= @plugin_name %> filter will replace the contents of the default
+# This <%= plugin_name %> filter will replace the contents of the default
 # message field with whatever you specify in the configuration.
 #
-# It is only intended to be used as an <%= @plugin_name %>.
+# It is only intended to be used as an <%= plugin_name %>.
 class LogStash::Filters::<%= classify(plugin_name) %> < LogStash::Filters::Base
 
   # Setting the config_name here is required. This is how you
   # configure this filter from your Logstash config.
   #
   # filter {
-  #   <%= @plugin_name %> {
+  #   <%= plugin_name %> {
   #     message => "My message..."
   #   }
   # }
diff --git a/lib/pluginmanager/templates/filter-plugin/logstash-filter-example.gemspec.erb b/lib/pluginmanager/templates/filter-plugin/logstash-filter-example.gemspec.erb
index 2c2c2ff2e..b408537fb 100644
--- a/lib/pluginmanager/templates/filter-plugin/logstash-filter-example.gemspec.erb
+++ b/lib/pluginmanager/templates/filter-plugin/logstash-filter-example.gemspec.erb
@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.name          = 'logstash-filter-<%= plugin_name %>'
   s.version       = '0.1.0'
   s.licenses      = ['Apache-2.0']
-  s.summary       = 'TODO: Write a short summary, because Rubygems requires one.'
+  s.summary       = 'Logstash Filter Plugin for <%= classify(plugin_name) %>'
   s.description   = 'TODO: Write a longer description or delete this line.'
   s.homepage      = 'TODO: Put your plugin''s website or public repo URL here.'
   s.authors       = ['<%= author %>']
diff --git a/lib/pluginmanager/templates/filter-plugin/spec/spec_helper.rb b/lib/pluginmanager/templates/filter-plugin/spec/spec_helper.rb
index dc64aba12..f7516daf1 100644
--- a/lib/pluginmanager/templates/filter-plugin/spec/spec_helper.rb
+++ b/lib/pluginmanager/templates/filter-plugin/spec/spec_helper.rb
@@ -1,2 +1,18 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/devutils/rspec/spec_helper"
diff --git a/lib/pluginmanager/templates/input-plugin/.ruby-version b/lib/pluginmanager/templates/input-plugin/.ruby-version
new file mode 120000
index 000000000..67c664308
--- /dev/null
+++ b/lib/pluginmanager/templates/input-plugin/.ruby-version
@@ -0,0 +1 @@
+../../../../.ruby-version
\ No newline at end of file
diff --git a/lib/pluginmanager/templates/input-plugin/Gemfile b/lib/pluginmanager/templates/input-plugin/Gemfile
deleted file mode 100644
index 06618cefa..000000000
--- a/lib/pluginmanager/templates/input-plugin/Gemfile
+++ /dev/null
@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
diff --git a/lib/pluginmanager/templates/input-plugin/Gemfile.erb b/lib/pluginmanager/templates/input-plugin/Gemfile.erb
new file mode 100644
index 000000000..d697e6ecc
--- /dev/null
+++ b/lib/pluginmanager/templates/input-plugin/Gemfile.erb
@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+gemspec
+
+logstash_path = ENV['LOGSTASH_PATH'] || '<%= logstash_path %>'
+
+if Dir.exist?(logstash_path)
+  gem 'logstash-core', :path => "#{logstash_path}/logstash-core"
+  gem 'logstash-core-plugin-api', :path => "#{logstash_path}/logstash-core-plugin-api"
+end
\ No newline at end of file
diff --git a/lib/pluginmanager/templates/input-plugin/README.md b/lib/pluginmanager/templates/input-plugin/README.md
index f5301aca0..9fd9be34d 100644
--- a/lib/pluginmanager/templates/input-plugin/README.md
+++ b/lib/pluginmanager/templates/input-plugin/README.md
@@ -13,7 +13,7 @@ Logstash provides infrastructure to automatically generate documentation for thi
 
 ## Need Help?
 
-Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum.
+Need help? Try the https://discuss.elastic.co/c/logstash discussion forum.
 
 ## Developing
 
@@ -83,4 +83,4 @@ Programming is not a required skill. Whatever you've seen about open source and
 
 It is more important to the community that you are able to contribute.
 
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.
+For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/main/CONTRIBUTING.md) file.
diff --git a/lib/pluginmanager/templates/input-plugin/docs/index.asciidoc b/lib/pluginmanager/templates/input-plugin/docs/index.asciidoc
new file mode 100644
index 000000000..cc47ac158
--- /dev/null
+++ b/lib/pluginmanager/templates/input-plugin/docs/index.asciidoc
@@ -0,0 +1,117 @@
+:plugin: example
+:type: input
+:default_codec: plain
+// Update header with plugin name and default codec
+
+///////////////////////////////////////////
+START - GENERATED VARIABLES, DO NOT EDIT!
+///////////////////////////////////////////
+:version: %VERSION%
+:release_date: %RELEASE_DATE%
+:changelog_url: %CHANGELOG_URL%
+:include_path: ../../../../logstash/docs/include
+///////////////////////////////////////////
+END - GENERATED VARIABLES, DO NOT EDIT!
+///////////////////////////////////////////
+
+[id="plugins-{type}s-{plugin}"]
+
+=== Example input plugin
+
+include::{include_path}/plugin_header.asciidoc[]
+
+==== Description
+
+Add plugin description here
+
+// Format anchors and links to support generated ids for versioning
+// Sample anchor: [id="plugins-{type}s-{plugin}-setting_name"]
+// Sample link: <<plugins-{type}s-{plugin}-setting_name>>
+
+[id="plugins-{type}s-{plugin}-options"]
+==== Example Input Configuration Options
+
+[cols="<,<,<",options="header",]
+|=======================================================================
+|Setting |Input type|Required
+| <<plugins-{type}s-{plugin}-a_setting_name>> |<<boolean,boolean>>|No
+| <<plugins-{type}s-{plugin}-another_setting_name>> |<<hash,hash>>|No
+| <<plugins-{type}s-{plugin}-setting_name_3>> |<<string,string>>|No
+| <<plugins-{type}s-{plugin}-setting_name_4>> |<<number,number>>|No
+| <<plugins-{type}s-{plugin}-setting_name_5>> |<<array,array>>|No
+| <<plugins-{type}s-{plugin}-setting_name_6>> |<<bytes,bytes>>|No
+| <<plugins-{type}s-{plugin}-setting_name_7>> |<<path,path>>|No
+| <<plugins-{type}s-{plugin}-setting_name_8>> |<<password,password>>|No
+|=======================================================================
+
+[id="plugins-{type}s-{plugin}-a_setting_name"]
+===== `a_setting_name` 
+
+  * Value type is <<boolean,boolean>>
+  * Default value is `true`
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-another_setting_name"]
+===== `another_setting_name` 
+
+  * Value type is <<hash,hash>>
+  * Default value is `{}`
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-setting_name_3"]
+===== `setting_name_3` 
+
+  * Value type is <<string,string>>
+  * Default value is `{}`
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-setting_name_4"]
+===== `setting_name_4` 
+
+  * Value type is <<number,number>>
+  * Default value is `0`
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-setting_name_5"]
+===== `setting_name_5` 
+
+  * Value type is <<array,array>>
+  * Default value is {}
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-setting_name_6"]
+===== `setting_name_6` 
+
+  * Value type is <<bytes,bytes>>
+  * Default value is {}
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-setting_name_7"]
+===== `setting_name_7` 
+
+  * Value type is <<path,path>>
+  * Default value is {}
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-setting_name_8"]
+===== `setting_name_8` 
+
+  * Value type is <<password,password>>
+  * Default value is {}
+
+Add description here
+
+// The full list of Value Types is here: 
+// https://www.elastic.co/guide/en/logstash/current/configuration-file-structure.html
+
+[id="plugins-{type}s-{plugin}-common-options"]
+include::{include_path}/{type}.asciidoc[]
+
+:default_codec!:
diff --git a/lib/pluginmanager/templates/input-plugin/lib/logstash/inputs/example.rb.erb b/lib/pluginmanager/templates/input-plugin/lib/logstash/inputs/example.rb.erb
index 5ad634a38..05a5f01d2 100644
--- a/lib/pluginmanager/templates/input-plugin/lib/logstash/inputs/example.rb.erb
+++ b/lib/pluginmanager/templates/input-plugin/lib/logstash/inputs/example.rb.erb
@@ -8,7 +8,7 @@ require "socket" # for Socket.gethostname
 # This plugin is intented only as an example.
 
 class LogStash::Inputs::<%= classify(plugin_name) %> < LogStash::Inputs::Base
-  config_name "<%= @plugin_name %>"
+  config_name "<%= plugin_name %>"
 
   # If undefined, Logstash will complain, even if codec is unused.
   default :codec, "plain"
diff --git a/lib/pluginmanager/templates/input-plugin/logstash-input-example.gemspec.erb b/lib/pluginmanager/templates/input-plugin/logstash-input-example.gemspec.erb
index ca14065fb..58ce43c30 100644
--- a/lib/pluginmanager/templates/input-plugin/logstash-input-example.gemspec.erb
+++ b/lib/pluginmanager/templates/input-plugin/logstash-input-example.gemspec.erb
@@ -2,8 +2,8 @@ Gem::Specification.new do |s|
   s.name          = 'logstash-input-<%= plugin_name %>'
   s.version       = '0.1.0'
   s.licenses      = ['Apache-2.0']
-  s.summary       = 'TODO: Write a short summary, because Rubygems requires one.'
-  s.description   = '{TODO: Write a longer description or delete this line.'
+  s.summary       = 'Logstash Input Plugin for <%= classify(plugin_name) %>'
+  s.description   = 'TODO: Write a longer description or delete this line.'
   s.homepage      = 'TODO: Put your plugin''s website or public repo URL here.'
   s.authors       = ['<%= author %>']
   s.email         = '<%= email %>'
diff --git a/lib/pluginmanager/templates/input-plugin/spec/inputs/example_spec.rb.erb b/lib/pluginmanager/templates/input-plugin/spec/inputs/example_spec.rb.erb
index 7b8bfde8e..d95c058a0 100644
--- a/lib/pluginmanager/templates/input-plugin/spec/inputs/example_spec.rb.erb
+++ b/lib/pluginmanager/templates/input-plugin/spec/inputs/example_spec.rb.erb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+require 'logstash/devutils/rspec/shared_examples'
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/inputs/<%= plugin_name %>"
 
diff --git a/lib/pluginmanager/templates/output-plugin/.ruby-version b/lib/pluginmanager/templates/output-plugin/.ruby-version
new file mode 120000
index 000000000..67c664308
--- /dev/null
+++ b/lib/pluginmanager/templates/output-plugin/.ruby-version
@@ -0,0 +1 @@
+../../../../.ruby-version
\ No newline at end of file
diff --git a/lib/pluginmanager/templates/output-plugin/Gemfile b/lib/pluginmanager/templates/output-plugin/Gemfile
deleted file mode 100644
index 06618cefa..000000000
--- a/lib/pluginmanager/templates/output-plugin/Gemfile
+++ /dev/null
@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
diff --git a/lib/pluginmanager/templates/output-plugin/Gemfile.erb b/lib/pluginmanager/templates/output-plugin/Gemfile.erb
new file mode 100644
index 000000000..a94020f8c
--- /dev/null
+++ b/lib/pluginmanager/templates/output-plugin/Gemfile.erb
@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+gemspec
+
+logstash_path = ENV['LOGSTASH_PATH'] || '<%= logstash_path %>'
+
+if Dir.exist?(logstash_path)
+  gem 'logstash-core', :path => "#{logstash_path}/logstash-core"
+  gem 'logstash-core-plugin-api', :path => "#{logstash_path}/logstash-core-plugin-api"
+end
+
diff --git a/lib/pluginmanager/templates/output-plugin/README.md b/lib/pluginmanager/templates/output-plugin/README.md
index f5301aca0..9fd9be34d 100644
--- a/lib/pluginmanager/templates/output-plugin/README.md
+++ b/lib/pluginmanager/templates/output-plugin/README.md
@@ -13,7 +13,7 @@ Logstash provides infrastructure to automatically generate documentation for thi
 
 ## Need Help?
 
-Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum.
+Need help? Try the https://discuss.elastic.co/c/logstash discussion forum.
 
 ## Developing
 
@@ -83,4 +83,4 @@ Programming is not a required skill. Whatever you've seen about open source and
 
 It is more important to the community that you are able to contribute.
 
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.
+For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/main/CONTRIBUTING.md) file.
diff --git a/lib/pluginmanager/templates/output-plugin/docs/index.asciidoc b/lib/pluginmanager/templates/output-plugin/docs/index.asciidoc
new file mode 100644
index 000000000..623a89d9a
--- /dev/null
+++ b/lib/pluginmanager/templates/output-plugin/docs/index.asciidoc
@@ -0,0 +1,127 @@
+:plugin: example
+:type: output
+:default_codec: plain
+// Update header with plugin name and default codec
+
+///////////////////////////////////////////
+START - GENERATED VARIABLES, DO NOT EDIT!
+///////////////////////////////////////////
+:version: %VERSION%
+:release_date: %RELEASE_DATE%
+:changelog_url: %CHANGELOG_URL%
+:include_path: ../../../../logstash/docs/include
+///////////////////////////////////////////
+END - GENERATED VARIABLES, DO NOT EDIT!
+///////////////////////////////////////////
+
+[id="plugins-{type}s-{plugin}"]
+
+=== Example output plugin
+
+include::{include_path}/plugin_header.asciidoc[]
+
+==== Description
+
+Add plugin description here
+
+// Format anchors and links to support generated ids for versioning
+// Sample anchor: [id="plugins-{type}s-{plugin}-setting_name"]
+// Sample link: <<plugins-{type}s-{plugin}-setting_name>>
+
+[id="plugins-{type}s-{plugin}-options"]
+==== Example Output Configuration Options
+
+[cols="<,<,<",options="header",]
+|=======================================================================
+|Setting |Input type|Required
+| <<plugins-{type}s-{plugin}-a_setting_name>> |<<boolean,boolean>>|No
+| <<plugins-{type}s-{plugin}-another_setting_name>> |<<hash,hash>>|No
+| <<plugins-{type}s-{plugin}-setting_name_3>> |<<string,string>>|No
+| <<plugins-{type}s-{plugin}-setting_name_4>> |<<number,number>>|No
+| <<plugins-{type}s-{plugin}-setting_name_5>> |<<array,array>>|No
+| <<plugins-{type}s-{plugin}-setting_name_6>> |<<bytes,bytes>>|No
+| <<plugins-{type}s-{plugin}-setting_name_7>> |<<path,path>>|No
+| <<plugins-{type}s-{plugin}-setting_name_8>> |<<password,password>>|No
+| <<plugins-{type}s-{plugin}-setting_name_9>> |<<uri,uri>>|No
+|=======================================================================
+
+[id="plugins-{type}s-{plugin}-a_setting_name"]
+===== `a_setting_name` 
+
+  * Value type is <<boolean,boolean>>
+  * Default value is `true`
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-another_setting_name"]
+===== `another_setting_name` 
+
+  * Value type is <<hash,hash>>
+  * Default value is `{}`
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-setting_name_3"]
+===== `setting_name_3` 
+
+  * Value type is <<string,string>>
+  * Default value is `{}`
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-setting_name_4"]
+===== `setting_name_4` 
+
+  * Value type is <<number,number>>
+  * Default value is `0`
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-setting_name_5"]
+===== `setting_name_5` 
+
+  * Value type is <<array,array>>
+  * Default value is {}
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-setting_name_6"]
+===== `setting_name_6` 
+
+  * Value type is <<bytes,bytes>>
+  * Default value is {}
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-setting_name_7"]
+===== `setting_name_7` 
+
+  * Value type is <<path,path>>
+  * Default value is {}
+
+Add description here
+
+[id="plugins-{type}s-{plugin}-setting_name_8"]
+===== `setting_name_8` 
+
+  * Value type is <<password,password>>
+  * Default value is {}
+
+Add description here
+
+
+[id="plugins-{type}s-{plugin}-setting_name_9"]
+===== `setting_name_9` 
+
+  * Value type is <<uri,uri>>
+  * Default value is {}
+
+Add description here
+
+// The full list of Value Types is here: 
+// https://www.elastic.co/guide/en/logstash/current/configuration-file-structure.html
+
+[id="plugins-{type}s-{plugin}-common-options"]
+include::{include_path}/{type}.asciidoc[]
+
+:default_codec!:
diff --git a/lib/pluginmanager/templates/output-plugin/logstash-output-example.gemspec.erb b/lib/pluginmanager/templates/output-plugin/logstash-output-example.gemspec.erb
index 29653ebf6..c1554cece 100644
--- a/lib/pluginmanager/templates/output-plugin/logstash-output-example.gemspec.erb
+++ b/lib/pluginmanager/templates/output-plugin/logstash-output-example.gemspec.erb
@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.name          = 'logstash-output-<%= plugin_name %>'
   s.version       = '0.1.0'
   s.licenses      = ['Apache-2.0']
-  s.summary       = 'TODO: Write a short summary, because Rubygems requires one.'
+  s.summary       = 'Logstash Output Plugin for <%= classify(plugin_name) %>'
   s.description   = 'TODO: Write a longer description or delete this line.'
   s.homepage      = 'TODO: Put your plugin''s website or public repo URL here.'
   s.authors       = ['<%= author %>']
diff --git a/lib/pluginmanager/templates/output-plugin/spec/outputs/example_spec.rb.erb b/lib/pluginmanager/templates/output-plugin/spec/outputs/example_spec.rb.erb
index 220d967bd..e1f8f143c 100644
--- a/lib/pluginmanager/templates/output-plugin/spec/outputs/example_spec.rb.erb
+++ b/lib/pluginmanager/templates/output-plugin/spec/outputs/example_spec.rb.erb
@@ -2,7 +2,7 @@
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/outputs/<%= plugin_name %>"
 require "logstash/codecs/plain"
-require "logstash/event"
+
 
 describe LogStash::Outputs::<%= classify(plugin_name) %> do
   let(:sample_event) { LogStash::Event.new }
diff --git a/lib/pluginmanager/templates/render_context.rb b/lib/pluginmanager/templates/render_context.rb
index 583c6a9ee..626cbe559 100644
--- a/lib/pluginmanager/templates/render_context.rb
+++ b/lib/pluginmanager/templates/render_context.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "erb"
 
 module LogStash::PluginManager
diff --git a/lib/pluginmanager/ui.rb b/lib/pluginmanager/ui.rb
index 1f40265cf..90f9db52c 100644
--- a/lib/pluginmanager/ui.rb
+++ b/lib/pluginmanager/ui.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module LogStash module PluginManager
   # The command line commands should be able to report but they shouldn't
   # require an explicit logger like log4j.
diff --git a/lib/pluginmanager/unpack.rb b/lib/pluginmanager/unpack.rb
index f1f7221e1..c7005fa25 100644
--- a/lib/pluginmanager/unpack.rb
+++ b/lib/pluginmanager/unpack.rb
@@ -1,9 +1,25 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "pack_command"
 
 class LogStash::PluginManager::Unpack < LogStash::PluginManager::PackCommand
-  option "--tgz", :flag, "unpack a packaged tar.gz file", :default => !LogStash::Environment.windows?
-  option "--zip", :flag, "unpack a packaged  zip file", :default => LogStash::Environment.windows?
+  option "--tgz", :flag, "unpack a packaged tar.gz file", :default => !LogStash::Environment.win_platform?
+  option "--zip", :flag, "unpack a packaged  zip file", :default => LogStash::Environment.win_platform?
 
   parameter "file", "the package file name", :attribute_name => :package_file, :required => true
 
@@ -25,7 +41,7 @@ class LogStash::PluginManager::Unpack < LogStash::PluginManager::PackCommand
     cache_location = LogStash::Environment::CACHE_PATH
     if File.exist?(cache_location)
       puts("Directory #{cache_location} is going to be overwritten, do you want to continue? (Y/N)")
-      override = ( "y" == STDIN.gets.strip.downcase ? true : false)
+      override = ("y" == STDIN.gets.strip.downcase ? true : false)
       if override
         FileUtils.rm_rf(cache_location)
       else
diff --git a/lib/pluginmanager/update.rb b/lib/pluginmanager/update.rb
index 40755e5eb..91306bc1e 100644
--- a/lib/pluginmanager/update.rb
+++ b/lib/pluginmanager/update.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/command"
 require "jar-dependencies"
 require "jar_install_post_install_hook"
@@ -8,9 +24,16 @@ class LogStash::PluginManager::Update < LogStash::PluginManager::Command
   # These are local gems used by LS and needs to be filtered out of other plugin gems
   NON_PLUGIN_LOCAL_GEMS = ["logstash-core", "logstash-core-plugin-api"]
 
+  SUPPORTED_LEVELS = %w(major minor patch)
+
   parameter "[PLUGIN] ...", "Plugin name(s) to upgrade to latest version", :attribute_name => :plugins_arg
+  option "--level", "LEVEL", "restrict updates to given semantic version level (one of #{SUPPORTED_LEVELS})", :default => "minor" do |given_level|
+    fail("unsupported level `#{given_level}`; expected one of #{SUPPORTED_LEVELS}") unless SUPPORTED_LEVELS.include?(given_level)
+    given_level
+  end
   option "--[no-]verify", :flag, "verify plugin validity before installation", :default => true
   option "--local", :flag, "force local-only plugin update. see bin/logstash-plugin package|unpack", :default => false
+  option "--[no-]conservative", :flag, "do a conservative update of plugin's dependencies", :default => true
 
   def execute
     # Turn off any jar dependencies lookup when running with `--local`
@@ -47,6 +70,7 @@ class LogStash::PluginManager::Update < LogStash::PluginManager::Command
     # remove any version constrain from the Gemfile so the plugin(s) can be updated to latest version
     # calling update without requirements will remove any previous requirements
     plugins = plugins_to_update(previous_gem_specs_map)
+
     # Skipping the major version validation when using a local cache as we can have situations
     # without internet connection.
     filtered_plugins = plugins.map { |plugin| gemfile.find(plugin) }
@@ -59,15 +83,20 @@ class LogStash::PluginManager::Update < LogStash::PluginManager::Command
 
     puts("Updating #{filtered_plugins.collect(&:name).join(", ")}") unless filtered_plugins.empty?
 
+    output = nil
     # any errors will be logged to $stderr by invoke!
     # Bundler cannot update and clean gems in one operation so we have to call the CLI twice.
-    options = {:update => plugins, :rubygems_source => gemfile.gemset.sources}
-    options[:local] = true if local?
-    output = LogStash::Bundler.invoke!(options)
-    # We currently dont removed unused gems from the logstash installation
-    # see: https://github.com/elastic/logstash/issues/6339
-    # output = LogStash::Bundler.invoke!(:clean => true)
+    Bundler.settings.temporary(:frozen => false) do # Unfreeze the bundle when updating gems
+      output = LogStash::Bundler.invoke! update: plugins,
+                                         level: level,
+                                         rubygems_source: gemfile.gemset.sources,
+                                         local: local?,
+                                         conservative: conservative?
+      output << LogStash::Bundler.genericize_platform unless output.nil?
+    end
+
     display_updated_plugins(previous_gem_specs_map)
+    remove_orphan_dependencies!
   rescue => exception
     gemfile.restore!
     report_exception("Updated Aborted", exception)
@@ -78,14 +107,30 @@ class LogStash::PluginManager::Update < LogStash::PluginManager::Command
   # create list of plugins to update
   def plugins_to_update(previous_gem_specs_map)
     if update_all?
-      previous_gem_specs_map.values.map{|spec| spec.name}
+      previous_gem_specs_map.values.map {|spec| spec.name}
     else
-      # If the plugins isn't available in the gemspec or in 
+      # If the plugins isn't available in the gemspec or in
       # the gemfile defined with a local path, we assume the plugins is not
       # installed.
-      not_installed = plugins_arg.select{|plugin| !previous_gem_specs_map.has_key?(plugin.downcase) && !gemfile.find(plugin) }
+      not_installed = plugins_arg.select { |plugin| !previous_gem_specs_map.has_key?(plugin.downcase) && !gemfile.find(plugin) }
+
+      # find only the not installed that doesn't correspond to an alias
+      not_installed_aliases = not_installed.select { |plugin| LogStash::PluginManager::ALIASES.has_key?(plugin)}
+      not_installed -= not_installed_aliases
+
       signal_error("Plugin #{not_installed.join(', ')} is not installed so it cannot be updated, aborting") unless not_installed.empty?
-      plugins_arg
+
+      # resolve aliases that doesn't correspond to a real gem
+      plugins_to_update = plugins_arg.map do |plugin|
+        if not_installed_aliases.include?(plugin)
+          resolved_plugin = LogStash::PluginManager::ALIASES[plugin]
+          puts "Remapping alias #{plugin} to #{resolved_plugin}"
+          resolved_plugin
+        else
+          plugin
+        end
+      end
+      plugins_to_update
     end
   end
 
@@ -113,7 +158,7 @@ class LogStash::PluginManager::Update < LogStash::PluginManager::Command
   def find_latest_gem_specs
     LogStash::PluginManager.all_installed_plugins_gem_specs(gemfile).inject({}) do |result, spec|
       previous = result[spec.name.downcase]
-      result[spec.name.downcase] = previous ? [previous, spec].max_by{|s| s.version} : spec
+      result[spec.name.downcase] = previous ? [previous, spec].max_by {|s| s.version} : spec
       result
     end
   end
diff --git a/lib/pluginmanager/util.rb b/lib/pluginmanager/util.rb
index 09c55590a..e6710039d 100644
--- a/lib/pluginmanager/util.rb
+++ b/lib/pluginmanager/util.rb
@@ -1,8 +1,61 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "rubygems/package"
-require_relative "../bootstrap/patches/remote_fetcher"
+require "yaml"
 
 module LogStash::PluginManager
+  def self.load_aliases_definitions(path = File.expand_path('plugin_aliases.yml', __dir__))
+    content = IO.read(path)
+
+    #Verify header
+    header = content.lines[0]
+    if !header.start_with?('#CHECKSUM:')
+      raise ValidationError.new "Bad header format, expected '#CHECKSUM: ...' but found #{header}"
+    end
+    yaml_body = content.lines[2..-1].join
+    extracted_sha = header.delete_prefix('#CHECKSUM:').chomp.strip
+    sha256_hex = Digest::SHA256.hexdigest(yaml_body)
+    if sha256_hex != extracted_sha
+      raise ValidationError.new "Bad checksum value, expected #{sha256_hex} but found #{extracted_sha}"
+    end
+
+    yaml = YAML.safe_load(yaml_body) || {}
+    result = {}
+    yaml.each do |type, alias_defs|
+      alias_defs.each do |alias_def|
+        result["logstash-#{type}-#{alias_def["alias"]}"] = "logstash-#{type}-#{alias_def["from"]}"
+      end
+    end
+    result
+  end
+
+  # Defines the plugin alias, must be kept in synch with Java class org.logstash.plugins.AliasRegistry
+  ALIASES = load_aliases_definitions()
+
+  def self.resolve_alias(alias_name)
+    ALIASES[alias_name]
+  end
+
+  def self.find_aliases(plugin_name)
+    ALIASES.each_with_object([]) do |(alias_name, candidate_plugin_name), aliases|
+      aliases << alias_name if candidate_plugin_name == plugin_name
+    end.compact.uniq
+  end
 
   class ValidationError < StandardError; end
 
@@ -13,8 +66,7 @@ module LogStash::PluginManager
   # @param [Hash] options the options used to setup external components
   # @option options [Array<String>] :rubygems_source Gem sources to lookup for the verification
   # @return [Boolean] true if valid logstash plugin gem name & version or a .gem file
-  def self.logstash_plugin?(plugin, version = nil, options={})
-
+  def self.logstash_plugin?(plugin, version = nil, options = {})
     if plugin_file?(plugin)
       begin
         return logstash_plugin_gem_spec?(plugin_file_spec(plugin))
@@ -24,9 +76,9 @@ module LogStash::PluginManager
         return false
       end
     else
-      dep = Gem::Dependency.new(plugin, version || Gem::Requirement.default)
-      Gem.sources = Gem::SourceList.from(options[:rubygems_source]) if options[:rubygems_source]
-      specs, errors = Gem::SpecFetcher.fetcher.spec_for_dependency(dep)
+      dep = _gem_dependency(plugin, version)
+      ::Gem.sources = ::Gem::SourceList.from(options[:rubygems_source]) if options[:rubygems_source]
+      specs, errors = ::Gem::SpecFetcher.fetcher.spec_for_dependency(dep)
 
       # dump errors
       errors.each { |error| $stderr.puts(error.wordy) }
@@ -45,13 +97,19 @@ module LogStash::PluginManager
     end
   end
 
+  # This test injection point allows us to avoid mocking the ::Gem::Dependency
+  # that is used by ruby internals for finding dependencies on the load path
+  def self._gem_dependency(gem_name, version = nil)
+    ::Gem::Dependency.new(gem_name, version || ::Gem::Requirement.default)
+  end
+
   # Fetch latest version information as in rubygems
   # @param [String] The plugin name
   # @param [Hash] Set of available options when fetching the information
   # @option options [Boolean] :pre Include pre release versions in the search (default: false)
   # @return [Hash] The plugin version information as returned by rubygems
-  def self.fetch_latest_version_info(plugin, options={})
-    exclude_prereleases =  options.fetch(:pre, false)
+  def self.fetch_latest_version_info(plugin, options = {})
+    exclude_prereleases = options.fetch(:pre, false)
     versions = LogStash::Rubygems.versions(plugin)
     raise ValidationError.new("Something went wrong with the validation. You can skip the validation with the --no-verify option") if !versions.is_a?(Array) || versions.empty?
     versions = versions.select { |version| !version["prerelease"] } if !exclude_prereleases
@@ -68,7 +126,7 @@ module LogStash::PluginManager
   # @return [Gem::Specification] .get file gem specification
   # @raise [Exception] Gem::Package::FormatError will be raised on invalid .gem file format, might be other exceptions too
   def self.plugin_file_spec(path)
-    Gem::Package.new(path).spec
+    ::Gem::Package.new(path).spec
   end
 
   # @param plugin [String] the plugin name or the local path to a .gem file
@@ -81,8 +139,8 @@ module LogStash::PluginManager
   # @param name [String] specific plugin name to find or nil for all plugins
   # @return [Array<Gem::Specification>] all local logstash plugin gem specs
   def self.find_plugins_gem_specs(name = nil)
-    specs = name ? Gem::Specification.find_all_by_name(name) : Gem::Specification.find_all
-    specs.select{|spec| logstash_plugin_gem_spec?(spec)}
+    specs = name ? ::Gem::Specification.find_all_by_name(name) : ::Gem::Specification.find_all
+    specs.select {|spec| logstash_plugin_gem_spec?(spec)}
   end
 
   # list of all locally installed plugins specs specified in the Gemfile.
@@ -93,7 +151,7 @@ module LogStash::PluginManager
   def self.all_installed_plugins_gem_specs(gemfile)
     # we start form the installed gemspecs so we can verify the metadata for valid logstash plugin
     # then filter out those not included in the Gemfile
-    find_plugins_gem_specs.select{|spec| !!gemfile.find(spec.name)}
+    find_plugins_gem_specs.select {|spec| !!gemfile.find(spec.name)}
   end
 
   # @param plugin [String] plugin name
@@ -130,7 +188,6 @@ module LogStash::PluginManager
   # @param plugin_list [Array] array of [plugin name, version] tuples
   # @return [Array] array of [plugin name, version, ...] tuples when duplicate names have been merged and non duplicate version requirements added
   def self.merge_duplicates(plugin_list)
-
     # quick & dirty naive dedup for now
     # TODO: properly merge versions requirements
     plugin_list.uniq(&:first)
diff --git a/lib/pluginmanager/utils/downloader.rb b/lib/pluginmanager/utils/downloader.rb
index d2092f221..48594bc55 100644
--- a/lib/pluginmanager/utils/downloader.rb
+++ b/lib/pluginmanager/utils/downloader.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "ruby-progressbar"
 require "pluginmanager/utils/http_client"
 require "pluginmanager/errors"
diff --git a/lib/pluginmanager/utils/http_client.rb b/lib/pluginmanager/utils/http_client.rb
index a8cb91caf..ba719ebde 100644
--- a/lib/pluginmanager/utils/http_client.rb
+++ b/lib/pluginmanager/utils/http_client.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module LogStash module PluginManager module Utils
   class HttpClient
     class RedirectionLimit < RuntimeError; end
@@ -36,7 +52,7 @@ module LogStash module PluginManager module Utils
         response = http.request(request)
 
         if response.code == "302"
-          new_uri = response.headers["location"]
+          new_uri = response["location"]
           remote_file_exist?(new_uri, redirect_count + 1)
         elsif response.code == "200"
           true
diff --git a/lib/pluginmanager/x_pack_interceptor.rb b/lib/pluginmanager/x_pack_interceptor.rb
index 2a6c41ae0..a25b288ab 100644
--- a/lib/pluginmanager/x_pack_interceptor.rb
+++ b/lib/pluginmanager/x_pack_interceptor.rb
@@ -1,11 +1,24 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 module LogStash; module PluginManager
-
   # Centralised messaging about installing and removing x-pack, which is no longer a plugin, but
   # part of the distribution.
   module XPackInterceptor
-
     module Install
       extend self
 
diff --git a/lib/secretstore/cli.rb b/lib/secretstore/cli.rb
index 335403a0f..08612d4dd 100644
--- a/lib/secretstore/cli.rb
+++ b/lib/secretstore/cli.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 $LOAD_PATH.push(File.expand_path(File.dirname(__FILE__) + "/../../logstash-core/lib"))
 require_relative "../bootstrap/environment"
 LogStash::Bundler.setup!({:without => [:build, :development]})
@@ -32,7 +49,7 @@ class LogStash::SecretStoreCli
     LogStash::Util::SettingsHelper.post_process
     secure_config = SecretStoreExt.getConfig(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)
     cli = SecretStoreCli.new(Terminal.new)
-    cli.command(ARGV[0], secure_config, ARGV[1])
+    cli.command(ARGV[0], secure_config, *ARGV[1, ARGV.length])
     exit 0
   rescue => e
     logger.error(e.message, :cause => e.cause, :backtrace => e.backtrace)
diff --git a/lib/systeminstall/pleasewrap.rb b/lib/systeminstall/pleasewrap.rb
index f7ee00bd4..026bf8366 100755
--- a/lib/systeminstall/pleasewrap.rb
+++ b/lib/systeminstall/pleasewrap.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 $LOAD_PATH.unshift(File.expand_path(File.join(__FILE__, "..", "..")))
 
 require "bootstrap/environment"
diff --git a/logstash-core-plugin-api/lib/logstash-core-plugin-api/version.rb b/logstash-core-plugin-api/lib/logstash-core-plugin-api/version.rb
index f240d0075..083704e57 100644
--- a/logstash-core-plugin-api/lib/logstash-core-plugin-api/version.rb
+++ b/logstash-core-plugin-api/lib/logstash-core-plugin-api/version.rb
@@ -1,8 +1,23 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # The version of logstash core plugin api gem.
 #
-# sourced from a copy of the master versions.yml file, see logstash-core/logstash-core.gemspec
+# sourced from a copy of the main versions.yml file, see logstash-core/logstash-core.gemspec
 if !defined?(ALL_VERSIONS)
   require 'yaml'
   ALL_VERSIONS = YAML.load_file(File.expand_path("../../versions-gem-copy.yml", File.dirname(__FILE__)))
@@ -13,6 +28,5 @@ unless defined?(LOGSTASH_CORE_PLUGIN_API)
 end
 
 unless defined?(LOGSTASH_CORE_VERSION)
-  # PACKAGE_SUFFIX is declared in the artifact namespace from artifacts.rake
-  LOGSTASH_CORE_VERSION = defined?(PACKAGE_SUFFIX) ? "#{ALL_VERSIONS.fetch("logstash-core")}#{PACKAGE_SUFFIX}" : ALL_VERSIONS.fetch("logstash-core")
+  LOGSTASH_CORE_VERSION = ALL_VERSIONS.fetch("logstash-core")
 end
diff --git a/logstash-core-plugin-api/logstash-core-plugin-api.gemspec b/logstash-core-plugin-api/logstash-core-plugin-api.gemspec
index 59ce44714..05e0b8cfc 100644
--- a/logstash-core-plugin-api/logstash-core-plugin-api.gemspec
+++ b/logstash-core-plugin-api/logstash-core-plugin-api.gemspec
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
@@ -11,7 +12,13 @@ if File.exist?(project_versions_yaml_path)
   # we ignore the copy in git and we overwrite an existing file
   # each time we build the logstash-core gem
   original_lines = IO.readlines(project_versions_yaml_path)
-  original_lines << ""
+  # introduce the version qualifier (e.g. beta1, rc1) into the copied yml so it's displayed by Logstash
+  unless ENV['VERSION_QUALIFIER'].to_s.strip.empty?
+    logstash_version_line = original_lines.find {|line| line.match(/^logstash:/) }
+    logstash_version_line.chomp!
+    logstash_version_line << "-#{ENV['VERSION_QUALIFIER']}\n"
+  end
+  original_lines << "\n"
   original_lines << "# This is a copy the project level versions.yml into this gem's root and it is created when the gemspec is evaluated."
   gem_versions_yaml_path = File.expand_path("./versions-gem-copy.yml", File.dirname(__FILE__))
   File.open(gem_versions_yaml_path, 'w') do |new_file|
diff --git a/logstash-core/benchmarks/build.gradle b/logstash-core/benchmarks/build.gradle
index 7261b40cb..fff6cd5ac 100644
--- a/logstash-core/benchmarks/build.gradle
+++ b/logstash-core/benchmarks/build.gradle
@@ -1,6 +1,25 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 import org.yaml.snakeyaml.Yaml
 
-// fetch version from Logstash's master versions.yml file
+// fetch version from Logstash's main versions.yml file
 def versionMap = (Map) (new Yaml()).load(new File("$projectDir/../../versions.yml").text)
 
 description = """Logstash Core Java Benchmarks"""
@@ -9,17 +28,16 @@ String jrubyVersion = versionMap['jruby']['version']
 
 repositories {
   mavenCentral()
-  jcenter()
 }
 
 buildscript {
   repositories {
     mavenCentral()
-    jcenter()
+    gradlePluginPortal()
   }
   dependencies {
-    classpath 'org.yaml:snakeyaml:1.17'
-    classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'
+    classpath "org.yaml:snakeyaml:${snakeYamlVersion}"
+    classpath "com.github.johnrengelman:shadow:${shadowGradlePluginVersion}"
   }
 }
 
@@ -32,19 +50,17 @@ jar {
 }
 
 ext {
-  jmh = 1.18
+  jmh = 1.37
 }
 
 dependencies {
-  compile project(':logstash-core')
-  compile "org.openjdk.jmh:jmh-core:$jmh"
-  compile "org.openjdk.jmh:jmh-generator-annprocess:$jmh"
-  compile "org.openjdk.jmh:jmh-core-benchmarks:$jmh"
-  compile 'net.sf.jopt-simple:jopt-simple:5.0.3'
-  compile 'com.google.guava:guava:21.0'
-  compile 'commons-io:commons-io:2.5'
-  runtime 'joda-time:joda-time:2.8.2'
-  compile "org.jruby:jruby-core:$jrubyVersion"
+  implementation project(':logstash-core')
+  implementation "org.openjdk.jmh:jmh-core:$jmh"
+  annotationProcessor "org.openjdk.jmh:jmh-generator-annprocess:$jmh"
+  implementation 'com.google.guava:guava:33.1.0-jre'
+  implementation 'commons-io:commons-io:2.16.1'
+  runtimeOnly 'joda-time:joda-time:2.8.2'
+  api "org.jruby:jruby-core:$jrubyVersion"
 }
 
 javadoc {
@@ -54,22 +70,25 @@ javadoc {
 apply plugin: 'com.github.johnrengelman.shadow'
 
 shadowJar {
-  baseName = 'logstash-core-benchmarks-all'
-  classifier = null
-  version = null
+  archiveBaseName = 'logstash-core-benchmarks-all'
+  archiveClassifier = null
+  archiveVersion = ''
 }
 
-task jmh(type: JavaExec, dependsOn: [':logstash-core-benchmarks:clean', ':logstash-core-benchmarks:shadowJar']) {
+tasks.register("jmh", JavaExec) {
 
-  main = "-jar"
+ dependsOn=[':logstash-core-benchmarks:clean', ':logstash-core-benchmarks:shadowJar']
+
+  mainClass = "-jar"
+
+  def include = project.properties.get('include', '')
 
   doFirst {
     args = [
-      "-Djava.io.tmpdir=${buildDir.absolutePath}",
-      "-XX:+UseParNewGC", "-XX:+UseConcMarkSweepGC", "-XX:CMSInitiatingOccupancyFraction=75",
-      "-XX:+UseCMSInitiatingOccupancyOnly", "-XX:+DisableExplicitGC",
-      "-XX:+HeapDumpOnOutOfMemoryError", "-Xms2g", "-Xmx2g",
-      shadowJar.archivePath,
+            "-Djava.io.tmpdir=${buildDir.absolutePath}",
+            "-XX:+HeapDumpOnOutOfMemoryError", "-Xms2g", "-Xmx2g",
+            shadowJar.archiveFile.get().asFile,
+            include
     ]
   }
 }
diff --git a/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/BufferedTokenizerExtBenchmark.java b/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/BufferedTokenizerExtBenchmark.java
new file mode 100644
index 000000000..5b01cebb3
--- /dev/null
+++ b/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/BufferedTokenizerExtBenchmark.java
@@ -0,0 +1,83 @@
+package org.logstash.benchmark;
+
+import org.jruby.RubyArray;
+import org.jruby.RubyString;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.logstash.RubyUtil;
+import org.logstash.common.BufferedTokenizerExt;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.util.concurrent.TimeUnit;
+
+import static org.logstash.RubyUtil.RUBY;
+
+@Warmup(iterations = 3, time = 100, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 10, time = 100, timeUnit = TimeUnit.MILLISECONDS)
+@Fork(1)
+@BenchmarkMode(Mode.Throughput)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+public class BufferedTokenizerExtBenchmark {
+
+    private BufferedTokenizerExt sut;
+    private ThreadContext context;
+    private RubyString singleTokenPerFragment;
+    private RubyString multipleTokensPerFragment;
+    private RubyString multipleTokensSpreadMultipleFragments_1;
+    private RubyString multipleTokensSpreadMultipleFragments_2;
+    private RubyString multipleTokensSpreadMultipleFragments_3;
+
+    @Setup(Level.Invocation)
+    public void setUp() {
+        sut = new BufferedTokenizerExt(RubyUtil.RUBY, RubyUtil.BUFFERED_TOKENIZER);
+        context = RUBY.getCurrentContext();
+        IRubyObject[] args = {};
+        sut.init(context, args);
+        singleTokenPerFragment = RubyUtil.RUBY.newString("a".repeat(512) + "\n");
+
+        multipleTokensPerFragment = RubyUtil.RUBY.newString("a".repeat(512) + "\n" + "b".repeat(512) + "\n" + "c".repeat(512) + "\n");
+
+        multipleTokensSpreadMultipleFragments_1 = RubyUtil.RUBY.newString("a".repeat(512) + "\n" + "b".repeat(512) + "\n" + "c".repeat(256));
+        multipleTokensSpreadMultipleFragments_2 = RubyUtil.RUBY.newString("c".repeat(256) + "\n" + "d".repeat(512) + "\n" + "e".repeat(256));
+        multipleTokensSpreadMultipleFragments_3 = RubyUtil.RUBY.newString("f".repeat(256) + "\n" + "g".repeat(512) + "\n" + "h".repeat(512) + "\n");
+    }
+
+    @SuppressWarnings("unchecked")
+    @Benchmark
+    public final void onlyOneTokenPerFragment(Blackhole blackhole) {
+        RubyArray<RubyString> tokens = (RubyArray<RubyString>) sut.extract(context, singleTokenPerFragment);
+        blackhole.consume(tokens);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Benchmark
+    public final void multipleTokenPerFragment(Blackhole blackhole) {
+        RubyArray<RubyString> tokens = (RubyArray<RubyString>) sut.extract(context, multipleTokensPerFragment);
+        blackhole.consume(tokens);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Benchmark
+    public final void multipleTokensCrossingMultipleFragments(Blackhole blackhole) {
+        RubyArray<RubyString> tokens = (RubyArray<RubyString>) sut.extract(context, multipleTokensSpreadMultipleFragments_1);
+        blackhole.consume(tokens);
+
+        tokens = (RubyArray<RubyString>) sut.extract(context, multipleTokensSpreadMultipleFragments_2);
+        blackhole.consume(tokens);
+
+        tokens = (RubyArray<RubyString>) sut.extract(context, multipleTokensSpreadMultipleFragments_3);
+        blackhole.consume(tokens);
+    }
+}
diff --git a/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/EventSerializationBenchmark.java b/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/EventSerializationBenchmark.java
index 182cbe075..af7f62ade 100644
--- a/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/EventSerializationBenchmark.java
+++ b/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/EventSerializationBenchmark.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark;
 
 import java.io.DataOutputStream;
diff --git a/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/EventSprintfBenchmark.java b/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/EventSprintfBenchmark.java
index a55e39230..0d640328b 100644
--- a/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/EventSprintfBenchmark.java
+++ b/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/EventSprintfBenchmark.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark;
 
 import java.util.concurrent.TimeUnit;
diff --git a/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/LogPerPipelineBenchmark.java b/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/LogPerPipelineBenchmark.java
new file mode 100644
index 000000000..ad1b7f33c
--- /dev/null
+++ b/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/LogPerPipelineBenchmark.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.benchmark;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.ThreadContext;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.openjdk.jmh.annotations.*;
+
+import java.util.concurrent.TimeUnit;
+
+@Warmup(iterations = 3, time = 100, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 10, time = 100, timeUnit = TimeUnit.MILLISECONDS)
+@Fork(1)
+@BenchmarkMode(Mode.Throughput)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@State(Scope.Thread)
+public class LogPerPipelineBenchmark {
+
+    private static final int EVENTS_PER_INVOCATION = 10_000_000;
+
+    @Setup
+    public void setUp() {
+        System.setProperty("ls.log.format", "plain");
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(EVENTS_PER_INVOCATION)
+    public final void logWithScriptingCodeToExecuteAndOneLogPerPipelineEnabled() {
+        System.setProperty("log4j.configurationFile", "log4j2-with-script.properties");
+        System.setProperty("ls.pipeline.separate_logs", "true");
+        logManyLines();
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(EVENTS_PER_INVOCATION)
+    public final void logWithScriptingCodeToExecuteAndOneLogPerPipelineDisabled() {
+        System.setProperty("log4j.configurationFile", "log4j2-with-script.properties");
+        System.setProperty("ls.pipeline.separate_logs", "false");
+        logManyLines();
+    }
+
+    @Benchmark
+    @OperationsPerInvocation(EVENTS_PER_INVOCATION)
+    public final void logWithoutScriptingCodeToExecute() {
+        System.setProperty("log4j.configurationFile", "log4j2-without-script.properties");
+
+        logManyLines();
+    }
+
+    private void logManyLines() {
+        LoggerContext context = LoggerContext.getContext(false);
+        context.reconfigure();
+        ThreadContext.put("pipeline.id", "pipeline_1");
+        Logger logger = LogManager.getLogger(LogPerPipelineBenchmark.class);
+
+        for (int i = 0; i < EVENTS_PER_INVOCATION; ++i) {
+            logger.info("log for pipeline 1");
+        }
+    }
+}
diff --git a/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/QueueRWBenchmark.java b/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/QueueRWBenchmark.java
index 316025371..55210b6bf 100644
--- a/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/QueueRWBenchmark.java
+++ b/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/QueueRWBenchmark.java
@@ -1,6 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark;
 
-import com.google.common.io.Files;
+import java.nio.file.Files;
 import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.ArrayBlockingQueue;
@@ -116,8 +136,8 @@ public class QueueRWBenchmark {
         future.get();
     }
 
-    private static Settings settings() {
-        return SettingsImpl.fileSettingsBuilder(Files.createTempDir().getPath())
+    private static Settings settings() throws IOException {
+        return SettingsImpl.fileSettingsBuilder(String.valueOf(Files.createTempDirectory(null)))
             .capacity(256 * 1024 * 1024)
             .queueMaxBytes(Long.MAX_VALUE)
             .checkpointMaxWrites(ACK_INTERVAL)
diff --git a/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/QueueWriteBenchmark.java b/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/QueueWriteBenchmark.java
index c35c37f99..ac44d85a3 100644
--- a/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/QueueWriteBenchmark.java
+++ b/logstash-core/benchmarks/src/main/java/org/logstash/benchmark/QueueWriteBenchmark.java
@@ -1,6 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark;
 
-import com.google.common.io.Files;
+import java.nio.file.Files;
 import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
@@ -68,8 +88,8 @@ public class QueueWriteBenchmark {
         }
     }
 
-    private static Settings settings() {
-        return SettingsImpl.fileSettingsBuilder(Files.createTempDir().getPath())
+    private static Settings settings() throws IOException {
+        return SettingsImpl.fileSettingsBuilder(String.valueOf(Files.createTempDirectory(null)))
             .capacity(256 * 1024 * 1024)
             .queueMaxBytes(Long.MAX_VALUE)
             .checkpointMaxWrites(1024)
diff --git a/logstash-core/benchmarks/src/main/resources/log4j2-with-script.properties b/logstash-core/benchmarks/src/main/resources/log4j2-with-script.properties
new file mode 100644
index 000000000..52a61d10d
--- /dev/null
+++ b/logstash-core/benchmarks/src/main/resources/log4j2-with-script.properties
@@ -0,0 +1,35 @@
+status = error
+name = LogstashPropertiesConfig
+
+appender.rolling.type = RollingFile
+appender.rolling.name = plain_rolling
+appender.rolling.fileName = ${sys:ls.logs}/logstash-plain.log
+appender.rolling.filePattern = ${sys:ls.logs}/logstash-plain-%d{yyyy-MM-dd}-%i.log.gz
+appender.rolling.policies.type = Policies
+appender.rolling.policies.time.type = TimeBasedTriggeringPolicy
+appender.rolling.policies.time.interval = 1
+appender.rolling.policies.time.modulate = true
+appender.rolling.layout.type = PatternLayout
+appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]} %-.10000m%n
+appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.rolling.policies.size.size = 100MB
+appender.rolling.strategy.type = DefaultRolloverStrategy
+appender.rolling.strategy.max = 30
+appender.rolling.avoid_pipelined_filter.type = PipelineRoutingFilter
+
+appender.routing.type = PipelineRouting
+appender.routing.name = pipeline_routing_appender
+appender.routing.pipeline.type = RollingFile
+appender.routing.pipeline.name = appender-${ctx:pipeline.id}
+appender.routing.pipeline.fileName = ${sys:ls.logs}/pipeline_${ctx:pipeline.id}.log
+appender.routing.pipeline.filePattern = ${sys:ls.logs}/pipeline_${ctx:pipeline.id}.%i.log.gz
+appender.routing.pipeline.layout.type = PatternLayout
+appender.routing.pipeline.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n
+appender.routing.pipeline.policy.type = SizeBasedTriggeringPolicy
+appender.routing.pipeline.policy.size = 100MB
+appender.routing.pipeline.strategy.type = DefaultRolloverStrategy
+appender.routing.pipeline.strategy.max = 30
+
+rootLogger.level = INFO
+rootLogger.appenderRef.rolling.ref = ${sys:ls.log.format}_rolling
+rootLogger.appenderRef.routing.ref = pipeline_routing_appender
diff --git a/logstash-core/benchmarks/src/main/resources/log4j2-without-script.properties b/logstash-core/benchmarks/src/main/resources/log4j2-without-script.properties
new file mode 100644
index 000000000..959f65e0d
--- /dev/null
+++ b/logstash-core/benchmarks/src/main/resources/log4j2-without-script.properties
@@ -0,0 +1,21 @@
+status = error
+name = LogstashPropertiesConfig
+
+appender.rolling.type = RollingFile
+appender.rolling.name = plain_rolling
+appender.rolling.fileName = ${sys:ls.logs}/logstash-plain.log
+appender.rolling.filePattern = ${sys:ls.logs}/logstash-plain-%d{yyyy-MM-dd}-%i.log.gz
+appender.rolling.policies.type = Policies
+appender.rolling.policies.time.type = TimeBasedTriggeringPolicy
+appender.rolling.policies.time.interval = 1
+appender.rolling.policies.time.modulate = true
+appender.rolling.layout.type = PatternLayout
+appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]} %-.10000m%n
+appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.rolling.policies.size.size = 100MB
+appender.rolling.strategy.type = DefaultRolloverStrategy
+appender.rolling.strategy.max = 30
+
+rootLogger.level = INFO
+rootLogger.appenderRef.rolling.ref = ${sys:ls.log.format}_rolling
+rootLogger.appenderRef.routing.ref = pipeline_routing_appender
diff --git a/logstash-core/build.gradle b/logstash-core/build.gradle
index d3e26879c..4ae67b0c2 100644
--- a/logstash-core/build.gradle
+++ b/logstash-core/build.gradle
@@ -1,53 +1,99 @@
-import java.nio.file.Files
-import java.nio.file.Paths
-import org.yaml.snakeyaml.Yaml
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
-// fetch version from Logstash's master versions.yml file
-def versionMap = (Map) (new Yaml()).load(new File("$projectDir/../versions.yml").text)
-
-description = """Logstash Core Java"""
-version = versionMap['logstash-core']
-String jrubyVersion = versionMap['jruby']['version']
-String jacksonVersion = versionMap['jackson']
-
-repositories {
-    mavenCentral()
-}
 
 buildscript {
     repositories {
         mavenCentral()
     }
     dependencies {
-        classpath 'org.yaml:snakeyaml:1.17'
+        classpath "org.yaml:snakeyaml:${snakeYamlVersion}"
     }
 }
 
-task sourcesJar(type: Jar, dependsOn: classes) {
+plugins {
+    id "jacoco"
+    id "org.sonarqube" version "4.3.0.3225"
+}
+
+apply plugin: 'jacoco'
+apply plugin: "org.sonarqube"
+
+repositories {
+    mavenCentral()
+}
+
+sonarqube {
+    properties {
+        property 'sonar.coverage.jacoco.xmlReportPaths', "${buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+    }
+}
+
+jacoco {
+    toolVersion = "0.8.9"
+}
+
+
+import org.yaml.snakeyaml.Yaml
+
+// fetch version from Logstash's main versions.yml file
+def versionMap = (Map) (new Yaml()).load(new File("$projectDir/../versions.yml").text)
+
+description = """Logstash Core Java"""
+
+String logstashCoreVersion = versionMap['logstash-core']
+String jacksonVersion = versionMap['jackson']
+String jacksonDatabindVersion = versionMap['jackson-databind']
+String jrubyVersion = versionMap['jruby']['version']
+
+String log4jVersion = '2.17.2'
+
+tasks.register("sourcesJar", Jar) {
+    dependsOn classes
     from sourceSets.main.allSource
-    classifier 'sources'
-    extension 'jar'
+    archiveClassifier = 'sources'
+    archiveExtension = 'jar'
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
+tasks.register("javadocJar", Jar) {
+    dependsOn javadoc
     from javadoc.destinationDir
-    classifier 'javadoc'
-    extension 'jar'
+    archiveClassifier = 'javadoc'
+    archiveExtension = 'jar'
 }
 
-task copyRuntimeLibs(type: Copy) {
+tasks.register("copyRuntimeLibs", Copy) {
     into project.file('lib/jars/')
-    from configurations.compile, configurations.runtime
+    from configurations.runtimeClasspath {
+        exclude { it.file.name == 'jruby.jar' }
+    }
 }
 
 // copy jar file into the gem lib dir but without the version number in filename
-task copyGemjar(type: Copy, dependsOn: [sourcesJar, copyRuntimeLibs]) {
+tasks.register("copyGemjar", Copy) {
+    dependsOn=[sourcesJar, copyRuntimeLibs]
     from project.jar
     into project.file('lib/jars/')
     rename(/(.+)-${project.version}.jar/, '$1.jar')
 }
 
-task cleanGemjar {
+tasks.register("cleanGemjar") {
     delete fileTree(project.file('lib/jars/')) {
         include '*.jar'
     }
@@ -64,21 +110,55 @@ configurations.archives {
     extendsFrom configurations.javadoc
 }
 
-task javaTests(type: Test) {
+tasks.register("javaTests", Test) {
+    dependsOn ':bootstrap'
     exclude '/org/logstash/RSpecTests.class'
     exclude '/org/logstash/config/ir/ConfigCompilerTest.class'
     exclude '/org/logstash/config/ir/CompiledPipelineTest.class'
+    exclude '/org/logstash/config/ir/EventConditionTest.class'
+    exclude '/org/logstash/config/ir/PipelineConfigTest.class'
     exclude '/org/logstash/config/ir/compiler/OutputDelegatorTest.class'
+    exclude '/org/logstash/config/ir/compiler/JavaCodecDelegatorTest.class'
+    exclude '/org/logstash/plugins/NamespacedMetricImplTest.class'
+    exclude '/org/logstash/plugins/CounterMetricImplTest.class'
+    exclude '/org/logstash/plugins/factory/PluginFactoryExtTest.class'
+    exclude '/org/logstash/execution/ObservedExecutionTest.class'
+
+    // 10GB is needed by the BufferedTokenizerExtWithSizeLimitTest.givenTooLongInputExtractDoesntOverflow test
+    maxHeapSize = "10g"
+
+    jacoco {
+        enabled = true
+        destinationFile = layout.buildDirectory.file('jacoco/test.exec').get().asFile
+        classDumpDir = layout.buildDirectory.dir('jacoco/classpathdumps').get().asFile
+    }
 }
 
-task rubyTests(type: Test) {
+jacocoTestReport {
+    reports {
+        xml.required = true
+        html.required = true
+    }
+}
+
+javaTests.finalizedBy(jacocoTestReport)
+
+tasks.register("rubyTests", Test) {
+    dependsOn compileTestJava
     inputs.files fileTree("${projectDir}/lib")
     inputs.files fileTree("${projectDir}/spec")
-    systemProperty 'logstash.core.root.dir', projectDir.absolutePath
+    systemProperty 'logstash.root.dir', projectDir.parent
     include '/org/logstash/RSpecTests.class'
     include '/org/logstash/config/ir/ConfigCompilerTest.class'
     include '/org/logstash/config/ir/CompiledPipelineTest.class'
+    include '/org/logstash/config/ir/EventConditionTest.class'
+    include '/org/logstash/config/ir/PipelineConfigTest.class'
     include '/org/logstash/config/ir/compiler/OutputDelegatorTest.class'
+    include '/org/logstash/config/ir/compiler/JavaCodecDelegatorTest.class'
+    include '/org/logstash/plugins/NamespacedMetricImplTest.class'
+    include '/org/logstash/plugins/CounterMetricImplTest.class'
+    include '/org/logstash/plugins/factory/PluginFactoryExtTest.class'
+    include '/org/logstash/execution/ObservedExecutionTest.class'
 }
 
 test {
@@ -86,6 +166,17 @@ test {
 }
 test.dependsOn javaTests, rubyTests
 
+tasks {
+    javadoc {
+        (options as StandardJavadocDocletOptions)
+                .tags(
+                        "apiNote:a:API Note:",
+                        "implSpec:a:Implementation Requirements:",
+                        "implNote:a:Implementation Note:"
+                )
+    }
+}
+
 artifacts {
     sources(sourcesJar) {
         // Weird Gradle quirk where type will be used for the extension, but only for sources
@@ -96,6 +187,23 @@ artifacts {
     }
 }
 
+task generateVersionInfoResources(type: DefaultTask) {
+    ext.outDir = layout.buildDirectory.dir("generated-resources/version-info").get()
+
+    inputs.property("version-info:logstash-core", logstashCoreVersion)
+    outputs.dir(ext.outDir)
+
+    doLast {
+        mkdir outDir;
+        def resourceFile = outDir.file('version-info.properties').asFile
+        resourceFile.text = "logstash-core: ${logstashCoreVersion}"
+    }
+}
+sourceSets {
+    main { output.dir(generateVersionInfoResources.outputs.files) }
+}
+processResources.dependsOn generateVersionInfoResources
+
 configurations {
     provided
 }
@@ -114,36 +222,48 @@ idea {
     }
 }
 
-def customJRubyDir = project.hasProperty("custom.jruby.path") ? project.property("custom.jruby.path") : ""
-def customJRubyVersion = customJRubyDir == "" ? "" : Files.readAllLines(Paths.get(customJRubyDir, "VERSION")).get(0).trim()
-
 dependencies {
-    compile 'org.apache.logging.log4j:log4j-api:2.11.1'
-    compile 'org.apache.logging.log4j:log4j-core:2.11.1'
-    runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.1'
-    compile 'commons-codec:commons-codec:1.11'
-    // Jackson version moved to versions.yml in the project root (the JrJackson version is there too)
-    compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
-    compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
-    compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
-    compile 'org.codehaus.janino:janino:3.0.11'
-    compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}"
-    if (customJRubyDir == "") {
-        compile "org.jruby:jruby-complete:${jrubyVersion}"
-    } else {
-        compile files(customJRubyDir + "/maven/jruby-complete/target/jruby-complete-${customJRubyVersion}.jar")
-    }
-    compile group: 'com.google.guava', name: 'guava', version: '22.0'
-    // Do not upgrade this, later versions require GPL licensed code in javac-shaded that is
-    // Apache2 incompatible
-    compile('com.google.googlejavaformat:google-java-format:1.1') {
+    api(files("../vendor/jruby/lib/jruby.jar") { // jruby-core.jar
+        builtBy ':downloadAndInstallJRuby'
+    }) { because "DEPENDENCY: org.jruby:jruby-core:${jrubyVersion}" } // meta-data for generateLicenseReport
+    implementation project(':jvm-options-parser')
+    implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
+    annotationProcessor "org.apache.logging.log4j:log4j-core:${log4jVersion}"
+    api "org.apache.logging.log4j:log4j-core:${log4jVersion}"
+    runtimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:${log4jVersion}"
+    runtimeOnly "org.slf4j:slf4j-api:1.7.30"
+    // concerns libraries such as manticore's http-client 4.5 (using commons-logging)
+    runtimeOnly "org.apache.logging.log4j:log4j-jcl:${log4jVersion}"
+    // for the log4j-jcl bridge to work commons-logging needs to be on the same class-path
+    runtimeOnly 'commons-logging:commons-logging:1.3.1'
+    // also handle libraries relying on log4j 1.x to redirect their logs
+    runtimeOnly "org.apache.logging.log4j:log4j-1.2-api:${log4jVersion}"
+    implementation('org.reflections:reflections:0.10.2') {
         exclude group: 'com.google.guava', module: 'guava'
     }
-    compile 'org.javassist:javassist:3.24.0-GA'
-    compile 'com.google.guava:guava:20.0'
-    testCompile 'org.apache.logging.log4j:log4j-core:2.11.1:tests'
-    testCompile 'junit:junit:4.12'
-    testCompile 'net.javacrumbs.json-unit:json-unit:2.3.0'
-    testCompile 'org.elasticsearch:securemock:1.2'
-    testCompile 'org.assertj:assertj-core:3.11.1'
+    implementation 'commons-codec:commons-codec:1.17.0' // transitively required by httpclient
+    // Jackson version moved to versions.yml in the project root (the JrJackson version is there too)
+    implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
+    api "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"
+    api "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
+    implementation 'org.codehaus.janino:janino:3.1.0'
+    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}"
+    implementation group: 'org.yaml', name: 'snakeyaml', version: '2.2'
+    implementation group: 'com.google.guava', name: 'guava', version: '33.1.0-jre'
+    implementation('com.google.googlejavaformat:google-java-format:1.22.0') {
+        exclude group: 'com.google.guava', module: 'guava'
+    }
+    implementation 'org.javassist:javassist:3.30.2-GA'
+    testImplementation "org.apache.logging.log4j:log4j-core:${log4jVersion}:tests"
+    testImplementation 'org.hamcrest:hamcrest:2.2'
+    testImplementation 'org.hamcrest:hamcrest-library:2.2'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'net.javacrumbs.json-unit:json-unit:2.3.0'
+    testImplementation 'org.elasticsearch:securemock:1.2'
+    testImplementation 'org.assertj:assertj-core:3.11.1'
+    testImplementation 'org.awaitility:awaitility:4.2.0'
+
+    api group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.14'
+    api group: 'commons-codec', name: 'commons-codec', version: '1.17.0'
+    api group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.16'
 }
diff --git a/logstash-core/gradle.properties b/logstash-core/gradle.properties
index ee05cbf9c..b8589ab55 100644
--- a/logstash-core/gradle.properties
+++ b/logstash-core/gradle.properties
@@ -1,2 +1 @@
 isDistributedArtifact=true
-
diff --git a/logstash-core/lib/logstash-core.rb b/logstash-core/lib/logstash-core.rb
index c2e4557af..df1dfd645 100644
--- a/logstash-core/lib/logstash-core.rb
+++ b/logstash-core/lib/logstash-core.rb
@@ -1 +1,18 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash-core/logstash-core"
diff --git a/logstash-core/lib/logstash-core/logstash-core.rb b/logstash-core/lib/logstash-core/logstash-core.rb
index 36b8e906c..b3deb9e45 100644
--- a/logstash-core/lib/logstash-core/logstash-core.rb
+++ b/logstash-core/lib/logstash-core/logstash-core.rb
@@ -1,4 +1,19 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 require "java"
 
@@ -8,9 +23,8 @@ require "java"
 # wrapper.
 unless $LS_JARS_LOADED
   jar_path = File.join(File.dirname(File.dirname(__FILE__)), "jars")
-  $:.unshift jar_path
-  Dir.glob(jar_path + '/*.jar') do |jar|
-    require File.basename(jar)
+  Dir.glob("#{jar_path}/*.jar") do |jar|
+    load jar
   end
   java_import org.logstash.RubyUtil
 end
diff --git a/logstash-core/lib/logstash-core/version.rb b/logstash-core/lib/logstash-core/version.rb
index 8907e466d..d798d7386 100644
--- a/logstash-core/lib/logstash-core/version.rb
+++ b/logstash-core/lib/logstash-core/version.rb
@@ -1,14 +1,28 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # The version of logstash core gem.
 #
-# sourced from a copy of the master versions.yml file, see logstash-core/logstash-core.gemspec
+# sourced from a copy of the main versions.yml file, see logstash-core/logstash-core.gemspec
 if !defined?(ALL_VERSIONS)
   require 'yaml'
   ALL_VERSIONS = YAML.load_file(File.expand_path("../../versions-gem-copy.yml", File.dirname(__FILE__)))
 end
 
 if !defined?(LOGSTASH_CORE_VERSION)
-  # PACKAGE_SUFFIX is declared in the artifact namespace from artifacts.rake
-  LOGSTASH_CORE_VERSION = defined?(PACKAGE_SUFFIX) ? "#{ALL_VERSIONS.fetch("logstash-core")}#{PACKAGE_SUFFIX}" : ALL_VERSIONS.fetch("logstash-core")
+  LOGSTASH_CORE_VERSION = ALL_VERSIONS.fetch("logstash-core")
 end
diff --git a/logstash-core/lib/logstash/agent.rb b/logstash-core/lib/logstash/agent.rb
index 6cd3408d6..dd0ad4a2d 100644
--- a/logstash-core/lib/logstash/agent.rb
+++ b/logstash-core/lib/logstash/agent.rb
@@ -1,14 +1,32 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/environment"
 require "logstash/config/cpu_core_strategy"
 require "logstash/instrument/collector"
 require "logstash/instrument/periodic_pollers"
-require "logstash/pipeline"
 require "logstash/webserver"
 require "logstash/config/source_loader"
+require "logstash/config/pipeline_config"
 require "logstash/pipeline_action"
 require "logstash/state_resolver"
 require "logstash/pipelines_registry"
+require "logstash/persisted_queue_config_validator"
+require "logstash/pipeline_resource_usage_validator"
 require "stud/trap"
 require "uri"
 require "socket"
@@ -23,6 +41,8 @@ class LogStash::Agent
   attr_reader :metric, :name, :settings, :dispatcher, :ephemeral_id, :pipeline_bus
   attr_accessor :logger
 
+  attr_reader :health_observer
+
   # initialize method for LogStash::Agent
   # @param params [Hash] potential parameters are:
   #   :name [String] - identifier for the agent
@@ -34,28 +54,26 @@ class LogStash::Agent
     @auto_reload = setting("config.reload.automatic")
     @ephemeral_id = SecureRandom.uuid
 
-    # Mutex to synchonize in the exclusive method
+    java_import("org.logstash.health.HealthObserver")
+    @health_observer ||= HealthObserver.new
+
+    # Mutex to synchronize in the exclusive method
     # Initial usage for the Ruby pipeline initialization which is not thread safe
-    @exclusive_lock = Mutex.new
     @webserver_control_lock = Mutex.new
 
+    @convergence_lock = Mutex.new
+
     # Special bus object for inter-pipelines communications. Used by the `pipeline` input/output
-    @pipeline_bus = org.logstash.plugins.pipeline.PipelineBus.new
+    @pipeline_bus = org.logstash.plugins.pipeline.PipelineBus.create
 
     @pipelines_registry = LogStash::PipelinesRegistry.new
 
     @name = setting("node.name")
-    @http_host = setting("http.host")
-    @http_port = setting("http.port")
-    @http_environment = setting("http.environment")
     # Generate / load the persistent uuid
     id
 
-    # Set the global FieldReference parsing mode
-    if @settings.set?('config.field_reference.parser')
-      # TODO: i18n
-      logger.warn("deprecated setting `config.field_reference.parser` set; field reference parsing is strict by default")
-    end
+    # Initialize, but do not start the webserver.
+    @webserver = LogStash::WebServer.from_settings(@logger, self, settings)
 
     # This is for backward compatibility in the tests
     if source_loader.nil?
@@ -66,7 +84,9 @@ class LogStash::Agent
     end
 
     # Normalize time interval to seconds
-    @reload_interval = setting("config.reload.interval") / 1_000_000_000.0
+    # we can't do .to_seconds here as values under 1 seconds are rounded to 0
+    # so we get the nanos and convert to seconds instead.
+    @reload_interval = setting("config.reload.interval").to_nanos * 1e-9
 
     @collect_metric = setting("metric.collect")
 
@@ -78,6 +98,12 @@ class LogStash::Agent
     @pipeline_reload_metric = metric.namespace([:stats, :pipelines])
     @instance_reload_metric = metric.namespace([:stats, :reloads])
     initialize_agent_metrics
+    initialize_flow_metrics
+
+    initialize_geoip_database_metrics(metric)
+
+    @pq_config_validator = LogStash::PersistedQueueConfigValidator.new
+    @pipeline_resource_usage_validator = LogStash::PipelineResourceUsageValidator.new(Java::java.lang.Runtime.getRuntime().maxMemory)
 
     @dispatcher = LogStash::EventDispatcher.new(self)
     LogStash::PLUGIN_REGISTRY.hooks.register_emitter(self.class, dispatcher)
@@ -86,19 +112,16 @@ class LogStash::Agent
     @running = Concurrent::AtomicBoolean.new(false)
   end
 
-  def exclusive(&block)
-    @exclusive_lock.synchronize { block.call }
-  end
-
   def execute
     @thread = Thread.current # this var is implicitly used by Stud.stop?
+    LogStash::Util.set_thread_name("Agent thread")
     logger.debug("Starting agent")
 
     transition_to_running
 
-    converge_state_and_update
+    start_webserver_if_enabled
 
-    start_webserver
+    converge_state_and_update
 
     if auto_reload?
       # `sleep_then_run` instead of firing the interval right away
@@ -135,6 +158,31 @@ class LogStash::Agent
     transition_to_stopped
   end
 
+  include org.logstash.health.PipelineIndicator::PipelineDetailsProvider
+  def pipeline_details(pipeline_id)
+    logger.trace("fetching pipeline details for `#{pipeline_id}`")
+    pipeline_id = pipeline_id.to_sym
+
+    java_import org.logstash.health.PipelineIndicator
+
+    pipeline_state = @pipelines_registry.states.get(pipeline_id)
+    if pipeline_state.nil?
+      return PipelineIndicator::Details.new(PipelineIndicator::Status::UNKNOWN)
+    end
+
+    pipeline_state.synchronize do |sync_state|
+      status = case
+               when sync_state.loading?    then PipelineIndicator::Status::LOADING
+               when sync_state.crashed?    then PipelineIndicator::Status::TERMINATED
+               when sync_state.running?    then PipelineIndicator::Status::RUNNING
+               when sync_state.finished?   then PipelineIndicator::Status::FINISHED
+               else                             PipelineIndicator::Status::UNKNOWN
+               end
+
+      PipelineIndicator::Details.new(status, sync_state.pipeline&.to_java.collectWorkerUtilizationFlowObservation)
+    end
+  end
+
   def auto_reload?
     @auto_reload
   end
@@ -147,6 +195,18 @@ class LogStash::Agent
     @running.false?
   end
 
+  # Only call converge_state_and_update if agent is running
+  # to avoid a double call to converge_state_and_update since
+  # agent.execute will call converge_state_and_update itself
+  def converge_state_and_update_if_running
+    converge_state_and_update if running?
+  end
+
+  # Trigger convergence of pipelines
+  # NOTE that there is no point of calling this method before
+  # Agent#execute has been called since it will itself call
+  # converge_state_and_update and will result in a double
+  # convergence.
   def converge_state_and_update
     results = @source_loader.fetch
 
@@ -159,26 +219,36 @@ class LogStash::Agent
       end
     end
 
-    # We Lock any access on the pipelines, since the actions will modify the
-    # content of it.
-    converge_result = nil
+    @pq_config_validator.check(@pipelines_registry.running_user_defined_pipelines, results.response)
 
-    pipeline_actions = resolve_actions(results.response)
-    converge_result = converge_state(pipeline_actions)
+    converge_result = resolve_actions_and_converge_state(results.response)
     update_metrics(converge_result)
-
-    logger.info(
-        "Pipelines running",
-        :count => running_pipelines.size,
-        :running_pipelines => running_pipelines.keys,
-        :non_running_pipelines => non_running_pipelines.keys
-    ) if converge_result.success? && converge_result.total > 0
+    if converge_result.success? && converge_result.total > 0
+      logger.info(
+          "Pipelines running",
+          :count => running_pipelines.size,
+          :running_pipelines => running_pipelines.keys,
+          :non_running_pipelines => non_running_pipelines.keys
+      )
+      @pipeline_resource_usage_validator.check(@pipelines_registry)
+    end
 
     dispatch_events(converge_result)
 
     converge_result
   rescue => e
-    logger.error("An exception happened when converging configuration", :exception => e.class, :message => e.message, :backtrace => e.backtrace)
+    attributes = {:exception => e.class, :message => e.message}
+    attributes.merge!({:backtrace => e.backtrace}) if logger.debug?
+    logger.error("An exception happened when converging configuration", attributes)
+  end
+
+  ##
+  # Shut down a pipeline and wait for it to fully stop.
+  # WARNING: Calling from `Plugin#initialize` or `Plugin#register` will result in deadlock.
+  # @param pipeline_id [String]
+  def stop_pipeline(pipeline_id)
+    action = LogStash::PipelineAction::Stop.new(pipeline_id.to_sym)
+    converge_state_with_resolved_actions([action])
   end
 
   # Calculate the Logstash uptime in milliseconds
@@ -193,10 +263,10 @@ class LogStash::Agent
     # in order of dependency.
     pipeline_bus.setBlockOnUnlisten(true)
 
-    stop_collecting_metrics
-    stop_webserver
     transition_to_stopped
     converge_result = shutdown_pipelines
+    stop_collecting_metrics
+    stop_webserver
     converge_result
   end
 
@@ -204,7 +274,7 @@ class LogStash::Agent
     return @id if @id
 
     uuid = nil
-    if ::File.exists?(id_path)
+    if ::File.exist?(id_path)
       begin
         uuid = ::File.open(id_path) {|f| f.each_line.first.chomp }
       rescue => e
@@ -254,6 +324,14 @@ class LogStash::Agent
     @pipelines_registry.running_pipelines
    end
 
+   def loading_pipelines
+    @pipelines_registry.loading_pipelines
+   end
+
+  def loaded_pipelines
+    @pipelines_registry.loaded_pipelines
+  end
+
   def non_running_pipelines
     @pipelines_registry.non_running_pipelines
   end
@@ -275,7 +353,7 @@ class LogStash::Agent
   end
 
   def no_pipeline?
-    @pipelines_registry.running_pipelines.empty?
+    @pipelines_registry.running_pipelines(include_loading: true).empty?
   end
 
   private
@@ -288,6 +366,24 @@ class LogStash::Agent
     @running.make_true
   end
 
+  # @param pipeline_configs [Array<Config::PipelineConfig>]
+  # @return [ConvergeResult]
+  def resolve_actions_and_converge_state(pipeline_configs)
+    @convergence_lock.synchronize do
+      pipeline_actions = resolve_actions(pipeline_configs)
+      converge_state(pipeline_actions)
+    end
+  end
+
+  # Beware the usage with #resolve_actions_and_converge_state
+  # Calling this method in `Plugin#register` causes deadlock.
+  # For example, resolve_actions_and_converge_state -> pipeline reload_action -> plugin register -> converge_state_with_resolved_actions
+  def converge_state_with_resolved_actions(pipeline_actions)
+    @convergence_lock.synchronize do
+      converge_state(pipeline_actions)
+    end
+  end
+
   # We depends on a series of task derived from the internal state and what
   # need to be run, theses actions are applied to the current pipelines to converge to
   # the desired state.
@@ -300,12 +396,13 @@ class LogStash::Agent
   #
   def converge_state(pipeline_actions)
     logger.debug("Converging pipelines state", :actions_count => pipeline_actions.size)
+    fail("Illegal access to `LogStash::Agent#converge_state()` without exclusive lock at #{caller[1]}") unless @convergence_lock.owned?
 
     converge_result = LogStash::ConvergeResult.new(pipeline_actions.size)
 
     pipeline_actions.map do |action|
       Thread.new(action, converge_result) do |action, converge_result|
-        java.lang.Thread.currentThread().setName("Converge #{action}");
+        LogStash::Util.set_thread_name("Converge #{action}")
         # We execute every task we need to converge the current state of pipelines
         # for every task we will record the action result, that will help us
         # the results of all the task will determine if the converge was successful or not
@@ -332,8 +429,14 @@ class LogStash::Agent
             )
           end
         rescue SystemExit, Exception => e
-          logger.error("Failed to execute action", :action => action, :exception => e.class.name, :message => e.message, :backtrace => e.backtrace)
-          converge_result.add(action, e)
+          error_details = { :action => action, :exception => e.class.name, :message => e.message, :backtrace => e.backtrace }
+          cause = e.cause
+          if cause && e != cause
+            error_details[:cause] = { :exception => cause.class, :message => cause.message }
+            error_details[:cause][:backtrace] = cause.backtrace if cause.backtrace
+          end
+          logger.error('Failed to execute action', error_details)
+          converge_result.add(action, LogStash::ConvergeResult::FailedAction.from_exception(e))
         end
       end
     end.each(&:join)
@@ -348,6 +451,7 @@ class LogStash::Agent
   end
 
   def resolve_actions(pipeline_configs)
+    fail("Illegal access to `LogStash::Agent#resolve_actions()` without exclusive lock at #{caller[1]}") unless @convergence_lock.owned?
     @state_resolver.resolve(@pipelines_registry, pipeline_configs)
   end
 
@@ -364,10 +468,16 @@ class LogStash::Agent
     end
   end
 
+  def start_webserver_if_enabled
+    if @settings.get_value("api.enabled")
+      start_webserver
+    else
+      @logger.info("HTTP API is disabled (`api.enabled=false`); webserver will not be started.")
+    end
+  end
+
   def start_webserver
     @webserver_control_lock.synchronize do
-      options = {:http_host => @http_host, :http_ports => @http_port, :http_environment => @http_environment }
-      @webserver = LogStash::WebServer.new(@logger, self, options)
       @webserver_thread = Thread.new(@webserver) do |webserver|
         LogStash::Util.set_thread_name("Api Webserver")
         webserver.run
@@ -377,7 +487,7 @@ class LogStash::Agent
 
   def stop_webserver
     @webserver_control_lock.synchronize do
-      if @webserver
+      if @webserver_thread
         @webserver.stop
         if @webserver_thread.join(5).nil?
           @webserver_thread.kill
@@ -415,11 +525,9 @@ class LogStash::Agent
     # In this context I could just call shutdown, but I've decided to
     # use the stop action implementation for that so we have the same code.
     # This also give us some context into why a shutdown is failing
-    pipeline_actions = resolve_actions([]) # We stop all the pipeline, so we converge to a empty state
-    converge_state(pipeline_actions)
+    resolve_actions_and_converge_state([]) # We stop all the pipeline, so we converge to a empty state
   end
 
-
   def setting(key)
     @settings.get(key)
   end
@@ -470,6 +578,56 @@ class LogStash::Agent
     @instance_reload_metric.increment(:failures, 0)
   end
 
+  def initialize_flow_metrics
+    if collect_metrics? && metric.collector
+
+      java_import org.logstash.instrument.metrics.UptimeMetric
+      java_import org.logstash.instrument.metrics.UptimeMetric::ScaleUnits
+
+      uptime_metric = UptimeMetric.new
+      uptime_precise_millis = uptime_metric.with_units_precise(ScaleUnits::MILLISECONDS)
+      uptime_precise_seconds = uptime_metric.with_units_precise(ScaleUnits::SECONDS)
+
+      events_namespace = metric.namespace([:stats, :events])
+      flow_metrics = []
+      flow_metrics << create_flow_metric("input_throughput", get_counter(events_namespace, :in), uptime_precise_seconds)
+      flow_metrics << create_flow_metric("filter_throughput", get_counter(events_namespace, :out), uptime_precise_seconds)
+      flow_metrics << create_flow_metric("output_throughput", get_counter(events_namespace, :filtered), uptime_precise_seconds)
+      flow_metrics << create_flow_metric("queue_backpressure", get_timer(events_namespace, :queue_push_duration_in_millis), uptime_precise_millis)
+      flow_metrics << create_flow_metric("worker_concurrency", get_timer(events_namespace, :duration_in_millis), uptime_precise_millis)
+
+      registered, unregistered = flow_metrics.partition do |flow_metric|
+        @metric.collector.register?([:stats, :flow], flow_metric.name.to_sym, flow_metric)
+      end
+
+      unregistered.each do |unregistered_flow_metric|
+        logger.warn("Failed to register global flow metric #{unregistered_flow_metric.name}.")
+      end
+
+      @flow_metrics = registered.freeze
+    end
+  end
+
+  def get_counter(namespace, key)
+    org.logstash.instrument.metrics.counter.LongCounter.fromRubyBase(namespace, key)
+  end
+  private :get_counter
+
+  def get_timer(namespace, key)
+    org.logstash.instrument.metrics.timer.TimerMetric.fromRubyBase(namespace, key)
+  end
+  private :get_timer
+
+  def create_flow_metric(name, numerator_metric, denominator_metric)
+    org.logstash.instrument.metrics.FlowMetric.create(name, numerator_metric, denominator_metric)
+  end
+  private :create_flow_metric
+
+  def capture_flow_metrics
+    @flow_metrics&.each(&:capture)
+  end
+  public :capture_flow_metrics
+
   def initialize_pipeline_metrics(action)
     @pipeline_reload_metric.namespace([action.pipeline_id, :reloads]).tap do |n|
       n.increment(:successes, 0)
@@ -488,4 +646,34 @@ class LogStash::Agent
       n.gauge(:last_success_timestamp, action_result.executed_at)
     end
   end
+
+  def initialize_geoip_database_metrics(metric)
+    begin
+      relative_path = ::File.join(LogStash::Environment::LOGSTASH_HOME, "x-pack", "lib", "geoip_database_management")
+      require_relative ::File.join(relative_path, "manager")
+      require_relative ::File.join(relative_path, "metric")
+
+      geoip_metric = metric.namespace([:geoip_download_manager]).tap do |n|
+        db = n.namespace([:database])
+        [:ASN, :City].each do  |database_type|
+          db_type = db.namespace([database_type])
+          db_type.gauge(:status, nil)
+          db_type.gauge(:last_updated_at, nil)
+          db_type.gauge(:fail_check_in_days, 0)
+        end
+
+        dl = n.namespace([:download_stats])
+        dl.increment(:successes, 0)
+        dl.increment(:failures, 0)
+        dl.gauge(:last_checked_at, nil)
+        dl.gauge(:status, nil)
+      end
+
+      database_metric = LogStash::GeoipDatabaseManagement::Metric.new(geoip_metric)
+      database_manager = LogStash::GeoipDatabaseManagement::Manager.instance
+      database_manager.database_metric = database_metric
+    rescue LoadError => e
+      @logger.trace("DatabaseManager is not in classpath", exception: e.message, backtrace: e.backtrace)
+    end
+  end
 end # class LogStash::Agent
diff --git a/logstash-core/lib/logstash/api/app_helpers.rb b/logstash-core/lib/logstash/api/app_helpers.rb
index 98e6c3775..6df4cc706 100644
--- a/logstash-core/lib/logstash/api/app_helpers.rb
+++ b/logstash-core/lib/logstash/api/app_helpers.rb
@@ -1,6 +1,23 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/json"
 require "logstash/api/errors"
+require "logstash/util"
 
 module LogStash::Api::AppHelpers
   # This method handle both of the normal flow *happy path*
@@ -8,7 +25,7 @@ module LogStash::Api::AppHelpers
   # it will make sense to separate them.
   #
   # See `#error` method in the `LogStash::Api::Module::Base`
-  def respond_with(data, options={})
+  def respond_with(data, options = {})
     as     = options.fetch(:as, :json)
     filter = options.fetch(:filter, "")
 
@@ -19,7 +36,7 @@ module LogStash::Api::AppHelpers
         data = generate_error_hash(data)
       else
         selected_fields = extract_fields(filter.to_s.strip)
-        data.select! { |k,v| selected_fields.include?(k) } unless selected_fields.empty?
+        data.select! { |k, v| selected_fields.include?(k) } unless selected_fields.empty?
         unless options.include?(:exclude_default_metadata)
           data = data.to_hash
           if data.values.size == 0 && selected_fields.size > 0
@@ -30,7 +47,7 @@ module LogStash::Api::AppHelpers
       end
 
       content_type "application/json"
-      LogStash::Json.dump(data, {:pretty => pretty?})
+      LogStash::Json.dump(stringify_symbols(data), {:pretty => pretty?})
     else
       content_type "text/plain"
       data.to_s
@@ -43,11 +60,15 @@ module LogStash::Api::AppHelpers
   end
 
   def as_boolean(string)
-    return true   if string == true   || string =~ (/(true|t|yes|y|1)$/i)
-    return false  if string == false  || string.blank? || string =~ (/(false|f|no|n|0)$/i)
+    return true if string == true
+    return false if string == false
+
+    return true if string =~ (/(true|t|yes|y|1)$/i)
+    return false if  LogStash::Util.blank?(string) || string =~ (/(false|f|no|n|0)$/i)
     raise ArgumentError.new("invalid value for Boolean: \"#{string}\"")
   end
 
+  protected
   def default_metadata
     @factory.build(:default_metadata).all
   end
@@ -60,6 +81,16 @@ module LogStash::Api::AppHelpers
     params.has_key?("pretty")
   end
 
+  # Recursively stringify symbols in the provided data structure
+  def stringify_symbols(data)
+    case data
+    when Hash   then Hash[data.each_pair.map { |k,v| [stringify_symbols(k), stringify_symbols(v)] }]
+    when Array  then data.map { |v| stringify_symbols(v) }
+    when Symbol then data.to_s.encode('UTF-8')
+    else data
+    end
+  end
+
   def generate_error_hash(error)
     {
       :path => request.path,
diff --git a/logstash-core/lib/logstash/api/command_factory.rb b/logstash-core/lib/logstash/api/command_factory.rb
index 2d790b5ee..0b246f140 100644
--- a/logstash-core/lib/logstash/api/command_factory.rb
+++ b/logstash-core/lib/logstash/api/command_factory.rb
@@ -1,12 +1,28 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/api/service"
 require "logstash/api/commands/system/basicinfo_command"
 require "logstash/api/commands/system/plugins_command"
+require "logstash/api/commands/health_report"
 require "logstash/api/commands/stats"
 require "logstash/api/commands/node"
 require "logstash/api/commands/default_metadata"
 
-
 module LogStash
   module Api
     class CommandFactory
@@ -19,13 +35,14 @@ module LogStash
           :plugins_command => ::LogStash::Api::Commands::System::Plugins,
           :stats => ::LogStash::Api::Commands::Stats,
           :node => ::LogStash::Api::Commands::Node,
+          :health_report => ::LogStash::Api::Commands::HealthReport,
           :default_metadata => ::LogStash::Api::Commands::DefaultMetadata
         }
       end
 
       def build(*klass_path)
         # Get a nested path with args like (:parent, :child)
-        klass = klass_path.reduce(factory) {|acc,v| acc[v]}
+        klass = klass_path.reduce(factory) {|acc, v| acc[v]}
 
         if klass
           klass.new(service)
diff --git a/logstash-core/lib/logstash/api/commands/base.rb b/logstash-core/lib/logstash/api/commands/base.rb
index d2bef44e6..25e71edd1 100644
--- a/logstash-core/lib/logstash/api/commands/base.rb
+++ b/logstash-core/lib/logstash/api/commands/base.rb
@@ -1,11 +1,26 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 module LogStash
   module Api
     module Commands
       class Base
         attr_reader :service
-        
+
         def initialize(service = LogStash::Api::Service.instance)
           @service = service
         end
@@ -13,7 +28,7 @@ module LogStash
         def uptime
           service.agent.uptime
         end
-        
+
         def started_at
           (LogStash::Agent::STARTED_AT.to_f * 1000.0).to_i
         end
diff --git a/logstash-core/lib/logstash/api/commands/default_metadata.rb b/logstash-core/lib/logstash/api/commands/default_metadata.rb
index 5bb177f42..79181cb51 100644
--- a/logstash-core/lib/logstash/api/commands/default_metadata.rb
+++ b/logstash-core/lib/logstash/api/commands/default_metadata.rb
@@ -1,4 +1,19 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 require "logstash/api/commands/base"
 
@@ -7,8 +22,37 @@ module LogStash
     module Commands
       class DefaultMetadata < Commands::Base
         def all
-          {:host => host, :version => version, :http_address => http_address,
-           :id => service.agent.id, :name => service.agent.name}
+          res = base_info.merge({
+             :status => service.agent.health_observer.status,
+             :pipeline => {
+               :workers => LogStash::SETTINGS.get("pipeline.workers"),
+               :batch_size => LogStash::SETTINGS.get("pipeline.batch.size"),
+               :batch_delay => LogStash::SETTINGS.get("pipeline.batch.delay"),
+             },
+            })
+          monitoring = {}
+          if enabled_xpack_monitoring?
+            monitoring = monitoring.merge({
+                        :hosts => LogStash::SETTINGS.get("xpack.monitoring.elasticsearch.hosts"),
+                        :username => LogStash::SETTINGS.get("xpack.monitoring.elasticsearch.username")
+                        })
+          end
+          if LogStash::SETTINGS.set?("monitoring.cluster_uuid")
+            monitoring = monitoring.merge({:cluster_uuid => LogStash::SETTINGS.get("monitoring.cluster_uuid")})
+          end
+          res.merge(monitoring.empty? ? {} : {:monitoring => monitoring})
+        end
+
+        def base_info
+          {
+            :host => host,
+            :version => version,
+            :http_address => http_address,
+            :id => service.agent.id,
+            :name => service.agent.name,
+            :ephemeral_id => service.agent.ephemeral_id,
+            :snapshot => ::BUILD_INFO["build_snapshot"],
+          }
         end
 
         def host
@@ -16,7 +60,7 @@ module LogStash
         end
 
         def version
-          LOGSTASH_CORE_VERSION
+          LOGSTASH_VERSION
         end
 
         def http_address
@@ -24,6 +68,14 @@ module LogStash
         rescue ::LogStash::Instrument::MetricStore::MetricNotFound, NoMethodError => e
           nil
         end
+
+        private
+        def enabled_xpack_monitoring?
+          LogStash::SETTINGS.registered?("xpack.monitoring.allow_legacy_collection") &&
+          LogStash::SETTINGS.get_value("xpack.monitoring.allow_legacy_collection") &&
+          LogStash::SETTINGS.registered?("xpack.monitoring.enabled") &&
+          LogStash::SETTINGS.get("xpack.monitoring.enabled")
+        end
       end
     end
   end
diff --git a/logstash-core/lib/logstash/api/commands/health_report.rb b/logstash-core/lib/logstash/api/commands/health_report.rb
new file mode 100644
index 000000000..d53a313b4
--- /dev/null
+++ b/logstash-core/lib/logstash/api/commands/health_report.rb
@@ -0,0 +1,31 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require "logstash/api/commands/base"
+
+module LogStash
+  module Api
+    module Commands
+      class HealthReport < Commands::Base
+
+        def all(selected_fields = [])
+          service.agent.health_observer.report
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/logstash-core/lib/logstash/api/commands/hot_threads_reporter.rb b/logstash-core/lib/logstash/api/commands/hot_threads_reporter.rb
index 384280b20..e602e6bd0 100644
--- a/logstash-core/lib/logstash/api/commands/hot_threads_reporter.rb
+++ b/logstash-core/lib/logstash/api/commands/hot_threads_reporter.rb
@@ -1,25 +1,41 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 java_import 'org.logstash.instrument.reports.ThreadsReport'
 
 class HotThreadsReport
   STRING_SEPARATOR_LENGTH = 80.freeze
-  HOT_THREADS_STACK_TRACES_SIZE_DEFAULT = 10.freeze
+  HOT_THREADS_STACK_TRACES_SIZE_DEFAULT = 50.freeze
 
   def initialize(cmd, options)
     @cmd = cmd
-    filter = { :stacktrace_size => options.fetch(:stacktrace_size, HOT_THREADS_STACK_TRACES_SIZE_DEFAULT) }
+    filter = { 'stacktrace_size' => "#{options.fetch(:stacktrace_size, HOT_THREADS_STACK_TRACES_SIZE_DEFAULT)}" }
     @thread_dump = ::LogStash::Util::ThreadDump.new(options.merge(:dump => ThreadsReport.generate(filter)))
   end
 
   def to_s
     hash = to_hash[:hot_threads]
-    report =  "#{I18n.t("logstash.web_api.hot_threads.title", :hostname => hash[:hostname], :time => hash[:time], :top_count => @thread_dump.top_count )} \n"
+    report =  "#{I18n.t("logstash.web_api.hot_threads.title", :hostname => hash[:hostname], :time => hash[:time], :top_count => @thread_dump.top_count)} \n"
     report << '=' * STRING_SEPARATOR_LENGTH
     report << "\n"
     hash[:threads].each do |thread|
-      line_str = I18n.t("logstash.web_api.hot_threads.thread_title", 
-        :percent_of_cpu_time => thread[:percent_of_cpu_time], 
-        :thread_state => thread[:state], 
+      line_str = I18n.t("logstash.web_api.hot_threads.thread_title",
+        :percent_of_cpu_time => thread[:percent_of_cpu_time],
+        :thread_state => thread[:state],
         :thread_name => thread[:name],
         :thread_id => thread[:thread_id])
       thread_report = "#{line_str} \n"
@@ -55,7 +71,7 @@ class HotThreadsReport
   end
 
   def cpu_time_as_percent(hash)
-    (((cpu_time(hash) / @cmd.uptime * 1.0)*10000).to_i)/100.0
+    (((cpu_time(hash) / @cmd.uptime * 1.0) * 10000).to_i) / 100.0
   end
 
   def cpu_time(hash)
diff --git a/logstash-core/lib/logstash/api/commands/node.rb b/logstash-core/lib/logstash/api/commands/node.rb
index 17721bba9..db7ef3510 100644
--- a/logstash-core/lib/logstash/api/commands/node.rb
+++ b/logstash-core/lib/logstash/api/commands/node.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/api/commands/base"
 require_relative "hot_threads_reporter"
 
@@ -7,30 +23,48 @@ module LogStash
     module Commands
       class Node < Commands::Base
 
-        def all(selected_fields=[])
+        def all(selected_fields = [])
           payload = {
             :pipelines => pipelines,
             :os => os,
             :jvm => jvm
           }
-          payload.select! { |k,v| selected_fields.include?(k) } unless selected_fields.empty?
+          payload.select! { |k, v| selected_fields.include?(k) } unless selected_fields.empty?
           payload
         end
 
-        def pipelines
+        def pipelines(options = {})
           pipeline_ids = service.get_shallow(:stats, :pipelines).keys
           pipeline_ids.each_with_object({}) do |pipeline_id, result|
-            result[pipeline_id] = pipeline(pipeline_id)
+            pipeline_node = pipeline(pipeline_id, options)
+            result[pipeline_id] = pipeline_node unless pipeline_node.empty?
           end
+        rescue LogStash::Instrument::MetricStore::MetricNotFound
+          {}
         end
 
-        def pipeline(pipeline_id)
-          extract_metrics(
+        def pipeline(pipeline_id, options = {})
+          metrics = extract_metrics(
             [:stats, :pipelines, pipeline_id.to_sym, :config],
-            :workers, :batch_size, :batch_delay, :config_reload_automatic, :config_reload_interval, :dead_letter_queue_enabled, :dead_letter_queue_path
-          ).reject{|_, v|v.nil?}
-        rescue
-          {}
+            :ephemeral_id,
+            :hash,
+            :workers,
+            :batch_size,
+            :batch_delay,
+            :config_reload_automatic,
+            :config_reload_interval,
+            :dead_letter_queue_enabled,
+            :dead_letter_queue_path,
+          ).reject {|_, v| v.nil?}
+          if options.fetch(:graph, false)
+            extended_stats = extract_metrics([:stats, :pipelines, pipeline_id.to_sym, :config], :graph)
+            decorated_vertices = extended_stats[:graph]["graph"]["vertices"].map { |vertex| decorate_with_cluster_uuids(vertex)  }
+            extended_stats[:graph]["graph"]["vertices"] = decorated_vertices
+            metrics.merge!(extended_stats)
+          end
+          metrics
+        rescue LogStash::Instrument::MetricStore::MetricNotFound
+          {} # empty
         end
 
         def os
@@ -62,9 +96,27 @@ module LogStash
           }
         end
 
-        def hot_threads(options={})
+        def hot_threads(options = {})
           HotThreadsReport.new(self, options)
         end
+
+        private
+        ##
+        # Returns a vertex, decorated with the cluster UUID metadata retrieved from ES
+        # Does not mutate the passed `vertex` object.
+        # @api private
+        # @param vertex [Hash{String=>Object}]
+        # @return [Hash{String=>Object}]
+        def decorate_with_cluster_uuids(vertex)
+          plugin_id = vertex["id"]&.to_s
+          return vertex unless plugin_id && LogStash::PluginMetadata.exists?(plugin_id)
+
+          plugin_metadata = LogStash::PluginMetadata.for_plugin(plugin_id)
+          cluster_uuid = plugin_metadata&.get(:cluster_uuid)
+          vertex = vertex.merge("cluster_uuid" => cluster_uuid) unless cluster_uuid.nil?
+
+          vertex
+        end
       end
     end
   end
diff --git a/logstash-core/lib/logstash/api/commands/stats.rb b/logstash-core/lib/logstash/api/commands/stats.rb
index 2c6790667..5bf1b3e3a 100644
--- a/logstash-core/lib/logstash/api/commands/stats.rb
+++ b/logstash-core/lib/logstash/api/commands/stats.rb
@@ -1,6 +1,23 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/api/commands/base"
 require 'logstash/util/thread_dump'
+require 'logstash/config/pipelines_info'
 require_relative "hot_threads_reporter"
 
 java_import java.nio.file.Files
@@ -10,6 +27,22 @@ module LogStash
   module Api
     module Commands
       class Stats < Commands::Base
+        def queue
+          pipeline_ids = service.get_shallow(:stats, :pipelines).keys
+          total_queued_events = 0
+          pipeline_ids.each do |pipeline_id|
+            p_stats = service.get_shallow(:stats, :pipelines, pipeline_id.to_sym)
+            type = p_stats[:queue] && p_stats[:queue][:type].value
+            pipeline = service.agent.get_pipeline(pipeline_id)
+            next if pipeline.nil? || pipeline.system? || type != 'persisted'
+            total_queued_events += p_stats.dig(:queue, :events)&.value || 0
+          end
+
+          {:events_count => total_queued_events}
+        rescue LogStash::Instrument::MetricStore::MetricNotFound
+          {}
+        end
+
         def jvm
           {
             :threads => extract_metrics(
@@ -43,16 +76,39 @@ module LogStash
             [:stats, :events],
             :in, :filtered, :out, :duration_in_millis, :queue_push_duration_in_millis
           )
+        rescue LogStash::Instrument::MetricStore::MetricNotFound
+          # if the stats/events metrics have not yet been populated, return an empty map
+          {}
         end
 
-        def pipeline(pipeline_id = nil)
+        def flow
+          extract_metrics(
+            [:stats, :flow],
+            :input_throughput, :filter_throughput, :output_throughput, :queue_backpressure, :worker_concurrency
+          )
+        rescue LogStash::Instrument::MetricStore::MetricNotFound
+          # if the stats/events metrics have not yet been populated, return an empty map
+          {}
+        end
+
+        def pipeline(pipeline_id = nil, opts = {})
+          extended_stats = LogStash::Config::PipelinesInfo.format_pipelines_info(
+            service.agent,
+            service.snapshot.metric_store,
+            true).each_with_object({}) do |pipeline_stats, memo|
+              p_id = pipeline_stats["id"].to_s
+              memo[p_id] = pipeline_stats
+            end
+
           if pipeline_id.nil?
             pipeline_ids = service.get_shallow(:stats, :pipelines).keys
             pipeline_ids.each_with_object({}) do |pipeline_id, result|
-              result[pipeline_id] = plugins_stats_report(pipeline_id)
+              extended_pipeline = extended_stats[pipeline_id.to_s]
+              result[pipeline_id] = plugins_stats_report(pipeline_id, extended_pipeline, opts)
             end
           else
-            { pipeline_id => plugins_stats_report(pipeline_id) }
+            extended_pipeline = extended_stats[pipeline_id.to_s]
+            { pipeline_id => plugins_stats_report(pipeline_id, extended_pipeline, opts) }
           end
         rescue # failed to find pipeline
           {}
@@ -87,14 +143,20 @@ module LogStash
           service.get_shallow(:jvm, :gc)
         end
 
-        def hot_threads(options={})
+        def hot_threads(options = {})
           HotThreadsReport.new(self, options)
         end
 
+        def geoip
+          service.get_shallow(:geoip_download_manager)
+        rescue
+          {}
+        end
+
         private
-        def plugins_stats_report(pipeline_id)
+        def plugins_stats_report(pipeline_id, extended_pipeline, opts = {})
           stats = service.get_shallow(:stats, :pipelines, pipeline_id.to_sym)
-          PluginsStats.report(stats)
+          PluginsStats.report(stats, extended_pipeline, opts)
         end
 
         module PluginsStats
@@ -110,18 +172,55 @@ module LogStash
             end
           end
 
-          def report(stats)
-            {
+          def report(stats, extended_stats = nil, opts = {})
+            ret = {
               :events => stats[:events],
+              :flow => stats[:flow],
               :plugins => {
                 :inputs => plugin_stats(stats, :inputs),
+                :codecs => plugin_stats(stats, :codecs),
                 :filters => plugin_stats(stats, :filters),
                 :outputs => plugin_stats(stats, :outputs)
               },
               :reloads => stats[:reloads],
-              :queue => stats[:queue]
-            }.merge(stats[:dlq] ? {:dead_letter_queue => stats[:dlq]} : {})
+              :queue => stats[:queue],
+              :pipeline => {
+                :workers => stats.dig(:config, :workers),
+                :batch_size => stats.dig(:config, :batch_size),
+                :batch_delay => stats.dig(:config, :batch_delay),
+              }
+            }
+            ret[:dead_letter_queue] = stats[:dlq] if stats.include?(:dlq)
+
+            # if extended_stats were provided, enrich the return value
+            if extended_stats
+              ret[:queue].merge!(extended_stats["queue"]) if extended_stats.include?("queue")
+              ret[:hash] = extended_stats["hash"]
+              ret[:ephemeral_id] = extended_stats["ephemeral_id"]
+              if opts[:vertices] && extended_stats.include?("vertices")
+                ret[:vertices] = extended_stats["vertices"].map { |vertex| decorate_vertex(vertex) }
+              end
             end
+
+            ret
+          end
+
+          ##
+          # Returns a vertex, decorated with additional metadata if available.
+          # Does not mutate the passed `vertex` object.
+          # @api private
+          # @param vertex [Hash{String=>Object}]
+          # @return [Hash{String=>Object}]
+          def decorate_vertex(vertex)
+            plugin_id = vertex[:id]&.to_s
+            return vertex unless plugin_id && LogStash::PluginMetadata.exists?(plugin_id)
+
+            plugin_metadata = LogStash::PluginMetadata.for_plugin(plugin_id)
+            cluster_uuid = plugin_metadata&.get(:cluster_uuid)
+            vertex = vertex.merge("cluster_uuid" => cluster_uuid) unless cluster_uuid.nil?
+
+            vertex
+          end
         end # module PluginsStats
       end
     end
diff --git a/logstash-core/lib/logstash/api/commands/system/basicinfo_command.rb b/logstash-core/lib/logstash/api/commands/system/basicinfo_command.rb
index 6eacdbd5b..339c943bf 100644
--- a/logstash-core/lib/logstash/api/commands/system/basicinfo_command.rb
+++ b/logstash-core/lib/logstash/api/commands/system/basicinfo_command.rb
@@ -1,6 +1,21 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'logstash/api/commands/base'
-require "logstash/util/duration_formatter"
 require 'logstash/build'
 
 module LogStash
diff --git a/logstash-core/lib/logstash/api/commands/system/plugins_command.rb b/logstash-core/lib/logstash/api/commands/system/plugins_command.rb
index 378f65e85..ff99c8e60 100644
--- a/logstash-core/lib/logstash/api/commands/system/plugins_command.rb
+++ b/logstash-core/lib/logstash/api/commands/system/plugins_command.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/api/commands/base"
 
 module LogStash
@@ -21,7 +37,7 @@ module LogStash
           end
 
           def find_plugins_gem_specs
-            @specs ||= ::Gem::Specification.find_all.select{|spec| logstash_plugin_gem_spec?(spec)}
+            @specs ||= ::Gem::Specification.find_all.select {|spec| logstash_plugin_gem_spec?(spec)}
           end
 
           def logstash_plugin_gem_spec?(spec)
diff --git a/logstash-core/lib/logstash/api/errors.rb b/logstash-core/lib/logstash/api/errors.rb
index e080305d9..ad783c63a 100644
--- a/logstash-core/lib/logstash/api/errors.rb
+++ b/logstash-core/lib/logstash/api/errors.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module LogStash
   module Api
     class ApiError < StandardError;
diff --git a/logstash-core/lib/logstash/api/modules/base.rb b/logstash-core/lib/logstash/api/modules/base.rb
index d8ad5e0c7..c32386e24 100644
--- a/logstash-core/lib/logstash/api/modules/base.rb
+++ b/logstash-core/lib/logstash/api/modules/base.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/api/app_helpers"
 require "logstash/api/command_factory"
 require "logstash/api/errors"
@@ -24,7 +40,7 @@ module LogStash
 
         helpers AppHelpers
 
-        def initialize(app=nil, agent)
+        def initialize(app = nil, agent)
           super(app)
           @agent = agent
           @factory = ::LogStash::Api::CommandFactory.new(LogStash::Api::Service.new(agent))
diff --git a/logstash-core/lib/logstash/api/modules/health_report.rb b/logstash-core/lib/logstash/api/modules/health_report.rb
new file mode 100644
index 000000000..ff5728d94
--- /dev/null
+++ b/logstash-core/lib/logstash/api/modules/health_report.rb
@@ -0,0 +1,49 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module LogStash
+  module Api
+    module Modules
+      class HealthReport < ::LogStash::Api::Modules::Base
+
+        get "/" do
+          payload = health_report.all.then do |health_report_pojo|
+            # The app_helper needs a ruby-hash.
+            # Manually creating a map of properties works around the issue.
+            base_metadata.merge({
+              status:     health_report_pojo.status,
+              symptom:    health_report_pojo.symptom,
+              indicators: health_report_pojo.indicators,
+            })
+          end
+
+          respond_with(payload, {exclude_default_metadata: true})
+        end
+
+        private
+
+        def health_report
+          @health_report ||= factory.build(:health_report)
+        end
+
+        def base_metadata
+          @factory.build(:default_metadata).base_info
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/logstash-core/lib/logstash/api/modules/logging.rb b/logstash-core/lib/logstash/api/modules/logging.rb
index 440cbacc8..43d8c5877 100644
--- a/logstash-core/lib/logstash/api/modules/logging.rb
+++ b/logstash-core/lib/logstash/api/modules/logging.rb
@@ -1,5 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 java_import org.apache.logging.log4j.core.LoggerContext
 java_import java.lang.IllegalArgumentException
 
@@ -11,7 +26,7 @@ module LogStash
         #
         # return any unused configurations
         def handle_logging(settings)
-          Hash[settings.map do |key, level|
+          couplesList = settings.map do |key, level|
             if key.start_with?("logger.")
               _, path = key.split("logger.")
               LogStash::Logging::Logger::configure_logging(level, path)
@@ -19,7 +34,8 @@ module LogStash
             else
               [key, level]
             end
-          end]
+          end.reject {|value| value.nil?} # skip nil which result in ArgumentError since JRuby 9.4
+          Hash[couplesList]
         end
 
         put "/" do
diff --git a/logstash-core/lib/logstash/api/modules/node.rb b/logstash-core/lib/logstash/api/modules/node.rb
index 985a8a6a4..cae3db339 100644
--- a/logstash-core/lib/logstash/api/modules/node.rb
+++ b/logstash-core/lib/logstash/api/modules/node.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/api/modules/base"
 require "logstash/api/errors"
 
@@ -13,9 +29,10 @@ module LogStash
         get "/hot_threads" do
           begin
             ignore_idle_threads = params["ignore_idle_threads"] || true
-
             options = {:ignore_idle_threads => as_boolean(ignore_idle_threads)}
             options[:threads] = params["threads"].to_i if params.has_key?("threads")
+            options[:ordered_by] = params["ordered_by"] if params.has_key?("ordered_by")
+            options[:stacktrace_size] = params["stacktrace_size"] if params.has_key?("stacktrace_size")
 
             as = human? ? :string : :json
             respond_with(node.hot_threads(options), {:as => as})
@@ -28,9 +45,18 @@ module LogStash
 
         get "/pipelines/:id" do
           pipeline_id = params["id"]
-          payload = node.pipeline(pipeline_id)
+          opts = {:graph => as_boolean(params.fetch("graph", false)),
+                  :vertices => as_boolean(params.fetch("vertices", false))}
+          payload = node.pipeline(pipeline_id, opts)
           halt(404) if payload.empty?
-          respond_with(:pipelines => { pipeline_id => payload } )
+          respond_with(:pipelines => { pipeline_id => payload })
+        end
+
+        get "/pipelines" do
+          opts = {:graph => as_boolean(params.fetch("graph", false)),
+                  :vertices => as_boolean(params.fetch("vertices", false))}
+          payload = node.pipelines(opts)
+          respond_with(:pipelines => payload)
         end
 
          get "/?:filter?" do
diff --git a/logstash-core/lib/logstash/api/modules/node_stats.rb b/logstash-core/lib/logstash/api/modules/node_stats.rb
index 2a58fc7ae..2bd017458 100644
--- a/logstash-core/lib/logstash/api/modules/node_stats.rb
+++ b/logstash-core/lib/logstash/api/modules/node_stats.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module LogStash
   module Api
     module Modules
@@ -19,13 +35,24 @@ module LogStash
             :jvm => jvm_payload,
             :process => process_payload,
             :events => events_payload,
+            :flow => flow_payload,
             :pipelines => pipeline_payload,
             :reloads => reloads_payload,
-            :os => os_payload
+            :os => os_payload,
+            :queue => queue
           }
+
+          geoip = geoip_payload
+          payload[:geoip_download_manager] = geoip unless geoip.empty? || geoip[:download_stats][:status].value.nil?
+
           respond_with(payload, {:filter => params["filter"]})
         end
 
+        private
+        def queue
+          @stats.queue
+        end
+
         private
         def os_payload
           @stats.os
@@ -35,6 +62,10 @@ module LogStash
           @stats.events
         end
 
+        def flow_payload
+          @stats.flow
+        end
+
         def jvm_payload
           @stats.jvm
         end
@@ -47,13 +78,15 @@ module LogStash
           @stats.process
         end
 
-        def mem_payload
-          @stats.memory
+        def pipeline_payload(val = nil)
+          opts = {:vertices => as_boolean(params.fetch("vertices", false))}
+          @stats.pipeline(val, opts)
         end
 
-        def pipeline_payload(val = nil)
-          @stats.pipeline(val)
+        def geoip_payload
+          @stats.geoip
         end
+
       end
     end
   end
diff --git a/logstash-core/lib/logstash/api/modules/plugins.rb b/logstash-core/lib/logstash/api/modules/plugins.rb
index 7edd3da15..129492a8c 100644
--- a/logstash-core/lib/logstash/api/modules/plugins.rb
+++ b/logstash-core/lib/logstash/api/modules/plugins.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module LogStash
   module Api
     module Modules
diff --git a/logstash-core/lib/logstash/api/modules/root.rb b/logstash-core/lib/logstash/api/modules/root.rb
index 10a414187..260319e78 100644
--- a/logstash-core/lib/logstash/api/modules/root.rb
+++ b/logstash-core/lib/logstash/api/modules/root.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module LogStash
   module Api
     module Modules
diff --git a/logstash-core/lib/logstash/api/modules/stats.rb b/logstash-core/lib/logstash/api/modules/stats.rb
index 03175b33b..11e63a0c3 100644
--- a/logstash-core/lib/logstash/api/modules/stats.rb
+++ b/logstash-core/lib/logstash/api/modules/stats.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module LogStash
   module Api
     module Modules
diff --git a/logstash-core/lib/logstash/api/rack_app.rb b/logstash-core/lib/logstash/api/rack_app.rb
index 8b2d19055..ee3e409e9 100644
--- a/logstash-core/lib/logstash/api/rack_app.rb
+++ b/logstash-core/lib/logstash/api/rack_app.rb
@@ -1,6 +1,24 @@
-require "sinatra"
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "rack"
+require "sinatra/base"
 require "logstash/api/modules/base"
+require "logstash/api/modules/health_report"
 require "logstash/api/modules/node"
 require "logstash/api/modules/node_stats"
 require "logstash/api/modules/plugins"
@@ -74,6 +92,11 @@ module LogStash
       end
 
       def self.app(logger, agent, environment)
+        # LS should avoid loading sinatra/main.rb as it does not need the full Sinatra functionality
+        # such as configuration based on ARGV (actually dangerous if there's a --name collision),
+        # pretty much the only piece needed is the DSL but even that only for the rackup part :
+        Rack::Builder.send(:include, Sinatra::Delegator) unless Rack::Builder < Sinatra::Delegator
+
         namespaces = rack_namespaces(agent)
 
         Rack::Builder.new do
@@ -101,6 +124,7 @@ module LogStash
 
       def self.rack_namespaces(agent)
         {
+          "/_health_report" => LogStash::Api::Modules::HealthReport,
           "/_node" => LogStash::Api::Modules::Node,
           "/_stats" => LogStash::Api::Modules::Stats,
           "/_node/stats" => LogStash::Api::Modules::NodeStats,
diff --git a/logstash-core/lib/logstash/api/service.rb b/logstash-core/lib/logstash/api/service.rb
index c49e609e1..0c0aedc66 100644
--- a/logstash-core/lib/logstash/api/service.rb
+++ b/logstash-core/lib/logstash/api/service.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/instrument/collector"
 
 module LogStash
diff --git a/logstash-core/lib/logstash/bootstrap_check/default_config.rb b/logstash-core/lib/logstash/bootstrap_check/default_config.rb
index da058917d..aa7d69e6a 100644
--- a/logstash-core/lib/logstash/bootstrap_check/default_config.rb
+++ b/logstash-core/lib/logstash/bootstrap_check/default_config.rb
@@ -1,4 +1,19 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 module LogStash module BootstrapCheck
   class DefaultConfig
diff --git a/logstash-core/lib/logstash/bootstrap_check/persisted_queue_config.rb b/logstash-core/lib/logstash/bootstrap_check/persisted_queue_config.rb
deleted file mode 100644
index 0c0292d29..000000000
--- a/logstash-core/lib/logstash/bootstrap_check/persisted_queue_config.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# encoding: utf-8
-
-module LogStash
-  module BootstrapCheck
-    class PersistedQueueConfig
-      def self.check(settings)
-        return unless settings.get('queue.type') == 'persisted'
-        if settings.get('queue.page_capacity') > settings.get('queue.max_bytes')
-          raise(LogStash::BootstrapCheckError, I18n.t("logstash.bootstrap_check.persisted_queue_config.page-capacity"))
-        end
-      end
-    end
-  end
-end
diff --git a/logstash-core/lib/logstash/build.rb b/logstash-core/lib/logstash/build.rb
index fb2132c22..3d9476216 100644
--- a/logstash-core/lib/logstash/build.rb
+++ b/logstash-core/lib/logstash/build.rb
@@ -1,4 +1,19 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # DO NOT EDIT
 # this file acts as a placeholder for build information when executing
diff --git a/logstash-core/lib/logstash/certs/cacert.pem b/logstash-core/lib/logstash/certs/cacert.pem
deleted file mode 100644
index 99b310bce..000000000
--- a/logstash-core/lib/logstash/certs/cacert.pem
+++ /dev/null
@@ -1,3895 +0,0 @@
-##
-## ca-bundle.crt -- Bundle of CA Root Certificates
-##
-## Certificate data from Mozilla as of: Sat Dec 29 20:03:40 2012
-##
-## This is a bundle of X.509 certificates of public Certificate Authorities
-## (CA). These were automatically extracted from Mozilla's root certificates
-## file (certdata.txt).  This file can be found in the mozilla source tree:
-## http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1
-##
-## It contains the certificates in PEM format and therefore
-## can be directly used with curl / libcurl / php_curl, or with
-## an Apache+mod_ssl webserver for SSL client authentication.
-## Just configure this file as the SSLCACertificateFile.
-##
-
-# @(#) $RCSfile: certdata.txt,v $ $Revision: 1.87 $ $Date: 2012/12/29 16:32:45 $
-
-GTE CyberTrust Global Root
-==========================
------BEGIN CERTIFICATE-----
-MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9HVEUg
-Q29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNvbHV0aW9ucywgSW5jLjEjMCEG
-A1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJvb3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEz
-MjM1OTAwWjB1MQswCQYDVQQGEwJVUzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQL
-Ex5HVEUgQ3liZXJUcnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0
-IEdsb2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrHiM3dFw4u
-sJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTSr41tiGeA5u2ylc9yMcql
-HHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X404Wqk2kmhXBIgD8SFcd5tB8FLztimQID
-AQABMA0GCSqGSIb3DQEBBAUAA4GBAG3rGwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMW
-M4ETCJ57NE7fQMh017l93PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OF
-NMQkpw0PlZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
------END CERTIFICATE-----
-
-Thawte Server CA
-================
------BEGIN CERTIFICATE-----
-MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT
-DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3Vs
-dGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UE
-AxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5j
-b20wHhcNOTYwODAxMDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNV
-BAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29u
-c3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcG
-A1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0
-ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl
-/Kj0R1HahbUgdJSGHg91yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg7
-1CcEJRCXL+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGjEzAR
-MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG7oWDTSEwjsrZqG9J
-GubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6eQNuozDJ0uW8NxuOzRAvZim+aKZuZ
-GCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZqdq5snUb9kLy78fyGPmJvKP/iiMucEc=
------END CERTIFICATE-----
-
-Thawte Premium Server CA
-========================
------BEGIN CERTIFICATE-----
-MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkExFTATBgNVBAgT
-DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3Vs
-dGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UE
-AxMYVGhhd3RlIFByZW1pdW0gU2VydmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZl
-ckB0aGF3dGUuY29tMB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYT
-AlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsGA1UEChMU
-VGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2
-aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNlcnZlciBDQTEoMCYGCSqGSIb3DQEJARYZ
-cHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2
-aovXwlue2oFBYo847kkEVdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIh
-Udib0GfQug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMRuHM/
-qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQAm
-SCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUIhfzJATj/Tb7yFkJD57taRvvBxhEf
-8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JMpAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7t
-UCemDaYj+bvLpgcUQg==
------END CERTIFICATE-----
-
-Equifax Secure CA
-=================
------BEGIN CERTIFICATE-----
-MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEQMA4GA1UE
-ChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5
-MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoT
-B0VxdWlmYXgxLTArBgNVBAsTJEVxdWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPR
-fM6fBeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+AcJkVV5MW
-8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kCAwEAAaOCAQkwggEFMHAG
-A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UE
-CxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoG
-A1UdEAQTMBGBDzIwMTgwODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvS
-spXXR9gjIBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQFMAMB
-Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAFjOKer89961
-zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y7qj/WsjTVbJmcVfewCHrPSqnI0kB
-BIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee95
-70+sB3c4
------END CERTIFICATE-----
-
-Digital Signature Trust Co. Global CA 1
-=======================================
------BEGIN CERTIFICATE-----
-MIIDKTCCApKgAwIBAgIENnAVljANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJVUzEkMCIGA1UE
-ChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQLEwhEU1RDQSBFMTAeFw05ODEy
-MTAxODEwMjNaFw0xODEyMTAxODQwMjNaMEYxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFs
-IFNpZ25hdHVyZSBUcnVzdCBDby4xETAPBgNVBAsTCERTVENBIEUxMIGdMA0GCSqGSIb3DQEBAQUA
-A4GLADCBhwKBgQCgbIGpzzQeJN3+hijM3oMv+V7UQtLodGBmE5gGHKlREmlvMVW5SXIACH7TpWJE
-NySZj9mDSI+ZbZUTu0M7LklOiDfBu1h//uG9+LthzfNHwJmm8fOR6Hh8AMthyUQncWlVSn5JTe2i
-o74CTADKAqjuAQIxZA9SLRN0dja1erQtcQIBA6OCASQwggEgMBEGCWCGSAGG+EIBAQQEAwIABzBo
-BgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0
-dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgRTExDTALBgNVBAMTBENSTDEwKwYDVR0QBCQw
-IoAPMTk5ODEyMTAxODEwMjNagQ8yMDE4MTIxMDE4MTAyM1owCwYDVR0PBAQDAgEGMB8GA1UdIwQY
-MBaAFGp5fpFpRhgTCgJ3pVlbYJglDqL4MB0GA1UdDgQWBBRqeX6RaUYYEwoCd6VZW2CYJQ6i+DAM
-BgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4GB
-ACIS2Hod3IEGtgllsofIH160L+nEHvI8wbsEkBFKg05+k7lNQseSJqBcNJo4cvj9axY+IO6CizEq
-kzaFI4iKPANo08kJD038bKTaKHKTDomAsH3+gG9lbRgzl4vCa4nuYD3Im+9/KzJic5PLPON74nZ4
-RbyhkwS7hp86W0N6w4pl
------END CERTIFICATE-----
-
-Digital Signature Trust Co. Global CA 3
-=======================================
------BEGIN CERTIFICATE-----
-MIIDKTCCApKgAwIBAgIENm7TzjANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJVUzEkMCIGA1UE
-ChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQLEwhEU1RDQSBFMjAeFw05ODEy
-MDkxOTE3MjZaFw0xODEyMDkxOTQ3MjZaMEYxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFs
-IFNpZ25hdHVyZSBUcnVzdCBDby4xETAPBgNVBAsTCERTVENBIEUyMIGdMA0GCSqGSIb3DQEBAQUA
-A4GLADCBhwKBgQC/k48Xku8zExjrEH9OFr//Bo8qhbxe+SSmJIi2A7fBw18DW9Fvrn5C6mYjuGOD
-VvsoLeE4i7TuqAHhzhy2iCoiRoX7n6dwqUcUP87eZfCocfdPJmyMvMa1795JJ/9IKn3oTQPMx7JS
-xhcxEzu1TdvIxPbDDyQq2gyd55FbgM2UnQIBA6OCASQwggEgMBEGCWCGSAGG+EIBAQQEAwIABzBo
-BgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0
-dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgRTIxDTALBgNVBAMTBENSTDEwKwYDVR0QBCQw
-IoAPMTk5ODEyMDkxOTE3MjZagQ8yMDE4MTIwOTE5MTcyNlowCwYDVR0PBAQDAgEGMB8GA1UdIwQY
-MBaAFB6CTShlgDzJQW6sNS5ay97u+DlbMB0GA1UdDgQWBBQegk0oZYA8yUFurDUuWsve7vg5WzAM
-BgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4GB
-AEeNg61i8tuwnkUiBbmi1gMOOHLnnvx75pO2mqWilMg0HZHRxdf0CiUPPXiBng+xZ8SQTGPdXqfi
-up/1902lMXucKS1M/mQ+7LZT/uqb7YLbdHVLB3luHtgZg3Pe9T7Qtd7nS2h9Qy4qIOF+oHhEngj1
-mPnHfxsb1gYgAlihw6ID
------END CERTIFICATE-----
-
-Verisign Class 3 Public Primary Certification Authority
-=======================================================
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMx
-FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmltYXJ5
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVow
-XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAz
-IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhEBarsAx94
-f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/isI19wKTakyYbnsZogy1Ol
-hec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0GCSqGSIb3DQEBAgUAA4GBALtMEivPLCYA
-TxQT3ab7/AoRhIzzKBxnki98tsX63/Dolbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59Ah
-WM1pF+NEHJwZRDmJXNycAA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2Omuf
-Tqj/ZA1k
------END CERTIFICATE-----
-
-Verisign Class 1 Public Primary Certification Authority - G2
-============================================================
------BEGIN CERTIFICATE-----
-MIIDAjCCAmsCEEzH6qqYPnHTkxD4PTqJkZIwDQYJKoZIhvcNAQEFBQAwgcExCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMSBQdWJsaWMgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
-dCBOZXR3b3JrMB4XDTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMSBQdWJsaWMgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
-dCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq0Lq+Fi24g9TK0g+8djHKlNgd
-k4xWArzZbxpvUjZudVYKVdPfQ4chEWWKfo+9Id5rMj8bhDSVBZ1BNeuS65bdqlk/AVNtmU/t5eIq
-WpDBucSmFc/IReumXY6cPvBkJHalzasab7bYe1FhbqZ/h8jit+U03EGI6glAvnOSPWvndQIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4GBAKlPww3HZ74sy9mozS11534Vnjty637rXC0Jh9ZrbWB85a7FkCMM
-XErQr7Fd88e2CtvgFZMN3QO8x3aKtd1Pw5sTdbgBwObJW2uluIncrKTdcu1OofdPvAbT6shkdHvC
-lUGcZXNY8ZCaPGqxmMnEh7zPRW1F4m4iP/68DzFc6PLZ
------END CERTIFICATE-----
-
-Verisign Class 2 Public Primary Certification Authority - G2
-============================================================
------BEGIN CERTIFICATE-----
-MIIDAzCCAmwCEQC5L2DMiJ+hekYJuFtwbIqvMA0GCSqGSIb3DQEBBQUAMIHBMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0NsYXNzIDIgUHVibGljIFByaW1h
-cnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjE6MDgGA1UECxMxKGMpIDE5OTggVmVyaVNp
-Z24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1
-c3QgTmV0d29yazAeFw05ODA1MTgwMDAwMDBaFw0yODA4MDEyMzU5NTlaMIHBMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0NsYXNzIDIgUHVibGljIFByaW1h
-cnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjE6MDgGA1UECxMxKGMpIDE5OTggVmVyaVNp
-Z24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1
-c3QgTmV0d29yazCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAp4gBIXQs5xoD8JjhlzwPIQjx
-nNuX6Zr8wgQGE75fUsjMHiwSViy4AWkszJkfrbCWrnkE8hM5wXuYuggs6MKEEyyqaekJ9MepAqRC
-wiNPStjwDqL7MWzJ5m+ZJwf15vRMeJ5t60aG+rmGyVTyssSv1EYcWskVMP8NbPUtDm3Of3cCAwEA
-ATANBgkqhkiG9w0BAQUFAAOBgQByLvl/0fFx+8Se9sVeUYpAmLho+Jscg9jinb3/7aHmZuovCfTK
-1+qlK5X2JGCGTUQug6XELaDTrnhpb3LabK4I8GOSN+a7xDAXrXfMSTWqz9iP0b63GJZHc2pUIjRk
-LbYWm1lbtFFZOrMLFPQS32eg9K0yZF6xRnInjBJ7xUS0rg==
------END CERTIFICATE-----
-
-Verisign Class 3 Public Primary Certification Authority - G2
-============================================================
------BEGIN CERTIFICATE-----
-MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
-dCBOZXR3b3JrMB4XDTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
-dCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCO
-FoUgRm1HP9SFIIThbbP4pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71
-lSk8UOg013gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSkU01UbSuvDV1Ai2TT
-1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7iF6YM40AIOw7n60RzKprxaZLvcRTD
-Oaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpYoJ2daZH9
------END CERTIFICATE-----
-
-GlobalSign Root CA
-==================
------BEGIN CERTIFICATE-----
-MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
-GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
-b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
-BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
-VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
-DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
-THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
-Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
-c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
-gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
-AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
-Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
-j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
-hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
-X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
------END CERTIFICATE-----
-
-GlobalSign Root CA - R2
-=======================
------BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
-YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
-bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
-aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
-bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
-ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
-s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
-S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
-TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
-ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
-FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
-YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
-BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
-9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
-01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
-9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
-TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
------END CERTIFICATE-----
-
-ValiCert Class 1 VA
-===================
------BEGIN CERTIFICATE-----
-MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp
-b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
-YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh
-bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIy
-MjM0OFoXDTE5MDYyNTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0
-d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEg
-UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0
-LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9YLqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIi
-GQj4/xEjm84H9b9pGib+TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCm
-DuJWBQ8YTfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0LBwG
-lN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLWI8sogTLDAHkY7FkX
-icnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPwnXS3qT6gpf+2SQMT2iLM7XGCK5nP
-Orf1LXLI
------END CERTIFICATE-----
-
-ValiCert Class 2 VA
-===================
------BEGIN CERTIFICATE-----
-MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp
-b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
-YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh
-bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAw
-MTk1NFoXDTE5MDYyNjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0
-d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIg
-UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0
-LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDOOnHK5avIWZJV16vYdA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVC
-CSRrCl6zfN1SLUzm1NZ9WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7Rf
-ZHM047QSv4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9vUJSZ
-SWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTuIYEZoDJJKPTEjlbV
-UjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwCW/POuZ6lcg5Ktz885hZo+L7tdEy8
-W9ViH0Pd
------END CERTIFICATE-----
-
-RSA Root Certificate 1
-======================
------BEGIN CERTIFICATE-----
-MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRp
-b24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
-YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZh
-bGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAw
-MjIzM1oXDTE5MDYyNjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0
-d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMg
-UG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0
-LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDjmFGWHOjVsQaBalfDcnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td
-3zZxFJmP3MKS8edgkpfs2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89H
-BFx1cQqYJJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliEZwgs
-3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJn0WuPIqpsHEzXcjF
-V9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/APhmcGcwTTYJBtYze4D1gCCAPRX5r
-on+jjBXu
------END CERTIFICATE-----
-
-Verisign Class 1 Public Primary Certification Authority - G3
-============================================================
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQCLW3VWhFSFCwDPrzhIzrGkMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
-dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDEgUHVibGljIFByaW1hcnkg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAN2E1Lm0+afY8wR4nN493GwTFtl63SRRZsDHJlkNrAYIwpTRMx/wgzUfbhvI3qpuFU5UJ+/E
-bRrsC+MO8ESlV8dAWB6jRx9x7GD2bZTIGDnt/kIYVt/kTEkQeE4BdjVjEjbdZrwBBDajVWjVojYJ
-rKshJlQGrT/KFOCsyq0GHZXi+J3x4GD/wn91K0zM2v6HmSHquv4+VNfSWXjbPG7PoBMAGrgnoeS+
-Z5bKoMWznN3JdZ7rMJpfo83ZrngZPyPpXNspva1VyBtUjGP26KbqxzcSXKMpHgLZ2x87tNcPVkeB
-FQRKr4Mn0cVYiMHd9qqnoxjaaKptEVHhv2Vrn5Z20T0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-q2aN17O6x5q25lXQBfGfMY1aqtmqRiYPce2lrVNWYgFHKkTp/j90CxObufRNG7LRX7K20ohcs5/N
-y9Sn2WCVhDr4wTcdYcrnsMXlkdpUpqwxga6X3s0IrLjAl4B/bnKk52kTlWUfxJM8/XmPBNQ+T+r3
-ns7NZ3xPZQL/kYVUc8f/NveGLezQXk//EZ9yBta4GvFMDSZl4kSAHsef493oCtrspSCAaWihT37h
-a88HQfqDjrw43bAuEbFrskLMmrz5SCJ5ShkPshw+IHTZasO+8ih4E1Z5T21Q6huwtVexN2ZYI/Pc
-D98Kh8TvhgXVOBRgmaNL3gaWcSzy27YfpO8/7g==
------END CERTIFICATE-----
-
-Verisign Class 2 Public Primary Certification Authority - G3
-============================================================
------BEGIN CERTIFICATE-----
-MIIEGTCCAwECEGFwy0mMX5hFKeewptlQW3owDQYJKoZIhvcNAQEFBQAwgcoxCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29y
-azE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ug
-b25seTFFMEMGA1UEAxM8VmVyaVNpZ24gQ2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0
-aW9uIEF1dGhvcml0eSAtIEczMB4XDTk5MTAwMTAwMDAwMFoXDTM2MDcxNjIzNTk1OVowgcoxCzAJ
-BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1
-c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9y
-aXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNpZ24gQ2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEArwoNwtUs22e5LeWUJ92lvuCwTY+zYVY81nzD9M0+hsuiiOLh2KRpxbXiv8GmR1BeRjmL1Za6
-tW8UvxDOJxOeBUebMXoT2B/Z0wI3i60sR/COgQanDTAM6/c8DyAd3HJG7qUCyFvDyVZpTMUYwZF7
-C9UTAJu878NIPkZgIIUq1ZC2zYugzDLdt/1AVbJQHFauzI13TccgTacxdu9okoqQHgiBVrKtaaNS
-0MscxCM9H5n+TOgWY47GCI72MfbS+uV23bUckqNJzc0BzWjNqWm6o+sdDZykIKbBoMXRRkwXbdKs
-Zj+WjOCE1Db/IlnF+RFgqF8EffIa9iVCYQ/ESrg+iQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA0
-JhU8wI1NQ0kdvekhktdmnLfexbjQ5F1fdiLAJvmEOjr5jLX77GDx6M4EsMjdpwOPMPOY36TmpDHf
-0xwLRtxyID+u7gU8pDM/CzmscHhzS5kr3zDCVLCoO1Wh/hYozUK9dG6A2ydEp85EXdQbkJgNHkKU
-sQAsBNB0owIFImNjzYO1+8FtYmtpdf1dcEG59b98377BMnMiIYtYgXsVkXq642RIsH/7NiXaldDx
-JBQX3RiAa0YjOVT1jmIJBB2UkKab5iXiQkWquJCtvgiPqQtCGJTPcjnhsUPgKM+351psE2tJs//j
-GHyJizNdrDPXp/naOlXJWBD5qu9ats9LS98q
------END CERTIFICATE-----
-
-Verisign Class 3 Public Primary Certification Authority - G3
-============================================================
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
-dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1
-EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc
-cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw
-EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj
-055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f
-j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
-/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0
-xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa
-t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
------END CERTIFICATE-----
-
-Verisign Class 4 Public Primary Certification Authority - G3
-============================================================
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
-dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAK3LpRFpxlmr8Y+1GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaS
-tBO3IFsJ+mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0GbdU6LM
-8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLmNxdLMEYH5IBtptiW
-Lugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XYufTsgsbSPZUd5cBPhMnZo0QoBmrX
-Razwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-j/ola09b5KROJ1WrIhVZPMq1CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXtt
-mhwwjIDLk5Mqg6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm
-fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c2NU8Qh0XwRJd
-RTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/bLvSHgCwIe34QWKCudiyxLtG
-UPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg==
------END CERTIFICATE-----
-
-Entrust.net Secure Server CA
-============================
------BEGIN CERTIFICATE-----
-MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMCVVMxFDASBgNV
-BAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5uZXQvQ1BTIGluY29ycC4gYnkg
-cmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRl
-ZDE6MDgGA1UEAxMxRW50cnVzdC5uZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhv
-cml0eTAeFw05OTA1MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIG
-A1UEChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBi
-eSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1p
-dGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQ
-aO2f55M28Qpku0f1BBc/I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5
-gXpa0zf3wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OCAdcw
-ggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHboIHYpIHVMIHSMQsw
-CQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5l
-dC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
-bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
-dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0MFqBDzIwMTkw
-NTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8BdiE1U9s/8KAGv7UISX8+1i0Bow
-HQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAaMAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EA
-BAwwChsEVjQuMAMCBJAwDQYJKoZIhvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyN
-Ewr75Ji174z4xRAN95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9
-n9cd2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
------END CERTIFICATE-----
-
-Entrust.net Premium 2048 Secure Server CA
-=========================================
------BEGIN CERTIFICATE-----
-MIIEXDCCA0SgAwIBAgIEOGO5ZjANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
-ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp
-bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
-BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx
-NzUwNTFaFw0xOTEyMjQxODIwNTFaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
-d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
-MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
-ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
-Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr
-hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW
-nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi
-VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo3QwcjARBglghkgBhvhC
-AQEEBAMCAAcwHwYDVR0jBBgwFoAUVeSB0RGAvtiJuQijMfmhJAkWuXAwHQYDVR0OBBYEFFXkgdER
-gL7YibkIozH5oSQJFrlwMB0GCSqGSIb2fQdBAAQQMA4bCFY1LjA6NC4wAwIEkDANBgkqhkiG9w0B
-AQUFAAOCAQEAWUesIYSKF8mciVMeuoCFGsY8Tj6xnLZ8xpJdGGQC49MGCBFhfGPjK50xA3B20qMo
-oPS7mmNz7W3lKtvtFKkrxjYR0CvrB4ul2p5cGZ1WEvVUKcgF7bISKo30Axv/55IQh7A6tcOdBTcS
-o8f0FbnVpDkWm1M6I5HxqIKiaohowXkCIryqptau37AUX7iH0N18f3v/rxzP5tsHrV7bhZ3QKw0z
-2wTR5klAEyt2+z7pnIkPFc4YsIV4IU9rTw76NmfNB/L/CNDi3tm/Kq+4h4YhPATKt5Rof8886ZjX
-OP/swNlQ8C5LWK5Gb9Auw2DaclVyvUxFnmG6v4SBkgPR0ml8xQ==
------END CERTIFICATE-----
-
-Baltimore CyberTrust Root
-=========================
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE
-ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li
-ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC
-SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs
-dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME
-uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB
-UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C
-G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9
-XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr
-l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI
-VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
-BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh
-cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5
-hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa
-Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
-RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
------END CERTIFICATE-----
-
-Equifax Secure Global eBusiness CA
-==================================
------BEGIN CERTIFICATE-----
-MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-RXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBTZWN1cmUgR2xvYmFsIGVCdXNp
-bmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIwMDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMx
-HDAaBgNVBAoTE0VxdWlmYXggU2VjdXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEds
-b2JhbCBlQnVzaW5lc3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRV
-PEnCUdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc58O/gGzN
-qfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/o5brhTMhHD4ePmBudpxn
-hcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAHMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0j
-BBgwFoAUvqigdHJQa0S3ySPY+6j/s1draGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hs
-MA0GCSqGSIb3DQEBBAUAA4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okEN
-I7SS+RkAZ70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv8qIY
-NMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV
------END CERTIFICATE-----
-
-Equifax Secure eBusiness CA 1
-=============================
------BEGIN CERTIFICATE-----
-MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-RXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENB
-LTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQwMDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UE
-ChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNz
-IENBLTEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ
-1MRoRvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBuWqDZQu4a
-IZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKwEnv+j6YDAgMBAAGjZjBk
-MBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFEp4MlIR21kW
-Nl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRKeDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQF
-AAOBgQB1W6ibAxHm6VZMzfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5
-lSE/9dR+WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN/Bf+
-KpYrtWKmpj29f5JZzVoqgrI3eQ==
------END CERTIFICATE-----
-
-Equifax Secure eBusiness CA 2
-=============================
------BEGIN CERTIFICATE-----
-MIIDIDCCAomgAwIBAgIEN3DPtTANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEXMBUGA1UE
-ChMORXF1aWZheCBTZWN1cmUxJjAkBgNVBAsTHUVxdWlmYXggU2VjdXJlIGVCdXNpbmVzcyBDQS0y
-MB4XDTk5MDYyMzEyMTQ0NVoXDTE5MDYyMzEyMTQ0NVowTjELMAkGA1UEBhMCVVMxFzAVBgNVBAoT
-DkVxdWlmYXggU2VjdXJlMSYwJAYDVQQLEx1FcXVpZmF4IFNlY3VyZSBlQnVzaW5lc3MgQ0EtMjCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA5Dk5kx5SBhsoNviyoynF7Y6yEb3+6+e0dMKP/wXn
-2Z0GvxLIPw7y1tEkshHe0XMJitSxLJgJDR5QRrKDpkWNYmi7hRsgcDKqQM2mll/EcTc/BPO3QSQ5
-BxoeLmFYoBIL5aXfxavqN3HMHMg3OrmXUqesxWoklE6ce8/AatbfIb0CAwEAAaOCAQkwggEFMHAG
-A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEXMBUGA1UEChMORXF1aWZheCBTZWN1cmUx
-JjAkBgNVBAsTHUVxdWlmYXggU2VjdXJlIGVCdXNpbmVzcyBDQS0yMQ0wCwYDVQQDEwRDUkwxMBoG
-A1UdEAQTMBGBDzIwMTkwNjIzMTIxNDQ1WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUUJ4L6q9e
-uSBIplBqy/3YIHqngnYwHQYDVR0OBBYEFFCeC+qvXrkgSKZQasv92CB6p4J2MAwGA1UdEwQFMAMB
-Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAAyGgq3oThr1
-jokn4jVYPSm0B482UJW/bsGe68SQsoWou7dC4A8HOd/7npCy0cE+U58DRLB+S/Rv5Hwf5+Kx5Lia
-78O9zt4LMjTZ3ijtM2vE1Nc9ElirfQkty3D1E4qUoSek1nDFbZS1yX2doNLGCEnZZpum0/QL3MUm
-V+GRMOrN
------END CERTIFICATE-----
-
-AddTrust Low-Value Services Root
-================================
------BEGIN CERTIFICATE-----
-MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRU
-cnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMwMTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQsw
-CQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBO
-ZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ulCDtbKRY6
-54eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6ntGO0/7Gcrjyvd7ZWxbWr
-oulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyldI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1
-Zmne3yzxbrww2ywkEtvrNTVokMsAsJchPXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJui
-GMx1I4S+6+JNM3GOGvDC+Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8w
-HQYDVR0OBBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8EBTAD
-AQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBlMQswCQYDVQQGEwJT
-RTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEw
-HwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxt
-ZBsfzQ3duQH6lmM0MkhHma6X7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0Ph
-iVYrqW9yTkkz43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
-eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJlpz/+0WatC7xr
-mYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOAWiFeIc9TVPC6b4nbqKqVz4vj
-ccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
------END CERTIFICATE-----
-
-AddTrust External Root
-======================
------BEGIN CERTIFICATE-----
-MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD
-VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw
-NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU
-cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg
-Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821
-+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw
-Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo
-aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy
-2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7
-7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P
-BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL
-VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk
-VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
-IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl
-j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
-6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355
-e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u
-G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
------END CERTIFICATE-----
-
-AddTrust Public Services Root
-=============================
------BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSAwHgYDVQQDExdBZGRU
-cnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAxMDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJ
-BgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5l
-dHdvcmsxIDAeBgNVBAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV6tsfSlbu
-nyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nXGCwwfQ56HmIexkvA/X1i
-d9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnPdzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSG
-Aa2Il+tmzV7R/9x98oTaunet3IAIx6eH1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAw
-HM+A+WD+eeSI8t0A65RF62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0G
-A1UdDgQWBBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
-/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDELMAkGA1UEBhMCU0Ux
-FDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29yazEgMB4G
-A1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4
-JNojVhaTdt02KLmuG7jD8WS6IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL
-+YPoRNWyQSW/iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao
-GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh4SINhwBk/ox9
-Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQmXiLsks3/QppEIW1cxeMiHV9H
-EufOX1362KqxMy3ZdvJOOjMMK7MtkAY=
------END CERTIFICATE-----
-
-AddTrust Qualified Certificates Root
-====================================
------BEGIN CERTIFICATE-----
-MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSMwIQYDVQQDExpBZGRU
-cnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcx
-CzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQ
-IE5ldHdvcmsxIzAhBgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwqxBb/4Oxx
-64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G87B4pfYOQnrjfxvM0PC3
-KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i2O+tCBGaKZnhqkRFmhJePp1tUvznoD1o
-L/BLcHwTOK28FSXx1s6rosAx1i+f4P8UWfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GR
-wVY18BTcZTYJbqukB8c10cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HU
-MIHRMB0GA1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/
-BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6FrpGkwZzELMAkGA1UE
-BhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29y
-azEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlmaWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQAD
-ggEBABmrder4i2VhlRO6aQTvhsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxG
-GuoYQ992zPlmhpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
-dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3P6CxB9bpT9ze
-RXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9YiQBCYz95OdBEsIJuQRno3eDB
-iFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5noxqE=
------END CERTIFICATE-----
-
-Entrust Root Certification Authority
-====================================
------BEGIN CERTIFICATE-----
-MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV
-BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw
-b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG
-A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0
-MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu
-MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu
-Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v
-dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz
-A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww
-Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68
-j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN
-rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw
-DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1
-MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH
-hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
-A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM
-Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa
-v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS
-W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
-tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
------END CERTIFICATE-----
-
-RSA Security 2048 v3
-====================
------BEGIN CERTIFICATE-----
-MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6MRkwFwYDVQQK
-ExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJpdHkgMjA0OCBWMzAeFw0wMTAy
-MjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAXBgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAb
-BgNVBAsTFFJTQSBTZWN1cml0eSAyMDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAt49VcdKA3XtpeafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7
-Jylg/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGlwSMiuLgb
-WhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnhAMFRD0xS+ARaqn1y07iH
-KrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP
-+Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpuAWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/
-MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4E
-FgQUB8NRMKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYcHnmY
-v/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/Zb5gEydxiKRz44Rj
-0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+f00/FGj1EVDVwfSQpQgdMWD/YIwj
-VAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVOrSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395
-nzIlQnQFgCi/vcEkllgVsRch6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kA
-pKnXwiJPZ9d37CAFYd4=
------END CERTIFICATE-----
-
-GeoTrust Global CA
-==================
------BEGIN CERTIFICATE-----
-MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
-Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw
-MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
-LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo
-BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet
-8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc
-T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU
-vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD
-AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk
-DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q
-zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4
-d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2
-mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p
-XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm
-Mw==
------END CERTIFICATE-----
-
-GeoTrust Global CA 2
-====================
------BEGIN CERTIFICATE-----
-MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
-R2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwHhcNMDQwMzA0MDUw
-MDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
-LjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDvPE1APRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/
-NTL8Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hLTytCOb1k
-LUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL5mkWRxHCJ1kDs6ZgwiFA
-Vvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7S4wMcoKK+xfNAGw6EzywhIdLFnopsk/b
-HdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQF
-MAMBAf8wHQYDVR0OBBYEFHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNH
-K266ZUapEBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6tdEPx7
-srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv/NgdRN3ggX+d6Yvh
-ZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywNA0ZF66D0f0hExghAzN4bcLUprbqL
-OzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkC
-x1YAzUm5s2x7UwQa4qjJqhIFI8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqF
-H4z1Ir+rzoPz4iIprn2DQKi6bA==
------END CERTIFICATE-----
-
-GeoTrust Universal CA
-=====================
------BEGIN CERTIFICATE-----
-MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
-R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1
-MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu
-Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t
-JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e
-RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs
-7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d
-8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V
-qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga
-Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB
-Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu
-KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08
-ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0
-XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB
-hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
-aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2
-qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL
-oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK
-xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF
-KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2
-DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK
-xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU
-p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI
-P/rmMuGNG2+k5o7Y+SlIis5z/iw=
------END CERTIFICATE-----
-
-GeoTrust Universal CA 2
-=======================
------BEGIN CERTIFICATE-----
-MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
-R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0
-MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg
-SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0
-DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17
-j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q
-JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a
-QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2
-WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP
-20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn
-ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC
-SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG
-8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2
-+/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E
-BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
-dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ
-4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+
-mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq
-A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg
-Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP
-pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d
-FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp
-gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm
-X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
------END CERTIFICATE-----
-
-UTN-USER First-Network Applications
-===================================
------BEGIN CERTIFICATE-----
-MIIEZDCCA0ygAwIBAgIQRL4Mi1AAJLQR0zYwS8AzdzANBgkqhkiG9w0BAQUFADCBozELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
-IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzAp
-BgNVBAMTIlVUTi1VU0VSRmlyc3QtTmV0d29yayBBcHBsaWNhdGlvbnMwHhcNOTkwNzA5MTg0ODM5
-WhcNMTkwNzA5MTg1NzQ5WjCBozELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5T
-YWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
-dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzApBgNVBAMTIlVUTi1VU0VSRmlyc3QtTmV0d29yayBB
-cHBsaWNhdGlvbnMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCz+5Gh5DZVhawGNFug
-mliy+LUPBXeDrjKxdpJo7CNKyXY/45y2N3kDuatpjQclthln5LAbGHNhSuh+zdMvZOOmfAz6F4Cj
-DUeJT1FxL+78P/m4FoCHiZMlIJpDgmkkdihZNaEdwH+DBmQWICzTSaSFtMBhf1EI+GgVkYDLpdXu
-Ozr0hAReYFmnjDRy7rh4xdE7EkpvfmUnuaRVxblvQ6TFHSyZwFKkeEwVs0CYCGtDxgGwenv1axwi
-P8vv/6jQOkt2FZ7S0cYu49tXGzKiuG/ohqY/cKvlcJKrRB5AUPuco2LkbG6gyN7igEL66S/ozjIE
-j3yNtxyjNTwV3Z7DrpelAgMBAAGjgZEwgY4wCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8w
-HQYDVR0OBBYEFPqGydvguul49Uuo1hXf8NPhahQ8ME8GA1UdHwRIMEYwRKBCoECGPmh0dHA6Ly9j
-cmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LU5ldHdvcmtBcHBsaWNhdGlvbnMuY3JsMA0G
-CSqGSIb3DQEBBQUAA4IBAQCk8yXM0dSRgyLQzDKrm5ZONJFUICU0YV8qAhXhi6r/fWRRzwr/vH3Y
-IWp4yy9Rb/hCHTO967V7lMPDqaAt39EpHx3+jz+7qEUqf9FuVSTiuwL7MT++6LzsQCv4AdRWOOTK
-RIK1YSAhZ2X28AvnNPilwpyjXEAfhZOVBt5P1CeptqX8Fs1zMT+4ZSfP1FMa8Kxun08FDAOBp4Qp
-xFq9ZFdyrTvPNximmMatBrTcCKME1SmklpoSZ0qMYEWd8SOasACcaLWYUNPvji6SZbFIPiG+FTAq
-DbUMo2s/rn9X9R+WfN9v3YIwLGUbQErNaLly7HF27FSOH4UMAWr6pjisH8SE
------END CERTIFICATE-----
-
-America Online Root Certification Authority 1
-=============================================
------BEGIN CERTIFICATE-----
-MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-QW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBPbmxpbmUgUm9vdCBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyODA2MDAwMFoXDTM3MTExOTIwNDMwMFowYzELMAkG
-A1UEBhMCVVMxHDAaBgNVBAoTE0FtZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2Eg
-T25saW5lIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKgv6KRpBgNHw+kqmP8ZonCaxlCyfqXfaE0bfA+2l2h9LaaLl+lkhsmj76CG
-v2BlnEtUiMJIxUo5vxTjWVXlGbR0yLQFOVwWpeKVBeASrlmLojNoWBym1BW32J/X3HGrfpq/m44z
-DyL9Hy7nBzbvYjnF3cu6JRQj3gzGPTzOggjmZj7aUTsWOqMFf6Dch9Wc/HKpoH145LcxVR5lu9Rh
-sCFg7RAycsWSJR74kEoYeEfffjA3PlAb2xzTa5qGUwew76wGePiEmf4hjUyAtgyC9mZweRrTT6PP
-8c9GsEsPPt2IYriMqQkoO3rHl+Ee5fSfwMCuJKDIodkP1nsmgmkyPacCAwEAAaNjMGEwDwYDVR0T
-AQH/BAUwAwEB/zAdBgNVHQ4EFgQUAK3Zo/Z59m50qX8zPYEX10zPM94wHwYDVR0jBBgwFoAUAK3Z
-o/Z59m50qX8zPYEX10zPM94wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBBQUAA4IBAQB8itEf
-GDeC4Liwo+1WlchiYZwFos3CYiZhzRAW18y0ZTTQEYqtqKkFZu90821fnZmv9ov761KyBZiibyrF
-VL0lvV+uyIbqRizBs73B6UlwGBaXCBOMIOAbLjpHyx7kADCVW/RFo8AasAFOq73AI25jP4BKxQft
-3OJvx8Fi8eNy1gTIdGcL+oiroQHIb/AUr9KZzVGTfu0uOMe9zkZQPXLjeSWdm4grECDdpbgyn43g
-Kd8hdIaC2y+CMMbHNYaz+ZZfRtsMRf3zUMNvxsNIrUam4SdHCh0Om7bCd39j8uB9Gr784N/Xx6ds
-sPmuujz9dLQR6FgNgLzTqIA6me11zEZ7
------END CERTIFICATE-----
-
-America Online Root Certification Authority 2
-=============================================
------BEGIN CERTIFICATE-----
-MIIFpDCCA4ygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-QW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBPbmxpbmUgUm9vdCBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyODA2MDAwMFoXDTM3MDkyOTE0MDgwMFowYzELMAkG
-A1UEBhMCVVMxHDAaBgNVBAoTE0FtZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2Eg
-T25saW5lIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAMxBRR3pPU0Q9oyxQcngXssNt79Hc9PwVU3dxgz6sWYFas14tNwC206B89en
-fHG8dWOgXeMHDEjsJcQDIPT/DjsS/5uN4cbVG7RtIuOx238hZK+GvFciKtZHgVdEglZTvYYUAQv8
-f3SkWq7xuhG1m1hagLQ3eAkzfDJHA1zEpYNI9FdWboE2JxhP7JsowtS013wMPgwr38oE18aO6lhO
-qKSlGBxsRZijQdEt0sdtjRnxrXm3gT+9BoInLRBYBbV4Bbkv2wxrkJB+FFk4u5QkE+XRnRTf04JN
-RvCAOVIyD+OEsnpD8l7eXz8d3eOyG6ChKiMDbi4BFYdcpnV1x5dhvt6G3NRI270qv0pV2uh9UPu0
-gBe4lL8BPeraunzgWGcXuVjgiIZGZ2ydEEdYMtA1fHkqkKJaEBEjNa0vzORKW6fIJ/KD3l67Xnfn
-6KVuY8INXWHQjNJsWiEOyiijzirplcdIz5ZvHZIlyMbGwcEMBawmxNJ10uEqZ8A9W6Wa6897Gqid
-FEXlD6CaZd4vKL3Ob5Rmg0gp2OpljK+T2WSfVVcmv2/LNzGZo2C7HK2JNDJiuEMhBnIMoVxtRsX6
-Kc8w3onccVvdtjc+31D1uAclJuW8tf48ArO3+L5DwYcRlJ4jbBeKuIonDFRH8KmzwICMoCfrHRnj
-B453cMor9H124HhnAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE1FwWg4u3Op
-aaEg5+31IqEjFNeeMB8GA1UdIwQYMBaAFE1FwWg4u3OpaaEg5+31IqEjFNeeMA4GA1UdDwEB/wQE
-AwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAZ2sGuV9FOypLM7PmG2tZTiLMubekJcmnxPBUlgtk87FY
-T15R/LKXeydlwuXK5w0MJXti4/qftIe3RUavg6WXSIylvfEWK5t2LHo1YGwRgJfMqZJS5ivmae2p
-+DYtLHe/YUjRYwu5W1LtGLBDQiKmsXeu3mnFzcccobGlHBD7GL4acN3Bkku+KVqdPzW+5X1R+FXg
-JXUjhx5c3LqdsKyzadsXg8n33gy8CNyRnqjQ1xU3c6U1uPx+xURABsPr+CKAXEfOAuMRn0T//Zoy
-zH1kUQ7rVyZ2OuMeIjzCpjbdGe+n/BLzJsBZMYVMnNjP36TMzCmT/5RtdlwTCJfy7aULTd3oyWgO
-ZtMADjMSW7yV5TKQqLPGbIOtd+6Lfn6xqavT4fG2wLHqiMDn05DpKJKUe2h7lyoKZy2FAjgQ5ANh
-1NolNscIWC2hp1GvMApJ9aZphwctREZ2jirlmjvXGKL8nDgQzMY70rUXOm/9riW99XJZZLF0Kjhf
-GEzfz3EEWjbUvy+ZnOjZurGV5gJLIaFb1cFPj65pbVPbAZO1XB4Y3WRayhgoPmMEEf0cjQAPuDff
-Z4qdZqkCapH/E8ovXYO8h5Ns3CRRFgQlZvqz2cK6Kb6aSDiCmfS/O0oxGfm/jiEzFMpPVF/7zvuP
-cX/9XhmgD0uRuMRUvAawRY8mkaKO/qk=
------END CERTIFICATE-----
-
-Visa eCommerce Root
-===================
------BEGIN CERTIFICATE-----
-MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQG
-EwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2Ug
-QXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2
-WhcNMjIwNjI0MDAxNjEyWjBrMQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMm
-VmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
-bW1lcmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h2mCxlCfL
-F9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4ElpF7sDPwsRROEW+1QK8b
-RaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdVZqW1LS7YgFmypw23RuwhY/81q6UCzyr0
-TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI
-/k4+oKsGGelT84ATB+0tvz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzs
-GHxBvfaLdXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEG
-MB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUFAAOCAQEAX/FBfXxc
-CLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcRzCSs00Rsca4BIGsDoo8Ytyk6feUW
-YFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pz
-zkWKsKZJ/0x9nXGIxHYdkFsd7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBu
-YQa7FkKMcPcw++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
-398znM/jra6O1I7mT1GvFpLgXPYHDw==
------END CERTIFICATE-----
-
-Certum Root CA
-==============
------BEGIN CERTIFICATE-----
-MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQK
-ExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA2MTExMDQ2Mzla
-Fw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8u
-by4xEjAQBgNVBAMTCUNlcnR1bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6x
-wS7TT3zNJc4YPk/EjG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdL
-kKWoePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GIULdtlkIJ
-89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapuOb7kky/ZR6By6/qmW6/K
-Uz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUgAKpoC6EahQGcxEZjgoi2IrHu/qpGWX7P
-NSzVttpd90gzFFS269lvzs2I1qsb2pY7HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkq
-hkiG9w0BAQUFAAOCAQEAuI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+
-GXYkHAQaTOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTgxSvg
-GrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1qCjqTE5s7FCMTY5w/
-0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5xO/fIR/RpbxXyEV6DHpx8Uq79AtoS
-qFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs6GAqm4VKQPNriiTsBhYscw==
------END CERTIFICATE-----
-
-Comodo AAA Services root
-========================
------BEGIN CERTIFICATE-----
-MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
-R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
-TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw
-MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl
-c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
-BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG
-C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs
-i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW
-Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH
-Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK
-Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f
-BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl
-cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz
-LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm
-7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
-Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
-8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C
-12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
------END CERTIFICATE-----
-
-Comodo Secure Services root
-===========================
------BEGIN CERTIFICATE-----
-MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
-R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
-TGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAw
-MDAwMFoXDTI4MTIzMTIzNTk1OVowfjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFu
-Y2hlc3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAi
-BgNVBAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPMcm3ye5drswfxdySRXyWP
-9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3SHpR7LZQdqnXXs5jLrLxkU0C8j6ysNstc
-rbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rC
-oznl2yY4rYsK7hljxxwk3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3V
-p6ea5EQz6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNVHQ4E
-FgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
-gYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL1NlY3VyZUNlcnRpZmlj
-YXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRwOi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlm
-aWNhdGVTZXJ2aWNlcy5jcmwwDQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm
-4J4oqF7Tt/Q05qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj
-Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtIgKvcnDe4IRRL
-DXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJaD61JlfutuC23bkpgHl9j6Pw
-pCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDlizeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1H
-RR3B7Hzs/Sk=
------END CERTIFICATE-----
-
-Comodo Trusted Services root
-============================
------BEGIN CERTIFICATE-----
-MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
-R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
-TGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEw
-MDAwMDBaFw0yODEyMzEyMzU5NTlaMH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1h
-bmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUw
-IwYDVQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWWfnJSoBVC21ndZHoa0Lh7
-3TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMtTGo87IvDktJTdyR0nAducPy9C1t2ul/y
-/9c3S0pgePfw+spwtOpZqqPOSC+pw7ILfhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6
-juljatEPmsbS9Is6FARW1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsS
-ivnkBbA7kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0GA1Ud
-DgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
-/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21vZG9jYS5jb20vVHJ1c3RlZENlcnRp
-ZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRodHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENl
-cnRpZmljYXRlU2VydmljZXMuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8Ntw
-uleGFTQQuS9/HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32
-pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxISjBc/lDb+XbDA
-BHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+xqFx7D+gIIxmOom0jtTYsU0l
-R+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/AtyjcndBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O
-9y5Xt5hwXsjEeLBi
------END CERTIFICATE-----
-
-QuoVadis Root CA
-================
------BEGIN CERTIFICATE-----
-MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
-ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
-MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
-cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
-EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
-J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
-F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
-YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
-AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
-PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
-ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
-MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
-YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
-ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
-Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
-Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
-BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
-FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
-tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
-fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
-LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
-gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
-5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
-5nrQNiOKSnQ2+Q==
------END CERTIFICATE-----
-
-QuoVadis Root CA 2
-==================
------BEGIN CERTIFICATE-----
-MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
-EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMjAeFw0wNjExMjQx
-ODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQCaGMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6
-XJxgFyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55JWpzmM+Yk
-lvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bBrrcCaoF6qUWD4gXmuVbB
-lDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp+ARz8un+XJiM9XOva7R+zdRcAitMOeGy
-lZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt
-66/3FsvbzSUr5R/7mp/iUcw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1Jdxn
-wQ5hYIizPtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og/zOh
-D7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UHoycR7hYQe7xFSkyy
-BNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuIyV77zGHcizN300QyNQliBJIWENie
-J0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1Ud
-DgQWBBQahGK8SEwzJQTU7tD2A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGU
-a6FJpEcwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
-ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2fBluornFdLwUv
-Z+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzng/iN/Ae42l9NLmeyhP3ZRPx3
-UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2BlfF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodm
-VjB3pjd4M1IQWK4/YY7yarHvGH5KWWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK
-+JDSV6IZUaUtl0HaB0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrW
-IozchLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPRTUIZ3Ph1
-WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWDmbA4CD/pXvk1B+TJYm5X
-f6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0ZohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II
-4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8
-VCLAAVBpQ570su9t+Oza8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
------END CERTIFICATE-----
-
-QuoVadis Root CA 3
-==================
------BEGIN CERTIFICATE-----
-MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
-EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMzAeFw0wNjExMjQx
-OTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQDMV0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNgg
-DhoB4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUrH556VOij
-KTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd8lyyBTNvijbO0BNO/79K
-DDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9CabwvvWhDFlaJKjdhkf2mrk7AyxRllDdLkgbv
-BNDInIjbC3uBr7E9KsRlOni27tyAsdLTmZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwp
-p5ijJUMv7/FfJuGITfhebtfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8
-nT8KKdjcT5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDtWAEX
-MJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZc6tsgLjoC2SToJyM
-Gf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A4iLItLRkT9a6fUg+qGkM17uGcclz
-uD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYDVR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHT
-BgkrBgEEAb5YAAMwgcUwgZMGCCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmlj
-YXRlIGNvbnN0aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
-aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVudC4wLQYIKwYB
-BQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2NwczALBgNVHQ8EBAMCAQYwHQYD
-VR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4GA1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4
-ywLQoUmkRzBFMQswCQYDVQQGEwJCTTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UE
-AxMSUXVvVmFkaXMgUm9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZV
-qyM07ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSemd1o417+s
-hvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd+LJ2w/w4E6oM3kJpK27z
-POuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2
-Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadNt54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp
-8kokUvd0/bpO5qgdAm6xDYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBC
-bjPsMZ57k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6szHXu
-g/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0jWy10QJLZYxkNc91p
-vGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeTmJlglFwjz1onl14LBQaTNx47aTbr
-qZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK4SVhM7JZG+Ju1zdXtg2pEto=
------END CERTIFICATE-----
-
-Security Communication Root CA
-==============================
------BEGIN CERTIFICATE-----
-MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
-U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
-HhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
-U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw
-8yl89f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJDKaVv0uM
-DPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9Ms+k2Y7CI9eNqPPYJayX
-5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/NQV3Is00qVUarH9oe4kA92819uZKAnDfd
-DJZkndwi92SL32HeFZRSFaB9UslLqCHJxrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2
-JChzAgMBAAGjPzA9MB0GA1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYw
-DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vGkl3g
-0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfrUj94nK9NrvjVT8+a
-mCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5Bw+SUEmK3TGXX8npN6o7WWWXlDLJ
-s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
-6rBK+1YWc26sTfcioU+tHXotRSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAi
-FL39vmwLAw==
------END CERTIFICATE-----
-
-Sonera Class 1 Root CA
-======================
------BEGIN CERTIFICATE-----
-MIIDIDCCAgigAwIBAgIBJDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
-U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MxIENBMB4XDTAxMDQwNjEwNDkxM1oXDTIxMDQw
-NjEwNDkxM1owOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
-IENsYXNzMSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALWJHytPZwp5/8Ue+H88
-7dF+2rDNbS82rDTG29lkFwhjMDMiikzujrsPDUJVyZ0upe/3p4zDq7mXy47vPxVnqIJyY1MPQYx9
-EJUkoVqlBvqSV536pQHydekfvFYmUk54GWVYVQNYwBSujHxVX3BbdyMGNpfzJLWaRpXk3w0LBUXl
-0fIdgrvGE+D+qnr9aTCU89JFhfzyMlsy3uhsXR/LpCJ0sICOXZT3BgBLqdReLjVQCfOAl/QMF645
-2F/NM8EcyonCIvdFEu1eEpOdY6uCLrnrQkFEy0oaAIINnvmLVz5MxxftLItyM19yejhW1ebZrgUa
-HXVFsculJRwSVzb9IjcCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQIR+IMi/ZT
-iFIwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQCLGrLJXWG04bkruVPRsoWdd44W7hE9
-28Jj2VuXZfsSZ9gqXLar5V7DtxYvyOirHYr9qxp81V9jz9yw3Xe5qObSIjiHBxTZ/75Wtf0HDjxV
-yhbMp6Z3N/vbXB9OWQaHowND9Rart4S9Tu+fMTfwRvFAttEMpWT4Y14h21VOTzF2nBBhjrZTOqMR
-vq9tfB69ri3iDGnHhVNoomG6xT60eVR4ngrHAr5i0RGCS2UvkVrCqIexVmiUefkl98HVrhq4uz2P
-qYo4Ffdz0Fpg0YCw8NzVUM1O7pJIae2yIx4wzMiUyLb1O4Z/P6Yun/Y+LLWSlj7fLJOK/4GMDw9Z
-IRlXvVWa
------END CERTIFICATE-----
-
-Sonera Class 2 Root CA
-======================
------BEGIN CERTIFICATE-----
-MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
-U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
-NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
-IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
-/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
-dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
-f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
-tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
-nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
-XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
-0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
-cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
-Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
-EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
-llpwrN9M
------END CERTIFICATE-----
-
-Staat der Nederlanden Root CA
-=============================
------BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJOTDEeMBwGA1UE
-ChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-Um9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEyMTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4w
-HAYDVQQKExVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxh
-bmRlbiBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFt
-vsznExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw719tV2U02P
-jLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MOhXeiD+EwR+4A5zN9RGca
-C1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+UtFE5A3+y3qcym7RHjm+0Sq7lr7HcsBth
-vJly3uSJt3omXdozSVtSnA71iq3DuD3oBmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn6
-22r+I/q85Ej0ZytqERAhSQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRV
-HSAAMDwwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMvcm9v
-dC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA7Jbg0zTBLL9s+DAN
-BgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k/rvuFbQvBgwp8qiSpGEN/KtcCFtR
-EytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzmeafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbw
-MVcoEoJz6TMvplW0C5GUR5z6u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3y
-nGQI0DvDKcWy7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
-iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
------END CERTIFICATE-----
-
-TDC Internet Root CA
-====================
------BEGIN CERTIFICATE-----
-MIIEKzCCAxOgAwIBAgIEOsylTDANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJESzEVMBMGA1UE
-ChMMVERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTAeFw0wMTA0MDUx
-NjMzMTdaFw0yMTA0MDUxNzAzMTdaMEMxCzAJBgNVBAYTAkRLMRUwEwYDVQQKEwxUREMgSW50ZXJu
-ZXQxHTAbBgNVBAsTFFREQyBJbnRlcm5ldCBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAxLhAvJHVYx/XmaCLDEAedLdInUaMArLgJF/wGROnN4NrXceO+YQwzho7+vvOi20j
-xsNuZp+Jpd/gQlBn+h9sHvTQBda/ytZO5GhgbEaqHF1j4QeGDmUApy6mcca8uYGoOn0a0vnRrEvL
-znWv3Hv6gXPU/Lq9QYjUdLP5Xjg6PEOo0pVOd20TDJ2PeAG3WiAfAzc14izbSysseLlJ28TQx5yc
-5IogCSEWVmb/Bexb4/DPqyQkXsN/cHoSxNK1EKC2IeGNeGlVRGn1ypYcNIUXJXfi9i8nmHj9eQY6
-otZaQ8H/7AQ77hPv01ha/5Lr7K7a8jcDR0G2l8ktCkEiu7vmpwIDAQABo4IBJTCCASEwEQYJYIZI
-AYb4QgEBBAQDAgAHMGUGA1UdHwReMFwwWqBYoFakVDBSMQswCQYDVQQGEwJESzEVMBMGA1UEChMM
-VERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTENMAsGA1UEAxMEQ1JM
-MTArBgNVHRAEJDAigA8yMDAxMDQwNTE2MzMxN1qBDzIwMjEwNDA1MTcwMzE3WjALBgNVHQ8EBAMC
-AQYwHwYDVR0jBBgwFoAUbGQBx/2FbazI2p5QCIUItTxWqFAwHQYDVR0OBBYEFGxkAcf9hW2syNqe
-UAiFCLU8VqhQMAwGA1UdEwQFMAMBAf8wHQYJKoZIhvZ9B0EABBAwDhsIVjUuMDo0LjADAgSQMA0G
-CSqGSIb3DQEBBQUAA4IBAQBOQ8zR3R0QGwZ/t6T609lN+yOfI1Rb5osvBCiLtSdtiaHsmGnc540m
-gwV5dOy0uaOXwTUA/RXaOYE6lTGQ3pfphqiZdwzlWqCE/xIWrG64jcN7ksKsLtB9KOy282A4aW8+
-2ARVPp7MVdK6/rtHBNcK2RYKNCn1WBPVT8+PVkuzHu7TmHnaCB4Mb7j4Fifvwm899qNLPg7kbWzb
-O0ESm70NRyN/PErQr8Cv9u8btRXE64PECV90i9kR+8JWsTz4cMo0jUNAE4z9mQNUecYu6oah9jrU
-Cbz0vGbMPVjQV0kK7iXiQe4T+Zs4NNEA9X7nlB38aQNiuJkFBT1reBK9sG9l
------END CERTIFICATE-----
-
-TDC OCES Root CA
-================
------BEGIN CERTIFICATE-----
-MIIFGTCCBAGgAwIBAgIEPki9xDANBgkqhkiG9w0BAQUFADAxMQswCQYDVQQGEwJESzEMMAoGA1UE
-ChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTAeFw0wMzAyMTEwODM5MzBaFw0zNzAyMTEwOTA5
-MzBaMDExCzAJBgNVBAYTAkRLMQwwCgYDVQQKEwNUREMxFDASBgNVBAMTC1REQyBPQ0VTIENBMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArGL2YSCyz8DGhdfjeebM7fI5kqSXLmSjhFuH
-nEz9pPPEXyG9VhDr2y5h7JNp46PMvZnDBfwGuMo2HP6QjklMxFaaL1a8z3sM8W9Hpg1DTeLpHTk0
-zY0s2RKY+ePhwUp8hjjEqcRhiNJerxomTdXkoCJHhNlktxmW/OwZ5LKXJk5KTMuPJItUGBxIYXvV
-iGjaXbXqzRowwYCDdlCqT9HU3Tjw7xb04QxQBr/q+3pJoSgrHPb8FTKjdGqPqcNiKXEx5TukYBde
-dObaE+3pHx8b0bJoc8YQNHVGEBDjkAB2QMuLt0MJIf+rTpPGWOmlgtt3xDqZsXKVSQTwtyv6e1mO
-3QIDAQABo4ICNzCCAjMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwgewGA1UdIASB
-5DCB4TCB3gYIKoFQgSkBAQEwgdEwLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuY2VydGlmaWthdC5k
-ay9yZXBvc2l0b3J5MIGdBggrBgEFBQcCAjCBkDAKFgNUREMwAwIBARqBgUNlcnRpZmlrYXRlciBm
-cmEgZGVubmUgQ0EgdWRzdGVkZXMgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEuMS4xLiBDZXJ0aWZp
-Y2F0ZXMgZnJvbSB0aGlzIENBIGFyZSBpc3N1ZWQgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEuMS4x
-LjARBglghkgBhvhCAQEEBAMCAAcwgYEGA1UdHwR6MHgwSKBGoESkQjBAMQswCQYDVQQGEwJESzEM
-MAoGA1UEChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTENMAsGA1UEAxMEQ1JMMTAsoCqgKIYm
-aHR0cDovL2NybC5vY2VzLmNlcnRpZmlrYXQuZGsvb2Nlcy5jcmwwKwYDVR0QBCQwIoAPMjAwMzAy
-MTEwODM5MzBagQ8yMDM3MDIxMTA5MDkzMFowHwYDVR0jBBgwFoAUYLWF7FZkfhIZJ2cdUBVLc647
-+RIwHQYDVR0OBBYEFGC1hexWZH4SGSdnHVAVS3OuO/kSMB0GCSqGSIb2fQdBAAQQMA4bCFY2LjA6
-NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEACromJkbTc6gJ82sLMJn9iuFXehHTuJTXCRBuo7E4
-A9G28kNBKWKnctj7fAXmMXAnVBhOinxO5dHKjHiIzxvTkIvmI/gLDjNDfZziChmPyQE+dF10yYsc
-A+UYyAFMP8uXBV2YcaaYb7Z8vTd/vuGTJW1v8AqtFxjhA7wHKcitJuj4YfD9IQl+mo6paH1IYnK9
-AOoBmbgGglGBTvH1tJFUuSN6AJqfXY3gPGS5GhKSKseCRHI53OI8xthV9RVOyAUO28bQYqbsFbS1
-AoLbrIyigfCbmTH1ICCoiGEKB5+U/NDXG8wuF/MEJ3Zn61SD/aSQfgY9BKNDLdr8C2LqL19iUw==
------END CERTIFICATE-----
-
-UTN DATACorp SGC Root CA
-========================
------BEGIN CERTIFICATE-----
-MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
-IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZ
-BgNVBAMTElVUTiAtIERBVEFDb3JwIFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBa
-MIGTMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4w
-HAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRy
-dXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ys
-raP6LnD43m77VkIVni5c7yPeIbkFdicZD0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlo
-wHDyUwDAXlCCpVZvNvlK4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA
-9P4yPykqlXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulWbfXv
-33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQABo4GrMIGoMAsGA1Ud
-DwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRTMtGzz3/64PGgXYVOktKeRR20TzA9
-BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dD
-LmNybDAqBgNVHSUEIzAhBggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3
-DQEBBQUAA4IBAQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft
-Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyjj98C5OBxOvG0
-I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVHKWss5nbZqSl9Mt3JNjy9rjXx
-EZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwP
-DPafepE39peC4N1xaf92P2BNPM/3mfnGV/TJVTl4uix5yaaIK/QI
------END CERTIFICATE-----
-
-UTN USERFirst Email Root CA
-===========================
------BEGIN CERTIFICATE-----
-MIIEojCCA4qgAwIBAgIQRL4Mi1AAJLQR0zYlJWfJiTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
-IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xNjA0
-BgNVBAMTLVVUTi1VU0VSRmlyc3QtQ2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBFbWFpbDAeFw05
-OTA3MDkxNzI4NTBaFw0xOTA3MDkxNzM2NThaMIGuMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQx
-FzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsx
-ITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTE2MDQGA1UEAxMtVVROLVVTRVJGaXJz
-dC1DbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWlsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAsjmFpPJ9q0E7YkY3rs3BYHW8OWX5ShpHornMSMxqmNVNNRm5pELlzkniii8efNIx
-B8dOtINknS4p1aJkxIW9hVE1eaROaJB7HHqkkqgX8pgV8pPMyaQylbsMTzC9mKALi+VuG6JG+ni8
-om+rWV6lL8/K2m2qL+usobNqqrcuZzWLeeEeaYji5kbNoKXqvgvOdjp6Dpvq/NonWz1zHyLmSGHG
-TPNpsaguG7bUMSAsvIKKjqQOpdeJQ/wWWq8dcdcRWdq6hw2v+vPhwvCkxWeM1tZUOt4KpLoDd7Nl
-yP0e03RiqhjKaJMeoYV+9Udly/hNVyh00jT/MLbu9mIwFIws6wIDAQABo4G5MIG2MAsGA1UdDwQE
-AwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSJgmd9xJ0mcABLtFBIfN49rgRufTBYBgNV
-HR8EUTBPME2gS6BJhkdodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLVVTRVJGaXJzdC1DbGll
-bnRBdXRoZW50aWNhdGlvbmFuZEVtYWlsLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwQwDQYJKoZIhvcNAQEFBQADggEBALFtYV2mGn98q0rkMPxTbyUkxsrt4jFcKw7u7mFVbwQ+zzne
-xRtJlOTrIEy05p5QLnLZjfWqo7NK2lYcYJeA3IKirUq9iiv/Cwm0xtcgBEXkzYABurorbs6q15L+
-5K/r9CYdFip/bDCVNy8zEqx/3cfREYxRmLLQo5HQrfafnoOTHh1CuEava2bwm3/q4wMC5QJRwarV
-NZ1yQAOJujEdxRBoUp7fooXFXAimeOZTT7Hot9MUnpOmw2TjrH5xzbyf6QMbzPvprDHBr3wVdAKZ
-w7JHpsIyYdfHb0gkUSeh1YdV8nuPmD0Wnu51tvjQjvLzxq4oW6fw8zYX/MMF08oDSlQ=
------END CERTIFICATE-----
-
-UTN USERFirst Hardware Root CA
-==============================
------BEGIN CERTIFICATE-----
-MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
-IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAd
-BgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgx
-OTIyWjCBlzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0
-eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVz
-ZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlI
-wrthdBKWHTxqctU8EGc6Oe0rE81m65UJM6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFd
-tqdt++BxF2uiiPsA3/4aMXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8
-i4fDidNdoI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqIDsjf
-Pe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9KsyoUhbAgMBAAGjgbkw
-gbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFKFyXyYbKJhDlV0HN9WF
-lp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNF
-UkZpcnN0LUhhcmR3YXJlLmNybDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUF
-BwMGBggrBgEFBQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
-//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28GpgoiskliCE7/yMgUsogW
-XecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gECJChicsZUN/KHAG8HQQZexB2
-lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kn
-iCrVWFCVH/A7HFe7fRQ5YiuayZSSKqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67
-nfhmqA==
------END CERTIFICATE-----
-
-UTN USERFirst Object Root CA
-============================
------BEGIN CERTIFICATE-----
-MIIEZjCCA06gAwIBAgIQRL4Mi1AAJLQR0zYt4LNfGzANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
-IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHTAb
-BgNVBAMTFFVUTi1VU0VSRmlyc3QtT2JqZWN0MB4XDTk5MDcwOTE4MzEyMFoXDTE5MDcwOTE4NDAz
-NlowgZUxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkx
-HjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMYaHR0cDovL3d3dy51c2Vy
-dHJ1c3QuY29tMR0wGwYDVQQDExRVVE4tVVNFUkZpcnN0LU9iamVjdDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAM6qgT+jo2F4qjEAVZURnicPHxzfOpuCaDDASmEd8S8O+r5596Uj71VR
-loTN2+O5bj4x2AogZ8f02b+U60cEPgLOKqJdhwQJ9jCdGIqXsqoc/EHSoTbL+z2RuufZcDX65OeQ
-w5ujm9M89RKZd7G3CeBo5hy485RjiGpq/gt2yb70IuRnuasaXnfBhQfdDWy/7gbHd2pBnqcP1/vu
-lBe3/IW+pKvEHDHd17bR5PDv3xaPslKT16HUiaEHLr/hARJCHhrh2JU022R5KP+6LhHC5ehbkkj7
-RwvCbNqtMoNB86XlQXD9ZZBt+vpRxPm9lisZBCzTbafc8H9vg2XiaquHhnUCAwEAAaOBrzCBrDAL
-BgNVHQ8EBAMCAcYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU2u1kdBScFDyr3ZmpvVsoTYs8
-ydgwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC51c2VydHJ1c3QuY29tL1VUTi1VU0VSRmly
-c3QtT2JqZWN0LmNybDApBgNVHSUEIjAgBggrBgEFBQcDAwYIKwYBBQUHAwgGCisGAQQBgjcKAwQw
-DQYJKoZIhvcNAQEFBQADggEBAAgfUrE3RHjb/c652pWWmKpVZIC1WkDdIaXFwfNfLEzIR1pp6ujw
-NTX00CXzyKakh0q9G7FzCL3Uw8q2NbtZhncxzaeAFK4T7/yxSPlrJSUtUbYsbUXBmMiKVl0+7kNO
-PmsnjtA6S4ULX9Ptaqd1y9Fahy85dRNacrACgZ++8A+EVCBibGnU4U3GDZlDAQ0Slox4nb9QorFE
-qmrPF3rPbw/U+CRVX/A0FklmPlBGyWNxODFiuGK581OtbLUrohKqGU8J2l7nk8aOFAj+8DCAGKCG
-hU3IfdeLA/5u1fedFqySLKAj5ZyRUh+U3xeUc8OzwcFxBSAAeL0TUh2oPs0AH8g=
------END CERTIFICATE-----
-
-Camerfirma Chambers of Commerce Root
-====================================
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
-QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
-ZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAx
-NjEzNDNaFw0zNzA5MzAxNjEzNDRaMH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZp
-cm1hIFNBIENJRiBBODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3Jn
-MSIwIAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0BAQEFAAOC
-AQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtbunXF/KGIJPov7coISjlU
-xFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0dBmpAPrMMhe5cG3nCYsS4No41XQEMIwRH
-NaqbYE6gZj3LJgqcQKH0XZi/caulAGgq7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jW
-DA+wWFjbw2Y3npuRVDM30pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFV
-d9oKDMyXroDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIGA1Ud
-EwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5jaGFtYmVyc2lnbi5v
-cmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p26EpW1eLTXYGduHRooowDgYDVR0P
-AQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hh
-bWJlcnNpZ24ub3JnMCcGA1UdEgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYD
-VR0gBFEwTzBNBgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
-aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEBAAxBl8IahsAi
-fJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZdp0AJPaxJRUXcLo0waLIJuvvD
-L8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wN
-UPf6s+xCX6ndbcj0dc97wXImsQEcXCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/n
-ADydb47kMgkdTXg0eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1
-erfutGWaIZDgqtCYvDi1czyL+Nw=
------END CERTIFICATE-----
-
-Camerfirma Global Chambersign Root
-==================================
------BEGIN CERTIFICATE-----
-MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
-QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
-ZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYx
-NDE4WhcNMzcwOTMwMTYxNDE4WjB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJt
-YSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEg
-MB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUAA4IBDQAw
-ggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0Mi+ITaFgCPS3CU6gSS9J
-1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/sQJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8O
-by4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpVeAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl
-6DJWk0aJqCWKZQbua795B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c
-8lCrEqWhz0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0TAQH/
-BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1iZXJzaWduLm9yZy9j
-aGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4wTcbOX60Qq+UDpfqpFDAOBgNVHQ8B
-Af8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAHMCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBj
-aGFtYmVyc2lnbi5vcmcwKgYDVR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9y
-ZzBbBgNVHSAEVDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
-bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0BAQUFAAOCAQEA
-PDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUMbKGKfKX0j//U2K0X1S0E0T9Y
-gOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXiryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJ
-PJ7oKXqJ1/6v/2j1pReQvayZzKWGVwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4
-IBHNfTIzSJRUTN3cecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREes
-t2d/AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
------END CERTIFICATE-----
-
-NetLock Qualified (Class QA) Root
-=================================
------BEGIN CERTIFICATE-----
-MIIG0TCCBbmgAwIBAgIBezANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMCSFUxETAPBgNVBAcT
-CEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNV
-BAsTEVRhbnVzaXR2YW55a2lhZG9rMUIwQAYDVQQDEzlOZXRMb2NrIE1pbm9zaXRldHQgS296amVn
-eXpvaSAoQ2xhc3MgUUEpIFRhbnVzaXR2YW55a2lhZG8xHjAcBgkqhkiG9w0BCQEWD2luZm9AbmV0
-bG9jay5odTAeFw0wMzAzMzAwMTQ3MTFaFw0yMjEyMTUwMTQ3MTFaMIHJMQswCQYDVQQGEwJIVTER
-MA8GA1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNhZ2kgS2Z0
-LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxQjBABgNVBAMTOU5ldExvY2sgTWlub3NpdGV0
-dCBLb3pqZWd5em9pIChDbGFzcyBRQSkgVGFudXNpdHZhbnlraWFkbzEeMBwGCSqGSIb3DQEJARYP
-aW5mb0BuZXRsb2NrLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx1Ilstg91IRV
-CacbvWy5FPSKAtt2/GoqeKvld/Bu4IwjZ9ulZJm53QE+b+8tmjwi8F3JV6BVQX/yQ15YglMxZc4e
-8ia6AFQer7C8HORSjKAyr7c3sVNnaHRnUPYtLmTeriZ539+Zhqurf4XsoPuAzPS4DB6TRWO53Lhb
-m+1bOdRfYrCnjnxmOCyqsQhjF2d9zL2z8cM/z1A57dEZgxXbhxInlrfa6uWdvLrqOU+L73Sa58XQ
-0uqGURzk/mQIKAR5BevKxXEOC++r6uwSEaEYBTJp0QwsGj0lmT+1fMptsK6ZmfoIYOcZwvK9UdPM
-0wKswREMgM6r3JSda6M5UzrWhQIDAMV9o4ICwDCCArwwEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNV
-HQ8BAf8EBAMCAQYwggJ1BglghkgBhvhCAQ0EggJmFoICYkZJR1lFTEVNISBFemVuIHRhbnVzaXR2
-YW55IGEgTmV0TG9jayBLZnQuIE1pbm9zaXRldHQgU3pvbGdhbHRhdGFzaSBTemFiYWx5emF0YWJh
-biBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBBIG1pbm9zaXRldHQgZWxla3Ryb25p
-a3VzIGFsYWlyYXMgam9naGF0YXMgZXJ2ZW55ZXN1bGVzZW5laywgdmFsYW1pbnQgZWxmb2dhZGFz
-YW5hayBmZWx0ZXRlbGUgYSBNaW5vc2l0ZXR0IFN6b2xnYWx0YXRhc2kgU3phYmFseXphdGJhbiwg
-YXogQWx0YWxhbm9zIFN6ZXJ6b2Rlc2kgRmVsdGV0ZWxla2JlbiBlbG9pcnQgZWxsZW5vcnplc2kg
-ZWxqYXJhcyBtZWd0ZXRlbGUuIEEgZG9rdW1lbnR1bW9rIG1lZ3RhbGFsaGF0b2sgYSBodHRwczov
-L3d3dy5uZXRsb2NrLmh1L2RvY3MvIGNpbWVuIHZhZ3kga2VyaGV0b2sgYXogaW5mb0BuZXRsb2Nr
-Lm5ldCBlLW1haWwgY2ltZW4uIFdBUk5JTkchIFRoZSBpc3N1YW5jZSBhbmQgdGhlIHVzZSBvZiB0
-aGlzIGNlcnRpZmljYXRlIGFyZSBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIFF1YWxpZmllZCBDUFMg
-YXZhaWxhYmxlIGF0IGh0dHBzOi8vd3d3Lm5ldGxvY2suaHUvZG9jcy8gb3IgYnkgZS1tYWlsIGF0
-IGluZm9AbmV0bG9jay5uZXQwHQYDVR0OBBYEFAlqYhaSsFq7VQ7LdTI6MuWyIckoMA0GCSqGSIb3
-DQEBBQUAA4IBAQCRalCc23iBmz+LQuM7/KbD7kPgz/PigDVJRXYC4uMvBcXxKufAQTPGtpvQMznN
-wNuhrWw3AkxYQTvyl5LGSKjN5Yo5iWH5Upfpvfb5lHTocQ68d4bDBsxafEp+NFAwLvt/MpqNPfMg
-W/hqyobzMUwsWYACff44yTB1HLdV47yfuqhthCgFdbOLDcCRVCHnpgu0mfVRQdzNo0ci2ccBgcTc
-R08m6h/t280NmPSjnLRzMkqWmf68f8glWPhY83ZmiVSkpj7EUFy6iRiCdUgh0k8T6GB+B3bbELVR
-5qq5aKrN9p2QdRLqOBrKROi3macqaJVmlaut74nLYKkGEsaUR+ko
------END CERTIFICATE-----
-
-NetLock Notary (Class A) Root
-=============================
------BEGIN CERTIFICATE-----
-MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQI
-EwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6
-dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9j
-ayBLb3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oX
-DTE5MDIxOTIzMTQ0N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQH
-EwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYD
-VQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFz
-cyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSM
-D7tM9DceqQWC2ObhbHDqeLVu0ThEDaiDzl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZ
-z+qMkjvN9wfcZnSX9EUi3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC
-/tmwqcm8WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LYOph7
-tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2EsiNCubMvJIH5+hCoR6
-4sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCCApswDgYDVR0PAQH/BAQDAgAGMBIG
-A1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaC
-Ak1GSUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pv
-bGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
-IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2Vn
-LWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0
-ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFz
-IGxlaXJhc2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBh
-IGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVu
-b3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBh
-bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sg
-Q1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFp
-bCBhdCBjcHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5
-ayZrU3/b39/zcT0mwBQOxmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjP
-ytoUMaFP0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQQeJB
-CWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxkf1qbFFgBJ34TUMdr
-KuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK8CtmdWOMovsEPoMOmzbwGOQmIMOM
-8CgHrTwXZoi1/baI
------END CERTIFICATE-----
-
-NetLock Business (Class B) Root
-===============================
------BEGIN CERTIFICATE-----
-MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUxETAPBgNVBAcT
-CEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNV
-BAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQDEylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikg
-VGFudXNpdHZhbnlraWFkbzAeFw05OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYD
-VQQGEwJIVTERMA8GA1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRv
-bnNhZ2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5ldExvY2sg
-VXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
-iQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xKgZjupNTKihe5In+DCnVMm8Bp2GQ5o+2S
-o/1bXHQawEfKOml2mrriRBf8TKPV/riXiK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr
-1nGTLbO/CVRY7QbrqHvcQ7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNV
-HQ8BAf8EBAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZ
-RUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRh
-dGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQuIEEgaGl0
-ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRv
-c2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUg
-YXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJh
-c2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBz
-Oi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6ZXNA
-bmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhl
-IHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2
-YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBj
-cHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06sPgzTEdM
-43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXan3BukxowOR0w2y7jfLKR
-stE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKSNitjrFgBazMpUIaD8QFI
------END CERTIFICATE-----
-
-NetLock Express (Class C) Root
-==============================
------BEGIN CERTIFICATE-----
-MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUxETAPBgNVBAcT
-CEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNV
-BAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQDEytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBD
-KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJ
-BgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6
-dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMrTmV0TG9j
-ayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzANBgkqhkiG9w0BAQEFAAOB
-jQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNAOoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3Z
-W3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63
-euyucYT2BDMIJTLrdKwWRMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQw
-DgYDVR0PAQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEWggJN
-RklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0YWxhbm9zIFN6b2xn
-YWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBB
-IGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBOZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1i
-aXp0b3NpdGFzYSB2ZWRpLiBBIGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0
-ZWxlIGF6IGVsb2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs
-ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25sYXBqYW4gYSBo
-dHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kga2VyaGV0byBheiBlbGxlbm9y
-emVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4gSU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5k
-IHRoZSB1c2Ugb2YgdGhpcyBjZXJ0aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQ
-UyBhdmFpbGFibGUgYXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwg
-YXQgY3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmYta3UzbM2
-xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2gpO0u9f38vf5NNwgMvOOW
-gyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4Fp1hBWeAyNDYpQcCNJgEjTME1A==
------END CERTIFICATE-----
-
-XRamp Global CA Root
-====================
------BEGIN CERTIFICATE-----
-MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
-BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj
-dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx
-HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg
-U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu
-IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx
-foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE
-zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs
-AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry
-xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap
-oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC
-AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc
-/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
-qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n
-nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz
-8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw=
------END CERTIFICATE-----
-
-Go Daddy Class 2 CA
-===================
------BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY
-VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG
-A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
-RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD
-ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv
-2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32
-qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j
-YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY
-vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O
-BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o
-atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu
-MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim
-PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
-I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
-HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI
-Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b
-vZ8=
------END CERTIFICATE-----
-
-Starfield Class 2 CA
-====================
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc
-U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo
-MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG
-A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG
-SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY
-bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ
-JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm
-epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN
-F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF
-MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f
-hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo
-bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g
-QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs
-afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM
-PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
-xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD
-KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
-QBFGmh95DmK/D5fs4C8fF5Q=
------END CERTIFICATE-----
-
-StartCom Certification Authority
-================================
------BEGIN CERTIFICATE-----
-MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
-U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu
-ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0
-NjM2WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk
-LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg
-U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y
-o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/
-Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d
-eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt
-2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z
-6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ
-osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/
-untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc
-UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT
-37uMdBNSSwIDAQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
-FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9jZXJ0LnN0YXJ0
-Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3JsLnN0YXJ0Y29tLm9yZy9zZnNj
-YS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFMBgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUH
-AgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRw
-Oi8vY2VydC5zdGFydGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYg
-U3RhcnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlhYmlsaXR5
-LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2YgdGhlIFN0YXJ0Q29tIENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFpbGFibGUgYXQgaHR0cDovL2NlcnQuc3Rh
-cnRjb20ub3JnL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilT
-dGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOC
-AgEAFmyZ9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8jhvh
-3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUWFjgKXlf2Ysd6AgXm
-vB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJzewT4F+irsfMuXGRuczE6Eri8sxHk
-fY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3
-fsNrarnDy0RLrHiQi+fHLB5LEUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZ
-EoalHmdkrQYuL6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
-yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuCO3NJo2pXh5Tl
-1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6Vum0ABj6y6koQOdjQK/W/7HW/
-lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkyShNOsF/5oirpt9P/FlUQqmMGqz9IgcgA38coro
-g14=
------END CERTIFICATE-----
-
-Taiwan GRCA
-===========
------BEGIN CERTIFICATE-----
-MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG
-EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
-DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv
-dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN
-w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5
-BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O
-1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO
-htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov
-J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7
-Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t
-B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB
-O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8
-lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV
-HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2
-09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
-TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj
-Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2
-Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU
-D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz
-DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk
-Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk
-7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ
-CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy
-+fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS
------END CERTIFICATE-----
-
-Firmaprofesional Root CA
-========================
------BEGIN CERTIFICATE-----
-MIIEVzCCAz+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCRVMxIjAgBgNVBAcT
-GUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1dG9yaWRhZCBkZSBDZXJ0aWZp
-Y2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FA
-ZmlybWFwcm9mZXNpb25hbC5jb20wHhcNMDExMDI0MjIwMDAwWhcNMTMxMDI0MjIwMDAwWjCBnTEL
-MAkGA1UEBhMCRVMxIjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMT
-OUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2
-ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20wggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDnIwNvbyOlXnjOlSztlB5uCp4Bx+ow0Syd3Tfom5h5VtP8c9/Qit5V
-j1H5WuretXDE7aTt/6MNbg9kUDGvASdYrv5sp0ovFy3Tc9UTHI9ZpTQsHVQERc1ouKDAA6XPhUJH
-lShbz++AbOCQl4oBPB3zhxAwJkh91/zpnZFx/0GaqUC1N5wpIE8fUuOgfRNtVLcK3ulqTgesrBlf
-3H5idPayBQC6haD9HThuy1q7hryUZzM1gywfI834yJFxzJeL764P3CkDG8A563DtwW4O2GcLiam8
-NeTvtjS0pbbELaW+0MOUJEjb35bTALVmGotmBQ/dPz/LP6pemkr4tErvlTcbAgMBAAGjgZ8wgZww
-KgYDVR0RBCMwIYYfaHR0cDovL3d3dy5maXJtYXByb2Zlc2lvbmFsLmNvbTASBgNVHRMBAf8ECDAG
-AQH/AgEBMCsGA1UdEAQkMCKADzIwMDExMDI0MjIwMDAwWoEPMjAxMzEwMjQyMjAwMDBaMA4GA1Ud
-DwEB/wQEAwIBBjAdBgNVHQ4EFgQUMwugZtHq2s7eYpMEKFK1FH84aLcwDQYJKoZIhvcNAQEFBQAD
-ggEBAEdz/o0nVPD11HecJ3lXV7cVVuzH2Fi3AQL0M+2TUIiefEaxvT8Ub/GzR0iLjJcG1+p+o1wq
-u00vR+L4OQbJnC4xGgN49Lw4xiKLMzHwFgQEffl25EvXwOaD7FnMP97/T2u3Z36mhoEyIwOdyPdf
-wUpgpZKpsaSgYMN4h7Mi8yrrW6ntBas3D7Hi05V2Y1Z0jFhyGzflZKG+TQyTmAyX9odtsz/ny4Cm
-7YjHX1BiAuiZdBbQ5rQ58SfLyEDW44YQqSMSkuBpQWOnryULwMWSyx6Yo1q6xTMPoJcB3X/ge9YG
-VM+h4k0460tQtcsm9MracEpqoeJ5quGnM/b9Sh/22WA=
------END CERTIFICATE-----
-
-Wells Fargo Root CA
-===================
------BEGIN CERTIFICATE-----
-MIID5TCCAs2gAwIBAgIEOeSXnjANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMCVVMxFDASBgNV
-BAoTC1dlbGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhv
-cml0eTEvMC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN
-MDAxMDExMTY0MTI4WhcNMjEwMTE0MTY0MTI4WjCBgjELMAkGA1UEBhMCVVMxFDASBgNVBAoTC1dl
-bGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEv
-MC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVqDM7Jvk0/82bfuUER84A4n135zHCLielTWi5MbqNQ1mX
-x3Oqfz1cQJ4F5aHiidlMuD+b+Qy0yGIZLEWukR5zcUHESxP9cMIlrCL1dQu3U+SlK93OvRw6esP3
-E48mVJwWa2uv+9iWsWCaSOAlIiR5NM4OJgALTqv9i86C1y8IcGjBqAr5dE8Hq6T54oN+J3N0Prj5
-OEL8pahbSCOz6+MlsoCultQKnMJ4msZoGK43YjdeUXWoWGPAUe5AeH6orxqg4bB4nVCMe+ez/I4j
-sNtlAHCEAQgAFG5Uhpq6zPk3EPbg3oQtnaSFN9OH4xXQwReQfhkhahKpdv0SAulPIV4XAgMBAAGj
-YTBfMA8GA1UdEwEB/wQFMAMBAf8wTAYDVR0gBEUwQzBBBgtghkgBhvt7hwcBCzAyMDAGCCsGAQUF
-BwIBFiRodHRwOi8vd3d3LndlbGxzZmFyZ28uY29tL2NlcnRwb2xpY3kwDQYJKoZIhvcNAQEFBQAD
-ggEBANIn3ZwKdyu7IvICtUpKkfnRLb7kuxpo7w6kAOnu5+/u9vnldKTC2FJYxHT7zmu1Oyl5GFrv
-m+0fazbuSCUlFLZWohDo7qd/0D+j0MNdJu4HzMPBJCGHHt8qElNvQRbn7a6U+oxy+hNH8Dx+rn0R
-OhPs7fpvcmR7nX1/Jv16+yWt6j4pf0zjAFcysLPp7VMX2YuyFA4w6OXVE8Zkr8QA1dhYJPz1j+zx
-x32l2w8n0cbyQIjmH/ZhqPRCyLk306m+LFZ4wnKbWV01QIroTmMatukgalHizqSQ33ZwmVxwQ023
-tqcZZE6St8WRPH9IFmV7Fv3L/PvZ1dZPIWU7Sn9Ho/s=
------END CERTIFICATE-----
-
-Swisscom Root CA 1
-==================
------BEGIN CERTIFICATE-----
-MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQG
-EwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2VydGlmaWNhdGUgU2Vy
-dmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3QgQ0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4
-MTgyMjA2MjBaMGQxCzAJBgNVBAYTAmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGln
-aXRhbCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIIC
-IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9m2BtRsiM
-MW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdihFvkcxC7mlSpnzNApbjyF
-NDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/TilftKaNXXsLmREDA/7n29uj/x2lzZAe
-AR81sH8A25Bvxn570e56eqeqDFdvpG3FEzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkC
-b6dJtDZd0KTeByy2dbcokdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn
-7uHbHaBuHYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNFvJbN
-cA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo19AOeCMgkckkKmUp
-WyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjCL3UcPX7ape8eYIVpQtPM+GP+HkM5
-haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJWbjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNY
-MUJDLXT5xp6mig/p/r+D5kNXJLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYw
-HQYDVR0hBBYwFDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j
-BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzcK6FptWfUjNP9
-MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzfky9NfEBWMXrrpA9gzXrzvsMn
-jgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7IkVh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQ
-MbFamIp1TpBcahQq4FJHgmDmHtqBsfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4H
-VtA4oJVwIHaM190e3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtl
-vrsRls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ipmXeascCl
-OS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HHb6D0jqTsNFFbjCYDcKF3
-1QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksfrK/7DZBaZmBwXarNeNQk7shBoJMBkpxq
-nvy5JMWzFYJ+vq6VK+uxwNrjAWALXmmshFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCy
-x/yP2FS1k2Kdzs9Z+z0YzirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMW
-NY6E0F/6MBr1mmz0DlP5OlvRHA==
------END CERTIFICATE-----
-
-DigiCert Assured ID Root CA
-===========================
------BEGIN CERTIFICATE-----
-MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
-IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx
-MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
-ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO
-9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy
-UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW
-/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy
-oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf
-GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF
-66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq
-hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc
-EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn
-SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i
-8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
-+o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
------END CERTIFICATE-----
-
-DigiCert Global Root CA
-=======================
------BEGIN CERTIFICATE-----
-MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
-HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw
-MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
-dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn
-TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5
-BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H
-4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y
-7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB
-o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm
-8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF
-BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr
-EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt
-tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886
-UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
-CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
------END CERTIFICATE-----
-
-DigiCert High Assurance EV Root CA
-==================================
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
-KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw
-MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
-MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu
-Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t
-Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS
-OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3
-MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ
-NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe
-h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB
-Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY
-JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ
-V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp
-myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK
-mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
-vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
------END CERTIFICATE-----
-
-Certplus Class 2 Primary CA
-===========================
------BEGIN CERTIFICATE-----
-MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAwPTELMAkGA1UE
-BhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFzcyAyIFByaW1hcnkgQ0EwHhcN
-OTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2Vy
-dHBsdXMxGzAZBgNVBAMTEkNsYXNzIDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANxQltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR
-5aiRVhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyLkcAbmXuZ
-Vg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCdEgETjdyAYveVqUSISnFO
-YFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yasH7WLO7dDWWuwJKZtkIvEcupdM5i3y95e
-e++U8Rs+yskhwcWYAqqi9lt3m/V+llU0HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRME
-CDAGAQH/AgEKMAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJ
-YIZIAYb4QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMuY29t
-L0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/AN9WM2K191EBkOvD
-P9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8yfFC82x/xXp8HVGIutIKPidd3i1R
-TtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMRFcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+
-7UCmnYR0ObncHoUW2ikbhiMAybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW
-//1IMwrh3KWBkJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
-l7+ijrRU
------END CERTIFICATE-----
-
-DST Root CA X3
-==============
------BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
-ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
-DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
-cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
-rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
-UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
-xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
-utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
-AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
-MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
-dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
-GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
-RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
-fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
------END CERTIFICATE-----
-
-DST ACES CA X6
-==============
------BEGIN CERTIFICATE-----
-MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBbMQswCQYDVQQG
-EwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QxETAPBgNVBAsTCERTVCBBQ0VT
-MRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0wMzExMjAyMTE5NThaFw0xNzExMjAyMTE5NTha
-MFsxCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UE
-CxMIRFNUIEFDRVMxFzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPuktKe1jzI
-DZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7gLFViYsx+tC3dr5BPTCa
-pCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZHfAjIgrrep4c9oW24MFbCswKBXy314pow
-GCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4aahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPy
-MjwmR/onJALJfh1biEITajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1Ud
-EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rkc3Qu
-Y29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjtodHRwOi8vd3d3LnRy
-dXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMtaW5kZXguaHRtbDAdBgNVHQ4EFgQU
-CXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZIhvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V2
-5FYrnJmQ6AgwbN99Pe7lv7UkQIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6t
-Fr8hlxCBPeP/h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
-nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpRrscL9yuwNwXs
-vFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf29w4LTJxoeHtxMcfrHuBnQfO3
-oKfN5XozNmr6mis=
------END CERTIFICATE-----
-
-TURKTRUST Certificate Services Provider Root 1
-==============================================
------BEGIN CERTIFICATE-----
-MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOcUktUUlVTVCBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGDAJUUjEP
-MA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykgMjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0
-acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMx
-MDI3MTdaFw0xNTAzMjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsg
-U2VydGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYDVQQHDAZB
-TktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBC
-aWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEuxZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GX
-yGl8hMW0kWxsE2qkVa2kheiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8i
-Si9BB35JYbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5CurKZ
-8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1JuTm5Rh8i27fbMx4
-W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51b0dewQIDAQABoxAwDjAMBgNVHRME
-BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46
-sWrv7/hg0Uw2ZkUd82YCdAR7kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxE
-q8Sn5RTOPEFhfEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy
-B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdAaLX/7KfS0zgY
-nNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKSRGQDJereW26fyfJOrN3H
------END CERTIFICATE-----
-
-TURKTRUST Certificate Services Provider Root 2
-==============================================
------BEGIN CERTIFICATE-----
-MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEP
-MA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUg
-QmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcN
-MDUxMTA3MTAwNzU3WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVr
-dHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEPMA0G
-A1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls
-acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqe
-LCDe2JAOCtFp0if7qnefJ1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKI
-x+XlZEdhR3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJQv2g
-QrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGXJHpsmxcPbe9TmJEr
-5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1pzpwACPI2/z7woQ8arBT9pmAPAgMB
-AAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58SFq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8G
-A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/ntt
-Rbj2hWyfIvwqECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4
-Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFzgw2lGh1uEpJ+
-hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotHuFEJjOp9zYhys2AzsfAKRO8P
-9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LSy3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5
-UrbnBEI=
------END CERTIFICATE-----
-
-SwissSign Platinum CA - G2
-==========================
------BEGIN CERTIFICATE-----
-MIIFwTCCA6mgAwIBAgIITrIAZwwDXU8wDQYJKoZIhvcNAQEFBQAwSTELMAkGA1UEBhMCQ0gxFTAT
-BgNVBAoTDFN3aXNzU2lnbiBBRzEjMCEGA1UEAxMaU3dpc3NTaWduIFBsYXRpbnVtIENBIC0gRzIw
-HhcNMDYxMDI1MDgzNjAwWhcNMzYxMDI1MDgzNjAwWjBJMQswCQYDVQQGEwJDSDEVMBMGA1UEChMM
-U3dpc3NTaWduIEFHMSMwIQYDVQQDExpTd2lzc1NpZ24gUGxhdGludW0gQ0EgLSBHMjCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAMrfogLi2vj8Bxax3mCq3pZcZB/HL37PZ/pEQtZ2Y5Wu
-669yIIpFR4ZieIbWIDkm9K6j/SPnpZy1IiEZtzeTIsBQnIJ71NUERFzLtMKfkr4k2HtnIuJpX+UF
-eNSH2XFwMyVTtIc7KZAoNppVRDBopIOXfw0enHb/FZ1glwCNioUD7IC+6ixuEFGSzH7VozPY1kne
-WCqv9hbrS3uQMpe5up1Y8fhXSQQeol0GcN1x2/ndi5objM89o03Oy3z2u5yg+gnOI2Ky6Q0f4nIo
-j5+saCB9bzuohTEJfwvH6GXp43gOCWcwizSC+13gzJ2BbWLuCB4ELE6b7P6pT1/9aXjvCR+htL/6
-8++QHkwFix7qepF6w9fl+zC8bBsQWJj3Gl/QKTIDE0ZNYWqFTFJ0LwYfexHihJfGmfNtf9dng34T
-aNhxKFrYzt3oEBSa/m0jh26OWnA81Y0JAKeqvLAxN23IhBQeW71FYyBrS3SMvds6DsHPWhaPpZjy
-domyExI7C3d3rLvlPClKknLKYRorXkzig3R3+jVIeoVNjZpTxN94ypeRSCtFKwH3HBqi7Ri6Cr2D
-+m+8jVeTO9TUps4e8aCxzqv9KyiaTxvXw3LbpMS/XUz13XuWae5ogObnmLo2t/5u7Su9IPhlGdpV
-CX4l3P5hYnL5fhgC72O00Puv5TtjjGePAgMBAAGjgawwgakwDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFFCvzAeHFUdvOMW0ZdHelarp35zMMB8GA1UdIwQYMBaAFFCv
-zAeHFUdvOMW0ZdHelarp35zMMEYGA1UdIAQ/MD0wOwYJYIV0AVkBAQEBMC4wLAYIKwYBBQUHAgEW
-IGh0dHA6Ly9yZXBvc2l0b3J5LnN3aXNzc2lnbi5jb20vMA0GCSqGSIb3DQEBBQUAA4ICAQAIhab1
-Fgz8RBrBY+D5VUYI/HAcQiiWjrfFwUF1TglxeeVtlspLpYhg0DB0uMoI3LQwnkAHFmtllXcBrqS3
-NQuB2nEVqXQXOHtYyvkv+8Bldo1bAbl93oI9ZLi+FHSjClTTLJUYFzX1UWs/j6KWYTl4a0vlpqD4
-U99REJNi54Av4tHgvI42Rncz7Lj7jposiU0xEQ8mngS7twSNC/K5/FqdOxa3L8iYq/6KUFkuozv8
-KV2LwUvJ4ooTHbG/u0IdUt1O2BReEMYxB+9xJ/cbOQncguqLs5WGXv312l0xpuAxtpTmREl0xRbl
-9x8DYSjFyMsSoEJL+WuICI20MhjzdZ/EfwBPBZWcoxcCw7NTm6ogOSkrZvqdr16zktK1puEa+S1B
-aYEUtLS17Yk9zvupnTVCRLEcFHOBzyoBNZox1S2PbYTfgE1X4z/FhHXaicYwu+uPyyIIoK6q8QNs
-OktNCaUOcsZWayFCTiMlFGiudgp8DAdwZPmaL/YFOSbGDI8Zf0NebvRbFS/bYV3mZy8/CJT5YLSY
-Mdp08YSTcU1f+2BY0fvEwW2JorsgH51xkcsymxM9Pn2SUjWskpSi0xjCfMfqr3YFFt1nJ8J+HAci
-IfNAChs0B0QTwoRqjt8ZWr9/6x3iGjjRXK9HkmuAtTClyY3YqzGBH9/CZjfTk6mFhnll0g==
------END CERTIFICATE-----
-
-SwissSign Gold CA - G2
-======================
------BEGIN CERTIFICATE-----
-MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUw
-EwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcN
-MDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dp
-c3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUq
-t2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5C
-jCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpg
-vd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDF
-ylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvR
-AiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuend
-jIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkO
-peUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR
-7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGi
-GqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64
-OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
-L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm
-5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr
-44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOf
-Mke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6m
-Gu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxp
-mo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJk
-vC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid392qgQmwLOM7XdVAyksLf
-KzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2Br
-NU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6Lqj
-viOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
------END CERTIFICATE-----
-
-SwissSign Silver CA - G2
-========================
------BEGIN CERTIFICATE-----
-MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCQ0gxFTAT
-BgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMB4X
-DTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0NlowRzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3
-aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644
-N0MvFz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7brYT7QbNHm
-+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieFnbAVlDLaYQ1HTWBCrpJH
-6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH6ATK72oxh9TAtvmUcXtnZLi2kUpCe2Uu
-MGoM9ZDulebyzYLs2aFK7PayS+VFheZteJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5h
-qAaEuSh6XzjZG6k4sIN/c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5
-FZGkECwJMoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRHHTBs
-ROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTfjNFusB3hB48IHpmc
-celM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb65i/4z3GcRm25xBWNOHkDRUjvxF3X
-CO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQUF6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRB
-tjpbO8tFnb0cwpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
-cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBAHPGgeAn0i0P
-4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShpWJHckRE1qTodvBqlYJ7YH39F
-kWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L
-3XWgwF15kIwb4FDm3jH+mHtwX6WQ2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx
-/uNncqCxv1yL5PqZIseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFa
-DGi8aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2Xem1ZqSqP
-e97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQRdAtq/gsD/KNVV4n+Ssuu
-WxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJ
-DIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ub
-DgEj8Z+7fNzcbBGXJbLytGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
------END CERTIFICATE-----
-
-GeoTrust Primary Certification Authority
-========================================
------BEGIN CERTIFICATE-----
-MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
-EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx
-CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ
-cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN
-b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9
-nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge
-RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt
-tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI
-hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K
-Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN
-NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa
-Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG
-1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
------END CERTIFICATE-----
-
-thawte Primary Root CA
-======================
------BEGIN CERTIFICATE-----
-MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE
-BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
-aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3
-MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg
-SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv
-KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT
-FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs
-oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ
-1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc
-q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K
-aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p
-afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF
-AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE
-uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
-xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89
-jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH
-z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA==
------END CERTIFICATE-----
-
-VeriSign Class 3 Public Primary Certification Authority - G5
-============================================================
------BEGIN CERTIFICATE-----
-MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
-BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
-ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
-IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln
-biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh
-dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt
-YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz
-j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD
-Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/
-Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r
-fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/
-BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv
-Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
-aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG
-SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+
-X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE
-KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC
-Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE
-ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
------END CERTIFICATE-----
-
-SecureTrust CA
-==============
------BEGIN CERTIFICATE-----
-MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG
-EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy
-dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe
-BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX
-OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t
-DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH
-GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b
-01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH
-ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj
-aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
-KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu
-SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf
-mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ
-nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
-3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
------END CERTIFICATE-----
-
-Secure Global CA
-================
------BEGIN CERTIFICATE-----
-MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG
-EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH
-bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg
-MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg
-Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx
-YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ
-bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g
-8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV
-HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi
-0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn
-oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA
-MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+
-OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn
-CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5
-3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
-f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
------END CERTIFICATE-----
-
-COMODO Certification Authority
-==============================
------BEGIN CERTIFICATE-----
-MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE
-BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
-A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb
-MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD
-T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH
-+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww
-xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV
-4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA
-1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI
-rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k
-b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC
-AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP
-OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
-RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc
-IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
-+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
------END CERTIFICATE-----
-
-Network Solutions Certificate Authority
-=======================================
------BEGIN CERTIFICATE-----
-MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG
-EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr
-IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx
-MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
-MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx
-jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT
-aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT
-crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc
-/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB
-AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv
-bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA
-A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q
-4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/
-GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
-wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD
-ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
------END CERTIFICATE-----
-
-WellsSecure Public Root Certificate Authority
-=============================================
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoM
-F1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYw
-NAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN
-MDcxMjEzMTcwNzU0WhcNMjIxMjE0MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dl
-bGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYD
-VQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+rWxxTkqxtnt3CxC5FlAM1
-iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjUDk/41itMpBb570OYj7OeUt9tkTmPOL13
-i0Nj67eT/DBMHAGTthP796EfvyXhdDcsHqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8
-bJVhHlfXBIEyg1J55oNjz7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiB
-K0HmOFafSZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/SlwxlAgMB
-AAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwu
-cGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0PAQH/BAQDAgHGMB0GA1UdDgQWBBQm
-lRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0jBIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGB
-i6SBiDCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRww
-GgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg
-Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEBALkVsUSRzCPI
-K0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd/ZDJPHV3V3p9+N701NX3leZ0
-bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pBA4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSlj
-qHyita04pO2t/caaH/+Xc/77szWnk4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+es
-E2fDbbFwRnzVlhE9iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJ
-tylv2G0xffX8oRAHh84vWdw+WNs=
------END CERTIFICATE-----
-
-COMODO ECC Certification Authority
-==================================
------BEGIN CERTIFICATE-----
-MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC
-R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
-ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix
-GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
-Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo
-b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X
-4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni
-wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG
-FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
-U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
------END CERTIFICATE-----
-
-IGC/A
-=====
------BEGIN CERTIFICATE-----
-MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkZSMQ8wDQYD
-VQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVE
-Q1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZy
-MB4XDTAyMTIxMzE0MjkyM1oXDTIwMTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQI
-EwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NT
-STEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaIs9z4iPf930Pfeo2aSVz2
-TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCW
-So7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYy
-HF2fYPepraX/z9E0+X1bF8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNd
-frGoRpAxVs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGdPDPQ
-tQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNVHSAEDjAMMAoGCCqB
-egF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAxNjAfBgNVHSMEGDAWgBSjBS8YYFDC
-iQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUFAAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RK
-q89toB9RlPhJy3Q2FLwV3duJL92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3Q
-MZsyK10XZZOYYLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg
-Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2aNjSaTFR+FwNI
-lQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R0982gaEbeC9xs/FZTEYYKKuF
-0mBWWg==
------END CERTIFICATE-----
-
-Security Communication EV RootCA1
-=================================
------BEGIN CERTIFICATE-----
-MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
-U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU2VjdXJpdHkgQ29tbXVuaWNh
-dGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIzMloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UE
-BhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNl
-Y3VyaXR5IENvbW11bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSERMqm4miO
-/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gOzXppFodEtZDkBp2uoQSX
-WHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4z
-ZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDFMxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4
-bepJz11sS6/vmsJWXMY1VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK
-9U2vP9eCOKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
-SIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HWtWS3irO4G8za+6xm
-iEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZq51ihPZRwSzJIxXYKLerJRO1RuGG
-Av8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDbEJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnW
-mHyojf6GPgcWkuF75x3sM3Z+Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEW
-T1MKZPlO9L9OVL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490
------END CERTIFICATE-----
-
-OISTE WISeKey Global Root GA CA
-===============================
------BEGIN CERTIFICATE-----
-MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE
-BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG
-A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH
-bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD
-VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw
-IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5
-IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9
-Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg
-Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD
-d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ
-/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R
-LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
-KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm
-MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4
-+vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
-hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY
-okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0=
------END CERTIFICATE-----
-
-S-TRUST Authentication and Encryption Root CA 2005 PN
-=====================================================
------BEGIN CERTIFICATE-----
-MIIEezCCA2OgAwIBAgIQNxkY5lNUfBq1uMtZWts1tzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxIDAeBgNVBAgTF0JhZGVuLVd1ZXJ0dGVtYmVyZyAoQlcpMRIwEAYDVQQHEwlTdHV0dGdh
-cnQxKTAnBgNVBAoTIERldXRzY2hlciBTcGFya2Fzc2VuIFZlcmxhZyBHbWJIMT4wPAYDVQQDEzVT
-LVRSVVNUIEF1dGhlbnRpY2F0aW9uIGFuZCBFbmNyeXB0aW9uIFJvb3QgQ0EgMjAwNTpQTjAeFw0w
-NTA2MjIwMDAwMDBaFw0zMDA2MjEyMzU5NTlaMIGuMQswCQYDVQQGEwJERTEgMB4GA1UECBMXQmFk
-ZW4tV3VlcnR0ZW1iZXJnIChCVykxEjAQBgNVBAcTCVN0dXR0Z2FydDEpMCcGA1UEChMgRGV1dHNj
-aGVyIFNwYXJrYXNzZW4gVmVybGFnIEdtYkgxPjA8BgNVBAMTNVMtVFJVU1QgQXV0aGVudGljYXRp
-b24gYW5kIEVuY3J5cHRpb24gUm9vdCBDQSAyMDA1OlBOMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA2bVKwdMz6tNGs9HiTNL1toPQb9UY6ZOvJ44TzbUlNlA0EmQpoVXhOmCTnijJ4/Ob
-4QSwI7+Vio5bG0F/WsPoTUzVJBY+h0jUJ67m91MduwwA7z5hca2/OnpYH5Q9XIHV1W/fuJvS9eXL
-g3KSwlOyggLrra1fFi2SU3bxibYs9cEv4KdKb6AwajLrmnQDaHgTncovmwsdvs91DSaXm8f1Xgqf
-eN+zvOyauu9VjxuapgdjKRdZYgkqeQd3peDRF2npW932kKvimAoA0SVtnteFhy+S8dF2g08LOlk3
-KC8zpxdQ1iALCvQm+Z845y2kuJuJja2tyWp9iRe79n+Ag3rm7QIDAQABo4GSMIGPMBIGA1UdEwEB
-/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgEGMCkGA1UdEQQiMCCkHjAcMRowGAYDVQQDExFTVFJv
-bmxpbmUxLTIwNDgtNTAdBgNVHQ4EFgQUD8oeXHngovMpttKFswtKtWXsa1IwHwYDVR0jBBgwFoAU
-D8oeXHngovMpttKFswtKtWXsa1IwDQYJKoZIhvcNAQEFBQADggEBAK8B8O0ZPCjoTVy7pWMciDMD
-pwCHpB8gq9Yc4wYfl35UvbfRssnV2oDsF9eK9XvCAPbpEW+EoFolMeKJ+aQAPzFoLtU96G7m1R08
-P7K9n3frndOMusDXtk3sU5wPBG7qNWdX4wple5A64U8+wwCSersFiXOMy6ZNwPv2AtawB6MDwidA
-nwzkhYItr5pCHdDHjfhA7p0GVxzZotiAFP7hYy0yh9WUUpY6RsZxlj33mA6ykaqP2vROJAA5Veit
-F7nTNCtKqUDMFypVZUF0Qn71wK/Ik63yGFs9iQzbRzkk+OBM8h+wPQrKBU6JIRrjKpms/H+h8Q8b
-Hz2eBIPdltkdOpQ=
------END CERTIFICATE-----
-
-Microsec e-Szigno Root CA
-=========================
------BEGIN CERTIFICATE-----
-MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAwcjELMAkGA1UE
-BhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNyb3NlYyBMdGQuMRQwEgYDVQQL
-EwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9zZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0
-MDYxMjI4NDRaFw0xNzA0MDYxMjI4NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVz
-dDEWMBQGA1UEChMNTWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMT
-GU1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2uuO/TEdyB5s87lozWbxXG
-d36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/N
-oqdNAoI/gqyFxuEPkEeZlApxcpMqyabAvjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjc
-QR/Ji3HWVBTji1R4P770Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJ
-PqW+jqpx62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcBAQRb
-MFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3AwLQYIKwYBBQUHMAKG
-IWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAPBgNVHRMBAf8EBTADAQH/MIIBcwYD
-VR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIBAQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3
-LmUtc3ppZ25vLmh1L1NaU1ovMIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0A
-dAB2AOEAbgB5ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn
-AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABTAHoAbwBsAGcA
-4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABhACAAcwB6AGUAcgBpAG4AdAAg
-AGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABoAHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMA
-egBpAGcAbgBvAC4AaAB1AC8AUwBaAFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6
-Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NO
-PU1pY3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxPPU1pY3Jv
-c2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDtiaW5h
-cnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuBEGluZm9AZS1zemlnbm8uaHWkdzB1MSMw
-IQYDVQQDDBpNaWNyb3NlYyBlLVN6aWduw7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhT
-WjEWMBQGA1UEChMNTWljcm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhV
-MIGsBgNVHSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJIVTER
-MA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDASBgNVBAsTC2UtU3pp
-Z25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBSb290IENBghEAzLjnv04pGv2i3Gal
-HCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMT
-nGZjWS7KXHAM/IO8VbH0jgdsZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FE
-aGAHQzAxQmHl7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a
-86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfRhUZLphK3dehK
-yVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/MPMMNz7UwiiAc7EBt51alhQB
-S6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU=
------END CERTIFICATE-----
-
-Certigna
-========
------BEGIN CERTIFICATE-----
-MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw
-EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3
-MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI
-Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q
-XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH
-GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p
-ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg
-DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf
-Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ
-tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ
-BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J
-SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA
-hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+
-ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu
-PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
-1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
-WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
------END CERTIFICATE-----
-
-AC Ra\xC3\xADz Certic\xC3\xA1mara S.A.
-======================================
------BEGIN CERTIFICATE-----
-MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNVBAYT
-AkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRpZmljYWNpw7NuIERpZ2l0YWwg
-LSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwaQUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4w
-HhcNMDYxMTI3MjA0NjI5WhcNMzAwNDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+
-U29jaWVkYWQgQ2FtZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJh
-IFMuQS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeGqentLhM0R7LQcNzJPNCN
-yu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzLfDe3fezTf3MZsGqy2IiKLUV0qPezuMDU
-2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQY5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU3
-4ojC2I+GdV75LaeHM/J4Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP
-2yYe68yQ54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+bMMCm
-8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48jilSH5L887uvDdUhf
-HjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++EjYfDIJss2yKHzMI+ko6Kh3VOz3vCa
-Mh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/ztA/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK
-5lw1omdMEWux+IBkAC1vImHFrEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1b
-czwmPS9KvqfJpxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
-AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCBlTCBkgYEVR0g
-ADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFyYS5jb20vZHBjLzBaBggrBgEF
-BQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW507WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2Ug
-cHVlZGVuIGVuY29udHJhciBlbiBsYSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEf
-AygPU3zmpFmps4p6xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuX
-EpBcunvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/Jre7Ir5v
-/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dpezy4ydV/NgIlqmjCMRW3
-MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42gzmRkBDI8ck1fj+404HGIGQatlDCIaR4
-3NAvO2STdPCWkPHv+wlaNECW8DYSwaN0jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wk
-eZBWN7PGKX6jD/EpOe9+XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f
-/RWmnkJDW2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/RL5h
-RqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35rMDOhYil/SrnhLecU
-Iw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxkBYn8eNZcLCZDqQ==
------END CERTIFICATE-----
-
-TC TrustCenter Class 2 CA II
-============================
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy
-IENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYw
-MTEyMTQzODQzWhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1
-c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UE
-AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jftMjWQ+nEdVl//OEd+DFw
-IxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKguNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2
-xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2JXjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQ
-Xa7pIXSSTYtZgo+U4+lK8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7u
-SNQZu+995OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3kUrL84J6E1wIqzCB
-7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90
-Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU
-cnVzdENlbnRlciUyMENsYXNzJTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i
-SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iSGNn3Bzn1LL4G
-dXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprtZjluS5TmVfwLG4t3wVMTZonZ
-KNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8au0WOB9/WIFaGusyiC2y8zl3gK9etmF1Kdsj
-TYjKUCjLhdLTEKJZbtOTVAB6okaVhgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kP
-JOzHdiEoZa5X6AeIdUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfk
-vQ==
------END CERTIFICATE-----
-
-TC TrustCenter Class 3 CA II
-============================
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy
-IENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYw
-MTEyMTQ0MTU3WhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1
-c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UE
-AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJWHt4bNwcwIi9v8Qbxq63W
-yKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+QVl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo
-6SI7dYnWRBpl8huXJh0obazovVkdKyT21oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZ
-uV3bOx4a+9P/FRQI2AlqukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk
-2ZyqBwi1Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NXXAek0CSnwPIA1DCB
-7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90
-Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU
-cnVzdENlbnRlciUyMENsYXNzJTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i
-SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlNirTzwppVMXzE
-O2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8TtXqluJucsG7Kv5sbviRmEb8
-yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9
-IJqDnxrcOfHFcqMRA/07QlIp2+gB95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal
-092Y+tTmBvTwtiBjS+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc
-5A==
------END CERTIFICATE-----
-
-TC TrustCenter Universal CA I
-=============================
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy
-IFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcN
-MDYwMzIyMTU1NDI4WhcNMjUxMjMxMjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMg
-VHJ1c3RDZW50ZXIgR21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYw
-JAYDVQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSRJJZ4Hgmgm5qVSkr1YnwC
-qMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3TfCZdzHd55yx4Oagmcw6iXSVphU9VDprv
-xrlE4Vc93x9UIuVvZaozhDrzznq+VZeujRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtw
-ag+1m7Z3W0hZneTvWq3zwZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9O
-gdwZu5GQfezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYDVR0j
-BBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0GCSqGSIb3DQEBBQUAA4IBAQAo0uCG
-1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X17caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/Cy
-vwbZ71q+s2IhtNerNXxTPqYn8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3
-ghUJGooWMNjsydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT
-ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/2TYcuiUaUj0a
-7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY
------END CERTIFICATE-----
-
-Deutsche Telekom Root CA 2
-==========================
------BEGIN CERTIFICATE-----
-MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMT
-RGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEG
-A1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5
-MjM1OTAwWjBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0G
-A1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBS
-b290IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEUha88EOQ5
-bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhCQN/Po7qCWWqSG6wcmtoI
-KyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1MjwrrFDa1sPeg5TKqAyZMg4ISFZbavva4VhY
-AUlfckE8FQYBjl2tqriTtM2e66foai1SNNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aK
-Se5TBY8ZTNXeWHmb0mocQqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTV
-jlsB9WoHtxa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAPBgNV
-HRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAlGRZrTlk5ynr
-E/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756AbrsptJh6sTtU6zkXR34ajgv8HzFZMQSy
-zhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpaIzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8
-rZ7/gFnkm0W09juwzTkZmDLl6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4G
-dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
-Cm26OWMohpLzGITY+9HPBVZkVw==
------END CERTIFICATE-----
-
-ComSign CA
-==========
------BEGIN CERTIFICATE-----
-MIIDkzCCAnugAwIBAgIQFBOWgxRVjOp7Y+X8NId3RDANBgkqhkiG9w0BAQUFADA0MRMwEQYDVQQD
-EwpDb21TaWduIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQGEwJJTDAeFw0wNDAzMjQxMTMy
-MThaFw0yOTAzMTkxNTAyMThaMDQxEzARBgNVBAMTCkNvbVNpZ24gQ0ExEDAOBgNVBAoTB0NvbVNp
-Z24xCzAJBgNVBAYTAklMMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8ORUaSvTx49q
-ROR+WCf4C9DklBKK8Rs4OC8fMZwG1Cyn3gsqrhqg455qv588x26i+YtkbDqthVVRVKU4VbirgwTy
-P2Q298CNQ0NqZtH3FyrV7zb6MBBC11PN+fozc0yz6YQgitZBJzXkOPqUm7h65HkfM/sb2CEJKHxN
-GGleZIp6GZPKfuzzcuc3B1hZKKxC+cX/zT/npfo4sdAMx9lSGlPWgcxCejVb7Us6eva1jsz/D3zk
-YDaHL63woSV9/9JLEYhwVKZBqGdTUkJe5DSe5L6j7KpiXd3DTKaCQeQzC6zJMw9kglcq/QytNuEM
-rkvF7zuZ2SOzW120V+x0cAwqTwIDAQABo4GgMIGdMAwGA1UdEwQFMAMBAf8wPQYDVR0fBDYwNDAy
-oDCgLoYsaHR0cDovL2ZlZGlyLmNvbXNpZ24uY28uaWwvY3JsL0NvbVNpZ25DQS5jcmwwDgYDVR0P
-AQH/BAQDAgGGMB8GA1UdIwQYMBaAFEsBmz5WGmU2dst7l6qSBe4y5ygxMB0GA1UdDgQWBBRLAZs+
-VhplNnbLe5eqkgXuMucoMTANBgkqhkiG9w0BAQUFAAOCAQEA0Nmlfv4pYEWdfoPPbrxHbvUanlR2
-QnG0PFg/LUAlQvaBnPGJEMgOqnhPOAlXsDzACPw1jvFIUY0McXS6hMTXcpuEfDhOZAYnKuGntewI
-mbQKDdSFc8gS4TXt8QUxHXOZDOuWyt3T5oWq8Ir7dcHyCTxlZWTzTNity4hp8+SDtwy9F1qWF8pb
-/627HOkthIDYIb6FUtnUdLlphbpN7Sgy6/lhSuTENh4Z3G+EER+V9YMoGKgzkkMn3V0TBEVPh9VG
-zT2ouvDzuFYkRes3x+F2T3I5GN9+dHLHcy056mDmrRGiVod7w2ia/viMcKjfZTL0pECMocJEAw6U
-AGegcQCCSA==
------END CERTIFICATE-----
-
-ComSign Secured CA
-==================
------BEGIN CERTIFICATE-----
-MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAwPDEbMBkGA1UE
-AxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQGEwJJTDAeFw0w
-NDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwxGzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBD
-QTEQMA4GA1UEChMHQ29tU2lnbjELMAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDGtWhfHZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs
-49ohgHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sWv+bznkqH
-7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ueMv5WJDmyVIRD9YTC2LxB
-kMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d1
-9guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUw
-AwEB/zBEBgNVHR8EPTA7MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29t
-U2lnblNlY3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58ADsA
-j8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkqhkiG9w0BAQUFAAOC
-AQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7piL1DRYHjZiM/EoZNGeQFsOY3wo3a
-BijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtCdsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtp
-FhpFfTMDZflScZAmlaxMDPWLkz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP
-51qJThRv4zdLhfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz
-OjRXUDpvgV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw==
------END CERTIFICATE-----
-
-Cybertrust Global Root
-======================
------BEGIN CERTIFICATE-----
-MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
-ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
-MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
-ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-+Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
-0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
-AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
-89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
-8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
-MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
-A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
-lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
-5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
-hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
-X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
-WL1WMRJOEcgh4LMRkWXbtKaIOM5V
------END CERTIFICATE-----
-
-ePKI Root Certification Authority
-=================================
------BEGIN CERTIFICATE-----
-MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
-Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
-MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
-MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
-IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
-lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
-qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
-12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
-WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
-ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
-lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
-vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
-Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
-MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
-ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
-1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
-KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
-xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
-NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
-GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
-xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
-gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
-sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
-BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
------END CERTIFICATE-----
-
-T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3
-=============================================================================================================================
------BEGIN CERTIFICATE-----
-MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRSMRgwFgYDVQQH
-DA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJpbGltc2VsIHZlIFRla25vbG9q
-aWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSwVEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ry
-b25payB2ZSBLcmlwdG9sb2ppIEFyYcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNV
-BAsMGkthbXUgU2VydGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUg
-S8O2ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAeFw0wNzA4
-MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIxGDAWBgNVBAcMD0dlYnpl
-IC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmlsaW1zZWwgdmUgVGVrbm9sb2ppayBBcmHF
-n3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBUQUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZl
-IEtyaXB0b2xvamkgQXJhxZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2Ft
-dSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7ZrIFNl
-cnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4hgb46ezzb8R1Sf1n68yJMlaCQvEhO
-Eav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yKO7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1
-xnnRFDDtG1hba+818qEhTsXOfJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR
-6Oqeyjh1jmKwlZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
-hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQIDAQABo0IwQDAd
-BgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
-MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmPNOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4
-N5EY3ATIZJkrGG2AA1nJrvhY0D7twyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLT
-y9LQQfMmNkqblWwM7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYh
-LBOhgLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5noN+J1q2M
-dqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUsyZyQ2uypQjyttgI=
------END CERTIFICATE-----
-
-Buypass Class 2 CA 1
-====================
------BEGIN CERTIFICATE-----
-MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMiBDQSAxMB4XDTA2
-MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
-c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7M
-cXA0ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLXl18xoS83
-0r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVBHfCuuCkslFJgNJQ72uA4
-0Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/R
-uFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0P
-AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLPgcIV
-1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+DKhQ7SLHrQVMdvvt
-7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKuBctN518fV4bVIJwo+28TOPX2EZL2
-fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHsh7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5w
-wDX3OaJdZtB7WZ+oRxKaJyOkLY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
------END CERTIFICATE-----
-
-Buypass Class 3 CA 1
-====================
------BEGIN CERTIFICATE-----
-MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMyBDQSAxMB4XDTA1
-MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
-c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKx
-ifZgisRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//zNIqeKNc0
-n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI+MkcVyzwPX6UvCWThOia
-AJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2RhzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c
-1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0P
-AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFPBdy7
-pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27sEzNxZy5p+qksP2bA
-EllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2mSlf56oBzKwzqBwKu5HEA6BvtjT5
-htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yCe/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQj
-el/wroQk5PMr+4okoyeYZdowdXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
------END CERTIFICATE-----
-
-EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1
-==========================================================================
------BEGIN CERTIFICATE-----
-MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNVBAMML0VCRyBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMTcwNQYDVQQKDC5FQkcg
-QmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAe
-Fw0wNjA4MTcwMDIxMDlaFw0xNjA4MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25p
-ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2lt
-IFRla25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h4fuXd7hxlugTlkaDT7by
-X3JWbhNgpQGR4lvFzVcfd2NR/y8927k/qqk153nQ9dAktiHq6yOU/im/+4mRDGSaBUorzAzu8T2b
-gmmkTPiab+ci2hC6X5L8GCcKqKpE+i4stPtGmggDg3KriORqcsnlZR9uKg+ds+g75AxuetpX/dfr
-eYteIAbTdgtsApWjluTLdlHRKJ2hGvxEok3MenaoDT2/F08iiFD9rrbskFBKW5+VQarKD7JK/oCZ
-TqNGFav4c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s/OsNA/+mgxKb8amTD8UmTDGy
-Y5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z+kI2sSXFCjEmN1Zn
-uqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0OLna9XvNRiYuoP1Vzv9s6xiQFlpJI
-qkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMWOeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vm
-ExH8nYQKE3vwO9D8owrXieqWfo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0
-Nokb+Clsi7n2l9GkLqq+CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
-/wQEAwIBBjAdBgNVHQ4EFgQU587GT/wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgwFoAU587GT/wW
-Z5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2+8ygjdsZs93/mQJ7ANtyVDR2t
-FcU22NU57/IeIl6zgrRdu0waypIN30ckHrMk2pGI6YNw3ZPX6bqz3xZaPt7gyPvT/Wwp+BVGoGgm
-zJNSroIBk5DKd8pNSe/iWtkqvTDOTLKBtjDOWU/aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64k
-XPBfrAowzIpAoHMEwfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ/XvCgKqT
-bCmYIai7FvOpEl90tYeY8pUm3zTvilORiF0alKM/fCL414i6poyWqD1SNGKfAB5UVUJnxk1Gj7sU
-RT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq+u2lrDgv+R4QDgZxGhBM/nV+/x5XOULK
-1+EVoVZVWRvRo68R2E7DpSvvkL/A7IITW43WciyTTo9qKd+FPNMN4KIYEsxVL0e3p5sC/kH2iExt
-2qkBR4NkJ2IQgtYSe14DHzSpyZH+r11thie3I6p1GMog57AP14kOpmciY/SDQSsGS7tY1dHXt7kQ
-Y9iJSrSq3RZj9W6+YKH47ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK+lvm9
-AahH3eU7QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT
------END CERTIFICATE-----
-
-certSIGN ROOT CA
-================
------BEGIN CERTIFICATE-----
-MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
-VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
-Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
-CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
-JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
-rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
-ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
-0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
-AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
-Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
-AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
-SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
-x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
-vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
-TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
------END CERTIFICATE-----
-
-CNNIC ROOT
-==========
------BEGIN CERTIFICATE-----
-MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJDTjEOMAwGA1UE
-ChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2MDcwOTE0WhcNMjcwNDE2MDcw
-OTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1Qw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzD
-o+/hn7E7SIX1mlwhIhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tiz
-VHa6dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZOV/kbZKKT
-VrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrCGHn2emU1z5DrvTOTn1Or
-czvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gNv7Sg2Ca+I19zN38m5pIEo3/PIKe38zrK
-y5nLAgMBAAGjczBxMBEGCWCGSAGG+EIBAQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscC
-wQ7vptU7ETAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991S
-lgrHAsEO76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnKOOK5
-Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvHugDnuL8BV8F3RTIM
-O/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7HgviyJA/qIYM/PmLXoXLT1tLYhFHxUV8
-BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fLbuXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2
-G8kS1sHNzYDzAgE8yGnLRUhj2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5m
-mxE=
------END CERTIFICATE-----
-
-ApplicationCA - Japanese Government
-===================================
------BEGIN CERTIFICATE-----
-MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEcMBoGA1UEChMT
-SmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRpb25DQTAeFw0wNzEyMTIxNTAw
-MDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zl
-cm5tZW50MRYwFAYDVQQLEw1BcHBsaWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAp23gdE6Hj6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4
-fl+Kf5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55IrmTwcrN
-wVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cwFO5cjFW6WY2H/CPek9AE
-jP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDihtQWEjdnjDuGWk81quzMKq2edY3rZ+nYVu
-nyoKb58DKTCXKB28t89UKU5RMfkntigm/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRU
-WssmP3HMlEYNllPqa0jQk/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNV
-BAYTAkpQMRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOCseOD
-vOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADlqRHZ3ODrs
-o2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJhyzjVOGjprIIC8CFqMjSnHH2HZ9g
-/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYD
-io+nEhEMy/0/ecGc/WLuo89UDNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmW
-dupwX3kSa+SjB1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
-rosot4LKGAfmt1t06SAZf7IbiVQ=
------END CERTIFICATE-----
-
-GeoTrust Primary Certification Authority - G3
-=============================================
------BEGIN CERTIFICATE-----
-MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
-BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0
-IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz
-NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo
-YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT
-LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j
-K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE
-c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C
-IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu
-dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr
-2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9
-cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE
-Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
-AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s
-t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt
------END CERTIFICATE-----
-
-thawte Primary Root CA - G2
-===========================
------BEGIN CERTIFICATE-----
-MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC
-VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu
-IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg
-Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV
-MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG
-b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt
-IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS
-LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5
-8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
-mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN
-G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K
-rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
------END CERTIFICATE-----
-
-thawte Primary Root CA - G3
-===========================
------BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
-BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
-aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w
-ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
-d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD
-VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG
-A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At
-P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC
-+BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY
-7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW
-vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ
-KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK
-A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
-t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC
-8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm
-er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A=
------END CERTIFICATE-----
-
-GeoTrust Primary Certification Authority - G2
-=============================================
------BEGIN CERTIFICATE-----
-MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
-VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
-Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
-OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
-MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
-b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
-BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
-KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
-VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
-EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
-ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
-npaqBA+K
------END CERTIFICATE-----
-
-VeriSign Universal Root Certification Authority
-===============================================
------BEGIN CERTIFICATE-----
-MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
-BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
-ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
-IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
-1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
-MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
-9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
-AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
-tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
-CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
-a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
-DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
-Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
-Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
-P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
-wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
-mJO37M2CYfE45k+XmCpajQ==
------END CERTIFICATE-----
-
-VeriSign Class 3 Public Primary Certification Authority - G4
-============================================================
------BEGIN CERTIFICATE-----
-MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC
-VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3
-b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz
-ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU
-cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo
-b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8
-Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz
-rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB
-/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw
-HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u
-Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD
-A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx
-AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
------END CERTIFICATE-----
-
-NetLock Arany (Class Gold) Főtanúsítvány
-============================================
------BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
-A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
-dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
-cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
-MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
-ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
-biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
-c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
-0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
-/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
-H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
-fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
-neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
-BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
-qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
-YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
-bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
-NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
-dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
------END CERTIFICATE-----
-
-Staat der Nederlanden Root CA - G2
-==================================
------BEGIN CERTIFICATE-----
-MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
-CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-Um9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oXDTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMC
-TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
-ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ
-5291qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8SpuOUfiUtn
-vWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPUZ5uW6M7XxgpT0GtJlvOj
-CwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvEpMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiil
-e7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCR
-OME4HYYEhLoaJXhena/MUGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpI
-CT0ugpTNGmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy5V65
-48r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv6q012iDTiIJh8BIi
-trzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEKeN5KzlW/HdXZt1bv8Hb/C3m1r737
-qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMB
-AAGjgZcwgZQwDwYDVR0TAQH/BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcC
-ARYxaHR0cDovL3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqGSIb3DQEBCwUA
-A4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLySCZa59sCrI2AGeYwRTlHSeYAz
-+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwj
-f/ST7ZwaUb7dRUG/kSS0H4zpX897IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaN
-kqbG9AclVMwWVxJKgnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfk
-CpYL+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxLvJxxcypF
-URmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkmbEgeqmiSBeGCc1qb3Adb
-CG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvkN1trSt8sV4pAWja63XVECDdCcAz+3F4h
-oKOKwJCcaNpQ5kUQR3i2TtJlycM33+FCY7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoV
-IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm
-66+KAQ==
------END CERTIFICATE-----
-
-CA Disig
-========
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMK
-QnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwHhcNMDYw
-MzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlz
-bGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgm
-GErENx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnXmjxUizkD
-Pw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYDXcDtab86wYqg6I7ZuUUo
-hwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhWS8+2rT+MitcE5eN4TPWGqvWP+j1scaMt
-ymfraHtuM6kMgiioTGohQBUgDCZbg8KpFhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8w
-gfwwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0P
-AQH/BAQDAgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cuZGlz
-aWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5zay9jYS9jcmwvY2Ff
-ZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2svY2EvY3JsL2NhX2Rpc2lnLmNybDAa
-BgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEwDQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59t
-WDYcPQuBDRIrRhCA/ec8J9B6yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3
-mkkp7M5+cTxqEEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
-CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeBEicTXxChds6K
-ezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFNPGO+I++MzVpQuGhU+QqZMxEA
-4Z7CRneC9VkGjCFMhwnN5ag=
------END CERTIFICATE-----
-
-Juur-SK
-=======
------BEGIN CERTIFICATE-----
-MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lA
-c2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAw
-DgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMwMVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqG
-SIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVy
-aW1pc2tlc2t1czEQMA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOBSvZiF3tf
-TQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkzABpTpyHhOEvWgxutr2TC
-+Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvHLCu3GFH+4Hv2qEivbDtPL+/40UceJlfw
-UR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMPPbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDa
-Tpxt4brNj3pssAki14sL2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQF
-MAMBAf8wggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwICMIHD
-HoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDkAGwAagBhAHMAdABh
-AHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0AHMAZQBlAHIAaQBtAGkAcwBrAGUA
-cwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABzAGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABr
-AGkAbgBuAGkAdABhAG0AaQBzAGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nw
-cy8wKwYDVR0fBCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
-FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcYP2/v6X2+MA4G
-A1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOiCfP+JmeaUOTDBS8rNXiRTHyo
-ERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+gkcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyL
-abVAyJRld/JXIWY7zoVAtjNjGr95HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678
-IIbsSt4beDI3poHSna9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkh
-Mp6qqIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0ZTbvGRNs2
-yyqcjg==
------END CERTIFICATE-----
-
-Hongkong Post Root CA 1
-=======================
------BEGIN CERTIFICATE-----
-MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
-DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
-NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
-IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
-ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
-auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
-qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
-V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
-HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
-h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
-l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
-IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
-T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
-c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
------END CERTIFICATE-----
-
-SecureSign RootCA11
-===================
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
-SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
-b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
-KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
-cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
-TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
-wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
-g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
-O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
-bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
-t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
-OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
-bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
-Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
-y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
-lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
------END CERTIFICATE-----
-
-ACEDICOM Root
-=============
------BEGIN CERTIFICATE-----
-MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UEAwwNQUNFRElD
-T00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMB4XDTA4
-MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEWMBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoG
-A1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEF
-AAOCAg8AMIICCgKCAgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHk
-WLn709gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7XBZXehuD
-YAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5PGrjm6gSSrj0RuVFCPYew
-MYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAKt0SdE3QrwqXrIhWYENiLxQSfHY9g5QYb
-m8+5eaA9oiM/Qj9r+hwDezCNzmzAv+YbX79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbk
-HQl/Sog4P75n/TSW9R28MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTT
-xKJxqvQUfecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI2Sf2
-3EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyHK9caUPgn6C9D4zq9
-2Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEaeZAwUswdbxcJzbPEHXEUkFDWug/Fq
-TYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz
-4SsrSbbXc6GqlPUB53NlTKxQMA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU
-9QHnc2VMrFAwRAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv
-bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWImfQwng4/F9tqg
-aHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3gvoFNTPhNahXwOf9jU8/kzJP
-eGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKeI6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1Pwk
-zQSulgUV1qzOMPPKC8W64iLgpq0i5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1
-ThCojz2GuHURwCRiipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oI
-KiMnMCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZo5NjEFIq
-nxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6zqylfDJKZ0DcMDQj3dcE
-I2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacNGHk0vFQYXlPKNFHtRQrmjseCNj6nOGOp
-MCwXEGCSn1WHElkQwg9naRHMTh5+Spqtr0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3o
-tkYNbn5XOmeUwssfnHdKZ05phkOTOPu220+DkdRgfks+KzgHVZhepA==
------END CERTIFICATE-----
-
-Verisign Class 1 Public Primary Certification Authority
-=======================================================
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCED9pHoGc8JpK83P/uUii5N0wDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCVVMx
-FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAxIFB1YmxpYyBQcmltYXJ5
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVow
-XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAx
-IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDlGb9to1ZhLZlIcfZn3rmN67eehoAKkQ76OCWvRoiC5XOooJskXQ0fzGVuDLDQ
-VoQYh5oGmxChc9+0WDlrbsH2FdWoqD+qEgaNMax/sDTXjzRniAnNFBHiTkVWaR94AoDa3EeRKbs2
-yWNcxeDXLYd7obcysHswuiovMaruo2fa2wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFgVKTk8d6Pa
-XCUDfGD67gmZPCcQcMgMCeazh88K4hiWNWLMv5sneYlfycQJ9M61Hd8qveXbhpxoJeUwfLaJFf5n
-0a3hUKw8fGJLj7qE1xIVGx/KXQ/BUpQqEZnae88MNhPVNdwQGVnqlMEAv3WP2fr9dgTbYruQagPZ
-RjXZ+Hxb
------END CERTIFICATE-----
-
-Verisign Class 3 Public Primary Certification Authority
-=======================================================
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkGA1UEBhMCVVMx
-FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmltYXJ5
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVow
-XzELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAz
-IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhEBarsAx94
-f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/isI19wKTakyYbnsZogy1Ol
-hec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBABByUqkFFBky
-CEHwxWsKzH4PIRnN5GfcX6kb5sroc50i2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWX
-bj9T/UWZYB2oK0z5XqcJ2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/
-D/xwzoiQ
------END CERTIFICATE-----
-
-Microsec e-Szigno Root CA 2009
-==============================
------BEGIN CERTIFICATE-----
-MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
-MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
-c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
-dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
-BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
-U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
-fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
-0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
-pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
-1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
-AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
-QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
-FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
-lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
-I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
-tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
-yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
-LXpUq3DDfSJlgnCW
------END CERTIFICATE-----
-
-E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi
-===================================================
------BEGIN CERTIFICATE-----
-MIIDtjCCAp6gAwIBAgIQRJmNPMADJ72cdpW56tustTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
-EwJUUjEoMCYGA1UEChMfRWxla3Ryb25payBCaWxnaSBHdXZlbmxpZ2kgQS5TLjE8MDoGA1UEAxMz
-ZS1HdXZlbiBLb2sgRWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhZ2xheWljaXNpMB4XDTA3
-MDEwNDExMzI0OFoXDTE3MDEwNDExMzI0OFowdTELMAkGA1UEBhMCVFIxKDAmBgNVBAoTH0VsZWt0
-cm9uaWsgQmlsZ2kgR3V2ZW5saWdpIEEuUy4xPDA6BgNVBAMTM2UtR3V2ZW4gS29rIEVsZWt0cm9u
-aWsgU2VydGlmaWthIEhpem1ldCBTYWdsYXlpY2lzaTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMMSIJ6wXgBljU5Gu4Bc6SwGl9XzcslwuedLZYDBS75+PNdUMZTe1RK6UxYC6lhj71vY
-8+0qGqpxSKPcEC1fX+tcS5yWCEIlKBHMilpiAVDV6wlTL/jDj/6z/P2douNffb7tC+Bg62nsM+3Y
-jfsSSYMAyYuXjDtzKjKzEve5TfL0TW3H5tYmNwjy2f1rXKPlSFxYvEK+A1qBuhw1DADT9SN+cTAI
-JjjcJRFHLfO6IxClv7wC90Nex/6wN1CZew+TzuZDLMN+DfIcQ2Zgy2ExR4ejT669VmxMvLz4Bcpk
-9Ok0oSy1c+HCPujIyTQlCFzz7abHlJ+tiEMl1+E5YP6sOVkCAwEAAaNCMEAwDgYDVR0PAQH/BAQD
-AgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ/uRLOU1fqRTy7ZVZoEVtstxNulMA0GCSqG
-SIb3DQEBBQUAA4IBAQB/X7lTW2M9dTLn+sR0GstG30ZpHFLPqk/CaOv/gKlR6D1id4k9CnU58W5d
-F4dvaAXBlGzZXd/aslnLpRCKysw5zZ/rTt5S/wzw9JKp8mxTq5vSR6AfdPebmvEvFZ96ZDAYBzwq
-D2fK/A+JYZ1lpTzlvBNbCNvj/+27BrtqBrF6T2XGgv0enIu1De5Iu7i9qgi0+6N8y5/NkHZchpZ4
-Vwpm+Vganf2XKWDeEaaQHBkc7gGWIjQ0LpH5t8Qn0Xvmv/uARFoW5evg1Ao4vOSR49XrXMGs3xtq
-fJ7lddK2l4fbzIcrQzqECK+rPNv3PGYxhrCdU3nt+CPeQuMtgvEP5fqX
------END CERTIFICATE-----
-
-GlobalSign Root CA - R3
-=======================
------BEGIN CERTIFICATE-----
-MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
-YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
-bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
-aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
-bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
-iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
-0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
-rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
-OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
-xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
-FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
-lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
-EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
-bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
-YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
-kpeDMdmztcpHWD9f
------END CERTIFICATE-----
-
-TC TrustCenter Universal CA III
-===============================
------BEGIN CERTIFICATE-----
-MIID4TCCAsmgAwIBAgIOYyUAAQACFI0zFQLkbPQwDQYJKoZIhvcNAQEFBQAwezELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy
-IFVuaXZlcnNhbCBDQTEoMCYGA1UEAxMfVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIElJSTAe
-Fw0wOTA5MDkwODE1MjdaFw0yOTEyMzEyMzU5NTlaMHsxCzAJBgNVBAYTAkRFMRwwGgYDVQQKExNU
-QyBUcnVzdENlbnRlciBHbWJIMSQwIgYDVQQLExtUQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0Ex
-KDAmBgNVBAMTH1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQSBJSUkwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDC2pxisLlxErALyBpXsq6DFJmzNEubkKLF5+cvAqBNLaT6hdqbJYUt
-QCggbergvbFIgyIpRJ9Og+41URNzdNW88jBmlFPAQDYvDIRlzg9uwliT6CwLOunBjvvya8o84pxO
-juT5fdMnnxvVZ3iHLX8LR7PH6MlIfK8vzArZQe+f/prhsq75U7Xl6UafYOPfjdN/+5Z+s7Vy+Eut
-CHnNaYlAJ/Uqwa1D7KRTyGG299J5KmcYdkhtWyUB0SbFt1dpIxVbYYqt8Bst2a9c8SaQaanVDED1
-M4BDj5yjdipFtK+/fz6HP3bFzSreIMUWWMv5G/UPyw0RUmS40nZid4PxWJ//AgMBAAGjYzBhMB8G
-A1UdIwQYMBaAFFbn4VslQ4Dg9ozhcbyO5YAvxEjiMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
-BAQDAgEGMB0GA1UdDgQWBBRW5+FbJUOA4PaM4XG8juWAL8RI4jANBgkqhkiG9w0BAQUFAAOCAQEA
-g8ev6n9NCjw5sWi+e22JLumzCecYV42FmhfzdkJQEw/HkG8zrcVJYCtsSVgZ1OK+t7+rSbyUyKu+
-KGwWaODIl0YgoGhnYIg5IFHYaAERzqf2EQf27OysGh+yZm5WZ2B6dF7AbZc2rrUNXWZzwCUyRdhK
-BgePxLcHsU0GDeGl6/R1yrqc0L2z0zIkTO5+4nYES0lT2PLpVDP85XEfPRRclkvxOvIAu2y0+pZV
-CIgJwcyRGSmwIC3/yzikQOEXvnlhgP8HA4ZMTnsGnxGGjYnuJ8Tb4rwZjgvDwxPHLQNjO9Po5KIq
-woIIlBZU8O8fJ5AluA0OKBtHd0e9HKgl8ZS0Zg==
------END CERTIFICATE-----
-
-Autoridad de Certificacion Firmaprofesional CIF A62634068
-=========================================================
------BEGIN CERTIFICATE-----
-MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA
-BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
-MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw
-QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
-NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
-Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
-B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
-7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
-ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
-plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
-MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
-LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
-bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
-vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud
-EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH
-DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
-cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA
-bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx
-ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx
-51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk
-R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP
-T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f
-Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl
-osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR
-crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR
-saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD
-KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi
-6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
------END CERTIFICATE-----
-
-Izenpe.com
-==========
------BEGIN CERTIFICATE-----
-MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4MQswCQYDVQQG
-EwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wHhcNMDcxMjEz
-MTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMu
-QS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ
-03rKDx6sp4boFmVqscIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAK
-ClaOxdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6HLmYRY2xU
-+zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFXuaOKmMPsOzTFlUFpfnXC
-PCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQDyCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxT
-OTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbK
-F7jJeodWLBoBHmy+E60QrLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK
-0GqfvEyNBjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8Lhij+
-0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIBQFqNeb+Lz0vPqhbB
-leStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+HMh3/1uaD7euBUbl8agW7EekFwID
-AQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2luZm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+
-SVpFTlBFIFMuQS4gLSBDSUYgQTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBG
-NjIgUzgxQzBBBgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
-MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
-BBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUAA4ICAQB4pgwWSp9MiDrAyw6l
-Fn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWblaQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbga
-kEyrkgPH7UIBzg/YsfqikuFgba56awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8q
-hT/AQKM6WfxZSzwoJNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Cs
-g1lwLDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCTVyvehQP5
-aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGkLhObNA5me0mrZJfQRsN5
-nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJbUjWumDqtujWTI6cfSN01RpiyEGjkpTHC
-ClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZo
-Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z
-WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
------END CERTIFICATE-----
-
-Chambers of Commerce Root - 2008
-================================
------BEGIN CERTIFICATE-----
-MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
-MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
-bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
-QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
-Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
-ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
-EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
-cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
-AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
-XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
-h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
-ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
-NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
-D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
-lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
-0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
-ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
-EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
-G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
-BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
-bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
-bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
-CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
-AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
-wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
-3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
-RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
-M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
-YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
-9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
-zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
-nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
-OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
------END CERTIFICATE-----
-
-Global Chambersign Root - 2008
-==============================
------BEGIN CERTIFICATE-----
-MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
-MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
-bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
-QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
-NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
-Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
-QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
-aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
-VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
-XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
-ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
-/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
-TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
-H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
-Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
-HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
-wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
-AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
-BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
-BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
-aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
-aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
-1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
-dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
-/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
-ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
-dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
-9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
-foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
-qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
-P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
-c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
-09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
------END CERTIFICATE-----
-
-Go Daddy Root Certificate Authority - G2
-========================================
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
-MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
-MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
-b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
-A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
-9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
-+qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
-fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
-NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
-BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
-vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
-5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
-N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
-LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
------END CERTIFICATE-----
-
-Starfield Root Certificate Authority - G2
-=========================================
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
-b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
-eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
-DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
-VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
-dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
-W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
-bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
-N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
-ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
-JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
-TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
-4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
-F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
-pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
-c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
------END CERTIFICATE-----
-
-Starfield Services Root Certificate Authority - G2
-==================================================
------BEGIN CERTIFICATE-----
-MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
-b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
-IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
-BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
-dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
-Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
-h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
-hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
-LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
-rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
-AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
-SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
-E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
-xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
-iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
-YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
------END CERTIFICATE-----
-
-AffirmTrust Commercial
-======================
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw
-MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
-bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb
-DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV
-C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6
-BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww
-MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV
-HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG
-hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi
-qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv
-0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh
-sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
------END CERTIFICATE-----
-
-AffirmTrust Networking
-======================
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw
-MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
-bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE
-Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI
-dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24
-/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb
-h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV
-HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu
-UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6
-12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23
-WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9
-/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
------END CERTIFICATE-----
-
-AffirmTrust Premium
-===================
------BEGIN CERTIFICATE-----
-MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy
-OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy
-dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn
-BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV
-5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs
-+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd
-GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R
-p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI
-S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04
-6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5
-/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo
-+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv
-MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
-Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC
-6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S
-L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK
-+4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV
-BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg
-IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60
-g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb
-zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw==
------END CERTIFICATE-----
-
-AffirmTrust Premium ECC
-=======================
------BEGIN CERTIFICATE-----
-MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV
-BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx
-MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U
-cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA
-IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ
-N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW
-BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK
-BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X
-57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM
-eQ==
------END CERTIFICATE-----
-
-Certum Trusted Network CA
-=========================
------BEGIN CERTIFICATE-----
-MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
-ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
-MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
-ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
-l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
-J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
-fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
-cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
-Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
-DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
-jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
-mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
-Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
-03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
------END CERTIFICATE-----
-
-Certinomis - Autorité Racine
-=============================
------BEGIN CERTIFICATE-----
-MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
-Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAkBgNVBAMMHUNlcnRpbm9taXMg
-LSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkG
-A1UEBhMCRlIxEzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYw
-JAYDVQQDDB1DZXJ0aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jYF1AMnmHa
-wE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N8y4oH3DfVS9O7cdxbwly
-Lu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWerP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw
-2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92N
-jMD2AR5vpTESOH2VwnHu7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9q
-c1pkIuVC28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6lSTC
-lrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1Enn1So2+WLhl+HPNb
-xxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB0iSVL1N6aaLwD4ZFjliCK0wi1F6g
-530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql095gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna
-4NH4+ej9Uji29YnfAgMBAAGjWzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
-A1UdDgQWBBQNjLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
-KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9sov3/4gbIOZ/x
-WqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZMOH8oMDX/nyNTt7buFHAAQCva
-R6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40
-nJ+U8/aGH88bc62UeYdocMMzpXDn2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1B
-CxMjidPJC+iKunqjo3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjv
-JL1vnxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG5ERQL1TE
-qkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWqpdEdnV1j6CTmNhTih60b
-WfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZbdsLLO7XSAPCjDuGtbkD326C00EauFddE
-wk01+dIL8hf2rGbVJLJP0RyZwG71fet0BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/
-vgt2Fl43N+bYdJeimUV5
------END CERTIFICATE-----
-
-Root CA Generalitat Valenciana
-==============================
------BEGIN CERTIFICATE-----
-MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJFUzEfMB0GA1UE
-ChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290
-IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcNMDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3
-WjBoMQswCQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UE
-CxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+WmmmO3I2
-F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKjSgbwJ/BXufjpTjJ3Cj9B
-ZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGlu6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQ
-D0EbtFpKd71ng+CT516nDOeB0/RSrFOyA8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXte
-JajCq+TA81yc477OMUxkHl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMB
-AAGjggM7MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBraS5n
-dmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIICIwYKKwYBBAG/VQIB
-ADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBl
-AHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIAYQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIA
-YQBsAGkAdABhAHQAIABWAGEAbABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQBy
-AGEAYwBpAPMAbgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA
-aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMAaQBvAG4AYQBt
-AGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQAZQAgAEEAdQB0AG8AcgBpAGQA
-YQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBu
-AHQAcgBhACAAZQBuACAAbABhACAAZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAA
-OgAvAC8AdwB3AHcALgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0
-dHA6Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+yeAT8MIGV
-BgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQswCQYDVQQGEwJFUzEfMB0G
-A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5S
-b290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRh
-TvW1yEICKrNcda3FbcrnlD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdz
-Ckj+IHLtb8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg9J63
-NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XFducTZnV+ZfsBn5OH
-iJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmCIoaZM3Fa6hlXPZHNqcCjbgcTpsnt
-+GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
------END CERTIFICATE-----
-
-A-Trust-nQual-03
-================
------BEGIN CERTIFICATE-----
-MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJBVDFIMEYGA1UE
-Cgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBlbGVrdHIuIERhdGVudmVy
-a2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5RdWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5R
-dWFsLTAzMB4XDTA1MDgxNzIyMDAwMFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJBgNVBAYTAkFUMUgw
-RgYDVQQKDD9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0
-ZW52ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMMEEEtVHJ1
-c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtPWFuA/OQO8BBC4SA
-zewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUjlUC5B3ilJfYKvUWG6Nm9wASOhURh73+n
-yfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZznF/QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPE
-SU7l0+m0iKsMrmKS1GWH2WrX9IWf5DMiJaXlyDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4
-iHQF63n1k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs2e3V
-cuy+VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0OBAoECERqlWdV
-eRFPMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAVdRU0VlIXLOThaq/Yy/kgM40
-ozRiPvbY7meIMQQDbwvUB/tOdQ/TLtPAF8fGKOwGDREkDg6lXb+MshOWcdzUzg4NCmgybLlBMRmr
-sQd7TZjTXLDR8KdCoLXEjq/+8T/0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR/TeIGgUUw3tKZd
-JXDRZslo+S4RFGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9+GS
-mYHovjrHF1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD/GMBWsm2vLV7eJUYs66MmEDNuxUCAKGkq6
-ahq97BvIxYSazQ==
------END CERTIFICATE-----
-
-TWCA Root Certification Authority
-=================================
------BEGIN CERTIFICATE-----
-MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
-VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
-EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
-IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
-QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
-oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
-4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
-y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
-BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
-9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
-mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
-QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
-T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
-Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
------END CERTIFICATE-----
-
-Security Communication RootCA2
-==============================
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
-U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
-dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
-SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
-aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
-+T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
-3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
-spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
-EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
-QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
-CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
-u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
-3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
-tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
-mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
------END CERTIFICATE-----
-
-EC-ACC
-======
------BEGIN CERTIFICATE-----
-MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
-BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
-ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
-VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
-CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
-BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
-MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
-SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
-Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
-cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
-w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
-ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
-HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
-E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
-0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
-VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
-Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
-dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
-lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
-Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
-l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
-E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
-5EI=
------END CERTIFICATE-----
-
-Hellenic Academic and Research Institutions RootCA 2011
-=======================================================
------BEGIN CERTIFICATE-----
-MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1IxRDBCBgNVBAoT
-O0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9y
-aXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
-IFJvb3RDQSAyMDExMB4XDTExMTIwNjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYT
-AkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
-IENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNo
-IEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPzdYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI
-1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJfel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa
-71HFK9+WXesyHgLacEnsbgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u
-8yBRQlqD75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSPFEDH
-3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTADAQH/
-MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp5dgTBCPuQSUwRwYDVR0eBEAwPqA8
-MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQub3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQu
-b3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVt
-XdMiKahsog2p6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
-TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7dIsXRSZMFpGD
-/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8AcysNnq/onN694/BtZqhFLKPM58N
-7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXIl7WdmplNsDz4SgCbZN2fOUvRJ9e4
------END CERTIFICATE-----
-
-Actalis Authentication Root CA
-==============================
------BEGIN CERTIFICATE-----
-MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UEBhMCSVQxDjAM
-BgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UE
-AwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDky
-MjExMjIwMlowazELMAkGA1UEBhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlz
-IFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
-IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNvUTufClrJ
-wkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX4ay8IMKx4INRimlNAJZa
-by/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9KK3giq0itFZljoZUj5NDKd45RnijMCO6
-zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1f
-YVEiVRvjRuPjPdA1YprbrxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2
-oxgkg4YQ51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2Fbe8l
-EfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxeKF+w6D9Fz8+vm2/7
-hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4Fv6MGn8i1zeQf1xcGDXqVdFUNaBr8
-EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbnfpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5
-jF66CyCU3nuDuP/jVo23Eek7jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLY
-iDrIn3hm7YnzezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
-ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQALe3KHwGCmSUyI
-WOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70jsNjLiNmsGe+b7bAEzlgqqI0
-JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDzWochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKx
-K3JCaKygvU5a2hi/a5iB0P2avl4VSM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+
-Xlff1ANATIGk0k9jpwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC
-4yyXX04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+OkfcvHlXHo
-2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7RK4X9p2jIugErsWx0Hbhz
-lefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btUZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXem
-OR/qnuOf0GZvBeyqdn6/axag67XH/JJULysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9
-vwGYT7JZVEc+NHt4bVaTLnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
------END CERTIFICATE-----
-
-Trustis FPS Root CA
-===================
------BEGIN CERTIFICATE-----
-MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQG
-EwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQLExNUcnVzdGlzIEZQUyBSb290
-IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTExMzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNV
-BAoTD1RydXN0aXMgTGltaXRlZDEcMBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQ
-RUN+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihHiTHcDnlk
-H5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjjvSkCqPoc4Vu5g6hBSLwa
-cY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zt
-o3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlBOrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEA
-AaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAd
-BgNVHQ4EFgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01GX2c
-GE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmWzaD+vkAMXBJV+JOC
-yinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP41BIy+Q7DsdwyhEQsb8tGD+pmQQ9P
-8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZEf1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHV
-l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl
-iB6XzCGcKQENZetX2fNXlrtIzYE=
------END CERTIFICATE-----
-
-StartCom Certification Authority
-================================
------BEGIN CERTIFICATE-----
-MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
-U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu
-ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0
-NjM3WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk
-LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg
-U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y
-o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/
-Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d
-eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt
-2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z
-6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ
-osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/
-untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc
-UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT
-37uMdBNSSwIDAQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
-VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFulF2mHMMo0aEPQ
-Qa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCCATgwLgYIKwYBBQUHAgEWImh0
-dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cu
-c3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENv
-bW1lcmNpYWwgKFN0YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0
-aGUgc2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0aWZpY2F0
-aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuc3RhcnRzc2wuY29t
-L3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBG
-cmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5
-fPGFf59Jb2vKXfuM/gTFwWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWm
-N3PH/UvSTa0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst0OcN
-Org+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNcpRJvkrKTlMeIFw6T
-tn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKlCcWw0bdT82AUuoVpaiF8H3VhFyAX
-e2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVFP0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA
-2MFrLH9ZXF2RsXAiV+uKa0hK1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBs
-HvUwyKMQ5bLmKhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE
-JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ8dCAWZvLMdib
-D4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnmfyWl8kgAwKQB2j8=
------END CERTIFICATE-----
-
-StartCom Certification Authority G2
-===================================
------BEGIN CERTIFICATE-----
-MIIFYzCCA0ugAwIBAgIBOzANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
-U3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
-RzIwHhcNMTAwMTAxMDEwMDAxWhcNMzkxMjMxMjM1OTAxWjBTMQswCQYDVQQGEwJJTDEWMBQGA1UE
-ChMNU3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkgRzIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2iTZbB7cgNr2Cu+EWIAOVeq8O
-o1XJJZlKxdBWQYeQTSFgpBSHO839sj60ZwNq7eEPS8CRhXBF4EKe3ikj1AENoBB5uNsDvfOpL9HG
-4A/LnooUCri99lZi8cVytjIl2bLzvWXFDSxu1ZJvGIsAQRSCb0AgJnooD/Uefyf3lLE3PbfHkffi
-Aez9lInhzG7TNtYKGXmu1zSCZf98Qru23QumNK9LYP5/Q0kGi4xDuFby2X8hQxfqp0iVAXV16iul
-Q5XqFYSdCI0mblWbq9zSOdIxHWDirMxWRST1HFSr7obdljKF+ExP6JV2tgXdNiNnvP8V4so75qbs
-O+wmETRIjfaAKxojAuuKHDp2KntWFhxyKrOq42ClAJ8Em+JvHhRYW6Vsi1g8w7pOOlz34ZYrPu8H
-vKTlXcxNnw3h3Kq74W4a7I/htkxNeXJdFzULHdfBR9qWJODQcqhaX2YtENwvKhOuJv4KHBnM0D4L
-nMgJLvlblnpHnOl68wVQdJVznjAJ85eCXuaPOQgeWeU1FEIT/wCc976qUM/iUUjXuG+v+E5+M5iS
-FGI6dWPPe/regjupuznixL0sAA7IF6wT700ljtizkC+p2il9Ha90OrInwMEePnWjFqmveiJdnxMa
-z6eg6+OGCtP95paV1yPIN93EfKo2rJgaErHgTuixO/XWb/Ew1wIDAQABo0IwQDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUS8W0QGutHLOlHGVuRjaJhwUMDrYwDQYJ
-KoZIhvcNAQELBQADggIBAHNXPyzVlTJ+N9uWkusZXn5T50HsEbZH77Xe7XRcxfGOSeD8bpkTzZ+K
-2s06Ctg6Wgk/XzTQLwPSZh0avZyQN8gMjgdalEVGKua+etqhqaRpEpKwfTbURIfXUfEpY9Z1zRbk
-J4kd+MIySP3bmdCPX1R0zKxnNBFi2QwKN4fRoxdIjtIXHfbX/dtl6/2o1PXWT6RbdejF0mCy2wl+
-JYt7ulKSnj7oxXehPOBKc2thz4bcQ///If4jXSRK9dNtD2IEBVeC2m6kMyV5Sy5UGYvMLD0w6dEG
-/+gyRr61M3Z3qAFdlsHB1b6uJcDJHgoJIIihDsnzb02CVAAgp9KP5DlUFy6NHrgbuxu9mk47EDTc
-nIhT76IxW1hPkWLIwpqazRVdOKnWvvgTtZ8SafJQYqz7Fzf07rh1Z2AQ+4NQ+US1dZxAF7L+/Xld
-blhYXzD8AK6vM8EOTmy6p6ahfzLbOOCxchcKK5HsamMm7YnUeMx0HgX4a/6ManY5Ka5lIxKVCCIc
-l85bBu4M4ru8H0ST9tg4RQUh7eStqxK2A6RCLi3ECToDZ2mEmuFZkIoohdVddLHRDiBYmxOlsGOm
-7XtH/UVVMKTumtTm4ofvmMkyghEpIrwACjFeLQ/Ajulrso8uBtjRkcfGEvRM/TAXw8HaOFvjqerm
-obp573PYtlNXLfbQ4ddI
------END CERTIFICATE-----
-
-Buypass Class 2 Root CA
-=======================
------BEGIN CERTIFICATE-----
-MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMiBSb290IENBMB4X
-DTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1owTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
-eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1
-g1Lr6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPVL4O2fuPn
-9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC911K2GScuVr1QGbNgGE41b
-/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHxMlAQTn/0hpPshNOOvEu/XAFOBz3cFIqU
-CqTqc/sLUegTBxj6DvEr0VQVfTzh97QZQmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeff
-awrbD02TTqigzXsu8lkBarcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgI
-zRFo1clrUs3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLiFRhn
-Bkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRSP/TizPJhk9H9Z2vX
-Uq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN9SG9dKpN6nIDSdvHXx1iY8f93ZHs
-M+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxPAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
-VR0OBBYEFMmAd+BikoL1RpzzuvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
-AAOCAgEAU18h9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
-A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3tOluwlN5E40EI
-osHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo+fsicdl9sz1Gv7SEr5AcD48S
-aq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYd
-DnkM/crqJIByw5c/8nerQyIKx+u2DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWD
-LfJ6v9r9jv6ly0UsH8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0
-oyLQI+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK75t98biGC
-wWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h3PFaTWwyI0PurKju7koS
-CTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPzY11aWOIv4x3kqdbQCtCev9eBCfHJxyYN
-rJgWVqA=
------END CERTIFICATE-----
-
-Buypass Class 3 Root CA
-=======================
------BEGIN CERTIFICATE-----
-MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMyBSb290IENBMB4X
-DTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFowTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
-eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRH
-sJ8YZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3EN3coTRiR
-5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9tznDDgFHmV0ST9tD+leh
-7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX0DJq1l1sDPGzbjniazEuOQAnFN44wOwZ
-ZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH
-2xc519woe2v1n/MuwU8XKhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV
-/afmiSTYzIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvSO1UQ
-RwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D34xFMFbG02SrZvPA
-Xpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgPK9Dx2hzLabjKSWJtyNBjYt1gD1iq
-j6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
-VR0OBBYEFEe4zf/lb+74suwvTg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
-AAOCAgEAACAjQTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
-cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXSIGrs/CIBKM+G
-uIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2HJLw5QY33KbmkJs4j1xrG0aG
-Q0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsaO5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8
-ZORK15FTAaggiG6cX0S5y2CBNOxv033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2
-KSb12tjE8nVhz36udmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz
-6MkEkbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg413OEMXbug
-UZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvDu79leNKGef9JOxqDDPDe
-eOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq4/g7u9xN12TyUb7mqqta6THuBrxzvxNi
-Cp/HuZc=
------END CERTIFICATE-----
-
-T-TeleSec GlobalRoot Class 3
-============================
------BEGIN CERTIFICATE-----
-MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
-IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
-cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgx
-MDAxMTAyOTU2WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
-dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
-ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN8ELg63iIVl6bmlQdTQyK
-9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/RLyTPWGrTs0NvvAgJ1gORH8EGoel15YU
-NpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZF
-iP0Zf3WHHx+xGwpzJFu5ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W
-0eDrXltMEnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGjQjBA
-MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1A/d2O2GCahKqGFPr
-AyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOyWL6ukK2YJ5f+AbGwUgC4TeQbIXQb
-fsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzT
-ucpH9sry9uetuUg/vBa3wW306gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7h
-P0HHRwA11fXT91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
-e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4pTpPDpFQUWw==
------END CERTIFICATE-----
-
-EE Certification Centre Root CA
-===============================
------BEGIN CERTIFICATE-----
-MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
-EwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2Vy
-dGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIw
-MTAxMDMwMTAxMDMwWhgPMjAzMDEyMTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlB
-UyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRy
-ZSBSb290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUyeuuOF0+W2Ap7kaJjbMeM
-TC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvObntl8jixwKIy72KyaOBhU8E2lf/slLo2
-rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIwWFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw
-93X2PaRka9ZP585ArQ/dMtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtN
-P2MbRMNE1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYDVR0T
-AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/zQas8fElyalL1BSZ
-MEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEF
-BQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEFBQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+Rj
-xY6hUFaTlrg4wCQiZrxTFGGVv9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqM
-lIpPnTX/dqQGE5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
-uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU
-3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/vGVCJYMzpJJUPwssd8m92kMfM
-dcGWxZ0=
------END CERTIFICATE-----
diff --git a/logstash-core/lib/logstash/codecs/base.rb b/logstash-core/lib/logstash/codecs/base.rb
index f9a9e636b..f028cfe16 100644
--- a/logstash-core/lib/logstash/codecs/base.rb
+++ b/logstash-core/lib/logstash/codecs/base.rb
@@ -1,5 +1,20 @@
-# encoding: utf-8
-require "logstash/event"
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/plugin"
 
 # This is the base class for logstash codecs.
@@ -12,7 +27,7 @@ module LogStash::Codecs; class Base < LogStash::Plugin
     "codec"
   end
 
-  def initialize(params={})
+  def initialize(params = {})
     super
     config_init(@params)
     register if respond_to?(:register)
@@ -30,7 +45,7 @@ module LogStash::Codecs; class Base < LogStash::Plugin
   # DEPRECATED: Prefer defining encode_sync or multi_encode
   def encode(event)
     encoded = multi_encode([event])
-    encoded.each {|event,data| @on_event.call(event,data) }
+    encoded.each {|event, data| @on_event.call(event, data) }
   end # def encode
 
   public
@@ -75,7 +90,9 @@ module LogStash::Codecs; class Base < LogStash::Plugin
   end
 
   public
-  def clone
-    return self.class.new(params)
+  def clone(*args)
+    LogStash::Plugins::Contextualizer.initialize_plugin(execution_context, self.class, params).tap do |klone|
+      klone.metric = @metric if klone.instance_variable_get(:@metric).nil?
+    end
   end
 end; end # class LogStash::Codecs::Base
diff --git a/logstash-core/lib/logstash/codecs/delegator.rb b/logstash-core/lib/logstash/codecs/delegator.rb
new file mode 100644
index 000000000..0527cf78f
--- /dev/null
+++ b/logstash-core/lib/logstash/codecs/delegator.rb
@@ -0,0 +1,69 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module LogStash::Codecs
+  class Delegator < SimpleDelegator
+    def initialize(obj)
+      super(obj)
+      @encode_metric = LogStash::Instrument::NamespacedNullMetric.new
+      @decode_metric = LogStash::Instrument::NamespacedNullMetric.new
+    end
+
+    def class
+      __getobj__.class
+    end
+
+    def metric=(metric)
+      __getobj__.metric = metric
+
+      __getobj__.metric.gauge(:name, __getobj__.class.config_name)
+
+      @encode_metric = __getobj__.metric.namespace(:encode)
+      @encode_metric.counter(:writes_in)
+      @encode_metric.timer(:duration_in_millis)
+
+      @decode_metric = __getobj__.metric.namespace(:decode)
+      @decode_metric.counter(:writes_in)
+      @decode_metric.counter(:out)
+      @decode_metric.timer(:duration_in_millis)
+    end
+
+    def encode(event)
+      @encode_metric.increment(:writes_in)
+      @encode_metric.time(:duration_in_millis) do
+        __getobj__.encode(event)
+      end
+    end
+
+    def multi_encode(events)
+      @encode_metric.increment(:writes_in, events.length)
+      @encode_metric.time(:duration_in_millis) do
+        __getobj__.multi_encode(events)
+      end
+    end
+
+    def decode(data)
+      @decode_metric.increment(:writes_in)
+      @decode_metric.time(:duration_in_millis) do
+        __getobj__.decode(data) do |event|
+          @decode_metric.increment(:out)
+          yield event
+        end
+      end
+    end
+  end
+end
diff --git a/logstash-core/lib/logstash/compiler.rb b/logstash-core/lib/logstash/compiler.rb
index 6cd68b280..113b68278 100644
--- a/logstash-core/lib/logstash/compiler.rb
+++ b/logstash-core/lib/logstash/compiler.rb
@@ -1,34 +1,25 @@
-require 'logstash/compiler/lscl/lscl_grammar'
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
-java_import org.logstash.config.ir.PipelineIR
-java_import org.logstash.config.ir.graph.Graph
+require 'logstash/compiler/lscl/lscl_grammar'
 
 module LogStash; class Compiler
   include ::LogStash::Util::Loggable
 
-  def self.compile_sources(sources_with_metadata, support_escapes)
-    graph_sections = sources_with_metadata.map do |swm|
-      self.compile_graph(swm, support_escapes)
-    end
-
-    input_graph = Graph.combine(*graph_sections.map {|s| s[:input] }).graph
-    output_graph = Graph.combine(*graph_sections.map {|s| s[:output] }).graph
-
-    filter_graph = graph_sections.reduce(nil) do |acc, s|
-      filter_section = s[:filter]
-
-      if acc.nil?
-        filter_section
-      else
-        acc.chain(filter_section)
-      end
-    end
-
-    original_source = sources_with_metadata.map(&:text).join("\n")
-
-    PipelineIR.new(input_graph, filter_graph, output_graph, original_source)
-  end
-
   def self.compile_imperative(source_with_metadata, support_escapes)
     if !source_with_metadata.is_a?(org.logstash.common.SourceWithMetadata)
       raise ArgumentError, "Expected 'org.logstash.common.SourceWithMetadata', got #{source_with_metadata.class}"
@@ -44,8 +35,4 @@ module LogStash; class Compiler
     config.process_escape_sequences = support_escapes
     config.compile(source_with_metadata)
   end
-
-  def self.compile_graph(source_with_metadata, support_escapes)
-    Hash[compile_imperative(source_with_metadata, support_escapes).map {|section,icompiled| [section, icompiled.toGraph]}]
-  end
 end; end
diff --git a/logstash-core/lib/logstash/compiler/lscl.rb b/logstash-core/lib/logstash/compiler/lscl.rb
index 277c3ef27..c066489f8 100644
--- a/logstash-core/lib/logstash/compiler/lscl.rb
+++ b/logstash-core/lib/logstash/compiler/lscl.rb
@@ -1,8 +1,25 @@
-# encoding: utf-8
-require "treetop"
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'treetop/runtime'
 require "logstash/compiler/treetop_monkeypatches"
 require "logstash/compiler/lscl/helpers"
 require "logstash/config/string_escape"
+require "logstash/util"
 
 java_import org.logstash.config.ir.DSL
 java_import org.logstash.common.SourceWithMetadata
@@ -30,7 +47,7 @@ module LogStashCompilerLSCLGrammar; module LogStash; module Compiler; module LSC
       set_meta(PROCESS_ESCAPE_SEQUENCES, val)
     end
 
-    def compile(base_source_with_metadata=nil)
+    def compile(base_source_with_metadata = nil)
       # There is no way to move vars across nodes in treetop :(
       self.base_source_with_metadata = base_source_with_metadata
 
@@ -70,9 +87,14 @@ module LogStashCompilerLSCLGrammar; module LogStash; module Compiler; module LSC
   end
 
   class Plugins < Node; end
+
   class Plugin < Node
     def expr
-      jdsl.iPlugin(source_meta, plugin_type_enum, self.plugin_name, self.expr_attributes)
+      expr_attributes = self.map_expr_attributes
+
+      validate(expr_attributes)
+
+      jdsl.iPlugin(source_meta, plugin_type_enum, self.plugin_name, expr_attributes)
     end
 
     def plugin_type_enum
@@ -92,13 +114,13 @@ module LogStashCompilerLSCLGrammar; module LogStash; module Compiler; module LSC
       return name.text_value
     end
 
-    def expr_attributes
+    def map_expr_attributes
       # Turn attributes into a hash map
-      self.attributes.recursive_select(Attribute).map(&:expr).map {|k,v|
-        if v.java_kind_of?(Java::OrgLogstashConfigIrExpression::ValueExpression)
+      self.attributes.recursive_select(Attribute).map(&:expr).map {|k, v|
+        if v.kind_of?(Java::OrgLogstashConfigIrExpression::ValueExpression)
           [k, v.get]
         else
-          [k,v]
+          [k, v]
         end
       }.reduce({}) do |hash, kv|
         k, v = kv
@@ -111,15 +133,32 @@ module LogStashCompilerLSCLGrammar; module LogStash; module Compiler; module LSC
           # hash value; e.g., `{"match" => {"baz" => "bar"}, "match" => {"foo" => "bulb"}}` is
           # interpreted as `{"match" => {"baz" => "bar", "foo" => "blub"}}`.
           # (NOTE: this bypasses `AST::Hash`'s ability to detect duplicate keys)
-          hash[k] = existing.merge(v)
+          hash[k] = ::LogStash::Util.hash_merge_many(existing, v)
         elsif existing.kind_of?(::Array)
           hash[k] = existing.push(*v)
         else
-          hash[k] = existing + v
+          hash[k] = [existing, v] unless v == existing
         end
         hash
       end
     end
+
+    def validate(expr_attributes)
+      if section_type == "input" || section_type == "output"
+        codec_attribute = expr_attributes["codec"]
+        # If the `codec` attribute value is an Array, it means that multiple codec blocks were found on the plugin
+        # configuration section, which is not a valid configuration and would cause an object serialization error
+        if !codec_attribute.nil? && codec_attribute.kind_of?(::Array)
+          raise ::LogStash::ConfigurationError.new(
+            I18n.t("logstash.runner.configuration.invalid_plugin_settings_multiple_codecs",
+                   :plugin => plugin_name,
+                   :type => section_type,
+                   :line => input.line_of(interval.first)
+            )
+          )
+        end
+      end
+    end
   end
 
   class Name < Node
@@ -130,7 +169,7 @@ module LogStashCompilerLSCLGrammar; module LogStash; module Compiler; module LSC
 
   class Attribute < Node
     def expr
-      [name.text_value, value.expr]
+      [name.is_a?(AST::String) ? name.text_value[1...-1] : name.text_value, value.expr]
     end
   end
 
@@ -164,8 +203,8 @@ module LogStashCompilerLSCLGrammar; module LogStash; module Compiler; module LSC
   class Number < Value
     def expr
       jdsl.eValue(source_meta, text_value.include?(".") ?
-        text_value.to_f :
-        text_value.to_i)
+                                   Float(text_value) :
+                                   Integer(text_value))
     end
   end
 
@@ -239,7 +278,7 @@ module LogStashCompilerLSCLGrammar; module LogStash; module Compiler; module LSC
       end
 
       else_stack.reverse.each_cons(2) do |cons|
-        later,earlier = cons
+        later, earlier = cons
         earlier << later
       end
       exprs << else_stack.first
@@ -299,7 +338,6 @@ module LogStashCompilerLSCLGrammar; module LogStash; module Compiler; module LSC
 
       all_elements = [first_element, *rest_elements]
 
-
       res = if all_elements.size == 1
         elem = all_elements.first
         if elem.is_a?(Selector)
@@ -330,7 +368,7 @@ module LogStashCompilerLSCLGrammar; module LogStash; module Compiler; module LSC
     def jconvert(sexpr)
       raise "jconvert cannot handle nils!" if sexpr.nil?
 
-      if sexpr.java_kind_of?(Java::OrgLogstashConfigIrExpression::Expression)
+      if sexpr.kind_of?(Java::OrgLogstashConfigIrExpression::Expression)
         return sexpr
       end
 
diff --git a/logstash-core/lib/logstash/compiler/lscl/helpers.rb b/logstash-core/lib/logstash/compiler/lscl/helpers.rb
index 8cded0a4d..677eb99a4 100644
--- a/logstash-core/lib/logstash/compiler/lscl/helpers.rb
+++ b/logstash-core/lib/logstash/compiler/lscl/helpers.rb
@@ -1,4 +1,19 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 module LogStashCompilerLSCLGrammar; module LogStash; module Compiler; module LSCL; module AST
   # Helpers for parsing LSCL files
@@ -11,7 +26,7 @@ module LogStashCompilerLSCLGrammar; module LogStash; module Compiler; module LSC
     def base_source_with_metadata=(value)
       set_meta(:base_source_with_metadata, value)
     end
-    
+
     def base_source_with_metadata
       get_meta(:base_source_with_metadata)
     end
@@ -48,7 +63,7 @@ module LogStashCompilerLSCLGrammar; module LogStash; module Compiler; module LSC
     def self.jdsl
       org.logstash.config.ir.DSL
     end
-    
+
     BOOLEAN_DSL_METHOD_SIGNATURE = [org.logstash.common.SourceWithMetadata, org.logstash.config.ir.expression.Expression, org.logstash.config.ir.expression.Expression]
     AND_METHOD = jdsl.java_method(:eAnd, BOOLEAN_DSL_METHOD_SIGNATURE)
     NAND_METHOD = jdsl.java_method(:eNand, BOOLEAN_DSL_METHOD_SIGNATURE)
diff --git a/logstash-core/lib/logstash/compiler/lscl/lscl_grammar.rb b/logstash-core/lib/logstash/compiler/lscl/lscl_grammar.rb
index e391b93d6..63176d4ff 100644
--- a/logstash-core/lib/logstash/compiler/lscl/lscl_grammar.rb
+++ b/logstash-core/lib/logstash/compiler/lscl/lscl_grammar.rb
@@ -1,7 +1,7 @@
 # Autogenerated from a Treetop grammar. Edits may be lost.
 
 
-require "treetop"
+require "treetop/runtime"
 require "logstash/compiler/lscl.rb"
 
 module LogStashCompilerLSCLGrammar
@@ -12,7 +12,7 @@ module LogStashCompilerLSCLGrammar
   end
 
   module Config0
-    def _
+    def cs
       elements[0]
     end
 
@@ -22,21 +22,9 @@ module LogStashCompilerLSCLGrammar
   end
 
   module Config1
-    def _1
-      elements[0]
-    end
-
-    def plugin_section
+    def cs
       elements[1]
     end
-
-    def _2
-      elements[2]
-    end
-
-    def _3
-      elements[4]
-    end
   end
 
   def _nt_config
@@ -44,52 +32,40 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:config].has_key?(index)
       cached = node_cache[:config][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:config][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    r1 = _nt__
+    s1, i1 = [], index
+    loop do
+      i2, s2 = index, []
+      r3 = _nt_cs
+      s2 << r3
+      if r3
+        r4 = _nt_plugin_section
+        s2 << r4
+      end
+      if s2.last
+        r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+        r2.extend(Config0)
+      else
+        @index = i2
+        r2 = nil
+      end
+      if r2
+        s1 << r2
+      else
+        break
+      end
+    end
+    r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
     s0 << r1
     if r1
-      r2 = _nt_plugin_section
-      s0 << r2
-      if r2
-        r3 = _nt__
-        s0 << r3
-        if r3
-          s4, i4 = [], index
-          loop do
-            i5, s5 = index, []
-            r6 = _nt__
-            s5 << r6
-            if r6
-              r7 = _nt_plugin_section
-              s5 << r7
-            end
-            if s5.last
-              r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
-              r5.extend(Config0)
-            else
-              @index = i5
-              r5 = nil
-            end
-            if r5
-              s4 << r5
-            else
-              break
-            end
-          end
-          r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
-          s0 << r4
-          if r4
-            r8 = _nt__
-            s0 << r8
-          end
-        end
-      end
+      r5 = _nt_cs
+      s0 << r5
     end
     if s0.last
       r0 = instantiate_node(LogStash::Compiler::LSCL::AST::Config,input, i0...index, s0)
@@ -104,7 +80,91 @@ module LogStashCompilerLSCLGrammar
     r0
   end
 
+  module NewlineOrEoi0
+  end
+
+  def _nt_newline_or_eoi
+    start_index = index
+    if node_cache[:newline_or_eoi].has_key?(index)
+      cached = node_cache[:newline_or_eoi][index]
+      if cached
+        node_cache[:newline_or_eoi][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    i1, s1 = index, []
+    if (match_len = has_terminal?("\r", false, index))
+      r3 = true
+      @index += match_len
+    else
+      terminal_parse_failure('"\\r"')
+      r3 = nil
+    end
+    if r3
+      r2 = r3
+    else
+      r2 = instantiate_node(SyntaxNode,input, index...index)
+    end
+    s1 << r2
+    if r2
+      if (match_len = has_terminal?("\n", false, index))
+        r4 = true
+        @index += match_len
+      else
+        terminal_parse_failure('"\\n"')
+        r4 = nil
+      end
+      s1 << r4
+    end
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(NewlineOrEoi0)
+    else
+      @index = i1
+      r1 = nil
+    end
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      i5 = index
+      if index < input_length
+        r6 = true
+        @index += 1
+      else
+        terminal_parse_failure("any character")
+        r6 = nil
+      end
+      if r6
+        @index = i5
+        r5 = nil
+        terminal_parse_failure("any character", true)
+      else
+        @terminal_failures.pop
+        @index = i5
+        r5 = instantiate_node(SyntaxNode,input, index...index)
+      end
+      if r5
+        r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
+        r0 = r5
+      else
+        @index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:newline_or_eoi][start_index] = r0
+
+    r0
+  end
+
   module Comment0
+    def newline_or_eoi
+      elements[3]
+    end
   end
 
   def _nt_comment
@@ -112,7 +172,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:comment].has_key?(index)
       cached = node_cache[:comment][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:comment][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -129,21 +189,22 @@ module LogStashCompilerLSCLGrammar
       end
       s1 << r2
       if r2
-        if has_terminal?("#", false, index)
-          r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?("#", false, index))
+          r4 = true
+          @index += match_len
         else
-          terminal_parse_failure("#")
+          terminal_parse_failure('"#"')
           r4 = nil
         end
         s1 << r4
         if r4
           s5, i5 = [], index
           loop do
-            if has_terminal?('\G[^\\r\\n]', true, index)
+            if has_terminal?(@regexps[gr = '\A[^\\r\\n]'] ||= Regexp.new(gr), :regexp, index)
               r6 = true
               @index += 1
             else
+              terminal_parse_failure('[^\\r\\n]')
               r6 = nil
             end
             if r6
@@ -155,29 +216,8 @@ module LogStashCompilerLSCLGrammar
           r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
           s1 << r5
           if r5
-            if has_terminal?("\r", false, index)
-              r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
-            else
-              terminal_parse_failure("\r")
-              r8 = nil
-            end
-            if r8
-              r7 = r8
-            else
-              r7 = instantiate_node(SyntaxNode,input, index...index)
-            end
+            r7 = _nt_newline_or_eoi
             s1 << r7
-            if r7
-              if has_terminal?("\n", false, index)
-                r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
-              else
-                terminal_parse_failure("\n")
-                r9 = nil
-              end
-              s1 << r9
-            end
           end
         end
       end
@@ -206,12 +246,12 @@ module LogStashCompilerLSCLGrammar
     r0
   end
 
-  def _nt__
+  def _nt_cs
     start_index = index
-    if node_cache[:_].has_key?(index)
-      cached = node_cache[:_][index]
+    if node_cache[:cs].has_key?(index)
+      cached = node_cache[:cs][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:cs][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -222,10 +262,12 @@ module LogStashCompilerLSCLGrammar
       i1 = index
       r2 = _nt_comment
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r1 = r2
       else
         r3 = _nt_whitespace
         if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r1 = r3
         else
           @index = i1
@@ -240,7 +282,7 @@ module LogStashCompilerLSCLGrammar
     end
     r0 = instantiate_node(LogStash::Compiler::LSCL::AST::Whitespace,input, i0...index, s0)
 
-    node_cache[:_][start_index] = r0
+    node_cache[:cs][start_index] = r0
 
     r0
   end
@@ -250,7 +292,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:whitespace].has_key?(index)
       cached = node_cache[:whitespace][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:whitespace][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -258,10 +300,11 @@ module LogStashCompilerLSCLGrammar
 
     s0, i0 = [], index
     loop do
-      if has_terminal?('\G[ \\t\\r\\n]', true, index)
+      if has_terminal?(@regexps[gr = '\A[ \\t\\r\\n]'] ||= Regexp.new(gr), :regexp, index)
         r1 = true
         @index += 1
       else
+        terminal_parse_failure('[ \\t\\r\\n]')
         r1 = nil
       end
       if r1
@@ -287,7 +330,7 @@ module LogStashCompilerLSCLGrammar
       elements[0]
     end
 
-    def _
+    def cs
       elements[1]
     end
   end
@@ -297,11 +340,11 @@ module LogStashCompilerLSCLGrammar
       elements[0]
     end
 
-    def _1
+    def cs1
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -312,7 +355,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:plugin_section].has_key?(index)
       cached = node_cache[:plugin_section][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:plugin_section][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -322,19 +365,19 @@ module LogStashCompilerLSCLGrammar
     r1 = _nt_plugin_type
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
-        if has_terminal?("{", false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?("{", false, index))
+          r3 = true
+          @index += match_len
         else
-          terminal_parse_failure("{")
+          terminal_parse_failure('"{"')
           r3 = nil
         end
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
             s5, i5 = [], index
@@ -343,7 +386,7 @@ module LogStashCompilerLSCLGrammar
               r7 = _nt_branch_or_plugin
               s6 << r7
               if r7
-                r8 = _nt__
+                r8 = _nt_cs
                 s6 << r8
               end
               if s6.last
@@ -362,11 +405,11 @@ module LogStashCompilerLSCLGrammar
             r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
             s0 << r5
             if r5
-              if has_terminal?("}", false, index)
-                r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
+              if (match_len = has_terminal?("}", false, index))
+                r9 = true
+                @index += match_len
               else
-                terminal_parse_failure("}")
+                terminal_parse_failure('"}"')
                 r9 = nil
               end
               s0 << r9
@@ -393,7 +436,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:branch_or_plugin].has_key?(index)
       cached = node_cache[:branch_or_plugin][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:branch_or_plugin][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -402,10 +445,12 @@ module LogStashCompilerLSCLGrammar
     i0 = index
     r1 = _nt_branch
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
       r2 = _nt_plugin
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
         @index = i0
@@ -423,41 +468,44 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:plugin_type].has_key?(index)
       cached = node_cache[:plugin_type][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:plugin_type][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0 = index
-    if has_terminal?("input", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 5))
-      @index += 5
+    if (match_len = has_terminal?("input", false, index))
+      r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
     else
-      terminal_parse_failure("input")
+      terminal_parse_failure('"input"')
       r1 = nil
     end
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
-      if has_terminal?("filter", false, index)
-        r2 = instantiate_node(SyntaxNode,input, index...(index + 6))
-        @index += 6
+      if (match_len = has_terminal?("filter", false, index))
+        r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        @index += match_len
       else
-        terminal_parse_failure("filter")
+        terminal_parse_failure('"filter"')
         r2 = nil
       end
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
-        if has_terminal?("output", false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 6))
-          @index += 6
+        if (match_len = has_terminal?("output", false, index))
+          r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
-          terminal_parse_failure("output")
+          terminal_parse_failure('"output"')
           r3 = nil
         end
         if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
           @index = i0
@@ -472,7 +520,7 @@ module LogStashCompilerLSCLGrammar
   end
 
   module Plugins0
-    def _
+    def cs
       elements[0]
     end
 
@@ -493,7 +541,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:plugins].has_key?(index)
       cached = node_cache[:plugins][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:plugins][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -506,7 +554,7 @@ module LogStashCompilerLSCLGrammar
       s3, i3 = [], index
       loop do
         i4, s4 = index, []
-        r5 = _nt__
+        r5 = _nt_cs
         s4 << r5
         if r5
           r6 = _nt_plugin
@@ -551,7 +599,7 @@ module LogStashCompilerLSCLGrammar
       elements[0]
     end
 
-    def _
+    def cs
       elements[1]
     end
 
@@ -572,11 +620,11 @@ module LogStashCompilerLSCLGrammar
       elements[0]
     end
 
-    def _1
+    def cs1
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -584,7 +632,7 @@ module LogStashCompilerLSCLGrammar
       elements[4]
     end
 
-    def _3
+    def cs3
       elements[5]
     end
 
@@ -595,7 +643,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:plugin].has_key?(index)
       cached = node_cache[:plugin][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:plugin][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -605,19 +653,19 @@ module LogStashCompilerLSCLGrammar
     r1 = _nt_name
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
-        if has_terminal?("{", false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?("{", false, index))
+          r3 = true
+          @index += match_len
         else
-          terminal_parse_failure("{")
+          terminal_parse_failure('"{"')
           r3 = nil
         end
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
             i6, s6 = index, []
@@ -630,7 +678,7 @@ module LogStashCompilerLSCLGrammar
                 r10 = _nt_whitespace
                 s9 << r10
                 if r10
-                  r11 = _nt__
+                  r11 = _nt_cs
                   s9 << r11
                   if r11
                     r12 = _nt_attribute
@@ -667,14 +715,14 @@ module LogStashCompilerLSCLGrammar
             end
             s0 << r5
             if r5
-              r13 = _nt__
+              r13 = _nt_cs
               s0 << r13
               if r13
-                if has_terminal?("}", false, index)
-                  r14 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
+                if (match_len = has_terminal?("}", false, index))
+                  r14 = true
+                  @index += match_len
                 else
-                  terminal_parse_failure("}")
+                  terminal_parse_failure('"}"')
                   r14 = nil
                 end
                 s0 << r14
@@ -702,7 +750,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:name].has_key?(index)
       cached = node_cache[:name][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:name][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -711,10 +759,11 @@ module LogStashCompilerLSCLGrammar
     i0 = index
     s1, i1 = [], index
     loop do
-      if has_terminal?('\G[A-Za-z0-9_-]', true, index)
+      if has_terminal?(@regexps[gr = '\A[A-Za-z0-9_-]'] ||= Regexp.new(gr), :regexp, index)
         r2 = true
         @index += 1
       else
+        terminal_parse_failure('[A-Za-z0-9_-]')
         r2 = nil
       end
       if r2
@@ -730,10 +779,12 @@ module LogStashCompilerLSCLGrammar
       r1 = instantiate_node(LogStash::Compiler::LSCL::AST::Name,input, i1...index, s1)
     end
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
       r3 = _nt_string
       if r3
+        r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
         r0 = r3
       else
         @index = i0
@@ -751,11 +802,11 @@ module LogStashCompilerLSCLGrammar
       elements[0]
     end
 
-    def _1
+    def cs1
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -769,7 +820,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:attribute].has_key?(index)
       cached = node_cache[:attribute][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:attribute][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -779,19 +830,19 @@ module LogStashCompilerLSCLGrammar
     r1 = _nt_name
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
-        if has_terminal?("=>", false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 2))
-          @index += 2
+        if (match_len = has_terminal?("=>", false, index))
+          r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
-          terminal_parse_failure("=>")
+          terminal_parse_failure('"=>"')
           r3 = nil
         end
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
             r5 = _nt_value
@@ -818,7 +869,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:value].has_key?(index)
       cached = node_cache[:value][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:value][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -827,26 +878,32 @@ module LogStashCompilerLSCLGrammar
     i0 = index
     r1 = _nt_plugin
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
       r2 = _nt_bareword
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
         r3 = _nt_string
         if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
           r4 = _nt_number
           if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
           else
             r5 = _nt_array
             if r5
+              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
               r0 = r5
             else
               r6 = _nt_hash
               if r6
+                r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
                 r0 = r6
               else
                 @index = i0
@@ -868,7 +925,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:array_value].has_key?(index)
       cached = node_cache[:array_value][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:array_value][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -877,22 +934,27 @@ module LogStashCompilerLSCLGrammar
     i0 = index
     r1 = _nt_bareword
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
       r2 = _nt_string
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
         r3 = _nt_number
         if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
           r4 = _nt_array
           if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
           else
             r5 = _nt_hash
             if r5
+              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
               r0 = r5
             else
               @index = i0
@@ -916,27 +978,29 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:bareword].has_key?(index)
       cached = node_cache[:bareword][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:bareword][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?('\G[A-Za-z_]', true, index)
+    if has_terminal?(@regexps[gr = '\A[A-Za-z_]'] ||= Regexp.new(gr), :regexp, index)
       r1 = true
       @index += 1
     else
+      terminal_parse_failure('[A-Za-z_]')
       r1 = nil
     end
     s0 << r1
     if r1
       s2, i2 = [], index
       loop do
-        if has_terminal?('\G[A-Za-z0-9_]', true, index)
+        if has_terminal?(@regexps[gr = '\A[A-Za-z0-9_]'] ||= Regexp.new(gr), :regexp, index)
           r3 = true
           @index += 1
         else
+          terminal_parse_failure('[A-Za-z0-9_]')
           r3 = nil
         end
         if r3
@@ -977,18 +1041,18 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:double_quoted_string].has_key?(index)
       cached = node_cache[:double_quoted_string][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:double_quoted_string][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?('"', false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
-      @index += 1
+    if (match_len = has_terminal?('"', false, index))
+      r1 = true
+      @index += match_len
     else
-      terminal_parse_failure('"')
+      terminal_parse_failure('\'"\'')
       r1 = nil
     end
     s0 << r1
@@ -996,35 +1060,39 @@ module LogStashCompilerLSCLGrammar
       s2, i2 = [], index
       loop do
         i3 = index
-        if has_terminal?('\"', false, index)
-          r4 = instantiate_node(SyntaxNode,input, index...(index + 2))
-          @index += 2
+        if (match_len = has_terminal?('\"', false, index))
+          r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
-          terminal_parse_failure('\"')
+          terminal_parse_failure('\'\\"\'')
           r4 = nil
         end
         if r4
+          r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
           r3 = r4
         else
           i5, s5 = index, []
           i6 = index
-          if has_terminal?('"', false, index)
-            r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            @index += 1
+          if (match_len = has_terminal?('"', false, index))
+            r7 = true
+            @index += match_len
           else
-            terminal_parse_failure('"')
+            terminal_parse_failure('\'"\'')
             r7 = nil
           end
           if r7
+            @index = i6
             r6 = nil
+            terminal_parse_failure('\'"\'', true)
           else
+            @terminal_failures.pop
             @index = i6
             r6 = instantiate_node(SyntaxNode,input, index...index)
           end
           s5 << r6
           if r6
             if index < input_length
-              r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              r8 = true
               @index += 1
             else
               terminal_parse_failure("any character")
@@ -1040,6 +1108,7 @@ module LogStashCompilerLSCLGrammar
             r5 = nil
           end
           if r5
+            r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
             r3 = r5
           else
             @index = i3
@@ -1055,11 +1124,11 @@ module LogStashCompilerLSCLGrammar
       r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
       s0 << r2
       if r2
-        if has_terminal?('"', false, index)
-          r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?('"', false, index))
+          r9 = true
+          @index += match_len
         else
-          terminal_parse_failure('"')
+          terminal_parse_failure('\'"\'')
           r9 = nil
         end
         s0 << r9
@@ -1089,18 +1158,18 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:single_quoted_string].has_key?(index)
       cached = node_cache[:single_quoted_string][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:single_quoted_string][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?("'", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
-      @index += 1
+    if (match_len = has_terminal?("'", false, index))
+      r1 = true
+      @index += match_len
     else
-      terminal_parse_failure("'")
+      terminal_parse_failure('"\'"')
       r1 = nil
     end
     s0 << r1
@@ -1108,35 +1177,39 @@ module LogStashCompilerLSCLGrammar
       s2, i2 = [], index
       loop do
         i3 = index
-        if has_terminal?("\\'", false, index)
-          r4 = instantiate_node(SyntaxNode,input, index...(index + 2))
-          @index += 2
+        if (match_len = has_terminal?("\\'", false, index))
+          r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
-          terminal_parse_failure("\\'")
+          terminal_parse_failure('"\\\\\'"')
           r4 = nil
         end
         if r4
+          r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
           r3 = r4
         else
           i5, s5 = index, []
           i6 = index
-          if has_terminal?("'", false, index)
-            r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            @index += 1
+          if (match_len = has_terminal?("'", false, index))
+            r7 = true
+            @index += match_len
           else
-            terminal_parse_failure("'")
+            terminal_parse_failure('"\'"')
             r7 = nil
           end
           if r7
+            @index = i6
             r6 = nil
+            terminal_parse_failure('"\'"', true)
           else
+            @terminal_failures.pop
             @index = i6
             r6 = instantiate_node(SyntaxNode,input, index...index)
           end
           s5 << r6
           if r6
             if index < input_length
-              r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              r8 = true
               @index += 1
             else
               terminal_parse_failure("any character")
@@ -1152,6 +1225,7 @@ module LogStashCompilerLSCLGrammar
             r5 = nil
           end
           if r5
+            r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
             r3 = r5
           else
             @index = i3
@@ -1167,11 +1241,11 @@ module LogStashCompilerLSCLGrammar
       r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
       s0 << r2
       if r2
-        if has_terminal?("'", false, index)
-          r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?("'", false, index))
+          r9 = true
+          @index += match_len
         else
-          terminal_parse_failure("'")
+          terminal_parse_failure('"\'"')
           r9 = nil
         end
         s0 << r9
@@ -1195,7 +1269,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:string].has_key?(index)
       cached = node_cache[:string][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:string][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -1204,10 +1278,12 @@ module LogStashCompilerLSCLGrammar
     i0 = index
     r1 = _nt_double_quoted_string
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
       r2 = _nt_single_quoted_string
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
         @index = i0
@@ -1231,18 +1307,18 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:regexp].has_key?(index)
       cached = node_cache[:regexp][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:regexp][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?('/', false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
-      @index += 1
+    if (match_len = has_terminal?('/', false, index))
+      r1 = true
+      @index += match_len
     else
-      terminal_parse_failure('/')
+      terminal_parse_failure('\'/\'')
       r1 = nil
     end
     s0 << r1
@@ -1250,35 +1326,39 @@ module LogStashCompilerLSCLGrammar
       s2, i2 = [], index
       loop do
         i3 = index
-        if has_terminal?('\/', false, index)
-          r4 = instantiate_node(SyntaxNode,input, index...(index + 2))
-          @index += 2
+        if (match_len = has_terminal?('\/', false, index))
+          r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
-          terminal_parse_failure('\/')
+          terminal_parse_failure('\'\\/\'')
           r4 = nil
         end
         if r4
+          r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
           r3 = r4
         else
           i5, s5 = index, []
           i6 = index
-          if has_terminal?('/', false, index)
-            r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            @index += 1
+          if (match_len = has_terminal?('/', false, index))
+            r7 = true
+            @index += match_len
           else
-            terminal_parse_failure('/')
+            terminal_parse_failure('\'/\'')
             r7 = nil
           end
           if r7
+            @index = i6
             r6 = nil
+            terminal_parse_failure('\'/\'', true)
           else
+            @terminal_failures.pop
             @index = i6
             r6 = instantiate_node(SyntaxNode,input, index...index)
           end
           s5 << r6
           if r6
             if index < input_length
-              r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              r8 = true
               @index += 1
             else
               terminal_parse_failure("any character")
@@ -1294,6 +1374,7 @@ module LogStashCompilerLSCLGrammar
             r5 = nil
           end
           if r5
+            r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
             r3 = r5
           else
             @index = i3
@@ -1309,11 +1390,11 @@ module LogStashCompilerLSCLGrammar
       r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
       s0 << r2
       if r2
-        if has_terminal?('/', false, index)
-          r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?('/', false, index))
+          r9 = true
+          @index += match_len
         else
-          terminal_parse_failure('/')
+          terminal_parse_failure('\'/\'')
           r9 = nil
         end
         s0 << r9
@@ -1343,18 +1424,18 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:number].has_key?(index)
       cached = node_cache[:number][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:number][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?("-", false, index)
-      r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
-      @index += 1
+    if (match_len = has_terminal?("-", false, index))
+      r2 = true
+      @index += match_len
     else
-      terminal_parse_failure("-")
+      terminal_parse_failure('"-"')
       r2 = nil
     end
     if r2
@@ -1366,10 +1447,11 @@ module LogStashCompilerLSCLGrammar
     if r1
       s3, i3 = [], index
       loop do
-        if has_terminal?('\G[0-9]', true, index)
+        if has_terminal?(@regexps[gr = '\A[0-9]'] ||= Regexp.new(gr), :regexp, index)
           r4 = true
           @index += 1
         else
+          terminal_parse_failure('[0-9]')
           r4 = nil
         end
         if r4
@@ -1387,21 +1469,22 @@ module LogStashCompilerLSCLGrammar
       s0 << r3
       if r3
         i6, s6 = index, []
-        if has_terminal?(".", false, index)
-          r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?(".", false, index))
+          r7 = true
+          @index += match_len
         else
-          terminal_parse_failure(".")
+          terminal_parse_failure('"."')
           r7 = nil
         end
         s6 << r7
         if r7
           s8, i8 = [], index
           loop do
-            if has_terminal?('\G[0-9]', true, index)
+            if has_terminal?(@regexps[gr = '\A[0-9]'] ||= Regexp.new(gr), :regexp, index)
               r9 = true
               @index += 1
             else
+              terminal_parse_failure('[0-9]')
               r9 = nil
             end
             if r9
@@ -1442,11 +1525,11 @@ module LogStashCompilerLSCLGrammar
   end
 
   module Array0
-    def _1
+    def cs1
       elements[0]
     end
 
-    def _2
+    def cs2
       elements[2]
     end
 
@@ -1463,11 +1546,11 @@ module LogStashCompilerLSCLGrammar
   end
 
   module Array2
-    def _1
+    def cs1
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -1478,23 +1561,23 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:array].has_key?(index)
       cached = node_cache[:array][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:array][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?("[", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
-      @index += 1
+    if (match_len = has_terminal?("[", false, index))
+      r1 = true
+      @index += match_len
     else
-      terminal_parse_failure("[")
+      terminal_parse_failure('"["')
       r1 = nil
     end
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
         i4, s4 = index, []
@@ -1504,19 +1587,19 @@ module LogStashCompilerLSCLGrammar
           s6, i6 = [], index
           loop do
             i7, s7 = index, []
-            r8 = _nt__
+            r8 = _nt_cs
             s7 << r8
             if r8
-              if has_terminal?(",", false, index)
-                r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
+              if (match_len = has_terminal?(",", false, index))
+                r9 = true
+                @index += match_len
               else
-                terminal_parse_failure(",")
+                terminal_parse_failure('","')
                 r9 = nil
               end
               s7 << r9
               if r9
-                r10 = _nt__
+                r10 = _nt_cs
                 s7 << r10
                 if r10
                   r11 = _nt_value
@@ -1554,14 +1637,14 @@ module LogStashCompilerLSCLGrammar
         end
         s0 << r3
         if r3
-          r12 = _nt__
+          r12 = _nt_cs
           s0 << r12
           if r12
-            if has_terminal?("]", false, index)
-              r13 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
+            if (match_len = has_terminal?("]", false, index))
+              r13 = true
+              @index += match_len
             else
-              terminal_parse_failure("]")
+              terminal_parse_failure('"]"')
               r13 = nil
             end
             s0 << r13
@@ -1583,11 +1666,11 @@ module LogStashCompilerLSCLGrammar
   end
 
   module Hash0
-    def _1
+    def cs1
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -1598,23 +1681,23 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:hash].has_key?(index)
       cached = node_cache[:hash][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:hash][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?("{", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
-      @index += 1
+    if (match_len = has_terminal?("{", false, index))
+      r1 = true
+      @index += match_len
     else
-      terminal_parse_failure("{")
+      terminal_parse_failure('"{"')
       r1 = nil
     end
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
         r4 = _nt_hashentries
@@ -1625,14 +1708,14 @@ module LogStashCompilerLSCLGrammar
         end
         s0 << r3
         if r3
-          r5 = _nt__
+          r5 = _nt_cs
           s0 << r5
           if r5
-            if has_terminal?("}", false, index)
-              r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
+            if (match_len = has_terminal?("}", false, index))
+              r6 = true
+              @index += match_len
             else
-              terminal_parse_failure("}")
+              terminal_parse_failure('"}"')
               r6 = nil
             end
             s0 << r6
@@ -1654,7 +1737,7 @@ module LogStashCompilerLSCLGrammar
   end
 
   module Hashentries0
-    def whitespace
+    def cs
       elements[0]
     end
 
@@ -1675,7 +1758,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:hashentries].has_key?(index)
       cached = node_cache[:hashentries][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:hashentries][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -1688,7 +1771,7 @@ module LogStashCompilerLSCLGrammar
       s2, i2 = [], index
       loop do
         i3, s3 = index, []
-        r4 = _nt_whitespace
+        r4 = _nt_cs
         s3 << r4
         if r4
           r5 = _nt_hashentry
@@ -1728,11 +1811,11 @@ module LogStashCompilerLSCLGrammar
       elements[0]
     end
 
-    def _1
+    def cs1
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -1746,7 +1829,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:hashentry].has_key?(index)
       cached = node_cache[:hashentry][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:hashentry][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -1756,14 +1839,17 @@ module LogStashCompilerLSCLGrammar
     i1 = index
     r2 = _nt_number
     if r2
+      r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
       r1 = r2
     else
       r3 = _nt_bareword
       if r3
+        r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
         r1 = r3
       else
         r4 = _nt_string
         if r4
+          r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
           r1 = r4
         else
           @index = i1
@@ -1773,19 +1859,19 @@ module LogStashCompilerLSCLGrammar
     end
     s0 << r1
     if r1
-      r5 = _nt__
+      r5 = _nt_cs
       s0 << r5
       if r5
-        if has_terminal?("=>", false, index)
-          r6 = instantiate_node(SyntaxNode,input, index...(index + 2))
-          @index += 2
+        if (match_len = has_terminal?("=>", false, index))
+          r6 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
-          terminal_parse_failure("=>")
+          terminal_parse_failure('"=>"')
           r6 = nil
         end
         s0 << r6
         if r6
-          r7 = _nt__
+          r7 = _nt_cs
           s0 << r7
           if r7
             r8 = _nt_value
@@ -1808,7 +1894,7 @@ module LogStashCompilerLSCLGrammar
   end
 
   module Branch0
-    def _
+    def cs
       elements[0]
     end
 
@@ -1818,7 +1904,7 @@ module LogStashCompilerLSCLGrammar
   end
 
   module Branch1
-    def _
+    def cs
       elements[0]
     end
 
@@ -1839,7 +1925,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:branch].has_key?(index)
       cached = node_cache[:branch][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:branch][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -1852,7 +1938,7 @@ module LogStashCompilerLSCLGrammar
       s2, i2 = [], index
       loop do
         i3, s3 = index, []
-        r4 = _nt__
+        r4 = _nt_cs
         s3 << r4
         if r4
           r5 = _nt_else_if
@@ -1875,7 +1961,7 @@ module LogStashCompilerLSCLGrammar
       s0 << r2
       if r2
         i7, s7 = index, []
-        r8 = _nt__
+        r8 = _nt_cs
         s7 << r8
         if r8
           r9 = _nt_else
@@ -1914,13 +2000,13 @@ module LogStashCompilerLSCLGrammar
       elements[0]
     end
 
-    def _
+    def cs
       elements[1]
     end
   end
 
   module If1
-    def _1
+    def cs1
       elements[1]
     end
 
@@ -1928,11 +2014,11 @@ module LogStashCompilerLSCLGrammar
       elements[2]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
-    def _3
+    def cs3
       elements[5]
     end
 
@@ -1943,41 +2029,41 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:if].has_key?(index)
       cached = node_cache[:if][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:if][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?("if", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 2))
-      @index += 2
+    if (match_len = has_terminal?("if", false, index))
+      r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
     else
-      terminal_parse_failure("if")
+      terminal_parse_failure('"if"')
       r1 = nil
     end
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
         r3 = _nt_condition
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
-            if has_terminal?("{", false, index)
-              r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
+            if (match_len = has_terminal?("{", false, index))
+              r5 = true
+              @index += match_len
             else
-              terminal_parse_failure("{")
+              terminal_parse_failure('"{"')
               r5 = nil
             end
             s0 << r5
             if r5
-              r6 = _nt__
+              r6 = _nt_cs
               s0 << r6
               if r6
                 s7, i7 = [], index
@@ -1986,7 +2072,7 @@ module LogStashCompilerLSCLGrammar
                   r9 = _nt_branch_or_plugin
                   s8 << r9
                   if r9
-                    r10 = _nt__
+                    r10 = _nt_cs
                     s8 << r10
                   end
                   if s8.last
@@ -2005,11 +2091,11 @@ module LogStashCompilerLSCLGrammar
                 r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
                 s0 << r7
                 if r7
-                  if has_terminal?("}", false, index)
-                    r11 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                    @index += 1
+                  if (match_len = has_terminal?("}", false, index))
+                    r11 = true
+                    @index += match_len
                   else
-                    terminal_parse_failure("}")
+                    terminal_parse_failure('"}"')
                     r11 = nil
                   end
                   s0 << r11
@@ -2038,17 +2124,17 @@ module LogStashCompilerLSCLGrammar
       elements[0]
     end
 
-    def _
+    def cs
       elements[1]
     end
   end
 
   module ElseIf1
-    def _1
+    def cs1
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -2056,11 +2142,11 @@ module LogStashCompilerLSCLGrammar
       elements[4]
     end
 
-    def _3
+    def cs3
       elements[5]
     end
 
-    def _4
+    def cs4
       elements[7]
     end
 
@@ -2071,53 +2157,53 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:else_if].has_key?(index)
       cached = node_cache[:else_if][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:else_if][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?("else", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 4))
-      @index += 4
+    if (match_len = has_terminal?("else", false, index))
+      r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
     else
-      terminal_parse_failure("else")
+      terminal_parse_failure('"else"')
       r1 = nil
     end
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
-        if has_terminal?("if", false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 2))
-          @index += 2
+        if (match_len = has_terminal?("if", false, index))
+          r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
-          terminal_parse_failure("if")
+          terminal_parse_failure('"if"')
           r3 = nil
         end
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
             r5 = _nt_condition
             s0 << r5
             if r5
-              r6 = _nt__
+              r6 = _nt_cs
               s0 << r6
               if r6
-                if has_terminal?("{", false, index)
-                  r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
+                if (match_len = has_terminal?("{", false, index))
+                  r7 = true
+                  @index += match_len
                 else
-                  terminal_parse_failure("{")
+                  terminal_parse_failure('"{"')
                   r7 = nil
                 end
                 s0 << r7
                 if r7
-                  r8 = _nt__
+                  r8 = _nt_cs
                   s0 << r8
                   if r8
                     s9, i9 = [], index
@@ -2126,7 +2212,7 @@ module LogStashCompilerLSCLGrammar
                       r11 = _nt_branch_or_plugin
                       s10 << r11
                       if r11
-                        r12 = _nt__
+                        r12 = _nt_cs
                         s10 << r12
                       end
                       if s10.last
@@ -2145,11 +2231,11 @@ module LogStashCompilerLSCLGrammar
                     r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
                     s0 << r9
                     if r9
-                      if has_terminal?("}", false, index)
-                        r13 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                        @index += 1
+                      if (match_len = has_terminal?("}", false, index))
+                        r13 = true
+                        @index += match_len
                       else
-                        terminal_parse_failure("}")
+                        terminal_parse_failure('"}"')
                         r13 = nil
                       end
                       s0 << r13
@@ -2180,17 +2266,17 @@ module LogStashCompilerLSCLGrammar
       elements[0]
     end
 
-    def _
+    def cs
       elements[1]
     end
   end
 
   module Else1
-    def _1
+    def cs1
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -2201,35 +2287,35 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:else].has_key?(index)
       cached = node_cache[:else][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:else][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?("else", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 4))
-      @index += 4
+    if (match_len = has_terminal?("else", false, index))
+      r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
     else
-      terminal_parse_failure("else")
+      terminal_parse_failure('"else"')
       r1 = nil
     end
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
-        if has_terminal?("{", false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?("{", false, index))
+          r3 = true
+          @index += match_len
         else
-          terminal_parse_failure("{")
+          terminal_parse_failure('"{"')
           r3 = nil
         end
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
             s5, i5 = [], index
@@ -2238,7 +2324,7 @@ module LogStashCompilerLSCLGrammar
               r7 = _nt_branch_or_plugin
               s6 << r7
               if r7
-                r8 = _nt__
+                r8 = _nt_cs
                 s6 << r8
               end
               if s6.last
@@ -2257,11 +2343,11 @@ module LogStashCompilerLSCLGrammar
             r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
             s0 << r5
             if r5
-              if has_terminal?("}", false, index)
-                r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
+              if (match_len = has_terminal?("}", false, index))
+                r9 = true
+                @index += match_len
               else
-                terminal_parse_failure("}")
+                terminal_parse_failure('"}"')
                 r9 = nil
               end
               s0 << r9
@@ -2284,7 +2370,7 @@ module LogStashCompilerLSCLGrammar
   end
 
   module Condition0
-    def _1
+    def cs1
       elements[0]
     end
 
@@ -2292,7 +2378,7 @@ module LogStashCompilerLSCLGrammar
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[2]
     end
 
@@ -2313,7 +2399,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:condition].has_key?(index)
       cached = node_cache[:condition][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:condition][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -2326,13 +2412,13 @@ module LogStashCompilerLSCLGrammar
       s2, i2 = [], index
       loop do
         i3, s3 = index, []
-        r4 = _nt__
+        r4 = _nt_cs
         s3 << r4
         if r4
           r5 = _nt_boolean_operator
           s3 << r5
           if r5
-            r6 = _nt__
+            r6 = _nt_cs
             s3 << r6
             if r6
               r7 = _nt_expression
@@ -2370,7 +2456,7 @@ module LogStashCompilerLSCLGrammar
   end
 
   module Expression0
-    def _1
+    def cs1
       elements[1]
     end
 
@@ -2378,7 +2464,7 @@ module LogStashCompilerLSCLGrammar
       elements[2]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -2389,7 +2475,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:expression].has_key?(index)
       cached = node_cache[:expression][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:expression][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -2397,29 +2483,29 @@ module LogStashCompilerLSCLGrammar
 
     i0 = index
     i1, s1 = index, []
-    if has_terminal?("(", false, index)
-      r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
-      @index += 1
+    if (match_len = has_terminal?("(", false, index))
+      r2 = true
+      @index += match_len
     else
-      terminal_parse_failure("(")
+      terminal_parse_failure('"("')
       r2 = nil
     end
     s1 << r2
     if r2
-      r3 = _nt__
+      r3 = _nt_cs
       s1 << r3
       if r3
         r4 = _nt_condition
         s1 << r4
         if r4
-          r5 = _nt__
+          r5 = _nt_cs
           s1 << r5
           if r5
-            if has_terminal?(")", false, index)
-              r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
+            if (match_len = has_terminal?(")", false, index))
+              r6 = true
+              @index += match_len
             else
-              terminal_parse_failure(")")
+              terminal_parse_failure('")"')
               r6 = nil
             end
             s1 << r6
@@ -2435,36 +2521,43 @@ module LogStashCompilerLSCLGrammar
       r1 = nil
     end
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
       r0.extend(LogStash::Compiler::LSCL::AST::Expression)
     else
       r7 = _nt_negative_expression
       if r7
+        r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
         r0 = r7
         r0.extend(LogStash::Compiler::LSCL::AST::Expression)
       else
         r8 = _nt_in_expression
         if r8
+          r8 = SyntaxNode.new(input, (index-1)...index) if r8 == true
           r0 = r8
           r0.extend(LogStash::Compiler::LSCL::AST::Expression)
         else
           r9 = _nt_not_in_expression
           if r9
+            r9 = SyntaxNode.new(input, (index-1)...index) if r9 == true
             r0 = r9
             r0.extend(LogStash::Compiler::LSCL::AST::Expression)
           else
             r10 = _nt_compare_expression
             if r10
+              r10 = SyntaxNode.new(input, (index-1)...index) if r10 == true
               r0 = r10
               r0.extend(LogStash::Compiler::LSCL::AST::Expression)
             else
               r11 = _nt_regexp_expression
               if r11
+                r11 = SyntaxNode.new(input, (index-1)...index) if r11 == true
                 r0 = r11
                 r0.extend(LogStash::Compiler::LSCL::AST::Expression)
               else
                 r12 = _nt_rvalue
                 if r12
+                  r12 = SyntaxNode.new(input, (index-1)...index) if r12 == true
                   r0 = r12
                   r0.extend(LogStash::Compiler::LSCL::AST::Expression)
                 else
@@ -2484,11 +2577,11 @@ module LogStashCompilerLSCLGrammar
   end
 
   module NegativeExpression0
-    def _1
+    def cs1
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -2496,14 +2589,14 @@ module LogStashCompilerLSCLGrammar
       elements[4]
     end
 
-    def _3
+    def cs3
       elements[5]
     end
 
   end
 
   module NegativeExpression1
-    def _
+    def cs
       elements[1]
     end
 
@@ -2517,7 +2610,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:negative_expression].has_key?(index)
       cached = node_cache[:negative_expression][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:negative_expression][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -2525,41 +2618,41 @@ module LogStashCompilerLSCLGrammar
 
     i0 = index
     i1, s1 = index, []
-    if has_terminal?("!", false, index)
-      r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
-      @index += 1
+    if (match_len = has_terminal?("!", false, index))
+      r2 = true
+      @index += match_len
     else
-      terminal_parse_failure("!")
+      terminal_parse_failure('"!"')
       r2 = nil
     end
     s1 << r2
     if r2
-      r3 = _nt__
+      r3 = _nt_cs
       s1 << r3
       if r3
-        if has_terminal?("(", false, index)
-          r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?("(", false, index))
+          r4 = true
+          @index += match_len
         else
-          terminal_parse_failure("(")
+          terminal_parse_failure('"("')
           r4 = nil
         end
         s1 << r4
         if r4
-          r5 = _nt__
+          r5 = _nt_cs
           s1 << r5
           if r5
             r6 = _nt_condition
             s1 << r6
             if r6
-              r7 = _nt__
+              r7 = _nt_cs
               s1 << r7
               if r7
-                if has_terminal?(")", false, index)
-                  r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
+                if (match_len = has_terminal?(")", false, index))
+                  r8 = true
+                  @index += match_len
                 else
-                  terminal_parse_failure(")")
+                  terminal_parse_failure('")"')
                   r8 = nil
                 end
                 s1 << r8
@@ -2577,20 +2670,21 @@ module LogStashCompilerLSCLGrammar
       r1 = nil
     end
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
       r0.extend(LogStash::Compiler::LSCL::AST::NegativeExpression)
     else
       i9, s9 = index, []
-      if has_terminal?("!", false, index)
-        r10 = instantiate_node(SyntaxNode,input, index...(index + 1))
-        @index += 1
+      if (match_len = has_terminal?("!", false, index))
+        r10 = true
+        @index += match_len
       else
-        terminal_parse_failure("!")
+        terminal_parse_failure('"!"')
         r10 = nil
       end
       s9 << r10
       if r10
-        r11 = _nt__
+        r11 = _nt_cs
         s9 << r11
         if r11
           r12 = _nt_selector
@@ -2605,6 +2699,7 @@ module LogStashCompilerLSCLGrammar
         r9 = nil
       end
       if r9
+        r9 = SyntaxNode.new(input, (index-1)...index) if r9 == true
         r0 = r9
         r0.extend(LogStash::Compiler::LSCL::AST::NegativeExpression)
       else
@@ -2623,7 +2718,7 @@ module LogStashCompilerLSCLGrammar
       elements[0]
     end
 
-    def _1
+    def cs1
       elements[1]
     end
 
@@ -2631,7 +2726,7 @@ module LogStashCompilerLSCLGrammar
       elements[2]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -2645,7 +2740,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:in_expression].has_key?(index)
       cached = node_cache[:in_expression][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:in_expression][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -2655,13 +2750,13 @@ module LogStashCompilerLSCLGrammar
     r1 = _nt_rvalue
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
         r3 = _nt_in_operator
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
             r5 = _nt_rvalue
@@ -2688,7 +2783,7 @@ module LogStashCompilerLSCLGrammar
       elements[0]
     end
 
-    def _1
+    def cs1
       elements[1]
     end
 
@@ -2696,7 +2791,7 @@ module LogStashCompilerLSCLGrammar
       elements[2]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -2710,7 +2805,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:not_in_expression].has_key?(index)
       cached = node_cache[:not_in_expression][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:not_in_expression][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -2720,13 +2815,13 @@ module LogStashCompilerLSCLGrammar
     r1 = _nt_rvalue
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
         r3 = _nt_not_in_operator
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
             r5 = _nt_rvalue
@@ -2753,17 +2848,17 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:in_operator].has_key?(index)
       cached = node_cache[:in_operator][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:in_operator][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
-    if has_terminal?("in", false, index)
-      r0 = instantiate_node(SyntaxNode,input, index...(index + 2))
-      @index += 2
+    if (match_len = has_terminal?("in", false, index))
+      r0 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
     else
-      terminal_parse_failure("in")
+      terminal_parse_failure('"in"')
       r0 = nil
     end
 
@@ -2773,7 +2868,7 @@ module LogStashCompilerLSCLGrammar
   end
 
   module NotInOperator0
-    def _
+    def cs
       elements[1]
     end
 
@@ -2784,30 +2879,30 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:not_in_operator].has_key?(index)
       cached = node_cache[:not_in_operator][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:not_in_operator][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?("not ", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 4))
-      @index += 4
+    if (match_len = has_terminal?("not ", false, index))
+      r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
     else
-      terminal_parse_failure("not ")
+      terminal_parse_failure('"not "')
       r1 = nil
     end
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
-        if has_terminal?("in", false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 2))
-          @index += 2
+        if (match_len = has_terminal?("in", false, index))
+          r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
-          terminal_parse_failure("in")
+          terminal_parse_failure('"in"')
           r3 = nil
         end
         s0 << r3
@@ -2831,7 +2926,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:rvalue].has_key?(index)
       cached = node_cache[:rvalue][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:rvalue][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -2840,26 +2935,32 @@ module LogStashCompilerLSCLGrammar
     i0 = index
     r1 = _nt_string
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
       r2 = _nt_number
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
         r3 = _nt_selector
         if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
           r4 = _nt_array
           if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
           else
             r5 = _nt_method_call
             if r5
+              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
               r0 = r5
             else
               r6 = _nt_regexp
               if r6
+                r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
                 r0 = r6
               else
                 @index = i0
@@ -2877,11 +2978,11 @@ module LogStashCompilerLSCLGrammar
   end
 
   module MethodCall0
-    def _1
+    def cs1
       elements[0]
     end
 
-    def _2
+    def cs2
       elements[2]
     end
 
@@ -2902,15 +3003,15 @@ module LogStashCompilerLSCLGrammar
       elements[0]
     end
 
-    def _1
+    def cs1
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
-    def _3
+    def cs3
       elements[5]
     end
 
@@ -2921,7 +3022,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:method_call].has_key?(index)
       cached = node_cache[:method_call][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:method_call][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -2931,19 +3032,19 @@ module LogStashCompilerLSCLGrammar
     r1 = _nt_method
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
-        if has_terminal?("(", false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?("(", false, index))
+          r3 = true
+          @index += match_len
         else
-          terminal_parse_failure("(")
+          terminal_parse_failure('"("')
           r3 = nil
         end
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
             i6, s6 = index, []
@@ -2953,19 +3054,19 @@ module LogStashCompilerLSCLGrammar
               s8, i8 = [], index
               loop do
                 i9, s9 = index, []
-                r10 = _nt__
+                r10 = _nt_cs
                 s9 << r10
                 if r10
-                  if has_terminal?(",", false, index)
-                    r11 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                    @index += 1
+                  if (match_len = has_terminal?(",", false, index))
+                    r11 = true
+                    @index += match_len
                   else
-                    terminal_parse_failure(",")
+                    terminal_parse_failure('","')
                     r11 = nil
                   end
                   s9 << r11
                   if r11
-                    r12 = _nt__
+                    r12 = _nt_cs
                     s9 << r12
                     if r12
                       r13 = _nt_rvalue
@@ -3003,14 +3104,14 @@ module LogStashCompilerLSCLGrammar
             end
             s0 << r5
             if r5
-              r14 = _nt__
+              r14 = _nt_cs
               s0 << r14
               if r14
-                if has_terminal?(")", false, index)
-                  r15 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
+                if (match_len = has_terminal?(")", false, index))
+                  r15 = true
+                  @index += match_len
                 else
-                  terminal_parse_failure(")")
+                  terminal_parse_failure('")"')
                   r15 = nil
                 end
                 s0 << r15
@@ -3038,7 +3139,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:method].has_key?(index)
       cached = node_cache[:method][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:method][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -3056,7 +3157,7 @@ module LogStashCompilerLSCLGrammar
       elements[0]
     end
 
-    def _1
+    def cs1
       elements[1]
     end
 
@@ -3064,7 +3165,7 @@ module LogStashCompilerLSCLGrammar
       elements[2]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -3078,7 +3179,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:compare_expression].has_key?(index)
       cached = node_cache[:compare_expression][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:compare_expression][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -3088,13 +3189,13 @@ module LogStashCompilerLSCLGrammar
     r1 = _nt_rvalue
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
         r3 = _nt_compare_operator
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
             r5 = _nt_rvalue
@@ -3121,76 +3222,82 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:compare_operator].has_key?(index)
       cached = node_cache[:compare_operator][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:compare_operator][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0 = index
-    if has_terminal?("==", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 2))
-      @index += 2
+    if (match_len = has_terminal?("==", false, index))
+      r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
     else
-      terminal_parse_failure("==")
+      terminal_parse_failure('"=="')
       r1 = nil
     end
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
       r0.extend(LogStash::Compiler::LSCL::AST::ComparisonOperator)
     else
-      if has_terminal?("!=", false, index)
-        r2 = instantiate_node(SyntaxNode,input, index...(index + 2))
-        @index += 2
+      if (match_len = has_terminal?("!=", false, index))
+        r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        @index += match_len
       else
-        terminal_parse_failure("!=")
+        terminal_parse_failure('"!="')
         r2 = nil
       end
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
         r0.extend(LogStash::Compiler::LSCL::AST::ComparisonOperator)
       else
-        if has_terminal?("<=", false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 2))
-          @index += 2
+        if (match_len = has_terminal?("<=", false, index))
+          r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
-          terminal_parse_failure("<=")
+          terminal_parse_failure('"<="')
           r3 = nil
         end
         if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
           r0.extend(LogStash::Compiler::LSCL::AST::ComparisonOperator)
         else
-          if has_terminal?(">=", false, index)
-            r4 = instantiate_node(SyntaxNode,input, index...(index + 2))
-            @index += 2
+          if (match_len = has_terminal?(">=", false, index))
+            r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+            @index += match_len
           else
-            terminal_parse_failure(">=")
+            terminal_parse_failure('">="')
             r4 = nil
           end
           if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
             r0.extend(LogStash::Compiler::LSCL::AST::ComparisonOperator)
           else
-            if has_terminal?("<", false, index)
-              r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
+            if (match_len = has_terminal?("<", false, index))
+              r5 = true
+              @index += match_len
             else
-              terminal_parse_failure("<")
+              terminal_parse_failure('"<"')
               r5 = nil
             end
             if r5
+              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
               r0 = r5
               r0.extend(LogStash::Compiler::LSCL::AST::ComparisonOperator)
             else
-              if has_terminal?(">", false, index)
-                r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
+              if (match_len = has_terminal?(">", false, index))
+                r6 = true
+                @index += match_len
               else
-                terminal_parse_failure(">")
+                terminal_parse_failure('">"')
                 r6 = nil
               end
               if r6
+                r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
                 r0 = r6
                 r0.extend(LogStash::Compiler::LSCL::AST::ComparisonOperator)
               else
@@ -3213,7 +3320,7 @@ module LogStashCompilerLSCLGrammar
       elements[0]
     end
 
-    def _1
+    def cs1
       elements[1]
     end
 
@@ -3221,7 +3328,7 @@ module LogStashCompilerLSCLGrammar
       elements[2]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -3232,7 +3339,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:regexp_expression].has_key?(index)
       cached = node_cache[:regexp_expression][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:regexp_expression][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -3242,22 +3349,24 @@ module LogStashCompilerLSCLGrammar
     r1 = _nt_rvalue
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
         r3 = _nt_regexp_operator
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
             i5 = index
             r6 = _nt_string
             if r6
+              r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
               r5 = r6
             else
               r7 = _nt_regexp
               if r7
+                r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
                 r5 = r7
               else
                 @index = i5
@@ -3287,32 +3396,34 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:regexp_operator].has_key?(index)
       cached = node_cache[:regexp_operator][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:regexp_operator][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0 = index
-    if has_terminal?("=~", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 2))
-      @index += 2
+    if (match_len = has_terminal?("=~", false, index))
+      r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
     else
-      terminal_parse_failure("=~")
+      terminal_parse_failure('"=~"')
       r1 = nil
     end
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
       r0.extend(LogStash::Compiler::LSCL::AST::RegExpOperator)
     else
-      if has_terminal?("!~", false, index)
-        r2 = instantiate_node(SyntaxNode,input, index...(index + 2))
-        @index += 2
+      if (match_len = has_terminal?("!~", false, index))
+        r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        @index += match_len
       else
-        terminal_parse_failure("!~")
+        terminal_parse_failure('"!~"')
         r2 = nil
       end
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
         r0.extend(LogStash::Compiler::LSCL::AST::RegExpOperator)
       else
@@ -3331,54 +3442,58 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:boolean_operator].has_key?(index)
       cached = node_cache[:boolean_operator][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:boolean_operator][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0 = index
-    if has_terminal?("and", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 3))
-      @index += 3
+    if (match_len = has_terminal?("and", false, index))
+      r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
     else
-      terminal_parse_failure("and")
+      terminal_parse_failure('"and"')
       r1 = nil
     end
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
       r0.extend(LogStash::Compiler::LSCL::AST::BooleanOperator)
     else
-      if has_terminal?("or", false, index)
-        r2 = instantiate_node(SyntaxNode,input, index...(index + 2))
-        @index += 2
+      if (match_len = has_terminal?("or", false, index))
+        r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        @index += match_len
       else
-        terminal_parse_failure("or")
+        terminal_parse_failure('"or"')
         r2 = nil
       end
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
         r0.extend(LogStash::Compiler::LSCL::AST::BooleanOperator)
       else
-        if has_terminal?("xor", false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 3))
-          @index += 3
+        if (match_len = has_terminal?("xor", false, index))
+          r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
-          terminal_parse_failure("xor")
+          terminal_parse_failure('"xor"')
           r3 = nil
         end
         if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
           r0.extend(LogStash::Compiler::LSCL::AST::BooleanOperator)
         else
-          if has_terminal?("nand", false, index)
-            r4 = instantiate_node(SyntaxNode,input, index...(index + 4))
-            @index += 4
+          if (match_len = has_terminal?("nand", false, index))
+            r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+            @index += match_len
           else
-            terminal_parse_failure("nand")
+            terminal_parse_failure('"nand"')
             r4 = nil
           end
           if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
             r0.extend(LogStash::Compiler::LSCL::AST::BooleanOperator)
           else
@@ -3399,7 +3514,7 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:selector].has_key?(index)
       cached = node_cache[:selector][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:selector][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -3434,28 +3549,29 @@ module LogStashCompilerLSCLGrammar
     if node_cache[:selector_element].has_key?(index)
       cached = node_cache[:selector_element][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:selector_element][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?("[", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
-      @index += 1
+    if (match_len = has_terminal?("[", false, index))
+      r1 = true
+      @index += match_len
     else
-      terminal_parse_failure("[")
+      terminal_parse_failure('"["')
       r1 = nil
     end
     s0 << r1
     if r1
       s2, i2 = [], index
       loop do
-        if has_terminal?('\G[^\\],]', true, index)
+        if has_terminal?(@regexps[gr = '\A[^\\]\\[,]'] ||= Regexp.new(gr), :regexp, index)
           r3 = true
           @index += 1
         else
+          terminal_parse_failure('[^\\]\\[,]')
           r3 = nil
         end
         if r3
@@ -3472,11 +3588,11 @@ module LogStashCompilerLSCLGrammar
       end
       s0 << r2
       if r2
-        if has_terminal?("]", false, index)
-          r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?("]", false, index))
+          r4 = true
+          @index += match_len
         else
-          terminal_parse_failure("]")
+          terminal_parse_failure('"]"')
           r4 = nil
         end
         s0 << r4
diff --git a/logstash-core/lib/logstash/compiler/lscl/lscl_grammar.treetop b/logstash-core/lib/logstash/compiler/lscl/lscl_grammar.treetop
index 095c8e912..d7af0af60 100644
--- a/logstash-core/lib/logstash/compiler/lscl/lscl_grammar.treetop
+++ b/logstash-core/lib/logstash/compiler/lscl/lscl_grammar.treetop
@@ -1,16 +1,21 @@
-require "treetop"
+require "treetop/runtime"
 require "logstash/compiler/lscl.rb"
 
 grammar LogStashCompilerLSCLGrammar
   rule config
-    _ plugin_section _ (_ plugin_section)* _ <LogStash::Compiler::LSCL::AST::Config>
+    (cs plugin_section)* cs <LogStash::Compiler::LSCL::AST::Config>
+  end
+
+  rule newline_or_eoi
+    # `!.` is a negative lookahead for 'anything', i.e. it matches at the end of input.
+    ("\r"? "\n") / !.
   end
 
   rule comment
-    (whitespace? "#" [^\r\n]* "\r"? "\n")+ <LogStash::Compiler::LSCL::AST::Comment>
+    (whitespace? "#" [^\r\n]* newline_or_eoi)+ <LogStash::Compiler::LSCL::AST::Comment>
   end
 
-  rule _
+  rule cs
     (comment / whitespace)* <LogStash::Compiler::LSCL::AST::Whitespace>
   end
 
@@ -19,8 +24,8 @@ grammar LogStashCompilerLSCLGrammar
   end
 
   rule plugin_section
-    plugin_type _ "{"
-      _ (branch_or_plugin _)*
+    plugin_type cs "{"
+      cs (branch_or_plugin cs)*
     "}"
     <LogStash::Compiler::LSCL::AST::PluginSection>
   end
@@ -34,15 +39,15 @@ grammar LogStashCompilerLSCLGrammar
   end
 
   rule plugins
-    (plugin (_ plugin)*)?
+    (plugin (cs plugin)*)?
     <LogStash::Compiler::LSCL::AST::Plugins>
   end
 
   rule plugin
-    name _ "{"
-      _
-      attributes:( attribute (whitespace _ attribute)*)?
-      _
+    name cs "{"
+      cs
+      attributes:( attribute (whitespace cs attribute)*)?
+      cs
     "}"
     <LogStash::Compiler::LSCL::AST::Plugin>
   end
@@ -55,7 +60,7 @@ grammar LogStashCompilerLSCLGrammar
   end
 
   rule attribute
-    name _ "=>" _ value
+    name cs "=>" cs value
     <LogStash::Compiler::LSCL::AST::Attribute>
   end
 
@@ -95,63 +100,63 @@ grammar LogStashCompilerLSCLGrammar
 
   rule array
     "["
-    _
+    cs
     (
-      value (_ "," _ value)*
+      value (cs "," cs value)*
     )?
-    _
+    cs
     "]"
     <LogStash::Compiler::LSCL::AST::Array>
   end
 
   rule hash
     "{"
-      _
+      cs
       hashentries?
-      _
+      cs
     "}"
     <LogStash::Compiler::LSCL::AST::Hash>
   end
 
   rule hashentries
-    hashentry (whitespace hashentry)*
+    hashentry (cs hashentry)*
     <LogStash::Compiler::LSCL::AST::HashEntries>
   end
 
   rule hashentry
-    name:(number / bareword / string) _ "=>" _ value
+    name:(number / bareword / string) cs "=>" cs value
     <LogStash::Compiler::LSCL::AST::HashEntry>
   end
 
   # Conditions
   rule branch
-    if (_ else_if)* (_ else)?
+    if (cs else_if)* (cs else)?
     <LogStash::Compiler::LSCL::AST::Branch>
   end
 
   rule if
-    "if" _ condition _ "{" _ (branch_or_plugin _)* "}"
+    "if" cs condition cs "{" cs (branch_or_plugin cs)* "}"
     <LogStash::Compiler::LSCL::AST::If>
   end
 
   rule else_if
-    "else" _ "if" _ condition _ "{" _ ( branch_or_plugin _)* "}"
+    "else" cs "if" cs condition cs "{" cs ( branch_or_plugin cs)* "}"
     <LogStash::Compiler::LSCL::AST::Elsif>
   end
 
   rule else
-    "else" _ "{" _ (branch_or_plugin _)* "}"
+    "else" cs "{" cs (branch_or_plugin cs)* "}"
     <LogStash::Compiler::LSCL::AST::Else>
   end
 
   rule condition
-    expression (_ boolean_operator _ expression)*
+    expression (cs boolean_operator cs expression)*
     <LogStash::Compiler::LSCL::AST::Condition>
   end
 
   rule expression
     (
-        ("(" _ condition _ ")")
+        ("(" cs condition cs ")")
       / negative_expression
       / in_expression
       / not_in_expression
@@ -163,18 +168,18 @@ grammar LogStashCompilerLSCLGrammar
 
   rule negative_expression
     (
-        ("!" _ "(" _ condition _ ")")
-      / ("!" _ selector)
+        ("!" cs "(" cs condition cs ")")
+      / ("!" cs selector)
     ) <LogStash::Compiler::LSCL::AST::NegativeExpression>
   end
 
   rule in_expression
-    rvalue _ in_operator _ rvalue
+    rvalue cs in_operator cs rvalue
     <LogStash::Compiler::LSCL::AST::InExpression>
   end
 
   rule not_in_expression
-    rvalue _ not_in_operator _ rvalue
+    rvalue cs not_in_operator cs rvalue
     <LogStash::Compiler::LSCL::AST::NotInExpression>
   end
 
@@ -183,7 +188,7 @@ grammar LogStashCompilerLSCLGrammar
   end
 
   rule not_in_operator
-    "not " _ "in"
+    "not " cs "in"
   end
 
   rule rvalue
@@ -191,11 +196,11 @@ grammar LogStashCompilerLSCLGrammar
   end
 
   rule method_call
-      method _ "(" _
+      method cs "(" cs
         (
-          rvalue ( _ "," _ rvalue )*
+          rvalue ( cs "," cs rvalue )*
         )?
-      _ ")"
+      cs ")"
     <LogStash::Compiler::LSCL::AST::MethodCall>
   end
 
@@ -204,7 +209,7 @@ grammar LogStashCompilerLSCLGrammar
   end
 
   rule compare_expression
-    rvalue _ compare_operator _ rvalue
+    rvalue cs compare_operator cs rvalue
     <LogStash::Compiler::LSCL::AST::ComparisonExpression>
   end
 
@@ -214,7 +219,7 @@ grammar LogStashCompilerLSCLGrammar
   end
 
   rule regexp_expression
-    rvalue _  regexp_operator _ (string / regexp)
+    rvalue cs  regexp_operator cs (string / regexp)
     <LogStash::Compiler::LSCL::AST::RegexpExpression>
   end
 
@@ -234,7 +239,7 @@ grammar LogStashCompilerLSCLGrammar
   end
 
   rule selector_element
-    "[" [^\],]+ "]"
+    "[" [^\]\[,]+ "]"
     <LogStash::Compiler::LSCL::AST::SelectorElement>
   end
 
diff --git a/logstash-core/lib/logstash/compiler/treetop_monkeypatches.rb b/logstash-core/lib/logstash/compiler/treetop_monkeypatches.rb
index 48c3f0c7c..d5a13ae92 100644
--- a/logstash-core/lib/logstash/compiler/treetop_monkeypatches.rb
+++ b/logstash-core/lib/logstash/compiler/treetop_monkeypatches.rb
@@ -1,11 +1,30 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'treetop/runtime'
+
 class Treetop::Runtime::SyntaxNode
   def get_meta(key)
     @ast_metadata ||= {}
-    return @ast_metadata[key] if @ast_metadata[key] 
+    return @ast_metadata[key] if @ast_metadata[key]
     return self.parent.get_meta(key) if self.parent
     nil
   end
-  
+
   def set_meta(key, value)
     @ast_metadata ||= {}
     @ast_metadata[key] = value
@@ -19,13 +38,13 @@ class Treetop::Runtime::SyntaxNode
   # Traverse the syntax tree recursively.
   # The order should respect the order of the configuration file as it is read
   # and written by humans (and the order in which it is parsed).
-  def recurse(e, depth=0, &block)
+  def recurse(e, depth = 0, &block)
     r = block.call(e, depth)
     e.elements.each { |e| recurse(e, depth + 1, &block) } if r && e.elements
     nil
   end
 
-  def recursive_inject(results=[], &block)
+  def recursive_inject(results = [], &block)
     if !elements.nil?
       elements.each do |element|
         if block.call(element)
@@ -46,9 +65,9 @@ class Treetop::Runtime::SyntaxNode
   # and ignore the empty nodes.
   def recursive_select(*klasses)
     return recursive_inject { |e| klasses.any? {|k| e.is_a?(k)} }
-  end  
+  end
 
-  def recursive_inject_parent(results=[], &block)
+  def recursive_inject_parent(results = [], &block)
     if !parent.nil?
       if block.call(parent)
         results << parent
@@ -59,32 +78,32 @@ class Treetop::Runtime::SyntaxNode
     return results
   end
 
-  def recursive_select_parent(results=[], klass)
+  def recursive_select_parent(results = [], klass)
     return recursive_inject_parent(results) { |e| e.is_a?(klass) }
   end
-  
+
   # Monkeypatch Treetop::Runtime::SyntaxNode's inspect method to skip
   # any Whitespace or SyntaxNodes with no children.
-  def _inspect(indent="")
+  def _inspect(indent = "")
     em = extension_modules
-    interesting_methods = methods-[em.last ? em.last.methods : nil]-self.class.instance_methods
+    interesting_methods = methods - [em.last ? em.last.methods : nil] - self.class.instance_methods
     im = interesting_methods.size > 0 ? " (#{interesting_methods.join(",")})" : ""
     tv = text_value
     tv = "...#{tv[-20..-1]}" if tv.size > 20
 
     indent +
-    self.class.to_s.sub(/.*:/,'') +
-      em.map{|m| "+"+m.to_s.sub(/.*:/,'')}*"" +
+    self.class.to_s.sub(/.*:/, '') +
+      em.map {|m| "+" + m.to_s.sub(/.*:/, '')} * "" +
       " offset=#{interval.first}" +
       ", #{tv.inspect}" +
       im +
       (elements && elements.size > 0 ?
         ":" +
-          (elements.select { |e| !e.is_a?(LogStash::Config::AST::Whitespace) && e.elements && e.elements.size > 0 }||[]).map{|e|
+          (elements.select { |e| !e.is_a?(LogStash::Config::AST::Whitespace) && e.elements && e.elements.size > 0 } || []).map {|e|
       begin
-        "\n"+e.inspect(indent+"  ")
+        "\n" + e.inspect(indent + "  ")
       rescue  # Defend against inspect not taking a parameter
-        "\n"+indent+" "+e.inspect
+        "\n" + indent + " " + e.inspect
       end
           }.join("") :
         ""
diff --git a/logstash-core/lib/logstash/config/config_ast.rb b/logstash-core/lib/logstash/config/config_ast.rb
index 5e796475b..8b5f7fd99 100644
--- a/logstash-core/lib/logstash/config/config_ast.rb
+++ b/logstash-core/lib/logstash/config/config_ast.rb
@@ -1,34 +1,82 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/compiler/lscl/helpers"
-require "treetop"
+require 'treetop/runtime'
 
 require "logstash/compiler/treetop_monkeypatches"
 
 module LogStash; module Config; module AST
   PROCESS_ESCAPE_SEQUENCES = :process_escape_sequences
 
-  def self.deferred_conditionals=(val)
-    @deferred_conditionals = val
-  end
+  class << self
+    # @api private
+    MUTEX = Mutex.new
 
-  def self.deferred_conditionals
-    @deferred_conditionals
-  end
+    # Executes the given block with exclusive access to the AST global variables
+    #
+    # @yieldreturn [Object]: the object that is returned from the block is returned by this method
+    #
+    # @return [Object]
+    def exclusive
+      MUTEX.synchronize { yield }
+    end
 
-  def self.deferred_conditionals_index
-    @deferred_conditionals_index
-  end
+    def deferred_conditionals=(val)
+      ensure_exclusive!
+      @deferred_conditionals = val
+    end
 
-  def self.deferred_conditionals_index=(val)
-    @deferred_conditionals_index = val
-  end
+    def deferred_conditionals
+      ensure_exclusive!
+      @deferred_conditionals
+    end
 
-  def self.plugin_instance_index
-    @plugin_instance_index
-  end
+    def deferred_conditionals_index
+      ensure_exclusive!
+      @deferred_conditionals_index
+    end
 
-  def self.plugin_instance_index=(val)
-    @plugin_instance_index = val
+    def deferred_conditionals_index=(val)
+      ensure_exclusive!
+      @deferred_conditionals_index = val
+    end
+
+    def plugin_instance_index
+      ensure_exclusive!
+      @plugin_instance_index
+    end
+
+    def plugin_instance_index=(val)
+      ensure_exclusive!
+      @plugin_instance_index = val
+    end
+
+    private
+
+    # Raises a descriptive error if the thread in which it is invoked does
+    # not have exclusive access.
+    #
+    # @raise [RuntimeError]
+    def ensure_exclusive!
+      return if MUTEX.owned?
+
+      raise "Illegal access without exclusive lock at `#{caller[1]}`"
+    end
   end
 
   class Node < Treetop::Runtime::SyntaxNode
@@ -44,8 +92,16 @@ module LogStash; module Config; module AST
       set_meta(PROCESS_ESCAPE_SEQUENCES, val)
     end
 
-
     def compile
+      LogStash::Config::AST.exclusive { do_compile }
+    end
+
+    private
+
+    # NON-threadsafe method compiles an AST into executable Ruby code.
+    # @see Config#compile, which is a threadsafe wrapper around this method.
+    # @api private
+    def do_compile
       LogStash::Config::AST.deferred_conditionals = []
       LogStash::Config::AST.deferred_conditionals_index = 0
       LogStash::Config::AST.plugin_instance_index = 0
@@ -99,6 +155,7 @@ module LogStash; module Config; module AST
 
   class Comment < Node; end
   class Whitespace < Node; end
+
   class PluginSection < Node
     # Global plugin numbering for the janky instance variable naming we use
     # like @filter_<name>_1
@@ -111,8 +168,6 @@ module LogStash; module Config; module AST
       generate_variables
       code = []
       @variables.each do |plugin, name|
-
-
         code << <<-CODE
           @generated_objects[:#{name}] = #{plugin.compile_initializer}
           @#{plugin.plugin_type}s << @generated_objects[:#{name}]
@@ -171,6 +226,7 @@ module LogStash; module Config; module AST
   end
 
   class Plugins < Node; end
+
   class Plugin < Node
     def plugin_type
       if recursive_select_parent(Plugin).any?
@@ -192,12 +248,12 @@ module LogStash; module Config; module AST
       # If any parent is a Plugin, this must be a codec.
 
       if attributes.elements.nil?
-        return "plugin(#{plugin_type.inspect}, #{plugin_name.inspect}, #{source_meta.line}, #{source_meta.column})" << (plugin_type == "codec" ? "" : "\n")
+        return "plugin(#{plugin_type.inspect}, #{plugin_name.inspect}, {}, line_to_source(#{source_meta.line}, #{source_meta.column}))" << (plugin_type == "codec" ? "" : "\n")
       else
         settings = attributes.recursive_select(Attribute).collect(&:compile).reject(&:empty?)
 
         attributes_code = "LogStash::Util.hash_merge_many(#{settings.map { |c| "{ #{c} }" }.join(", ")})"
-        return "plugin(#{plugin_type.inspect}, #{plugin_name.inspect}, #{source_meta.line}, #{source_meta.column}, #{attributes_code})" << (plugin_type == "codec" ? "" : "\n")
+        return "plugin(#{plugin_type.inspect}, #{plugin_name.inspect}, #{attributes_code}, line_to_source(#{source_meta.line}, #{source_meta.column}))" << (plugin_type == "codec" ? "" : "\n")
       end
     end
 
@@ -214,7 +270,7 @@ module LogStash; module Config; module AST
       when "codec"
         settings = attributes.recursive_select(Attribute).collect(&:compile).reject(&:empty?)
         attributes_code = "LogStash::Util.hash_merge_many(#{settings.map { |c| "{ #{c} }" }.join(", ")})"
-        return "plugin(#{plugin_type.inspect}, #{plugin_name.inspect}, #{source_meta.line}, #{source_meta.column}, #{attributes_code})"
+        return "plugin(#{plugin_type.inspect}, #{plugin_name.inspect}, #{attributes_code}, line_to_source(#{source_meta.line}, #{source_meta.column}))"
       end
     end
 
@@ -267,11 +323,13 @@ module LogStash; module Config; module AST
       return text_value.inspect
     end
   end
+
   class Attribute < Node
     def compile
       return %Q(#{name.compile} => #{value.compile})
     end
   end
+
   class RValue < Node; end
   class Value < RValue; end
 
@@ -286,6 +344,7 @@ module LogStash; module Config; module AST
       return Unicode.wrap(text_value)
     end
   end
+
   class String < Value
     def compile
       if get_meta(PROCESS_ESCAPE_SEQUENCES)
@@ -295,21 +354,25 @@ module LogStash; module Config; module AST
       end
     end
   end
+
   class RegExp < Value
     def compile
       return "Regexp.new(" + Unicode.wrap(text_value[1...-1]) + ")"
     end
   end
+
   class Number < Value
     def compile
       return text_value
     end
   end
+
   class Array < Value
     def compile
       return "[" << recursive_select(Value).collect(&:compile).reject(&:empty?).join(", ") << "]"
     end
   end
+
   class Hash < Value
     def validate!
       duplicate_values = find_duplicate_keys
@@ -351,7 +414,6 @@ module LogStash; module Config; module AST
 
   class Branch < Node
     def compile
-
       # this construct is non obvious. we need to loop through each event and apply the conditional.
       # each branch of a conditional will contain a construct (a filter for example) that also loops through
       # the events variable so we have to initialize it to [event] for the branch code.
@@ -397,6 +459,7 @@ module LogStash; module Config; module AST
         << children.collect(&:compile).map { |s| s.split("\n", -1).map { |l| "  " + l }.join("\n") }.join("") << "\n"
     end
   end
+
   class Elsif < BranchEntry
     def compile
       children = recursive_inject { |e| e.is_a?(Branch) || e.is_a?(Plugin) }
@@ -404,6 +467,7 @@ module LogStash; module Config; module AST
         << children.collect(&:compile).map { |s| s.split("\n", -1).map { |l| "  " + l }.join("\n") }.join("") << "\n"
     end
   end
+
   class Else < BranchEntry
     def compile
       children = recursive_inject { |e| e.is_a?(Branch) || e.is_a?(Plugin) }
@@ -472,48 +536,51 @@ module LogStash; module Config; module AST
       return " #{text_value} "
     end
   end
+
   module RegExpOperator
     def compile
       return " #{text_value} "
     end
   end
+
   module BooleanOperator
     def compile
       return " #{text_value} "
     end
   end
+
   class Selector < RValue
     def compile
       return "event.get(#{text_value.inspect})"
     end
   end
+
   class SelectorElement < Node; end
 end; end; end
 
-
 # Monkeypatch Treetop::Runtime::SyntaxNode's inspect method to skip
 # any Whitespace or SyntaxNodes with no children.
 class Treetop::Runtime::SyntaxNode
-  def _inspect(indent="")
+  def _inspect(indent = "")
     em = extension_modules
-    interesting_methods = methods-[em.last ? em.last.methods : nil]-self.class.instance_methods
+    interesting_methods = methods - [em.last ? em.last.methods : nil] - self.class.instance_methods
     im = interesting_methods.size > 0 ? " (#{interesting_methods.join(",")})" : ""
     tv = text_value
     tv = "...#{tv[-20..-1]}" if tv.size > 20
 
     indent +
-    self.class.to_s.sub(/.*:/,'') +
-      em.map{|m| "+"+m.to_s.sub(/.*:/,'')}*"" +
+    self.class.to_s.sub(/.*:/, '') +
+      em.map {|m| "+" + m.to_s.sub(/.*:/, '')} * "" +
       " offset=#{interval.first}" +
       ", #{tv.inspect}" +
       im +
       (elements && elements.size > 0 ?
         ":" +
-          (elements.select { |e| !e.is_a?(LogStash::Config::AST::Whitespace) && e.elements && e.elements.size > 0 }||[]).map{|e|
+          (elements.select { |e| !e.is_a?(LogStash::Config::AST::Whitespace) && e.elements && e.elements.size > 0 } || []).map {|e|
       begin
-        "\n"+e.inspect(indent+"  ")
+        "\n" + e.inspect(indent + "  ")
       rescue  # Defend against inspect not taking a parameter
-        "\n"+indent+" "+e.inspect
+        "\n" + indent + " " + e.inspect
       end
           }.join("") :
         ""
diff --git a/logstash-core/lib/logstash/config/cpu_core_strategy.rb b/logstash-core/lib/logstash/config/cpu_core_strategy.rb
index 5ad9ec34e..0f8adbf3b 100644
--- a/logstash-core/lib/logstash/config/cpu_core_strategy.rb
+++ b/logstash-core/lib/logstash/config/cpu_core_strategy.rb
@@ -1,8 +1,23 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/config/defaults"
 
 module LogStash module Config module CpuCoreStrategy
-
   extend self
 
   def maximum
diff --git a/logstash-core/lib/logstash/config/defaults.rb b/logstash-core/lib/logstash/config/defaults.rb
index ee77065d2..0018d8ae4 100644
--- a/logstash-core/lib/logstash/config/defaults.rb
+++ b/logstash-core/lib/logstash/config/defaults.rb
@@ -1,8 +1,23 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "concurrent"
 
 module LogStash module Config module Defaults
-
   extend self
 
   def input
diff --git a/logstash-core/lib/logstash/config/file.rb b/logstash-core/lib/logstash/config/file.rb
index 3dd6289f5..11cb5ade5 100644
--- a/logstash-core/lib/logstash/config/file.rb
+++ b/logstash-core/lib/logstash/config/file.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/config/grammar"
 require "logstash/config/config_ast"
 require "logger"
diff --git a/logstash-core/lib/logstash/config/grammar.rb b/logstash-core/lib/logstash/config/grammar.rb
index af56cf3a1..e7de111e8 100644
--- a/logstash-core/lib/logstash/config/grammar.rb
+++ b/logstash-core/lib/logstash/config/grammar.rb
@@ -1,7 +1,7 @@
 # Autogenerated from a Treetop grammar. Edits may be lost.
 
 
-require "treetop"
+require "treetop/runtime"
 require "logstash/config/config_ast"
 
 module LogStashConfig
@@ -12,7 +12,7 @@ module LogStashConfig
   end
 
   module Config0
-    def _
+    def cs
       elements[0]
     end
 
@@ -22,7 +22,7 @@ module LogStashConfig
   end
 
   module Config1
-    def _1
+    def cs1
       elements[0]
     end
 
@@ -30,11 +30,11 @@ module LogStashConfig
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[2]
     end
 
-    def _3
+    def cs3
       elements[4]
     end
   end
@@ -44,26 +44,26 @@ module LogStashConfig
     if node_cache[:config].has_key?(index)
       cached = node_cache[:config][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:config][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    r1 = _nt__
+    r1 = _nt_cs
     s0 << r1
     if r1
       r2 = _nt_plugin_section
       s0 << r2
       if r2
-        r3 = _nt__
+        r3 = _nt_cs
         s0 << r3
         if r3
           s4, i4 = [], index
           loop do
             i5, s5 = index, []
-            r6 = _nt__
+            r6 = _nt_cs
             s5 << r6
             if r6
               r7 = _nt_plugin_section
@@ -85,7 +85,7 @@ module LogStashConfig
           r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
           s0 << r4
           if r4
-            r8 = _nt__
+            r8 = _nt_cs
             s0 << r8
           end
         end
@@ -104,7 +104,91 @@ module LogStashConfig
     r0
   end
 
+  module NewlineOrEoi0
+  end
+
+  def _nt_newline_or_eoi
+    start_index = index
+    if node_cache[:newline_or_eoi].has_key?(index)
+      cached = node_cache[:newline_or_eoi][index]
+      if cached
+        node_cache[:newline_or_eoi][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    i1, s1 = index, []
+    if (match_len = has_terminal?("\r", false, index))
+      r3 = true
+      @index += match_len
+    else
+      terminal_parse_failure('"\\r"')
+      r3 = nil
+    end
+    if r3
+      r2 = r3
+    else
+      r2 = instantiate_node(SyntaxNode,input, index...index)
+    end
+    s1 << r2
+    if r2
+      if (match_len = has_terminal?("\n", false, index))
+        r4 = true
+        @index += match_len
+      else
+        terminal_parse_failure('"\\n"')
+        r4 = nil
+      end
+      s1 << r4
+    end
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(NewlineOrEoi0)
+    else
+      @index = i1
+      r1 = nil
+    end
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      i5 = index
+      if index < input_length
+        r6 = true
+        @index += 1
+      else
+        terminal_parse_failure("any character")
+        r6 = nil
+      end
+      if r6
+        @index = i5
+        r5 = nil
+        terminal_parse_failure("any character", true)
+      else
+        @terminal_failures.pop
+        @index = i5
+        r5 = instantiate_node(SyntaxNode,input, index...index)
+      end
+      if r5
+        r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
+        r0 = r5
+      else
+        @index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:newline_or_eoi][start_index] = r0
+
+    r0
+  end
+
   module Comment0
+    def newline_or_eoi
+      elements[3]
+    end
   end
 
   def _nt_comment
@@ -112,7 +196,7 @@ module LogStashConfig
     if node_cache[:comment].has_key?(index)
       cached = node_cache[:comment][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:comment][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -129,21 +213,22 @@ module LogStashConfig
       end
       s1 << r2
       if r2
-        if has_terminal?("#", false, index)
-          r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?("#", false, index))
+          r4 = true
+          @index += match_len
         else
-          terminal_parse_failure("#")
+          terminal_parse_failure('"#"')
           r4 = nil
         end
         s1 << r4
         if r4
           s5, i5 = [], index
           loop do
-            if has_terminal?('\G[^\\r\\n]', true, index)
+            if has_terminal?(@regexps[gr = '\A[^\\r\\n]'] ||= Regexp.new(gr), :regexp, index)
               r6 = true
               @index += 1
             else
+              terminal_parse_failure('[^\\r\\n]')
               r6 = nil
             end
             if r6
@@ -155,29 +240,8 @@ module LogStashConfig
           r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
           s1 << r5
           if r5
-            if has_terminal?("\r", false, index)
-              r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
-            else
-              terminal_parse_failure("\r")
-              r8 = nil
-            end
-            if r8
-              r7 = r8
-            else
-              r7 = instantiate_node(SyntaxNode,input, index...index)
-            end
+            r7 = _nt_newline_or_eoi
             s1 << r7
-            if r7
-              if has_terminal?("\n", false, index)
-                r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
-              else
-                terminal_parse_failure("\n")
-                r9 = nil
-              end
-              s1 << r9
-            end
           end
         end
       end
@@ -206,12 +270,12 @@ module LogStashConfig
     r0
   end
 
-  def _nt__
+  def _nt_cs
     start_index = index
-    if node_cache[:_].has_key?(index)
-      cached = node_cache[:_][index]
+    if node_cache[:cs].has_key?(index)
+      cached = node_cache[:cs][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:cs][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -222,10 +286,12 @@ module LogStashConfig
       i1 = index
       r2 = _nt_comment
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r1 = r2
       else
         r3 = _nt_whitespace
         if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r1 = r3
         else
           @index = i1
@@ -240,7 +306,7 @@ module LogStashConfig
     end
     r0 = instantiate_node(LogStash::Config::AST::Whitespace,input, i0...index, s0)
 
-    node_cache[:_][start_index] = r0
+    node_cache[:cs][start_index] = r0
 
     r0
   end
@@ -250,7 +316,7 @@ module LogStashConfig
     if node_cache[:whitespace].has_key?(index)
       cached = node_cache[:whitespace][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:whitespace][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -258,10 +324,11 @@ module LogStashConfig
 
     s0, i0 = [], index
     loop do
-      if has_terminal?('\G[ \\t\\r\\n]', true, index)
+      if has_terminal?(@regexps[gr = '\A[ \\t\\r\\n]'] ||= Regexp.new(gr), :regexp, index)
         r1 = true
         @index += 1
       else
+        terminal_parse_failure('[ \\t\\r\\n]')
         r1 = nil
       end
       if r1
@@ -287,7 +354,7 @@ module LogStashConfig
       elements[0]
     end
 
-    def _
+    def cs
       elements[1]
     end
   end
@@ -297,11 +364,11 @@ module LogStashConfig
       elements[0]
     end
 
-    def _1
+    def cs1
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -312,7 +379,7 @@ module LogStashConfig
     if node_cache[:plugin_section].has_key?(index)
       cached = node_cache[:plugin_section][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:plugin_section][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -322,19 +389,19 @@ module LogStashConfig
     r1 = _nt_plugin_type
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
-        if has_terminal?("{", false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?("{", false, index))
+          r3 = true
+          @index += match_len
         else
-          terminal_parse_failure("{")
+          terminal_parse_failure('"{"')
           r3 = nil
         end
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
             s5, i5 = [], index
@@ -343,7 +410,7 @@ module LogStashConfig
               r7 = _nt_branch_or_plugin
               s6 << r7
               if r7
-                r8 = _nt__
+                r8 = _nt_cs
                 s6 << r8
               end
               if s6.last
@@ -362,11 +429,11 @@ module LogStashConfig
             r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
             s0 << r5
             if r5
-              if has_terminal?("}", false, index)
-                r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
+              if (match_len = has_terminal?("}", false, index))
+                r9 = true
+                @index += match_len
               else
-                terminal_parse_failure("}")
+                terminal_parse_failure('"}"')
                 r9 = nil
               end
               s0 << r9
@@ -393,7 +460,7 @@ module LogStashConfig
     if node_cache[:branch_or_plugin].has_key?(index)
       cached = node_cache[:branch_or_plugin][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:branch_or_plugin][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -402,10 +469,12 @@ module LogStashConfig
     i0 = index
     r1 = _nt_branch
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
       r2 = _nt_plugin
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
         @index = i0
@@ -423,41 +492,44 @@ module LogStashConfig
     if node_cache[:plugin_type].has_key?(index)
       cached = node_cache[:plugin_type][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:plugin_type][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0 = index
-    if has_terminal?("input", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 5))
-      @index += 5
+    if (match_len = has_terminal?("input", false, index))
+      r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
     else
-      terminal_parse_failure("input")
+      terminal_parse_failure('"input"')
       r1 = nil
     end
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
-      if has_terminal?("filter", false, index)
-        r2 = instantiate_node(SyntaxNode,input, index...(index + 6))
-        @index += 6
+      if (match_len = has_terminal?("filter", false, index))
+        r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        @index += match_len
       else
-        terminal_parse_failure("filter")
+        terminal_parse_failure('"filter"')
         r2 = nil
       end
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
-        if has_terminal?("output", false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 6))
-          @index += 6
+        if (match_len = has_terminal?("output", false, index))
+          r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
-          terminal_parse_failure("output")
+          terminal_parse_failure('"output"')
           r3 = nil
         end
         if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
           @index = i0
@@ -472,7 +544,7 @@ module LogStashConfig
   end
 
   module Plugins0
-    def _
+    def cs
       elements[0]
     end
 
@@ -493,7 +565,7 @@ module LogStashConfig
     if node_cache[:plugins].has_key?(index)
       cached = node_cache[:plugins][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:plugins][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -506,7 +578,7 @@ module LogStashConfig
       s3, i3 = [], index
       loop do
         i4, s4 = index, []
-        r5 = _nt__
+        r5 = _nt_cs
         s4 << r5
         if r5
           r6 = _nt_plugin
@@ -551,7 +623,7 @@ module LogStashConfig
       elements[0]
     end
 
-    def _
+    def cs
       elements[1]
     end
 
@@ -572,11 +644,11 @@ module LogStashConfig
       elements[0]
     end
 
-    def _1
+    def cs1
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -584,7 +656,7 @@ module LogStashConfig
       elements[4]
     end
 
-    def _3
+    def cs3
       elements[5]
     end
 
@@ -595,7 +667,7 @@ module LogStashConfig
     if node_cache[:plugin].has_key?(index)
       cached = node_cache[:plugin][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:plugin][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -605,19 +677,19 @@ module LogStashConfig
     r1 = _nt_name
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
-        if has_terminal?("{", false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?("{", false, index))
+          r3 = true
+          @index += match_len
         else
-          terminal_parse_failure("{")
+          terminal_parse_failure('"{"')
           r3 = nil
         end
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
             i6, s6 = index, []
@@ -630,7 +702,7 @@ module LogStashConfig
                 r10 = _nt_whitespace
                 s9 << r10
                 if r10
-                  r11 = _nt__
+                  r11 = _nt_cs
                   s9 << r11
                   if r11
                     r12 = _nt_attribute
@@ -667,14 +739,14 @@ module LogStashConfig
             end
             s0 << r5
             if r5
-              r13 = _nt__
+              r13 = _nt_cs
               s0 << r13
               if r13
-                if has_terminal?("}", false, index)
-                  r14 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
+                if (match_len = has_terminal?("}", false, index))
+                  r14 = true
+                  @index += match_len
                 else
-                  terminal_parse_failure("}")
+                  terminal_parse_failure('"}"')
                   r14 = nil
                 end
                 s0 << r14
@@ -702,7 +774,7 @@ module LogStashConfig
     if node_cache[:name].has_key?(index)
       cached = node_cache[:name][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:name][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -711,10 +783,11 @@ module LogStashConfig
     i0 = index
     s1, i1 = [], index
     loop do
-      if has_terminal?('\G[A-Za-z0-9_-]', true, index)
+      if has_terminal?(@regexps[gr = '\A[A-Za-z0-9_-]'] ||= Regexp.new(gr), :regexp, index)
         r2 = true
         @index += 1
       else
+        terminal_parse_failure('[A-Za-z0-9_-]')
         r2 = nil
       end
       if r2
@@ -730,10 +803,12 @@ module LogStashConfig
       r1 = instantiate_node(LogStash::Config::AST::Name,input, i1...index, s1)
     end
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
       r3 = _nt_string
       if r3
+        r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
         r0 = r3
       else
         @index = i0
@@ -751,11 +826,11 @@ module LogStashConfig
       elements[0]
     end
 
-    def _1
+    def cs1
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -769,7 +844,7 @@ module LogStashConfig
     if node_cache[:attribute].has_key?(index)
       cached = node_cache[:attribute][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:attribute][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -779,19 +854,19 @@ module LogStashConfig
     r1 = _nt_name
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
-        if has_terminal?("=>", false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 2))
-          @index += 2
+        if (match_len = has_terminal?("=>", false, index))
+          r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
-          terminal_parse_failure("=>")
+          terminal_parse_failure('"=>"')
           r3 = nil
         end
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
             r5 = _nt_value
@@ -818,7 +893,7 @@ module LogStashConfig
     if node_cache[:value].has_key?(index)
       cached = node_cache[:value][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:value][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -827,26 +902,32 @@ module LogStashConfig
     i0 = index
     r1 = _nt_plugin
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
       r2 = _nt_bareword
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
         r3 = _nt_string
         if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
           r4 = _nt_number
           if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
           else
             r5 = _nt_array
             if r5
+              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
               r0 = r5
             else
               r6 = _nt_hash
               if r6
+                r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
                 r0 = r6
               else
                 @index = i0
@@ -868,7 +949,7 @@ module LogStashConfig
     if node_cache[:array_value].has_key?(index)
       cached = node_cache[:array_value][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:array_value][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -877,22 +958,27 @@ module LogStashConfig
     i0 = index
     r1 = _nt_bareword
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
       r2 = _nt_string
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
         r3 = _nt_number
         if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
           r4 = _nt_array
           if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
           else
             r5 = _nt_hash
             if r5
+              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
               r0 = r5
             else
               @index = i0
@@ -916,27 +1002,29 @@ module LogStashConfig
     if node_cache[:bareword].has_key?(index)
       cached = node_cache[:bareword][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:bareword][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?('\G[A-Za-z_]', true, index)
+    if has_terminal?(@regexps[gr = '\A[A-Za-z_]'] ||= Regexp.new(gr), :regexp, index)
       r1 = true
       @index += 1
     else
+      terminal_parse_failure('[A-Za-z_]')
       r1 = nil
     end
     s0 << r1
     if r1
       s2, i2 = [], index
       loop do
-        if has_terminal?('\G[A-Za-z0-9_]', true, index)
+        if has_terminal?(@regexps[gr = '\A[A-Za-z0-9_]'] ||= Regexp.new(gr), :regexp, index)
           r3 = true
           @index += 1
         else
+          terminal_parse_failure('[A-Za-z0-9_]')
           r3 = nil
         end
         if r3
@@ -977,18 +1065,18 @@ module LogStashConfig
     if node_cache[:double_quoted_string].has_key?(index)
       cached = node_cache[:double_quoted_string][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:double_quoted_string][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?('"', false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
-      @index += 1
+    if (match_len = has_terminal?('"', false, index))
+      r1 = true
+      @index += match_len
     else
-      terminal_parse_failure('"')
+      terminal_parse_failure('\'"\'')
       r1 = nil
     end
     s0 << r1
@@ -996,35 +1084,39 @@ module LogStashConfig
       s2, i2 = [], index
       loop do
         i3 = index
-        if has_terminal?('\"', false, index)
-          r4 = instantiate_node(SyntaxNode,input, index...(index + 2))
-          @index += 2
+        if (match_len = has_terminal?('\"', false, index))
+          r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
-          terminal_parse_failure('\"')
+          terminal_parse_failure('\'\\"\'')
           r4 = nil
         end
         if r4
+          r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
           r3 = r4
         else
           i5, s5 = index, []
           i6 = index
-          if has_terminal?('"', false, index)
-            r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            @index += 1
+          if (match_len = has_terminal?('"', false, index))
+            r7 = true
+            @index += match_len
           else
-            terminal_parse_failure('"')
+            terminal_parse_failure('\'"\'')
             r7 = nil
           end
           if r7
+            @index = i6
             r6 = nil
+            terminal_parse_failure('\'"\'', true)
           else
+            @terminal_failures.pop
             @index = i6
             r6 = instantiate_node(SyntaxNode,input, index...index)
           end
           s5 << r6
           if r6
             if index < input_length
-              r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              r8 = true
               @index += 1
             else
               terminal_parse_failure("any character")
@@ -1040,6 +1132,7 @@ module LogStashConfig
             r5 = nil
           end
           if r5
+            r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
             r3 = r5
           else
             @index = i3
@@ -1055,11 +1148,11 @@ module LogStashConfig
       r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
       s0 << r2
       if r2
-        if has_terminal?('"', false, index)
-          r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?('"', false, index))
+          r9 = true
+          @index += match_len
         else
-          terminal_parse_failure('"')
+          terminal_parse_failure('\'"\'')
           r9 = nil
         end
         s0 << r9
@@ -1089,18 +1182,18 @@ module LogStashConfig
     if node_cache[:single_quoted_string].has_key?(index)
       cached = node_cache[:single_quoted_string][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:single_quoted_string][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?("'", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
-      @index += 1
+    if (match_len = has_terminal?("'", false, index))
+      r1 = true
+      @index += match_len
     else
-      terminal_parse_failure("'")
+      terminal_parse_failure('"\'"')
       r1 = nil
     end
     s0 << r1
@@ -1108,35 +1201,39 @@ module LogStashConfig
       s2, i2 = [], index
       loop do
         i3 = index
-        if has_terminal?("\\'", false, index)
-          r4 = instantiate_node(SyntaxNode,input, index...(index + 2))
-          @index += 2
+        if (match_len = has_terminal?("\\'", false, index))
+          r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
-          terminal_parse_failure("\\'")
+          terminal_parse_failure('"\\\\\'"')
           r4 = nil
         end
         if r4
+          r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
           r3 = r4
         else
           i5, s5 = index, []
           i6 = index
-          if has_terminal?("'", false, index)
-            r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            @index += 1
+          if (match_len = has_terminal?("'", false, index))
+            r7 = true
+            @index += match_len
           else
-            terminal_parse_failure("'")
+            terminal_parse_failure('"\'"')
             r7 = nil
           end
           if r7
+            @index = i6
             r6 = nil
+            terminal_parse_failure('"\'"', true)
           else
+            @terminal_failures.pop
             @index = i6
             r6 = instantiate_node(SyntaxNode,input, index...index)
           end
           s5 << r6
           if r6
             if index < input_length
-              r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              r8 = true
               @index += 1
             else
               terminal_parse_failure("any character")
@@ -1152,6 +1249,7 @@ module LogStashConfig
             r5 = nil
           end
           if r5
+            r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
             r3 = r5
           else
             @index = i3
@@ -1167,11 +1265,11 @@ module LogStashConfig
       r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
       s0 << r2
       if r2
-        if has_terminal?("'", false, index)
-          r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?("'", false, index))
+          r9 = true
+          @index += match_len
         else
-          terminal_parse_failure("'")
+          terminal_parse_failure('"\'"')
           r9 = nil
         end
         s0 << r9
@@ -1195,7 +1293,7 @@ module LogStashConfig
     if node_cache[:string].has_key?(index)
       cached = node_cache[:string][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:string][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -1204,10 +1302,12 @@ module LogStashConfig
     i0 = index
     r1 = _nt_double_quoted_string
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
       r2 = _nt_single_quoted_string
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
         @index = i0
@@ -1231,18 +1331,18 @@ module LogStashConfig
     if node_cache[:regexp].has_key?(index)
       cached = node_cache[:regexp][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:regexp][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?('/', false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
-      @index += 1
+    if (match_len = has_terminal?('/', false, index))
+      r1 = true
+      @index += match_len
     else
-      terminal_parse_failure('/')
+      terminal_parse_failure('\'/\'')
       r1 = nil
     end
     s0 << r1
@@ -1250,35 +1350,39 @@ module LogStashConfig
       s2, i2 = [], index
       loop do
         i3 = index
-        if has_terminal?('\/', false, index)
-          r4 = instantiate_node(SyntaxNode,input, index...(index + 2))
-          @index += 2
+        if (match_len = has_terminal?('\/', false, index))
+          r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
-          terminal_parse_failure('\/')
+          terminal_parse_failure('\'\\/\'')
           r4 = nil
         end
         if r4
+          r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
           r3 = r4
         else
           i5, s5 = index, []
           i6 = index
-          if has_terminal?('/', false, index)
-            r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            @index += 1
+          if (match_len = has_terminal?('/', false, index))
+            r7 = true
+            @index += match_len
           else
-            terminal_parse_failure('/')
+            terminal_parse_failure('\'/\'')
             r7 = nil
           end
           if r7
+            @index = i6
             r6 = nil
+            terminal_parse_failure('\'/\'', true)
           else
+            @terminal_failures.pop
             @index = i6
             r6 = instantiate_node(SyntaxNode,input, index...index)
           end
           s5 << r6
           if r6
             if index < input_length
-              r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              r8 = true
               @index += 1
             else
               terminal_parse_failure("any character")
@@ -1294,6 +1398,7 @@ module LogStashConfig
             r5 = nil
           end
           if r5
+            r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
             r3 = r5
           else
             @index = i3
@@ -1309,11 +1414,11 @@ module LogStashConfig
       r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
       s0 << r2
       if r2
-        if has_terminal?('/', false, index)
-          r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?('/', false, index))
+          r9 = true
+          @index += match_len
         else
-          terminal_parse_failure('/')
+          terminal_parse_failure('\'/\'')
           r9 = nil
         end
         s0 << r9
@@ -1343,18 +1448,18 @@ module LogStashConfig
     if node_cache[:number].has_key?(index)
       cached = node_cache[:number][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:number][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?("-", false, index)
-      r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
-      @index += 1
+    if (match_len = has_terminal?("-", false, index))
+      r2 = true
+      @index += match_len
     else
-      terminal_parse_failure("-")
+      terminal_parse_failure('"-"')
       r2 = nil
     end
     if r2
@@ -1366,10 +1471,11 @@ module LogStashConfig
     if r1
       s3, i3 = [], index
       loop do
-        if has_terminal?('\G[0-9]', true, index)
+        if has_terminal?(@regexps[gr = '\A[0-9]'] ||= Regexp.new(gr), :regexp, index)
           r4 = true
           @index += 1
         else
+          terminal_parse_failure('[0-9]')
           r4 = nil
         end
         if r4
@@ -1387,21 +1493,22 @@ module LogStashConfig
       s0 << r3
       if r3
         i6, s6 = index, []
-        if has_terminal?(".", false, index)
-          r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?(".", false, index))
+          r7 = true
+          @index += match_len
         else
-          terminal_parse_failure(".")
+          terminal_parse_failure('"."')
           r7 = nil
         end
         s6 << r7
         if r7
           s8, i8 = [], index
           loop do
-            if has_terminal?('\G[0-9]', true, index)
+            if has_terminal?(@regexps[gr = '\A[0-9]'] ||= Regexp.new(gr), :regexp, index)
               r9 = true
               @index += 1
             else
+              terminal_parse_failure('[0-9]')
               r9 = nil
             end
             if r9
@@ -1442,11 +1549,11 @@ module LogStashConfig
   end
 
   module Array0
-    def _1
+    def cs1
       elements[0]
     end
 
-    def _2
+    def cs2
       elements[2]
     end
 
@@ -1463,11 +1570,11 @@ module LogStashConfig
   end
 
   module Array2
-    def _1
+    def cs1
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -1478,23 +1585,23 @@ module LogStashConfig
     if node_cache[:array].has_key?(index)
       cached = node_cache[:array][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:array][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?("[", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
-      @index += 1
+    if (match_len = has_terminal?("[", false, index))
+      r1 = true
+      @index += match_len
     else
-      terminal_parse_failure("[")
+      terminal_parse_failure('"["')
       r1 = nil
     end
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
         i4, s4 = index, []
@@ -1504,19 +1611,19 @@ module LogStashConfig
           s6, i6 = [], index
           loop do
             i7, s7 = index, []
-            r8 = _nt__
+            r8 = _nt_cs
             s7 << r8
             if r8
-              if has_terminal?(",", false, index)
-                r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
+              if (match_len = has_terminal?(",", false, index))
+                r9 = true
+                @index += match_len
               else
-                terminal_parse_failure(",")
+                terminal_parse_failure('","')
                 r9 = nil
               end
               s7 << r9
               if r9
-                r10 = _nt__
+                r10 = _nt_cs
                 s7 << r10
                 if r10
                   r11 = _nt_value
@@ -1554,14 +1661,14 @@ module LogStashConfig
         end
         s0 << r3
         if r3
-          r12 = _nt__
+          r12 = _nt_cs
           s0 << r12
           if r12
-            if has_terminal?("]", false, index)
-              r13 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
+            if (match_len = has_terminal?("]", false, index))
+              r13 = true
+              @index += match_len
             else
-              terminal_parse_failure("]")
+              terminal_parse_failure('"]"')
               r13 = nil
             end
             s0 << r13
@@ -1583,11 +1690,11 @@ module LogStashConfig
   end
 
   module Hash0
-    def _1
+    def cs1
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -1598,23 +1705,23 @@ module LogStashConfig
     if node_cache[:hash].has_key?(index)
       cached = node_cache[:hash][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:hash][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?("{", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
-      @index += 1
+    if (match_len = has_terminal?("{", false, index))
+      r1 = true
+      @index += match_len
     else
-      terminal_parse_failure("{")
+      terminal_parse_failure('"{"')
       r1 = nil
     end
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
         r4 = _nt_hashentries
@@ -1625,14 +1732,14 @@ module LogStashConfig
         end
         s0 << r3
         if r3
-          r5 = _nt__
+          r5 = _nt_cs
           s0 << r5
           if r5
-            if has_terminal?("}", false, index)
-              r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
+            if (match_len = has_terminal?("}", false, index))
+              r6 = true
+              @index += match_len
             else
-              terminal_parse_failure("}")
+              terminal_parse_failure('"}"')
               r6 = nil
             end
             s0 << r6
@@ -1654,7 +1761,7 @@ module LogStashConfig
   end
 
   module Hashentries0
-    def whitespace
+    def cs
       elements[0]
     end
 
@@ -1675,7 +1782,7 @@ module LogStashConfig
     if node_cache[:hashentries].has_key?(index)
       cached = node_cache[:hashentries][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:hashentries][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -1688,7 +1795,7 @@ module LogStashConfig
       s2, i2 = [], index
       loop do
         i3, s3 = index, []
-        r4 = _nt_whitespace
+        r4 = _nt_cs
         s3 << r4
         if r4
           r5 = _nt_hashentry
@@ -1728,11 +1835,11 @@ module LogStashConfig
       elements[0]
     end
 
-    def _1
+    def cs1
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -1746,7 +1853,7 @@ module LogStashConfig
     if node_cache[:hashentry].has_key?(index)
       cached = node_cache[:hashentry][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:hashentry][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -1756,14 +1863,17 @@ module LogStashConfig
     i1 = index
     r2 = _nt_number
     if r2
+      r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
       r1 = r2
     else
       r3 = _nt_bareword
       if r3
+        r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
         r1 = r3
       else
         r4 = _nt_string
         if r4
+          r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
           r1 = r4
         else
           @index = i1
@@ -1773,19 +1883,19 @@ module LogStashConfig
     end
     s0 << r1
     if r1
-      r5 = _nt__
+      r5 = _nt_cs
       s0 << r5
       if r5
-        if has_terminal?("=>", false, index)
-          r6 = instantiate_node(SyntaxNode,input, index...(index + 2))
-          @index += 2
+        if (match_len = has_terminal?("=>", false, index))
+          r6 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
-          terminal_parse_failure("=>")
+          terminal_parse_failure('"=>"')
           r6 = nil
         end
         s0 << r6
         if r6
-          r7 = _nt__
+          r7 = _nt_cs
           s0 << r7
           if r7
             r8 = _nt_value
@@ -1808,7 +1918,7 @@ module LogStashConfig
   end
 
   module Branch0
-    def _
+    def cs
       elements[0]
     end
 
@@ -1818,7 +1928,7 @@ module LogStashConfig
   end
 
   module Branch1
-    def _
+    def cs
       elements[0]
     end
 
@@ -1839,7 +1949,7 @@ module LogStashConfig
     if node_cache[:branch].has_key?(index)
       cached = node_cache[:branch][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:branch][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -1852,7 +1962,7 @@ module LogStashConfig
       s2, i2 = [], index
       loop do
         i3, s3 = index, []
-        r4 = _nt__
+        r4 = _nt_cs
         s3 << r4
         if r4
           r5 = _nt_else_if
@@ -1875,7 +1985,7 @@ module LogStashConfig
       s0 << r2
       if r2
         i7, s7 = index, []
-        r8 = _nt__
+        r8 = _nt_cs
         s7 << r8
         if r8
           r9 = _nt_else
@@ -1914,13 +2024,13 @@ module LogStashConfig
       elements[0]
     end
 
-    def _
+    def cs
       elements[1]
     end
   end
 
   module If1
-    def _1
+    def cs1
       elements[1]
     end
 
@@ -1928,11 +2038,11 @@ module LogStashConfig
       elements[2]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
-    def _3
+    def cs3
       elements[5]
     end
 
@@ -1943,41 +2053,41 @@ module LogStashConfig
     if node_cache[:if].has_key?(index)
       cached = node_cache[:if][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:if][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?("if", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 2))
-      @index += 2
+    if (match_len = has_terminal?("if", false, index))
+      r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
     else
-      terminal_parse_failure("if")
+      terminal_parse_failure('"if"')
       r1 = nil
     end
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
         r3 = _nt_condition
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
-            if has_terminal?("{", false, index)
-              r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
+            if (match_len = has_terminal?("{", false, index))
+              r5 = true
+              @index += match_len
             else
-              terminal_parse_failure("{")
+              terminal_parse_failure('"{"')
               r5 = nil
             end
             s0 << r5
             if r5
-              r6 = _nt__
+              r6 = _nt_cs
               s0 << r6
               if r6
                 s7, i7 = [], index
@@ -1986,7 +2096,7 @@ module LogStashConfig
                   r9 = _nt_branch_or_plugin
                   s8 << r9
                   if r9
-                    r10 = _nt__
+                    r10 = _nt_cs
                     s8 << r10
                   end
                   if s8.last
@@ -2005,11 +2115,11 @@ module LogStashConfig
                 r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
                 s0 << r7
                 if r7
-                  if has_terminal?("}", false, index)
-                    r11 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                    @index += 1
+                  if (match_len = has_terminal?("}", false, index))
+                    r11 = true
+                    @index += match_len
                   else
-                    terminal_parse_failure("}")
+                    terminal_parse_failure('"}"')
                     r11 = nil
                   end
                   s0 << r11
@@ -2038,17 +2148,17 @@ module LogStashConfig
       elements[0]
     end
 
-    def _
+    def cs
       elements[1]
     end
   end
 
   module ElseIf1
-    def _1
+    def cs1
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -2056,11 +2166,11 @@ module LogStashConfig
       elements[4]
     end
 
-    def _3
+    def cs3
       elements[5]
     end
 
-    def _4
+    def cs4
       elements[7]
     end
 
@@ -2071,53 +2181,53 @@ module LogStashConfig
     if node_cache[:else_if].has_key?(index)
       cached = node_cache[:else_if][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:else_if][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?("else", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 4))
-      @index += 4
+    if (match_len = has_terminal?("else", false, index))
+      r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
     else
-      terminal_parse_failure("else")
+      terminal_parse_failure('"else"')
       r1 = nil
     end
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
-        if has_terminal?("if", false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 2))
-          @index += 2
+        if (match_len = has_terminal?("if", false, index))
+          r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
-          terminal_parse_failure("if")
+          terminal_parse_failure('"if"')
           r3 = nil
         end
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
             r5 = _nt_condition
             s0 << r5
             if r5
-              r6 = _nt__
+              r6 = _nt_cs
               s0 << r6
               if r6
-                if has_terminal?("{", false, index)
-                  r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
+                if (match_len = has_terminal?("{", false, index))
+                  r7 = true
+                  @index += match_len
                 else
-                  terminal_parse_failure("{")
+                  terminal_parse_failure('"{"')
                   r7 = nil
                 end
                 s0 << r7
                 if r7
-                  r8 = _nt__
+                  r8 = _nt_cs
                   s0 << r8
                   if r8
                     s9, i9 = [], index
@@ -2126,7 +2236,7 @@ module LogStashConfig
                       r11 = _nt_branch_or_plugin
                       s10 << r11
                       if r11
-                        r12 = _nt__
+                        r12 = _nt_cs
                         s10 << r12
                       end
                       if s10.last
@@ -2145,11 +2255,11 @@ module LogStashConfig
                     r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
                     s0 << r9
                     if r9
-                      if has_terminal?("}", false, index)
-                        r13 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                        @index += 1
+                      if (match_len = has_terminal?("}", false, index))
+                        r13 = true
+                        @index += match_len
                       else
-                        terminal_parse_failure("}")
+                        terminal_parse_failure('"}"')
                         r13 = nil
                       end
                       s0 << r13
@@ -2180,17 +2290,17 @@ module LogStashConfig
       elements[0]
     end
 
-    def _
+    def cs
       elements[1]
     end
   end
 
   module Else1
-    def _1
+    def cs1
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -2201,35 +2311,35 @@ module LogStashConfig
     if node_cache[:else].has_key?(index)
       cached = node_cache[:else][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:else][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?("else", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 4))
-      @index += 4
+    if (match_len = has_terminal?("else", false, index))
+      r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
     else
-      terminal_parse_failure("else")
+      terminal_parse_failure('"else"')
       r1 = nil
     end
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
-        if has_terminal?("{", false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?("{", false, index))
+          r3 = true
+          @index += match_len
         else
-          terminal_parse_failure("{")
+          terminal_parse_failure('"{"')
           r3 = nil
         end
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
             s5, i5 = [], index
@@ -2238,7 +2348,7 @@ module LogStashConfig
               r7 = _nt_branch_or_plugin
               s6 << r7
               if r7
-                r8 = _nt__
+                r8 = _nt_cs
                 s6 << r8
               end
               if s6.last
@@ -2257,11 +2367,11 @@ module LogStashConfig
             r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
             s0 << r5
             if r5
-              if has_terminal?("}", false, index)
-                r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
+              if (match_len = has_terminal?("}", false, index))
+                r9 = true
+                @index += match_len
               else
-                terminal_parse_failure("}")
+                terminal_parse_failure('"}"')
                 r9 = nil
               end
               s0 << r9
@@ -2284,7 +2394,7 @@ module LogStashConfig
   end
 
   module Condition0
-    def _1
+    def cs1
       elements[0]
     end
 
@@ -2292,7 +2402,7 @@ module LogStashConfig
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[2]
     end
 
@@ -2313,7 +2423,7 @@ module LogStashConfig
     if node_cache[:condition].has_key?(index)
       cached = node_cache[:condition][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:condition][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -2326,13 +2436,13 @@ module LogStashConfig
       s2, i2 = [], index
       loop do
         i3, s3 = index, []
-        r4 = _nt__
+        r4 = _nt_cs
         s3 << r4
         if r4
           r5 = _nt_boolean_operator
           s3 << r5
           if r5
-            r6 = _nt__
+            r6 = _nt_cs
             s3 << r6
             if r6
               r7 = _nt_expression
@@ -2370,7 +2480,7 @@ module LogStashConfig
   end
 
   module Expression0
-    def _1
+    def cs1
       elements[1]
     end
 
@@ -2378,7 +2488,7 @@ module LogStashConfig
       elements[2]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -2389,7 +2499,7 @@ module LogStashConfig
     if node_cache[:expression].has_key?(index)
       cached = node_cache[:expression][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:expression][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -2397,29 +2507,29 @@ module LogStashConfig
 
     i0 = index
     i1, s1 = index, []
-    if has_terminal?("(", false, index)
-      r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
-      @index += 1
+    if (match_len = has_terminal?("(", false, index))
+      r2 = true
+      @index += match_len
     else
-      terminal_parse_failure("(")
+      terminal_parse_failure('"("')
       r2 = nil
     end
     s1 << r2
     if r2
-      r3 = _nt__
+      r3 = _nt_cs
       s1 << r3
       if r3
         r4 = _nt_condition
         s1 << r4
         if r4
-          r5 = _nt__
+          r5 = _nt_cs
           s1 << r5
           if r5
-            if has_terminal?(")", false, index)
-              r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
+            if (match_len = has_terminal?(")", false, index))
+              r6 = true
+              @index += match_len
             else
-              terminal_parse_failure(")")
+              terminal_parse_failure('")"')
               r6 = nil
             end
             s1 << r6
@@ -2435,36 +2545,43 @@ module LogStashConfig
       r1 = nil
     end
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
       r0.extend(LogStash::Config::AST::Expression)
     else
       r7 = _nt_negative_expression
       if r7
+        r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
         r0 = r7
         r0.extend(LogStash::Config::AST::Expression)
       else
         r8 = _nt_in_expression
         if r8
+          r8 = SyntaxNode.new(input, (index-1)...index) if r8 == true
           r0 = r8
           r0.extend(LogStash::Config::AST::Expression)
         else
           r9 = _nt_not_in_expression
           if r9
+            r9 = SyntaxNode.new(input, (index-1)...index) if r9 == true
             r0 = r9
             r0.extend(LogStash::Config::AST::Expression)
           else
             r10 = _nt_compare_expression
             if r10
+              r10 = SyntaxNode.new(input, (index-1)...index) if r10 == true
               r0 = r10
               r0.extend(LogStash::Config::AST::Expression)
             else
               r11 = _nt_regexp_expression
               if r11
+                r11 = SyntaxNode.new(input, (index-1)...index) if r11 == true
                 r0 = r11
                 r0.extend(LogStash::Config::AST::Expression)
               else
                 r12 = _nt_rvalue
                 if r12
+                  r12 = SyntaxNode.new(input, (index-1)...index) if r12 == true
                   r0 = r12
                   r0.extend(LogStash::Config::AST::Expression)
                 else
@@ -2484,11 +2601,11 @@ module LogStashConfig
   end
 
   module NegativeExpression0
-    def _1
+    def cs1
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -2496,14 +2613,14 @@ module LogStashConfig
       elements[4]
     end
 
-    def _3
+    def cs3
       elements[5]
     end
 
   end
 
   module NegativeExpression1
-    def _
+    def cs
       elements[1]
     end
 
@@ -2517,7 +2634,7 @@ module LogStashConfig
     if node_cache[:negative_expression].has_key?(index)
       cached = node_cache[:negative_expression][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:negative_expression][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -2525,41 +2642,41 @@ module LogStashConfig
 
     i0 = index
     i1, s1 = index, []
-    if has_terminal?("!", false, index)
-      r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
-      @index += 1
+    if (match_len = has_terminal?("!", false, index))
+      r2 = true
+      @index += match_len
     else
-      terminal_parse_failure("!")
+      terminal_parse_failure('"!"')
       r2 = nil
     end
     s1 << r2
     if r2
-      r3 = _nt__
+      r3 = _nt_cs
       s1 << r3
       if r3
-        if has_terminal?("(", false, index)
-          r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?("(", false, index))
+          r4 = true
+          @index += match_len
         else
-          terminal_parse_failure("(")
+          terminal_parse_failure('"("')
           r4 = nil
         end
         s1 << r4
         if r4
-          r5 = _nt__
+          r5 = _nt_cs
           s1 << r5
           if r5
             r6 = _nt_condition
             s1 << r6
             if r6
-              r7 = _nt__
+              r7 = _nt_cs
               s1 << r7
               if r7
-                if has_terminal?(")", false, index)
-                  r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
+                if (match_len = has_terminal?(")", false, index))
+                  r8 = true
+                  @index += match_len
                 else
-                  terminal_parse_failure(")")
+                  terminal_parse_failure('")"')
                   r8 = nil
                 end
                 s1 << r8
@@ -2577,20 +2694,21 @@ module LogStashConfig
       r1 = nil
     end
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
       r0.extend(LogStash::Config::AST::NegativeExpression)
     else
       i9, s9 = index, []
-      if has_terminal?("!", false, index)
-        r10 = instantiate_node(SyntaxNode,input, index...(index + 1))
-        @index += 1
+      if (match_len = has_terminal?("!", false, index))
+        r10 = true
+        @index += match_len
       else
-        terminal_parse_failure("!")
+        terminal_parse_failure('"!"')
         r10 = nil
       end
       s9 << r10
       if r10
-        r11 = _nt__
+        r11 = _nt_cs
         s9 << r11
         if r11
           r12 = _nt_selector
@@ -2605,6 +2723,7 @@ module LogStashConfig
         r9 = nil
       end
       if r9
+        r9 = SyntaxNode.new(input, (index-1)...index) if r9 == true
         r0 = r9
         r0.extend(LogStash::Config::AST::NegativeExpression)
       else
@@ -2623,7 +2742,7 @@ module LogStashConfig
       elements[0]
     end
 
-    def _1
+    def cs1
       elements[1]
     end
 
@@ -2631,7 +2750,7 @@ module LogStashConfig
       elements[2]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -2645,7 +2764,7 @@ module LogStashConfig
     if node_cache[:in_expression].has_key?(index)
       cached = node_cache[:in_expression][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:in_expression][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -2655,13 +2774,13 @@ module LogStashConfig
     r1 = _nt_rvalue
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
         r3 = _nt_in_operator
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
             r5 = _nt_rvalue
@@ -2688,7 +2807,7 @@ module LogStashConfig
       elements[0]
     end
 
-    def _1
+    def cs1
       elements[1]
     end
 
@@ -2696,7 +2815,7 @@ module LogStashConfig
       elements[2]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -2710,7 +2829,7 @@ module LogStashConfig
     if node_cache[:not_in_expression].has_key?(index)
       cached = node_cache[:not_in_expression][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:not_in_expression][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -2720,13 +2839,13 @@ module LogStashConfig
     r1 = _nt_rvalue
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
         r3 = _nt_not_in_operator
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
             r5 = _nt_rvalue
@@ -2753,17 +2872,17 @@ module LogStashConfig
     if node_cache[:in_operator].has_key?(index)
       cached = node_cache[:in_operator][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:in_operator][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
-    if has_terminal?("in", false, index)
-      r0 = instantiate_node(SyntaxNode,input, index...(index + 2))
-      @index += 2
+    if (match_len = has_terminal?("in", false, index))
+      r0 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
     else
-      terminal_parse_failure("in")
+      terminal_parse_failure('"in"')
       r0 = nil
     end
 
@@ -2773,7 +2892,7 @@ module LogStashConfig
   end
 
   module NotInOperator0
-    def _
+    def cs
       elements[1]
     end
 
@@ -2784,30 +2903,30 @@ module LogStashConfig
     if node_cache[:not_in_operator].has_key?(index)
       cached = node_cache[:not_in_operator][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:not_in_operator][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?("not ", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 4))
-      @index += 4
+    if (match_len = has_terminal?("not ", false, index))
+      r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
     else
-      terminal_parse_failure("not ")
+      terminal_parse_failure('"not "')
       r1 = nil
     end
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
-        if has_terminal?("in", false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 2))
-          @index += 2
+        if (match_len = has_terminal?("in", false, index))
+          r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
-          terminal_parse_failure("in")
+          terminal_parse_failure('"in"')
           r3 = nil
         end
         s0 << r3
@@ -2831,7 +2950,7 @@ module LogStashConfig
     if node_cache[:rvalue].has_key?(index)
       cached = node_cache[:rvalue][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:rvalue][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -2840,26 +2959,32 @@ module LogStashConfig
     i0 = index
     r1 = _nt_string
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
       r2 = _nt_number
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
         r3 = _nt_selector
         if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
           r4 = _nt_array
           if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
           else
             r5 = _nt_method_call
             if r5
+              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
               r0 = r5
             else
               r6 = _nt_regexp
               if r6
+                r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
                 r0 = r6
               else
                 @index = i0
@@ -2877,11 +3002,11 @@ module LogStashConfig
   end
 
   module MethodCall0
-    def _1
+    def cs1
       elements[0]
     end
 
-    def _2
+    def cs2
       elements[2]
     end
 
@@ -2902,15 +3027,15 @@ module LogStashConfig
       elements[0]
     end
 
-    def _1
+    def cs1
       elements[1]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
-    def _3
+    def cs3
       elements[5]
     end
 
@@ -2921,7 +3046,7 @@ module LogStashConfig
     if node_cache[:method_call].has_key?(index)
       cached = node_cache[:method_call][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:method_call][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -2931,19 +3056,19 @@ module LogStashConfig
     r1 = _nt_method
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
-        if has_terminal?("(", false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?("(", false, index))
+          r3 = true
+          @index += match_len
         else
-          terminal_parse_failure("(")
+          terminal_parse_failure('"("')
           r3 = nil
         end
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
             i6, s6 = index, []
@@ -2953,19 +3078,19 @@ module LogStashConfig
               s8, i8 = [], index
               loop do
                 i9, s9 = index, []
-                r10 = _nt__
+                r10 = _nt_cs
                 s9 << r10
                 if r10
-                  if has_terminal?(",", false, index)
-                    r11 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                    @index += 1
+                  if (match_len = has_terminal?(",", false, index))
+                    r11 = true
+                    @index += match_len
                   else
-                    terminal_parse_failure(",")
+                    terminal_parse_failure('","')
                     r11 = nil
                   end
                   s9 << r11
                   if r11
-                    r12 = _nt__
+                    r12 = _nt_cs
                     s9 << r12
                     if r12
                       r13 = _nt_rvalue
@@ -3003,14 +3128,14 @@ module LogStashConfig
             end
             s0 << r5
             if r5
-              r14 = _nt__
+              r14 = _nt_cs
               s0 << r14
               if r14
-                if has_terminal?(")", false, index)
-                  r15 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
+                if (match_len = has_terminal?(")", false, index))
+                  r15 = true
+                  @index += match_len
                 else
-                  terminal_parse_failure(")")
+                  terminal_parse_failure('")"')
                   r15 = nil
                 end
                 s0 << r15
@@ -3038,7 +3163,7 @@ module LogStashConfig
     if node_cache[:method].has_key?(index)
       cached = node_cache[:method][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:method][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -3056,7 +3181,7 @@ module LogStashConfig
       elements[0]
     end
 
-    def _1
+    def cs1
       elements[1]
     end
 
@@ -3064,7 +3189,7 @@ module LogStashConfig
       elements[2]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -3078,7 +3203,7 @@ module LogStashConfig
     if node_cache[:compare_expression].has_key?(index)
       cached = node_cache[:compare_expression][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:compare_expression][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -3088,13 +3213,13 @@ module LogStashConfig
     r1 = _nt_rvalue
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
         r3 = _nt_compare_operator
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
             r5 = _nt_rvalue
@@ -3121,76 +3246,82 @@ module LogStashConfig
     if node_cache[:compare_operator].has_key?(index)
       cached = node_cache[:compare_operator][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:compare_operator][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0 = index
-    if has_terminal?("==", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 2))
-      @index += 2
+    if (match_len = has_terminal?("==", false, index))
+      r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
     else
-      terminal_parse_failure("==")
+      terminal_parse_failure('"=="')
       r1 = nil
     end
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
       r0.extend(LogStash::Config::AST::ComparisonOperator)
     else
-      if has_terminal?("!=", false, index)
-        r2 = instantiate_node(SyntaxNode,input, index...(index + 2))
-        @index += 2
+      if (match_len = has_terminal?("!=", false, index))
+        r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        @index += match_len
       else
-        terminal_parse_failure("!=")
+        terminal_parse_failure('"!="')
         r2 = nil
       end
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
         r0.extend(LogStash::Config::AST::ComparisonOperator)
       else
-        if has_terminal?("<=", false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 2))
-          @index += 2
+        if (match_len = has_terminal?("<=", false, index))
+          r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
-          terminal_parse_failure("<=")
+          terminal_parse_failure('"<="')
           r3 = nil
         end
         if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
           r0.extend(LogStash::Config::AST::ComparisonOperator)
         else
-          if has_terminal?(">=", false, index)
-            r4 = instantiate_node(SyntaxNode,input, index...(index + 2))
-            @index += 2
+          if (match_len = has_terminal?(">=", false, index))
+            r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+            @index += match_len
           else
-            terminal_parse_failure(">=")
+            terminal_parse_failure('">="')
             r4 = nil
           end
           if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
             r0.extend(LogStash::Config::AST::ComparisonOperator)
           else
-            if has_terminal?("<", false, index)
-              r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
+            if (match_len = has_terminal?("<", false, index))
+              r5 = true
+              @index += match_len
             else
-              terminal_parse_failure("<")
+              terminal_parse_failure('"<"')
               r5 = nil
             end
             if r5
+              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
               r0 = r5
               r0.extend(LogStash::Config::AST::ComparisonOperator)
             else
-              if has_terminal?(">", false, index)
-                r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
+              if (match_len = has_terminal?(">", false, index))
+                r6 = true
+                @index += match_len
               else
-                terminal_parse_failure(">")
+                terminal_parse_failure('">"')
                 r6 = nil
               end
               if r6
+                r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
                 r0 = r6
                 r0.extend(LogStash::Config::AST::ComparisonOperator)
               else
@@ -3213,7 +3344,7 @@ module LogStashConfig
       elements[0]
     end
 
-    def _1
+    def cs1
       elements[1]
     end
 
@@ -3221,7 +3352,7 @@ module LogStashConfig
       elements[2]
     end
 
-    def _2
+    def cs2
       elements[3]
     end
 
@@ -3232,7 +3363,7 @@ module LogStashConfig
     if node_cache[:regexp_expression].has_key?(index)
       cached = node_cache[:regexp_expression][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:regexp_expression][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -3242,22 +3373,24 @@ module LogStashConfig
     r1 = _nt_rvalue
     s0 << r1
     if r1
-      r2 = _nt__
+      r2 = _nt_cs
       s0 << r2
       if r2
         r3 = _nt_regexp_operator
         s0 << r3
         if r3
-          r4 = _nt__
+          r4 = _nt_cs
           s0 << r4
           if r4
             i5 = index
             r6 = _nt_string
             if r6
+              r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
               r5 = r6
             else
               r7 = _nt_regexp
               if r7
+                r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
                 r5 = r7
               else
                 @index = i5
@@ -3287,32 +3420,34 @@ module LogStashConfig
     if node_cache[:regexp_operator].has_key?(index)
       cached = node_cache[:regexp_operator][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:regexp_operator][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0 = index
-    if has_terminal?("=~", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 2))
-      @index += 2
+    if (match_len = has_terminal?("=~", false, index))
+      r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
     else
-      terminal_parse_failure("=~")
+      terminal_parse_failure('"=~"')
       r1 = nil
     end
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
       r0.extend(LogStash::Config::AST::RegExpOperator)
     else
-      if has_terminal?("!~", false, index)
-        r2 = instantiate_node(SyntaxNode,input, index...(index + 2))
-        @index += 2
+      if (match_len = has_terminal?("!~", false, index))
+        r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        @index += match_len
       else
-        terminal_parse_failure("!~")
+        terminal_parse_failure('"!~"')
         r2 = nil
       end
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
         r0.extend(LogStash::Config::AST::RegExpOperator)
       else
@@ -3331,54 +3466,58 @@ module LogStashConfig
     if node_cache[:boolean_operator].has_key?(index)
       cached = node_cache[:boolean_operator][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:boolean_operator][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0 = index
-    if has_terminal?("and", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 3))
-      @index += 3
+    if (match_len = has_terminal?("and", false, index))
+      r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
     else
-      terminal_parse_failure("and")
+      terminal_parse_failure('"and"')
       r1 = nil
     end
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
       r0.extend(LogStash::Config::AST::BooleanOperator)
     else
-      if has_terminal?("or", false, index)
-        r2 = instantiate_node(SyntaxNode,input, index...(index + 2))
-        @index += 2
+      if (match_len = has_terminal?("or", false, index))
+        r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        @index += match_len
       else
-        terminal_parse_failure("or")
+        terminal_parse_failure('"or"')
         r2 = nil
       end
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
         r0.extend(LogStash::Config::AST::BooleanOperator)
       else
-        if has_terminal?("xor", false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 3))
-          @index += 3
+        if (match_len = has_terminal?("xor", false, index))
+          r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
-          terminal_parse_failure("xor")
+          terminal_parse_failure('"xor"')
           r3 = nil
         end
         if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
           r0.extend(LogStash::Config::AST::BooleanOperator)
         else
-          if has_terminal?("nand", false, index)
-            r4 = instantiate_node(SyntaxNode,input, index...(index + 4))
-            @index += 4
+          if (match_len = has_terminal?("nand", false, index))
+            r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+            @index += match_len
           else
-            terminal_parse_failure("nand")
+            terminal_parse_failure('"nand"')
             r4 = nil
           end
           if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
             r0.extend(LogStash::Config::AST::BooleanOperator)
           else
@@ -3399,7 +3538,7 @@ module LogStashConfig
     if node_cache[:selector].has_key?(index)
       cached = node_cache[:selector][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:selector][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -3434,28 +3573,29 @@ module LogStashConfig
     if node_cache[:selector_element].has_key?(index)
       cached = node_cache[:selector_element][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:selector_element][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?("[", false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
-      @index += 1
+    if (match_len = has_terminal?("[", false, index))
+      r1 = true
+      @index += match_len
     else
-      terminal_parse_failure("[")
+      terminal_parse_failure('"["')
       r1 = nil
     end
     s0 << r1
     if r1
       s2, i2 = [], index
       loop do
-        if has_terminal?('\G[^\\],]', true, index)
+        if has_terminal?(@regexps[gr = '\A[^\\]\\[,]'] ||= Regexp.new(gr), :regexp, index)
           r3 = true
           @index += 1
         else
+          terminal_parse_failure('[^\\]\\[,]')
           r3 = nil
         end
         if r3
@@ -3472,11 +3612,11 @@ module LogStashConfig
       end
       s0 << r2
       if r2
-        if has_terminal?("]", false, index)
-          r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?("]", false, index))
+          r4 = true
+          @index += match_len
         else
-          terminal_parse_failure("]")
+          terminal_parse_failure('"]"')
           r4 = nil
         end
         s0 << r4
diff --git a/logstash-core/lib/logstash/config/grammar.treetop b/logstash-core/lib/logstash/config/grammar.treetop
index e46fc5530..e0497c832 100644
--- a/logstash-core/lib/logstash/config/grammar.treetop
+++ b/logstash-core/lib/logstash/config/grammar.treetop
@@ -1,16 +1,21 @@
-require "treetop"
+require "treetop/runtime"
 require "logstash/config/config_ast"
 
 grammar LogStashConfig
   rule config
-    _ plugin_section _ (_ plugin_section)* _ <LogStash::Config::AST::Config>
+    cs plugin_section cs (cs plugin_section)* cs <LogStash::Config::AST::Config>
+  end
+
+  rule newline_or_eoi
+    # `!.` is a negative lookahead for 'anything', i.e. it matches at the end of input.
+    ("\r"? "\n") / !.
   end
 
   rule comment
-    (whitespace? "#" [^\r\n]* "\r"? "\n")+ <LogStash::Config::AST::Comment>
+    (whitespace? "#" [^\r\n]* newline_or_eoi)+ <LogStash::Config::AST::Comment>
   end
 
-  rule _
+  rule cs
     (comment / whitespace)* <LogStash::Config::AST::Whitespace>
   end
 
@@ -19,8 +24,8 @@ grammar LogStashConfig
   end
 
   rule plugin_section
-    plugin_type _ "{"
-      _ (branch_or_plugin _)*
+    plugin_type cs "{"
+      cs (branch_or_plugin cs)*
     "}"
     <LogStash::Config::AST::PluginSection>
   end
@@ -34,15 +39,15 @@ grammar LogStashConfig
   end
 
   rule plugins
-    (plugin (_ plugin)*)?
+    (plugin (cs plugin)*)?
     <LogStash::Config::AST::Plugins>
   end
 
   rule plugin
-    name _ "{"
-      _
-      attributes:( attribute (whitespace _ attribute)*)?
-      _
+    name cs "{"
+      cs
+      attributes:( attribute (whitespace cs attribute)*)?
+      cs
     "}"
     <LogStash::Config::AST::Plugin>
   end
@@ -55,7 +60,7 @@ grammar LogStashConfig
   end
 
   rule attribute
-    name _ "=>" _ value
+    name cs "=>" cs value
     <LogStash::Config::AST::Attribute>
   end
 
@@ -95,63 +100,63 @@ grammar LogStashConfig
 
   rule array
     "["
-    _
+    cs
     (
-      value (_ "," _ value)*
+      value (cs "," cs value)*
     )?
-    _
+    cs
     "]"
     <LogStash::Config::AST::Array>
   end
 
   rule hash
     "{"
-      _
+      cs
       hashentries?
-      _
+      cs
     "}"
     <LogStash::Config::AST::Hash>
   end
 
   rule hashentries
-    hashentry (whitespace hashentry)*
+    hashentry (cs hashentry)*
     <LogStash::Config::AST::HashEntries>
   end
 
   rule hashentry
-    name:(number / bareword / string) _ "=>" _ value
+    name:(number / bareword / string) cs "=>" cs value
     <LogStash::Config::AST::HashEntry>
   end
 
   # Conditions
   rule branch
-    if (_ else_if)* (_ else)?
+    if (cs else_if)* (cs else)?
     <LogStash::Config::AST::Branch>
   end
 
   rule if
-    "if" _ condition _ "{" _ (branch_or_plugin _)* "}"
+    "if" cs condition cs "{" cs (branch_or_plugin cs)* "}"
     <LogStash::Config::AST::If>
   end
 
   rule else_if
-    "else" _ "if" _ condition _ "{" _ ( branch_or_plugin _)* "}"
+    "else" cs "if" cs condition cs "{" cs ( branch_or_plugin cs)* "}"
     <LogStash::Config::AST::Elsif>
   end
 
   rule else
-    "else" _ "{" _ (branch_or_plugin _)* "}"
+    "else" cs "{" cs (branch_or_plugin cs)* "}"
     <LogStash::Config::AST::Else>
   end
 
   rule condition
-    expression (_ boolean_operator _ expression)*
+    expression (cs boolean_operator cs expression)*
     <LogStash::Config::AST::Condition>
   end
 
   rule expression
     (
-        ("(" _ condition _ ")")
+        ("(" cs condition cs ")")
       / negative_expression
       / in_expression
       / not_in_expression
@@ -163,18 +168,18 @@ grammar LogStashConfig
 
   rule negative_expression
     (
-        ("!" _ "(" _ condition _ ")")
-      / ("!" _ selector)
+        ("!" cs "(" cs condition cs ")")
+      / ("!" cs selector)
     ) <LogStash::Config::AST::NegativeExpression>
   end
 
   rule in_expression
-    rvalue _ in_operator _ rvalue
+    rvalue cs in_operator cs rvalue
     <LogStash::Config::AST::InExpression>
   end
 
   rule not_in_expression
-    rvalue _ not_in_operator _ rvalue
+    rvalue cs not_in_operator cs rvalue
     <LogStash::Config::AST::NotInExpression>
   end
 
@@ -183,7 +188,7 @@ grammar LogStashConfig
   end
 
   rule not_in_operator
-    "not " _ "in"
+    "not " cs "in"
   end
 
   rule rvalue
@@ -191,11 +196,11 @@ grammar LogStashConfig
   end
 
   rule method_call
-      method _ "(" _
+      method cs "(" cs
         (
-          rvalue ( _ "," _ rvalue )*
+          rvalue ( cs "," cs rvalue )*
         )?
-      _ ")"
+      cs ")"
     <LogStash::Config::AST::MethodCall>
   end
 
@@ -204,7 +209,7 @@ grammar LogStashConfig
   end
 
   rule compare_expression
-    rvalue _ compare_operator _ rvalue
+    rvalue cs compare_operator cs rvalue
     <LogStash::Config::AST::ComparisonExpression>
   end
   
@@ -214,7 +219,7 @@ grammar LogStashConfig
   end
 
   rule regexp_expression
-    rvalue _  regexp_operator _ (string / regexp)
+    rvalue cs  regexp_operator cs (string / regexp)
     <LogStash::Config::AST::RegexpExpression>
   end
 
@@ -234,7 +239,7 @@ grammar LogStashConfig
   end
 
   rule selector_element
-    "[" [^\],]+ "]"
+    "[" [^\]\[,]+ "]"
     <LogStash::Config::AST::SelectorElement>
   end
 
diff --git a/logstash-core/lib/logstash/config/lir_serializer.rb b/logstash-core/lib/logstash/config/lir_serializer.rb
new file mode 100644
index 000000000..e3389cb6d
--- /dev/null
+++ b/logstash-core/lib/logstash/config/lir_serializer.rb
@@ -0,0 +1,172 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'logstash-core'
+require 'logstash/compiler'
+
+module LogStash;
+  module Config;
+  class LIRSerializer
+    attr_reader :lir_pipeline
+
+    def self.serialize(lir_pipeline)
+      self.new(lir_pipeline).serialize
+    end
+
+    def initialize(lir_pipeline)
+      @lir_pipeline = lir_pipeline
+    end
+
+    def serialize
+      {
+        "hash" => lir_pipeline.unique_hash,
+        "type" => "lir",
+        "version" => "0.0.0",
+        "graph" => {
+          "vertices" => vertices,
+          "edges" => edges
+        }
+      }
+    end
+
+    def vertices
+      graph.getVertices.map {|v| vertex(v) }.compact
+    end
+
+    def edges
+      remove_separators_from_edges(graph.getEdges)
+    end
+
+    def graph
+      lir_pipeline.graph
+    end
+
+    def vertex(v)
+      hashified_vertex = case vertex_type(v)
+                         when :plugin
+                           plugin_vertex(v)
+                         when :if
+                           if_vertex(v)
+                         when :queue
+                           queue_vertex(v)
+                         when :separator
+                           nil
+                         end
+
+      decorate_vertex(v, hashified_vertex) unless hashified_vertex.nil?
+    end
+
+    def vertex_type(v)
+      if v.kind_of?(org.logstash.config.ir.graph.PluginVertex)
+        :plugin
+      elsif v.kind_of?(org.logstash.config.ir.graph.IfVertex)
+        :if
+      elsif v.kind_of?(org.logstash.config.ir.graph.QueueVertex)
+        :queue
+      elsif v.kind_of?(org.logstash.config.ir.graph.SeparatorVertex)
+        :separator
+      else
+        raise "Unexpected vertex type! #{v}"
+      end
+    end
+
+    def decorate_vertex(v, v_json)
+      v_json["meta"] = format_swm(v.source_with_metadata)
+      v_json["id"] = v.id
+      v_json["explicit_id"] = !!v.explicit_id
+      v_json["type"] = vertex_type(v).to_s
+      v_json
+    end
+
+    def plugin_vertex(v)
+      pd = v.plugin_definition
+      {
+        "config_name" => pd.name,
+        "plugin_type" => pd.getType.to_s.downcase
+      }
+    end
+
+    def if_vertex(v)
+      {
+        "condition" => v.humanReadableExpression
+      }
+    end
+
+    def queue_vertex(v)
+      {}
+    end
+
+    def separator_vertex(v)
+      {}
+    end
+
+    # For separators, create new edges going between the incoming and all of the outgoing edges, and remove
+    # the separator vertices from the serialized output.
+    def remove_separators_from_edges(edges)
+      edges_with_separators_removed = []
+      edges.each do |e|
+        if vertex_type(e.to) == :separator
+          e.to.getOutgoingEdges.each do |outgoing|
+            if e.kind_of?(org.logstash.config.ir.graph.BooleanEdge)
+              edges_with_separators_removed << edge(org.logstash.config.ir.graph.BooleanEdge.new(e.edgeType, e.from, outgoing.to))
+            else
+              edges_with_separators_removed << edge(org.logstash.config.ir.graph.PlainEdge.factory.make(e.from, outgoing.to))
+            end
+          end
+        elsif vertex_type(e.from) == :separator
+          # Skip the edges coming from the 'from' separator
+        else
+          edges_with_separators_removed << edge(e)
+        end
+      end
+      edges_with_separators_removed
+    end
+
+    def edge(e)
+      e_json = {
+        "from" => e.from.id,
+        "to" => e.to.id,
+        "id" => e.id
+      }
+
+      if e.kind_of?(org.logstash.config.ir.graph.BooleanEdge)
+        e_json["when"] = e.edge_type
+        e_json["type"] = "boolean"
+      else
+        e_json["type"] = "plain"
+      end
+
+      e_json
+    end
+
+    def format_swm(source_with_metadata)
+      return nil unless source_with_metadata
+      {
+        "source" => {
+          "protocol" => source_with_metadata.protocol,
+          "id" => source_with_metadata.id,
+          "line" =>  source_with_metadata.line,
+          "column" => source_with_metadata.column
+          # We omit the text of the source code for security reasons
+          # raw text may contain passwords
+        }
+      }
+    end
+
+  end
+  end
+end
diff --git a/logstash-core/lib/logstash/config/mixin.rb b/logstash-core/lib/logstash/config/mixin.rb
index 30fb44d75..5e04ec730 100644
--- a/logstash-core/lib/logstash/config/mixin.rb
+++ b/logstash-core/lib/logstash/config/mixin.rb
@@ -1,9 +1,26 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/util/password"
 require "logstash/util/safe_uri"
 require "logstash/version"
 require "logstash/environment"
 require "logstash/util/plugin_version"
+require "logstash/codecs/delegator"
 require "filesize"
 
 LogStash::Environment.load_locale!
@@ -30,15 +47,12 @@ LogStash::Environment.load_locale!
 # }
 #
 module LogStash::Config::Mixin
-
   include LogStash::Util::SubstitutionVariables
+  include LogStash::Util::Loggable
 
   attr_accessor :config
   attr_accessor :original_params
 
-  PLUGIN_VERSION_1_0_0 = LogStash::Util::PluginVersion.new(1, 0, 0)
-  PLUGIN_VERSION_0_9_0 = LogStash::Util::PluginVersion.new(0, 9, 0)
-
   # This method is called when someone does 'include LogStash::Config'
   def self.included(base)
     # Add the DSL methods to the 'base' given.
@@ -79,7 +93,18 @@ module LogStash::Config::Mixin
 
     # Resolve environment variables references
     params.each do |name, value|
-      params[name.to_s] = deep_replace(value)
+      params[name.to_s] = deep_replace(value, true)
+    end
+
+    # Intercept codecs that have not been instantiated
+    params.each do |name, value|
+      validator = self.class.validator_find(name)
+      next unless validator && validator[:validate] == :codec && value.kind_of?(String)
+
+      codec_klass = LogStash::Plugin.lookup("codec", value)
+      codec_instance = LogStash::Plugins::Contextualizer.initialize_plugin(execution_context, codec_klass)
+
+      params[name.to_s] = LogStash::Codecs::Delegator.new(codec_instance)
     end
 
     if !self.class.validate(params)
@@ -98,14 +123,14 @@ module LogStash::Config::Mixin
       if opts && opts[:deprecated]
         extra = opts[:deprecated].is_a?(String) ? opts[:deprecated] : ""
         extra.gsub!("%PLUGIN%", self.class.config_name)
-        self.logger.warn("You are using a deprecated config setting " +
-                     "#{name.inspect} set in #{self.class.config_name}. " +
-                     "Deprecated settings will continue to work, " +
-                     "but are scheduled for removal from logstash " +
-                     "in the future. #{extra} If you have any questions " +
-                     "about this, please visit the #logstash channel " +
-                     "on freenode irc.", :name => name, :plugin => self)
-
+        self.deprecation_logger.deprecated(
+          "You are using a deprecated config setting #{name.inspect} set in " \
+          "#{self.class.config_name}. Deprecated settings will continue to work, " \
+          "but are scheduled for removal from logstash in the future. #{extra} " \
+          "If you have any questions about this, please ask it on the " \
+          "https://discuss.elastic.co/c/logstash discussion forum",
+          {}
+        )
       end
 
       if opts && opts[:obsolete]
@@ -140,7 +165,6 @@ module LogStash::Config::Mixin
   end # def config_init
 
   module DSL
-
     include LogStash::Util::SubstitutionVariables
 
     attr_accessor :flags
@@ -166,14 +190,23 @@ module LogStash::Config::Mixin
     end
 
     # Define a new configuration setting
-    def config(name, opts={})
+    #
+    # @param name [String, Symbol, Regexp]
+    # @param opts [Hash]: the options for this config parameter
+    # @option opts [Array,Symbol] :validate
+    #   When `Array`, the expanded form of the given directive MUST exist in the Array.
+    #   When `Symbol`, the named validator matching the provided `Symbol` is used.
+    # @option opts [Boolean]      :list
+    # @option opts [Object]       :default
+    # @option opts [Boolean]      :required
+    def config(name, opts = {})
       @config ||= Hash.new
       # TODO(sissel): verify 'name' is of type String, Symbol, or Regexp
 
       name = name.to_s if name.is_a?(Symbol)
       @config[name] = opts  # ok if this is empty
 
-      if name.is_a?(String)
+      if name.is_a?(String) && opts.fetch(:attr_accessor, true)
         define_method(name) { instance_variable_get("@#{name}") }
         define_method("#{name}=") { |v| instance_variable_set("@#{name}", v) }
       end
@@ -200,7 +233,7 @@ module LogStash::Config::Mixin
       # add any options from this class
       prefix = self.name.split("::").last.downcase
       @flags.each do |flag|
-        flagpart = flag[:args].first.gsub(/^--/,"")
+        flagpart = flag[:args].first.gsub(/^--/, "")
         # TODO(sissel): logger things here could help debugging.
 
         opts.on("--#{prefix}-#{flagpart}", *flag[:args][1..-1], &flag[:block])
@@ -219,7 +252,6 @@ module LogStash::Config::Mixin
         end
       end
       subclass.instance_variable_set("@config", subconfig)
-      @@version_notice_given = false
     end # def inherited
 
     def validate(params)
@@ -227,8 +259,6 @@ module LogStash::Config::Mixin
       @plugin_type = ancestors.find { |a| a.name =~ /::Base$/ }.config_name
       is_valid = true
 
-      print_version_notice
-
       is_valid &&= validate_check_invalid_parameter_names(params)
       is_valid &&= validate_check_required_parameter_names(params)
       is_valid &&= validate_check_parameter_values(params)
@@ -236,35 +266,6 @@ module LogStash::Config::Mixin
       return is_valid
     end # def validate
 
-    # TODO: Remove in 6.0
-    def print_version_notice
-      return if @@version_notice_given
-
-      begin
-        plugin_version = LogStash::Util::PluginVersion.find_plugin_version!(@plugin_type, @config_name)
-
-        if plugin_version < PLUGIN_VERSION_1_0_0
-          if plugin_version < PLUGIN_VERSION_0_9_0
-            self.logger.info(I18n.t("logstash.plugin.version.0-1-x",
-                                :type => @plugin_type,
-                                :name => @config_name,
-                                :LOGSTASH_VERSION => LOGSTASH_VERSION))
-          else
-            self.logger.info(I18n.t("logstash.plugin.version.0-9-x",
-                                :type => @plugin_type,
-                                :name => @config_name,
-                                :LOGSTASH_VERSION => LOGSTASH_VERSION))
-          end
-        end
-      rescue LogStash::PluginNoVersionError
-        # This can happen because of one of the following:
-        # - The plugin is loaded from the plugins.path and contains no gemspec.
-        # - The plugin is defined in a universal plugin, so the loaded plugin doesn't correspond to an actual gemspec.
-      ensure
-        @@version_notice_given = true
-      end
-    end
-
     def validate_check_invalid_parameter_names(params)
       invalid_params = params.keys
       # Filter out parameters that match regexp keys.
@@ -325,6 +326,8 @@ module LogStash::Config::Mixin
         # Empty lists are converted to nils
         return true, [] if value.empty?
 
+        return validate_value(value, :uri_list) if config_val == :uri
+
         validated_items = value.map {|v| validate_value(v, config_val)}
         is_valid = validated_items.all? {|sr| sr[0] }
         processed_value = validated_items.map {|sr| sr[1]}
@@ -381,6 +384,32 @@ module LogStash::Config::Mixin
       return nil
     end
 
+    ##
+    # Performs deep replacement of the provided value, then performs validation and coercion.
+    #
+    # The provided validator can be nil, an Array of acceptable values, or a Symbol
+    # representing a named validator, and is the result of a configuration parameter's `:validate` option (@see DSL#config)
+    #
+    # @overload validate_value(value, validator)
+    #   Validation occurs with the named validator.
+    #   @param value [Object]
+    #   @param validator [Symbol]
+    # @overload validate_value(value, validator)
+    #   The value must exist in the provided Array.
+    #   @param value [Object]
+    #   @param validator [Array]
+    # @overload validate_value(value, validator)
+    #   The value is always considered valid
+    #   @param value [Object]
+    #   @param validator [nil]
+    #
+    # @return [Array<(true, Object)>]: when value is valid, a tuple containing true and a coerced form of the value is returned
+    # @return [Array<(false, String)>]: when value is not valid, a tuple containing false and an error string is returned.
+    #
+    # @api private
+    #
+    # WARNING: validators added here must be back-ported to the Validation Support plugin mixin so that plugins
+    #          that use them are not constrained to the version of Logstash that introduced the validator.
     def validate_value(value, validator)
       # Validator comes from the 'config' pieces of plugins.
       # They look like this
@@ -410,7 +439,12 @@ module LogStash::Config::Mixin
         case validator
           when :codec
             if value.first.is_a?(String)
-              value = LogStash::Plugin.lookup("codec", value.first).new
+              # A plugin's codecs should be instantiated by `PluginFactory` or in `Config::Mixin#config_init(Hash)`,
+              # which ensure the inner plugin has access to the outer's execution context and metric store.
+              # This deprecation exists to warn plugins that call `Config::Mixin::validate_value` directly.
+              self.deprecation_logger.deprecated("Codec instantiated by `Config::Mixin::DSL::validate_value(String, :codec)` which cannot propagate parent plugin's execution context or metrics. ",
+                                                 self.logger.debug? ? {:backtrace => caller} : {})
+              value = LogStash::Codecs::Delegator.new LogStash::Plugin.lookup("codec", value.first).new
               return true, value
             else
               value = value.first
@@ -511,6 +545,15 @@ module LogStash::Config::Mixin
             end
 
             result = value.first.is_a?(::LogStash::Util::SafeURI) ? value.first : ::LogStash::Util::SafeURI.new(value.first)
+          when :uri_list
+            # expand entries that have space-delimited URIs in strings.
+            # This validator is considered private, and can be accessed
+            # by specifying `:validate => :uri` and `:list => true`
+            result = value.flat_map do |entry|
+              entry.kind_of?(String) ? entry.split(' ') : entry
+            end.map do |expanded_entry|
+              ::LogStash::Util::SafeURI.from(expanded_entry)
+            end
           when :path
             if value.size > 1 # Only 1 value wanted
               return false, "Expected path (one value), got #{value.size} values?"
@@ -521,7 +564,7 @@ module LogStash::Config::Mixin
               #return false, "Require absolute path, got relative path #{value.first}?"
             #end
 
-            if !File.exists?(value.first) # Check if the file exists
+            if !File.exist?(value.first) # Check if the file exists
               return false, "File does not exist or cannot be opened #{value.first}"
             end
 
@@ -533,6 +576,24 @@ module LogStash::Config::Mixin
             rescue ArgumentError
               return false, "Unparseable filesize: #{value.first}. possible units (KiB, MiB, ...) e.g. '10 KiB'. doc reference: http://www.elastic.co/guide/en/logstash/current/configuration.html#bytes"
             end
+          when :field_reference # @since 7.11
+            return [false, "Expected exactly one field reference, got `#{value.inspect}`"] unless value.kind_of?(Array) && value.size <= 1
+            return [true, nil] if value.empty? || value.first.nil? || value.first.empty?
+
+            candidate = value.first
+
+            return [false, "Expected a valid field reference, got `#{candidate.inspect}`"] unless org.logstash.FieldReference.isValid(candidate)
+
+            return [true, candidate]
+          when :sha_256_hex # since 8.3
+            return [false, "Expected exactly one hex-encoded SHA-256 fingerprint, got `#{value.inspect}`"] unless value.kind_of?(Array) && value.size <= 1
+            return [true, nil] if value.empty? || value.first.nil? || value.first.empty?
+
+            candidate = value.first
+
+            return [false, "Expected a hex-encoded SHA-256 fingerprint, got `#{candidate.inspect}`"] unless candidate.kind_of?(String) && candidate =~ /\A(?:[[:xdigit:]]{2}:?){32}\z/
+
+            return [true, candidate.upcase.tr('^0-9A-F', '')]
           else
             return false, "Unknown validator symbol #{validator}"
         end # case validator
diff --git a/logstash-core/lib/logstash/config/modules_common.rb b/logstash-core/lib/logstash/config/modules_common.rb
deleted file mode 100644
index 28a9f22c9..000000000
--- a/logstash-core/lib/logstash/config/modules_common.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-# encoding: utf-8
-require "logstash/elasticsearch_client"
-require "logstash/modules/kibana_client"
-require "logstash/modules/elasticsearch_importer"
-require "logstash/modules/kibana_importer"
-require "logstash/modules/settings_merger"
-
-module LogStash module Config
-  class ModulesCommon # extracted here for bwc with 5.x
-    include LogStash::Util::Loggable
-
-    MODULES_MAX_PIPELINES = 1
-
-    def self.pipeline_configs(settings)
-      pipelines = []
-      plugin_modules = LogStash::PLUGIN_REGISTRY.plugins_with_type(:modules)
-
-      cli_settings = settings.get("modules.cli")
-      yml_settings = settings.get("modules")
-
-      modules_array = if !(cli_settings.empty? && yml_settings.empty?)
-            LogStash::Modules::SettingsMerger.merge(cli_settings, yml_settings)
-          elsif cli_settings.empty?
-             yml_settings
-          else
-            cli_settings
-          end
-
-      if modules_array.empty?
-        # no specified modules
-        return pipelines
-      end
-      logger.debug("Specified modules", :modules_array => modules_array.to_s)
-
-      module_names = modules_array.collect {|module_hash| module_hash["name"]}
-      if module_names.size > MODULES_MAX_PIPELINES
-        error_message = I18n.t("logstash.modules.configuration.modules-too-many-specified", :max => MODULES_MAX_PIPELINES, :specified_modules => module_names.join(', '))
-        raise LogStash::ConfigLoadingError, error_message
-      end
-
-      if module_names.length > module_names.uniq.length
-        duplicate_modules = module_names.group_by(&:to_s).select { |_,v| v.size > 1 }.keys
-        raise LogStash::ConfigLoadingError, I18n.t("logstash.modules.configuration.modules-must-be-unique", :duplicate_modules => duplicate_modules)
-      end
-
-      available_module_names = plugin_modules.map(&:module_name)
-      specified_and_available_names = module_names & available_module_names
-
-      if (specified_and_available_names).empty?
-        i18n_opts = {:specified_modules => module_names, :available_modules => available_module_names}
-        raise LogStash::ConfigLoadingError, I18n.t("logstash.modules.configuration.modules-unavailable", i18n_opts)
-      end
-
-      specified_and_available_names.each do |module_name|
-        connect_fail_args = {}
-        begin
-          module_settings = settings.clone
-
-          module_hash = modules_array.find {|m| m["name"] == module_name}
-          current_module = plugin_modules.find { |allmodules| allmodules.module_name == module_name }
-
-          enabled = current_module.is_enabled?(module_settings)
-          unless enabled
-            logger.warn("The #{module_name} module is not enabled. Please check the logs for additional information.")
-            next
-          end
-
-
-          alt_name = "module-#{module_name}"
-          pipeline_id = alt_name
-          module_settings.set("pipeline.id", pipeline_id)
-          LogStash::Modules::SettingsMerger.merge_cloud_settings(module_hash, module_settings)
-          LogStash::Modules::SettingsMerger.merge_kibana_auth!(module_hash)
-          current_module.with_settings(module_hash)
-          config_test = settings.get("config.test_and_exit")
-          module_setup = settings.get("modules_setup")
-          # Only import data if it's not a config test and --setup is true
-          if !config_test && module_setup
-            logger.info("Setting up the #{module_name} module")
-            esclient = LogStash::ElasticsearchClient.build(module_hash)
-            kbnclient = LogStash::Modules::KibanaClient.new(module_hash)
-            esconnected = esclient.can_connect?
-            kbnconnected = kbnclient.can_connect?
-            if esconnected && kbnconnected
-              current_module.add_kibana_version(kbnclient.version_parts)
-              current_module.import(
-                  LogStash::Modules::ElasticsearchImporter.new(esclient),
-                  LogStash::Modules::KibanaImporter.new(kbnclient)
-                )
-            else
-              connect_fail_args[:module_name] = module_name
-              connect_fail_args[:elasticsearch_hosts] = esclient.host_settings
-              connect_fail_args[:kibana_hosts] = kbnclient.host_settings
-            end
-          else
-            logger.info("Starting the #{module_name} module")
-          end
-
-          config_string = current_module.config_string
-          pipelines << {"pipeline_id" => pipeline_id, "alt_name" => alt_name, "config_string" => config_string, "settings" => module_settings}
-        rescue => e
-          new_error = LogStash::ConfigLoadingError.new(I18n.t("logstash.modules.configuration.parse-failed", :error => e.message))
-          new_error.set_backtrace(e.backtrace)
-          raise new_error
-        end
-
-        if !connect_fail_args.empty?
-          raise LogStash::ConfigLoadingError, I18n.t("logstash.modules.configuration.elasticsearch_connection_failed", connect_fail_args)
-        end
-      end
-      pipelines
-    end
-
-  end
-end end
diff --git a/logstash-core/lib/logstash/config/pipeline_config.rb b/logstash-core/lib/logstash/config/pipeline_config.rb
index d93b444b4..6981162ff 100644
--- a/logstash-core/lib/logstash/config/pipeline_config.rb
+++ b/logstash-core/lib/logstash/config/pipeline_config.rb
@@ -1,48 +1,20 @@
-# encoding: utf-8
-require "digest"
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
-module LogStash module Config
-  class PipelineConfig
-    include LogStash::Util::Loggable
-
-    attr_reader :source, :pipeline_id, :config_parts, :settings, :read_at
-
-    def initialize(source, pipeline_id, config_parts, settings)
-      @source = source
-      @pipeline_id = pipeline_id
-      # We can't use Array() since config_parts may be a java object!
-      config_parts_array = config_parts.is_a?(Array) ? config_parts : [config_parts]
-      @config_parts = config_parts_array.sort_by { |config_part| [config_part.protocol.to_s, config_part.id] }
-      @settings = settings
-      @read_at = Time.now
-    end
-
-    def config_hash
-      @config_hash ||= Digest::SHA1.hexdigest(config_string)
-    end
-
-    def config_string
-      @config_string = config_parts.collect(&:text).join("\n")
-    end
-
-    def system?
-      @settings.get("pipeline.system")
-    end
-
-    def ==(other)
-      config_hash == other.config_hash && pipeline_id == other.pipeline_id && settings == other.settings
-    end
-
-    def display_debug_information
-      logger.debug("-------- Logstash Config ---------")
-      logger.debug("Config from source", :source => source, :pipeline_id => pipeline_id)
-
-      config_parts.each do |config_part|
-        logger.debug("Config string", :protocol => config_part.protocol, :id => config_part.id)
-        logger.debug("\n\n#{config_part.text}")
-      end
-      logger.debug("Merged config")
-      logger.debug("\n\n#{config_string}")
-    end
-  end
-end end
+module LogStash::Config
+  java_import org.logstash.config.ir.PipelineConfig
+end
diff --git a/logstash-core/lib/logstash/config/pipelines_info.rb b/logstash-core/lib/logstash/config/pipelines_info.rb
new file mode 100644
index 000000000..eb5cf6fda
--- /dev/null
+++ b/logstash-core/lib/logstash/config/pipelines_info.rb
@@ -0,0 +1,167 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module LogStash; module Config;
+  class PipelinesInfo
+    def self.format_pipelines_info(agent, metric_store, extended_performance_collection)
+      # It is important that we iterate via the agent's pipelines vs. the
+      # metrics pipelines. This prevents race conditions as pipeline stats may be
+      # populated before the agent has it in its own pipelines state
+      stats = metric_store.get_with_path("/stats/pipelines").dig(:stats, :pipelines) || {}
+      agent.running_pipelines.map do |pipeline_id, pipeline|
+        p_stats = stats.fetch(pipeline_id) { Hash.new }
+        # Don't record stats for system pipelines
+        next nil if pipeline.system?
+        # Don't emit stats for pipelines that have not yet registered any metrics
+        next nil if p_stats.nil?
+        res = {
+          "id" => pipeline_id.to_s,
+          "hash" => pipeline.lir.unique_hash,
+          "ephemeral_id" => pipeline.ephemeral_id,
+          "events" => format_pipeline_events(p_stats[:events]),
+          "queue" => format_queue_stats(pipeline_id, metric_store),
+          "reloads" => {
+            "successes" => (p_stats.dig(:reloads, :successes)&.value || 0),
+            "failures" => (p_stats.dig(:reloads, :failures)&.value || 0)
+          }
+        }
+        if extended_performance_collection
+          res["vertices"] = format_pipeline_vertex_stats(p_stats[:plugins], pipeline)
+        end
+        res
+      end.compact
+    end
+
+    def self.format_pipeline_events(stats)
+      result = {}
+      (stats || {}).each { |stage, counter| result[stage.to_s] = counter.value }
+      result
+    end
+
+    def self.format_pipeline_vertex_stats(stats, pipeline)
+      return nil unless stats
+
+      [:inputs, :filters, :outputs].flat_map do |section|
+        format_pipeline_vertex_section_stats(stats[section], pipeline)
+      end.select {|stats| !stats.nil?} # Ignore empty sections
+    end
+
+    ROOT_METRIC_MAPPINGS = {
+      'events.in' => 'events_in',
+      'events.out' => 'events_out',
+      'events.queue_push_duration_in_millis' => 'queue_push_duration_in_millis',
+      'events.duration_in_millis' => 'duration_in_millis',
+      'name' => :discard # we don't need this, pipeline_state has this already
+    }
+
+    def self.format_pipeline_vertex_section_stats(stats, pipeline)
+      return nil unless stats
+
+       (stats || {}).reduce([]) do |acc, kv|
+        plugin_id, plugin_stats = kv
+
+        props = Hash.new {|h, k| h[k] = []}
+        next unless plugin_stats
+
+        flattened = flatten_metrics(plugin_stats)
+
+        segmented = flattened.reduce(Hash.new {|h, k| h[k] = []}) do |acc, kv|
+          k, v = kv
+          metric_value = v.value
+          root_metric_field = ROOT_METRIC_MAPPINGS[k]
+
+          if root_metric_field
+            if root_metric_field != :discard
+              acc[root_metric_field] = metric_value
+            end
+          else
+            type_sym = v.type.to_sym
+
+            nested_type = if type_sym == :"counter/long"
+                            :long_counters
+                          elsif type_sym == :"gauge/numeric"
+                            :double_gauges
+                          else
+                            nil
+                          end
+
+            if nested_type
+              acc[nested_type] << { :name => k, :value => metric_value }
+            end
+         end
+
+          acc
+        end
+        segment = {
+          :id => plugin_id,
+          :pipeline_ephemeral_id => pipeline.ephemeral_id
+        }
+
+        if LogStash::PluginMetadata.exists?(plugin_id.to_s)
+          plugin_metadata = LogStash::PluginMetadata.for_plugin(plugin_id.to_s)
+          cluster_uuid = plugin_metadata&.get(:cluster_uuid)
+          segment[:cluster_uuid] = cluster_uuid unless cluster_uuid.nil?
+        end
+
+        acc << segment.merge(segmented)
+        acc
+      end
+    end
+
+    def self.flatten_metrics(hash_or_value, namespaces = [])
+      if hash_or_value.is_a?(Hash)
+        return hash_or_value.reduce({}) do |acc, kv|
+          k, v = kv
+          # We must concat the arrays, creating a copy instead of mutation
+          # to handle the case where there are multiple sibling metrics in a namespace
+          new_namespaces = namespaces.clone
+          new_namespaces << k
+          acc.merge(flatten_metrics(v, new_namespaces))
+        end
+      else
+        { namespaces.join('.') => hash_or_value }
+      end
+    end
+
+    def self.format_queue_stats(pipeline_id, metric_store)
+      path = [:stats, :pipelines, pipeline_id, :queue, :type]
+      if metric_store.has_metric?(*path)
+        queue_type = metric_store.get_shallow(*path).value
+      else
+        queue_type = 'memory'
+      end
+
+      events = 0
+      queue_size_in_bytes = 0
+      max_queue_size_in_bytes = 0
+
+      if queue_type == "persisted"
+        queue_path = [:stats, :pipelines, pipeline_id, :queue]
+        events = metric_store.get_shallow(*queue_path, :events).value
+        queue_size_in_bytes = metric_store.get_shallow(*queue_path, :capacity, :queue_size_in_bytes).value
+        max_queue_size_in_bytes = metric_store.get_shallow(*queue_path, :capacity, :max_queue_size_in_bytes).value
+      end
+
+      {
+          :type => queue_type,
+          :events_count => events,
+          :queue_size_in_bytes => queue_size_in_bytes,
+          :max_queue_size_in_bytes => max_queue_size_in_bytes,
+      }
+    end
+  end
+end; end;
diff --git a/logstash-core/lib/logstash/config/source/base.rb b/logstash-core/lib/logstash/config/source/base.rb
index b9a5e5530..b891551a5 100644
--- a/logstash-core/lib/logstash/config/source/base.rb
+++ b/logstash-core/lib/logstash/config/source/base.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module LogStash module Config module Source
   class Base
     attr_reader :conflict_messages
@@ -55,37 +71,5 @@ module LogStash module Config module Source
     def config_path?
       !(config_path.nil? || config_path.empty?)
     end
-
-    def modules_cli_setting
-      @settings.get_setting("modules.cli")
-    end
-
-    def modules_cli
-      modules_cli_setting.value
-    end
-
-    def modules_cli?
-      !(modules_cli.nil? || modules_cli.empty?)
-    end
-
-    def modules_setting
-      @settings.get_setting("modules")
-    end
-
-    def modules
-      modules_setting.value
-    end
-
-    def modules?
-      !(modules.nil? || modules.empty?)
-    end
-
-    def both_module_configs?
-      modules_cli? && modules?
-    end
-
-    def modules_defined?
-      modules_cli? || modules?
-    end
   end
 end end end
diff --git a/logstash-core/lib/logstash/config/source/local.rb b/logstash-core/lib/logstash/config/source/local.rb
index a4beefb76..f994130d5 100644
--- a/logstash-core/lib/logstash/config/source/local.rb
+++ b/logstash-core/lib/logstash/config/source/local.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/config/source/base"
 require "logstash/config/pipeline_config"
 require "uri"
@@ -59,7 +75,7 @@ module LogStash module Config module Source
         end
 
         get_matched_files.each do |file|
-          next unless ::File.file?(file) # skip directory
+          next unless ::File.file?(file) or ::File.pipe?(file) # skip directory
 
           logger.debug("Reading config file", :config_file => file)
 
@@ -163,7 +179,7 @@ module LogStash module Config module Source
 
     def match?
       # see basic settings predicates and getters defined in the base class
-      (config_string? || config_path?) && !(modules_cli? || modules?) && !automatic_reload_with_config_string?
+      (config_string? || config_path?) && !automatic_reload_with_config_string?
     end
 
     def config_conflict?
@@ -196,7 +212,7 @@ module LogStash module Config module Source
 
       return [] if config_parts.empty?
 
-      [PipelineConfig.new(self.class, @settings.get("pipeline.id").to_sym, config_parts, @settings)]
+      [org.logstash.config.ir.PipelineConfig.new(self.class, @settings.get("pipeline.id").to_sym, config_parts, @settings)]
     end
 
     def automatic_reload_with_config_string?
diff --git a/logstash-core/lib/logstash/config/source/modules.rb b/logstash-core/lib/logstash/config/source/modules.rb
deleted file mode 100644
index 6f88033ef..000000000
--- a/logstash-core/lib/logstash/config/source/modules.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# encoding: utf-8
-require "logstash/config/source/base"
-require "logstash/config/modules_common"
-require "logstash/config/pipeline_config"
-
-module LogStash module Config module Source
-  class Modules < Base
-    include LogStash::Util::Loggable
-    def pipeline_configs
-      if config_conflict? # double check
-        raise ConfigurationError, @conflict_messages.join(", ")
-      end
-
-      pipelines = LogStash::Config::ModulesCommon.pipeline_configs(@settings)
-      pipelines.map do |hash|
-        PipelineConfig.new(self, hash["pipeline_id"].to_sym,
-          org.logstash.common.SourceWithMetadata.new("module", hash["alt_name"], 0, 0, hash["config_string"]),
-          hash["settings"])
-      end
-    end
-
-    def match?
-      # see basic settings predicates and getters defined in the base class
-      (modules_cli? || modules?) && !(config_string? || config_path?) && !automatic_reload_with_modules?
-    end
-
-    def config_conflict?
-      @conflict_messages.clear
-      # Make note that if modules are configured in both cli and logstash.yml that cli module
-      # settings will overwrite the logstash.yml modules settings
-      if modules_cli? && modules?
-        logger.info(I18n.t("logstash.runner.cli-module-override"))
-      end
-
-      if automatic_reload_with_modules?
-        @conflict_messages << I18n.t("logstash.runner.reload-with-modules")
-      end
-
-      # Check if config (-f or -e) and modules are configured
-      if (modules_cli? || modules?) && (config_string? || config_path?)
-        @conflict_messages << I18n.t("logstash.runner.config-module-exclusive")
-      end
-
-      @conflict_messages.any?
-    end
-
-    private
-
-    def automatic_reload_with_modules?
-      (modules_cli? || modules?) && config_reload_automatic?
-    end
-  end
-end end end
diff --git a/logstash-core/lib/logstash/config/source/multi_local.rb b/logstash-core/lib/logstash/config/source/multi_local.rb
index 9f546ef24..1a7904e29 100644
--- a/logstash-core/lib/logstash/config/source/multi_local.rb
+++ b/logstash-core/lib/logstash/config/source/multi_local.rb
@@ -1,9 +1,26 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/config/source/local"
-require "logstash/pipeline_settings"
+require "logstash/settings"
 
 module LogStash module Config module Source
   class MultiLocal < Local
+    include LogStash::Util::SubstitutionVariables
     include LogStash::Util::Loggable
 
     def initialize(settings)
@@ -13,9 +30,10 @@ module LogStash module Config module Source
     end
 
     def pipeline_configs
-      pipelines = retrieve_yaml_pipelines()
+      pipelines = deep_replace(retrieve_yaml_pipelines)
       pipelines_settings = pipelines.map do |pipeline_settings|
-        ::LogStash::PipelineSettings.from_settings(@original_settings.clone).merge(pipeline_settings)
+        clone = @original_settings.clone
+        clone.merge_pipeline_settings(pipeline_settings)
       end
       detect_duplicate_pipelines(pipelines_settings)
       pipeline_configs = pipelines_settings.map do |pipeline_settings|
@@ -30,7 +48,7 @@ module LogStash module Config module Source
     end
 
     def match?
-      if modules_cli? || modules? || config_string? || config_path?
+      if config_string? || config_path?
         return false
       end
       detect_pipelines if !@detect_pipelines_called
@@ -44,7 +62,7 @@ module LogStash module Config module Source
     def config_conflict?
       @conflict_messages.clear
       # are there any auto-reload conflicts?
-      if !(modules_cli? || modules? || config_string? || config_path?)
+      if !(config_string? || config_path?)
         detect_pipelines if !@detect_pipelines_called
         if @detected_marker.nil?
           @conflict_messages << I18n.t("logstash.runner.config-pipelines-failed-read", :path => pipelines_yaml_location)
@@ -52,9 +70,11 @@ module LogStash module Config module Source
           @conflict_messages << I18n.t("logstash.runner.config-pipelines-empty", :path => pipelines_yaml_location)
         elsif @detected_marker.is_a?(Class)
           @conflict_messages << I18n.t("logstash.runner.config-pipelines-invalid", :invalid_class => @detected_marker, :path => pipelines_yaml_location)
+        elsif @detected_marker.kind_of?(ConfigurationError)
+          @conflict_messages << @detected_marker.message
         end
       else
-        do_warning? && logger.warn("Ignoring the 'pipelines.yml' file because modules or command line options are specified")
+        do_warning? && logger.warn("Ignoring the 'pipelines.yml' file because command line options are specified")
       end
       @conflict_messages.any?
     end
@@ -67,17 +87,15 @@ module LogStash module Config module Source
       when Array
         result
       when false
-        raise ConfigurationError.new("Pipelines YAML file is empty. Path: #{pipelines_yaml_location}")
+        raise ConfigurationError, I18n.t("logstash.runner.config-pipelines-empty", :path => pipelines_yaml_location)
       else
-        raise ConfigurationError.new("Pipelines YAML file must contain an array of pipeline configs. Found \"#{result.class}\" in #{pipelines_yaml_location}")
+        raise ConfigurationError, I18n.t("logstash.runner.config-pipelines-invalid", :invalid_class => result.class, :path => pipelines_yaml_location)
       end
     end
 
     def read_pipelines_from_yaml(yaml_location)
-      logger.debug("Reading pipeline configurations from YAML", :location => pipelines_yaml_location)
-      ::YAML.load(IO.read(yaml_location))
-    rescue => e
-      raise ConfigurationError.new("Failed to read pipelines yaml file. Location: #{yaml_location}, Exception: #{e.inspect}")
+      yaml_contents = ::File.read(yaml_location) rescue fail(ConfigurationError, I18n.t("logstash.runner.config-pipelines-failed-read-with-exception", :path => yaml_location, exception: $!.inspect))
+      ::YAML.safe_load(yaml_contents, fallback: false) rescue fail(ConfigurationError, I18n.t("logstash.runner.config-pipelines-failed-parse-with-exception", :path => yaml_location, exception: $!.inspect))
     end
 
     def pipelines_yaml_location
@@ -87,12 +105,12 @@ module LogStash module Config module Source
     def detect_duplicate_pipelines(pipelines)
       duplicate_ids = pipelines.group_by {|pipeline| pipeline.get("pipeline.id") }.select {|k, v| v.size > 1 }.map {|k, v| k}
       if duplicate_ids.any?
-        raise ConfigurationError.new("Pipelines YAML file contains duplicate pipeline ids: #{duplicate_ids.inspect}. Location: #{pipelines_yaml_location}")
+        raise ConfigurationError, I18n.t("logstash.runner.config-pipelines-duplicate-ids", :path => pipelines_yaml_location, duplicate_ids: duplicate_ids.inspect)
       end
     end
 
     def detect_pipelines
-      result = read_pipelines_from_yaml(pipelines_yaml_location) rescue nil
+      result = read_pipelines_from_yaml(pipelines_yaml_location)
       if result.is_a?(Array)
         @detected_marker = true
       elsif result.nil?
@@ -102,6 +120,9 @@ module LogStash module Config module Source
       else
         @detected_marker = result.class
       end
+    rescue ConfigurationError => cfg_error
+      @detected_marker = cfg_error
+    ensure
       @detect_pipelines_called = true
     end
 
diff --git a/logstash-core/lib/logstash/config/source_loader.rb b/logstash-core/lib/logstash/config/source_loader.rb
index 1da3619f5..1774f2fd7 100644
--- a/logstash-core/lib/logstash/config/source_loader.rb
+++ b/logstash-core/lib/logstash/config/source_loader.rb
@@ -1,6 +1,21 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/config/source/local"
-require "logstash/config/source/modules"
 require "logstash/config/source/multi_local"
 require "thread"
 require "set"
@@ -47,7 +62,6 @@ module LogStash module Config
       sources do |source|
         sources_loaders << source if source.match?
       end
-
       if sources_loaders.empty?
         # This shouldn't happen with the settings object or with any external plugins.
         # but lets add a guard so we fail fast.
@@ -65,7 +79,7 @@ module LogStash module Config
           duplicate_ids = find_duplicate_ids(pipeline_configs)
 
           if duplicate_ids.any?
-            logger.debug("Fetching pipelines with duplicate ids", duplicate_ids.each { |k, v| v.collect(&:pipeline_id) } )
+            logger.debug("Fetching pipelines with duplicate ids", duplicate_ids.each { |k, v| v.collect(&:pipeline_id) })
             return FailedFetch.new("Found duplicate ids in your source: #{duplicate_ids.keys.sort.join(", ")}")
           end
 
diff --git a/logstash-core/lib/logstash/config/string_escape.rb b/logstash-core/lib/logstash/config/string_escape.rb
index 84126407a..ab320a198 100644
--- a/logstash-core/lib/logstash/config/string_escape.rb
+++ b/logstash-core/lib/logstash/config/string_escape.rb
@@ -1,4 +1,19 @@
-
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 module LogStash; module Config; module StringEscape
   class << self
@@ -19,6 +34,8 @@ module LogStash; module Config; module StringEscape
         "\r"
       when "t"
         "\t"
+      when "0"
+        "\x00"
       else
         value
       end
diff --git a/logstash-core/lib/logstash/dependency_report.rb b/logstash-core/lib/logstash/dependency_report.rb
index 9b9493b50..c9d6e28b7 100644
--- a/logstash-core/lib/logstash/dependency_report.rb
+++ b/logstash-core/lib/logstash/dependency_report.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Thread.abort_on_exception = true
 Encoding.default_external = Encoding::UTF_8
 $DEBUGLIST = (ENV["DEBUG"] || "").split(",")
@@ -10,20 +26,27 @@ require 'fileutils'
 require 'securerandom'
 
 class LogStash::DependencyReport < Clamp::Command
-  option [ "--csv" ], "OUTPUT_PATH", "The path to write the dependency report in csv format.",
+  option ["--csv"], "OUTPUT_PATH", "The path to write the dependency report in csv format.",
     :required => true, :attribute_name => :output_path
 
+  OTHER_DEPENDENCIES = [
+    ["jruby", "", "http://jruby.org", "EPL-2.0"],
+    ["Red Hat Universal Base Image minimal", "9", "https://catalog.redhat.com/software/containers/ubi9-minimal/61832888c0d15aff4912fe0d", "Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf", "", "https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz"]
+  ]
+
   def execute
     require "csv"
 
     tmp_dir = java.lang.System.getProperty("java.io.tmpdir")
     ruby_output_path = File.join(tmp_dir, SecureRandom.uuid)
     # Write a CSV with just the ruby stuff
-    CSV.open(ruby_output_path, "wb", :headers => [ "name", "version", "url", "license" ], :write_headers => true) do |csv|
+    CSV.open(ruby_output_path, "wb", :headers => ["name", "version", "url", "license", "copyright", "sourceURL"], :write_headers => true) do |csv|
       puts "Finding gem dependencies"
       gems.each { |d| csv << d }
       puts "Finding gem embedded java/jar dependencies"
       jars.each { |d| csv << d }
+      puts "Adding non-gem non-jar dependencies (such as jruby distribution)"
+      OTHER_DEPENDENCIES.each { |d| csv << d }
     end
     puts "Wrote temporary ruby deps CSV to #{ruby_output_path}"
 
@@ -32,8 +55,9 @@ class LogStash::DependencyReport < Clamp::Command
     command = ["./gradlew", "generateLicenseReport", "-PlicenseReportInputCSV=#{ruby_output_path}", "-PlicenseReportOutputCSV=#{output_path}"]
     puts "Executing #{command}"
     system(*command)
+
     if $?.exitstatus != 0
-      raise "Could not run gradle java deps! Exit status #{$?.exitstatus}"
+      raise "generateLicenseReport failed with exit status #{$?.exitstatus}"
     end
 
     nil
@@ -56,7 +80,6 @@ class LogStash::DependencyReport < Clamp::Command
     #   Look at META-INF/MANIFEST.MF for any jars in each gem
     #   Note any important details.
     Gem::Specification.select { |g| g.requirements && g.requirements.any? { |r| r =~ /^jar / } }.collect do |gem|
-
       # Where is the gem installed
       root = gem.full_gem_path
 
@@ -84,7 +107,7 @@ class LogStash::DependencyReport < Clamp::Command
         # convert manifest attributes to a map w/ keys .to_s
         # without this, the attribute keys will be `Object#inspect` values
         # like #<Java::JavaUtilJar::Attributes::Name0xabcdef0>
-        attributes = Hash[manifest.getMainAttributes.map { |k,v| [k.to_s, v] }]
+        attributes = Hash[manifest.getMainAttributes.map { |k, v| [k.to_s, v] }]
 
         begin
           # Prefer the maven/pom groupId when it is available.
@@ -130,14 +153,14 @@ class LogStash::DependencyReport < Clamp::Command
     }
 
     # Get a map of name => spdx
-    MAP_APACHE2 = Hash[ALIASES.map { |spdx,aliases| aliases.map { |value| [value, spdx] } }[0]]
-    MAP_ARTISTIC2 = Hash[ALIASES.map { |spdx,aliases| aliases.map { |value| [value, spdx] } }[1]]
-    MAP_BSD = Hash[ALIASES.map { |spdx,aliases| aliases.map { |value| [value, spdx] } }[2]]
-    MAP_GPL2 = Hash[ALIASES.map { |spdx,aliases| aliases.map { |value| [value, spdx] } }[3]]
+    MAP_APACHE2 = Hash[ALIASES.map { |spdx, aliases| aliases.map { |value| [value, spdx] } }[0]]
+    MAP_ARTISTIC2 = Hash[ALIASES.map { |spdx, aliases| aliases.map { |value| [value, spdx] } }[1]]
+    MAP_BSD = Hash[ALIASES.map { |spdx, aliases| aliases.map { |value| [value, spdx] } }[2]]
+    MAP_GPL2 = Hash[ALIASES.map { |spdx, aliases| aliases.map { |value| [value, spdx] } }[3]]
 
     module_function
     def map(value)
-      MAP_APACHE2[value] ||  MAP_ARTISTIC2[value] || MAP_BSD[value] ||  MAP_GPL2[value] || value
+      MAP_APACHE2[value] || MAP_ARTISTIC2[value] || MAP_BSD[value] || MAP_GPL2[value] || value
     end
   end
 end
diff --git a/logstash-core/lib/logstash/dependency_report_runner.rb b/logstash-core/lib/logstash/dependency_report_runner.rb
index 880c3c5c3..f30aed7f9 100644
--- a/logstash-core/lib/logstash/dependency_report_runner.rb
+++ b/logstash-core/lib/logstash/dependency_report_runner.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "../../../lib/bootstrap/environment"
 
 if $0 == __FILE__
diff --git a/logstash-core/lib/logstash/deprecation_message.rb b/logstash-core/lib/logstash/deprecation_message.rb
new file mode 100644
index 000000000..59a61da32
--- /dev/null
+++ b/logstash-core/lib/logstash/deprecation_message.rb
@@ -0,0 +1,31 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'singleton'
+
+###
+# This is a place for storing deprecation message which cannot deliver to user before log4j initialization.
+# eg. command line flags deprecation warning. `bin/logstash --debug`
+module LogStash
+  class DeprecationMessage < Array
+    include Singleton
+
+    def self.instance
+      @@instance ||= Array.new
+    end
+  end
+end
diff --git a/logstash-core/lib/logstash/elasticsearch_client.rb b/logstash-core/lib/logstash/elasticsearch_client.rb
deleted file mode 100644
index ef61d7781..000000000
--- a/logstash-core/lib/logstash/elasticsearch_client.rb
+++ /dev/null
@@ -1,139 +0,0 @@
-# encoding: utf-8
-require "elasticsearch"
-require "elasticsearch/transport/transport/http/manticore"
-require 'logstash/util/manticore_ssl_config_helper'
-
-module LogStash class ElasticsearchClient
-  include LogStash::Util::Loggable
-
-  class Response
-    # duplicated here from Elasticsearch::Transport::Transport::Response
-    # to create a normalised response across different client IMPL
-    attr_reader :status, :body, :headers
-    def initialize(status, body, headers={})
-      @status, @body, @headers = status, body, headers
-      @body = body.force_encoding('UTF-8') if body.respond_to?(:force_encoding)
-    end
-  end
-
-  def self.build(settings)
-    new(RubyClient.new(settings, logger))
-  end
-
-  class RubyClient
-    include LogStash::Util::ManticoreSSLConfigHelper
-
-    def initialize(settings, logger)
-      @settings = settings
-      @logger = logger
-      @client_args = client_args
-
-      ssl_options = manticore_ssl_options_from_config('elasticsearch', settings)
-
-      @client_args[:ssl] = ssl_options
-
-      username = @settings["var.elasticsearch.username"]
-      if username
-        password = @settings["var.elasticsearch.password"]
-        if password.is_a?(LogStash::Util::Password)
-          password = password.value
-        end
-        @client_args[:transport_options] = { :headers => { "Authorization" => 'Basic ' + Base64.encode64( "#{username}:#{password}" ).chomp } }
-      end
-
-      @client = Elasticsearch::Client.new(@client_args)
-    end
-
-    def can_connect?
-      begin
-        head(SecureRandom.hex(32).prepend('_'))
-      rescue Elasticsearch::Transport::Transport::Errors::BadRequest
-        true
-      rescue Manticore::SocketException
-        false
-      end
-    end
-
-    def host_settings
-      @client_args[:hosts]
-    end
-
-    def delete(path)
-      begin
-        normalize_response(@client.perform_request('DELETE', path, {}, nil))
-      rescue Exception => e
-        if e.class.to_s =~ /NotFound/ || e.message =~ /Not\s*Found|404/i
-          Response.new(404, "", {})
-        else
-          raise e
-        end
-      end
-    end
-
-    def put(path, content)
-      normalize_response(@client.perform_request('PUT', path, {}, content))
-    end
-
-    def head(path)
-      begin
-        normalize_response(@client.perform_request('HEAD', path, {}, nil))
-      rescue Exception => e
-        if is_404_error?(e)
-          Response.new(404, "", {})
-        else
-          raise e
-        end
-      end
-    end
-
-    private
-
-    def is_404_error?(error)
-      error.class.to_s =~ /NotFound/ || error.message =~ /Not\s*Found|404/i
-    end
-
-    def normalize_response(response)
-      Response.new(response.status, response.body, response.headers)
-    end
-
-    def client_args
-      {
-        :transport_class => Elasticsearch::Transport::Transport::HTTP::Manticore,
-        :hosts => [*unpack_hosts],
-        # :logger => @logger, # silence the client logging
-      }
-    end
-
-    def unpack_hosts
-      setting = @settings.fetch("var.elasticsearch.hosts", "localhost:9200")
-      if setting.is_a?(String)
-        return setting.split(',').map(&:strip)
-      end
-      setting
-    end
-  end
-
-  def initialize(client)
-    @client = client
-  end
-
-  def delete(path)
-    @client.delete(path)
-  end
-
-  def put(path, content)
-    @client.put(path, content)
-  end
-
-  def head(path)
-    @client.head(path)
-  end
-
-  def can_connect?
-    @client.can_connect?
-  end
-
-  def host_settings
-    @client.host_settings
-  end
-end end
diff --git a/logstash-core/lib/logstash/environment.rb b/logstash-core/lib/logstash/environment.rb
index bf70f7762..a29faff6e 100644
--- a/logstash-core/lib/logstash/environment.rb
+++ b/logstash-core/lib/logstash/environment.rb
@@ -1,10 +1,25 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash-core/logstash-core"
 require "logstash/config/cpu_core_strategy"
 require "logstash/settings"
 require "logstash/util/cloud_setting_id"
 require "logstash/util/cloud_setting_auth"
-require "logstash/util/modules_setting_array"
 require "socket"
 require "stud/temporary"
 
@@ -18,63 +33,79 @@ module LogStash
   end
 
   [
-            Setting::String.new("node.name", Socket.gethostname),
-    Setting::NullableString.new("path.config", nil, false),
+           Setting::Boolean.new("allow_superuser", false),
+            Setting::SettingString.new("node.name", Socket.gethostname),
+    Setting::SettingNullableString.new("path.config", nil, false),
  Setting::WritableDirectory.new("path.data", ::File.join(LogStash::Environment::LOGSTASH_HOME, "data")),
-    Setting::NullableString.new("config.string", nil, false),
-           Setting::Modules.new("modules.cli", LogStash::Util::ModulesSettingArray, []),
-           Setting::Modules.new("modules", LogStash::Util::ModulesSettingArray, []),
-                    Setting.new("modules_list", Array, []),
-                    Setting.new("modules_variable_list", Array, []),
-           Setting::Modules.new("cloud.id", LogStash::Util::CloudSettingId),
-           Setting::Modules.new("cloud.auth",LogStash::Util::CloudSettingAuth),
-           Setting::Boolean.new("modules_setup", false),
+    Setting::SettingNullableString.new("config.string", nil, false),
            Setting::Boolean.new("config.test_and_exit", false),
            Setting::Boolean.new("config.reload.automatic", false),
-           Setting::TimeValue.new("config.reload.interval", "3s"), # in seconds
+         Setting::TimeValue.new("config.reload.interval", "3s"), # in seconds
            Setting::Boolean.new("config.support_escapes", false),
-            Setting::String.new("config.field_reference.parser", "STRICT", true, %w(STRICT)),
+            Setting::SettingString.new("config.field_reference.escape_style", "none", true, %w(none percent ampersand)),
            Setting::Boolean.new("metric.collect", true),
-            Setting::String.new("pipeline.id", "main"),
+            Setting::SettingString.new("pipeline.id", "main"),
            Setting::Boolean.new("pipeline.system", false),
    Setting::PositiveInteger.new("pipeline.workers", LogStash::Config::CpuCoreStrategy.maximum),
    Setting::PositiveInteger.new("pipeline.batch.size", 125),
-           Setting::Numeric.new("pipeline.batch.delay", 50), # in milliseconds
+           Setting::SettingNumeric.new("pipeline.batch.delay", 50), # in milliseconds
            Setting::Boolean.new("pipeline.unsafe_shutdown", false),
-           Setting::Boolean.new("pipeline.java_execution", true),
            Setting::Boolean.new("pipeline.reloadable", true),
+           Setting::Boolean.new("pipeline.plugin_classloaders", false),
+           Setting::Boolean.new("pipeline.separate_logs", false),
+   Setting::CoercibleString.new("pipeline.ordered", "auto", true, ["auto", "true", "false"]),
+   Setting::CoercibleString.new("pipeline.ecs_compatibility", "v8", true, %w(disabled v1 v8)),
                     Setting.new("path.plugins", Array, []),
-    Setting::NullableString.new("interactive", nil, false),
+    Setting::SettingNullableString.new("interactive", nil, false),
            Setting::Boolean.new("config.debug", false),
-            Setting::String.new("log.level", "info", true, ["fatal", "error", "warn", "debug", "info", "trace"]),
+            Setting::SettingString.new("log.level", "info", true, ["fatal", "error", "warn", "debug", "info", "trace"]),
            Setting::Boolean.new("version", false),
            Setting::Boolean.new("help", false),
-            Setting::String.new("log.format", "plain", true, ["json", "plain"]),
-            Setting::String.new("http.host", "127.0.0.1"),
-            Setting::PortRange.new("http.port", 9600..9700),
-            Setting::String.new("http.environment", "production"),
-            Setting::String.new("queue.type", "memory", true, ["persisted", "memory"]),
-            Setting::Boolean.new("queue.drain", false),
-            Setting::Bytes.new("queue.page_capacity", "64mb"),
-            Setting::Bytes.new("queue.max_bytes", "1024mb"),
-            Setting::Numeric.new("queue.max_events", 0), # 0 is unlimited
-            Setting::Numeric.new("queue.checkpoint.acks", 1024), # 0 is unlimited
-            Setting::Numeric.new("queue.checkpoint.writes", 1024), # 0 is unlimited
-            Setting::Numeric.new("queue.checkpoint.interval", 1000), # 0 is no time-based checkpointing
-            Setting::Boolean.new("queue.checkpoint.retry", false),
-            Setting::Boolean.new("dead_letter_queue.enable", false),
-            Setting::Bytes.new("dead_letter_queue.max_bytes", "1024mb"),
-            Setting::TimeValue.new("slowlog.threshold.warn", "-1"),
-            Setting::TimeValue.new("slowlog.threshold.info", "-1"),
-            Setting::TimeValue.new("slowlog.threshold.debug", "-1"),
-            Setting::TimeValue.new("slowlog.threshold.trace", "-1"),
-            Setting::String.new("keystore.classname", "org.logstash.secret.store.backend.JavaKeyStore"),
-            Setting::String.new("keystore.file", ::File.join(::File.join(LogStash::Environment::LOGSTASH_HOME, "config"), "logstash.keystore"), false) # will be populated on
+           Setting::Boolean.new("enable-local-plugin-development", false),
+            Setting::SettingString.new("log.format", "plain", true, ["json", "plain"]),
+           Setting::Boolean.new("log.format.json.fix_duplicate_message_fields", true),
+           Setting::Boolean.new("api.enabled", true),
+            Setting::SettingString.new("api.http.host", "127.0.0.1"),
+         Setting::PortRange.new("api.http.port", 9600..9700),
+            Setting::SettingString.new("api.environment", "production"),
+            Setting::SettingString.new("api.auth.type", "none", true, %w(none basic)),
+            Setting::SettingString.new("api.auth.basic.username", nil, false).nullable,
+          Setting::Password.new("api.auth.basic.password", nil, false).nullable,
+            Setting::SettingString.new("api.auth.basic.password_policy.mode", "WARN", true, %w[WARN ERROR]),
+           Setting::SettingNumeric.new("api.auth.basic.password_policy.length.minimum", 8),
+            Setting::SettingString.new("api.auth.basic.password_policy.include.upper", "REQUIRED", true, %w[REQUIRED OPTIONAL]),
+            Setting::SettingString.new("api.auth.basic.password_policy.include.lower", "REQUIRED", true, %w[REQUIRED OPTIONAL]),
+            Setting::SettingString.new("api.auth.basic.password_policy.include.digit", "REQUIRED", true, %w[REQUIRED OPTIONAL]),
+            Setting::SettingString.new("api.auth.basic.password_policy.include.symbol", "OPTIONAL", true, %w[REQUIRED OPTIONAL]),
+           Setting::Boolean.new("api.ssl.enabled", false),
+  Setting::ExistingFilePath.new("api.ssl.keystore.path", nil, false).nullable,
+          Setting::Password.new("api.ssl.keystore.password", nil, false).nullable,
+       Setting::StringArray.new("api.ssl.supported_protocols", nil, true, %w[TLSv1 TLSv1.1 TLSv1.2 TLSv1.3]),
+            Setting::SettingString.new("queue.type", "memory", true, ["persisted", "memory"]),
+           Setting::Boolean.new("queue.drain", false),
+             Setting::Bytes.new("queue.page_capacity", "64mb"),
+             Setting::Bytes.new("queue.max_bytes", "1024mb"),
+           Setting::SettingNumeric.new("queue.max_events", 0), # 0 is unlimited
+           Setting::SettingNumeric.new("queue.checkpoint.acks", 1024), # 0 is unlimited
+           Setting::SettingNumeric.new("queue.checkpoint.writes", 1024), # 0 is unlimited
+           Setting::SettingNumeric.new("queue.checkpoint.interval", 1000), # 0 is no time-based checkpointing
+           Setting::Boolean.new("queue.checkpoint.retry", true),
+           Setting::Boolean.new("dead_letter_queue.enable", false),
+             Setting::Bytes.new("dead_letter_queue.max_bytes", "1024mb"),
+           Setting::SettingNumeric.new("dead_letter_queue.flush_interval", 5000),
+            Setting::SettingString.new("dead_letter_queue.storage_policy", "drop_newer", true, ["drop_newer", "drop_older"]),
+    Setting::SettingNullableString.new("dead_letter_queue.retain.age"), # example 5d
+         Setting::TimeValue.new("slowlog.threshold.warn", "-1"),
+         Setting::TimeValue.new("slowlog.threshold.info", "-1"),
+         Setting::TimeValue.new("slowlog.threshold.debug", "-1"),
+         Setting::TimeValue.new("slowlog.threshold.trace", "-1"),
+            Setting::SettingString.new("keystore.classname", "org.logstash.secret.store.backend.JavaKeyStore"),
+            Setting::SettingString.new("keystore.file", ::File.join(::File.join(LogStash::Environment::LOGSTASH_HOME, "config"), "logstash.keystore"), false), # will be populated on
+    Setting::SettingNullableString.new("monitoring.cluster_uuid"),
+            Setting::SettingString.new("pipeline.buffer.type", "heap", true, ["direct", "heap"])
   # post_process
   ].each {|setting| SETTINGS.register(setting) }
 
-
-
   # Compute the default queue path based on `path.data`
   default_queue_file_path = ::File.join(SETTINGS.get("path.data"), "queue")
   SETTINGS.register Setting::WritableDirectory.new("path.queue", default_queue_file_path)
@@ -82,6 +113,24 @@ module LogStash
   default_dlq_file_path = ::File.join(SETTINGS.get("path.data"), "dead_letter_queue")
   SETTINGS.register Setting::WritableDirectory.new("path.dead_letter_queue", default_dlq_file_path)
 
+  SETTINGS.on_post_process do |settings|
+    # Configure Logstash logging facility. This needs to be done as early as possible to
+    # make sure the logger has the correct settings tnd the log level is correctly defined.
+    java.lang.System.setProperty("ls.log.format.json.fix_duplicate_message_fields", settings.get("log.format.json.fix_duplicate_message_fields").to_s)
+    java.lang.System.setProperty("ls.logs", settings.get("path.logs"))
+    java.lang.System.setProperty("ls.log.format", settings.get("log.format"))
+    java.lang.System.setProperty("ls.log.level", settings.get("log.level"))
+    java.lang.System.setProperty("ls.pipeline.separate_logs", settings.get("pipeline.separate_logs").to_s)
+    unless java.lang.System.getProperty("log4j.configurationFile")
+      log4j_config_location = ::File.join(settings.get("path.settings"), "log4j2.properties")
+
+      # Windows safe way to produce a file: URI.
+      file_schema = "file://" + (LogStash::Environment.windows? ? "/" : "")
+      LogStash::Logging::Logger::reconfigure(::URI::Parser.new.escape(file_schema + ::File.absolute_path(log4j_config_location)))
+    end
+    # override log level that may have been introduced from a custom log4j config file
+    LogStash::Logging::Logger::configure_logging(settings.get("log.level"))
+  end
 
   SETTINGS.on_post_process do |settings|
     # If the data path is overridden but the queue path isn't recompute the queue path
@@ -100,7 +149,7 @@ module LogStash
   module Environment
     extend self
 
-    LOGSTASH_CORE = ::File.expand_path(::File.join(::File.dirname(__FILE__), "..", ".."))
+    LOGSTASH_CORE = ::File.expand_path(::File.join("..", ".."), ::File.dirname(__FILE__))
     LOGSTASH_ENV = (ENV["LS_ENV"] || 'production').to_s.freeze
 
     LINUX_OS_RE = /linux/
@@ -131,11 +180,11 @@ module LogStash
       ::File.join(dir_name, package, "test-jars")
     end
 
-    def load_runtime_jars!(dir_name="vendor", package="jar-dependencies")
+    def load_runtime_jars!(dir_name = "vendor", package = "jar-dependencies")
       load_jars!(::File.join(runtime_jars_root(dir_name, package), "*.jar"))
     end
 
-    def load_test_jars!(dir_name="vendor", package="jar-dependencies")
+    def load_test_jars!(dir_name = "vendor", package = "jar-dependencies")
       load_jars!(::File.join(test_jars_root(dir_name, package), "*.jar"))
     end
 
@@ -163,11 +212,15 @@ module LogStash
     end
 
     def windows?
-      RbConfig::CONFIG['host_os'] =~ WINDOW_OS_RE
+      host_os =~ WINDOW_OS_RE
     end
 
     def linux?
-      RbConfig::CONFIG['host_os'] =~ LINUX_OS_RE
+      host_os =~ LINUX_OS_RE
+    end
+
+    def host_os
+      RbConfig::CONFIG['host_os']
     end
 
     def locales_path(path)
diff --git a/logstash-core/lib/logstash/errors.rb b/logstash-core/lib/logstash/errors.rb
index cf7879f56..dd0059212 100644
--- a/logstash-core/lib/logstash/errors.rb
+++ b/logstash-core/lib/logstash/errors.rb
@@ -1 +1,18 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Keeping this file for backwards compatibility with plugins that include it directly.
diff --git a/logstash-core/lib/logstash/event.rb b/logstash-core/lib/logstash/event.rb
index 577ece5fb..5394fd1d1 100644
--- a/logstash-core/lib/logstash/event.rb
+++ b/logstash-core/lib/logstash/event.rb
@@ -1,28 +1,19 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # used only in the Ruby execution engine
-module LogStash
-  class SignalEvent
-    def flush?; raise "abstract method"; end;
-    def shutdown?; raise "abstract method"; end;
-  end
-
-  class ShutdownEvent < SignalEvent
-    def flush?; false; end;
-    def shutdown?; true; end;
-  end
-
-  class FlushEvent < SignalEvent
-    def flush?; true; end;
-    def shutdown?; false; end;
-  end
-
-  class NoSignal < SignalEvent
-    def flush?; false; end;
-    def shutdown?; false; end;
-  end
-
-  FLUSH = FlushEvent.new
-  SHUTDOWN = ShutdownEvent.new
-  NO_SIGNAL = NoSignal.new
-end
+# for backward compatibility
diff --git a/logstash-core/lib/logstash/event_dispatcher.rb b/logstash-core/lib/logstash/event_dispatcher.rb
index cf7879f56..dd0059212 100644
--- a/logstash-core/lib/logstash/event_dispatcher.rb
+++ b/logstash-core/lib/logstash/event_dispatcher.rb
@@ -1 +1,18 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Keeping this file for backwards compatibility with plugins that include it directly.
diff --git a/logstash-core/lib/logstash/execution_context.rb b/logstash-core/lib/logstash/execution_context.rb
index 548cf47a6..0f4032e3a 100644
--- a/logstash-core/lib/logstash/execution_context.rb
+++ b/logstash-core/lib/logstash/execution_context.rb
@@ -1,2 +1,19 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # The contents of this file have been ported to Java. It is included for for compatibility
 # with plugins that directly include it.
diff --git a/logstash-core/lib/logstash/filter_delegator.rb b/logstash-core/lib/logstash/filter_delegator.rb
index 548cf47a6..0f4032e3a 100644
--- a/logstash-core/lib/logstash/filter_delegator.rb
+++ b/logstash-core/lib/logstash/filter_delegator.rb
@@ -1,2 +1,19 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # The contents of this file have been ported to Java. It is included for for compatibility
 # with plugins that directly include it.
diff --git a/logstash-core/lib/logstash/filters/base.rb b/logstash-core/lib/logstash/filters/base.rb
index 39036bf9f..f7bb3ea54 100644
--- a/logstash-core/lib/logstash/filters/base.rb
+++ b/logstash-core/lib/logstash/filters/base.rb
@@ -1,5 +1,20 @@
-# encoding: utf-8
-require "logstash/event"
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/plugin"
 require "logstash/config/mixin"
 require "logstash/util/decorators"
@@ -144,7 +159,6 @@ class LogStash::Filters::Base < LogStash::Plugin
     @slow_logger.on_event("event processing time", @original_params, event, java.lang.System.nanoTime - time)
   end
 
-
   # in 1.5.0 multi_filter is meant to be used in the generated filter function in LogStash::Config::AST::Plugin only
   # and is temporary until we refactor the filter method interface to accept events list and return events list,
   # just list in multi_filter see https://github.com/elastic/logstash/issues/2872.
@@ -159,7 +173,7 @@ class LogStash::Filters::Base < LogStash::Plugin
     events.each do |event|
       unless event.cancelled?
         result << event
-        do_filter(event){|new_event| result << new_event}
+        do_filter(event) {|new_event| result << new_event}
       end
     end
     result
@@ -179,7 +193,7 @@ class LogStash::Filters::Base < LogStash::Plugin
   # matches the filter's conditions (right type, etc)
   protected
   def filter_matched(event)
-    LogStash::Util::Decorators.add_fields(@add_field,event,"filters/#{self.class.name}")
+    LogStash::Util::Decorators.add_fields(@add_field, event, "filters/#{self.class.name}")
 
     @remove_field.each do |field|
       field = event.sprintf(field)
@@ -188,7 +202,7 @@ class LogStash::Filters::Base < LogStash::Plugin
       event.remove(field)
     end
 
-    LogStash::Util::Decorators.add_tags(@add_tag,event,"filters/#{self.class.name}")
+    LogStash::Util::Decorators.add_tags(@add_tag, event, "filters/#{self.class.name}")
 
     # note below that the tags array field needs to be updated then reassigned to the event.
     # this is important because a construct like event["tags"].delete(tag) will not work
diff --git a/logstash-core/lib/logstash/inputs/base.rb b/logstash-core/lib/logstash/inputs/base.rb
index 2a8ee97e7..0c2f4820f 100644
--- a/logstash-core/lib/logstash/inputs/base.rb
+++ b/logstash-core/lib/logstash/inputs/base.rb
@@ -1,5 +1,20 @@
-# encoding: utf-8
-require "logstash/event"
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/plugin"
 require "logstash/config/mixin"
 require "logstash/codecs/base"
@@ -53,7 +68,7 @@ class LogStash::Inputs::Base < LogStash::Plugin
   end
 
   public
-  def initialize(params={})
+  def initialize(params = {})
     super
     @threadable = false
     @stop_called = Concurrent::AtomicBoolean.new(false)
@@ -93,18 +108,25 @@ class LogStash::Inputs::Base < LogStash::Plugin
     @stop_called.value
   end
 
-  def clone
-    cloned = super
+  def clone(*args)
+    cloned = super(args)
     cloned.codec = @codec.clone if @codec
     cloned
   end
 
+  def metric=(metric)
+    super
+    # Hack to create a new metric namespace using 'plugins' as the root
+    @codec.metric = metric.root.namespace(metric.namespace_name[0...-2].push(:codecs, codec.id))
+    metric
+  end
+
   def execution_context=(context)
     super
-    # There is no easy way to propage an instance variable into the codec, because the codec
-    # are created at the class level
-    # TODO(talevy): Codecs should have their own execution_context, for now they will inherit their
-    #               parent plugin's
+    # Setting the execution context after initialization is deprecated and will be removed in
+    # a future release of Logstash. While this code is no longer executed from Logstash core,
+    # we continue to propagate a set execution context to an input's codec, and rely on super's
+    # deprecation warning.
     @codec.execution_context = context
     context
   end
@@ -114,8 +136,8 @@ class LogStash::Inputs::Base < LogStash::Plugin
     # Only set 'type' if not already set. This is backwards-compatible behavior
     event.set("type", @type) if @type && !event.include?("type")
 
-    LogStash::Util::Decorators.add_fields(@add_field,event,"inputs/#{self.class.name}")
-    LogStash::Util::Decorators.add_tags(@tags,event,"inputs/#{self.class.name}")
+    LogStash::Util::Decorators.add_fields(@add_field, event, "inputs/#{self.class.name}")
+    LogStash::Util::Decorators.add_tags(@tags, event, "inputs/#{self.class.name}")
   end
 
   protected
@@ -124,11 +146,12 @@ class LogStash::Inputs::Base < LogStash::Plugin
     require "logstash/codecs/line"
     require "logstash/codecs/json"
     require "logstash/codecs/json_lines"
-    case @codec
-      when LogStash::Codecs::Plain
+
+    case @codec.class.name
+      when "LogStash::Codecs::Plain"
         @logger.info("Automatically switching from #{@codec.class.config_name} to line codec", :plugin => self.class.config_name)
         @codec = LogStash::Codecs::Line.new("charset" => @codec.charset)
-      when LogStash::Codecs::JSON
+      when "LogStash::Codecs::JSON"
         @logger.info("Automatically switching from #{@codec.class.config_name} to json_lines codec", :plugin => self.class.config_name)
         @codec = LogStash::Codecs::JSONLines.new("charset" => @codec.charset)
     end
diff --git a/logstash-core/lib/logstash/inputs/threadable.rb b/logstash-core/lib/logstash/inputs/threadable.rb
index 7348c1edf..a61c9bb0f 100644
--- a/logstash-core/lib/logstash/inputs/threadable.rb
+++ b/logstash-core/lib/logstash/inputs/threadable.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/inputs/base"
 
 # This is the threadable class for logstash inputs.
diff --git a/logstash-core/lib/logstash/instrument/collector.rb b/logstash-core/lib/logstash/instrument/collector.rb
index 5c2a8f4c0..c481c1863 100644
--- a/logstash-core/lib/logstash/instrument/collector.rb
+++ b/logstash-core/lib/logstash/instrument/collector.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/instrument/metric_store"
 require "concurrent/timer_task"
 require "observer"
@@ -31,7 +47,10 @@ module LogStash module Instrument
     #
     def push(namespaces_path, key, type, *metric_type_params)
       begin
-        get(namespaces_path, key, type).execute(*metric_type_params)
+        metric_proxy = get(namespaces_path, key, type)
+        return metric_proxy.execute(*metric_type_params) if metric_proxy.respond_to?(:execute)
+
+        logger.error("Collector: Cannot record metric action #{type}@#{metric_type_params.join('/')} on <#{metric_proxy}> at path #{namespaces_path.join('/')}/#{key}")
       rescue MetricStore::NamespacesExpectedError => e
         logger.error("Collector: Cannot record metric", :exception => e)
       rescue NameError => e
@@ -47,10 +66,37 @@ module LogStash module Instrument
 
     def get(namespaces_path, key, type)
       @metric_store.fetch_or_store(namespaces_path, key) do
-        LogStash::Instrument::MetricType.create(type, namespaces_path, key)
+        initialize_metric(type, namespaces_path, key)
       end
     end
 
+    # test injection, see MetricExtFactory
+    def initialize_metric(type, namespaces_path, key)
+      MetricType.create(type, namespaces_path, key)
+    end
+
+    ##
+    # Ensures that a metric on the provided `namespaces_path` with the provided `key`
+    # is registered, using the provided `metric_instance` IFF it is not already present.
+    #
+    # @param namespaces_path [Array<Symbol>]
+    # @param key [Symbol]
+    # @param metric_instance [Metric]
+    #
+    # @return [Boolean] true IFF the provided `metric_instance` was registered
+    def register?(namespaces_path, key, metric_instance)
+      registered = false
+
+      # Relies on MetricStore#fetch_or_store yielding the block
+      # EXACTLY ONCE to the winner in a race-condition.
+      @metric_store.fetch_or_store(namespaces_path, key) do
+        registered = true
+        metric_instance
+      end
+
+      registered
+    end
+
     # Snapshot the current Metric Store and return it immediately,
     # This is useful if you want to get access to the current metric store without
     # waiting for a periodic call.
diff --git a/logstash-core/lib/logstash/instrument/metric.rb b/logstash-core/lib/logstash/instrument/metric.rb
index 6abbe7ce3..e93dce784 100644
--- a/logstash-core/lib/logstash/instrument/metric.rb
+++ b/logstash-core/lib/logstash/instrument/metric.rb
@@ -1 +1,18 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # This file is kept for backwards compatibility with plugins that include it.
diff --git a/logstash-core/lib/logstash/instrument/metric_store.rb b/logstash-core/lib/logstash/instrument/metric_store.rb
index 864f2c01a..40a0080a3 100644
--- a/logstash-core/lib/logstash/instrument/metric_store.rb
+++ b/logstash-core/lib/logstash/instrument/metric_store.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "concurrent"
 require "logstash/instrument/metric_type"
 require "thread"
@@ -15,7 +31,7 @@ module LogStash module Instrument
 
     # Lets me a bit flexible on the coma usage in the path
     # definition
-    FILTER_KEYS_SEPARATOR = /\s?*,\s*/.freeze
+    FILTER_KEYS_SEPARATOR = /\s*,\s*/.freeze
 
     def initialize
       # We keep the structured cache to allow
@@ -35,32 +51,41 @@ module LogStash module Instrument
 
     # This method use the namespace and key to search the corresponding value of
     # the hash, if it doesn't exist it will create the appropriate namespaces
-    # path in the hash and return `new_value`
-    #
-    # @param [Array] The path where the values should be located
-    # @param [Symbol] The metric key
-    # @return [Object] Return the new_value of the retrieve object in the tree
+    # path in the hash and return `new_value`.
+    # @overload fetch_or_store(namespaces, key, default_value)
+    #   @param [Array<Symbol>] namespaces: The path where the values should be located
+    #   @param [Symbol] key: The metric key
+    #   @param [Metric] default_value: if no metric exists at this address, the
+    #                                  provided default_value will be stored
+    #   @return [Metric] the value as it exists in the tree after this operation
+    # @overload fetch_or_store(namespaces, key, &default_value_generator)
+    #   @param [Array<Symbol>] namespaces: The path where the values should be located
+    #   @param [Symbol] key: The metric key
+    #   @yield EXACTLY ONCE to the provided block IFF the metric does not exist
+    #   @yieldreturn [Metric] if no metric exists at this address, the result of yielding
+    #                         to the provided default_value_generator block will be stored.
+    #   @return [Metric] the value as it exists in the tree after this operation
     def fetch_or_store(namespaces, key, default_value = nil)
-
       # We first check in the `@fast_lookup` store to see if we have already see that metrics before,
       # This give us a `o(1)` access, which is faster than searching through the structured
       # data store (Which is a `o(n)` operation where `n` is the number of element in the namespace and
       # the value of the key). If the metric is already present in the `@fast_lookup`, then that value is sent
       # back directly to the caller.
-      #
-      # BUT. If the value is not present in the `@fast_lookup` the value will be inserted and we assume that we don't
-      # have it in the `@metric_store` for structured search so we add it there too.
+      fast_lookup_key = namespaces.dup << key
+      existing_value = @fast_lookup.get(fast_lookup_key)
+      return existing_value unless existing_value.nil?
 
-      value = @fast_lookup.get(namespaces.dup << key)
-      if value.nil?
-        value = block_given? ? yield(key) : default_value
-        @fast_lookup.put(namespaces.dup << key, value)
-        @structured_lookup_mutex.synchronize do
-            # If we cannot find the value this mean we need to save it in the store.
-          fetch_or_store_namespaces(namespaces).fetch_or_store(key, value)
+      # BUT. If the value was not present in the `@fast_lookup` we acquire the structured_lookup_lock
+      # before modifying _either_ the fast-lookup or the structured store.
+      @structured_lookup_mutex.synchronize do
+        # by using compute_if_absent, we ensure that we don't overwrite a value that was
+        # written by another thread that beat us to the @structured_lookup_mutex lock.
+        @fast_lookup.compute_if_absent(fast_lookup_key) do
+          generated_value = block_given? ? yield(key) : default_value
+          fetch_or_store_namespaces(namespaces).fetch_or_store(key, generated_value)
+          generated_value
         end
       end
-      return value;
     end
 
     # This method allow to retrieve values for a specific path,
@@ -108,9 +133,8 @@ module LogStash module Instrument
       key_paths.reduce(get(*key_paths)) {|acc, p| acc[p]}
     end
 
-
     # Return a hash including the values of the keys given at the path given
-    # 
+    #
     # Example Usage:
     # extract_metrics(
     #   [:jvm, :process],
@@ -118,7 +142,7 @@ module LogStash module Instrument
     #   [:cpu, [:total_in_millis, :percent]]
     #   [:pipelines, [:one, :two], :size]
     # )
-    # 
+    #
     # Returns:
     # # From the jvm.process metrics namespace
     # {
@@ -130,7 +154,7 @@ module LogStash module Instrument
     #                 }
     # }
     def extract_metrics(path, *keys)
-      keys.reduce({}) do |acc,k|
+      keys.reduce({}) do |acc, k|
         # Simplify 1-length keys
         k = k.first if k.is_a?(Array) && k.size == 1
 
@@ -148,8 +172,8 @@ module LogStash module Instrument
           next_paths.each do |next_path|
             # If there already is a hash at this location use that so we don't overwrite it
             np_hash = acc[next_path] || {}
-            
-            acc[next_path] = next_keys.reduce(np_hash) do |a,next_key|
+
+            acc[next_path] = next_keys.reduce(np_hash) do |a, next_key|
               a.merge! extract_metrics(path + [next_path], [next_key, *rest])
             end
           end
@@ -157,10 +181,10 @@ module LogStash module Instrument
           res = get_shallow(*path)[k]
           acc[k] = res ? res.value : nil
         end
-        
+
         acc
       end
-    end    
+    end
 
     def has_metric?(*path)
       @fast_lookup[path]
@@ -206,7 +230,7 @@ module LogStash module Instrument
 
     # This method take an array of keys and recursively search the metric store structure
     # and return a filtered hash of the structure. This method also take into consideration
-    # getting two different branchs.
+    # getting two different branches.
     #
     #
     # If one part of the `key_paths` contains a filter key with the following format.
@@ -215,7 +239,7 @@ module LogStash module Instrument
     # Look at the rspec test for more usage.
     #
     # @param key_paths [Array<Symbol>] The list of keys part to filter
-    # @param map [Concurrent::Map] The the part of map to search in
+    # @param map [Concurrent::Map] The part of map to search in
     # @param new_hash [Hash] The hash to populate with the results.
     # @return Hash
     def get_recursively(key_paths, map, new_hash)
@@ -282,36 +306,18 @@ module LogStash module Instrument
     # create it.
     #
     # @param [Array] The path where values should be located
-    # @raise [ConcurrentMapExpected] Raise if the retrieved object isn't a `Concurrent::Map`
+    # @raise [NamespacesExpectedError] Raise if the retrieved object isn't a `Concurrent::Map`
     # @return [Concurrent::Map] Map where the metrics should be saved
     def fetch_or_store_namespaces(namespaces_path)
-      path_map = fetch_or_store_namespace_recursively(@store, namespaces_path)
+      namespaces_path.each_with_index.reduce(@store) do |memo, (current, index)|
+        node = memo.compute_if_absent(current) { Concurrent::Map.new }
 
-      # This mean one of the namespace and key are colliding
-      # and we have to deal it upstream.
-      unless path_map.is_a?(Concurrent::Map)
-        raise NamespacesExpectedError, "Expecting a `Namespaces` but found class:  #{path_map.class.name} for namespaces_path: #{namespaces_path}"
+        unless node.kind_of?(Concurrent::Map)
+          raise NamespacesExpectedError, "Expecting a `Namespaces` but found class:  #{node.class.name} for namespaces_path: #{namespaces_path.first(index + 1)}"
+        end
+
+        node
       end
-
-      return path_map
-    end
-
-    # Recursively fetch or create the namespace paths through the `MetricStove`
-    # This algorithm use an index to known which keys to search in the map.
-    # This doesn't cloning the array if we want to give a better feedback to the user
-    #
-    # @param [Concurrent::Map] Map to search for the key
-    # @param [Array] List of path to create
-    # @param [Integer] Which part from the list to create
-    #
-    def fetch_or_store_namespace_recursively(map, namespaces_path, idx = 0)
-      current = namespaces_path[idx]
-
-      # we are at the end of the namespace path, break out of the recursion
-      return map if current.nil?
-
-      new_map = map.fetch_or_store(current) { Concurrent::Map.new }
-      return fetch_or_store_namespace_recursively(new_map, namespaces_path, idx + 1)
     end
 
     def delete_from_map(map, keys)
diff --git a/logstash-core/lib/logstash/instrument/metric_type.rb b/logstash-core/lib/logstash/instrument/metric_type.rb
index 85b82de4c..0536517ee 100644
--- a/logstash-core/lib/logstash/instrument/metric_type.rb
+++ b/logstash-core/lib/logstash/instrument/metric_type.rb
@@ -1,14 +1,25 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/instrument/metric_type/counter"
 require "logstash/instrument/metric_type/gauge"
 
 module LogStash module Instrument
   module MetricType
-    METRIC_TYPE_LIST = {
-      :counter => LogStash::Instrument::MetricType::Counter,
-      :gauge => LogStash::Instrument::MetricType::Gauge
-    }.freeze
-
     # Use the string to generate a concrete class for this metrics
     #
     # @param [String] The name of the class
@@ -16,7 +27,13 @@ module LogStash module Instrument
     # @param [String] The metric key
     # @raise [NameError] If the class is not found
     def self.create(type, namespaces, key)
-      METRIC_TYPE_LIST[type].new(namespaces, key)
+      case type
+      when :counter then return LogStash::Instrument::MetricType::Counter.new(namespaces, key)
+      when :gauge   then return LogStash::Instrument::MetricType::Gauge.new(namespaces, key)
+      when :uptime  then return org.logstash.instrument.metrics.UptimeMetric.new(key.to_s)
+      when :timer   then return org.logstash.instrument.metrics.timer.TimerMetric::create(key.to_s)
+      else fail NameError, "Unknown Metric Type `#{type}`"
+      end
     end
   end
 end; end
diff --git a/logstash-core/lib/logstash/instrument/metric_type/counter.rb b/logstash-core/lib/logstash/instrument/metric_type/counter.rb
index 2feeb2d77..9c22a7831 100644
--- a/logstash-core/lib/logstash/instrument/metric_type/counter.rb
+++ b/logstash-core/lib/logstash/instrument/metric_type/counter.rb
@@ -1,4 +1,20 @@
-#encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 java_import org.logstash.instrument.metrics.counter.LongCounter
 
 module LogStash module Instrument module MetricType
@@ -6,7 +22,6 @@ module LogStash module Instrument module MetricType
 
     def initialize(namespaces, key)
       super(key.to_s)
-
     end
 
     def execute(action, value = 1)
diff --git a/logstash-core/lib/logstash/instrument/metric_type/gauge.rb b/logstash-core/lib/logstash/instrument/metric_type/gauge.rb
index e6492305e..390182d7b 100644
--- a/logstash-core/lib/logstash/instrument/metric_type/gauge.rb
+++ b/logstash-core/lib/logstash/instrument/metric_type/gauge.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 java_import org.logstash.instrument.metrics.gauge.LazyDelegatingGauge
 module LogStash module Instrument module MetricType
   class Gauge < LazyDelegatingGauge
@@ -13,4 +29,3 @@ module LogStash module Instrument module MetricType
 
   end
 end; end; end
-
diff --git a/logstash-core/lib/logstash/instrument/namespaced_metric.rb b/logstash-core/lib/logstash/instrument/namespaced_metric.rb
index 6abbe7ce3..e93dce784 100644
--- a/logstash-core/lib/logstash/instrument/namespaced_metric.rb
+++ b/logstash-core/lib/logstash/instrument/namespaced_metric.rb
@@ -1 +1,18 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # This file is kept for backwards compatibility with plugins that include it.
diff --git a/logstash-core/lib/logstash/instrument/namespaced_null_metric.rb b/logstash-core/lib/logstash/instrument/namespaced_null_metric.rb
index 63524d225..b298135de 100644
--- a/logstash-core/lib/logstash/instrument/namespaced_null_metric.rb
+++ b/logstash-core/lib/logstash/instrument/namespaced_null_metric.rb
@@ -1 +1,18 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # This file is kept for backwards compatibility with plugins that include it directly.
diff --git a/logstash-core/lib/logstash/instrument/null_metric.rb b/logstash-core/lib/logstash/instrument/null_metric.rb
index 4dfe43e4c..220365a0f 100644
--- a/logstash-core/lib/logstash/instrument/null_metric.rb
+++ b/logstash-core/lib/logstash/instrument/null_metric.rb
@@ -1,2 +1,19 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # The contents of this file have been ported to Java. It is included for for compatibility
 # with plugins that directly require it.
diff --git a/logstash-core/lib/logstash/instrument/periodic_poller/base.rb b/logstash-core/lib/logstash/instrument/periodic_poller/base.rb
index 338162172..987506757 100644
--- a/logstash-core/lib/logstash/instrument/periodic_poller/base.rb
+++ b/logstash-core/lib/logstash/instrument/periodic_poller/base.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/util"
 require "concurrent"
 
diff --git a/logstash-core/lib/logstash/instrument/periodic_poller/cgroup.rb b/logstash-core/lib/logstash/instrument/periodic_poller/cgroup.rb
index 4a5739ba8..5213f83cc 100644
--- a/logstash-core/lib/logstash/instrument/periodic_poller/cgroup.rb
+++ b/logstash-core/lib/logstash/instrument/periodic_poller/cgroup.rb
@@ -1,4 +1,19 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # Logic from elasticsearch/core/src/main/java/org/elasticsearch/monitor/os/OsProbe.java
 # Move to ruby to remove any existing dependency
@@ -7,6 +22,7 @@ module LogStash module Instrument module PeriodicPoller
     include LogStash::Util::Loggable
     class Override
       attr_reader :key, :value
+
       def initialize(key)
         @key = key
         @value = java.lang.System.getProperty(@key)
@@ -47,7 +63,7 @@ module LogStash module Instrument module PeriodicPoller
 
       def cgroup_available?
         # don't cache to ivar, in case the files are mounted after logstash starts??
-        CRITICAL_PATHS.all?{|path| ::File.exist?(path)}
+        CRITICAL_PATHS.all? {|path| ::File.exist?(path)}
       end
 
       def controller_groups
@@ -74,6 +90,7 @@ module LogStash module Instrument module PeriodicPoller
 
     module ControllerResource
       attr_reader :base_path, :override, :offset_path
+
       def implemented?
         true
       end
@@ -87,6 +104,7 @@ module LogStash module Instrument module PeriodicPoller
         @procs[:read_int] = lambda {|path| IO.readlines(path).first.to_i }
         @procs[:read_lines] = lambda {|path| IO.readlines(path) }
       end
+
       def call_if_file_exists(call_key, file, not_found_value)
         path = ::File.join(@base_path, @offset_path, file)
         if ::File.exist?(path)
@@ -110,6 +128,7 @@ module LogStash module Instrument module PeriodicPoller
       def initialize(original_path)
         common_initialize(CPUACCT_DIR, "ls.cgroup.cpuacct.path.override", original_path)
       end
+
       def to_hash
         {:control_group => offset_path, :usage_nanos => cpuacct_usage}
       end
@@ -125,6 +144,7 @@ module LogStash module Instrument module PeriodicPoller
       def initialize(original_path)
         common_initialize(CPU_DIR, "ls.cgroup.cpu.path.override", original_path)
       end
+
       def to_hash
         {
           :control_group => offset_path,
@@ -137,9 +157,11 @@ module LogStash module Instrument module PeriodicPoller
       def cfs_period_us
         call_if_file_exists(:read_int, "cpu.cfs_period_us", -1)
       end
+
       def cfs_quota_us
         call_if_file_exists(:read_int, "cpu.cfs_quota_us", -1)
       end
+
       def build_cpu_stats_hash
         stats = CpuStats.new
         lines = call_if_file_exists(:read_lines, "cpu.stat", [])
@@ -150,9 +172,11 @@ module LogStash module Instrument module PeriodicPoller
 
     class UnimplementedResource
       attr_reader :controller, :original_path
+
       def initialize(controller, original_path)
         @controller, @original_path = controller, original_path
       end
+
       def implemented?
         false
       end
@@ -164,6 +188,7 @@ module LogStash module Instrument module PeriodicPoller
         @number_of_times_throttled = -1
         @time_throttled_nanos = -1
       end
+
       def update(lines)
         lines.each do |line|
           fields = line.split(/\s+/)
@@ -175,6 +200,7 @@ module LogStash module Instrument module PeriodicPoller
           end
         end
       end
+
       def to_hash
         {
           :number_of_elapsed_periods => @number_of_elapsed_periods,
diff --git a/logstash-core/lib/logstash/instrument/periodic_poller/dlq.rb b/logstash-core/lib/logstash/instrument/periodic_poller/dlq.rb
index c2d92e97b..b92ed5e5f 100644
--- a/logstash-core/lib/logstash/instrument/periodic_poller/dlq.rb
+++ b/logstash-core/lib/logstash/instrument/periodic_poller/dlq.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'logstash/instrument/periodic_poller/base'
 
 module LogStash module Instrument module PeriodicPoller
@@ -19,4 +35,3 @@ module LogStash module Instrument module PeriodicPoller
     end
   end
 end end end
-
diff --git a/logstash-core/lib/logstash/instrument/periodic_poller/flow_rate.rb b/logstash-core/lib/logstash/instrument/periodic_poller/flow_rate.rb
new file mode 100644
index 000000000..2ead1de78
--- /dev/null
+++ b/logstash-core/lib/logstash/instrument/periodic_poller/flow_rate.rb
@@ -0,0 +1,35 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'logstash/instrument/periodic_poller/base'
+
+module LogStash module Instrument module PeriodicPoller
+  class FlowRate < Base
+    def initialize(metric, agent, options = {})
+      super(metric, options)
+      @metric = metric
+      @agent = agent
+    end
+
+    def collect
+      @agent.capture_flow_metrics
+
+      pipelines = @agent.running_user_defined_pipelines
+      pipelines.values.compact.each(&:collect_flow_metrics)
+    end
+  end
+end end end
diff --git a/logstash-core/lib/logstash/instrument/periodic_poller/jvm.rb b/logstash-core/lib/logstash/instrument/periodic_poller/jvm.rb
index ba095b6f1..7b347cb83 100644
--- a/logstash-core/lib/logstash/instrument/periodic_poller/jvm.rb
+++ b/logstash-core/lib/logstash/instrument/periodic_poller/jvm.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/instrument/periodic_poller/base"
 require "logstash/instrument/periodic_poller/load_average"
 require "logstash/environment"
@@ -16,12 +32,11 @@ java_import 'javax.naming.directory.Attribute'
 java_import 'org.logstash.instrument.reports.MemoryReport'
 java_import 'org.logstash.instrument.reports.ProcessReport'
 
-
 module LogStash module Instrument module PeriodicPoller
   class JVM < Base
     class GarbageCollectorName
       YOUNG_GC_NAMES = Set.new(["Copy", "PS Scavenge", "ParNew", "G1 Young Generation", "scavenge", "GPGC New"])
-      OLD_GC_NAMES = Set.new(["MarkSweepCompact", "PS MarkSweep", "ConcurrentMarkSweep", "G1 Old Generation", "global", "GPGC Old"])
+      OLD_GC_NAMES = Set.new(["MarkSweepCompact", "PS MarkSweep", "ConcurrentMarkSweep", "G1 Old Generation", "G1 Concurrent GC", "global", "GPGC Old"])
 
       YOUNG = :young
       OLD = :old
@@ -29,7 +44,7 @@ module LogStash module Instrument module PeriodicPoller
       def self.get(gc_name)
         if YOUNG_GC_NAMES.include?(gc_name)
           YOUNG
-        elsif(OLD_GC_NAMES.include?(gc_name))
+        elsif (OLD_GC_NAMES.include?(gc_name))
           OLD
         end
       end
@@ -102,7 +117,6 @@ module LogStash module Instrument module PeriodicPoller
       metric.gauge(cpu_path, :total_in_millis, cpu_metrics["total_in_millis"])
 
       metric.gauge(path + [:mem], :total_virtual_in_bytes, process_metrics["mem"]["total_virtual_in_bytes"])
-
     end
 
     def collect_load_average
@@ -125,7 +139,7 @@ module LogStash module Instrument module PeriodicPoller
 
     def collect_heap_metrics(data)
       heap = aggregate_information_for(data["heap"].values)
-      heap[:used_percent] = (heap[:used_in_bytes] / heap[:max_in_bytes].to_f)*100.0
+      heap[:used_percent] = (heap[:used_in_bytes] / heap[:max_in_bytes].to_f) * 100.0
 
       heap.each_pair do |key, value|
         metric.gauge([:jvm, :memory, :heap], key, value.to_i)
@@ -135,14 +149,14 @@ module LogStash module Instrument module PeriodicPoller
     def collect_non_heap_metrics(data)
       non_heap = aggregate_information_for(data["non_heap"].values)
       non_heap.each_pair do |key, value|
-        metric.gauge([:jvm, :memory, :non_heap],key, value.to_i)
+        metric.gauge([:jvm, :memory, :non_heap], key, value.to_i)
       end
     end
 
     def collect_pools_metrics(data)
       metrics = build_pools_metrics(data)
       metrics.each_pair do |key, hash|
-        hash.each_pair do |p,v|
+        hash.each_pair do |p, v|
           metric.gauge([:jvm, :memory, :pools, key.to_sym], p, v)
         end
       end
@@ -153,12 +167,15 @@ module LogStash module Instrument module PeriodicPoller
       old  = {}
       old = old.merge!(heap["CMS Old Gen"]) if heap.has_key?("CMS Old Gen")
       old = old.merge!(heap["PS Old Gen"])  if heap.has_key?("PS Old Gen")
+      old = old.merge!(heap["G1 Old Gen"])  if heap.has_key?("G1 Old Gen")
       young = {}
       young = young.merge!(heap["Par Eden Space"]) if heap.has_key?("Par Eden Space")
       young = young.merge!(heap["PS Eden Space"])  if heap.has_key?("PS Eden Space")
+      young = young.merge!(heap["G1 Eden Space"])  if heap.has_key?("G1 Eden Space")
       survivor = {}
       survivor = survivor.merge!(heap["Par Survivor Space"]) if heap.has_key?("Par Survivor Space")
       survivor = survivor.merge!(heap["PS Survivor Space"])  if heap.has_key?("PS Survivor Space")
+      survivor = survivor.merge!(heap["G1 Survivor Space"])  if heap.has_key?("G1 Survivor Space")
       {
         "young"    => aggregate_information_for(young),
         "old"      => aggregate_information_for(old),
@@ -167,9 +184,9 @@ module LogStash module Instrument module PeriodicPoller
     end
 
     def aggregate_information_for(collection)
-      collection.reduce(default_information_accumulator) do |m,e|
+      collection.reduce(default_information_accumulator) do |m, e|
         e = { e[0] => e[1] } if e.is_a?(Array)
-        e.each_pair do |k,v|
+        e.each_pair do |k, v|
           if MEMORY_TRANSPOSE_MAP.include?(k)
             transpose_key = MEMORY_TRANSPOSE_MAP[k]
             m[transpose_key] += v
diff --git a/logstash-core/lib/logstash/instrument/periodic_poller/load_average.rb b/logstash-core/lib/logstash/instrument/periodic_poller/load_average.rb
index 1e13f1a9c..f26f8687b 100644
--- a/logstash-core/lib/logstash/instrument/periodic_poller/load_average.rb
+++ b/logstash-core/lib/logstash/instrument/periodic_poller/load_average.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 java_import "java.lang.management.ManagementFactory"
 
 module LogStash module Instrument module PeriodicPoller
diff --git a/logstash-core/lib/logstash/instrument/periodic_poller/os.rb b/logstash-core/lib/logstash/instrument/periodic_poller/os.rb
index 7f2a334b5..64fa87a13 100644
--- a/logstash-core/lib/logstash/instrument/periodic_poller/os.rb
+++ b/logstash-core/lib/logstash/instrument/periodic_poller/os.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/instrument/periodic_poller/base"
 require "logstash/instrument/periodic_poller/cgroup"
 
diff --git a/logstash-core/lib/logstash/instrument/periodic_poller/pq.rb b/logstash-core/lib/logstash/instrument/periodic_poller/pq.rb
index 0ef82247c..68ebdbf89 100644
--- a/logstash-core/lib/logstash/instrument/periodic_poller/pq.rb
+++ b/logstash-core/lib/logstash/instrument/periodic_poller/pq.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/instrument/periodic_poller/base"
 
 module LogStash module Instrument module PeriodicPoller
diff --git a/logstash-core/lib/logstash/instrument/periodic_pollers.rb b/logstash-core/lib/logstash/instrument/periodic_pollers.rb
index 812075b03..2fae2629f 100644
--- a/logstash-core/lib/logstash/instrument/periodic_pollers.rb
+++ b/logstash-core/lib/logstash/instrument/periodic_pollers.rb
@@ -1,8 +1,25 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/instrument/periodic_poller/dlq"
 require "logstash/instrument/periodic_poller/os"
 require "logstash/instrument/periodic_poller/jvm"
 require "logstash/instrument/periodic_poller/pq"
+require "logstash/instrument/periodic_poller/flow_rate"
 
 module LogStash module Instrument
   # Each PeriodPoller manager his own thread to do the poller
@@ -16,7 +33,8 @@ module LogStash module Instrument
       @periodic_pollers = [PeriodicPoller::Os.new(metric),
                            PeriodicPoller::JVM.new(metric),
                            PeriodicPoller::PersistentQueue.new(metric, queue_type, agent),
-                           PeriodicPoller::DeadLetterQueue.new(metric, agent)]
+                           PeriodicPoller::DeadLetterQueue.new(metric, agent),
+                           PeriodicPoller::FlowRate.new(metric, agent)]
     end
 
     def start
diff --git a/logstash-core/lib/logstash/java_pipeline.rb b/logstash-core/lib/logstash/java_pipeline.rb
index 8de8197d9..bc5cac5d6 100644
--- a/logstash-core/lib/logstash/java_pipeline.rb
+++ b/logstash-core/lib/logstash/java_pipeline.rb
@@ -1,22 +1,46 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "thread"
 require "concurrent"
+require "thwait"
 require "logstash/filters/base"
 require "logstash/inputs/base"
 require "logstash/outputs/base"
 require "logstash/instrument/collector"
 require "logstash/compiler"
+require "logstash/config/lir_serializer"
+require "logstash/worker_loop_thread"
 
-module LogStash; class JavaPipeline < JavaBasePipeline
+module LogStash; class JavaPipeline < AbstractPipeline
   include LogStash::Util::Loggable
+
+  java_import org.apache.logging.log4j.ThreadContext
+
   attr_reader \
     :worker_threads,
+    :input_threads,
     :events_consumed,
     :events_filtered,
     :started_at,
     :thread
 
-  MAX_INFLIGHT_WARN_THRESHOLD = 10_000
+  SECOND = 1
+  MEMORY = "memory".freeze
 
   def initialize(pipeline_config, namespaced_metric = nil, agent = nil)
     @logger = self.logger
@@ -25,7 +49,10 @@ module LogStash; class JavaPipeline < JavaBasePipeline
 
     @worker_threads = []
 
-    @drain_queue =  settings.get_value("queue.drain") || settings.get("queue.type") == "memory"
+    @worker_observer = org.logstash.execution.WorkerObserver.new(process_events_namespace_metric,
+                                                                 pipeline_events_namespace_metric)
+
+    @drain_queue = settings.get_value("queue.drain") || settings.get("queue.type") == MEMORY
 
     @events_filtered = java.util.concurrent.atomic.LongAdder.new
     @events_consumed = java.util.concurrent.atomic.LongAdder.new
@@ -37,6 +64,7 @@ module LogStash; class JavaPipeline < JavaBasePipeline
     @flushing = java.util.concurrent.atomic.AtomicBoolean.new(false)
     @flushRequested = java.util.concurrent.atomic.AtomicBoolean.new(false)
     @shutdownRequested = java.util.concurrent.atomic.AtomicBoolean.new(false)
+    @crash_detected = Concurrent::AtomicBoolean.new(false)
     @outputs_registered = Concurrent::AtomicBoolean.new(false)
 
     # @finished_execution signals that the pipeline thread has finished its execution
@@ -48,6 +76,10 @@ module LogStash; class JavaPipeline < JavaBasePipeline
     # is by design and necessary for the wait_until_started semantic
     @finished_run = Concurrent::AtomicBoolean.new(false)
 
+    @logger.info(I18n.t('logstash.pipeline.effective_ecs_compatibility',
+                        :pipeline_id       => pipeline_id,
+                        :ecs_compatibility => settings.get('pipeline.ecs_compatibility')))
+
     @thread = nil
   end # def initialize
 
@@ -55,6 +87,10 @@ module LogStash; class JavaPipeline < JavaBasePipeline
     @finished_execution.true?
   end
 
+  def finished_run?
+    @finished_run.true?
+  end
+
   def ready?
     @ready.value
   end
@@ -92,6 +128,7 @@ module LogStash; class JavaPipeline < JavaBasePipeline
     # this is useful in the context of pipeline reloading
     collect_stats
     collect_dlq_stats
+    initialize_flow_metrics
 
     @logger.debug("Starting pipeline", default_logging_keys)
 
@@ -99,15 +136,31 @@ module LogStash; class JavaPipeline < JavaBasePipeline
     @finished_run.make_false
 
     @thread = Thread.new do
+      error_log_params = ->(e) {
+        default_logging_keys(
+          :exception => e,
+          :backtrace => e.backtrace,
+          "pipeline.sources" => pipeline_source_details
+        )
+      }
+
       begin
         LogStash::Util.set_thread_name("pipeline.#{pipeline_id}")
+        ThreadContext.put("pipeline.id", pipeline_id)
         run
         @finished_run.make_true
       rescue => e
-        close
-        logger.error("Pipeline aborted due to error", default_logging_keys(:exception => e, :backtrace => e.backtrace))
+        logger.error("Pipeline error", error_log_params.call(e))
       ensure
+        # we must trap any exception here to make sure the following @finished_execution
+        # is always set to true regardless of any exception before in the close method call
+        begin
+          close
+        rescue => e
+          logger.error("Pipeline close error, ignoring", error_log_params.call(e))
+        end
         @finished_execution.make_true
+        @logger.info("Pipeline terminated", "pipeline.id" => pipeline_id)
       end
     end
 
@@ -151,21 +204,18 @@ module LogStash; class JavaPipeline < JavaBasePipeline
 
     transition_to_running
     start_flusher # Launches a non-blocking thread for flush events
-    wait_inputs
-    transition_to_stopped
+    begin
+      monitor_inputs_and_workers
+    ensure
+      transition_to_stopped
 
-    @logger.debug("Input plugins stopped! Will shutdown filter/output workers.", default_logging_keys)
-
-    shutdown_flusher
-    shutdown_workers
-
-    close
+      shutdown_flusher
+      shutdown_workers
 
+      close
+    end
     @logger.debug("Pipeline has been shutdown", default_logging_keys)
-
-    # exit code
-    return 0
-  end # def run
+  end
 
   def transition_to_running
     @running.make_true
@@ -183,6 +233,10 @@ module LogStash; class JavaPipeline < JavaBasePipeline
     @running.false?
   end
 
+  def crashed?
+    @crash_detected.true?
+  end
+
   # register_plugins calls #register_plugin on the plugins list and upon exception will call Plugin#do_close on all registered plugins
   # @param plugins [Array[Plugin]] the list of plugins to register
   def register_plugins(plugins)
@@ -203,6 +257,7 @@ module LogStash; class JavaPipeline < JavaBasePipeline
       maybe_setup_out_plugins
 
       pipeline_workers = safe_pipeline_worker_count
+      @preserve_event_order = preserve_event_order?(pipeline_workers)
       batch_size = settings.get("pipeline.batch.size")
       batch_delay = settings.get("pipeline.batch.delay")
 
@@ -213,36 +268,63 @@ module LogStash; class JavaPipeline < JavaBasePipeline
       config_metric.gauge(:batch_size, batch_size)
       config_metric.gauge(:batch_delay, batch_delay)
       config_metric.gauge(:config_reload_automatic, settings.get("config.reload.automatic"))
-      config_metric.gauge(:config_reload_interval, settings.get("config.reload.interval"))
+      config_metric.gauge(:config_reload_interval, settings.get("config.reload.interval").to_nanos)
       config_metric.gauge(:dead_letter_queue_enabled, dlq_enabled?)
       config_metric.gauge(:dead_letter_queue_path, dlq_writer.get_path.to_absolute_path.to_s) if dlq_enabled?
+      config_metric.gauge(:ephemeral_id, ephemeral_id)
+      config_metric.gauge(:hash, lir.unique_hash)
+      config_metric.gauge(:graph, ::LogStash::Config::LIRSerializer.serialize(lir))
 
-
-      @logger.info("Starting pipeline", default_logging_keys(
+      pipeline_log_params = default_logging_keys(
         "pipeline.workers" => pipeline_workers,
         "pipeline.batch.size" => batch_size,
         "pipeline.batch.delay" => batch_delay,
-        "pipeline.max_inflight" => max_inflight))
-      if max_inflight > MAX_INFLIGHT_WARN_THRESHOLD
-        @logger.warn("CAUTION: Recommended inflight events max exceeded! Logstash will run with up to #{max_inflight} events in memory in your current configuration. If your message sizes are large this may cause instability with the default heap size. Please consider setting a non-standard heap size, changing the batch size (currently #{batch_size}), or changing the number of pipeline workers (currently #{pipeline_workers})", default_logging_keys)
-      end
+        "pipeline.max_inflight" => max_inflight,
+        "pipeline.sources" => pipeline_source_details)
+      @logger.info("Starting pipeline", pipeline_log_params)
 
       filter_queue_client.set_batch_dimensions(batch_size, batch_delay)
 
-      pipeline_workers.times do |t|
-        thread = Thread.new do
+      # First launch WorkerLoop initialization in separate threads which concurrently
+      # compiles and initializes the worker pipelines
+
+      workers_init_start = Time.now
+      worker_loops = pipeline_workers.times
+        .map { Thread.new { init_worker_loop } }
+        .map(&:value)
+      workers_init_elapsed = Time.now - workers_init_start
+
+      fail("Some worker(s) were not correctly initialized") if worker_loops.any? {|v| v.nil?}
+
+      @logger.info("Pipeline Java execution initialization time", "seconds" => workers_init_elapsed.round(2))
+
+      # Once all WorkerLoop have been initialized run them in separate threads
+
+      worker_loops.each_with_index do |worker_loop, t|
+        thread = WorkerLoopThread.new(worker_loop) do
           Util.set_thread_name("[#{pipeline_id}]>worker#{t}")
-          org.logstash.execution.WorkerLoop.new(
-              lir_execution, filter_queue_client, @events_filtered, @events_consumed,
-              @flushRequested, @flushing, @shutdownRequested, @drain_queue).run
+          ThreadContext.put("pipeline.id", pipeline_id)
+          begin
+            worker_loop.run
+          rescue => e
+            # WorkerLoop.run() catches all Java Exception class and re-throws as IllegalStateException with the
+            # original exception as the cause
+            @crash_detected.make_true
+            @logger.error(
+              "Pipeline worker error, the pipeline will be stopped",
+              default_logging_keys(:error => e.cause.message, :exception => e.cause.class, :backtrace => e.cause.backtrace)
+            )
+          end
         end
         @worker_threads << thread
       end
 
-      # inputs should be started last, after all workers
+      # Finally inputs should be started last, after all workers have been initialized and started
+
       begin
         start_inputs
       rescue => e
+        @crash_detected.make_true
         # if there is any exception in starting inputs, make sure we shutdown workers.
         # exception will already by logged in start_inputs
         shutdown_workers
@@ -255,14 +337,53 @@ module LogStash; class JavaPipeline < JavaBasePipeline
     end
   end
 
-  def wait_inputs
-    @input_threads.each do |thread|
-      if thread.class == Java::JavaObject
-        thread.to_java.join
-      else
-        thread.join
+  def resolve_cluster_uuids
+    outputs.each_with_object(Set.new) do |output, cluster_uuids|
+      if LogStash::PluginMetadata.exists?(output.id)
+        cluster_uuids << LogStash::PluginMetadata.for_plugin(output.id).get(:cluster_uuid)
+      end
+    end.to_a.compact
+  end
+
+  def monitor_inputs_and_workers
+    twait = ThreadsWait.new(*(@input_threads + @worker_threads))
+
+    loop do
+      break if @input_threads.empty?
+
+      terminated_thread = twait.next_wait
+
+      if @input_threads.delete(terminated_thread).nil?
+        # this is an abnormal worker thread termination, we need to terminate the pipeline
+
+        @worker_threads.delete(terminated_thread)
+
+        # before terminating the pipeline we need to close the inputs
+        stop_inputs
+
+        # wait 10 seconds for all input threads to terminate
+        wait_input_threads_termination(10 * SECOND) do
+          @logger.warn("Waiting for input plugin to close", default_logging_keys)
+          sleep(1)
+        end
+
+        if inputs_running? && settings.get("queue.type") == MEMORY
+          # if there are still input threads alive they are probably blocked pushing on the memory queue
+          # because no worker is present to consume from the ArrayBlockingQueue
+          # if this is taking too long we have a problem
+          wait_input_threads_termination(10 * SECOND) do
+            dropped_batch = filter_queue_client.read_batch
+            @logger.error("Dropping events to unblock input plugin", default_logging_keys(:count => dropped_batch.filteredSize)) if dropped_batch.filteredSize > 0
+          end
+        end
+
+        raise("Unable to stop input plugin(s)") if inputs_running?
+
+        break
       end
     end
+
+    @logger.debug("Input plugins stopped! Will shutdown filter/output workers.", default_logging_keys)
   end
 
   def start_inputs
@@ -293,58 +414,59 @@ module LogStash; class JavaPipeline < JavaBasePipeline
 
   def inputworker(plugin)
     Util::set_thread_name("[#{pipeline_id}]<#{plugin.class.config_name}")
+    ThreadContext.put("pipeline.id", pipeline_id)
+    ThreadContext.put("plugin.id", plugin.id)
     begin
       plugin.run(wrapped_write_client(plugin.id.to_sym))
     rescue => e
       if plugin.stop?
-        @logger.debug("Input plugin raised exception during shutdown, ignoring it.",
-                      default_logging_keys(:plugin => plugin.class.config_name, :exception => e.message, :backtrace => e.backtrace))
+        @logger.debug(
+          "Input plugin raised exception during shutdown, ignoring it.",
+           default_logging_keys(
+             :plugin => plugin.class.config_name,
+             :exception => e.message,
+             :backtrace => e.backtrace))
         return
       end
 
       # otherwise, report error and restart
-      @logger.error(I18n.t("logstash.pipeline.worker-error-debug",
-                            default_logging_keys(
-                              :plugin => plugin.inspect,
-                              :error => e.message,
-                              :exception => e.class,
-                              :stacktrace => e.backtrace.join("\n"))))
+      @logger.error(I18n.t(
+        "logstash.pipeline.worker-error-debug",
+        **default_logging_keys(
+          :plugin => plugin.inspect,
+          :error => e.message,
+          :exception => e.class,
+          :stacktrace => e.backtrace.join("\n"))))
 
       # Assuming the failure that caused this exception is transient,
       # let's sleep for a bit and execute #run again
       sleep(1)
+      close_plugin_and_ignore(plugin)
       retry
     ensure
-      plugin.do_close
+      close_plugin_and_ignore(plugin)
     end
-  end # def inputworker
+  end
 
   # initiate the pipeline shutdown sequence
   # this method is intended to be called from outside the pipeline thread
-  # @param before_stop [Proc] code block called before performing stop operation on input plugins
-  def shutdown(&before_stop)
+  # and will block until the pipeline has successfully shut down.
+  def shutdown
+    return if finished_execution?
     # shutdown can only start once the pipeline has completed its startup.
     # avoid potential race condition between the startup sequence and this
     # shutdown method which can be called from another thread at any time
     sleep(0.1) while !ready?
 
     # TODO: should we also check against calling shutdown multiple times concurrently?
-
-    before_stop.call if block_given?
-
     stop_inputs
-
-    # We make this call blocking, so we know for sure when the method return the shutdown is
-    # stopped
-    wait_for_workers
+    wait_for_shutdown
+  ensure
     clear_pipeline_metrics
-    @logger.info("Pipeline terminated", "pipeline.id" => pipeline_id)
   end # def shutdown
 
-  def wait_for_workers
-    @logger.debug("Closing inputs", default_logging_keys)
-    @worker_threads.map(&:join)
-    @logger.debug("Worker closed", default_logging_keys)
+  def wait_for_shutdown
+    ShutdownWatcher.new(self).start
   end
 
   def stop_inputs
@@ -360,7 +482,7 @@ module LogStash; class JavaPipeline < JavaBasePipeline
     @shutdownRequested.set(true)
 
     @worker_threads.each do |t|
-      @logger.debug("Shutdown waiting for worker thread" , default_logging_keys(:thread => t.inspect))
+      @logger.debug("Shutdown waiting for worker thread", default_logging_keys(:thread => t.inspect))
       t.join
     end
 
@@ -404,7 +526,10 @@ module LogStash; class JavaPipeline < JavaBasePipeline
   end
 
   def stalling_threads_info
-    plugin_threads_info
+    all_threads = plugin_threads_info
+    all_threads << Util.thread_info(@thread) if @thread
+
+    all_threads
       .reject {|t| t["blocked_on"] } # known benign blocking statuses
       .each {|t| t.delete("backtrace") }
       .each {|t| t.delete("blocked_on") }
@@ -422,6 +547,7 @@ module LogStash; class JavaPipeline < JavaBasePipeline
       # we want to keep other metrics like reload counts and error messages
       collector.clear("stats/pipelines/#{pipeline_id}/plugins")
       collector.clear("stats/pipelines/#{pipeline_id}/events")
+      collector.clear("stats/pipelines/#{pipeline_id}/flow")
     end
   end
 
@@ -438,8 +564,59 @@ module LogStash; class JavaPipeline < JavaBasePipeline
     }
   end
 
+  def shutdown_requested?
+    @shutdownRequested.get
+  end
+
+  def worker_threads_draining?
+    @worker_threads.any? {|t| t.worker_loop.draining? }
+  end
+
   private
 
+  def close_plugin_and_ignore(plugin)
+    begin
+      plugin.do_close
+    rescue => e
+      @logger.warn(
+        "plugin raised exception while closing, ignoring",
+        default_logging_keys(
+          :plugin => plugin.class.config_name,
+          :exception => e.message,
+          :backtrace => e.backtrace))
+    end
+  end
+
+  # @return [WorkerLoop] a new WorkerLoop instance or nil upon construction exception
+  def init_worker_loop
+    begin
+      org.logstash.execution.WorkerLoop.new(
+        filter_queue_client,   # QueueReadClient
+        lir_execution,         # CompiledPipeline
+        @worker_observer,      # WorkerObserver
+        # pipeline reporter counters
+        @events_consumed,      # LongAdder
+        @events_filtered,      # LongAdder
+        # signaling channels
+        @flushRequested,       # AtomicBoolean
+        @flushing,             # AtomicBoolean
+        @shutdownRequested,    # AtomicBoolean
+        # behaviour config pass-through
+        @drain_queue,          # boolean
+        @preserve_event_order) # boolean
+    rescue => e
+      @logger.error(
+        "Worker loop initialization error",
+        default_logging_keys(:error => e.message, :exception => e.class, :stacktrace => e.backtrace.join("\n")))
+      nil
+    rescue Java::java.lang.StackOverflowError => se
+      @logger.error(
+        "Stack overflow error while compiling Pipeline. Please increase thread stack size using -Xss",
+        default_logging_keys())
+      nil
+    end
+  end
+
   def maybe_setup_out_plugins
     if @outputs_registered.make_true
       register_plugins(outputs)
@@ -452,4 +629,32 @@ module LogStash; class JavaPipeline < JavaBasePipeline
     keys[:thread] ||= thread.inspect if thread
     keys
   end
+
+  def preserve_event_order?(pipeline_workers)
+    case settings.get("pipeline.ordered")
+    when "auto"
+      if settings.set?("pipeline.workers") && settings.get("pipeline.workers") == 1
+        @logger.warn("'pipeline.ordered' is enabled and is likely less efficient, consider disabling if preserving event order is not necessary") unless settings.get("pipeline.system")
+        return true
+      end
+    when "true"
+      fail("enabling the 'pipeline.ordered' setting requires the use of a single pipeline worker") if pipeline_workers > 1
+      return true
+    end
+
+    false
+  end
+
+  def wait_input_threads_termination(timeout_seconds, &block)
+    start = Time.now
+    seconds = 0
+    while inputs_running? && (seconds < timeout_seconds)
+      block.call
+      seconds = Time.now - start
+    end
+  end
+
+  def inputs_running?
+    @input_threads.any?(&:alive?)
+  end
 end; end
diff --git a/logstash-core/lib/logstash/json.rb b/logstash-core/lib/logstash/json.rb
index f2dc0e0a9..a8f0abe9b 100644
--- a/logstash-core/lib/logstash/json.rb
+++ b/logstash-core/lib/logstash/json.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/environment"
 require "jrjackson"
 
@@ -11,18 +27,18 @@ module LogStash
       # options[:symbolize_keys] ? JrJackson::Raw.parse_sym(data) : JrJackson::Raw.parse_raw(data)
 
       JrJackson::Ruby.parse(data, options)
-
     rescue JrJackson::ParseError => e
       raise LogStash::Json::ParserError.new(e.message)
     end
 
-    def jruby_dump(o, options={})
+    def jruby_dump(o, options = {})
+      encoding_normalized_data = normalize_encoding(o)
+
       # TODO [guyboertje] remove these comments in 5.0
       # test for enumerable here to work around an omission in JrJackson::Json.dump to
       # also look for Java::JavaUtil::ArrayList, see TODO submit issue
       # o.is_a?(Enumerable) ? JrJackson::Raw.generate(o) : JrJackson::Json.dump(o)
-      JrJackson::Base.generate(o, options)
-
+      JrJackson::Base.generate(encoding_normalized_data, options)
     rescue => e
       raise LogStash::Json::GeneratorError.new(e.message)
     end
@@ -30,5 +46,26 @@ module LogStash
     alias_method :load, "jruby_load".to_sym
     alias_method :dump, "jruby_dump".to_sym
 
+    private
+    def normalize_encoding(data)
+      case data
+      when String
+        if data.encoding == Encoding::ASCII_8BIT
+          # when given BINARY-flagged string, assume it is UTF-8 so that
+          # subsequent cleanup retains valid UTF-8 sequences
+          data = data.dup.force_encoding(Encoding::UTF_8)
+        end
+        data
+      when Array
+        data.map { |item| normalize_encoding(item) }
+      when Hash
+        # origin key might change when normalizing, so requires transformation
+        data.to_hash # if coming from jruby objects such as UnmodifiableMap
+            .transform_keys { |key| normalize_encoding(key) }
+            .transform_values { |value| normalize_encoding(value) }
+      else
+        data # use as it is
+      end
+    end
   end
 end
diff --git a/logstash-core/lib/logstash/logging.rb b/logstash-core/lib/logstash/logging.rb
index bca5f6749..e249288bf 100644
--- a/logstash-core/lib/logstash/logging.rb
+++ b/logstash-core/lib/logstash/logging.rb
@@ -1 +1,16 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
diff --git a/logstash-core/lib/logstash/logging/logger.rb b/logstash-core/lib/logstash/logging/logger.rb
index 647fe2307..dd0059212 100644
--- a/logstash-core/lib/logstash/logging/logger.rb
+++ b/logstash-core/lib/logstash/logging/logger.rb
@@ -1 +1,18 @@
-# Keeping this file for backwards compatibility with plugins that include it directly.
\ No newline at end of file
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Keeping this file for backwards compatibility with plugins that include it directly.
diff --git a/logstash-core/lib/logstash/modules/cli_parser.rb b/logstash-core/lib/logstash/modules/cli_parser.rb
deleted file mode 100644
index 3942d1434..000000000
--- a/logstash-core/lib/logstash/modules/cli_parser.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-# encoding: utf-8
-module LogStash module Modules class CLIParser
-  include LogStash::Util::Loggable
-
-  attr_reader :output
-  def initialize(module_names, module_variables)
-    @output = []
-    # The #compact here catches instances when module_variables may be nil or
-    # [nil] and sets it to []
-    parse_it(module_names, Array(module_variables).compact)
-  end
-
-  def parse_modules(module_list)
-    parsed_modules = []
-    module_list.each do |module_value|
-      # Calling --modules but not filling it results in [nil], so skip that.
-      next if module_value.nil?
-      # Catch if --modules was launched empty but an option/flag (-something)
-      # follows immediately after
-      if module_value.start_with?('-')
-        raise LogStash::ConfigLoadingError, I18n.t("logstash.modules.configuration.modules-invalid-name", :module_name => module_value)
-      end
-      parsed_modules.concat module_value.split(',')
-    end
-    parsed_modules
-  end
-
-  def get_kv(module_name, unparsed)
-    # Ensure that there is at least 1 equals sign in our variable string
-    # Using String#partition to split on the first '='
-    # This hackery is to catch the possibility of an equals (`=`) sign
-    # in a passphrase, which might result in an incomplete key.  The
-    # portion before the first `=` should always be the key, leaving
-    # the rest to be the value
-    k, op, rest = unparsed.partition('=')
-    if rest.size.zero?
-      raise LogStash::ConfigLoadingError, I18n.t("logstash.modules.configuration.modules-variables-malformed", :rawvar => (module_name + '.' + unparsed))
-    end
-    return k.strip, rest.strip
-  end
-
-  def name_splitter(unparsed)
-    # It must have at least `modulename.something`
-    module_name, dot, rest = unparsed.partition('.')
-    if rest.count('.') >= 1
-      return module_name, rest
-    else
-      raise LogStash::ConfigLoadingError, I18n.t("logstash.modules.configuration.modules-variables-malformed", :rawvar => unparsed)
-    end
-  end
-
-  def parse_vars(module_name, vars_list)
-    module_hash = {"name" => module_name}
-    vars_list.each do |unparsed|
-      extracted_name, modvar = name_splitter(unparsed)
-      next if extracted_name != module_name
-      k, v = get_kv(extracted_name, modvar)
-      module_hash[k] = v
-    end
-    module_hash
-  end
-
-  def parse_it(module_list, module_variable_list)
-    if module_list.is_a?(Array)
-      parse_modules(module_list).each do |module_name|
-        @output << parse_vars(module_name, module_variable_list)
-      end
-    end
-  end
-end end end
diff --git a/logstash-core/lib/logstash/modules/elasticsearch_config.rb b/logstash-core/lib/logstash/modules/elasticsearch_config.rb
deleted file mode 100644
index 0fa54ffd8..000000000
--- a/logstash-core/lib/logstash/modules/elasticsearch_config.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# encoding: utf-8
-require_relative "elasticsearch_resource"
-
-module LogStash module Modules class ElasticsearchConfig
-  attr_reader :index_name
-
-  # We name it `modul` here because `module` has meaning in Ruby.
-  def initialize(modul, settings)
-    @directory = ::File.join(modul.directory, "elasticsearch")
-    @name = modul.module_name
-    @settings = settings
-    @full_path = ::File.join(@directory, "#{@name}.json")
-    @index_name = @settings.fetch("elasticsearch.template_path", "_template")
-  end
-
-  def resources
-    [ElasticsearchResource.new(@index_name, "not-used", @full_path)]
-  end
-end end end
diff --git a/logstash-core/lib/logstash/modules/elasticsearch_importer.rb b/logstash-core/lib/logstash/modules/elasticsearch_importer.rb
deleted file mode 100644
index 6d957a709..000000000
--- a/logstash-core/lib/logstash/modules/elasticsearch_importer.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# encoding: utf-8
-module LogStash module Modules class ElasticsearchImporter
-  include LogStash::Util::Loggable
-
-  def initialize(client)
-    @client = client
-  end
-
-  def put(resource, overwrite = true)
-    path = resource.import_path
-    logger.debug("Attempting PUT", :url_path => path, :file_path => resource.content_path)
-    if !overwrite && content_exists?(path)
-      logger.debug("Found existing Elasticsearch resource.", :resource => path)
-      return
-    end
-    put_overwrite(path, resource.content)
-  end
-
-  private
-
-  def put_overwrite(path, content)
-    if content_exists?(path)
-      response = @client.delete(path)
-    end
-    # hmmm, versioning?
-    @client.put(path, content).status == 201
-  end
-
-  def content_exists?(path)
-    response = @client.head(path)
-    response.status >= 200 && response.status < 300
-  end
-
-end end end # class LogStash::Modules::Importer
diff --git a/logstash-core/lib/logstash/modules/elasticsearch_resource.rb b/logstash-core/lib/logstash/modules/elasticsearch_resource.rb
deleted file mode 100644
index 90744cd09..000000000
--- a/logstash-core/lib/logstash/modules/elasticsearch_resource.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# encoding: utf-8
-require_relative "resource_base"
-
-module LogStash module Modules class ElasticsearchResource
-  include ResourceBase
-  def import_path
-    base + "/" + content_id
-  end
-end end end
diff --git a/logstash-core/lib/logstash/modules/file_reader.rb b/logstash-core/lib/logstash/modules/file_reader.rb
deleted file mode 100644
index 75c14f692..000000000
--- a/logstash-core/lib/logstash/modules/file_reader.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# encoding: utf-8
-require "logstash/json"
-
-module LogStash module Modules class FileReader
-  # stub these methods for testing
-  include LogStash::Util::Loggable
-
-  def self.read(path)
-    begin
-      ::File.read(path)
-    rescue => e
-      logger.error("Error when reading file from path", :path => path)
-      ""
-    end
-  end
-
-  def self.read_json(path)
-    json = read(path)
-    begin
-      LogStash::Json.load(json)
-    rescue => e
-      logger.error("Error when parsing json from path", :path => path)
-      return {}
-    end
-  end
-
-  def self.glob(path)
-    files = Dir.glob(path)
-    if files.empty?
-      logger.warn("No files found for glob", :pattern => path)
-    end
-    files
-  end
-end end end
diff --git a/logstash-core/lib/logstash/modules/kibana_base.rb b/logstash-core/lib/logstash/modules/kibana_base.rb
deleted file mode 100644
index 635909d91..000000000
--- a/logstash-core/lib/logstash/modules/kibana_base.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# encoding: utf-8
-require "logstash/json"
-
-module LogStash module Modules class KibanaBase
-  attr_reader :import_path, :content
-
-  def initialize(import_path, content)
-    @import_path, @content = import_path, content
-  end
-
-  def import(client)
-    raise NotImplementedError, "#{self.class.name} needs to implement `#import`"
-  end
-
-  def to_s
-    import_path
-  end
-
-  def content_as_object
-    return content unless content.is_a?(String)
-    LogStash::Json.load(content) rescue nil
-  end
-end end end
diff --git a/logstash-core/lib/logstash/modules/kibana_client.rb b/logstash-core/lib/logstash/modules/kibana_client.rb
deleted file mode 100644
index b5a6a174c..000000000
--- a/logstash-core/lib/logstash/modules/kibana_client.rb
+++ /dev/null
@@ -1,146 +0,0 @@
-# encoding: utf-8
-require "logstash/json"
-require "manticore"
-require 'logstash/util/manticore_ssl_config_helper'
-
-module LogStash module Modules class KibanaClient
-  include LogStash::Util::Loggable
-
-  include LogStash::Util::ManticoreSSLConfigHelper
-
-  class Response
-    # to create a custom response with body as an Object (Hash or Array)
-    attr_reader :status, :body, :headers
-    def initialize(status, body, headers={})
-      @status, @body, @headers = status, body, headers
-      @body = body.is_a?(String) ? LogStash::Json.load(body) : body
-    end
-
-    def succeeded?
-      @status >= 200 && @status < 300
-    end
-
-    def failed?
-      !succeeded?
-    end
-  end
-
-  SCHEME_REGEX = /^https?$/
-
-  attr_reader :version, :endpoint
-
-  def initialize(settings, client = nil) # allow for test mock injection
-    @settings = settings
-
-    client_options = {
-      request_timeout: 5,
-      connect_timeout: 5,
-      socket_timeout: 5,
-      pool_max: 10,
-      pool_max_per_route: 2
-    }
-
-    ssl_options = manticore_ssl_options_from_config('kibana', settings)
-    ssl_enabled = ssl_options.any?
-
-    client_options[:ssl] = ssl_options
-
-    @host = @settings.fetch("var.kibana.host", "localhost:5601")
-    implicit_scheme, colon_slash_slash, host = @host.partition("://")
-    explicit_scheme = @settings["var.kibana.scheme"]
-    @scheme = "http"
-    if !colon_slash_slash.empty?
-      if !explicit_scheme.nil? && implicit_scheme != explicit_scheme
-        # both are set and not the same - error
-        msg = sprintf("Detected differing Kibana host schemes as sourced from var.kibana.host: '%s' and var.kibana.scheme: '%s'", implicit_scheme, explicit_scheme)
-        raise ArgumentError.new(msg)
-      end
-      @scheme = implicit_scheme
-      @host = host
-    elsif !explicit_scheme.nil?
-      @scheme = explicit_scheme
-    end
-
-    if SCHEME_REGEX.match(@scheme).nil?
-      msg = sprintf("Kibana host scheme given is invalid, given value: '%s' - acceptable values: 'http', 'https'", @scheme)
-      raise ArgumentError.new(msg)
-    end
-
-    if ssl_enabled && @scheme != "https"
-      @scheme = "https"
-    end
-
-    @endpoint = "#{@scheme}://#{@host}"
-
-    @client = client || Manticore::Client.new(client_options)
-    @http_options = {:headers => {'Content-Type' => 'application/json'}}
-    username = @settings["var.kibana.username"]
-    if username
-      password = @settings["var.kibana.password"]
-      if password.is_a?(LogStash::Util::Password)
-        password = password.value
-      end
-      @http_options[:headers]['Authorization'] = 'Basic ' + Base64.encode64( "#{username}:#{password}" ).chomp
-    end
-
-    # e.g. {"name":"Elastics-MacBook-Pro.local","version":{"number":"6.0.0-beta1","build_hash":"41e69","build_number":15613,"build_snapshot":true}..}
-    @version = "0.0.0"
-    response = get("api/status")
-    if response.succeeded?
-      status = response.body
-      if status["version"].is_a?(Hash)
-        @version = status["version"]["number"]
-        if status["version"]["build_snapshot"]
-          @version.concat("-SNAPSHOT")
-        end
-      end
-    end
-    @http_options[:headers]['kbn-version'] = @version
-  end
-
-  def version_parts
-    @version.split(/[.-]/)
-  end
-
-  def host_settings
-    "[\"#{@host}\"]"
-  end
-
-  def get(relative_path)
-    # e.g. api/kibana/settings
-    safely(:get, relative_path, @http_options)
-  end
-
-  # content will be converted to a json string
-  def post(relative_path, content, headers = nil)
-
-    body = content.is_a?(String) ? content : LogStash::Json.dump(content)
-    options = {:body => body}.merge(headers || @http_options)
-    safely(:post, relative_path, options)
-  end
-
-  def head(relative_path)
-    safely(:head, relative_path, @http_options)
-  end
-
-  def can_connect?
-    head("api/status").succeeded?
-  end
-
-  private
-
-  def safely(method_sym, relative_path, options = {})
-    begin
-      resp = @client.http(method_sym, full_url(relative_path), options).call
-      Response.new(resp.code, resp.body, resp.headers)
-    rescue Manticore::ManticoreException => e
-      logger.error("Error when executing Kibana client request", :error => e)
-      body = {"statusCode" => 0, "error" => e.message}
-      Response.new(0, body, {})
-    end
-  end
-
-  def full_url(relative)
-    "#{@endpoint}/#{relative}"
-  end
-end end end
diff --git a/logstash-core/lib/logstash/modules/kibana_config.rb b/logstash-core/lib/logstash/modules/kibana_config.rb
deleted file mode 100644
index 528eed6af..000000000
--- a/logstash-core/lib/logstash/modules/kibana_config.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-# encoding: utf-8
-require_relative "file_reader"
-require_relative "kibana_settings"
-require_relative "kibana_dashboards"
-require_relative "kibana_resource"
-
-module LogStash module Modules class KibanaConfig
-  include LogStash::Util::Loggable
-
-  ALLOWED_DIRECTORIES = ["search", "visualization"]
-  attr_reader :index_name # not used when importing via kibana but for BWC with ElasticsearchConfig
-
-  # We name it `modul` here because `module` has meaning in Ruby.
-  def initialize(modul, settings)
-    build_versioned_directory(modul)
-    @name = modul.module_name
-    @settings = settings
-    @index_name = "kibana"
-    @pattern_name = "#{@name}-*"
-    @kibana_settings = [
-      KibanaSettings::Setting.new("defaultIndex", @pattern_name)
-    ]
-  end
-
-  def dashboards
-    # there can be more than one dashboard to load
-    filenames = FileReader.read_json(dynamic("dashboard"))
-    filenames.map do |filename|
-      KibanaResource.new(@index_name, "dashboard", dynamic("dashboard", filename))
-    end
-  end
-
-  def index_pattern
-    [KibanaResource.new(@index_name, "index-pattern", dynamic("index-pattern"),nil, @pattern_name)]
-  end
-
-  def resources
-    list = index_pattern
-    dashboards.each do |board|
-      list << board
-      extract_panels_into(board, list)
-    end
-    list.concat(extract_saved_searches_into(list))
-    [
-      KibanaSettings.new("api/kibana/settings", @kibana_settings),
-      KibanaDashboards.new("api/kibana/dashboards/import", list)
-    ]
-  end
-
-  private
-
-  def build_versioned_directory(modul)
-    # try to detect which directory holds the config for the kibana version
-    base_dir = ::File.join(modul.directory, "kibana")
-    maj, min, patch = modul.kibana_version_parts
-    version_dir = "#{maj}.#{min}.#{patch}"
-    @directory = ::File.join(base_dir, version_dir)
-    return if ::File.directory?(@directory)
-    version_dir = "#{maj}.#{min}.x"
-    @directory = ::File.join(base_dir, version_dir)
-    return if ::File.directory?(@directory)
-    version_dir = "#{maj}.x"
-    @directory = ::File.join(base_dir, version_dir)
-    unless ::File.directory?(@directory)
-      logger.error("Cannot find kibana version sub-directory", :module => @name, :base_directory => base_dir)
-    end
-  end
-
-  def dynamic(dynamic_folder, filename = @name)
-    ::File.join(@directory, dynamic_folder, "#{filename}.json")
-  end
-
-  def extract_panels_into(dashboard, list)
-    dash = dashboard.content_as_object
-
-    if !dash.is_a?(Hash)
-      logger.warn("Kibana dashboard JSON is not an Object", :module => @name)
-      return
-    end
-
-    panelsjson = dash["panelsJSON"]
-
-    if panelsjson.nil?
-      logger.info("No panelJSON key found in kibana dashboard", :module => @name)
-      return
-    end
-
-    begin
-      panels = LogStash::Json.load(panelsjson)
-    rescue => e
-      logger.error("JSON parse error when reading kibana panelsJSON", :module => @name)
-      return
-    end
-
-    panels.each do |panel|
-      panel_type = panel["type"]
-      if ALLOWED_DIRECTORIES.member?(panel_type)
-        list << KibanaResource.new(@index_name, panel_type, dynamic(panel_type, panel["id"]))
-      else
-        logger.warn("panelJSON contained unknown type", :type => panel_type)
-      end
-    end
-  end
-
-  def extract_saved_searches_into(list)
-    result = [] # must not add to list while iterating
-    list.each do |resource|
-      content = resource.content_as_object
-      next if content.nil?
-      next unless content.keys.include?("savedSearchId")
-      saved_search = content["savedSearchId"]
-      next if saved_search.nil?
-      ss_resource = KibanaResource.new(@index_name, "search", dynamic("search", saved_search))
-      next if list.member?(ss_resource) || result.member?(ss_resource)
-      result << ss_resource
-    end
-    result
-  end
-end end end
diff --git a/logstash-core/lib/logstash/modules/kibana_dashboards.rb b/logstash-core/lib/logstash/modules/kibana_dashboards.rb
deleted file mode 100644
index d8f345a17..000000000
--- a/logstash-core/lib/logstash/modules/kibana_dashboards.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# encoding: utf-8
-require_relative "kibana_base"
-
-module LogStash module Modules class KibanaDashboards < KibanaBase
-  include LogStash::Util::Loggable
-
-  attr_reader :import_path, :content
-
-  # content is a list of kibana file resources
-  def initialize(import_path, content)
-    @import_path, @content = import_path, content
-  end
-
-  def import(client)
-    # e.g. curl "http://localhost:5601/api/kibana/dashboards/import"
-    # extract and prepare all objects
-    objects = []
-    content.each do |resource|
-      hash = {
-        "id" => resource.content_id,
-        "type" => resource.content_type,
-        "version" => 1,
-        "attributes" => resource.content_as_object
-      }
-      objects << hash
-    end
-    body = {"version": client.version, "objects": objects}
-    response = client.post(import_path, body)
-    if response.failed?
-      logger.error("Attempted POST failed", :url_path => import_path, :response => response.body)
-    end
-    response
-  end
-end end end
diff --git a/logstash-core/lib/logstash/modules/kibana_importer.rb b/logstash-core/lib/logstash/modules/kibana_importer.rb
deleted file mode 100644
index 268f4827b..000000000
--- a/logstash-core/lib/logstash/modules/kibana_importer.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# encoding: utf-8
-module LogStash module Modules class KibanaImporter
-  include LogStash::Util::Loggable
-
-  def initialize(client)
-    @client = client
-  end
-
-  def put(via_kibana)
-    path = via_kibana.import_path
-    logger.debug("Attempting POST", :url_path => path, :content => via_kibana.content)
-    via_kibana.import(@client)
-  end
-end end end
diff --git a/logstash-core/lib/logstash/modules/kibana_resource.rb b/logstash-core/lib/logstash/modules/kibana_resource.rb
deleted file mode 100644
index d512765a0..000000000
--- a/logstash-core/lib/logstash/modules/kibana_resource.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# encoding: utf-8
-require_relative "resource_base"
-
-module LogStash module Modules class KibanaResource
-  include ResourceBase
-  def import_path
-    base + "/" + content_type + "/" + content_id
-  end
-end end end
diff --git a/logstash-core/lib/logstash/modules/kibana_settings.rb b/logstash-core/lib/logstash/modules/kibana_settings.rb
deleted file mode 100644
index af3383360..000000000
--- a/logstash-core/lib/logstash/modules/kibana_settings.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# encoding: utf-8
-require_relative "kibana_base"
-
-module LogStash module Modules class KibanaSettings < KibanaBase
-  include LogStash::Util::Loggable
-
-  class Setting
-    attr_reader :name, :value
-    def initialize(name, value)
-      @name, @value = name, value
-    end
-  end
-
-  attr_reader :import_path, :content
-
-  # content is an array of Setting required for this module
-  def initialize(import_path, content)
-    @import_path, @content = import_path, content
-  end
-
-  def import(client)
-    # e.g. curl "http://localhost:5601/api/kibana/settings"
-    # 6.0.0-beta1 -> {"settings":{"buildNum":{"userValue":15613},"defaultIndex":{"userValue":"arcsight-*"}}}
-    # 5.4 -> {"settings":{"defaultIndex":{"userValue":"cef-*"},"metrics:max_buckets":{"userValue":"600000"}}}
-    # array of Setting objects
-    # The POST api body { "changes": { "defaultIndex": "arcsight-*", "metrics:max_buckets": "400" } }
-    settings = {}
-    content.each do |setting|
-      settings[setting.name] = "#{setting.value}"
-    end
-    body = {"changes" => settings}
-    response = client.post(import_path, body)
-    if response.failed?
-      logger.error("Attempted POST failed", :url_path => import_path, :response => response.body)
-    end
-    response
-  end
-end end end
diff --git a/logstash-core/lib/logstash/modules/logstash_config.rb b/logstash-core/lib/logstash/modules/logstash_config.rb
deleted file mode 100644
index 14801a17b..000000000
--- a/logstash-core/lib/logstash/modules/logstash_config.rb
+++ /dev/null
@@ -1,133 +0,0 @@
-# encoding: utf-8
-require_relative "file_reader"
-require "logstash/settings"
-
-module LogStash module Modules class LogStashConfig
-  # We name it `modul` here because `module` has meaning in Ruby.
-  def initialize(modul, settings)
-    @directory = ::File.join(modul.directory, "logstash")
-    @name = modul.module_name
-    @settings = settings
-  end
-
-  def template
-    ::File.join(@directory, "#{@name}.conf.erb")
-  end
-
-  def configured_inputs(default = [], aliases = {})
-    name = "var.inputs"
-    values = get_setting(LogStash::Setting::SplittableStringArray.new(name, String, default))
-
-    aliases.each { |k,v| values << v if values.include?(k) }
-    aliases.invert.each { |k,v| values << v if values.include?(k) }
-    values.flatten.uniq
-  end
-
-  def alias_settings_keys!(aliases)
-    aliased_settings = alias_matching_keys(aliases, @settings)
-    @settings = alias_matching_keys(aliases.invert, aliased_settings)
-  end
-
-  def array_to_string(array)
-    "[#{array.collect { |i| "'#{i}'" }.join(", ")}]"
-  end
-
-  def csv_string(array)
-    "'#{array.join(',')}'"
-  end
-
-  def get_setting(setting_class)
-    raw_value = @settings[setting_class.name]
-    # If we dont check for NIL, the Settings class will try to coerce the value
-    # and most of the it will fails when a NIL value is explicitly set.
-    # This will be fixed once we wrap the plugins settings into a Settings class
-    setting_class.set(raw_value) unless raw_value.nil?
-    setting_class.value
-  end
-
-  def setting(name, default)
-    # by default we use the more permissive setting which is a `NullableString`
-    # This is fine because the end format of the logstash configuration is a string representation
-    # of the pipeline. There is a good reason why I think we should use the settings classes, we
-    # can `preprocess` a template and generate a configuration from the defined settings
-    # validate the values and replace them in the template.
-    case default
-      when String
-        get_setting(LogStash::Setting::NullableString.new(name, default.to_s))
-      when Numeric
-        get_setting(LogStash::Setting::Numeric.new(name, default))
-      when true, false
-        get_setting(LogStash::Setting::Boolean.new(name, default))
-      else
-        get_setting(LogStash::Setting::NullableString.new(name, default.to_s))
-      end
-  end
-
-  def has_setting?(name)
-    @settings.key?(name)
-  end
-
-  def raw_setting(name)
-    @settings[name]
-  end
-
-  def fetch_raw_setting(name, default)
-    @settings.fetch(name, default)
-  end
-
-  def elasticsearch_output_config(type_string = nil)
-    hosts = array_to_string(get_setting(LogStash::Setting::SplittableStringArray.new("var.elasticsearch.hosts", String, ["localhost:9200"])))
-    index = "#{@name}-#{setting("var.elasticsearch.index_suffix", "%{+YYYY.MM.dd}")}"
-    user = @settings["var.elasticsearch.username"]
-    password = @settings["var.elasticsearch.password"]
-    lines = ["hosts => #{hosts}", "index => \"#{index}\""]
-    lines.push(user ? "user => \"#{user}\"" : nil)
-    lines.push(password ? "password => \"#{password.value}\"" : nil)
-    lines.push(type_string ? "document_type => #{type_string}" : nil)
-    lines.push("ssl => #{@settings.fetch('var.elasticsearch.ssl.enabled', false)}")
-    if cacert = @settings["var.elasticsearch.ssl.certificate_authority"]
-      lines.push("cacert => \"#{cacert}\"") if cacert
-    end
-    # NOTE: the first line should be indented in the conf.erb
-    <<-CONF
-elasticsearch {
-    #{lines.compact.join("\n    ")}
-    manage_template => false
-  }
-CONF
-  end
-
-  def config_string
-    # process the template and settings
-    # send back as a string
-    renderer = ERB.new(FileReader.read(template))
-    renderer.result(binding)
-  end
-
-  private
-  # For a first version we are copying the values of the original hash,
-  # this might become problematic if we users changes the values of the
-  # settings in the template, which could result in an inconsistent view of the original data
-  #
-  # For v1 of the feature I think its an OK compromise, v2 we have a more advanced hash that
-  # support alias.
-  def alias_matching_keys(aliases, target)
-    aliased_target = target.dup
-
-    aliases.each do |matching_key_prefix, new_key_prefix|
-      target.each do |k, v|
-        re = /^#{matching_key_prefix}\./
-
-        if k =~ re
-          alias_key = k.gsub(re, "#{new_key_prefix}.")
-
-          # If the user setup the same values twices with different values lets just halt.
-          raise "Cannot create an alias, the destination key has already a value set: original key: #{k}, alias key: #{alias_key}" if (!aliased_target[alias_key].nil? && aliased_target[alias_key] != v)
-          aliased_target[alias_key] = v unless v.nil?
-        end
-      end
-    end
-
-    aliased_target
-  end
-end end end
diff --git a/logstash-core/lib/logstash/modules/resource_base.rb b/logstash-core/lib/logstash/modules/resource_base.rb
deleted file mode 100644
index 7951e6cd1..000000000
--- a/logstash-core/lib/logstash/modules/resource_base.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# encoding: utf-8
-require "logstash/json"
-require_relative "file_reader"
-
-module LogStash module Modules module ResourceBase
-  attr_reader :base, :content_type, :content_path, :content_id
-
-  def initialize(base, content_type, content_path, content = nil, content_id = nil)
-    @base, @content_type, @content_path = base, content_type, content_path
-    @content_id =  content_id || ::File.basename(@content_path, ".*")
-    # content at this time will be a JSON string
-    @content = content
-    if !@content.nil?
-      @content_as_object = LogStash::Json.load(@content) rescue {}
-    end
-  end
-
-  def content
-    @content ||= FileReader.read(@content_path)
-  end
-
-  def to_s
-    "#{base}, #{content_type}, #{content_path}, #{content_id}"
-  end
-
-  def content_as_object
-    @content_as_object ||= FileReader.read_json(@content_path) rescue nil
-  end
-
-  def <=>(other)
-    to_s <=> other.to_s
-  end
-
-  def ==(other)
-    to_s == other.to_s
-  end
-end end end
diff --git a/logstash-core/lib/logstash/modules/scaffold.rb b/logstash-core/lib/logstash/modules/scaffold.rb
deleted file mode 100644
index dfe16f972..000000000
--- a/logstash-core/lib/logstash/modules/scaffold.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# encoding: utf-8
-require "erb"
-
-require_relative "elasticsearch_config"
-require_relative "kibana_config"
-require_relative "logstash_config"
-
-module LogStash module Modules class Scaffold
-  include LogStash::Util::Loggable
-
-  attr_reader :directory, :module_name, :kibana_version_parts
-  attr_reader :kibana_configuration, :logstash_configuration, :elasticsearch_configuration
-
-  def initialize(name, directory)
-    @module_name = name
-    @directory = directory  # this is the 'configuration folder in the GEM root.'
-    @kibana_version_parts = "6.0.0".split('.') # this is backup in case kibana client fails to connect
-    logger.debug("Found module", :module_name => name, :directory => directory)
-  end
-
-  def add_kibana_version(version_parts)
-    @kibana_version_parts = version_parts
-  end
-
-  def import(import_engine, kibana_import_engine)
-    @elasticsearch_configuration.resources.each do |resource|
-      import_engine.put(resource)
-    end
-    @kibana_configuration.resources.each do |resource|
-      kibana_import_engine.put(resource)
-    end
-  end
-
-  def with_settings(module_settings)
-    @logstash_configuration = LogStashConfig.new(self, module_settings)
-    @kibana_configuration = KibanaConfig.new(self, module_settings)
-    @elasticsearch_configuration = ElasticsearchConfig.new(self, module_settings)
-    self
-  end
-
-  def config_string()
-    # settings should be set earlier by the caller.
-    # settings should be the subset from the YAML file with a structure like
-    # {"name" => "plugin name", "k1" => "v1", "k2" => "v2"}, etc.
-    return nil if @logstash_configuration.nil?
-    @logstash_configuration.config_string
-  end
-
-  # subclass may override
-  def is_enabled?(settings)
-    true
-  end
-
-end end end # class LogStash::Modules::Scaffold
-
diff --git a/logstash-core/lib/logstash/modules/settings_merger.rb b/logstash-core/lib/logstash/modules/settings_merger.rb
deleted file mode 100644
index 628bfc520..000000000
--- a/logstash-core/lib/logstash/modules/settings_merger.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-# encoding: utf-8
-require "logstash/util"
-
-module LogStash module Modules module SettingsMerger
-  include LogStash::Util::Loggable
-  extend self
-
-  def merge(cli_settings, yml_settings)
-    # both args are arrays of hashes, e.g.
-    # [{"name"=>"mod1", "var.input.tcp.port"=>"3333"}, {"name"=>"mod2"}]
-    # [{"name"=>"mod1", "var.input.tcp.port"=>2222, "var.kibana.username"=>"rupert", "var.kibana.password"=>"fotherington"}, {"name"=>"mod3", "var.input.tcp.port"=>4445}]
-    merged = []
-    # union and group_by preserves order
-    # union will also coalesce identical hashes
-    union_of_settings = (cli_settings | yml_settings)
-    grouped_by_name = union_of_settings.group_by{|e| e["name"]}
-    grouped_by_name.each do |_, array|
-      if array.size == 2
-        merged << array.last.merge(array.first)
-      else
-        merged.concat(array)
-      end
-    end
-    merged
-  end
-
-  def merge_cloud_settings(module_settings, logstash_settings)
-    cloud_id = logstash_settings.get("cloud.id")
-    cloud_auth = logstash_settings.get("cloud.auth")
-    if cloud_id.nil?
-      if cloud_auth.nil?
-        return # user did not specify cloud settings
-      else
-        raise ArgumentError.new("Cloud Auth without Cloud Id")
-      end
-    end
-    if logger.debug?
-      settings_copy = LogStash::Util.deep_clone(module_settings)
-    end
-
-    module_settings["var.kibana.scheme"] = cloud_id.kibana_scheme
-    module_settings["var.kibana.host"] = cloud_id.kibana_host
-    # elasticsearch client does not use scheme, it URI parses the host setting
-    module_settings["var.elasticsearch.hosts"] = "#{cloud_id.elasticsearch_scheme}://#{cloud_id.elasticsearch_host}"
-    unless cloud_auth.nil?
-      module_settings["var.elasticsearch.username"] = cloud_auth.username
-      module_settings["var.elasticsearch.password"] = cloud_auth.password
-      module_settings["var.kibana.username"] = cloud_auth.username
-      module_settings["var.kibana.password"] = cloud_auth.password
-    end
-    if logger.debug?
-      format_module_settings(settings_copy, module_settings).each {|line| logger.debug(line)}
-    end
-  end
-
-  def merge_kibana_auth!(module_settings)
-    module_settings["var.kibana.username"] = module_settings["var.elasticsearch.username"] if module_settings["var.kibana.username"].nil?
-    module_settings["var.kibana.password"] = module_settings["var.elasticsearch.password"] if module_settings["var.kibana.password"].nil?
-  end
-
-  def format_module_settings(settings_before, settings_after)
-    output = []
-    output << "-------- Module Settings ---------"
-    settings_after.each do |setting_name, setting|
-      setting_before = settings_before.fetch(setting_name, "")
-      line = "#{setting_name}: '#{setting}'"
-      if setting_before != setting
-        line.concat(", was: '#{setting_before}'")
-      end
-      output << line
-    end
-    output << "-------- Module Settings ---------"
-    output
-  end
-end end end
diff --git a/logstash-core/lib/logstash/modules/util.rb b/logstash-core/lib/logstash/modules/util.rb
deleted file mode 100644
index 0e52ca156..000000000
--- a/logstash-core/lib/logstash/modules/util.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# encoding: utf-8
-require_relative "scaffold"
-
-# This module function should be used when gems or
-# x-pack defines modules in their folder structures.
-module LogStash module Modules module Util
-  def self.register_local_modules(path)
-    modules_path = ::File.join(path, "modules")
-    ::Dir.foreach(modules_path) do |item|
-      # Ignore unix relative path ids
-      next if item == '.' or item == '..'
-      # Ignore non-directories
-      next if !::File.directory?(::File.join(modules_path, ::File::Separator, item))
-      LogStash::PLUGIN_REGISTRY.add(:modules, item, Scaffold.new(item, ::File.join(modules_path, item, "configuration")))
-    end
-  end
-end end end
diff --git a/logstash-core/lib/logstash/namespace.rb b/logstash-core/lib/logstash/namespace.rb
index 4dfe43e4c..220365a0f 100644
--- a/logstash-core/lib/logstash/namespace.rb
+++ b/logstash-core/lib/logstash/namespace.rb
@@ -1,2 +1,19 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # The contents of this file have been ported to Java. It is included for for compatibility
 # with plugins that directly require it.
diff --git a/logstash-core/lib/logstash/outputs/base.rb b/logstash-core/lib/logstash/outputs/base.rb
index 1efc8b079..13d10f92c 100644
--- a/logstash-core/lib/logstash/outputs/base.rb
+++ b/logstash-core/lib/logstash/outputs/base.rb
@@ -1,5 +1,20 @@
-# encoding: utf-8
-require "logstash/event"
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/plugin"
 require "logstash/config/mixin"
 require "concurrent/atomic/atomic_fixnum"
@@ -24,7 +39,7 @@ class LogStash::Outputs::Base < LogStash::Plugin
   config :workers, :type => :number, :default => 1
 
   # Set or return concurrency type
-  def self.concurrency(type=nil)
+  def self.concurrency(type = nil)
     if type
       @concurrency = type
     else
@@ -44,7 +59,7 @@ class LogStash::Outputs::Base < LogStash::Plugin
 
   # Deprecated: Favor `concurrency :single`
   # Remove in Logstash 6.0.0
-  def self.declare_workers_not_supported!(message=nil)
+  def self.declare_workers_not_supported!(message = nil)
     concurrency :single
   end
 
@@ -55,7 +70,7 @@ class LogStash::Outputs::Base < LogStash::Plugin
   end
 
   public
-  def initialize(params={})
+  def initialize(params = {})
     super
     config_init(@params)
 
@@ -90,7 +105,7 @@ class LogStash::Outputs::Base < LogStash::Plugin
     end
   end
 
-  def workers_not_supported(message=nil)
+  def workers_not_supported(message = nil)
     raise "This plugin (#{self.class.name}) is using the obsolete '#workers_not_supported' method. If you installed this plugin specifically on this Logstash version, it is not compatible. If you are a plugin author, please see https://www.elastic.co/guide/en/logstash/current/_how_to_write_a_logstash_output_plugin.html for more info"
   end
 
@@ -102,16 +117,27 @@ class LogStash::Outputs::Base < LogStash::Plugin
     self.class.concurrency
   end
 
+  def metric=(metric)
+    super
+    # Hack to create a new metric namespace using 'plugins' as the root
+    @codec.metric = metric.root.namespace(metric.namespace_name[0...-2].push(:codecs, codec.id))
+    metric
+  end
+
   def execution_context=(context)
     super
-    # There is no easy way to propage an instance variable into the codec, because the codec
-    # are created at the class level
-    # TODO(talevy): Codecs should have their own execution_context, for now they will inherit their
-    #               parent plugin's
+    # Setting the execution context after initialization is deprecated and will be removed in
+    # a future release of Logstash. While this code is no longer executed from Logstash core,
+    # we continue to propagate a set execution context to an output's codec, and rely on super's
+    # deprecation warning.
     @codec.execution_context = context
     context
   end
 
+  def pipeline_shutdown_requested?
+    execution_context.pipeline&.shutdown_requested?
+  end
+
   private
   def output?(event)
     # TODO: noop for now, remove this once we delete this call from all plugins
diff --git a/logstash-core/lib/logstash/patches.rb b/logstash-core/lib/logstash/patches.rb
index a34d5d44e..f458b821c 100644
--- a/logstash-core/lib/logstash/patches.rb
+++ b/logstash-core/lib/logstash/patches.rb
@@ -1,7 +1,22 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/patches/bugfix_jruby_2558"
 require "logstash/patches/cabin"
 require "logstash/patches/profile_require_calls"
 require "logstash/patches/stronger_openssl_defaults"
 require "logstash/patches/exception_to_json"
-require "logstash/patches/resolv"
diff --git a/logstash-core/lib/logstash/patches/bugfix_jruby_2558.rb b/logstash-core/lib/logstash/patches/bugfix_jruby_2558.rb
index 7f6533018..3819f6a06 100644
--- a/logstash-core/lib/logstash/patches/bugfix_jruby_2558.rb
+++ b/logstash-core/lib/logstash/patches/bugfix_jruby_2558.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/environment"
 
 if LogStash::Environment.windows?
@@ -28,6 +44,7 @@ if LogStash::Environment.windows?
     alias_method :orig_peeraddr, :peeraddr
     include JRubyBug2558SocketPeerAddrBugFix
   end
+
   class UDPSocket
     alias_method :orig_peeraddr, :peeraddr
     include JRubyBug2558SocketPeerAddrBugFix
@@ -36,7 +53,7 @@ end
 
 if LogStash::Environment.windows?
   # make sure all strings pulled out of ENV are UTF8
-  class <<ENV
+  class << ENV
     alias_method :orig_getter, :[]
     def [](key)
       case value = orig_getter(key)
diff --git a/logstash-core/lib/logstash/patches/cabin.rb b/logstash-core/lib/logstash/patches/cabin.rb
index 5d5fc7121..1d009e96b 100644
--- a/logstash-core/lib/logstash/patches/cabin.rb
+++ b/logstash-core/lib/logstash/patches/cabin.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 if ENV["PROFILE_BAD_LOG_CALLS"] || ($DEBUGLIST || []).include?("log")
   # Set PROFILE_BAD_LOG_CALLS=1 in your environment if you want
   # to track down logger calls that cause performance problems
diff --git a/logstash-core/lib/logstash/patches/clamp.rb b/logstash-core/lib/logstash/patches/clamp.rb
index df40c0d2d..1fc953718 100644
--- a/logstash-core/lib/logstash/patches/clamp.rb
+++ b/logstash-core/lib/logstash/patches/clamp.rb
@@ -1,5 +1,23 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'clamp'
 require 'logstash/environment'
+require 'logstash/deprecation_message'
 
 module Clamp
   module Attribute
@@ -15,7 +33,6 @@ module Clamp
   end
 
   module Option
-
     module Declaration
       def deprecated_option(switches, type, description, opts = {})
         Option::Definition.new(switches, type, description, opts).tap do |option|
@@ -27,7 +44,6 @@ module Clamp
     end
 
     module StrictDeclaration
-
       include Clamp::Attribute::Declaration
       include LogStash::Util::Loggable
 
@@ -60,8 +76,22 @@ module Clamp
 
       def define_deprecated_writer_for(option, opts, &block)
         define_method(option.write_method) do |value|
-          self.class.logger.warn "DEPRECATION WARNING: The flag #{option.switches} has been deprecated, please use \"--#{opts[:new_flag]}=#{opts[:new_value]}\" instead."
-          LogStash::SETTINGS.set(opts[:new_flag], opts[:new_value])
+          new_flag = opts[:new_flag]
+          new_value = opts.fetch(:new_value, value)
+          passthrough = opts.fetch(:passthrough, false)
+          obsoleted_version = opts[:obsoleted_version]
+
+          dmsg = "DEPRECATION WARNING: The flag #{option.switches} has been deprecated"
+          dmsg += obsoleted_version.nil? ? " and may be removed in a future release" : " and will be removed in version #{obsoleted_version}"
+          dmsg += new_flag.nil? ? ".": ", please use \"--#{new_flag}=#{new_value}\" instead."
+
+          LogStash::DeprecationMessage.instance << dmsg
+
+          if passthrough
+            LogStash::SETTINGS.set(option.attribute_name, value)
+          else
+            LogStash::SETTINGS.set(opts[:new_flag], opts.include?(:new_value) ? opts[:new_value] : value)
+          end
         end
       end
     end
@@ -98,5 +128,3 @@ module Clamp
     end
   end
 end
-
-
diff --git a/logstash-core/lib/logstash/patches/exception_to_json.rb b/logstash-core/lib/logstash/patches/exception_to_json.rb
index 00de79f25..dcc351b03 100644
--- a/logstash-core/lib/logstash/patches/exception_to_json.rb
+++ b/logstash-core/lib/logstash/patches/exception_to_json.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 class Exception
   def to_json
     {"exception_name" => self.class.name, "message" => message}
diff --git a/logstash-core/lib/logstash/patches/manticore/trust_strategies.rb b/logstash-core/lib/logstash/patches/manticore/trust_strategies.rb
new file mode 100644
index 000000000..20eecebb3
--- /dev/null
+++ b/logstash-core/lib/logstash/patches/manticore/trust_strategies.rb
@@ -0,0 +1,43 @@
+# encoding: utf-8
+
+require 'manticore'
+
+unless defined?(::Manticore::Client::TrustStrategies)
+  module ManticoreTrustStrategiesBackport
+    # @override
+    def setup_trust_store(ssl_options, context, trust_strategy)
+      if ssl_options.include?(:trust_strategy)
+        trust_strategy = TrustStrategies.combine(trust_strategy, ssl_options.fetch(:trust_strategy))
+      end
+
+      super(ssl_options, context, trust_strategy)
+    end
+
+    module TrustStrategies
+      def self.combine(lhs, rhs)
+        return rhs if lhs.nil?
+        return lhs if rhs.nil?
+
+        Combined.new(lhs, rhs)
+      end
+
+      class Combined
+        include ::Java::OrgApacheHttpConnSSL::TrustStrategy
+
+        def initialize(lhs, rhs)
+          @lhs = lhs
+          @rhs = rhs
+          super()
+        end
+
+        # boolean isTrusted(X509Certificate[] chain, String authType) throws CertificateException;
+        def trusted?(x509_certificate_chain, auth_type)
+          return true if @lhs.trusted?(x509_certificate_chain, auth_type)
+
+          @rhs.trusted?(x509_certificate_chain, auth_type)
+        end
+      end
+    end
+  end
+  ::Manticore::Client.send(:prepend, ManticoreTrustStrategiesBackport)
+end
diff --git a/logstash-core/lib/logstash/patches/polyglot.rb b/logstash-core/lib/logstash/patches/polyglot.rb
new file mode 100644
index 000000000..7e319d4c3
--- /dev/null
+++ b/logstash-core/lib/logstash/patches/polyglot.rb
@@ -0,0 +1,20 @@
+# NOTE: this patch is meant to be used when polyglot (a tree-top dependency) is loaded.
+# At runtime we avoid loading polyglot, it's only needed for the rake compile task atm.
+require 'polyglot'
+
+module Kernel
+  alias original_require require
+
+  def require(*a, &b)
+    begin
+      original_require(*a, &b)
+    rescue RuntimeError => e
+      # https://github.com/jruby/jruby/pull/7145 introduced an exception check for circular causes, which
+      # breaks when the polyglot library is used and LoadErrors are emitted
+      if e.message == "circular causes"
+        raise e.cause
+      end
+      raise e
+    end
+  end
+end
diff --git a/logstash-core/lib/logstash/patches/profile_require_calls.rb b/logstash-core/lib/logstash/patches/profile_require_calls.rb
index 0eb2f2fcc..ab74cb9e8 100644
--- a/logstash-core/lib/logstash/patches/profile_require_calls.rb
+++ b/logstash-core/lib/logstash/patches/profile_require_calls.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 if ($DEBUGLIST || []).include?("require")
   ROOT = File.dirname(__FILE__)
   module Kernel
diff --git a/logstash-core/lib/logstash/patches/puma.rb b/logstash-core/lib/logstash/patches/puma.rb
index b8507db18..90617dcdd 100644
--- a/logstash-core/lib/logstash/patches/puma.rb
+++ b/logstash-core/lib/logstash/patches/puma.rb
@@ -1,5 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Patch to replace the usage of STDERR and STDOUT
 # see: https://github.com/elastic/logstash/issues/5912
 module LogStash
@@ -8,24 +23,22 @@ module LogStash
     end
   end
 
-  # Puma uses by default the STDERR an the STDOUT for all his error
-  # handling, the server class accept custom a events object that can accept custom io object,
-  # so I just wrap the logger into an IO like object.
-  class IOWrappedLogger
+  # Puma still uses the STDERR an the STDOUT for a few error
+  # handling, the server class accept custom a log writer object that can accept custom io object,
+  # so it just wrap the logger into an IO like object.
+  class IOWrappedLogger < ::Puma::NullIO
     def initialize(new_logger)
       @logger_lock = Mutex.new
       @logger = new_logger
     end
 
-    def sync=(v)
-      # noop
-    end
-
     def logger=(logger)
       @logger_lock.synchronize { @logger = logger }
     end
 
+    # @overload
     def puts(str)
+      return unless @logger.debug?
       # The logger only accept a str as the first argument
       @logger_lock.synchronize { @logger.debug(str.to_s) }
     end
@@ -33,6 +46,91 @@ module LogStash
     alias_method :<<, :puts
   end
 
+  # ::Puma::LogWriter#error(str) sends Kernel#exit
+  # This error will be raised instead.
+  UnrecoverablePumaError = Class.new(RuntimeError)
+
+  # Replacement for Puma's `LogWriter` to redirect all logging to a logger.
+  # @private
+  class DelegatingLogWriter
+    attr_reader :stdout, :stderr
+
+    def initialize(logger)
+      @logger = logger
+      @stdout = @stderr = IOWrappedLogger.new(self)
+    end
+
+    # @overload
+    def write(str)
+      # raw write - no formatting
+      @logger.debug(str) if @logger.debug?
+    end
+
+    # @overload
+    def debug(str)
+      @logger.debug(format(str)) if @logger.debug?
+    end
+    alias_method :log, :debug
+
+    # @overload
+    def error(str)
+      @logger.error(format(str))
+      raise UnrecoverablePumaError.new(str)
+    end
+
+    # @overload
+    def format(str)
+      str.to_s
+    end
+
+    # An HTTP connection error has occurred.
+    # +error+ a connection exception, +req+ the request,
+    # and +text+ additional info
+    # @version 5.0.0
+    # @overload
+    def connection_error(error, req, text = "HTTP connection error")
+      @logger.debug(text, { error: error, req: req, backtrace: error&.backtrace }) if @logger.debug?
+    end
+
+    # An HTTP parse error has occurred.
+    # +error+ a parsing exception, and +req+ the request.
+    def parse_error(error, req)
+      @logger.debug('HTTP parse error, malformed request', { error: error, req: req }) if @logger.debug?
+    end
+
+    # An SSL error has occurred.
+    # @param error <Puma::MiniSSL::SSLError>
+    # @param ssl_socket <Puma::MiniSSL::Socket>
+    # @overload
+    def ssl_error(error, ssl_socket)
+      return unless @logger.debug?
+      peeraddr = ssl_socket.peeraddr.last rescue "<unknown>"
+      subject = ssl_socket.peercert&.subject
+      @logger.debug("SSL error, peer: #{peeraddr}, peer cert: #{subject}", error: error)
+    end
+
+    # An unknown error has occurred.
+    # +error+ an exception object, +req+ the request,
+    # and +text+ additional info
+    # @overload
+    def unknown_error(error, req = nil, text = "Unknown error")
+      details = { error: error, req: req }
+      details[:backtrace] = error.backtrace if @logger.debug?
+      @logger.error(text, details)
+    end
+
+    # Log occurred error debug dump.
+    # +error+ an exception object, +req+ the request,
+    # and +text+ additional info
+    # @overload
+    def debug_error(error, req = nil, text = "")
+      @logger.debug(text, { error: error, req: req, backtrace: error&.backtrace }) if @logger.debug?
+    end
+
+    def debug?
+      @logger.debug?
+    end
+  end
 end
 
 # Reopen the puma class to create a scoped STDERR and STDOUT
@@ -42,3 +140,19 @@ module Puma
   STDERR = LogStash::IOWrappedLogger.new(LogStash::NullLogger)
   STDOUT = LogStash::IOWrappedLogger.new(LogStash::NullLogger)
 end
+
+# JRuby (>= 9.2.18.0) added support for getsockopt(Socket::IPPROTO_TCP, Socket::TCP_INFO)
+# however it isn't working correctly on ARM64 likely due an underlying issue in JNR/JFFI.
+#
+# Puma uses the TCP_INFO to detect a closed socket when handling a request and has a dummy
+# fallback in place when Socket constants :TCP_INFO && :IPPROTO_TCP are not defined, see:
+# https://github.com/puma/puma/blob/v5.5.2/lib/puma/server.rb#L169-L192
+#
+# Remove this patch once https://github.com/elastic/logstash/issues/13444 gets resolved!
+if ENV_JAVA['os.name'].match?(/Linux/i) && ENV_JAVA['os.arch'].eql?('aarch64')
+  Puma::Server.class_eval do
+    def closed_socket?(socket)
+      false
+    end
+  end
+end
diff --git a/logstash-core/lib/logstash/patches/resolv.rb b/logstash-core/lib/logstash/patches/resolv.rb
deleted file mode 100644
index bdc1d0813..000000000
--- a/logstash-core/lib/logstash/patches/resolv.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require "resolv"
-
-# ref: https://github.com/logstash-plugins/logstash-filter-dns/issues/40
-#
-# JRuby 9k versions prior to 9.1.16.0 have a bug which crashes IP address
-# resolution after 64k unique IP addresses resolutions.
-#
-# Note that the oldest JRuby version in LS 6 is 9.1.13.0 and
-# JRuby 1.7.25 and 1.7.27 (the 2 versions used across LS 5) are not affected by this bug.
-
-# make sure we abort if a known correct JRuby version is installed 
-# to avoid having an unnecessary legacy patch being applied in the future.
-
-# The code below is copied from JRuby 9.1.16.0 resolv.rb:
-# https://github.com/jruby/jruby/blob/9.1.16.0/lib/ruby/stdlib/resolv.rb#L775-L784
-#
-# JRuby is Copyright (c) 2007-2017 The JRuby project, and is released
-# under a tri EPL/GPL/LGPL license.
-# Full license available at https://github.com/jruby/jruby/blob/9.1.16.0/COPYING
diff --git a/logstash-core/lib/logstash/patches/stronger_openssl_defaults.rb b/logstash-core/lib/logstash/patches/stronger_openssl_defaults.rb
index eeb841dd8..ec0d124fc 100644
--- a/logstash-core/lib/logstash/patches/stronger_openssl_defaults.rb
+++ b/logstash-core/lib/logstash/patches/stronger_openssl_defaults.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "openssl"
 
 # :nodoc:
@@ -21,7 +37,7 @@ class OpenSSL::SSL::SSLContext
   end
 
   # This cipher selection comes from https://wiki.mozilla.org/Security/Server_Side_TLS
-  MOZILLA_INTERMEDIATE_CIPHERS = "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA"
+  MOZILLA_INTERMEDIATE_CIPHERS = "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH"
 
   # Returns the value that should be used for the default SSLContext options
   #
@@ -33,7 +49,7 @@ class OpenSSL::SSL::SSLContext
     # secure, so let's fix that here. The next few lines setting options and
     # ciphers come from jmhodges' proposed patch
     ssloptions = OpenSSL::SSL::OP_ALL
- 
+
     # TODO(sissel): JRuby doesn't have this. Maybe work on a fix?
     if defined?(OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS)
       ssloptions &= ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS
diff --git a/logstash-core/lib/logstash/persisted_queue_config_validator.rb b/logstash-core/lib/logstash/persisted_queue_config_validator.rb
new file mode 100644
index 000000000..45a8edad3
--- /dev/null
+++ b/logstash-core/lib/logstash/persisted_queue_config_validator.rb
@@ -0,0 +1,193 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+java_import 'org.logstash.common.FsUtil'
+java_import 'java.nio.file.Paths'
+java_import "java.nio.file.FileStore"
+java_import "java.nio.file.Files"
+
+module LogStash
+  class PersistedQueueConfigValidator
+    include LogStash::Util::Loggable
+
+    def initialize
+      @last_check_pipeline_configs = Array.new
+      @last_check_pass = false
+    end
+
+    # Check the config of persistent queue. Raise BootstrapCheckError if queue.page_capacity > queue.max_bytes
+    # Print warning message if fail the space checking
+    # @param running_pipelines [Hash pipeline_id (sym) => JavaPipeline]
+    # @param pipeline_configs [Array PipelineConfig]
+    def check(running_pipelines, pipeline_configs)
+      # Compare value of new pipeline config and pipeline registry and cache
+      has_update = queue_configs_update?(running_pipelines, pipeline_configs) && cache_check_fail?(pipeline_configs)
+      @last_check_pipeline_configs = pipeline_configs
+      return unless has_update
+
+      warn_msg = []
+      err_msg = []
+      queue_path_file_system = Hash.new # (String: queue path, String: file system)
+      required_free_bytes = Hash.new # (String: file system, Integer: size)
+      current_usage_bytes = Hash.new # (String: file system, Integer: size)
+
+      pipeline_configs.select { |config| config.settings.get('queue.type') == 'persisted'}
+                      .select { |config| config.settings.get('queue.max_bytes').to_i != 0 }
+                      .each do |config|
+        max_bytes = config.settings.get("queue.max_bytes").to_i
+        page_capacity = config.settings.get("queue.page_capacity").to_i
+        pipeline_id = config.settings.get("pipeline.id")
+        queue_path = ::File.join(config.settings.get("path.queue"), pipeline_id)
+        pq_page_glob = ::File.join(queue_path, "page.*")
+        create_dirs(queue_path)
+        used_bytes = get_page_size(pq_page_glob)
+        file_system = get_file_system(queue_path)
+
+        check_page_capacity(err_msg, pipeline_id, max_bytes, page_capacity)
+        check_queue_usage(warn_msg, pipeline_id, max_bytes, used_bytes)
+
+        queue_path_file_system[queue_path] = file_system
+        # Add max_bytes to required total for this filesystem
+        required_free_bytes[file_system] = required_free_bytes.fetch(file_system, 0) + max_bytes
+        # Track current usage separately
+        current_usage_bytes[file_system] = current_usage_bytes.fetch(file_system, 0) + used_bytes
+      end
+
+      check_disk_space(warn_msg, queue_path_file_system, required_free_bytes, current_usage_bytes)
+
+      @last_check_pass = err_msg.empty? && warn_msg.empty?
+
+      logger.warn(warn_msg.flatten.join(" ")) unless warn_msg.empty?
+      raise(LogStash::BootstrapCheckError, err_msg.flatten.join(" ")) unless err_msg.empty?
+    end
+
+    def check_page_capacity(err_msg, pipeline_id, max_bytes, page_capacity)
+      if page_capacity > max_bytes
+        err_msg << "Pipeline #{pipeline_id} 'queue.page_capacity' must be less than or equal to 'queue.max_bytes'."
+      end
+    end
+
+    def check_queue_usage(warn_msg, pipeline_id, max_bytes, used_bytes)
+      if used_bytes > max_bytes
+        warn_msg << "Pipeline #{pipeline_id} current queue size (#{used_bytes}) is greater than 'queue.max_bytes' (#{max_bytes})."
+      end
+    end
+
+    # Check disk has sufficient space for all queues reach their max bytes. Queues may config with different paths/devices.
+    # It uses the filesystem of the path and count the required bytes by filesystem
+    def check_disk_space(warn_msg, queue_path_file_system, required_free_bytes, current_usage_bytes)
+      # Group paths by filesystem
+      paths_by_filesystem = queue_path_file_system.group_by { |_, fs| fs }
+
+      # Only process filesystems that need more space
+      filesystems_needing_space = paths_by_filesystem.select do |file_system, paths|
+        additional_needed = required_free_bytes.fetch(file_system, 0) - current_usage_bytes.fetch(file_system, 0)
+        !FsUtil.hasFreeSpace(Paths.get(paths.first.first), additional_needed)
+      end
+
+      return if filesystems_needing_space.empty?
+
+      message_parts = [
+        "Persistent queues require more disk space than is available on #{filesystems_needing_space.size > 1 ? 'multiple filesystems' : 'a filesystem'}:",
+        ""
+      ]
+
+      # Add filesystem-specific information
+      filesystems_needing_space.each do |file_system, paths|
+        total_required = required_free_bytes.fetch(file_system, 0)
+        current_usage = current_usage_bytes.fetch(file_system, 0)
+        additional_needed = total_required - current_usage
+        fs_path = Paths.get(paths.first.first)
+        free_space = Files.getFileStore(fs_path).getUsableSpace
+
+        message_parts.concat([
+          "Filesystem '#{file_system}':",
+          "- Total space required: #{LogStash::Util::ByteValue.human_readable(total_required)}",
+          "- Currently free space: #{LogStash::Util::ByteValue.human_readable(free_space)}",
+          "- Current PQ usage: #{LogStash::Util::ByteValue.human_readable(current_usage)}",
+          "- Additional space needed: #{LogStash::Util::ByteValue.human_readable(additional_needed)}",
+          "",
+          "Individual queue requirements:",
+          *paths.map { |path, _|
+            used = get_page_size(::File.join(path, "page.*"))
+            [
+              "  #{path}:",
+              "    Current size: #{LogStash::Util::ByteValue.human_readable(used)}",
+              "    Maximum size: #{LogStash::Util::ByteValue.human_readable(total_required / paths.size)}"
+            ]
+          }.flatten,
+          "" # Empty line between filesystems
+        ])
+      end
+
+      # Add common footer
+      message_parts.concat([
+        "Please either:",
+        "1. Free up disk space",
+        "2. Reduce queue.max_bytes in your pipeline configurations",
+        "3. Move PQ storage to a filesystem with more available space",
+        "Note: Logstash may fail to start if this is not resolved.",
+        ""
+      ])
+
+      warn_msg << message_parts.join("\n")
+    end
+
+    def get_file_system(queue_path)
+      fs = Files.getFileStore(Paths.get(queue_path))
+      fs.name
+    end
+
+    # PQ pages size in bytes
+    def get_page_size(page_glob)
+      ::Dir.glob(page_glob).sum { |f| ::File.size(f) }
+    end
+
+    # Compare value in pipeline registry / cache and new pipeline config
+    # return true if new pipeline is added or reloadable PQ config has changed
+    # @param pipeline_hash [Hash pipeline_id (sym) => JavaPipeline / PipelineConfig]
+    # @param new_pipeline_configs [Array PipelineConfig]
+    def queue_configs_update?(pipeline_hash, new_pipeline_configs)
+      new_pipeline_configs.each do |new_pipeline_config|
+        return true unless pipeline_hash.has_key?(new_pipeline_config.pipeline_id.to_sym)
+
+        settings = pipeline_hash.fetch(new_pipeline_config.pipeline_id.to_sym).settings
+        return true unless settings.get("queue.type") == new_pipeline_config.settings.get("queue.type") &&
+          settings.get("queue.max_bytes") == new_pipeline_config.settings.get("queue.max_bytes") &&
+          settings.get("queue.page_capacity") == new_pipeline_config.settings.get("queue.page_capacity") &&
+          settings.get("path.queue") == new_pipeline_config.settings.get("path.queue")
+      end
+
+      false
+    end
+
+    # cache check is to prevent an invalid new pipeline config trigger the check of valid size config repeatedly
+    def cache_check_fail?(pipeline_configs)
+      last_check_pipeline_configs = @last_check_pipeline_configs.map { |pc| [pc.pipeline_id.to_sym, pc] }.to_h
+      queue_configs_update?(last_check_pipeline_configs, pipeline_configs) || !@last_check_pass
+    end
+
+    # creates path directories if not exist
+    def create_dirs(queue_path)
+      path = Paths.get(queue_path)
+      # Files.createDirectories raises a FileAlreadyExistsException
+      # if pipeline path is a symlink
+      return if Files.exists(path)
+      Files.createDirectories(path)
+    end
+  end
+end
diff --git a/logstash-core/lib/logstash/pipeline.rb b/logstash-core/lib/logstash/pipeline.rb
index 283f6327c..98429b9c4 100644
--- a/logstash-core/lib/logstash/pipeline.rb
+++ b/logstash-core/lib/logstash/pipeline.rb
@@ -1,625 +1,23 @@
-# encoding: utf-8
-require "thread"
-require "stud/interval"
-require "concurrent"
-require "logstash-core/logstash-core"
-require "logstash/event"
-require "logstash/config/file"
-require "logstash/filters/base"
-require "logstash/inputs/base"
-require "logstash/outputs/base"
-require "logstash/instrument/collector"
-require "logstash/filter_delegator"
-require "logstash/compiler"
-
-module LogStash; class BasePipeline < AbstractPipeline
-  include LogStash::Util::Loggable
-
-  attr_reader :inputs, :filters, :outputs
-
-  def initialize(pipeline_config, namespaced_metric = nil, agent = nil)
-    @logger = self.logger
-    super pipeline_config, namespaced_metric, @logger
-
-    @inputs = nil
-    @filters = nil
-    @outputs = nil
-    @agent = agent
-
-    @plugin_factory = LogStash::Plugins::PluginFactory.new(
-      # use NullMetric if called in the BasePipeline context otherwise use the @metric value
-      lir, LogStash::Plugins::PluginMetricFactory.new(pipeline_id, metric),
-      LogStash::Plugins::ExecutionContextFactory.new(@agent, self, dlq_writer),
-      FilterDelegator
-    )
-    grammar = LogStashConfigParser.new
-    parsed_config = grammar.parse(config_str)
-    raise(ConfigurationError, grammar.failure_reason) if parsed_config.nil?
-
-    parsed_config.process_escape_sequences = settings.get_value("config.support_escapes")
-    config_code = parsed_config.compile
-
-    if settings.get_value("config.debug")
-      @logger.debug("Compiled pipeline code", default_logging_keys(:code => config_code))
-    end
-
-    # Evaluate the config compiled code that will initialize all the plugins and define the
-    # filter and output methods.
-    begin
-      eval(config_code)
-    rescue => e
-      raise e
-    end
-  end
-
-  def reloadable?
-    configured_as_reloadable? && reloadable_plugins?
-  end
-
-  def reloadable_plugins?
-    non_reloadable_plugins.empty?
-  end
-
-  def non_reloadable_plugins
-    (inputs + filters + outputs).select { |plugin| !plugin.reloadable? }
-  end
-
-  private
-
-
-  def plugin(plugin_type, name, line, column, *args)
-    @plugin_factory.plugin(plugin_type, name, line, column, *args)
-  end
-
-  def default_logging_keys(other_keys = {})
-    { :pipeline_id => pipeline_id }.merge(other_keys)
-  end
-end; end
-
-module LogStash; class Pipeline < BasePipeline
-  attr_reader \
-    :worker_threads,
-    :events_consumed,
-    :events_filtered,
-    :started_at,
-    :thread
-
-  MAX_INFLIGHT_WARN_THRESHOLD = 10_000
-
-  def initialize(pipeline_config, namespaced_metric = nil, agent = nil)
-    super
-    open_queue
-
-    @worker_threads = []
-
-    @signal_queue = java.util.concurrent.LinkedBlockingQueue.new
-
-    @drain_queue =  settings.get_value("queue.drain") || settings.get("queue.type") == "memory"
-
-
-    @events_filtered = java.util.concurrent.atomic.LongAdder.new
-    @events_consumed = java.util.concurrent.atomic.LongAdder.new
-
-    @input_threads = []
-    # @ready requires thread safety since it is typically polled from outside the pipeline thread
-    @ready = Concurrent::AtomicBoolean.new(false)
-    @running = Concurrent::AtomicBoolean.new(false)
-    @flushing = Concurrent::AtomicReference.new(false)
-    @outputs_registered = Concurrent::AtomicBoolean.new(false)
-    @worker_shutdown = java.util.concurrent.atomic.AtomicBoolean.new(false)
-
-    # @finished_execution signals that the pipeline thread has finished its execution
-    # regardless of any exceptions; it will always be true when the thread completes
-    @finished_execution = Concurrent::AtomicBoolean.new(false)
-
-    # @finished_run signals that the run methods called in the pipeline thread was completed
-    # without errors and it will NOT be set if the run method exits from an exception; this
-    # is by design and necessary for the wait_until_started semantic
-    @finished_run = Concurrent::AtomicBoolean.new(false)
-
-    @thread = nil
-  end # def initialize
-
-  def finished_execution?
-    @finished_execution.true?
-  end
-
-  def ready?
-    @ready.value
-  end
-
-  def safe_pipeline_worker_count
-    default = settings.get_default("pipeline.workers")
-    pipeline_workers = settings.get("pipeline.workers") #override from args "-w 8" or config
-    safe_filters, unsafe_filters = @filters.partition(&:threadsafe?)
-    plugins = unsafe_filters.collect { |f| f.config_name }
-
-    return pipeline_workers if unsafe_filters.empty?
-
-    if settings.set?("pipeline.workers")
-      if pipeline_workers > 1
-        @logger.warn("Warning: Manual override - there are filters that might not work with multiple worker threads", default_logging_keys(:worker_threads => pipeline_workers, :filters => plugins))
-      end
-    else
-      # user did not specify a worker thread count
-      # warn if the default is multiple
-      if default > 1
-        @logger.warn("Defaulting pipeline worker threads to 1 because there are some filters that might not work with multiple worker threads",
-                     default_logging_keys(:count_was => default, :filters => plugins))
-        return 1 # can't allow the default value to propagate if there are unsafe filters
-      end
-    end
-    pipeline_workers
-  end
-
-  def filters?
-    return @filters.any?
-  end
-
-  def start
-    # Since we start lets assume that the metric namespace is cleared
-    # this is useful in the context of pipeline reloading
-    collect_stats
-    collect_dlq_stats
-
-    @logger.info("Starting pipeline", default_logging_keys(
-      "pipeline.workers" => settings.get("pipeline.workers"),
-      "pipeline.batch.size" => settings.get("pipeline.batch.size"),
-      "pipeline.batch.delay" => settings.get("pipeline.batch.delay")))
-
-    @finished_execution.make_false
-    @finished_run.make_false
-
-    @thread = Thread.new do
-      begin
-        LogStash::Util.set_thread_name("pipeline.#{pipeline_id}")
-        run
-        @finished_run.make_true
-      rescue => e
-        close
-        @logger.error("Pipeline aborted due to error", default_logging_keys(:exception => e, :backtrace => e.backtrace))
-      ensure
-        @finished_execution.make_true
-      end
-    end
-
-    status = wait_until_started
-
-    if status
-      @logger.info("Pipeline started successfully", default_logging_keys)
-    end
-
-    status
-  end
-
-  def wait_until_started
-    while true do
-      if @finished_run.true?
-        # it completed run without exception
-        return true
-      elsif thread.nil? || !thread.alive?
-        # some exception occured and the thread is dead
-        return false
-      elsif running?
-        # fully initialized and running
-        return true
-      else
-        sleep 0.01
-      end
-    end
-  end
-
-  def run
-    @started_at = Time.now
-    @thread = Thread.current
-    Util.set_thread_name("[#{pipeline_id}]-pipeline-manager")
-
-    start_workers
-
-    # Block until all inputs have stopped
-    # Generally this happens if SIGINT is sent and `shutdown` is called from an external thread
-
-    transition_to_running
-    start_flusher # Launches a non-blocking thread for flush events
-    wait_inputs
-    transition_to_stopped
-
-    shutdown_flusher
-    @logger.debug("Shutting down filter/output workers", default_logging_keys)
-    shutdown_workers
-
-    close
-
-    @logger.info("Pipeline has terminated", default_logging_keys)
-
-    # exit code
-    return 0
-  end # def run
-
-  def transition_to_running
-    @running.make_true
-  end
-
-  def transition_to_stopped
-    @running.make_false
-  end
-
-  def running?
-    @running.true?
-  end
-
-  def stopped?
-    @running.false?
-  end
-
-  # register_plugin simply calls the plugin #register method and catches & logs any error
-  # @param plugin [Plugin] the plugin to register
-  # @return [Plugin] the registered plugin
-  def register_plugin(plugin)
-    plugin.register
-    plugin
-  rescue => e
-    @logger.error("Error registering plugin", default_logging_keys(:plugin => plugin.inspect, :error => e.message))
-    raise e
-  end
-
-  # register_plugins calls #register_plugin on the plugins list and upon exception will call Plugin#do_close on all registered plugins
-  # @param plugins [Array[Plugin]] the list of plugins to register
-  def register_plugins(plugins)
-    registered = []
-    plugins.each { |plugin| registered << register_plugin(plugin) }
-  rescue => e
-    registered.each(&:do_close)
-    raise e
-  end
-
-  def start_workers
-    @worker_threads.clear # In case we're restarting the pipeline
-    @outputs_registered.make_false
-    begin
-      maybe_setup_out_plugins
-
-      pipeline_workers = safe_pipeline_worker_count
-      batch_size = settings.get("pipeline.batch.size")
-      batch_delay = settings.get("pipeline.batch.delay")
-
-      max_inflight = batch_size * pipeline_workers
-
-      config_metric = metric.namespace([:stats, :pipelines, pipeline_id.to_s.to_sym, :config])
-      config_metric.gauge(:workers, pipeline_workers)
-      config_metric.gauge(:batch_size, batch_size)
-      config_metric.gauge(:batch_delay, batch_delay)
-      config_metric.gauge(:config_reload_automatic, settings.get("config.reload.automatic"))
-      config_metric.gauge(:config_reload_interval, settings.get("config.reload.interval"))
-      config_metric.gauge(:dead_letter_queue_enabled, dlq_enabled?)
-      config_metric.gauge(:dead_letter_queue_path, dlq_writer.get_path.to_absolute_path.to_s) if dlq_enabled?
-
-      if max_inflight > MAX_INFLIGHT_WARN_THRESHOLD
-        @logger.warn("CAUTION: Recommended inflight events max exceeded! Logstash will run with up to #{max_inflight} events in memory in your current configuration. If your message sizes are large this may cause instability with the default heap size. Please consider setting a non-standard heap size, changing the batch size (currently #{batch_size}), or changing the number of pipeline workers (currently #{pipeline_workers})", default_logging_keys)
-      end
-
-      pipeline_workers.times do |t|
-        thread = Thread.new(batch_size, batch_delay, self) do |_b_size, _b_delay, _pipeline|
-          Util.set_thread_name("[#{pipeline_id}]>worker#{t}")
-          _pipeline.worker_loop(_b_size, _b_delay)
-        end
-        @worker_threads << thread
-      end
-
-      # inputs should be started last, after all workers
-      begin
-        start_inputs
-      rescue => e
-        # if there is any exception in starting inputs, make sure we shutdown workers.
-        # exception will already by logged in start_inputs
-        shutdown_workers
-        raise e
-      end
-    ensure
-      # it is important to guarantee @ready to be true after the startup sequence has been completed
-      # to potentially unblock the shutdown method which may be waiting on @ready to proceed
-      @ready.make_true
-    end
-  end
-
-  # Main body of what a worker thread does
-  # Repeatedly takes batches off the queue, filters, then outputs them
-  def worker_loop(batch_size, batch_delay)
-    filter_queue_client.set_batch_dimensions(batch_size, batch_delay)
-    output_events_map = Hash.new { |h, k| h[k] = [] }
-    while true
-      signal = @signal_queue.poll || NO_SIGNAL
-
-      batch = filter_queue_client.read_batch.to_java # metrics are started in read_batch
-      batch_size = batch.filteredSize
-      if batch_size > 0
-        @events_consumed.add(batch_size)
-        filter_batch(batch)
-      end
-      flush_filters_to_batch(batch, :final => false) if signal.flush?
-      if batch.filteredSize > 0
-        output_batch(batch, output_events_map)
-        filter_queue_client.close_batch(batch)
-      end
-      # keep break at end of loop, after the read_batch operation, some pipeline specs rely on this "final read_batch" before shutdown.
-      break if (@worker_shutdown.get && !draining_queue?)
-    end
-
-    # we are shutting down, queue is drained if it was required, now  perform a final flush.
-    # for this we need to create a new empty batch to contain the final flushed events
-    batch = filter_queue_client.to_java.newBatch
-    filter_queue_client.start_metrics(batch) # explicitly call start_metrics since we dont do a read_batch here
-    flush_filters_to_batch(batch, :final => true)
-    output_batch(batch, output_events_map)
-    filter_queue_client.close_batch(batch)
-  end
-
-  def filter_batch(batch)
-    filter_func(batch.to_a).each do |e|
-      #these are both original and generated events
-      batch.merge(e) unless e.cancelled?
-    end
-    filter_queue_client.add_filtered_metrics(batch.filtered_size)
-    @events_filtered.add(batch.filteredSize)
-  rescue Exception => e
-    # Plugins authors should manage their own exceptions in the plugin code
-    # but if an exception is raised up to the worker thread they are considered
-    # fatal and logstash will not recover from this situation.
-    #
-    # Users need to check their configuration or see if there is a bug in the
-    # plugin.
-    @logger.error("Exception in pipelineworker, the pipeline stopped processing new events, please check your filter configuration and restart Logstash.",
-                  default_logging_keys("exception" => e.message, "backtrace" => e.backtrace))
-
-    raise e
-  end
-
-  # Take an array of events and send them to the correct output
-  def output_batch(batch, output_events_map)
-    # Build a mapping of { output_plugin => [events...]}
-    batch.to_a.each do |event|
-      # We ask the AST to tell us which outputs to send each event to
-      # Then, we stick it in the correct bin
-      output_func(event).each do |output|
-        output_events_map[output].push(event)
-      end
-    end
-    # Now that we have our output to event mapping we can just invoke each output
-    # once with its list of events
-    output_events_map.each do |output, events|
-      output.multi_receive(events)
-      events.clear
-    end
-
-    filter_queue_client.add_output_metrics(batch.filtered_size)
-  end
-
-  def wait_inputs
-    @input_threads.each(&:join)
-  end
-
-  def start_inputs
-    moreinputs = []
-    @inputs.each do |input|
-      if input.threadable && input.threads > 1
-        (input.threads - 1).times do |i|
-          moreinputs << input.clone
-        end
-      end
-    end
-    @inputs += moreinputs
-
-    # first make sure we can register all input plugins
-    register_plugins(@inputs)
-
-    # then after all input plugins are successfully registered, start them
-    @inputs.each { |input| start_input(input) }
-  end
-
-  def start_input(plugin)
-    @input_threads << Thread.new { inputworker(plugin) }
-  end
-
-  def inputworker(plugin)
-    Util::set_thread_name("[#{pipeline_id}]<#{plugin.class.config_name}")
-    begin
-      plugin.run(wrapped_write_client(plugin.id.to_sym))
-    rescue => e
-      if plugin.stop?
-        @logger.debug("Input plugin raised exception during shutdown, ignoring it.",
-                      default_logging_keys(:plugin => plugin.class.config_name, :exception => e.message, :backtrace => e.backtrace))
-        return
-      end
-
-      # otherwise, report error and restart
-      @logger.error(I18n.t("logstash.pipeline.worker-error-debug",
-                            default_logging_keys(
-                              :plugin => plugin.inspect,
-                              :error => e.message,
-                              :exception => e.class,
-                              :stacktrace => e.backtrace.join("\n"))))
-
-      # Assuming the failure that caused this exception is transient,
-      # let's sleep for a bit and execute #run again
-      sleep(1)
-      retry
-    ensure
-      plugin.do_close
-    end
-  end # def inputworker
-
-  # initiate the pipeline shutdown sequence
-  # this method is intended to be called from outside the pipeline thread
-  # @param before_stop [Proc] code block called before performing stop operation on input plugins
-  def shutdown(&before_stop)
-    # shutdown can only start once the pipeline has completed its startup.
-    # avoid potential race condition between the startup sequence and this
-    # shutdown method which can be called from another thread at any time
-    sleep(0.1) while !ready?
-
-    # TODO: should we also check against calling shutdown multiple times concurrently?
-
-    before_stop.call if block_given?
-
-    stop_inputs
-
-    # We make this call blocking, so we know for sure when the method return the shutdown is
-    # stopped
-    wait_for_workers
-    clear_pipeline_metrics
-  end # def shutdown
-
-  def wait_for_workers
-    @worker_threads.each do |t|
-      t.join
-      @logger.debug("Worker terminated", default_logging_keys(:thread => t.inspect))
-    end
-  end
-
-  def stop_inputs
-    @logger.debug("Stopping inputs", default_logging_keys)
-    @inputs.each(&:do_stop)
-    @logger.debug("Stopped inputs", default_logging_keys)
-  end
-
-  # After `shutdown` is called from an external thread this is called from the main thread to
-  # tell the worker threads to stop and then block until they've fully stopped
-  # This also stops all filter and output plugins
-  def shutdown_workers
-    @logger.debug("Setting shutdown", default_logging_keys)
-    @worker_shutdown.set(true)
-
-    @worker_threads.each do |t|
-      @logger.debug("Shutdown waiting for worker thread" , default_logging_keys(:thread => t.inspect))
-      t.join
-    end
-
-    @filters.each(&:do_close)
-    @outputs.each(&:do_close)
-  end
-
-  # for backward compatibility in devutils for the rspec helpers, this method is not used
-  # in the pipeline anymore.
-  def filter(event, &block)
-    maybe_setup_out_plugins
-    # filter_func returns all filtered events, including cancelled ones
-    filter_func([event]).each {|e| block.call(e)}
-  end
-
-  # perform filters flush and yield flushed event to the passed block
-  # @param options [Hash]
-  # @option options [Boolean] :final => true to signal a final shutdown flush
-  def flush_filters(options = {}, &block)
-    flushers = options[:final] ? @shutdown_flushers : @periodic_flushers
-
-    flushers.each do |flusher|
-      flusher.call(options, &block)
-    end
-  end
-
-  def start_flusher
-    # Invariant to help detect improper initialization
-    raise "Attempted to start flusher on a stopped pipeline!" if stopped?
-
-    @flusher_thread = Thread.new do
-      while Stud.stoppable_sleep(5, 0.1) { stopped? }
-        flush
-        break if stopped?
-      end
-    end
-  end
-
-  def shutdown_flusher
-    @flusher_thread.join
-  end
-
-  def flush
-    if @flushing.compare_and_set(false, true)
-      @logger.debug? && @logger.debug("Pushing flush onto pipeline", default_logging_keys)
-      @signal_queue.put(FLUSH)
-    end
-  end
-
-  # Calculate the uptime in milliseconds
-  #
-  # @return [Integer] Uptime in milliseconds, 0 if the pipeline is not started
-  def uptime
-    return 0 if started_at.nil?
-    ((Time.now.to_f - started_at.to_f) * 1000.0).to_i
-  end
-
-  # perform filters flush into the output queue
-  #
-  # @param batch [ReadClient::ReadBatch]
-  # @param options [Hash]
-  def flush_filters_to_batch(batch, options = {})
-    flush_filters(options) do |event|
-      unless event.cancelled?
-        @logger.debug? and @logger.debug("Pushing flushed events", default_logging_keys(:event => event))
-        batch.merge(event)
-      end
-    end
-
-    @flushing.set(false)
-  end # flush_filters_to_batch
-
-  def plugin_threads_info
-    input_threads = @input_threads.select {|t| t.alive? }
-    worker_threads = @worker_threads.select {|t| t.alive? }
-    (input_threads + worker_threads).map {|t| Util.thread_info(t) }
-  end
-
-  def stalling_threads_info
-    plugin_threads_info
-      .reject {|t| t["blocked_on"] } # known benign blocking statuses
-      .each {|t| t.delete("backtrace") }
-      .each {|t| t.delete("blocked_on") }
-      .each {|t| t.delete("status") }
-  end
-
-  def clear_pipeline_metrics
-    # TODO(ph): I think the metric should also proxy that call correctly to the collector
-    # this will simplify everything since the null metric would simply just do a noop
-    collector = metric.collector
-
-    unless collector.nil?
-      # selectively reset metrics we don't wish to keep after reloading
-      # these include metrics about the plugins and number of processed events
-      # we want to keep other metrics like reload counts and error messages
-      collector.clear("stats/pipelines/#{pipeline_id}/plugins")
-      collector.clear("stats/pipelines/#{pipeline_id}/events")
-    end
-  end
-
-  # Sometimes we log stuff that will dump the pipeline which may contain
-  # sensitive information (like the raw syntax tree which can contain passwords)
-  # We want to hide most of what's in here
-  def inspect
-    {
-      :pipeline_id => pipeline_id,
-      :settings => settings.inspect,
-      :ready => @ready,
-      :running => @running,
-      :flushing => @flushing
-    }
-  end
-
-  private
-
-  def maybe_setup_out_plugins
-    if @outputs_registered.make_true
-      register_plugins(@outputs)
-      register_plugins(@filters)
-    end
-  end
-
-  def default_logging_keys(other_keys = {})
-    keys = super
-    keys[:thread] ||= thread.inspect if thread
-    keys
-  end
-
-  def draining_queue?
-    @drain_queue ? !filter_queue_client.empty? : false
-  end
-end; end
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# for backward compatibility
+# logstash-devutils-1.3.6 logstash_helpers has dependency on this class
+require 'logstash/java_pipeline'
+module LogStash
+  Pipeline = JavaPipeline
+end
diff --git a/logstash-core/lib/logstash/pipeline_action.rb b/logstash-core/lib/logstash/pipeline_action.rb
index 79ce2fb80..3ae612ec0 100644
--- a/logstash-core/lib/logstash/pipeline_action.rb
+++ b/logstash-core/lib/logstash/pipeline_action.rb
@@ -1,13 +1,33 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/pipeline_action/base"
 require "logstash/pipeline_action/create"
 require "logstash/pipeline_action/stop"
 require "logstash/pipeline_action/reload"
+require "logstash/pipeline_action/delete"
+require "logstash/pipeline_action/stop_and_delete"
 
 module LogStash module PipelineAction
   ORDERING = {
     LogStash::PipelineAction::Create => 100,
     LogStash::PipelineAction::Reload => 200,
-    LogStash::PipelineAction::Stop => 300
+    LogStash::PipelineAction::Stop => 300,
+    LogStash::PipelineAction::StopAndDelete => 350,
+    LogStash::PipelineAction::Delete => 400
   }
 end end
diff --git a/logstash-core/lib/logstash/pipeline_action/base.rb b/logstash-core/lib/logstash/pipeline_action/base.rb
index 364f20ddd..8060cbcc9 100644
--- a/logstash-core/lib/logstash/pipeline_action/base.rb
+++ b/logstash-core/lib/logstash/pipeline_action/base.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # I've decided to take the action strategy, I think this make the code a bit easier to understand.
 # maybe in the context of config management we will want to have force kill on the
 # threads instead of waiting forever or sending feedback to the host
diff --git a/logstash-core/lib/logstash/pipeline_action/create.rb b/logstash-core/lib/logstash/pipeline_action/create.rb
index 708a9dd3c..6f0fff001 100644
--- a/logstash-core/lib/logstash/pipeline_action/create.rb
+++ b/logstash-core/lib/logstash/pipeline_action/create.rb
@@ -1,8 +1,22 @@
-# encoding: utf-8
-require "logstash/pipeline_action/base"
-require "logstash/pipeline"
-require "logstash/java_pipeline"
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
+require "logstash/pipeline_action/base"
+require "logstash/java_pipeline"
 
 module LogStash module PipelineAction
   class Create < Base
@@ -18,7 +32,7 @@ module LogStash module PipelineAction
     end
 
     def pipeline_id
-      @pipeline_config.pipeline_id
+      @pipeline_config.pipeline_id.to_sym
     end
 
     # Make sure we execution system pipeline like the monitoring
@@ -32,18 +46,8 @@ module LogStash module PipelineAction
     # The execute assume that the thread safety access of the pipeline
     # is managed by the caller.
     def execute(agent, pipelines_registry)
-      new_pipeline =
-        if @pipeline_config.settings.get_value("pipeline.java_execution")
-          LogStash::JavaPipeline.new(@pipeline_config, @metric, agent)
-        else
-          agent.exclusive do
-            # The Ruby pipeline initialization is not thread safe because of the module level
-            # shared state in LogsStash::Config::AST. When using multiple pipelines this gets
-            # executed simultaneously in different threads and we need to synchronize this initialization.
-            LogStash::Pipeline.new(@pipeline_config, @metric, agent)
-          end
-        end
-
+      attach_health_indicator(agent)
+      new_pipeline = LogStash::JavaPipeline.new(@pipeline_config, @metric, agent)
       success = pipelines_registry.create_pipeline(pipeline_id, new_pipeline) do
         new_pipeline.start # block until the pipeline is correctly started or crashed
       end
@@ -51,6 +55,12 @@ module LogStash module PipelineAction
       LogStash::ConvergeResult::ActionResult.create(self, success)
     end
 
+    def attach_health_indicator(agent)
+      health_observer = agent.health_observer
+      health_observer.detach_pipeline_indicator(pipeline_id) # just in case ...
+      health_observer.attach_pipeline_indicator(pipeline_id, agent)
+    end
+
     def to_s
       "PipelineAction::Create<#{pipeline_id}>"
     end
diff --git a/logstash-core/lib/logstash/pipeline_action/delete.rb b/logstash-core/lib/logstash/pipeline_action/delete.rb
new file mode 100644
index 000000000..c072e70bf
--- /dev/null
+++ b/logstash-core/lib/logstash/pipeline_action/delete.rb
@@ -0,0 +1,43 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require "logstash/pipeline_action/base"
+
+module LogStash module PipelineAction
+  class Delete < Base
+    attr_reader :pipeline_id
+
+    def initialize(pipeline_id)
+      @pipeline_id = pipeline_id
+    end
+
+    def execute(agent, pipelines_registry)
+      success = pipelines_registry.delete_pipeline(@pipeline_id)
+      detach_health_indicator(agent) if success
+
+      LogStash::ConvergeResult::ActionResult.create(self, success)
+    end
+
+    def detach_health_indicator(agent)
+      agent.health_observer.detach_pipeline_indicator(pipeline_id)
+    end
+
+    def to_s
+      "PipelineAction::Delete<#{pipeline_id}>"
+    end
+  end
+end end
diff --git a/logstash-core/lib/logstash/pipeline_action/reload.rb b/logstash-core/lib/logstash/pipeline_action/reload.rb
index a24f6ad53..55dc2e862 100644
--- a/logstash-core/lib/logstash/pipeline_action/reload.rb
+++ b/logstash-core/lib/logstash/pipeline_action/reload.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/pipeline_action/base"
 require "logstash/pipeline_action/create"
 require "logstash/pipeline_action/stop"
@@ -13,7 +29,7 @@ module LogStash module PipelineAction
     end
 
     def pipeline_id
-      @pipeline_config.pipeline_id
+      @pipeline_config.pipeline_id.to_sym
     end
 
     def to_s
@@ -32,17 +48,7 @@ module LogStash module PipelineAction
       end
 
       begin
-        pipeline_validator =
-          if @pipeline_config.settings.get_value("pipeline.java_execution")
-            LogStash::JavaBasePipeline.new(@pipeline_config, nil, logger, nil)
-          else
-            agent.exclusive do
-              # The Ruby pipeline initialization is not thread safe because of the module level
-              # shared state in LogsStash::Config::AST. When using multiple pipelines this gets
-              # executed simultaneously in different threads and we need to synchronize this initialization.
-              LogStash::BasePipeline.new(@pipeline_config)
-            end
-          end
+        pipeline_validator = LogStash::AbstractPipeline.new(@pipeline_config, nil, logger, nil)
       rescue => e
         return LogStash::ConvergeResult::FailedAction.from_exception(e)
       end
@@ -58,22 +64,10 @@ module LogStash module PipelineAction
         # the block must emit a success boolean value
 
         # First shutdown old pipeline
-        old_pipeline.shutdown { LogStash::ShutdownWatcher.start(old_pipeline) }
-        old_pipeline.thread.join
+        old_pipeline.shutdown
 
         # Then create a new pipeline
-        new_pipeline =
-          if @pipeline_config.settings.get_value("pipeline.java_execution")
-            LogStash::JavaPipeline.new(@pipeline_config, @metric, agent)
-          else
-            agent.exclusive do
-              # The Ruby pipeline initialization is not thread safe because of the module level
-              # shared state in LogsStash::Config::AST. When using multiple pipelines this gets
-              # executed simultaneously in different threads and we need to synchronize this initialization.
-              LogStash::Pipeline.new(@pipeline_config, @metric, agent)
-            end
-          end
-
+        new_pipeline = LogStash::JavaPipeline.new(@pipeline_config, @metric, agent)
         success = new_pipeline.start # block until the pipeline is correctly started or crashed
 
         # return success and new_pipeline to registry reload_pipeline
diff --git a/logstash-core/lib/logstash/pipeline_action/stop.rb b/logstash-core/lib/logstash/pipeline_action/stop.rb
index 0bb405629..be631e54c 100644
--- a/logstash-core/lib/logstash/pipeline_action/stop.rb
+++ b/logstash-core/lib/logstash/pipeline_action/stop.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/pipeline_action/base"
 
 module LogStash module PipelineAction
@@ -11,8 +27,7 @@ module LogStash module PipelineAction
 
     def execute(agent, pipelines_registry)
       pipelines_registry.terminate_pipeline(pipeline_id) do |pipeline|
-        pipeline.shutdown { LogStash::ShutdownWatcher.start(pipeline) }
-        pipeline.thread.join
+        pipeline.shutdown
       end
 
       LogStash::ConvergeResult::SuccessfulAction.new
diff --git a/logstash-core/lib/logstash/pipeline_action/stop_and_delete.rb b/logstash-core/lib/logstash/pipeline_action/stop_and_delete.rb
new file mode 100644
index 000000000..4c8e6ded0
--- /dev/null
+++ b/logstash-core/lib/logstash/pipeline_action/stop_and_delete.rb
@@ -0,0 +1,47 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require "logstash/pipeline_action/base"
+
+module LogStash module PipelineAction
+  class StopAndDelete < Base
+    attr_reader :pipeline_id
+
+    def initialize(pipeline_id)
+      @pipeline_id = pipeline_id
+    end
+
+    def execute(agent, pipelines_registry)
+      pipelines_registry.terminate_pipeline(pipeline_id) do |pipeline|
+        pipeline.shutdown
+      end
+
+      success = pipelines_registry.delete_pipeline(@pipeline_id)
+      detach_health_indicator(agent) if success
+
+      LogStash::ConvergeResult::ActionResult.create(self, success)
+    end
+
+    def detach_health_indicator(agent)
+      agent.health_observer.detach_pipeline_indicator(pipeline_id)
+    end
+
+    def to_s
+      "PipelineAction::StopAndDelete<#{pipeline_id}>"
+    end
+  end
+end end
diff --git a/logstash-core/lib/logstash/pipeline_reporter.rb b/logstash-core/lib/logstash/pipeline_reporter.rb
index 4dfe43e4c..220365a0f 100644
--- a/logstash-core/lib/logstash/pipeline_reporter.rb
+++ b/logstash-core/lib/logstash/pipeline_reporter.rb
@@ -1,2 +1,19 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # The contents of this file have been ported to Java. It is included for for compatibility
 # with plugins that directly require it.
diff --git a/logstash-core/lib/logstash/pipeline_resource_usage_validator.rb b/logstash-core/lib/logstash/pipeline_resource_usage_validator.rb
new file mode 100644
index 000000000..5c428bfc7
--- /dev/null
+++ b/logstash-core/lib/logstash/pipeline_resource_usage_validator.rb
@@ -0,0 +1,54 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module LogStash
+  class PipelineResourceUsageValidator
+    include LogStash::Util::Loggable
+
+    WARN_HEAP_THRESHOLD = 10 # 10%
+
+    def initialize(max_heap_size)
+      @max_heap_size = max_heap_size
+    end
+
+    def check(pipelines_registry)
+      return if pipelines_registry.size == 0
+
+      percentage_of_heap = compute_percentage(pipelines_registry)
+
+      if percentage_of_heap >= WARN_HEAP_THRESHOLD
+        logger.warn("For a baseline of 2KB events, the maximum heap memory consumed across #{pipelines_registry.size} pipelines may reach up to #{percentage_of_heap}% of the entire heap (more if the events are bigger). The recommended percentage is less than #{WARN_HEAP_THRESHOLD}%. Consider reducing the number of pipelines, or the batch size and worker count per pipeline.")
+      else
+        logger.debug("For a baseline of 2KB events, the maximum heap memory consumed across #{pipelines_registry.size} pipelines may reach up to #{percentage_of_heap}% of the entire heap (more if the events are bigger).")
+      end
+    end
+
+    def compute_percentage(pipelines_registry)
+      max_event_count = sum_event_count(pipelines_registry)
+      estimated_heap_usage = max_event_count * 2.0 * 1024 # assume 2KB per event
+      percentage_of_heap = ((estimated_heap_usage / @max_heap_size) * 100).round(2)
+    end
+
+    def sum_event_count(pipelines_registry)
+      pipelines_registry.loaded_pipelines.inject(0) do |sum, (pipeline_id, pipeline)|
+        batch_size = pipeline.settings.get("pipeline.batch.size")
+        pipeline_workers = pipeline.settings.get("pipeline.workers")
+        sum + (batch_size * pipeline_workers)
+      end
+    end
+  end
+end
diff --git a/logstash-core/lib/logstash/pipeline_settings.rb b/logstash-core/lib/logstash/pipeline_settings.rb
deleted file mode 100644
index 95ec76ad1..000000000
--- a/logstash-core/lib/logstash/pipeline_settings.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# encoding: utf-8
-require "logstash/settings"
-
-module LogStash
-  class PipelineSettings < Settings
-
-    # there are settings that the pipeline uses and can be changed per pipeline instance
-    SETTINGS_WHITE_LIST = [
-      "config.debug",
-      "config.support_escapes",
-      "config.reload.automatic",
-      "config.reload.interval",
-      "config.string",
-      "dead_letter_queue.enable",
-      "dead_letter_queue.max_bytes",
-      "metric.collect",
-      "pipeline.java_execution",
-      "path.config",
-      "path.dead_letter_queue",
-      "path.queue",
-      "pipeline.batch.delay",
-      "pipeline.batch.size",
-      "pipeline.id",
-      "pipeline.reloadable",
-      "pipeline.system",
-      "pipeline.workers",
-      "queue.checkpoint.acks",
-      "queue.checkpoint.interval",
-      "queue.checkpoint.writes",
-      "queue.checkpoint.retry",
-      "queue.drain",
-      "queue.max_bytes",
-      "queue.max_events",
-      "queue.page_capacity",
-      "queue.type",
-    ]
-
-    # register a set of settings that is used as the default set of pipelines settings
-    def self.from_settings(settings)
-      pipeline_settings = self.new
-      SETTINGS_WHITE_LIST.each do |setting|
-        pipeline_settings.register(settings.get_setting(setting).clone)
-      end
-      pipeline_settings
-    end
-
-    def register(setting)
-      unless SETTINGS_WHITE_LIST.include?(setting.name)
-        raise ArgumentError.new("Only pipeline related settings can be registered in a PipelineSettings object. Received \"#{setting.name}\". Allowed settings: #{SETTINGS_WHITE_LIST}")
-      end
-      super(setting)
-    end
-  end
-end
diff --git a/logstash-core/lib/logstash/pipelines_registry.rb b/logstash-core/lib/logstash/pipelines_registry.rb
index 15358db92..375200347 100644
--- a/logstash-core/lib/logstash/pipelines_registry.rb
+++ b/logstash-core/lib/logstash/pipelines_registry.rb
@@ -1,40 +1,150 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 module LogStash
   class PipelineState
-    attr_reader :pipeline_id, :pipeline
+    attr_reader :pipeline_id
 
     def initialize(pipeline_id, pipeline)
       @pipeline_id = pipeline_id
       @pipeline = pipeline
-      @reloading = Concurrent::AtomicBoolean.new(false)
+      @loading = Concurrent::AtomicBoolean.new(false)
+
+      # this class uses a reentrant lock to ensure thread safe visibility.
+      @lock = Monitor.new
     end
 
+    # a terminated pipeline has either crashed OR finished normally
     def terminated?
-      # a reloading pipeline is never considered terminated
-      @reloading.false? && @pipeline.finished_execution?
+      @lock.synchronize do
+        # a loading pipeline is never considered terminated
+        @loading.false? && @pipeline.finished_execution?
+      end
     end
 
-    def set_reloading(is_reloading)
-      @reloading.value = is_reloading
+    # a finished pipeline finished _normally_ without exception
+    def finished?
+      @lock.synchronize do
+        # a loading pipeline is never considered terminated
+        @loading.false? && @pipeline.finished_run?
+      end
+    end
+
+    def crashed?
+      @lock.synchronize do
+        @pipeline&.crashed?
+      end
+    end
+
+    def running?
+      @lock.synchronize do
+        # not terminated and not loading
+        @loading.false? && !@pipeline.finished_execution?
+      end
+    end
+
+    def loading?
+      @lock.synchronize do
+        @loading.true?
+      end
+    end
+
+    def set_loading(is_loading)
+      @lock.synchronize do
+        @loading.value = is_loading
+      end
     end
 
     def set_pipeline(pipeline)
-      raise(ArgumentError, "invalid nil pipeline") if pipeline.nil?
-      @pipeline = pipeline
+      @lock.synchronize do
+        raise(ArgumentError, "invalid nil pipeline") if pipeline.nil?
+        @pipeline = pipeline
+      end
+    end
+
+    def synchronize
+      @lock.synchronize do
+        yield self
+      end
+    end
+
+    def pipeline
+      @lock.synchronize { @pipeline }
+    end
+  end
+
+  class PipelineStates
+
+    def initialize
+      @states = {}
+      @locks = {}
+      @lock = Mutex.new
+    end
+
+    def get(pipeline_id)
+      @lock.synchronize do
+        @states[pipeline_id]
+      end
+    end
+
+    def put(pipeline_id, state)
+      @lock.synchronize do
+        @states[pipeline_id] = state
+      end
+    end
+
+    def remove(pipeline_id)
+      @lock.synchronize do
+        @states.delete(pipeline_id)
+      end
+    end
+
+    def size
+      @lock.synchronize do
+        @states.size
+      end
+    end
+
+
+    def empty?
+      @lock.synchronize do
+        @states.empty?
+      end
+    end
+
+    def each_with_object(init, &block)
+      states = @lock.synchronize { @states.dup }
+      states.each_with_object(init, &block)
+    end
+
+    def get_lock(pipeline_id)
+      @lock.synchronize do
+        @locks[pipeline_id] ||= Mutex.new
+      end
     end
   end
 
   class PipelinesRegistry
     attr_reader :states
+
     include LogStash::Util::Loggable
 
     def initialize
-      # we leverage the semantic of the Java ConcurrentHashMap for the
-      # compute() method which is atomic; calling compute() concurrently
-      # will block until the other compute finishes so no mutex is necessary
-      # for synchronizing compute calls
-      @states = java.util.concurrent.ConcurrentHashMap.new
+      @states = PipelineStates.new
     end
 
     # Execute the passed creation logic block and create a new state upon success
@@ -46,24 +156,40 @@ module LogStash
     #
     # @return [Boolean] new pipeline creation success
     def create_pipeline(pipeline_id, pipeline, &create_block)
+      lock = @states.get_lock(pipeline_id)
+      lock.lock
       success = false
 
-      @states.compute(pipeline_id) do |_, state|
-        if state
-          if state.terminated?
-            success = yield
-            state.set_pipeline(pipeline)
-          else
-            logger.error("Attempted to create a pipeline that already exists", :pipeline_id => pipeline_id)
-          end
-          state
-        else
+      state = @states.get(pipeline_id)
+
+      if state && !state.terminated?
+        logger.error("Attempted to create a pipeline that already exists", :pipeline_id => pipeline_id)
+        return false
+      end
+
+      if state.nil?
+        state = PipelineState.new(pipeline_id, pipeline)
+        state.set_loading(true)
+        @states.put(pipeline_id, state)
+        begin
           success = yield
-          success ? PipelineState.new(pipeline_id, pipeline) : nil
+        ensure
+          state.set_loading(false)
+          @states.remove(pipeline_id) unless success
+        end
+      else
+        state.set_loading(true)
+        state.set_pipeline(pipeline)
+        begin
+          success = yield
+        ensure
+          state.set_loading(false)
         end
       end
 
       success
+    ensure
+      lock.unlock
     end
 
     # Execute the passed termination logic block
@@ -72,18 +198,20 @@ module LogStash
     #
     # @yieldparam [Pipeline] the pipeline to terminate
     def terminate_pipeline(pipeline_id, &stop_block)
-      @states.compute(pipeline_id) do |_, state|
-        if state.nil?
-          logger.error("Attempted to terminate a pipeline that does not exists", :pipeline_id => pipeline_id)
-          nil
-        else
-          yield(state.pipeline)
-          state
-        end
+      lock = @states.get_lock(pipeline_id)
+      lock.lock
+
+      state = @states.get(pipeline_id)
+      if state.nil?
+        logger.error("Attempted to terminate a pipeline that does not exists", :pipeline_id => pipeline_id)
+      else
+        yield(state.pipeline)
       end
+    ensure
+      lock.unlock
     end
 
-    # Execute the passed reloading logic block in the context of the reloading state and set new pipeline in state
+    # Execute the passed reloading logic block in the context of the loading state and set new pipeline in state
     # @param pipeline_id [String, Symbol] the pipeline id
     # @param reload_block [Block] the reloading execution logic
     #
@@ -91,31 +219,60 @@ module LogStash
     #
     # @return [Boolean] new pipeline creation success
     def reload_pipeline(pipeline_id, &reload_block)
+      lock = @states.get_lock(pipeline_id)
+      lock.lock
       success = false
 
-      @states.compute(pipeline_id) do |_, state|
-        if state.nil?
-          logger.error("Attempted to reload a pipeline that does not exists", :pipeline_id => pipeline_id)
-          nil
-        else
-          state.set_reloading(true)
-          begin
-            success, new_pipeline = yield
-            state.set_pipeline(new_pipeline)
-          ensure
-            state.set_reloading(false)
-          end
-          state
-        end
+      state = @states.get(pipeline_id)
+
+      if state.nil?
+        logger.error("Attempted to reload a pipeline that does not exists", :pipeline_id => pipeline_id)
+        return false
+      end
+
+      state.set_loading(true)
+      begin
+        success, new_pipeline = yield
+        state.set_pipeline(new_pipeline)
+      ensure
+        state.set_loading(false)
       end
 
       success
+    ensure
+      lock.unlock
+    end
+
+    # Delete the pipeline that is terminated
+    # @param pipeline_id [String, Symbol] the pipeline id
+    # @return [Boolean] pipeline delete success
+    def delete_pipeline(pipeline_id)
+      lock = @states.get_lock(pipeline_id)
+      lock.lock
+
+      state = @states.get(pipeline_id)
+
+      if state.nil?
+        logger.error("Attempted to delete a pipeline that does not exists", :pipeline_id => pipeline_id)
+        return false
+      end
+
+      if state.terminated?
+        @states.remove(pipeline_id)
+        logger.info("Removed pipeline from registry successfully", :pipeline_id => pipeline_id)
+        return true
+      else
+        logger.info("Attempted to delete a pipeline that is not terminated", :pipeline_id => pipeline_id)
+        return false
+      end
+    ensure
+      lock.unlock
     end
 
     # @param pipeline_id [String, Symbol] the pipeline id
     # @return [Pipeline] the pipeline object or nil if none for pipeline_id
     def get_pipeline(pipeline_id)
-      state = @states.get(pipeline_id)
+      state = @states.get(pipeline_id.to_sym)
       state.nil? ? nil : state.pipeline
     end
 
@@ -126,12 +283,20 @@ module LogStash
 
     # @return [Boolean] true if the states collection is empty.
     def empty?
-      @states.isEmpty
+      @states.empty?
     end
 
     # @return [Hash{String=>Pipeline}]
-    def running_pipelines
-      select_pipelines { |state| !state.terminated? }
+    def running_pipelines(include_loading: false)
+      select_pipelines { |state| state.running? || (include_loading && state.loading?) }
+    end
+
+    def loading_pipelines
+      select_pipelines { |state| state.loading? }
+    end
+
+    def loaded_pipelines
+      select_pipelines { |state| !state.loading? }
     end
 
     # @return [Hash{String=>Pipeline}]
@@ -141,7 +306,7 @@ module LogStash
 
     # @return [Hash{String=>Pipeline}]
     def running_user_defined_pipelines
-      select_pipelines { |state | !state.terminated? && !state.pipeline.system? }
+      select_pipelines { |state| !state.terminated? && !state.pipeline.system? }
     end
 
     private
@@ -157,7 +322,7 @@ module LogStash
     # @return [Hash{String=>Pipeline}]
     def select_pipelines(&optional_state_filter)
       @states.each_with_object({}) do |(id, state), memo|
-        if state && (!block_given? || yield(state))
+        if state && (!block_given? || state.synchronize(&optional_state_filter))
           memo[id] = state.pipeline
         end
       end
diff --git a/logstash-core/lib/logstash/plugin.rb b/logstash-core/lib/logstash/plugin.rb
index 59fa8a9dc..107a1319b 100644
--- a/logstash-core/lib/logstash/plugin.rb
+++ b/logstash-core/lib/logstash/plugin.rb
@@ -1,16 +1,39 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/config/mixin"
+require "logstash/plugins/ecs_compatibility_support"
 require "concurrent"
+require "logstash/plugins/event_factory_support"
+require "logstash/plugins/ca_trusted_fingerprint_support"
 require "securerandom"
 
+require_relative 'plugin_metadata'
+
 class LogStash::Plugin
   include LogStash::Util::Loggable
 
-  attr_accessor :params, :execution_context
+  attr_accessor :params
 
   NL = "\n"
 
   include LogStash::Config::Mixin
+  include LogStash::Plugins::ECSCompatibilitySupport
+  include LogStash::Plugins::EventFactorySupport
 
   # Disable or enable metric logging for this specific plugin instance
   # by default we record all the metrics we can, but you can disable metrics collection
@@ -42,14 +65,15 @@ class LogStash::Plugin
     self.class.name == other.class.name && @params == other.params
   end
 
-  def initialize(params=nil)
+  def initialize(params = {})
     @logger = self.logger
+    @deprecation_logger = self.deprecation_logger
     # need to access settings statically because plugins are initialized in config_ast with no context.
     settings = LogStash::SETTINGS
-    @slow_logger = self.slow_logger(settings.get("slowlog.threshold.warn"),
-                                    settings.get("slowlog.threshold.info"),
-                                    settings.get("slowlog.threshold.debug"),
-                                    settings.get("slowlog.threshold.trace"))
+    @slow_logger = self.slow_logger(settings.get("slowlog.threshold.warn").to_nanos,
+                                    settings.get("slowlog.threshold.info").to_nanos,
+                                    settings.get("slowlog.threshold.debug").to_nanos,
+                                    settings.get("slowlog.threshold.trace").to_nanos)
     @params = LogStash::Util.deep_clone(params)
     # The id should always be defined normally, but in tests that might not be the case
     # In the future we may make this more strict in the Plugin API
@@ -70,7 +94,11 @@ class LogStash::Plugin
   # main task terminates
   def do_close
     @logger.debug("Closing", :plugin => self.class.name)
-    close
+    begin
+      close
+    ensure
+      LogStash::PluginMetadata.delete_for_plugin(self.id)
+    end
   end
 
   # Subclasses should implement this close method if you need to perform any
@@ -136,4 +164,32 @@ class LogStash::Plugin
     require "logstash/plugins/registry"
     LogStash::PLUGIN_REGISTRY.lookup_pipeline_plugin(type, name)
   end
+
+  ##
+  # Returns this plugin's metadata key/value store.
+  #
+  # @see LogStash::PluginMetadata for restrictions and caveats.
+  # @since 7.1
+  #
+  # @usage:
+  # ~~~
+  # if defined?(plugin_metadata)
+  #   plugin_metadata.set(:foo, 'value')
+  # end
+  # ~~~
+  #
+  # @return [LogStash::PluginMetadata]
+  def plugin_metadata
+    LogStash::PluginMetadata.for_plugin(self.id)
+  end
+
+  # Deprecated attr_writer for execution_context
+  def execution_context=(new_context)
+    @deprecation_logger.deprecated("LogStash::Plugin#execution_context=(new_ctx) is deprecated. Use LogStash::Plugins::Contextualizer#initialize_plugin(new_ctx, klass, args) instead", :caller => caller.first)
+    @execution_context = new_context
+  end
+
+  def execution_context
+    @execution_context || LogStash::ExecutionContext::Empty
+  end
 end # class LogStash::Plugin
diff --git a/logstash-core/lib/logstash/plugin_metadata.rb b/logstash-core/lib/logstash/plugin_metadata.rb
new file mode 100644
index 000000000..90182d145
--- /dev/null
+++ b/logstash-core/lib/logstash/plugin_metadata.rb
@@ -0,0 +1,152 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'thread_safe/cache'
+
+module LogStash
+  ##
+  # `PluginMetadata` provides a space to store key/value metadata about a plugin, typically metadata about
+  # external resources that can be gleaned during plugin registration.
+  #
+  # Data should not be persisted across pipeline reloads, and should be cleaned up after a pipeline reload
+  #
+  #  - It MUST NOT be used to store processing state
+  #  - It SHOULD NOT be updated frequently.
+  #  - Individual metadata keys MUST be Symbols and SHOULD NOT be dynamically generated
+  #
+  # USAGE FROM PLUGINS
+  # ------------------
+  #
+  # Since we allow plugins to be updated, it is important to introduce bindings to new Logstash features in a way
+  # that doesn't break when installed onto a Logstash that doesn't have those features, e.g.:
+  #
+  # ~~~
+  #
+  # plugin_metadata.set(:foo, bar) if defined?(plugin_metadata?)
+  #
+  # ~~~
+  #
+  # @since 7.1
+  class PluginMetadata
+    include LogStash::Util::Loggable
+
+    REGISTRY = ThreadSafe::Cache.new unless defined?(REGISTRY)
+
+    class << self
+      ##
+      # Get the PluginMetadata object corresponding to the given plugin id
+      #
+      # @param plugin_id [String]
+      #
+      # @return [PluginMetadata]: the metadata object for the provided `plugin_id`; if no
+      #                           metadata object exists, it will be created.
+      def for_plugin(plugin_id)
+        REGISTRY.compute_if_absent(plugin_id) { PluginMetadata.new }
+      end
+
+      ##
+      # Determine if we have an existing PluginMetadata object for the given plugin id
+      # This allows us to avoid creating a metadata object if we don't already have one.
+      #
+      # @param plugin_id [String]
+      #
+      # @return [Boolean]
+      def exists?(plugin_id)
+        REGISTRY.key?(plugin_id)
+      end
+
+      ##
+      # Deletes, and then clears the contents of an existing PluginMetadata object for the given plugin id if one exists
+      #
+      # @param plugin_id [String]
+      #
+      # @return [Boolean]
+      def delete_for_plugin(plugin_id)
+        logger.debug("Removing metadata for plugin #{plugin_id}")
+        old_registry = REGISTRY.delete(plugin_id)
+        old_registry.clear unless old_registry.nil?
+      end
+
+      ##
+      # @api private
+      def reset!
+        REGISTRY.clear
+      end
+    end
+
+    ##
+    # @see [LogStash::PluginMetadata#for_plugin(String)]
+    # @api private
+    def initialize
+      @datastore = ThreadSafe::Cache.new
+    end
+
+    ##
+    # Set the metadata key for this plugin, returning the previous value (if any)
+    #
+    # @param key [Symbol]
+    # @param value [Object]
+    #
+    # @return [Object]
+    def set(key, value)
+      if value.nil?
+        @datastore.delete(key)
+      else
+        @datastore.get_and_set(key, value)
+      end
+    end
+
+    ##
+    # Get the metadata value for the given key on this plugin
+    #
+    # @param key [Symbol]
+    #
+    # @return [Object]: the value object associated with the given key on this
+    #                   plugin, or nil if no value is associated
+    def get(key)
+      @datastore.get(key)
+    end
+
+    ##
+    # Determine whether specific key/value metadata exists for this plugin
+    #
+    # @param key [Symbol]: the key
+    #
+    # @return [Boolean]: true if the plugin includes metadata for the key
+    def set?(key)
+      @datastore.key?(key)
+    end
+
+    ##
+    # Delete the metadata key for this plugin, returning the previous value (if any)
+    #
+    # @param key [Symbol]
+    #
+    # @return [Object]
+    def delete(key)
+      @datastore.delete(key)
+    end
+
+    ##
+    # Clear all metadata keys for this plugin
+    #
+    # @return [Object]
+    def clear
+      @datastore.clear
+    end
+  end
+end
diff --git a/logstash-core/lib/logstash/plugins.rb b/logstash-core/lib/logstash/plugins.rb
index 215f71f2c..6d90a1afc 100644
--- a/logstash-core/lib/logstash/plugins.rb
+++ b/logstash-core/lib/logstash/plugins.rb
@@ -1,2 +1,19 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/plugins/registry"
-require 'logstash/plugins/builtin'
\ No newline at end of file
+require 'logstash/plugins/builtin'
diff --git a/logstash-core/lib/logstash/plugins/builtin.rb b/logstash-core/lib/logstash/plugins/builtin.rb
index 9f84ca37a..1375d35f4 100644
--- a/logstash-core/lib/logstash/plugins/builtin.rb
+++ b/logstash-core/lib/logstash/plugins/builtin.rb
@@ -1,7 +1,24 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module ::LogStash::Plugins::Builtin
   require 'logstash/plugins/builtin/pipeline/input'
   require 'logstash/plugins/builtin/pipeline/output'
 
   LogStash::PLUGIN_REGISTRY.add(:input, "pipeline", LogStash::Plugins::Builtin::Pipeline::Input)
   LogStash::PLUGIN_REGISTRY.add(:output, "pipeline", LogStash::Plugins::Builtin::Pipeline::Output)
-end
\ No newline at end of file
+end
diff --git a/logstash-core/lib/logstash/plugins/builtin/pipeline/input.rb b/logstash-core/lib/logstash/plugins/builtin/pipeline/input.rb
index 340bd1ef5..eab669c0b 100644
--- a/logstash-core/lib/logstash/plugins/builtin/pipeline/input.rb
+++ b/logstash-core/lib/logstash/plugins/builtin/pipeline/input.rb
@@ -1,5 +1,23 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module ::LogStash; module Plugins; module Builtin; module Pipeline; class Input < ::LogStash::Inputs::Base
   include org.logstash.plugins.pipeline.PipelineInput
+  java_import org.logstash.plugins.pipeline.ReceiveResponse
 
   config_name "pipeline"
 
@@ -16,6 +34,8 @@ module ::LogStash; module Plugins; module Builtin; module Pipeline; class Input
     if !listen_successful
       raise ::LogStash::ConfigurationError, "Internal input at '#{@address}' already bound! Addresses must be globally unique across pipelines."
     end
+    # add address to the plugin stats
+    metric.gauge(:address, address)
   end
 
   def run(queue)
@@ -35,29 +55,32 @@ module ::LogStash; module Plugins; module Builtin; module Pipeline; class Input
   # To understand why this value is useful see Internal.send_to
   # Note, this takes a java Stream, not a ruby array
   def internalReceive(events)
-    return false if !@running.get()
+    return ReceiveResponse.closing() if !@running.get()
 
     # TODO This should probably push a batch at some point in the future when doing so
     # buys us some efficiency
-    events.forEach do |event|
-      decorate(event)
-      @queue << event
+    begin
+      stream_position = 0
+      events.forEach (lambda do |event|
+        decorate(event)
+        @queue << event
+        stream_position = stream_position + 1
+      end)
+      ReceiveResponse.completed()
+    rescue java.lang.InterruptedException, org.logstash.ackedqueue.QueueRuntimeException, IOError => e
+      logger.debug? && logger.debug('queueing event failed', message: e.message, exception: e.class, backtrace: e.backtrace)
+      ReceiveResponse.failed_at(stream_position, e)
     end
-
-    return true
-  rescue => e
-    require 'pry'; binding.pry
-    return true
   end
 
   def stop
-    # We stop receiving events before we unlisten to prevent races
-    @running.set(false) if @running # If register wasn't yet called, no @running!
     pipeline_bus.unlisten(self, address)
+    # We stop receiving events _after_ we unlisten to pick up any events sent by upstream outputs that
+    # have not yet stopped
+    @running.set(false) if @running # If register wasn't yet called, no @running!
   end
 
   def isRunning
     @running.get
   end
-
-end; end; end; end; end
\ No newline at end of file
+end; end; end; end; end
diff --git a/logstash-core/lib/logstash/plugins/builtin/pipeline/output.rb b/logstash-core/lib/logstash/plugins/builtin/pipeline/output.rb
index 5f9e6a810..f3660d485 100644
--- a/logstash-core/lib/logstash/plugins/builtin/pipeline/output.rb
+++ b/logstash-core/lib/logstash/plugins/builtin/pipeline/output.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module ::LogStash; module Plugins; module Builtin; module Pipeline; class Output < ::LogStash::Outputs::Base
   include org.logstash.plugins.pipeline.PipelineOutput
 
@@ -13,6 +30,8 @@ module ::LogStash; module Plugins; module Builtin; module Pipeline; class Output
 
   def register
     @pipeline_bus = execution_context.agent.pipeline_bus
+    # add list of pipelines to send to the plugin metrics
+    metric.gauge(:send_to, send_to)
     pipeline_bus.registerSender(self, @send_to)
   end
 
@@ -23,4 +42,4 @@ module ::LogStash; module Plugins; module Builtin; module Pipeline; class Output
   def close
     pipeline_bus.unregisterSender(self, @send_to)
   end
-end; end; end; end; end
\ No newline at end of file
+end; end; end; end; end
diff --git a/logstash-core/lib/logstash/plugins/ca_trusted_fingerprint_support.rb b/logstash-core/lib/logstash/plugins/ca_trusted_fingerprint_support.rb
new file mode 100644
index 000000000..a610bca4d
--- /dev/null
+++ b/logstash-core/lib/logstash/plugins/ca_trusted_fingerprint_support.rb
@@ -0,0 +1,21 @@
+module LogStash
+  module Plugins
+    module CATrustedFingerprintSupport
+      java_import "org.logstash.util.CATrustedFingerprintTrustStrategy"
+
+      def self.included(base)
+        fail(ArgumentError) unless base < LogStash::Plugin
+
+        base.config(:ca_trusted_fingerprint, :validate => :sha_256_hex, :list => true)
+      end
+
+      extend LogStash::Util::ThreadSafeAttributes
+
+      lazy_init_attr(:trust_strategy_for_ca_trusted_fingerprint,
+                     variable: :@_trust_strategy_for_ca_trusted_fingerprint) do
+        require 'logstash/patches/manticore/trust_strategies'
+        @ca_trusted_fingerprint && CATrustedFingerprintTrustStrategy.new(@ca_trusted_fingerprint)
+      end
+    end
+  end
+end
diff --git a/logstash-core/lib/logstash/plugins/ecs_compatibility_support.rb b/logstash-core/lib/logstash/plugins/ecs_compatibility_support.rb
new file mode 100644
index 000000000..17602a6b1
--- /dev/null
+++ b/logstash-core/lib/logstash/plugins/ecs_compatibility_support.rb
@@ -0,0 +1,46 @@
+module LogStash
+  module Plugins
+    module ECSCompatibilitySupport
+      def self.included(base)
+        base.extend(ArgumentValidator)
+        base.config(:ecs_compatibility, :validate => :ecs_compatibility_argument,
+                                        :attr_accessor => false)
+      end
+
+      def ecs_compatibility
+        @_ecs_compatibility || LogStash::Util.synchronize(self) do
+          # use config_init-set value if present
+          @_ecs_compatibility ||= @ecs_compatibility
+
+          # load default from settings
+          @_ecs_compatibility ||= begin
+            pipeline = execution_context.pipeline
+            pipeline_settings = pipeline && pipeline.settings
+            pipeline_settings ||= LogStash::SETTINGS
+
+            pipeline_settings.get_value('pipeline.ecs_compatibility').to_sym
+          end
+        end
+      end
+
+      module ArgumentValidator
+        V_PREFIXED_INTEGER_PATTERN = %r(\Av[1-9][0-9]?\Z).freeze
+        private_constant :V_PREFIXED_INTEGER_PATTERN
+
+        def validate_value(value, validator)
+          return super unless validator == :ecs_compatibility_argument
+
+          value = deep_replace(value)
+          value = hash_or_array(value)
+
+          if value.size == 1
+            return true, :disabled if value.first.to_s == 'disabled'
+            return true, value.first.to_sym if value.first.to_s =~ V_PREFIXED_INTEGER_PATTERN
+          end
+
+          return false, "Expected a v-prefixed integer major-version number (e.g., `v1`) or the literal `disabled`, got #{value.inspect}"
+        end
+      end
+    end
+  end
+end
diff --git a/logstash-core/lib/logstash/plugins/event_factory_support.rb b/logstash-core/lib/logstash/plugins/event_factory_support.rb
new file mode 100644
index 000000000..5f1d9b2ee
--- /dev/null
+++ b/logstash-core/lib/logstash/plugins/event_factory_support.rb
@@ -0,0 +1,66 @@
+require 'logstash/util/thread_safe_attributes'
+
+module LogStash
+  module Plugins
+    module EventFactorySupport
+      extend LogStash::Util::ThreadSafeAttributes
+
+      # The event_factory method is effectively final and should not be re-defined by plugins.
+      #
+      # @return an event factory object with a `new_event(Hash)` API
+      # @since LS 7.14
+      lazy_init_attr(:event_factory, variable: :@_event_factory) { create_event_factory }
+
+      # The `targeted_event_factory` method is effectively final and should not be re-defined.
+      # If the plugin defines a `target => ...` option than this method will return a factory
+      # that respects the set target, otherwise (no target) returns {#event_factory}.
+      #
+      # @return an event factory object with a `new_event(Hash)` API
+      # @since LS 7.14
+      lazy_init_attr :targeted_event_factory, variable: :@_targeted_event_factory do
+        raise ArgumentError.new('config(:target) not present') unless respond_to?(:target)
+        target.nil? ? event_factory : TargetedEventFactory.new(event_factory, target)
+      end
+
+      private
+
+      # @api private
+      # @since LS 7.14
+      def create_event_factory
+        BasicEventFactory::INSTANCE
+      end
+
+      class BasicEventFactory
+        INSTANCE = new
+
+        # @param payload [Hash]
+        # @return [LogStash::Event]
+        def new_event(payload = {})
+          LogStash::Event.new(payload)
+        end
+
+      end
+      private_constant :BasicEventFactory
+
+      class TargetedEventFactory
+
+        def initialize(inner, target)
+          fail(ArgumentError, "invalid EventFactory `#{inner}`") unless inner.respond_to?(:new_event)
+          fail(ArgumentError, "invalid target field reference `#{target}`") unless org.logstash.FieldReference.isValid(target)
+          @delegate = inner
+          @target = target
+        end
+
+        # @param payload [Hash]
+        # @return [LogStash::Event]
+        def new_event(payload = {})
+          event = @delegate.new_event
+          event.set(@target, payload)
+          event
+        end
+
+      end
+      private_constant :TargetedEventFactory
+    end
+  end
+end
diff --git a/logstash-core/lib/logstash/plugins/hooks_registry.rb b/logstash-core/lib/logstash/plugins/hooks_registry.rb
index 8bf9c3d84..e249288bf 100644
--- a/logstash-core/lib/logstash/plugins/hooks_registry.rb
+++ b/logstash-core/lib/logstash/plugins/hooks_registry.rb
@@ -1 +1,16 @@
-# encoding: utf-8
\ No newline at end of file
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
diff --git a/logstash-core/lib/logstash/plugins/registry.rb b/logstash-core/lib/logstash/plugins/registry.rb
index 161354799..680b9c396 100644
--- a/logstash-core/lib/logstash/plugins/registry.rb
+++ b/logstash-core/lib/logstash/plugins/registry.rb
@@ -1,7 +1,22 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "rubygems/package"
 require "logstash/plugin"
-require "logstash/modules/scaffold"
 require "logstash/codecs/base"
 require "logstash/filters/base"
 require "logstash/outputs/base"
@@ -97,7 +112,7 @@ module LogStash module Plugins
 
     attr_reader :hooks
 
-    def initialize
+    def initialize(alias_registry = nil)
       @mutex = Mutex.new
       # We need a threadsafe class here because we may perform
       # get/set operations concurrently despite the fact we don't use
@@ -105,7 +120,9 @@ module LogStash module Plugins
       # but it is the case that we can call lookups from multiple threads,
       # when multiple pipelines are in play, and that a lookup may modify the registry.
       @registry = java.util.concurrent.ConcurrentHashMap.new
+      @java_plugins = java.util.concurrent.ConcurrentHashMap.new
       @hooks = HooksRegistry.new
+      @alias_registry = alias_registry || Java::org.logstash.plugins.AliasRegistry.instance
     end
 
     def setup!
@@ -133,6 +150,16 @@ module LogStash module Plugins
       require "logstash/plugins/builtin"
 
       GemRegistry.logstash_plugins.each do |plugin_context|
+        if plugin_context.spec.metadata.key?('java_plugin')
+          # Find *.jar file from the require path
+          jar_files = plugin_context.spec.matches_for_glob("**/*.jar")
+          expected_jar_name = plugin_context.spec.name + "-" + plugin_context.spec.version.to_s + ".jar"
+          if jar_files.length != 1 || !jar_files.first.end_with?(expected_jar_name)
+            raise LoadError, "Java plugin '#{plugin_context.spec.name}' does not contain a single jar file with the plugin's name and version"
+          end
+          @java_plugins[plugin_context.spec.name] = jar_files.first
+        end
+
         # When a plugin has a HOOK_FILE defined, its the responsibility of the plugin
         # to register itself to the registry of available plugins.
         #
@@ -142,7 +169,7 @@ module LogStash module Plugins
             logger.debug("Executing hooks", :name => plugin_context.name, :type => plugin_context.type, :hooks_file => plugin_context.hooks_file)
             plugin_context.execute_hooks!
           rescue => e
-            logger.error("error occured when loading plugins hooks file", :name => plugin_context.name, :type => plugin_context.type, :exception => e.message, :stacktrace => e.backtrace )
+            logger.error("error occured when loading plugins hooks file", :name => plugin_context.name, :type => plugin_context.type, :exception => e.message, :stacktrace => e.backtrace)
           end
         end
       end
@@ -162,7 +189,7 @@ module LogStash module Plugins
           raise LoadError, "Block validation fails for plugin named #{plugin_name} of type #{type}," unless block.call(plugin_spec.klass, plugin_name)
         end
 
-        return plugin_spec.klass
+        plugin_spec.klass
       end
     end
 
@@ -170,41 +197,47 @@ module LogStash module Plugins
     # a plugin and will do a lookup on the namespace of the required class to find a matching
     # plugin with the appropriate type.
     def legacy_lookup(type, plugin_name)
-      begin
-        path = "logstash/#{type}s/#{plugin_name}"
+      klass = load_plugin_class(type, plugin_name)
 
-        klass = begin
-          namespace_lookup(type, plugin_name)
-        rescue UnknownPlugin => e
-          # Plugin not registered. Try to load it.
-          begin
-            require path
-            namespace_lookup(type, plugin_name)
-          rescue LoadError => e
-            logger.error("Tried to load a plugin's code, but failed.", :exception => e, :path => path, :type => type, :name => plugin_name)
-            raise
-          end
-        end
-
-        plugin = lazy_add(type, plugin_name, klass)
-      rescue => e
-        logger.error("Problems loading a plugin with",
-                    :type => type,
-                    :name => plugin_name,
-                    :path => path,
-                    :error_message => e.message,
-                    :error_class => e.class,
-                    :error_backtrace => e.backtrace)
-
-        raise LoadError, "Problems loading the requested plugin named #{plugin_name} of type #{type}. Error: #{e.class} #{e.message}"
+      if !klass && @alias_registry.alias?(type.to_java, plugin_name)
+        resolved_plugin_name = @alias_registry.original_from_alias(type.to_java, plugin_name)
+        logger.debug("Loading #{type} plugin #{resolved_plugin_name} via its alias #{plugin_name}...")
+        klass = load_plugin_class(type, resolved_plugin_name)
+        lazy_add(type, resolved_plugin_name, klass) if klass
       end
 
-      plugin
+      unless klass
+        logger.error("Unable to load plugin.", :type => type, :name => plugin_name)
+        raise LoadError, "Unable to load the requested plugin named #{plugin_name} of type #{type}. The plugin is not installed."
+      end
+
+      lazy_add(type, plugin_name, klass)
     end
 
+    # load a plugin's class, or return nil if the plugin cannot be loaded.
+    # attempts to load the class purely through namespace lookup,
+    # and falls back to requiring the path of the expected plugin.
+    # @param type [String]: plugin type, such as "input", "output", "filter", "codec"
+    # @param plugin_name [String]: plugin name, such as "grok", "elasticsearch"
+    # @return [Class,nil] the plugin class, or nil
+    private
+    def load_plugin_class(type, plugin_name)
+      klass = namespace_lookup(type, plugin_name)
+
+      unless klass
+        require("logstash/#{type}s/#{plugin_name}")
+        klass = namespace_lookup(type, plugin_name)
+      end
+      klass
+    rescue LoadError => e
+      logger.debug("Tried to load a plugin's code, but failed.", :exception => e, :path => e.path, :type => type, :name => plugin_name)
+      nil
+    end
+
+    public
     def lookup_pipeline_plugin(type, name)
       LogStash::PLUGIN_REGISTRY.lookup(type, name) do |plugin_klass, plugin_name|
-        is_a_plugin?(plugin_klass, plugin_name)
+        is_a_plugin_or_alias?(plugin_klass, type.to_java, plugin_name)
       end
     rescue LoadError, NameError => e
       logger.debug("Problems loading the plugin with", :type => type, :name => name)
@@ -242,8 +275,7 @@ module LogStash module Plugins
     # ex.: namespace_lookup("filter", "grok") looks for LogStash::Filters::Grok
     # @param type [String] plugin type, "input", "output", "filter"
     # @param name [String] plugin name, ex.: "grok"
-    # @return [Class] the plugin class or raises NameError
-    # @raise NameError if plugin class does not exist or is invalid
+    # @return [Class,nil] the plugin class or nil
     def namespace_lookup(type, name)
       type_const = "#{type.capitalize}s"
       namespace = LogStash.const_get(type_const)
@@ -251,10 +283,7 @@ module LogStash module Plugins
       # namespace.constants is the shallow collection of all constants symbols in namespace
       # note that below namespace.const_get(c) should never result in a NameError since c is from the constants collection
       klass_sym = namespace.constants.find { |c| is_a_plugin?(namespace.const_get(c), name) }
-      klass = klass_sym && namespace.const_get(klass_sym)
-
-      raise(UnknownPlugin) unless klass
-      klass
+      klass_sym && namespace.const_get(klass_sym)
     end
 
     # check if klass is a valid plugin for name
@@ -262,13 +291,40 @@ module LogStash module Plugins
     # @param name [String] plugin name
     # @return [Boolean] true if klass is a valid plugin for name
     def is_a_plugin?(klass, name)
-      (klass.class == Java::JavaClass && klass.simple_name.downcase == name.gsub('_','')) ||
-      (klass.ancestors.include?(LogStash::Plugin) && klass.respond_to?(:config_name) && klass.config_name == name)
+      (klass.class == Java::JavaLang::Class && klass.simple_name.downcase == name.gsub('_', '')) ||
+      (klass.ancestors.include?(LogStash::Plugin) && klass.respond_to?(:config_name) &&
+        klass.config_name == name)
+    end
+
+    # check if klass is a valid plugin for name,
+    # including alias resolution
+    def is_a_plugin_or_alias?(klass, type, plugin_name)
+      return true if is_a_plugin?(klass, plugin_name)
+
+      resolved_plugin_name = @alias_registry.resolve_alias(type, plugin_name)
+      return true if is_a_plugin?(klass, resolved_plugin_name)
+
+      false
     end
 
     def add_plugin(type, name, klass)
       if klass.respond_to?("javaClass", true)
-        @registry[key_for(type, name)] = PluginSpecification.new(type, name, klass.javaClass)
+        if LogStash::SETTINGS.get_value('pipeline.plugin_classloaders')
+          full_name = 'logstash-' + key_for(type, name)
+          if @java_plugins.key?(full_name)
+            plugin_paths = @java_plugins[full_name]
+          else
+            raise LoadError,  "Could not find metadata for Java plugin: #{full_name}"
+          end
+          java_import org.logstash.plugins.PluginClassLoader
+          java_import org.logstash.Logstash
+
+          classloader = PluginClassLoader.create(plugin_paths, Logstash.java_class.class_loader)
+          klazz = classloader.load_class(klass.javaClass.name)
+          @registry[key_for(type, name)] = PluginSpecification.new(type, name, klazz.ruby_class.java_class)
+        else
+          @registry[key_for(type, name)] = PluginSpecification.new(type, name, klass.javaClass)
+        end
       elsif !exists?(type, name)
         specification_klass = type == :universal ? UniversalPluginSpecification : PluginSpecification
         @registry[key_for(type, name)] = specification_klass.new(type, name, klass)
diff --git a/logstash-core/lib/logstash/runner.rb b/logstash-core/lib/logstash/runner.rb
index bc964a9dc..1df665712 100644
--- a/logstash-core/lib/logstash/runner.rb
+++ b/logstash-core/lib/logstash/runner.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 Thread.abort_on_exception = true
 Encoding.default_external = Encoding::UTF_8
 $DEBUGLIST = (ENV["DEBUG"] || "").split(",")
@@ -6,7 +22,7 @@ $DEBUGLIST = (ENV["DEBUG"] || "").split(",")
 require 'pathname'
 LogStash::ROOT = Pathname.new(File.join(File.expand_path(File.dirname(__FILE__)), "..", "..", "..")).cleanpath.to_s
 LogStash::XPACK_PATH = File.join(LogStash::ROOT, "x-pack")
-LogStash::OSS = ENV["OSS"] == "true" || !File.exists?(LogStash::XPACK_PATH)
+LogStash::OSS = ENV["OSS"] == "true" || !File.exist?(LogStash::XPACK_PATH)
 
 if !LogStash::OSS
   xpack_dir = File.join(LogStash::XPACK_PATH, "lib")
@@ -16,12 +32,10 @@ if !LogStash::OSS
 end
 
 require "clamp"
-require "net/http"
-
 require "logstash-core/logstash-core"
 require "logstash/environment"
-require "logstash/modules/cli_parser"
 require "logstash/util/settings_helper"
+require "logstash/util/jackson"
 
 LogStash::Environment.load_locale!
 
@@ -31,12 +45,11 @@ require "logstash/patches/clamp"
 require "logstash/settings"
 require "logstash/version"
 require 'logstash/plugins'
-require "logstash/modules/util"
 require "logstash/bootstrap_check/default_config"
-require "logstash/bootstrap_check/persisted_queue_config"
-require "set"
+require 'logstash/deprecation_message'
 
 java_import 'org.logstash.FileLockFactory'
+java_import 'org.logstash.util.JavaVersion'
 
 class LogStash::Runner < Clamp::StrictCommand
   include LogStash::Util::Loggable
@@ -46,8 +59,7 @@ class LogStash::Runner < Clamp::StrictCommand
   # Ordered list of check to run before starting logstash
   # theses checks can be changed by a plugin loaded into memory.
   DEFAULT_BOOTSTRAP_CHECKS = [
-      LogStash::BootstrapCheck::DefaultConfig,
-      LogStash::BootstrapCheck::PersistedQueueConfig
+      LogStash::BootstrapCheck::DefaultConfig
   ]
 
   # Node Settings
@@ -56,6 +68,11 @@ class LogStash::Runner < Clamp::StrictCommand
     :attribute_name => "node.name",
     :default => LogStash::SETTINGS.get_default("node.name")
 
+  option ["--enable-local-plugin-development"], :flag,
+         I18n.t("logstash.runner.flag.enable-local-plugin-development"),
+         :attribute_name => "enable-local-plugin-development",
+         :default => LogStash::SETTINGS.get_default("enable-local-plugin-development")
+
   # Config Settings
   option ["-f", "--path.config"], "CONFIG_PATH",
     I18n.t("logstash.runner.flag.config"),
@@ -68,34 +85,10 @@ class LogStash::Runner < Clamp::StrictCommand
     :default => LogStash::SETTINGS.get_default("config.string"),
     :attribute_name => "config.string"
 
-  option ["--field-reference-parser"], "MODE",
-         I18n.t("logstash.runner.flag.field-reference-parser"),
-         :attribute_name => "config.field_reference.parser",
-         :default => LogStash::SETTINGS.get_default("config.field_reference.parser")
-
-  # Module settings
-  option ["--modules"], "MODULES",
-    I18n.t("logstash.runner.flag.modules"),
-    :multivalued => true,
-    :attribute_name => "modules_list"
-
-  option ["-M", "--modules.variable"], "MODULES_VARIABLE",
-    I18n.t("logstash.runner.flag.modules_variable"),
-    :multivalued => true,
-    :attribute_name => "modules_variable_list"
-
-  option ["--setup"], :flag,
-    I18n.t("logstash.runner.flag.modules_setup"),
-    :default => LogStash::SETTINGS.get_default("modules_setup"),
-    :attribute_name => "modules_setup"
-
-  option ["--cloud.id"], "CLOUD_ID",
-    I18n.t("logstash.runner.flag.cloud_id"),
-    :attribute_name => "cloud.id"
-
-  option ["--cloud.auth"], "CLOUD_AUTH",
-    I18n.t("logstash.runner.flag.cloud_auth"),
-    :attribute_name => "cloud.auth"
+  option ["--field-reference-escape-style"], "STYLE",
+         I18n.t("logstash.runner.flag.field-reference-escape-style"),
+         :default => LogStash::SETTINGS.get_default("config.field_reference.escape_style"),
+         :attribute_name => "config.field_reference.escape_style"
 
   # Pipeline settings
   option ["--pipeline.id"], "ID",
@@ -108,10 +101,15 @@ class LogStash::Runner < Clamp::StrictCommand
     :attribute_name => "pipeline.workers",
     :default => LogStash::SETTINGS.get_default("pipeline.workers")
 
-  option ["--java-execution"], :flag,
-         I18n.t("logstash.runner.flag.java-execution"),
-         :attribute_name => "pipeline.java_execution",
-         :default => LogStash::SETTINGS.get_default("pipeline.java_execution")
+  option "--pipeline.ordered", "ORDERED",
+    I18n.t("logstash.runner.flag.pipeline-ordered"),
+    :attribute_name => "pipeline.ordered",
+    :default => LogStash::SETTINGS.get_default("pipeline.ordered")
+
+  option ["--plugin-classloaders"], :flag,
+         I18n.t("logstash.runner.flag.plugin-classloaders"),
+         :attribute_name => "pipeline.plugin_classloaders",
+         :default => LogStash::SETTINGS.get_default("pipeline.plugin_classloaders")
 
   option ["-b", "--pipeline.batch.size"], "SIZE",
     I18n.t("logstash.runner.flag.pipeline-batch-size"),
@@ -128,14 +126,19 @@ class LogStash::Runner < Clamp::StrictCommand
     :attribute_name => "pipeline.unsafe_shutdown",
     :default => LogStash::SETTINGS.get_default("pipeline.unsafe_shutdown")
 
+  option ["--pipeline.ecs_compatibility"], "STRING",
+    I18n.t("logstash.runner.flag.ecs_compatibility"),
+    :attribute_name => "pipeline.ecs_compatibility",
+    :default => LogStash::SETTINGS.get_default('pipeline.ecs_compatibility')
+
   # Data Path Setting
-  option ["--path.data"] , "PATH",
+  option ["--path.data"], "PATH",
     I18n.t("logstash.runner.flag.datapath"),
     :attribute_name => "path.data",
     :default => LogStash::SETTINGS.get_default("path.data")
 
   # Plugins Settings
-  option ["-p", "--path.plugins"] , "PATH",
+  option ["-p", "--path.plugins"], "PATH",
     I18n.t("logstash.runner.flag.pluginpath"),
     :multivalued => true, :attribute_name => "path.plugins",
     :default => LogStash::SETTINGS.get_default("path.plugins")
@@ -178,21 +181,31 @@ class LogStash::Runner < Clamp::StrictCommand
     :attribute_name => "config.reload.interval",
     :default => LogStash::SETTINGS.get_default("config.reload.interval")
 
-  option ["--http.host"], "HTTP_HOST",
-    I18n.t("logstash.runner.flag.http_host"),
-    :attribute_name => "http.host",
-    :default => LogStash::SETTINGS.get_default("http.host")
+  option ["--api.enabled"], "ENABLED",
+    I18n.t("logstash.runner.flag.api_enabled"),
+    :attribute_name => 'api.enabled',
+    :default => LogStash::SETTINGS.get_default('api.enabled')
 
-  option ["--http.port"], "HTTP_PORT",
-    I18n.t("logstash.runner.flag.http_port"),
-    :attribute_name => "http.port",
-    :default => LogStash::SETTINGS.get_default("http.port")
+  option ["--api.http.host"], "HTTP_HOST",
+    I18n.t("logstash.runner.flag.api_http_host"),
+    :attribute_name => "api.http.host",
+    :default => LogStash::SETTINGS.get_default("api.http.host")
+
+  option ["--api.http.port"], "HTTP_PORT",
+    I18n.t("logstash.runner.flag.api_http_port"),
+    :attribute_name => "api.http.port",
+    :default => LogStash::SETTINGS.get_default("api.http.port")
 
   option ["--log.format"], "FORMAT",
     I18n.t("logstash.runner.flag.log_format"),
     :attribute_name => "log.format",
     :default => LogStash::SETTINGS.get_default("log.format")
 
+  option ["--log.format.json.fix_duplicate_message_fields"], "FORMAT_JSON_STRICT",
+    I18n.t("logstash.runner.flag.log_format_json_fix_duplicate_message_fields"),
+    :attribute_name => "log.format.json.fix_duplicate_message_fields",
+    :default => LogStash::SETTINGS.get_default("log.format.json.fix_duplicate_message_fields")
+
   option ["--path.settings"], "SETTINGS_DIR",
     I18n.t("logstash.runner.flag.path_settings"),
     :attribute_name => "path.settings",
@@ -226,7 +239,6 @@ class LogStash::Runner < Clamp::StrictCommand
     # Default we check local sources: `-e`, `-f` and the logstash.yml options.
     @source_loader = LogStash::Config::SourceLoader.new(@settings)
     @source_loader.add_source(LogStash::Config::Source::Local.new(@settings))
-    @source_loader.add_source(LogStash::Config::Source::Modules.new(@settings))
     @source_loader.add_source(LogStash::Config::Source::MultiLocal.new(@settings))
 
     super(*args)
@@ -244,45 +256,59 @@ class LogStash::Runner < Clamp::StrictCommand
     require "logstash/util/java_version"
     require "stud/task"
 
-    # Configure Logstash logging facility, this need to be done before everything else to
-    # make sure the logger has the correct settings and the log level is correctly defined.
-    java.lang.System.setProperty("ls.logs", setting("path.logs"))
-    java.lang.System.setProperty("ls.log.format", setting("log.format"))
-    java.lang.System.setProperty("ls.log.level", setting("log.level"))
-    unless java.lang.System.getProperty("log4j.configurationFile")
-      log4j_config_location = ::File.join(setting("path.settings"), "log4j2.properties")
+    running_as_superuser
 
-      # Windows safe way to produce a file: URI.
-      file_schema = "file://" + (LogStash::Environment.windows? ? "/" : "")
-      LogStash::Logging::Logger::reconfigure(URI.encode(file_schema + File.absolute_path(log4j_config_location)))
+    if log_configuration_contains_javascript_usage?
+      logger.error("Logging configuration uses Script log appender or filter with Javascript, which is no longer supported.")
+      return 1
     end
-    # override log level that may have been introduced from a custom log4j config file
-    LogStash::Logging::Logger::configure_logging(setting("log.level"))
 
     if setting("config.debug") && !logger.debug?
       logger.warn("--config.debug was specified, but log.level was not set to \'debug\'! No config info will be logged.")
     end
+    if setting("pipeline.buffer.type") != nil
+      configure_pipeline_buffer_type
+    end
 
+    while (msg = LogStash::DeprecationMessage.instance.shift)
+      deprecation_logger.deprecated msg
+    end
+
+    if JavaVersion::CURRENT < JavaVersion::JAVA_17
+      deprecation_logger.deprecated I18n.t("logstash.runner.java.version_17_minimum",
+                                           :java_home => java.lang.System.getProperty("java.home"))
+    end
+
+    logger.warn I18n.t("logstash.runner.java.home") if ENV["JAVA_HOME"]
     # Skip any validation and just return the version
     if version?
       show_version
       return 0
     end
 
-    # Add local modules to the registry before everything else
-    LogStash::Modules::Util.register_local_modules(LogStash::Environment::LOGSTASH_HOME)
+    logger.info("Starting Logstash", "logstash.version" => LOGSTASH_VERSION, "jruby.version" => RUBY_DESCRIPTION)
+    jvmArgs = ManagementFactory.getRuntimeMXBean().getInputArguments()
+    logger.info "JVM bootstrap flags: #{jvmArgs}"
+
+
+    # Verify the Jackson defaults
+    LogStash::Util::Jackson.verify_jackson_overrides
 
     @dispatcher = LogStash::EventDispatcher.new(self)
     LogStash::PLUGIN_REGISTRY.hooks.register_emitter(self.class, @dispatcher)
 
-    @settings.validate_all
+    validate_settings! or return 1
     @dispatcher.fire(:before_bootstrap_checks)
 
-    return start_shell(setting("interactive"), binding) if setting("interactive")
+    field_reference_escape_style_setting = settings.get_setting('config.field_reference.escape_style')
+    if field_reference_escape_style_setting.set?
+      logger.warn(I18n.t("logstash.settings.technical_preview.set", :canonical_name => field_reference_escape_style_setting.name))
+    end
+    field_reference_escape_style = field_reference_escape_style_setting.value
+    logger.debug("Setting global FieldReference escape style: #{field_reference_escape_style}")
+    org.logstash.FieldReference::set_escape_style(field_reference_escape_style)
 
-    module_parser = LogStash::Modules::CLIParser.new(setting("modules_list"), setting("modules_variable_list"))
-    # Now populate Setting for modules.list with our parsed array.
-    @settings.set("modules.cli", module_parser.output)
+    return start_shell(setting("interactive"), binding) if setting("interactive")
 
     begin
       @bootstrap_checks.each { |bootstrap| bootstrap.check(@settings) }
@@ -298,7 +324,6 @@ class LogStash::Runner < Clamp::StrictCommand
 
     configure_plugin_paths(setting("path.plugins"))
 
-
     @settings.format_settings.each {|line| logger.debug(line) }
 
     # Check for absence of any configuration
@@ -330,9 +355,7 @@ class LogStash::Runner < Clamp::StrictCommand
 
         # TODO(ph): make it better for multiple pipeline
         if results.success?
-          results.response.each do |pipeline_config|
-            LogStash::BasePipeline.new(pipeline_config)
-          end
+          results.response.each { |pipeline_config| LogStash::JavaPipeline.new(pipeline_config) }
           puts "Configuration OK"
           logger.info "Using config.test_and_exit mode. Config Validation Result: OK. Exiting Logstash"
         else
@@ -348,8 +371,6 @@ class LogStash::Runner < Clamp::StrictCommand
     # lock path.data before starting the agent
     @data_path_lock = FileLockFactory.obtainLock(java.nio.file.Paths.get(setting("path.data")).to_absolute_path, ".lock")
 
-    logger.info("Starting Logstash", "logstash.version" => LOGSTASH_VERSION)
-
     @dispatcher.fire(:before_agent)
     @agent = create_agent(@settings, @source_loader)
     @dispatcher.fire(:after_agent)
@@ -369,11 +390,12 @@ class LogStash::Runner < Clamp::StrictCommand
 
     @agent.shutdown
 
+    logger.info("Logstash shut down.")
+
     # flush any outstanding log messages during shutdown
     org.apache.logging.log4j.LogManager.shutdown
 
     agent_return
-
   rescue org.logstash.LockException => e
     logger.fatal(I18n.t("logstash.runner.locked-data-path", :path => setting("path.data")))
     return 1
@@ -397,6 +419,39 @@ class LogStash::Runner < Clamp::StrictCommand
     @log_fd.close if @log_fd
   end # def self.main
 
+  def running_as_superuser
+    return if LogStash::Environment.windows? # windows euid always returns 0, skip checking
+
+    if Process.euid() == 0
+      if setting("allow_superuser")
+        logger.warn("NOTICE: Allowing Logstash to run as superuser is heavily discouraged as it poses a security risk. " +
+                      "It is strongly recommended to set 'allow_superuser' to false.")
+      else
+        raise(RuntimeError, "Logstash cannot be run as superuser.")
+      end
+    end
+  end
+
+  def log_configuration_contains_javascript_usage?
+     context = LoggerContext.getContext(false)
+     config = context.configuration
+     config_file = config.configuration_source.file
+     # no config file so nothing to check
+     return false if config_file.nil?
+
+     logger.info("Log4j configuration path used is: #{config_file.path}")
+     log_config = File.open(config_file.absolute_path).read
+     (log_config =~ /^[^#]+script\.language\s*=\s*JavaScript/) != nil
+  end
+
+  def validate_settings!
+    @settings.validate_all
+    true
+  rescue => e
+    $stderr.puts(I18n.t("logstash.runner.invalid-settings", :error => e.message))
+    return false
+  end
+
   def show_version
     show_version_logstash
 
@@ -501,4 +556,19 @@ class LogStash::Runner < Clamp::StrictCommand
     @settings.get_value(key)
   end
 
+  def configure_pipeline_buffer_type
+    # if user hasn't explicitly set Netty's interested property
+    if java.lang.System.getProperty("io.netty.noPreferDirect") == nil
+      if setting("pipeline.buffer.type") == "heap"
+        # set Netty's Java properties to prefer heap memory allocation
+        java.lang.System.setProperty("io.netty.noPreferDirect", "true")
+      else
+        # set Netty's Java properties to prefer direct memory allocation
+        java.lang.System.setProperty("io.netty.noPreferDirect", "false")
+      end
+    else
+      logger.warn("Ignoring 'pipeline.buffer.type' since the 'io.netty.noPreferDirect' Java property has already been set (check LS_JAVA_OPTS or jvm.options file.")
+    end
+  end
+
 end
diff --git a/logstash-core/lib/logstash/settings.rb b/logstash-core/lib/logstash/settings.rb
index 94994dcaa..e879613e7 100644
--- a/logstash-core/lib/logstash/settings.rb
+++ b/logstash-core/lib/logstash/settings.rb
@@ -1,8 +1,27 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "fileutils"
+require "delegate"
+
 require "logstash/util/byte_value"
 require "logstash/util/substitution_variables"
 require "logstash/util/time_value"
+require "i18n"
 
 module LogStash
   class Settings
@@ -10,6 +29,53 @@ module LogStash
     include LogStash::Util::SubstitutionVariables
     include LogStash::Util::Loggable
 
+    # The `LOGGABLE_PROXY` is included into `LogStash::Setting` to make all
+    # settings-related logs and deprecations come from the same logger.
+    LOGGABLE_PROXY = Module.new do
+      define_method(:logger) { Settings.logger }
+      define_method(:deprecation_logger) { Settings.deprecation_logger }
+
+      def self.included(base)
+        base.extend(self)
+      end
+    end
+
+    # there are settings that the pipeline uses and can be changed per pipeline instance
+    PIPELINE_SETTINGS_WHITE_LIST = [
+      "config.debug",
+      "config.support_escapes",
+      "config.reload.automatic",
+      "config.reload.interval",
+      "config.string",
+      "dead_letter_queue.enable",
+      "dead_letter_queue.flush_interval",
+      "dead_letter_queue.max_bytes",
+      "dead_letter_queue.storage_policy",
+      "dead_letter_queue.retain.age",
+      "metric.collect",
+      "pipeline.plugin_classloaders",
+      "path.config",
+      "path.dead_letter_queue",
+      "path.queue",
+      "pipeline.batch.delay",
+      "pipeline.batch.size",
+      "pipeline.id",
+      "pipeline.reloadable",
+      "pipeline.system",
+      "pipeline.workers",
+      "pipeline.ordered",
+      "pipeline.ecs_compatibility",
+      "queue.checkpoint.acks",
+      "queue.checkpoint.interval",
+      "queue.checkpoint.writes",
+      "queue.checkpoint.retry",
+      "queue.drain",
+      "queue.max_bytes",
+      "queue.max_events",
+      "queue.page_capacity",
+      "queue.type",
+    ]
+
     def initialize
       @settings = {}
       # Theses settings were loaded from the yaml file
@@ -20,6 +86,11 @@ module LogStash
     end
 
     def register(setting)
+      # Method #with_deprecated_alias returns collection containing couple of other settings.
+      # In case the method is implemented in Ruby returns an Array while for the Java implementation
+      # return a List, so the following type checking before going deep by one layer.
+      return setting.map { |s| register(s) } if setting.kind_of?(Array) || setting.kind_of?(java.util.List)
+
       if @settings.key?(setting.name)
         raise ArgumentError.new("Setting \"#{setting.name}\" has already been registered as #{setting.inspect}")
       else
@@ -33,7 +104,7 @@ module LogStash
 
     def get_setting(setting_name)
       setting = @settings[setting_name]
-      raise ArgumentError.new("Setting \"#{setting_name}\" hasn't been registered") if setting.nil?
+      raise ArgumentError.new("Setting \"#{setting_name}\" doesn't exist. Please check if you haven't made a typo.") if setting.nil?
       setting
     end
 
@@ -47,11 +118,15 @@ module LogStash
       settings
     end
 
+    def names
+      @settings.keys
+    end
+
     def set?(setting_name)
       get_setting(setting_name).set?
     end
 
-    def clone
+    def clone(*args)
       get_subset(".*")
     end
     alias_method :dup, :clone
@@ -79,6 +154,7 @@ module LogStash
     def to_hash
       hash = {}
       @settings.each do |name, setting|
+        next if (setting.kind_of? Setting::DeprecatedAlias) || (setting.kind_of? Java::org.logstash.settings.DeprecatedAlias)
         hash[name] = setting.value
       end
       hash
@@ -89,21 +165,20 @@ module LogStash
       self
     end
 
+    def merge_pipeline_settings(hash, graceful = false)
+      hash.each do |key, _|
+        unless PIPELINE_SETTINGS_WHITE_LIST.include?(key)
+          raise ArgumentError.new("Only pipeline related settings are expected. Received \"#{key}\". Allowed settings: #{PIPELINE_SETTINGS_WHITE_LIST}")
+        end
+      end
+      merge(hash, graceful)
+    end
+
     def format_settings
       output = []
       output << "-------- Logstash Settings (* means modified) ---------"
       @settings.each do |setting_name, setting|
-        value = setting.value
-        default_value = setting.default
-        if default_value == value # print setting and its default value
-          output << "#{setting_name}: #{value.inspect}" unless value.nil?
-        elsif default_value.nil? # print setting and warn it has been set
-          output << "*#{setting_name}: #{value.inspect}"
-        elsif value.nil? # default setting not set by user
-          output << "#{setting_name}: #{default_value.inspect}"
-        else # print setting, warn it has been set, and show default value
-          output << "*#{setting_name}: #{value.inspect} (default: #{default_value.inspect})"
-        end
+        setting.format(output)
       end
       output << "--------------- Logstash Settings -------------------"
       output
@@ -113,9 +188,9 @@ module LogStash
       @settings.values.each(&:reset)
     end
 
-    def from_yaml(yaml_path, file_name="logstash.yml")
+    def from_yaml(yaml_path, file_name = "logstash.yml")
       settings = read_yaml(::File.join(yaml_path, file_name))
-      self.merge(deep_replace(flatten_hash(settings)), true)
+      self.merge(deep_replace(flatten_hash(settings), true), true)
       self
     end
 
@@ -125,6 +200,13 @@ module LogStash
           callback.call(self)
         end
       end
+
+      # because we cannot rely on deprecation logger being wired up when the setters
+      # are initially used, we re-emit setter-related deprecations after all post-processing
+      # hooks have been activated (and therefore after logging has been configured)
+      @settings.each_value do |setting|
+        setting.observe_post_process if setting.respond_to?(:observe_post_process)
+      end
     end
 
     def on_post_process(&block)
@@ -151,68 +233,87 @@ module LogStash
       YAML.safe_load(IO.read(path)) || {}
     end
 
-    def flatten_hash(h,f="",g={})
+    def flatten_hash(h, f = "", g = {})
       return g.update({ f => h }) unless h.is_a? Hash
       if f.empty?
-        h.each { |k,r| flatten_hash(r,k,g) }
+        h.each { |k, r| flatten_hash(r, k, g) }
       else
-        h.each { |k,r| flatten_hash(r,"#{f}.#{k}",g) }
+        h.each { |k, r| flatten_hash(r, "#{f}.#{k}", g) }
       end
       g
     end
   end
 
   class Setting
-    include LogStash::Util::Loggable
+    include LogStash::Settings::LOGGABLE_PROXY
 
-    attr_reader :name, :default
+    attr_reader :wrapped_setting
 
-    def initialize(name, klass, default=nil, strict=true, &validator_proc)
-      @name = name
+    def initialize(name, klass, default = nil, strict = true, &validator_proc)
       unless klass.is_a?(Class)
-        raise ArgumentError.new("Setting \"#{@name}\" must be initialized with a class (received #{klass})")
+        raise ArgumentError.new("Setting \"#{name}\" must be initialized with a class (received #{klass})")
       end
+      setting_builder = Java::org.logstash.settings.BaseSetting.create(name)
+                            .defaultValue(default)
+                            .strict(strict)
+      if validator_proc
+        setting_builder = setting_builder.validator(validator_proc)
+      end
+
+      @wrapped_setting = setting_builder.build()
+
       @klass = klass
       @validator_proc = validator_proc
-      @value = nil
-      @value_is_set = false
-      @strict = strict
 
-      validate(default) if @strict
-      @default = default
+      validate(default) if strict?
+    end
+
+    def default
+      @wrapped_setting.default
+    end
+
+    def name
+      @wrapped_setting.name
+    end
+
+    def initialize_copy(original)
+      @wrapped_setting = original.wrapped_setting.clone
+    end
+
+    # To be used only internally
+    def update_wrapper(wrapped_setting)
+      @wrapped_setting = wrapped_setting
     end
 
     def value
-      @value_is_set ? @value : default
+      @wrapped_setting.value()
     end
 
     def set?
-      @value_is_set
+      @wrapped_setting.set?
     end
 
     def strict?
-      @strict
+      @wrapped_setting.strict?
     end
 
     def set(value)
-      validate(value) if @strict
-      @value = value
-      @value_is_set = true
-      @value
+      validate(value) if strict?
+      @wrapped_setting.set(value)
+      @wrapped_setting.value
     end
 
     def reset
-      @value = nil
-      @value_is_set = false
+      @wrapped_setting.reset
     end
 
     def to_hash
       {
-        "name" => @name,
+        "name" => @wrapped_setting.name,
         "klass" => @klass,
-        "value" => @value,
-        "value_is_set" => @value_is_set,
-        "default" => @default,
+        "value" => @wrapped_setting.value,
+        "value_is_set" => @wrapped_setting.set?,
+        "default" => @wrapped_setting.default,
         # Proc#== will only return true if it's the same obj
         # so no there's no point in comparing it
         # also thereś no use case atm to return the proc
@@ -221,6 +322,10 @@ module LogStash
       }
     end
 
+    def inspect
+      "<#{self.class.name}(#{name}): #{value.inspect}" + (@wrapped_setting.set? ? '' : ' (DEFAULT)') + ">"
+    end
+
     def ==(other)
       self.to_hash == other.to_hash
     end
@@ -229,43 +334,76 @@ module LogStash
       validate(value)
     end
 
+    def with_deprecated_alias(deprecated_alias_name, obsoleted_version=nil)
+      SettingWithDeprecatedAlias.wrap(self, deprecated_alias_name, obsoleted_version)
+    end
+
+    ##
+    # Returns a Nullable-wrapped self, effectively making the Setting optional.
+    def nullable
+      Nullable.new(self)
+    end
+
+    def format(output)
+      @wrapped_setting.format(output)
+    end
+
+    def clone(*args)
+      copy = self.dup
+      copy.update_wrapper(@wrapped_setting.clone())
+      copy
+    end
+
     protected
     def validate(input)
       if !input.is_a?(@klass)
-        raise ArgumentError.new("Setting \"#{@name}\" must be a #{@klass}. Received: #{input} (#{input.class})")
+        raise ArgumentError.new("Setting \"#{@wrapped_setting.name}\" must be a #{@klass}. Received: #{input} (#{input.class})")
       end
 
       if @validator_proc && !@validator_proc.call(input)
-        raise ArgumentError.new("Failed to validate setting \"#{@name}\" with value: #{input}")
+        raise ArgumentError.new("Failed to validate setting \"#{@wrapped_setting.name}\" with value: #{input}")
       end
     end
 
     class Coercible < Setting
-      def initialize(name, klass, default=nil, strict=true, &validator_proc)
-        @name = name
+      def initialize(name, klass, default = nil, strict = true, &validator_proc)
         unless klass.is_a?(Class)
-          raise ArgumentError.new("Setting \"#{@name}\" must be initialized with a class (received #{klass})")
+          raise ArgumentError.new("Setting \"#{name}\" must be initialized with a class (received #{klass})")
         end
+
         @klass = klass
         @validator_proc = validator_proc
-        @value = nil
-        @value_is_set = false
+
+        # needed to have the name method accessible when invoking validate
+        @wrapped_setting = Java::org.logstash.settings.BaseSetting.create(name)
+                                      .defaultValue(default)
+                                      .strict(strict)
+                                      .build()
 
         if strict
           coerced_default = coerce(default)
           validate(coerced_default)
-          @default = coerced_default
+          updated_default = coerced_default
         else
-          @default = default
+          updated_default = default
         end
+
+        # default value must be coerced to the right type before being set
+        setting_builder = Java::org.logstash.settings.BaseSetting.create(name)
+                              .defaultValue(updated_default)
+                              .strict(strict)
+        if validator_proc
+          setting_builder = setting_builder.validator(validator_proc)
+        end
+
+        @wrapped_setting = setting_builder.build()
       end
 
       def set(value)
         coerced_value = coerce(value)
         validate(coerced_value)
-        @value = coerce(coerced_value)
-        @value_is_set = true
-        @value
+        @wrapped_setting.set(coerced_value)
+        coerced_value
       end
 
       def coerce(value)
@@ -274,45 +412,11 @@ module LogStash
     end
     ### Specific settings #####
 
-    class Boolean < Coercible
-      def initialize(name, default, strict=true, &validator_proc)
-        super(name, Object, default, strict, &validator_proc)
-      end
-
-      def coerce(value)
-        case value
-        when TrueClass, "true"
-          true
-        when FalseClass, "false"
-          false
-        else
-          raise ArgumentError.new("could not coerce #{value} into a boolean")
-        end
-      end
-    end
-
-    class Numeric < Coercible
-      def initialize(name, default=nil, strict=true)
-        super(name, ::Numeric, default, strict)
-      end
-
-      def coerce(v)
-        return v if v.is_a?(::Numeric)
-
-        # I hate these "exceptions as control flow" idioms
-        # but Ruby's `"a".to_i => 0` makes it hard to do anything else.
-        coerced_value = (Integer(v) rescue nil) || (Float(v) rescue nil)
-
-        if coerced_value.nil?
-          raise ArgumentError.new("Failed to coerce value to Numeric. Received #{v} (#{v.class})")
-        else
-          coerced_value
-        end
-      end
-    end
+    java_import org.logstash.settings.Boolean
+    java_import org.logstash.settings.SettingNumeric
 
     class Integer < Coercible
-      def initialize(name, default=nil, strict=true)
+      def initialize(name, default = nil, strict = true)
         super(name, ::Integer, default, strict)
       end
 
@@ -330,7 +434,7 @@ module LogStash
     end
 
     class PositiveInteger < Integer
-      def initialize(name, default=nil, strict=true)
+      def initialize(name, default = nil, strict = true)
         super(name, default, strict) do |v|
           if v > 0
             true
@@ -344,7 +448,7 @@ module LogStash
     class Port < Integer
       VALID_PORT_RANGE = 1..65535
 
-      def initialize(name, default=nil, strict=true)
+      def initialize(name, default = nil, strict = true)
         super(name, default, strict) { |value| valid?(value) }
       end
 
@@ -356,8 +460,8 @@ module LogStash
     class PortRange < Coercible
       PORT_SEPARATOR = "-"
 
-      def initialize(name, default=nil, strict=true)
-        super(name, ::Range, default, strict=true) { |value| valid?(value) }
+      def initialize(name, default = nil, strict = true)
+        super(name, ::Range, default, strict = true) { |value| valid?(value) }
       end
 
       def valid?(range)
@@ -385,13 +489,13 @@ module LogStash
 
       def validate(value)
         unless valid?(value)
-          raise ArgumentError.new("Invalid value \"#{value}, valid options are within the range of #{Port::VALID_PORT_RANGE.first}-#{Port::VALID_PORT_RANGE.last}")
+          raise ArgumentError.new("Invalid value \"#{name}: #{value}\", valid options are within the range of #{Port::VALID_PORT_RANGE.first}-#{Port::VALID_PORT_RANGE.last}")
         end
       end
     end
 
     class Validator < Setting
-      def initialize(name, default=nil, strict=true, validator_class=nil)
+      def initialize(name, default = nil, strict = true, validator_class = nil)
         @validator_class = validator_class
         super(name, ::Object, default, strict)
       end
@@ -400,11 +504,86 @@ module LogStash
         @validator_class.validate(value)
       end
     end
+    
+    java_import org.logstash.settings.SettingString
 
-    class String < Setting
-      def initialize(name, default=nil, strict=true, possible_strings=[])
+    java_import org.logstash.settings.SettingNullableString
+
+    class Password < Coercible
+      def initialize(name, default = nil, strict = true)
+        super(name, LogStash::Util::Password, default, strict)
+      end
+
+      def coerce(value)
+        return value if value.kind_of?(LogStash::Util::Password)
+
+        if value && !value.kind_of?(::String)
+          raise(ArgumentError, "Setting `#{name}` could not coerce non-string value to password")
+        end
+
+        LogStash::Util::Password.new(value)
+      end
+
+      def validate(value)
+        super(value)
+      end
+    end
+
+    class ValidatedPassword < Setting::Password
+      def initialize(name, value, password_policies)
+        @password_policies = password_policies
+        super(name, value, true)
+      end
+
+      def coerce(password)
+        if password && !password.kind_of?(::LogStash::Util::Password)
+          raise(ArgumentError, "Setting `#{name}` could not coerce LogStash::Util::Password value to password")
+        end
+
+        policies = build_password_policies
+        validatedResult = LogStash::Util::PasswordValidator.new(policies).validate(password.value)
+        if validatedResult.length() > 0
+          if @password_policies.fetch(:mode).eql?("WARN")
+            logger.warn("Password #{validatedResult}.")
+          else
+            raise(ArgumentError, "Password #{validatedResult}.")
+          end
+        end
+        password
+      end
+
+      def build_password_policies
+        policies = {}
+        policies[Util::PasswordPolicyType::EMPTY_STRING] = Util::PasswordPolicyParam.new
+        policies[Util::PasswordPolicyType::LENGTH] = Util::PasswordPolicyParam.new("MINIMUM_LENGTH", @password_policies.dig(:length, :minimum).to_s)
+        if @password_policies.dig(:include, :upper).eql?("REQUIRED")
+          policies[Util::PasswordPolicyType::UPPER_CASE] = Util::PasswordPolicyParam.new
+        end
+        if @password_policies.dig(:include, :lower).eql?("REQUIRED")
+          policies[Util::PasswordPolicyType::LOWER_CASE] = Util::PasswordPolicyParam.new
+        end
+        if @password_policies.dig(:include, :digit).eql?("REQUIRED")
+          policies[Util::PasswordPolicyType::DIGIT] = Util::PasswordPolicyParam.new
+        end
+        if @password_policies.dig(:include, :symbol).eql?("REQUIRED")
+          policies[Util::PasswordPolicyType::SYMBOL] = Util::PasswordPolicyParam.new
+        end
+        policies
+      end
+    end
+
+    # The CoercibleString allows user to enter any value which coerces to a String.
+    # For example for true/false booleans; if the possible_strings are ["foo", "true", "false"]
+    # then these options in the config file or command line will be all valid: "foo", true, false, "true", "false"
+    #
+    class CoercibleString < Coercible
+      def initialize(name, default = nil, strict = true, possible_strings = [], &validator_proc)
         @possible_strings = possible_strings
-        super(name, ::String, default, strict)
+        super(name, Object, default, strict, &validator_proc)
+      end
+
+      def coerce(value)
+        value.to_s
       end
 
       def validate(value)
@@ -415,17 +594,10 @@ module LogStash
       end
     end
 
-    class NullableString < String
-      def validate(value)
-        return if value.nil?
-        super(value)
-      end
-    end
-
     class ExistingFilePath < Setting
-      def initialize(name, default=nil, strict=true)
+      def initialize(name, default = nil, strict = true)
         super(name, ::String, default, strict) do |file_path|
-          if !::File.exists?(file_path)
+          if !::File.exist?(file_path)
             raise ::ArgumentError.new("File \"#{file_path}\" must exist but was not found.")
           else
             true
@@ -435,7 +607,7 @@ module LogStash
     end
 
     class WritableDirectory < Setting
-      def initialize(name, default=nil, strict=false)
+      def initialize(name, default = nil, strict = false)
         super(name, ::String, default, strict)
       end
 
@@ -480,8 +652,8 @@ module LogStash
     end
 
     class Bytes < Coercible
-      def initialize(name, default=nil, strict=true)
-        super(name, ::Integer, default, strict=true) { |value| valid?(value) }
+      def initialize(name, default = nil, strict = true)
+        super(name, ::Integer, default, strict = true) { |value| valid?(value) }
       end
 
       def valid?(value)
@@ -507,18 +679,27 @@ module LogStash
     end
 
     class TimeValue < Coercible
-      def initialize(name, default, strict=true, &validator_proc)
-        super(name, ::Integer, default, strict, &validator_proc)
+      include LogStash::Util::Loggable
+
+      def initialize(name, default, strict = true, &validator_proc)
+        super(name, Util::TimeValue, default, strict, &validator_proc)
       end
 
       def coerce(value)
-        return value if value.is_a?(::Integer)
-        Util::TimeValue.from_value(value).to_nanos
+        if value.is_a?(::Integer)
+          deprecation_logger.deprecated("Integer value for `#{name}` does not have a time unit and will be interpreted in nanoseconds. " +
+                                        "Time units will be required in a future release of Logstash. " +
+                                        "Acceptable unit suffixes are: `d`, `h`, `m`, `s`, `ms`, `micros`, and `nanos`.")
+
+          return Util::TimeValue.new(value, :nanosecond)
+        end
+
+        Util::TimeValue.from_value(value)
       end
     end
 
     class ArrayCoercible < Coercible
-      def initialize(name, klass, default, strict=true, &validator_proc)
+      def initialize(name, klass, default, strict = true, &validator_proc)
         @element_class = klass
         super(name, ::Array, default, strict, &validator_proc)
       end
@@ -530,15 +711,15 @@ module LogStash
       protected
       def validate(input)
         if !input.is_a?(@klass)
-          raise ArgumentError.new("Setting \"#{@name}\" must be a #{@klass}. Received: #{input} (#{input.class})")
+          raise ArgumentError.new("Setting \"#{@wrapped_setting.name}\" must be a #{@klass}. Received: #{input} (#{input.class})")
         end
 
         unless input.all? {|el| el.kind_of?(@element_class) }
-          raise ArgumentError.new("Values of setting \"#{@name}\" must be #{@element_class}. Received: #{input.map(&:class)}")
+          raise ArgumentError.new("Values of setting \"#{@wrapped_setting.name}\" must be #{@element_class}. Received: #{input.map(&:class)}")
         end
 
         if @validator_proc && !@validator_proc.call(input)
-          raise ArgumentError.new("Failed to validate setting \"#{@name}\" with value: #{input}")
+          raise ArgumentError.new("Failed to validate setting \"#{@wrapped_setting.name}\" with value: #{input}")
         end
       end
     end
@@ -546,7 +727,7 @@ module LogStash
     class SplittableStringArray < ArrayCoercible
       DEFAULT_TOKEN = ","
 
-      def initialize(name, klass, default, strict=true, tokenizer = DEFAULT_TOKEN, &validator_proc)
+      def initialize(name, klass, default, strict = true, tokenizer = DEFAULT_TOKEN, &validator_proc)
         @element_class = klass
         @token = tokenizer
         super(name, klass, default, strict, &validator_proc)
@@ -563,31 +744,164 @@ module LogStash
       end
     end
 
-    class Modules < Coercible
-      def initialize(name, klass, default = nil)
-        super(name, klass, default, false)
-      end
-
-      def set(value)
-        @value = coerce(value)
-        @value_is_set = true
-        @value
-      end
-
-      def coerce(value)
-        if value.is_a?(@klass)
-          return value
-        end
-        @klass.new(value)
+    class StringArray < ArrayCoercible
+      def initialize(name, default, strict = true, possible_strings = [], &validator_proc)
+        @possible_strings = possible_strings
+        super(name, ::String, default, strict, &validator_proc)
       end
 
       protected
+
       def validate(value)
-        coerce(value)
+        super(value)
+        return unless @possible_strings&.any?
+
+        invalid_value = coerce(value).reject { |val| @possible_strings.include?(val) }
+        return unless invalid_value.any?
+
+        raise ArgumentError,
+          "Failed to validate the setting \"#{@wrapped_setting.name}\" value(s): #{invalid_value.inspect}. Valid options are: #{@possible_strings.inspect}"
+      end
+    end
+
+    java_import org.logstash.settings.NullableSetting
+
+    # @see Setting#nullable
+    # @api internal
+    class Nullable < SimpleDelegator
+      def validate(value)
+        return true if value.nil?
+
+        __getobj__.send(:validate, value)
+      end
+
+      # prevent delegate from intercepting
+      def validate_value
+        validate(value)
+      end
+    end
+
+    ##
+    # @api private
+    #
+    # A DeprecatedAlias provides a deprecated alias for a setting, and is meant
+    # to be used exclusively through `SettingWithDeprecatedAlias#wrap`
+    class DeprecatedAlias < SimpleDelegator
+      # include LogStash::Util::Loggable
+      alias_method :wrapped, :__getobj__
+      attr_reader :canonical_proxy, :obsoleted_version
+
+      def initialize(canonical_proxy, alias_name, obsoleted_version)
+        @canonical_proxy = canonical_proxy
+        @obsoleted_version = obsoleted_version
+
+        clone = @canonical_proxy.canonical_setting.clone
+        clone.update_wrapper(clone.wrapped_setting.deprecate(alias_name))
+
+        super(clone)
+      end
+
+      def set(value)
+        do_log_setter_deprecation
+        super
+      end
+
+      def value
+        logger.warn(I18n.t("logstash.settings.deprecation.queried",
+                           :deprecated_alias => name,
+                           :canonical_name => canonical_proxy.name))
+        @canonical_proxy.value
+      end
+
+      def validate_value
+        # bypass deprecation warning
+        wrapped.validate_value if set?
+      end
+
+      def observe_post_process
+        do_log_setter_deprecation if set?
+      end
+
+      private
+
+      def do_log_setter_deprecation
+        deprecation_logger.deprecated(
+          I18n.t("logstash.settings.deprecation.set",
+                 :deprecated_alias => name,
+                 :canonical_name => canonical_proxy.name,
+                 :obsoleted_sentences =>
+                   @obsoleted_version.nil? ?
+                     I18n.t("logstash.settings.deprecation.obsoleted_future") :
+                     I18n.t("logstash.settings.deprecation.obsoleted_version", :obsoleted_version => @obsoleted_version))
+        )
+      end
+    end
+
+    ##
+    # A SettingWithDeprecatedAlias wraps any Setting to provide a deprecated
+    # alias, and hooks `Setting#validate_value` to ensure that a deprecation
+    # warning is fired when the setting is provided by its deprecated alias,
+    # or to produce an error when both the canonical name and deprecated
+    # alias are used together.
+    class SettingWithDeprecatedAlias < SimpleDelegator
+
+      ##
+      # Wraps the provided setting, returning a pair of connected settings
+      # including the canonical setting and a deprecated alias.
+      # @param canonical_setting [Setting]: the setting to wrap
+      # @param deprecated_alias_name [String]: the name for the deprecated alias
+      # @param obsoleted_version [String]: the version of Logstash that deprecated alias will be removed
+      #
+      # @return [SettingWithDeprecatedAlias,DeprecatedSetting]
+      def self.wrap(canonical_setting, deprecated_alias_name, obsoleted_version=nil)
+        setting_proxy = new(canonical_setting, deprecated_alias_name, obsoleted_version)
+
+        [setting_proxy, setting_proxy.deprecated_alias]
+      end
+
+      attr_reader :deprecated_alias
+      alias_method :canonical_setting, :__getobj__
+
+      def initialize(canonical_setting, deprecated_alias_name, obsoleted_version)
+        super(canonical_setting)
+
+        @deprecated_alias = DeprecatedAlias.new(self, deprecated_alias_name, obsoleted_version)
+      end
+
+      def set(value)
+        canonical_setting.set(value)
+      end
+
+      def value
+        return super if canonical_setting.set?
+
+        # bypass warning by querying the wrapped setting's value
+        return deprecated_alias.wrapped.value if deprecated_alias.set?
+
+        default
+      end
+
+      def set?
+        canonical_setting.set? || deprecated_alias.set?
+      end
+
+      def format(output)
+        return super unless deprecated_alias.set? && !canonical_setting.set?
+
+        output << "*#{self.name}: #{value.inspect} (via deprecated `#{deprecated_alias.name}`; default: #{default.inspect})"
+      end
+
+      def validate_value
+        if deprecated_alias.set? && canonical_setting.set?
+          fail(ArgumentError, I18n.t("logstash.settings.deprecation.ambiguous",
+                                     :canonical_name => canonical_setting.name,
+                                     :deprecated_alias => deprecated_alias.name))
+        end
+
+        super
       end
     end
   end
 
-
   SETTINGS = Settings.new
 end
diff --git a/logstash-core/lib/logstash/shutdown_watcher.rb b/logstash-core/lib/logstash/shutdown_watcher.rb
index bca5f6749..e249288bf 100644
--- a/logstash-core/lib/logstash/shutdown_watcher.rb
+++ b/logstash-core/lib/logstash/shutdown_watcher.rb
@@ -1 +1,16 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
diff --git a/logstash-core/lib/logstash/state_resolver.rb b/logstash-core/lib/logstash/state_resolver.rb
index ec32d23ba..efa6e44a6 100644
--- a/logstash-core/lib/logstash/state_resolver.rb
+++ b/logstash-core/lib/logstash/state_resolver.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module LogStash
   # In the beginning I was using this code as a method in the Agent class directly
   # But with the plugins system I think we should be able to swap what kind of action would be run.
@@ -25,13 +41,18 @@ module LogStash
         end
       end
 
-      configured_pipelines = pipeline_configs.collect(&:pipeline_id)
+      configured_pipelines = pipeline_configs.each_with_object(Set.new) { |config, set| set.add(config.pipeline_id.to_sym) }
 
       # If one of the running pipeline is not in the pipeline_configs, we assume that we need to
-      # stop it.
-      pipelines_registry.running_pipelines.keys
+      # stop it and delete it in registry.
+      pipelines_registry.running_pipelines(include_loading: true).keys
         .select { |pipeline_id| !configured_pipelines.include?(pipeline_id) }
-        .each { |pipeline_id| actions << LogStash::PipelineAction::Stop.new(pipeline_id) }
+        .each { |pipeline_id| actions << LogStash::PipelineAction::StopAndDelete.new(pipeline_id) }
+
+      # If one of the terminated pipeline is not in the pipeline_configs, delete it in registry.
+      pipelines_registry.non_running_pipelines.keys
+        .select { |pipeline_id| !configured_pipelines.include?(pipeline_id) }
+        .each { |pipeline_id| actions << LogStash::PipelineAction::Delete.new(pipeline_id)}
 
       actions.sort # See logstash/pipeline_action.rb
     end
diff --git a/logstash-core/lib/logstash/timestamp.rb b/logstash-core/lib/logstash/timestamp.rb
index 60f9a95db..9bed6ac90 100644
--- a/logstash-core/lib/logstash/timestamp.rb
+++ b/logstash-core/lib/logstash/timestamp.rb
@@ -1,2 +1,19 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # The contents of this file have been ported to Java. It is included for for compatibility
 # with plugins that directly require "logstash/timestamp".
diff --git a/logstash-core/lib/logstash/universal_plugin.rb b/logstash-core/lib/logstash/universal_plugin.rb
index cf7879f56..dd0059212 100644
--- a/logstash-core/lib/logstash/universal_plugin.rb
+++ b/logstash-core/lib/logstash/universal_plugin.rb
@@ -1 +1,18 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Keeping this file for backwards compatibility with plugins that include it directly.
diff --git a/logstash-core/lib/logstash/util.rb b/logstash-core/lib/logstash/util.rb
index b04192659..9eac95e1a 100644
--- a/logstash-core/lib/logstash/util.rb
+++ b/logstash-core/lib/logstash/util.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/environment"
 
 module LogStash::Util
@@ -8,19 +24,17 @@ module LogStash::Util
   end
 
   PR_SET_NAME = 15
+
   def self.set_thread_name(name)
     previous_name = Java::java.lang.Thread.currentThread.getName() if block_given?
 
-    if RUBY_ENGINE == "jruby"
-      # Keep java and ruby thread names in sync.
-      Java::java.lang.Thread.currentThread.setName(name)
-    end
+    # Keep java and ruby thread names in sync.
+    Java::java.lang.Thread.currentThread.setName(name)
     Thread.current[:name] = name
 
     if UNAME == "linux"
       require "logstash/util/prctl"
       # prctl PR_SET_NAME allows up to 16 bytes for a process name
-      # since MRI 1.9, JRuby, and Rubinius use system threads for this.
       LibC.prctl(PR_SET_NAME, name[0..16], 0, 0, 0)
     end
 
@@ -37,18 +51,23 @@ module LogStash::Util
     Thread.current[:plugin] = plugin
   end
 
-  def self.get_thread_id(thread)
-    if RUBY_ENGINE == "jruby"
-      JRuby.reference(thread).native_thread.id
-    else
-      raise Exception.new("Native thread IDs aren't supported outside of JRuby")
-    end
+  def self.with_logging_thread_context(override_context)
+    java_import org.apache.logging.log4j.ThreadContext
+
+    backup = ThreadContext.getImmutableContext()
+    ThreadContext.putAll(override_context)
+
+    yield
+
+  ensure
+    ThreadContext.removeAll(override_context.keys)
+    ThreadContext.putAll(backup)
   end
 
   def self.thread_info(thread)
     # When the `thread` is dead, `Thread#backtrace` returns `nil`; fall back to an empty array.
     backtrace = (thread.backtrace || []).map do |line|
-      line.gsub(LogStash::Environment::LOGSTASH_HOME, "[...]")
+      line.sub(LogStash::Environment::LOGSTASH_HOME, "[...]")
     end
 
     blocked_on = case backtrace.first
@@ -58,8 +77,8 @@ module LogStash::Util
                  end
 
     {
-      "thread_id" => get_thread_id(thread),
-      "name" => thread[:name],
+      "thread_id" => get_thread_id(thread), # might be nil for dead threads
+      "name" => thread[:name] || get_thread_name(thread),
       "plugin" => (thread[:plugin] ? thread[:plugin].debug_info : nil),
       "backtrace" => backtrace,
       "blocked_on" => blocked_on,
@@ -68,7 +87,6 @@ module LogStash::Util
     }
   end
 
-
   # Merge hash 'src' into 'dst' nondestructively
   #
   # Duplicate keys will become array values
@@ -150,7 +168,6 @@ module LogStash::Util
     return dst
   end # def hash_merge_many
 
-
   # normalize method definition based on platform.
   # normalize is used to convert an object create through
   # json deserialization from JrJackson in :raw mode to pure Ruby
@@ -165,9 +182,9 @@ module LogStash::Util
   def self.normalize(o)
     case o
     when Java::JavaUtil::LinkedHashMap
-      o.inject({}){|r, (k, v)| r[k] = normalize(v); r}
+      o.inject({}) {|r, (k, v)| r[k] = normalize(v); r}
     when Java::JavaUtil::ArrayList
-      o.map{|i| normalize(i)}
+      o.map {|i| normalize(i)}
     else
       o
     end
@@ -176,9 +193,9 @@ module LogStash::Util
   def self.stringify_symbols(o)
     case o
     when Hash
-      o.inject({}){|r, (k, v)| r[k.is_a?(Symbol) ? k.to_s : k] = stringify_symbols(v); r}
+      o.inject({}) {|r, (k, v)| r[k.is_a?(Symbol) ? k.to_s : k] = stringify_symbols(v); r}
     when Array
-      o.map{|i| stringify_symbols(i)}
+      o.map {|i| stringify_symbols(i)}
     when Symbol
       o.to_s
     else
@@ -198,7 +215,7 @@ module LogStash::Util
   def self.deep_clone(o)
     case o
     when Hash
-      o.inject({}) {|h, (k,v)| h[k] = deep_clone(v); h }
+      o.inject({}) {|h, (k, v)| h[k] = deep_clone(v); h }
     when Array
       o.map {|v| deep_clone(v) }
     when Integer, Symbol, IO, TrueClass, FalseClass, NilClass
@@ -213,4 +230,19 @@ module LogStash::Util
       Marshal.load(Marshal.dump(o))
     end
   end
+
+  # Returns true if the object is considered blank.
+  # A blank includes things like '', '   ', nil,
+  # and arrays and hashes that have nothing in them.
+  #
+  # This logic is mostly shared with ActiveSupport's blank?
+  def self.blank?(value)
+    if value.kind_of?(NilClass)
+      true
+    elsif value.kind_of?(String)
+      value !~ /\S/
+    else
+      value.respond_to?(:empty?) ? value.empty? : !value
+    end
+  end
 end # module LogStash::Util
diff --git a/logstash-core/lib/logstash/util/buftok.rb b/logstash-core/lib/logstash/util/buftok.rb
index cf7879f56..dd0059212 100644
--- a/logstash-core/lib/logstash/util/buftok.rb
+++ b/logstash-core/lib/logstash/util/buftok.rb
@@ -1 +1,18 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Keeping this file for backwards compatibility with plugins that include it directly.
diff --git a/logstash-core/lib/logstash/util/byte_value.rb b/logstash-core/lib/logstash/util/byte_value.rb
index 593a1e034..77a44208d 100644
--- a/logstash-core/lib/logstash/util/byte_value.rb
+++ b/logstash-core/lib/logstash/util/byte_value.rb
@@ -1,4 +1,19 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 module LogStash; module Util; module ByteValue
   module_function
diff --git a/logstash-core/lib/logstash/util/charset.rb b/logstash-core/lib/logstash/util/charset.rb
index 38cf1a6a4..76db34205 100644
--- a/logstash-core/lib/logstash/util/charset.rb
+++ b/logstash-core/lib/logstash/util/charset.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/util"
 
 class LogStash::Util::Charset
diff --git a/logstash-core/lib/logstash/util/cloud_setting_auth.rb b/logstash-core/lib/logstash/util/cloud_setting_auth.rb
index e3284f918..e7eb9b5b2 100644
--- a/logstash-core/lib/logstash/util/cloud_setting_auth.rb
+++ b/logstash-core/lib/logstash/util/cloud_setting_auth.rb
@@ -1,28 +1,20 @@
-# encoding: utf-8
-require "logstash/util/password"
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
-module LogStash module Util class CloudSettingAuth
-  attr_reader :original, :username, :password
-
-  def initialize(value)
-    return if value.nil?
-
-    unless value.is_a?(String)
-      raise ArgumentError.new("Cloud Auth must be String. Received: #{value.class}")
-    end
-    @original = value
-    @username, sep, password = @original.partition(":")
-    if @username.empty? || sep.empty? || password.empty?
-      raise ArgumentError.new("Cloud Auth username and password format should be \"<username>:<password>\".")
-    end
-    @password = LogStash::Util::Password.new(password)
-  end
-
-  def to_s
-    "#{@username}:#{@password}"
-  end
-
-  def inspect
-    to_s
-  end
-end end end
+module LogStash; module Util
+  java_import "org.logstash.util.CloudSettingAuth"
+end; end
diff --git a/logstash-core/lib/logstash/util/cloud_setting_id.rb b/logstash-core/lib/logstash/util/cloud_setting_id.rb
index 8f1c58179..71851a2ed 100644
--- a/logstash-core/lib/logstash/util/cloud_setting_id.rb
+++ b/logstash-core/lib/logstash/util/cloud_setting_id.rb
@@ -1,87 +1,22 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "base64"
 
-module LogStash module Util class CloudSettingId
-
-  def self.cloud_id_encode(*args)
-    Base64.urlsafe_encode64(args.join("$"))
-  end
-  DOT_SEPARATOR = "."
-  CLOUD_PORT = "443"
-
-  attr_reader :original, :decoded, :label
-  attr_reader :elasticsearch_host, :elasticsearch_scheme, :elasticsearch_port
-  attr_reader :kibana_host, :kibana_scheme, :kibana_port
-  attr_reader :other_identifiers
-
-  # The constructor is expecting a 'cloud.id', a string in 2 variants.
-  # 1 part example: 'dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRub3RhcmVhbCRpZGVudGlmaWVy'
-  # 2 part example: 'foobar:dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRub3RhcmVhbCRpZGVudGlmaWVy'
-  # The two part variant has a 'label' prepended with a colon separator. The label is not encoded.
-  # The 1 part (or second section of the 2 part variant) is base64 encoded.
-  # The original string before encoding has three segments separated by a dollar sign.
-  # e.g. 'us-east-1.aws.found.io$notareal$identifier'
-  # The first segment is the cloud base url, e.g. 'us-east-1.aws.found.io'
-  # The second segment is the elasticsearch host identifier, e.g. 'notareal'
-  # The third segment is the kibana host identifier, e.g. 'identifier'
-  # The 'cloud.id' value decoded into the #attr_reader ivars.
-  def initialize(value)
-    return if value.nil?
-
-    unless value.is_a?(String)
-      raise ArgumentError.new("Cloud Id must be String. Received: #{value.class}")
-    end
-    @original = value
-    @label, colon, encoded = @original.partition(":")
-    if encoded.empty?
-      @decoded = Base64.urlsafe_decode64(@label) rescue ""
-      @label = ""
-    else
-      @decoded = Base64.urlsafe_decode64(encoded) rescue ""
-    end
-
-    @decoded = @decoded.encode(Encoding::UTF_8, :invalid => :replace, :undef => :replace)
-
-    if @decoded.count("$") < 2
-      raise ArgumentError.new("Cloud Id, after decoding, is invalid. Format: '<segment1>$<segment2>$<segment3>'. Received: \"#{@decoded}\".")
-    end
-
-    segments = @decoded.split("$")
-    if segments.any?(&:empty?)
-      raise ArgumentError.new("Cloud Id, after decoding, is invalid. Format: '<segment1>$<segment2>$<segment3>'. Received: \"#{@decoded}\".")
-    end
-    cloud_base = segments.shift
-    cloud_host = "#{DOT_SEPARATOR}#{cloud_base}"
-    cloud_host, cloud_port = cloud_host.split(":")
-    cloud_port ||= CLOUD_PORT
-
-    @elasticsearch_host, @kibana_host, *@other_identifiers = segments
-    @elasticsearch_host, @elasticsearch_port = @elasticsearch_host.split(":")
-    @kibana_host, @kibana_port = @kibana_host.split(":")
-    @elasticsearch_port ||= cloud_port
-    @kibana_port ||= cloud_port
-    @other_identifiers ||= []
-
-    if @elasticsearch_host == "undefined"
-      raise ArgumentError.new("Cloud Id, after decoding, elasticsearch segment is 'undefined', literally.")
-    end
-    @elasticsearch_scheme = "https"
-    @elasticsearch_host.concat(cloud_host)
-    @elasticsearch_host.concat(":#{@elasticsearch_port}")
-
-    if @kibana_host == "undefined"
-      raise ArgumentError.new("Cloud Id, after decoding, the kibana segment is 'undefined', literally. You may need to enable Kibana in the Cloud UI.")
-    end
-    @kibana_scheme = "https"
-    @kibana_host.concat(cloud_host)
-    @kibana_host.concat(":#{@kibana_port}")
-  end
-
-  def to_s
-    @decoded.to_s
-  end
-
-  def inspect
-    to_s
-  end
-end end end
+module LogStash; module Util
+    java_import "org.logstash.util.CloudSettingId"
+end; end
diff --git a/logstash-core/lib/logstash/util/dead_letter_queue_manager.rb b/logstash-core/lib/logstash/util/dead_letter_queue_manager.rb
index 548cf47a6..0f4032e3a 100644
--- a/logstash-core/lib/logstash/util/dead_letter_queue_manager.rb
+++ b/logstash-core/lib/logstash/util/dead_letter_queue_manager.rb
@@ -1,2 +1,19 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # The contents of this file have been ported to Java. It is included for for compatibility
 # with plugins that directly include it.
diff --git a/logstash-core/lib/logstash/util/decorators.rb b/logstash-core/lib/logstash/util/decorators.rb
index bb98a081c..989484f6d 100644
--- a/logstash-core/lib/logstash/util/decorators.rb
+++ b/logstash-core/lib/logstash/util/decorators.rb
@@ -1,8 +1,23 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/util"
 
 module LogStash::Util
-
   # Decorators provides common manipulation on the event data.
   module Decorators
     include LogStash::Util::Loggable
@@ -10,7 +25,7 @@ module LogStash::Util
 
     # fields is a hash of field => value
     # where both `field` and `value` can use sprintf syntax.
-    def add_fields(fields,event, pluginname)
+    def add_fields(fields, event, pluginname)
       fields.each do |field, value|
         field = event.sprintf(field)
         value = Array(value)
@@ -48,7 +63,5 @@ module LogStash::Util
 
       event.set("tags", tags)
     end
-
   end # module LogStash::Util::Decorators
-
 end # module LogStash::Util
diff --git a/logstash-core/lib/logstash/util/duration_formatter.rb b/logstash-core/lib/logstash/util/duration_formatter.rb
deleted file mode 100644
index b80c33531..000000000
--- a/logstash-core/lib/logstash/util/duration_formatter.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# encoding: utf-8
-require "chronic_duration"
-module LogStash::Util::DurationFormatter
-  CHRONIC_OPTIONS = { :format => :short }
-
-  # Take a duration in milliseconds and transform it into
-  # a format that a human can understand. This is currently used by
-  # the API.
-  #
-  # @param [Integer] Duration in milliseconds
-  # @return [String] Duration in human format
-  def self.human_format(duration)
-    ChronicDuration.output(duration / 1000, CHRONIC_OPTIONS)
-  end
-end
diff --git a/logstash-core/lib/logstash/util/filetools.rb b/logstash-core/lib/logstash/util/filetools.rb
deleted file mode 100644
index ed2f2b9ac..000000000
--- a/logstash-core/lib/logstash/util/filetools.rb
+++ /dev/null
@@ -1,186 +0,0 @@
-# encoding: utf-8
-require "net/http"
-require "uri"
-require "digest/sha1"
-require 'fileutils'
-
-module LogStash::Util::FileTools
-  extend self
-
-  def fetch(url, sha1, output)
-
-    puts "Downloading #{url}"
-    actual_sha1 = download(url, output)
-
-    if actual_sha1 != sha1
-      fail "SHA1 does not match (expected '#{sha1}' but got '#{actual_sha1}')"
-    end
-  end # def fetch
-
-  def file_fetch(url, sha1, target)
-    filename = File.basename( URI(url).path )
-    output = "#{target}/#{filename}"
-    begin
-      actual_sha1 = file_sha1(output)
-      if actual_sha1 != sha1
-        fetch(url, sha1, output)
-      end
-    rescue Errno::ENOENT
-      fetch(url, sha1, output)
-    end
-    return output
-  end
-
-  def file_sha1(path)
-    digest = Digest::SHA1.new
-    fd = File.new(path, "r")
-    while true
-      begin
-        digest << fd.sysread(16384)
-      rescue EOFError
-        break
-      end
-    end
-    return digest.hexdigest
-  ensure
-    fd.close if fd
-  end
-
-  def download(url, output)
-    uri = URI(url)
-    digest = Digest::SHA1.new
-    tmp = "#{output}.tmp"
-    Net::HTTP.start(uri.host, uri.port, :use_ssl => (uri.scheme == "https")) do |http|
-      request = Net::HTTP::Get.new(uri.path)
-      http.request(request) do |response|
-        fail "HTTP fetch failed for #{url}. #{response}" if [200, 301].include?(response.code)
-        size = (response["content-length"].to_i || -1).to_f
-        count = 0
-        File.open(tmp, "w") do |fd|
-          response.read_body do |chunk|
-            fd.write(chunk)
-            digest << chunk
-            if size > 0 && $stdout.tty?
-              count += chunk.bytesize
-              $stdout.write(sprintf("\r%0.2f%%", count/size * 100))
-            end
-          end
-        end
-        $stdout.write("\r      \r") if $stdout.tty?
-      end
-    end
-
-    File.rename(tmp, output)
-
-    return digest.hexdigest
-  rescue SocketError => e
-    puts "Failure while downloading #{url}: #{e}"
-    raise
-  ensure
-    File.unlink(tmp) if File.exist?(tmp)
-  end # def download
-
-  def untar(tarball, &block)
-    require "archive/tar/minitar"
-    tgz = Zlib::GzipReader.new(File.open(tarball))
-    # Pull out typesdb
-    tar = Archive::Tar::Minitar::Input.open(tgz)
-    tar.each do |entry|
-      path = block.call(entry)
-      next if path.nil?
-      parent = File.dirname(path)
-
-      FileUtils.mkdir_p(parent) unless File.directory?(parent)
-
-      # Skip this file if the output file is the same size
-      if entry.directory?
-        FileUtils.mkdir_p(path) unless File.directory?(path)
-      else
-        entry_mode = entry.instance_eval { @mode } & 0777
-        if File.exists?(path)
-          stat = File.stat(path)
-          # TODO(sissel): Submit a patch to archive-tar-minitar upstream to
-          # expose headers in the entry.
-          entry_size = entry.instance_eval { @size }
-          # If file sizes are same, skip writing.
-          next if stat.size == entry_size && (stat.mode & 0777) == entry_mode
-        end
-        puts "Extracting #{entry.full_name} from #{tarball} #{entry_mode.to_s(8)}"
-        File.open(path, "w") do |fd|
-          # eof? check lets us skip empty files. Necessary because the API provided by
-          # Archive::Tar::Minitar::Reader::EntryStream only mostly acts like an
-          # IO object. Something about empty files in this EntryStream causes
-          # IO.copy_stream to throw "can't convert nil into String" on JRuby
-          # TODO(sissel): File a bug about this.
-          while !entry.eof?
-            chunk = entry.read(16384)
-            fd.write(chunk)
-          end
-            #IO.copy_stream(entry, fd)
-        end
-        File.chmod(entry_mode, path)
-      end
-    end
-    tar.close
-    File.unlink(tarball) if File.file?(tarball)
-  end # def untar
-
-  def do_ungz(file)
-
-    outpath = file.gsub('.gz', '')
-    tgz = Zlib::GzipReader.new(File.open(file))
-    begin
-      File.open(outpath, "w") do |out|
-        IO::copy_stream(tgz, out)
-      end
-      File.unlink(file)
-    rescue
-      File.unlink(outpath) if File.file?(outpath)
-     raise
-    end
-    tgz.close
-  end
-
-  def eval_file(entry, files, prefix)
-    return false if entry.full_name =~ /PaxHeaders/
-    if !files.nil?
-      if files.is_a?(Array)
-        return false unless files.include?(entry.full_name.gsub(prefix, ''))
-        entry.full_name.split("/").last
-      elsif files.is_a?(String)
-        return false unless entry.full_name =~ Regexp.new(files)
-        entry.full_name.split("/").last
-      end
-    else
-      entry.full_name.gsub(prefix, '')
-    end
-  end
-
-  def process_downloads(files,target='')
-
-    FileUtils.mkdir_p(target) unless File.directory?(target)
-
-    files.each do |file|
-      download = file_fetch(file['url'], file['sha1'],target)
-
-      if download =~ /.tar.gz/
-        prefix = download.gsub('.tar.gz', '').gsub("#{target}/", '')
-        untar(download) do |entry|
-          next unless out = eval_file(entry, file['files'], prefix)
-          File.join(target, out)
-        end
-
-      elsif download =~ /.tgz/
-        prefix = download.gsub('.tgz', '').gsub("#{target}/", '')
-        untar(download) do |entry|
-          next unless out = eval_file(entry, file['files'], prefix)
-          File.join(target, out)
-        end
-
-      elsif download =~ /.gz/
-        do_ungz(download)
-      end
-    end
-  end
-
-end
diff --git a/logstash-core/lib/logstash/util/jackson.rb b/logstash-core/lib/logstash/util/jackson.rb
new file mode 100644
index 000000000..2755d7196
--- /dev/null
+++ b/logstash-core/lib/logstash/util/jackson.rb
@@ -0,0 +1,30 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module LogStash
+  module Util
+    module Jackson
+
+      def self.verify_jackson_overrides
+        java_import org.logstash.ObjectMappers
+
+        ObjectMappers::getConfiguredStreamReadConstraints().validateIsGlobalDefault()
+      end
+
+    end
+  end
+end
\ No newline at end of file
diff --git a/logstash-core/lib/logstash/util/java_version.rb b/logstash-core/lib/logstash/util/java_version.rb
index ba87c2b4e..7582425e8 100644
--- a/logstash-core/lib/logstash/util/java_version.rb
+++ b/logstash-core/lib/logstash/util/java_version.rb
@@ -1,4 +1,19 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 module LogStash::Util::JavaVersion
   # Return the current java version string. Returns nil if this is a non-java platform (e.g. MRI).
diff --git a/logstash-core/lib/logstash/util/lazy_singleton.rb b/logstash-core/lib/logstash/util/lazy_singleton.rb
new file mode 100644
index 000000000..5e876da28
--- /dev/null
+++ b/logstash-core/lib/logstash/util/lazy_singleton.rb
@@ -0,0 +1,33 @@
+require 'thread' # Mutex
+
+# A [LazySingleton] wraps the result of the provided block,
+# which is guaranteed to be called at-most-once, even if the
+# block's return value is nil.
+class ::LogStash::Util::LazySingleton
+
+  def initialize(&block)
+    @mutex = Mutex.new
+    @block = block
+    @instantiated = false
+  end
+
+  def instance
+    unless @instantiated
+      @mutex.synchronize do
+        unless @instantiated
+          @instance = @block.call
+          @instantiated = true
+        end
+      end
+    end
+
+    return @instance
+  end
+
+  def reset!
+    @mutex.synchronize do
+      @instantiated = false
+      @instance = nil
+    end
+  end
+end
diff --git a/logstash-core/lib/logstash/util/loggable.rb b/logstash-core/lib/logstash/util/loggable.rb
index cf7879f56..dd0059212 100644
--- a/logstash-core/lib/logstash/util/loggable.rb
+++ b/logstash-core/lib/logstash/util/loggable.rb
@@ -1 +1,18 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Keeping this file for backwards compatibility with plugins that include it directly.
diff --git a/logstash-core/lib/logstash/util/manticore_ssl_config_helper.rb b/logstash-core/lib/logstash/util/manticore_ssl_config_helper.rb
deleted file mode 100644
index f91bdc424..000000000
--- a/logstash-core/lib/logstash/util/manticore_ssl_config_helper.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-# encoding: utf-8
-
-module LogStash; module Util; module ManticoreSSLConfigHelper
-  extend self
-
-  ##
-  # Extract Manticore-style SSL directives from the given configuration.
-  #
-  # @param namespace [String] a string namespace (e.g., `kibana` in `var.kibana.ssl.*`)
-  # @param settings [Hash<String,Object>] a collection of Manticore-friendly SSL directives.
-  #                                       if SSL explicitly disabled, an _empty_ hash will be returned.
-  #
-  # @return [Hash<Symbol,Object>]
-  def manticore_ssl_options_from_config(namespace, settings)
-    ssl_settings = strip_prefix(settings, "var.#{namespace}.ssl.")
-
-    # boolean settings may be strings if set through the cli
-    # or booleans if set through the yaml file, so we use .to_s
-    if ssl_settings.include?('enabled') && !coerce_boolean(ssl_settings['enabled'])
-      logger.warn('SSL explicitly disabled; other SSL settings will be ignored') if logger && ssl_settings.size > 1
-      return {}
-    end
-
-    {
-        :verify      => ssl_settings.fetch('verification_mode', :strict).to_sym,
-        :ca_file     => ssl_settings.fetch('certificate_authority', nil),
-        :client_cert => ssl_settings.fetch('certificate', nil),
-        :client_key  => ssl_settings.fetch('key', nil),
-    }
-  end
-
-  private
-
-  ##
-  # Returns the subset of the hash whose keys match the given prefix, with the prefix removed
-  #
-  # @param hash [Hash<String,Object>]
-  # @param prefix [String]
-  # @return [Hash<String,Object>]
-  def strip_prefix(hash, prefix)
-    hash.each_with_object({}) do |(key, value), memo|
-      next unless key.start_with?(prefix)
-      unprefixed_key = key[prefix.length..-1]
-      memo[unprefixed_key] = value
-    end
-  end
-
-  ##
-  # Coerces the non-nil input to boolean
-  #
-  # @param value [Boolean,String,Integer]
-  # @return [Boolean]
-  def coerce_boolean(value)
-    case value
-    when true, "true", "T", 1 then true
-    when false, "false", "F", 0 then false
-    else
-      fail("Boolean value required, received `#{value}`")
-    end
-  end
-
-  ##
-  # Adapter to enable logging via the including class' `#logger` method or `@logger` instance variable
-  #
-  # @return [Logger,nil]
-  def logger
-    return super if defined?(super)
-
-    @logger
-  end
-end end end
diff --git a/logstash-core/lib/logstash/util/modules_setting_array.rb b/logstash-core/lib/logstash/util/modules_setting_array.rb
deleted file mode 100644
index 5b4b2da8c..000000000
--- a/logstash-core/lib/logstash/util/modules_setting_array.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# encoding: utf-8
-require "forwardable"
-require "logstash/util/password"
-
-module LogStash module Util class ModulesSettingArray
-  extend Forwardable
-  DELEGATED_METHODS = [].public_methods.reject{|symbol| symbol.to_s.end_with?('__')}
-
-  def_delegators :@original, *DELEGATED_METHODS
-
-  attr_reader :original
-  def initialize(value)
-    unless value.is_a?(Array)
-      raise ArgumentError.new("Module Settings must be an Array. Received: #{value.class}")
-    end
-    @original = value
-    # wrap passwords
-    @original.each do |hash|
-      hash.keys.select{|key| key.to_s.end_with?('password') && !hash[key].is_a?(LogStash::Util::Password)}.each do |key|
-        hash[key] = LogStash::Util::Password.new(hash[key])
-      end
-    end
-  end
-
-  def __class__
-    LogStash::Util::ModulesSettingArray
-  end
-end end end
diff --git a/logstash-core/lib/logstash/util/password.rb b/logstash-core/lib/logstash/util/password.rb
index c84adbe33..531a794fb 100644
--- a/logstash-core/lib/logstash/util/password.rb
+++ b/logstash-core/lib/logstash/util/password.rb
@@ -1,22 +1,26 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # This class exists to quietly wrap a password string so that, when printed or
 # logged, you don't accidentally print the password itself.
-module LogStash module Util class Password
-  attr_reader :value
 
-  public
-  def initialize(password)
-    @value = password
-  end # def initialize
-
-  public
-  def to_s
-    return "<password>"
-  end # def to_s
-
-  public
-  def inspect
-    return to_s
-  end # def inspect
-end end end # class LogStash::Util::Password
+module LogStash; module Util
+    java_import "co.elastic.logstash.api.Password" # class LogStash::Util::Password
+    java_import "org.logstash.secret.password.PasswordValidator" # class LogStash::Util::PasswordValidator
+    java_import "org.logstash.secret.password.PasswordPolicyType" # class LogStash::Util::PasswordPolicyType
+    java_import "org.logstash.secret.password.PasswordPolicyParam" # class LogStash::Util::PasswordPolicyParam
+end; end
diff --git a/logstash-core/lib/logstash/util/plugin_version.rb b/logstash-core/lib/logstash/util/plugin_version.rb
index ab296bdef..033d33f54 100644
--- a/logstash-core/lib/logstash/util/plugin_version.rb
+++ b/logstash-core/lib/logstash/util/plugin_version.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'rubygems/version'
 require 'forwardable'
 
diff --git a/logstash-core/lib/logstash/util/prctl.rb b/logstash-core/lib/logstash/util/prctl.rb
index ffb572014..2022cfbc1 100644
--- a/logstash-core/lib/logstash/util/prctl.rb
+++ b/logstash-core/lib/logstash/util/prctl.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module LibC
   require "ffi"
   extend FFI::Library
@@ -7,4 +23,3 @@ module LibC
   # Ok so the 2nd arg isn't really a string... but whatever
   attach_function :prctl, [:int, :string, :long, :long, :long], :int
 end
-
diff --git a/logstash-core/lib/logstash/util/safe_uri.rb b/logstash-core/lib/logstash/util/safe_uri.rb
index 0513833ac..4dae8fc17 100644
--- a/logstash-core/lib/logstash/util/safe_uri.rb
+++ b/logstash-core/lib/logstash/util/safe_uri.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/util"
 require "forwardable"
 
@@ -6,11 +22,10 @@ require "forwardable"
 # logged, you don't accidentally print the password itself.
 class LogStash::Util::SafeURI
   PASS_PLACEHOLDER = "xxxxxx".freeze
-  HOSTNAME_PORT_REGEX=/\A(?<hostname>([A-Za-z0-9\.\-]+)|\[[0-9A-Fa-f\:]+\])(:(?<port>\d+))?\Z/
+  HOSTNAME_PORT_REGEX = /\A(?<hostname>([A-Za-z0-9\.\-]+)|\[[0-9A-Fa-f\:]+\])(:(?<port>\d+))?\Z/
 
   extend Forwardable
 
-
   attr_reader :uri
 
   public
@@ -26,6 +41,18 @@ class LogStash::Util::SafeURI
            else
              raise ArgumentError, "Expected a string, java.net.URI, or URI, got a #{arg.class} creating a URL"
            end
+    raise ArgumentError, "URI is not valid - host is not specified" if @uri.host.nil?
+  end
+
+  ##
+  # Attempts to efficiently return an instance of `SafeURI` from the given object.
+  # @param object [Object]: an object that may or may not already be a `SafeURI`.
+  # @return [SafeURI]: if the given `object` was a `SafeURI`, returns it unmodified.
+  #                    otherwise, a new `SafeURI` is initialized using the `object`.
+  def self.from(object)
+    return object if object.kind_of?(self)
+
+    new(object)
   end
 
   def to_s
@@ -44,11 +71,16 @@ class LogStash::Util::SafeURI
     make_uri(scheme, user_info, host, port, path, query, fragment)
   end
 
-  def ==(other)
-    other.is_a?(::LogStash::Util::SafeURI) ? @uri == other.uri : false
+  def hash
+    @uri.hash * 11
   end
 
-  def clone
+  def eql?(other)
+    other.is_a?(::LogStash::Util::SafeURI) ? @uri == other.uri : false
+  end
+  alias == eql?
+
+  def clone(*args)
     # No need to clone the URI, in java its immutable
     self.class.new(uri)
   end
@@ -143,13 +175,13 @@ class LogStash::Util::SafeURI
   # Same algorithm as Ruby's URI class uses
   def normalize!
     if path && path == ''
-      path = '/'
+      update(:path, '/')
     end
     if scheme && scheme != scheme.downcase
-      scheme = self.scheme.downcase
+      update(:scheme, self.scheme.downcase)
     end
     if host && host != host.downcase
-      host = self.host.downcase
+      update(:host, self.host.downcase)
     end
   end
 
@@ -187,4 +219,3 @@ class LogStash::Util::SafeURI
     java.net.URI.new(scheme, user_info, host, port || -1, prefixed_path, query, fragment)
   end
 end
-
diff --git a/logstash-core/lib/logstash/util/secretstore.rb b/logstash-core/lib/logstash/util/secretstore.rb
index cf7879f56..dd0059212 100644
--- a/logstash-core/lib/logstash/util/secretstore.rb
+++ b/logstash-core/lib/logstash/util/secretstore.rb
@@ -1 +1,18 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Keeping this file for backwards compatibility with plugins that include it directly.
diff --git a/logstash-core/lib/logstash/util/settings_helper.rb b/logstash-core/lib/logstash/util/settings_helper.rb
index 77b5c003c..b58b8dd74 100644
--- a/logstash-core/lib/logstash/util/settings_helper.rb
+++ b/logstash-core/lib/logstash/util/settings_helper.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/settings"
 require "logstash-core/logstash-core"
 require "logstash/environment"
@@ -13,12 +30,11 @@ require "logstash/environment"
 # The methods should be called in the above order before the settings are ready to be used.
 ########################
 module LogStash::Util::SettingsHelper
-
   # The `path.settings` and `path.logs` can not be defined in "logstash/environment" since the `Environment::LOGSTASH_HOME` doesn't
   # exist unless launched via "bootstrap/environment"
   def self.pre_process
-    LogStash::SETTINGS.register(LogStash::Setting::String.new("path.settings", ::File.join(LogStash::Environment::LOGSTASH_HOME, "config")))
-    LogStash::SETTINGS.register(LogStash::Setting::String.new("path.logs", ::File.join(LogStash::Environment::LOGSTASH_HOME, "logs")))
+    LogStash::SETTINGS.register(LogStash::Setting::SettingString.new("path.settings", ::File.join(LogStash::Environment::LOGSTASH_HOME, "config")))
+    LogStash::SETTINGS.register(LogStash::Setting::SettingString.new("path.logs", ::File.join(LogStash::Environment::LOGSTASH_HOME, "logs")))
   end
 
   # Ensure that any settings are re-calculated after loading yaml
@@ -59,8 +75,8 @@ module LogStash::Util::SettingsHelper
   # 3. check if the LS_SETTINGS_DIR environment variable is set
   # 4. return nil if not found
   def self.fetch_settings_path(cli_args)
-    if i=cli_args.find_index("--path.settings")
-      cli_args[i+1]
+    if i = cli_args.find_index("--path.settings")
+      cli_args[i + 1]
     elsif settings_arg = cli_args.find {|v| v.match(/--path.settings=/)}
       match = settings_arg.match(/--path.settings=(.*)/)
       match[1]
@@ -76,5 +92,4 @@ module LogStash::Util::SettingsHelper
     # I know, double negative
     !(["--help", "-h"] & args).empty?
   end
-
-end
\ No newline at end of file
+end
diff --git a/logstash-core/lib/logstash/util/socket_peer.rb b/logstash-core/lib/logstash/util/socket_peer.rb
index 56ea2f3e2..7220e34cd 100644
--- a/logstash-core/lib/logstash/util/socket_peer.rb
+++ b/logstash-core/lib/logstash/util/socket_peer.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module ::LogStash::Util::SocketPeer
   public
   def peer
diff --git a/logstash-core/lib/logstash/util/substitution_variables.rb b/logstash-core/lib/logstash/util/substitution_variables.rb
index 41ff14a7e..a6d2fd86e 100644
--- a/logstash-core/lib/logstash/util/substitution_variables.rb
+++ b/logstash-core/lib/logstash/util/substitution_variables.rb
@@ -1,26 +1,46 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 java_import "org.logstash.secret.store.SecretStoreExt"
 
-module ::LogStash::Util::SubstitutionVariables
+require_relative 'lazy_singleton'
+require_relative 'password'
 
+module ::LogStash::Util::SubstitutionVariables
   include LogStash::Util::Loggable
 
   SUBSTITUTION_PLACEHOLDER_REGEX = /\${(?<name>[a-zA-Z_.][a-zA-Z0-9_.]*)(:(?<default>[^}]*))?}/
 
-  # Recursive method to replace substitution variable references in parameters
-  def deep_replace(value)
+  SECRET_STORE = ::LogStash::Util::LazySingleton.new { load_secret_store }
+  private_constant :SECRET_STORE
+
+  # Recursive method to replace substitution variable references in parameters and refine if required
+  def deep_replace(value, refine = false)
     if value.is_a?(Hash)
       value.each do |valueHashKey, valueHashValue|
-        value[valueHashKey.to_s] = deep_replace(valueHashValue)
+        value[valueHashKey.to_s] = deep_replace(valueHashValue, refine)
       end
     else
       if value.is_a?(Array)
-        value.each_index do | valueArrayIndex|
-          value[valueArrayIndex] = deep_replace(value[valueArrayIndex])
+        value.each_with_index do |single_value, i|
+          value[i] = deep_replace(single_value, refine)
         end
       else
-        return replace_placeholders(value)
+        return replace_placeholders(value, refine)
       end
     end
   end
@@ -29,10 +49,17 @@ module ::LogStash::Util::SubstitutionVariables
   # Process following patterns : ${VAR}, ${VAR:defaultValue}
   # If value matches the pattern, returns the following precedence : Secret store value, Environment entry value, default value as provided in the pattern
   # If the value does not match the pattern, the 'value' param returns as-is
-  def replace_placeholders(value)
+  # When setting refine to true, substituted value will be cleaned against escaped single/double quotes
+  #   and generates array if resolved substituted value is array string
+  def replace_placeholders(value, refine = false)
+    if value.kind_of?(::LogStash::Util::Password)
+      interpolated = replace_placeholders(value.value, refine)
+      return ::LogStash::Util::Password.new(interpolated)
+    end
     return value unless value.is_a?(String)
 
-    value.gsub(SUBSTITUTION_PLACEHOLDER_REGEX) do |placeholder|
+    is_placeholder_found = false
+    placeholder_value = value.gsub(SUBSTITUTION_PLACEHOLDER_REGEX) do |placeholder|
       # Note: Ruby docs claim[1] Regexp.last_match is thread-local and scoped to
       # the call, so this should be thread-safe.
       #
@@ -41,8 +68,10 @@ module ::LogStash::Util::SubstitutionVariables
       default = Regexp.last_match(:default)
       logger.debug("Replacing `#{placeholder}` with actual value")
 
+      is_placeholder_found = true
+
       #check the secret store if it exists
-      secret_store = SecretStoreExt.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)
+      secret_store = SECRET_STORE.instance
       replacement = secret_store.nil? ? nil : secret_store.retrieveSecret(SecretStoreExt.getStoreId(name))
       #check the environment
       replacement = ENV.fetch(name, default) if replacement.nil?
@@ -52,6 +81,53 @@ module ::LogStash::Util::SubstitutionVariables
       end
       replacement.to_s
     end
+
+    # no further action need if substitution didn't happen or refine isn't required
+    return placeholder_value unless is_placeholder_found && refine
+
+    # ENV ${var} value may carry single quote or escaped double quote
+    # or single/double quoted entries in array string, needs to be refined
+    refined_value = strip_enclosing_char(strip_enclosing_char(placeholder_value, "'"), '"')
+    if refined_value.start_with?('[') && refined_value.end_with?(']')
+      # remove square brackets, split by comma and cleanup leading/trailing whitespace
+      refined_array = refined_value[1..-2].split(',').map(&:strip)
+      refined_array.each_with_index do |str, index|
+        refined_array[index] = strip_enclosing_char(strip_enclosing_char(str, "'"), '"')
+      end
+      refined_array
+    else
+      refined_value
+    end
   end # def replace_placeholders
 
+  private
+
+  # removes removed_char of string_value if string_value is wrapped with removed_char
+  def strip_enclosing_char(string_value, remove_char)
+    return string_value unless string_value.is_a?(String)
+    return string_value if string_value.empty?
+
+    if string_value.start_with?(remove_char) && string_value.end_with?(remove_char)
+      string_value[1..-2] # Remove the first and last characters
+    else
+      string_value
+    end
+  end
+
+  class << self
+    private
+
+    # loads a secret_store from disk if available, or returns nil
+    #
+    # @api private
+    # @return [SecretStoreExt,nil]
+    def load_secret_store
+      SecretStoreExt.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)
+    end
+
+    # @api test
+    def reset_secret_store
+      SECRET_STORE.reset!
+    end
+  end
 end
diff --git a/logstash-core/lib/logstash/util/thread_dump.rb b/logstash-core/lib/logstash/util/thread_dump.rb
index bd61874af..dc5b3099c 100644
--- a/logstash-core/lib/logstash/util/thread_dump.rb
+++ b/logstash-core/lib/logstash/util/thread_dump.rb
@@ -1,24 +1,40 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 java_import 'org.logstash.instrument.reports.ThreadsReport'
 
 module LogStash
   module Util
     class ThreadDump
-      SKIPPED_THREADS             = [ "Finalizer", "Reference Handler", "Signal Dispatcher" ].freeze
+      SKIPPED_THREADS             = ["Finalizer", "Reference Handler", "Signal Dispatcher"].freeze
       THREADS_COUNT_DEFAULT       = 10.freeze
       IGNORE_IDLE_THREADS_DEFAULT = true.freeze
 
       attr_reader :top_count, :ignore, :dump
 
-      def initialize(options={})
-        @options   = options
+      def initialize(options = {})
+        @options = options
         @dump = options.fetch(:dump, ThreadsReport.generate({}))
         @top_count = options.fetch(:threads, THREADS_COUNT_DEFAULT)
         @ignore    = options.fetch(:ignore_idle_threads, IGNORE_IDLE_THREADS_DEFAULT)
       end
 
       def each(&block)
-        i=0
+        i = 0
         dump.each do |hash|
           thread_name = hash["thread.name"]
           break if i >= top_count
@@ -36,7 +52,7 @@ module LogStash
           # these are likely JVM dependent
           idle = true
         elsif thread_name.match(/Ruby-\d+-JIT-\d+/)
-          # This are internal JRuby JIT threads, 
+          # This are internal JRuby JIT threads,
           # see java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor for details.
           idle = true
         elsif thread_name.match(/pool-\d+-thread-\d+/)
diff --git a/logstash-core/lib/logstash/util/thread_safe_attributes.rb b/logstash-core/lib/logstash/util/thread_safe_attributes.rb
new file mode 100644
index 000000000..1a5258815
--- /dev/null
+++ b/logstash-core/lib/logstash/util/thread_safe_attributes.rb
@@ -0,0 +1,42 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module LogStash
+  module Util
+    # @api internal
+    module ThreadSafeAttributes
+      # Thread-safe lazy initialized attribute with a given (variable) name.
+      def lazy_init_attr(attribute, variable: "@#{attribute}".to_sym, &block)
+        raise ArgumentError.new("invalid attribute name: #{attribute}") unless attribute.match? /^[_A-Za-z]\w*$/
+        raise ArgumentError.new('no block given') unless block_given?
+        send(:define_method, attribute.to_sym) do
+          if instance_variable_defined?(variable)
+            instance_variable_get(variable)
+          else
+            LogStash::Util.synchronize(self) do
+              if instance_variable_defined?(variable)
+                instance_variable_get(variable)
+              else
+                instance_variable_set(variable, instance_eval(&block))
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/logstash-core/lib/logstash/util/time_value.rb b/logstash-core/lib/logstash/util/time_value.rb
index 63e19ce02..5b9ad9bd1 100644
--- a/logstash-core/lib/logstash/util/time_value.rb
+++ b/logstash-core/lib/logstash/util/time_value.rb
@@ -1,70 +1,22 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module LogStash
   module Util
-    class TimeValue
-      def initialize(duration, time_unit)
-        @duration = duration
-        @time_unit = time_unit
-      end
-
-      def self.from_value(value)
-        if value.is_a?(TimeValue)
-          TimeValue.new(value.duration, value.time_unit)
-        elsif value.is_a?(::String)
-          normalized = value.downcase.strip
-          if normalized.end_with?("nanos")
-            TimeValue.new(parse(normalized, 5), :nanosecond)
-          elsif normalized.end_with?("micros")
-            TimeValue.new(parse(normalized, 6), :microsecond)
-          elsif normalized.end_with?("ms")
-            TimeValue.new(parse(normalized, 2), :millisecond)
-          elsif normalized.end_with?("s")
-            TimeValue.new(parse(normalized, 1), :second)
-          elsif normalized.end_with?("m")
-            TimeValue.new(parse(normalized, 1), :minute)
-          elsif normalized.end_with?("h")
-            TimeValue.new(parse(normalized, 1), :hour)
-          elsif normalized.end_with?("d")
-            TimeValue.new(parse(normalized, 1), :day)
-          elsif normalized =~ /^-0*1/
-            TimeValue.new(-1, :nanosecond)
-          else
-            raise ArgumentError.new("invalid time unit: \"#{value}\"")
-          end
-        else
-          raise ArgumentError.new("value is not a string: #{value} [#{value.class}]")
-        end
-      end
-
-      def to_nanos
-        case @time_unit
-        when :day
-          86400000000000 * @duration
-        when :hour
-          3600000000000 * @duration
-        when :minute
-          60000000000 * @duration
-        when :second
-          1000000000 * @duration
-        when :millisecond
-          1000000 * @duration
-        when :microsecond
-          1000 * @duration
-        when :nanosecond
-          @duration
-        end
-      end
-
-      def ==(other)
-        self.duration == other.duration and self.time_unit == other.time_unit
-      end
-
-      def self.parse(value, suffix)
-        Integer(value[0..(value.size - suffix - 1)].strip)
-      end
-
-      private_class_method :parse
-      attr_reader :duration
-      attr_reader :time_unit
-    end
+    java_import "org.logstash.util.TimeValue"
   end
 end
diff --git a/logstash-core/lib/logstash/util/unicode_trimmer.rb b/logstash-core/lib/logstash/util/unicode_trimmer.rb
index b8bb1c0d3..68468e67e 100644
--- a/logstash-core/lib/logstash/util/unicode_trimmer.rb
+++ b/logstash-core/lib/logstash/util/unicode_trimmer.rb
@@ -1,4 +1,22 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # encoding: utf-8
+
 module LogStash::Util::UnicodeTrimmer
   # The largest possible unicode chars are 4 bytes
   # http://stackoverflow.com/questions/9533258/what-is-the-maximum-number-of-bytes-for-a-utf-8-encoded-character
@@ -38,7 +56,7 @@ module LogStash::Util::UnicodeTrimmer
     # Try to do an initial shortening based on the average char size
     # The goal here is to get us somewhere above or below the boundary quickly
     orig_extra_bytes = orig_bs - desired_bytes
-    pre_shorten_by = (orig_extra_bytes  / avg_size).to_i
+    pre_shorten_by = (orig_extra_bytes / avg_size).to_i
     orig_str.slice(0, orig_len - pre_shorten_by)
   end
 
diff --git a/logstash-core/lib/logstash/util/worker_threads_default_printer.rb b/logstash-core/lib/logstash/util/worker_threads_default_printer.rb
index 11c5f687c..c27ffdfae 100644
--- a/logstash-core/lib/logstash/util/worker_threads_default_printer.rb
+++ b/logstash-core/lib/logstash/util/worker_threads_default_printer.rb
@@ -1,9 +1,24 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/util"
 
 # This class exists to format the settings for default worker threads
 module LogStash module Util class WorkerThreadsDefaultPrinter
-
   def initialize(settings)
     @setting = settings.fetch('pipeline.workers', 0)
     @default = settings.fetch('default-pipeline-workers', 0)
@@ -23,6 +38,4 @@ module LogStash module Util class WorkerThreadsDefaultPrinter
     return if @default == 0
     collector.push "Default pipeline workers: #{@default}"
   end
-
 end end end
-
diff --git a/logstash-core/lib/logstash/version.rb b/logstash-core/lib/logstash/version.rb
index 5ec0f8d5e..026b3510a 100644
--- a/logstash-core/lib/logstash/version.rb
+++ b/logstash-core/lib/logstash/version.rb
@@ -1,8 +1,23 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 # The version of the logstash package (not the logstash-core gem version).
 #
-# sourced from a copy of the master versions.yml file, see logstash-core/logstash-core.gemspec
+# sourced from a copy of the main versions.yml file, see logstash-core/logstash-core.gemspec
 if !defined?(ALL_VERSIONS)
   require 'yaml'
   ALL_VERSIONS = YAML.load_file(File.expand_path("../../versions-gem-copy.yml", File.dirname(__FILE__)))
diff --git a/logstash-core/lib/logstash/webserver.rb b/logstash-core/lib/logstash/webserver.rb
index 0531cb843..3caac63f8 100644
--- a/logstash-core/lib/logstash/webserver.rb
+++ b/logstash-core/lib/logstash/webserver.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/api/rack_app"
 require "puma"
 require "puma/server"
@@ -8,51 +24,149 @@ require "thread"
 
 module LogStash
   class WebServer
-    extend Forwardable
+    include Util::Loggable
 
-    attr_reader :logger, :status, :config, :options, :runner, :binder, :events, :http_host, :http_ports, :http_environment, :agent
-
-    def_delegator :@runner, :stats
+    attr_reader :logger, :config, :http_host, :http_ports, :http_environment, :agent, :port
 
     DEFAULT_HOST = "127.0.0.1".freeze
     DEFAULT_PORTS = (9600..9700).freeze
     DEFAULT_ENVIRONMENT = 'production'.freeze
 
-    def initialize(logger, agent, options={})
+    def self.from_settings(logger, agent, settings)
+      options = {}
+      options[:http_host] = settings.get('api.http.host') # may be overridden later if API configured securely
+      options[:http_ports] = settings.get('api.http.port')
+      options[:http_environment] = settings.get('api.environment')
+
+      if settings.get('api.ssl.enabled')
+        ssl_params = {}
+        ssl_params[:keystore_path] = required_setting(settings, 'api.ssl.keystore.path', "api.ssl.enabled")
+        ssl_params[:keystore_password] = required_setting(settings, 'api.ssl.keystore.password', "api.ssl.enabled")
+        ssl_params[:supported_protocols] = settings.get('api.ssl.supported_protocols')
+        options[:ssl_params] = ssl_params.freeze
+      else
+        warn_ignored(logger, settings, "api.ssl.", "api.ssl.enabled")
+      end
+
+      if settings.get('api.auth.type') == 'basic'
+        auth_basic = {}
+        auth_basic[:username] = required_setting(settings, 'api.auth.basic.username', "api.auth.type")
+        auth_basic[:password] = required_setting(settings, 'api.auth.basic.password', "api.auth.type")
+
+        password_policies = {}
+        password_policies[:mode] = required_setting_with_changing_default(settings, 'api.auth.basic.password_policy.mode', "api.auth.type", "ERROR")
+        password_policies[:length] = {}
+        password_policies[:length][:minimum] = required_setting(settings, 'api.auth.basic.password_policy.length.minimum', "api.auth.type")
+        if !password_policies[:length][:minimum].between?(8, 1024)
+          fail(ArgumentError, "api.auth.basic.password_policy.length.minimum has to be between 8 and 1024.")
+        end
+        password_policies[:include] = {}
+        password_policies[:include][:upper] = required_setting(settings, 'api.auth.basic.password_policy.include.upper', "api.auth.type")
+        password_policies[:include][:lower] = required_setting(settings, 'api.auth.basic.password_policy.include.lower', "api.auth.type")
+        password_policies[:include][:digit] = required_setting(settings, 'api.auth.basic.password_policy.include.digit', "api.auth.type")
+        password_policies[:include][:symbol] = required_setting(settings, 'api.auth.basic.password_policy.include.symbol', "api.auth.type")
+
+        auth_basic[:password_policies] = password_policies
+        options[:auth_basic] = auth_basic.freeze
+      else
+        warn_ignored(logger, settings, "api.auth.basic.", "api.auth.type")
+      end
+
+      if !settings.set?('api.http.host')
+        if settings.get('api.ssl.enabled') && settings.get('api.auth.type') == 'basic'
+          logger.info("API configured securely with SSL and Basic Auth. Defaulting `api.http.host` to all available interfaces")
+          options[:http_host] = '0.0.0.0'
+        end
+      end
+
+      logger.debug("Initializing API WebServer",
+                   "api.http.host"        => options[:http_host],
+                   "api.http.port"        => settings.get("api.http.port"),
+                   "api.ssl.enabled"      => settings.get("api.ssl.enabled"),
+                   "api.auth.type"        => settings.get("api.auth.type"),
+                   "api.environment"      => settings.get("api.environment"))
+
+      new(logger, agent, options)
+    end
+
+    # @api internal
+    def self.warn_ignored(logger, settings, pattern, trigger)
+      trigger_value = settings.get(trigger)
+      settings.names.each do |setting_name|
+        next unless setting_name.start_with?(pattern)
+        next if setting_name == trigger
+        next unless settings.set?(setting_name)
+
+        logger.warn("Setting `#{setting_name}` is ignored because `#{trigger}` is set to `#{trigger_value}`")
+      end
+    end
+
+    # @api internal
+    def self.required_setting(settings, setting_name, trigger)
+      settings.get(setting_name) || fail(ArgumentError, "Setting `#{setting_name}` is required when `#{trigger}` is set to `#{settings.get(trigger)}`. Please provide it in your `logstash.yml`")
+    end
+
+    def self.required_setting_with_changing_default(settings, name, trigger, future_value)
+      effective_value = required_setting(settings, name, trigger)
+      if !settings.set?(name)
+        deprecation_logger.deprecated("The default value of `#{name}` will change to `#{future_value}` in a future release of Logstash. Set it to `#{future_value}` to observe the future behavior early, or set it to `#{effective_value}` to lock in the current behavior.")
+      end
+      effective_value
+    end
+
+    ##
+    # @param logger [Logger]
+    # @param agent [Agent]
+    # @param options [Hash{Symbol=>Object}]
+    # @option :http_host [String]
+    # @option :http_ports [Enumerable[Integer]]
+    # @option :http_environment [String]
+    # @option :ssl_params [Hash{Symbol=>Object}]
+    #             :keystore_path [String]
+    #             :keystore_password [LogStash::Util::Password]
+    # @option :auth_basic [Hash{Symbol=>Object}]
+    #             :username [String]
+    #             :password [LogStash::Util::Password]
+    def initialize(logger, agent, options = {})
       @logger = logger
       @agent = agent
       @http_host = options[:http_host] || DEFAULT_HOST
       @http_ports = options[:http_ports] || DEFAULT_PORTS
       @http_environment = options[:http_environment] || DEFAULT_ENVIRONMENT
-      @options = {}
-      @status = nil
+      @ssl_params = options[:ssl_params] if options.include?(:ssl_params)
       @running = Concurrent::AtomicBoolean.new(false)
+      @mutex = Mutex.new
+
+      validate_keystore_access! if @ssl_params
+
+      # wrap any output that puma could generate into a wrapped logger
+      # use the puma namespace to override STDERR, STDOUT in that scope.
+      Puma::STDERR.logger = logger
+      Puma::STDOUT.logger = logger
+
+      app = LogStash::Api::RackApp.app(logger, agent, http_environment)
+
+      if options.include?(:auth_basic)
+        username = options[:auth_basic].fetch(:username)
+        password = options[:auth_basic].fetch(:password)
+        password_policies = options[:auth_basic].fetch(:password_policies)
+        validated_password = Setting::ValidatedPassword.new("api.auth.basic.password", password, password_policies).freeze
+        app = Rack::Auth::Basic.new(app, "logstash-api") { |u, p| u == username && p == validated_password.value.value }
+      end
+
+      @app = app
     end
 
     def run
-      logger.debug("Starting puma")
+      logger.debug("Starting API WebServer (puma)")
 
       stop # Just in case
 
       running!
 
-      http_ports.each_with_index do |port, idx|
-        begin
-          if running?
-            @port = port
-            logger.debug("Trying to start WebServer", :port => @port)
-            start_webserver(@port)
-          else
-            break # we are closing down the server so just get out of the loop
-          end
-        rescue Errno::EADDRINUSE
-          if http_ports.count == 1
-            raise Errno::EADDRINUSE.new(I18n.t("logstash.web_api.cant_bind_to_port", :port => http_ports.first))
-          elsif idx == http_ports.count-1
-            raise Errno::EADDRINUSE.new(I18n.t("logstash.web_api.cant_bind_to_port_in_range", :http_ports => http_ports))
-          end
-        end
-      end
+      server_thread = create_server_thread
+      server_thread.join unless server_thread.nil?  # and block...
+      logger.debug("API WebServer has stopped running")
     end
 
     def running!
@@ -67,37 +181,84 @@ module LogStash
       "#{http_host}:#{@port}"
     end
 
-    def stop(options={})
-      @running.make_false
-      @server.stop(true) if @server
+    def stop(options = {})
+      @mutex.synchronize do
+        @running.make_false
+        @server.stop(true) if @server
+      end
     end
 
-    def start_webserver(port)
-      # wrap any output that puma could generate into a wrapped logger
-      # use the puma namespace to override STDERR, STDOUT in that scope.
-      Puma::STDERR.logger = logger
-      Puma::STDOUT.logger = logger
-
-      io_wrapped_logger = LogStash::IOWrappedLogger.new(logger)
-
-      app = LogStash::Api::RackApp.app(logger, agent, http_environment)
-
-      events = ::Puma::Events.new(io_wrapped_logger, io_wrapped_logger)
-
-      @server = ::Puma::Server.new(app, events)
-      @server.add_tcp_listener(http_host, port)
-
-      logger.info("Successfully started Logstash API endpoint", :port => port)
-
-      set_http_address_metric("#{http_host}:#{port}")
-
-      @server.run.join
+    def ssl_enabled?
+      !!@ssl_params
     end
 
     private
+
+    def _init_server
+      ::Puma::Server.new(@app, nil, log_writer: LogStash::DelegatingLogWriter.new(logger))
+    end
+
+    def create_server_thread
+      server_thread = nil
+      @mutex.synchronize do
+        @server = _init_server
+        http_ports.each_with_index do |candidate_port, idx|
+          begin
+            break unless running?
+            @port = bind_to_port(candidate_port)
+            server_thread = @server.run
+            logger.info("Successfully started Logstash API endpoint", :port => candidate_port, :ssl_enabled => ssl_enabled?)
+            set_http_address_metric("#{http_host}:#{candidate_port}")
+            break
+          rescue Errno::EADDRINUSE
+            if http_ports.count == 1
+              raise Errno::EADDRINUSE.new(I18n.t("logstash.web_api.cant_bind_to_port", :port => http_ports.first))
+            elsif idx == http_ports.count - 1
+              raise Errno::EADDRINUSE.new(I18n.t("logstash.web_api.cant_bind_to_port_in_range", :http_ports => http_ports))
+            end
+          end
+        end
+      end
+      server_thread
+    end
+
+    def bind_to_port(candidate_port)
+      logger.debug("Trying to start API WebServer", :port => candidate_port, :ssl_enabled => ssl_enabled?)
+      if @ssl_params
+        context_builder_params = {
+            'keystore' => @ssl_params.fetch(:keystore_path),
+            'keystore-pass' => @ssl_params.fetch(:keystore_password).value,
+        }
+
+        supported_protocols = @ssl_params.fetch(:supported_protocols, [])
+        context_builder_params['protocols'] = supported_protocols if supported_protocols.any?
+
+        ssl_context = Puma::MiniSSL::ContextBuilder.new(context_builder_params, @server.log_writer).context
+        @server.add_ssl_listener(http_host, candidate_port, ssl_context)
+      else
+        @server.add_tcp_listener(http_host, candidate_port)
+      end
+      candidate_port
+    end
+
     def set_http_address_metric(value)
       return unless @agent.metric
       @agent.metric.gauge([], :http_address, value)
     end
+
+    # Validate access to the provided keystore.
+    # Errors accessing the keystore after binding the webserver to a port are very hard to debug.
+    # @api private
+    def validate_keystore_access!
+      return false unless @ssl_params
+
+      raise("Password not provided!") unless @ssl_params.fetch(:keystore_password).value
+
+      java.security.KeyStore.getInstance("JKS")
+          .load(java.io.FileInputStream.new(@ssl_params.fetch(:keystore_path)),
+                @ssl_params.fetch(:keystore_password).value.chars&.to_java(:char))
+    rescue => e
+      raise ArgumentError.new("API Keystore could not be opened (#{e})")
+    end
   end
 end
diff --git a/logstash-core/lib/logstash/worker_loop_thread.rb b/logstash-core/lib/logstash/worker_loop_thread.rb
new file mode 100644
index 000000000..aa3b6dfcd
--- /dev/null
+++ b/logstash-core/lib/logstash/worker_loop_thread.rb
@@ -0,0 +1,30 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require "thread"
+
+module LogStash
+  class WorkerLoopThread < Thread
+    attr_reader :worker_loop
+
+    def initialize(worker_loop)
+      super
+      @worker_loop = worker_loop
+    end
+
+  end
+end
diff --git a/logstash-core/locales/en.yml b/logstash-core/locales/en.yml
index 7ff23e787..4985edbd2 100644
--- a/logstash-core/locales/en.yml
+++ b/logstash-core/locales/en.yml
@@ -45,41 +45,19 @@ en:
         %{plugin} output plugin: setting 'workers => %{worker_count}' is not
         supported by this plugin. I will continue working as if you had not set
         this setting. Reason: %{message}
+      effective_ecs_compatibility: >-
+        Pipeline `%{pipeline_id}` is configured with `pipeline.ecs_compatibility: %{ecs_compatibility}` setting.
+        All plugins in this pipeline will default to `ecs_compatibility => %{ecs_compatibility}` unless explicitly configured otherwise.
     plugin:
       deprecated_milestone: >-
         %{plugin} plugin is using the 'milestone' method to declare the version
         of the plugin this method is deprecated in favor of declaring the
         version inside the gemspec.
-      version:
-        0-9-x:
-         Using version 0.9.x %{type} plugin '%{name}'. This plugin should work but
-         would benefit from use by folks like you. Please let us know if you
-         find bugs or have suggestions on how to improve this plugin.
-        0-1-x: >-
-         Using version 0.1.x %{type} plugin '%{name}'. This plugin isn't well
-         supported by the community and likely has no maintainer.
-    agent:
-      sighup: >-
-        SIGHUP received.
-      sigint: >-
-        SIGINT received. Shutting down.
-      sigterm: >-
-        SIGTERM received. Shutting down.
-      slow_shutdown: |-
-        Received shutdown signal, but pipeline is still waiting for in-flight events
-        to be processed. Sending another ^C will force quit Logstash, but this may cause
-        data loss.
-      forced_sigint: >-
-        SIGINT received. Terminating immediately..
-      non_reloadable_config_reload: >-
-        Unable to reload configuration because it does not support dynamic reloading
-      non_reloadable_config_register: |-
-        Logstash is not able to start since configuration auto reloading was enabled but the configuration contains plugins that don't support it. Quitting...
     web_api:
       cant_bind_to_port: |-
-        Logstash tried to bind to port %{port}, but the port is already in use. You can specify a new port by launching logstash with the --http.port option."
+        Logstash tried to bind to port %{port}, but the port is already in use. You can specify a new port by launching logstash with the --api.http.port option."
       cant_bind_to_port_in_range: |-
-        Logstash tried to bind to port range %{http_ports}, but all the ports are already in use. You can specify a new port by launching logstash with the --http.port option."
+        Logstash tried to bind to port range %{http_ports}, but all the ports are already in use. You can specify a new port by launching logstash with the --api.http.port option."
       hot_threads:
         title: |-
           ::: {%{hostname}}
@@ -89,37 +67,18 @@ en:
       logging:
         unrecognized_option: |-
           unrecognized option [%{option}]
-    modules:
-      configuration:
-        parse-failed: |-
-          Failed to parse the module configuration: [%{error}]
-        modules-must-be-unique: >-
-          Only a single instance of any module can be run at a time. Duplicate
-          modules: %{duplicate_modules}
-        modules-invalid-name: >-
-          Invalid module name: %{module_name}
-        modules-variables-malformed: >-
-          Failed to parse module variable %{rawvar}.  Must be in -M
-          "MODULE_NAME.KEY.SUBKEY=VALUE" format
-        modules-unavailable: >-
-          The modules specified are not available yet.
-          Specified modules: %{specified_modules}
-          Available modules: %{available_modules}
-        elasticsearch_connection_failed: >-
-          Failed to import module configurations to Elasticsearch and/or Kibana.
-          Module: %{module_name} has Elasticsearch hosts: %{elasticsearch_hosts} and Kibana hosts: %{kibana_hosts}
-        modules-too-many-specified: >-
-          Too many modules specified. Maximum allowed: %{max}, specified: %{specified_modules}
 
     runner:
       short-help: |-
         usage:
           bin/logstash -f CONFIG_PATH [-t] [-r] [] [-w COUNT] [-l LOG]
-          bin/logstash --modules MODULE_NAME [-M "MODULE_NAME.var.PLUGIN_TYPE.PLUGIN_NAME.VARIABLE_NAME=VALUE"] [-t] [-w COUNT] [-l LOG]
           bin/logstash -e CONFIG_STR [-t] [--log.level fatal|error|warn|info|debug|trace] [-w COUNT] [-l LOG]
           bin/logstash -i SHELL [--log.level fatal|error|warn|info|debug|trace]
           bin/logstash -V [--log.level fatal|error|warn|info|debug|trace]
           bin/logstash --help
+      invalid-settings: >-
+        Your settings are invalid.
+        Reason: %{error}
       invalid-configuration: >-
         The given configuration is invalid. Reason: %{error}
       missing-configuration: >-
@@ -127,20 +86,18 @@ en:
         the '-f yourlogstash.conf' flag?
       config-string-path-exclusive:
         Settings 'path.config' (-f) and 'config.string' (-e) can't be used simultaneously.
-      config-module-exclusive: >-
-        Settings 'path.config' (-f) or 'config.string' (-e) can't be used in conjunction with
-        (--modules) or the "modules:" block in the logstash.yml file.
-      reload-with-modules: >-
-        Configuration reloading can't be used with command-line or logstash.yml specified modules.
-      cli-module-override: >-
-        Both command-line and logstash.yml modules configurations detected.
-        Using command-line module configuration to override logstash.yml module configuration.
       config-pipelines-failed-read: >-
         Failed to read pipelines yaml file. Location: %{path}
+      config-pipelines-failed-read-with-exception: >-
+        Failed to read pipelines yaml file. Location: %{path}, Exception: %{exception}
+      config-pipelines-failed-parse-with-exception: >-
+        Failed to parse contents of pipelines yaml file. Location: %{path}, Exception: %{exception}
       config-pipelines-empty: >-
         Pipelines YAML file is empty. Location: %{path}
       config-pipelines-invalid: >-
         Pipelines YAML file must contain an array of pipeline configs. Found "%{invalid_class}" in %{path}
+      config-pipelines-duplicate-ids: >-
+        Pipelines YAML file contains duplicate pipeline ids: #{duplicate_ids}. Location: #{path}
       reload-without-config-path: >-
         Configuration reloading also requires passing a configuration path with '-f yourlogstash.conf'
       reload-with-config-string: >-
@@ -152,7 +109,9 @@ en:
       configtest-flag-information: |-
         You may be interested in the '--configtest' flag which you can use to validate
         logstash's configuration before you choose to restart a running system.
-      configuration:
+      # YAML named reference to the logstash.runner.configuration
+      # so we can later alias it from logstash.agent.configuration
+      configuration: &runner_configuration
         obsolete: >-
           The setting `%{name}` in plugin `%{plugin}` is obsolete and is no
           longer available. %{extra} If you have any questions about this, you
@@ -191,6 +150,8 @@ en:
           Duplicate keys found in your configuration: [%{keys}]
           At line: %{line}, column %{column} (byte %{byte})
           after %{after}
+        invalid_plugin_settings_multiple_codecs: |-
+          The %{type} plugin %{plugin} at line %{line} has multiple `codec` declarations - this is not a valid configuration, only one top-level `codec` per %{type} plugin is supported.
         invalid_plugin_register: >-
           Cannot register %{plugin} %{type} plugin.
           The error reported is:
@@ -228,68 +189,63 @@ en:
           "%{default_output}"
           If you wish to use both defaults, please use
           the empty string for the '-e' flag.
-        field-reference-parser: |+
-          (DEPRECATED) This option is no longer
-          configurable.
+        field-reference-escape-style: |+
+          Use the given STYLE when parsing field
+          references. This allows you to reference fields
+          whose name includes characters that are
+          meaningful in a field reference including square
+          brackets (`[` and `]`).
 
-          Use the given MODE when parsing field
-          references.
+          This feature is in TECHNICAL PREVIEW, and
+          implementations are subject to change.
 
-          The field reference parser is used to expand
-          field references in your pipeline configs,
-          and has become more strict to better handle
-          ambiguous- and illegal-syntax inputs.
-
-          The only available MODE is:
-           - `STRICT`: parse in a strict manner; when
-             given ambiguous- or illegal-syntax input,
-             raises a runtime exception that should
-             be handled by the calling plugin.
-
-        modules: |+
-          Load Logstash modules.
-          Modules can be defined using multiple instances
-          '--modules module1 --modules module2',
-             or comma-separated syntax
-          '--modules=module1,module2'
-          Cannot be used in conjunction with '-e' or '-f'
-          Use of '--modules' will override modules declared
-          in the 'logstash.yml' file.
-        modules_variable: |+
-          Load variables for module template.
-          Multiple instances of '-M' or
-          '--modules.variable' are supported.
-          Ignored if '--modules' flag is not used.
-          Should be in the format of
-          '-M "MODULE_NAME.var.PLUGIN_TYPE.PLUGIN_NAME.VARIABLE_NAME=VALUE"'
-          as in
-          '-M "example.var.filter.mutate.fieldname=fieldvalue"'
-        modules_setup: |+
-          Load index template into Elasticsearch, and saved searches, 
-          index-pattern, visualizations, and dashboards into Kibana when
-          running modules.
-        cloud_id: |+
-          Sets the elasticsearch and kibana host settings for
-          module connections in Elastic Cloud.
-          Your Elastic Cloud User interface or the Cloud support
-          team should provide this.
-          Add an optional label prefix '<label>:' to help you
-          identify multiple cloud.ids.
-          e.g. 'staging:dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRub3RhcmVhbCRpZGVudGlmaWVy'
-        cloud_auth: |+
-          Sets the elasticsearch and kibana username and password
-          for module connections in Elastic Cloud
-          e.g. 'username:<password>'
+          Available escape styles are:
+           - `none`: escape sequences in field references
+             are not processed, which means fields that
+             contain special characters cannot be
+             referenced.
+           - `percent`: characters may be encoded with
+             URI-style percent notation represeting UTF-8
+             bytes (`[` is `%5B`; `]` is `%5D`).
+             Unlike URI-encoding, literal percent characters
+             do not need to be escaped unless followed by a
+             sequence of 2 capital hexadecimal characters.
+           - `ampersand`: characters may be encoded with
+             HTML-style ampersand-hash encoding notation
+             representing decimal unicode codepoints
+             (`[` is `&#91;`; `]` is `&#93;`).
         configtest: |+
           Check configuration for valid syntax and then exit.
-        http_host: Web API binding host
-        http_port: Web API http port
+        api_enabled: |+
+          Can be used to disable the Web API, which is
+          enabled by default.
+        api_http_host: Web API binding host
+        api_http_port: Web API http port
+        enable-local-plugin-development: |+
+          Allow Gemfile to be manipulated directly
+          to facilitate simpler local plugin
+          development.
+          This is an advanced setting, intended
+          only for use by Logstash developers,
+          and should not be used in production.
         pipeline-id: |+
           Sets the ID of the pipeline.
         pipeline-workers: |+
           Sets the number of pipeline workers to run.
-        java-execution: |+
-          Use Java execution engine.
+        pipeline-ordered: |+
+          Preserve events order. Possible values are `auto` (default), `true` and `false`.
+          This setting
+          will only work when also using a single worker for the pipeline.
+          Note that when enabled, it may impact the performance of the filters
+          and ouput processing.
+          The `auto` option will automatically enable ordering if the
+          `pipeline.workers` setting is set to `1`.
+          Use `true` to enable ordering on the pipeline and prevent logstash
+          from starting if there are multiple workers.
+          Use `false` to disable any extra processing necessary for preserving
+          ordering.
+        plugin-classloaders: |+
+          (Beta) Load Java plugins in independent classloaders to isolate their dependencies.
         pipeline-batch-size: |+
           Size of batches the pipeline is to work in.
         pipeline-batch-delay: |+
@@ -345,6 +301,21 @@ en:
           if there are still inflight events in memory.
           By default, logstash will refuse to quit until all
           received events have been pushed to the outputs.
+        ecs_compatibility: |+
+          Sets the pipeline's default value for `ecs_compatibility`,
+          a setting that is available to plugins that implement
+          an ECS Compatibility mode for use with the Elastic Common
+          Schema.
+          Possible values are:
+           - disabled (default)
+           - v1
+           - v8
+          This option allows the early opt-in (or preemptive opt-out)
+          of ECS Compatibility modes in plugins, which is scheduled to
+          be on-by-default in a future major release of Logstash.
+
+          Values other than `disabled` are currently considered BETA,
+          and may produce unintended consequences when upgrading Logstash.
         rubyshell: |+
           Drop to shell instead of running as normal.
           Valid shells are "irb" and "pry"
@@ -358,6 +329,8 @@ en:
         log_format: |+
           Specify if Logstash should write its own logs in JSON form (one
           event per line) or in plain text (using Ruby's Object#inspect)
+        log_format_json_fix_duplicate_message_fields: |+
+          Enable to avoid duplication of message fields in JSON form.
         debug: |+
           Set the log level to debug.
           DEPRECATED: use --log.level=debug instead.
@@ -367,3 +340,56 @@ en:
         quiet: |+
           Set the log level to info.
           DEPRECATED: use --log.level=info instead.
+      java:
+        home: >-
+          The use of JAVA_HOME has been deprecated. Logstash 8.0 and later ignores JAVA_HOME and uses the bundled JDK.
+          Running Logstash with the bundled JDK is recommended.
+          The bundled JDK has been verified to work with each specific version of Logstash, and generally provides best performance and reliability.
+          If you have compelling reasons for using your own JDK (organizational-specific compliance requirements, for example), you can configure LS_JAVA_HOME to use that version instead.
+        version_17_minimum: >-
+          Starting from Logstash 9.0, the minimum required version of Java is Java 17;
+          your Java version from `%{java_home}` does not meet this requirement.
+          Running Logstash with the bundled JDK is recommended.
+          The bundled JDK has been verified to work with each specific version of Logstash, and generally provides best performance and reliability.
+          If you have compelling reasons for using your own JDK (organizational-specific compliance requirements, for example), the version you supply with LS_JAVA_HOME must meet the minimum requirements.
+    agent:
+      sighup: >-
+        SIGHUP received.
+      sigint: >-
+        SIGINT received. Shutting down.
+      sigterm: >-
+        SIGTERM received. Shutting down.
+      slow_shutdown: |-
+        Received shutdown signal, but pipeline is still waiting for in-flight events
+        to be processed. Sending another ^C will force quit Logstash, but this may cause
+        data loss.
+      forced_sigint: >-
+        SIGINT received. Terminating immediately..
+      non_reloadable_config_reload: >-
+        Unable to reload configuration because it does not support dynamic reloading
+      non_reloadable_config_register: |-
+        Logstash is not able to start since configuration auto reloading was enabled but the configuration contains plugins that don't support it. Quitting...
+      # LEGACY: many plugins refer to logstash.agent.configuration.*
+      # so we alias the canonical logstash.runner.configuration.*
+      configuration:
+        <<: *runner_configuration
+    settings:
+      deprecation:
+        set: >-
+          The setting `%{deprecated_alias}` is a deprecated alias for `%{canonical_name}`
+          %{obsoleted_sentences} Please use `%{canonical_name}` instead
+        obsoleted_future: >-
+          and will be removed in a future release of Logstash.
+        obsoleted_version: >-
+          and will be removed in version %{obsoleted_version}.
+        queried: >-
+          The value of setting `%{canonical_name}` has been queried by its deprecated alias `%{deprecated_alias}`.
+          Code should be updated to query `%{canonical_name}` instead
+        ambiguous: >-
+          Both `%{canonical_name}` and its deprecated alias `%{deprecated_alias}` have been set.
+          Please only set `%{canonical_name}`
+      technical_preview:
+        set: >-
+          The setting `%{canonical_name}` is in TECHNICAL PREVIEW and its implementation
+          is subject to change in a future release of Logstash
+
diff --git a/logstash-core/logstash-core.gemspec b/logstash-core/logstash-core.gemspec
index c2603b4f4..43b425897 100644
--- a/logstash-core/logstash-core.gemspec
+++ b/logstash-core/logstash-core.gemspec
@@ -17,7 +17,13 @@ if File.exist?(project_versions_yaml_path)
   # we ignore the copy in git and we overwrite an existing file
   # each time we build the logstash-core gem
   original_lines = IO.readlines(project_versions_yaml_path)
-  original_lines << ""
+  # introduce the version qualifier (e.g. beta1, rc1) into the copied yml so it's displayed by Logstash
+  unless ENV['VERSION_QUALIFIER'].to_s.strip.empty?
+    logstash_version_line = original_lines.find {|line| line.match(/^logstash:/) }
+    logstash_version_line.chomp!
+    logstash_version_line << "-#{ENV['VERSION_QUALIFIER']}\n"
+  end
+  original_lines << "\n"
   original_lines << "# This is a copy the project level versions.yml into this gem's root and it is created when the gemspec is evaluated."
   gem_versions_yaml_path = File.expand_path("./versions-gem-copy.yml", File.dirname(__FILE__))
   File.open(gem_versions_yaml_path, 'w') do |new_file|
@@ -33,7 +39,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["info@elastic.co"]
   gem.description   = %q{The core components of logstash, the scalable log and event management tool}
   gem.summary       = %q{logstash-core - The core components of logstash}
-  gem.homepage      = "http://www.elastic.co/guide/en/logstash/current/index.html"
+  gem.homepage      = "https://www.elastic.co/logstash"
   gem.license       = "Apache-2.0"
 
   gem.files         = Dir.glob(
@@ -49,27 +55,42 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency "pry", "~> 0.12"  #(Ruby license)
   gem.add_runtime_dependency "stud", "~> 0.0.19" #(Apache 2.0 license)
-  gem.add_runtime_dependency "clamp", "~> 0.6" #(MIT license) for command line args/flags
+  gem.add_runtime_dependency "clamp", "~> 1" #(MIT license) for command line args/flags
   gem.add_runtime_dependency "filesize", "~> 0.2" #(MIT license) for :bytes config validator
   gem.add_runtime_dependency "gems", "~> 1"  #(MIT license)
-  gem.add_runtime_dependency "concurrent-ruby", "~> 1"
-  gem.add_runtime_dependency "rack", '~> 1', '>= 1.6.11'
-  gem.add_runtime_dependency "sinatra", '~> 1', '>= 1.4.6'
-  gem.add_runtime_dependency 'puma', '~> 2'
-  gem.add_runtime_dependency "jruby-openssl", "~> 0.10" # >= 0.9.13 Required to support TLSv1.2
-  gem.add_runtime_dependency "chronic_duration", "~> 0.10"
+  gem.add_runtime_dependency "concurrent-ruby", "~> 1", "< 1.1.10" # pinned until https://github.com/elastic/logstash/issues/13956
+  gem.add_runtime_dependency "rack", '~> 3'
+  gem.add_runtime_dependency "sinatra", '~> 4'
+  gem.add_runtime_dependency 'puma', '~> 6.3', '>= 6.4.2'
+  gem.add_runtime_dependency 'ruby-maven-libs', '~> 3', '>= 3.8.9'
+  gem.add_runtime_dependency "jar-dependencies",'= 0.4.1' # Pin to `0.4.1` until https://github.com/jruby/jruby/issues/7262 is resolved
 
   gem.add_runtime_dependency "treetop", "~> 1" #(MIT license)
 
   gem.add_runtime_dependency "i18n", "~> 1" #(MIT license)
 
+  gem.add_runtime_dependency "thwait"
+
   # filetools and rakelib
-  gem.add_runtime_dependency "minitar", "~> 0.8"
+  gem.add_runtime_dependency "minitar", "~> 1"
   gem.add_runtime_dependency "rubyzip", "~> 1"
   gem.add_runtime_dependency "thread_safe", "~> 0.3.6" #(Apache 2.0 license)
 
   gem.add_runtime_dependency "jrjackson", "= #{ALL_VERSIONS.fetch('jrjackson')}" #(Apache 2.0 license)
 
-  gem.add_runtime_dependency "elasticsearch", "~> 5"
+  gem.add_runtime_dependency "elasticsearch", '~> 8'
   gem.add_runtime_dependency "manticore", '~> 0.6'
+
+  # xpack geoip database service
+  gem.add_development_dependency 'logstash-filter-geoip', '>= 7.2.1' # breaking change of DatabaseManager
+  gem.add_dependency 'down', '~> 5.2.0' #(MIT license)
+  gem.add_dependency 'tzinfo-data' #(MIT license)
+
+  # NOTE: plugins now avoid using **rufus-scheduler** directly, if logstash-core would find itself in a need
+  # to use rufus than preferably the **logstash-mixin-scheduler** should be changed to work with non-plugins.
+  #
+  # Using the scheduler directly might lead to issues e.g. when join-ing, see:
+  # https://github.com/logstash-plugins/logstash-mixin-scheduler/blob/v1.0.1/lib/logstash/plugin_mixins/scheduler/rufus_impl.rb#L85=
+  # and https://github.com/elastic/logstash/issues/13773
+
 end
diff --git a/logstash-core/spec/conditionals_spec.rb b/logstash-core/spec/conditionals_spec.rb
index 93473e42f..9bb1c5445 100644
--- a/logstash-core/spec/conditionals_spec.rb
+++ b/logstash-core/spec/conditionals_spec.rb
@@ -1,9 +1,24 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'spec_helper'
 require 'support/pipeline/pipeline_helpers'
 
 module ConditionalFanciness
-  include PipelineHelpers
   def description
     return self.metadata[:description]
   end
@@ -32,37 +47,65 @@ describe "conditionals in output" do
 
     def register
     end
+
     def multi_receive(events)
     end
   end
 
-  before do
-    LogStash::PLUGIN_REGISTRY.add(:output, "dummynull", DummyNullOutput)
-  end
-
   describe "simple" do
-    config <<-CONFIG
-      input {
-        generator {
-          message => '{"foo":{"bar"},"baz": "quux"}'
-          count => 1
-        }
+    let(:config) do <<-CONFIG
+    input {
+      generator {
+        message => '{"foo":{"bar"},"baz": "quux"}'
+        count => 1
       }
-      output {
-        if [foo] == "bar" {
-          dummynull { }
-        }
+    }
+    output {
+      if [foo] == "bar" {
+        dummynull { }
       }
+    }
     CONFIG
+    end
 
-    agent do
+    let(:pipeline) do
+      settings = ::LogStash::SETTINGS.clone
+      config_part = org.logstash.common.SourceWithMetadata.new("config_string", "config_string", config)
+      pipeline_config = LogStash::Config::PipelineConfig.new(LogStash::Config::Source::Local, :main, config_part, settings)
+      LogStash::JavaPipeline.new(pipeline_config)
+    end
+
+    before do
+      LogStash::PLUGIN_REGISTRY.add(:output, "dummynull", DummyNullOutput)
+    end
+
+    after do
+      pipeline.close
+    end
+
+    it "should not fail in pipeline run" do
       #LOGSTASH-2288, should not fail raising an exception
+      pipeline.run
     end
   end
 end
 
 describe "conditionals in filter" do
   extend ConditionalFanciness
+  extend PipelineHelpers
+
+  let(:settings) do
+    # settings is used by sample_one.
+    # This was originally set directly in sample_one and
+    # pipeline.workers was also set to 1. I am preserving
+    # this setting here for the sake of minimizing change
+    # but unsure if this is actually required.
+
+    LogStash::SETTINGS.clone.tap do |s|
+      s.set_value("pipeline.workers", 1)
+      s.set_value("pipeline.ordered", true)
+    end
+  end
 
   describe "simple" do
     config <<-CONFIG
@@ -155,7 +198,7 @@ describe "conditionals in filter" do
     CONFIG
 
     sample_one("foo" => 123, "bar" => 123) do
-      expect(subject.get("tags") ).to include("woot")
+      expect(subject.get("tags")).to include("woot")
     end
   end
 
@@ -205,7 +248,7 @@ describe "conditionals in filter" do
       }
     CONFIG
 
-    sample_one("foo" => "foo", "somelist" => [ "one", "two" ], "foobar" => "foobar", "greeting" => "hello world", "tags" => [ "fancypantsy" ]) do
+    sample_one("foo" => "foo", "somelist" => ["one", "two"], "foobar" => "foobar", "greeting" => "hello world", "tags" => ["fancypantsy"]) do
       # verify the original exists
       expect(subject.get("tags")).to include("fancypantsy")
 
@@ -220,8 +263,8 @@ describe "conditionals in filter" do
 
   describe "operators" do
     conditional "[message] == 'sample'" do
-      sample_one("sample") { expect(subject.get("tags") ).to include("success") }
-      sample_one("different") { expect(subject.get("tags") ).to include("failure") }
+      sample_one("sample") { expect(subject.get("tags")).to include("success") }
+      sample_one("different") { expect(subject.get("tags")).to include("failure") }
     end
 
     conditional "'sample' == [message]" do
@@ -238,30 +281,30 @@ describe "conditionals in filter" do
     end
 
     conditional "[message] != 'sample'" do
-      sample_one("sample") { expect(subject.get("tags") ).to include("failure") }
-      sample_one("different") { expect(subject.get("tags") ).to include("success") }
+      sample_one("sample") { expect(subject.get("tags")).to include("failure") }
+      sample_one("different") { expect(subject.get("tags")).to include("success") }
     end
 
     conditional "[message] < 'sample'" do
-      sample_one("apple") { expect(subject.get("tags") ).to include("success") }
-      sample_one("zebra") { expect(subject.get("tags") ).to include("failure") }
+      sample_one("apple") { expect(subject.get("tags")).to include("success") }
+      sample_one("zebra") { expect(subject.get("tags")).to include("failure") }
     end
 
     conditional "[message] > 'sample'" do
-      sample_one("zebra") { expect(subject.get("tags") ).to include("success") }
-      sample_one("apple") { expect(subject.get("tags") ).to include("failure") }
+      sample_one("zebra") { expect(subject.get("tags")).to include("success") }
+      sample_one("apple") { expect(subject.get("tags")).to include("failure") }
     end
 
     conditional "[message] <= 'sample'" do
-      sample_one("apple") { expect(subject.get("tags") ).to include("success") }
-      sample_one("zebra") { expect(subject.get("tags") ).to include("failure") }
-      sample_one("sample") { expect(subject.get("tags") ).to include("success") }
+      sample_one("apple") { expect(subject.get("tags")).to include("success") }
+      sample_one("zebra") { expect(subject.get("tags")).to include("failure") }
+      sample_one("sample") { expect(subject.get("tags")).to include("success") }
     end
 
     conditional "[message] >= 'sample'" do
-      sample_one("zebra") { expect(subject.get("tags") ).to include("success") }
-      sample_one("sample") { expect(subject.get("tags") ).to include("success") }
-      sample_one("apple") { expect(subject.get("tags") ).to include("failure") }
+      sample_one("zebra") { expect(subject.get("tags")).to include("success") }
+      sample_one("sample") { expect(subject.get("tags")).to include("success") }
+      sample_one("apple") { expect(subject.get("tags")).to include("failure") }
     end
 
     conditional "[message] == 5" do
@@ -314,9 +357,9 @@ describe "conditionals in filter" do
     end
 
     conditional "[message] =~ /sample/" do
-      sample_one("apple") { expect(subject.get("tags") ).to include("failure") }
-      sample_one("sample") { expect(subject.get("tags") ).to include("success") }
-      sample_one("some sample") { expect(subject.get("tags") ).to include("success") }
+      sample_one("apple") { expect(subject.get("tags")).to include("failure") }
+      sample_one("sample") { expect(subject.get("tags")).to include("success") }
+      sample_one("some sample") { expect(subject.get("tags")).to include("success") }
     end
 
     conditional "[message] !~ /sample/" do
@@ -324,7 +367,6 @@ describe "conditionals in filter" do
       sample_one("sample") { expect(subject.get("tags")).to include("failure") }
       sample_one("some sample") { expect(subject.get("tags")).to include("failure") }
     end
-
   end
 
   describe "negated expressions" do
@@ -371,7 +413,6 @@ describe "conditionals in filter" do
       sample_one("sample") { expect(subject.get("tags")).not_to include("failure") }
       sample_one("some sample") { expect(subject.get("tags")).not_to include("failure") }
     end
-
   end
 
   describe "value as an expression" do
@@ -477,6 +518,7 @@ describe "conditionals in filter" do
       filter {
         if [type] == "original" {
           clone {
+            ecs_compatibility => disabled # rely on legacy clone plugin behaviour
             clones => ["clone"]
           }
         }
@@ -507,6 +549,7 @@ describe "conditionals in filter" do
       filter {
         if [type] == "original" {
           clone {
+            ecs_compatibility => disabled # rely on legacy clone plugin behaviour
             clones => ["clone1", "clone2"]
           }
         }
@@ -539,28 +582,28 @@ describe "conditionals in filter" do
       filter {
         if ("foo" in [tags]) {
           mutate { id => addbar add_tag => bar }
-      
+
           if ("bar" in [tags]) {
             mutate { id => addbaz  add_tag => baz }
           }
-      
+
           if ("baz" in [tags]) {
             mutate { id => addbot add_tag => bot }
-      
+
             if ("bot" in [tags]) {
               mutate { id => addbonk add_tag => bonk }
             }
           }
         }
-      
+
         if ("bot" in [tags]) {
           mutate { id => addwat add_tag => wat }
         }
-      
+
         mutate { id => addprev add_tag => prev }
-      
+
         mutate { id => addfinal add_tag => final }
-      
+
       }
     CONFIG
 
diff --git a/logstash-core/spec/logstash/acked_queue_concurrent_stress_spec.rb b/logstash-core/spec/logstash/acked_queue_concurrent_stress_spec.rb
index 06435f1f3..f5335f974 100644
--- a/logstash-core/spec/logstash/acked_queue_concurrent_stress_spec.rb
+++ b/logstash-core/spec/logstash/acked_queue_concurrent_stress_spec.rb
@@ -1,5 +1,20 @@
-# encoding: utf-8
-require "logstash/event"
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/instrument/namespaced_metric"
 
 describe LogStash::WrappedAckedQueue, :stress_test => true do
@@ -99,7 +114,7 @@ describe LogStash::WrappedAckedQueue, :stress_test => true do
         sleep 0.1
         expect { queue.close }.not_to raise_error
         sleep 0.1
-        files = Dir.glob(path + '/*').map{|f| f.sub("#{path}/", '')}
+        files = Dir.glob(path + '/*').map {|f| f.sub("#{path}/", '')}
         if files.count != 2
           output_strings << "File count after close mismatch expected: 2 got: #{files.count}"
           output_strings.concat files
@@ -108,7 +123,7 @@ describe LogStash::WrappedAckedQueue, :stress_test => true do
         queue.close
 
         if output_strings.any?
-          output_strings << __memoized.reject{|k,v| reject_memo_keys.include?(k)}.inspect
+          output_strings << __memoized.reject {|k, v| reject_memo_keys.include?(k)}.inspect
         end
 
         expect(output_strings).to eq([])
diff --git a/logstash-core/spec/logstash/agent/converge_spec.rb b/logstash-core/spec/logstash/agent/converge_spec.rb
index 0e0f8941f..d1ba2f587 100644
--- a/logstash-core/spec/logstash/agent/converge_spec.rb
+++ b/logstash-core/spec/logstash/agent/converge_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/agent"
 require_relative "../../support/helpers"
 require_relative "../../support/matchers"
@@ -48,11 +64,9 @@ describe LogStash::Agent do
     end
 
     context "system pipeline" do
-      
       let(:system_pipeline_config) { mock_pipeline_config(:system_pipeline, "input { dummyblockinginput { } } output { null {} }", { "pipeline.system" => true }) }
 
       context "when we have a finite pipeline and a system pipeline running" do
-
         let(:finite_pipeline_config) { mock_pipeline_config(:main, "input { generator { count => 1000 } } output { null {} }") }
 
         let(:source_loader) do
@@ -175,7 +189,9 @@ describe LogStash::Agent do
           end
 
           it "it will keep trying to converge" do
-            sleep(agent_settings.get("config.reload.interval") / 1_000_000_000.0 * 20) # let the interval reload a few times
+            # we can't do .to_seconds here as values under 1 seconds are rounded to 0
+            # causing a race condition in the test. So we get the nanos and convert to seconds
+            sleep(agent_settings.get("config.reload.interval").to_nanos * 1e-9 * 20) # let the interval reload a few times
             expect(subject.pipelines_count).to eq(0)
             expect(source_loader.fetch_count).to be > 1
           end
@@ -271,7 +287,7 @@ describe LogStash::Agent do
           expect(subject.converge_state_and_update).to be_a_successful_converge
         }.not_to change { subject.running_pipelines_count }
         expect(subject).to have_running_pipeline?(modified_pipeline_config)
-        expect(subject).not_to have_pipeline?(pipeline_config)
+        expect(subject).to have_stopped_pipeline?(pipeline_config)
       end
     end
 
diff --git a/logstash-core/spec/logstash/agent/metrics_spec.rb b/logstash-core/spec/logstash/agent/metrics_spec.rb
index cdf33ef74..fb96df93f 100644
--- a/logstash-core/spec/logstash/agent/metrics_spec.rb
+++ b/logstash-core/spec/logstash/agent/metrics_spec.rb
@@ -1,5 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/agent"
 require_relative "../../support/helpers"
 require_relative "../../support/matchers"
@@ -58,6 +73,14 @@ describe LogStash::Agent do
       expect(mval(:stats, :reloads, :successes)).to eq(0)
       expect(mval(:stats, :reloads, :failures)).to eq(0)
     end
+
+    it "makes the top-level flow metrics available" do
+      expect(mval(:stats, :flow, :input_throughput)).to be_a_kind_of(java.util.Map)
+      expect(mval(:stats, :flow, :output_throughput)).to be_a_kind_of(java.util.Map)
+      expect(mval(:stats, :flow, :filter_throughput)).to be_a_kind_of(java.util.Map)
+      expect(mval(:stats, :flow, :queue_backpressure)).to be_a_kind_of(java.util.Map)
+      expect(mval(:stats, :flow, :worker_concurrency)).to be_a_kind_of(java.util.Map)
+    end
   end
 
   context "when we try to start one pipeline" do
@@ -170,7 +193,7 @@ describe LogStash::Agent do
         end
 
         it "increment the pipeline successes" do
-          expect{ subject.converge_state_and_update }.to change { mval(:stats, :pipelines, pipeline_name, :reloads, :successes) }.by(1)
+          expect { subject.converge_state_and_update }.to change { mval(:stats, :pipelines, pipeline_name, :reloads, :successes) }.by(1)
         end
 
         it "record the `last_success_timestamp`" do
@@ -190,7 +213,7 @@ describe LogStash::Agent do
         end
 
         it "increment the pipeline failures" do
-          expect{ subject.converge_state_and_update }.to change { mval(:stats, :pipelines, pipeline_name, :reloads, :failures) }.by(1)
+          expect { subject.converge_state_and_update }.to change { mval(:stats, :pipelines, pipeline_name, :reloads, :failures) }.by(1)
         end
       end
     end
@@ -229,15 +252,17 @@ describe LogStash::Agent do
         # since the pipeline is async, it can actually take some time to have metrics recordings
         # so we try a few times
         try(20) do
-          expect { mhash(:stats, :pipelines, :main, :events) }.not_to raise_error , "Events pipeline stats should exist"
+          expect { mhash(:stats, :pipelines, :main, :events) }.not_to raise_error, "Events pipeline stats should exist"
+          expect { mhash(:stats, :pipelines, :main, :flow) }.not_to raise_error, "Events pipeline stats should exist"
           expect { mhash(:stats, :pipelines, :main, :plugins) }.not_to raise_error, "Plugins pipeline stats should exist"
         end
 
         expect(subject.converge_state_and_update.success?).to be_truthy
 
         # We do have to retry here, since stopping a pipeline is a blocking operation
-        expect { mhash(:stats, :pipelines, :main, :plugins) }.to raise_error
-        expect { mhash(:stats, :pipelines, :main, :events) }.to raise_error
+        expect { mhash(:stats, :pipelines, :main, :plugins) }.to raise_error LogStash::Instrument::MetricStore::MetricNotFound
+        expect { mhash(:stats, :pipelines, :main, :flow) }.to raise_error LogStash::Instrument::MetricStore::MetricNotFound
+        expect { mhash(:stats, :pipelines, :main, :events) }.to raise_error LogStash::Instrument::MetricStore::MetricNotFound
       end
     end
   end
diff --git a/logstash-core/spec/logstash/agent_spec.rb b/logstash-core/spec/logstash/agent_spec.rb
index 9af834913..55359d261 100644
--- a/logstash-core/spec/logstash/agent_spec.rb
+++ b/logstash-core/spec/logstash/agent_spec.rb
@@ -1,8 +1,23 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "stud/temporary"
 require "logstash/inputs/generator"
-require "logstash/config/pipeline_config"
 require "logstash/config/source/local"
 require_relative "../support/mocks_classes"
 require "fileutils"
@@ -13,9 +28,7 @@ require 'timeout'
 java_import org.logstash.Timestamp
 
 describe LogStash::Agent do
-
   shared_examples "all Agent tests" do
-
     let(:agent_settings) { mock_settings({}) }
     let(:agent_args) { {} }
     let(:pipeline_settings) { agent_settings.clone }
@@ -50,6 +63,8 @@ describe LogStash::Agent do
       allow(described_class).to receive(:logger).and_return(logger)
       [:debug, :info, :error, :fatal, :trace].each {|level| allow(logger).to receive(level) }
       [:debug?, :info?, :error?, :fatal?, :trace?].each {|level| allow(logger).to receive(level) }
+
+      allow(LogStash::WebServer).to receive(:from_settings).with(any_args).and_return(double("WebServer").as_null_object)
     end
 
     after :each do
@@ -69,7 +84,7 @@ describe LogStash::Agent do
 
       it "should delegate settings to new pipeline" do
         expect(LogStash::JavaPipeline).to receive(:new) do |arg1, arg2|
-          expect(arg1).to eq(config_string)
+          expect(arg1.to_s).to eq(config_string)
           expect(arg2.to_hash).to include(agent_args)
         end
         subject.converge_state_and_update
@@ -159,7 +174,7 @@ describe LogStash::Agent do
 
             let(:source_loader) { TestSequenceSourceLoader.new(mock_config_pipeline, mock_second_pipeline_config)}
 
-            it "does upgrade the new config" do
+            it "updates to the new config without stopping logstash" do
               t = Thread.new { subject.execute }
               Timeout.timeout(timeout) do
                 sleep(0.1) until subject.running_pipelines_count > 0 && subject.running_pipelines.values.first.ready?
@@ -168,12 +183,15 @@ describe LogStash::Agent do
               expect(subject.converge_state_and_update).to be_a_successful_converge
               expect(subject).to have_running_pipeline?(mock_second_pipeline_config)
 
+              # Previously `transition_to_stopped` would be called - the loading pipeline would
+              # not be detected in the `while !Stud.stop?` loop in agent#execute, and the method would
+              # exit prematurely
+              joined = t.join(1)
+              expect(joined).to be(nil)
               Stud.stop!(t)
               t.join
-              subject.shutdown
             end
           end
-
         end
         context "when calling reload_state!" do
           context "with a pipeline with auto reloading turned off" do
@@ -263,6 +281,12 @@ describe LogStash::Agent do
           expect(json_document["message"]).to eq("foo-bar")
         end
       end
+
+      context "referenced environment variable does not exist" do
+        it "does not converge the pipeline" do
+          expect(subject.converge_state_and_update).not_to be_a_successful_converge
+        end
+      end
     end
 
     describe "#upgrade_pipeline" do
@@ -287,6 +311,15 @@ describe LogStash::Agent do
         subject.shutdown
       end
 
+      context "when the upgrade contains a bad environment variable" do
+        let(:new_pipeline_config) { "input { generator {} } filter { if '${NOEXIST}' { mutate { add_tag => 'x' } } } output { }" }
+
+        it "leaves the state untouched" do
+          expect(subject.converge_state_and_update).not_to be_a_successful_converge
+          expect(subject.get_pipeline(default_pipeline_id).config_str).to eq(pipeline_config)
+        end
+      end
+
       context "when the upgrade fails" do
         it "leaves the state untouched" do
           expect(subject.converge_state_and_update).not_to be_a_successful_converge
@@ -318,6 +351,31 @@ describe LogStash::Agent do
       end
     end
 
+    describe "#stop_pipeline" do
+      let(:config_string) { "input { generator { id => 'old'} } output { }" }
+      let(:mock_config_pipeline) { mock_pipeline_config(:main, config_string, pipeline_settings) }
+      let(:source_loader) { TestSourceLoader.new(mock_config_pipeline) }
+      subject { described_class.new(agent_settings, source_loader) }
+
+      before(:each) do
+        expect(subject.converge_state_and_update).to be_a_successful_converge
+        expect(subject.get_pipeline('main').running?).to be_truthy
+      end
+
+      after(:each) do
+        subject.shutdown
+      end
+
+      context "when agent stops the pipeline" do
+        it "should stop successfully", :aggregate_failures do
+          converge_result = subject.stop_pipeline('main')
+
+          expect(converge_result).to be_a_successful_converge
+          expect(subject.get_pipeline('main').stopped?).to be_truthy
+        end
+      end
+    end
+
     context "#started_at" do
       it "return the start time when the agent is started" do
         expect(described_class::STARTED_AT).to be_kind_of(Time)
@@ -331,12 +389,11 @@ describe LogStash::Agent do
     end
 
     context "metrics after config reloading" do
-
       let(:initial_generator_threshold) { 1000 }
       let(:original_config_output) { Stud::Temporary.pathname }
       let(:new_config_output) { Stud::Temporary.pathname }
 
-      let(:config_file_txt) { "input { generator { count => #{initial_generator_threshold*2} } } output { file { path => '#{original_config_output}'} }" }
+      let(:config_file_txt) { "input { generator { count => #{initial_generator_threshold * 2} } } output { file { path => '#{original_config_output}'} }" }
 
       let(:agent_args) do
         {
@@ -395,7 +452,7 @@ describe LogStash::Agent do
 
           # wait for file existence otherwise it will raise exception on Windows
           wait(timeout)
-            .for { ::File.exists?(new_config_output) && !::File.read(new_config_output).chomp.empty? }
+            .for { ::File.exist?(new_config_output) && !::File.read(new_config_output).chomp.empty? }
             .to eq(true)
           # ensure the converge_state_and_update method has updated metrics by
           # invoking the mutex
@@ -414,6 +471,28 @@ describe LogStash::Agent do
           expect(value).to be > initial_generator_threshold
         end
 
+        it "does not reset the global flow metrics" do
+          snapshot = subject.metric.collector.snapshot_metric
+          subject.capture_flow_metrics
+
+          flow_metrics = snapshot.metric_store.get_with_path("/stats/flow")[:stats][:flow]
+
+          input_throughput_current = flow_metrics[:input_throughput].value.get("current")
+          input_throughput_lifetime = flow_metrics[:input_throughput].value.get("lifetime")
+          filter_throughput_current = flow_metrics[:filter_throughput].value.get("current")
+          filter_throughput_lifetime = flow_metrics[:filter_throughput].value.get("lifetime")
+          worker_concurrency_current = flow_metrics[:worker_concurrency].value.get("current")
+          worker_concurrency_lifetime = flow_metrics[:worker_concurrency].value.get("lifetime")
+
+          # rates depend on [events/wall-clock time], the expectation is non-zero values
+          expect(input_throughput_current).to be > 0
+          expect(input_throughput_lifetime).to be > 0
+          expect(filter_throughput_current).to be > 0
+          expect(filter_throughput_lifetime).to be > 0
+          expect(worker_concurrency_current).to be > 0
+          expect(worker_concurrency_lifetime).to be > 0
+        end
+
         it "increases the successful reload count" do
           skip("This test fails randomly, tracked in https://github.com/elastic/logstash/issues/8005")
           snapshot = subject.metric.collector.snapshot_metric
@@ -530,7 +609,8 @@ describe LogStash::Agent do
 
   describe "using persisted queue" do
     it_behaves_like "all Agent tests" do
-      let(:agent_settings) { mock_settings("queue.type" => "persisted", "queue.drain" => true) }
+      let(:agent_settings) { mock_settings("queue.type" => "persisted", "queue.drain" => true,
+                                           "queue.page_capacity" => "8mb", "queue.max_bytes" => "64mb") }
     end
   end
 end
diff --git a/logstash-core/spec/logstash/api/commands/default_metadata_spec.rb b/logstash-core/spec/logstash/api/commands/default_metadata_spec.rb
new file mode 100644
index 000000000..165855b53
--- /dev/null
+++ b/logstash-core/spec/logstash/api/commands/default_metadata_spec.rb
@@ -0,0 +1,100 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require "spec_helper"
+
+describe LogStash::Api::Commands::DefaultMetadata do
+  include_context "api setup"
+
+  def registerIfNot(setting)
+    LogStash::SETTINGS.register(setting) unless LogStash::SETTINGS.registered?(setting.name)
+  end
+
+  let(:report_method) { :all }
+  subject(:report) do
+    factory = ::LogStash::Api::CommandFactory.new(LogStash::Api::Service.new(@agent))
+    factory.build(:default_metadata).send(report_method)
+  end
+
+  let(:report_class) { described_class }
+
+  before :all do
+    registerIfNot(LogStash::Setting::Boolean.new("xpack.monitoring.enabled", false))
+    registerIfNot(LogStash::Setting::ArrayCoercible.new("xpack.monitoring.elasticsearch.hosts", String, ["http://localhost:9200"]))
+    registerIfNot(LogStash::Setting::SettingNullableString.new("xpack.monitoring.elasticsearch.username", "logstash_TEST system"))
+    registerIfNot(LogStash::Setting::SettingNullableString.new("xpack.monitoring.elasticsearch.username", "logstash_TEST system"))
+  end
+
+  after :each do
+    LogStash::SETTINGS.set_value("xpack.monitoring.enabled", false)
+  end
+
+  describe "#plugins_stats_report" do
+    let(:report_method) { :all }
+
+    # Enforce just the structure
+    it "check monitoring exist when cluster_uuid has been defined" do
+      LogStash::SETTINGS.set_value("monitoring.cluster_uuid", "cracking_cluster")
+      expect(report.keys).to include(
+        :monitoring
+        )
+    end
+
+    it "check monitoring section exist when legacy monitoring is enabled and allowed" do
+      LogStash::SETTINGS.set_value("xpack.monitoring.allow_legacy_collection", true)
+      LogStash::SETTINGS.set_value("xpack.monitoring.enabled", true)
+      expect(report.keys).to include(
+        :monitoring
+        )
+    end
+
+    it "check monitoring section does not appear when legacy monitoring is not allowed but enabled" do
+      LogStash::SETTINGS.set_value("xpack.monitoring.allow_legacy_collection", false)
+      LogStash::SETTINGS.set_value("xpack.monitoring.enabled", true)
+      expect(report.keys).not_to include(
+                               :monitoring
+                             )
+    end
+
+    it "check monitoring does not appear when not enabled and nor cluster_uuid is defined" do
+      LogStash::SETTINGS.set_value("xpack.monitoring.enabled", false)
+      LogStash::SETTINGS.get_setting("monitoring.cluster_uuid").reset
+      expect(report.keys).not_to include(
+        :monitoring
+        )
+    end
+
+    it "check keys" do
+      expect(report.keys).to include(
+        :host,
+        :version,
+        :http_address,
+        :id,
+        :name,
+        :ephemeral_id,
+        :status,
+        :snapshot,
+        :pipeline
+      )
+      expect(report[:pipeline].keys).to include(
+        :workers,
+        :batch_size,
+        :batch_delay,
+      )
+    end
+  end
+end
diff --git a/logstash-core/spec/logstash/api/commands/node_spec.rb b/logstash-core/spec/logstash/api/commands/node_spec.rb
new file mode 100644
index 000000000..d5e1c6ef6
--- /dev/null
+++ b/logstash-core/spec/logstash/api/commands/node_spec.rb
@@ -0,0 +1,162 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require "spec_helper"
+
+describe LogStash::Api::Commands::Node do
+  include_context "api setup"
+
+  let(:report_method) { :all }
+  let(:pipeline_id) { nil }
+  let(:opts) { {} }
+  let(:mocked_vertex) {{:config_name => "elasticsearch",
+                       :plugin_type => "output",
+                       :meta => {
+                         :source => {
+                           :protocol => "str",
+                           :id => "pipeline",
+                           :line => 1,
+                           :column => 64
+                         }
+                       },
+                       :id => "2d2270426a2e8d7976b972b6a5318624331fa0d39fa3f903d2f3490e58a7d25a",
+                       :explicit_id => false,
+                       :type => "plugin"}
+                  }
+  let(:api_service) { LogStash::Api::Service.new(@agent) }
+  subject(:report) do
+    factory = ::LogStash::Api::CommandFactory.new(api_service)
+    if report_method == :pipelines
+      factory.build(:node).send(report_method, opts)
+    elsif report_method == :pipeline
+      factory.build(:node).send(report_method, pipeline_id, opts)
+    elsif report_method == :decorate_with_cluster_uuids
+      factory.build(:node).send(report_method, mocked_vertex)
+    else
+      factory.build(:node).send(report_method)
+    end
+  end
+
+  let(:report_class) { described_class }
+
+  describe "#all" do
+    let(:report_method) { :all }
+    # Enforce just the structure
+    it "check keys" do
+      expect(report.keys).to include(
+        :pipelines,
+        :os,
+        :jvm
+      )
+    end
+  end
+
+  describe "#pipelines" do
+    let(:report_method) { :pipelines }
+    it "contains the running pipelines" do
+      expect(report).to include(:main, :secondary)
+    end
+    context 'when the `main` pipeline throws a MetricNotFound exception' do
+      before(:each) do
+        allow(api_service).to receive(:extract_metrics).and_call_original
+        expect(api_service).to receive(:extract_metrics)
+                                .with([:stats, :pipelines, :main, :config], any_args)
+                                .and_raise(LogStash::Instrument::MetricStore::MetricNotFound)
+      end
+
+      it 'does not contain the partially-constructed pipeline' do
+        expect(report).to include(:secondary)
+        expect(report).to_not include(:main)
+      end
+    end
+  end
+
+  describe "#pipeline" do
+    let(:report_method) { :pipeline }
+    let(:pipeline_id) { "main" }
+    # Enforce just the structure
+    it "check keys" do
+      expect(report.keys).to include(
+        :ephemeral_id,
+        :hash,
+        :workers,
+        :batch_size,
+        :batch_delay,
+        :config_reload_automatic,
+        :config_reload_interval,
+        :dead_letter_queue_enabled,
+        # :dead_letter_queue_path is nil in tests
+        # so it is ignored
+      )
+    end
+  end
+
+  describe "#pipeline?opts" do
+    let(:report_method) { :pipeline }
+    let(:pipeline_id) { "main" }
+    let(:opts) { { :graph => true } }
+    # Enforce just the structure
+    it "check keys" do
+      expect(report.keys).to include(
+        :ephemeral_id,
+        :hash,
+        :workers,
+        :batch_size,
+        :batch_delay,
+        :config_reload_automatic,
+        :config_reload_interval,
+        :dead_letter_queue_enabled,
+        # Be sure we display a graph when we set the option to
+        :graph
+      )
+    end
+  end
+
+  describe "#os" do
+    let(:report_method) { :os }
+    it "check_keys" do
+      expect(report.keys).to include(
+        :name,
+        :arch,
+        :version,
+        :available_processors
+      )
+    end
+  end
+
+  describe "#jvm" do
+    let(:report_method) { :jvm }
+    it "check_keys" do
+      expect(report.keys).to include(
+        :pid,
+        :version,
+        :vm_version,
+        :vm_vendor,
+        :vm_name,
+        :start_time_in_millis,
+        :mem,
+        :gc_collectors
+      )
+    expect(report[:mem].keys).to include(
+      :heap_init_in_bytes,
+      :heap_max_in_bytes,
+      :non_heap_init_in_bytes,
+      :non_heap_max_in_bytes
+    )
+    end
+  end
+end
diff --git a/logstash-core/spec/logstash/api/commands/stats_spec.rb b/logstash-core/spec/logstash/api/commands/stats_spec.rb
index 62335fb1e..fbe01ba27 100644
--- a/logstash-core/spec/logstash/api/commands/stats_spec.rb
+++ b/logstash-core/spec/logstash/api/commands/stats_spec.rb
@@ -1,29 +1,97 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 
 describe LogStash::Api::Commands::Stats do
-  include_context "api setup"
+  # enable PQ to ensure PQ-related metrics are present
+  include_context "api setup", {"queue.type" => "persisted"}
 
   let(:report_method) { :run }
+  let(:extended_pipeline) { nil }
+  let(:opts) { {} }
   subject(:report) do
     factory = ::LogStash::Api::CommandFactory.new(LogStash::Api::Service.new(@agent))
-   
-    factory.build(:stats).send(report_method)
+    if extended_pipeline
+      factory.build(:stats).send(report_method, "main", extended_pipeline, opts)
+    else
+      factory.build(:stats).send(report_method)
+    end
   end
 
   let(:report_class) { described_class }
 
+  describe "#plugins_stats_report" do
+    let(:report_method) { :plugins_stats_report }
+    # Enforce just the structure
+    let(:extended_pipeline) {
+      {
+      :queue => "fake_queue",
+      :hash => "fake_hash",
+      :ephemeral_id => "fake_epehemeral_id",
+      :vertices => "fake_vertices"
+      }
+    }
+    # TODO pass in a real sample vertex
+#    let(:opts) {
+#      {
+#        :vertices => "fake vertices"
+#      }
+#    }
+    it "check keys" do
+      expect(report.keys).to include(
+        :queue,
+        :hash,
+        :ephemeral_id,
+        # TODO re-add vertices -- see above
+#        :vertices
+      )
+    end
+  end
+
   describe "#events" do
     let(:report_method) { :events }
 
     it "return events information" do
-      expect(report.keys).to include(:in, :filtered, :out)
+      expect(report.keys).to include(
+        :in,
+        :filtered,
+        :out,
+        :duration_in_millis,
+        :queue_push_duration_in_millis)
     end
   end
-  
+
+  describe "#metric flows" do
+    let(:report_method) { :flow }
+
+    it "should validate flow metric keys are exist" do
+      expect(report.keys).to include(
+                               :input_throughput,
+                               :output_throughput,
+                               :filter_throughput,
+                               :queue_backpressure,
+                               :worker_concurrency)
+    end
+  end
+
   describe "#hot_threads" do
     let(:report_method) { :hot_threads }
-    
+
     it "should return hot threads information as a string" do
       expect(report.to_s).to be_a(String)
     end
@@ -35,18 +103,116 @@ describe LogStash::Api::Commands::Stats do
 
   describe "memory stats" do
     let(:report_method) { :memory }
-      
+
     it "return hot threads information" do
       expect(report).not_to be_empty
     end
 
-    it "return heap information" do
-      expect(report.keys).to include(:heap_used_in_bytes)
+    it "return memory information" do
+      expect(report.keys).to include(
+        :heap_used_percent,
+        :heap_committed_in_bytes,
+        :heap_max_in_bytes,
+        :heap_used_in_bytes,
+        :non_heap_used_in_bytes,
+        :non_heap_committed_in_bytes,
+        :pools
+      )
     end
+  end
 
-    it "return non heap information" do
-      expect(report.keys).to include(:non_heap_used_in_bytes)
+  describe "jvm stats" do
+    let(:report_method) { :jvm }
+
+    it "return jvm information" do
+      expect(report.keys).to include(
+        :threads,
+        :mem,
+        :gc,
+        :uptime_in_millis
+      )
+      expect(report[:threads].keys).to include(
+        :count,
+        :peak_count
+      )
     end
+  end
 
+  describe "reloads stats" do
+    let(:report_method) { :reloads }
+
+    it "return reloads information" do
+      expect(report.keys).to include(
+      :successes,
+      :failures,
+      )
+    end
+  end
+
+  describe "pipeline stats" do
+    let(:report_method) { :pipeline }
+    it "returns information on existing pipeline" do
+      expect(report.keys).to include(:main)
+    end
+    context "for each pipeline" do
+      it "returns information on pipeline" do
+        expect(report[:main].keys).to include(
+          :events,
+          :flow,
+          :plugins,
+          :reloads,
+          :queue,
+          :pipeline
+        )
+      end
+      it "returns event information" do
+        expect(report[:main][:events].keys).to include(
+          :in,
+          :filtered,
+          :duration_in_millis,
+          :out,
+          :queue_push_duration_in_millis
+        )
+      end
+      it "returns flow metric information" do
+        expect(report[:main][:flow].keys).to include(
+                                                 :output_throughput,
+                                                 :filter_throughput,
+                                                 :queue_backpressure,
+                                                 :worker_concurrency,
+                                                 :worker_utilization,
+                                                 :input_throughput,
+                                                 :queue_persisted_growth_bytes,
+                                                 :queue_persisted_growth_events
+                                               )
+      end
+      it "returns queue metric information" do
+        expect(report[:main][:queue].keys).to include(
+                                               :capacity,
+                                               :events,
+                                               :type,
+                                               :data)
+        expect(report[:main][:queue][:capacity].keys).to include(
+                                                           :page_capacity_in_bytes,
+                                                           :max_queue_size_in_bytes,
+                                                           :queue_size_in_bytes,
+                                                           :max_unread_events)
+        expect(report[:main][:queue][:data].keys).to include(
+                                                           :storage_type,
+                                                           :path,
+                                                           :free_space_in_bytes)
+      end
+    end
+    context "when using multiple pipelines" do
+      before(:each) do
+        expect(LogStash::Config::PipelinesInfo).to receive(:format_pipelines_info).and_return([
+          {"id" => :main},
+          {"id" => :secondary},
+        ])
+      end
+      it "contains metrics for all pipelines" do
+        expect(report.keys).to include(:main, :secondary)
+      end
+    end
   end
 end
diff --git a/logstash-core/spec/logstash/api/errors_spec.rb b/logstash-core/spec/logstash/api/errors_spec.rb
index 49e6e1462..ec3c719e8 100644
--- a/logstash-core/spec/logstash/api/errors_spec.rb
+++ b/logstash-core/spec/logstash/api/errors_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/api/errors"
 
diff --git a/logstash-core/spec/logstash/api/modules/logging_spec.rb b/logstash-core/spec/logstash/api/modules/logging_spec.rb
index 9d67a4fe1..5fc138b87 100644
--- a/logstash-core/spec/logstash/api/modules/logging_spec.rb
+++ b/logstash-core/spec/logstash/api/modules/logging_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "json-schema"
 require "sinatra"
@@ -8,7 +24,6 @@ describe LogStash::Api::Modules::Logging do
   include_context "api setup"
 
   describe "#logging" do
-
     context "when setting a logger's log level" do
       it "should return a positive acknowledgement on success" do
         put '/', '{"logger.logstash": "ERROR"}'
diff --git a/logstash-core/spec/logstash/api/modules/node_plugins_spec.rb b/logstash-core/spec/logstash/api/modules/node_plugins_spec.rb
index 01eede56d..d252ba71a 100644
--- a/logstash-core/spec/logstash/api/modules/node_plugins_spec.rb
+++ b/logstash-core/spec/logstash/api/modules/node_plugins_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "json-schema"
 require "sinatra"
diff --git a/logstash-core/spec/logstash/api/modules/node_spec.rb b/logstash-core/spec/logstash/api/modules/node_spec.rb
index 7fc7f1271..a1f97217d 100644
--- a/logstash-core/spec/logstash/api/modules/node_spec.rb
+++ b/logstash-core/spec/logstash/api/modules/node_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "json-schema"
 require "sinatra"
@@ -9,7 +25,6 @@ describe LogStash::Api::Modules::Node do
   include_examples "not found"
 
   describe "#hot threads" do
-
     before(:all) do
       get "/hot_threads"
     end
@@ -23,7 +38,6 @@ describe LogStash::Api::Modules::Node do
     end
 
     context "#threads count" do
-
       before(:all) do
         get "/hot_threads?threads=5"
       end
@@ -47,7 +61,6 @@ describe LogStash::Api::Modules::Node do
     end
 
     context "broken params in URL" do
-
       before(:all) do
         get "/hot_threads?human=?threads=5"
       end
@@ -64,7 +77,6 @@ describe LogStash::Api::Modules::Node do
         "/hot_threads?human=1",
         "/hot_threads?human=t",
       ].each do |path|
-
         before(:all) do
           get path
         end
@@ -123,6 +135,7 @@ describe LogStash::Api::Modules::Node do
       root_structure = {
         "pipelines" => {
           "main" => {
+            "ephemeral_id" => String,
             "workers" => Numeric,
             "batch_size" => Numeric,
             "batch_delay" => Numeric,
@@ -152,7 +165,7 @@ describe LogStash::Api::Modules::Node do
         },
         "gc_collectors" => Array
         },
-        "hot_threads"=> {
+        "hot_threads" => {
           "time" => String,
           "busiest_threads" => Numeric,
           "threads" => Array
diff --git a/logstash-core/spec/logstash/api/modules/node_stats_spec.rb b/logstash-core/spec/logstash/api/modules/node_stats_spec.rb
index 729f9aee9..48b73f80c 100644
--- a/logstash-core/spec/logstash/api/modules/node_stats_spec.rb
+++ b/logstash-core/spec/logstash/api/modules/node_stats_spec.rb
@@ -1,22 +1,39 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 
 require "sinatra"
 require "logstash/api/modules/node_stats"
 
 describe LogStash::Api::Modules::NodeStats do
-  include_context "api setup"
+  # enable PQ to ensure PQ-related metrics are present
+  include_context "api setup", {"queue.type" => "persisted"}
   include_examples "not found"
 
   extend ResourceDSLMethods
 
   # DSL describing response structure
   root_structure = {
-    "jvm"=>{
+    "jvm" => {
       "uptime_in_millis" => Numeric,
-      "threads"=>{
-        "count"=>Numeric,
-        "peak_count"=>Numeric
+      "threads" => {
+        "count" => Numeric,
+        "peak_count" => Numeric
       },
       "gc" => {
         "collectors" => {
@@ -59,19 +76,33 @@ describe LogStash::Api::Modules::NodeStats do
         }
       }
     },
-    "process"=>{
-      "peak_open_file_descriptors"=>Numeric,
-      "max_file_descriptors"=>Numeric,
-      "open_file_descriptors"=>Numeric,
-      "mem"=>{
-        "total_virtual_in_bytes"=>Numeric
+    "process" => {
+      "peak_open_file_descriptors" => Numeric,
+      "max_file_descriptors" => Numeric,
+      "open_file_descriptors" => Numeric,
+      "mem" => {
+        "total_virtual_in_bytes" => Numeric
       },
-      "cpu"=>{
-        "total_in_millis"=>Numeric,
-        "percent"=>Numeric,
+      "cpu" => {
+        "total_in_millis" => Numeric,
+        "percent" => Numeric,
         # load_average is not supported on Windows, set it below
       }
-    },
+   },
+   "events" => {
+      "duration_in_millis" => Numeric,
+      "in" => Numeric,
+      "filtered" => Numeric,
+      "out" => Numeric,
+      "queue_push_duration_in_millis" => Numeric
+   },
+   "flow" => {
+      "output_throughput" => Hash,
+      "filter_throughput" => Hash,
+      "queue_backpressure" => Hash,
+      "worker_concurrency" => Hash,
+      "input_throughput" => Hash
+   },
    "pipelines" => {
      "main" => {
        "events" => {
@@ -80,12 +111,47 @@ describe LogStash::Api::Modules::NodeStats do
          "filtered" => Numeric,
          "out" => Numeric,
          "queue_push_duration_in_millis" => Numeric
+       },
+       "flow" => {
+         "output_throughput" => Hash,
+         "filter_throughput" => Hash,
+         "queue_backpressure" => Hash,
+         "worker_concurrency" => Hash,
+         "worker_utilization" => Hash,
+         "input_throughput" => Hash,
+         "queue_persisted_growth_bytes" => Hash,
+         "queue_persisted_growth_events" => Hash
+       },
+       "plugins" => {
+          "inputs" => Array,
+          "codecs" => Array,
+          "filters" => Array,
+          "outputs" => Array,
+       },
+       "queue" => {
+         "capacity" => {
+           "page_capacity_in_bytes" => Numeric,
+           "max_queue_size_in_bytes" => Numeric,
+           "queue_size_in_bytes" => Numeric,
+           "max_unread_events" => Numeric
+         },
+         "events" => Numeric,
+         "type" => String,
+         "data" => {
+           "storage_type" => String,
+           "path" => String,
+           "free_space_in_bytes" => Numeric
+         }
        }
      }
    },
    "reloads" => {
      "successes" => Numeric,
      "failures" => Numeric
+   },
+   "os" => Hash,
+   "queue" => {
+      "events_count" => Numeric
    }
   }
 
diff --git a/logstash-core/spec/logstash/api/modules/plugins_spec.rb b/logstash-core/spec/logstash/api/modules/plugins_spec.rb
index 265a7b2b9..84a4c075f 100644
--- a/logstash-core/spec/logstash/api/modules/plugins_spec.rb
+++ b/logstash-core/spec/logstash/api/modules/plugins_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "json-schema"
 require "sinatra"
@@ -35,7 +51,7 @@ describe LogStash::Api::Modules::Plugins do
                 }
               ]
             },
-            "total" => { "type" => "number" } 
+            "total" => { "type" => "number" }
           },
           "required" => ["plugins", "total"]
         },
@@ -45,7 +61,6 @@ describe LogStash::Api::Modules::Plugins do
   end
 
   context "#values" do
-
     let(:payload) { LogStash::Json.load(last_response.body) }
 
     it "return totals of plugins" do
@@ -54,7 +69,7 @@ describe LogStash::Api::Modules::Plugins do
 
     it "return a list of available plugins" do
       payload["plugins"].each do |plugin|
-        expect do 
+        expect do
           Gem::Specification.find_by_name(plugin["name"])
         end.not_to raise_error
       end
diff --git a/logstash-core/spec/logstash/api/modules/root_spec.rb b/logstash-core/spec/logstash/api/modules/root_spec.rb
index 6c2d950b9..22fbfe44d 100644
--- a/logstash-core/spec/logstash/api/modules/root_spec.rb
+++ b/logstash-core/spec/logstash/api/modules/root_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 
 require "sinatra"
@@ -14,4 +30,3 @@ describe LogStash::Api::Modules::Root do
 
   include_examples "not found"
 end
-
diff --git a/logstash-core/spec/logstash/api/rack_app_spec.rb b/logstash-core/spec/logstash/api/rack_app_spec.rb
index 5b31dc8c8..24f085f14 100644
--- a/logstash-core/spec/logstash/api/rack_app_spec.rb
+++ b/logstash-core/spec/logstash/api/rack_app_spec.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/api/rack_app"
 require "json-schema"
 require "rack/test"
diff --git a/logstash-core/spec/logstash/bootstrap_check/persisted_queue_config_spec.rb b/logstash-core/spec/logstash/bootstrap_check/persisted_queue_config_spec.rb
deleted file mode 100644
index 09d589a6c..000000000
--- a/logstash-core/spec/logstash/bootstrap_check/persisted_queue_config_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require "spec_helper"
-require "tmpdir"
-require "logstash/bootstrap_check/persisted_queue_config"
-
-describe LogStash::BootstrapCheck::PersistedQueueConfig do
-
-  context("when persisted queues are enabled") do
-    let(:settings) do
-      settings = LogStash::SETTINGS.dup
-      settings.set_value("queue.type", "persisted")
-      settings.set_value("queue.page_capacity", 1024)
-      settings.set_value("path.queue", ::File.join(Dir.tmpdir, "some/path"))
-      settings
-    end
-
-    context("and 'queue.max_bytes' is set to a value less than the value of 'queue.page_capacity'") do
-      it "should throw" do
-        settings.set_value("queue.max_bytes", 512)
-        expect { LogStash::BootstrapCheck::PersistedQueueConfig.check(settings) }.to raise_error
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/logstash-core/spec/logstash/codecs/base_spec.rb b/logstash-core/spec/logstash/codecs/base_spec.rb
index 42b07b5d4..a325e17d9 100644
--- a/logstash-core/spec/logstash/codecs/base_spec.rb
+++ b/logstash-core/spec/logstash/codecs/base_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 
 DATA_DOUBLE = "data".freeze
@@ -6,6 +22,7 @@ DATA_DOUBLE = "data".freeze
 # use a dummy NOOP output to test Outputs::Base
 class LogStash::Codecs::NOOPAsync < LogStash::Codecs::Base
   attr_reader :last_result
+
   config_name "noop_async"
 
   def encode(event)
@@ -15,6 +32,7 @@ end
 
 class LogStash::Codecs::NOOPSync < LogStash::Codecs::Base
   attr_reader :last_result
+
   config_name "noop_sync"
 
   def encode_sync(event)
@@ -24,6 +42,7 @@ end
 
 class LogStash::Codecs::NOOPMulti < LogStash::Codecs::Base
   attr_reader :last_result
+
   config_name "noop_multi"
 
   def encode_sync(event)
@@ -41,14 +60,14 @@ describe LogStash::Codecs::Base do
   describe "encoding" do
     shared_examples "encoder types" do |codec_class|
       let(:klass) { codec_class }
-      
+
       describe "#{codec_class}" do
         describe "multi_encode" do
           it "should return an array of [event,data] tuples" do
-            expect(instance.multi_encode([event,event])).to eq([encoded_tuple, encoded_tuple])
+            expect(instance.multi_encode([event, event])).to eq([encoded_tuple, encoded_tuple])
           end
         end
-        
+
         describe "#encode" do
           before do
             @result = nil
@@ -57,7 +76,7 @@ describe LogStash::Codecs::Base do
             end
             instance.encode(event)
           end
-          
+
           it "should yield the correct result" do
             expect(@result).to eq(encoded_tuple)
           end
@@ -70,5 +89,3 @@ describe LogStash::Codecs::Base do
     include_examples("encoder types", LogStash::Codecs::NOOPMulti)
   end
 end
-
-                          
diff --git a/logstash-core/spec/logstash/codecs/delegator_spec.rb b/logstash-core/spec/logstash/codecs/delegator_spec.rb
new file mode 100644
index 000000000..1dc771c6a
--- /dev/null
+++ b/logstash-core/spec/logstash/codecs/delegator_spec.rb
@@ -0,0 +1,101 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require "spec_helper"
+
+class LogStash::Codecs::MockCodec < LogStash::Codecs::Base
+  config_name "my_name"
+
+  def multi_encode(e)
+  end
+
+  def encode(e)
+  end
+
+  def decode(e)
+    for i in e.split('|')
+      yield i
+    end
+  end
+end
+
+describe LogStash::Codecs::Delegator do
+  let(:collector)   { LogStash::Instrument::Collector.new }
+  let(:metric) { LogStash::Instrument::Metric.new(collector) }
+  let(:codec) { LogStash::Codecs::MockCodec.new }
+
+  subject do
+    delegator = described_class.new(codec)
+    delegator.metric = metric.namespace([:stats, :pipelines, :main, :plugins, :codecs, :my_id])
+    delegator
+  end
+
+  let(:snapshot_store) { collector.snapshot_metric.metric_store }
+
+  let(:snapshot_metric) { snapshot_store.get_shallow(:stats) }
+
+  describe "#encode" do
+    it "should delegate call to codec" do
+      expect(codec).to receive(:encode).with("abcdef")
+      subject.encode("abcdef")
+    end
+
+    it "should increment metrics" do
+      subject.encode("test")
+      expect(snapshot_metric[:pipelines][:main][:plugins][:codecs][:my_id][:encode][:writes_in].value).to eq(1)
+    end
+  end
+
+  describe "#multi_encode" do
+    it "should delegate call to codec" do
+      expect(codec).to receive(:multi_encode).with(%w(ay laa))
+      subject.multi_encode(%w(ay laa))
+    end
+
+    it "should increment metrics" do
+      subject.multi_encode(%w(ay test))
+      expect(snapshot_metric[:pipelines][:main][:plugins][:codecs][:my_id][:encode][:writes_in].value).to eq(2)
+    end
+  end
+
+  describe "#decode" do
+    it "should delegate call to codec" do
+      expect(codec).to receive(:decode).with("ayooooo")
+      subject.decode("ayooooo")
+    end
+
+    it "should increment metrics" do
+      subject.decode("bird|law") {}
+      expect(snapshot_metric[:pipelines][:main][:plugins][:codecs][:my_id][:decode][:writes_in].value).to eq(1)
+      expect(snapshot_metric[:pipelines][:main][:plugins][:codecs][:my_id][:decode][:out].value).to eq(2)
+    end
+  end
+
+  describe "#close" do
+    it "should delegate call to codec" do
+      expect(codec).to receive(:close)
+      subject.close
+    end
+  end
+
+  describe "#plugin_type" do
+    it "should delegate call to codec" do
+      expect(codec).to receive(:plugin_type)
+      subject.plugin_type
+    end
+  end
+end
diff --git a/logstash-core/spec/logstash/compiler/compiler_spec.rb b/logstash-core/spec/logstash/compiler/compiler_spec.rb
index dc9cf9dc3..2932b338c 100644
--- a/logstash-core/spec/logstash/compiler/compiler_spec.rb
+++ b/logstash-core/spec/logstash/compiler/compiler_spec.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/compiler"
 require "support/helpers"
@@ -32,78 +49,10 @@ describe LogStash::Compiler do
     end
   end
 
-  describe "compiling to Pipeline" do
-    subject(:source_id) { "fake_sourcefile" }
-    let(:source_with_metadata) { org.logstash.common.SourceWithMetadata.new(source_protocol, source_id, 0, 0, source) }
-    subject(:compiled) { puts "PCOMP"; described_class.compile_pipeline(source_with_metadata, settings) }
-
-    describe "compiling multiple sources" do
-      let(:sources) do
-        [ 
-          "input { input_0 {} } filter { filter_0 {} } output { output_0 {} }",
-          "input { input_1 {} } filter { filter_1 {} } output { output_1 {} }"
-        ]
-      end
-
-      let(:sources_with_metadata) do
-        sources.map.with_index do |source, idx|
-          org.logstash.common.SourceWithMetadata.new("#{source_protocol}_#{idx}", "#{source_id}_#{idx}", 0, 0, source)
-        end
-      end
-
-      subject(:pipeline) { described_class.compile_sources(sources_with_metadata, false) }
-
-      it "should generate a hash" do
-        expect(pipeline.unique_hash).to be_a(String)
-      end
-
-      it "should compile cleanly" do
-        expect(pipeline).to be_a(org.logstash.config.ir.PipelineIR)
-      end
-
-      it "should provide the original source" do
-        expect(pipeline.original_source).to eq(sources.join("\n"))
-      end
-
-      describe "applying protocol and id metadata" do
-        it "should apply the correct source metadata to all components" do
-          # TODO: seems to be a jruby regression we cannot currently call each on a stream
-          pipeline.get_plugin_vertices.each do |pv|
-            name_idx = pv.plugin_definition.name.split("_").last
-            source_protocol_idx = pv.source_with_metadata.protocol.split("_").last
-            source_id_idx = pv.source_with_metadata.id.split("_").last
-
-            expect(name_idx).to eq(source_protocol_idx)
-            expect(name_idx).to eq(source_id_idx)
-          end
-        end
-      end
-    end
-
-    describe "complex configs" do
-      shared_examples_for "compilable LSCL files" do |path|
-        describe "parsing #{path}" do
-          let(:source) { File.read(path) }
-          
-          it "should compile" do
-            expect(compiled).to be_java_kind_of(Java::OrgLogstashConfigIr::Pipeline)
-          end
-          
-          it "should have a hash" do
-            expect(compiled.uniqueHash)
-          end
-        end
-      end
-      
-      Dir.glob(File.join(SUPPORT_DIR, "lscl_configs", "*.conf")).each do |path|
-        it_should_behave_like "compilable LSCL files", path
-      end
-    end
-  end
-
   describe "compiling imperative" do
     let(:source_id) { "fake_sourcefile" }
     let(:source_with_metadata) { org.logstash.common.SourceWithMetadata.new(source_protocol, source_id, 0, 0, source) }
+    let(:cve) { org.logstash.plugins.ConfigVariableExpander.without_secret(org.logstash.common.EnvironmentVariableProvider.default_provider()) }
     subject(:compiled) { described_class.compile_imperative(source_with_metadata, settings.get_value("config.support_escapes")) }
 
     context "when config.support_escapes" do
@@ -111,7 +60,7 @@ describe LogStash::Compiler do
 
       let(:processed_value)  { 'The computer says, "No"' }
 
-      let(:source) { 
+      let(:source) {
         %q(
           input {
             foo {
@@ -122,7 +71,7 @@ describe LogStash::Compiler do
       }
 
       let(:compiled_string) do
-        compiled[:input].toGraph.vertices.toArray.first.getPluginDefinition.arguments["bar"]
+        compiled[:input].toGraph(cve).vertices.toArray.first.getPluginDefinition.arguments["bar"]
       end
 
       before do
@@ -184,7 +133,7 @@ describe LogStash::Compiler do
       describe "a plugin with mixed parameter types" do
         let(:plugin_source) { "generator { aarg => [1] hasharg => {foo => bar} iarg => 123 farg => 123.123 sarg => 'hello'}" }
         let(:expected_plugin_args) do
-          { 
+          {
             "aarg" => [1],
             "hasharg" => {"foo" => "bar"},
             "iarg" => 123,
@@ -198,6 +147,21 @@ describe LogStash::Compiler do
         end
       end
 
+      describe "a plugin with quoted parameter keys" do
+        let(:plugin_source) { "generator { notquoted => 1 'singlequoted' => 2 \"doublequoted\" => 3}" }
+        let(:expected_plugin_args) do
+          {
+            "notquoted" => 1,
+            "singlequoted" => 2,
+            "doublequoted" => 3,
+          }
+        end
+
+        it "should contain the plugin" do
+          expect(c_plugin).to ir_eql(j.iPlugin(rand_meta, INPUT, "generator", expected_plugin_args))
+        end
+      end
+
       describe "a plugin with multiple array parameter types" do
         let(:plugin_source) { "generator { aarg => [1] aarg => [2] aarg => [3]}" }
         let(:expected_plugin_args) do
@@ -224,6 +188,63 @@ describe LogStash::Compiler do
         end
       end
 
+      describe "an input plugin with a single codec" do
+        let(:plugin_source) { "generator { codec => plain }" }
+        let(:expected_plugin_args) do
+          {
+            "codec" => "plain"
+          }
+        end
+
+        it 'should add the plugin codec' do
+          expect(c_plugin).to ir_eql(j.iPlugin(rand_meta, INPUT, "generator", expected_plugin_args))
+        end
+      end
+
+      describe "an input plugin with multiple codecs" do
+        let(:plugin_source) { "generator { codec => plain codec => json }" }
+        let(:expected_error_message) {
+          I18n.t("logstash.runner.configuration.invalid_plugin_settings_multiple_codecs",
+                 :plugin => "generator",
+                 :type => "input",
+                 :line => "1"
+          )
+        }
+
+        it 'should raise a configuration error' do
+          expect {compiled}.to raise_error(LogStash::ConfigurationError, expected_error_message)
+        end
+      end
+
+      describe "an output plugin with a single codec" do
+        let(:source) { "input { generator {} } output { stdout { codec => json } }" }
+        subject(:output) { compiled[:output] }
+        let(:expected_plugin_args) do
+          {
+            "codec" => "json"
+          }
+        end
+
+        it 'should add the plugin codec' do
+          expect(output).to ir_eql(j.iPlugin(rand_meta, OUTPUT, "stdout", expected_plugin_args))
+        end
+      end
+
+      describe "an output plugin with multiple codecs" do
+        let(:source) { "input { generator {} } output { stdout { codec => plain codec => json } }" }
+        let(:expected_error_message) {
+          I18n.t("logstash.runner.configuration.invalid_plugin_settings_multiple_codecs",
+                 :plugin => "stdout",
+                 :type => "output",
+                 :line => "1"
+          )
+        }
+
+        it 'should raise a configuration error' do
+          expect {compiled}.to raise_error(LogStash::ConfigurationError, expected_error_message)
+        end
+      end
+
       describe "a filter plugin that repeats a Hash directive" do
         let(:source) { "input { } filter { #{plugin_source} } output { } " }
         subject(:c_plugin) { compiled[:filter] }
@@ -252,6 +273,33 @@ describe LogStash::Compiler do
           expect(c_plugin).to ir_eql(j.iPlugin(rand_meta, FILTER, "grok", expected_plugin_args))
         end
 
+        describe "a filter plugin with a repeated hash directive with duplicated keys" do
+          let(:source) { "input { } filter { #{plugin_source} } output { } " }
+          let(:plugin_source) do
+            %q[
+              grok {
+                match => { "message" => "foo" }
+                match => { "message" => "bar" }
+                break_on_match => false
+              }
+          ]
+          end
+          subject(:c_plugin) { compiled[:filter] }
+
+          let(:expected_plugin_args) do
+            {
+                "match" => {
+                    "message" => ["foo", "bar"]
+                },
+                "break_on_match" => "false"
+            }
+          end
+
+          it "should merge the values of the duplicate keys into an array" do
+            expect(c_plugin).to ir_eql(j.iPlugin(rand_meta, FILTER, "grok", expected_plugin_args))
+          end
+        end
+
         describe "a filter plugin that has nested Hash directives" do
           let(:source) { "input { } filter { #{plugin_source} } output { } " }
           let(:plugin_source) do
@@ -291,7 +339,7 @@ describe LogStash::Compiler do
                         "integer" => 7,
                         "quoted-key-string" => "nested-quoted-key-string",
                         "quoted-key-integer" => 31,
-                        "deep"    => { # <-- This is deeper nested hash!
+                        "deep" => { # <-- This is deeper nested hash!
                             "string"  => "deeply-nested-string",
                             "integer" => 127,
                             "quoted-key-string" => "deeply-nested-quoted-key-string",
@@ -365,21 +413,20 @@ describe LogStash::Compiler do
           j.iComposeParallel(*statements)
         end
       end
-      
+
       describe "multiple section declarations" do
         let(:source) do
           <<-EOS
             #{section} {
               aplugin { count => 1 }
             }
-            
+
             #{section} {
               aplugin { count => 2 }
             }
           EOS
         end
-        
-        
+
         it "should contain both section declarations, in order" do
           expect(compiled_section).to ir_eql(compose(
                                       splugin("aplugin", {"count" => 1}),
@@ -613,11 +660,11 @@ describe LogStash::Compiler do
               it "should compile correctly" do
                 expect(c_expression).to ir_eql(j.eRegexEq(j.eEventValue("[foo]"), j.eRegex('^abc$')))
               end
-              
+
               # Believe it or not, "\.\." is a valid regexp!
               describe "when given a quoted regexp" do
                 let(:expression) { '[foo] =~ "\\.\\."' }
-              
+
                 it "should compile correctly" do
                   expect(c_expression).to ir_eql(j.eRegexEq(j.eEventValue("[foo]"), j.eRegex('\\.\\.')))
                 end
diff --git a/logstash-core/spec/logstash/config/config_ast_spec.rb b/logstash-core/spec/logstash/config/config_ast_spec.rb
index 769cb0a8b..5851b11c8 100644
--- a/logstash-core/spec/logstash/config/config_ast_spec.rb
+++ b/logstash-core/spec/logstash/config/config_ast_spec.rb
@@ -1,6 +1,21 @@
-# encoding: utf-8
-# config syntax tests
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# config syntax tests
 require "spec_helper"
 require "logstash/config/grammar"
 require "logstash/config/config_ast"
@@ -60,7 +75,7 @@ describe LogStashConfigParser do
         }
       CONFIG
       subject { LogStashConfigParser.new }
-         
+
       it "should compile successfully" do
         result = subject.parse(config)
         expect(result).not_to(be_nil)
@@ -87,7 +102,6 @@ describe LogStashConfigParser do
       end
     end
 
-
     context "invalid configuration" do
       it "rejects duplicate hash key" do
         parser = LogStashConfigParser.new
@@ -143,6 +157,21 @@ describe LogStashConfigParser do
 
         expect(config).to be_nil
       end
+
+      it "supports octal literals" do
+        parser = LogStashConfigParser.new
+        config = parser.parse(%q(
+          input {
+            example {
+              foo => 010
+            }
+          }
+        ))
+
+        compiled_number = eval(config.recursive_select(LogStash::Config::AST::Number).first.compile)
+
+        expect(compiled_number).to be == 8
+      end
     end
 
     context "when config.support_escapes" do
@@ -182,6 +211,51 @@ describe LogStashConfigParser do
         end
       end
     end
+
+    context "commentary in odd places" do
+      let(:config) { %q(
+        # early
+        input # bla
+        { # bla
+          plugin # bla
+          # bla
+          { # bla
+            # bla
+            arg  # bla
+            => # bla
+            bareword # bla
+            # bla
+            hasharg => {
+              #preentry
+              "firstkey" => "firstvalue"
+              # bla
+              "middle" # bla
+              # bla
+              => # bla
+              # bla
+              "midvalue"  # bla
+              # bla
+              "lastkey" => "lastvalue"
+              # bla
+            }
+          } # bla
+        # bla
+        } # bla
+        # comment ending in EOF:
+      ).strip }
+      subject { LogStashConfigParser.new }
+      def line_to_source(*args); end
+      def plugin(*args); end
+      it "hasn't got a trailing newline in the test config" do
+        # just to be clear that the last comment is supposed to end with EOF not \n
+        expect(config).not_to(end_with "\n")
+      end
+      it "should permit the comments" do
+        result = subject.parse(config)
+        expect(result).not_to(be_nil)
+        expect { eval(result.compile) }.not_to(raise_error)
+      end
+    end
   end
 
   context "when using two plugin sections of the same type" do
@@ -193,7 +267,9 @@ describe LogStashConfigParser do
           @code = @config.compile
           eval(@code)
         end
-        def plugin(*args);end
+
+        def plugin(*args); end
+        def line_to_source(*args); end
       end
     end
     context "(filters)" do
@@ -204,7 +280,6 @@ describe LogStashConfigParser do
          output { output1 { } }"
       }
 
-
       it "should create a pipeline with both sections" do
         generated_objects = pipeline_klass.new(config_string, settings).instance_variable_get("@generated_objects")
         filters = generated_objects.keys.map(&:to_s).select {|obj_name| obj_name.match(/^filter.+?_\d+$/) }
@@ -219,7 +294,6 @@ describe LogStashConfigParser do
          output { output1 { } }"
       }
 
-
       it "should create a pipeline with both sections" do
         generated_objects = pipeline_klass.new(config_string, settings).instance_variable_get("@generated_objects")
         outputs = generated_objects.keys.map(&:to_s).select {|obj_name| obj_name.match(/^output.+?_\d+$/) }
@@ -246,7 +320,9 @@ describe LogStashConfigParser do
           @code = @config.compile
           eval(@code)
         end
-        def plugin(*args);end
+
+        def plugin(*args); end
+        def line_to_source(*args); end
       end
     end
 
diff --git a/logstash-core/spec/logstash/config/cpu_core_strategy_spec.rb b/logstash-core/spec/logstash/config/cpu_core_strategy_spec.rb
index c9b69fd26..8f158d0a2 100644
--- a/logstash-core/spec/logstash/config/cpu_core_strategy_spec.rb
+++ b/logstash-core/spec/logstash/config/cpu_core_strategy_spec.rb
@@ -1,9 +1,24 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/config/cpu_core_strategy"
 
 describe LogStash::Config::CpuCoreStrategy do
-
   before do
     allow(LogStash::Config::Defaults).to receive(:cpu_cores).and_return(cores)
   end
@@ -119,5 +134,4 @@ describe LogStash::Config::CpuCoreStrategy do
       expect(described_class.max_minus_two).to eq(1)
     end
   end
-
 end
diff --git a/logstash-core/spec/logstash/config/defaults_spec.rb b/logstash-core/spec/logstash/config/defaults_spec.rb
index 6fb363f48..6451d9286 100644
--- a/logstash-core/spec/logstash/config/defaults_spec.rb
+++ b/logstash-core/spec/logstash/config/defaults_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/config/defaults"
 
diff --git a/logstash-core/spec/logstash/config/mixin_spec.rb b/logstash-core/spec/logstash/config/mixin_spec.rb
index a0a9742e7..b140ef37e 100644
--- a/logstash-core/spec/logstash/config/mixin_spec.rb
+++ b/logstash-core/spec/logstash/config/mixin_spec.rb
@@ -1,33 +1,108 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/config/mixin"
 
 describe LogStash::Config::Mixin do
   context "when encountering a deprecated option" do
     let(:password) { "sekret" }
-    let(:double_logger) { double("logger").as_null_object }
-
-    subject do
+    let(:deprecation_logger) { double("DeprecationLogger").as_null_object }
+    let(:plugin_class) do
       Class.new(LogStash::Filters::Base) do
         include LogStash::Config::Mixin
         config_name "test_deprecated"
         milestone 1
         config :old_opt, :validate => :string, :deprecated => "this is old school"
         config :password, :validate => :password
-      end.new({
-        "old_opt" => "whut",
-        "password" => password
-      })
+      end
     end
 
     it "should not log the password" do
-      expect(LogStash::Logging::Logger).to receive(:new).with(anything).and_return(double_logger)
-      expect(double_logger).to receive(:warn) do |arg1,arg2|
-          message = 'You are using a deprecated config setting "old_opt" set in test_deprecated. Deprecated settings will continue to work, but are scheduled for removal from logstash in the future. this is old school If you have any questions about this, please visit the #logstash channel on freenode irc.'
-          expect(arg1).to eq(message)
-          expect(arg2[:plugin].to_s).to include('"password"=><password>')
-        end.once
-      subject
+      instance = plugin_class.new("old_opt" => "whut", "password" => password)
+      allow(instance).to receive(:deprecation_logger).and_return(deprecation_logger)
+
+      expect(deprecation_logger).to receive(:deprecated) do |message, _|
+        expect(message).to include("old_opt")
+        expect(message).to include("this is old school")
+        expect(message).not_to include(password)
+      end
+
+      instance.send(:config_init, instance.params)
+    end
+  end
+
+  context 'DSL::validate_value(String, :codec)' do
+    subject(:plugin_class) { Class.new(LogStash::Filters::Base) { config_name "test_deprecated_two" } }
+    let(:codec_class) { Class.new(LogStash::Codecs::Base) { config_name 'dummy' } }
+    let(:deprecation_logger) { double("DeprecationLogger").as_null_object }
+
+    before(:each) do
+      allow(plugin_class).to receive(:deprecation_logger).and_return(deprecation_logger)
+      allow(LogStash::Plugin).to receive(:lookup).with("codec", codec_class.config_name).and_return(codec_class)
+    end
+
+    it 'instantiates the codec' do
+      success, codec = plugin_class.validate_value(codec_class.config_name, :codec)
+
+      expect(success).to be true
+      expect(codec.class).to eq(codec_class)
+    end
+
+    it 'logs a deprecation' do
+      plugin_class.validate_value(codec_class.config_name, :codec)
+      expect(deprecation_logger).to have_received(:deprecated) do |message|
+        expect(message).to include("validate_value(String, :codec)")
+      end
+    end
+  end
+
+  context "validating :field_reference" do
+    let(:plugin_class) do
+      Class.new(LogStash::Filters::Base) do
+        config :target, :validate => :field_reference
+      end
+    end
+    let(:params) do
+      { "target" => target_param }
+    end
+
+    before(:each) do
+      allow(plugin_class).to receive(:logger).and_return(double('Logger').as_null_object)
+    end
+
+    context "when input is valid" do
+      let(:target_param) { "[@metadata][target]" }
+      it 'successfully initializes the plugin' do
+        expect(plugin_class.new(params)).to be_a_kind_of plugin_class
+      end
+      it 'coerces the value' do
+        instance = plugin_class.new(params)
+        expect(instance.target).to_not be_nil
+        expect(instance.target).to eq(target_param)
+      end
+    end
+
+    context "when input is invalid" do
+      let(:target_param) { "][Nv@l][d" }
+      it 'does not initialize the plugin' do
+        expect { plugin_class.new(params) }.to raise_exception(LogStash::ConfigurationError)
+        expect(plugin_class.logger).to have_received(:error).with(/must be a field_reference/)
+      end
     end
   end
 
@@ -99,28 +174,76 @@ describe LogStash::Config::Mixin do
   context "when validating lists of items" do
     let(:klass) do
       Class.new(LogStash::Filters::Base)  do
-        config_name "multiuri"
-        config :uris, :validate => :uri, :list => true
+        config_name "list_validator_spec"
         config :strings, :validate => :string, :list => true
         config :required_strings, :validate => :string, :list => true, :required => true
       end
     end
 
-    let(:uris) { ["http://example.net/1", "http://example.net/2"] }
-    let(:safe_uris) { uris.map {|str| ::LogStash::Util::SafeURI.new(str) } }
     let(:strings) { ["I am a", "modern major general"] }
     let(:required_strings) { ["required", "strings"] }
 
-    subject { klass.new("uris" => uris, "strings" => strings, "required_strings" => required_strings) }
-
-    it "a URI list should return an array of URIs" do
-      expect(subject.uris).to match_array(safe_uris)
+    let(:config) do
+      {"strings" => strings, "required_strings" => required_strings}
     end
 
+    subject(:instance) { klass.new(config) }
+
     it "a string list should return an array of strings" do
       expect(subject.strings).to match_array(strings)
     end
 
+    context 'URI lists' do
+      let(:klass) do
+        Class.new(LogStash::Filters::Base) do
+          config_name 'list_uri_validator_spec'
+          config :uris, :validate => :uri, :list => true
+        end
+      end
+      subject(:instance) { klass.new(config) }
+
+      let(:uri_1) { "http://example.net/1" }
+      let(:uri_2) { "http://example.net/2" }
+      let(:uri_3) { "http://example.net:9201/3" }
+
+      let(:uris) { [uri_1, uri_2, uri_3] }
+      let(:config) { Hash["uris" => uris_parameter] }
+
+      let(:safe_uris) { uris.map {|str| ::LogStash::Util::SafeURI.new(str) } }
+
+      shared_examples ':validate => :uri_list' do
+        it 'should normalize to a flat list containing all extracted URIs from the input' do
+          expect(instance.uris).to match_array(safe_uris)
+        end
+      end
+
+      context 'when given a single string containing exactly one uri' do
+        let(:uris_parameter) { "#{uri_1}" }
+        let(:uris) { [uri_1] }
+        include_examples ':validate => :uri_list'
+      end
+
+      context 'when given an array of strings, each containing exactly one uri' do
+        let(:uris_parameter) { uris }
+        include_examples ':validate => :uri_list'
+      end
+
+      context 'when given a single string containing multiple whitespace-delimited uris' do
+        let(:uris_parameter) { "#{uri_1} #{uri_2} #{uri_3}" }
+        include_examples ':validate => :uri_list'
+      end
+
+      context 'when given an array containing a single entry that has multiple whitespace-delimited uris' do
+        let(:uris_parameter) { ["#{uri_1} #{uri_2} #{uri_3}"] }
+        include_examples ':validate => :uri_list'
+      end
+
+      context 'when given an array containing multiple entries, one of which has multiple whitespace-delimited uris' do
+        let(:uris_parameter) { ["#{uri_1} #{uri_2}", "#{uri_3}"] }
+        include_examples ':validate => :uri_list'
+      end
+    end
+
     context "with a scalar value" do
       let(:strings) { "foo" }
 
@@ -165,36 +288,58 @@ describe LogStash::Config::Mixin do
   end
 
   context "when validating :password" do
-    let(:klass) do
-      Class.new(LogStash::Filters::Base)  do
-        config_name "fake"
-        config :password, :validate => :password
+    shared_examples 'protected password' do
+      let(:secret) { 'fancy pants' }
+      let(:plugin_class) do
+        Class.new(LogStash::Filters::Base)  do
+          config_name "fake"
+          config :password, :validate => :password
+        end
+      end
+      subject(:plugin_instance) { plugin_class.new(instance_params) }
+
+      it "should be a Password object" do
+        expect(plugin_instance.password).to(be_a(LogStash::Util::Password))
+      end
+
+      it "should make password values hidden" do
+        expect(plugin_instance.password.to_s).to(be == "<password>")
+        expect(plugin_instance.password.inspect).to(be == "<password>")
+      end
+
+      it "should show password values via #value" do
+        expect(plugin_instance.password.value).to(be == secret)
+      end
+
+      it "should correctly copy password types" do
+        clone = plugin_instance.class.new(plugin_instance.params)
+        expect(clone.password.value).to(be == secret)
+      end
+
+      it "should obfuscate original_params" do
+        expect(plugin_instance.original_params['password']).to(be_a(LogStash::Util::Password))
       end
     end
 
-    let(:secret) { "fancy pants" }
-    subject { klass.new("password" => secret) }
-
-    it "should be a Password object" do
-      expect(subject.password).to(be_a(LogStash::Util::Password))
+    context 'when instantiated with a string literal password' do
+      it_behaves_like 'protected password' do
+        let(:instance_params) { { "password" => secret } }
+      end
     end
 
-    it "should make password values hidden" do
-      expect(subject.password.to_s).to(be == "<password>")
-      expect(subject.password.inspect).to(be == "<password>")
-    end
+    context 'when instantiated with an environment variable placeholder' do
+      it_behaves_like 'protected password' do
+        let(:instance_params) { { "password" => '${PLACEHOLDER}'} }
+        before(:each) { ENV.store('PLACEHOLDER', secret) }
+        after(:each) { ENV.delete('PLACEHOLDER')}
 
-    it "should show password values via #value" do
-      expect(subject.password.value).to(be == secret)
-    end
-
-    it "should correctly copy password types" do
-      clone = subject.class.new(subject.params)
-      expect(clone.password.value).to(be == secret)
-    end
-
-    it "should obfuscate original_params" do
-      expect(subject.original_params['password']).to(be_a(LogStash::Util::Password))
+        before(:each) do
+          # Ensure the shared examples are actually running with an
+          # environment variable placeholder.
+          # If this assertion fails, setup for the spec is invalid.
+          expect(instance_params['password']).to eq('${PLACEHOLDER}')
+        end
+      end
     end
   end
 
@@ -379,7 +524,7 @@ describe LogStash::Config::Mixin do
           plugin_class.new(
             "oneString" => "${notExistingVar:foo}",
             "oneBoolean" => "${notExistingVar:true}",
-            "oneArray" => [ "first array value", "${notExistingVar:foo}", "${notExistingVar:}", "${notExistingVar: }", "${notExistingVar:foo bar}" ],
+            "oneArray" => ["first array value", "${notExistingVar:foo}", "${notExistingVar:}", "${notExistingVar: }", "${notExistingVar:foo bar}"],
             "oneHash" => { "key" => "${notExistingVar:foo}" }
           )
         end
@@ -410,7 +555,7 @@ describe LogStash::Config::Mixin do
         plugin_class.new(
           "oneString" => "${FunString:foo}",
           "oneBoolean" => "${FunBool:false}",
-          "oneArray" => [ "first array value", "${FunString:foo}" ],
+          "oneArray" => ["first array value", "${FunString:foo}"],
           "oneHash" => { "key1" => "${FunString:foo}", "key2" => "${FunString} is ${FunBool}", "key3" => "${FunBool:false} or ${funbool:false}" },
           "nestedHash" => { "level1" => { "key1" => "http://${FunString}:8080/blah.txt" } },
           "nestedArray" => { "level1" => [{ "key1" => "http://${FunString}:8080/blah.txt" }, { "key2" => "http://${FunString}:8080/foo.txt" }] },
@@ -419,9 +564,10 @@ describe LogStash::Config::Mixin do
       end
 
       it "should use the value in the variable" do
+        skip("This test fails on Windows, tracked in https://github.com/elastic/logstash/issues/10454")
         expect(subject.oneString).to(be == "fancy")
         expect(subject.oneBoolean).to(be_truthy)
-        expect(subject.oneArray).to(be == [ "first array value", "fancy" ])
+        expect(subject.oneArray).to(be == ["first array value", "fancy"])
         expect(subject.oneHash).to(be == { "key1" => "fancy", "key2" => "fancy is true", "key3" => "true or false" })
         expect(subject.nestedHash).to(be == { "level1" => { "key1" => "http://fancy:8080/blah.txt" } })
         expect(subject.nestedArray).to(be == { "level1" => [{ "key1" => "http://fancy:8080/blah.txt" }, { "key2" => "http://fancy:8080/foo.txt" }] })
diff --git a/logstash-core/spec/logstash/config/pipeline_config_spec.rb b/logstash-core/spec/logstash/config/pipeline_config_spec.rb
deleted file mode 100644
index d7ed1c565..000000000
--- a/logstash-core/spec/logstash/config/pipeline_config_spec.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-# encoding: utf-8
-require "logstash/config/pipeline_config"
-require "logstash/config/source/local"
-
-describe LogStash::Config::PipelineConfig do
-  let(:source) { LogStash::Config::Source::Local }
-  let(:pipeline_id) { :main }
-  let(:ordered_config_parts) do
-    [
-      org.logstash.common.SourceWithMetadata.new("file", "/tmp/1", 0, 0, "input { generator1 }"),
-      org.logstash.common.SourceWithMetadata.new("file", "/tmp/2", 0, 0,  "input { generator2 }"),
-      org.logstash.common.SourceWithMetadata.new("file", "/tmp/3", 0, 0, "input { generator3 }"),
-      org.logstash.common.SourceWithMetadata.new("file", "/tmp/4", 0, 0, "input { generator4 }"),
-      org.logstash.common.SourceWithMetadata.new("file", "/tmp/5", 0, 0, "input { generator5 }"),
-      org.logstash.common.SourceWithMetadata.new("file", "/tmp/6", 0, 0, "input { generator6 }"),
-      org.logstash.common.SourceWithMetadata.new("string", "config_string", 0, 0, "input { generator1 }"),
-    ]
-  end
-
-  let(:unordered_config_parts) { ordered_config_parts.shuffle }
-  let(:settings) { LogStash::SETTINGS }
-
-  subject { described_class.new(source, pipeline_id, unordered_config_parts, settings) }
-
-  it "returns the source" do
-    expect(subject.source).to eq(source)
-  end
-
-  it "returns the pipeline id" do
-    expect(subject.pipeline_id).to eq(pipeline_id)
-  end
-
-  it "returns the sorted config parts" do
-    expect(subject.config_parts).to eq(ordered_config_parts)
-  end
-
-  it "returns the config_hash" do
-    expect(subject.config_hash).not_to be_nil
-  end
-
-  it "returns the merged `ConfigPart#config_string`" do
-    expect(subject.config_string).to eq(ordered_config_parts.collect(&:text).join("\n"))
-  end
-
-  it "records when the config was read" do
-    expect(subject.read_at).to be <= Time.now
-  end
-
-  it "does object equality on config_hash and pipeline_id" do
-    another_exact_pipeline = described_class.new(source, pipeline_id, ordered_config_parts, settings)
-    expect(subject).to eq(another_exact_pipeline)
-
-    not_matching_pipeline = described_class.new(source, pipeline_id, [], settings)
-    expect(subject).not_to eq(not_matching_pipeline)
-
-    not_same_pipeline_id = described_class.new(source, :another_pipeline, unordered_config_parts, settings)
-    expect(subject).not_to eq(not_same_pipeline_id)
-  end
-
-  describe "#system?" do
-    context "when the pipeline is a system pipeline" do
-      let(:settings) { mock_settings({ "pipeline.system" => true })}
-
-      it "returns true if the pipeline is a system pipeline" do
-        expect(subject.system?).to be_truthy
-      end
-    end
-
-    context "when is not a system pipeline" do
-      it "returns false if the pipeline is not a system pipeline" do
-        expect(subject.system?).to be_falsey
-      end
-    end
-  end
-end
diff --git a/logstash-core/spec/logstash/config/source/local_spec.rb b/logstash-core/spec/logstash/config/source/local_spec.rb
index 2d5574839..841e6999e 100644
--- a/logstash-core/spec/logstash/config/source/local_spec.rb
+++ b/logstash-core/spec/logstash/config/source/local_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/config/source/local"
 require "rspec/expectations"
 require "stud/temporary"
@@ -29,7 +45,7 @@ describe LogStash::Config::Source::Local::ConfigPathLoader do
   context "no configs" do
     context "in the directory" do
       let(:directory) do
-        p =  Stud::Temporary.pathname
+        p = Stud::Temporary.pathname
         FileUtils.mkdir_p(p)
         p
       end
@@ -41,7 +57,7 @@ describe LogStash::Config::Source::Local::ConfigPathLoader do
 
     context "target file doesn't exist" do
       let(:directory) do
-        p =  Stud::Temporary.pathname
+        p = Stud::Temporary.pathname
         FileUtils.mkdir_p(p)
         ::File.join(p, "ls.conf")
       end
@@ -289,9 +305,7 @@ describe LogStash::Config::Source::Local do
     let(:settings) do
       mock_settings(
         "config.string" => "#{filter_block} #{output_block}",
-        "path.config" => config_file,
-        "modules.cli" => [],
-        "modules" => []
+        "path.config" => config_file
       )
     end
 
@@ -303,7 +317,7 @@ describe LogStash::Config::Source::Local do
 
   context "when only the `config.string` is set" do
     let(:settings) do
-      mock_settings( "config.string" => filter_block)
+      mock_settings("config.string" => filter_block)
     end
 
     it "returns a config" do
@@ -314,7 +328,7 @@ describe LogStash::Config::Source::Local do
   context "when only the `path.config` is set" do
     let(:config_file) { temporary_file(input_block) }
     let(:settings) do
-      mock_settings( "path.config" => config_file)
+      mock_settings("path.config" => config_file)
     end
 
     it "returns a config" do
@@ -342,7 +356,7 @@ describe LogStash::Config::Source::Local do
     end
 
     let(:settings) do
-      mock_settings( "path.config" => remote_url)
+      mock_settings("path.config" => remote_url)
     end
 
     it "returns a config" do
@@ -373,7 +387,7 @@ describe LogStash::Config::Source::Local do
         file.close # we need to flush the write
         path
       end
-      let(:settings) { mock_settings( "path.config" => config_path) }
+      let(:settings) { mock_settings("path.config" => config_path) }
 
       it "doesn't add anything" do
         expect(subject.pipeline_configs.first.config_string).not_to include(LogStash::Config::Defaults.output, LogStash::Config::Defaults.input)
@@ -381,7 +395,7 @@ describe LogStash::Config::Source::Local do
     end
 
     context "when the input block is missing" do
-      let(:settings) { mock_settings( "config.string" => "#{filter_block} #{output_block}") }
+      let(:settings) { mock_settings("config.string" => "#{filter_block} #{output_block}") }
 
       it "add stdin input" do
         expect(subject.pipeline_configs.first.config_string).to include(LogStash::Config::Defaults.input)
@@ -389,7 +403,7 @@ describe LogStash::Config::Source::Local do
     end
 
     context "when the output block is missing" do
-      let(:settings) { mock_settings( "config.string" => "#{input_block} #{filter_block}") }
+      let(:settings) { mock_settings("config.string" => "#{input_block} #{filter_block}") }
 
       it "add stdout output" do
         expect(subject.pipeline_configs.first.config_string).to include(LogStash::Config::Defaults.output)
@@ -397,7 +411,7 @@ describe LogStash::Config::Source::Local do
     end
 
     context "when both the output block and input block are missing" do
-      let(:settings) { mock_settings( "config.string" => "#{filter_block}") }
+      let(:settings) { mock_settings("config.string" => "#{filter_block}") }
 
       it "add stdin and output" do
         expect(subject.pipeline_configs.first.config_string).to include(LogStash::Config::Defaults.output, LogStash::Config::Defaults.input)
@@ -405,7 +419,7 @@ describe LogStash::Config::Source::Local do
     end
 
     context "when it has an input and an output" do
-      let(:settings) { mock_settings( "config.string" => "#{input_block} #{filter_block} #{output_block}") }
+      let(:settings) { mock_settings("config.string" => "#{input_block} #{filter_block} #{output_block}") }
 
       it "doesn't add anything" do
         expect(subject.pipeline_configs.first.config_string).not_to include(LogStash::Config::Defaults.output, LogStash::Config::Defaults.input)
diff --git a/logstash-core/spec/logstash/config/source/multi_local_spec.rb b/logstash-core/spec/logstash/config/source/multi_local_spec.rb
index b4d6de0ca..a8e9b4a37 100644
--- a/logstash-core/spec/logstash/config/source/multi_local_spec.rb
+++ b/logstash-core/spec/logstash/config/source/multi_local_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/config/source/multi_local"
 require "rspec/expectations"
 require "stud/temporary"
@@ -51,7 +67,7 @@ describe LogStash::Config::Source::MultiLocal do
 
     context "when `pipelines.yml` is only comments" do
       before(:each) do
-        allow(subject).to receive(:read_pipelines_from_yaml).and_return(::YAML.load("# blah\n# blah\n# blah\n"))
+        allow(subject).to receive(:read_pipelines_from_yaml).and_return(::YAML.load("# blah\n# blah\n# blah\n", fallback: false))
       end
       it "returns true with messages" do
         expect(subject.config_conflict?).to be_truthy
@@ -129,12 +145,25 @@ describe LogStash::Config::Source::MultiLocal do
   end
 
   describe "#pipeline_configs" do
+
+#     let(:config_string) {
+#      "input {
+#         udp {
+#           port => 5555 # intentional comment contains \"${UDP_DEV_PORT}\" variable, shouldn't break functionalities
+#           host => \"127.0.0.1\"
+#         }
+#         # another intentional comment contains \"${UDP_PROD_HOST}\" variable, shouldn't break functionalities
+#       }
+#       output {}"
+#     }
+    let(:config_string) { "input {} output {}" }
     let(:retrieved_pipelines) do
       [
-        { "pipeline.id" => "main", "config.string" => "input {} output {}" },
-        { "pipeline.id" => "backup", "config.string" => "input {} output {}" }
+        { "pipeline.id" => "main", "config.string" => config_string },
+        { "pipeline.id" => "backup", "config.string" => config_string }
       ]
     end
+
     before(:each) do
       allow(subject).to receive(:retrieve_yaml_pipelines).and_return(retrieved_pipelines)
     end
@@ -142,13 +171,13 @@ describe LogStash::Config::Source::MultiLocal do
     it "should return instances of PipelineConfig" do
       configs = subject.pipeline_configs
       expect(configs).to be_a(Array)
-      expect(subject.pipeline_configs.first).to be_a(::LogStash::Config::PipelineConfig)
-      expect(subject.pipeline_configs.last).to be_a(::LogStash::Config::PipelineConfig)
+      expect(configs.first).to be_a(::LogStash::Config::PipelineConfig)
+      expect(configs.last).to be_a(::LogStash::Config::PipelineConfig)
     end
 
     context "using non pipeline related settings" do
       let(:retrieved_pipelines) do [
-          { "pipeline.id" => "main", "config.string" => "", "http.port" => 22222 },
+          { "pipeline.id" => "main", "config.string" => "", "api.http.port" => 22222 },
         ]
       end
       it "should raise and error" do
@@ -164,7 +193,17 @@ describe LogStash::Config::Source::MultiLocal do
       it "should not raise an error" do
         expect { subject.pipeline_configs }.not_to raise_error(ArgumentError)
       end
+    end
 
+    context 'using dead letter queue settings with storage and retention policies' do
+      let(:retrieved_pipelines) do [
+          { "pipeline.id" => "main", "path.dead_letter_queue" => "/tmp", "dead_letter_queue.max_bytes" => 10000,
+            "dead_letter_queue.storage_policy" => "drop_newer", "dead_letter_queue.retain.age" => "5d" },
+      ]
+      end
+      it "should not raise an error" do
+        expect { subject.pipeline_configs }.not_to raise_error(ArgumentError)
+      end
     end
   end
 end
diff --git a/logstash-core/spec/logstash/config/source_loader_spec.rb b/logstash-core/spec/logstash/config/source_loader_spec.rb
index 8f3fad052..87d812d9f 100644
--- a/logstash-core/spec/logstash/config/source_loader_spec.rb
+++ b/logstash-core/spec/logstash/config/source_loader_spec.rb
@@ -1,11 +1,27 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/config/source_loader"
 require "logstash/config/source/base"
 require_relative "../../support/helpers"
 
 def temporary_pipeline_config(id, source, reader = "random_reader")
   config_part = org.logstash.common.SourceWithMetadata.new("local", "...", 0, 0, "input {} output {}")
-  LogStash::Config::PipelineConfig.new(source, id, [config_part], LogStash::SETTINGS)
+  org.logstash.config.ir.PipelineConfig.new(source, id.to_sym, [config_part], LogStash::SETTINGS)
 end
 
 class DummySource < LogStash::Config::Source::Base
diff --git a/logstash-core/spec/logstash/config/string_escape_spec.rb b/logstash-core/spec/logstash/config/string_escape_spec.rb
index a5f345688..d7e6db4ac 100644
--- a/logstash-core/spec/logstash/config/string_escape_spec.rb
+++ b/logstash-core/spec/logstash/config/string_escape_spec.rb
@@ -1,3 +1,19 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 require "logstash/config/string_escape"
 
@@ -11,6 +27,7 @@ describe LogStash::Config::StringEscape do
     "\\r" => "\r",
     "\\t" => "\t",
     "\\\\" => "\\",
+    "\\0" => "\x00",
   }
 
   table.each do |input, expected|
diff --git a/logstash-core/spec/logstash/converge_result_spec.rb b/logstash-core/spec/logstash/converge_result_spec.rb
index ea13a0bb1..c084efccf 100644
--- a/logstash-core/spec/logstash/converge_result_spec.rb
+++ b/logstash-core/spec/logstash/converge_result_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/pipeline_action/stop"
 require "spec_helper"
 
@@ -8,7 +24,6 @@ describe LogStash::ConvergeResult do
 
   subject { described_class.new(expected_actions_count) }
 
-
   context "When the action was executed" do
     it "returns the time of execution" do
       expect(LogStash::ConvergeResult::FailedAction.new("testing").executed_at.class).to eq(LogStash::Timestamp)
diff --git a/logstash-core/spec/logstash/elasticsearch_client_spec.rb b/logstash-core/spec/logstash/elasticsearch_client_spec.rb
deleted file mode 100644
index 52356aa48..000000000
--- a/logstash-core/spec/logstash/elasticsearch_client_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# encoding: utf-8
-#
-require "logstash/elasticsearch_client"
-
-describe LogStash::ElasticsearchClient do
-  describe LogStash::ElasticsearchClient::RubyClient do
-    let(:settings) { {} }
-    let(:logger) { nil }
-
-    describe "ssl option handling" do
-      context "when using a string for ssl.enabled" do
-        let(:settings) do
-          { "var.elasticsearch.ssl.enabled" => "true" }
-        end
-
-        it "should set the ssl options" do
-          expect(Elasticsearch::Client).to receive(:new) do |args|
-            expect(args[:ssl]).to_not be_empty
-          end
-          described_class.new(settings, logger)
-        end
-      end
-
-      context "when using a boolean for ssl.enabled" do
-        let(:settings) do
-          { "var.elasticsearch.ssl.enabled" => true }
-        end
-
-        it "should set the ssl options" do
-          expect(Elasticsearch::Client).to receive(:new) do |args|
-            expect(args[:ssl]).to_not be_empty
-          end
-          described_class.new(settings, logger)
-        end
-      end
-    end
-  end
-end
diff --git a/logstash-core/spec/logstash/environment_spec.rb b/logstash-core/spec/logstash/environment_spec.rb
index d64ed3941..e95e98f77 100644
--- a/logstash-core/spec/logstash/environment_spec.rb
+++ b/logstash-core/spec/logstash/environment_spec.rb
@@ -1,14 +1,28 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/environment"
 
 describe LogStash::Environment do
-
   context "when loading jars dependencies" do
-
     let(:default_jars_location)    { File.join("vendor", "jar-dependencies") }
-    let(:default_runtime_location) { File.join(default_jars_location,"runtime-jars","*.jar") }
-    let(:default_test_location)    { File.join(default_jars_location,"test-jars","*.jar") }
+    let(:default_runtime_location) { File.join(default_jars_location, "runtime-jars", "*.jar") }
+    let(:default_test_location)    { File.join(default_jars_location, "test-jars", "*.jar") }
 
     it "find runtime jars in the default location" do
       expect(subject).to receive(:find_jars).with(default_runtime_location).and_return([])
@@ -21,8 +35,7 @@ describe LogStash::Environment do
     end
 
     context "when loading a jar file" do
-
-      let(:dummy_jar_file) { File.join(default_jars_location,"runtime-jars","elasticsearch.jar") }
+      let(:dummy_jar_file) { File.join(default_jars_location, "runtime-jars", "elasticsearch.jar") }
 
       it "requires the jar files if there are jars to load" do
         expect(subject).to receive(:find_jars).with(default_runtime_location).and_return([dummy_jar_file])
@@ -44,12 +57,11 @@ describe LogStash::Environment do
     after(:each) { $LOAD_PATH.delete(path) }
 
     it "should add the path to $LOAD_PATH" do
-      expect{subject.add_plugin_path(path)}.to change{$LOAD_PATH.size}.by(1)
+      expect {subject.add_plugin_path(path)}.to change {$LOAD_PATH.size}.by(1)
       expect($LOAD_PATH).to include(path)
     end
   end
 
-
   describe "OS detection" do
     windows_host_os = %w(bccwin cygwin mingw mswin wince)
     linux_host_os = %w(linux)
@@ -57,14 +69,14 @@ describe LogStash::Environment do
     context "windows" do
       windows_host_os.each do |host|
         it "#{host} returns true" do
-          expect(RbConfig::CONFIG).to receive(:[]).with("host_os").and_return(host)
+          allow(LogStash::Environment).to receive(:host_os).and_return(host)
           expect(LogStash::Environment.windows?).to be_truthy
         end
       end
 
       linux_host_os.each do |host|
         it "#{host} returns false" do
-          expect(RbConfig::CONFIG).to receive(:[]).with("host_os").and_return(host)
+          allow(LogStash::Environment).to receive(:host_os).and_return(host)
           expect(LogStash::Environment.windows?).to be_falsey
         end
       end
@@ -73,14 +85,14 @@ describe LogStash::Environment do
     context "Linux" do
       windows_host_os.each do |host|
         it "#{host} returns true" do
-          expect(RbConfig::CONFIG).to receive(:[]).with("host_os").and_return(host)
+          allow(LogStash::Environment).to receive(:host_os).and_return(host)
           expect(LogStash::Environment.linux?).to be_falsey
         end
       end
 
       linux_host_os.each do |host|
         it "#{host} returns false" do
-          expect(RbConfig::CONFIG).to receive(:[]).with("host_os").and_return(host)
+          allow(LogStash::Environment).to receive(:host_os).and_return(host)
           expect(LogStash::Environment.linux?).to be_truthy
         end
       end
diff --git a/logstash-core/spec/logstash/event_dispatcher_spec.rb b/logstash-core/spec/logstash/event_dispatcher_spec.rb
index dfe24131e..b1f5431d0 100644
--- a/logstash-core/spec/logstash/event_dispatcher_spec.rb
+++ b/logstash-core/spec/logstash/event_dispatcher_spec.rb
@@ -1,5 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 describe LogStash::EventDispatcher do
   class DummyEmitter
     attr_reader :dispatcher
diff --git a/logstash-core/spec/logstash/event_spec.rb b/logstash-core/spec/logstash/event_spec.rb
index c4aa25f2b..2c8a556e1 100644
--- a/logstash-core/spec/logstash/event_spec.rb
+++ b/logstash-core/spec/logstash/event_spec.rb
@@ -1,8 +1,23 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 require "spec_helper"
 require "logstash/util"
-require "logstash/event"
+
 require "json"
 require "java"
 
@@ -136,9 +151,9 @@ describe LogStash::Event do
     # BigDecimal is now natively converted by JRuby, see https://github.com/elastic/logstash/pull/4838
     it "should set BigDecimal" do
       e = LogStash::Event.new()
-      e.set("[foo]", BigDecimal.new(1))
+      e.set("[foo]", BigDecimal(1))
       expect(e.get("foo")).to be_kind_of(BigDecimal)
-      expect(e.get("foo")).to eq(BigDecimal.new(1))
+      expect(e.get("foo")).to eq(BigDecimal(1))
     end
 
     it "should set RubyInteger" do
@@ -177,6 +192,15 @@ describe LogStash::Event do
         expect { e.set('[', 'value') }.to raise_exception(::RuntimeError)
       end
     end
+
+    context 'with map value whose keys have FieldReference-special characters' do
+      let(:event) { LogStash::Event.new }
+      let(:value) { {"this[field]" => "okay"} }
+      it 'sets the value correctly' do
+        event.set('[some][field]', value.dup)
+        expect(event.get('[some][field]')).to eq(value)
+      end
+    end
   end
 
   context "timestamp" do
@@ -223,7 +247,6 @@ describe LogStash::Event do
     end
   end
 
-
   # TODO(talevy): migrate tests to Java. no reason to test logging logic in ruby when it is being
   #               done in java land.
 
@@ -299,27 +322,26 @@ describe LogStash::Event do
       end
     end
 
-    it "should raise TypeError on nil string" do
-      expect{LogStash::Event.from_json(nil)}.to raise_error TypeError
-    end
-
     it "should consistently handle nil" do
-      blank_strings.each do |s|
-        expect{LogStash::Event.from_json(nil)}.to raise_error
-        expect{LogStash::Event.new(LogStash::Json.load(nil))}.to raise_error
-      end
+      expect {LogStash::Event.from_json(nil)}.to raise_error(TypeError)
+      expect {LogStash::Event.new(LogStash::Json.load(nil))}.to raise_error # java.lang.ClassCastException
     end
 
     it "should consistently handle bare string" do
       bare_strings.each do |s|
-        expect{LogStash::Event.from_json(s)}.to raise_error LogStash::Json::ParserError
-        expect{LogStash::Event.new(LogStash::Json.load(s))}.to raise_error LogStash::Json::ParserError
+        expect {LogStash::Event.from_json(s)}.to raise_error LogStash::Json::ParserError
+        expect {LogStash::Event.new(LogStash::Json.load(s))}.to raise_error LogStash::Json::ParserError
        end
     end
+
+    it "should allow to pass a block that acts as an event factory" do
+      events = LogStash::Event.from_json(source_json) { |data| LogStash::Event.new(data).tap { |e| e.set('answer', 42) } }
+      expect(events.size).to eql 1
+      expect(events.first.get('answer')).to eql 42
+    end
   end
 
   context "initialize" do
-
     it "should accept Ruby Hash" do
       e = LogStash::Event.new({"foo" => 1, TIMESTAMP => "2015-05-28T23:02:05.350Z"})
       expect(e.get("foo")).to eq(1)
@@ -336,6 +358,11 @@ describe LogStash::Event do
       expect(e.timestamp.to_iso8601).to eq("2016-05-28T23:02:05.350Z")
     end
 
+    it 'accepts maps whose keys contain FieldReference-special characters' do
+      e = LogStash::Event.new({"nested" => {"i][egal" => "okay"}, "n[0]" => "bene"})
+      expect(e.get('nested')).to eq({"i][egal" => "okay"})
+      expect(e.to_hash).to include("n[0]" => "bene")
+    end
   end
 
   context "method missing exception messages" do
@@ -346,60 +373,66 @@ describe LogStash::Event do
     end
   end
 
-  describe "#clone" do
-    let(:fieldref) { "[@metadata][fancy]" }
-    let(:event1) { LogStash::Event.new("hello" => "world", "@metadata" => { "fancy" => "pants" }) }
-    let(:event2) { LogStash::Event.new("hello" => "world", "@metadata" => { "fancy" => {"fancy2" => "pants2"} }) }
-    let(:event3) { LogStash::Event.new("hello" => "world", "@metadata" => { "fancy" => {"fancy2" => {"fancy3" => "pants2"}} }) }
-    let(:event4) { LogStash::Event.new("hello" => "world", "@metadata" => { "fancy" => {"fancy2" => ["pants1", "pants2"]} }) }
-    let(:event5) { LogStash::Event.new("hello" => "world", "@metadata" => { "fancy" => "pants", "smarty" => "pants2" }) }
+  %i(dup clone).each do |clone_method|
+    describe "##{clone_method}" do
 
-    it "should clone metadata fields" do
-      cloned = event1.clone
-      expect(cloned.get(fieldref)).to eq("pants")
-      expect(cloned.to_hash_with_metadata).to include("@metadata")
-    end
+      let(:fieldref) { "[@metadata][fancy]" }
+      let(:event1) { LogStash::Event.new("hello" => "world", "@metadata" => { "fancy" => "pants" }) }
+      let(:event2) { LogStash::Event.new("hello" => "world", "@metadata" => { "fancy" => {"fancy2" => "pants2"} }) }
+      let(:event3) { LogStash::Event.new("hello" => "world", "@metadata" => { "fancy" => {"fancy2" => {"fancy3" => "pants2"}} }) }
+      let(:event4) { LogStash::Event.new("hello" => "world", "@metadata" => { "fancy" => {"fancy2" => ["pants1", "pants2"]} }) }
+      let(:event5) { LogStash::Event.new("hello" => "world", "@metadata" => { "fancy" => "pants", "smarty" => "pants2" }) }
 
-    it "should clone metadata fields with nested json" do
-      cloned = event2.clone
-      expect(cloned.get(fieldref)).to eq({"fancy2" => "pants2"})
-      expect(cloned.get("hello")).to eq("world")
-      expect(cloned.to_hash).not_to include("@metadata")
-      expect(cloned.to_hash_with_metadata).to include("@metadata")
-    end
+      acting = clone_method == :dup ? "duplicates" : "clones"
+      acted = clone_method == :dup ? "duplicated" : "cloned"
 
-    it "should clone metadata fields with 2-level nested json" do
-      cloned = event3.clone
-      expect(cloned.get(fieldref)).to eq({"fancy2" => {"fancy3" => "pants2"}})
-      expect(cloned.to_hash).not_to include("@metadata")
-      expect(cloned.to_hash_with_metadata).to include("@metadata")
-    end
+      it "#{acting} metadata fields" do
+        cloned = event1.public_send(clone_method)
+        expect(cloned.get(fieldref)).to eq("pants")
+        expect(cloned.to_hash_with_metadata).to include("@metadata")
+      end
 
-    it "should clone metadata fields with nested json and array value" do
-      cloned = event4.clone
-      expect(cloned.get(fieldref)).to eq({"fancy2" => ["pants1", "pants2"]})
-      expect(cloned.to_hash_with_metadata).to include("@metadata")
-    end
+      it "#{acting} metadata fields with nested json" do
+        cloned = event2.public_send(clone_method)
+        expect(cloned.get(fieldref)).to eq({"fancy2" => "pants2"})
+        expect(cloned.get("hello")).to eq("world")
+        expect(cloned.to_hash).not_to include("@metadata")
+        expect(cloned.to_hash_with_metadata).to include("@metadata")
+      end
 
-    it "should clone metadata fields with multiple keys" do
-      cloned = event5.clone
-      expect(cloned.get(fieldref)).to eq("pants")
-      expect(cloned.get("[@metadata][smarty]")).to eq("pants2")
-      expect(cloned.to_hash_with_metadata).to include("@metadata")
-    end
+      it "#{acting} metadata fields with 2-level nested json" do
+        cloned = event3.public_send(clone_method)
+        expect(cloned.get(fieldref)).to eq({"fancy2" => {"fancy3" => "pants2"}})
+        expect(cloned.to_hash).not_to include("@metadata")
+        expect(cloned.to_hash_with_metadata).to include("@metadata")
+      end
 
-    it "mutating cloned event should not affect the original event" do
-      cloned = event1.clone
-      cloned.set("hello", "foobar")
-      expect(cloned.get("hello")).to eq("foobar")
-      expect(event1.get("hello")).to eq("world")
-    end
+      it "#{acting} metadata fields with nested json and array value" do
+        cloned = event4.public_send(clone_method)
+        expect(cloned.get(fieldref)).to eq({"fancy2" => ["pants1", "pants2"]})
+        expect(cloned.to_hash_with_metadata).to include("@metadata")
+      end
 
-    it "mutating cloned event's metadata should not affect the original event metadata" do
-      cloned = event1.clone
-      cloned.set("[@metadata][fancy]", "foobar")
-      expect(cloned.get("[@metadata][fancy]")).to eq("foobar")
-      expect(event1.get("[@metadata][fancy]")).to eq("pants")
+      it "#{acting} metadata fields with multiple keys" do
+        cloned = event5.public_send(clone_method)
+        expect(cloned.get(fieldref)).to eq("pants")
+        expect(cloned.get("[@metadata][smarty]")).to eq("pants2")
+        expect(cloned.to_hash_with_metadata).to include("@metadata")
+      end
+
+      it "mutating #{acted} event should not affect the original event" do
+        cloned = event1.public_send(clone_method)
+        cloned.set("hello", "foobar")
+        expect(cloned.get("hello")).to eq("foobar")
+        expect(event1.get("hello")).to eq("world")
+      end
+
+      it "mutating #{acted} event's metadata should not affect the original event metadata" do
+        cloned = event1.public_send(clone_method)
+        cloned.set("[@metadata][fancy]", "foobar")
+        expect(cloned.get("[@metadata][fancy]")).to eq("foobar")
+        expect(event1.get("[@metadata][fancy]")).to eq("pants")
+      end
     end
   end
 end
diff --git a/logstash-core/spec/logstash/execution_context_factory_spec.rb b/logstash-core/spec/logstash/execution_context_factory_spec.rb
new file mode 100644
index 000000000..e20fd6cb6
--- /dev/null
+++ b/logstash-core/spec/logstash/execution_context_factory_spec.rb
@@ -0,0 +1,59 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require "spec_helper"
+
+describe LogStash::Plugins::ExecutionContextFactory do
+  let(:pipeline) { double('Pipeline') }
+  let(:agent) { double('Agent') }
+  let(:inner_dlq_writer) { nil }
+
+  subject(:factory) { described_class.new(agent, pipeline, inner_dlq_writer) }
+
+  context '#create' do
+    let(:plugin_id) { SecureRandom.uuid }
+    let(:plugin_type) { 'input' }
+
+    context 'the resulting instance' do
+      subject(:instance) { factory.create(plugin_id, plugin_type) }
+
+      it 'retains the pipeline from the factory' do
+        expect(instance.pipeline).to be(pipeline)
+      end
+
+      it 'retains the agent from the factory' do
+        expect(instance.agent).to be(agent)
+      end
+
+      it 'has a dlq_writer' do
+        expect(instance.dlq_writer).to_not be_nil
+      end
+
+      context 'dlq_writer' do
+        subject(:instance_dlq_writer) { instance.dlq_writer }
+
+        it 'retains the plugin id' do
+          expect(instance_dlq_writer.plugin_id).to eq(plugin_id)
+        end
+
+        it 'retains the plugin type' do
+          expect(instance_dlq_writer.plugin_type).to eq(plugin_type)
+        end
+      end
+    end
+  end
+end
diff --git a/logstash-core/spec/logstash/execution_context_spec.rb b/logstash-core/spec/logstash/execution_context_spec.rb
index a34c03779..4ec9acb21 100644
--- a/logstash-core/spec/logstash/execution_context_spec.rb
+++ b/logstash-core/spec/logstash/execution_context_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 
 describe LogStash::ExecutionContext do
@@ -14,7 +30,7 @@ describe LogStash::ExecutionContext do
     allow(pipeline).to receive(:pipeline_id).and_return(pipeline_id)
   end
 
-  subject { described_class.new(pipeline, agent, plugin_id, plugin_type, dlq_writer) }
+  subject { described_class.new(pipeline, agent, dlq_writer) }
 
   it "returns the `pipeline_id`" do
     expect(subject.pipeline_id).to eq(pipeline_id)
@@ -28,9 +44,7 @@ describe LogStash::ExecutionContext do
     expect(subject.agent).to eq(agent)
   end
 
-  it "returns the plugin-specific dlq writer" do
-    expect(subject.dlq_writer.plugin_type).to eq(plugin_type)
-    expect(subject.dlq_writer.plugin_id).to eq(plugin_id)
-    expect(subject.dlq_writer.inner_writer).to eq(dlq_writer)
+  it "returns the dlq writer" do
+    expect(subject.dlq_writer).to be(dlq_writer)
   end
 end
diff --git a/logstash-core/spec/logstash/filter_delegator_spec.rb b/logstash-core/spec/logstash/filter_delegator_spec.rb
index 36d7605b2..8c5524cf5 100644
--- a/logstash-core/spec/logstash/filter_delegator_spec.rb
+++ b/logstash-core/spec/logstash/filter_delegator_spec.rb
@@ -1,12 +1,26 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require 'logstash/instrument/collector'
 require "logstash/filter_delegator"
-require "logstash/event"
 require "support/shared_contexts"
 
 describe LogStash::FilterDelegator do
-
   include_context "execution_context"
 
   let(:filter_id) { "my-filter" }
@@ -41,7 +55,8 @@ describe LogStash::FilterDelegator do
         config_name "super_plugin"
         config :host, :validate => :string
         def register; end
-        def flush(options = {}); @events ; end
+        def flush(options = {}); @events; end
+
         def filter(event)
           @events ||= []
           @events << event
@@ -70,7 +85,6 @@ describe LogStash::FilterDelegator do
     end
 
     context "when the filter buffer events" do
-
       it "has incremented :in" do
         subject.multi_filter(events)
         expect(collector.snapshot_metric.metric_store.get_with_path("/null")[:null]["my-filter".to_sym][:events][:in].value).to eq(events.size)
@@ -88,7 +102,7 @@ describe LogStash::FilterDelegator do
           config_name "super_plugin"
           config :host, :validate => :string
           def register; end
-          def flush(options = {}); @events ; end
+          def flush(options = {}); @events; end
 
           # naive split filter implementation
           def filter(event)
@@ -117,6 +131,7 @@ describe LogStash::FilterDelegator do
         config_name "super_plugin"
         config :host, :validate => :string
         def register; end
+
         def filter(event)
           event
         end
@@ -144,5 +159,4 @@ describe LogStash::FilterDelegator do
       expect(subject.config_name).to eq("super_plugin")
     end
   end
-
 end
diff --git a/logstash-core/spec/logstash/filters/base_spec.rb b/logstash-core/spec/logstash/filters/base_spec.rb
index d943567d6..f634d66f5 100644
--- a/logstash-core/spec/logstash/filters/base_spec.rb
+++ b/logstash-core/spec/logstash/filters/base_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/json"
 require 'support/pipeline/pipeline_helpers'
@@ -20,8 +36,8 @@ describe LogStash::Filters::Base do
   subject {LogStash::Filters::Base.new({})}
 
   it "should provide method interfaces to override" do
-    expect{subject.register}.to raise_error(RuntimeError)
-    expect{subject.filter(:foo)}.to raise_error(RuntimeError)
+    expect {subject.register}.to raise_error(RuntimeError)
+    expect {subject.filter(:foo)}.to raise_error(RuntimeError)
   end
 
   it "should provide class public API" do
@@ -31,8 +47,8 @@ describe LogStash::Filters::Base do
   end
 
   context "multi_filter" do
-    let(:event1){LogStash::Event.new}
-    let(:event2){LogStash::Event.new}
+    let(:event1) {LogStash::Event.new}
+    let(:event2) {LogStash::Event.new}
 
     it "should multi_filter without new events" do
       allow(subject).to receive(:filter) do |event, &block|
@@ -52,6 +68,17 @@ end
 
 describe LogStash::Filters::NOOP do
   extend PipelineHelpers
+  let(:settings) do
+    # settings is used by sample_one.
+    # This was originally set directly in sample_one and
+    # pipeline.workers was also set to 1. I am preserving
+    # this setting here for the sake of minimizing change
+    # but unsure if this is actually required.
+
+    s = LogStash::SETTINGS.clone
+    s.set_value("pipeline.workers", 1)
+    s
+  end
 
   describe "adding multiple values to one field" do
     config <<-CONFIG
@@ -64,7 +91,7 @@ describe LogStash::Filters::NOOP do
     CONFIG
 
     sample_one("example") do
-      insist { subject.get("new_field") } == ["new_value", "new_value_2"]
+      expect(subject.get("new_field")).to eq(["new_value", "new_value_2"])
     end
   end
 
@@ -78,7 +105,7 @@ describe LogStash::Filters::NOOP do
     CONFIG
 
     sample_one("type" => "noop") do
-      insist { subject.get("tags") } == ["test"]
+      expect(subject.get("tags")).to eq(["test"])
     end
   end
 
@@ -92,11 +119,11 @@ describe LogStash::Filters::NOOP do
     CONFIG
 
     sample_one("type" => "noop") do
-      insist { subject.get("tags") } == ["test"]
+      expect(subject.get("tags")).to eq(["test"])
     end
 
     sample_one("type" => "noop", "tags" => ["t1", "t2"]) do
-      insist { subject.get("tags") } == ["t1", "t2", "test"]
+      expect(subject.get("tags")).to eq(["t1", "t2", "test"])
     end
   end
 
@@ -110,11 +137,11 @@ describe LogStash::Filters::NOOP do
     CONFIG
 
     sample_one("type" => "noop") do
-      insist { subject.get("tags") } == ["bar"]
+      expect(subject.get("tags")).to eq(["bar"])
     end
 
     sample_one("type" => "noop", "tags" => "foo") do
-      insist { subject.get("tags") } == ["foo", "bar"]
+      expect(subject.get("tags")).to eq(["foo", "bar"])
     end
   end
 
@@ -129,7 +156,7 @@ describe LogStash::Filters::NOOP do
 
     sample_one("type" => "noop", "tags" => "foo") do
       # this is completely weird but seems to be already expected in other specs
-      insist { subject.get("tags") } == ["foo", "foo"]
+      expect(subject.get("tags")).to eq(["foo", "foo"])
     end
   end
 
@@ -143,19 +170,19 @@ describe LogStash::Filters::NOOP do
     CONFIG
 
     sample_one("type" => "noop") do
-      insist { subject.get("tags") } == ["test"]
+      expect(subject.get("tags")).to eq(["test"])
     end
 
     sample_one("type" => "noop", "tags" => ["t1"]) do
-      insist { subject.get("tags") } == ["t1", "test"]
+      expect(subject.get("tags")).to eq(["t1", "test"])
     end
 
     sample_one("type" => "noop", "tags" => ["t1", "t2"]) do
-      insist { subject.get("tags") } == ["t1", "t2", "test"]
+      expect(subject.get("tags")).to eq(["t1", "t2", "test"])
     end
 
     sample_one("type" => "noop", "tags" => ["t1", "t2", "t3"]) do
-      insist { subject.get("tags") } == ["t1", "t2", "t3", "test"]
+      expect(subject.get("tags")).to eq(["t1", "t2", "t3", "test"])
     end
   end
 
@@ -169,39 +196,39 @@ describe LogStash::Filters::NOOP do
     CONFIG
 
     sample_one("type" => "noop", "tags" => "foo") do
-      insist { subject.get("tags") } == ["foo"]
+      expect(subject.get("tags")).to eq(["foo"])
     end
 
     sample_one("type" => "noop", "tags" => "t2") do
-      insist { subject.get("tags") } == []
+      expect(subject.get("tags")).to be_empty
     end
 
     sample_one("type" => "noop", "tags" => ["t2"]) do
-      insist { subject.get("tags") } == []
+      expect(subject.get("tags")).to be_empty
     end
 
     sample_one("type" => "noop", "tags" => ["t4"]) do
-      insist { subject.get("tags") } == ["t4"]
+      expect(subject.get("tags")).to eq(["t4"])
     end
 
     sample_one("type" => "noop", "tags" => ["t1", "t2", "t3"]) do
-      insist { subject.get("tags") } == ["t1"]
+      expect(subject.get("tags")).to eq(["t1"])
     end
 
     # also test from Json deserialized data to test the handling of native Java collections by JrJackson
     # see https://github.com/elastic/logstash/issues/2261
     sample_one(LogStash::Json.load("{\"type\":\"noop\", \"tags\":[\"t1\", \"t2\", \"t3\"]}")) do
-      insist { subject.get("tags") } == ["t1"]
+      expect(subject.get("tags")).to eq(["t1"])
     end
 
     sample_one("type" => "noop", "tags" => ["t1", "t2"]) do
-      insist { subject.get("tags") } == ["t1"]
+      expect(subject.get("tags")).to eq(["t1"])
     end
 
     # also test from Json deserialized data to test the handling of native Java collections by JrJackson
     # see https://github.com/elastic/logstash/issues/2261
     sample_one(LogStash::Json.load("{\"type\":\"noop\", \"tags\":[\"t1\", \"t2\"]}")) do
-      insist { subject.get("tags") } == ["t1"]
+      expect(subject.get("tags")).to eq(["t1"])
     end
   end
 
@@ -215,13 +242,13 @@ describe LogStash::Filters::NOOP do
     CONFIG
 
     sample_one("type" => "noop", "tags" => ["t1", "goaway", "t3"], "blackhole" => "goaway") do
-      insist { subject.get("tags") } == ["t1", "t3"]
+      expect(subject.get("tags")).to eq(["t1", "t3"])
     end
 
     # also test from Json deserialized data to test the handling of native Java collections by JrJackson
     # see https://github.com/elastic/logstash/issues/2261
     sample_one(LogStash::Json.load("{\"type\":\"noop\", \"tags\":[\"t1\", \"goaway\", \"t3\"], \"blackhole\":\"goaway\"}")) do
-      insist { subject.get("tags") } == ["t1", "t3"]
+      expect(subject.get("tags")).to eq(["t1", "t3"])
     end
   end
 
@@ -235,18 +262,18 @@ describe LogStash::Filters::NOOP do
     CONFIG
 
     sample_one("type" => "noop", "t4" => "four") do
-      insist { subject }.include?("t4")
+      expect(subject).to include("t4")
     end
 
     sample_one("type" => "noop", "t1" => "one", "t2" => "two", "t3" => "three") do
-      insist { subject }.include?("t1")
-      reject { subject }.include?("t2")
-      reject { subject }.include?("t3")
+      expect(subject).to include("t1")
+      expect(subject).to_not include("t2")
+      expect(subject).to_not include("t3")
     end
 
     sample_one("type" => "noop", "t1" => "one", "t2" => "two") do
-      insist { subject }.include?("t1")
-      reject { subject }.include?("t2")
+      expect(subject).to include("t1")
+      expect(subject).to_not include("t2")
     end
   end
 
@@ -260,7 +287,7 @@ describe LogStash::Filters::NOOP do
     CONFIG
 
     sample_one("tags" => "foo") do
-      reject { subject }.include?("tags")
+      expect(subject).to_not include("tags")
     end
   end
 
@@ -274,9 +301,44 @@ describe LogStash::Filters::NOOP do
     CONFIG
 
     sample_one("type" => "noop", "t1" => {"t2" => "two", "t3" => "three"}) do
-      insist { subject }.include?("t1")
-      reject { subject }.include?("[t1][t2]")
-      insist { subject }.include?("[t1][t3]")
+      expect(subject).to include("t1")
+      expect(subject).to_not include("[t1][t2]")
+      expect(subject).to include("[t1][t3]")
+    end
+  end
+
+  describe "remove_field within @metadata" do
+    config <<-CONFIG
+    filter {
+      noop {
+        remove_field => ["[@metadata][f1]", "[@metadata][f2]", "[@metadata][f4][f5]"]
+      }
+    }
+    CONFIG
+
+    sample_one("type" => "noop", "@metadata" => {"f1" => "one", "f2" => { "f3" => "three"}, "f4" => { "f5" => "five", "f6" => "six"}, "f7" => "seven"}) do
+      expect(subject).to_not include("[@metadata][f1]")
+      expect(subject).to_not include("[@metadata][f2]")
+      expect(subject).to include("[@metadata][f4]")
+      expect(subject).to_not include("[@metadata][f4][f5]")
+      expect(subject).to include("[@metadata][f4][f6]")
+      expect(subject).to include("[@metadata][f7]")
+    end
+  end
+
+  describe "remove_field on @metadata" do
+    config <<-CONFIG
+    filter {
+      noop {
+        remove_field => ["[@metadata]"]
+      }
+    }
+    CONFIG
+
+    sample_one("type" => "noop", "@metadata" => {"f1" => "one", "f2" => { "f3" => "three"}}) do
+      expect(subject).to include("[@metadata]")
+      expect(subject).to_not include("[@metadata][f1]")
+      expect(subject).to_not include("[@metadata][f2]")
     end
   end
 
@@ -290,8 +352,8 @@ describe LogStash::Filters::NOOP do
     CONFIG
 
     sample_one("type" => "noop", "t1" => ["t2", "t3"]) do
-      insist { subject }.include?("t1")
-      insist { subject.get("[t1][0]") } == "t3"
+      expect(subject).to include("t1")
+      expect(subject.get("[t1][0]")).to eq("t3")
     end
   end
 
@@ -305,8 +367,8 @@ describe LogStash::Filters::NOOP do
     CONFIG
 
     sample_one("type" => "noop", "blackhole" => "go", "go" => "away") do
-      insist { subject }.include?("blackhole")
-      reject { subject }.include?("go")
+      expect(subject).to include("blackhole")
+      expect(subject).to_not include("go")
     end
   end
 
@@ -317,9 +379,22 @@ describe LogStash::Filters::NOOP do
     }
     CONFIG
 
-    sample_one("type" => "noop", "go" => "away", "tags" => {"blackhole" => "go"}) do
-      expect(subject.get("[tags][blackhole]")).to eq("go")
+    sample_one("type" => "noop", "go" => "away", "tags" => "blackhole") do
+      expect(subject.get("[tags]")).to eq("blackhole")
     end
+  end
 
+  describe "when metrics are disabled" do
+    describe "An error should not be raised, and the event should be processed" do
+      config <<-CONFIG
+        filter {
+          noop { enable_metric => false }
+        }
+      CONFIG
+
+      sample_one("type" => "noop", "tags" => "blackhole") do
+        expect(subject.get("[tags]")).to eq("blackhole")
+      end
+    end
   end
 end
diff --git a/logstash-core/spec/logstash/inputs/base_spec.rb b/logstash-core/spec/logstash/inputs/base_spec.rb
index a16e7ae4d..77d0986de 100644
--- a/logstash-core/spec/logstash/inputs/base_spec.rb
+++ b/logstash-core/spec/logstash/inputs/base_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/inputs/base"
 require "support/shared_contexts"
@@ -21,17 +37,17 @@ describe "LogStash::Inputs::Base#decorate" do
   end
 
   it "should add multiple tag" do
-    input = LogStash::Inputs::NOOP.new("tags" => ["value1","value2"])
+    input = LogStash::Inputs::NOOP.new("tags" => ["value1", "value2"])
     evt = LogStash::Event.new({"type" => "noop"})
     input.instance_eval {decorate(evt)}
-    expect(evt.get("tags")).to eq(["value1","value2"])
+    expect(evt.get("tags")).to eq(["value1", "value2"])
   end
 
   it "should allow duplicates  tag" do
-    input = LogStash::Inputs::NOOP.new("tags" => ["value","value"])
+    input = LogStash::Inputs::NOOP.new("tags" => ["value", "value"])
     evt = LogStash::Event.new({"type" => "noop"})
     input.instance_eval {decorate(evt)}
-    expect(evt.get("tags")).to eq(["value","value"])
+    expect(evt.get("tags")).to eq(["value", "value"])
   end
 
   it "should add tag with sprintf" do
@@ -59,7 +75,7 @@ describe "LogStash::Inputs::Base#decorate" do
     input = LogStash::Inputs::NOOP.new("add_field" => {"field" => ["value1", "value2"], "field2" => "value"})
     evt = LogStash::Event.new({"type" => "noop"})
     input.instance_eval {decorate(evt)}
-    expect(evt.get("field")).to eq(["value1","value2"])
+    expect(evt.get("field")).to eq(["value1", "value2"])
     expect(evt.get("field2")).to eq("value")
   end
 
@@ -70,18 +86,34 @@ describe "LogStash::Inputs::Base#decorate" do
 
     subject(:instance) { klass.new({}) }
 
-    it "allow to set the context" do
-      expect(instance.execution_context).to be_nil
-      instance.execution_context = execution_context
+    context 'execution_context=' do
+      let(:deprecation_logger_stub) { double('DeprecationLogger').as_null_object }
+      before(:each) do
+        allow(klass).to receive(:deprecation_logger).and_return(deprecation_logger_stub)
+      end
 
-      expect(instance.execution_context).to eq(execution_context)
-    end
+      it "allow to set the context" do
+        new_ctx = execution_context.dup
+        subject.execution_context = new_ctx
+        expect(subject.execution_context).to be(new_ctx)
+      end
 
-    it "propagate the context to the codec" do
-      expect(instance.codec.execution_context).to be_nil
-      instance.execution_context = execution_context
+      it "propagate the context to the codec" do
+        new_ctx = execution_context.dup
+        expect(instance.codec.execution_context).to_not be(new_ctx)
+        instance.execution_context = new_ctx
 
-      expect(instance.codec.execution_context).to eq(execution_context)
+        expect(instance.execution_context).to be(new_ctx)
+        expect(instance.codec.execution_context).to be(new_ctx)
+      end
+
+      it 'emits a deprecation warning' do
+        expect(deprecation_logger_stub).to receive(:deprecated) do |message|
+          expect(message).to match(/execution_context=/)
+        end
+
+        instance.execution_context = execution_context
+      end
     end
   end
 
@@ -113,4 +145,32 @@ describe "LogStash::Inputs::Base#fix_streaming_codecs" do
     tcp.instance_eval { fix_streaming_codecs }
     expect(tcp.codec.charset).to eq("CP1252")
   end
+
+  it "should switch plain codec to line" do
+    require "logstash/inputs/tcp"
+    require "logstash/codecs/plain"
+    require "logstash/codecs/line"
+
+    # it is important to use "codec" => "plain" here and not the LogStash::Codecs::Plain instance so that
+    # the config parsing wrap the codec into the delagator which was causing the codec identification bug
+    # per https://github.com/elastic/logstash/issues/11140
+    tcp = LogStash::Inputs::Tcp.new("codec" => "plain", "port" => 0)
+    tcp.register
+
+    expect(tcp.codec.class.name).to eq("LogStash::Codecs::Line")
+  end
+
+  it "should switch json codec to json_lines" do
+    require "logstash/inputs/tcp"
+    require "logstash/codecs/plain"
+    require "logstash/codecs/line"
+
+    # it is important to use "codec" => "json" here and not the LogStash::Codecs::Plain instance so that
+    # the config parsing wrap the codec into the delagator which was causing the codec identification bug
+    # per https://github.com/elastic/logstash/issues/11140
+    tcp = LogStash::Inputs::Tcp.new("codec" => "json", "port" => 0)
+    tcp.register
+
+    expect(tcp.codec.class.name).to eq("LogStash::Codecs::JSONLines")
+  end
 end
diff --git a/logstash-core/spec/logstash/instrument/collector_spec.rb b/logstash-core/spec/logstash/instrument/collector_spec.rb
index b5c9b3073..bd8b950a4 100644
--- a/logstash-core/spec/logstash/instrument/collector_spec.rb
+++ b/logstash-core/spec/logstash/instrument/collector_spec.rb
@@ -1,9 +1,25 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/instrument/collector"
 require "spec_helper"
 
 describe LogStash::Instrument::Collector do
-  subject { LogStash::Instrument::Collector.new }
+  subject(:metrics_collector) { LogStash::Instrument::Collector.new }
   describe "#push" do
     let(:namespaces_path) { [:root, :pipelines, :pipelines01] }
     let(:key) { :my_key }
@@ -41,6 +57,30 @@ describe LogStash::Instrument::Collector do
     end
   end
 
+  describe '#get' do
+    let(:namespaces_path) { [:root, :pipelines, :pipelines01] }
+    let(:key) { :my_key }
+
+    {
+      counter: LogStash::Instrument::MetricType::Counter,
+      gauge:   LogStash::Instrument::MetricType::Gauge,
+      uptime:  org.logstash.instrument.metrics.UptimeMetric,
+      timer:   org.logstash.instrument.metrics.timer.TimerMetric,
+    }.each do |type, type_specific_implementation|
+      context "with (type: `#{type}`)" do
+        it "gets an instance of #{type_specific_implementation}" do
+          expect(metrics_collector.get(namespaces_path, key, type)).to be_a_kind_of(type_specific_implementation)
+        end
+
+        it 'gets a singleton instance from multiple consecutive calls' do
+          first = metrics_collector.get(namespaces_path, key, type)
+          second = metrics_collector.get(namespaces_path, key, type)
+          expect(second).to equal(first)
+        end
+      end
+    end
+  end
+
   describe "#snapshot_metric" do
     it "return a `LogStash::Instrument::MetricStore`" do
       expect(subject.snapshot_metric).to be_kind_of(LogStash::Instrument::Snapshot)
diff --git a/logstash-core/spec/logstash/instrument/metric_spec.rb b/logstash-core/spec/logstash/instrument/metric_spec.rb
index 1e1397bdd..0810704f0 100644
--- a/logstash-core/spec/logstash/instrument/metric_spec.rb
+++ b/logstash-core/spec/logstash/instrument/metric_spec.rb
@@ -1,23 +1,41 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/instrument/collector"
 require_relative "../../support/matchers"
 require "spec_helper"
 
 describe LogStash::Instrument::Metric do
-  let(:collector) { [] }
+  let(:collector) { LogStash::Instrument::Collector.new }
   let(:namespace) { :root }
 
   subject { LogStash::Instrument::Metric.new(collector) }
 
+  before(:each) { allow(collector).to receive(:push).and_call_original }
+
   context "#increment" do
     it "a counter by 1" do
-      metric = subject.increment(:root, :error_rate)
-      expect(collector).to be_a_metric_event([:root, :error_rate], :counter, :increment, 1)
+      subject.increment(:root, :error_rate)
+      expect(collector).to have_received(:push).with([:root], :error_rate, :counter, :increment, 1)
     end
 
     it "a counter by a provided value" do
-      metric = subject.increment(:root, :error_rate, 20)
-      expect(collector).to be_a_metric_event([:root, :error_rate], :counter, :increment, 20)
+      subject.increment(:root, :error_rate, 20)
+      expect(collector).to have_received(:push).with([:root], :error_rate, :counter, :increment, 20)
     end
 
     it "raises an exception if the key is an empty string" do
@@ -29,15 +47,15 @@ describe LogStash::Instrument::Metric do
     end
   end
 
-  context "#decrement" do
+  context "#decrement", skip: "LongCounter impl does not support decrement" do
     it "a counter by 1" do
-      metric = subject.decrement(:root, :error_rate)
-      expect(collector).to be_a_metric_event([:root, :error_rate], :counter, :decrement, 1)
+      subject.decrement(:root, :error_rate)
+      expect(collector).to have_received(:push).with([:root], :error_rate, :counter, :decrement, 1)
     end
 
     it "a counter by a provided value" do
-      metric = subject.decrement(:root, :error_rate, 20)
-      expect(collector).to be_a_metric_event([:root, :error_rate], :counter, :decrement, 20)
+      subject.decrement(:root, :error_rate, 20)
+      expect(collector).to have_received(:push).with([:root], :error_rate, :counter, :decrement, 20)
     end
 
     it "raises an exception if the key is an empty string" do
@@ -51,8 +69,8 @@ describe LogStash::Instrument::Metric do
 
   context "#gauge" do
     it "set the value of a key" do
-      metric = subject.gauge(:root, :size_queue, 20)
-      expect(collector).to be_a_metric_event([:root, :size_queue], :gauge, :set, 20)
+      subject.gauge(:root, :size_queue, 20)
+      expect(collector).to have_received(:push).with([:root], :size_queue, :gauge, :set, 20)
     end
 
     it "raises an exception if the key is an empty string" do
@@ -71,10 +89,8 @@ describe LogStash::Instrument::Metric do
     it "records the duration" do
       subject.time(:root, :duration_ms) { sleep(sleep_time) }
 
-      expect(collector.last).to be_within(sleep_time_ms).of(sleep_time_ms + 5)
-      expect(collector[0]).to match(:root)
-      expect(collector[1]).to be(:duration_ms)
-      expect(collector[2]).to be(:counter)
+      timer = subject.timer(:root, :duration_ms)
+      expect(timer.value).to be_within(50).of(sleep_time_ms)
     end
 
     it "returns the value of the executed block" do
@@ -84,13 +100,14 @@ describe LogStash::Instrument::Metric do
     it "return a TimedExecution" do
       execution = subject.time(:root, :duration_ms)
       sleep(sleep_time)
+
+      timer = subject.timer(:root, :duration_ms)
+      expect(timer.value).to eq(0) # no live tracking without a block
+
       execution_time = execution.stop
 
-      expect(execution_time).to eq(collector.last)
-      expect(collector.last).to be_within(sleep_time_ms).of(sleep_time_ms + 0.1)
-      expect(collector[0]).to match(:root)
-      expect(collector[1]).to be(:duration_ms)
-      expect(collector[2]).to be(:counter)
+      expect(execution_time).to be_within(50).of(sleep_time_ms)
+      expect(timer.value).to be_within(50).of(sleep_time_ms)
     end
   end
 
@@ -103,8 +120,8 @@ describe LogStash::Instrument::Metric do
 
     it "uses the same collector as the creator class" do
       child = subject.namespace(sub_key)
-      metric = child.increment(:error_rate)
-      expect(collector).to be_a_metric_event([sub_key, :error_rate], :counter, :increment, 1)
+      child.increment(:error_rate)
+      expect(collector).to have_received(:push).with([:my_sub_key], :error_rate, :counter, :increment, 1)
     end
   end
 end
diff --git a/logstash-core/spec/logstash/instrument/metric_store_spec.rb b/logstash-core/spec/logstash/instrument/metric_store_spec.rb
index dac026643..edc82ef04 100644
--- a/logstash-core/spec/logstash/instrument/metric_store_spec.rb
+++ b/logstash-core/spec/logstash/instrument/metric_store_spec.rb
@@ -1,8 +1,24 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/instrument/metric_store"
 
 describe LogStash::Instrument::MetricStore do
-  let(:namespaces) { [ :root, :pipelines, :pipeline_01 ] }
+  let(:namespaces) { [:root, :pipelines, :pipeline_01] }
   let(:key) { :events_in }
   let(:counter) { LogStash::Instrument::MetricType::Counter.new(namespaces, key) }
 
@@ -70,28 +86,28 @@ describe LogStash::Instrument::MetricStore do
       context "when the path exist" do
         it "retrieves end of of a branch" do
           metrics = subject.get(:node, :sashimi, :pipelines, :pipeline01, :plugins, :"logstash-output-elasticsearch")
-          expect(metrics).to match(a_hash_including(:node => a_hash_including(:sashimi => a_hash_including(:pipelines  => a_hash_including(:pipeline01 => a_hash_including(:plugins => a_hash_including(:"logstash-output-elasticsearch" => anything)))))))
+          expect(metrics).to match(a_hash_including(:node => a_hash_including(:sashimi => a_hash_including(:pipelines => a_hash_including(:pipeline01 => a_hash_including(:plugins => a_hash_including(:"logstash-output-elasticsearch" => anything)))))))
         end
 
         it "retrieves branch" do
           metrics = subject.get(:node, :sashimi, :pipelines, :pipeline01)
-          expect(metrics).to match(a_hash_including(:node => a_hash_including(:sashimi => a_hash_including(:pipelines  => a_hash_including(:pipeline01 => anything)))))
+          expect(metrics).to match(a_hash_including(:node => a_hash_including(:sashimi => a_hash_including(:pipelines => a_hash_including(:pipeline01 => anything)))))
         end
 
         it "allow to retrieve a specific metrics" do
           metrics = subject.get(:node, :sashimi, :pipelines, :pipeline01, :plugins, :"logstash-output-elasticsearch", :event_in)
-          expect(metrics).to match(a_hash_including(:node => a_hash_including(:sashimi => a_hash_including(:pipelines  => a_hash_including(:pipeline01 => a_hash_including(:plugins => a_hash_including(:"logstash-output-elasticsearch" => a_hash_including(:event_in => be_kind_of(LogStash::Instrument::MetricType::Counter)))))))))
+          expect(metrics).to match(a_hash_including(:node => a_hash_including(:sashimi => a_hash_including(:pipelines => a_hash_including(:pipeline01 => a_hash_including(:plugins => a_hash_including(:"logstash-output-elasticsearch" => a_hash_including(:event_in => be_kind_of(LogStash::Instrument::MetricType::Counter)))))))))
         end
 
         context "with filtered keys" do
           it "allows to retrieve multiple keys on the same level" do
             metrics = subject.get(:node, :sashimi, :pipelines, :"pipeline01,pipeline02")
-            expect(metrics).to match(a_hash_including(:node => a_hash_including(:sashimi => a_hash_including(:pipelines  => a_hash_including(:pipeline01 => anything, :pipeline02 => anything)))))
+            expect(metrics).to match(a_hash_including(:node => a_hash_including(:sashimi => a_hash_including(:pipelines => a_hash_including(:pipeline01 => anything, :pipeline02 => anything)))))
           end
 
           it "supports space in the keys" do
             metrics = subject.get(:node, :sashimi, :pipelines, :"pipeline01, pipeline02 ")
-            expect(metrics).to match(a_hash_including(:node => a_hash_including(:sashimi => a_hash_including(:pipelines  => a_hash_including(:pipeline01 => anything, :pipeline02 => anything)))))
+            expect(metrics).to match(a_hash_including(:node => a_hash_including(:sashimi => a_hash_including(:pipelines => a_hash_including(:pipeline01 => anything, :pipeline02 => anything)))))
           end
 
           it "retrieves only the requested keys" do
@@ -116,28 +132,28 @@ describe LogStash::Instrument::MetricStore do
 
           it "retrieves end of of a branch" do
             metrics = subject.get_with_path("node/sashimi/pipelines/pipeline01/plugins/logstash-output-elasticsearch")
-            expect(metrics).to match(a_hash_including(:node => a_hash_including(:sashimi => a_hash_including(:pipelines  => a_hash_including(:pipeline01 => a_hash_including(:plugins => a_hash_including(:"logstash-output-elasticsearch" => anything)))))))
+            expect(metrics).to match(a_hash_including(:node => a_hash_including(:sashimi => a_hash_including(:pipelines => a_hash_including(:pipeline01 => a_hash_including(:plugins => a_hash_including(:"logstash-output-elasticsearch" => anything)))))))
           end
 
           it "retrieves branch" do
             metrics = subject.get_with_path("node/sashimi/pipelines/pipeline01")
-            expect(metrics).to match(a_hash_including(:node => a_hash_including(:sashimi => a_hash_including(:pipelines  => a_hash_including(:pipeline01 => anything)))))
+            expect(metrics).to match(a_hash_including(:node => a_hash_including(:sashimi => a_hash_including(:pipelines => a_hash_including(:pipeline01 => anything)))))
           end
 
           it "allow to retrieve a specific metrics" do
             metrics = subject.get_with_path("node/sashimi/pipelines/pipeline01/plugins/logstash-output-elasticsearch/event_in")
-            expect(metrics).to match(a_hash_including(:node => a_hash_including(:sashimi => a_hash_including(:pipelines  => a_hash_including(:pipeline01 => a_hash_including(:plugins => a_hash_including(:"logstash-output-elasticsearch" => a_hash_including(:event_in => be_kind_of(LogStash::Instrument::MetricType::Counter)))))))))
+            expect(metrics).to match(a_hash_including(:node => a_hash_including(:sashimi => a_hash_including(:pipelines => a_hash_including(:pipeline01 => a_hash_including(:plugins => a_hash_including(:"logstash-output-elasticsearch" => a_hash_including(:event_in => be_kind_of(LogStash::Instrument::MetricType::Counter)))))))))
           end
 
           context "with filtered keys" do
             it "allows to retrieve multiple keys on the same level" do
               metrics = subject.get_with_path("node/sashimi/pipelines/pipeline01,pipeline02/plugins/logstash-output-elasticsearch/event_in")
-              expect(metrics).to match(a_hash_including(:node => a_hash_including(:sashimi => a_hash_including(:pipelines  => a_hash_including(:pipeline01 => anything, :pipeline02 => anything)))))
+              expect(metrics).to match(a_hash_including(:node => a_hash_including(:sashimi => a_hash_including(:pipelines => a_hash_including(:pipeline01 => anything, :pipeline02 => anything)))))
             end
 
             it "supports space in the keys" do
               metrics = subject.get_with_path("node/sashimi/pipelines/pipeline01, pipeline02 /plugins/logstash-output-elasticsearch/event_in")
-              expect(metrics).to match(a_hash_including(:node => a_hash_including(:sashimi => a_hash_including(:pipelines  => a_hash_including(:pipeline01 => anything, :pipeline02 => anything)))))
+              expect(metrics).to match(a_hash_including(:node => a_hash_including(:sashimi => a_hash_including(:pipelines => a_hash_including(:pipeline01 => anything, :pipeline02 => anything)))))
             end
 
             it "retrieves only the requested keys" do
diff --git a/logstash-core/spec/logstash/instrument/metric_type/counter_spec.rb b/logstash-core/spec/logstash/instrument/metric_type/counter_spec.rb
index 82b7c581a..dc7050a6a 100644
--- a/logstash-core/spec/logstash/instrument/metric_type/counter_spec.rb
+++ b/logstash-core/spec/logstash/instrument/metric_type/counter_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/instrument/metric_type/counter"
 require "spec_helper"
 
@@ -10,7 +26,7 @@ describe LogStash::Instrument::MetricType::Counter do
 
   describe "#increment" do
     it "increment the counter" do
-      expect{ subject.increment }.to change { subject.value }.by(1)
+      expect { subject.increment }.to change { subject.value }.by(1)
     end
   end
 
@@ -19,5 +35,4 @@ describe LogStash::Instrument::MetricType::Counter do
       expect(LogStash::Json.dump(subject)).to eq("0")
     end
   end
-
 end
diff --git a/logstash-core/spec/logstash/instrument/metric_type/gauge_spec.rb b/logstash-core/spec/logstash/instrument/metric_type/gauge_spec.rb
index 69ee278a0..8c0a5a95e 100644
--- a/logstash-core/spec/logstash/instrument/metric_type/gauge_spec.rb
+++ b/logstash-core/spec/logstash/instrument/metric_type/gauge_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/instrument/metric_type/gauge"
 require "logstash/json"
 require "spec_helper"
@@ -25,6 +41,4 @@ describe LogStash::Instrument::MetricType::Gauge do
       expect(LogStash::Json.dump(subject)).to eq("\"#{value}\"")
     end
   end
-
-
 end
diff --git a/logstash-core/spec/logstash/instrument/namespaced_metric_spec.rb b/logstash-core/spec/logstash/instrument/namespaced_metric_spec.rb
index d850d5c01..422e9caf9 100644
--- a/logstash-core/spec/logstash/instrument/namespaced_metric_spec.rb
+++ b/logstash-core/spec/logstash/instrument/namespaced_metric_spec.rb
@@ -1,15 +1,33 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "../../support/matchers"
 require_relative "../../support/shared_examples"
 require "spec_helper"
 
 describe LogStash::Instrument::NamespacedMetric do
   let(:namespace) { :root }
-  let(:collector) { [] }
+  let(:collector) { LogStash::Instrument::Collector.new }
   let(:metric) { LogStash::Instrument::Metric.new(collector) }
 
   subject { described_class.new(metric, namespace) }
 
+  before(:each) { allow(collector).to receive(:push).and_call_original }
+
   it "defines the same interface as `Metric`" do
     expect(described_class).to implement_interface_of(LogStash::Instrument::Metric)
   end
@@ -31,32 +49,32 @@ describe LogStash::Instrument::NamespacedMetric do
 
   context "#increment" do
     it "a counter by 1" do
-      metric = subject.increment(:error_rate)
-      expect(collector).to be_a_metric_event([:root, :error_rate], :counter, :increment, 1)
+      subject.increment(:error_rate)
+      expect(collector).to have_received(:push).with([:root], :error_rate, :counter, :increment, 1)
     end
 
     it "a counter by a provided value" do
-      metric = subject.increment(:error_rate, 20)
-      expect(collector).to be_a_metric_event([:root, :error_rate], :counter, :increment, 20)
+      subject.increment(:error_rate, 20)
+      expect(collector).to have_received(:push).with([:root], :error_rate, :counter, :increment, 20)
     end
   end
 
-  context "#decrement" do
+  context "#decrement", skip: "LongCounter impl does not support decrement" do
     it "a counter by 1" do
-      metric = subject.decrement(:error_rate)
-      expect(collector).to be_a_metric_event([:root, :error_rate], :counter, :decrement, 1)
+      subject.decrement(:error_rate)
+      expect(collector).to have_received(:push).with([:root], :error_rate, :counter, :decrement, 1)
     end
 
     it "a counter by a provided value" do
-      metric = subject.decrement(:error_rate, 20)
-      expect(collector).to be_a_metric_event([:root, :error_rate], :counter, :decrement, 20)
+      subject.decrement(:error_rate, 20)
+      expect(collector).to have_received(:push).with([:root], :error_rate, :counter, :decrement, 20)
     end
   end
 
   context "#gauge" do
     it "set the value of a key" do
-      metric = subject.gauge(:size_queue, 20)
-      expect(collector).to be_a_metric_event([:root, :size_queue], :gauge, :set, 20)
+      subject.gauge(:size_queue, 20)
+      expect(collector).to have_received(:push).with([:root], :size_queue, :gauge, :set, 20)
     end
   end
 
@@ -67,22 +85,36 @@ describe LogStash::Instrument::NamespacedMetric do
     it "records the duration" do
       subject.time(:duration_ms) { sleep(sleep_time) }
 
-      expect(collector.last).to be_within(sleep_time_ms).of(sleep_time_ms + 5)
-      expect(collector[0]).to match([:root])
-      expect(collector[1]).to be(:duration_ms)
-      expect(collector[2]).to be(:counter)
+      timer = metric.timer(namespace, :duration_ms)
+      expect(timer.value).to be_within(50).of(sleep_time_ms)
     end
 
     it "return a TimedExecution" do
       execution = subject.time(:duration_ms)
       sleep(sleep_time)
+
+      timer = metric.timer(namespace, :duration_ms)
+      expect(timer.value).to eq(0) # no live tracking without a block
+
       execution_time = execution.stop
 
-      expect(execution_time).to eq(collector.last)
-      expect(collector.last).to be_within(sleep_time_ms).of(sleep_time_ms + 0.1)
-      expect(collector[0]).to match([:root])
-      expect(collector[1]).to be(:duration_ms)
-      expect(collector[2]).to be(:counter)
+      expect(execution_time).to be_within(50).of(sleep_time_ms)
+      expect(timer.value).to be_within(50).of(sleep_time_ms)
+    end
+  end
+
+  context "#namespace" do
+    let(:namespace) { [:deeply, :nested] }
+    let(:sub_key) { [:even, :deeper] }
+
+    it "creates a new metric object and append the `sub_key` to the `base_key`" do
+      expect(subject.namespace(sub_key).namespace_name).to eq(namespace + sub_key)
+    end
+
+    it "uses the same collector as the creator class" do
+      child = subject.namespace(sub_key)
+      child.increment(:error_rate)
+      expect(collector).to have_received(:push).with((namespace + sub_key), :error_rate, :counter, :increment, 1)
     end
   end
 
diff --git a/logstash-core/spec/logstash/instrument/namespaced_null_metric_spec.rb b/logstash-core/spec/logstash/instrument/namespaced_null_metric_spec.rb
index 3e97c330f..b6f35f342 100644
--- a/logstash-core/spec/logstash/instrument/namespaced_null_metric_spec.rb
+++ b/logstash-core/spec/logstash/instrument/namespaced_null_metric_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "../../support/matchers"
 require "spec_helper"
 
@@ -27,5 +43,4 @@ describe LogStash::Instrument::NamespacedNullMetric do
     expect(subject.namespace_name).to eq([namespace])
     expect(new_namespace.namespace_name).to eq([:root, :wally])
   end
-
 end
diff --git a/logstash-core/spec/logstash/instrument/null_metric_spec.rb b/logstash-core/spec/logstash/instrument/null_metric_spec.rb
index a01ed8372..9b491e573 100644
--- a/logstash-core/spec/logstash/instrument/null_metric_spec.rb
+++ b/logstash-core/spec/logstash/instrument/null_metric_spec.rb
@@ -1,10 +1,25 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "../../support/shared_examples"
 require_relative "../../support/matchers"
 require "spec_helper"
 
 describe LogStash::Instrument::NullMetric do
-
   let(:key) { "test" }
   subject { LogStash::Instrument::NullMetric.new(nil) }
 
diff --git a/logstash-core/spec/logstash/instrument/periodic_poller/base_spec.rb b/logstash-core/spec/logstash/instrument/periodic_poller/base_spec.rb
index 63be505b4..197693329 100644
--- a/logstash-core/spec/logstash/instrument/periodic_poller/base_spec.rb
+++ b/logstash-core/spec/logstash/instrument/periodic_poller/base_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/instrument/periodic_poller/base"
 require "logstash/instrument/collector"
 
diff --git a/logstash-core/spec/logstash/instrument/periodic_poller/cgroup_spec.rb b/logstash-core/spec/logstash/instrument/periodic_poller/cgroup_spec.rb
index 4a8eab8eb..2873b3a9b 100644
--- a/logstash-core/spec/logstash/instrument/periodic_poller/cgroup_spec.rb
+++ b/logstash-core/spec/logstash/instrument/periodic_poller/cgroup_spec.rb
@@ -1,9 +1,23 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/instrument/periodic_poller/cgroup"
 require "spec_helper"
 
-LogStash::Logging::Logger::configure_logging("DEBUG")
-
 module LogStash module Instrument module PeriodicPoller
 describe "cgroup stats" do
   let(:relative_path) { "/docker/a1f61" }
@@ -177,7 +191,7 @@ describe "cgroup stats" do
         it "fills in the hash with minus one" do
           expect(cpuacct_resource.base_path).to eq("/sys/fs/cgroup/cpuacct")
           expect(cpuacct_resource.offset_path).to eq("/bar")
-          expect(cpuacct_resource.to_hash).to eq({:control_group=>"/bar", :usage_nanos=>-1})
+          expect(cpuacct_resource.to_hash).to eq({:control_group => "/bar", :usage_nanos => -1})
         end
       end
     end
@@ -192,7 +206,7 @@ describe "cgroup stats" do
         it "fills in the hash with minus one" do
           expect(cpuacct_resource.base_path).to eq("/sys/fs/cgroup/cpuacct")
           expect(cpuacct_resource.offset_path).to eq("/quux")
-          expect(cpuacct_resource.to_hash).to eq({:control_group=>"/quux", :usage_nanos=>-1})
+          expect(cpuacct_resource.to_hash).to eq({:control_group => "/quux", :usage_nanos => -1})
         end
       end
     end
@@ -205,7 +219,7 @@ describe "cgroup stats" do
         it "fills in the hash with minus one" do
           expect(cpu_resource.base_path).to eq("/sys/fs/cgroup/cpu")
           expect(cpu_resource.offset_path).to eq("/bar")
-          expect(cpu_resource.to_hash).to eq({:cfs_period_micros=>-1, :cfs_quota_micros=>-1, :control_group=>"/bar", :stat=>{:number_of_elapsed_periods=>-1, :number_of_times_throttled=>-1, :time_throttled_nanos=>-1}})
+          expect(cpu_resource.to_hash).to eq({:cfs_period_micros => -1, :cfs_quota_micros => -1, :control_group => "/bar", :stat => {:number_of_elapsed_periods => -1, :number_of_times_throttled => -1, :time_throttled_nanos => -1}})
         end
       end
     end
@@ -221,7 +235,7 @@ describe "cgroup stats" do
         it "fills in the hash with minus one" do
           expect(cpu_resource.base_path).to eq("/sys/fs/cgroup/cpu")
           expect(cpu_resource.offset_path).to eq("/quux")
-          expect(cpu_resource.to_hash).to eq({:cfs_period_micros=>-1, :cfs_quota_micros=>-1, :control_group=>"/quux", :stat=>{:number_of_elapsed_periods=>-1, :number_of_times_throttled=>-1, :time_throttled_nanos=>-1}})
+          expect(cpu_resource.to_hash).to eq({:cfs_period_micros => -1, :cfs_quota_micros => -1, :control_group => "/quux", :stat => {:number_of_elapsed_periods => -1, :number_of_times_throttled => -1, :time_throttled_nanos => -1}})
         end
       end
     end
@@ -278,4 +292,4 @@ describe "cgroup stats" do
     end
   end
 end
-end end end
\ No newline at end of file
+end end end
diff --git a/logstash-core/spec/logstash/instrument/periodic_poller/dlq_spec.rb b/logstash-core/spec/logstash/instrument/periodic_poller/dlq_spec.rb
index a818dd113..64d55475a 100644
--- a/logstash-core/spec/logstash/instrument/periodic_poller/dlq_spec.rb
+++ b/logstash-core/spec/logstash/instrument/periodic_poller/dlq_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/instrument/periodic_poller/dlq"
 require "logstash/instrument/collector"
diff --git a/logstash-core/spec/logstash/instrument/periodic_poller/jvm_spec.rb b/logstash-core/spec/logstash/instrument/periodic_poller/jvm_spec.rb
index f7edb2f02..1479c20ae 100644
--- a/logstash-core/spec/logstash/instrument/periodic_poller/jvm_spec.rb
+++ b/logstash-core/spec/logstash/instrument/periodic_poller/jvm_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/instrument/periodic_poller/jvm"
 require "logstash/instrument/collector"
@@ -28,7 +44,6 @@ describe LogStash::Instrument::PeriodicPoller::JVM::GarbageCollectorName do
   end
 end
 
-
 describe LogStash::Instrument::PeriodicPoller::JVM do
   let(:metric) { LogStash::Instrument::Metric.new(LogStash::Instrument::Collector.new) }
   let(:options) { {} }
@@ -103,7 +118,7 @@ describe LogStash::Instrument::PeriodicPoller::JVM do
       # Make looking up metric paths easy when given varargs of keys
       # e.g. mval(:parent, :child)
       def mval(*metric_path)
-        metric_path.reduce(jvm_metrics) {|acc,k| acc[k]}.value
+        metric_path.reduce(jvm_metrics) {|acc, k| acc[k]}.value
       end
 
       [
diff --git a/logstash-core/spec/logstash/instrument/periodic_poller/load_average_spec.rb b/logstash-core/spec/logstash/instrument/periodic_poller/load_average_spec.rb
index 7063466e3..b75e11647 100644
--- a/logstash-core/spec/logstash/instrument/periodic_poller/load_average_spec.rb
+++ b/logstash-core/spec/logstash/instrument/periodic_poller/load_average_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/instrument/periodic_poller/load_average"
 describe LogStash::Instrument::PeriodicPoller::LoadAverage do
   subject { described_class.create }
diff --git a/logstash-core/spec/logstash/instrument/periodic_poller/os_spec.rb b/logstash-core/spec/logstash/instrument/periodic_poller/os_spec.rb
index 9c489d74b..2edd9bc19 100644
--- a/logstash-core/spec/logstash/instrument/periodic_poller/os_spec.rb
+++ b/logstash-core/spec/logstash/instrument/periodic_poller/os_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/instrument/periodic_poller/os"
 require "logstash/instrument/collector"
 
@@ -53,7 +69,7 @@ describe LogStash::Instrument::PeriodicPoller::Os do
     end
 
     def mval(*metric_path)
-      metric_path.reduce(os_metrics) {|acc,k| acc[k]}.value
+      metric_path.reduce(os_metrics) {|acc, k| acc[k]}.value
     end
 
     it "should have a value for #{[:cgroup, :cpuacc, :control_group]} that is a String" do
diff --git a/logstash-core/spec/logstash/instrument/wrapped_write_client_spec.rb b/logstash-core/spec/logstash/instrument/wrapped_write_client_spec.rb
index 3ebd2e375..762943f35 100644
--- a/logstash-core/spec/logstash/instrument/wrapped_write_client_spec.rb
+++ b/logstash-core/spec/logstash/instrument/wrapped_write_client_spec.rb
@@ -1,5 +1,20 @@
-# encoding: utf-8
-require "logstash/event"
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "../../support/mocks_classes"
 require "spec_helper"
 require "java"
@@ -123,5 +138,4 @@ describe LogStash::WrappedWriteClient do
 
     include_examples "queue tests"
   end
-
 end
diff --git a/logstash-core/spec/logstash/java_filter_delegator_spec.rb b/logstash-core/spec/logstash/java_filter_delegator_spec.rb
index c9d24b492..3586debdc 100644
--- a/logstash-core/spec/logstash/java_filter_delegator_spec.rb
+++ b/logstash-core/spec/logstash/java_filter_delegator_spec.rb
@@ -1,13 +1,27 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/filter_delegator"
-require "logstash/event"
 require "support/shared_contexts"
 
 java_import org.logstash.RubyUtil
 
 describe LogStash::FilterDelegator do
-
   class MockGauge
     def increment(_)
     end
@@ -35,9 +49,9 @@ describe LogStash::FilterDelegator do
     counter
   }
   let(:counter_time) {
-    counter = metric.counter(:duration_in_millis)
-    counter.increment(0)
-    counter
+    timer = metric.timer(:duration_in_millis)
+    timer.report_untracked_millis(0)
+    timer
   }
   let(:events) { [LogStash::Event.new, LogStash::Event.new] }
 
@@ -65,7 +79,8 @@ describe LogStash::FilterDelegator do
         config_name "super_plugin"
         config :host, :validate => :string
         def register; end
-        def flush(options = {}); @events ; end
+        def flush(options = {}); @events; end
+
         def filter(event)
           @events ||= []
           @events << event
@@ -101,7 +116,6 @@ describe LogStash::FilterDelegator do
     end
 
     context "when the filter buffer events" do
-
       it "has incremented :in" do
         subject.to_java.multiFilter(events)
         expect(
@@ -125,7 +139,7 @@ describe LogStash::FilterDelegator do
           config_name "super_plugin"
           config :host, :validate => :string
           def register; end
-          def flush(options = {}); @events ; end
+          def flush(options = {}); @events; end
 
           # naive split filter implementation
           def filter(event)
@@ -152,6 +166,7 @@ describe LogStash::FilterDelegator do
         config_name "super_plugin"
         config :host, :validate => :string
         def register; end
+
         def filter(event)
           event
         end
@@ -181,5 +196,4 @@ describe LogStash::FilterDelegator do
       expect(subject.config_name).to eq("super_plugin")
     end
   end
-
 end
diff --git a/logstash-core/spec/logstash/java_integration_spec.rb b/logstash-core/spec/logstash/java_integration_spec.rb
index 0d4fd9c87..b834903a2 100644
--- a/logstash-core/spec/logstash/java_integration_spec.rb
+++ b/logstash-core/spec/logstash/java_integration_spec.rb
@@ -1,16 +1,29 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 
 describe "Java integration" do
-
   context "type equivalence" do
-
     # here we test for both is_a? and case/when usage of the Java types
     # because these are the specific use-cases in our code and the expected
     # behaviour.
 
     context "Java::JavaUtil::ArrayList" do
-
       it "should report to be a Ruby Array" do
         expect(Java::JavaUtil::ArrayList.new.is_a?(Array)).to eq(true)
       end
@@ -52,8 +65,8 @@ describe "Java integration" do
   context "Java::JavaUtil::Map" do
     # this is to test the Java 8 Map interface change for the merge method
 
-    let(:merger){{:a => 1, :b => 2}}
-    let(:mergee){{:b => 3, :c => 4}}
+    let(:merger) {{:a => 1, :b => 2}}
+    let(:mergee) {{:b => 3, :c => 4}}
 
     shared_examples "map merge" do
       it "should support merging" do
@@ -61,27 +74,27 @@ describe "Java integration" do
       end
 
       it "should return a new hash and not change original hash" do
-        expect{subject.merge(mergee)}.to_not change{subject}
+        expect {subject.merge(mergee)}.to_not change {subject}
       end
     end
 
     context "with Java::JavaUtil::LinkedHashMap" do
       it_behaves_like "map merge" do
-        subject{Java::JavaUtil::LinkedHashMap.new(merger)}
+        subject {Java::JavaUtil::LinkedHashMap.new(merger)}
       end
     end
 
     context "with Java::JavaUtil::HashMap" do
       it_behaves_like "map merge" do
-        subject{Java::JavaUtil::HashMap.new(merger)}
+        subject {Java::JavaUtil::HashMap.new(merger)}
       end
     end
   end
 
   context "Java::JavaUtil::Collection" do
-    subject{Java::JavaUtil::ArrayList.new(initial_array)}
+    subject {Java::JavaUtil::ArrayList.new(initial_array)}
 
-    context "when inspecting" do
+    context "when inspecting a list" do
       let(:items) { [:a, {:b => :c}] }
       subject { java.util.ArrayList.new(items) }
 
@@ -92,9 +105,20 @@ describe "Java integration" do
       it "should include the class name" do
         expect(subject.inspect).to include("ArrayList")
       end
+    end
 
-      it "should include the hash code of the collection" do
-        expect(subject.inspect).to include(subject.hashCode.to_s)
+    context "when inspecting a set" do
+      let(:items) { [:foo, 'bar'] }
+      subject { java.util.HashSet.new(items) }
+
+      it "should include the contents" do
+        expect(subject.inspect).to include 'bar'
+      end
+
+      it "should include the class name" do
+        expect(subject.inspect).to include("HashSet")
+
+        expect(java.util.TreeSet.new.inspect).to include("TreeSet")
       end
     end
 
@@ -106,7 +130,7 @@ describe "Java integration" do
       end
 
       it "should remove the object to delete" do
-        expect{subject.delete("foo")}.to change{subject.to_a}.from(initial_array).to(["bar"])
+        expect {subject.delete("foo")}.to change {subject.to_a}.from(initial_array).to(["bar"])
       end
     end
 
@@ -118,7 +142,7 @@ describe "Java integration" do
       end
 
       it "should remove all the objects to delete" do
-        expect{subject.delete("foo")}.to change{subject.to_a}.from(initial_array).to(["bar"])
+        expect {subject.delete("foo")}.to change {subject.to_a}.from(initial_array).to(["bar"])
       end
     end
 
@@ -130,11 +154,11 @@ describe "Java integration" do
       end
 
       it "should not change the collection" do
-        expect{subject.delete("baz")}.to_not change{subject.to_a}
+        expect {subject.delete("baz")}.to_not change {subject.to_a}
       end
 
       it "should yield to block when given" do
-        expect(subject.delete("baz"){"foobar"}).to eq("foobar")
+        expect(subject.delete("baz") {"foobar"}).to eq("foobar")
       end
     end
 
@@ -146,17 +170,16 @@ describe "Java integration" do
       end
 
       it "should not change the collection" do
-        expect{subject.delete("baz")}.to_not change{subject.to_a}
+        expect {subject.delete("baz")}.to_not change {subject.to_a}
       end
     end
 
     context "when intersecting with a Ruby Array" do
-
       context "using string collection with duplicates and single result" do
         let(:initial_array) {["foo", "bar", "foo"]}
 
         it "should not change original collection" do
-          expect{subject & ["foo"]}.to_not change{subject.to_a}
+          expect {subject & ["foo"]}.to_not change {subject.to_a}
         end
 
         it "should return a new array containing elements common to the two arrays, excluding any duplicate" do
@@ -187,12 +210,11 @@ describe "Java integration" do
     end
 
     context "when unioning with a Ruby Array" do
-
       context "using string collection with duplicates" do
         let(:initial_array) {["foo", "bar", "foo"]}
 
         it "should not change original collection" do
-          expect{subject | ["bar", "baz"]}.to_not change{subject.to_a}
+          expect {subject | ["bar", "baz"]}.to_not change {subject.to_a}
         end
 
         it "should return a new array by joining excluding any duplicates and preserving the order from the original array" do
@@ -213,18 +235,18 @@ describe "Java integration" do
 
     context "when compacting" do
       context "#compact with nils" do
-        let(:initial_array) { [1,2,3,nil,nil,6] }
+        let(:initial_array) { [1, 2, 3, nil, nil, 6] }
         it "should remove nil values from a copy" do
-          expect(subject.compact).to eq([1,2,3,6])
-          expect(subject).to eq([1,2,3,nil,nil,6])
+          expect(subject.compact).to eq([1, 2, 3, 6])
+          expect(subject).to eq([1, 2, 3, nil, nil, 6])
         end
       end
 
       context "#compact! with nils" do
-        let(:initial_array) { [1,2,3,nil,nil,6] }
+        let(:initial_array) { [1, 2, 3, nil, nil, 6] }
         it "should remove nil values" do
-          expect(subject.compact!).to eq([1,2,3,6])
-          expect(subject).to eq([1,2,3,6])
+          expect(subject.compact!).to eq([1, 2, 3, 6])
+          expect(subject).to eq([1, 2, 3, 6])
         end
 
         it "should return the original" do
@@ -233,10 +255,10 @@ describe "Java integration" do
       end
 
       context "#compact! without nils" do
-        let(:initial_array) { [1,2,3,6] }
+        let(:initial_array) { [1, 2, 3, 6] }
         it "should return nil" do
           expect(subject.compact!).to be nil
-          expect(subject).to eq([1,2,3,6])
+          expect(subject).to eq([1, 2, 3, 6])
         end
       end
     end
@@ -244,7 +266,6 @@ describe "Java integration" do
 
   context "Enumerable implementation" do
     context "Java Map interface should report key with nil value as included" do
-
       it "should support include? method" do
         expect(Java::JavaUtil::LinkedHashMap.new({"foo" => nil}).include?("foo")).to eq(true)
       end
@@ -263,7 +284,6 @@ describe "Java integration" do
     end
 
     context "Java Map interface should report key with a value as included" do
-
       it "should support include? method" do
         expect(Java::JavaUtil::LinkedHashMap.new({"foo" => 1}).include?("foo")).to eq(true)
       end
@@ -282,7 +302,6 @@ describe "Java integration" do
     end
 
     context "Java Map interface should report non existing key as not included" do
-
       it "should support include? method" do
         expect(Java::JavaUtil::LinkedHashMap.new({"foo" => 1})).not_to include("bar")
       end
diff --git a/logstash-core/spec/logstash/java_pipeline_spec.rb b/logstash-core/spec/logstash/java_pipeline_spec.rb
index 137305582..fa2ededdc 100644
--- a/logstash-core/spec/logstash/java_pipeline_spec.rb
+++ b/logstash-core/spec/logstash/java_pipeline_spec.rb
@@ -1,13 +1,30 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/inputs/generator"
 require "logstash/filters/drop"
 require_relative "../support/mocks_classes"
 require_relative "../support/helpers"
-require_relative "../logstash/pipeline_reporter_spec" # for DummyOutput class
 require 'support/pipeline/pipeline_helpers'
+require 'logstash/pipeline_action/reload'
 require "stud/try"
 require 'timeout'
+require "thread"
 
 class DummyInput < LogStash::Inputs::Base
   config_name "dummyinput"
@@ -23,18 +40,56 @@ class DummyInput < LogStash::Inputs::Base
   end
 end
 
-class DummyInputGenerator < LogStash::Inputs::Base
-  config_name "dummyinputgenerator"
+class DummyManualInputGenerator < LogStash::Inputs::Base
+  config_name "dummymanualinputgenerator"
+  config :iterations, :validate => :number
   milestone 2
 
+  attr_accessor :keep_running
+
+  def initialize(*args)
+    super(*args)
+    @keep_running = Concurrent::AtomicBoolean.new(false)
+    @queue = nil
+  end
+
   def register
   end
 
   def run(queue)
-    queue << Logstash::Event.new while !stop?
+    @queue = queue
+    if @iterations
+      @iterations.times do |i|
+        queue << LogStash::Event.new
+        sleep(0.5)
+      end
+    else
+      while !stop? || @keep_running.true?
+        queue << LogStash::Event.new
+        sleep(0.5)
+      end
+    end
   end
 
-  def close
+  def push_once
+    @queue << LogStash::Event.new
+  end
+end
+
+class DummyCrashingInput  < LogStash::Inputs::Base
+  config_name "dummycrashinginput"
+
+  config :on_register, :validate => :boolean
+
+  def register
+    raise(LogStash::ConfigurationError, 'crashing input on register') if @on_register
+  end
+
+  def run(queue)
+    while !stop?
+      queue << LogStash::Event.new
+      sleep(0.5)
+    end
   end
 end
 
@@ -60,6 +115,21 @@ class DummyOutputMore < ::LogStash::Outputs::DummyOutput
   config_name "dummyoutputmore"
 end
 
+class DummyAbortingOutput < ::LogStash::Outputs::DummyOutput
+  config_name "dummyabortingoutput"
+
+  def multi_receive(batch)
+    while !execution_context&.pipeline&.shutdown_requested?
+      # wait for shutdown simulating a not consumed batch
+      sleep 1
+    end
+
+    # raise the exception
+    java_import org.logstash.execution.AbortedBatchException
+    raise AbortedBatchException.new
+  end
+end
+
 class DummyFilter < LogStash::Filters::Base
   config_name "dummyfilter"
   milestone 2
@@ -73,6 +143,17 @@ class DummyFilter < LogStash::Filters::Base
   def close() end
 end
 
+class DummyCrashingFilter < LogStash::Filters::Base
+  config_name "dummycrashingfilter"
+  milestone 2
+
+  def register; end
+
+  def filter(event)
+    raise("crashing filter")
+  end
+end
+
 class DummySafeFilter < LogStash::Filters::Base
   config_name "dummysafefilter"
   milestone 2
@@ -92,12 +173,15 @@ class DummyFlushingFilter < LogStash::Filters::Base
 
   def register() end
   def filter(event) end
+
   def periodic_flush
     true
   end
+
   def flush(options)
     [::LogStash::Event.new("message" => "dummy_flush")]
   end
+
   def close() end
 end
 
@@ -132,17 +216,18 @@ describe LogStash::JavaPipeline do
   let(:dead_letter_queue_enabled) { false }
   let(:dead_letter_queue_path) { }
   let(:pipeline_settings_obj) { LogStash::SETTINGS.clone }
-  let(:pipeline_settings) { {} }
+  let(:pipeline_settings) do
+    {
+      "dead_letter_queue.enable" => dead_letter_queue_enabled,
+      "path.dead_letter_queue" => dead_letter_queue_path
+    }
+  end
   let(:max_retry) {10} #times
   let(:timeout) {120} #seconds
 
   before :each do
     pipeline_workers_setting = LogStash::SETTINGS.get_setting("pipeline.workers")
     allow(pipeline_workers_setting).to receive(:default).and_return(worker_thread_count)
-    dlq_enabled_setting = LogStash::SETTINGS.get_setting("dead_letter_queue.enable")
-    allow(dlq_enabled_setting).to receive(:value).and_return(dead_letter_queue_enabled)
-    dlq_path_setting = LogStash::SETTINGS.get_setting("path.dead_letter_queue")
-    allow(dlq_path_setting).to receive(:value).and_return(dead_letter_queue_path)
 
     pipeline_settings.each {|k, v| pipeline_settings_obj.set(k, v) }
   end
@@ -159,6 +244,15 @@ describe LogStash::JavaPipeline do
     end
   end
 
+  describe "aliased plugin instantiation" do
+    it "should create the pipeline as if it's using the original plugin" do
+      alias_registry = Java::org.logstash.plugins.AliasRegistry.new({["input", "alias"] => "generator"})
+      LogStash::PLUGIN_REGISTRY = LogStash::Plugins::Registry.new alias_registry
+      pipeline = mock_java_pipeline_from_string("input { alias { count => 1 } } output { null {} }")
+      expect(pipeline.ephemeral_id).to_not be_nil
+      pipeline.close
+    end
+  end
 
   describe "event cancellation" do
     # test harness for https://github.com/elastic/logstash/issues/6055
@@ -197,27 +291,350 @@ describe LogStash::JavaPipeline do
       Thread.abort_on_exception = true
 
       pipeline = mock_java_pipeline_from_string(config, pipeline_settings_obj)
-      t = Thread.new { pipeline.run }
       Timeout.timeout(timeout) do
-        sleep(0.1) until pipeline.ready?
-      end
-      Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
-        wait(3).for do
-          # give us a bit of time to flush the events
-          # puts("*****" + output.events.map{|e| e.message}.to_s)
-          output.events.map{|e| e.get("message")}.include?("END")
-        end.to be_truthy
+        pipeline.start
+        sleep 0.01 until pipeline.stopped?
       end
+      pipeline.shutdown
+      expect(output.events.map {|e| e.get("message")}).to include("END")
       expect(output.events.size).to eq(2)
       expect(output.events[0].get("tags")).to eq(["notdropped"])
       expect(output.events[1].get("tags")).to eq(["notdropped"])
-      pipeline.shutdown
-      t.join
 
       Thread.abort_on_exception = abort_on_exception_state
     end
   end
 
+  context "when the output plugin raises an abort batch exception" do
+    let(:metric) { LogStash::Instrument::Metric.new(LogStash::Instrument::Collector.new) }
+    subject { mock_java_pipeline_from_string(config, pipeline_settings_obj, metric) }
+    let(:metric_store) { subject.metric.collector.snapshot_metric.metric_store }
+    let(:config) do
+      <<-EOS
+      input { dummymanualinputgenerator {iterations => 2} }
+      output { dummyabortingoutput {} }
+      EOS
+    end
+    let(:dummyabortingoutput) { DummyAbortingOutput.new }
+    let(:pipeline_settings) { super().merge({ "pipeline.batch.size" => 2, "queue.type" => "persisted"}) }
+
+    let(:collected_metric) { metric_store.get_with_path("stats/events") }
+    let (:queue_client_batch) { double("Acked queue client Mock") }
+    let(:logger) { double("pipeline logger").as_null_object }
+
+    before :each do
+      # warn: use a real DummyAbortingOutput plugin instantiated by PluginFactory because it needs
+      # a properly initialized ExecutionContext, so DONT' mock the constructor of DummyAbortingOutput
+      allow(LogStash::Plugin).to receive(:lookup).with("input", "dummymanualinputgenerator").and_return(DummyManualInputGenerator)
+      allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_return(LogStash::Codecs::Plain)
+      allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyabortingoutput").and_return(DummyAbortingOutput)
+      allow(LogStash::JavaPipeline).to receive(:filter_queue_client).and_return(queue_client_batch)
+      allow(LogStash::JavaPipeline).to receive(:logger).twice.and_return(logger)
+    end
+
+   before(:each) do
+      expect { subject.start }.to_not raise_error
+      expect(queue_client_batch).to_not receive(:close_batch)
+
+      # make sure all the workers are started
+      wait(5).for {subject.worker_threads.any?(&:alive?)}.to be_truthy
+    end
+    it "should not acknowledge the batch" do
+      # command a shutdown while the output is processing a batch and not completing it
+      thread = Thread.new { subject.shutdown_workers }
+
+      # wait for inputs to terminate
+      wait(5).for {subject.input_threads.any?(&:alive?)}.to be_falsey
+
+      # the exception raised by the aborting output should have stopped the workers
+      wait(5).for {subject.worker_threads.any?(&:alive?)}.to be_falsey
+
+      # need to wait that the pipeline thread stops completely, else the logger mock could be
+      # used outside of this context
+      subject.wait_for_shutdown
+
+      # verify the not completed batch by checking output stats
+      expect(collected_metric[:stats][:events][:duration_in_millis].value).not_to be_nil
+      expect(collected_metric[:stats][:events][:in].value).to eq(2)
+      expect(collected_metric[:stats][:events][:out].value).to eq(0)
+    end
+
+    it "should not throw a generic error" do
+      expect(logger).not_to receive(:error).with(/Pipeline worker error, the pipeline will be stopped/, anything)
+
+      # command a shutdown while the output is processing a batch and not completing it
+      thread = Thread.new { subject.shutdown_workers }
+
+      # wait for inputs to terminate
+      wait(5).for {subject.input_threads.any?(&:alive?)}.to be_falsey
+
+      # the exception raised by the aborting output should have stopped the workers
+      wait(5).for {subject.worker_threads.any?(&:alive?)}.to be_falsey
+
+      # need to wait that the pipeline thread stops completely, else the logger mock could be
+      # used outside of this context
+      subject.wait_for_shutdown
+    end
+  end
+
+  context "when logical expression in conditional" do
+    extend PipelineHelpers
+
+    let(:settings) { LogStash::SETTINGS.clone }
+
+    config <<-CONFIG
+          filter {
+            if [path][to][value] > 100 {
+              mutate { add_tag => "hit" }
+            } else {
+              mutate { add_tag => "miss" }
+            }
+          }
+        CONFIG
+
+    context "raise an error when it's evaluated, should cancel the event execution and log the error" do
+      context "when type of evaluation doesn't have same type" do
+        sample_one( [{ "path" => {"to" => {"value" => "101"}}}] ) do
+          expect(subject).to be nil
+          expect(pipeline.last_error_evaluation_received).to match(/no implicit conversion of nil into Integer/)
+        end
+      end
+
+      context "when left and right operands of event condition are not comparable" do
+        context "comparing a non existing field" do
+          sample_one( [{ "path" => {"to" => "Rome"}}] ) do
+            expect(subject).to be nil
+            expect(pipeline.last_error_evaluation_received).to match(/<no-class>:<null-value>/)
+          end
+        end
+
+        context "comparing incompatible types" do
+          sample_one( [{ "path" => {"to" => {"value" => [101, 102]}}}] ) do
+            expect(subject).to be nil
+            expect(pipeline.last_error_evaluation_received).to match(/Unexpected conditional input combination of.*List.*RubyFixnum/)
+          end
+        end
+      end
+
+      context "when the offending logic expression is used in a nested conditional structure" do
+        config <<-CONFIG
+                  filter {
+                    if "a" == "a" {
+                      if "b" == "b" {
+                        if [path][to][value] > 100 {
+                          mutate { add_tag => "hit" }
+                        } else {
+                          mutate { add_tag => "miss" }
+                        }
+                      }
+                    }
+                  }
+                CONFIG
+
+        sample_one( [{ "path" => {"to" => {"value" => "101"}}}] ) do
+          expect(subject).to be nil
+          expect(pipeline.last_error_evaluation_received).to match(/no implicit conversion of nil into Integer/)
+        end
+      end
+
+      context "when the offending condition is in the output section" do
+        before do
+          LogStash::PLUGIN_REGISTRY.add(:input, "spec_sampler_input", PipelineHelpers::SpecSamplerInput)
+          LogStash::PLUGIN_REGISTRY.add(:output, "spec_sampler_output", PipelineHelpers::SpecSamplerOutput)
+        end
+
+        context "given a pipeline executing an event that would trigger an evaluation error" do
+          let(:pipeline) do
+            LogStash::JavaPipeline.new(
+              org.logstash.config.ir.PipelineConfig.new(
+                LogStash::Config::Source::Local, :main,
+                SourceWithMetadata.new(
+                  "config_string", "config_string",
+                  "input { spec_sampler_input {} }\n output { if [path][to][value] > 100 { spec_sampler_output {} } }"
+                ), settings
+              )
+            )
+          end
+          let(:event) do
+            [LogStash::Event.new({ "path" => {"to" => {"value" => "101"}}})]
+          end
+
+          let(:results) do
+            PipelineHelpers::SpecSamplerInput.set_event event
+            pipeline.run
+            PipelineHelpers::SpecSamplerOutput.seen
+          end
+
+          after do
+            pipeline.close
+          end
+
+          describe "when DLQ is disabled" do
+            let(:settings) do
+              s = super()
+              s.set_value("queue.drain", true)
+              s
+            end
+
+            subject {results.length > 1 ? results : results.first}
+
+            it "should raise an error without killing the pipeline" do
+              expect(subject).to be nil
+              expect(pipeline.last_error_evaluation_received).to match(/no implicit conversion of nil into Integer/)
+            end
+          end
+
+          describe "when DLQ is enabled" do
+            let(:dlq_path) { Dir.mktmpdir }
+
+            let(:settings) do
+              s = super()
+              s.set_value("queue.drain", true)
+              s.set_value("pipeline.id", "test_dlq")
+              s.set_value("dead_letter_queue.enable", true)
+              s.set_value("path.dead_letter_queue", dlq_path)
+              s
+            end
+
+            after do
+              FileUtils.rm_rf(settings.get_value("path.dead_letter_queue"))
+            end
+
+            subject {results.length > 1 ? results : results.first}
+
+            it "should raise an error without killing the pipeline and insert the event into DLQ" do
+              expect(subject).to be nil
+              expect(pipeline.last_error_evaluation_received).to match(/no implicit conversion of nil into Integer/)
+              dlq_path = java.nio.file.Paths.get(settings.get_value("path.dead_letter_queue"), "test_dlq")
+              dlq_reader = org.logstash.common.io.DeadLetterQueueReader.new(dlq_path)
+              entry = dlq_reader.pollEntry(40)
+              expect(entry).to_not be_nil
+              expect(entry.reason).to match(/condition evaluation error.*no implicit conversion of nil into Integer/)
+              expect(entry.plugin_id).to eq("if-statement")
+              expect(entry.plugin_type).to eq("if-statement")
+            end
+          end
+        end
+
+        describe "given a pipeline executing an event with invalid UTF-8 string" do
+          let(:pipeline) do
+            settings.set_value("queue.drain", true)
+            LogStash::JavaPipeline.new(
+              org.logstash.config.ir.PipelineConfig.new(
+                LogStash::Config::Source::Local, :main,
+                SourceWithMetadata.new(
+                  "config_string", "config_string",
+                  "input { spec_sampler_input {} }\n output { if [message] =~ /^(NOSQL|SQL):/ { spec_sampler_output {} } }"
+                ), settings
+              )
+            )
+          end
+          let(:event) do
+            [LogStash::Event.new({ "message" => "abrac\xC5adabra"})]
+          end
+
+          let(:results) do
+            PipelineHelpers::SpecSamplerInput.set_event event
+            pipeline.run
+            PipelineHelpers::SpecSamplerOutput.seen
+          end
+
+          after do
+            pipeline.close
+          end
+
+          subject {results.length > 1 ? results : results.first}
+
+          it "should raise an error without killing the pipeline" do
+            expect(subject).to be nil
+            expect(pipeline.last_error_evaluation_received).to match(/invalid byte sequence in UTF-8/)
+          end
+        end
+      end
+    end
+  end
+
+  context "a crashing worker terminates the pipeline and all inputs and workers" do
+    subject { mock_java_pipeline_from_string(config, pipeline_settings_obj) }
+    let(:config) do
+      <<-EOS
+      input { dummymanualinputgenerator {} }
+      filter { dummycrashingfilter {} }
+      output { dummyoutput {} }
+      EOS
+    end
+    let(:dummyoutput) { ::LogStash::Outputs::DummyOutput.new }
+    let(:dummyinput) { DummyManualInputGenerator.new }
+
+    before :each do
+      allow(::LogStash::Outputs::DummyOutput).to receive(:new).with(any_args).and_return(dummyoutput)
+      allow(DummyManualInputGenerator).to receive(:new).with(any_args).and_return(dummyinput)
+
+      allow(LogStash::Plugin).to receive(:lookup).with("input", "dummymanualinputgenerator").and_return(DummyManualInputGenerator)
+      allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_return(LogStash::Codecs::Plain)
+      allow(LogStash::Plugin).to receive(:lookup).with("filter", "dummycrashingfilter").and_return(DummyCrashingFilter)
+      allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutput").and_return(::LogStash::Outputs::DummyOutput)
+    end
+
+    context "a crashing worker using memory queue" do
+      let(:pipeline_settings) { super().merge({ "pipeline.batch.size" => 1, "pipeline.workers" => 1, "queue.type" => "memory"}) }
+
+      it "does not raise in the main thread, terminates the run thread and finishes execution" do
+        # first make sure we keep the input plugin in the run method for now
+        dummyinput.keep_running.make_true
+
+        expect { subject.start }.to_not raise_error
+
+        # wait until there is no more worker thread since we have a single worker that should have died
+        wait(5).for {subject.worker_threads.any?(&:alive?)}.to be_falsey
+        expect(subject.crashed?).to be true
+
+        # at this point the input plugin should have been asked to stop
+        wait(5).for {dummyinput.stop?}.to be_truthy
+
+        # allow the input plugin to exit the run method now
+        dummyinput.keep_running.make_false
+
+        # the pipeline thread should terminate normally
+        expect { subject.thread.join }.to_not raise_error
+        expect(subject.finished_execution?).to be_truthy
+
+        # when the pipeline has exited, no input threads should be alive
+        wait(5).for {subject.input_threads.any?(&:alive?)}.to be_falsey
+      end
+    end
+
+    context "a crashing worker using persisted queue" do
+      let(:pipeline_settings) { super().merge({ "pipeline.batch.size" => 1, "pipeline.workers" => 1, "queue.type" => "persisted"}) }
+
+      it "does not raise in the main thread, terminates the run thread and finishes execution" do
+        # first make sure we keep the input plugin in the run method for now
+        dummyinput.keep_running.make_true
+
+        expect { subject.start }.to_not raise_error
+
+        # wait until there is no more worker thread since we have a single worker that should have died
+        wait(5).for {subject.worker_threads.any?(&:alive?)}.to be_falsey
+        expect(subject.crashed?).to be true
+
+        # at this point the input plugin should have been asked to stop
+        wait(5).for {dummyinput.stop?}.to be_truthy
+
+        # allow the input plugin to exit the run method now
+        dummyinput.keep_running.make_false
+
+        # the pipeline thread should terminate normally
+        expect { subject.thread.join }.to_not raise_error
+        expect(subject.finished_execution?).to be_truthy
+
+        # when the pipeline has exited, no input threads should be alive
+        wait(5).for {subject.input_threads.any?(&:alive?)}.to be_falsey
+
+        expect {dummyinput.push_once}.to raise_error(/Tried to write to a closed queue/)
+      end
+    end
+  end
+
   describe "defaulting the pipeline workers based on thread safety" do
     before(:each) do
       allow(LogStash::Plugin).to receive(:lookup).with("input", "dummyinput").and_return(DummyInput)
@@ -273,21 +690,21 @@ describe LogStash::JavaPipeline do
           msg = "Defaulting pipeline worker threads to 1 because there are some filters that might not work with multiple worker threads"
           pipeline = mock_java_pipeline_from_string(test_config_with_filters)
           expect(pipeline.logger).to receive(:warn).with(msg,
-            hash_including({:count_was=>worker_thread_count, :filters=>["dummyfilter"]}))
-          pipeline.run
+            hash_including({:count_was => worker_thread_count, :filters => ["dummyfilter"]}))
+          pipeline.start
           expect(pipeline.worker_threads.size).to eq(safe_thread_count)
           pipeline.shutdown
         end
       end
 
       context "when there is command line -w N set" do
-        let(:pipeline_settings) { {"pipeline.workers" => override_thread_count } }
+        let(:pipeline_settings) { super().merge({"pipeline.workers" => override_thread_count }) }
         it "starts multiple filter thread" do
           msg = "Warning: Manual override - there are filters that might" +
                 " not work with multiple worker threads"
           pipeline = mock_java_pipeline_from_string(test_config_with_filters, pipeline_settings_obj)
-          expect(pipeline.logger).to receive(:warn).with(msg, hash_including({:worker_threads=> override_thread_count, :filters=>["dummyfilter"]}))
-          pipeline.run
+          expect(pipeline.logger).to receive(:warn).with(msg, hash_including({:worker_threads => override_thread_count, :filters => ["dummyfilter"]}))
+          pipeline.start
           expect(pipeline.worker_threads.size).to eq(override_thread_count)
           pipeline.shutdown
         end
@@ -314,7 +731,7 @@ describe LogStash::JavaPipeline do
       it "starts multiple filter threads" do
         skip("This test has been failing periodically since November 2016. Tracked as https://github.com/elastic/logstash/issues/6245")
         pipeline = mock_java_pipeline_from_string(test_config_with_filters)
-        pipeline.run
+        pipeline.start
         expect(pipeline.worker_threads.size).to eq(worker_thread_count)
         pipeline.shutdown
       end
@@ -328,7 +745,6 @@ describe LogStash::JavaPipeline do
       allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutput").and_return(::LogStash::Outputs::DummyOutput)
     end
 
-
     let(:test_config_without_output_workers) {
       <<-eos
       input {
@@ -355,22 +771,17 @@ describe LogStash::JavaPipeline do
       eos
     }
 
-    context "output close" do
+    context "input and output close" do
       let(:pipeline) { mock_java_pipeline_from_string(test_config_without_output_workers) }
       let(:output) { pipeline.outputs.first }
+      let(:input) { pipeline.inputs.first }
 
-      before do
-        allow(output).to receive(:do_close)
-      end
-
-      after do
+      it "should call close of input and output without output-workers" do
+        expect(output).to receive(:do_close).once
+        expect(input).to receive(:do_close).once
+        pipeline.start
         pipeline.shutdown
-      end
-
-      it "should call close of output without output-workers" do
-        pipeline.run
-
-        expect(output).to have_received(:do_close).once
+        expect(pipeline.crashed?).to be false
       end
     end
   end
@@ -401,6 +812,8 @@ describe LogStash::JavaPipeline do
 
   context "compiled flush function" do
     extend PipelineHelpers
+    let(:settings) { LogStash::SETTINGS.clone }
+
     describe "flusher thread" do
       before(:each) do
         allow(LogStash::Plugin).to receive(:lookup).with("input", "dummyinput").and_return(DummyInput)
@@ -416,7 +829,7 @@ describe LogStash::JavaPipeline do
         expect(pipeline).to receive(:transition_to_running).ordered.and_call_original
         expect(pipeline).to receive(:start_flusher).ordered.and_call_original
 
-        pipeline.run
+        pipeline.start
         pipeline.shutdown
       end
     end
@@ -448,10 +861,134 @@ describe LogStash::JavaPipeline do
     end
   end
 
+  context "batch order" do
+    extend PipelineHelpers
+
+    context "with a single worker and ordering enabled" do
+      let(:settings) do
+        s = LogStash::SETTINGS.clone
+        s.set_value("pipeline.workers", 1)
+        s.set_value("pipeline.ordered", "true")
+        s
+      end
+
+      config <<-CONFIG
+        filter {
+          if [message] =~ "\\d" {
+            mutate { add_tag => "digit" }
+          } else {
+            mutate { add_tag => "letter" }
+          }
+        }
+      CONFIG
+
+       sample_one(["a", "1", "b", "2", "c", "3"]) do
+        expect(subject.map {|e| e.get("message")}).to eq(["a", "1", "b", "2", "c", "3"])
+      end
+    end
+
+    context "with a multiple workers and ordering enabled" do
+      let(:settings) do
+        s = LogStash::SETTINGS.clone
+        s.set_value("pipeline.workers", 2)
+        s.set_value("pipeline.ordered", "true")
+        s
+      end
+      let(:config) { "input { } output { }" }
+      let(:pipeline) { mock_java_pipeline_from_string(config, settings) }
+
+      it "should raise error" do
+        expect {pipeline.run}.to raise_error(RuntimeError, /pipeline\.ordered/)
+        pipeline.close
+      end
+    end
+
+    context "with an explicit single worker ordering will auto enable" do
+      let(:settings) do
+        s = LogStash::SETTINGS.clone
+        s.set_value("pipeline.workers", 1)
+        s.set_value("pipeline.ordered", "auto")
+        s
+      end
+
+      config <<-CONFIG
+        filter {
+          if [message] =~ "\\d" {
+            mutate { add_tag => "digit" }
+          } else {
+            mutate { add_tag => "letter" }
+          }
+        }
+      CONFIG
+
+       sample_one(["a", "1", "b", "2", "c", "3"]) do
+        expect(subject.map {|e| e.get("message")}).to eq(["a", "1", "b", "2", "c", "3"])
+      end
+    end
+
+    context "with an implicit single worker ordering will not auto enable" do
+      let(:settings) do
+        s = LogStash::SETTINGS.clone
+        s.set_value("pipeline.ordered", "auto")
+        s
+      end
+
+      before(:each) do
+        # this is to make sure this test will be valid by having a pipeline.workers default value > 1
+        # and not explicitly set.
+        expect(settings.get_default("pipeline.workers")).to be > 1
+        expect(settings.set?("pipeline.workers")).to be_falsey
+
+        expect(LogStash::Plugin).to receive(:lookup).with("filter", "dummyfilter").at_least(1).time.and_return(DummyFilter)
+        expect(LogStash::Plugin).to receive(:lookup).with(any_args).at_least(3).time.and_call_original
+      end
+
+      config <<-CONFIG
+        filter {
+          # per above dummyfilter is not threadsafe hence will set the number of workers to 1
+          dummyfilter { }
+
+          if [message] =~ "\\d" {
+            mutate { add_tag => "digit" }
+          } else {
+            mutate { add_tag => "letter" }
+          }
+        }
+      CONFIG
+
+      sample_one(["a", "1", "b", "2", "c", "3"]) do
+        expect(subject.map {|e| e.get("message")}).to eq(["1", "2", "3", "a", "b", "c"])
+      end
+    end
+
+    context "with a single worker and ordering disabled" do
+      let(:settings) do
+        s = LogStash::SETTINGS.clone
+        s.set_value("pipeline.workers", 1)
+        s.set_value("pipeline.ordered", "false")
+        s
+      end
+
+      config <<-CONFIG
+        filter {
+          if [message] =~ "\\d" {
+            mutate { add_tag => "digit" }
+          } else {
+            mutate { add_tag => "letter" }
+          }
+        }
+      CONFIG
+
+      sample_one(["a", "1", "b", "2", "c", "3"]) do
+        expect(subject.map {|e| e.get("message")}).to eq(["1", "2", "3", "a", "b", "c"])
+      end
+    end
+  end
+
   describe "max inflight warning" do
     let(:config) { "input { dummyinput {} } output { dummyoutput {} }" }
     let(:batch_size) { 1 }
-    let(:pipeline_settings) { { "pipeline.batch.size" => batch_size, "pipeline.workers" => 1 } }
+    let(:pipeline_settings) { super().merge({ "pipeline.batch.size" => batch_size, "pipeline.workers" => 1 }) }
     let(:pipeline) { mock_java_pipeline_from_string(config, pipeline_settings_obj) }
     let(:logger) { pipeline.logger }
     let(:warning_prefix) { Regexp.new("CAUTION: Recommended inflight events max exceeded!") }
@@ -462,36 +999,27 @@ describe LogStash::JavaPipeline do
       allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutput").and_return(::LogStash::Outputs::DummyOutput)
       allow(logger).to receive(:warn)
 
-      # pipeline must be first called outside the thread context because it lazily initialize and will create a
-      # race condition if called in the thread
-      p = pipeline
-      t = Thread.new { p.run }
-      Timeout.timeout(timeout) do
-        sleep(0.1) until pipeline.ready?
-      end
+      pipeline.start
+      # the only input auto-closes, so the pipeline will automatically stop.
+      sleep(0.01) until pipeline.stopped?
       pipeline.shutdown
-      t.join
     end
 
     it "should not raise a max inflight warning if the max_inflight count isn't exceeded" do
       expect(logger).not_to have_received(:warn).with(warning_prefix)
     end
 
-    context "with a too large inflight count" do
-      let(:batch_size) { LogStash::JavaPipeline::MAX_INFLIGHT_WARN_THRESHOLD + 1 }
-
-      it "should raise a max inflight warning if the max_inflight count is exceeded" do
-        expect(logger).to have_received(:warn).with(warning_prefix, hash_including(:pipeline_id => anything))
-      end
-    end
   end
 
   context "compiled filter functions" do
     context "new events should propagate down the filters" do
       extend PipelineHelpers
+      let(:settings) { LogStash::SETTINGS.clone }
+
       config <<-CONFIG
         filter {
           clone {
+            ecs_compatibility => disabled
             clones => ["clone1", "clone2"]
           }
           mutate {
@@ -608,8 +1136,9 @@ describe LogStash::JavaPipeline do
   end
 
   context "Periodic Flush" do
-    let(:config) do
-      <<-EOS
+    shared_examples 'it flushes correctly' do
+      let(:config) do
+        <<-EOS
       input {
         dummy_input {}
       }
@@ -619,6 +1148,57 @@ describe LogStash::JavaPipeline do
       output {
         dummy_output {}
       }
+        EOS
+      end
+      let(:output) { ::LogStash::Outputs::DummyOutput.new }
+
+      before do
+        allow(::LogStash::Outputs::DummyOutput).to receive(:new).with(any_args).and_return(output)
+        allow(LogStash::Plugin).to receive(:lookup).with("input", "dummy_input").and_return(LogStash::Inputs::DummyBlockingInput)
+        allow(LogStash::Plugin).to receive(:lookup).with("filter", "dummy_flushing_filter").and_return(DummyFlushingFilterPeriodic)
+        allow(LogStash::Plugin).to receive(:lookup).with("output", "dummy_output").and_return(::LogStash::Outputs::DummyOutput)
+        allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_return(LogStash::Codecs::Plain)
+      end
+
+      it "flush periodically" do
+        Thread.abort_on_exception = true
+        pipeline = mock_java_pipeline_from_string(config, pipeline_settings_obj)
+        Timeout.timeout(timeout) do
+          pipeline.start
+        end
+        Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
+          wait(10).for do
+            # give us a bit of time to flush the events
+            output.events.empty?
+          end.to be_falsey
+        end
+
+        expect(output.events.any? {|e| e.get("message") == "dummy_flush"}).to eq(true)
+
+        pipeline.shutdown
+      end
+    end
+
+    it_behaves_like 'it flushes correctly'
+
+    context 'with pipeline ordered' do
+      before do
+        pipeline_settings_obj.set("pipeline.workers", 1)
+        pipeline_settings_obj.set("pipeline.ordered", true)
+      end
+      it_behaves_like 'it flushes correctly'
+    end
+  end
+  context "Pipeline created with too many filters" do
+    # create pipeline with 2000 filters
+    # 2000 filters is more than a thread stack of size 2MB can handle
+    let(:config) do
+      <<-EOS
+      input { dummy_input {} }
+      filter {
+        #{"          nil_flushing_filter {}\n" * 2000}
+      }
+      output { dummy_output {} }
       EOS
     end
     let(:output) { ::LogStash::Outputs::DummyOutput.new }
@@ -626,33 +1206,22 @@ describe LogStash::JavaPipeline do
     before do
       allow(::LogStash::Outputs::DummyOutput).to receive(:new).with(any_args).and_return(output)
       allow(LogStash::Plugin).to receive(:lookup).with("input", "dummy_input").and_return(LogStash::Inputs::DummyBlockingInput)
-      allow(LogStash::Plugin).to receive(:lookup).with("filter", "dummy_flushing_filter").and_return(DummyFlushingFilterPeriodic)
+      allow(LogStash::Plugin).to receive(:lookup).with("filter", "nil_flushing_filter").and_return(NilFlushingFilterPeriodic)
       allow(LogStash::Plugin).to receive(:lookup).with("output", "dummy_output").and_return(::LogStash::Outputs::DummyOutput)
       allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_return(LogStash::Codecs::Plain)
     end
 
-    it "flush periodically" do
-      Thread.abort_on_exception = true
-      pipeline = mock_java_pipeline_from_string(config, pipeline_settings_obj)
-      t = Thread.new { pipeline.run }
-      Timeout.timeout(timeout) do
-        sleep(0.1) until pipeline.ready?
-      end
-      Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
-        wait(10).for do
-          # give us a bit of time to flush the events
-          output.events.empty?
-        end.to be_falsey
-      end
+    let(:pipeline) { mock_java_pipeline_from_string(config, pipeline_settings_obj) }
 
-      expect(output.events.any? {|e| e.get("message") == "dummy_flush"}).to eq(true)
+    it "informs the user that a stack overflow occurred" do
+      allow(pipeline.logger).to receive(:error)
 
+      pipeline.start
       pipeline.shutdown
 
-      t.join
+      expect(pipeline.logger).to have_received(:error).with(/Stack overflow/, anything).at_least(:once)
     end
   end
-
   context "Periodic Flush that intermittently returns nil" do
     let(:config) do
       <<-EOS
@@ -680,9 +1249,8 @@ describe LogStash::JavaPipeline do
     it "flush periodically without error on nil flush return" do
       Thread.abort_on_exception = true
       pipeline = mock_java_pipeline_from_string(config, pipeline_settings_obj)
-      t = Thread.new { pipeline.run }
       Timeout.timeout(timeout) do
-        sleep(0.1) until pipeline.ready?
+        pipeline.start
       end
       Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
         wait(10).for do
@@ -694,8 +1262,6 @@ describe LogStash::JavaPipeline do
       expect(output.events.any? {|e| e.get("message") == "dummy_flush"}).to eq(true)
 
       pipeline.shutdown
-
-      t.join
     end
   end
 
@@ -733,9 +1299,8 @@ describe LogStash::JavaPipeline do
     it "flush periodically" do
       Thread.abort_on_exception = true
       pipeline = mock_java_pipeline_from_string(config, pipeline_settings_obj)
-      t = Thread.new { pipeline.run }
       Timeout.timeout(timeout) do
-        sleep(0.1) until pipeline.ready?
+        pipeline.start
       end
       Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
         wait(11).for do
@@ -747,8 +1312,6 @@ describe LogStash::JavaPipeline do
       expect(output.events.any? {|e| e.get("message") == "dummy_flush"}).to eq(true)
 
       pipeline.shutdown
-
-      t.join
     end
   end
 
@@ -760,8 +1323,8 @@ describe LogStash::JavaPipeline do
       }
       filter {
        clone {
-          add_field => { 
-            'cloned' =>  'cloned' 
+          add_field => {
+            'cloned' =>  'cloned'
           }
           clones => ["clone1"]
         }
@@ -787,7 +1350,8 @@ describe LogStash::JavaPipeline do
 
     it "correctly distributes events" do
       pipeline = mock_java_pipeline_from_string(config, pipeline_settings_obj)
-      pipeline.run
+      pipeline.start
+      sleep 0.01 until pipeline.finished_execution?
       pipeline.shutdown
       expect(output.events.size).to eq(60)
       expect(output.events.count {|e| e.get("cloned") == "cloned"}).to eq(30)
@@ -817,7 +1381,7 @@ describe LogStash::JavaPipeline do
     end
 
     it "return when the pipeline started working" do
-      subject.run
+      subject.start
       expect(subject.started_at).to be < Time.now
       subject.shutdown
     end
@@ -845,18 +1409,12 @@ describe LogStash::JavaPipeline do
 
     context "when the pipeline is started" do
       it "return the duration in milliseconds" do
-        # subject must be first call outside the thread context because of lazy initialization
-        s = subject
-        t = Thread.new { s.run }
         Timeout.timeout(timeout) do
-          sleep(0.1) until subject.ready?
-        end
-        Timeout.timeout(timeout) do
-          sleep(0.1)
+          subject.start
         end
+        sleep(0.1)
         expect(subject.uptime).to be > 0
         subject.shutdown
-        t.join
       end
     end
   end
@@ -866,7 +1424,7 @@ describe LogStash::JavaPipeline do
 
     subject { mock_java_pipeline_from_string(config, pipeline_settings_obj, metric) }
 
-    let(:pipeline_settings) { { "pipeline.id" => pipeline_id } }
+    let(:pipeline_settings) { super().merge({ "pipeline.id" => pipeline_id }) }
     let(:pipeline_id) { "main" }
     let(:number_of_events) { 420 }
     let(:dummy_id) { "my-multiline" }
@@ -898,12 +1456,6 @@ describe LogStash::JavaPipeline do
     end
     let(:dummyoutput) { ::LogStash::Outputs::DummyOutput.new({ "id" => dummy_output_id }) }
     let(:metric_store) { subject.metric.collector.snapshot_metric.metric_store }
-    let(:pipeline_thread) do
-      # subject has to be called for the first time outside the thread because it will create a race condition
-      # with the subject.ready? call since subject is lazily initialized
-      s = subject
-      Thread.new { s.run }
-    end
 
     before :each do
       allow(::LogStash::Outputs::DummyOutput).to receive(:new).with(any_args).and_return(dummyoutput)
@@ -912,9 +1464,8 @@ describe LogStash::JavaPipeline do
       allow(LogStash::Plugin).to receive(:lookup).with("filter", "dummyfilter").and_return(LogStash::Filters::DummyFilter)
       allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutput").and_return(::LogStash::Outputs::DummyOutput)
 
-      pipeline_thread
       Timeout.timeout(timeout) do
-        sleep(0.1) until subject.ready?
+        subject.start
       end
 
       # make sure we have received all the generated events
@@ -928,7 +1479,6 @@ describe LogStash::JavaPipeline do
 
     after :each do
       subject.shutdown
-      pipeline_thread.join
     end
 
     context "global metric" do
@@ -990,7 +1540,6 @@ describe LogStash::JavaPipeline do
           collect_stats
           expect(collected_stats).to be_nil
         end
-
       end
 
       context 'when dlq is enabled' do
@@ -1005,6 +1554,7 @@ describe LogStash::JavaPipeline do
           collect_stats
           # A newly created dead letter queue with no entries will have a size of 1 (the version 'header')
           expect(collected_stats[:queue_size_in_bytes].value).to eq(1)
+          expect(collected_stats[:storage_policy].value).to eq("drop_newer")
         end
       end
     end
@@ -1082,4 +1632,100 @@ describe LogStash::JavaPipeline do
       end
     end
   end
+
+  context "#shutdown" do
+    subject(:pipeline) { mock_java_pipeline_from_string(config, pipeline_settings_obj, pipeline_metric) }
+    let(:pipeline_metric) { LogStash::Instrument::Metric.new(LogStash::Instrument::Collector.new) }
+    let(:dummyinput_class) { DummyManualInputGenerator }
+    let(:dummyinput_config) { {'enable_metric' => true} }
+    let(:dummyinput) { dummyinput_class.new(dummyinput_config) }
+    let(:pipeline_id) { "shutdown" }
+    let(:config) { build_pipeline_string_config(dummyinput_config) }
+
+    def build_pipeline_string_config(dummyinput_config)
+      <<-"EOS"
+      input { dummyinput { #{ dummyinput_config.to_s.tr('{},', '') } } }
+      filter { dummyfilter {} }
+      output { dummyoutput {} }
+      EOS
+    end
+
+    before(:each) do
+      allow(::LogStash::Outputs::DummyOutput).to receive(:new).with(any_args).and_return(::LogStash::Outputs::DummyOutput::new)
+      allow(DummyManualInputGenerator).to receive(:new).with(any_args).and_return(dummyinput)
+
+      allow(LogStash::Plugin).to receive(:lookup).with("input", "dummyinput").and_return(dummyinput_class)
+      allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_return(LogStash::Codecs::Plain)
+      allow(LogStash::Plugin).to receive(:lookup).with("filter", "dummyfilter").and_return(DummyFilter)
+      allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutput").and_return(::LogStash::Outputs::DummyOutput)
+
+      allow(pipeline).to receive(:clear_pipeline_metrics).and_call_original
+      allow(pipeline).to receive(:stop_inputs).and_call_original
+      allow(pipeline).to receive(:wait_for_shutdown).and_return(double(new: nil))
+    end
+
+    context "of a running pipeline" do
+      let(:pipeline_settings) { { "pipeline.batch.size" => 1, "pipeline.workers" => 1, "pipeline.id" => pipeline_id, "metric.collect" => true } }
+
+      it "should clear the pipeline metrics" do
+        dummyinput.keep_running.make_true
+
+        expect { pipeline.start }.to_not raise_error
+
+        pipeline.shutdown
+
+        expect(pipeline).to have_received(:clear_pipeline_metrics)
+        expect(pipeline).to have_received(:stop_inputs)
+        expect(pipeline).to have_received(:wait_for_shutdown)
+      end
+    end
+
+    context "of a failed reloading pipeline" do
+      let(:agent) { double("agent") }
+      let(:dummyinput_class) { DummyCrashingInput }
+      let(:pipeline_settings) { {
+        "pipeline.id" => pipeline_id,
+        "pipeline.batch.size" => 1,
+        "pipeline.workers" => 1,
+        "metric.collect" => true,
+        "config.reload.automatic" => true
+      } }
+      let(:pipelines) do
+        registry = LogStash::PipelinesRegistry.new
+        registry.create_pipeline(pipeline_id.to_sym, pipeline) { true }
+        registry
+      end
+
+      # This test ensure that even for failed pipeline reloads, the shutdown method cleans
+      # the pipeline's metric store. If those metrics are not cleaned, it would pilling up
+      # data from previous reloads attempts.
+      it "should clear the pipeline metrics for every shutdown" do
+        expect { pipeline.start }.to_not raise_error
+
+        wait(10).for { pipeline.running? }
+
+        new_config_string = build_pipeline_string_config({'on_register' => 'true' })
+        reload_action = LogStash::PipelineAction::Reload.new(
+          mock_pipeline_config(pipeline_id, new_config_string, pipeline_settings),
+          pipeline_metric
+        )
+
+        # 1st failed attempt (finished_execution? = > false)
+        action_result = reload_action.execute(agent, pipelines)
+        expect(action_result.successful?).to be_falsy
+        expect(pipeline).to have_received(:clear_pipeline_metrics)
+        expect(pipeline).to have_received(:stop_inputs)
+        expect(pipeline).to have_received(:wait_for_shutdown)
+
+        # 2nd failed attempt (finished_execution? = > true, as the previous reload failed)
+        pipeline = pipelines.states.get(pipeline_id.to_sym).pipeline
+        allow(pipeline).to receive(:wait_for_shutdown).and_return(double(new: nil))
+        allow(pipeline).to receive(:clear_pipeline_metrics).and_call_original
+
+        action_result = reload_action.execute(agent, pipelines)
+        expect(action_result.successful?).to be_falsy
+        expect(pipeline).to have_received(:clear_pipeline_metrics)
+      end
+    end
+  end
 end
diff --git a/logstash-core/spec/logstash/json_spec.rb b/logstash-core/spec/logstash/json_spec.rb
index 8ad341c2b..4ada40cdb 100644
--- a/logstash-core/spec/logstash/json_spec.rb
+++ b/logstash-core/spec/logstash/json_spec.rb
@@ -1,11 +1,26 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/json"
 require "logstash/environment"
 require "logstash/util"
 
 describe "LogStash::Json" do
-
   let(:hash)   {{"a" => 1}}
   let(:json_hash)   {"{\"a\":1}"}
 
@@ -57,7 +72,6 @@ describe "LogStash::Json" do
     end
 
     context "pretty print" do
-
       let(:hash) { { "foo" => "bar", :zoo => 2 } }
 
       it "should serialize with pretty print" do
@@ -90,7 +104,7 @@ describe "LogStash::Json" do
   end
 
   it "should raise Json::ParserError on invalid json" do
-    expect{LogStash::Json.load("abc")}.to raise_error LogStash::Json::ParserError
+    expect {LogStash::Json.load("abc")}.to raise_error LogStash::Json::ParserError
   end
 
   it "should return nil on empty string" do
@@ -104,4 +118,98 @@ describe "LogStash::Json" do
     o = LogStash::Json.load("  ")
     expect(o).to be_nil
   end
+
+  # a safeguard guard test to ensure that Json#dump does not break (especially if internally processes)
+  # current behavior when Event (RubyEvent object) is passed
+  describe "Json#dump the event" do
+    let(:sample_count) { 10 }
+    let(:sample_event) { LogStash::Event.new('message' => 'This is a message') }
+    let(:dumped_sample_event) { LogStash::Json.dump(sample_event) }
+    let(:sample_events) do
+      sample_count.times.map do
+        [sample_event, dumped_sample_event]
+      end
+    end
+
+    it 'validates the Json#dump event' do
+      sample_events.each do |sample_event, dumped_sample_event|
+        # Json#dump internally normalizes Event as it is
+        expect(sample_event.to_json).to eql(dumped_sample_event)
+      end
+    end
+  end
+
+  context "Unicode edge-cases" do
+    matcher :be_utf8 do
+      match(:notify_expectation_failures => true) do |actual|
+        aggregate_failures do
+          expect(actual).to have_attributes(:encoding => Encoding::UTF_8, :valid_encoding? => true)
+          expect(actual.bytes).to eq(@expected_bytes) unless @expected_bytes.nil?
+        end
+      end
+      chain :with_bytes do |expected_bytes|
+        @expected_bytes = expected_bytes
+      end
+    end
+
+    let(:result) { LogStash::Json::dump(input) }
+
+    context "with valid non-unicode encoding" do
+      let(:input) { "Th\xEFs \xCCs W\xCFnd\xD8w\x8A".b.force_encoding(Encoding::WINDOWS_1252).freeze }
+      it 'transcodes to equivalent UTF-8 code-points' do
+        aggregate_failures do
+          expect(result).to be_utf8.with_bytes("\u{22}Th\u{EF}s \u{CC}s W\u{CF}nd\u{D8}w\u{160}\u{22}".bytes)
+        end
+      end
+    end
+
+    context "with unicode that has invalid sequences" do
+      let(:input) { "Thïs is a not-quite-v\xCEalid uni\xF0\x9D\x84code string 💖ok".b.force_encoding(Encoding::UTF_8).freeze }
+      it 'replaces each invalid sequence with the xFFFD replacement character' do
+        expect(result).to be_utf8.with_bytes("\x22Thïs is a not-quite-v\u{FFFD}alid uni\u{FFFD}code string 💖ok\x22".bytes)
+      end
+    end
+
+    context 'with valid unicode' do
+      let(:input) { "valid \u{A7}\u{a9c5}\u{18a5}\u{1f984} unicode".encode('UTF-8').freeze }
+      it 'keeps the unicode in-tact' do
+        expect(result).to be_utf8.with_bytes(('"' + input + '"').bytes)
+      end
+    end
+
+    context 'with binary-flagged input' do
+
+      context 'that contains only lower-ascii' do
+        let(:input) { "hello, world. This is a test including newline(\x0A) literal-backslash(\x5C) double-quote(\x22)".b.force_encoding(Encoding::BINARY).freeze}
+        it 'does not munge the bytes' do
+          expect(result).to be_utf8.with_bytes("\x22hello, world. This is a test including newline(\x5Cn) literal-backslash(\x5C\x5C) double-quote(\x5C\x22)\x22".bytes)
+        end
+      end
+
+      context 'that contains bytes outside lower-ascii' do
+        let(:input) { "Thïs is a not-quite-v\xCEalid uni\xF0\x9D\x84code string 💖ok".b.force_encoding(Encoding::BINARY).freeze }
+        it 'replaces each invalid sequence with the xFFFD replacement character' do
+          expect(result).to be_utf8.with_bytes("\x22Thïs is a not-quite-v\u{FFFD}alid uni\u{FFFD}code string 💖ok\x22".bytes)
+        end
+      end
+
+    end
+
+    context 'with hash data structure' do
+      let(:input) {{"Th\xEFs key and".b.force_encoding(Encoding::WINDOWS_1252).freeze =>
+                      {"Thïs key also".b.force_encoding(Encoding::UTF_8).freeze => "not-quite-v\xCEalid uni\xF0\x9D\x84code string 💖ok".b.force_encoding(Encoding::UTF_8).freeze}}}
+      it 'normalizes and replaces each invalid key-value with the xFFFD replacement character' do
+        expect(result).to be_utf8.with_bytes("{\"Th\u{EF}s key and\":{\"Thïs key also\":\"not-quite-v\u{FFFD}alid uni\u{FFFD}code string 💖ok\"}}".bytes)
+      end
+    end
+
+    context 'with array data structure' do
+      let(:input) {["Th\xEFs entry and".b.force_encoding(Encoding::WINDOWS_1252).freeze,
+                    "Thïs entry also".b.force_encoding(Encoding::UTF_8).freeze,
+                    "not-quite-v\xCEalid uni\xF0\x9D\x84code strings 💖ok".b.force_encoding(Encoding::UTF_8).freeze]}
+      it 'normalizes and replaces each invalid array values with the xFFFD replacement character' do
+        expect(result).to be_utf8.with_bytes("[\"Th\u{EF}s entry and\",\"Thïs entry also\",\"not-quite-v\u{FFFD}alid uni\u{FFFD}code strings 💖ok\"]".bytes)
+      end
+    end
+  end
 end
diff --git a/logstash-core/spec/logstash/legacy_ruby_event_spec.rb b/logstash-core/spec/logstash/legacy_ruby_event_spec.rb
deleted file mode 100644
index 5c1a75e1e..000000000
--- a/logstash-core/spec/logstash/legacy_ruby_event_spec.rb
+++ /dev/null
@@ -1,628 +0,0 @@
-# encoding: utf-8
-require "spec_helper"
-require "logstash/util/decorators"
-require "json"
-
-describe LogStash::Event do
-
-  shared_examples "all event tests" do
-    context "[]=" do
-      it "should raise an exception if you attempt to set @timestamp to a value type other than a Time object" do
-        expect{subject.set("@timestamp", "crash!")}.to raise_error(TypeError)
-      end
-
-      it "should assign simple fields" do
-        expect(subject.get("foo")).to be_nil
-        expect(subject.set("foo", "bar")).to eq("bar")
-        expect(subject.get("foo")).to eq("bar")
-      end
-
-      it "should overwrite simple fields" do
-        expect(subject.get("foo")).to be_nil
-        expect(subject.set("foo", "bar")).to eq("bar")
-        expect(subject.get("foo")).to eq("bar")
-
-        expect(subject.set("foo", "baz")).to eq("baz")
-        expect(subject.get("foo")).to eq("baz")
-      end
-
-      it "should assign deep fields" do
-        expect(subject.get("[foo][bar]")).to be_nil
-        expect(subject.set("[foo][bar]", "baz")).to eq("baz")
-        expect(subject.get("[foo][bar]")).to eq("baz")
-      end
-
-      it "should overwrite deep fields" do
-        expect(subject.get("[foo][bar]")).to be_nil
-        expect(subject.set("[foo][bar]", "baz")).to eq("baz")
-        expect(subject.get("[foo][bar]")).to eq("baz")
-
-        expect(subject.set("[foo][bar]", "zab")).to eq("zab")
-        expect(subject.get("[foo][bar]")).to eq("zab")
-      end
-
-      it "allow to set the @metadata key to a hash" do
-        subject.set("@metadata", { "action" => "index" })
-        expect(subject.get("[@metadata][action]")).to eq("index")
-      end
-
-      it "should add key when setting nil value" do
-        subject.set("[baz]", nil)
-        expect(subject.to_hash).to include("baz" => nil)
-      end
-
-      it "should set nil element within existing array value" do
-        subject.set("[foo]", ["bar", "baz"])
-
-        expect(subject.set("[foo][0]", nil)).to eq(nil)
-        expect(subject.get("[foo]")).to eq([nil, "baz"])
-      end
-
-      it "should set nil in first element within empty array" do
-        subject.set("[foo]", [])
-
-        expect(subject.set("[foo][0]", nil)).to eq(nil)
-        expect(subject.get("[foo]")).to eq([nil])
-      end
-
-      it "should set nil in second element within empty array" do
-        subject.set("[foo]", [])
-
-        expect(subject.set("[foo][1]", nil)).to eq(nil)
-        expect(subject.get("[foo]")).to eq([nil, nil])
-      end
-    end
-
-    context "#sprintf" do
-      it "should not return a String reference" do
-        data = "NOT-A-REFERENCE"
-        event = LogStash::Event.new({ "reference" => data })
-        LogStash::Util::Decorators.add_fields({"reference_test" => "%{reference}"}, event, "dummy-plugin")
-        data.downcase!
-        expect(event.get("reference_test")).not_to eq(data)
-      end
-
-      it "should not return an Integer reference" do
-        data = 1
-        event = LogStash::Event.new({ "reference" => data })
-        LogStash::Util::Decorators.add_fields({"reference_test" => "%{reference}"}, event, "dummy-plugin")
-        data += 41
-        expect(event.get("reference_test")).to eq("1")
-      end
-
-      it "should report a unix timestamp for %{+%s}" do
-        expect(subject.sprintf("%{+%s}")).to eq("1356998400")
-      end
-
-      it "should work if there is no fieldref in the string" do
-        expect(subject.sprintf("bonjour")).to eq("bonjour")
-      end
-
-      it "should not raise error and should format as empty string when @timestamp field is missing" do
-        str = "hello-%{+%s}"
-        subj = subject.clone
-        subj.remove("[@timestamp]")
-        expect{ subj.sprintf(str) }.not_to raise_error(LogStash::Error)
-        expect(subj.sprintf(str)).to eq("hello-")
-      end
-
-      it "should report a time with %{+format} syntax", :if => RUBY_ENGINE == "jruby" do
-        expect(subject.sprintf("%{+YYYY}")).to eq("2013")
-        expect(subject.sprintf("%{+MM}")).to eq("01")
-        expect(subject.sprintf("%{+HH}")).to eq("00")
-      end
-
-      it "should support mixed string" do
-        expect(subject.sprintf("foo %{+YYYY-MM-dd} %{type}")).to eq("foo 2013-01-01 sprintf")
-      end
-
-      it "should not raise error with %{+format} syntax when @timestamp field is missing", :if => RUBY_ENGINE == "jruby" do
-        str = "logstash-%{+YYYY}"
-        subj = subject.clone
-        subj.remove("[@timestamp]")
-        expect{ subj.sprintf(str) }.not_to raise_error(LogStash::Error)
-      end
-
-      it "should report fields with %{field} syntax" do
-        expect(subject.sprintf("%{type}")).to eq("sprintf")
-        expect(subject.sprintf("%{message}")).to eq(subject.get("message"))
-      end
-
-      it "should print deep fields" do
-        expect(subject.sprintf("%{[j][k1]}")).to eq("v")
-        expect(subject.sprintf("%{[j][k2][0]}")).to eq("w")
-      end
-
-      it "should be able to take a non-string for the format" do
-        expect(subject.sprintf(2)).to eq("2")
-      end
-
-      it "should allow to use the metadata when calling #sprintf" do
-        expect(subject.sprintf("super-%{[@metadata][fancy]}")).to eq("super-pants")
-      end
-
-      it "should allow to use nested hash from the metadata field" do
-        expect(subject.sprintf("%{[@metadata][have-to-go][deeper]}")).to eq("inception")
-      end
-
-      it "should return a json string if the key is a hash" do
-        expect(subject.sprintf("%{[j][k3]}")).to eq("{\"4\":\"m\"}")
-      end
-
-      it "should not strip last character" do
-        expect(subject.sprintf("%{type}%{message}|")).to eq("sprintfhello world|")
-      end
-
-      it "should render nil array values as leading empty string" do
-        expect(subject.set("foo", [nil, "baz"])).to eq([nil, "baz"])
-
-        expect(subject.get("[foo][0]")).to be_nil
-        expect(subject.get("[foo][1]")).to eq("baz")
-
-        expect(subject.sprintf("%{[foo]}")).to eq(",baz")
-      end
-
-      it "should render nil array values as middle empty string" do
-        expect(subject.set("foo", ["bar", nil, "baz"])).to eq(["bar", nil, "baz"])
-
-        expect(subject.get("[foo][0]")).to eq("bar")
-        expect(subject.get("[foo][1]")).to be_nil
-        expect(subject.get("[foo][2]")).to eq("baz")
-
-        expect(subject.sprintf("%{[foo]}")).to eq("bar,,baz")
-      end
-
-     it "should render nil array values as trailing empty string" do
-        expect(subject.set("foo", ["bar", nil])).to eq(["bar", nil])
-
-        expect(subject.get("[foo][0]")).to eq("bar")
-        expect(subject.get("[foo][1]")).to be_nil
-
-        expect(subject.sprintf("%{[foo]}")).to eq("bar,")
-     end
-
-      it "should render deep arrays with nil value" do
-        subject.set("[foo]", [[12, nil], 56])
-        expect(subject.sprintf("%{[foo]}")).to eq("12,,56")
-      end
-
-      context "#encoding" do
-        it "should return known patterns as UTF-8" do
-          expect(subject.sprintf("%{message}").encoding).to eq(Encoding::UTF_8)
-        end
-
-        it "should return unknown patterns as UTF-8" do
-          expect(subject.sprintf("%{unknown_pattern}").encoding).to eq(Encoding::UTF_8)
-        end
-      end
-    end
-
-    context "#[]" do
-      it "should fetch data" do
-        expect(subject.get("type")).to eq("sprintf")
-      end
-      it "should fetch fields" do
-        expect(subject.get("a")).to eq("b")
-        expect(subject.get('c')['d']).to eq("f")
-      end
-      it "should fetch deep fields" do
-        expect(subject.get("[j][k1]")).to eq("v")
-        expect(subject.get("[c][d]")).to eq("f")
-        expect(subject.get('[f][g][h]')).to eq("i")
-        expect(subject.get('[j][k3][4]')).to eq("m")
-        expect(subject.get('[j][5]')).to eq(7)
-
-      end
-
-      it "should be fast?", :performance => true do
-        count = 1000000
-        2.times do
-          start = Time.now
-          count.times { subject.get("[j][k1]") }
-          duration = Time.now - start
-          puts "event #[] rate: #{"%02.0f/sec" % (count / duration)}, elapsed: #{duration}s"
-        end
-      end
-    end
-
-    context "#include?" do
-      it "should include existing fields" do
-        expect(subject.include?("c")).to eq(true)
-        expect(subject.include?("[c][d]")).to eq(true)
-        expect(subject.include?("[j][k4][0][nested]")).to eq(true)
-      end
-
-      it "should include field with nil value" do
-        expect(subject.include?("nilfield")).to eq(true)
-      end
-
-      it "should include @metadata field" do
-        expect(subject.include?("@metadata")).to eq(true)
-      end
-
-      it "should include field within @metadata" do
-        expect(subject.include?("[@metadata][fancy]")).to eq(true)
-      end
-
-      it "should not include non-existing fields" do
-        expect(subject.include?("doesnotexist")).to eq(false)
-        expect(subject.include?("[j][doesnotexist]")).to eq(false)
-        expect(subject.include?("[tag][0][hello][yes]")).to eq(false)
-      end
-
-      it "should include within arrays" do
-        expect(subject.include?("[tags][0]")).to eq(true)
-        expect(subject.include?("[tags][1]")).to eq(false)
-      end
-    end
-
-    context "#overwrite" do
-      it "should swap data with new content" do
-        new_event = LogStash::Event.new(
-          "type" => "new",
-          "message" => "foo bar",
-        )
-        subject.overwrite(new_event)
-
-        expect(subject.get("message")).to eq("foo bar")
-        expect(subject.get("type")).to eq("new")
-
-        ["tags", "source", "a", "c", "f", "j"].each do |field|
-          expect(subject.get(field)).to be_nil
-        end
-      end
-    end
-
-    context "#append" do
-      it "should append strings to an array" do
-        subject.append(LogStash::Event.new("message" => "another thing"))
-        expect(subject.get("message")).to eq([ "hello world", "another thing" ])
-      end
-
-      it "should concatenate tags" do
-        subject.append(LogStash::Event.new("tags" => [ "tag2" ]))
-        # added to_a for when array is a Java Collection when produced from json input
-        # TODO: we have to find a better way to handle this in tests. maybe override
-        # rspec eq or == to do an explicit to_a when comparing arrays?
-        expect(subject.get("tags").to_a).to eq([ "tag1", "tag2" ])
-      end
-
-      context "when event field is nil" do
-        it "should add single value as string" do
-          subject.append(LogStash::Event.new({"field1" => "append1"}))
-          expect(subject.get("field1")).to eq("append1")
-        end
-        it "should add multi values as array" do
-          subject.append(LogStash::Event.new({"field1" => [ "append1","append2" ]}))
-          expect(subject.get("field1")).to eq([ "append1","append2" ])
-        end
-      end
-
-      context "when event field is a string" do
-        before { subject.set("field1", "original1") }
-
-        it "should append string to values, if different from current" do
-          subject.append(LogStash::Event.new({"field1" => "append1"}))
-          expect(subject.get("field1")).to eq([ "original1", "append1" ])
-        end
-        it "should not change value, if appended value is equal current" do
-          subject.append(LogStash::Event.new({"field1" => "original1"}))
-          expect(subject.get("field1")).to eq("original1")
-        end
-        it "should concatenate values in an array" do
-          subject.append(LogStash::Event.new({"field1" => [ "append1" ]}))
-          expect(subject.get("field1")).to eq([ "original1", "append1" ])
-        end
-        it "should join array, removing duplicates" do
-          subject.append(LogStash::Event.new({"field1" => [ "append1","original1" ]}))
-          expect(subject.get("field1")).to eq([ "original1", "append1" ])
-        end
-      end
-      context "when event field is an array" do
-        before { subject.set("field1", [ "original1", "original2" ] )}
-
-        it "should append string values to array, if not present in array" do
-          subject.append(LogStash::Event.new({"field1" => "append1"}))
-          expect(subject.get("field1")).to eq([ "original1", "original2", "append1" ])
-        end
-        it "should not append string values, if the array already contains it" do
-          subject.append(LogStash::Event.new({"field1" => "original1"}))
-          expect(subject.get("field1")).to eq([ "original1", "original2" ])
-        end
-        it "should join array, removing duplicates" do
-          subject.append(LogStash::Event.new({"field1" => [ "append1","original1" ]}))
-          expect(subject.get("field1")).to eq([ "original1", "original2", "append1" ])
-        end
-      end
-
-    end
-
-    it "timestamp parsing speed", :performance => true do
-      warmup = 10000
-      count = 1000000
-
-      data = { "@timestamp" => "2013-12-21T07:25:06.605Z" }
-      event = LogStash::Event.new(data)
-      expect(event.get("@timestamp")).to be_a(LogStash::Timestamp)
-
-      duration = 0
-      [warmup, count].each do |i|
-        start = Time.now
-        i.times do
-          data = { "@timestamp" => "2013-12-21T07:25:06.605Z" }
-          LogStash::Event.new(data.clone)
-        end
-        duration = Time.now - start
-      end
-      puts "event @timestamp parse rate: #{"%02.0f/sec" % (count / duration)}, elapsed: #{duration}s"
-    end
-
-    context "acceptable @timestamp formats" do
-      subject { LogStash::Event.new }
-
-      formats = [
-        "YYYY-MM-dd'T'HH:mm:ss.SSSZ",
-        "YYYY-MM-dd'T'HH:mm:ss.SSSSSSZ",
-        "YYYY-MM-dd'T'HH:mm:ss.SSS",
-        "YYYY-MM-dd'T'HH:mm:ss",
-        "YYYY-MM-dd'T'HH:mm:ssZ",
-      ]
-      formats.each do |format|
-        it "includes #{format}" do
-          time = subject.sprintf("%{+#{format}}")
-          begin
-            LogStash::Event.new("@timestamp" => time)
-          rescue => e
-            raise StandardError, "Time '#{time}' was rejected. #{e.class}: #{e.to_s}"
-          end
-        end
-      end
-
-      context "from LOGSTASH-1738" do
-        it "does not error" do
-          LogStash::Event.new("@timestamp" => "2013-12-29T23:12:52.371240+02:00")
-        end
-      end
-
-      context "from LOGSTASH-1732" do
-        it "does not error" do
-          LogStash::Event.new("@timestamp" => "2013-12-27T11:07:25+00:00")
-        end
-      end
-    end
-
-    context "timestamp initialization" do
-      it "should coerce timestamp" do
-        t = Time.iso8601("2014-06-12T00:12:17.114Z")
-        expect(LogStash::Event.new("@timestamp" => t).timestamp.to_i).to eq(t.to_i)
-        expect(LogStash::Event.new("@timestamp" => LogStash::Timestamp.new(t)).timestamp.to_i).to eq(t.to_i)
-        expect(LogStash::Event.new("@timestamp" => "2014-06-12T00:12:17.114Z").timestamp.to_i).to eq(t.to_i)
-      end
-
-      it "should assign current time when no timestamp" do
-        expect(LogStash::Event.new({}).timestamp.to_i).to be_within(2).of (Time.now.to_i)
-      end
-
-      it "should tag for invalid value" do
-        event = LogStash::Event.new("@timestamp" => "foo")
-        expect(event.timestamp.to_i).to be_within(2).of Time.now.to_i
-        expect(event.get("tags")).to eq([LogStash::Event::TIMESTAMP_FAILURE_TAG])
-        expect(event.get(LogStash::Event::TIMESTAMP_FAILURE_FIELD)).to eq("foo")
-
-        event = LogStash::Event.new("@timestamp" => 666)
-        expect(event.timestamp.to_i).to be_within(2).of Time.now.to_i
-        expect(event.get("tags")).to eq([LogStash::Event::TIMESTAMP_FAILURE_TAG])
-        expect(event.get(LogStash::Event::TIMESTAMP_FAILURE_FIELD)).to eq(666)
-      end
-
-      it "should warn for invalid value" do
-        LogStash::Event.new("@timestamp" => :foo)
-        LogStash::Event.new("@timestamp" => 666)
-      end
-
-      it "should tag for invalid string format" do
-        event = LogStash::Event.new("@timestamp" => "foo")
-        expect(event.timestamp.to_i).to be_within(2).of Time.now.to_i
-        expect(event.get("tags")).to eq([LogStash::Event::TIMESTAMP_FAILURE_TAG])
-        expect(event.get(LogStash::Event::TIMESTAMP_FAILURE_FIELD)).to eq("foo")
-      end
-
-      it "should warn for invalid string format" do
-        LogStash::Event.new("@timestamp" => "foo")
-      end
-    end
-
-    context "to_json" do
-      it "should support to_json" do
-        new_event = LogStash::Event.new(
-          "@timestamp" => Time.iso8601("2014-09-23T19:26:15.832Z"),
-          "message" => "foo bar",
-        )
-        json = new_event.to_json
-
-        expect(JSON.parse(json)).to eq( JSON.parse("{\"@timestamp\":\"2014-09-23T19:26:15.832Z\",\"message\":\"foo bar\",\"@version\":\"1\"}"))
-      end
-
-      it "should support to_json and ignore arguments" do
-        new_event = LogStash::Event.new(
-          "@timestamp" => Time.iso8601("2014-09-23T19:26:15.832Z"),
-          "message" => "foo bar",
-        )
-        json = new_event.to_json(:foo => 1, :bar => "baz")
-
-        expect(JSON.parse(json)).to eq( JSON.parse("{\"@timestamp\":\"2014-09-23T19:26:15.832Z\",\"message\":\"foo bar\",\"@version\":\"1\"}"))
-      end
-    end
-
-    context "metadata" do
-      context "with existing metadata" do
-        subject { LogStash::Event.new("hello" => "world", "@metadata" => { "fancy" => "pants" }) }
-
-        it "should not include metadata in to_hash" do
-          expect(subject.to_hash.keys).not_to include("@metadata")
-
-          # 'hello', '@timestamp', and '@version'
-          expect(subject.to_hash.keys.count).to eq(3)
-        end
-
-        it "should still allow normal field access" do
-          expect(subject.get("hello")).to eq("world")
-        end
-      end
-
-      context "with set metadata" do
-        let(:fieldref) { "[@metadata][foo][bar]" }
-        let(:value) { "bar" }
-        subject { LogStash::Event.new("normal" => "normal") }
-        before do
-          # Verify the test is configured correctly.
-          expect(fieldref).to start_with("[@metadata]")
-
-          # Set it.
-          subject.set(fieldref, value)
-        end
-
-        it "should still allow normal field access" do
-          expect(subject.get("normal")).to eq("normal")
-        end
-
-        it "should allow getting" do
-          expect(subject.get(fieldref)).to eq(value)
-        end
-
-        it "should be hidden from .to_json" do
-          require "json"
-          obj = JSON.parse(subject.to_json)
-          expect(obj).not_to include("@metadata")
-        end
-
-        it "should be hidden from .to_hash" do
-          expect(subject.to_hash).not_to include("@metadata")
-        end
-
-        it "should be accessible through #to_hash_with_metadata" do
-          obj = subject.to_hash_with_metadata
-          expect(obj).to include("@metadata")
-          expect(obj["@metadata"]["foo"]["bar"]).to eq(value)
-        end
-      end
-
-      context "with no metadata" do
-        subject { LogStash::Event.new("foo" => "bar") }
-        it "should have no metadata" do
-          expect(subject.get("@metadata")).to be_empty
-        end
-        it "should still allow normal field access" do
-          expect(subject.get("foo")).to eq("bar")
-        end
-
-        it "should not include the @metadata key" do
-          expect(subject.to_hash_with_metadata).not_to include("@metadata")
-        end
-      end
-    end
-
-    context "signal events" do
-      it "should define the shutdown and flush event constants" do
-        # the SHUTDOWN and FLUSH constants are part of the plugin API contract
-        # if they are changed, all plugins must be updated
-        expect(LogStash::SHUTDOWN).to be_a(LogStash::ShutdownEvent)
-        expect(LogStash::FLUSH).to be_a(LogStash::FlushEvent)
-      end
-
-      it "should define the shutdown event with SignalEvent as parent class" do
-        expect(LogStash::SHUTDOWN).to be_a(LogStash::SignalEvent)
-        expect(LogStash::FLUSH).to be_a(LogStash::SignalEvent)
-      end
-
-      it "should define the flush? method" do
-        expect(LogStash::SHUTDOWN.flush?).to be_falsey
-        expect(LogStash::FLUSH.flush?).to be_truthy
-      end
-
-      it "should define the shutdown? method" do
-        expect(LogStash::SHUTDOWN.shutdown?).to be_truthy
-        expect(LogStash::FLUSH.shutdown?).to be_falsey
-      end
-    end
-  end
-
-  let(:event_hash) do
-    {
-      "@timestamp" => "2013-01-01T00:00:00.000Z",
-      "type" => "sprintf",
-      "message" => "hello world",
-      "tags" => [ "tag1" ],
-      "source" => "/home/foo",
-      "a" => "b",
-      "c" => {
-        "d" => "f",
-        "e" => {"f" => "g"}
-      },
-      "f" => { "g" => { "h" => "i" } },
-      "j" => {
-          "k1" => "v",
-          "k2" => [ "w", "x" ],
-          "k3" => {"4" => "m"},
-          "k4" => [ {"nested" => "cool"} ],
-          5 => 6,
-          "5" => 7
-      },
-      "nilfield" => nil,
-      "@metadata" => { "fancy" => "pants", "have-to-go" => { "deeper" => "inception" } }
-    }
-  end
-
-  describe "using normal hash input" do
-    it_behaves_like "all event tests" do
-      subject{LogStash::Event.new(event_hash)}
-    end
-  end
-
-  describe "using hash input from deserialized json" do
-    # this is to test the case when JrJackson deserializes Json and produces
-    # native Java Collections objects for efficiency
-    it_behaves_like "all event tests" do
-      subject{LogStash::Event.new(LogStash::Json.load(LogStash::Json.dump(event_hash)))}
-    end
-  end
-
-
-  describe "#to_s" do
-    let(:timestamp) { LogStash::Timestamp.new }
-    let(:event1) { LogStash::Event.new({ "@timestamp" => timestamp, "host" => "foo", "message" => "bar"}) }
-
-    it "return the string containing the timestamp, the host and the message" do
-      expect(event1.to_s).to eq("#{timestamp.to_iso8601} #{event1.get("host")} #{event1.get("message")}")
-    end
-  end
-
-  describe "Event accessors" do
-    let(:event) { LogStash::Event.new({ "message" => "foo" }) }
-
-    it "should invalidate target caching" do
-      expect(event.get("[a][0]")).to be_nil
-
-      expect(event.set("[a][0]", 42)).to eq(42)
-      expect(event.get("[a][0]")).to eq(42)
-      expect(event.get("[a]")).to eq({"0" => 42})
-
-      expect(event.set("[a]", [42, 24])).to eq([42, 24])
-      expect(event.get("[a]")).to eq([42, 24])
-
-      expect(event.get("[a][0]")).to eq(42)
-
-      expect(event.set("[a]", [24, 42])).to eq([24, 42])
-      expect(event.get("[a][0]")).to eq(24)
-
-      expect(event.set("[a][0]", {"a "=> 99, "b" => 98})).to eq({"a "=> 99, "b" => 98})
-      expect(event.get("[a][0]")).to eq({"a "=> 99, "b" => 98})
-
-      expect(event.get("[a]")).to eq([{"a "=> 99, "b" => 98}, 42])
-      expect(event.get("[a][0]")).to eq({"a "=> 99, "b" => 98})
-      expect(event.get("[a][1]")).to eq(42)
-      expect(event.get("[a][0][b]")).to eq(98)
-    end
-  end
-end
-
diff --git a/logstash-core/spec/logstash/legacy_ruby_timestamp_spec.rb b/logstash-core/spec/logstash/legacy_ruby_timestamp_spec.rb
index 512bfe8fb..b1cafe183 100644
--- a/logstash-core/spec/logstash/legacy_ruby_timestamp_spec.rb
+++ b/logstash-core/spec/logstash/legacy_ruby_timestamp_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "bigdecimal"
 
@@ -12,39 +28,77 @@ describe LogStash::Timestamp do
   it "should parse its own iso8601 output" do
     t = Time.now
     ts = LogStash::Timestamp.new(t)
-    expect(LogStash::Timestamp.parse_iso8601(ts.to_iso8601).to_i).to eq(t.to_i)
+    parsed = LogStash::Timestamp.parse_iso8601(ts.to_iso8601)
+    expect(parsed.to_i).to eq(t.to_i)
+    expect(parsed).to eq(ts)
   end
 
   it "should coerce iso8601 string" do
     t = DateTime.now.to_time
     ts = LogStash::Timestamp.new(t)
-    expect(LogStash::Timestamp.coerce(ts.to_iso8601).to_i).to eq(t.to_i)
+    coerced = LogStash::Timestamp.coerce(ts.to_iso8601)
+    expect(coerced.to_i).to eq(t.to_i)
+    expect(coerced).to eq(ts)
   end
 
   it "should coerce Time" do
     t = Time.now
-    expect(LogStash::Timestamp.coerce(t).to_i).to eq(t.to_i)
+    coerced = LogStash::Timestamp.coerce(t)
+    expect(coerced.to_i).to eq(t.to_i)
+    expect(coerced.time).to eq(t)
   end
 
   it "should coerce Timestamp" do
     t = LogStash::Timestamp.now
-    expect(LogStash::Timestamp.coerce(t).to_i).to eq(t.to_i)
+    coerced = LogStash::Timestamp.coerce(t)
+    expect(coerced.to_i).to eq(t.to_i)
+    expect(coerced).to eq(t)
   end
 
   it "should raise on invalid string coerce" do
-    expect{LogStash::Timestamp.coerce("foobar")}.to raise_error LogStash::TimestampParserError
+    expect {LogStash::Timestamp.coerce("foobar")}.to raise_error LogStash::TimestampParserError
   end
 
   it "should return nil on invalid object coerce" do
     expect(LogStash::Timestamp.coerce(:foobar)).to be_nil
   end
 
-  it "should support to_json" do
-    expect(LogStash::Timestamp.parse_iso8601("2014-09-23T00:00:00-0800").to_json).to eq("\"2014-09-23T08:00:00.000Z\"")
-  end
+  context '#to_json' do
+    it "should support to_json" do
+      expect(LogStash::Timestamp.parse_iso8601("2014-09-23T00:00:00.123-0800").to_json).to eq("\"2014-09-23T08:00:00.123Z\"")
+    end
 
-  it "should support to_json and ignore arguments" do
-    expect(LogStash::Timestamp.parse_iso8601("2014-09-23T00:00:00-0800").to_json(:some => 1, :arguments => "test")).to eq("\"2014-09-23T08:00:00.000Z\"")
+    it "should support to_json and ignore arguments" do
+      expect(LogStash::Timestamp.parse_iso8601("2014-09-23T00:00:00.456-0800").to_json(:some => 1, :arguments => "test")).to eq("\"2014-09-23T08:00:00.456Z\"")
+    end
+
+    context 'variable serialization length' do
+      subject(:timestamp) { LogStash::Timestamp.parse_iso8601(time_string) }
+      context 'with whole seconds' do
+        let(:time_string) { "2014-09-23T00:00:00.000-0800" }
+        it 'serializes a 24-byte string' do
+          expect(timestamp.to_json).to eq('"2014-09-23T08:00:00.000Z"')
+        end
+      end
+      context 'with excess millis' do
+        let(:time_string) { "2014-09-23T00:00:00.123000-0800" }
+        it 'serializes a 24-byte string' do
+          expect(timestamp.to_json).to eq('"2014-09-23T08:00:00.123Z"')
+        end
+      end
+      context 'with excess micros' do
+        let(:time_string) { "2014-09-23T00:00:00.000100-0800" }
+        it 'serializes a 27-byte string' do
+          expect(timestamp.to_json).to eq('"2014-09-23T08:00:00.000100Z"')
+        end
+      end
+      context 'with excess nanos' do
+        let(:time_string) { "2014-09-23T00:00:00.000000010-0800" }
+        it 'serializes a 30-byte string' do
+          expect(timestamp.to_json).to eq('"2014-09-23T08:00:00.000000010Z"')
+        end
+      end
+    end
   end
 
   it "should support timestamp comparison" do
@@ -129,33 +183,31 @@ describe LogStash::Timestamp do
 
     context "with float epoch" do
       it "should convert to correct date" do
-        expect(LogStash::Timestamp.at(946702800.123456.to_f).to_iso8601).to eq("2000-01-01T05:00:00.123Z")
+        expect(LogStash::Timestamp.at(946702800.123456).to_f).to be_within(0.000001).of(946702800.123456)
       end
 
       it "should return usec with a minimum of millisec precision" do
-        expect(LogStash::Timestamp.at(946702800.123456.to_f).usec).to be_within(1000).of(123456)
+        expect(LogStash::Timestamp.at(946702800.123456789.to_f).usec).to be_within(1000).of(123456)
       end
     end
 
     context "with BigDecimal epoch" do
       it "should convert to correct date" do
-        expect(LogStash::Timestamp.at(BigDecimal.new("946702800.123456")).to_iso8601).to eq("2000-01-01T05:00:00.123Z")
+        expect(LogStash::Timestamp.at(BigDecimal("946702800.123456789")).to_iso8601).to eq("2000-01-01T05:00:00.123456789Z")
       end
 
       it "should return usec with a minimum of millisec precision" do
-        # since Java Timestamp relies on JodaTime which supports only milliseconds precision
-        # the usec method will only be precise up to milliseconds.
-        expect(LogStash::Timestamp.at(BigDecimal.new("946702800.123456")).usec).to be_within(1000).of(123456)
+        expect(LogStash::Timestamp.at(BigDecimal("946702800.123456789")).usec).to be_within(1000).of(123456)
       end
     end
 
     context "with illegal parameters" do
       it "should raise exception on nil input" do
-        expect{LogStash::Timestamp.at(nil)}.to raise_error
+        expect {LogStash::Timestamp.at(nil)}.to raise_error
       end
 
       it "should raise exception on invalid input type" do
-        expect{LogStash::Timestamp.at(:foo)}.to raise_error
+        expect {LogStash::Timestamp.at(:foo)}.to raise_error
       end
     end
   end
@@ -165,10 +217,37 @@ describe LogStash::Timestamp do
       expect(LogStash::Timestamp.at(946702800.123).usec).to eq(123000)
     end
 
-    it "should try to preserve and report microseconds precision if possible" do
-      # since Java Timestamp relies on JodaTime which supports only milliseconds precision
-      # the usec method will only be precise up to milliseconds.
-      expect(LogStash::Timestamp.at(946702800.123456).usec).to be_within(1000).of(123456)
+    it "preserves microseconds precision if possible" do
+      expect(LogStash::Timestamp.at(946702800.123456).usec).to eq(123456)
+    end
+
+    it "truncates excess nanos" do
+      expect(LogStash::Timestamp.at(946702800.123456789).usec).to eq(123456)
+    end
+  end
+
+  context "nsec" do
+    # iterate through a list of known edge-cases, plus one random.
+    # if we get a test failure and identify a regression, add its value to the list.
+    [
+      000000000,
+      499999999,
+      500000000,
+      999999999,
+      Random.rand(1_000_000_000)
+    ].each do |excess_nanos|
+      context "with excess_nanos=`#{'%09d' % excess_nanos}`" do
+        let(:epoch_seconds) { Time.now.to_i }
+        let(:excess_nanos) {  }
+
+        let(:rational_time) { epoch_seconds + Rational(excess_nanos, 1_000_000_000) }
+
+        subject(:timestamp) { LogStash::Timestamp.at(rational_time) }
+
+        it "supports nanosecond precision" do
+          expect(timestamp.nsec).to eq(excess_nanos)
+        end
+      end
     end
   end
 end
diff --git a/logstash-core/spec/logstash/modules/cli_parser_spec.rb b/logstash-core/spec/logstash/modules/cli_parser_spec.rb
deleted file mode 100644
index 03a036f05..000000000
--- a/logstash-core/spec/logstash/modules/cli_parser_spec.rb
+++ /dev/null
@@ -1,127 +0,0 @@
-require "spec_helper"
-require "logstash/modules/cli_parser"
-
-describe LogStash::Modules::CLIParser do
-
-  subject { LogStash::Modules::CLIParser.new(module_names, module_variables) }
-  let(:logger) { double("logger") }
-  let(:module_name) { "foo" }
-  let(:module_names) { [ module_name, "bar" ] }
-  let(:proto_key_value) { "var.input.stdin.type=example" }
-  let(:proto_mod_vars) { module_name + "." + proto_key_value }
-  let(:module_variables) { [ proto_mod_vars ] }
-  let(:expected_output) { { "name" => module_name, "var.input.stdin.type" => "example" } }
-
-  describe ".parse_modules" do
-    let(:module1) { "module1" }
-    let(:module2) { "module2" }
-    let(:csv_modules) { "#{module1},#{module2}" }
-    let(:list_with_csv) { [ module_name, csv_modules ] }
-    let(:post_parse) { [ module_name, module1, module2 ] }
-
-    context "when it receives an array without a csv entry" do
-      it "return the array unaltered" do
-        expect(subject.parse_modules(module_names)).to eq(module_names)
-      end
-    end
-
-    context "when it receives an empty array" do
-      it "return an empty array" do
-        expect(subject.parse_modules([])).to eq([])
-      end
-    end
-
-    context "when it receives an array with a csv entry" do
-      it "return the original array with the csv values split into elements" do
-        expect(subject.parse_modules(list_with_csv)).to eq(post_parse)
-      end
-    end
-
-    context "when it receives an array with a bad csv entry" do
-      let(:bad_modules) { [ "-Minvalid", module1 ] }
-      it "raise a LogStash::ConfigLoadingError exception" do
-        expect { subject.parse_modules(bad_modules) }.to raise_error LogStash::ConfigLoadingError
-      end
-    end
-
-    context "when it receives a nil value in an array" do
-      let(:array_with_nil) { list_with_csv << nil }
-      it "skip it" do
-        expect(subject.parse_modules(array_with_nil)).to eq(post_parse)
-      end
-    end
-  end
-
-  describe ".get_kv" do
-    context "when it receives a valid string" do
-      let(:expected_key) { "var.input.stdin.type" }
-      let(:expected_value) { "example" }
-      let(:unparsed) { expected_key + "=" + expected_value }
-      it "split it into a key value pair" do
-        expect(subject.get_kv(module_name,unparsed)).to eq([expected_key,expected_value])
-      end
-    end
-
-    context "when it receives an invalid string" do
-      let(:bad_example) { "var.fail" }
-      it "raise a LogStash::ConfigLoadingError exception" do
-        expect { subject.get_kv(module_name,bad_example) }.to raise_error LogStash::ConfigLoadingError
-      end
-    end
-  end
-
-  describe ".name_splitter" do
-    context "when it receives a valid string" do
-      let(:expected) { "var.input.stdin.type=example" }
-      it "split the module name from the rest of the string" do
-        expect(subject.name_splitter(proto_mod_vars)).to eq([module_name,expected])
-      end
-    end
-
-    context "when it receives an invalid string" do
-      let(:bad_example) { "var.fail" }
-      it "raise a LogStash::ConfigLoadingError exception" do
-        expect { subject.name_splitter(bad_example) }.to raise_error LogStash::ConfigLoadingError
-      end
-    end
-  end
-
-  describe ".parse_vars" do
-    context "when it receives a vars_list with valid strings" do
-      it "return a hash with the module name and associated variables as key value pairs" do
-        expect(subject.parse_vars(module_name, module_variables)).to eq(expected_output)
-      end
-    end
-
-    context "when it receives a string that doesn't start with module_name" do
-      let(:has_unrelated) { module_variables << "bar.var.input.stdin.type=different" }
-      it "skips it" do
-        expect(subject.parse_vars(module_name, has_unrelated)).to eq(expected_output)
-      end
-    end
-
-    context "when it receives an empty vars_list" do
-      let(:name_only) { { "name" => module_name } }
-      it "return a hash with only 'name => module_name'" do
-        expect(subject.parse_vars(module_name, [])).to eq(name_only)
-      end
-    end
-  end
-
-  describe ".parse_it" do
-    context "when it receives a valid module_list and module_variable_list" do
-      let(:module_names) { [ module_name ]}
-      it "@output is array of hashes with the module name and associated variables as key value pairs" do
-        expect(subject.output).to eq([expected_output])
-      end
-    end
-
-    context "when it receives a non-array value for module_list" do
-      let(:module_names) { "string value" }
-      it "return an empty array" do
-        expect(subject.output).to eq([])
-      end
-    end
-  end
-
-end
diff --git a/logstash-core/spec/logstash/modules/kibana_client_spec.rb b/logstash-core/spec/logstash/modules/kibana_client_spec.rb
deleted file mode 100644
index 946c28240..000000000
--- a/logstash-core/spec/logstash/modules/kibana_client_spec.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-# encoding: utf-8
-require "spec_helper"
-require "logstash/modules/kibana_client"
-module LogStash module Modules
-  KibanaTestResponse = Struct.new(:code, :body, :headers)
-  class KibanaTestClient
-    def http(method, endpoint, options)
-      self
-    end
-    def call
-      KibanaTestResponse.new(200, '{"version":{"number":"1.2.3","build_snapshot":false}}', {})
-    end
-  end
-  describe KibanaClient do
-    let(:settings) { Hash.new }
-    let(:test_client) { KibanaTestClient.new }
-    let(:kibana_host) { "https://foo.bar:4321" }
-    subject(:kibana_client) { described_class.new(settings, test_client) }
-
-    context "when supplied with conflicting scheme data" do
-      let(:settings) { {"var.kibana.scheme" => "http", "var.kibana.host" => kibana_host} }
-      it "a new instance will throw an error" do
-        expect{described_class.new(settings, test_client)}.to raise_error(ArgumentError, /Detected differing Kibana host schemes as sourced from var\.kibana\.host: 'https' and var\.kibana\.scheme: 'http'/)
-      end
-    end
-
-    context "when supplied with invalid schemes" do
-      ["httpd", "ftp", "telnet"].each do |uri_scheme|
-        it "a new instance will throw an error" do
-          re = /Kibana host scheme given is invalid, given value: '#{uri_scheme}' - acceptable values: 'http', 'https'/
-          expect{described_class.new({"var.kibana.scheme" => uri_scheme}, test_client)}.to raise_error(ArgumentError, re)
-        end
-      end
-    end
-
-    context "when supplied with the scheme in the host only" do
-      let(:settings) { {"var.kibana.host" => kibana_host} }
-      it "has a version and an endpoint" do
-        expect(kibana_client.version).to eq("1.2.3")
-        expect(kibana_client.endpoint).to eq("https://foo.bar:4321")
-      end
-    end
-
-    context "when supplied with the scheme in the scheme setting" do
-      let(:settings) { {"var.kibana.scheme" => "https", "var.kibana.host" => "foo.bar:4321"} }
-      it "has a version and an endpoint" do
-        expect(kibana_client.version).to eq("1.2.3")
-        expect(kibana_client.endpoint).to eq(kibana_host)
-      end
-    end
-
-    context "when supplied with a no scheme host setting and ssl is enabled" do
-      let(:settings) { {"var.kibana.ssl.enabled" => "true", "var.kibana.host" => "foo.bar:4321"} }
-      it "has a version and an endpoint" do
-        expect(kibana_client.version).to eq("1.2.3")
-        expect(kibana_client.endpoint).to eq(kibana_host)
-      end
-    end
-
-    describe "ssl option handling" do
-      context "when using a string for ssl.enabled" do
-        let(:settings) do
-          { "var.kibana.ssl.enabled" => "true" }
-        end
-
-        it "should set the ssl options" do
-          expect(Manticore::Client).to receive(:new) do |args|
-            expect(args[:ssl]).to_not be_empty
-          end.and_return(test_client)
-          described_class.new(settings)
-        end
-      end
-
-      context "when using a boolean for ssl.enabled" do
-        let(:settings) do
-          { "var.kibana.ssl.enabled" => true }
-        end
-
-        it "should set the ssl options" do
-          expect(Manticore::Client).to receive(:new) do |args|
-            expect(args[:ssl]).to_not be_empty
-          end.and_return(test_client)
-          described_class.new(settings)
-        end
-      end
-    end
-  end
-end end
diff --git a/logstash-core/spec/logstash/modules/logstash_config_spec.rb b/logstash-core/spec/logstash/modules/logstash_config_spec.rb
deleted file mode 100644
index a862f8957..000000000
--- a/logstash-core/spec/logstash/modules/logstash_config_spec.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# encoding: utf-8
-require "logstash/modules/logstash_config"
-
-describe LogStash::Modules::LogStashConfig do
-  let(:mod) { instance_double("module", :directory => Stud::Temporary.directory, :module_name => "testing") }
-  let(:settings) { {"var.logstash.testing.pants" => "fancy", "var.elasticsearch.password" => LogStash::Util::Password.new('correct_horse_battery_staple') }}
-  subject { described_class.new(mod, settings) }
-
-  describe "configured inputs" do
-    context "when no inputs is send" do
-      it "returns the default" do
-        expect(subject.configured_inputs(["kafka"])).to include("kafka")
-      end
-    end
-
-    context "when inputs are send" do
-      let(:settings) { { "var.inputs" => "tcp" } }
-
-      it "returns the configured inputs" do
-        expect(subject.configured_inputs(["kafka"])).to include("tcp")
-      end
-
-      context "when alias is specified" do
-        let(:settings) { { "var.inputs" => "smartconnector" } }
-
-        it "returns the configured inputs" do
-          expect(subject.configured_inputs(["kafka"], { "smartconnector" => "tcp"  })).to include("tcp", "smartconnector")
-        end
-      end
-    end
-  end
-
-  describe "array to logstash array string" do
-    it "return an escaped string" do
-      expect(subject.array_to_string(["hello", "ninja"])).to eq("['hello', 'ninja']")
-    end
-  end
-
-  describe 'elastic_search_config' do
-    it 'should put the password in correctly' do
-      expect(subject.elasticsearch_output_config()).to include("password => \"correct_horse_battery_staple\"")
-    end
-  end
-
-  describe "alias modules options" do
-    let(:alias_table) do
-      { "var.logstash.testing" => "var.logstash.better" }
-    end
-
-    before do
-      subject.alias_settings_keys!(alias_table)
-    end
-
-    it "allow to retrieve settings" do
-      expect(subject.setting("var.logstash.better.pants", "dont-exist")).to eq("fancy")
-    end
-
-    it "allow to retrieve settings with the original name" do
-      expect(subject.setting("var.logstash.testing.pants", "dont-exist")).to eq("fancy")
-    end
-  end
-end
diff --git a/logstash-core/spec/logstash/modules/scaffold_spec.rb b/logstash-core/spec/logstash/modules/scaffold_spec.rb
deleted file mode 100644
index e08eb4a27..000000000
--- a/logstash-core/spec/logstash/modules/scaffold_spec.rb
+++ /dev/null
@@ -1,233 +0,0 @@
-# encoding: utf-8
-#
-require "logstash/elasticsearch_client"
-require "logstash/modules/kibana_client"
-require "logstash/modules/kibana_config"
-require "logstash/modules/scaffold"
-require "logstash/modules/elasticsearch_importer"
-require "logstash/modules/kibana_importer"
-
-require_relative "../../support/helpers"
-
-describe LogStash::Modules::Scaffold do
-  let(:base_dir) { "gem-home" }
-  let(:mname) { "foo" }
-  subject(:test_module) { described_class.new(mname, base_dir) }
-  let(:module_settings) do
-    {
-      "var.elasticsearch.hosts" => "es.mycloud.com:9200",
-      "var.elasticsearch.user" => "foo",
-      "var.elasticsearch.password" => "password",
-      "var.input.tcp.port" => 5606,
-    }
-  end
-  let(:dashboard_hash) do
-    {
-      "hits" => 0,
-      "timeRestore" => false,
-      "description" => "",
-      "title" => "Filebeat Apache2 Dashboard",
-      "uiStateJSON" => "{}",
-      "panelsJSON" => '[{"col":1,"id":"foo-c","panelIndex":1,"row":1,"size_x":12,"size_y":3,"type":"visualization"},{"id":"foo-d","type":"search","panelIndex":7,"size_x":12,"size_y":3,"col":1,"row":11,"columns":["apache2.error.client","apache2.error.level","apache2.error.module","apache2.error.message"],"sort":["@timestamp","desc"]}]',
-      "optionsJSON" => "{}",
-      "version" => 1,
-      "kibanaSavedObjectMeta" => {
-        "searchSourceJSON" => "{}"
-      }
-    }
-  end
-  let(:viz_hash) do
-    {
-      "visState" => "",
-      "description" => "",
-      "title" => "foo-c",
-      "uiStateJSON" => "",
-      "version" => 1,
-      "savedSearchId" => "foo-e",
-      "kibanaSavedObjectMeta" => {}
-    }
-  end
-  let(:index_pattern_hash) do
-    {
-      "title" => "foo-*",
-      "timeFieldName" =>"time",
-      "fieldFormatMap" => "{some map}",
-      "fields" => "[some array]"
-    }
-  end
-  context "logstash operation" do
-    let(:ls_conf) do
-<<-ERB
-input {
-  tcp {
-    port => <%= setting("var.input.tcp.port", 45) %>
-    host => <%= setting("var.input.tcp.host", "localhost") %>
-    type => <%= setting("var.input.tcp.type", "server") %>
-  }
-}
-filter {
-
-}
-output {
-  <%= elasticsearch_output_config() %>
-}
-ERB
-    end
-
-    before do
-      allow(LogStash::Modules::FileReader).to receive(:read).and_return(ls_conf)
-    end
-
-    it "provides a logstash config" do
-      expect(test_module.logstash_configuration).to be_nil
-      test_module.with_settings(LogStash::Util::ModulesSettingArray.new([module_settings]).first)
-      expect(test_module.logstash_configuration).not_to be_nil
-      config_string = test_module.config_string
-      expect(config_string).to include("port => 5606")
-      expect(config_string).to include("hosts => ['es.mycloud.com:9200']")
-    end
-  end
-
-  context "elasticsearch operation" do
-    it "provides the elasticsearch mapping file paths" do
-      test_module.with_settings(module_settings)
-      expect(test_module.elasticsearch_configuration).not_to be_nil
-      files = test_module.elasticsearch_configuration.resources
-      expect(files.size).to eq(1)
-      expect(files.first).to be_a(LogStash::Modules::ElasticsearchResource)
-      expect(files.first.content_path).to eq("gem-home/elasticsearch/foo.json")
-      expect(files.first.import_path).to eq("_template/foo")
-    end
-  end
-
-  context "kibana operation" do
-    before do
-      # allow(LogStash::Modules::FileReader).to receive(:read_json).and_return({})
-      allow(LogStash::Modules::FileReader).to receive(:read_json).with("gem-home/kibana/6.x/dashboard/foo.json").and_return(["Foo-Dashboard"])
-      allow(LogStash::Modules::FileReader).to receive(:read_json).with("gem-home/kibana/6.x/dashboard/Foo-Dashboard.json").and_return(dashboard_hash)
-      allow(LogStash::Modules::FileReader).to receive(:read_json).with("gem-home/kibana/6.x/visualization/foo-c.json").and_return(viz_hash)
-      allow(LogStash::Modules::FileReader).to receive(:read_json).with("gem-home/kibana/6.x/search/foo-d.json").and_return({"d" => "search"})
-      allow(LogStash::Modules::FileReader).to receive(:read_json).with("gem-home/kibana/6.x/search/foo-e.json").and_return({"e" => "search"})
-      allow(LogStash::Modules::FileReader).to receive(:read_json).with("gem-home/kibana/6.x/index-pattern/foo.json").and_return(index_pattern_hash)
-    end
-
-    it "provides a list of importable files" do
-      expect(test_module.kibana_configuration).to be_nil
-      test_module.with_settings(module_settings)
-      expect(test_module.kibana_configuration).not_to be_nil
-      resources = test_module.kibana_configuration.resources
-      expect(resources.size).to eq(2)
-      resource1 = resources[0]
-      resource2 = resources[1]
-      expect(resource1).to be_a(LogStash::Modules::KibanaSettings)
-      expect(resource2).to be_a(LogStash::Modules::KibanaDashboards)
-      expect(resource1.import_path).to eq("api/kibana/settings")
-      expect(resource1.content).to be_a(Array)
-      expect(resource1.content.size).to eq(1)
-
-      test_object = resource1.content[0]
-      expect(test_object).to be_a(LogStash::Modules::KibanaSettings::Setting)
-      expect(test_object.name).to eq("defaultIndex")
-      expect(test_object.value).to eq("foo-*")
-
-      expect(resource2.import_path).to eq("api/kibana/dashboards/import")
-      expect(resource2.content).to be_a(Array)
-      expect(resource2.content.size).to eq(5)
-      expect(resource2.content.map{|o| o.class}.uniq).to eq([LogStash::Modules::KibanaResource])
-
-      test_object = resource2.content[0]
-      expect(test_object.content_id).to eq("foo-*")
-      expect(test_object.content_type).to eq("index-pattern")
-      expect(test_object.content_as_object).to eq(index_pattern_hash)
-
-      test_object = resource2.content[1]
-      expect(test_object.content_id).to eq("Foo-Dashboard")
-      expect(test_object.content_type).to eq("dashboard")
-      expect(test_object.content_as_object).to eq(dashboard_hash)
-
-      test_object = resource2.content[2]
-      expect(test_object.content_id).to eq("foo-c") #<- the panels can contain items from other folders
-      expect(test_object.content_type).to eq("visualization")
-      expect(test_object.content_as_object).to eq(viz_hash)
-      expect(test_object.content_as_object["savedSearchId"]).to eq("foo-e")
-
-      test_object = resource2.content[3]
-      expect(test_object.content_id).to eq("foo-d") #<- the panels can contain items from other folders
-      expect(test_object.content_type).to eq("search")
-      expect(test_object.content_as_object).to eq("d"=>"search")
-
-      test_object = resource2.content[4]
-      expect(test_object.content_id).to eq("foo-e") # <- the visualization can contain items from the search folder
-      expect(test_object.content_type).to eq("search")
-      expect(test_object.content_as_object).to eq("e"=>"search")
-    end
-  end
-
-  context "importing to elasticsearch stubbed client" do
-    let(:mname) { "tester" }
-    let(:base_dir) { File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "modules_test_files", "modules", "#{mname}", "configuration")) }
-    let(:response) { double(:response) }
-    let(:client) { double(:client) }
-    let(:kbnclient) { double(:kbnclient) }
-    let(:paths) { [] }
-    let(:expected_paths) { ["_template/tester", "api/kibana/settings", "api/kibana/dashboards/import"] }
-    let(:contents) { [] }
-    let(:expected_objects) do
-      [
-        "index-pattern tester-*",
-        "dashboard FW-Dashboard",
-        "visualization FW-Viz-1",
-        "visualization FW-Viz-2",
-        "search Search-Tester"
-      ]
-    end
-
-    before do
-      allow(response).to receive(:status).and_return(404)
-      allow(client).to receive(:head).and_return(response)
-      allow(kbnclient).to receive(:version).and_return("9.8.7-6")
-    end
-
-    it "calls the import method" do
-      expect(client).to receive(:put).once do |path, content|
-        paths << path
-        LogStash::ElasticsearchClient::Response.new(201, "", {})
-      end
-      expect(kbnclient).to receive(:post).twice do |path, content|
-        paths << path
-        contents << content
-        LogStash::Modules::KibanaClient::Response.new(201, "", {})
-      end
-      test_module.with_settings(module_settings)
-      test_module.import(LogStash::Modules::ElasticsearchImporter.new(client), LogStash::Modules::KibanaImporter.new(kbnclient))
-      expect(paths).to eq(expected_paths)
-      expect(contents[0]).to eq({"changes"=>{"defaultIndex"=>"tester-*"}})
-      second_kbn_post = contents[1]
-      expect(second_kbn_post[:version]).to eq("9.8.7-6")
-      expect(second_kbn_post[:objects]).to be_a(Array)
-      expect(second_kbn_post[:objects].size).to eq(5)
-      objects_types_ids = second_kbn_post[:objects].map {|h| "#{h["type"]} #{h["id"]}"}
-      expect(objects_types_ids).to eq(expected_objects)
-    end
-  end
-
-  context "import 4 realz", :skip => "integration" do
-    let(:mname) { "cef" }
-    let(:base_dir) { File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "modules_test_files", "#{mname}")) }
-    let(:module_settings) do
-      {
-        "var.elasticsearch.hosts" => "localhost:9200",
-        "var.elasticsearch.user" => "foo",
-        "var.elasticsearch.password" => "password",
-        "var.input.tcp.port" => 5606,
-      }
-    end
-    it "puts stuff in ES" do
-      test_module.with_settings(module_settings)
-      client = LogStash::ElasticsearchClient.build(module_settings)
-      import_engine = LogStash::Modules::Importer.new(client)
-      test_module.import(import_engine)
-      expect(1).to eq(1)
-    end
-  end
-end
diff --git a/logstash-core/spec/logstash/modules/settings_merger_spec.rb b/logstash-core/spec/logstash/modules/settings_merger_spec.rb
deleted file mode 100644
index 25e1ea8e9..000000000
--- a/logstash-core/spec/logstash/modules/settings_merger_spec.rb
+++ /dev/null
@@ -1,141 +0,0 @@
-# encoding: utf-8
-require "spec_helper"
-require "logstash/util/cloud_setting_id"
-require "logstash/util/cloud_setting_auth"
-require "logstash/modules/settings_merger"
-require "logstash/util/password"
-
-class SubstituteSettingsForRSpec
-  def initialize(hash = {}) @hash = hash; end
-  def put(key, value) @hash[key] = value; end
-  def get(key) @hash[key]; end
-end
-
-describe LogStash::Modules::SettingsMerger do
-  describe "#merge" do
-    let(:cli) {[{"name"=>"mod1", "var.input.tcp.port"=>"3333"}, {"name"=>"mod2"}]}
-    let(:yml) {[{"name"=>"mod1", "var.input.tcp.port"=>2222, "var.kibana.username"=>"rupert", "var.kibana.password"=>"fotherington"}, {"name"=>"mod3", "var.input.tcp.port"=>4445}]}
-    subject(:results) { described_class.merge(cli, yml) }
-    it "merges cli overwriting any common fields in yml" do
-      expect(results).to be_a(Array)
-      expect(results.size).to eq(3)
-      expect(results[0]["name"]).to eq("mod1")
-      expect(results[0]["var.input.tcp.port"]).to eq("3333")
-      expect(results[0]["var.kibana.username"]).to eq("rupert")
-      expect(results[1]["name"]).to eq("mod2")
-      expect(results[2]["name"]).to eq("mod3")
-      expect(results[2]["var.input.tcp.port"]).to eq(4445)
-    end
-  end
-
-  describe "#merge_kibana_auth" do
-
-    before do
-      described_class.merge_kibana_auth!(mod_settings)
-    end
-
-    context 'only elasticsearch username and password is set' do
-      let(:mod_settings) { {"name"=>"mod1", "var.input.tcp.port"=>2222, "var.elasticsearch.username"=>"rupert", "var.elasticsearch.password"=>"fotherington" } }
-      it "sets kibana username and password" do
-        expect(mod_settings["var.elasticsearch.username"]).to eq("rupert")
-        expect(mod_settings["var.elasticsearch.password"]).to eq("fotherington")
-        expect(mod_settings["var.kibana.username"]).to eq("rupert")
-        expect(mod_settings["var.kibana.password"]).to eq("fotherington")
-      end
-    end
-
-    context 'elasticsearch and kibana usernames and passwords are set' do
-      let(:mod_settings) { {"name"=>"mod1", "var.input.tcp.port"=>2222, "var.elasticsearch.username"=>"rupert", "var.elasticsearch.password"=>"fotherington",
-                                                               "var.kibana.username"=>"davey", "var.kibana.password"=>"stott"} }
-
-      it "keeps existing kibana username and password" do
-        expect(mod_settings["var.elasticsearch.username"]).to eq("rupert")
-        expect(mod_settings["var.elasticsearch.password"]).to eq("fotherington")
-        expect(mod_settings["var.kibana.username"]).to eq("davey")
-        expect(mod_settings["var.kibana.password"]).to eq("stott")
-      end
-    end
-
-  end
-
-  describe "#merge_cloud_settings" do
-    let(:cloud_id) { LogStash::Util::CloudSettingId.new("label:dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRub3RhcmVhbCRpZGVudGlmaWVy") }
-    let(:cloud_auth) { LogStash::Util::CloudSettingAuth.new("elastix:bigwhoppingfairytail") }
-    let(:mod_settings) { {} }
-
-    context "when both are supplied" do
-      let(:expected_table) do
-        {
-          "var.kibana.scheme" => "https",
-          "var.kibana.host" => "identifier.us-east-1.aws.found.io:443",
-          "var.elasticsearch.hosts" => "https://notareal.us-east-1.aws.found.io:443",
-          "var.elasticsearch.username" => "elastix",
-          "var.kibana.username" => "elastix"
-        }
-      end
-      let(:ls_settings) { SubstituteSettingsForRSpec.new({"cloud.id" => cloud_id, "cloud.auth" => cloud_auth}) }
-
-      before do
-        described_class.merge_cloud_settings(mod_settings, ls_settings)
-      end
-
-      it "adds entries to module settings" do
-        expected_table.each do |key, expected|
-          expect(mod_settings[key]).to eq(expected)
-        end
-        expect(mod_settings["var.elasticsearch.password"].value).to eq("bigwhoppingfairytail")
-        expect(mod_settings["var.kibana.password"].value).to eq("bigwhoppingfairytail")
-      end
-    end
-
-    context "when cloud.id is supplied" do
-      let(:expected_table) do
-        {
-          "var.kibana.scheme" => "https",
-          "var.kibana.host" => "identifier.us-east-1.aws.found.io:443",
-          "var.elasticsearch.hosts" => "https://notareal.us-east-1.aws.found.io:443",
-        }
-      end
-      let(:ls_settings) { SubstituteSettingsForRSpec.new({"cloud.id" => cloud_id}) }
-
-      before do
-        described_class.merge_cloud_settings(mod_settings, ls_settings)
-      end
-
-      it "adds entries to module settings" do
-        expected_table.each do |key, expected|
-          expect(mod_settings[key]).to eq(expected)
-        end
-      end
-    end
-
-    context "when only cloud.auth is supplied" do
-      let(:ls_settings) { SubstituteSettingsForRSpec.new({"cloud.auth" => cloud_auth}) }
-      it "should raise an error" do
-        expect{ described_class.merge_cloud_settings(mod_settings, ls_settings) }.to raise_exception(ArgumentError)
-      end
-    end
-
-    context "when neither cloud.id nor cloud.auth is supplied" do
-      let(:ls_settings) { SubstituteSettingsForRSpec.new() }
-      it "should do nothing" do
-        expect(mod_settings).to be_empty
-      end
-    end
-  end
-
-  describe "#format_module_settings" do
-    let(:before_hash) { {"foo" => "red", "bar" => "blue", "qux" => "pink"} }
-    let(:after_hash) { {"foo" => "red", "bar" => "steel-blue", "baz" => LogStash::Util::Password.new("cyan"), "qux" => nil} }
-    subject(:results) { described_class.format_module_settings(before_hash, after_hash) }
-    it "yields an array of formatted lines for ease of logging" do
-      expect(results.size).to eq(after_hash.size + 2)
-      expect(results.first).to eq("-------- Module Settings ---------")
-      expect(results.last).to eq("-------- Module Settings ---------")
-      expect(results[1]).to eq("foo: 'red'")
-      expect(results[2]).to eq("bar: 'steel-blue', was: 'blue'")
-      expect(results[3]).to eq("baz: '<password>', was: ''")
-      expect(results[4]).to eq("qux: '', was: 'pink'")
-    end
-  end
-end
\ No newline at end of file
diff --git a/logstash-core/spec/logstash/outputs/base_spec.rb b/logstash-core/spec/logstash/outputs/base_spec.rb
index 904e91493..e1f52efd3 100644
--- a/logstash-core/spec/logstash/outputs/base_spec.rb
+++ b/logstash-core/spec/logstash/outputs/base_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/outputs/base"
 require "support/shared_contexts"
@@ -47,7 +63,7 @@ describe "LogStash::Outputs::Base#new" do
       params = { "dummy_option" => "potatoes", "codec" => "json", "workers" => 2 }
       worker_params = params.dup; worker_params["workers"] = 1
 
-      expect{ subject }.not_to raise_error
+      expect { subject }.not_to raise_error
     end
 
     it "should set concurrency correctly" do
@@ -86,18 +102,34 @@ describe "LogStash::Outputs::Base#new" do
 
     subject(:instance) { klass.new(params.dup) }
 
-    it "allow to set the context" do
-      expect(instance.execution_context).to be_nil
-      instance.execution_context = execution_context
+    context 'execution_context=' do
+      let(:deprecation_logger_stub) { double('DeprecationLogger').as_null_object }
+      before(:each) do
+        allow(klass).to receive(:deprecation_logger).and_return(deprecation_logger_stub)
+      end
 
-      expect(instance.execution_context).to eq(execution_context)
-    end
+      it "allow to set the context" do
+        new_ctx = execution_context.dup
+        subject.execution_context = new_ctx
+        expect(subject.execution_context).to be(new_ctx)
+      end
 
-    it "propagate the context to the codec" do
-      expect(instance.codec.execution_context).to be_nil
-      instance.execution_context = execution_context
+      it "propagate the context to the codec" do
+        new_ctx = execution_context.dup
+        expect(instance.codec.execution_context).to_not be(new_ctx)
+        instance.execution_context = new_ctx
 
-      expect(instance.codec.execution_context).to eq(execution_context)
+        expect(instance.execution_context).to be(new_ctx)
+        expect(instance.codec.execution_context).to be(new_ctx)
+      end
+
+      it 'emits a deprecation warning' do
+        expect(deprecation_logger_stub).to receive(:deprecated) do |message|
+          expect(message).to match(/execution_context=/)
+        end
+
+        instance.execution_context = execution_context
+      end
     end
   end
 
diff --git a/logstash-core/spec/logstash/patches/puma_spec.rb b/logstash-core/spec/logstash/patches/puma_spec.rb
new file mode 100644
index 000000000..28e3b22e1
--- /dev/null
+++ b/logstash-core/spec/logstash/patches/puma_spec.rb
@@ -0,0 +1,114 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+require "spec_helper"
+
+describe LogStash::DelegatingLogWriter do
+  let(:logger) { double("Logger") }
+  let(:text) { 'foo bar'}
+  let(:req) { { status: 200 } }
+  let(:error) do
+    Class.new(StandardError) do
+      def self.backtrace
+        %w[foo.rb bar.rb]
+      end
+    end
+  end
+
+  subject { LogStash::DelegatingLogWriter.new(logger) }
+
+  before(:each) do
+    allow(logger).to receive(:debug?).and_return(true)
+  end
+
+  context "#log" do
+    it "should log a :debug message" do
+      expect(logger).to receive(:debug).with(text)
+      subject.send(:log, text)
+    end
+  end
+
+  context "#write" do
+    it "should log a raw :debug message" do
+      expect(logger).to receive(:debug).with(1)
+      subject.send(:write, 1)
+    end
+  end
+
+  context "#debug" do
+    it "should log a :debug message" do
+      expect(logger).to receive(:debug).with(text)
+      subject.send(:debug, text)
+    end
+  end
+
+  context "#error" do
+    it "should log an :error message and raise LogStash::UnrecoverablePumaError" do
+      expect(logger).to receive(:error).with(text)
+      expect { subject.send(:error, text) }.to raise_error(LogStash::UnrecoverablePumaError, text)
+    end
+  end
+
+  context "#connection_error" do
+    it "should log a :debug message" do
+      expect(logger).to receive(:debug).with(text, { error: error, req: req, backtrace: error.backtrace })
+      subject.send(:connection_error, error, req, text)
+    end
+  end
+
+  context "#parse_error" do
+    it "should log a :debug message" do
+      expect(logger).to receive(:debug).with(anything, { error: error, req: req })
+      subject.send(:parse_error, error, req)
+    end
+  end
+
+  context "#ssl_error" do
+    it "should log a :debug message with the peer certificate details" do
+      socket = double("Socket")
+      peercert = double("Peercert")
+
+      allow(socket).to receive(:peeraddr).and_return(%w[first second last])
+      allow(peercert).to receive(:subject).and_return("logstash")
+      allow(socket).to receive(:peercert).and_return(peercert)
+
+      expect(logger).to receive(:debug).with('SSL error, peer: last, peer cert: logstash', { error: error })
+      subject.send(:ssl_error, error, socket)
+    end
+  end
+
+  context "#unknown_error" do
+    it "should log an :error message" do
+      expect(logger).to receive(:error).with(text, { error: error, req: req, backtrace: error.backtrace })
+      subject.send(:unknown_error, error, req, text)
+    end
+
+    context 'when debug log level is disabled' do
+      it "should not include the :backtrace field on the :error log message" do
+        allow(logger).to receive(:debug?).and_return(false)
+        expect(logger).to receive(:error).with(text, { error: error, req: req })
+        subject.send(:unknown_error, error, req, text)
+      end
+    end
+  end
+
+  context "#debug_error" do
+    it "should log a :debug message" do
+      expect(logger).to receive(:debug).with(text, { error: error, req: req, backtrace: error.backtrace })
+      subject.send(:debug_error, error, req, text)
+    end
+  end
+end
diff --git a/logstash-core/spec/logstash/patches_spec.rb b/logstash-core/spec/logstash/patches_spec.rb
index f97d4ea20..2014300d2 100644
--- a/logstash-core/spec/logstash/patches_spec.rb
+++ b/logstash-core/spec/logstash/patches_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "socket"
 require "logstash/patches"
 require "flores/pki"
@@ -36,9 +52,7 @@ describe "OpenSSL defaults" do
     # https://github.com/jordansissel/ruby-flores/blob/master/spec/flores/pki_integration_spec.rb
     # since these helpers were created to fix this particular issue
     let(:csr) { Flores::PKI::CertificateSigningRequest.new }
-    # Here, I use a 1024-bit key for faster tests.
-    # Please do not use such small keys in production.
-    let(:key_bits) { 1024 }
+    let(:key_bits) { 2048 }
     let(:key) { OpenSSL::PKey::RSA.generate(key_bits, 65537) }
     let(:certificate_duration) { Flores::Random.number(1..86400) }
 
diff --git a/logstash-core/spec/logstash/persisted_queue_config_validator_spec.rb b/logstash-core/spec/logstash/persisted_queue_config_validator_spec.rb
new file mode 100644
index 000000000..98a311015
--- /dev/null
+++ b/logstash-core/spec/logstash/persisted_queue_config_validator_spec.rb
@@ -0,0 +1,364 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require "spec_helper"
+require "tmpdir"
+require "logstash/persisted_queue_config_validator"
+require 'securerandom'
+require_relative '../support/helpers'
+
+describe LogStash::PersistedQueueConfigValidator do
+  context("when persisted queues are enabled") do
+    let(:input_block) { "input { generator {} }" }
+    let(:config_path) { temporary_file(input_block) }
+    let(:queue_path) { Stud::Temporary.directory }
+    let(:settings) do
+      mock_settings(
+        "queue.type" => "persisted",
+        "queue.page_capacity" => 1024,
+        "path.queue" => queue_path,
+        "path.config" => config_path
+      )
+    end
+    let(:pipeline_configs) { LogStash::Config::Source::Local.new(settings).pipeline_configs }
+    let(:pq_config_validator) { LogStash::PersistedQueueConfigValidator.new }
+
+    context("'queue.max_bytes' is less than 'queue.page_capacity'") do
+      it "should throw" do
+        settings.set_value("queue.max_bytes", 512)
+        expect { pq_config_validator.check({}, pipeline_configs) }
+          .to raise_error(LogStash::BootstrapCheckError, /'queue.page_capacity' must be less than or equal to 'queue.max_bytes'/)
+      end
+    end
+
+    context("'queue.max_bytes' = 0 which is less than 'queue.page_capacity'") do
+      it "should not throw" do
+        expect(pq_config_validator.logger).not_to receive(:warn)
+        settings.set_value("queue.max_bytes", 0)
+        pq_config_validator.check({}, pipeline_configs)
+      end
+    end
+
+    context("queue size is greater than 'queue.max_bytes'") do
+      let(:pipeline_id) { "main" }
+      let(:page_file) do
+        FileUtils.mkdir_p(::File.join(queue_path, pipeline_id))
+        ::File.new(::File.join(queue_path, pipeline_id, "page.0"), "w")
+      end
+
+      before do
+        # create a 2MB file
+        ::File.open(page_file, 'wb') do |f|
+          f.write(SecureRandom.random_bytes(2**21))
+        end
+      end
+
+      it "should throw" do
+        expect(pq_config_validator.logger).to receive(:warn).once.with(/greater than 'queue.max_bytes'/)
+        settings.set_value("queue.max_bytes", "1mb")
+        pq_config_validator.check({}, pipeline_configs)
+      end
+
+      after do
+        page_file.truncate(0)
+        page_file.close
+      end
+    end
+
+    context("disk does not have sufficient space") do
+      let(:pipeline_id) { "main" }
+      # Create a pipeline config double that matches what the class expects
+      let(:pipeline_config) do
+        double("PipelineConfig").tap do |config|
+          allow(config).to receive(:pipeline_id).and_return(pipeline_id)
+          allow(config).to receive(:settings).and_return(
+            double("Settings").tap do |s|
+              allow(s).to receive(:get).with("queue.type").and_return("persisted")
+              allow(s).to receive(:get).with("queue.max_bytes").and_return(300 * 1024 * 1024 * 1024) # 300GB
+              allow(s).to receive(:get).with("queue.page_capacity").and_return(64 * 1024 * 1024) # 64MB
+              allow(s).to receive(:get).with("pipeline.id").and_return(pipeline_id)
+              allow(s).to receive(:get).with("path.queue").and_return(queue_path)
+            end
+          )
+        end
+      end
+
+      before do
+        allow(Dir).to receive(:glob).and_return(["page.1"])
+        allow(File).to receive(:size).and_return(25 * 1024 * 1024 * 1024)
+        allow(FsUtil).to receive(:hasFreeSpace).and_return(false)
+        allow(Files).to receive(:exists).and_return(true)
+
+        # Mock filesystem
+        mock_file_store = double("FileStore",
+          name: "disk1",
+          getUsableSpace: 100 * 1024 * 1024 * 1024  # 100GB free
+        )
+        allow(Files).to receive(:getFileStore).and_return(mock_file_store)
+      end
+
+      it "reports detailed space information" do
+        expect(pq_config_validator).to receive(:check_disk_space) do |_, _, required_free_bytes|
+          expect(required_free_bytes.size).to eq(1)
+          expect(required_free_bytes.values[0]).to eq(300 * 1024 * 1024 * 1024)
+        end.and_call_original
+
+        expect(pq_config_validator.logger).to receive(:warn).once do |msg|
+          expect(msg).to include("Total space required: 300gb")
+          expect(msg).to include("Current PQ usage: 25gb")
+        end
+
+        pq_config_validator.check({}, [pipeline_config])
+      end
+
+      context "with multiple pipelines" do
+        let(:pipeline_id1) { "main" }
+        let(:pipeline_id2) { "secondary" }
+        let(:pipeline_id3) { "third" }
+
+        let(:base_queue_path) { queue_path }
+        let(:queue_path1) { ::File.join(base_queue_path, pipeline_id1) }
+        let(:queue_path2) { ::File.join(base_queue_path, pipeline_id2) }
+        let(:queue_path3) { ::File.join(Stud::Temporary.directory, pipeline_id3) }
+
+        let(:pipeline_config1) do
+          double("PipelineConfig").tap do |config|
+            allow(config).to receive(:pipeline_id).and_return(pipeline_id1)
+            allow(config).to receive(:settings).and_return(
+              double("Settings").tap do |s|
+                allow(s).to receive(:get).with("queue.type").and_return("persisted")
+                allow(s).to receive(:get).with("queue.max_bytes").and_return(300 * 1024 * 1024 * 1024)
+                allow(s).to receive(:get).with("queue.page_capacity").and_return(64 * 1024 * 1024)
+                allow(s).to receive(:get).with("pipeline.id").and_return(pipeline_id1)
+                allow(s).to receive(:get).with("path.queue").and_return(base_queue_path)
+              end
+            )
+          end
+        end
+
+        let(:pipeline_config2) do
+          double("PipelineConfig").tap do |config|
+            allow(config).to receive(:pipeline_id).and_return(pipeline_id2)
+            allow(config).to receive(:settings).and_return(
+              double("Settings").tap do |s|
+                allow(s).to receive(:get).with("queue.type").and_return("persisted")
+                allow(s).to receive(:get).with("queue.max_bytes").and_return(300 * 1024 * 1024 * 1024)
+                allow(s).to receive(:get).with("queue.page_capacity").and_return(64 * 1024 * 1024)
+                allow(s).to receive(:get).with("pipeline.id").and_return(pipeline_id2)
+                allow(s).to receive(:get).with("path.queue").and_return(base_queue_path)
+              end
+            )
+          end
+        end
+
+        let(:pipeline_config3) do
+          double("PipelineConfig").tap do |config|
+            allow(config).to receive(:pipeline_id).and_return(pipeline_id3)
+            allow(config).to receive(:settings).and_return(
+              double("Settings").tap do |s|
+                allow(s).to receive(:get).with("queue.type").and_return("persisted")
+                allow(s).to receive(:get).with("queue.max_bytes").and_return(300 * 1024 * 1024 * 1024)
+                allow(s).to receive(:get).with("queue.page_capacity").and_return(64 * 1024 * 1024)
+                allow(s).to receive(:get).with("pipeline.id").and_return(pipeline_id3)
+                allow(s).to receive(:get).with("path.queue").and_return(::File.dirname(queue_path3))
+              end
+            )
+          end
+        end
+
+        let(:mock_file_store1) { double("FileStore", name: "disk1", getUsableSpace: 100 * 1024 * 1024 * 1024) }
+        let(:mock_file_store2) { double("FileStore", name: "disk2", getUsableSpace: 50 * 1024 * 1024 * 1024) }
+
+        before do
+          # Precise path matching for Dir.glob
+          allow(Dir).to receive(:glob) do |pattern|
+            case pattern
+            when /#{pipeline_id1}.*page\.*/ then ["#{::File.dirname(pattern)}/page.1"]
+            when /#{pipeline_id2}.*page\.*/ then ["#{::File.dirname(pattern)}/page.1", "#{::File.dirname(pattern)}/page.2"]
+            when /#{pipeline_id3}.*page\.*/ then ["#{::File.dirname(pattern)}/page.1"]
+            else []
+            end
+          end
+
+          # Set up file size matching with full paths
+          allow(File).to receive(:size) do |path|
+            case
+            when path.include?(pipeline_id1) then 30 * 1024 * 1024 * 1024 # 30GB for main
+            when path.include?(pipeline_id2) then 25 * 1024 * 1024 * 1024 # 25GB for secondary
+            when path.include?(pipeline_id3) then 25 * 1024 * 1024 * 1024 # 25GB for third
+            else 0
+            end
+          end
+
+          allow(Files).to receive(:getFileStore) do |path|
+            case path.toString
+            when /#{pipeline_id3}/ then mock_file_store2
+            else mock_file_store1
+            end
+          end
+
+          allow(FsUtil).to receive(:hasFreeSpace).and_return(false)
+          allow(Files).to receive(:exists).and_return(true)
+        end
+
+        context "with multiple queues on same filesystem" do
+          it "reports consolidated information for same filesystem" do
+            expect(pq_config_validator.logger).to receive(:warn).once do |msg|
+              expect(msg).to match(/Persistent queues require more disk space than is available on a filesystem:/)
+              expect(msg).to match(/Filesystem 'disk1':/)
+              expect(msg).to match(/Total space required: 600gb/) # 300GB * 2
+              expect(msg).to match(/Current PQ usage: 80gb/) # 30GB + (2 * 25GB)
+              expect(msg).to match(/Current size: 30gb/) # First queue
+              expect(msg).to match(/Current size: 50gb/) # Second queue (2 files * 25GB)
+            end
+
+            pq_config_validator.check({}, [pipeline_config1, pipeline_config2])
+          end
+        end
+
+        context "with queues across multiple filesystems" do
+          it "reports separate information for each filesystem" do
+            expect(pq_config_validator.logger).to receive(:warn).once do |msg|
+              # First filesystem
+              expect(msg).to match(/Filesystem 'disk1':/)
+              expect(msg).to match(/Total space required: 600gb/) # 300GB * 2
+              expect(msg).to match(/Current PQ usage: 80gb/) # 30GB + (2 * 25GB)
+
+              # Second filesystem
+              expect(msg).to match(/Filesystem 'disk2':/)
+              expect(msg).to match(/Total space required: 300gb/) # 300GB
+              expect(msg).to match(/Current PQ usage: 25gb/) # 25GB
+            end
+
+            pq_config_validator.check({}, [pipeline_config1, pipeline_config2, pipeline_config3])
+          end
+        end
+      end
+    end
+
+    context("pipeline registry check queue config") do
+      shared_examples "no update" do
+        it "gives false" do
+          expect(pq_config_validator.queue_configs_update?(running_pipelines, pipeline_configs))
+            .to be_falsey
+        end
+      end
+
+      shared_examples "got update" do
+        it "gives true" do
+          expect(pq_config_validator.queue_configs_update?(running_pipelines, pipeline_configs))
+            .to be_truthy
+        end
+      end
+
+      let(:java_pipeline) { LogStash::JavaPipeline.new(pipeline_configs[0]) }
+      let(:running_pipelines) { {:main => java_pipeline } }
+
+      context("pipeline config is identical") do
+        it_behaves_like "no update"
+      end
+
+      context("add more pipeline") do
+        let(:settings1) { settings.dup.merge("pipeline.id" => "main") }
+        let(:settings2) { settings.dup.merge("pipeline.id" => "second") }
+        let(:pipeline_configs) do
+          LogStash::Config::Source::Local.new(settings1).pipeline_configs +
+            LogStash::Config::Source::Local.new(settings2).pipeline_configs
+        end
+
+        it_behaves_like "got update"
+      end
+
+      context("queue configs has changed") do
+        let(:settings1) { settings.dup.merge("queue.max_bytes" => "1mb") }
+        let(:pipeline_configs1) { LogStash::Config::Source::Local.new(settings1).pipeline_configs }
+        let(:java_pipeline) { LogStash::JavaPipeline.new(pipeline_configs1[0]) }
+
+        it_behaves_like "got update"
+      end
+
+      context("queue configs do not changed") do
+        let(:settings1) { settings.dup.merge("config.debug" => "true") }
+        let(:pipeline_configs) { LogStash::Config::Source::Local.new(settings1).pipeline_configs }
+
+        it_behaves_like "no update"
+      end
+    end
+
+    context("cache check") do
+      context("has update since last check") do
+        let(:settings1) { settings.dup.merge("pipeline.id" => "main") }
+        let(:settings2) { settings.dup.merge("pipeline.id" => "second") }
+        let(:pipeline_configs2) do
+          LogStash::Config::Source::Local.new(settings1).pipeline_configs +
+            LogStash::Config::Source::Local.new(settings2).pipeline_configs
+        end
+        let(:pipeline_configs) do
+          LogStash::Config::Source::Local.new(settings1).pipeline_configs
+        end
+
+        it "gives true when add a new pipeline " do
+          pq_config_validator.instance_variable_set(:@last_check_pass, true)
+          pq_config_validator.instance_variable_set(:@last_check_pipeline_configs, pipeline_configs)
+          expect(pq_config_validator.cache_check_fail?(pipeline_configs2)).to be_truthy
+        end
+
+        it "gives false when remove a old pipeline" do
+          pq_config_validator.instance_variable_set(:@last_check_pass, true)
+          pq_config_validator.instance_variable_set(:@last_check_pipeline_configs, pipeline_configs2)
+          expect(pq_config_validator.cache_check_fail?(pipeline_configs)).to be_falsey
+        end
+      end
+
+      context("last check fail") do
+        it "gives true" do
+          pq_config_validator.instance_variable_set(:@last_check_pass, false)
+          pq_config_validator.instance_variable_set(:@last_check_pipeline_configs, pipeline_configs)
+          expect(pq_config_validator.cache_check_fail?(pipeline_configs)).to be_truthy
+        end
+      end
+
+      context("no update and last check pass") do
+        it "gives false" do
+          pq_config_validator.instance_variable_set(:@last_check_pass, true)
+          pq_config_validator.instance_variable_set(:@last_check_pipeline_configs, pipeline_configs)
+          expect(pq_config_validator.cache_check_fail?(pipeline_configs)).to be_falsey
+        end
+      end
+    end
+
+    context("check") do
+      context("add more pipeline and cache check pass") do
+        it "does not check PQ size" do
+          pq_config_validator.instance_variable_set(:@last_check_pass, true)
+          pq_config_validator.instance_variable_set(:@last_check_pipeline_configs, pipeline_configs)
+          expect(pq_config_validator).not_to receive(:check_disk_space)
+          pq_config_validator.check({}, pipeline_configs)
+        end
+      end
+
+      context("add more pipeline and cache is different") do
+        it "check PQ size" do
+          pq_config_validator.instance_variable_set(:@last_check_pass, true)
+          pq_config_validator.instance_variable_set(:@last_check_pipeline_configs, [])
+          expect(pq_config_validator).to receive(:check_disk_space).and_call_original
+          pq_config_validator.check({}, pipeline_configs)
+        end
+      end
+    end
+  end
+end
diff --git a/logstash-core/spec/logstash/pipeline_action/create_spec.rb b/logstash-core/spec/logstash/pipeline_action/create_spec.rb
index 0624d0775..553576b54 100644
--- a/logstash-core/spec/logstash/pipeline_action/create_spec.rb
+++ b/logstash-core/spec/logstash/pipeline_action/create_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require_relative "../../support/helpers"
 require_relative "../../support/matchers"
@@ -14,6 +30,7 @@ describe LogStash::PipelineAction::Create do
 
   before do
     clear_data_dir
+    allow(agent).to receive(:health_observer).and_return(double("HealthObserver").as_null_object)
   end
 
   subject { described_class.new(pipeline_config, metric) }
@@ -29,7 +46,6 @@ describe LogStash::PipelineAction::Create do
     expect(subject.pipeline_id).to eq(:main)
   end
 
-
   context "when we have really short lived pipeline" do
     let(:pipeline_config) { mock_pipeline_config(:main, "input { generator { count => 1 } } output { null {} }") }
 
@@ -51,9 +67,14 @@ describe LogStash::PipelineAction::Create do
     it "returns a successful execution status" do
       expect(subject.execute(agent, pipelines)).to be_truthy
     end
+
+    it "attached an indicator to the agent's health observer" do
+      expect(agent.health_observer).to receive(:attach_pipeline_indicator).with(:main, agent)
+      subject.execute(agent, pipelines)
+    end
   end
 
-  context  "when the pipeline doesn't start" do
+  context "when the pipeline doesn't start" do
     context "with a syntax error" do
       let(:pipeline_config) { mock_pipeline_config(:main, "input { dummyblockinginput { id => '123' } } output { stdout ") } # bad syntax
 
diff --git a/logstash-core/spec/logstash/pipeline_action/delete_spec.rb b/logstash-core/spec/logstash/pipeline_action/delete_spec.rb
new file mode 100644
index 000000000..73193389a
--- /dev/null
+++ b/logstash-core/spec/logstash/pipeline_action/delete_spec.rb
@@ -0,0 +1,78 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require "spec_helper"
+require_relative "../../support/helpers"
+require_relative "../../support/matchers"
+require "logstash/pipelines_registry"
+require "logstash/pipeline_action/delete"
+require "logstash/inputs/generator"
+
+
+describe LogStash::PipelineAction::Delete do
+  let(:pipeline_config) { "input { dummyblockinginput {} } output { null {} }" }
+  let(:pipeline_id) { :main }
+  let(:pipeline) { mock_java_pipeline_from_string(pipeline_config) }
+  let(:pipelines) do
+    LogStash::PipelinesRegistry.new.tap do |chm|
+      chm.create_pipeline(pipeline_id, pipeline) { true }
+    end
+  end
+  let(:agent) { double("agent") }
+
+  subject { described_class.new(pipeline_id) }
+
+  before do
+    clear_data_dir
+    allow(agent).to receive(:health_observer).and_return(double("HealthObserver").as_null_object)
+    pipeline.start
+  end
+
+  after do
+    pipeline.shutdown
+  end
+
+  it "returns the pipeline_id" do
+    expect(subject.pipeline_id).to eq(:main)
+  end
+
+  context "when the pipeline is still running" do
+
+    it 'fails to delete the pipeline' do
+      action_result = subject.execute(agent, pipelines)
+      expect(action_result).to_not be_successful
+
+      expect(pipelines.get_pipeline(pipeline_id)).to_not be_nil
+    end
+  end
+
+  context "when the pipeline has completed" do
+    let(:pipeline_config) { "input { generator { count => 1 } } output { null {} }"}
+
+    before(:each) do
+      sleep(0.1) until pipelines.non_running_pipelines.keys.include?(pipeline_id)
+    end
+
+    it 'deletes the pipeline' do
+      action_result = subject.execute(agent, pipelines)
+      expect(action_result).to be_successful
+
+      expect(pipelines.get_pipeline(pipeline_id)).to be_nil
+      expect(agent.health_observer).to have_received(:detach_pipeline_indicator).with(pipeline_id)
+    end
+  end
+end
\ No newline at end of file
diff --git a/logstash-core/spec/logstash/pipeline_action/reload_spec.rb b/logstash-core/spec/logstash/pipeline_action/reload_spec.rb
index 791b5dde2..5e0f9e171 100644
--- a/logstash-core/spec/logstash/pipeline_action/reload_spec.rb
+++ b/logstash-core/spec/logstash/pipeline_action/reload_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require_relative "../../support/helpers"
 require_relative "../../support/matchers"
@@ -10,7 +26,7 @@ describe LogStash::PipelineAction::Reload do
   let(:pipeline_id) { :main }
   let(:new_pipeline_config) { mock_pipeline_config(pipeline_id, "input { dummyblockinginput { id => 'new' } } output { null {} }", { "pipeline.reloadable" => true}) }
   let(:pipeline_config) { "input { dummyblockinginput {} } output { null {} }" }
-  let(:pipeline) { mock_pipeline_from_string(pipeline_config, mock_settings("pipeline.reloadable" => true)) }
+  let(:pipeline) { mock_java_pipeline_from_string(pipeline_config, mock_settings("pipeline.reloadable" => true)) }
   let(:pipelines) { r = LogStash::PipelinesRegistry.new; r.create_pipeline(pipeline_id, pipeline) { true }; r }
   let(:agent) { double("agent") }
 
@@ -44,7 +60,7 @@ describe LogStash::PipelineAction::Reload do
 
     it "run the new pipeline code" do
       subject.execute(agent, pipelines)
-      expect(pipelines.get_pipeline(pipeline_id).config_hash).to eq(new_pipeline_config.config_hash)
+      expect(pipelines.get_pipeline(pipeline_id).pipeline_config.config_hash).to eq(new_pipeline_config.config_hash)
     end
   end
 
diff --git a/logstash-core/spec/logstash/pipeline_action/stop_and_delete_spec.rb b/logstash-core/spec/logstash/pipeline_action/stop_and_delete_spec.rb
new file mode 100644
index 000000000..a32ed5eb0
--- /dev/null
+++ b/logstash-core/spec/logstash/pipeline_action/stop_and_delete_spec.rb
@@ -0,0 +1,79 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require "spec_helper"
+require_relative "../../support/helpers"
+require_relative "../../support/matchers"
+require "logstash/pipelines_registry"
+require "logstash/pipeline_action/delete"
+require "logstash/inputs/generator"
+
+
+describe LogStash::PipelineAction::StopAndDelete do
+  let(:pipeline_config) { "input { dummyblockinginput {} } output { null {} }" }
+  let(:pipeline_id) { :main }
+  let(:pipeline) { mock_java_pipeline_from_string(pipeline_config) }
+  let(:pipelines) do
+    LogStash::PipelinesRegistry.new.tap do |chm|
+      chm.create_pipeline(pipeline_id, pipeline) { true }
+    end
+  end
+  let(:agent) { double("agent") }
+
+  subject { described_class.new(pipeline_id) }
+
+  before do
+    clear_data_dir
+    allow(agent).to receive(:health_observer).and_return(double("HealthObserver").as_null_object)
+    pipeline.start
+  end
+
+  after do
+    pipeline.shutdown
+  end
+
+  it "returns the pipeline_id" do
+    expect(subject.pipeline_id).to eq(:main)
+  end
+
+  context "when the pipeline is still running" do
+    it 'stops and deletes the pipeline' do
+      action_result = subject.execute(agent, pipelines)
+      expect(action_result).to be_successful
+
+      expect(pipelines.get_pipeline(pipeline_id)).to be_nil
+      expect(agent.health_observer).to have_received(:detach_pipeline_indicator).with(pipeline_id)
+    end
+  end
+
+  context "when the pipeline has completed" do
+    let(:pipeline_config) { "input { generator { count => 1 } } output { null {} }"}
+
+    before(:each) do
+      sleep(0.1) until pipelines.non_running_pipelines.keys.include?(pipeline_id)
+    end
+
+    it 'deletes the pipeline' do
+      action_result = subject.execute(agent, pipelines)
+      expect(action_result).to be_successful
+
+      expect(pipelines.get_pipeline(pipeline_id)).to be_nil
+
+      expect(agent.health_observer).to have_received(:detach_pipeline_indicator).with(pipeline_id)
+    end
+  end
+end
\ No newline at end of file
diff --git a/logstash-core/spec/logstash/pipeline_action/stop_spec.rb b/logstash-core/spec/logstash/pipeline_action/stop_spec.rb
index 75648c50b..8355abb8c 100644
--- a/logstash-core/spec/logstash/pipeline_action/stop_spec.rb
+++ b/logstash-core/spec/logstash/pipeline_action/stop_spec.rb
@@ -1,14 +1,29 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require_relative "../../support/helpers"
 require "logstash/pipelines_registry"
 require "logstash/pipeline_action/stop"
-require "logstash/pipeline"
 
 describe LogStash::PipelineAction::Stop do
   let(:pipeline_config) { "input { dummyblockinginput {} } output { null {} }" }
   let(:pipeline_id) { :main }
-  let(:pipeline) { mock_pipeline_from_string(pipeline_config) }
+  let(:pipeline) { mock_java_pipeline_from_string(pipeline_config) }
   let(:pipelines) { chm = LogStash::PipelinesRegistry.new; chm.create_pipeline(pipeline_id, pipeline) { true }; chm }
   let(:agent) { double("agent") }
 
diff --git a/logstash-core/spec/logstash/pipeline_dlq_commit_spec.rb b/logstash-core/spec/logstash/pipeline_dlq_commit_spec.rb
index 1222ac2c8..8069f984e 100644
--- a/logstash-core/spec/logstash/pipeline_dlq_commit_spec.rb
+++ b/logstash-core/spec/logstash/pipeline_dlq_commit_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "tmpdir"
 require "spec_helper"
 require "logstash/codecs/plain"
@@ -35,7 +51,7 @@ class DLQCommittingFilter < LogStash::Filters::Base
   def close() end
 end
 
-describe LogStash::Pipeline do
+describe LogStash::JavaPipeline do
   let(:pipeline_settings_obj) { LogStash::SETTINGS.clone }
   let(:pipeline_settings) do
     {
@@ -56,7 +72,7 @@ describe LogStash::Pipeline do
     eos
   }
 
-  subject { mock_pipeline_from_string(test_config, pipeline_settings_obj, metric) }
+  subject { mock_java_pipeline_from_string(test_config, pipeline_settings_obj, metric) }
 
   before(:each) do
     pipeline_settings.each {|k, v| pipeline_settings_obj.set(k, v) }
@@ -75,14 +91,14 @@ describe LogStash::Pipeline do
     let(:pipeline_id) { "test-dlq" }
 
     it "retrieves proper pipeline-level DLQ writer" do
-      expect_any_instance_of(org.logstash.common.io.DeadLetterQueueWriter).to receive(:close).and_call_original
-      subject.run
+      expect_any_instance_of(org.logstash.common.io.DeadLetterQueueWriter).to receive(:close).at_least(:once).and_call_original
+      subject.start
+      subject.shutdown
       dlq_path = java.nio.file.Paths.get(pipeline_settings_obj.get("path.dead_letter_queue"), pipeline_id)
       dlq_reader = org.logstash.common.io.DeadLetterQueueReader.new(dlq_path)
       entry = dlq_reader.pollEntry(40)
       expect(entry).to_not be_nil
       expect(entry.reason).to eq("my reason")
-      subject.shutdown
     end
   end
 
@@ -92,12 +108,11 @@ describe LogStash::Pipeline do
 
     it "does not write to the DLQ" do
       expect(LogStash::Util::DummyDeadLetterQueueWriter).to receive(:new).and_call_original
-      expect_any_instance_of(LogStash::Util::DummyDeadLetterQueueWriter).to receive(:close).and_call_original
-      subject.run
+      expect_any_instance_of(LogStash::Util::DummyDeadLetterQueueWriter).to receive(:close).at_least(:once).and_call_original
+      subject.start
       dlq_path = java.nio.file.Paths.get(pipeline_settings_obj.get("path.dead_letter_queue"), pipeline_id)
       expect(java.nio.file.Files.exists(dlq_path)).to eq(false)
       subject.shutdown
     end
   end
-
 end
diff --git a/logstash-core/spec/logstash/pipeline_pq_file_spec.rb b/logstash-core/spec/logstash/pipeline_pq_file_spec.rb
index 59f23ce07..fe0f80fe6 100644
--- a/logstash-core/spec/logstash/pipeline_pq_file_spec.rb
+++ b/logstash-core/spec/logstash/pipeline_pq_file_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/inputs/generator"
 require_relative "../support/helpers"
@@ -14,7 +30,7 @@ class PipelinePqFileOutput < LogStash::Outputs::Base
     @concurrency = :shared
   end
 
-  def initialize(params={})
+  def initialize(params = {})
     super
     @num_closes = 0
     @event_count = 0
@@ -36,7 +52,7 @@ class PipelinePqFileOutput < LogStash::Outputs::Base
   end
 end
 
-describe LogStash::Pipeline do
+describe LogStash::JavaPipeline do
   let(:pipeline_settings_obj) { LogStash::SETTINGS.clone }
   let(:pipeline_id) { "main" }
 
@@ -64,10 +80,13 @@ describe LogStash::Pipeline do
     EOS
   end
 
-   let(:pipeline_settings) { { "queue.type" => queue_type, "pipeline.workers" => worker_thread_count, "pipeline.id" => pipeline_id} }
+  let(:pipeline_settings) {{
+    "queue.type" => queue_type,
+    "pipeline.workers" => worker_thread_count,
+    "pipeline.id" => pipeline_id
+  }}
 
   let(:pipeline_config) { mock_pipeline_config(pipeline_id, config, pipeline_settings_obj) }
-  subject { described_class.new(pipeline_config, metric) }
 
   let(:counting_output) { PipelinePqFileOutput.new({ "id" => output_id }) }
   let(:metric_store) { subject.metric.collector.snapshot_metric.metric_store }
@@ -76,18 +95,12 @@ describe LogStash::Pipeline do
   let(:this_queue_folder) { File.join(base_queue_path, SecureRandom.hex(8)) }
 
   let(:worker_thread_count) { 8 } # 1 4 8
-  let(:number_of_events) { 100_000 }
-  let(:page_capacity) { 1 * 1024 * 512 } # 1 128
-  let(:max_bytes) { 1024 * 1024 * 1024 } # 1 gb
-  let(:queue_type) { "persisted" } #  "memory" "memory_acked"
+  let(:number_of_events) { 10_000 }
+  let(:page_capacity) { 1 * 1024 * 1024 } # 1 mb
+  let(:max_bytes) { 64 * 1024 * 1024 } # 64 mb
   let(:times) { [] }
 
-  let(:pipeline_thread) do
-    # subject has to be called for the first time outside the thread because it will create a race condition
-    # with the subject.ready? call since subject is lazily initialized
-    s = subject
-    Thread.new { s.run }
-  end
+  let(:collected_metric) { metric_store.get_with_path("stats/pipelines/") }
 
   before :each do
     FileUtils.mkdir_p(this_queue_folder)
@@ -104,9 +117,10 @@ describe LogStash::Pipeline do
     pipeline_settings.each {|k, v| pipeline_settings_obj.set(k, v) }
     pipeline_settings_obj.set("queue.page_capacity", page_capacity)
     pipeline_settings_obj.set("queue.max_bytes", max_bytes)
+    pipeline_settings_obj.set("queue.drain", true)
     times.push(Time.now.to_f)
 
-    pipeline_thread
+    subject.start
     sleep(0.1) until subject.ready?
 
     # make sure we have received all the generated events
@@ -119,23 +133,38 @@ describe LogStash::Pipeline do
 
   after :each do
     subject.shutdown
-    pipeline_thread.join
     # Dir.rm_rf(this_queue_folder)
   end
 
-  let(:collected_metric) { metric_store.get_with_path("stats/pipelines/") }
+  shared_examples "a well behaved pipeline" do
+    it "populates the core metrics" do
+      _metric = collected_metric[:stats][:pipelines][:main][:events]
+      expect(_metric[:duration_in_millis].value).not_to be_nil
+      expect(_metric[:in].value).to eq(number_of_events)
+      expect(_metric[:filtered].value).to eq(number_of_events)
+      expect(_metric[:out].value).to eq(number_of_events)
+      STDOUT.puts "  pipeline: #{subject.class}"
+      STDOUT.puts "  queue.type: #{pipeline_settings_obj.get("queue.type")}"
+      STDOUT.puts "  queue.page_capacity: #{pipeline_settings_obj.get("queue.page_capacity") / 1024}KB"
+      STDOUT.puts "  queue.max_bytes: #{pipeline_settings_obj.get("queue.max_bytes") / 1024}KB"
+      STDOUT.puts "  workers: #{worker_thread_count}"
+      STDOUT.puts "  events: #{number_of_events}"
+      STDOUT.puts "  took: #{times.first}s"
+    end
+  end
 
-  it "populates the pipelines core metrics" do
-    _metric = collected_metric[:stats][:pipelines][:main][:events]
-    expect(_metric[:duration_in_millis].value).not_to be_nil
-    expect(_metric[:in].value).to eq(number_of_events)
-    expect(_metric[:filtered].value).to eq(number_of_events)
-    expect(_metric[:out].value).to eq(number_of_events)
-    STDOUT.puts "  queue.type: #{pipeline_settings_obj.get("queue.type")}"
-    STDOUT.puts "  queue.page_capacity: #{pipeline_settings_obj.get("queue.page_capacity") / 1024}KB"
-    STDOUT.puts "  queue.max_bytes: #{pipeline_settings_obj.get("queue.max_bytes") / 1024}KB"
-    STDOUT.puts "  workers: #{worker_thread_count}"
-    STDOUT.puts "  events: #{number_of_events}"
-    STDOUT.puts "  took: #{times.first}s"
+  context "using PQ" do
+    let(:queue_type) { "persisted" } #  "memory", "persisted"
+    context "with Java execution" do
+      subject { LogStash::JavaPipeline.new(pipeline_config, metric) }
+      it_behaves_like "a well behaved pipeline"
+    end
+  end
+  context "using MQ" do
+    let(:queue_type) { "memory" } #  "memory", "persisted"
+    context "with Java execution" do
+      subject { LogStash::JavaPipeline.new(pipeline_config, metric) }
+      it_behaves_like "a well behaved pipeline"
+    end
   end
 end
diff --git a/logstash-core/spec/logstash/pipeline_reporter_spec.rb b/logstash-core/spec/logstash/pipeline_reporter_spec.rb
index 2753be480..2f541d1c3 100644
--- a/logstash-core/spec/logstash/pipeline_reporter_spec.rb
+++ b/logstash-core/spec/logstash/pipeline_reporter_spec.rb
@@ -1,6 +1,21 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
-require "logstash/pipeline"
 require_relative "../support/helpers"
 require_relative "../support/mocks_classes"
 
@@ -14,19 +29,22 @@ shared_examples "a pipeline reporter" do |pipeline_setup|
   let(:pipeline) { Kernel.send(pipeline_setup, config)}
   let(:reporter) { pipeline.reporter }
 
-  before do
+  let(:do_setup_plugin_registry) do
     allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutput").and_return(::LogStash::Outputs::DummyOutput)
     allow(LogStash::Plugin).to receive(:lookup).with("input", "generator").and_call_original
     allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_call_original
+  end
+
+  before do
+    do_setup_plugin_registry
 
     @pre_snapshot = reporter.snapshot
 
-    pipeline.run
-    @post_snapshot = reporter.snapshot
-  end
-
-  after do
+    pipeline.start
+    # wait for stopped? so the input can produce all events
+    sleep 0.01 until pipeline.stopped?
     pipeline.shutdown
+    @post_snapshot = reporter.snapshot
   end
 
   describe "stalling threads info" do
@@ -34,8 +52,9 @@ shared_examples "a pipeline reporter" do |pipeline_setup|
       expect(@pre_snapshot.stalling_threads_info).to eql([])
     end
 
-    it "should end with no stalled threads" do
-      expect(@pre_snapshot.stalling_threads_info).to eql([])
+    it "should end with no plugin stalled threads" do
+      expect(@post_snapshot.stalling_threads_info.length).to be(1)
+      expect(@post_snapshot.stalling_threads_info).to include(hash_including("name" => pipeline.instance_variable_get("@thread")[:name]))
     end
   end
 
@@ -67,10 +86,45 @@ shared_examples "a pipeline reporter" do |pipeline_setup|
     it "should be zero after running" do
       expect(@post_snapshot.inflight_count).to eql(0)
     end
+
+    # We provide a hooked filter that captures a new reporter snapshot with each event.
+    # Since the event being processed is by-definition part of a batch that is in-flight,
+    # we expect all of the resulting reporter snapshots to have non-zero inflight_event-s
+    context "while running" do
+      let!(:report_queue) { Queue.new }
+      let(:hooked_dummy_filter_class) do
+        ::LogStash::Filters::DummyFilter.with_hook do |event|
+          report_queue << reporter.snapshot
+        end
+      end
+      let(:hooked_dummy_filter_name) { hooked_dummy_filter_class.config_name }
+
+      let(:config) do
+        <<~EOCONFIG
+          input  { generator { count => #{generator_count} } }
+          filter { #{hooked_dummy_filter_name} {} }
+          output { dummyoutput {} }
+        EOCONFIG
+      end
+
+      let(:do_setup_plugin_registry) do
+        super()
+        allow(LogStash::Plugin).to receive(:lookup).with("filter", hooked_dummy_filter_name)
+                                                   .and_return(hooked_dummy_filter_class)
+      end
+
+      it 'captures inflight counts that are non-zero ' do
+        inflight_reports = Array.new(report_queue.size) { report_queue.pop }
+
+        expect(inflight_reports).to_not be_empty
+        expect(inflight_reports).to all(have_attributes(inflight_count: (a_value > 0)))
+      end
+    end
   end
 end
 
 describe LogStash::PipelineReporter do
-  it_behaves_like "a pipeline reporter", :mock_pipeline_from_string
-  it_behaves_like "a pipeline reporter", :mock_java_pipeline_from_string
+  context "with java execution" do
+    it_behaves_like "a pipeline reporter", :mock_java_pipeline_from_string
+  end
 end
diff --git a/logstash-core/spec/logstash/pipeline_resource_usage_validator_spec.rb b/logstash-core/spec/logstash/pipeline_resource_usage_validator_spec.rb
new file mode 100644
index 000000000..db8910d8d
--- /dev/null
+++ b/logstash-core/spec/logstash/pipeline_resource_usage_validator_spec.rb
@@ -0,0 +1,59 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require "spec_helper"
+require "logstash/pipeline_resource_usage_validator"
+require_relative '../support/helpers'
+
+describe LogStash::PipelineResourceUsageValidator do
+  let(:max_heap_size) { 1 * 1024 * 1024 * 1024 } # 1 GB
+  subject { LogStash::PipelineResourceUsageValidator.new(max_heap_size) }
+  let(:logger) { subject.logger }
+  let(:pipelines_registry) { double(:pipelines_registry) }
+  let(:pipeline_count) { 10 }
+
+  before(:each) do
+    allow(subject).to receive(:compute_percentage).and_return(usage_percentage)
+    allow(pipelines_registry).to receive(:size).and_return(pipeline_count)
+  end
+
+  context "when memory usage goes above 10% heap" do
+    let(:usage_percentage) { 45 }
+    it "logs a warning message"  do
+      expect(logger).to receive(:warn).with(/may reach up to #{usage_percentage}.*Consider.*pipeline.$/)
+      subject.check(pipelines_registry)
+    end
+  end
+
+  context "when memory usage is below 10% heap" do
+    let(:usage_percentage) { 5 }
+    it "logs a debug message" do
+      expect(logger).to receive(:debug).with(/may reach up to #{usage_percentage}.*bigger\).$/)
+      subject.check(pipelines_registry)
+    end
+  end
+
+  context "when there are no pipelines" do
+    let(:pipeline_count) { 0 }
+    let(:usage_percentage) { 0 }
+    it "should not log" do
+      expect(logger).to_not receive(:warn)
+      expect(logger).to_not receive(:debug)
+      subject.check(pipelines_registry)
+    end
+  end
+end
diff --git a/logstash-core/spec/logstash/pipeline_spec.rb b/logstash-core/spec/logstash/pipeline_spec.rb
deleted file mode 100644
index 12dd306e7..000000000
--- a/logstash-core/spec/logstash/pipeline_spec.rb
+++ /dev/null
@@ -1,1009 +0,0 @@
-# encoding: utf-8
-require "spec_helper"
-require "logstash/inputs/generator"
-require "logstash/filters/drop"
-require_relative "../support/mocks_classes"
-require_relative "../support/helpers"
-require "stud/try"
-require 'timeout'
-
-class DummyInput < LogStash::Inputs::Base
-  config_name "dummyinput"
-  milestone 2
-
-  def register
-  end
-
-  def run(queue)
-  end
-
-  def close
-  end
-end
-
-# This input runs long enough that a flush should occur
-class DummyFlushEnablingInput < DummyInput
-  def run(queue)
-    while !stop?
-      sleep 1
-    end
-  end
-end
-
-class DummyInputGenerator < LogStash::Inputs::Base
-  config_name "dummyinputgenerator"
-  milestone 2
-
-  def register
-  end
-
-  def run(queue)
-    queue << Logstash::Event.new while !stop?
-  end
-
-  def close
-  end
-end
-
-class DummyCodec < LogStash::Codecs::Base
-  config_name "dummycodec"
-  milestone 2
-
-  config :format, :validate => :string
-
-  def decode(data)
-    data
-  end
-
-  def encode(event)
-    event
-  end
-
-  def close
-  end
-end
-
-class DummyOutputMore < ::LogStash::Outputs::DummyOutput
-  config_name "dummyoutputmore"
-end
-
-class DummyFilter < LogStash::Filters::Base
-  config_name "dummyfilter"
-  milestone 2
-
-  def register() end
-
-  def filter(event) end
-
-  def threadsafe?() false; end
-
-  def close() end
-end
-
-class DummySafeFilter < LogStash::Filters::Base
-  config_name "dummysafefilter"
-  milestone 2
-
-  def register() end
-
-  def filter(event) end
-
-  def threadsafe?() true; end
-
-  def close() end
-end
-
-class DummyFlushingFilter < LogStash::Filters::Base
-  config_name "dummyflushingfilter"
-  milestone 2
-
-  def register() end
-  def filter(event) end
-  def periodic_flush
-    true
-  end
-  def flush(options)
-    [::LogStash::Event.new("message" => "dummy_flush")]
-  end
-  def close() end
-end
-
-class DummyFlushingFilterPeriodic < DummyFlushingFilter
-  config_name "dummyflushingfilterperiodic"
-
-  def flush(options)
-    # Don't generate events on the shutdown flush to make sure we actually test the
-    # periodic flush.
-    options[:final] ? [] : [::LogStash::Event.new("message" => "dummy_flush")]
-  end
-end
-
-describe LogStash::Pipeline do
-  let(:worker_thread_count)     { 5 }
-  let(:safe_thread_count)       { 1 }
-  let(:override_thread_count)   { 42 }
-  let(:dead_letter_queue_enabled) { false }
-  let(:dead_letter_queue_path) { }
-  let(:pipeline_settings_obj) { LogStash::SETTINGS.clone }
-  let(:pipeline_settings) { {} }
-  let(:max_retry) {10} #times
-  let(:timeout) {120} #seconds
-
-  before :each do
-    pipeline_workers_setting = LogStash::SETTINGS.get_setting("pipeline.workers")
-    allow(pipeline_workers_setting).to receive(:default).and_return(worker_thread_count)
-    dlq_enabled_setting = LogStash::SETTINGS.get_setting("dead_letter_queue.enable")
-    allow(dlq_enabled_setting).to receive(:value).and_return(dead_letter_queue_enabled)
-    dlq_path_setting = LogStash::SETTINGS.get_setting("path.dead_letter_queue")
-    allow(dlq_path_setting).to receive(:value).and_return(dead_letter_queue_path)
-
-    pipeline_settings.each {|k, v| pipeline_settings_obj.set(k, v) }
-  end
-
-  describe "#ephemeral_id" do
-    it "creates an ephemeral_id at creation time" do
-      pipeline = mock_pipeline_from_string("input { generator { count =>  1 } } output { null {} }")
-      expect(pipeline.ephemeral_id).to_not be_nil
-      pipeline.close
-
-      second_pipeline = mock_pipeline_from_string("input { generator { count => 1 } } output { null {} }")
-      expect(second_pipeline.ephemeral_id).not_to eq(pipeline.ephemeral_id)
-      second_pipeline.close
-    end
-  end
-
-
-  describe "event cancellation" do
-    # test harness for https://github.com/elastic/logstash/issues/6055
-
-    let(:output) { LogStash::Outputs::DummyOutputWithEventsArray.new }
-
-    before do
-      allow(LogStash::Plugin).to receive(:lookup).with("input", "generator").and_return(LogStash::Inputs::Generator)
-      allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutputwitheventsarray").and_return(LogStash::Outputs::DummyOutputWithEventsArray)
-      allow(LogStash::Plugin).to receive(:lookup).with("filter", "drop").and_call_original
-      allow(LogStash::Plugin).to receive(:lookup).with("filter", "mutate").and_call_original
-      allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_call_original
-      allow(LogStash::Outputs::DummyOutputWithEventsArray).to receive(:new).with(any_args).and_return(output)
-    end
-
-    let(:config) do
-      <<-CONFIG
-        input {
-          generator {
-            lines => ["1", "2", "END"]
-            count => 1
-          }
-        }
-        filter {
-          if [message] == "1" {
-            drop {}
-          }
-          mutate { add_tag => ["notdropped"] }
-        }
-        output { dummyoutputwitheventsarray {} }
-      CONFIG
-    end
-
-    it "should not propagate cancelled events from filter to output" do
-      abort_on_exception_state = Thread.abort_on_exception
-      Thread.abort_on_exception = true
-
-      pipeline = mock_pipeline_from_string(config, pipeline_settings_obj)
-      t = Thread.new { pipeline.run }
-      Timeout.timeout(timeout) do
-        sleep(0.1) until pipeline.ready?
-      end
-      Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
-        wait(3).for do
-          # give us a bit of time to flush the events
-          # puts("*****" + output.events.map{|e| e.message}.to_s)
-          output.events.map{|e| e.get("message")}.include?("END")
-        end.to be_truthy
-      end
-      expect(output.events.size).to eq(2)
-      expect(output.events[0].get("tags")).to eq(["notdropped"])
-      expect(output.events[1].get("tags")).to eq(["notdropped"])
-      pipeline.shutdown
-      t.join
-
-      Thread.abort_on_exception = abort_on_exception_state
-    end
-  end
-
-  describe "defaulting the pipeline workers based on thread safety" do
-    before(:each) do
-      allow(LogStash::Plugin).to receive(:lookup).with("input", "dummyinput").and_return(DummyInput)
-      allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_return(DummyCodec)
-      allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutput").and_return(::LogStash::Outputs::DummyOutput)
-      allow(LogStash::Plugin).to receive(:lookup).with("filter", "dummyfilter").and_return(DummyFilter)
-      allow(LogStash::Plugin).to receive(:lookup).with("filter", "dummysafefilter").and_return(DummySafeFilter)
-    end
-
-    context "when there are some not threadsafe filters" do
-      let(:test_config_with_filters) {
-        <<-eos
-        input {
-          dummyinput {}
-        }
-
-        filter {
-          dummyfilter {}
-        }
-
-        output {
-          dummyoutput {}
-        }
-        eos
-      }
-
-      describe "debug compiled" do
-        let(:logger) { double("pipeline logger").as_null_object }
-
-        before do
-          expect(::LogStash::Pipeline).to receive(:logger).and_return(logger)
-          allow(logger).to receive(:debug?).and_return(true)
-        end
-
-        it "should not receive a debug message with the compiled code" do
-          pipeline_settings_obj.set("config.debug", false)
-          expect(logger).not_to receive(:debug).with(/Compiled pipeline/, anything)
-          pipeline = mock_pipeline_from_string(test_config_with_filters)
-          pipeline.close
-        end
-
-        it "should print the compiled code if config.debug is set to true" do
-          pipeline_settings_obj.set("config.debug", true)
-          expect(logger).to receive(:debug).with(/Compiled pipeline/, anything)
-          pipeline = mock_pipeline_from_string(test_config_with_filters, pipeline_settings_obj)
-          pipeline.close
-        end
-
-        it "should log each filtered event if config.debug is set to true" do
-          pipeline_settings_obj.set("config.debug", true)
-          pipeline = mock_pipeline_from_string(test_config_with_filters, pipeline_settings_obj)
-          expect(logger).to receive(:debug).with(/filter received/, anything)
-          pipeline.filter_func([LogStash::Event.new])
-          pipeline.close
-        end
-      end
-
-      context "when there is no command line -w N set" do
-        it "starts one filter thread" do
-          msg = "Defaulting pipeline worker threads to 1 because there are some filters that might not work with multiple worker threads"
-          pipeline = mock_pipeline_from_string(test_config_with_filters)
-          expect(pipeline.logger).to receive(:warn).with(msg,
-            hash_including({:count_was=>worker_thread_count, :filters=>["dummyfilter"]}))
-          pipeline.run
-          expect(pipeline.worker_threads.size).to eq(safe_thread_count)
-          pipeline.shutdown
-        end
-      end
-
-      context "when there is command line -w N set" do
-        let(:pipeline_settings) { {"pipeline.workers" => override_thread_count } }
-        it "starts multiple filter thread" do
-          msg = "Warning: Manual override - there are filters that might" +
-                " not work with multiple worker threads"
-          pipeline = mock_pipeline_from_string(test_config_with_filters, pipeline_settings_obj)
-          expect(pipeline.logger).to receive(:warn).with(msg, hash_including({:worker_threads=> override_thread_count, :filters=>["dummyfilter"]}))
-          pipeline.run
-          expect(pipeline.worker_threads.size).to eq(override_thread_count)
-          pipeline.shutdown
-        end
-      end
-    end
-
-    context "when there are threadsafe filters only" do
-      let(:test_config_with_filters) {
-        <<-eos
-        input {
-          dummyinput {}
-        }
-
-        filter {
-          dummysafefilter {}
-        }
-
-        output {
-          dummyoutput {}
-        }
-        eos
-      }
-
-      it "starts multiple filter threads" do
-        skip("This test has been failing periodically since November 2016. Tracked as https://github.com/elastic/logstash/issues/6245")
-        pipeline = mock_pipeline_from_string(test_config_with_filters)
-        pipeline.run
-        expect(pipeline.worker_threads.size).to eq(worker_thread_count)
-        pipeline.shutdown
-      end
-    end
-  end
-
-  context "close" do
-    before(:each) do
-      allow(LogStash::Plugin).to receive(:lookup).with("input", "dummyinput").and_return(DummyInput)
-      allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_return(DummyCodec)
-      allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutput").and_return(::LogStash::Outputs::DummyOutput)
-    end
-
-
-    let(:test_config_without_output_workers) {
-      <<-eos
-      input {
-        dummyinput {}
-      }
-
-      output {
-        dummyoutput {}
-      }
-      eos
-    }
-
-    let(:test_config_with_output_workers) {
-      <<-eos
-      input {
-        dummyinput {}
-      }
-
-      output {
-        dummyoutput {
-          workers => 2
-        }
-      }
-      eos
-    }
-
-    context "output close" do
-      let(:pipeline) { mock_pipeline_from_string(test_config_without_output_workers) }
-      let(:output) { pipeline.outputs.first }
-
-      before do
-        allow(output).to receive(:do_close)
-      end
-
-      after do
-        pipeline.shutdown
-      end
-
-      it "should call close of output without output-workers" do
-        pipeline.run
-
-        expect(output).to have_received(:do_close).once
-      end
-    end
-  end
-
-  context "with no explicit ids declared" do
-    before(:each) do
-      allow(LogStash::Plugin).to receive(:lookup).with("input", "dummyinput").and_return(DummyInput)
-      allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_return(DummyCodec)
-      allow(LogStash::Plugin).to receive(:lookup).with("filter", "dummyfilter").and_return(DummyFilter)
-      allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutput").and_return(::LogStash::Outputs::DummyOutput)
-    end
-
-    let(:config) { "input { dummyinput { codec => plain { format => 'something'  } } } filter { dummyfilter {} } output { dummyoutput {} }"}
-    let(:pipeline) { mock_pipeline_from_string(config) }
-
-    after do
-      # If you don't start/stop the pipeline it won't release the queue lock and will
-      # cause the suite to fail :(
-      pipeline.close
-    end
-
-    it "should use LIR provided IDs" do
-      expect(pipeline.inputs.first.id).to eq(pipeline.lir.input_plugin_vertices.first.id)
-      expect(pipeline.filters.first.id).to eq(pipeline.lir.filter_plugin_vertices.first.id)
-      expect(pipeline.outputs.first.id).to eq(pipeline.lir.output_plugin_vertices.first.id)
-    end
-  end
-
-  context "compiled flush function" do
-    describe "flusher thread" do
-      before(:each) do
-        allow(LogStash::Plugin).to receive(:lookup).with("input", "dummyinput").and_return(DummyInput)
-        allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_return(DummyCodec)
-        allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutput").and_return(::LogStash::Outputs::DummyOutput)
-      end
-
-      let(:config) { "input { dummyinput {} } output { dummyoutput {} }"}
-
-      it "should start the flusher thread only after the pipeline is running" do
-        pipeline = mock_pipeline_from_string(config)
-
-        expect(pipeline).to receive(:transition_to_running).ordered.and_call_original
-        expect(pipeline).to receive(:start_flusher).ordered.and_call_original
-
-        pipeline.run
-        pipeline.shutdown
-      end
-    end
-
-    context "cancelled events should not propagate down the filters" do
-      config <<-CONFIG
-        filter {
-          drop {}
-        }
-      CONFIG
-
-      sample("hello") do
-        expect(subject).to eq(nil)
-      end
-    end
-
-    context "new events should propagate down the filters" do
-      config <<-CONFIG
-        filter {
-          clone {
-            clones => ["clone1"]
-          }
-        }
-      CONFIG
-      sample(["foo", "bar"]) do
-        expect(subject.size).to eq(4)
-      end
-    end
-  end
-
-  describe "max inflight warning" do
-    let(:config) { "input { dummyinput {} } output { dummyoutput {} }" }
-    let(:batch_size) { 1 }
-    let(:pipeline_settings) { { "pipeline.batch.size" => batch_size, "pipeline.workers" => 1 } }
-    let(:pipeline) { mock_pipeline_from_string(config, pipeline_settings_obj) }
-    let(:logger) { pipeline.logger }
-    let(:warning_prefix) { Regexp.new("CAUTION: Recommended inflight events max exceeded!") }
-
-    before(:each) do
-      allow(LogStash::Plugin).to receive(:lookup).with("input", "dummyinput").and_return(DummyInput)
-      allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_return(DummyCodec)
-      allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutput").and_return(::LogStash::Outputs::DummyOutput)
-      allow(logger).to receive(:warn)
-
-      # pipeline must be first called outside the thread context because it lazily initialize and will create a
-      # race condition if called in the thread
-      p = pipeline
-      t = Thread.new { p.run }
-      Timeout.timeout(timeout) do
-        sleep(0.1) until pipeline.ready?
-      end
-      pipeline.shutdown
-      t.join
-    end
-
-    it "should not raise a max inflight warning if the max_inflight count isn't exceeded" do
-      expect(logger).not_to have_received(:warn).with(warning_prefix)
-    end
-
-    context "with a too large inflight count" do
-      let(:batch_size) { LogStash::Pipeline::MAX_INFLIGHT_WARN_THRESHOLD + 1 }
-
-      it "should raise a max inflight warning if the max_inflight count is exceeded" do
-        expect(logger).to have_received(:warn).with(warning_prefix, hash_including(:pipeline_id => anything))
-      end
-    end
-  end
-
-  context "compiled filter functions" do
-    context "new events should propagate down the filters" do
-      config <<-CONFIG
-        filter {
-          clone {
-            clones => ["clone1", "clone2"]
-          }
-          mutate {
-            add_field => {"foo" => "bar"}
-          }
-        }
-      CONFIG
-
-      sample("hello") do
-        expect(subject.size).to eq(3)
-
-        expect(subject[0].get("message")).to eq("hello")
-        expect(subject[0].get("type")).to be_nil
-        expect(subject[0].get("foo")).to eq("bar")
-
-        expect(subject[1].get("message")).to eq("hello")
-        expect(subject[1].get("type")).to eq("clone1")
-        expect(subject[1].get("foo")).to eq("bar")
-
-        expect(subject[2].get("message")).to eq("hello")
-        expect(subject[2].get("type")).to eq("clone2")
-        expect(subject[2].get("foo")).to eq("bar")
-      end
-    end
-  end
-
-  context "metrics" do
-    config = "input { } filter { } output { }"
-
-    let(:settings) { LogStash::SETTINGS.clone }
-    subject { mock_pipeline_from_string(config, settings, metric) }
-
-    after :each do
-      subject.close
-    end
-
-    context "when metric.collect is disabled" do
-      before :each do
-        settings.set("metric.collect", false)
-      end
-
-      context "if namespaced_metric is nil" do
-        let(:metric) { nil }
-        it "uses a `NullMetric` object" do
-          expect(subject.metric).to be_a(LogStash::Instrument::NullMetric)
-        end
-      end
-
-      context "if namespaced_metric is a Metric object" do
-        let(:collector) { ::LogStash::Instrument::Collector.new }
-        let(:metric) { ::LogStash::Instrument::Metric.new(collector) }
-
-        it "uses a `NullMetric` object" do
-          expect(subject.metric).to be_a(LogStash::Instrument::NullMetric)
-        end
-
-        it "uses the same collector" do
-          expect(subject.metric.collector).to be(collector)
-        end
-      end
-
-      context "if namespaced_metric is a NullMetric object" do
-        let(:collector) { ::LogStash::Instrument::Collector.new }
-        let(:metric) { ::LogStash::Instrument::NullMetric.new(collector) }
-
-        it "uses a `NullMetric` object" do
-          expect(subject.metric).to be_a(::LogStash::Instrument::NullMetric)
-        end
-
-        it "uses the same collector" do
-          expect(subject.metric.collector).to be(collector)
-        end
-      end
-    end
-
-    context "when metric.collect is enabled" do
-      before :each do
-        settings.set("metric.collect", true)
-      end
-
-      context "if namespaced_metric is nil" do
-        let(:metric) { nil }
-        it "uses a `NullMetric` object" do
-          expect(subject.metric).to be_a(LogStash::Instrument::NullMetric)
-        end
-      end
-
-      context "if namespaced_metric is a Metric object" do
-        let(:collector) { ::LogStash::Instrument::Collector.new }
-        let(:metric) { ::LogStash::Instrument::Metric.new(collector) }
-
-        it "uses a `Metric` object" do
-          expect(subject.metric).to be_a(LogStash::Instrument::Metric)
-        end
-
-        it "uses the same collector" do
-          expect(subject.metric.collector).to be(collector)
-        end
-      end
-
-      context "if namespaced_metric is a NullMetric object" do
-        let(:collector) { ::LogStash::Instrument::Collector.new }
-        let(:metric) { ::LogStash::Instrument::NullMetric.new(collector) }
-
-        it "uses a `NullMetric` object" do
-          expect(subject.metric).to be_a(LogStash::Instrument::NullMetric)
-        end
-
-        it "uses the same collector" do
-          expect(subject.metric.collector).to be(collector)
-        end
-      end
-    end
-  end
-
-  context "Multiples pipelines" do
-    before do
-      allow(LogStash::Plugin).to receive(:lookup).with("input", "dummyinputgenerator").and_return(DummyInputGenerator)
-      allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_return(DummyCodec)
-      allow(LogStash::Plugin).to receive(:lookup).with("filter", "dummyfilter").and_return(DummyFilter)
-      allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutput").and_return(::LogStash::Outputs::DummyOutput)
-      allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutputmore").and_return(DummyOutputMore)
-    end
-
-    # multiple pipelines cannot be instantiated using the same PQ settings, force memory queue
-    before :each do
-      pipeline_workers_setting = LogStash::SETTINGS.get_setting("queue.type")
-      allow(pipeline_workers_setting).to receive(:value).and_return("memory")
-      pipeline_settings.each {|k, v| pipeline_settings_obj.set(k, v) }
-    end
-
-    let(:pipeline1) { mock_pipeline_from_string("input { dummyinputgenerator {} } filter { dummyfilter {} } output { dummyoutput {}}") }
-    let(:pipeline2) { mock_pipeline_from_string("input { dummyinputgenerator {} } filter { dummyfilter {} } output { dummyoutputmore {}}") }
-
-    after  do
-      pipeline1.close
-      pipeline2.close
-    end
-
-    it "should handle evaluating different config" do
-      expect(pipeline1.output_func(LogStash::Event.new)).not_to include(nil)
-      expect(pipeline1.filter_func([LogStash::Event.new])).not_to include(nil)
-      expect(pipeline2.output_func(LogStash::Event.new)).not_to include(nil)
-      expect(pipeline1.filter_func([LogStash::Event.new])).not_to include(nil)
-    end
-  end
-
-  context "Periodic Flush" do
-    let(:config) do
-      <<-EOS
-      input {
-        dummy_input {}
-      }
-      filter {
-        dummy_flushing_filter {}
-      }
-      output {
-        dummy_output {}
-      }
-      EOS
-    end
-    let(:output) { ::LogStash::Outputs::DummyOutput.new }
-
-    before do
-      allow(::LogStash::Outputs::DummyOutput).to receive(:new).with(any_args).and_return(output)
-      allow(LogStash::Plugin).to receive(:lookup).with("input", "dummy_input").and_return(DummyFlushEnablingInput)
-      allow(LogStash::Plugin).to receive(:lookup).with("filter", "dummy_flushing_filter").and_return(DummyFlushingFilterPeriodic)
-      allow(LogStash::Plugin).to receive(:lookup).with("output", "dummy_output").and_return(::LogStash::Outputs::DummyOutput)
-      allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_return(LogStash::Codecs::Plain)
-    end
-
-    it "flush periodically" do
-      Thread.abort_on_exception = true
-      pipeline = mock_pipeline_from_string(config, pipeline_settings_obj)
-      t = Thread.new { pipeline.run }
-      Timeout.timeout(timeout) do
-        sleep(0.1) until pipeline.ready?
-      end
-      Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
-        wait(10).for do
-          # give us a bit of time to flush the events
-          output.events.empty?
-        end.to be_falsey
-      end
-
-      expect(output.events.any? {|e| e.get("message") == "dummy_flush"}).to eq(true)
-
-      pipeline.shutdown
-
-      t.join
-    end
-  end
-
-  context "Multiple pipelines" do
-    before do
-      allow(LogStash::Plugin).to receive(:lookup).with("input", "generator").and_return(LogStash::Inputs::Generator)
-      allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_return(DummyCodec)
-      allow(LogStash::Plugin).to receive(:lookup).with("filter", "dummyfilter").and_return(DummyFilter)
-      allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutput").and_return(::LogStash::Outputs::DummyOutput)
-    end
-
-    let(:pipeline1) { mock_pipeline_from_string("input { generator {} } filter { dummyfilter {} } output { dummyoutput {}}") }
-    let(:pipeline2) { mock_pipeline_from_string("input { generator {} } filter { dummyfilter {} } output { dummyoutput {}}") }
-
-    # multiple pipelines cannot be instantiated using the same PQ settings, force memory queue
-    before :each do
-      pipeline_workers_setting = LogStash::SETTINGS.get_setting("queue.type")
-      allow(pipeline_workers_setting).to receive(:value).and_return("memory")
-      pipeline_settings.each {|k, v| pipeline_settings_obj.set(k, v) }
-    end
-
-    it "should handle evaluating different config" do
-      # When the functions are compiled from the AST it will generate instance
-      # variables that are unique to the actual config, the instances are pointing
-      # to conditionals and/or plugins.
-      #
-      # Before the `defined_singleton_method`, the definition of the method was
-      # not unique per class, but the `instance variables` were unique per class.
-      #
-      # So the methods were trying to access instance variables that did not exist
-      # in the current instance and was returning an array containing nil values for
-      # the match.
-      expect(pipeline1.output_func(LogStash::Event.new)).not_to include(nil)
-      expect(pipeline1.filter_func([LogStash::Event.new])).not_to include(nil)
-      expect(pipeline2.output_func(LogStash::Event.new)).not_to include(nil)
-      expect(pipeline1.filter_func([LogStash::Event.new])).not_to include(nil)
-    end
-  end
-
-  context "#started_at" do
-    # use a run limiting count to shutdown the pipeline automatically
-    let(:config) do
-      <<-EOS
-      input {
-        generator { count => 10 }
-      }
-      EOS
-    end
-
-    subject { mock_pipeline_from_string(config) }
-
-    context "when the pipeline is not started" do
-      after :each do
-        subject.close
-      end
-
-      it "returns nil when the pipeline isnt started" do
-        expect(subject.started_at).to be_nil
-      end
-    end
-
-    it "return when the pipeline started working" do
-      subject.run
-      expect(subject.started_at).to be < Time.now
-      subject.shutdown
-    end
-  end
-
-  context "#uptime" do
-    let(:config) do
-      <<-EOS
-      input {
-        generator {}
-      }
-      EOS
-    end
-    subject { mock_pipeline_from_string(config) }
-
-    context "when the pipeline is not started" do
-      after :each do
-        subject.close
-      end
-
-      it "returns 0" do
-        expect(subject.uptime).to eq(0)
-      end
-    end
-
-    context "when the pipeline is started" do
-      it "return the duration in milliseconds" do
-        # subject must be first call outside the thread context because of lazy initialization
-        s = subject
-        t = Thread.new { s.run }
-        Timeout.timeout(timeout) do
-          sleep(0.1) until subject.ready?
-        end
-        Timeout.timeout(timeout) do
-          sleep(0.1)
-        end
-        expect(subject.uptime).to be > 0
-        subject.shutdown
-        t.join
-      end
-    end
-  end
-
-  context "when collecting metrics in the pipeline" do
-    let(:metric) { LogStash::Instrument::Metric.new(LogStash::Instrument::Collector.new) }
-
-    subject { mock_pipeline_from_string(config, pipeline_settings_obj, metric) }
-
-    let(:pipeline_settings) { { "pipeline.id" => pipeline_id } }
-    let(:pipeline_id) { "main" }
-    let(:number_of_events) { 420 }
-    let(:dummy_id) { "my-multiline" }
-    let(:dummy_id_other) { "my-multiline_other" }
-    let(:dummy_output_id) { "my-dummyoutput" }
-    let(:generator_id) { "my-generator" }
-    let(:config) do
-      <<-EOS
-      input {
-        generator {
-           count => #{number_of_events}
-           id => "#{generator_id}"
-        }
-      }
-      filter {
-          dummyfilter {
-              id => "#{dummy_id}"
-          }
-          dummyfilter {
-               id => "#{dummy_id_other}"
-           }
-      }
-      output {
-        dummyoutput {
-          id => "#{dummy_output_id}"
-        }
-      }
-      EOS
-    end
-    let(:dummyoutput) { ::LogStash::Outputs::DummyOutput.new({ "id" => dummy_output_id }) }
-    let(:metric_store) { subject.metric.collector.snapshot_metric.metric_store }
-    let(:pipeline_thread) do
-      # subject has to be called for the first time outside the thread because it will create a race condition
-      # with the subject.ready? call since subject is lazily initialized
-      s = subject
-      Thread.new { s.run }
-    end
-
-    before :each do
-      allow(::LogStash::Outputs::DummyOutput).to receive(:new).with(any_args).and_return(dummyoutput)
-      allow(LogStash::Plugin).to receive(:lookup).with("input", "generator").and_return(LogStash::Inputs::Generator)
-      allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_return(LogStash::Codecs::Plain)
-      allow(LogStash::Plugin).to receive(:lookup).with("filter", "dummyfilter").and_return(LogStash::Filters::DummyFilter)
-      allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutput").and_return(::LogStash::Outputs::DummyOutput)
-
-      pipeline_thread
-      Timeout.timeout(timeout) do
-        sleep(0.1) until subject.ready?
-      end
-
-      # make sure we have received all the generated events
-      Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
-        wait(3).for do
-          # give us a bit of time to flush the events
-          dummyoutput.events.size >= number_of_events
-        end.to be_truthy
-      end
-    end
-
-    after :each do
-      subject.shutdown
-      pipeline_thread.join
-    end
-
-    context "global metric" do
-      let(:collected_metric) { metric_store.get_with_path("stats/events") }
-
-      it "populates the different metrics" do
-        expect(collected_metric[:stats][:events][:duration_in_millis].value).not_to be_nil
-        expect(collected_metric[:stats][:events][:in].value).to eq(number_of_events)
-        expect(collected_metric[:stats][:events][:filtered].value).to eq(number_of_events)
-        expect(collected_metric[:stats][:events][:out].value).to eq(number_of_events)
-      end
-    end
-
-    context "pipelines" do
-      let(:collected_metric) { metric_store.get_with_path("stats/pipelines/") }
-
-      it "populates the pipelines core metrics" do
-        expect(collected_metric[:stats][:pipelines][:main][:events][:duration_in_millis].value).not_to be_nil
-        expect(collected_metric[:stats][:pipelines][:main][:events][:in].value).to eq(number_of_events)
-        expect(collected_metric[:stats][:pipelines][:main][:events][:filtered].value).to eq(number_of_events)
-        expect(collected_metric[:stats][:pipelines][:main][:events][:out].value).to eq(number_of_events)
-      end
-
-      it "populates the filter metrics" do
-        [dummy_id, dummy_id_other].map(&:to_sym).each do |id|
-          [:in, :out].each do |metric_key|
-            plugin_name = id.to_sym
-            expect(collected_metric[:stats][:pipelines][:main][:plugins][:filters][plugin_name][:events][metric_key].value).to eq(number_of_events)
-          end
-        end
-      end
-
-      it "populates the output metrics" do
-        plugin_name = dummy_output_id.to_sym
-
-        expect(collected_metric[:stats][:pipelines][:main][:plugins][:outputs][plugin_name][:events][:in].value).to eq(number_of_events)
-        expect(collected_metric[:stats][:pipelines][:main][:plugins][:outputs][plugin_name][:events][:out].value).to eq(number_of_events)
-        expect(collected_metric[:stats][:pipelines][:main][:plugins][:outputs][plugin_name][:events][:duration_in_millis].value).not_to be_nil
-      end
-
-      it "populates the name of the output plugin" do
-        plugin_name = dummy_output_id.to_sym
-        expect(collected_metric[:stats][:pipelines][:main][:plugins][:outputs][plugin_name][:name].value).to eq(::LogStash::Outputs::DummyOutput.config_name)
-      end
-
-      it "populates the name of the filter plugin" do
-        [dummy_id, dummy_id_other].map(&:to_sym).each do |id|
-          plugin_name = id.to_sym
-          expect(collected_metric[:stats][:pipelines][:main][:plugins][:filters][plugin_name][:name].value).to eq(LogStash::Filters::DummyFilter.config_name)
-        end
-      end
-
-      context 'when dlq is disabled' do
-        let (:collect_stats) { subject.collect_dlq_stats}
-        let (:collected_stats) { collected_metric[:stats][:pipelines][:main][:dlq]}
-        let (:available_stats) {[:path, :queue_size_in_bytes]}
-
-        it 'should show not show any dlq stats' do
-          collect_stats
-          expect(collected_stats).to be_nil
-        end
-
-      end
-
-      context 'when dlq is enabled' do
-        let (:dead_letter_queue_enabled) { true }
-        let (:dead_letter_queue_path) { Stud::Temporary.directory }
-        let (:pipeline_dlq_path) { "#{dead_letter_queue_path}/#{pipeline_id}"}
-
-        let (:collect_stats) { subject.collect_dlq_stats }
-        let (:collected_stats) { collected_metric[:stats][:pipelines][:main][:dlq]}
-
-        it 'should show dlq stats' do
-          collect_stats
-          # A newly created dead letter queue with no entries will have a size of 1 (the version 'header')
-          expect(collected_stats[:queue_size_in_bytes].value).to eq(1)
-        end
-      end
-    end
-  end
-
-  context "Pipeline object" do
-    before do
-      allow(LogStash::Plugin).to receive(:lookup).with("input", "generator").and_return(LogStash::Inputs::Generator)
-      allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_return(DummyCodec)
-      allow(LogStash::Plugin).to receive(:lookup).with("filter", "dummyfilter").and_return(DummyFilter)
-      allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutput").and_return(::LogStash::Outputs::DummyOutput)
-    end
-
-    let(:pipeline1) { mock_pipeline_from_string("input { generator {} } filter { dummyfilter {} } output { dummyoutput {}}") }
-    let(:pipeline2) { mock_pipeline_from_string("input { generator {} } filter { dummyfilter {} } output { dummyoutput {}}") }
-
-    # multiple pipelines cannot be instantiated using the same PQ settings, force memory queue
-    before :each do
-      pipeline_workers_setting = LogStash::SETTINGS.get_setting("queue.type")
-      allow(pipeline_workers_setting).to receive(:value).and_return("memory")
-      pipeline_settings.each {|k, v| pipeline_settings_obj.set(k, v) }
-    end
-
-    it "should not add ivars" do
-       expect(pipeline1.instance_variables).to eq(pipeline2.instance_variables)
-    end
-  end
-
-  context "#system" do
-    after do
-      pipeline.close # close the queue
-    end
-
-    context "when the pipeline is a system pipeline" do
-      let(:pipeline) { mock_pipeline_from_string("input { generator {} } output { null {} }", mock_settings("pipeline.system" => true)) }
-      it "returns true" do
-        expect(pipeline.system?).to be_truthy
-      end
-    end
-
-    context "when the pipeline is not a system pipeline" do
-      let(:pipeline) { mock_pipeline_from_string("input { generator {} } output { null {} }", mock_settings("pipeline.system" => false)) }
-      it "returns true" do
-        expect(pipeline.system?).to be_falsey
-      end
-    end
-  end
-
-  context "#reloadable?" do
-    after do
-      pipeline.close # close the queue
-    end
-
-    context "when all plugins are reloadable and pipeline is configured as reloadable" do
-      let(:pipeline) { mock_pipeline_from_string("input { generator {} } output { null {} }", mock_settings("pipeline.reloadable" => true)) }
-
-      it "returns true" do
-        expect(pipeline.reloadable?).to be_truthy
-      end
-    end
-
-    context "when the plugins are not reloadable and pipeline is configured as reloadable" do
-      let(:pipeline) { mock_pipeline_from_string("input { stdin {} } output { null {} }", mock_settings("pipeline.reloadable" => true)) }
-
-      it "returns true" do
-        expect(pipeline.reloadable?).to be_falsey
-      end
-    end
-
-    context "when all plugins are reloadable and pipeline is configured as non-reloadable" do
-      let(:pipeline) { mock_pipeline_from_string("input { generator {} } output { null {} }", mock_settings("pipeline.reloadable" => false)) }
-
-      it "returns true" do
-        expect(pipeline.reloadable?).to be_falsey
-      end
-    end
-  end
-end
diff --git a/logstash-core/spec/logstash/pipelines_registry_spec.rb b/logstash-core/spec/logstash/pipelines_registry_spec.rb
index eca53483b..ac3806311 100644
--- a/logstash-core/spec/logstash/pipelines_registry_spec.rb
+++ b/logstash-core/spec/logstash/pipelines_registry_spec.rb
@@ -1,12 +1,27 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/pipelines_registry"
 
 describe LogStash::PipelinesRegistry do
-
-  let(:pipeline_id) { "test" }
+  let(:pipeline_id) { "test".to_sym }
   let(:pipeline) { double("Pipeline") }
-  let (:logger) { double("Logger") }
+  let(:logger) { double("Logger") }
 
   context "at object creation" do
     it "should be empty" do
@@ -85,6 +100,46 @@ describe LogStash::PipelinesRegistry do
         end
       end
     end
+
+    context "when pipeline is initializing" do
+      let (:wait_start_create_block) { Queue.new }
+      let (:wait_before_exiting_create_block) { Queue.new }
+      let (:slow_initializing_pipeline) { double("slow_initializing_pipeline") }
+      let (:pipeline2) { double("pipeline2") }
+
+      it "should create a loading state before calling the create block" do
+        # create a thread which calls create_pipeline and wait in the create
+        # block so we can controle the pipeline initialization phase
+        t = Thread.new do
+          subject.create_pipeline(pipeline_id, slow_initializing_pipeline) do
+            # signal that we entered the create block
+            wait_start_create_block << "ping"
+
+            # stall here until wait_before_exiting_create_block receives a message
+            wait_before_exiting_create_block.pop
+
+            true
+          end
+        end
+
+        # stall here until subject.create_pipeline has been called in the above thread
+        # and it entered the create block
+        wait_start_create_block.pop
+
+        # finished_execution? should not be called in the below tests using terminated?
+        # because the loading state is true. This is to make sure the state is used and not
+        # the pipeline termination status
+        expect(slow_initializing_pipeline).not_to receive(:finished_execution?)
+
+        expect(subject.states.get(pipeline_id).terminated?).to be_falsey
+        expect(subject.get_pipeline(pipeline_id)).to eq(slow_initializing_pipeline)
+        expect(subject.empty?).to be_falsey
+
+        # signal termination of create block
+        wait_before_exiting_create_block << "ping"
+        t.join
+      end
+    end
   end
 
   context "terminating a pipeline" do
@@ -141,7 +196,6 @@ describe LogStash::PipelinesRegistry do
         # 2nd call: finished_execution? is true
         expect(subject.running_pipelines).to be_empty
 
-
         queue = Queue.new # threadsafe queue
         in_block = Concurrent::AtomicBoolean.new(false)
 
@@ -153,13 +207,14 @@ describe LogStash::PipelinesRegistry do
           end
         end
 
-        # make sure we entered the block executioin
+        # make sure we entered the block execution
         wait(10).for {in_block.true?}.to be_truthy
 
         # at this point the thread is suspended waiting on queue
 
         # since in reloading state, running_pipelines is not empty
-        expect(subject.running_pipelines).not_to be_empty
+        expect(subject.running_pipelines).to be_empty
+        expect(subject.loading_pipelines).not_to be_empty
 
         # unblock thread
         queue.push(:dummy)
@@ -167,11 +222,81 @@ describe LogStash::PipelinesRegistry do
 
         # 3rd call: finished_execution? is true
         expect(subject.running_pipelines).to be_empty
+        expect(subject.loading_pipelines).to be_empty
+      end
+    end
+  end
+
+  context "deleting a pipeline" do
+    context "when pipeline is in registry" do
+      before :each do
+        subject.create_pipeline(pipeline_id, pipeline) { true }
+      end
+
+      it "should not delete pipeline if pipeline is not terminated" do
+        expect(pipeline).to receive(:finished_execution?).and_return(false)
+        expect(LogStash::PipelinesRegistry).to receive(:logger).and_return(logger)
+        expect(logger).to receive(:info)
+        expect(subject.delete_pipeline(pipeline_id)).to be_falsey
+        expect(subject.get_pipeline(pipeline_id)).not_to be_nil
+      end
+
+      it "should delete pipeline if pipeline is terminated" do
+        expect(pipeline).to receive(:finished_execution?).and_return(true)
+        expect(LogStash::PipelinesRegistry).to receive(:logger).and_return(logger)
+        expect(logger).to receive(:info)
+        expect(subject.delete_pipeline(pipeline_id)).to be_truthy
+        expect(subject.get_pipeline(pipeline_id)).to be_nil
+      end
+
+      it "should recreate pipeline if pipeline is delete and create again" do
+        expect(pipeline).to receive(:finished_execution?).and_return(true)
+        expect(LogStash::PipelinesRegistry).to receive(:logger).and_return(logger)
+        expect(logger).to receive(:info)
+        expect(subject.delete_pipeline(pipeline_id)).to be_truthy
+        expect(subject.get_pipeline(pipeline_id)).to be_nil
+        subject.create_pipeline(pipeline_id, pipeline) { true }
+        expect(subject.get_pipeline(pipeline_id)).not_to be_nil
+      end
+    end
+
+    context "when pipeline is not in registry" do
+      it "should log error" do
+        expect(LogStash::PipelinesRegistry).to receive(:logger).and_return(logger)
+        expect(logger).to receive(:error)
+        expect(subject.delete_pipeline(pipeline_id)).to be_falsey
       end
     end
   end
 
   context "pipelines collections" do
+    context "with a reloading pipeline" do
+      before :each do
+        subject.create_pipeline(pipeline_id, pipeline) { true }
+#         expect(pipeline).to receive(:finished_execution?).and_return(false)
+        in_block = Concurrent::AtomicBoolean.new(false)
+        queue = Queue.new # threadsafe queue
+        thread = Thread.new(in_block) do |in_block|
+          subject.reload_pipeline(pipeline_id) do
+            in_block.make_true
+#             sleep(3) # simulate a long loading pipeline
+            queue.pop
+          end
+        end
+        # make sure we entered the block execution
+        wait(10).for {in_block.true?}.to be_truthy
+      end
+
+      it "should not find running pipelines" do
+        expect(subject.running_pipelines).to be_empty
+      end
+
+      it "should not find non_running pipelines" do
+        # non running pipelines are those terminated
+        expect(subject.non_running_pipelines).to be_empty
+      end
+    end
+
     context "with a non terminated pipelines" do
       before :each do
         subject.create_pipeline(pipeline_id, pipeline) { true }
@@ -215,6 +340,5 @@ describe LogStash::PipelinesRegistry do
         expect(subject.running_user_defined_pipelines).to be_empty
       end
     end
-
   end
 end
diff --git a/logstash-core/spec/logstash/plugin_spec.rb b/logstash-core/spec/logstash/plugin_spec.rb
index fb7f3c1c7..f3d8ee48c 100644
--- a/logstash-core/spec/logstash/plugin_spec.rb
+++ b/logstash-core/spec/logstash/plugin_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/plugin"
 require "logstash/outputs/base"
@@ -7,6 +23,15 @@ require "logstash/inputs/base"
 require "logstash/filters/base"
 require "support/shared_contexts"
 
+class CustomFilterDeprecable < LogStash::Filters::Base
+  config_name "simple_plugin"
+    config :host, :validate => :string
+
+    def register
+      @deprecation_logger.deprecated("Deprecated feature {}", "hydrocarbon car")
+    end
+end
+
 describe LogStash::Plugin do
   context "reloadable" do
     context "by default" do
@@ -44,13 +69,28 @@ describe LogStash::Plugin do
   end
 
   context "#execution_context" do
-    subject { Class.new(LogStash::Plugin).new({}) }
+    let(:klass) { Class.new(LogStash::Plugin) }
+    subject(:instance) { klass.new({}) }
     include_context "execution_context"
 
-    it "can be set and get" do
-      expect(subject.execution_context).to be_nil
-      subject.execution_context = execution_context
-      expect(subject.execution_context).to eq(execution_context)
+    context 'execution_context=' do
+      let(:deprecation_logger_stub) { double('DeprecationLogger').as_null_object }
+      before(:each) do
+        allow(klass).to receive(:deprecation_logger).and_return(deprecation_logger_stub)
+      end
+
+      it "can be set and get" do
+        new_ctx = execution_context.dup
+        subject.execution_context = new_ctx
+        expect(subject.execution_context).to eq(new_ctx)
+      end
+
+      it 'emits a deprecation warning' do
+        expect(deprecation_logger_stub).to receive(:deprecated) do |message|
+          expect(message).to match(/execution_context=/)
+        end
+        instance.execution_context = execution_context
+      end
     end
   end
 
@@ -115,49 +155,10 @@ describe LogStash::Plugin do
       subject.validate({})
     end
 
-    it 'warns the user if the plugin version is between 0.9.x and 1.0.0' do
-      allow(Gem::Specification).to receive(:find_by_name)
-        .with(plugin_name)
-        .and_return(double(:version => Gem::Version.new('0.9.1')))
-
-      expect_any_instance_of(LogStash::Logging::Logger).to receive(:info)
-        .with(/Using version 0.9.x/)
-
-      subject.validate({})
-    end
-
-    it 'warns the user if the plugin version is inferior to 0.9.x' do
-      allow(Gem::Specification).to receive(:find_by_name)
-        .with(plugin_name)
-        .and_return(double(:version => Gem::Version.new('0.1.1')))
-
-      expect_any_instance_of(LogStash::Logging::Logger).to receive(:info)
-        .with(/Using version 0.1.x/)
-      subject.validate({})
-    end
-
-    it "doesnt show the version notice more than once" do
-      one_notice = Class.new(LogStash::Filters::Base) do
-        config_name "stromae"
-      end
-
-      allow(Gem::Specification).to receive(:find_by_name)
-        .with(plugin_name)
-        .and_return(double(:version => Gem::Version.new('0.1.1')))
-
-      expect_any_instance_of(LogStash::Logging::Logger).to receive(:info)
-        .once
-        .with(/Using version 0.1.x/)
-
-      one_notice.validate({})
-      one_notice.validate({})
-    end
-
     it "doesn't raise an exception if no version is found" do
       expect { subject.validate({}) }.not_to raise_error
     end
 
-
     it 'logs a warning if the plugin use the milestone option' do
       expect_any_instance_of(LogStash::Logging::Logger).to receive(:debug)
         .with(/stromae plugin is using the 'milestone' method/)
@@ -190,7 +191,6 @@ describe LogStash::Plugin do
         config :foo_tag, :validate => :string, :default => "bar"
       end
     ].each do |klass|
-
       it "subclass #{klass.name} does not modify params" do
         klass.new(args)
         expect(args).to be_empty
@@ -198,7 +198,6 @@ describe LogStash::Plugin do
     end
 
     context "codec initialization" do
-
       class LogStash::Codecs::Noop < LogStash::Codecs::Base
         config_name "noop"
 
@@ -211,7 +210,6 @@ describe LogStash::Plugin do
         expect_any_instance_of(LogStash::Codecs::Noop).to receive(:register).once
         LogStash::Plugin.new(args)
       end
-
     end
   end
 
@@ -257,7 +255,7 @@ describe LogStash::Plugin do
 
         context "When a user provide an ID for the plugin" do
           let(:id) { "ABC" }
-          let(:config) { super.merge("id" => id) }
+          let(:config) { super().merge("id" => id) }
 
           it "uses the user provided ID" do
             expect(subject.id).to eq(id)
@@ -267,6 +265,79 @@ describe LogStash::Plugin do
     end
   end
 
+  describe "#plugin_metadata" do
+    plugin_types = [
+        LogStash::Filters::Base,
+        LogStash::Codecs::Base,
+        LogStash::Outputs::Base,
+        LogStash::Inputs::Base
+    ]
+
+    before(:each) { LogStash::PluginMetadata::reset! }
+
+    plugin_types.each do |plugin_type|
+      let(:plugin) do
+        Class.new(plugin_type) do
+          config_name "simple_plugin"
+
+          config :host, :validate => :string
+          config :export, :validate => :boolean
+
+          def register; end
+        end
+      end
+
+      let(:config) do
+        {
+            "host" => "127.0.0.1",
+            "export" => true
+        }
+      end
+
+      subject(:plugin_instance) { plugin.new(config) }
+
+      context "plugin type is #{plugin_type}" do
+        {
+            'when there is not ID configured for the plugin' => {},
+            'when a user provide an ID for the plugin' => { 'id' => 'ABC' },
+        }.each do |desc, config_override|
+          context(desc) do
+            let(:config) { super().merge(config_override) }
+
+            it "has a PluginMetadata" do
+              expect(plugin_instance.plugin_metadata).to be_a_kind_of(LogStash::PluginMetadata)
+            end
+
+            it "PluginMetadata is defined" do
+              expect(defined?(plugin_instance.plugin_metadata)).to be_truthy
+            end
+
+            if config_override.include?('id')
+              it "will be shared between instance of plugins" do
+                expect(plugin_instance.plugin_metadata).to equal(plugin.new(config).plugin_metadata)
+              end
+            end
+
+            it 'stores metadata' do
+              new_value = 'foo'
+              old_value = plugin_instance.plugin_metadata.set(:foo, new_value)
+              expect(old_value).to be_nil
+              expect(plugin_instance.plugin_metadata.get(:foo)).to eq(new_value)
+            end
+
+            it 'removes metadata when the plugin is closed' do
+              new_value = 'foo'
+              plugin_instance.plugin_metadata.set(:foo, new_value)
+              expect(plugin_instance.plugin_metadata.get(:foo)).to eq(new_value)
+              plugin_instance.do_close
+              expect(plugin_instance.plugin_metadata.set?(:foo)).to be_falsey
+            end
+          end
+        end
+      end
+    end
+  end
+
   describe "#id" do
     let(:plugin) do
       Class.new(LogStash::Filters::Base,) do
@@ -285,7 +356,7 @@ describe LogStash::Plugin do
 
     context "when the id is provided" do
       let(:my_id) { "mysuper-plugin" }
-      let(:config) { super.merge({ "id" => my_id })}
+      let(:config) { super().merge({ "id" => my_id })}
       subject { plugin.new(config) }
 
       it "return a human readable ID" do
@@ -302,6 +373,74 @@ describe LogStash::Plugin do
     end
   end
 
+  describe "#ecs_compatibility" do
+    let(:plugin_class) do
+      Class.new(LogStash::Filters::Base) do
+        config_name "ecs_validator_sample"
+        def register; end
+      end
+    end
+    let(:config) { Hash.new }
+    let(:instance) { plugin_class.new(config) }
+
+    let(:deprecation_logger_stub) { double('DeprecationLogger').as_null_object }
+    before(:each) do
+      allow(plugin_class).to receive(:deprecation_logger).and_return(deprecation_logger_stub)
+    end
+
+    context 'when plugin initialized with explicit value' do
+      let(:config) { super().merge("ecs_compatibility" => "v17") }
+      it 'returns the explicitly-given value' do
+        expect(instance.ecs_compatibility).to eq(:v17)
+      end
+    end
+
+    context 'when plugin is not initialized with an explicit value' do
+      let(:settings_stub) { LogStash::SETTINGS.clone }
+
+      before(:each) do
+        allow(settings_stub).to receive(:get_value).with(anything).and_call_original # allow spies
+        stub_const('LogStash::SETTINGS', settings_stub)
+      end
+
+      context 'and pipeline-level setting is explicitly `v1`' do
+        let(:settings_stub) do
+          super().tap do |settings|
+            settings.set_value('pipeline.ecs_compatibility', 'v1')
+          end
+        end
+        it 'reads the setting' do
+          expect(instance.ecs_compatibility).to eq(:v1)
+
+          expect(settings_stub).to have_received(:get_value)
+        end
+      end
+
+      context 'and pipeline-level setting is not specified' do
+        it 'returns `v8`' do
+          # Default value of `pipeline.ecs_compatibility`
+          expect(instance.ecs_compatibility).to eq(:v8)
+        end
+      end
+    end
+  end
+
+  describe "deprecation logger" do
+    let(:config) do
+      {
+        "host" => "127.0.0.1"
+      }
+    end
+
+    context "when a plugin is registered" do
+      subject { CustomFilterDeprecable.new(config) }
+
+      it "deprecation logger is available to be used" do
+        subject.register
+        expect(subject.deprecation_logger).not_to be_nil
+      end
+    end
+  end
 
   context "When the plugin record a metric" do
     let(:config) { {} }
diff --git a/logstash-core/spec/logstash/plugins/builtin/pipeline_input_output_spec.rb b/logstash-core/spec/logstash/plugins/builtin/pipeline_input_output_spec.rb
index b3d0234c8..8bd2886bc 100644
--- a/logstash-core/spec/logstash/plugins/builtin/pipeline_input_output_spec.rb
+++ b/logstash-core/spec/logstash/plugins/builtin/pipeline_input_output_spec.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'spec_helper'
 
 describe ::LogStash::Plugins::Builtin::Pipeline do
@@ -5,15 +22,20 @@ describe ::LogStash::Plugins::Builtin::Pipeline do
   let(:input_options) { { "address" => address }}
   let(:output_options) { { "send_to" => [address] }}
 
-  let(:execution_context) { double("execution_context" )}
+  let(:execution_context) { double("execution_context")}
   let(:agent) { double("agent") }
-  let(:pipeline_bus) { org.logstash.plugins.pipeline.PipelineBus.new }
+  let(:pipeline_bus) { org.logstash.plugins.pipeline.PipelineBus.create }
 
   let(:queue) { Queue.new }
 
   let(:input) { ::LogStash::Plugins::Builtin::Pipeline::Input.new(input_options) }
   let(:output) { ::LogStash::Plugins::Builtin::Pipeline::Output.new(output_options) }
   let(:inputs) { [input] }
+  let(:metric) {
+    LogStash::Instrument::NamespacedMetric.new(
+        LogStash::Instrument::Metric.new(LogStash::Instrument::Collector.new), [:filter]
+    )
+  }
 
   let(:event) { ::LogStash::Event.new("foo" => "bar") }
 
@@ -22,8 +44,10 @@ describe ::LogStash::Plugins::Builtin::Pipeline do
     allow(agent).to receive(:pipeline_bus).and_return(pipeline_bus)
     inputs.each do |i|
       allow(i).to receive(:execution_context).and_return(execution_context)
+      i.metric = metric
     end
     allow(output).to receive(:execution_context).and_return(execution_context)
+    output.metric = metric
   end
 
   def wait_input_running(input_plugin)
@@ -36,7 +60,7 @@ describe ::LogStash::Plugins::Builtin::Pipeline do
     def start_input
       input.register
 
-      @input_thread = Thread.new do 
+      @input_thread = Thread.new do
         input.run(queue)
       end
 
@@ -55,6 +79,14 @@ describe ::LogStash::Plugins::Builtin::Pipeline do
         output.register
       end
 
+      describe "#internalReceive" do
+        it "should fail" do
+          java_import "org.logstash.plugins.pipeline.PipelineInput"
+          res = input.internalReceive(java.util.ArrayList.new([event]).stream)
+          expect(res.status).to eq PipelineInput::ReceiveStatus::COMPLETED
+        end
+      end
+
       describe "sending a message" do
         before(:each) do
           output.multi_receive([event])
@@ -75,8 +107,21 @@ describe ::LogStash::Plugins::Builtin::Pipeline do
           event.set("baz", "bot")
           expect(subject.to_hash_with_metadata).not_to match(event.to_hash_with_metadata)
         end
+
+        it 'should add `address` to the plugin metrics' do
+          event_metrics = input.metric.collector.snapshot_metric.metric_store.get_with_path(
+              "filter"
+          )[:filter]
+          expect(event_metrics[:address].value).to eq(address)
+        end
+        it 'should add `send_to` to the plugin metrics' do
+          event_metrics = output.metric.collector.snapshot_metric.metric_store.get_with_path(
+              "filter"
+          )[:filter]
+          expect(event_metrics[:send_to].value).to eq([address])
+        end
       end
-      
+
       after(:each) do
         stop_input
         output.do_close
@@ -101,14 +146,32 @@ describe ::LogStash::Plugins::Builtin::Pipeline do
         output.do_close
       end
     end
+
+    it "stopped input should process events until upstream outputs stop" do
+      start_input
+      output.register
+      pipeline_bus.setBlockOnUnlisten(true)
+
+      output.multi_receive([event])
+      expect(queue.pop(true).to_hash_with_metadata).to match(event.to_hash_with_metadata)
+
+      Thread.new { input.do_stop }
+
+      sleep 1
+      output.multi_receive([event])
+      expect(queue.pop(true).to_hash_with_metadata).to match(event.to_hash_with_metadata)
+
+      output.do_close
+    end
   end
 
   describe "one output to multiple inputs" do
     describe "with all plugins up" do
       let(:other_address) { "other" }
+      let(:send_addresses) { [address, other_address]}
       let(:other_input_options) { { "address" => other_address } }
       let(:other_input) { ::LogStash::Plugins::Builtin::Pipeline::Input.new(other_input_options) }
-      let(:output_options) { { "send_to" => [address, other_address] } }
+      let(:output_options) { { "send_to" => send_addresses } }
       let(:inputs) { [input, other_input] }
       let(:queues) { [Queue.new, Queue.new] }
       let(:inputs_queues) { Hash[inputs.zip(queues)] }
@@ -118,8 +181,8 @@ describe ::LogStash::Plugins::Builtin::Pipeline do
         other_input.register
         output.register
 
-        @input_threads = inputs_queues.map do |input_plugin,input_queue|
-          Thread.new do 
+        @input_threads = inputs_queues.map do |input_plugin, input_queue|
+          Thread.new do
             input_plugin.run(input_queue)
           end
         end
@@ -128,20 +191,27 @@ describe ::LogStash::Plugins::Builtin::Pipeline do
         end
       end
 
+      it 'should add multiple `send_to` addresses to the plugin metrics' do
+        event_metrics = output.metric.collector.snapshot_metric.metric_store.get_with_path(
+            "filter"
+        )[:filter]
+        expect(event_metrics[:send_to].value).to eq(send_addresses)
+      end
+
       describe "sending a message" do
         before(:each) do
           output.multi_receive([event])
         end
 
         it "should send the message to both outputs" do
-          inputs_queues.each do |i,q|
+          inputs_queues.each do |i, q|
             expect(q.pop(true).to_hash_with_metadata).to match(event.to_hash_with_metadata)
           end
         end
       end
 
       context "with ensure delivery set to false" do
-        let(:output_options) { super.merge("ensure_delivery" => false) }
+        let(:output_options) { super().merge("ensure_delivery" => false) }
         before(:each) do
           other_input.do_stop
           other_input.do_close
@@ -163,7 +233,7 @@ describe ::LogStash::Plugins::Builtin::Pipeline do
           expect(inputs_queues[other_input].size).to eql(0)
         end
       end
-      
+
       after(:each) do
         inputs.each(&:do_stop)
         inputs.each(&:do_close)
@@ -172,4 +242,4 @@ describe ::LogStash::Plugins::Builtin::Pipeline do
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/logstash-core/spec/logstash/plugins/ca_trusted_fingerprint_support_spec.rb b/logstash-core/spec/logstash/plugins/ca_trusted_fingerprint_support_spec.rb
new file mode 100644
index 000000000..b968e0195
--- /dev/null
+++ b/logstash-core/spec/logstash/plugins/ca_trusted_fingerprint_support_spec.rb
@@ -0,0 +1,108 @@
+require "spec_helper"
+
+require "logstash/plugin"
+
+require 'logstash/inputs/base'
+require 'logstash/filters/base'
+require 'logstash/codecs/base'
+require 'logstash/outputs/base'
+java_import "org.logstash.util.CATrustedFingerprintTrustStrategy"
+
+describe LogStash::Plugins::CATrustedFingerprintSupport do
+  let(:ca_trusted_fingerprint_support) { described_class }
+
+  [
+      LogStash::Inputs::Base,
+      LogStash::Filters::Base,
+      LogStash::Codecs::Base,
+      LogStash::Outputs::Base
+  ].each do |base_class|
+    context "that inherits from `#{base_class}`" do
+      let(:plugin_base_class) { base_class }
+
+      subject(:plugin_class) do
+        Class.new(plugin_base_class) do
+          config_name 'sample'
+
+          include LogStash::Plugins::CATrustedFingerprintSupport
+        end
+      end
+
+      it 'defines a `trust_strategy_for_ca_trusted_fingerprint` method' do
+        expect(plugin_class.method_defined?(:trust_strategy_for_ca_trusted_fingerprint)).to be true
+      end
+
+      let(:options) { Hash.new }
+      let(:plugin) { plugin_class.new(options) }
+
+      context '#initialize' do
+        shared_examples 'normalizes fingerprints' do
+          context '#ca_trusted_fingerprint' do
+            it "normalizes to an array of capital hex fingerprints" do
+              expect(plugin.ca_trusted_fingerprint).to eq(normalized)
+            end
+          end
+          context '#trust_strategy_for_ca_trusted_fingerprint' do
+            it 'builds an appropriate trust strategy' do
+              expect(CATrustedFingerprintTrustStrategy).to receive(:new).with(normalized).and_call_original
+              expect(plugin.trust_strategy_for_ca_trusted_fingerprint).to be_a_kind_of(org.apache.http.conn.ssl.TrustStrategy)
+            end
+          end
+        end
+
+        shared_examples 'rejects bad input in the usual way' do
+          let(:logger_stub) { double('Logger').as_null_object }
+          before(:each) do
+            allow(plugin_class).to receive(:logger).and_return(logger_stub)
+          end
+          it 'logs helpfully and raises an exception' do
+            expect {plugin}.to raise_exception(LogStash::ConfigurationError)
+            expect(logger_stub).to have_received(:error).with(a_string_including "Expected a hex-encoded SHA-256 fingerprint")
+          end
+        end
+
+        context 'without a `ca_trusted_fingerprint`' do
+          context '#ca_trusted_fingerprint' do
+            it 'returns nil' do
+              expect(plugin.ca_trusted_fingerprint).to be_nil
+            end
+          end
+          context '#trust_strategy_for_ca_trusted_fingerprint' do
+            it 'returns nil' do
+              expect(plugin.trust_strategy_for_ca_trusted_fingerprint).to be_nil
+            end
+          end
+        end
+
+        context 'with a single `ca_trusted_fingerprint`' do
+          let(:options) { super().merge('ca_trusted_fingerprint' => input) }
+          context 'that is valid' do
+            let(:input) { "1b:ad:1d:ea:" * 8 }
+            include_examples('normalizes fingerprints') do
+              let(:normalized) { ['1BAD1DEA' * 8] }
+            end
+          end
+          context 'that is not valid' do
+            let(:input) { "NOPE" }
+            include_examples('rejects bad input in the usual way')
+          end
+        end
+
+        context 'with multiple `ca_trusted_fingerprint` values' do
+          let(:options) { super().merge('ca_trusted_fingerprint' => input) }
+          context 'that are valid' do
+            let(:input) { ["1b:ad:1d:ea:" * 8, 'BEefCaB1' * 8] }
+            include_examples('normalizes fingerprints') do
+              let(:normalized) { ["1BAD1DEA" * 8, "BEEFCAB1" * 8] }
+            end
+          end
+          context 'that is not valid' do
+            let(:input) { ["NOPE", "1BAD1DEA" * 8] }
+
+            include_examples('rejects bad input in the usual way')
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/logstash-core/spec/logstash/plugins/event_factory_support_spec.rb b/logstash-core/spec/logstash/plugins/event_factory_support_spec.rb
new file mode 100644
index 000000000..3f12308b1
--- /dev/null
+++ b/logstash-core/spec/logstash/plugins/event_factory_support_spec.rb
@@ -0,0 +1,120 @@
+require "spec_helper"
+
+require "logstash/plugin"
+
+require 'logstash/inputs/base'
+require 'logstash/filters/base'
+require 'logstash/codecs/base'
+require 'logstash/outputs/base'
+
+describe LogStash::Plugins::EventFactorySupport do
+  let(:event_factory_support) { described_class }
+
+  [
+      LogStash::Inputs::Base,
+      LogStash::Filters::Base,
+      LogStash::Codecs::Base,
+      LogStash::Outputs::Base
+  ].each do |base_class|
+    context "that inherits from `#{base_class}`" do
+      let(:plugin_base_class) { base_class }
+
+      subject(:plugin_class) do
+        Class.new(plugin_base_class) do
+          config_name 'sample'
+        end
+      end
+
+      it 'defines an `event_factory` method' do
+        expect(plugin_class.method_defined?(:event_factory)).to be true
+      end
+
+      it 'defines an `targeted_event_factory` method' do
+        expect(plugin_class.method_defined?(:targeted_event_factory)).to be true
+      end
+
+      let(:options) { Hash.new }
+      let(:plugin) { plugin_class.new(options) }
+
+      shared_examples 'an event factory' do
+        it 'returns an event' do
+          expect(event_factory.new_event).to be_a LogStash::Event
+          expect(event = event_factory.new_event('foo' => 'bar')).to be_a LogStash::Event
+          expect(event.get('foo')).to eql 'bar'
+        end
+      end
+
+      describe 'event_factory' do
+        subject(:event_factory) { plugin.send(:event_factory) }
+
+        it_behaves_like 'an event factory'
+
+        it 'memoizes the factory instance' do
+          expect(event_factory).to be plugin.send(:event_factory)
+        end
+      end
+
+      describe 'targeted_event_factory (no config :target option)' do
+        it 'raises an error' do
+          expect { plugin.send(:targeted_event_factory) }.to raise_error(ArgumentError, /target/)
+        end
+      end
+
+      describe 'targeted_event_factory' do
+        subject(:plugin_class) do
+          Class.new(plugin_base_class) do
+            config_name 'sample'
+
+            config :target, :validate => :string
+          end
+        end
+
+        subject(:targeted_event_factory) { plugin.send(:targeted_event_factory) }
+
+        it_behaves_like 'an event factory' do
+          subject(:event_factory) { targeted_event_factory }
+        end
+
+        it 'memoizes the factory instance' do
+          expect(targeted_event_factory).to be plugin.send(:targeted_event_factory)
+        end
+
+        it 'uses the basic event factory (no target specified)' do
+          expect(targeted_event_factory).to be plugin.send(:event_factory)
+        end
+
+        context 'with target' do
+          let(:options) { super().merge('target' => '[the][baz]') }
+
+          it 'returns an event' do
+            expect(targeted_event_factory.new_event).to be_a LogStash::Event
+            expect(event = targeted_event_factory.new_event('foo' => 'bar')).to be_a LogStash::Event
+            expect(event.include?('foo')).to be false
+            expect(event.get('[the][baz][foo]')).to eql 'bar'
+          end
+
+          it 'memoizes the factory instance' do
+            expect(targeted_event_factory).to be plugin.send(:targeted_event_factory)
+          end
+
+          it 'uses a different factory from the basic one' do
+            expect(targeted_event_factory).not_to be plugin.send(:event_factory)
+          end
+        end
+
+        context 'from_json (integration)' do
+          let(:json) { '[ {"foo": "bar"}, { "baz": { "a": 1 } } ]' }
+
+          let(:options) { super().merge('target' => 'internal') }
+
+          it 'works' do
+            events = LogStash::Event.from_json(json) { |data| targeted_event_factory.new_event(data) }
+            expect(events.size).to eql 2
+            expect(events[0].get('[internal]')).to eql 'foo' => 'bar'
+            expect(events[1].get('[internal]')).to eql 'baz' => { 'a' => 1 }
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/logstash-core/spec/logstash/plugins/hooks_registry_spec.rb b/logstash-core/spec/logstash/plugins/hooks_registry_spec.rb
index 300516a6c..45d19565b 100644
--- a/logstash-core/spec/logstash/plugins/hooks_registry_spec.rb
+++ b/logstash-core/spec/logstash/plugins/hooks_registry_spec.rb
@@ -1,4 +1,19 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 describe LogStash::Plugins::HooksRegistry do
   class DummyEmitter
diff --git a/logstash-core/spec/logstash/plugins/registry_spec.rb b/logstash-core/spec/logstash/plugins/registry_spec.rb
index 01ded2406..c4c5b7fbc 100644
--- a/logstash-core/spec/logstash/plugins/registry_spec.rb
+++ b/logstash-core/spec/logstash/plugins/registry_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/plugins/registry"
 require "logstash/inputs/base"
@@ -10,7 +26,6 @@ class LogStash::Inputs::Dummy < LogStash::Inputs::Base
   def register; end
 end
 
-
 class LogStash::Inputs::NewPlugin < LogStash::Inputs::Base
   config_name "new_plugin"
 
@@ -18,9 +33,11 @@ class LogStash::Inputs::NewPlugin < LogStash::Inputs::Base
 end
 
 describe LogStash::Plugins::Registry do
-  let(:registry) { described_class.new }
+  let(:alias_registry) { nil }
+  let(:registry) { described_class.new alias_registry }
 
   context "when loading installed plugins" do
+    let(:alias_registry) { Java::org.logstash.plugins.AliasRegistry.new({["input", "alias_std_input"] => "stdin"}) }
     let(:plugin) { double("plugin") }
 
     it "should return the expected class" do
@@ -28,6 +45,11 @@ describe LogStash::Plugins::Registry do
       expect(klass).to eq(LogStash::Inputs::Stdin)
     end
 
+    it "should load an aliased ruby plugin" do
+      klass = registry.lookup("input", "alias_std_input")
+      expect(klass).to eq(LogStash::Inputs::Stdin)
+    end
+
     it "should raise an error if can not find the plugin class" do
       expect { registry.lookup("input", "do-not-exist-elastic") }.to raise_error(LoadError)
     end
@@ -37,13 +59,34 @@ describe LogStash::Plugins::Registry do
       expect { registry.lookup("input", "new_plugin") }.to change { registry.size }.by(1)
       expect { registry.lookup("input", "new_plugin") }.not_to change { registry.size }
     end
+
+    context "when loading installed plugin that overrides an alias" do
+      let(:alias_registry) { Java::org.logstash.plugins.AliasRegistry.new({["input", "dummy"] => "new_plugin"}) }
+
+      it 'should load the concrete implementation instead of resolving the alias' do
+        klass = registry.lookup("input", "dummy")
+        expect(klass).to eq(LogStash::Inputs::Dummy)
+      end
+    end
   end
 
   context "when loading code defined plugins" do
+    let(:alias_registry) { Java::org.logstash.plugins.AliasRegistry.new({["input", "alias_input"] => "new_plugin"}) }
+
     it "should return the expected class" do
       klass = registry.lookup("input", "dummy")
       expect(klass).to eq(LogStash::Inputs::Dummy)
     end
+
+    it "should return the expected class also for aliased plugins" do
+      klass = registry.lookup("input", "alias_input")
+      expect(klass).to eq(LogStash::Inputs::NewPlugin)
+    end
+
+    it "should return the expected class also for alias-targeted plugins" do
+      klass = registry.lookup("input", "new_plugin")
+      expect(klass).to eq(LogStash::Inputs::NewPlugin)
+    end
   end
 
   context "when plugin is not installed and not defined" do
@@ -83,7 +126,6 @@ describe LogStash::Plugins::Registry do
       registry.add(:filter, "simple_plugin", simple_plugin)
 
       expect(registry.plugins_with_type(:filter)).to include(simple_plugin)
-      expect(registry.plugins_with_type(:modules)).to match([])
     end
   end
 end
diff --git a/logstash-core/spec/logstash/queue_factory_spec.rb b/logstash-core/spec/logstash/queue_factory_spec.rb
index 5741c234d..cae6b1fe7 100644
--- a/logstash-core/spec/logstash/queue_factory_spec.rb
+++ b/logstash-core/spec/logstash/queue_factory_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/settings"
 require "stud/temporary"
 
@@ -7,15 +23,15 @@ describe LogStash::QueueFactory do
   let(:settings_array) do
     [
       LogStash::Setting::WritableDirectory.new("path.queue", Stud::Temporary.pathname),
-      LogStash::Setting::String.new("queue.type", "memory", true, ["persisted", "memory"]),
-      LogStash::Setting::Bytes.new("queue.page_capacity", "64mb"),
-      LogStash::Setting::Bytes.new("queue.max_bytes", "1024mb"),
-      LogStash::Setting::Numeric.new("queue.max_events", 0),
-      LogStash::Setting::Numeric.new("queue.checkpoint.acks", 1024),
-      LogStash::Setting::Numeric.new("queue.checkpoint.writes", 1024),
-      LogStash::Setting::Numeric.new("queue.checkpoint.interval", 1000),
+      LogStash::Setting::SettingString.new("queue.type", "memory", true, ["persisted", "memory"]),
+      LogStash::Setting::Bytes.new("queue.page_capacity", "8mb"),
+      LogStash::Setting::Bytes.new("queue.max_bytes", "64mb"),
+      LogStash::Setting::SettingNumeric.new("queue.max_events", 0),
+      LogStash::Setting::SettingNumeric.new("queue.checkpoint.acks", 1024),
+      LogStash::Setting::SettingNumeric.new("queue.checkpoint.writes", 1024),
+      LogStash::Setting::SettingNumeric.new("queue.checkpoint.interval", 1000),
       LogStash::Setting::Boolean.new("queue.checkpoint.retry", false),
-      LogStash::Setting::String.new("pipeline.id", pipeline_id),
+      LogStash::Setting::SettingString.new("pipeline.id", pipeline_id),
       LogStash::Setting::PositiveInteger.new("pipeline.batch.size", 125),
       LogStash::Setting::PositiveInteger.new("pipeline.workers", LogStash::Config::CpuCoreStrategy.maximum)
     ]
@@ -38,7 +54,7 @@ describe LogStash::QueueFactory do
     end
 
     it "returns a `WrappedAckedQueue`" do
-      queue =  subject.create(settings)
+      queue = subject.create(settings)
       expect(queue).to be_kind_of(LogStash::WrappedAckedQueue)
       queue.close
     end
@@ -66,7 +82,7 @@ describe LogStash::QueueFactory do
     end
 
     it "returns a `WrappedSynchronousQueue`" do
-      queue =  subject.create(settings)
+      queue = subject.create(settings)
       expect(queue).to be_kind_of(LogStash::WrappedSynchronousQueue)
       queue.close
     end
diff --git a/logstash-core/spec/logstash/runner_spec.rb b/logstash-core/spec/logstash/runner_spec.rb
index 7ed516144..2e35abc1f 100644
--- a/logstash-core/spec/logstash/runner_spec.rb
+++ b/logstash-core/spec/logstash/runner_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/runner"
 require "stud/task"
@@ -6,16 +22,13 @@ require "stud/trap"
 require "stud/temporary"
 require "logstash/util/java_version"
 require "logstash/config/source_loader"
-require "logstash/config/modules_common"
-require "logstash/modules/util"
-require "logstash/elasticsearch_client"
 require "json"
+require "webmock/rspec"
 require_relative "../support/helpers"
 require_relative "../support/matchers"
 
 describe LogStash::Runner do
-
-  subject { LogStash::Runner }
+  subject(:runner) { LogStash::Runner }
   let(:logger) { double("logger") }
   let(:agent) { double("agent") }
 
@@ -44,10 +57,6 @@ describe LogStash::Runner do
     allow(agent).to receive(:shutdown)
   end
 
-  after(:each) do
-    LogStash::SETTINGS.get_value("modules_list").clear
-  end
-
   describe "argument precedence" do
     let(:config) { "input {} output {}" }
     let(:cli_args) { ["-e", config, "-w", "20"] }
@@ -70,7 +79,6 @@ describe LogStash::Runner do
     subject { LogStash::Runner.new("") }
 
     context "when -e is given" do
-
       let(:args) { ["-e", "input {} output {}"] }
       let(:agent) { double("agent") }
 
@@ -105,11 +113,11 @@ describe LogStash::Runner do
 
     it "should fail with single invalid dir path" do
       expect(LogStash::Environment).not_to receive(:add_plugin_path)
-      expect{subject.configure_plugin_paths(invalid_directory)}.to raise_error(Clamp::UsageError)
+      expect {subject.configure_plugin_paths(invalid_directory)}.to raise_error(Clamp::UsageError)
     end
 
     it "should add multiple valid dir path to the environment" do
-      multiple_paths.each{|path| expect(LogStash::Environment).to receive(:add_plugin_path).with(path)}
+      multiple_paths.each {|path| expect(LogStash::Environment).to receive(:add_plugin_path).with(path)}
       subject.configure_plugin_paths(multiple_paths)
     end
   end
@@ -117,7 +125,6 @@ describe LogStash::Runner do
   context "--auto-reload" do
     subject { LogStash::Runner.new("") }
     context "when -e is given" do
-
       let(:args) { ["-r", "-e", "input {} output {}"] }
 
       it "should exit immediately" do
@@ -147,6 +154,14 @@ describe LogStash::Runner do
         expect(subject.run(args)).to eq(1)
       end
     end
+
+    context "with invalid field reference literal" do
+      let(:pipeline_string) { "input { } output { if [[f[[[oo] == [bar] { } }" }
+      it "should fail by returning a bad exit code" do
+        expect(logger).to receive(:fatal)
+        expect(subject.run(args)).to eq(1)
+      end
+    end
   end
   describe "pipeline settings" do
     let(:pipeline_string) { "input { stdin {} } output { stdout {} }" }
@@ -187,8 +202,6 @@ describe LogStash::Runner do
             expect(settings.get("path.queue")).to eq(queue_override_path)
           end
 
-
-
           args = ["--path.data", test_data_path, "-e", pipeline_string]
           subject.run("bin/logstash", args)
         end
@@ -211,61 +224,69 @@ describe LogStash::Runner do
       end
     end
 
-    context "when :http.host is defined by the user" do
-      it "should pass the value to the webserver" do
-        expect(LogStash::Agent).to receive(:new) do |settings|
-          expect(settings.set?("http.host")).to be(true)
-          expect(settings.get("http.host")).to eq("localhost")
-        end
+    context ':api.http.host' do
+      context "when undefined by the user" do
+        let(:args) { ["-e", pipeline_string] }
+        it "creates an Agent whose `api.http.host` uses the default value" do
+          expect(LogStash::Agent).to receive(:new) do |settings|
+            expect(settings.set?("api.http.host")).to be_falsey
+            expect(settings.get("api.http.host")).to eq("127.0.0.1")
+          end
 
-        args = ["--http.host", "localhost", "-e", pipeline_string]
-        subject.run("bin/logstash", args)
+          subject.run("bin/logstash", args)
+        end
+      end
+
+      context "when defined by the user" do
+        let(:args) { ["--api.http.host", "localhost", "-e", pipeline_string]}
+        it "creates an Agent whose `api.http.host` uses provided value" do
+          expect(LogStash::Agent).to receive(:new) do |settings|
+            expect(settings.set?("api.http.host")).to be(true)
+            expect(settings.get("api.http.host")).to eq("localhost")
+          end
+
+          subject.run("bin/logstash", args)
+        end
       end
     end
 
-    context "when :http.host is not defined by the user" do
-      it "should pass the value to the webserver" do
-        expect(LogStash::Agent).to receive(:new) do |settings|
-          expect(settings.set?("http.host")).to be_falsey
-          expect(settings.get("http.host")).to eq("127.0.0.1")
+    context ":api.http.port" do
+      context "when undefined by the user" do
+        let(:args) { ["-e", pipeline_string] }
+        it "creates an Agent whose `api.http.port` uses the default value" do
+          expect(LogStash::Agent).to receive(:new) do |settings|
+            expect(settings.set?("api.http.port")).to be_falsey
+            expect(settings.get("api.http.port")).to eq(9600..9700)
+          end
+
+          subject.run("bin/logstash", args)
         end
-
-        args = ["-e", pipeline_string]
-        subject.run("bin/logstash", args)
-      end
-    end
-
-    context "when :http.port is defined by the user" do
-      it "should pass a single value to the webserver" do
-        expect(LogStash::Agent).to receive(:new) do |settings|
-          expect(settings.set?("http.port")).to be(true)
-          expect(settings.get("http.port")).to eq(10000..10000)
-        end
-
-        args = ["--http.port", "10000", "-e", pipeline_string]
-        subject.run("bin/logstash", args)
       end
 
-      it "should pass a range value to the webserver" do
-        expect(LogStash::Agent).to receive(:new) do |settings|
-          expect(settings.set?("http.port")).to be(true)
-          expect(settings.get("http.port")).to eq(10000..20000)
+      context "when defined by the user" do
+        let(:args) { ["--api.http.port", port_argument, "-e", pipeline_string] }
+        context "as a single-value string" do
+          let(:port_argument) { "10000" }
+          it "creates an Agent whose `api.http.port` is an appropriate single-element range" do
+            expect(LogStash::Agent).to receive(:new) do |settings|
+              expect(settings.set?("api.http.port")).to be(true)
+              expect(settings.get("api.http.port")).to eq(10000..10000)
+            end
+
+            subject.run("bin/logstash", args)
+          end
         end
+        context "as a range" do
+          let(:port_argument) { "10000-20000" }
+          it "creates an Agent whose `api.http.port` uses the appropriate inclusive-end range" do
+            expect(LogStash::Agent).to receive(:new) do |settings|
+              expect(settings.set?("api.http.port")).to be(true)
+              expect(settings.get("api.http.port")).to eq(10000..20000)
+            end
 
-        args = ["--http.port", "10000-20000", "-e", pipeline_string]
-        subject.run("bin/logstash", args)
-      end
-    end
-
-    context "when no :http.port is not defined by the user" do
-      it "should use the default settings" do
-        expect(LogStash::Agent).to receive(:new) do |settings|
-          expect(settings.set?("http.port")).to be_falsey
-          expect(settings.get("http.port")).to eq(9600..9700)
+            subject.run("bin/logstash", args)
+          end
         end
-
-        args = ["-e", pipeline_string]
-        subject.run("bin/logstash", args)
       end
     end
 
@@ -320,113 +341,13 @@ describe LogStash::Runner do
     end
   end
 
-  describe "logstash modules" do
-    before(:each) do
-      test_modules_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "modules_test_files"))
-      LogStash::Modules::Util.register_local_modules(test_modules_dir)
-    end
+  describe 'jackson defaults' do
+    subject { LogStash::Runner.new("") }
+    let(:args) { ["-e", "input {} output {}"] }
 
-    describe "--config.test_and_exit" do
-      subject { LogStash::Runner.new("") }
-      let(:args) { ["-t", "--modules", module_string] }
-
-      context "with a good configuration" do
-        let(:module_string) { "tester" }
-        it "should exit successfully" do
-          expect(logger).not_to receive(:fatal)
-          expect(subject.run(args)).to eq(0)
-        end
-      end
-
-      context "with a bad configuration" do
-        let(:module_string) { "rlwekjhrewlqrkjh" }
-        it "should fail by returning a bad exit code" do
-          expect(logger).to receive(:fatal)
-          expect(subject.run(args)).to eq(1)
-        end
-      end
-    end
-
-    describe "--modules" do
-      let(:args) { ["--modules", module_string, "--setup"] }
-
-      context "with an available module specified but no connection to elasticsearch" do
-        let(:module_string) { "tester" }
-        before do
-          expect(logger).to receive(:fatal) do |msg, hash|
-            expect(msg).to eq("An unexpected error occurred!")
-            expect(hash).to be_a_config_loading_error_hash(
-              /Failed to import module configurations to Elasticsearch and\/or Kibana. Module: tester has/)
-          end
-          expect(LogStash::Agent).to receive(:new) do |settings, source_loader|
-            pipelines = LogStash::Config::ModulesCommon.pipeline_configs(settings)
-            expect(pipelines).to eq([])
-            agent
-          end
-        end
-        it "should log fatally and return a bad exit code" do
-          expect(subject.run("bin/logstash", args)).to eq(1)
-        end
-      end
-
-      context "with an available module specified and a mocked connection to elasticsearch" do
-        let(:module_string) { "tester" }
-        let(:kbn_version) { "6.0.0" }
-        let(:esclient) { double(:esclient) }
-        let(:kbnclient) { double(:kbnclient) }
-        let(:response) { double(:response) }
-        before do
-          allow(response).to receive(:status).and_return(404)
-          allow(esclient).to receive(:head).and_return(response)
-          allow(esclient).to receive(:can_connect?).and_return(true)
-          allow(kbnclient).to receive(:version).and_return(kbn_version)
-          allow(kbnclient).to receive(:version_parts).and_return(kbn_version.split('.'))
-          allow(kbnclient).to receive(:can_connect?).and_return(true)
-          allow(LogStash::ElasticsearchClient).to receive(:build).and_return(esclient)
-          allow(LogStash::Modules::KibanaClient).to receive(:new).and_return(kbnclient)
-
-          expect(esclient).to receive(:put).once do |path, content|
-            LogStash::ElasticsearchClient::Response.new(201, "", {})
-          end
-          expect(kbnclient).to receive(:post).twice do |path, content|
-            LogStash::Modules::KibanaClient::Response.new(201, "", {})
-          end
-
-          expect(LogStash::Agent).to receive(:new) do |settings, source_loader|
-            pipelines = LogStash::Config::ModulesCommon.pipeline_configs(settings)
-            expect(pipelines).not_to be_empty
-            module_pipeline = pipelines.first
-            expect(module_pipeline).to include("pipeline_id", "config_string")
-            expect(module_pipeline["pipeline_id"]).to include('tester')
-            expect(module_pipeline["config_string"]).to include('index => "tester-')
-            agent
-          end
-          expect(logger).not_to receive(:fatal)
-          expect(logger).not_to receive(:error)
-        end
-        it "should not terminate logstash" do
-          expect(subject.run("bin/logstash", args)).to be_nil
-        end
-      end
-
-      context "with an unavailable module specified" do
-        let(:module_string) { "fancypants" }
-        before do
-          expect(logger).to receive(:fatal) do |msg, hash|
-            expect(msg).to eq("An unexpected error occurred!")
-            expect(hash).to be_a_config_loading_error_hash(
-              /The modules specified are not available yet. Specified modules: \["fancypants"\] Available modules:/)
-          end
-          expect(LogStash::Agent).to receive(:new) do |settings, source_loader|
-            pipelines = LogStash::Config::ModulesCommon.pipeline_configs(settings)
-            expect(pipelines).to eq([])
-            agent
-          end
-        end
-        it "should log fatally and return a bad exit code" do
-          expect(subject.run("bin/logstash", args)).to eq(1)
-        end
-      end
+    it 'should be verified' do
+      expect(LogStash::Util::Jackson).to receive(:verify_jackson_overrides)
+      subject.run(args)
     end
   end
 
@@ -464,9 +385,12 @@ describe LogStash::Runner do
     end
 
     context "deprecated flags" do
+      let(:deprecation_logger_stub) { double("DeprecationLogger").as_null_object }
+      before(:each) { allow(runner).to receive(:deprecation_logger).and_return(deprecation_logger_stub) }
+
       context "when using --quiet" do
         it "should warn about the deprecated flag" do
-          expect(logger).to receive(:warn).with(/DEPRECATION WARNING/)
+          expect(deprecation_logger_stub).to receive(:deprecated).with(/DEPRECATION WARNING/)
           args = ["--quiet", "--version"]
           subject.run("bin/logstash", args)
         end
@@ -479,7 +403,7 @@ describe LogStash::Runner do
       end
       context "when using --debug" do
         it "should warn about the deprecated flag" do
-          expect(logger).to receive(:warn).with(/DEPRECATION WARNING/)
+          expect(deprecation_logger_stub).to receive(:deprecated).with(/DEPRECATION WARNING/)
           args = ["--debug", "--version"]
           subject.run("bin/logstash", args)
         end
@@ -492,7 +416,7 @@ describe LogStash::Runner do
       end
       context "when using --verbose" do
         it "should warn about the deprecated flag" do
-          expect(logger).to receive(:warn).with(/DEPRECATION WARNING/)
+          expect(deprecation_logger_stub).to receive(:deprecated).with(/DEPRECATION WARNING/)
           args = ["--verbose", "--version"]
           subject.run("bin/logstash", args)
         end
@@ -526,4 +450,59 @@ describe LogStash::Runner do
       end
     end
   end
+
+  describe "allow_superuser" do
+    subject { LogStash::Runner.new("") }
+    let(:args) { ["-e", "input {} output {}"] }
+    let(:deprecation_logger_stub) { double("DeprecationLogger").as_null_object }
+    before(:each) { allow(runner).to receive(:deprecation_logger).and_return(deprecation_logger_stub) }
+
+    if LogStash::Environment.windows?
+      context "unintentionally running logstash as superuser" do
+        it "runs successfully" do
+          LogStash::SETTINGS.set("allow_superuser", false)
+          expect(logger).not_to receive(:fatal)
+          expect { subject.run(args) }.not_to raise_error
+        end
+      end
+    else
+      context "unintentionally running logstash as superuser" do
+        before do
+          expect(Process).to receive(:euid).and_return(0)
+        end
+        it "fails with bad exit" do
+          LogStash::SETTINGS.set("allow_superuser", false)
+          expect(logger).to receive(:fatal) do |msg, hash|
+            expect(msg).to eq("An unexpected error occurred!")
+            expect(hash[:error].to_s).to match("Logstash cannot be run as superuser.")
+          end
+          expect(subject.run(args)).to eq(1)
+        end
+      end
+
+      context "intentionally running logstash as superuser " do
+        before do
+          expect(Process).to receive(:euid).and_return(0)
+        end
+        it "runs successfully with warning message" do
+          LogStash::SETTINGS.set("allow_superuser", true)
+          expect(logger).not_to receive(:fatal)
+          expect(logger).to receive(:warn).with(/NOTICE: Allowing Logstash to run as superuser is heavily discouraged as it poses a security risk./)
+          expect { subject.run(args) }.not_to raise_error
+        end
+      end
+
+      context "running logstash as non-root " do
+        before do
+          expect(Process).to receive(:euid).and_return(100)
+        end
+        it "runs successfully without any messages" do
+          LogStash::SETTINGS.set("allow_superuser", false)
+          expect(logger).not_to receive(:fatal)
+          expect(logger).not_to receive(:warn).with(/NOTICE: Allowing Logstash to run as superuser is heavily discouraged as it poses a security risk./)
+          expect { subject.run(args) }.not_to raise_error
+        end
+      end
+    end
+  end
 end
diff --git a/logstash-core/spec/logstash/setting_spec.rb b/logstash-core/spec/logstash/setting_spec.rb
index 3c1f43847..92bd617af 100644
--- a/logstash-core/spec/logstash/setting_spec.rb
+++ b/logstash-core/spec/logstash/setting_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/settings"
 
diff --git a/logstash-core/spec/logstash/settings/array_coercible_spec.rb b/logstash-core/spec/logstash/settings/array_coercible_spec.rb
index 780f18cca..db0999f10 100644
--- a/logstash-core/spec/logstash/settings/array_coercible_spec.rb
+++ b/logstash-core/spec/logstash/settings/array_coercible_spec.rb
@@ -1,10 +1,26 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/settings"
 
 describe LogStash::Setting::ArrayCoercible do
   subject { described_class.new("option", element_class, value) }
-  let(:value) { [ ] }
+  let(:value) { [] }
   let(:element_class) { Object }
 
   context "when given a non array value" do
@@ -60,7 +76,7 @@ describe LogStash::Setting::ArrayCoercible do
           end
         end
         context "and the other also the same value in an array" do
-          let(:value_2) { [ "a string" ] }
+          let(:value_2) { ["a string"] }
           it "should be equal" do
             expect(setting_1).to be == setting_2
           end
@@ -72,7 +88,7 @@ describe LogStash::Setting::ArrayCoercible do
           end
         end
         context "and the other a different value in an array" do
-          let(:value_2) { [ "a different string" ] }
+          let(:value_2) { ["a different string"] }
           it "should be equal" do
             expect(setting_1).to_not be == setting_2
           end
@@ -80,9 +96,9 @@ describe LogStash::Setting::ArrayCoercible do
       end
 
       context "where one was given a value in an array" do
-        let(:value_1) { [ "a string"] }
+        let(:value_1) { ["a string"] }
         context "and the other the same value in an array" do
-          let(:value_2) { [ "a string" ] }
+          let(:value_2) { ["a string"] }
           it "should be equal" do
             expect(setting_1).to be == setting_2
           end
@@ -94,7 +110,7 @@ describe LogStash::Setting::ArrayCoercible do
           end
         end
         context "and the other a different value in an array" do
-          let(:value_2) { [ "a different string" ] }
+          let(:value_2) { ["a different string"] }
           it "should be equal" do
             expect(setting_1).to_not be == setting_2
           end
diff --git a/logstash-core/spec/logstash/settings/bytes_spec.rb b/logstash-core/spec/logstash/settings/bytes_spec.rb
index 084a252aa..016299761 100644
--- a/logstash-core/spec/logstash/settings/bytes_spec.rb
+++ b/logstash-core/spec/logstash/settings/bytes_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/settings"
 
@@ -21,7 +37,6 @@ describe LogStash::Setting::Bytes do
   subject { described_class.new("a byte value", default, false) }
 
   describe "#set" do
-
     # Hard-coded test just to make sure at least one known case is working
     context "when given '10mb'" do
       it "returns 10485760" do
@@ -41,7 +56,7 @@ describe LogStash::Setting::Bytes do
       end
 
       context "which is not a valid byte unit" do
-        values = [ "hello world", "1234", "", "-__-" ]
+        values = ["hello world", "1234", "", "-__-"]
         values.each do |value|
           it "should fail" do
             expect { subject.set(value) }.to raise_error
diff --git a/logstash-core/spec/logstash/settings/integer_spec.rb b/logstash-core/spec/logstash/settings/integer_spec.rb
index f7097d961..c301576fd 100644
--- a/logstash-core/spec/logstash/settings/integer_spec.rb
+++ b/logstash-core/spec/logstash/settings/integer_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/settings"
 
diff --git a/logstash-core/spec/logstash/settings/modules_spec.rb b/logstash-core/spec/logstash/settings/modules_spec.rb
deleted file mode 100644
index 68a6b366a..000000000
--- a/logstash-core/spec/logstash/settings/modules_spec.rb
+++ /dev/null
@@ -1,126 +0,0 @@
-# encoding: utf-8
-require "spec_helper"
-require "logstash/settings"
-require "logstash/util/cloud_setting_id"
-require "logstash/util/cloud_setting_auth"
-require "logstash/util/modules_setting_array"
-
-describe LogStash::Setting::Modules do
-  describe "Modules.Cli" do
-    subject { described_class.new("mycloudid", LogStash::Util::ModulesSettingArray, []) }
-    context "when given an array of hashes that contains a password key" do
-      let(:secret) { 'some_secret'}
-      it "should convert password Strings to Password" do
-        source = [{"var.kibana.password" => secret}]
-        setting = subject.set(source)
-        expect(setting).to be_a(Array)
-        expect(setting.__class__).to eq(LogStash::Util::ModulesSettingArray)
-        expect(setting.first.fetch("var.kibana.password")).to be_a(LogStash::Util::Password)
-        expect(setting.first.fetch("var.kibana.password").value).to eq(secret)
-      end
-
-      it 'should not wrap values that are already passwords' do
-        source = [{"var.kibana.password" => LogStash::Util::Password.new(secret)}]
-        setting = subject.set(source)
-        expect(setting).to be_a(Array)
-        expect(setting.__class__).to eq(LogStash::Util::ModulesSettingArray)
-        expect(setting.first.fetch("var.kibana.password")).to be_a(LogStash::Util::Password)
-        expect(setting.first.fetch("var.kibana.password").value).to eq(secret)
-      end
-    end
-  end
-
-  describe "Cloud.Id" do
-    subject { described_class.new("mycloudid", LogStash::Util::CloudSettingId) }
-    context "when given a string which is not a cloud id" do
-      it "should raise an exception" do
-        expect { subject.set("foobarbaz") }.to raise_error(ArgumentError, /Cloud Id.*is invalid/)
-      end
-    end
-
-    context "when given a string which is empty" do
-      it "should raise an exception" do
-        expect { subject.set("") }.to raise_error(ArgumentError, /Cloud Id.*is invalid/)
-      end
-    end
-
-    context "when given a string which is has environment prefix only" do
-      it "should raise an exception" do
-        expect { subject.set("testing:") }.to raise_error(ArgumentError, /Cloud Id.*is invalid/)
-      end
-    end
-
-    context "when given a badly formatted encoded id" do
-      it "should not raise an error" do
-        encoded = Base64.urlsafe_encode64("foo$$bal")
-        expect { subject.set(encoded) }.to raise_error(ArgumentError, "Cloud Id, after decoding, is invalid. Format: '<segment1>$<segment2>$<segment3>'. Received: \"foo$$bal\".")
-      end
-    end
-
-    context "when given a nil" do
-      it "should not raise an error" do
-        expect { subject.set(nil) }.to_not raise_error
-      end
-    end
-
-    context "when given a string which is an unlabelled cloud id" do
-      it "should set a LogStash::Util::CloudId instance" do
-        expect { subject.set("dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRub3RhcmVhbCRpZGVudGlmaWVy") }.to_not raise_error
-        expect(subject.value.elasticsearch_host).to eq("notareal.us-east-1.aws.found.io:443")
-        expect(subject.value.kibana_host).to eq("identifier.us-east-1.aws.found.io:443")
-        expect(subject.value.label).to eq("")
-      end
-    end
-
-    context "when given a string which is a labelled cloud id" do
-      it "should set a LogStash::Util::CloudId instance" do
-        expect { subject.set("staging:dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRub3RhcmVhbCRpZGVudGlmaWVy") }.to_not raise_error
-        expect(subject.value.elasticsearch_host).to eq("notareal.us-east-1.aws.found.io:443")
-        expect(subject.value.kibana_host).to eq("identifier.us-east-1.aws.found.io:443")
-        expect(subject.value.label).to eq("staging")
-      end
-    end
-  end
-
-  describe "Cloud.Auth" do
-    subject { described_class.new("mycloudauth", LogStash::Util::CloudSettingAuth) }
-    context "when given a string without a separator or a password" do
-      it "should raise an exception" do
-        expect { subject.set("foobarbaz") }.to raise_error(ArgumentError, /Cloud Auth username and password format should be/)
-      end
-    end
-
-    context "when given a string without a password" do
-      it "should raise an exception" do
-        expect { subject.set("foo:") }.to raise_error(ArgumentError, /Cloud Auth username and password format should be/)
-      end
-    end
-
-    context "when given a string without a username" do
-      it "should raise an exception" do
-        expect { subject.set(":bar") }.to raise_error(ArgumentError, /Cloud Auth username and password format should be/)
-      end
-    end
-
-    context "when given a string which is empty" do
-      it "should raise an exception" do
-        expect { subject.set("") }.to raise_error(ArgumentError, /Cloud Auth username and password format should be/)
-      end
-    end
-
-    context "when given a nil" do
-      it "should not raise an error" do
-        expect { subject.set(nil) }.to_not raise_error
-      end
-    end
-
-    context "when given a string which is a cloud auth" do
-      it "should set the string" do
-        expect { subject.set("frodo:baggins") }.to_not raise_error
-        expect(subject.value.username).to eq("frodo")
-        expect(subject.value.password.value).to eq("baggins")
-        expect(subject.value.to_s).to eq("frodo:<password>")
-      end
-    end
-  end
-end
diff --git a/logstash-core/spec/logstash/settings/nullable_spec.rb b/logstash-core/spec/logstash/settings/nullable_spec.rb
new file mode 100644
index 000000000..0e05e8a19
--- /dev/null
+++ b/logstash-core/spec/logstash/settings/nullable_spec.rb
@@ -0,0 +1,77 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require "spec_helper"
+require "logstash/settings"
+
+describe LogStash::Setting::Nullable do
+  let(:setting_name) { "this.that" }
+  let(:normal_setting) { LogStash::Setting::SettingString.new(setting_name, nil, false, possible_strings) }
+  let(:possible_strings) { [] } # empty means any string passes
+
+  subject(:nullable_setting) { normal_setting.nullable }
+
+  it 'is a kind of Nullable' do
+    expect(nullable_setting).to be_a_kind_of(LogStash::Setting::NullableSetting)
+  end
+
+  it "retains the wrapped setting's name" do
+    expect(nullable_setting.name).to eq(setting_name)
+  end
+
+  context 'when unset' do
+    context '#validate_value' do
+      it 'does not error' do
+        expect { nullable_setting.validate_value }.to_not raise_error
+      end
+    end
+    context '#set?' do
+      it 'is false' do
+        expect(nullable_setting.set?).to be false
+      end
+    end
+    context '#value' do
+      it 'is nil' do
+        expect(nullable_setting.value).to be_nil
+      end
+    end
+  end
+
+  context 'when set' do
+    before(:each) { nullable_setting.set(candidate_value) }
+    context 'to an invalid wrong-type value' do
+      let(:candidate_value) { 127 } # wrong type, expects String
+      it 'is an invalid setting' do
+        expect { nullable_setting.validate_value }.to raise_error(java.lang.ClassCastException, a_string_including("class java.lang.Long cannot be cast to class java.lang.String"))
+      end
+    end
+    context 'to an invalid value not in the allow-list' do
+      let(:possible_strings) { %w(this that)}
+      let(:candidate_value) { "another" } # wrong type, expects String
+      it 'is an invalid setting' do
+        expect { nullable_setting.validate_value }.to raise_error(java.lang.IllegalArgumentException, a_string_including("Invalid value"))
+      end
+    end
+    context 'to a valid value' do
+      let(:candidate_value) { "hello" }
+      it 'is a valid setting' do
+        expect { nullable_setting.validate_value }.to_not raise_error
+        expect(nullable_setting.value).to eq candidate_value
+      end
+    end
+  end
+end
diff --git a/logstash-core/spec/logstash/settings/numeric_spec.rb b/logstash-core/spec/logstash/settings/numeric_spec.rb
index cab162fce..78e16ffa0 100644
--- a/logstash-core/spec/logstash/settings/numeric_spec.rb
+++ b/logstash-core/spec/logstash/settings/numeric_spec.rb
@@ -1,20 +1,37 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/settings"
 
-describe LogStash::Setting::Numeric do
+# Mirrored in java class org.logstash.settings.SettingNumeric
+describe LogStash::Setting::SettingNumeric do
   subject { described_class.new("a number", nil, false) }
   describe "#set" do
     context "when giving a string which doesn't represent a string" do
       it "should raise an exception" do
-        expect { subject.set("not-a-number") }.to raise_error(ArgumentError)
+        expect { subject.set("not-a-number") }.to raise_error(java.lang.IllegalArgumentException)
       end
     end
     context "when giving a string which represents a " do
       context "float" do
         it "should coerce that string to the number" do
           subject.set("1.1")
-          expect(subject.value).to eq(1.1)
+          expect(subject.value).to be_within(0.01).of(1.1)
         end
       end
       context "int" do
diff --git a/logstash-core/spec/logstash/settings/password_spec.rb b/logstash-core/spec/logstash/settings/password_spec.rb
new file mode 100644
index 000000000..ca90bc4f9
--- /dev/null
+++ b/logstash-core/spec/logstash/settings/password_spec.rb
@@ -0,0 +1,63 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require "spec_helper"
+require "logstash/settings"
+
+describe LogStash::Setting::Password do
+  let(:setting_name) { "secure" }
+  subject(:password_setting) { described_class.new(setting_name, nil, true) }
+
+  context 'when unset' do
+    it 'is valid' do
+      expect { password_setting.validate_value }.to_not raise_error
+      expect(password_setting.value).to be_a_kind_of LogStash::Util::Password
+      expect(password_setting.value.value).to be_nil
+    end
+    context '#set?' do
+      it 'returns false' do
+        expect(password_setting.set?).to be false
+      end
+    end
+  end
+
+  context 'when set' do
+    let(:setting_value) { "s3cUr3p4$$w0rd" }
+    before(:each) { password_setting.set(setting_value) }
+
+    it 'is valid' do
+      expect { password_setting.validate_value }.to_not raise_error
+      expect(password_setting.value).to be_a_kind_of LogStash::Util::Password
+      expect(password_setting.value.value).to eq setting_value
+    end
+    context '#set?' do
+      it 'returns true' do
+        expect(password_setting.set?).to be true
+      end
+    end
+  end
+
+  context '#set' do
+    context 'with an invalid non-string value' do
+      let(:setting_value) { 867_5309 }
+      it 'rejects the invalid value' do
+        expect { password_setting.set(setting_value) }.to raise_error(ArgumentError, "Setting `#{setting_name}` could not coerce non-string value to password")
+        expect(password_setting).to_not be_set
+      end
+    end
+  end
+end
diff --git a/logstash-core/spec/logstash/settings/port_range_spec.rb b/logstash-core/spec/logstash/settings/port_range_spec.rb
index 8a5fb6e53..367b558ab 100644
--- a/logstash-core/spec/logstash/settings/port_range_spec.rb
+++ b/logstash-core/spec/logstash/settings/port_range_spec.rb
@@ -1,10 +1,24 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/settings"
 require "spec_helper"
 
 describe LogStash::Setting::PortRange do
-
   context "When the value is an Integer" do
     subject { LogStash::Setting::PortRange.new("mynewtest", 9000) }
 
@@ -50,7 +64,6 @@ describe LogStash::Setting::PortRange do
       expect { subject }.to raise_error
     end
 
-
     it "raises an exception on update" do
       expect { LogStash::Setting::PortRange.new("mynewtest", 10000).set("dsfnsdknfksdnfjksdnfjns") }.to raise_error
     end
@@ -59,12 +72,10 @@ describe LogStash::Setting::PortRange do
   context "when the value is an unknown type" do
     subject { LogStash::Setting::PortRange.new("mynewtest", 0.1) }
 
-
     it "raises an argument error" do
       expect { subject }.to raise_error
     end
 
-
     it "raises an exception on update" do
       expect { LogStash::Setting::PortRange.new("mynewtest", 10000).set(0.1) }.to raise_error
     end
diff --git a/logstash-core/spec/logstash/settings/setting_with_deprecated_alias_spec.rb b/logstash-core/spec/logstash/settings/setting_with_deprecated_alias_spec.rb
new file mode 100644
index 000000000..4ba04fdff
--- /dev/null
+++ b/logstash-core/spec/logstash/settings/setting_with_deprecated_alias_spec.rb
@@ -0,0 +1,218 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require "spec_helper"
+require "logstash/settings"
+
+describe LogStash::Setting::SettingWithDeprecatedAlias do
+  let(:canonical_setting_name) { "canonical.setting" }
+  let(:deprecated_setting_name) { "legacy.setting" }
+
+  let(:default_value) { "DeFaUlT" }
+
+  let(:settings) { LogStash::Settings.new }
+  let(:canonical_setting) { LogStash::Setting::SettingString.new(canonical_setting_name, default_value, true) }
+
+  let(:events) { [] }
+
+  before(:each) do
+    java_import org.apache.logging.log4j.LogManager
+    logger = LogManager.getLogger("org.logstash.settings.DeprecatedAlias")
+    deprecated_logger = LogManager.getLogger("org.logstash.deprecation.settings.DeprecatedAlias")
+
+    @custom_appender = CustomAppender.new(events).tap {|appender| appender.start }
+
+    java_import org.apache.logging.log4j.Level
+    logger.addAppender(@custom_appender)
+    deprecated_logger.addAppender(@custom_appender)
+    # had to set level after appending as it was "error" for some reason
+    logger.setLevel(Level::INFO)
+    deprecated_logger.setLevel(Level::INFO)
+
+    expect(@custom_appender.started?).to be_truthy
+
+    allow(LogStash::Settings).to receive(:logger).and_return(double("SettingsLogger").as_null_object)
+    allow(LogStash::Settings).to receive(:deprecation_logger).and_return(double("SettingsDeprecationLogger").as_null_object)
+
+    settings.register(canonical_setting.with_deprecated_alias(deprecated_setting_name))
+  end
+
+  after(:each) do
+    events.clear
+    java_import org.apache.logging.log4j.LogManager
+    logger = LogManager.getLogger("org.logstash.settings.DeprecatedAlias")
+    deprecated_logger = LogManager.getLogger("org.logstash.deprecation.settings.DeprecatedAlias")
+    # The Logger's AbstractConfiguration contains a cache of Appender, by class name. The cache is updated
+    # iff is absent, so to make subsequent add_appender effective we have cleanup on teardown, else the new
+    # appender instance is simply not used by the logger
+    logger.remove_appender(@custom_appender)
+    deprecated_logger.remove_appender(@custom_appender)
+  end
+
+  shared_examples '#validate_value success' do
+    context '#validate_value' do
+      it "returns without raising" do
+        expect { settings.get_setting(canonical_setting_name).validate_value }.to_not raise_error
+      end
+    end
+  end
+
+  context "when neither canonical setting nor deprecated alias are set" do
+    it 'resolves to the default' do
+      expect(settings.get(canonical_setting_name)).to eq(default_value)
+    end
+
+    it 'does not produce a relevant deprecation warning' do
+      expect(LogStash::Settings.deprecation_logger).to_not have_received(:deprecated).with(a_string_including(deprecated_setting_name))
+    end
+
+    include_examples '#validate_value success'
+
+    context "#observe_post_process" do
+      it 'does not emit a deprecation warning' do
+        expect(LogStash::Settings.deprecation_logger).to_not receive(:deprecated).with(a_string_including(deprecated_setting_name))
+        settings.get_setting(deprecated_setting_name).observe_post_process
+        expect(events).to be_empty
+      end
+    end
+  end
+
+  context "when only the deprecated alias is set" do
+    let(:value) { "crusty_value" }
+
+    before(:each) do
+      settings.set(deprecated_setting_name, value)
+      settings.get_setting(deprecated_setting_name).observe_post_process
+    end
+
+    it 'resolves to the value provided for the deprecated alias' do
+      expect(settings.get(canonical_setting_name)).to eq(value)
+    end
+
+    it 'logs a deprecation warning' do
+      expect(events[0]).to include(deprecated_setting_name)
+    end
+
+    include_examples '#validate_value success'
+
+    context "#observe_post_process" do
+      it 're-emits the deprecation warning' do
+        settings.get_setting(deprecated_setting_name).observe_post_process
+        expect(events[0]).to include(deprecated_setting_name)
+      end
+    end
+
+    it 'validates deprecated alias' do
+      expect { settings.get_setting(canonical_setting_name).deprecated_alias.validate_value }.to_not raise_error
+    end
+
+    context 'using a boolean setting' do
+      let(:value) { true }
+      let(:default_value) { false }
+
+      let(:canonical_setting) { LogStash::Setting::Boolean.new(canonical_setting_name, default_value, true) }
+
+      it 'resolves to the value provided for the deprecated alias' do
+        expect(settings.get(canonical_setting_name)).to eq(true)
+      end
+
+      include_examples '#validate_value success'
+
+      it 'validates deprecated alias' do
+        expect { settings.get_setting(canonical_setting_name).deprecated_alias.validate_value }.to_not raise_error
+      end
+    end
+
+    context 'obsoleted version' do
+      before(:each) do
+        settings.register(subject.with_deprecated_alias(deprecated_name, "9"))
+      end
+
+      describe "ruby string setting" do
+        let(:new_value) { "ironman" }
+        let(:old_value) { "iron man" }
+        let(:canonical_name) { "iron.setting" }
+        let(:deprecated_name) { "iron.oxide.setting" }
+        subject { LogStash::Setting::SettingString.new(canonical_name, old_value, true) }
+
+        it 'logs a deprecation warning with target remove version' do
+          settings.set(deprecated_name, new_value)
+          settings.get_setting(deprecated_name).observe_post_process
+          expect(events.length).to be 2
+          expect(events[1]).to include(deprecated_name)
+          expect(events[1]).to include("version 9")
+        end
+      end
+      describe "java boolean setting" do
+        let(:new_value) { false }
+        let(:old_value) { true }
+        let(:canonical_name) { "bool.setting" }
+        let(:deprecated_name) { "boo.setting" }
+        subject { LogStash::Setting::Boolean.new(canonical_name, old_value, true) }
+
+        it 'does not raise error' do
+          expect { settings.set(deprecated_name, new_value) }.to_not raise_error
+        end
+      end
+    end
+  end
+
+  context "when only the canonical setting is set" do
+    before(:each) do
+      settings.set(canonical_setting_name, "shiny_value")
+    end
+
+    it "resolves to the value provided for the canonical setting" do
+      expect(settings.get(canonical_setting_name)).to eq("shiny_value")
+    end
+
+    it 'does not produce a relevant deprecation warning' do
+      settings.get_setting(deprecated_setting_name).observe_post_process
+      expect(events).to be_empty
+    end
+
+    include_examples '#validate_value success'
+
+    context "#observe_post_process" do
+      it 'does not emit a deprecation warning' do
+        settings.get_setting(deprecated_setting_name).observe_post_process
+        expect(events).to be_empty
+      end
+    end
+  end
+
+  context "when both the canonical setting and deprecated alias are set" do
+    before(:each) do
+      settings.set(deprecated_setting_name, "crusty_value")
+      settings.set(canonical_setting_name, "shiny_value")
+    end
+
+    context '#validate_value' do
+      it "raises helpful exception" do
+        expect { settings.get_setting(canonical_setting_name).validate_value }
+          .to raise_exception(java.lang.IllegalStateException, a_string_including("Both `#{canonical_setting_name}` and its deprecated alias `#{deprecated_setting_name}` have been set. Please only set `#{canonical_setting_name}`"))
+      end
+    end
+  end
+
+  context 'Settings#get on deprecated alias' do
+    it 'produces a WARN-level message to the logger' do
+      settings.get(deprecated_setting_name)
+      expect(events[0]).to include("setting `#{canonical_setting_name}` has been queried by its deprecated alias `#{deprecated_setting_name}`")
+    end
+  end
+end
diff --git a/logstash-core/spec/logstash/settings/splittable_string_array_spec.rb b/logstash-core/spec/logstash/settings/splittable_string_array_spec.rb
index b24f629aa..030ceec1d 100644
--- a/logstash-core/spec/logstash/settings/splittable_string_array_spec.rb
+++ b/logstash-core/spec/logstash/settings/splittable_string_array_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/settings"
 
@@ -39,7 +55,7 @@ describe LogStash::Setting::SplittableStringArray do
   end
 
   context "when defining a custom tokenizer" do
-    subject { described_class.new("testing", element_class, default_value, strict=true, ";") }
+    subject { described_class.new("testing", element_class, default_value, strict = true, ";") }
 
     let(:candidate) { "hello;ninja" }
 
@@ -48,4 +64,3 @@ describe LogStash::Setting::SplittableStringArray do
     end
   end
 end
-
diff --git a/logstash-core/spec/logstash/settings/string_array_spec.rb b/logstash-core/spec/logstash/settings/string_array_spec.rb
new file mode 100644
index 000000000..7dfd1a297
--- /dev/null
+++ b/logstash-core/spec/logstash/settings/string_array_spec.rb
@@ -0,0 +1,62 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'spec_helper'
+require 'logstash/settings'
+
+describe LogStash::Setting::StringArray do
+  let(:value) { [] }
+  let(:strict) { true }
+  let(:possible_strings) { nil }
+
+  subject { described_class.new('testing', value, strict, possible_strings) }
+
+  context 'when given a coercible string' do
+    context 'with 1 element' do
+      let(:value) { %w[hello] }
+
+      it 'returns 1 element' do
+        expect(subject.value).to match(%w[hello])
+      end
+    end
+
+    context 'with multiple elements' do
+      let(:value) { %w[hello ninja] }
+
+      it 'returns an array of strings' do
+        expect(subject.value).to match(value)
+      end
+    end
+  end
+
+  context 'when defining possible_strings' do
+    let(:possible_strings) { %w[foo bar] }
+    let(:value) { %w[bar foo] }
+
+    context 'when a single given value is not a possible_strings' do
+      it 'should raise an ArgumentError' do
+        expect { subject.set(%w[foo baz]) }.to raise_error(ArgumentError, "Failed to validate the setting \"#{subject.name}\" value(s): [\"baz\"]. Valid options are: #{possible_strings.inspect}")
+      end
+    end
+
+    context 'when multiple given values are not a possible_strings' do
+      it 'should raise an ArgumentError' do
+        expect { subject.set(%w[foo baz boot]) }.to raise_error(ArgumentError, "Failed to validate the setting \"#{subject.name}\" value(s): [\"baz\", \"boot\"]. Valid options are: #{possible_strings.inspect}")
+      end
+    end
+  end
+end
diff --git a/logstash-core/spec/logstash/settings/string_spec.rb b/logstash-core/spec/logstash/settings/string_spec.rb
index 69d835649..9c4c07ce9 100644
--- a/logstash-core/spec/logstash/settings/string_spec.rb
+++ b/logstash-core/spec/logstash/settings/string_spec.rb
@@ -1,14 +1,31 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/settings"
 
-describe LogStash::Setting::String do
+# Mirrored in java class org.logstash.settings.SettingStringTest
+describe LogStash::Setting::SettingString do
   let(:possible_values) { ["a", "b", "c"] }
   subject { described_class.new("mytext", possible_values.first, true, possible_values) }
   describe "#set" do
     context "when a value is given outside of possible_values" do
       it "should raise an ArgumentError" do
-        expect { subject.set("d") }.to raise_error(ArgumentError)
+        expect { subject.set("d") }.to raise_error(java.lang.IllegalArgumentException)
       end
     end
     context "when a value is given within possible_values" do
@@ -17,5 +34,10 @@ describe LogStash::Setting::String do
         expect(subject.value).to eq("a")
       end
     end
+    context "when a null value is given" do
+      it "raises an ArgumentError" do
+        expect { subject.set(nil) }.to raise_error(java.lang.IllegalArgumentException)
+      end
+    end
   end
 end
diff --git a/logstash-core/spec/logstash/settings/time_value_spec.rb b/logstash-core/spec/logstash/settings/time_value_spec.rb
index e1e4940d3..526a6812f 100644
--- a/logstash-core/spec/logstash/settings/time_value_spec.rb
+++ b/logstash-core/spec/logstash/settings/time_value_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/settings"
 
@@ -6,7 +22,8 @@ describe LogStash::Setting::TimeValue do
   subject { described_class.new("option", "-1") }
   describe "#set" do
     it "should coerce the default correctly" do
-      expect(subject.value).to eq(LogStash::Util::TimeValue.new(-1, :nanosecond).to_nanos)
+      expect(subject.value).to eq(LogStash::Util::TimeValue.new(-1, :nanosecond))
+      expect(subject.value.to_nanos).to eq(-1)
     end
 
     context "when a value is given outside of possible_values" do
@@ -17,14 +34,22 @@ describe LogStash::Setting::TimeValue do
     context "when a value is given as a time value" do
       it "should set the value" do
         subject.set("18m")
-        expect(subject.value).to eq(LogStash::Util::TimeValue.new(18, :minute).to_nanos)
+        expect(subject.value).to eq(LogStash::Util::TimeValue.new(18, :minute))
+        expect(subject.value.to_nanos).to eq(18 * 60 * 1_000_000_000)
       end
     end
 
     context "when a value is given as a nanosecond" do
+      let(:deprecation_logger_stub) { double("DeprecationLogger").as_null_object }
+      before(:each) do
+        allow(subject).to receive(:deprecation_logger).and_return(deprecation_logger_stub)
+      end
       it "should set the value" do
         subject.set(5)
-        expect(subject.value).to eq(LogStash::Util::TimeValue.new(5, :nanosecond).to_nanos)
+        expect(subject.value).to eq(LogStash::Util::TimeValue.new(5, :nanosecond))
+        expect(subject.value.to_nanos).to eq(5)
+
+        expect(deprecation_logger_stub).to have_received(:deprecated).with(/units will be required/).once
       end
     end
   end
diff --git a/logstash-core/spec/logstash/settings/writable_directory_spec.rb b/logstash-core/spec/logstash/settings/writable_directory_spec.rb
index be00ce9f0..413465449 100644
--- a/logstash-core/spec/logstash/settings/writable_directory_spec.rb
+++ b/logstash-core/spec/logstash/settings/writable_directory_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/settings"
 require "tmpdir"
@@ -32,10 +48,9 @@ describe LogStash::Setting::WritableDirectory do
     before { subject.set(path) }
 
     context "when the directory is missing" do
-
       context "and the parent is writable" do
-        after { 
-          Dir.unlink(path) 
+        after {
+          Dir.unlink(path)
         }
         it "creates the directory" do
           subject.value # need to invoke `#value` to make it do the work.
@@ -88,7 +103,6 @@ describe LogStash::Setting::WritableDirectory do
         it_behaves_like "failure"
       end unless LogStash::Environment.windows?
 
-      
       context "but is a symlink" do
         before { FileUtils.symlink("whatever", path) }
         it_behaves_like "failure"
diff --git a/logstash-core/spec/logstash/settings_spec.rb b/logstash-core/spec/logstash/settings_spec.rb
index 3e9ed5fda..afd0ed630 100644
--- a/logstash-core/spec/logstash/settings_spec.rb
+++ b/logstash-core/spec/logstash/settings_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/util/substitution_variables"
 require "logstash/settings"
@@ -7,6 +23,7 @@ require "fileutils"
 describe LogStash::Settings do
   let(:numeric_setting_name) { "number" }
   let(:numeric_setting) { LogStash::Setting.new(numeric_setting_name, Numeric, 1) }
+
   describe "#register" do
     context "if setting has already been registered" do
       before :each do
@@ -16,7 +33,7 @@ describe LogStash::Settings do
         expect { subject.register(numeric_setting) }.to raise_error
       end
       it "registered? should return true" do
-        expect( subject.registered?(numeric_setting_name)).to be_truthy
+        expect(subject.registered?(numeric_setting_name)).to be_truthy
       end
     end
     context "if setting hasn't been registered" do
@@ -24,10 +41,11 @@ describe LogStash::Settings do
         expect { subject.register(numeric_setting) }.to_not raise_error
       end
       it "registered? should return false" do
-        expect( subject.registered?(numeric_setting_name)).to be_falsey
+        expect(subject.registered?(numeric_setting_name)).to be_falsey
       end
     end
   end
+
   describe "#get_setting" do
     context "if setting has been registered" do
       before :each do
@@ -43,6 +61,29 @@ describe LogStash::Settings do
       end
     end
   end
+
+  describe "#to_hash" do
+    let(:java_deprecated_alias) { LogStash::Setting::Boolean.new("java.actual", true).with_deprecated_alias("java.deprecated") }
+    let(:ruby_deprecated_alias) { LogStash::Setting::PortRange.new("ruby.actual", 9600..9700).with_deprecated_alias("ruby.deprecated") }
+    let(:non_deprecated) { LogStash::Setting::Boolean.new("plain_setting", false) }
+
+    before :each do
+      subject.register(java_deprecated_alias)
+      subject.register(ruby_deprecated_alias)
+      subject.register(non_deprecated)
+    end
+
+    it "filter deprecated alias settings" do
+      generated_settings_hash = subject.to_hash
+
+      expect(generated_settings_hash).not_to have_key("java.deprecated")
+      expect(generated_settings_hash).not_to have_key("ruby.deprecated")
+      expect(generated_settings_hash).to have_key("java.actual")
+      expect(generated_settings_hash).to have_key("ruby.actual")
+      expect(generated_settings_hash).to have_key("plain_setting")
+    end
+  end
+
   describe "#get_subset" do
     let(:numeric_setting_1) { LogStash::Setting.new("num.1", Numeric, 1) }
     let(:numeric_setting_2) { LogStash::Setting.new("num.2", Numeric, 2) }
@@ -94,32 +135,55 @@ describe LogStash::Settings do
       end
     end
   end
-  
+
+  describe '#names' do
+    subject(:settings) { described_class.new }
+    before(:each) do
+      settings.register(LogStash::Setting.new("one.two.three", String, "123", false))
+      settings.register(LogStash::Setting.new("this.that", Integer, 123, false))
+    end
+    it 'returns a list of setting names' do
+      expect(settings.names).to contain_exactly("one.two.three", "this.that")
+    end
+  end
+
   describe "post_process" do
     subject(:settings) { described_class.new }
-    
+
     before do
       settings.on_post_process do
         settings.set("baz", "bot")
       end
-      settings.register(LogStash::Setting::String.new("foo", "bar"))
-      settings.register(LogStash::Setting::String.new("baz", "somedefault"))
+      settings.register(LogStash::Setting::SettingString.new("foo", "bar"))
+      settings.register(LogStash::Setting::SettingString.new("baz", "somedefault"))
       settings.post_process
     end
-    
+
     it "should run the post process callbacks" do
       expect(settings.get("baz")).to eq("bot")
     end
-    
+
     it "should preserve original settings" do
       expect(settings.get("foo")).to eq("bar")
     end
+
+    context 'when a registered setting responds to `observe_post_process`' do
+      let(:observe_post_process_setting) do
+        LogStash::Setting::Boolean.new("this.that", true).tap { |s| allow(s).to receive(:observe_post_process) }
+      end
+      subject(:settings) do
+        described_class.new.tap { |s| s.register(observe_post_process_setting) }
+      end
+      it 'it sends `observe_post_process`' do
+        expect(observe_post_process_setting).to have_received(:observe_post_process)
+      end
+    end
   end
 
   context "transient settings" do
     subject do
       settings = described_class.new
-      settings.register(LogStash::Setting::String.new("exist", "bonsoir"))
+      settings.register(LogStash::Setting::SettingString.new("exist", "bonsoir"))
       settings
     end
 
@@ -155,25 +219,27 @@ describe LogStash::Settings do
   end
 
   describe "#from_yaml" do
-
     before :each do
       LogStash::SETTINGS.set("keystore.file", File.join(File.dirname(__FILE__), "../../src/test/resources/logstash.keystore.with.default.pass"))
+      LogStash::Util::SubstitutionVariables.send(:reset_secret_store)
+    end
+
+    after(:each) do
+      LogStash::Util::SubstitutionVariables.send(:reset_secret_store)
     end
 
     context "placeholders in flat logstash.yml" do
-
-
       after do
         ENV.delete('SOME_LOGSTASH_SPEC_ENV_VAR')
         ENV.delete('some.logstash.spec.env.var')
         ENV.delete('a')
       end
-      
+
       subject do
         settings = described_class.new
-        settings.register(LogStash::Setting::String.new("interpolated_env", "missing"))
-        settings.register(LogStash::Setting::String.new("with_dot_env", "missing"))
-        settings.register(LogStash::Setting::String.new("interpolated_store", "missing"))
+        settings.register(LogStash::Setting::SettingString.new("interpolated_env", "missing"))
+        settings.register(LogStash::Setting::SettingString.new("with_dot_env", "missing"))
+        settings.register(LogStash::Setting::SettingString.new("interpolated_store", "missing"))
         settings
       end
 
@@ -207,10 +273,38 @@ describe LogStash::Settings do
     end
   end
 
-  context "placeholders in nested logstash.yml" do
+  describe "#password_policy" do
+    let(:password_policies) { {
+      "mode": "ERROR",
+      "length": { "minimum": "8"},
+      "include": { "upper": "REQUIRED", "lower": "REQUIRED", "digit": "REQUIRED", "symbol": "REQUIRED" }
+    } }
 
+    context "when running PasswordValidator coerce" do
+      it "raises an error when supplied value is not LogStash::Util::Password" do
+        expect {
+          LogStash::Setting::ValidatedPassword.new("test.validated.password", "testPassword", password_policies)
+        }.to raise_error(ArgumentError, a_string_including("Setting `test.validated.password` could not coerce LogStash::Util::Password value to password"))
+      end
+
+      it "fails on validation" do
+        password = LogStash::Util::Password.new("Password!")
+        expect {
+          LogStash::Setting::ValidatedPassword.new("test.validated.password", password, password_policies)
+        }.to raise_error(ArgumentError, a_string_including("Password must contain at least one digit between 0 and 9."))
+      end
+
+      it "validates the password successfully" do
+        password = LogStash::Util::Password.new("Password123!")
+        expect(LogStash::Setting::ValidatedPassword.new("test.validated.password", password, password_policies)).to_not be_nil
+      end
+    end
+  end
+
+  context "placeholders in nested logstash.yml" do
     before :each do
       LogStash::SETTINGS.set("keystore.file", File.join(File.dirname(__FILE__), "../../src/test/resources/logstash.keystore.with.default.pass"))
+      LogStash::Util::SubstitutionVariables.send(:reset_secret_store)
     end
 
     before do
@@ -225,6 +319,10 @@ describe LogStash::Settings do
       ENV.delete('a')
     end
 
+    after(:each) do
+      LogStash::Util::SubstitutionVariables.send(:reset_secret_store)
+    end
+
     subject do
       settings = described_class.new
       settings.register(LogStash::Setting::ArrayCoercible.new("host", String, []))
diff --git a/logstash-core/spec/logstash/shutdown_watcher_spec.rb b/logstash-core/spec/logstash/shutdown_watcher_spec.rb
index 6d2f2fc2b..1526126ea 100644
--- a/logstash-core/spec/logstash/shutdown_watcher_spec.rb
+++ b/logstash-core/spec/logstash/shutdown_watcher_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 
 describe LogStash::ShutdownWatcher do
@@ -11,9 +27,10 @@ describe LogStash::ShutdownWatcher do
 
   before :each do
     allow(pipeline).to receive(:reporter).and_return(reporter)
-    allow(pipeline).to receive(:thread).and_return(Thread.current)
+    allow(pipeline).to receive(:finished_execution?).and_return(false)
     allow(reporter).to receive(:snapshot).and_return(reporter_snapshot)
     allow(reporter_snapshot).to receive(:o_simple_hash).and_return({})
+    allow(pipeline).to receive(:worker_threads_draining?).and_return(false)
   end
 
   context "when pipeline is stalled" do
@@ -24,7 +41,6 @@ describe LogStash::ShutdownWatcher do
     end
 
     describe ".unsafe_shutdown = false" do
-
       before :each do
         subject.class.unsafe_shutdown = false
       end
@@ -47,7 +63,6 @@ describe LogStash::ShutdownWatcher do
     end
 
     describe ".unsafe_shutdown = true" do
-
       before :each do
         subject.class.unsafe_shutdown = true
       end
@@ -62,7 +77,6 @@ describe LogStash::ShutdownWatcher do
     end
 
     describe ".unsafe_shutdown = false" do
-
       before :each do
         subject.class.unsafe_shutdown = false
       end
@@ -77,4 +91,75 @@ describe LogStash::ShutdownWatcher do
       end
     end
   end
+
+  context "when pipeline inflight events are stalled" do
+    let(:inflight_counters) { (1..5000).to_a }
+
+    before :each do
+      allow(reporter_snapshot).to receive(:inflight_count).and_return(*inflight_counters)
+    end
+
+    context "and threads are stalled" do
+      before :each do
+        allow(reporter_snapshot).to receive(:stalling_threads) {{}}
+      end
+
+      describe ".unsafe_shutdown = false" do
+        before :each do
+          subject.class.unsafe_shutdown = false
+        end
+
+        it "shouldn't force the shutdown" do
+          expect(subject).to_not receive(:force_exit)
+          thread = Thread.new(subject) {|subject| subject.start }
+          sleep 0.1 until subject.attempts_count > check_threshold
+          subject.stop!
+          expect(thread.join(60)).to_not be_nil
+        end
+      end
+    end
+
+    context "and threads are not stalled" do
+      before :each do
+        allow(reporter_snapshot).to receive(:stalling_threads) {{ id: rand(100)}}
+      end
+
+      describe ".unsafe_shutdown = false" do
+        before :each do
+          subject.class.unsafe_shutdown = false
+        end
+
+        it "shouldn't force the shutdown" do
+          expect(subject).to_not receive(:force_exit)
+          thread = Thread.new(subject) {|subject| subject.start }
+          sleep 0.1 until subject.attempts_count > check_threshold
+          subject.stop!
+          expect(thread.join(60)).to_not be_nil
+        end
+      end
+    end
+
+    context "and all reported inflight_count are zeros" do
+      let(:inflight_counters) { Array.new(5000, 0) }
+
+      before :each do
+        subject.class.unsafe_shutdown = true
+        allow(reporter_snapshot).to receive(:stalling_threads) {{ id: rand(100)}}
+      end
+
+      describe ".unsafe_shutdown = false" do
+        before :each do
+          subject.class.unsafe_shutdown = false
+        end
+
+        it "shouldn't force the shutdown" do
+          expect(subject).to_not receive(:force_exit)
+          thread = Thread.new(subject) {|subject| subject.start }
+          sleep 0.1 until subject.attempts_count > check_threshold
+          subject.stop!
+          expect(thread.join(60)).to_not be_nil
+        end
+      end
+    end
+  end
 end
diff --git a/logstash-core/spec/logstash/state_resolver_spec.rb b/logstash-core/spec/logstash/state_resolver_spec.rb
index 28abd8999..df1febfbc 100644
--- a/logstash-core/spec/logstash/state_resolver_spec.rb
+++ b/logstash-core/spec/logstash/state_resolver_spec.rb
@@ -1,10 +1,24 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require_relative "../support/helpers"
 require_relative "../support/matchers"
 require "logstash/state_resolver"
-require "logstash/config/pipeline_config"
-require "logstash/pipeline"
 require "ostruct"
 require "digest"
 
@@ -17,7 +31,7 @@ describe LogStash::StateResolver do
   end
 
   after do
-    # ensure that the the created pipeline are closed
+    # ensure that the created pipeline are closed
     pipelines.running_pipelines.each { |_, pipeline| pipeline.close }
   end
 
@@ -37,7 +51,7 @@ describe LogStash::StateResolver do
 
       it "returns some actions" do
         expect(subject.resolve(pipelines, pipeline_configs)).to have_actions(
-          [:create, :hello_world],
+          [:Create, :hello_world],
         )
       end
     end
@@ -48,27 +62,27 @@ describe LogStash::StateResolver do
       let(:main_pipeline) { mock_pipeline(:main) }
       let(:main_pipeline_config) { main_pipeline.pipeline_config }
       let(:pipelines) do
-        r =  LogStash::PipelinesRegistry.new
+        r = LogStash::PipelinesRegistry.new
         r.create_pipeline(:main, main_pipeline) { true }
         r
       end
 
       context "when the pipeline config contains a new one and the existing" do
-        let(:pipeline_configs) { [mock_pipeline_config(:hello_world), main_pipeline_config ] }
+        let(:pipeline_configs) { [mock_pipeline_config(:hello_world), main_pipeline_config] }
 
         it "creates the new one and keep the other one" do
           expect(subject.resolve(pipelines, pipeline_configs)).to have_actions(
-            [:create, :hello_world],
+            [:Create, :hello_world],
           )
         end
 
         context "when the pipeline config contains only the new one" do
           let(:pipeline_configs) { [mock_pipeline_config(:hello_world)] }
 
-          it "creates the new one and stop the old one one" do
+          it "creates the new one and stop and delete the old one one" do
             expect(subject.resolve(pipelines, pipeline_configs)).to have_actions(
-              [:create, :hello_world],
-              [:stop, :main]
+              [:Create, :hello_world],
+              [:StopAndDelete, :main]
             )
           end
         end
@@ -76,9 +90,9 @@ describe LogStash::StateResolver do
         context "when the pipeline config contains no pipeline" do
           let(:pipeline_configs) { [] }
 
-          it "stops the old one one" do
+          it "stops and delete the old one one" do
             expect(subject.resolve(pipelines, pipeline_configs)).to have_actions(
-              [:stop, :main]
+              [:StopAndDelete, :main]
             )
           end
         end
@@ -88,7 +102,7 @@ describe LogStash::StateResolver do
 
           it "reloads the old one one" do
             expect(subject.resolve(pipelines, pipeline_configs)).to have_actions(
-              [:reload, :main]
+              [:Reload, :main]
             )
           end
         end
@@ -97,7 +111,7 @@ describe LogStash::StateResolver do
 
     context "when we have a lot of pipeline running" do
       let(:pipelines) do
-        r =  LogStash::PipelinesRegistry.new
+        r = LogStash::PipelinesRegistry.new
         r.create_pipeline(:main1, mock_pipeline(:main1)) { true }
         r.create_pipeline(:main2, mock_pipeline(:main2)) { true }
         r.create_pipeline(:main3, mock_pipeline(:main3)) { true }
@@ -120,13 +134,13 @@ describe LogStash::StateResolver do
 
         it "generates actions required to converge" do
           expect(subject.resolve(pipelines, pipeline_configs)).to have_actions(
-            [:create, :main7],
-            [:create, :main9],
-            [:reload, :main3],
-            [:reload, :main5],
-            [:stop, :main2],
-            [:stop, :main4],
-            [:stop, :main6]
+            [:Create, :main7],
+            [:Create, :main9],
+            [:Reload, :main3],
+            [:Reload, :main5],
+            [:StopAndDelete, :main2],
+            [:StopAndDelete, :main4],
+            [:StopAndDelete, :main6]
           )
         end
       end
@@ -145,17 +159,56 @@ describe LogStash::StateResolver do
 
         it "creates the system pipeline before user defined pipelines" do
           expect(subject.resolve(pipelines, pipeline_configs)).to have_actions(
-            [:create, :monitoring],
-            [:create, :main7],
-            [:create, :main9],
-            [:reload, :main3],
-            [:reload, :main5],
-            [:stop, :main2],
-            [:stop, :main4],
-            [:stop, :main6]
+            [:Create, :monitoring],
+            [:Create, :main7],
+            [:Create, :main9],
+            [:Reload, :main3],
+            [:Reload, :main5],
+            [:StopAndDelete, :main2],
+            [:StopAndDelete, :main4],
+            [:StopAndDelete, :main6]
           )
         end
       end
     end
+
+    context "when a pipeline stops" do
+      let(:main_pipeline) { mock_pipeline(:main) }
+      let(:main_pipeline_config) { main_pipeline.pipeline_config }
+      let(:pipelines) do
+        r = LogStash::PipelinesRegistry.new
+        r.create_pipeline(:main, main_pipeline) { true }
+        r
+      end
+
+      before do
+        expect(main_pipeline).to receive(:finished_execution?).at_least(:once).and_return(true)
+      end
+
+      context "when pipeline config contains a new one and the existing" do
+        let(:pipeline_configs) { [mock_pipeline_config(:hello_world), main_pipeline_config] }
+
+        it "creates the new one and keep the other one stop" do
+          expect(subject.resolve(pipelines, pipeline_configs)).to have_actions([:Create, :hello_world])
+          expect(pipelines.non_running_pipelines.size).to eq(1)
+        end
+      end
+
+      context "when pipeline config contains an updated pipeline" do
+        let(:pipeline_configs) { [mock_pipeline_config(:main, "input { generator {}}")] }
+
+        it "should reload the stopped pipeline" do
+          expect(subject.resolve(pipelines, pipeline_configs)).to have_actions([:Reload, :main])
+        end
+      end
+
+      context "when pipeline config contains no pipeline" do
+        let(:pipeline_configs) { [] }
+
+        it "should delete the stopped one" do
+          expect(subject.resolve(pipelines, pipeline_configs)).to have_actions([:Delete, :main])
+        end
+      end
+    end
   end
 end
diff --git a/logstash-core/spec/logstash/util/accessors_spec.rb b/logstash-core/spec/logstash/util/accessors_spec.rb
index e3c1a73e6..2954db047 100644
--- a/logstash-core/spec/logstash/util/accessors_spec.rb
+++ b/logstash-core/spec/logstash/util/accessors_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 
 # this is to skip specs when running agains an alternate logstash-core-event implementation
@@ -12,9 +28,7 @@ rescue LoadError
 end
 
 describe "LogStash::Util::Accessors", :if => class_exists do
-
   context "using simple field" do
-
     it "should get value of word key" do
       str = "hello"
       data = { "hello" => "world" }
@@ -73,24 +87,23 @@ describe "LogStash::Util::Accessors", :if => class_exists do
   end
 
   context "using field path" do
-
     it "should get shallow string value of word key" do
       str = "[hello]"
-      data = { "hello" =>  "world" }
+      data = { "hello" => "world" }
       accessors = LogStash::Util::Accessors.new(data)
       expect(accessors.get(str)).to eq("world")
     end
 
     it "should get shallow string value of key with spaces" do
       str = "[hel lo]"
-      data = { "hel lo" =>  "world" }
+      data = { "hel lo" => "world" }
       accessors = LogStash::Util::Accessors.new(data)
       expect(accessors.get(str)).to eq("world")
     end
 
     it "should get shallow string value of numeric key string" do
       str = "[1]"
-      data = { "1" =>  "world" }
+      data = { "1" => "world" }
       accessors = LogStash::Util::Accessors.new(data)
       expect(accessors.get(str)).to eq("world")
     end
@@ -107,7 +120,7 @@ describe "LogStash::Util::Accessors", :if => class_exists do
       data = {}
       accessors = LogStash::Util::Accessors.new(data)
       expect(accessors.get(str)).to be_nil
-      expect(data).to  be_empty
+      expect(data).to be_empty
       expect(accessors.set(str, "foo")).to eq("foo")
       expect(data).to eq({ "hello" => {"world" => "foo"} })
     end
@@ -150,7 +163,7 @@ describe "LogStash::Util::Accessors", :if => class_exists do
       str = "[hello][0]"
       data = {"hello" => ["foo", "bar"]}
       accessors = LogStash::Util::Accessors.new(data)
-      expect(accessors.set(str, "world") ).to eq("world")
+      expect(accessors.set(str, "world")).to eq("world")
       expect(data).to eq({"hello" => ["world", "bar"]})
     end
 
@@ -162,7 +175,7 @@ describe "LogStash::Util::Accessors", :if => class_exists do
     end
 
     it "should retrieve array item containing hash" do
-      data = { "hello" => { "world" => [ { "a" => 123 }, { "b" => 345 } ], "bar" => "baz" } }
+      data = { "hello" => { "world" => [{ "a" => 123 }, { "b" => 345 }], "bar" => "baz" } }
       accessors = LogStash::Util::Accessors.new(data)
       expect(accessors.get("[hello][world][0][a]")).to eq(data["hello"]["world"][0]["a"])
       expect(accessors.get("[hello][world][1][b]")).to eq(data["hello"]["world"][1]["b"])
diff --git a/logstash-core/spec/logstash/util/buftok_spec.rb b/logstash-core/spec/logstash/util/buftok_spec.rb
index bcb37a6aa..3d7b4b199 100644
--- a/logstash-core/spec/logstash/util/buftok_spec.rb
+++ b/logstash-core/spec/logstash/util/buftok_spec.rb
@@ -1,8 +1,23 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 
 describe  FileWatch::BufferedTokenizer  do
-
   subject { FileWatch::BufferedTokenizer.new }
 
   it "should tokenize a single token" do
@@ -27,4 +42,53 @@ describe  FileWatch::BufferedTokenizer  do
     expect(subject.extract("\n")).to eq([""])
     expect(subject.extract("\n\n\n")).to eq(["", "", ""])
   end
+
+  describe 'flush' do
+    let(:data) { "content without a delimiter" }
+    before(:each) do
+      subject.extract(data)
+    end
+
+    it "emits the contents of the buffer" do
+      expect(subject.flush).to eq(data)
+    end
+
+    it "resets the state of the buffer" do
+      subject.flush
+      expect(subject).to be_empty
+    end
+
+    context 'with decode_size_limit_bytes' do
+      subject { FileWatch::BufferedTokenizer.new("\n", 100) }
+
+      it "validates size limit" do
+        expect { FileWatch::BufferedTokenizer.new("\n", -101) }.to raise_error(java.lang.IllegalArgumentException, "Size limit must be positive")
+        expect { FileWatch::BufferedTokenizer.new("\n", 0) }.to raise_error(java.lang.IllegalArgumentException, "Size limit must be positive")
+      end
+
+      it "emits the contents of the buffer" do
+        expect(subject.flush).to eq(data)
+      end
+
+      it "resets the state of the buffer" do
+        subject.flush
+        expect(subject).to be_empty
+      end
+    end
+  end
+
+  context 'with delimiter' do
+    subject { FileWatch::BufferedTokenizer.new(delimiter) }
+
+    let(:delimiter) { "||" }
+
+    it "should tokenize multiple token" do
+      expect(subject.extract("foo||b|r||")).to eq(["foo", "b|r"])
+    end
+
+    it "should ignore empty payload" do
+      expect(subject.extract("")).to eq([])
+      expect(subject.extract("foo||bar")).to eq(["foo"])
+    end
+  end
 end
diff --git a/logstash-core/spec/logstash/util/byte_value_spec.rb b/logstash-core/spec/logstash/util/byte_value_spec.rb
index a18e4ff11..cacb8b1fd 100644
--- a/logstash-core/spec/logstash/util/byte_value_spec.rb
+++ b/logstash-core/spec/logstash/util/byte_value_spec.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/util/byte_value"
 require "flores/random"
 
diff --git a/logstash-core/spec/logstash/util/charset_spec.rb b/logstash-core/spec/logstash/util/charset_spec.rb
index 5111a0c7e..62097f3cd 100644
--- a/logstash-core/spec/logstash/util/charset_spec.rb
+++ b/logstash-core/spec/logstash/util/charset_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/util/charset"
 
@@ -34,7 +50,6 @@ describe LogStash::Util::Charset do
         expect(subject.convert(data).encoding.name).to eq("UTF-8")
       end
     end
-
   end
 
   context "with valid non UTF-8 source encoding" do
@@ -45,7 +60,7 @@ describe LogStash::Util::Charset do
         ["foobar", "foobar"],
         ["\xE0 Montr\xE9al", "à Montréal"],
       ]
-      samples.map{|(a, b)| [a.force_encoding("ISO-8859-1"), b]}.each do |(a, b)|
+      samples.map {|(a, b)| [a.force_encoding("ISO-8859-1"), b]}.each do |(a, b)|
         expect(a.encoding.name).to eq("ISO-8859-1")
         expect(b.encoding.name).to eq("UTF-8")
         expect(a.valid_encoding?).to eq(true)
@@ -63,7 +78,7 @@ describe LogStash::Util::Charset do
         ["\xE0 Montr\xE9al", "� Montr�al"],
         ["\xCE\xBA\xCF\x8C\xCF\x83\xCE\xBC\xCE\xB5", "����������"],
       ]
-      samples.map{|(a, b)| [a.force_encoding("ASCII-8BIT"), b]}.each do |(a, b)|
+      samples.map {|(a, b)| [a.force_encoding("ASCII-8BIT"), b]}.each do |(a, b)|
         expect(a.encoding.name).to eq("ASCII-8BIT")
         expect(b.encoding.name).to eq("UTF-8")
         expect(subject.convert(a).encoding.name).to eq("UTF-8")
diff --git a/logstash-core/spec/logstash/util/cloud_setting_id_spec.rb b/logstash-core/spec/logstash/util/cloud_setting_id_spec.rb
index e46afb836..ca3ae8893 100644
--- a/logstash-core/spec/logstash/util/cloud_setting_id_spec.rb
+++ b/logstash-core/spec/logstash/util/cloud_setting_id_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/util/cloud_setting_id"
 
@@ -8,7 +24,7 @@ describe LogStash::Util::CloudSettingId do
 
   describe "when given unacceptable input" do
     it "a nil input does not raise an exception" do
-      expect{described_class.new(nil)}.not_to raise_exception
+      expect {described_class.new(nil)}.not_to raise_exception
     end
     it "when given a nil input, the accessors are all nil" do
       cloud_id = described_class.new(nil)
@@ -25,7 +41,7 @@ describe LogStash::Util::CloudSettingId do
       let(:raw) {%w(first second)}
       let(:input) { described_class.cloud_id_encode(*raw) }
       it "raises an error" do
-        expect{subject}.to raise_exception(ArgumentError, "Cloud Id, after decoding, is invalid. Format: '<segment1>$<segment2>$<segment3>'. Received: \"#{raw[0]}$#{raw[1]}\".")
+        expect {subject}.to raise_exception(ArgumentError, "Cloud Id, after decoding, is invalid. Format: '<segment1>$<segment2>$<segment3>'. Received: \"#{raw[0]}$#{raw[1]}\".")
       end
     end
 
@@ -33,7 +49,7 @@ describe LogStash::Util::CloudSettingId do
       let(:raw) {["first", "", "third"]}
       let(:input) { described_class.cloud_id_encode(*raw) }
       it "raises an error" do
-        expect{subject}.to raise_exception(ArgumentError, "Cloud Id, after decoding, is invalid. Format: '<segment1>$<segment2>$<segment3>'. Received: \"#{raw[0]}$#{raw[1]}$#{raw[2]}\".")
+        expect {subject}.to raise_exception(ArgumentError, "Cloud Id, after decoding, is invalid. Format: '<segment1>$<segment2>$<segment3>'. Received: \"#{raw[0]}$#{raw[1]}$#{raw[2]}\".")
       end
     end
 
@@ -41,7 +57,7 @@ describe LogStash::Util::CloudSettingId do
       let(:raw) {%w(us-east-1.aws.found.io undefined my-kibana)}
       let(:input) { described_class.cloud_id_encode(*raw) }
       it "raises an error" do
-        expect{subject}.to raise_exception(ArgumentError, "Cloud Id, after decoding, elasticsearch segment is 'undefined', literally.")
+        expect {subject}.to raise_exception(ArgumentError, "Cloud Id, after decoding, elasticsearch segment is 'undefined', literally.")
       end
     end
 
@@ -49,7 +65,7 @@ describe LogStash::Util::CloudSettingId do
       let(:raw) {%w(us-east-1.aws.found.io my-elastic-cluster undefined)}
       let(:input) { described_class.cloud_id_encode(*raw) }
       it "raises an error" do
-        expect{subject}.to raise_exception(ArgumentError, "Cloud Id, after decoding, the kibana segment is 'undefined', literally. You may need to enable Kibana in the Cloud UI.")
+        expect {subject}.to raise_exception(ArgumentError, "Cloud Id, after decoding, the kibana segment is 'undefined', literally. You may need to enable Kibana in the Cloud UI.")
       end
     end
   end
@@ -143,4 +159,60 @@ describe LogStash::Util::CloudSettingId do
       expect(subject.other_identifiers).to eq(["anotherid", "andanother"])
     end
   end
+
+  describe "when given acceptable input (with empty kibana uuid), the accessors:" do
+    let(:input) { "a-test:ZWNlLmhvbWUubGFuJHRlc3Qk" } # ece.home.lan$test$
+
+    it '#original has a value' do
+      expect(subject.original).to eq(input)
+    end
+    it '#decoded has a value' do
+      expect(subject.decoded).to eq("ece.home.lan$test$")
+    end
+    it '#label has a value' do
+      expect(subject.label).to eq("a-test")
+    end
+    it '#elasticsearch_host has a value' do
+      expect(subject.elasticsearch_host).to eq("test.ece.home.lan:443")
+    end
+    it '#elasticsearch_scheme has a value' do
+      expect(subject.elasticsearch_scheme).to eq("https")
+    end
+    it '#kibana_host has a value' do
+      # NOTE: kibana part is not relevant -> this is how python/beats(go) code behaves
+      expect(subject.kibana_host).to eq(".ece.home.lan:443")
+    end
+    it '#kibana_scheme has a value' do
+      expect(subject.kibana_scheme).to eq("https")
+    end
+    it '#to_s has a value of #decoded' do
+      expect(subject.to_s).to eq(subject.decoded)
+    end
+  end
+
+  describe "a lengthy real-world input, the accessors:" do
+    let(:input) do
+      "ZWFzdHVzMi5henVyZS5lbGFzdGljLWNsb3VkLmNvbTo5MjQzJDQwYjM0MzExNmNmYTRlYmNiNzZjMTFlZTIzMjlmOTJkJDQzZDA5MjUyNTAyYzQxODlhMzc2ZmQwY2YyY2QwODQ4"
+      # eastus2.azure.elastic-cloud.com:9243$40b343116cfa4ebcb76c11ee2329f92d$43d09252502c4189a376fd0cf2cd0848
+    end
+
+    it '#original has a value' do
+      expect(subject.original).to eq(input)
+    end
+    it '#decoded has a value' do
+      expect(subject.decoded).to eq("eastus2.azure.elastic-cloud.com:9243$40b343116cfa4ebcb76c11ee2329f92d$43d09252502c4189a376fd0cf2cd0848")
+    end
+    it '#label has a value' do
+      expect(subject.label).to eq("")
+    end
+    it '#elasticsearch_host has a value' do
+      expect(subject.elasticsearch_host).to eq("40b343116cfa4ebcb76c11ee2329f92d.eastus2.azure.elastic-cloud.com:9243")
+    end
+    it '#kibana_host has a value' do
+      expect(subject.kibana_host).to eq("43d09252502c4189a376fd0cf2cd0848.eastus2.azure.elastic-cloud.com:9243")
+    end
+    it '#to_s has a value of #decoded' do
+      expect(subject.to_s).to eq(subject.decoded)
+    end
+  end
 end
diff --git a/logstash-core/spec/logstash/util/duration_formatter_spec.rb b/logstash-core/spec/logstash/util/duration_formatter_spec.rb
deleted file mode 100644
index 44c0eb646..000000000
--- a/logstash-core/spec/logstash/util/duration_formatter_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# encoding: utf-8
-require "logstash/util/duration_formatter"
-require "spec_helper"
-
-describe LogStash::Util::DurationFormatter do
-  let(:duration) { 3600 * 1000 } # in milliseconds
-
-  it "returns a human format" do
-    expect(subject.human_format(duration)).to eq("1h")
-  end
-end
diff --git a/logstash-core/spec/logstash/util/java_version_spec.rb b/logstash-core/spec/logstash/util/java_version_spec.rb
index 9383e4941..8e835d289 100644
--- a/logstash-core/spec/logstash/util/java_version_spec.rb
+++ b/logstash-core/spec/logstash/util/java_version_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'spec_helper'
 require 'logstash/util/java_version'
 
@@ -20,15 +36,15 @@ describe "LogStash::Util::JavaVersion" do
   it "should mark java 7 version as bad" do
     expect(mod.bad_java_version?("1.7.0_51")).to be_truthy
   end
-  
+
   it "should mark java version 8 as good" do
     expect(mod.bad_java_version?("1.8.0")).to be_falsey
   end
-  
+
   it "should mark a good standard java version as good" do
     expect(mod.bad_java_version?("1.8.0_65")).to be_falsey
   end
-  
+
   it "should mark a good beta version as good" do
     expect(mod.bad_java_version?("1.8.0-beta")).to be_falsey
   end
@@ -68,7 +84,6 @@ describe "LogStash::Util::JavaVersion" do
       # Not sure this is what is being returned, but it doesn't match the
       # regex, which is the point
       expect(mod.parse_java_version("JCL - 20140103_01 based on Oracle 7u51-b11
-
 ")).to be_nil
     end
 
@@ -100,8 +115,7 @@ describe "LogStash::Util::JavaVersion" do
 
     include_examples("version parsing", "a plain version", "1.3.0", 1, 3, 0, 0, nil)
     include_examples("version parsing", "an update", "1.4.0_03", 1, 4, 0, 3, nil)
-    include_examples("version parsing", "a build", "1.4.0-beta", 1, 4, 0, 0,"beta")
+    include_examples("version parsing", "a build", "1.4.0-beta", 1, 4, 0, 0, "beta")
     include_examples("version parsing", "an update+build", "1.4.0_03-beta", 1, 4, 0, 3, "beta")
   end
-
 end
diff --git a/logstash-core/spec/logstash/util/plugin_version_spec.rb b/logstash-core/spec/logstash/util/plugin_version_spec.rb
index 684c8bc5e..f95506c2f 100644
--- a/logstash-core/spec/logstash/util/plugin_version_spec.rb
+++ b/logstash-core/spec/logstash/util/plugin_version_spec.rb
@@ -1,17 +1,31 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/util/plugin_version"
 
 describe "LogStash::Util::PluginVersion" do
-
   subject { LogStash::Util::PluginVersion }
 
   context "#find_version!" do
-
     let(:gem)     { "bundler" }
 
     it 'raises an PluginNoVersionError if we cant find the plugin in the gem path' do
-      dummy_name ='this-character-doesnt-exist-in-the-marvel-universe'
+      dummy_name = 'this-character-doesnt-exist-in-the-marvel-universe'
       expect { subject.find_version!(dummy_name) }.to raise_error(LogStash::PluginNoVersionError)
     end
 
@@ -20,7 +34,6 @@ describe "LogStash::Util::PluginVersion" do
     end
 
     context "with a pre release gem" do
-
       it 'return the version of the gem' do
         # Gem::Specification.find_by_name return nil if the gem is not activated, as for
         # example the pre release ones.
@@ -28,7 +41,6 @@ describe "LogStash::Util::PluginVersion" do
         expect { subject.find_version!(gem) }.not_to raise_error
       end
     end
-
   end
 
   context "#new" do
diff --git a/logstash-core/spec/logstash/util/safe_uri_spec.rb b/logstash-core/spec/logstash/util/safe_uri_spec.rb
index 12962ccff..bd4b082fe 100644
--- a/logstash-core/spec/logstash/util/safe_uri_spec.rb
+++ b/logstash-core/spec/logstash/util/safe_uri_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/util/safe_uri"
 require "spec_helper"
 
@@ -17,6 +33,22 @@ module LogStash module Util
       end
     end
 
+    describe "equality" do
+      subject { LogStash::Util::SafeURI.new("https://localhost:9200/uri") }
+
+      it "should eql/== to dup" do
+        expect(subject == subject.clone).to be true
+        expect(subject == subject.dup).to be true
+        expect(subject.eql? subject.dup).to be true
+      end
+
+      it "should eql to same uri" do
+        uri = LogStash::Util::SafeURI.new("https://localhost:9200/uri")
+        expect(uri.eql? subject).to be true
+        expect(subject.hash).to eql uri.hash
+      end
+    end
+
     describe "handling escapable fields" do
       let(:user) { "u%20" }
       let(:password) { "p%20ss" }
@@ -32,5 +64,92 @@ module LogStash module Util
         end
       end
     end
+
+    describe "#initialize" do
+      context 'when host is required' do
+        MALFORMED_URIS = ['http:/user:pass@localhost:9600', 'http:/localhost', 'http:/localhost:9600', 'h;localhost', 'http:://localhost']
+
+        context 'malformed uris via string' do
+          MALFORMED_URIS.each do |arg|
+            it "#{arg}: should raise an error" do
+              expect {LogStash::Util::SafeURI.new(arg)}.to raise_error(ArgumentError)
+            end
+          end
+        end
+
+        context 'malformed uris via java.net.URI' do
+          MALFORMED_URIS.each do |arg|
+            it "#{arg}: should raise an error" do
+              java_uri = java.net.URI.new(arg)
+              expect {LogStash::Util::SafeURI.new(java_uri)}.to raise_error(ArgumentError)
+            end
+          end
+        end
+
+        context 'malformed uris via Ruby URI' do
+          MALFORMED_URIS.each do |arg|
+            it "#{arg}: should raise an error" do
+              ruby_uri = URI.parse(arg)
+              expect {LogStash::Util::SafeURI.new(ruby_uri)}.to raise_error(ArgumentError)
+            end
+          end
+        end
+
+        context 'uris with a valid host' do
+          ['http://user:pass@notlocalhost:9600', 'http://notlocalhost', 'https://notlocalhost:9600', '//notlocalhost', 'notlocalhost', 'notlocalhost:9200'].each do |arg|
+            it "#{arg}: should resolve host correctly" do
+              expect(LogStash::Util::SafeURI.new(arg).host).to eq('notlocalhost')
+            end
+          end
+        end
+      end
+    end
+
+    describe "normalization" do
+      subject { LogStash::Util::SafeURI.new("HTTPS://FOO:BaR@S11.ORG") }
+
+      it "should normalize" do # like URI().normalize
+        subject.normalize!
+        expect(subject.to_s).to eq('https://FOO:xxxxxx@s11.org/')
+      end
+    end
+
+    describe "writers" do
+      subject { LogStash::Util::SafeURI.new("http://sample.net") }
+
+      it "should update :user" do
+        subject.user = 'user'
+        expect(subject.user).to eq('user')
+        expect(subject.to_s).to eq('http://user@sample.net/')
+      end
+
+      it "should update :password" do
+        subject.user = 'user'
+        subject.password = 'pass'
+        expect(subject.password).to eq('pass')
+      end
+
+      it "should update :path" do
+        subject.path = '/path'
+        expect(subject.path).to eq('/path')
+        expect(subject.to_s).to eq('http://sample.net/path')
+
+        subject.path = ''
+        expect(subject.path).to eq('/')
+        expect(subject.to_s).to eq('http://sample.net/')
+      end
+
+      it "should update :host" do
+        subject.host = '127.0.0.1'
+        expect(subject.host).to eq('127.0.0.1')
+        expect(subject.to_s).to eq('http://127.0.0.1/')
+      end
+
+      it "should update :scheme" do
+        subject.update(:scheme, 'https')
+        expect(subject.scheme).to eq('https')
+        expect(subject.to_s).to eq('https://sample.net/')
+      end
+    end
   end
 end end
diff --git a/logstash-core/spec/logstash/util/secretstore_spec.rb b/logstash-core/spec/logstash/util/secretstore_spec.rb
index bb9221ad6..8912d94c1 100644
--- a/logstash-core/spec/logstash/util/secretstore_spec.rb
+++ b/logstash-core/spec/logstash/util/secretstore_spec.rb
@@ -1,35 +1,52 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/settings"
 
 java_import "org.logstash.secret.store.SecretStoreExt"
 
 describe SecretStoreExt do
-
   subject {SecretStoreExt}
+  let(:settings) { LogStash::SETTINGS.clone }
 
   describe "with missing keystore" do
     before :each do
-      LogStash::SETTINGS.set("keystore.file", File.join(File.dirname(__FILE__), "nothing_here"))
+      settings.set("keystore.file", File.join(File.dirname(__FILE__), "nothing_here"))
     end
 
     it "should be not exist" do
-      expect(subject.exists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)).to be_falsey
-      expect(subject.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)).to be_nil
+      expect(subject.exists(settings.get_setting("keystore.file").value, settings.get_setting("keystore.classname").value)).to be_falsey
+      expect(subject.getIfExists(settings.get_setting("keystore.file").value, settings.get_setting("keystore.classname").value)).to be_nil
     end
   end
 
   describe "with implicit password keystore" do
     before :each do
-      LogStash::SETTINGS.set("keystore.file", File.join(File.dirname(__FILE__), "../../../src/test/resources/logstash.keystore.with.default.pass"))
+      settings.set("keystore.file", File.join(File.dirname(__FILE__), "../../../src/test/resources/logstash.keystore.with.default.pass"))
     end
 
     it "should be readable" do
-      expect(subject.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value).list).to include(subject.get_store_id("keystore.seed"))
+      expect(subject.getIfExists(settings.get_setting("keystore.file").value, settings.get_setting("keystore.classname").value).list).to include(subject.get_store_id("keystore.seed"))
     end
   end
 
   describe "with explicit password keystore" do
     before :each do
-      LogStash::SETTINGS.set("keystore.file", File.join(File.dirname(__FILE__), "../../../src/test/resources/logstash.keystore.with.defined.pass"))
+      settings.set("keystore.file", File.join(File.dirname(__FILE__), "../../../src/test/resources/logstash.keystore.with.defined.pass"))
     end
 
     describe "and correct password" do
@@ -42,7 +59,7 @@ describe SecretStoreExt do
       end
 
       it "should be readable" do
-        expect(subject.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value).list).to include(subject.get_store_id("keystore.seed"))
+        expect(subject.getIfExists(settings.get_setting("keystore.file").value, settings.get_setting("keystore.classname").value).list).to include(subject.get_store_id("keystore.seed"))
       end
     end
 
@@ -56,14 +73,14 @@ describe SecretStoreExt do
       end
 
       it "should be not readable" do
-        expect {subject.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)}.to raise_error.with_message(/Can not access Logstash keystore/)
+        expect {subject.getIfExists(settings.get_setting("keystore.file").value, settings.get_setting("keystore.classname").value)}.to raise_error.with_message(/Can not access Logstash keystore/)
       end
     end
 
     describe "and missing password" do
       it "should be not readable" do
-        expect {subject.getIfExists(LogStash::SETTINGS.get_setting("keystore.file").value, LogStash::SETTINGS.get_setting("keystore.classname").value)}.to raise_error.with_message(/Could not determine keystore password/)
+        expect {subject.getIfExists(settings.get_setting("keystore.file").value, settings.get_setting("keystore.classname").value)}.to raise_error.with_message(/Could not determine keystore password/)
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/logstash-core/spec/logstash/util/substitution_variables_spec.rb b/logstash-core/spec/logstash/util/substitution_variables_spec.rb
new file mode 100644
index 000000000..13c5c93c4
--- /dev/null
+++ b/logstash-core/spec/logstash/util/substitution_variables_spec.rb
@@ -0,0 +1,63 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require "spec_helper"
+require "logstash/util/substitution_variables"
+
+describe LogStash::Util::SubstitutionVariables do
+
+  subject { Class.new { extend LogStash::Util::SubstitutionVariables } }
+
+  context "ENV or Keystore ${VAR} with single/double quotes" do
+    # single or double quotes come from ENV/Keystore ${VAR} value
+    let(:xpack_monitoring_host) { '"http://node1:9200"' }
+    let(:xpack_monitoring_hosts) { "'[\"http://node3:9200\", \"http://node4:9200\"]'" }
+    let(:xpack_management_pipeline_id) { '"*"' }
+    let(:config_string) {
+      "'input {
+        stdin { }
+        beats { port => 5040 }
+      }
+      output {
+        elasticsearch {
+          hosts => [\"https://es:9200\"]
+          user => \"elastic\"
+          password => 'changeme'
+        }
+      }'"
+    }
+
+    # this happens mostly when running LS with docker
+    it "stripes out quotes" do
+      expect(subject.send(:strip_enclosing_char, xpack_monitoring_host, '"')).to eql('http://node1:9200')
+      expect(subject.send(:strip_enclosing_char, xpack_monitoring_hosts, "'")).to eql('["http://node3:9200", "http://node4:9200"]')
+      expect(subject.send(:strip_enclosing_char, xpack_management_pipeline_id, '"')).to eql('*')
+      # make sure we keep the hosts, user and password param enclosed quotes
+      expect(subject.send(:strip_enclosing_char, config_string, "'")).to eql('input {
+        stdin { }
+        beats { port => 5040 }
+      }
+      output {
+        elasticsearch {
+          hosts => ["https://es:9200"]
+          user => "elastic"
+          password => \'changeme\'
+        }
+      }')
+    end
+  end
+end
\ No newline at end of file
diff --git a/logstash-core/spec/logstash/util/time_value_spec.rb b/logstash-core/spec/logstash/util/time_value_spec.rb
index c263a322a..bd6d6bb81 100644
--- a/logstash-core/spec/logstash/util/time_value_spec.rb
+++ b/logstash-core/spec/logstash/util/time_value_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/util/time_value"
 require "spec_helper"
 
@@ -10,7 +26,6 @@ RSpec.shared_examples "coercion example" do |value, expected|
   end
 end
 
-
 module LogStash module Util
 describe TimeValue do
     it_behaves_like "coercion example", TimeValue.new(100, :hour), TimeValue.new(100, :hour)
@@ -51,7 +66,7 @@ describe TimeValue do
         a = TimeValue.from_value(32)
         fail "should not parse"
       rescue ArgumentError => e
-        expect(e.message).to eq("value is not a string: 32 [Integer]")
+        expect(e.message).to start_with("value is not a string: 32 ")
       end
     end
 end
diff --git a/logstash-core/spec/logstash/util/unicode_trimmer_spec.rb b/logstash-core/spec/logstash/util/unicode_trimmer_spec.rb
index 963cc4f2b..77646f4c0 100644
--- a/logstash-core/spec/logstash/util/unicode_trimmer_spec.rb
+++ b/logstash-core/spec/logstash/util/unicode_trimmer_spec.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require "spec_helper"
 require "logstash/util/unicode_trimmer"
 require "flores/rspec"
diff --git a/logstash-core/spec/logstash/util/wrapped_acked_queue_spec.rb b/logstash-core/spec/logstash/util/wrapped_acked_queue_spec.rb
index 6ba924d7d..2a8e9b676 100644
--- a/logstash-core/spec/logstash/util/wrapped_acked_queue_spec.rb
+++ b/logstash-core/spec/logstash/util/wrapped_acked_queue_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 
 describe LogStash::WrappedAckedQueue do
diff --git a/logstash-core/spec/logstash/util/wrapped_synchronous_queue_spec.rb b/logstash-core/spec/logstash/util/wrapped_synchronous_queue_spec.rb
index c81e59c97..9e6441958 100644
--- a/logstash-core/spec/logstash/util/wrapped_synchronous_queue_spec.rb
+++ b/logstash-core/spec/logstash/util/wrapped_synchronous_queue_spec.rb
@@ -1,9 +1,24 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "logstash/instrument/collector"
 
 describe LogStash::WrappedSynchronousQueue do
-
   subject {LogStash::WrappedSynchronousQueue.new(5)}
 
   describe "queue clients" do
@@ -23,65 +38,6 @@ describe LogStash::WrappedSynchronousQueue do
       let(:write_client) { subject.write_client }
       let(:read_client)  { subject.read_client }
 
-      context "when reading from the queue" do
-        let(:collector) { LogStash::Instrument::Collector.new }
-
-        before do
-          read_client.set_events_metric(LogStash::Instrument::Metric.new(collector).namespace(:events))
-          read_client.set_pipeline_metric(LogStash::Instrument::Metric.new(collector).namespace(:pipeline))
-        end
-
-        context "when the queue is empty" do
-          it "doesnt record the `duration_in_millis`" do
-            batch = read_client.read_batch
-            read_client.close_batch(batch)
-            store = collector.snapshot_metric.metric_store
-
-            expect(store.get_shallow(:events, :out).value).to eq(0)
-            expect(store.get_shallow(:events, :out)).to be_kind_of(LogStash::Instrument::MetricType::Counter)
-
-            expect(store.get_shallow(:events, :filtered).value).to eq(0)
-            expect(store.get_shallow(:events, :filtered)).to be_kind_of(LogStash::Instrument::MetricType::Counter)
-
-            expect(store.get_shallow(:events, :duration_in_millis).value).to eq(0)
-            expect(store.get_shallow(:events, :duration_in_millis)).to be_kind_of(LogStash::Instrument::MetricType::Counter)
-
-            expect(store.get_shallow(:pipeline, :duration_in_millis).value).to eq(0)
-            expect(store.get_shallow(:pipeline, :duration_in_millis)).to be_kind_of(LogStash::Instrument::MetricType::Counter)
-
-            expect(store.get_shallow(:pipeline, :out).value).to eq(0)
-            expect(store.get_shallow(:pipeline, :out)).to be_kind_of(LogStash::Instrument::MetricType::Counter)
-
-            expect(store.get_shallow(:pipeline, :filtered).value).to eq(0)
-            expect(store.get_shallow(:pipeline, :filtered)).to be_kind_of(LogStash::Instrument::MetricType::Counter)
-          end
-        end
-
-        context "when we have item in the queue" do
-          it "records the `duration_in_millis`" do
-            batch = []
-            5.times {|i| batch.push(LogStash::Event.new({"message" => "value-#{i}"}))}
-            write_client.push_batch(batch)
-
-            read_batch = read_client.read_batch.to_java
-            sleep(0.1) # simulate some work for the `duration_in_millis`
-            # TODO: this interaction should be cleaned in an upcoming PR,
-            # This is what the current pipeline does.
-            read_client.add_filtered_metrics(read_batch.filteredSize)
-            read_client.add_output_metrics(read_batch.filteredSize)
-            read_client.close_batch(read_batch)
-            store = collector.snapshot_metric.metric_store
-
-            expect(store.get_shallow(:events, :out).value).to eq(5)
-            expect(store.get_shallow(:events, :filtered).value).to eq(5)
-            expect(store.get_shallow(:events, :duration_in_millis).value).to be > 0
-            expect(store.get_shallow(:pipeline, :duration_in_millis).value).to be > 0
-            expect(store.get_shallow(:pipeline, :out).value).to eq(5)
-            expect(store.get_shallow(:pipeline, :filtered).value).to eq(5)
-          end
-        end
-      end
-
       context "when writing to the queue" do
         before :each do
           read_client.set_events_metric(LogStash::Instrument::NamespacedNullMetric.new(nil, :null))
@@ -103,19 +59,26 @@ describe LogStash::WrappedSynchronousQueue do
             message = data.get("message")
             expect(messages).to include(message)
             messages.delete(message)
-            # read_batch.cancel("value-#{i}") if i > 2     # TODO: disabled for https://github.com/elastic/logstash/issues/6055 - will have to properly refactor
             if message.match /value-[3-4]/
               data.cancel
-              read_batch.merge(LogStash::Event.new({ "message" => message.gsub(/value/, 'generated') }))
             end
           end
-          # expect(read_batch.cancelled_size).to eq(2) # disabled for https://github.com/elastic/logstash/issues/6055
           received = []
           read_batch.to_a.each do |data|
             received << data.get("message")
           end
+          expect(received.size).to eq(3)
           (0..2).each {|i| expect(received).to include("value-#{i}")}
-          (3..4).each {|i| expect(received).to include("generated-#{i}")}
+        end
+
+        it "handles Java proxied read-batch object" do
+          batch = []
+          3.times { |i| batch.push(LogStash::Event.new({"message" => "value-#{i}"})) }
+          write_client.push_batch(batch)
+
+          read_batch = read_client.read_batch
+          expect { read_client.close_batch(read_batch) }.to_not raise_error
+          expect { read_client.close_batch(read_batch.to_java) }.to_not raise_error
         end
       end
     end
diff --git a/logstash-core/spec/logstash/util_spec.rb b/logstash-core/spec/logstash/util_spec.rb
index 3f0c23eda..3408fd9cd 100644
--- a/logstash-core/spec/logstash/util_spec.rb
+++ b/logstash-core/spec/logstash/util_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'spec_helper'
 
 require "logstash/util"
@@ -12,7 +28,6 @@ module TestingClassName
 end
 
 describe LogStash::Util do
-
   subject { described_class }
 
   context "stringify_keys" do
@@ -67,4 +82,12 @@ describe LogStash::Util do
       end
     end
   end
+
+  describe ".get_thread_id" do
+    it "returns native identifier" do
+      thread_id = LogStash::Util.get_thread_id(Thread.current)
+      expect(thread_id).to be_a Integer
+      expect(thread_id).to eq(java.lang.Thread.currentThread.getId)
+    end
+  end
 end
diff --git a/logstash-core/spec/logstash/webserver_spec.rb b/logstash-core/spec/logstash/webserver_spec.rb
index a398e3eb8..e5e2c4e37 100644
--- a/logstash-core/spec/logstash/webserver_spec.rb
+++ b/logstash-core/spec/logstash/webserver_spec.rb
@@ -1,18 +1,35 @@
-# encoding: utf-8
-# require "logstash/json"
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/webserver"
 require_relative "../support/helpers"
 require "socket"
 require "spec_helper"
 require "open-uri"
 require "webmock/rspec"
+require "faraday"
+require "ostruct"
 
 def block_ports(range)
   servers = []
 
   range.each do |port|
     begin
-      server = TCPServer.new("localhost", port)
+      server = TCPServer.new("127.0.0.1", port)
       servers << server
     rescue => e
       # The port can already be taken
@@ -40,14 +57,26 @@ describe LogStash::WebServer do
   end
 
   let(:logger) { LogStash::Logging::Logger.new("testing") }
-  let(:agent) { OpenStruct.new({:webserver => webserver, :http_address => "127.0.0.1", :id => "myid", :name => "myname"}) }
-  let(:webserver) { OpenStruct.new({}) }
+  let(:agent) { OpenStruct.new({
+                                 webserver:       webserver_block,
+                                 http_address:    "127.0.0.1",
+                                 id:              "myid",
+                                 name:            "myname",
+                                 health_observer: org.logstash.health.HealthObserver.new,
+                               }) }
+  let(:webserver_block) { OpenStruct.new({}) }
 
-  subject { LogStash::WebServer.new(logger,
-                                    agent,
-                                    { :http_host => "localhost", :http_ports => port_range })}
+  subject(:webserver) { LogStash::WebServer.new(logger, agent, webserver_options) }
+
+  let(:webserver_options) do
+    {
+      :http_host => api_host,
+      :http_ports => port_range,
+    }
+  end
 
   let(:port_range) { 10000..10010 }
+  let(:api_host) { "127.0.0.1" }
 
   context "when an exception occur in the server thread" do
     let(:spy_output) { spy("stderr").as_null_object }
@@ -89,8 +118,9 @@ describe LogStash::WebServer do
     after(:each) { free_ports(@servers) }
 
     context "when we have available ports" do
+      let(:blocked_range) { 10000..10005 }
       before(:each) do
-        @servers = block_ports(10000..10005)
+        @servers = block_ports(blocked_range)
       end
 
       it "successfully find an available port" do
@@ -99,10 +129,13 @@ describe LogStash::WebServer do
         end
 
         sleep(1)
+        address = subject.address
+        port = address.split(":").last.to_i
+        expect(port_range).to cover(port)
+        expect(blocked_range).to_not cover(port)
 
-        response = open("http://localhost:10006").read
+        response = ::URI.open("http://#{address}").read
         expect { LogStash::Json.load(response) }.not_to raise_error
-        expect(subject.address).to eq("localhost:10006")
 
         subject.stop
         t.join
@@ -119,6 +152,68 @@ describe LogStash::WebServer do
       end
     end
   end
+
+  context "when configured with http basic auth" do
+    around(:each) do |example|
+      begin
+        thread = Thread.new(webserver, &:run)
+
+        Stud.try(10.times) { fail('webserver not running') unless webserver.port }
+
+        example.call
+      ensure
+        webserver.stop
+        thread.join
+      end
+    end
+
+    let(:password_policies) { {
+      "mode": "ERROR",
+      "length": { "minimum": "8"},
+      "include": { "upper": "REQUIRED", "lower": "REQUIRED", "digit": "REQUIRED", "symbol": "REQUIRED" }
+    } }
+    let(:webserver_options) {
+      super().merge(:auth_basic => {
+         :username => "a-user",
+         :password => LogStash::Util::Password.new("s3cur3dPas!"),
+         :password_policies => password_policies
+      }) }
+
+    context "and no auth is provided" do
+      it 'emits an HTTP 401 with WWW-Authenticate header' do
+        response = Faraday.new("http://#{api_host}:#{webserver.port}").get('/')
+        aggregate_failures do
+          expect(response.status).to eq(401)
+          expect(response.headers.to_hash).to include('www-authenticate' => 'Basic realm="logstash-api"')
+        end
+      end
+    end
+    context "and invalid basic auth is provided" do
+      it 'emits an HTTP 401 with WWW-Authenticate header' do
+        response = Faraday.new("http://#{api_host}:#{webserver.port}") do |conn|
+          conn.request :authorization, :basic, 'john-doe', 'open-sesame'
+        end.get('/')
+        aggregate_failures do
+          expect(response.status).to eq(401)
+          expect(response.headers.to_hash).to include('www-authenticate' => 'Basic realm="logstash-api"')
+        end
+      end
+    end
+    context "and valid auth is provided" do
+      it "returns a relevant response" do
+        response = Faraday.new("http://#{api_host}:#{webserver.port}") do |conn|
+          conn.request :authorization, :basic, 'a-user', 's3cur3dPas!'
+        end.get('/')
+        aggregate_failures do
+          expect(response.status).to eq(200)
+          expect(response.headers).to_not include('www-authenticate')
+        end
+        expect(response.body).to match(/\A{.*}\z/)
+        decoded_response = LogStash::Json.load(response.body)
+        expect(decoded_response).to include("id" => "myid")
+      end
+    end
+  end
 end
 
 describe LogStash::IOWrappedLogger do
@@ -143,6 +238,14 @@ describe LogStash::IOWrappedLogger do
   end
 
   it "responds to sync=(v)" do
-    expect{ subject.sync = true }.not_to raise_error
+    expect { subject.sync = true }.not_to raise_error
+  end
+
+  it "responds to sync" do
+    expect { subject.sync }.not_to raise_error
+  end
+
+  it "responds to flush" do
+    expect { subject.flush }.not_to raise_error
   end
 end
diff --git a/logstash-core/spec/modules_test_files/modules/tester/configuration/README.txt b/logstash-core/spec/modules_test_files/modules/tester/configuration/README.txt
deleted file mode 100644
index fe389215b..000000000
--- a/logstash-core/spec/modules_test_files/modules/tester/configuration/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is not a real working module, i.e. one that will work in kibana.
diff --git a/logstash-core/spec/modules_test_files/modules/tester/configuration/elasticsearch/tester.json b/logstash-core/spec/modules_test_files/modules/tester/configuration/elasticsearch/tester.json
deleted file mode 100755
index 75aadcd1b..000000000
--- a/logstash-core/spec/modules_test_files/modules/tester/configuration/elasticsearch/tester.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "order": 100,
-    "template": "tester-*",
-    "mappings": {
-      "_default_": {
-        "dynamic": true,
-        "dynamic_templates": [
-          {
-            "string_fields": {
-              "mapping": {
-                "type": "keyword"
-              },
-              "match_mapping_type": "string",
-              "match": "*"
-            }
-          }
-        ],
-        "_all": {
-          "enabled": true
-        },
-        "properties": {
-          "f1": {
-            "type": "integer"
-          },
-          "f2": {
-            "type": "integer"
-          },
-          "f3": {
-            "type": "ip"
-          },
-          "f4": {
-            "format": "epoch_millis||epoch_second||date_time||MMM dd yyyy HH:mm:ss",
-            "type": "date"
-          },
-          "f6": {
-            "type": "integer"
-          },
-          "f7": {
-            "type": "integer"
-          },
-          "f8": {
-            "type": "integer"
-          },
-          "f9": {
-            "type": "integer"
-          },
-        }
-      }
-    },
-    "aliases": {}
-}
diff --git a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/5.x/dashboard/FW-Dashboard.json b/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/5.x/dashboard/FW-Dashboard.json
deleted file mode 100755
index 437f61161..000000000
--- a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/5.x/dashboard/FW-Dashboard.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "title": "FW - Dashboard",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"id\":\"FW-Viz-1\",\"type\":\"visualization\",\"panelIndex\":12,\"size_x\":4,\"size_y\":3,\"col\":9,\"row\":6},{\"id\":\"FW-Viz-2\",\"type\":\"visualization\",\"panelIndex\":13,\"size_x\":4,\"size_y\":3,\"col\":5,\"row\":6},{\"id\":\"Search-Tester\",\"type\":\"search\",\"panelIndex\":14,\"size_x\":6,\"size_y\":3,\"col\":1,\"row\":13,\"columns\":[\"sevCode\",\"name\",\"deviceVendor\",\"deviceProduct\",\"categoryDeviceType\",\"categoryBehavior\",\"categoryOutcome\",\"sourceAddress\",\"sourcePort\",\"sourceHostName\",\"destinationAddress\",\"destinationPort\",\"destinationHostName\",\"sourceUserName\",\"destinationUserName\"],\"sort\":[\"@timestamp\",\"desc\"]}]",
-  "optionsJSON": "{\"darkTheme\":false}",
-  "uiStateJSON": "{\"P-1\":{\"vis\":{\"legendOpen\":true,\"colors\":{\"/Success\":\"#629E51\",\"/Failure\":\"#BF1B00\"}}},\"P-2\":{\"vis\":{\"legendOpen\":true}},\"P-3\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-4\":{\"vis\":{\"legendOpen\":true,\"colors\":{\"/Success\":\"#629E51\",\"/Failure\":\"#BF1B00\",\"Check Point\":\"#C15C17\",\"CISCO\":\"#EF843C\",\"NetScreen\":\"#F9BA8F\"}}},\"P-5\":{\"mapCenter\":[46.195042108660154,-56.42578125]},\"P-6\":{\"mapCenter\":[15.961329081596647,-0.3515625],\"mapZoom\":1},\"P-8\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-12\":{\"vis\":{\"legendOpen\":false}}}",
-  "version": 1,
-  "timeRestore": true,
-  "timeTo": "now",
-  "timeFrom": "now-1h",
-  "refreshInterval": {
-    "display": "Off",
-    "pause": false,
-    "value": 0
-  },
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}]}"
-  }
-}
diff --git a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/5.x/dashboard/tester.json b/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/5.x/dashboard/tester.json
deleted file mode 100644
index 6f13d606b..000000000
--- a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/5.x/dashboard/tester.json
+++ /dev/null
@@ -1 +0,0 @@
-["FW-Dashboard"]
diff --git a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/5.x/index-pattern/tester.json b/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/5.x/index-pattern/tester.json
deleted file mode 100644
index 5d8c501e0..000000000
--- a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/5.x/index-pattern/tester.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "title":"tester-*",
-  "timeFieldName":"startTime",
-  "notExpandable":true,
-  "fieldFormatMap": "{\"f3\":{\"id\":\"bytes\"},\"f4\":{\"id\":\"bytes\"},\"f5\":{\"id\":\"bytes\"}}",
-  "fields": "[{\"name\":\"f1\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},{\"name\":\"f2\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},{\"name\":\"f3\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},{\"name\":\"f3\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},{\"name\":\"f5\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},{\"name\":\"f6\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},{\"name\":\"f7\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},{\"name\":\"f8\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false,\"searchable\":false,\"aggregatable\":false},{\"name\":\"f9\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false,\"searchable\":true,\"aggregatable\":true}]"
-}
diff --git a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/5.x/search/Search-Tester.json b/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/5.x/search/Search-Tester.json
deleted file mode 100644
index 54aa0c674..000000000
--- a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/5.x/search/Search-Tester.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "title": "Firewall Events",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "f1",
-    "f2",
-    "f3",
-    "f4"
-  ],
-  "sort": [
-    "f4",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"tester-*\",\"query\":{\"query_string\":{\"query\":\"f3:\\\"Firewall\\\"\",\"analyze_wildcard\":true}},\"filter\":[],\"highlight\":{\"pre_tags\":[\"@kibana-highlighted-field@\"],\"post_tags\":[\"@/kibana-highlighted-field@\"],\"fields\":{\"*\":{}},\"require_field_match\":false,\"fragment_size\":2147483647}}"
-  }
-}
diff --git a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/5.x/visualization/FW-Viz-1.json b/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/5.x/visualization/FW-Viz-1.json
deleted file mode 100644
index 712fabd0a..000000000
--- a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/5.x/visualization/FW-Viz-1.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "FW Viz 1",
-  "visState": "{\"title\":\"FW - Area by Outcome\",\"type\":\"area\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"top\",\"smoothLines\":true,\"scale\":\"linear\",\"interpolate\":\"linear\",\"mode\":\"overlap\",\"times\":[],\"addTimeMarker\":false,\"defaultYExtents\":false,\"setYExtents\":false,\"yAxis\":{}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"interval\":\"auto\",\"customInterval\":\"2h\",\"min_doc_count\":1,\"extended_bounds\":{}}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"categoryOutcome\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"/Success\":\"#629E51\",\"/Failure\":\"#BF1B00\"}}}",
-  "description": "",
-  "savedSearchId": "Search-Tester",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/5.x/visualization/FW-Viz-2.json b/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/5.x/visualization/FW-Viz-2.json
deleted file mode 100644
index c2e2d7da3..000000000
--- a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/5.x/visualization/FW-Viz-2.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "FW Viz 2",
-  "visState": "{\"title\":\"FW - Count by Source, Destination Address and Ports\",\"type\":\"line\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"top\",\"showCircles\":true,\"smoothLines\":true,\"interpolate\":\"linear\",\"scale\":\"square root\",\"drawLinesBetweenPoints\":true,\"radiusRatio\":\"7\",\"times\":[],\"addTimeMarker\":false,\"defaultYExtents\":false,\"setYExtents\":false,\"yAxis\":{}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Overall Count\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"interval\":\"auto\",\"customInterval\":\"2h\",\"min_doc_count\":1,\"extended_bounds\":{}}},{\"id\":\"3\",\"enabled\":true,\"type\":\"count\",\"schema\":\"radius\",\"params\":{}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceAddress\",\"customLabel\":\"Source Address\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationAddress\",\"customLabel\":\"Destination Address\"}},{\"id\":\"6\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationPort\",\"customLabel\":\"Destination / Service Ports\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"Overall Count\":\"#BF1B00\",\"Source Address\":\"#E0752D\",\"Destination Address\":\"#E5AC0E\",\"Device Address\":\"#447EBC\",\"Service Port\":\"#447EBC\",\"Destination / Service Ports\":\"#447EBC\"}}}",
-  "description": "",
-  "savedSearchId": "Search-Tester",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/6.x/dashboard/FW-Dashboard.json b/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/6.x/dashboard/FW-Dashboard.json
deleted file mode 100755
index 437f61161..000000000
--- a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/6.x/dashboard/FW-Dashboard.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "title": "FW - Dashboard",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"id\":\"FW-Viz-1\",\"type\":\"visualization\",\"panelIndex\":12,\"size_x\":4,\"size_y\":3,\"col\":9,\"row\":6},{\"id\":\"FW-Viz-2\",\"type\":\"visualization\",\"panelIndex\":13,\"size_x\":4,\"size_y\":3,\"col\":5,\"row\":6},{\"id\":\"Search-Tester\",\"type\":\"search\",\"panelIndex\":14,\"size_x\":6,\"size_y\":3,\"col\":1,\"row\":13,\"columns\":[\"sevCode\",\"name\",\"deviceVendor\",\"deviceProduct\",\"categoryDeviceType\",\"categoryBehavior\",\"categoryOutcome\",\"sourceAddress\",\"sourcePort\",\"sourceHostName\",\"destinationAddress\",\"destinationPort\",\"destinationHostName\",\"sourceUserName\",\"destinationUserName\"],\"sort\":[\"@timestamp\",\"desc\"]}]",
-  "optionsJSON": "{\"darkTheme\":false}",
-  "uiStateJSON": "{\"P-1\":{\"vis\":{\"legendOpen\":true,\"colors\":{\"/Success\":\"#629E51\",\"/Failure\":\"#BF1B00\"}}},\"P-2\":{\"vis\":{\"legendOpen\":true}},\"P-3\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-4\":{\"vis\":{\"legendOpen\":true,\"colors\":{\"/Success\":\"#629E51\",\"/Failure\":\"#BF1B00\",\"Check Point\":\"#C15C17\",\"CISCO\":\"#EF843C\",\"NetScreen\":\"#F9BA8F\"}}},\"P-5\":{\"mapCenter\":[46.195042108660154,-56.42578125]},\"P-6\":{\"mapCenter\":[15.961329081596647,-0.3515625],\"mapZoom\":1},\"P-8\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-12\":{\"vis\":{\"legendOpen\":false}}}",
-  "version": 1,
-  "timeRestore": true,
-  "timeTo": "now",
-  "timeFrom": "now-1h",
-  "refreshInterval": {
-    "display": "Off",
-    "pause": false,
-    "value": 0
-  },
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}]}"
-  }
-}
diff --git a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/6.x/dashboard/tester.json b/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/6.x/dashboard/tester.json
deleted file mode 100644
index 6f13d606b..000000000
--- a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/6.x/dashboard/tester.json
+++ /dev/null
@@ -1 +0,0 @@
-["FW-Dashboard"]
diff --git a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/6.x/index-pattern/tester.json b/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/6.x/index-pattern/tester.json
deleted file mode 100644
index 5d8c501e0..000000000
--- a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/6.x/index-pattern/tester.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "title":"tester-*",
-  "timeFieldName":"startTime",
-  "notExpandable":true,
-  "fieldFormatMap": "{\"f3\":{\"id\":\"bytes\"},\"f4\":{\"id\":\"bytes\"},\"f5\":{\"id\":\"bytes\"}}",
-  "fields": "[{\"name\":\"f1\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},{\"name\":\"f2\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},{\"name\":\"f3\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},{\"name\":\"f3\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},{\"name\":\"f5\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},{\"name\":\"f6\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},{\"name\":\"f7\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},{\"name\":\"f8\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false,\"searchable\":false,\"aggregatable\":false},{\"name\":\"f9\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false,\"searchable\":true,\"aggregatable\":true}]"
-}
diff --git a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/6.x/search/Search-Tester.json b/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/6.x/search/Search-Tester.json
deleted file mode 100644
index 54aa0c674..000000000
--- a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/6.x/search/Search-Tester.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "title": "Firewall Events",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "f1",
-    "f2",
-    "f3",
-    "f4"
-  ],
-  "sort": [
-    "f4",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"tester-*\",\"query\":{\"query_string\":{\"query\":\"f3:\\\"Firewall\\\"\",\"analyze_wildcard\":true}},\"filter\":[],\"highlight\":{\"pre_tags\":[\"@kibana-highlighted-field@\"],\"post_tags\":[\"@/kibana-highlighted-field@\"],\"fields\":{\"*\":{}},\"require_field_match\":false,\"fragment_size\":2147483647}}"
-  }
-}
diff --git a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/6.x/visualization/FW-Viz-1.json b/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/6.x/visualization/FW-Viz-1.json
deleted file mode 100644
index 712fabd0a..000000000
--- a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/6.x/visualization/FW-Viz-1.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "FW Viz 1",
-  "visState": "{\"title\":\"FW - Area by Outcome\",\"type\":\"area\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"top\",\"smoothLines\":true,\"scale\":\"linear\",\"interpolate\":\"linear\",\"mode\":\"overlap\",\"times\":[],\"addTimeMarker\":false,\"defaultYExtents\":false,\"setYExtents\":false,\"yAxis\":{}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"interval\":\"auto\",\"customInterval\":\"2h\",\"min_doc_count\":1,\"extended_bounds\":{}}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"categoryOutcome\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"/Success\":\"#629E51\",\"/Failure\":\"#BF1B00\"}}}",
-  "description": "",
-  "savedSearchId": "Search-Tester",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/6.x/visualization/FW-Viz-2.json b/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/6.x/visualization/FW-Viz-2.json
deleted file mode 100644
index c2e2d7da3..000000000
--- a/logstash-core/spec/modules_test_files/modules/tester/configuration/kibana/6.x/visualization/FW-Viz-2.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "FW Viz 2",
-  "visState": "{\"title\":\"FW - Count by Source, Destination Address and Ports\",\"type\":\"line\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"top\",\"showCircles\":true,\"smoothLines\":true,\"interpolate\":\"linear\",\"scale\":\"square root\",\"drawLinesBetweenPoints\":true,\"radiusRatio\":\"7\",\"times\":[],\"addTimeMarker\":false,\"defaultYExtents\":false,\"setYExtents\":false,\"yAxis\":{}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Overall Count\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"interval\":\"auto\",\"customInterval\":\"2h\",\"min_doc_count\":1,\"extended_bounds\":{}}},{\"id\":\"3\",\"enabled\":true,\"type\":\"count\",\"schema\":\"radius\",\"params\":{}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceAddress\",\"customLabel\":\"Source Address\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationAddress\",\"customLabel\":\"Destination Address\"}},{\"id\":\"6\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationPort\",\"customLabel\":\"Destination / Service Ports\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"Overall Count\":\"#BF1B00\",\"Source Address\":\"#E0752D\",\"Destination Address\":\"#E5AC0E\",\"Device Address\":\"#447EBC\",\"Service Port\":\"#447EBC\",\"Destination / Service Ports\":\"#447EBC\"}}}",
-  "description": "",
-  "savedSearchId": "Search-Tester",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/logstash-core/spec/modules_test_files/modules/tester/configuration/logstash/tester.conf.erb b/logstash-core/spec/modules_test_files/modules/tester/configuration/logstash/tester.conf.erb
deleted file mode 100755
index 2a963d79b..000000000
--- a/logstash-core/spec/modules_test_files/modules/tester/configuration/logstash/tester.conf.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-input {
-  tcp {
-    codec => json
-    port => <%= setting("var.input.tcp.port", 5000) %>
-    type => syslog
-  }
-}
-
-filter {
-  date {
-    match => [ "logdate", "ISO8601" ]
-  }
-}
-
-output {
-  <%= elasticsearch_output_config() %>
-}
diff --git a/logstash-core/spec/plugin_metadata_spec.rb b/logstash-core/spec/plugin_metadata_spec.rb
new file mode 100644
index 000000000..97205c355
--- /dev/null
+++ b/logstash-core/spec/plugin_metadata_spec.rb
@@ -0,0 +1,164 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'spec_helper'
+require 'logstash/plugin_metadata'
+require 'securerandom'
+
+describe LogStash::PluginMetadata do
+  let(:registry) { described_class }
+  before(:each) { registry.reset! }
+
+  let(:plugin_id) { SecureRandom.uuid }
+
+  describe 'registry' do
+    describe '#for_plugin' do
+      it 'returns the same instance when given the same id' do
+        expect(registry.for_plugin(plugin_id)).to be(registry.for_plugin(plugin_id))
+      end
+      it 'returns different instances when given different ids' do
+        expect(registry.for_plugin(plugin_id)).to_not equal(registry.for_plugin(plugin_id.next))
+      end
+    end
+    describe '#exists?' do
+      context 'when the plugin has not yet been registered' do
+        it 'returns false' do
+          expect(registry.exists?(plugin_id)).to be false
+        end
+      end
+      context 'when the plugin has already been registered' do
+        before(:each) { registry.for_plugin(plugin_id).set(:foo, 'bar') }
+        it 'returns true' do
+          expect(registry.exists?(plugin_id)).to be true
+        end
+      end
+    end
+    describe '#delete_for_plugin' do
+      before(:each) { registry.for_plugin(plugin_id).set(:foo, 'bar') }
+      it 'deletes the registry' do
+        expect(registry.exists?(plugin_id)).to be true
+        registry.delete_for_plugin(plugin_id)
+        expect(registry.exists?(plugin_id)).to be false
+      end
+      it 'deletes the data inside the registry' do
+        plugin_registry = registry.for_plugin(plugin_id)
+        registry.delete_for_plugin(plugin_id)
+        expect(plugin_registry.set?(:foo)).to be false
+      end
+    end
+  end
+
+  describe 'instance' do
+    let(:instance) { registry.for_plugin(plugin_id) }
+
+    describe '#set' do
+      context 'when the key is not set' do
+        it 'sets the new value' do
+          instance.set(:foo, 'bar')
+          expect(instance.get(:foo)).to eq('bar')
+        end
+        it 'returns the nil' do
+          expect(instance.set(:foo, 'bar')).to be_nil
+        end
+      end
+      context 'when the key is set' do
+        let (:val) { 'bananas'}
+        before(:each) { instance.set(:foo, val) }
+
+        it 'sets the new value' do
+          instance.set(:foo, 'bar')
+          expect(instance.get(:foo)).to eq('bar')
+        end
+        it 'returns the previous associated value' do
+          expect(instance.set(:foo, 'bar')).to eq(val)
+        end
+        context 'when the new value is nil' do
+          it 'unsets the value' do
+            instance.set(:foo, nil)
+            expect(instance.set?(:foo)).to be false
+          end
+        end
+      end
+    end
+
+    describe '#get' do
+      context 'when the key is set' do
+        before(:each) { instance.set(:foo, 'bananas') }
+        it 'returns the associated value' do
+          expect(instance.get(:foo)).to eq('bananas')
+        end
+      end
+      context 'when the key is not set' do
+        it 'returns nil' do
+          expect(instance.get(:foo)).to be_nil
+        end
+      end
+    end
+
+    describe '#set?' do
+      context 'when the key is set' do
+        before(:each) { instance.set(:foo, 'bananas')}
+        it 'returns true' do
+          expect(instance.set?(:foo)).to be true
+        end
+      end
+      context 'when the key is not set' do
+        it 'returns false' do
+          expect(instance.set?(:foo)).to be false
+        end
+      end
+    end
+
+    describe '#delete' do
+      context 'when the key is set' do
+        let (:val) { 'bananas' }
+        before(:each) { instance.set(:foo, val)}
+        it 'returns the value' do
+          expect(instance.delete(:foo)).to be val
+        end
+        it 'removes the key' do
+          instance.delete(:foo)
+          expect(instance.set?(:foo)).to be false
+        end
+      end
+      context 'when the key is not set' do
+        it 'returns nil' do
+          expect(instance.delete(:foo)).to be nil
+        end
+
+        it 'should not be set' do
+          instance.delete(:foo)
+          expect(instance.set?(:foo)).to be false
+        end
+      end
+    end
+
+    describe '#clear' do
+      context 'when the key is set' do
+        before(:each) do
+          instance.set(:foo, 'bananas')
+          instance.set(:bar, 'more bananas')
+        end
+        it 'removes all keys' do
+          instance.clear
+          expect(instance.set?(:foo)).to be false
+          expect(instance.set?(:bar)).to be false
+        end
+      end
+    end
+  end
+end
diff --git a/logstash-core/spec/static/i18n_spec.rb b/logstash-core/spec/static/i18n_spec.rb
index b2cd76377..b71ca4f4a 100644
--- a/logstash-core/spec/static/i18n_spec.rb
+++ b/logstash-core/spec/static/i18n_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "i18n"
 
@@ -9,7 +25,6 @@ describe I18n do
     glob_path = File.join(LogStash::Environment::LOGSTASH_HOME, "logstash-*", "lib", "**", "*.rb")
 
     Dir.glob(glob_path).each do |file_name|
-
       context "in file \"#{file_name}\"" do
         File.foreach(file_name) do |line|
           next unless (match = line.match(I18N_T_REGEX))
diff --git a/logstash-core/spec/support/helpers.rb b/logstash-core/spec/support/helpers.rb
index 97785d807..1ed2a4ecc 100644
--- a/logstash-core/spec/support/helpers.rb
+++ b/logstash-core/spec/support/helpers.rb
@@ -1,5 +1,22 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "stud/task"
+require "rspec/wait"
 
 def silence_warnings
   warn_level = $VERBOSE
@@ -22,7 +39,7 @@ def clear_data_dir
   end
 end
 
-def mock_settings(settings_values={})
+def mock_settings(settings_values = {})
   settings = LogStash::SETTINGS.clone
 
   settings_values.each do |key, value|
@@ -32,26 +49,72 @@ def mock_settings(settings_values={})
   settings
 end
 
-def make_test_agent(settings=mock_settings)
+def make_test_agent(settings = mock_settings, config_source = nil)
     sl = LogStash::Config::SourceLoader.new
-    sl.add_source(LogStash::Config::Source::Local.new(settings))
+    sl.add_source(config_source || LogStash::Config::Source::Local.new(settings))
     sl
 
     ::LogStash::Agent.new(settings, sl)
 end
 
+def make_config_source(settings = mock_settings)
+  TestPipelineConfigSource.new(settings)
+end
+
+##
+# This TestPipelineConfigSource can be added to a LogStash::Config::SourceLoader
+# to provide pipeline config strings directly for testing purposes.
+class TestPipelineConfigSource
+  include LogStash::Util::Loggable
+
+  def initialize(settings)
+    @settings = settings
+    @pipelines = {}
+  end
+
+  def add_pipeline(pipeline_id, config_string, settings_overrides = {})
+    logger.debug("adding pipeline `#{pipeline_id}` from string `#{config_string}` with additional settings `#{settings_overrides}`")
+    @pipelines[pipeline_id.to_sym] = compose_pipeline_config(pipeline_id, config_string, settings_overrides)
+  end
+
+  def remove_pipeline(pipeline_id)
+    logger.debug("removing pipeline `#{pipeline_id}`")
+    !!@pipelines.delete(pipeline_id.to_sym)
+  end
+
+  def pipeline_configs
+    @pipelines.values
+  end
+
+  def match?
+    true
+  end
+
+  def config_conflict?
+    false
+  end
+
+  private
+  def compose_pipeline_config(pipeline_id, config_string, pipeline_settings)
+    config_parts = [org.logstash.common.SourceWithMetadata.new("string", pipeline_id.to_s, config_string)]
+
+    merged_pipeline_settings = @settings.clone.tap do |s|
+      s.merge_pipeline_settings('pipeline.id'   => pipeline_id)
+      s.merge_pipeline_settings('config.string' => config_string.dup.freeze)
+      s.merge_pipeline_settings(pipeline_settings)
+    end
+
+    org.logstash.config.ir.PipelineConfig.new(self.class, pipeline_id.to_sym, config_parts, merged_pipeline_settings)
+  end
+end
+
 def mock_pipeline(pipeline_id, reloadable = true, config_hash = nil)
   config_string = "input { stdin { id => '#{pipeline_id}' }}"
   settings = mock_settings("pipeline.id" => pipeline_id.to_s,
                            "config.string" => config_string,
                            "config.reload.automatic" => reloadable)
   pipeline_config = mock_pipeline_config(pipeline_id, config_string, settings)
-  LogStash::Pipeline.new(pipeline_config)
-end
-
-def mock_pipeline_from_string(config_string, settings = LogStash::SETTINGS, metric = nil)
-  pipeline_config = mock_pipeline_config(settings.get("pipeline.id"), config_string, settings)
-  LogStash::Pipeline.new(pipeline_config, metric)
+  LogStash::JavaPipeline.new(pipeline_config)
 end
 
 def mock_java_pipeline_from_string(config_string, settings = LogStash::SETTINGS, metric = nil)
@@ -70,7 +133,7 @@ def mock_pipeline_config(pipeline_id, config_string = nil, settings = {})
 
   config_part = org.logstash.common.SourceWithMetadata.new("config_string", "config_string", 0, 0, config_string)
 
-  LogStash::Config::PipelineConfig.new(LogStash::Config::Source::Local, pipeline_id, config_part, settings)
+  org.logstash.config.ir.PipelineConfig.new(LogStash::Config::Source::Local, pipeline_id.to_sym, [config_part], settings)
 end
 
 def start_agent(agent)
@@ -98,7 +161,7 @@ end
 
 RSpec::Matchers.define :ir_eql do |expected|
   match do |actual|
-    next unless expected.java_kind_of?(org.logstash.config.ir.SourceComponent) && actual.java_kind_of?(org.logstash.config.ir.SourceComponent)
+    next unless expected.kind_of?(org.logstash.config.ir.SourceComponent) && actual.kind_of?(org.logstash.config.ir.SourceComponent)
 
     expected.sourceComponentEquals(actual)
   end
diff --git a/logstash-core/spec/support/matchers.rb b/logstash-core/spec/support/matchers.rb
index da0948ddd..faa2f9a16 100644
--- a/logstash-core/spec/support/matchers.rb
+++ b/logstash-core/spec/support/matchers.rb
@@ -1,17 +1,24 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "rspec"
 require "rspec/expectations"
-require "logstash/config/pipeline_config"
 require "stud/try"
 
-RSpec::Matchers.define :be_a_metric_event do |namespace, type, *args|
-  match do
-    namespace == Array(actual[0]).concat(Array(actual[1])) &&
-      type == actual[2] &&
-      args == actual[3..-1]
-  end
-end
-
 # Match to test `NullObject` pattern
 RSpec::Matchers.define :implement_interface_of do |type, key, value|
   match do |actual|
@@ -36,7 +43,7 @@ RSpec::Matchers.define :have_actions do |*expected|
     expect(actual.size).to eq(expected.size)
 
     expected_values = expected.each_with_object([]) do |i, obj|
-      klass_name = "LogStash::PipelineAction::#{i.first.capitalize}"
+      klass_name = "LogStash::PipelineAction::#{i.first}"
       obj << [klass_name, i.last]
     end
 
@@ -61,13 +68,27 @@ RSpec::Matchers.define :have_pipeline? do |pipeline_config|
   end
 
   match_when_negated do |agent|
+    pipeline = nil
+    try(30) do
+      pipeline = agent.get_pipeline(pipeline_config.pipeline_id)
+      expect(pipeline).to be_nil
+    end
+  end
+end
+
+RSpec::Matchers.define :have_stopped_pipeline? do |pipeline_config|
+  match do |agent|
     pipeline = nil
     try(30) do
       pipeline = agent.get_pipeline(pipeline_config.pipeline_id)
       expect(pipeline).to_not be_nil
     end
     # either the pipeline_id is not in the running pipelines OR it is but have different configurations
-    expect(!agent.running_pipelines.keys.map(&:to_s).include?(pipeline_config.pipeline_id.to_s) ||  pipeline.config_str != pipeline_config.config_string).to be_truthy
+    expect(!agent.running_pipelines.keys.map(&:to_s).include?(pipeline_config.pipeline_id.to_s) || pipeline.config_str != pipeline_config.config_string).to be_truthy
+  end
+
+  match_when_negated do
+    raise "Not implemented"
   end
 end
 
@@ -77,10 +98,10 @@ RSpec::Matchers.define :have_running_pipeline? do |pipeline_config|
     try(30) do
       pipeline = agent.get_pipeline(pipeline_config.pipeline_id)
       expect(pipeline).to_not be_nil
+      expect(pipeline.running?).to be_truthy
     end
     expect(pipeline.config_str).to eq(pipeline_config.config_string)
-    expect(pipeline.running?).to be_truthy
-    expect(agent.running_pipelines.keys.map(&:to_s)).to include(pipeline_config.pipeline_id.to_s)
+    expect(agent.running_pipelines.keys.map(&:to_s) + agent.loading_pipelines.keys.map(&:to_s)).to include(pipeline_config.pipeline_id.to_s)
   end
 
   failure_message do |agent|
@@ -93,6 +114,10 @@ RSpec::Matchers.define :have_running_pipeline? do |pipeline_config|
         "Found '#{pipeline_config.pipeline_id.to_s}' in the list of pipelines but its not running"
       elsif pipeline.config_str != pipeline_config.config_string
         "Found '#{pipeline_config.pipeline_id.to_s}' in the list of pipelines and running, but the config_string doesn't match,\nExpected:\n#{pipeline_config.config_string}\n\ngot:\n#{pipeline.config_str}"
+      elsif agent.running_pipelines.keys.map(&:to_s).include?(pipeline_config.pipeline_id.to_s)
+        "Found '#{pipeline_config.pipeline_id.to_s}' in running but not included in the list of agent.running_pipelines or agent.loading_pipelines"
+      else
+        "Unrecognized error condition, probably you missed to track properly a newly added expect in :have_running_pipeline?"
       end
     end
   end
@@ -153,4 +178,3 @@ RSpec::Matchers.define :be_a_config_loading_error_hash do |regex|
     raise "Not implemented"
   end
 end
-
diff --git a/logstash-core/spec/support/mocks_classes.rb b/logstash-core/spec/support/mocks_classes.rb
index ef4129153..0f80223c9 100644
--- a/logstash-core/spec/support/mocks_classes.rb
+++ b/logstash-core/spec/support/mocks_classes.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/outputs/base"
 require "logstash/config/source_loader"
 require "logstash/inputs/base"
@@ -43,6 +59,18 @@ module LogStash
       def filter(event)
         # noop
       end
+
+      ##
+      # Returns a one-off subclass of the DummyFilter that
+      # executes the provided hook with each event it receives
+      def self.with_hook(&block)
+        Class.new(self) do
+          config_name "dummyfilter_#{__id__}"
+          define_method(:filter) do |event|
+            block.call(event)
+          end
+        end
+      end
     end
   end
 
@@ -53,7 +81,7 @@ module LogStash
 
       attr_reader :num_closes, :events
 
-      def initialize(params={})
+      def initialize(params = {})
         super
         @num_closes = 0
         @events = []
@@ -81,7 +109,7 @@ module LogStash
 
       attr_reader :events
 
-      def initialize(params={})
+      def initialize(params = {})
         super
         @events = []
       end
@@ -103,7 +131,7 @@ module LogStash
 
       attr_reader :num_closes
 
-      def initialize(params={})
+      def initialize(params = {})
         super
         @num_closes = 0
         @events_received = Concurrent::AtomicFixnum.new(0)
@@ -126,7 +154,6 @@ module LogStash
     end
 end end
 
-
 # A Test Source loader will return the same configuration on every fetch call
 class TestSourceLoader
   FailedFetch = LogStash::Config::SourceLoader::FailedFetch
diff --git a/logstash-core/spec/support/pipeline/pipeline_helpers.rb b/logstash-core/spec/support/pipeline/pipeline_helpers.rb
index a7e892189..2e52d06df 100644
--- a/logstash-core/spec/support/pipeline/pipeline_helpers.rb
+++ b/logstash-core/spec/support/pipeline/pipeline_helpers.rb
@@ -1,6 +1,23 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/agent"
 require "logstash/java_pipeline"
-require "logstash/event"
+
 require "stud/try"
 require "rspec/expectations"
 require "thread"
@@ -8,7 +25,6 @@ require "thread"
 java_import org.logstash.common.SourceWithMetadata
 
 module PipelineHelpers
-
   class SpecSamplerInput < LogStash::Inputs::Base
     config_name "spec_sampler_input"
 
@@ -58,11 +74,9 @@ module PipelineHelpers
 
     describe "\"#{name}\"" do
       let(:pipeline) do
-        settings = ::LogStash::SETTINGS.clone
         settings.set_value("queue.drain", true)
-        settings.set_value("pipeline.workers", 1)
         LogStash::JavaPipeline.new(
-          LogStash::Config::PipelineConfig.new(
+          org.logstash.config.ir.PipelineConfig.new(
             LogStash::Config::Source::Local, :main,
             SourceWithMetadata.new(
               "config_string", "config_string",
@@ -73,9 +87,9 @@ module PipelineHelpers
       end
       let(:event) do
         sample_event = [sample_event] unless sample_event.is_a?(Array)
-        next sample_event.collect do |e|
+        sample_event.map do |e|
           e = { "message" => e } if e.is_a?(String)
-          next LogStash::Event.new(e)
+          LogStash::Event.new(e)
         end
       end
 
diff --git a/logstash-core/spec/support/shared_contexts.rb b/logstash-core/spec/support/shared_contexts.rb
index 55ddfd7e9..2a19f1f26 100644
--- a/logstash-core/spec/support/shared_contexts.rb
+++ b/logstash-core/spec/support/shared_contexts.rb
@@ -1,3 +1,22 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'time'
+
 shared_context "execution_context" do
   let(:pipeline) { double("pipeline") }
   let(:pipeline_id) { :main }
@@ -5,8 +24,9 @@ shared_context "execution_context" do
   let(:plugin_id) { :plugin_id }
   let(:plugin_type) { :plugin_type }
   let(:dlq_writer) { double("dlq_writer") }
+  let(:execution_context_factory) { ::LogStash::Plugins::ExecutionContextFactory.new(agent, pipeline, dlq_writer) }
   let(:execution_context) do
-    ::LogStash::ExecutionContext.new(pipeline, agent, plugin_id, plugin_type, dlq_writer)
+    execution_context_factory.create(plugin_id, plugin_type)
   end
 
   before do
@@ -15,26 +35,42 @@ shared_context "execution_context" do
   end
 end
 
-shared_context "api setup" do
+shared_context "api setup" do |settings_overrides = {}|
+  ##
+  # blocks until the condition returns true, or the limit has passed
+  # @return [true] if the condition was met
+  # @return [false] if the condition was NOT met
+  def block_until(limit_seconds, &condition)
+    deadline = Time.now + limit_seconds
+    loop.with_index do |_, try|
+      break if Time.now >= deadline
+      return true if condition.call
+
+      next_sleep = [(2.0**(try)) / 10, 2, deadline - Time.now].min
+      Kernel::sleep(next_sleep) unless next_sleep <= 0
+    end
+    # one last try
+    condition.call
+  end
+
   before :all do
     clear_data_dir
-    settings = mock_settings
-    config_string = "input { generator {id => 'api-generator-pipeline' count => 100 } } output { dummyoutput {} }"
-    settings.set("config.string", config_string)
-    settings.set("config.reload.automatic", false)
-    @agent = make_test_agent(settings)
-    @agent.execute
-    pipeline_config = mock_pipeline_config(:main, "input { generator { id => '123' } } output { null {} }")
-    pipeline_creator =  LogStash::PipelineAction::Create.new(pipeline_config, @agent.metric)
-    @pipelines_registry = LogStash::PipelinesRegistry.new
-    expect(pipeline_creator.execute(@agent, @pipelines_registry)).to be_truthy
+    settings = mock_settings({"config.reload.automatic" => true}.merge(settings_overrides))
+    config_source = make_config_source(settings)
+    config_source.add_pipeline('main', "input { generator {id => 'api-generator-pipeline' count => 100 } } output { dummyoutput {} }")
+
+    @agent = make_test_agent(settings, config_source)
+    @agent_execution_task = Stud::Task.new { @agent.execute }
+    block_until(30) { @agent.loaded_pipelines.keys.include?(:main) } or fail('main pipeline did not come up')
+
+    config_source.add_pipeline('main', "input { generator { id => '123' } } output { null {} }")
+    config_source.add_pipeline('secondary', "input { generator { id => '123' } } output { null {} }")
+    block_until(30) { ([:main, :secondary] - @agent.running_pipelines.keys).empty? } or fail('pipelines did not come up')
   end
 
   after :all do
-    @pipelines_registry.running_pipelines.each do |_, pipeline|
-      pipeline.shutdown
-      pipeline.thread.join
-    end
+    @agent_execution_task.stop!
+    @agent_execution_task.wait
     @agent.shutdown
   end
 
@@ -43,4 +79,4 @@ shared_context "api setup" do
   def app()
     described_class.new(nil, @agent)
   end
-end
\ No newline at end of file
+end
diff --git a/logstash-core/spec/support/shared_examples.rb b/logstash-core/spec/support/shared_examples.rb
index 04a409d2b..29eb4953b 100644
--- a/logstash-core/spec/support/shared_examples.rb
+++ b/logstash-core/spec/support/shared_examples.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Define the common operation that both the `NullMetric` class and the Namespaced class should answer.
 shared_examples "metrics commons operations" do
   let(:key) { "galaxy" }
@@ -21,7 +37,7 @@ shared_examples "metrics commons operations" do
     end
   end
 
-  describe "#decrement" do
+  describe "#decrement", skip: "LongCounter impl does not support decrement" do
     it "allows to decrement a key with no amount" do
       expect { subject.decrement(key, 100) }.not_to raise_error
     end
@@ -44,7 +60,6 @@ shared_examples "metrics commons operations" do
       expect { subject.gauge(key, "pluto") }.not_to raise_error
     end
 
-
     it "raises an exception if the key is an empty string" do
       expect { subject.gauge("", 20) }.to raise_error(LogStash::Instrument::MetricNoKeyProvided)
     end
@@ -71,7 +86,7 @@ shared_examples "metrics commons operations" do
   describe "#time" do
     it "allow to record time with a block given" do
       expect do
-        subject.time(key) { 1+1 }
+        subject.time(key) { 1 + 1 }
       end.not_to raise_error
     end
 
@@ -84,7 +99,6 @@ shared_examples "metrics commons operations" do
       expect { execution.stop }.not_to raise_error
     end
 
-
     it "raises an exception if the key is an empty string" do
       expect { subject.time("") {} }.to raise_error(LogStash::Instrument::MetricNoKeyProvided)
     end
@@ -105,4 +119,3 @@ shared_examples "not found" do
     expect(LogStash::Json.load(last_response.body)["path"]).not_to be_nil
   end
 end
-
diff --git a/logstash-core/src/main/java/co/elastic/logstash/api/Codec.java b/logstash-core/src/main/java/co/elastic/logstash/api/Codec.java
index dba0d201d..1cceea7ab 100644
--- a/logstash-core/src/main/java/co/elastic/logstash/api/Codec.java
+++ b/logstash-core/src/main/java/co/elastic/logstash/api/Codec.java
@@ -1,6 +1,27 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package co.elastic.logstash.api;
 
-import java.nio.Buffer;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.nio.ByteBuffer;
 import java.util.Map;
 import java.util.function.Consumer;
@@ -43,28 +64,12 @@ public interface Codec extends Plugin {
     void flush(ByteBuffer buffer, Consumer<Map<String, Object>> eventConsumer);
 
     /**
-     * Encodes an {@link Event} and writes it into the specified {@link ByteBuffer}. Under ideal
-     * circumstances, the entirety of the event's encoding will fit into the supplied buffer. In cases
-     * where the buffer has insufficient space to hold the event's encoding, the buffer will be filled
-     * with as much of the event's encoding as possible, {@code false} will be returned, and the caller
-     * must call this method with the same event and a buffer that has more {@link Buffer#remaining()}
-     * bytes. That is typically done by draining the partial encoding from the supplied buffer. This
-     * process must be repeated until the event's entire encoding is written to the buffer at which
-     * point the method will return {@code true}. Attempting to call this method with a new event
-     * before the entirety of the previous event's encoding has been written to a buffer will result
-     * in an {@link EncodeException}.
-     *
-     * @param event  The event to encode.
-     * @param buffer The buffer into which the encoding of the event should be written. Codec
-     *               implementations are responsible for returning the buffer in a state from which it
-     *               can be read, typically by calling {@link Buffer#flip()} before returning.
-     * @return {@code true} if the entirety or final segment of the event's encoding was written to
-     * the buffer. {@code false} if the buffer was incapable of holding the entirety or remainder of the
-     * event's encoding.
-     * @throws EncodeException if called with a new event before the entirety of the previous event's
-     * encoding was written to a buffer.
+     * Encodes an {@link Event} and writes it to the specified {@link OutputStream}.
+     * @param event The event to encode.
+     * @param output The stream to which the encoded event should be written.
+     * @throws java.io.IOException Exceptions coming from the output stream
      */
-    boolean encode(Event event, ByteBuffer buffer) throws EncodeException;
+    void encode(Event event, OutputStream output) throws IOException;
 
     /**
      * Clones this {@link Codec}. All codecs should be capable of cloning themselves
@@ -74,13 +79,4 @@ public interface Codec extends Plugin {
      */
     Codec cloneCodec();
 
-    class EncodeException extends Exception {
-
-        private static final long serialVersionUID = 1L;
-
-        public EncodeException(String message) {
-            super(message);
-        }
-
-    }
 }
diff --git a/logstash-core/src/main/java/co/elastic/logstash/api/Configuration.java b/logstash-core/src/main/java/co/elastic/logstash/api/Configuration.java
index 21f4673b2..8aff9d2ae 100644
--- a/logstash-core/src/main/java/co/elastic/logstash/api/Configuration.java
+++ b/logstash-core/src/main/java/co/elastic/logstash/api/Configuration.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package co.elastic.logstash.api;
 
 import java.util.Collection;
diff --git a/logstash-core/src/main/java/co/elastic/logstash/api/Context.java b/logstash-core/src/main/java/co/elastic/logstash/api/Context.java
index 607c55589..80851186b 100644
--- a/logstash-core/src/main/java/co/elastic/logstash/api/Context.java
+++ b/logstash-core/src/main/java/co/elastic/logstash/api/Context.java
@@ -1,7 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package co.elastic.logstash.api;
 
 import org.apache.logging.log4j.Logger;
-import org.logstash.common.io.DeadLetterQueueWriter;
 
 /**
  * Provides Logstash context to plugins.
@@ -15,6 +34,14 @@ public interface Context {
      */
     DeadLetterQueueWriter getDlqWriter();
 
+    /**
+     * Provides a metric namespace scoped to the given {@code plugin} that metrics can be written to and
+     * can be nested deeper with further namespaces.
+     * @param plugin The plugin the metric should be scoped to
+     * @return       A metric scoped to the current plugin
+     */
+    NamespacedMetric getMetric(Plugin plugin);
+
     /**
      * Provides a {@link Logger} instance to plugins.
      * @param plugin The plugin for which the logger should be supplied.
@@ -22,6 +49,13 @@ public interface Context {
      */
     Logger getLogger(Plugin plugin);
 
+    /**
+     * Provides a {@link Logger} instance to plugins.
+     * @param plugin The plugin for which the logger should be supplied.
+     * @return       The supplied Logger instance.
+     */
+    DeprecationLogger getDeprecationLogger(Plugin plugin);
+
     /**
      * Provides an {@link EventFactory} to constructs instance of {@link Event}.
      * @return The event factory.
diff --git a/logstash-core/src/main/java/co/elastic/logstash/api/CounterMetric.java b/logstash-core/src/main/java/co/elastic/logstash/api/CounterMetric.java
new file mode 100644
index 000000000..d9c3a1f85
--- /dev/null
+++ b/logstash-core/src/main/java/co/elastic/logstash/api/CounterMetric.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package co.elastic.logstash.api;
+
+/**
+ * A counter metric that tracks a single counter.
+ *
+ * You can retrieve an instance of this class using {@link NamespacedMetric#counter(String)}.
+ */
+public interface CounterMetric {
+    /**
+     * Increments the counter by 1.
+     */
+    void increment();
+
+    /**
+     * Increments the counter by {@code delta}.
+     *
+     * @param delta amount to increment the counter by
+     */
+    void increment(long delta);
+
+    /**
+     * Gets the current value of the counter.
+     *
+     * @return the counter value
+     */
+    long getValue();
+
+    /**
+     * Sets the counter back to 0.
+     */
+    void reset();
+}
diff --git a/logstash-core/src/main/java/co/elastic/logstash/api/DeadLetterQueueWriter.java b/logstash-core/src/main/java/co/elastic/logstash/api/DeadLetterQueueWriter.java
new file mode 100644
index 000000000..123b4be82
--- /dev/null
+++ b/logstash-core/src/main/java/co/elastic/logstash/api/DeadLetterQueueWriter.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package co.elastic.logstash.api;
+
+import java.io.IOException;
+
+public interface DeadLetterQueueWriter {
+
+    void writeEntry(Event event, Plugin plugin, String reason) throws IOException;
+
+    boolean isOpen();
+
+    long getCurrentQueueSize();
+}
diff --git a/logstash-core/src/main/java/co/elastic/logstash/api/DeprecationLogger.java b/logstash-core/src/main/java/co/elastic/logstash/api/DeprecationLogger.java
new file mode 100644
index 000000000..c206d9cb5
--- /dev/null
+++ b/logstash-core/src/main/java/co/elastic/logstash/api/DeprecationLogger.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package co.elastic.logstash.api;
+
+/**
+ * Used to log deprecation notices.
+ * */
+public interface DeprecationLogger {
+
+    /**
+     * Print to deprecation log the message with placeholder replaced by param values. The placeholder
+     * are {} form, like in log4j's syntax.
+     *
+     * @param message string message with parameter's placeholders.
+     * @param params var args with all the replacement parameters.
+     * */
+    void deprecated(String message, Object... params);
+}
diff --git a/logstash-core/src/main/java/co/elastic/logstash/api/Event.java b/logstash-core/src/main/java/co/elastic/logstash/api/Event.java
index 491b3748c..b15f3aca2 100644
--- a/logstash-core/src/main/java/co/elastic/logstash/api/Event.java
+++ b/logstash-core/src/main/java/co/elastic/logstash/api/Event.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package co.elastic.logstash.api;
 
 import java.io.IOException;
diff --git a/logstash-core/src/main/java/co/elastic/logstash/api/EventFactory.java b/logstash-core/src/main/java/co/elastic/logstash/api/EventFactory.java
index fb4a5c0ae..03ed275b9 100644
--- a/logstash-core/src/main/java/co/elastic/logstash/api/EventFactory.java
+++ b/logstash-core/src/main/java/co/elastic/logstash/api/EventFactory.java
@@ -1,14 +1,41 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package co.elastic.logstash.api;
 
 import java.io.Serializable;
+import java.util.Collections;
 import java.util.Map;
 
+/**
+ * A factory for events.
+ */
+@FunctionalInterface
 public interface EventFactory {
 
     /**
      * @return New and empty event.
      */
-    Event newEvent();
+    default Event newEvent() {
+        return newEvent(Collections.emptyMap());
+    }
 
     /**
      * @param data Map from which the new event should copy its data.
diff --git a/logstash-core/src/main/java/co/elastic/logstash/api/Filter.java b/logstash-core/src/main/java/co/elastic/logstash/api/Filter.java
index 8cf2dc293..22e8502cc 100644
--- a/logstash-core/src/main/java/co/elastic/logstash/api/Filter.java
+++ b/logstash-core/src/main/java/co/elastic/logstash/api/Filter.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package co.elastic.logstash.api;
 
 import java.util.Collection;
@@ -33,6 +53,13 @@ public interface Filter extends Plugin {
      */
     Collection<Event> filter(Collection<Event> events, FilterMatchListener matchListener);
 
+    /**
+     * After a pipeline has been shut down, its filters are closed.
+     * If your plugin holds additional resources such as database connections,
+     * implementing this method will allow you to free up those resources.
+     */
+    default void close() { return; }
+
     /**
      * If this filter maintains state between calls to {@link #filter(Collection, FilterMatchListener)}, this
      * method should return events for all state currently held by the filter. This method will never be called
diff --git a/logstash-core/src/main/java/co/elastic/logstash/api/FilterMatchListener.java b/logstash-core/src/main/java/co/elastic/logstash/api/FilterMatchListener.java
index d5addb16b..d9c639986 100644
--- a/logstash-core/src/main/java/co/elastic/logstash/api/FilterMatchListener.java
+++ b/logstash-core/src/main/java/co/elastic/logstash/api/FilterMatchListener.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package co.elastic.logstash.api;
 
 /**
diff --git a/logstash-core/src/main/java/co/elastic/logstash/api/Input.java b/logstash-core/src/main/java/co/elastic/logstash/api/Input.java
index 11848779e..8d991602c 100644
--- a/logstash-core/src/main/java/co/elastic/logstash/api/Input.java
+++ b/logstash-core/src/main/java/co/elastic/logstash/api/Input.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package co.elastic.logstash.api;
 
 import java.util.Map;
diff --git a/logstash-core/src/main/java/co/elastic/logstash/api/LogstashPlugin.java b/logstash-core/src/main/java/co/elastic/logstash/api/LogstashPlugin.java
index d338be00a..644f991d1 100644
--- a/logstash-core/src/main/java/co/elastic/logstash/api/LogstashPlugin.java
+++ b/logstash-core/src/main/java/co/elastic/logstash/api/LogstashPlugin.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package co.elastic.logstash.api;
 
 import java.lang.annotation.ElementType;
diff --git a/logstash-core/src/main/java/co/elastic/logstash/api/Metric.java b/logstash-core/src/main/java/co/elastic/logstash/api/Metric.java
new file mode 100644
index 000000000..ba9efd17a
--- /dev/null
+++ b/logstash-core/src/main/java/co/elastic/logstash/api/Metric.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package co.elastic.logstash.api;
+
+/**
+ * Represents a metric namespace that other namespaces can nested within.
+ */
+public interface Metric {
+    /**
+     * Creates a namespace under the current {@link Metric} and returns it.
+     *
+     * @param key namespace to traverse into
+     * @return the {@code key} namespace under the current Metric
+     */
+    NamespacedMetric namespace(String... key);
+}
diff --git a/logstash-core/src/main/java/co/elastic/logstash/api/NamespacedMetric.java b/logstash-core/src/main/java/co/elastic/logstash/api/NamespacedMetric.java
new file mode 100644
index 000000000..ef2574cad
--- /dev/null
+++ b/logstash-core/src/main/java/co/elastic/logstash/api/NamespacedMetric.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package co.elastic.logstash.api;
+
+import java.util.function.Supplier;
+
+/**
+ * Represents a nested namespace that metrics can be written into and other namespaces
+ * can be nested within.
+ */
+public interface NamespacedMetric extends Metric {
+    /**
+     * Writes an absolute value to the {@code metric}.
+     *
+     * @param metric metric to write value to
+     * @param value value to write
+     */
+    void gauge(String metric, Object value);
+
+    /**
+     * Creates a counter with the name {@code metric}.
+     *
+     * @param metric name of the counter
+     * @return an instance tracking a counter metric allowing easy incrementing and resetting
+     */
+    CounterMetric counter(String metric);
+
+    /**
+     * Creates a timer with the name {@code metric}.
+     *
+     * @param metric name of the counter
+     * @return an instance tracking a counter metric allowing easy incrementing and resetting
+     */
+    TimerMetric timer(String metric);
+
+    /**
+     * Increment the {@code metric} metric by 1.
+     *
+     * @param metric metric to increment
+     */
+    void increment(String metric);
+
+    /**
+     * Increment the {@code metric} by {@code delta}.
+     *
+     * @param metric metric to increment
+     * @param delta amount to increment by
+     */
+    void increment(String metric, int delta);
+
+    /**
+     * Times the {@code callable} and returns its value and increments the
+     * {@code metric} with the time taken.
+     *
+     * @param metric metric to increment
+     * @param callable callable to time
+     * @param <T> return type of the {@code callable}
+     * @return the return value from the {@code callable}
+     */
+    <T> T time(String metric, Supplier<T> callable);
+
+    /**
+     * Increments the {@code metric} by {@code duration}.
+     *
+     * @param metric metric to increment
+     * @param duration duration to increment by
+     */
+    void reportTime(String metric, long duration);
+
+    /**
+     * Retrieves each namespace component that makes up this metric.
+     *
+     * @return the namespaces this metric is nested within
+     */
+    String[] namespaceName();
+
+    /**
+     * Gets Logstash's root metric namespace.
+     *
+     * @return the root namespace
+     */
+    Metric root();
+}
diff --git a/logstash-core/src/main/java/co/elastic/logstash/api/Output.java b/logstash-core/src/main/java/co/elastic/logstash/api/Output.java
index 4c133999a..7f9b35c96 100644
--- a/logstash-core/src/main/java/co/elastic/logstash/api/Output.java
+++ b/logstash-core/src/main/java/co/elastic/logstash/api/Output.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package co.elastic.logstash.api;
 
 import java.util.Collection;
diff --git a/logstash-core/src/main/java/co/elastic/logstash/api/Password.java b/logstash-core/src/main/java/co/elastic/logstash/api/Password.java
new file mode 100644
index 000000000..c89c31557
--- /dev/null
+++ b/logstash-core/src/main/java/co/elastic/logstash/api/Password.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package co.elastic.logstash.api;
+
+import java.io.Serializable;
+
+/**
+ * Wraps a password string so that it is not inadvertently printed or logged.
+ */
+public class Password implements Serializable {
+
+    private static final long serialVersionUID = -8683271728417419530L;
+
+    private String password;
+
+    public Password(String password) {
+        this.password = password;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    @Override
+    public String toString() {
+        return "<password>";
+    }
+
+    // Ruby code compatibility, value attribute
+    public String getValue() {
+        return getPassword();
+    }
+
+    // Ruby code compatibility, inspect method
+    public String inspect() {
+        return toString();
+    }
+}
diff --git a/logstash-core/src/main/java/co/elastic/logstash/api/Plugin.java b/logstash-core/src/main/java/co/elastic/logstash/api/Plugin.java
index d070acaaf..e602383dc 100644
--- a/logstash-core/src/main/java/co/elastic/logstash/api/Plugin.java
+++ b/logstash-core/src/main/java/co/elastic/logstash/api/Plugin.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package co.elastic.logstash.api;
 
 import java.util.Collection;
diff --git a/logstash-core/src/main/java/co/elastic/logstash/api/PluginConfigSpec.java b/logstash-core/src/main/java/co/elastic/logstash/api/PluginConfigSpec.java
index 8d3abaf7a..988fd0eb2 100644
--- a/logstash-core/src/main/java/co/elastic/logstash/api/PluginConfigSpec.java
+++ b/logstash-core/src/main/java/co/elastic/logstash/api/PluginConfigSpec.java
@@ -1,5 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package co.elastic.logstash.api;
 
+import java.net.URI;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -83,6 +104,28 @@ public final class PluginConfigSpec<T> {
         return new PluginConfigSpec<>(name, Codec.class, defaultValue, deprecated, required);
     }
 
+    public static PluginConfigSpec<URI> uriSetting(final String name) {
+        return new PluginConfigSpec<>(
+                name, URI.class, null, false, false
+        );
+    }
+
+    public static PluginConfigSpec<URI> uriSetting(final String name, final String defaultUri) {
+        PluginConfigSpec<URI> pcs = new PluginConfigSpec<>(
+                name, URI.class, null, false, false
+        );
+        pcs.rawDefaultValue = defaultUri;
+        return pcs;
+    }
+
+    public static PluginConfigSpec<URI> uriSetting(final String name, final String defaultUri, boolean deprecated, boolean required) {
+        PluginConfigSpec<URI> pcs = new PluginConfigSpec<>(
+                name, URI.class, null, deprecated, required
+        );
+        pcs.rawDefaultValue = defaultUri;
+        return pcs;
+    }
+
     public static PluginConfigSpec<Long> numSetting(final String name) {
         return new PluginConfigSpec<>(
             name, Long.class, null, false, false
@@ -95,6 +138,14 @@ public final class PluginConfigSpec<T> {
         );
     }
 
+    public static PluginConfigSpec<Double> floatSetting(final String name, final double defaultValue) {
+        return new PluginConfigSpec<>(name, Double.class, defaultValue, false, false);
+    }
+
+    public static PluginConfigSpec<Double> floatSetting(final String name, final double defaultValue, boolean deprecated, boolean required) {
+        return new PluginConfigSpec<>(name, Double.class, defaultValue, deprecated, required);
+    }
+
     public static PluginConfigSpec<Long> numSetting(final String name, final long defaultValue, boolean deprecated, boolean required) {
         return new PluginConfigSpec<>(name, Long.class, defaultValue, deprecated, required);
     }
@@ -135,6 +186,20 @@ public final class PluginConfigSpec<T> {
         return new PluginConfigSpec(name, List.class, defaultValue, deprecated, required);
     }
 
+    public static PluginConfigSpec<Password> passwordSetting(final String name) {
+        return new PluginConfigSpec<>(
+                name, Password.class, null, false, false
+        );
+    }
+
+    public static PluginConfigSpec<Password> passwordSetting(final String name, final String defaultValue, boolean deprecated, boolean required) {
+        PluginConfigSpec<Password> pcs = new PluginConfigSpec<>(
+                name, Password.class, null, false, false
+        );
+        pcs.rawDefaultValue = defaultValue;
+        return pcs;
+    }
+
     public Collection<PluginConfigSpec<?>> children() {
         return children;
     }
diff --git a/logstash-core/src/main/java/co/elastic/logstash/api/PluginHelper.java b/logstash-core/src/main/java/co/elastic/logstash/api/PluginHelper.java
index 7dee3a8a4..352d98830 100644
--- a/logstash-core/src/main/java/co/elastic/logstash/api/PluginHelper.java
+++ b/logstash-core/src/main/java/co/elastic/logstash/api/PluginHelper.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package co.elastic.logstash.api;
 
 import java.util.ArrayList;
diff --git a/logstash-core/src/main/java/co/elastic/logstash/api/TimerMetric.java b/logstash-core/src/main/java/co/elastic/logstash/api/TimerMetric.java
new file mode 100644
index 000000000..4a7108ef8
--- /dev/null
+++ b/logstash-core/src/main/java/co/elastic/logstash/api/TimerMetric.java
@@ -0,0 +1,49 @@
+package co.elastic.logstash.api;
+
+import java.io.IOException;
+import java.util.function.Supplier;
+
+/**
+ * This {@code TimerMetric} is a write-only interface for timing execution.
+ *
+ * <p>It includes two primary methods of tracking timed execution:
+ * <dl>
+ *     <dt>{@link TimerMetric#time}</dt>
+ *     <dd>Track the execution time of the provided block or closure.
+ *         This is the preferred method, as it requires no math or
+ *         external time-tracking.</dd>
+ *     <dt>{@link TimerMetric#reportUntrackedMillis}</dt>
+ *     <dd>Report milliseconds elapsed that were <em>NOt</em> tracked.
+ *         This method requires provisioning your own time source
+ *         (typically {@link System#nanoTime()}) and performing your
+ *         own time conversion math.</dd>
+ * </dl>
+ *
+ * A namespaced instance of {@code TimerMetric} can be acquired by plugins
+ * using {@link NamespacedMetric#timer(String)}, or can be invoked directly
+ * from a metric namespace with {@link NamespacedMetric#time(String, Supplier)}
+ * or {@link NamespacedMetric#reportTime(String, long)}.
+ */
+public interface TimerMetric {
+    <T, E extends Throwable> T time(ExceptionalSupplier<T, E> exceptionalSupplier) throws E;
+
+    void reportUntrackedMillis(final long untrackedMillis);
+
+
+    default <E extends Throwable> void time(final ExceptionalRunnable<E> exceptionalRunnable) throws E {
+        this.<Void, E>time(() -> {
+            exceptionalRunnable.run();
+            return null;
+        });
+    }
+
+    @FunctionalInterface
+    interface ExceptionalSupplier<T,E extends Throwable> {
+        T get() throws E;
+    }
+
+    @FunctionalInterface
+    interface ExceptionalRunnable<E extends Throwable> {
+        void run() throws E;
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/Accessors.java b/logstash-core/src/main/java/org/logstash/Accessors.java
index 0489bcc26..979489ca3 100644
--- a/logstash-core/src/main/java/org/logstash/Accessors.java
+++ b/logstash-core/src/main/java/org/logstash/Accessors.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 public final class Accessors {
diff --git a/logstash-core/src/main/java/org/logstash/Cloner.java b/logstash-core/src/main/java/org/logstash/Cloner.java
index 536bcdcb6..7d4b67fc5 100644
--- a/logstash-core/src/main/java/org/logstash/Cloner.java
+++ b/logstash-core/src/main/java/org/logstash/Cloner.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import org.jruby.RubyString;
@@ -22,7 +42,8 @@ public final class Cloner {
         } else if (input instanceof List<?>) {
             return (T) deepList((List<?>) input);
         } else if (input instanceof RubyString) {
-            return (T) ((RubyString) input).doClone();
+            // new instance but sharing ByteList (until either String is modified)
+            return (T) ((RubyString) input).dup();
         } else if (input instanceof Collection<?>) {
             throw new ClassCastException("unexpected Collection type " + input.getClass());
         }
diff --git a/logstash-core/src/main/java/org/logstash/ConvertedList.java b/logstash-core/src/main/java/org/logstash/ConvertedList.java
index c67b87b2d..a26d8fbd4 100644
--- a/logstash-core/src/main/java/org/logstash/ConvertedList.java
+++ b/logstash-core/src/main/java/org/logstash/ConvertedList.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import java.util.ArrayList;
diff --git a/logstash-core/src/main/java/org/logstash/ConvertedMap.java b/logstash-core/src/main/java/org/logstash/ConvertedMap.java
index 99d33a926..c9f0da606 100644
--- a/logstash-core/src/main/java/org/logstash/ConvertedMap.java
+++ b/logstash-core/src/main/java/org/logstash/ConvertedMap.java
@@ -1,14 +1,34 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.IdentityHashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import org.jruby.RubyHash;
 import org.jruby.RubyString;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
-import org.logstash.execution.WorkerLoop;
 
 /**
  * <p>This class is an internal API and behaves very different from a standard {@link Map}.</p>
@@ -16,15 +36,51 @@ import org.logstash.execution.WorkerLoop;
  * as key.</p>
  * <p>The {@code put} method will work with any {@link String} key but is only intended for use in
  * situations where {@link ConvertedMap#putInterned(String, Object)} would require manually
- * interning the {@link String} key. This is due to the fact that we use our internal
- * {@link FieldReference} cache to get an interned version of the given key instead of JDKs
- * {@link String#intern()}, which is faster since it works from a much smaller and hotter cache
- * in {@link FieldReference#CACHE} than using String interning directly.</p>
+ * interning the {@link String} key.
+ * This is due to the fact that it is based on {@link IdentityHashMap}, and we rely on the String
+ * intern pool to ensure identity match of equivalent strings.
+ * For performance, we keep a global cache of strings that have been interned for use with {@link ConvertedMap},
+ * and encourage interning through {@link ConvertedMap#internStringForUseAsKey(String)} to avoid
+ * the performance pentalty of the global string intern pool.
  */
 public final class ConvertedMap extends IdentityHashMap<String, Object> {
 
     private static final long serialVersionUID = 1L;
 
+    private static final ConcurrentHashMap<String,String> KEY_CACHE = new ConcurrentHashMap<>(100, 0.2F, 16);
+
+    /**
+     * Returns an equivalent interned string, possibly avoiding the
+     * global intern pool.
+     *
+     * @param candidate the candidate {@link String}
+     * @return an interned string from the global String intern pool
+     */
+    static String internStringForUseAsKey(final String candidate) {
+        // TODO: replace with LRU cache and/or isolated intern pool
+        final String cached = KEY_CACHE.get(candidate);
+        if (cached != null) { return cached; }
+
+        final String interned = candidate.intern();
+        if (KEY_CACHE.size() <= 10_000 ) {
+            KEY_CACHE.put(interned, interned);
+        }
+        return interned;
+    }
+
+    /**
+     * Ensures that the provided {@code String[]} contains only
+     * instances that have been {@link ConvertedMap::internStringForUseAsKey},
+     * possibly replacing entries with equivalent interned strings.
+     *
+     * @param candidates an array of non-null strings
+     */
+    static void internStringsForUseAsKeys(final String[] candidates) {
+        for (int i = 0; i < candidates.length; i++) {
+            candidates[i] = internStringForUseAsKey(candidates[i]);
+        }
+    }
+
     private static final RubyHash.VisitorWithState<ConvertedMap> RUBY_HASH_VISITOR =
         new RubyHash.VisitorWithState<ConvertedMap>() {
             @Override
@@ -61,7 +117,7 @@ public final class ConvertedMap extends IdentityHashMap<String, Object> {
     }
 
     public static ConvertedMap newFromRubyHash(final RubyHash o) {
-        return newFromRubyHash(WorkerLoop.THREAD_CONTEXT.get(), o);
+        return newFromRubyHash(RubyUtil.RUBY.getCurrentContext(), o);
     }
 
     public static ConvertedMap newFromRubyHash(final ThreadContext context, final RubyHash o) {
@@ -72,7 +128,7 @@ public final class ConvertedMap extends IdentityHashMap<String, Object> {
 
     @Override
     public Object put(final String key, final Object value) {
-        return super.put(FieldReference.from(key).getKey(), value);
+        return super.put(internStringForUseAsKey(key), value);
     }
 
     /**
@@ -99,6 +155,6 @@ public final class ConvertedMap extends IdentityHashMap<String, Object> {
      * @return Interned String
      */
     private static String convertKey(final RubyString key) {
-        return FieldReference.from(key).getKey();
+        return internStringForUseAsKey(key.asJavaString());
     }
 }
diff --git a/logstash-core/src/main/java/org/logstash/DLQEntry.java b/logstash-core/src/main/java/org/logstash/DLQEntry.java
index db524ab4e..26adaae8b 100644
--- a/logstash-core/src/main/java/org/logstash/DLQEntry.java
+++ b/logstash-core/src/main/java/org/logstash/DLQEntry.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -23,7 +43,9 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import org.logstash.ackedqueue.Queueable;
 
-
+/**
+ * Dead letter queue item
+ */
 public class DLQEntry implements Cloneable, Queueable {
 
     private final Event event;
diff --git a/logstash-core/src/main/java/org/logstash/Event.java b/logstash-core/src/main/java/org/logstash/Event.java
index 7885de87b..e1e9f4db1 100644
--- a/logstash-core/src/main/java/org/logstash/Event.java
+++ b/logstash-core/src/main/java/org/logstash/Event.java
@@ -1,5 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
+import co.elastic.logstash.api.EventFactory;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -9,20 +30,24 @@ import org.jruby.RubyString;
 import org.jruby.RubySymbol;
 import org.logstash.ackedqueue.Queueable;
 import org.logstash.ext.JrubyTimestampExtLibrary;
+import org.logstash.plugins.BasicEventFactory;
 
 import java.io.IOException;
 import java.io.Serializable;
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import static org.logstash.ObjectMappers.CBOR_MAPPER;
 import static org.logstash.ObjectMappers.JSON_MAPPER;
 
+/**
+ * Event implementation, is the Logstash's event implementation
+ * */
 public final class Event implements Cloneable, Queueable, co.elastic.logstash.api.Event {
 
     private boolean cancelled;
@@ -38,9 +63,13 @@ public final class Event implements Cloneable, Queueable, co.elastic.logstash.ap
     public static final String VERSION_ONE = "1";
     private static final String DATA_MAP_KEY = "DATA";
     private static final String META_MAP_KEY = "META";
+    public static final String TAGS = "tags";
+    public static final String TAGS_FAILURE_TAG = "_tagsparsefailure";
+    public static final String TAGS_FAILURE = "_tags";
+
+    private static final FieldReference TAGS_FIELD = FieldReference.from(TAGS);
+    private static final FieldReference TAGS_FAILURE_FIELD = FieldReference.from(TAGS_FAILURE);
 
-    private static final FieldReference TAGS_FIELD = FieldReference.from("tags");
-    
     private static final Logger logger = LogManager.getLogger(Event.class);
 
     public Event()
@@ -82,6 +111,13 @@ public final class Event implements Cloneable, Queueable, co.elastic.logstash.ap
         }
         this.cancelled = false;
 
+        // guard tags field from key/value map, only string or list is allowed
+        final Object tags = Accessors.get(data, TAGS_FIELD);
+        if (!isLegalTagValue(tags)) {
+            initFailTag(tags);
+            initTag(TAGS_FAILURE_TAG);
+        }
+
         Object providedTimestamp = data.get(TIMESTAMP);
         // keep reference to the parsedTimestamp for tagging below
         Timestamp parsedTimestamp = initTimestamp(providedTimestamp);
@@ -176,6 +212,10 @@ public final class Event implements Cloneable, Queueable, co.elastic.logstash.ap
 
     @SuppressWarnings("unchecked")
     public void setField(final FieldReference field, final Object value) {
+        if ((field.equals(TAGS_FIELD) && !isLegalTagValue(value)) || isTagsWithMap(field)) {
+            throw new InvalidTagsTypeException(field, value);
+        }
+
         switch (field.type()) {
             case FieldReference.META_PARENT:
                 // ConvertedMap.newFromMap already does valuefication
@@ -189,6 +229,25 @@ public final class Event implements Cloneable, Queueable, co.elastic.logstash.ap
         }
     }
 
+    private boolean isTagsWithMap(final FieldReference field) {
+        return field.getPath() != null && field.getPath().length > 0 && field.getPath()[0].equals(TAGS);
+    }
+
+    private boolean isLegalTagValue(final Object value) {
+        if (value instanceof String || value instanceof RubyString || value == null) {
+            return true;
+        } else if (value instanceof List) {
+            for (Object item: (List) value) {
+                if (!(item instanceof String) && !(item instanceof RubyString)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        return false;
+    }
+
     @Override
     public boolean includes(final String field) {
         return includes(FieldReference.from(field));
@@ -227,31 +286,56 @@ public final class Event implements Cloneable, Queueable, co.elastic.logstash.ap
         return JSON_MAPPER.writeValueAsString(this.data);
     }
 
+    private static final Event[] NULL_ARRAY = new Event[0];
+
     @SuppressWarnings("unchecked")
-    public static Event[] fromJson(String json)
-            throws IOException
-    {
+    private static Object parseJson(final String json) throws IOException {
+        return JSON_MAPPER.readValue(json, Object.class);
+    }
+
+    /**
+     * Map a JSON string into events.
+     * @param json input string
+     * @return events
+     * @throws IOException when (JSON) parsing fails
+     */
+    public static Event[] fromJson(final String json) throws IOException {
+        return fromJson(json, BasicEventFactory.INSTANCE);
+    }
+
+    /**
+     * Map a JSON string into events.
+     * @param json input string
+     * @param factory event factory
+     * @return events
+     * @throws IOException when (JSON) parsing fails
+     */
+    @SuppressWarnings("unchecked")
+    public static Event[] fromJson(final String json, final EventFactory factory) throws IOException {
         // empty/blank json string does not generate an event
-        if (json == null || json.trim().isEmpty()) {
-            return new Event[]{ };
+        if (json == null || isBlank(json)) {
+            return NULL_ARRAY;
         }
 
-        Event[] result;
-        Object o = JSON_MAPPER.readValue(json, Object.class);
+        Object o = parseJson(json);
         // we currently only support Map or Array json objects
         if (o instanceof Map) {
-            result = new Event[]{ new Event((Map<String, Object>)o) };
-        } else if (o instanceof List) {
-            final Collection<Map<String, Object>> list = (Collection<Map<String, Object>>) o; 
-            result = new Event[list.size()];
-            int i = 0;
-            for (final Map<String, Object> e : list) {
-                result[i++] = new Event(e);
-            }
-        } else {
-            throw new IOException("incompatible json object type=" + o.getClass().getName() + " , only hash map or arrays are supported");
+            // NOTE: we need to assume the factory returns org.logstash.Event impl
+            return new Event[] { (Event) factory.newEvent((Map<? extends Serializable, Object>) o) };
+        }
+        if (o instanceof List) { // Jackson returns an ArrayList
+            return fromList((List<Map<String, Object>>) o, factory);
         }
 
+        throw new IOException("incompatible json object type=" + o.getClass().getName() + " , only hash map or arrays are supported");
+    }
+
+    private static Event[] fromList(final List<Map<String, Object>> list, final EventFactory factory) {
+        final int len = list.size();
+        Event[] result = new Event[len];
+        for (int i = 0; i < len; i++) {
+            result[i] = (Event) factory.newEvent(list.get(i));
+        }
         return result;
     }
 
@@ -296,7 +380,17 @@ public final class Event implements Cloneable, Queueable, co.elastic.logstash.ap
     }
 
     public Object remove(final FieldReference field) {
-        return Accessors.del(data, field);
+        switch (field.type()) {
+            case FieldReference.META_PARENT:
+                // removal of metadata is actually emptying metadata.
+                final ConvertedMap old_value =  ConvertedMap.newFromMap(this.metadata);
+                this.metadata = new ConvertedMap();
+                return Javafier.deep(old_value);
+            case FieldReference.META_CHILD:
+                return Accessors.del(metadata, field);
+            default:
+                return Accessors.del(data, field);
+        }
     }
 
     @Override
@@ -324,6 +418,17 @@ public final class Event implements Cloneable, Queueable, co.elastic.logstash.ap
                 : hostMessageString;
     }
 
+    private static boolean isBlank(final String str) {
+        final int len = str.length();
+        if (len == 0) return true;
+        for (int i = 0; i < len; i++) {
+            if (!Character.isWhitespace(str.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     private static Timestamp initTimestamp(Object o) {
         if (o == null || o instanceof RubyNil) {
             // most frequent
@@ -413,6 +518,12 @@ public final class Event implements Cloneable, Queueable, co.elastic.logstash.ap
         }
     }
 
+    private void initFailTag(final Object tag) {
+        final ConvertedList list = new ConvertedList(1);
+        list.add(tag);
+        Accessors.set(data, TAGS_FAILURE_FIELD, list);
+    }
+
     /**
      * Fallback for {@link Event#tag(String)} in case "tags" was populated by just a String value
      * and needs to be converted to a list before appending to it.
@@ -439,4 +550,21 @@ public final class Event implements Cloneable, Queueable, co.elastic.logstash.ap
         }
         return fromSerializableMap(data);
     }
+
+    public static class InvalidTagsTypeException extends RuntimeException {
+        private static final long serialVersionUID = 1L;
+
+        public InvalidTagsTypeException(final FieldReference field, final Object value) {
+            super(String.format("Could not set the reserved tags field '%s' to value '%s'. " +
+                            "The tags field only accepts string or array of string.",
+                    getCanonicalFieldReference(field), value
+            ));
+        }
+
+        private static String getCanonicalFieldReference(final FieldReference field) {
+            List<String> path = new ArrayList<>(List.of(field.getPath()));
+            path.add(field.getKey());
+            return path.stream().collect(Collectors.joining("][", "[", "]"));
+        }
+    }
 }
diff --git a/logstash-core/src/main/java/org/logstash/FieldReference.java b/logstash-core/src/main/java/org/logstash/FieldReference.java
index 2f4923cc8..2df3122dd 100644
--- a/logstash-core/src/main/java/org/logstash/FieldReference.java
+++ b/logstash-core/src/main/java/org/logstash/FieldReference.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import java.util.ArrayList;
@@ -7,8 +27,14 @@ import java.util.List;
 import java.util.Map;
 
 import java.util.concurrent.ConcurrentHashMap;
-import org.jruby.RubyString;
+import java.util.stream.Collectors;
 
+import org.jruby.RubyString;
+import org.logstash.util.EscapeHandler;
+
+/**
+ * Represents a reference to another field of the event {@link Event}
+ * */
 public final class FieldReference {
     /**
      * A custom unchecked {@link RuntimeException} that can be thrown by parsing methods when
@@ -21,19 +47,41 @@ public final class FieldReference {
         }
     }
 
+    private static EscapeHandler ESCAPE_HANDLER = EscapeHandler.NONE;
+
+    public static void setEscapeStyle(final String escapeStyleSpec) {
+        final EscapeHandler newEscapeHandler;
+        switch(escapeStyleSpec) {
+            case "none":
+                newEscapeHandler = EscapeHandler.NONE;
+                break;
+            case "percent":
+                newEscapeHandler = EscapeHandler.PERCENT;
+                break;
+            case "ampersand":
+                newEscapeHandler = EscapeHandler.AMPERSAND;
+                break;
+            default:
+                throw new IllegalArgumentException(String.format("Invalid escape style: `%s`", escapeStyleSpec));
+        }
+        ESCAPE_HANDLER = newEscapeHandler;
+        CACHE.clear();
+        RUBY_CACHE.clear();
+    }
+
     /**
      * This type indicates that the referenced that is the metadata of an {@link Event} found in
-     * {@link Event#metadata}.
+     * {@link Event#getMetadata()}.
      */
     public static final int META_PARENT = 0;
 
     /**
-     * This type indicates that the referenced data must be looked up from {@link Event#metadata}.
+     * This type indicates that the referenced data must be looked up from {@link Event#getMetadata()}.
      */
     public static final int META_CHILD = 1;
 
     /**
-     * This type indicates that the referenced data must be looked up from {@link Event#data}.
+     * This type indicates that the referenced data must be looked up from {@link Event#getData()}.
      */
     private static final int DATA_CHILD = -1;
 
@@ -49,15 +97,6 @@ public final class FieldReference {
      */
     private static final StrictTokenizer TOKENIZER = new StrictTokenizer();
 
-    /**
-     * Unique {@link FieldReference} pointing at the timestamp field in a {@link Event}.
-     */
-    public static final FieldReference TIMESTAMP_REFERENCE =
-        deduplicate(new FieldReference(EMPTY_STRING_ARRAY, Event.TIMESTAMP, DATA_CHILD));
-
-    private static final FieldReference METADATA_PARENT_REFERENCE =
-        new FieldReference(EMPTY_STRING_ARRAY, Event.METADATA, META_PARENT);
-
     /**
      * Cache of all existing {@link FieldReference} by their {@link RubyString} source.
      */
@@ -70,6 +109,11 @@ public final class FieldReference {
     private static final Map<String, FieldReference> CACHE =
         new ConcurrentHashMap<>(64, 0.2F, 1);
 
+    /**
+     * Unique {@link FieldReference} pointing at the timestamp field in a {@link Event}.
+     */
+    public static final FieldReference TIMESTAMP_REFERENCE = FieldReference.from(Event.TIMESTAMP);
+
     private final String[] path;
 
     private final String key;
@@ -83,9 +127,10 @@ public final class FieldReference {
     private final int type;
 
     private FieldReference(final String[] path, final String key, final int type) {
-        this.key = key;
-        this.type = type;
+        this.key = ConvertedMap.internStringForUseAsKey(key);
+        ConvertedMap.internStringsForUseAsKeys(path);
         this.path = path;
+        this.type = type;
         hash = calculateHash(this.key, this.path, this.type);
     }
 
@@ -95,7 +140,13 @@ public final class FieldReference {
         if (result != null) {
             return result;
         }
-        return RUBY_CACHE.computeIfAbsent(reference.newFrozen(), ref -> from(ref.asJavaString()));
+
+        final FieldReference parsed = from(reference.asJavaString());
+        // exact size in a race condition is not important
+        if (RUBY_CACHE.size() < 10_000) {
+            RUBY_CACHE.put(reference.newFrozen(), parsed);
+        }
+        return parsed;
     }
 
     public static FieldReference from(final String reference) {
@@ -107,6 +158,15 @@ public final class FieldReference {
         return parseToCache(reference);
     }
 
+    public static boolean isValid(final String reference) {
+        try {
+            FieldReference.from(reference);
+            return true;
+        } catch (IllegalSyntaxException ise) {
+            return false;
+        }
+    }
+
     /**
      * Returns the type of this instance to allow for fast switch operations in
      * {@link Event#getUnconvertedField(FieldReference)} and
@@ -181,15 +241,21 @@ public final class FieldReference {
     }
 
     private static FieldReference parse(final CharSequence reference) {
-        final List<String> path = TOKENIZER.tokenize(reference);
+        final List<String> path = TOKENIZER.tokenize(reference).stream()
+                .map(ESCAPE_HANDLER::unescape)
+                .collect(Collectors.toList());
 
-        final String key = path.remove(path.size() - 1).intern();
+        return fromTokens(path);
+    }
+
+    private static FieldReference fromTokens(final List<String> path) {
+        final String key = path.remove(path.size() - 1);
         final boolean empty = path.isEmpty();
         if (empty && key.equals(Event.METADATA)) {
-            return METADATA_PARENT_REFERENCE;
+            return new FieldReference(EMPTY_STRING_ARRAY, key, META_PARENT);
         } else if (!empty && path.get(0).equals(Event.METADATA)) {
             return new FieldReference(
-                path.subList(1, path.size()).toArray(EMPTY_STRING_ARRAY), key, META_CHILD
+                    path.subList(1, path.size()).toArray(EMPTY_STRING_ARRAY), key, META_CHILD
             );
         } else {
             return new FieldReference(path.toArray(EMPTY_STRING_ARRAY), key, DATA_CHILD);
@@ -202,7 +268,11 @@ public final class FieldReference {
      **/
     private static class StrictTokenizer {
 
-        public List<String> tokenize(CharSequence reference) {
+        /**
+         * @param reference a sequence of characters representing a reference to a field
+         * @return a list of string path fragments.
+         */
+        public List<String> tokenize(final CharSequence reference) {
             ArrayList<String> path = new ArrayList<>();
             final int length = reference.length();
 
@@ -248,7 +318,7 @@ public final class FieldReference {
 
                         if (splitPoint < i) {
                             // if we have something to add, add it.
-                            path.add(reference.subSequence(splitPoint, i).toString().intern());
+                            path.add(reference.subSequence(splitPoint, i).toString());
                         }
 
                         depth--;
@@ -272,6 +342,7 @@ public final class FieldReference {
                 // further processing
                 path.add(reference.toString());
                 return path;
+
             } else if (depth > 0) {
                 // when we hit the end-of-input while still in an open bracket, we have an invalid field reference
                 potentiallyAmbiguousSyntaxDetected = true;
diff --git a/logstash-core/src/main/java/org/logstash/FileLockFactory.java b/logstash-core/src/main/java/org/logstash/FileLockFactory.java
index 8b41315e1..81b6dc5c1 100644
--- a/logstash-core/src/main/java/org/logstash/FileLockFactory.java
+++ b/logstash-core/src/main/java/org/logstash/FileLockFactory.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 // this class is largely inspired by Lucene FSLockFactory and friends, below is the Lucene original Apache 2.0 license:
 
 /*
@@ -49,59 +69,64 @@ public class FileLockFactory {
     private static final Map<FileLock, String> LOCK_MAP =  Collections.synchronizedMap(new HashMap<>());
 
     public static FileLock obtainLock(Path dirPath, String lockName) throws IOException {
-        if (!Files.isDirectory(dirPath)) { Files.createDirectories(dirPath); }
+        if (!Files.isDirectory(dirPath)) {
+            Files.createDirectories(dirPath);
+        }
         Path lockPath = dirPath.resolve(lockName);
 
         try {
             Files.createFile(lockPath);
         } catch (IOException ignore) {
             // we must create the file to have a truly canonical path.
-            // if it's already created, we don't care. if it cant be created, it will fail below.
+            // if it's already created, we don't care. if it can't be created, it will fail below.
         }
 
         // fails if the lock file does not exist
         final Path realLockPath = lockPath.toRealPath();
 
-        if (LOCK_HELD.add(realLockPath.toString())) {
-            FileChannel channel = null;
-            FileLock lock = null;
-            try {
-                channel = FileChannel.open(realLockPath, StandardOpenOption.CREATE, StandardOpenOption.WRITE);
-                lock = channel.tryLock();
-                if (lock != null) {
-                    LOCK_MAP.put(lock, realLockPath.toString());
-                    return lock;
-                } else {
-                    throw new LockException("Lock held by another program on lock path: " + realLockPath);
-                }
-            } finally {
-                if (lock == null) { // not successful - clear up and move out
-                    try {
-                        if (channel != null) {
-                            channel.close();
-                        }
-                    } catch (Throwable t) {
-                        // suppress any channel close exceptions
-                    }
-
-                    boolean removed = LOCK_HELD.remove(realLockPath.toString());
-                    if (removed == false) {
-                        throw new LockException("Lock path was cleared but never marked as held: " + realLockPath);
-                    }
-                }
-            }
-        } else {
+        if (!LOCK_HELD.add(realLockPath.toString())) {
             throw new LockException("Lock held by this virtual machine on lock path: " + realLockPath);
         }
+        FileChannel channel = null;
+        FileLock lock;
+        try {
+            channel = FileChannel.open(realLockPath, StandardOpenOption.CREATE, StandardOpenOption.WRITE);
+            lock = channel.tryLock();
+            if (lock == null) {
+                throw new LockException("Lock held by another program on lock path: " + realLockPath);
+            }
+        } catch (IOException ex) {
+            try {
+                if (channel != null) {
+                    channel.close();
+                }
+            } catch (Throwable t) {
+                // suppress any channel close exceptions
+            }
+
+            boolean removed = LOCK_HELD.remove(realLockPath.toString());
+            if (!removed) {
+                throw new LockException("Lock path was cleared but never marked as held: " + realLockPath, ex);
+            }
+
+            throw ex;
+        }
+
+        LOCK_MAP.put(lock, realLockPath.toString());
+        return lock;
     }
 
     public static void releaseLock(FileLock lock) throws IOException {
         String lockPath = LOCK_MAP.remove(lock);
-        if (lockPath == null) { throw new LockException("Cannot release unobtained lock"); }
+        if (lockPath == null) {
+            throw new LockException("Cannot release unobtained lock");
+        }
         lock.release();
         lock.channel().close();
-        Boolean removed = LOCK_HELD.remove(lockPath);
-        if (removed == false) { throw new LockException("Lock path was not marked as held: " + lockPath); }
+        boolean removed = LOCK_HELD.remove(lockPath);
+        if (!removed) {
+            throw new LockException("Lock path was not marked as held: " + lockPath);
+        }
     }
 
 }
diff --git a/logstash-core/src/main/java/org/logstash/JavaVersionUtils.java b/logstash-core/src/main/java/org/logstash/JavaVersionUtils.java
new file mode 100644
index 000000000..b83f54b5e
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/JavaVersionUtils.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash;
+
+/**
+ * Helper Class for dealing with Java versions
+ */
+public final class JavaVersionUtils {
+
+    /**
+     * Identifies whether we are running on a version greater than or equal to the version parameter specified.
+     * @param version The version to test against. This must be the Major version of Java
+     * @return True if running on Java whose major version is greater than or equal to the
+     *         specified version.
+     */
+    public static boolean isJavaAtLeast(int version) {
+        final String value = System.getProperty("java.specification.version");
+        final int actualVersion;
+        // Java specification version prior to Java 9 were of the format `1.X`, and after the format `X`
+        // See https://openjdk.java.net/jeps/223
+        if (value.startsWith("1.")) {
+            actualVersion = Integer.parseInt(value.split("\\.")[1]);
+        } else {
+            actualVersion = Integer.parseInt(value);
+        }
+        return actualVersion >= version;
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/main/java/org/logstash/Javafier.java b/logstash-core/src/main/java/org/logstash/Javafier.java
index dc98cfb11..8ee6b91fd 100644
--- a/logstash-core/src/main/java/org/logstash/Javafier.java
+++ b/logstash-core/src/main/java/org/logstash/Javafier.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import java.math.BigDecimal;
@@ -83,4 +103,3 @@ public final class Javafier {
         return converters;
     }
 }
-
diff --git a/logstash-core/src/main/java/org/logstash/KeyNode.java b/logstash-core/src/main/java/org/logstash/KeyNode.java
index a5774e854..6c4e54ff6 100644
--- a/logstash-core/src/main/java/org/logstash/KeyNode.java
+++ b/logstash-core/src/main/java/org/logstash/KeyNode.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import java.util.List;
diff --git a/logstash-core/src/main/java/org/logstash/LockException.java b/logstash-core/src/main/java/org/logstash/LockException.java
index 1da4469cd..217bf240b 100644
--- a/logstash-core/src/main/java/org/logstash/LockException.java
+++ b/logstash-core/src/main/java/org/logstash/LockException.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import java.io.IOException;
diff --git a/logstash-core/src/main/java/org/logstash/Logstash.java b/logstash-core/src/main/java/org/logstash/Logstash.java
index 98f5c525a..04ce1b182 100644
--- a/logstash-core/src/main/java/org/logstash/Logstash.java
+++ b/logstash-core/src/main/java/org/logstash/Logstash.java
@@ -1,24 +1,70 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
+import java.io.IOError;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Properties;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jruby.Ruby;
+import org.jruby.RubyClass;
 import org.jruby.RubyException;
 import org.jruby.RubyInstanceConfig;
-import org.jruby.RubyNumeric;
+import org.jruby.RubyStandardError;
+import org.jruby.RubySystemExit;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.runtime.builtin.IRubyObject;
 
+import javax.annotation.Nullable;
+
 /**
  * Logstash Main Entrypoint.
  */
 public final class Logstash implements Runnable, AutoCloseable {
 
+    public static final String VERSION_FULL;
+    public static final String VERSION_MAJOR;
+    public static final String VERSION_MINOR;
+    public static final String VERSION_PATCH;
+
+    static {
+        final Properties properties = new Properties();
+        try {
+            properties.load(Logstash.class.getResourceAsStream("/version-info.properties"));
+            VERSION_FULL = properties.getProperty("logstash-core");
+            final String[] versions = VERSION_FULL.split("\\.");
+            VERSION_MAJOR = versions[0];
+            VERSION_MINOR = versions[1];
+            VERSION_PATCH = versions[2];
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     private static final Logger LOGGER = LogManager.getLogger(Logstash.class);
 
     /**
@@ -38,39 +84,74 @@ public final class Logstash implements Runnable, AutoCloseable {
                     "LS_HOME environment variable must be set. This is likely a bug that should be reported."
             );
         }
+        installGlobalUncaughtExceptionHandler();
+
         final Path home = Paths.get(lsHome).toAbsolutePath();
         try (
                 final Logstash logstash = new Logstash(home, args, System.out, System.err, System.in)
         ) {
             logstash.run();
         } catch (final IllegalStateException e) {
-            String errorMessage[] = null;
-            if (e.getMessage().contains("Could not load FFI Provider")) {
-                errorMessage = new String[]{
-                        "\nError accessing temp directory: " + System.getProperty("java.io.tmpdir"),
-                        "This often occurs because the temp directory has been mounted with NOEXEC or",
-                        "the Logstash user has insufficient permissions on the directory. Possible",
-                        "workarounds include setting the -Djava.io.tmpdir property in the jvm.options",
-                        "file to an alternate directory or correcting the Logstash user's permissions."
-                };
+            Throwable t = e;
+            String message = e.getMessage();
+            if (message != null) {
+                if (message.startsWith(UNCLEAN_SHUTDOWN_PREFIX) ||
+                    message.startsWith(MUTATED_GEMFILE_ERROR)) {
+                    t = e.getCause(); // be less verbose with uncleanShutdown's wrapping exception
+                } else if (message.contains("Could not load FFI Provider")) {
+                    message =
+                            "Error accessing temp directory: " + System.getProperty("java.io.tmpdir") +
+                                    " this often occurs because the temp directory has been mounted with NOEXEC or" +
+                                    " the Logstash user has insufficient permissions on the directory. \n" +
+                                    "Possible workarounds include setting the -Djava.io.tmpdir property in the jvm.options" +
+                                    "file to an alternate directory or correcting the Logstash user's permissions.";
+                }
             }
-            handleCriticalError(e, errorMessage);
+            handleFatalError(message, t);
         } catch (final Throwable t) {
-            handleCriticalError(t, null);
+            handleFatalError("", t);
         }
+
         System.exit(0);
     }
 
-    private static void handleCriticalError(Throwable t, String[] errorMessage) {
-        LOGGER.error(t);
-        if (errorMessage != null) {
-            for (String err : errorMessage) {
-                System.err.println(err);
+    private static void installGlobalUncaughtExceptionHandler() {
+        Thread.setDefaultUncaughtExceptionHandler((thread, e) -> {
+            if (e instanceof Error) {
+                handleFatalError("uncaught error (in thread " + thread.getName() + ")",  e);
+            } else {
+                LOGGER.error("uncaught exception (in thread " + thread.getName() + ")", e);
             }
+        });
+    }
+
+    private static void handleFatalError(String message, Throwable t) {
+        LOGGER.fatal(message, t);
+
+        if (t instanceof InternalError) {
+            halt(128);
+        } else if (t instanceof OutOfMemoryError) {
+            halt(127);
+        } else if (t instanceof StackOverflowError) {
+            halt(126);
+        } else if (t instanceof UnknownError) {
+            halt(125);
+        } else if (t instanceof IOError) {
+            halt(124);
+        } else if (t instanceof LinkageError) {
+            halt(123);
+        } else if (t instanceof Error) {
+            halt(120);
         }
+
         System.exit(1);
     }
 
+    private static void halt(final int status) {
+        // we halt to prevent shutdown hooks from running
+        Runtime.getRuntime().halt(status);
+    }
+
     /**
      * Ctor.
      * @param home Logstash Root Directory
@@ -101,11 +182,19 @@ public final class Logstash implements Runnable, AutoCloseable {
             Thread.currentThread().setContextClassLoader(ruby.getJRubyClassLoader());
             ruby.runFromMain(script, config.displayedFileName());
         } catch (final RaiseException ex) {
-            final RubyException rexep = ex.getException();
-            if (ruby.getSystemExit().isInstance(rexep)) {
-                final IRubyObject status =
-                    rexep.callMethod(ruby.getCurrentContext(), "status");
-                if (status != null && !status.isNil() && RubyNumeric.fix2int(status) != 0) {
+            final RubyException re = ex.getException();
+
+            // If this is a production error this signifies an issue with the Gemfile, likely
+            // that a logstash developer has made changes to their local Gemfile for plugin
+            // development, etc. If this is the case, exit with a warning giving remediating
+            // information for Logstash devs.
+            if (isProductionError(re)){
+                bundlerStartupError(ex);
+            }
+
+            if (re instanceof RubySystemExit) {
+                IRubyObject success = ((RubySystemExit) re).success_p();
+                if (!success.isTrue()) {
                     uncleanShutdown(ex);
                 }
             } else {
@@ -116,11 +205,54 @@ public final class Logstash implements Runnable, AutoCloseable {
         }
     }
 
+    // Tests whether the RubyException is of type `Bundler::ProductionError`
+    private boolean isProductionError(RubyException re){
+        if (re instanceof RubyStandardError){
+            RubyClass metaClass = re.getMetaClass();
+            return (metaClass.getName().equals("Bundler::ProductionError"));
+        }
+        return false;
+    }
+
     @Override
     public void close() {
         ruby.tearDown(false);
     }
 
+    /**
+     * Initialize a runtime configuration.
+     * @param lsHome the LOGSTASH_HOME
+     * @param args extra arguments (ARGV) to process
+     * @return a runtime configuration instance
+     */
+    public static RubyInstanceConfig initRubyConfig(final Path lsHome,
+                                                    final String... args) {
+        return initRubyConfigImpl(lsHome, safePath(lsHome, "vendor", "jruby"), args);
+    }
+
+    /**
+     * Initialize a runtime configuration.
+     * @param lsHome the LOGSTASH_HOME
+     * @param args extra arguments (ARGV) to process
+     * @return a runtime configuration instance
+     */
+    public static RubyInstanceConfig initRubyConfig(final Path lsHome,
+                                                    final Path currentDir,
+                                                    final String... args) {
+
+        return initRubyConfigImpl(currentDir, safePath(lsHome, "vendor", "jruby"), args);
+    }
+
+    private static RubyInstanceConfig initRubyConfigImpl(@Nullable final Path currentDir,
+                                                     final String jrubyHome,
+                                                     final String[] args) {
+        final RubyInstanceConfig config = new RubyInstanceConfig();
+        if (currentDir != null) config.setCurrentDirectory(currentDir.toString());
+        config.setJRubyHome(jrubyHome);
+        config.processArguments(args);
+        return config;
+    }
+
     /**
      * Sets up the correct {@link RubyInstanceConfig} for a given Logstash installation and set of
      * CLI arguments.
@@ -129,13 +261,10 @@ public final class Logstash implements Runnable, AutoCloseable {
      * @return RubyInstanceConfig
      */
     private static RubyInstanceConfig buildConfig(final Path home, final String[] args) {
-        final String[] arguments = new String[args.length + 2];
-        System.arraycopy(args, 0, arguments, 2, args.length);
+        final String[] arguments = new String[args.length + 1];
+        System.arraycopy(args, 0, arguments, 1, args.length);
         arguments[0] = safePath(home, "lib", "bootstrap", "environment.rb");
-        arguments[1] = safePath(home, "logstash-core", "lib", "logstash", "runner.rb");
-        final RubyInstanceConfig config = new RubyInstanceConfig();
-        config.processArguments(arguments);
-        return config;
+        return initRubyConfig(home, arguments);
     }
 
     /**
@@ -159,7 +288,18 @@ public final class Logstash implements Runnable, AutoCloseable {
         return resolved.toString();
     }
 
-    private static void uncleanShutdown(final Exception ex) {
-        throw new IllegalStateException("Logstash stopped processing because of an error: " + ex.getMessage(), ex);
+    private static final String UNCLEAN_SHUTDOWN_PREFIX = "Logstash stopped processing because of an error: ";
+    private static final String MUTATED_GEMFILE_ERROR = "Logstash was unable to start due to an unexpected Gemfile change.\n" +
+            "If you are a user, this is a bug.\n" +
+            "If you are a logstash developer, please try restarting logstash with the " +
+            "`--enable-local-plugin-development` flag set.";
+
+    private static void bundlerStartupError(final Exception ex){
+        throw new IllegalStateException(MUTATED_GEMFILE_ERROR);
     }
+
+    private static void uncleanShutdown(final Exception ex) {
+        throw new IllegalStateException(UNCLEAN_SHUTDOWN_PREFIX + ex.getMessage(), ex);
+    }
+
 }
diff --git a/logstash-core/src/main/java/org/logstash/LogstashJavaCompat.java b/logstash-core/src/main/java/org/logstash/LogstashJavaCompat.java
deleted file mode 100644
index 6be9bfb49..000000000
--- a/logstash-core/src/main/java/org/logstash/LogstashJavaCompat.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.logstash;
-
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import org.codehaus.janino.ClassBodyEvaluator;
-import org.logstash.ackedqueue.io.ByteBufferCleaner;
-
-/**
- * Logic around ensuring compatibility with Java 8 and 9 simultaneously.
- */
-public final class LogstashJavaCompat {
-
-    /**
-     * True if current JVM is a Java 9 implementation.
-     */
-    public static final boolean IS_JAVA_9_OR_GREATER = isAtLeastJava9();
-
-    /**
-     * Sets up an appropriate implementation of {@link ByteBufferCleaner} depending no whether or
-     * not the current JVM is a Java 9 implementation.
-     * @return ByteBufferCleaner
-     */
-    @SuppressWarnings("rawtypes")
-    public static ByteBufferCleaner setupBytebufferCleaner() {
-        final ClassBodyEvaluator se = new ClassBodyEvaluator();
-        final Collection<String> imports = new ArrayList<>();
-        imports.add("java.nio.MappedByteBuffer");
-        final String cleanerCode;
-        final String ctorCode;
-        final String fieldsCode;
-        if (isAtLeastJava9()) {
-            imports.add("sun.misc.Unsafe");
-            imports.add("java.lang.reflect.Field");
-            cleanerCode = "unsafe.invokeCleaner(buffer);";
-            ctorCode = "Field unsafeField = Unsafe.class.getDeclaredField(\"theUnsafe\");" +
-                "unsafeField.setAccessible(true);" +
-                "unsafe = (Unsafe) unsafeField.get(null);";
-            fieldsCode = "private final Unsafe unsafe;";
-        } else {
-            imports.add("sun.misc.Cleaner");
-            imports.add("sun.nio.ch.DirectBuffer");
-            cleanerCode = "Cleaner c=((DirectBuffer)buffer).cleaner();if(c != null){c.clean();}";
-            ctorCode = "";
-            fieldsCode = "";
-        }
-        se.setImplementedInterfaces(new Class[]{ByteBufferCleaner.class});
-        se.setClassName("ByteBufferCleanerImpl");
-        se.setDefaultImports(imports.toArray(new String[0]));
-        try {
-            return (ByteBufferCleaner) se.createInstance(
-                new StringReader(String.format(
-                    "%s public ByteBufferCleanerImpl() throws Exception{%s} public void clean(MappedByteBuffer buffer){%s}",
-                    fieldsCode, ctorCode, cleanerCode
-                ))
-            );
-        } catch (final Exception ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-
-    /**
-     * Identifies whether we're running on Java 9 by parsing the first component of the
-     * {@code "java.version"} system property. For Java 9 this value is assumed to start with a
-     * {@code "9"}.
-     * @return True iff running on Java 9
-     */
-    private static boolean isAtLeastJava9() {
-        final String version = System.getProperty("java.version");
-        final int end = version.indexOf('.');
-        return Integer.parseInt(version.substring(0, end > 0 ? end : version.length())) >= 9;
-    }
-}
diff --git a/logstash-core/src/main/java/org/logstash/MissingConverterException.java b/logstash-core/src/main/java/org/logstash/MissingConverterException.java
index 04b07938e..1674ab9ca 100644
--- a/logstash-core/src/main/java/org/logstash/MissingConverterException.java
+++ b/logstash-core/src/main/java/org/logstash/MissingConverterException.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 /**
diff --git a/logstash-core/src/main/java/org/logstash/ObjectMappers.java b/logstash-core/src/main/java/org/logstash/ObjectMappers.java
index d6e0fbd1c..fb5ffa3d3 100644
--- a/logstash-core/src/main/java/org/logstash/ObjectMappers.java
+++ b/logstash-core/src/main/java/org/logstash/ObjectMappers.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -9,16 +29,21 @@ import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
 import com.fasterxml.jackson.dataformat.cbor.CBORGenerator;
+
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.HashMap;
+
+import org.apache.logging.log4j.core.jackson.Log4jJsonObjectMapper;
 import org.jruby.RubyBignum;
 import org.jruby.RubyBoolean;
 import org.jruby.RubyFixnum;
@@ -28,11 +53,29 @@ import org.jruby.RubyString;
 import org.jruby.RubySymbol;
 import org.jruby.ext.bigdecimal.RubyBigDecimal;
 import org.logstash.ext.JrubyTimestampExtLibrary;
+import org.logstash.jackson.StreamReadConstraintsUtil;
+import org.logstash.log.RubyBasicObjectSerializer;
 
 public final class ObjectMappers {
 
+    static final String RUBY_SERIALIZERS_MODULE_ID = "RubySerializers";
+
+    static final StreamReadConstraintsUtil CONFIGURED_STREAM_READ_CONSTRAINTS;
+
+    static {
+        // The StreamReadConstraintsUtil needs to load the configured constraints from system
+        // properties and apply them _statically_, before any object mappers are initialized.
+        CONFIGURED_STREAM_READ_CONSTRAINTS = StreamReadConstraintsUtil.fromSystemProperties();
+        CONFIGURED_STREAM_READ_CONSTRAINTS.applyAsGlobalDefault();
+    }
+
+    public static StreamReadConstraintsUtil getConfiguredStreamReadConstraints() {
+        return CONFIGURED_STREAM_READ_CONSTRAINTS;
+    }
+
+
     private static final SimpleModule RUBY_SERIALIZERS =
-        new SimpleModule("RubySerializers")
+        new SimpleModule(RUBY_SERIALIZERS_MODULE_ID)
             .addSerializer(RubyString.class, new RubyStringSerializer())
             .addSerializer(RubySymbol.class, new RubySymbolSerializer())
             .addSerializer(RubyFloat.class, new RubyFloatSerializer())
@@ -48,12 +91,34 @@ public final class ObjectMappers {
             .addDeserializer(RubyNil.class, new RubyNilDeserializer());
 
     public static final ObjectMapper JSON_MAPPER =
-        new ObjectMapper().registerModule(RUBY_SERIALIZERS);
+            new ObjectMapper().registerModule(RUBY_SERIALIZERS);
+
+    static String RUBY_BASIC_OBJECT_SERIALIZERS_MODULE_ID = "RubyBasicObjectSerializers";
+
+    // The RubyBasicObjectSerializer must be registered first, so it has a lower priority
+    // over other more specific serializers.
+    public static final ObjectMapper LOG4J_JSON_MAPPER = new Log4jJsonObjectMapper()
+            .registerModule(new SimpleModule(RUBY_BASIC_OBJECT_SERIALIZERS_MODULE_ID).addSerializer(new RubyBasicObjectSerializer()))
+            .registerModule(RUBY_SERIALIZERS);
+
+    /* TODO use this validator instead of LaissezFaireSubTypeValidator
+    public static final PolymorphicTypeValidator TYPE_VALIDATOR = BasicPolymorphicTypeValidator.builder()
+            .allowIfBaseType(java.util.HashMap.class)
+            .allowIfSubType(org.jruby.RubyNil.class)
+            .allowIfSubType(org.jruby.RubyString.class)
+            .allowIfSubType(org.logstash.ConvertedMap.class)
+            .allowIfSubType(org.logstash.ConvertedList.class)
+            .allowIfSubType(org.logstash.Timestamp.class)
+            .build();
+     */
+
+    public static final PolymorphicTypeValidator TYPE_VALIDATOR = new LaissezFaireSubTypeValidator();
 
     public static final ObjectMapper CBOR_MAPPER = new ObjectMapper(
         new CBORFactory().configure(CBORGenerator.Feature.WRITE_MINIMAL_INTS, false)
     ).registerModules(RUBY_SERIALIZERS, CBOR_DESERIALIZERS)
-        .enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+            .activateDefaultTyping(TYPE_VALIDATOR, ObjectMapper.DefaultTyping.NON_FINAL);
+
 
     /**
      * {@link JavaType} for the {@link HashMap} that {@link Event} is serialized as.
diff --git a/logstash-core/src/main/java/org/logstash/RubyJavaIntegration.java b/logstash-core/src/main/java/org/logstash/RubyJavaIntegration.java
index 093d66cfa..ee2e088bf 100644
--- a/logstash-core/src/main/java/org/logstash/RubyJavaIntegration.java
+++ b/logstash-core/src/main/java/org/logstash/RubyJavaIntegration.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import java.util.ArrayList;
@@ -11,9 +31,11 @@ import java.util.stream.Stream;
 import org.jruby.Ruby;
 import org.jruby.RubyBasicObject;
 import org.jruby.RubyString;
+import org.jruby.RubyModule;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.java.proxies.JavaProxy;
 import org.jruby.java.proxies.MapJavaProxy;
+import org.jruby.javasupport.Java;
 import org.jruby.javasupport.JavaClass;
 import org.jruby.javasupport.JavaUtil;
 import org.jruby.runtime.Block;
@@ -40,14 +62,14 @@ public final class RubyJavaIntegration {
         ruby.getArray().defineAnnotatedMethods(RubyJavaIntegration.RubyArrayOverride.class);
         ruby.getHash().defineAnnotatedMethods(RubyJavaIntegration.RubyHashOverride.class);
         Stream.of(LinkedHashMap.class, HashMap.class).forEach(cls ->
-            JavaClass.get(ruby, cls).getProxyModule().defineAnnotatedMethods(
+            Java.getProxyClass(ruby, cls).defineAnnotatedMethods(
                 RubyJavaIntegration.RubyMapProxyOverride.class
             )
         );
-        JavaClass.get(ruby, Map.class).getProxyModule().defineAnnotatedMethods(
+        Java.getProxyClass(ruby, Map.class).defineAnnotatedMethods(
             RubyJavaIntegration.JavaMapOverride.class
         );
-        JavaClass.get(ruby, Collection.class).getProxyModule().defineAnnotatedMethods(
+        Java.getProxyClass(ruby, Collection.class).defineAnnotatedMethods(
             RubyJavaIntegration.JavaCollectionOverride.class
         );
     }
@@ -105,6 +127,9 @@ public final class RubyJavaIntegration {
         }
     }
 
+    /**
+     * Helper class to provide some typical Ruby methods to Java Collection class when used from Ruby
+     * */
     public static final class JavaCollectionOverride {
 
         private static final Collection<IRubyObject> NIL_COLLECTION =
@@ -188,21 +213,15 @@ public final class RubyJavaIntegration {
             return JavaUtil.convertJavaToUsableRubyObject(context.runtime, dup);
         }
 
-        @JRubyMethod
-        public static IRubyObject inspect(final ThreadContext context, final IRubyObject self) {
-            return RubyString.newString(context.runtime, new StringBuilder("<")
-                .append(self.getMetaClass().name().asJavaString()).append(':')
-                .append(self.hashCode()).append(' ').append(self.convertToArray().inspect())
-                .append('>').toString()
-            );
-        }
-
         private static boolean removeNilAndNull(final Collection<?> collection) {
             final boolean res = collection.removeAll(NIL_COLLECTION);
             return collection.removeAll(NULL_COLLECTION) || res;
         }
     }
 
+    /**
+     * Helper class to provide "is_a?" method to Java Map class when use dfrom Ruby
+     * */
     public static final class JavaMapOverride {
 
         private JavaMapOverride() {
@@ -253,7 +272,8 @@ public final class RubyJavaIntegration {
         @JRubyMethod
         public static IRubyObject merge(final ThreadContext context, final IRubyObject self,
             final IRubyObject other) {
-            return ((MapJavaProxy) self.dup()).merge_bang(context, other, Block.NULL_BLOCK);
+            IRubyObject[] other_array = { other };
+            return ((MapJavaProxy) self.dup()).merge_bang(context, other_array, Block.NULL_BLOCK);
         }
     }
 }
diff --git a/logstash-core/src/main/java/org/logstash/RubyUtil.java b/logstash-core/src/main/java/org/logstash/RubyUtil.java
index 24fc92623..564f51bc0 100644
--- a/logstash-core/src/main/java/org/logstash/RubyUtil.java
+++ b/logstash-core/src/main/java/org/logstash/RubyUtil.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import org.jruby.Ruby;
@@ -5,7 +25,10 @@ import org.jruby.RubyClass;
 import org.jruby.RubyModule;
 import org.jruby.anno.JRubyClass;
 import org.jruby.exceptions.RaiseException;
+import org.jruby.javasupport.JavaUtil;
+import org.jruby.runtime.Block;
 import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.builtin.IRubyObject;
 import org.logstash.ackedqueue.QueueFactoryExt;
 import org.logstash.ackedqueue.ext.JRubyAckedQueueExt;
 import org.logstash.ackedqueue.ext.JRubyWrappedAckedQueueExt;
@@ -24,7 +47,6 @@ import org.logstash.execution.AbstractWrappedQueueExt;
 import org.logstash.execution.ConvergeResultExt;
 import org.logstash.execution.EventDispatcherExt;
 import org.logstash.execution.ExecutionContextExt;
-import org.logstash.execution.JavaBasePipelineExt;
 import org.logstash.execution.PipelineReporterExt;
 import org.logstash.execution.QueueReadClientBase;
 import org.logstash.execution.ShutdownWatcherExt;
@@ -46,12 +68,17 @@ import org.logstash.instrument.metrics.NamespacedMetricExt;
 import org.logstash.instrument.metrics.NullMetricExt;
 import org.logstash.instrument.metrics.NullNamespacedMetricExt;
 import org.logstash.instrument.metrics.SnapshotExt;
+import org.logstash.log.DeprecationLoggerExt;
 import org.logstash.log.LoggableExt;
 import org.logstash.log.LoggerExt;
 import org.logstash.log.SlowLoggerExt;
 import org.logstash.plugins.HooksRegistryExt;
-import org.logstash.plugins.PluginFactoryExt;
 import org.logstash.plugins.UniversalPluginExt;
+import org.logstash.plugins.factory.ContextualizerExt;
+import org.logstash.util.UtilExt;
+import org.logstash.plugins.factory.ExecutionContextFactoryExt;
+import org.logstash.plugins.factory.PluginMetricsFactoryExt;
+import org.logstash.plugins.factory.PluginFactoryExt;
 
 import java.util.stream.Stream;
 
@@ -169,14 +196,18 @@ public final class RubyUtil {
 
     public static final RubyClass EXECUTION_CONTEXT_FACTORY_CLASS;
 
-    public static final RubyClass PLUGIN_METRIC_FACTORY_CLASS;
+    public static final RubyClass PLUGIN_METRICS_FACTORY_CLASS;
 
     public static final RubyClass PLUGIN_FACTORY_CLASS;
 
+    public static final RubyModule PLUGIN_CONTEXTUALIZER_MODULE;
+
     public static final RubyClass LOGGER;
 
     public static final RubyModule LOGGABLE_MODULE;
 
+    public static final RubyClass DEPRECATION_LOGGER;
+
     public static final RubyClass SLOW_LOGGER;
 
     public static final RubyModule UTIL_MODULE;
@@ -207,8 +238,6 @@ public final class RubyUtil {
 
     public static final RubyClass ABSTRACT_PIPELINE_CLASS;
 
-    public static final RubyClass JAVA_PIPELINE_CLASS;
-
     /**
      * Logstash Ruby Module.
      */
@@ -233,16 +262,16 @@ public final class RubyUtil {
         METRIC_SNAPSHOT_CLASS.defineAnnotatedMethods(SnapshotExt.class);
         EXECUTION_CONTEXT_FACTORY_CLASS = PLUGINS_MODULE.defineClassUnder(
             "ExecutionContextFactory", RUBY.getObject(),
-            PluginFactoryExt.ExecutionContext::new
+            ExecutionContextFactoryExt::new
         );
-        PLUGIN_METRIC_FACTORY_CLASS = PLUGINS_MODULE.defineClassUnder(
-            "PluginMetricFactory", RUBY.getObject(), PluginFactoryExt.Metrics::new
+        PLUGIN_METRICS_FACTORY_CLASS = PLUGINS_MODULE.defineClassUnder(
+            "PluginMetricsFactory", RUBY.getObject(), PluginMetricsFactoryExt::new
         );
         SHUTDOWN_WATCHER_CLASS =
             setupLogstashClass(ShutdownWatcherExt::new, ShutdownWatcherExt.class);
-        PLUGIN_METRIC_FACTORY_CLASS.defineAnnotatedMethods(PluginFactoryExt.Metrics.class);
+        PLUGIN_METRICS_FACTORY_CLASS.defineAnnotatedMethods(PluginMetricsFactoryExt.class);
         EXECUTION_CONTEXT_FACTORY_CLASS.defineAnnotatedMethods(
-            PluginFactoryExt.ExecutionContext.class
+            ExecutionContextFactoryExt.class
         );
         METRIC_EXCEPTION_CLASS = instrumentModule.defineClassUnder(
             "MetricException", RUBY.getException(), MetricExt.MetricException::new
@@ -303,8 +332,9 @@ public final class RubyUtil {
         NULL_TIMED_EXECUTION_CLASS.defineAnnotatedMethods(NullMetricExt.NullTimedExecution.class);
         NULL_COUNTER_CLASS.defineAnnotatedMethods(NullNamespacedMetricExt.NullCounter.class);
         UTIL_MODULE = LOGSTASH_MODULE.defineModuleUnder("Util");
+        UTIL_MODULE.defineAnnotatedMethods(UtilExt.class);
         ABSTRACT_DLQ_WRITER_CLASS = UTIL_MODULE.defineClassUnder(
-            "AbstractDeadLetterQueueWriterExt", RUBY.getObject(),
+            "AbstractDeadLetterQueueWriter", RUBY.getObject(),
             ObjectAllocator.NOT_ALLOCATABLE_ALLOCATOR
         );
         ABSTRACT_DLQ_WRITER_CLASS.defineAnnotatedMethods(AbstractDeadLetterQueueWriterExt.class);
@@ -372,6 +402,7 @@ public final class RubyUtil {
         EXECUTION_CONTEXT_CLASS = setupLogstashClass(
             ExecutionContextExt::new, ExecutionContextExt.class
         );
+        EXECUTION_CONTEXT_CLASS.defineConstant("Empty", EXECUTION_CONTEXT_CLASS.newInstance(RUBY.getCurrentContext(), RUBY.getNil(), RUBY.getNil(), RUBY.getNil(), Block.NULL_BLOCK));
         RUBY_TIMESTAMP_CLASS = setupLogstashClass(
             JrubyTimestampExtLibrary.RubyTimestamp::new, JrubyTimestampExtLibrary.RubyTimestamp.class
         );
@@ -446,13 +477,14 @@ public final class RubyUtil {
         SLOW_LOGGER = loggingModule.defineClassUnder(
             "SlowLogger", RUBY.getObject(), SlowLoggerExt::new);
         SLOW_LOGGER.defineAnnotatedMethods(SlowLoggerExt.class);
+        DEPRECATION_LOGGER = loggingModule.defineClassUnder(
+            "DeprecationLogger", RUBY.getObject(), DeprecationLoggerExt::new);
+        DEPRECATION_LOGGER.defineAnnotatedMethods(DeprecationLoggerExt.class);
+
         LOGGABLE_MODULE = UTIL_MODULE.defineModuleUnder("Loggable");
         LOGGABLE_MODULE.defineAnnotatedMethods(LoggableExt.class);
         ABSTRACT_PIPELINE_CLASS =
             setupLogstashClass(AbstractPipelineExt::new, AbstractPipelineExt.class);
-        JAVA_PIPELINE_CLASS = setupLogstashClass(
-            ABSTRACT_PIPELINE_CLASS, JavaBasePipelineExt::new, JavaBasePipelineExt.class
-        );
         final RubyModule json = LOGSTASH_MODULE.defineOrGetModuleUnder("Json");
         final RubyClass stdErr = RUBY.getStandardError();
         LOGSTASH_ERROR = LOGSTASH_MODULE.defineClassUnder(
@@ -515,9 +547,11 @@ public final class RubyUtil {
         RUBY_EVENT_CLASS.defineAnnotatedMethods(JrubyEventExtLibrary.RubyEvent.class);
         RUBY_EVENT_CLASS.defineAnnotatedConstants(JrubyEventExtLibrary.RubyEvent.class);
         PLUGIN_FACTORY_CLASS = PLUGINS_MODULE.defineClassUnder(
-            "PluginFactory", RUBY.getObject(), PluginFactoryExt.Plugins::new
+            "PluginFactory", RUBY.getObject(), PluginFactoryExt::new
         );
-        PLUGIN_FACTORY_CLASS.defineAnnotatedMethods(PluginFactoryExt.Plugins.class);
+        PLUGIN_FACTORY_CLASS.defineAnnotatedMethods(PluginFactoryExt.class);
+        PLUGIN_CONTEXTUALIZER_MODULE = PLUGINS_MODULE.defineOrGetModuleUnder("Contextualizer");
+        PLUGIN_CONTEXTUALIZER_MODULE.defineAnnotatedMethods(ContextualizerExt.class);
         UNIVERSAL_PLUGIN_CLASS =
             setupLogstashClass(UniversalPluginExt::new, UniversalPluginExt.class);
         EVENT_DISPATCHER_CLASS =
@@ -594,4 +628,27 @@ public final class RubyUtil {
         return clazz;
     }
 
+    /**
+     * Convert a Java object to a Ruby representative.
+     * @param javaObject the object to convert (might be null)
+     * @return a Ruby wrapper
+     */
+    public static IRubyObject toRubyObject(Object javaObject) {
+        return JavaUtil.convertJavaToRuby(RUBY, javaObject);
+    }
+
+    /**
+     * Cast an IRubyObject that may be nil to a specific class
+     * @param objectOrNil an object of either type {@code <T>} or nil.
+     * @param <T> the type to cast non-nil values to
+     * @return The given value, cast to {@code <T>}, or null.
+     */
+    public static <T extends IRubyObject> T nilSafeCast(final IRubyObject objectOrNil) {
+        if (objectOrNil == null || objectOrNil.isNil()) { return null; }
+
+        @SuppressWarnings("unchecked")
+        final T objectAsCasted = (T) objectOrNil;
+
+        return objectAsCasted;
+    }
 }
diff --git a/logstash-core/src/main/java/org/logstash/Rubyfier.java b/logstash-core/src/main/java/org/logstash/Rubyfier.java
index d788c1875..4d6288d80 100644
--- a/logstash-core/src/main/java/org/logstash/Rubyfier.java
+++ b/logstash-core/src/main/java/org/logstash/Rubyfier.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import java.math.BigDecimal;
@@ -5,6 +25,7 @@ import java.math.BigInteger;
 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyBignum;
@@ -16,8 +37,10 @@ import org.jruby.RubyNil;
 import org.jruby.RubyString;
 import org.jruby.RubySymbol;
 import org.jruby.ext.bigdecimal.RubyBigDecimal;
+import org.jruby.javasupport.JavaUtil;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.logstash.ext.JrubyTimestampExtLibrary;
+import org.logstash.secret.SecretVariable;
 
 public final class Rubyfier {
 
@@ -29,6 +52,9 @@ public final class Rubyfier {
     private static final Rubyfier.Converter LONG_CONVERTER =
         (runtime, input) -> runtime.newFixnum(((Number) input).longValue());
 
+    private static final Rubyfier.Converter JAVAUTIL_CONVERTER =
+            JavaUtil::convertJavaToRuby;
+
     private static final Map<Class<?>, Rubyfier.Converter> CONVERTER_MAP = initConverters();
 
     /**
@@ -106,6 +132,7 @@ public final class Rubyfier {
                 runtime, (Timestamp) input
             )
         );
+        converters.put(SecretVariable.class, JAVAUTIL_CONVERTER);
         return converters;
     }
 
diff --git a/logstash-core/src/main/java/org/logstash/StringInterpolation.java b/logstash-core/src/main/java/org/logstash/StringInterpolation.java
index dbf3a86f4..0f7f3c470 100644
--- a/logstash-core/src/main/java/org/logstash/StringInterpolation.java
+++ b/logstash-core/src/main/java/org/logstash/StringInterpolation.java
@@ -1,14 +1,39 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.format.DateTimeFormat;
 
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 public final class StringInterpolation {
 
+    private static final String TIME_NOW = "TIME_NOW";
     private static final ThreadLocal<StringBuilder> STRING_BUILDER =
         new ThreadLocal<StringBuilder>() {
             @Override
@@ -46,21 +71,46 @@ public final class StringInterpolation {
         }
         final StringBuilder builder = STRING_BUILDER.get();
         int pos = 0;
+        final int len = template.length();
         while (open > -1 && close > -1) {
             if (open > 0) {
                 builder.append(template, pos, open);
             }
             if (template.regionMatches(open + 2, "+%s", 0, close - open - 2)) {
+                // UNIX-style @timestamp formatter:
+                // - `%{+%s}` -> 1234567890
                 Timestamp t = event.getTimestamp();
-                builder.append(t == null ? "" : t.getTime().getMillis() / 1000L);
+                builder.append(t == null ? "" : t.toInstant().getEpochSecond());
+            } else if (template.charAt(open+2) == '{' && (close < len) && template.charAt(close+1) == '}') {
+                // JAVA-style @timestamp formatter:
+                // - `%{{yyyy-MM-dd}}` -> `2021-08-11`
+                // - `%{{YYYY-'W'ww}}` -> `2021-W32`
+                // A special pattern to generate a fresh current time
+                // - `%{{TIME_NOW}}` -> `2025-01-16T16:57:12.488955Z`
+                close = close + 1; // consume extra closing squiggle
+                final String pattern = template.substring(open+3, close-1);
+                if (pattern.equals(TIME_NOW)) {
+                    builder.append(new Timestamp());
+                } else {
+                    Optional.ofNullable(event.getTimestamp())
+                            .map(Timestamp::toInstant)
+                            .map(instant -> DateTimeFormatter.ofPattern(pattern)
+                                    .withZone(ZoneOffset.UTC)
+                                    .format(instant))
+                            .ifPresent(builder::append);
+                }
             } else if (template.charAt(open + 2) == '+') {
-                Timestamp t = event.getTimestamp();
-                builder.append(t != null
-                        ? event.getTimestamp().getTime().toString(
-                                DateTimeFormat.forPattern(template.substring(open + 3, close))
-                                        .withZone(DateTimeZone.UTC))
-                        : ""
-                    );
+                // JODA-style @timestamp formatter:
+                // - `%{+YYYY.MM.dd}` -> `2021-08-11`
+                // - `%{+xxxx-'W'ww}  -> `2021-W32`
+                final Timestamp t = event.getTimestamp();
+                if (t != null) {
+                    final String jodaTimeFormatPattern = template.substring(open + 3, close);
+                    final org.joda.time.format.DateTimeFormatter jodaDateTimeFormatter = DateTimeFormat.forPattern(jodaTimeFormatPattern).withZone(DateTimeZone.UTC);
+                    final DateTime jodaTimestamp = new DateTime(t.toInstant().toEpochMilli(), DateTimeZone.UTC);
+                    final String formattedTimestamp = jodaTimestamp.toString(jodaDateTimeFormatter);
+                    builder.append(formattedTimestamp);
+                }
             } else {
                 final String found = template.substring(open + 2, close);
                 final Object value = event.getField(found);
@@ -80,7 +130,6 @@ public final class StringInterpolation {
             open = template.indexOf("%{", pos);
             close = template.indexOf('}', open);
         }
-        final int len = template.length();
         if (pos < len) {
             builder.append(template, pos, len);
         }
diff --git a/logstash-core/src/main/java/org/logstash/Timestamp.java b/logstash-core/src/main/java/org/logstash/Timestamp.java
index 0f2142b8d..571609d5f 100644
--- a/logstash-core/src/main/java/org/logstash/Timestamp.java
+++ b/logstash-core/src/main/java/org/logstash/Timestamp.java
@@ -1,101 +1,218 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import java.time.Clock;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.DecimalStyle;
+import java.time.format.ResolverStyle;
+import java.time.temporal.ChronoField;
 import java.util.Date;
-import org.joda.time.Chronology;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import org.joda.time.Duration;
-import org.joda.time.LocalDateTime;
-import org.joda.time.chrono.ISOChronology;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.function.UnaryOperator;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.logstash.ackedqueue.Queueable;
 
 /**
- * Wrapper around a {@link DateTime} with Logstash specific serialization behaviour.
- * This class is immutable and thread-safe since its only state is held in a final {@link DateTime}
- * reference and {@link DateTime} which itself is immutable and thread-safe.
+ * Wrapper around a {@link Instant} with Logstash specific serialization behaviour.
+ * This class is immutable and thread-safe since its only state is held in a final {@link Instant}
+ * reference and {@link Instant} which itself is immutable and thread-safe.
  */
 @JsonSerialize(using = ObjectMappers.TimestampSerializer.class)
 @JsonDeserialize(using = ObjectMappers.TimestampDeserializer.class)
 public final class Timestamp implements Comparable<Timestamp>, Queueable {
 
-    // all methods setting the time object must set it in the UTC timezone
-    private final DateTime time;
+    private static final Logger LOGGER = LogManager.getLogger(Timestamp.class);
 
-    private static final DateTimeFormatter iso8601Formatter = ISODateTimeFormat.dateTime();
+    private transient org.joda.time.DateTime time;
 
-    private static final LocalDateTime JAN_1_1970 = new LocalDateTime(1970, 1, 1, 0, 0);
+    private final Instant instant;
 
-    /**
-     * {@link Chronology} for UTC timezone, cached here to avoid lookup of it when constructing
-     * {@link DateTime} instances.
-     */
-    private static final Chronology UTC_CHRONOLOGY = ISOChronology.getInstance(DateTimeZone.UTC);
+    private static final DateTimeFormatter ISO_INSTANT_MILLIS = new DateTimeFormatterBuilder()
+            .appendInstant(3)
+            .toFormatter()
+            .withResolverStyle(ResolverStyle.STRICT);
 
     public Timestamp() {
-        this.time = new DateTime(UTC_CHRONOLOGY);
+        this(Clock.systemDefaultZone());
     }
 
     public Timestamp(String iso8601) {
-        this.time =
-            ISODateTimeFormat.dateTimeParser().parseDateTime(iso8601).toDateTime(UTC_CHRONOLOGY);
+        this(iso8601, Clock.systemDefaultZone(), Locale.getDefault());
+    }
+
+    Timestamp(final String iso8601, final Clock clock, final Locale locale) {
+        this.instant = tryParse(iso8601, clock, locale);
+    }
+
+    Timestamp(final Clock clock) {
+        this(clock.instant());
     }
 
     public Timestamp(long epoch_milliseconds) {
-        this.time = new DateTime(epoch_milliseconds, UTC_CHRONOLOGY);
+        this(Instant.ofEpochMilli(epoch_milliseconds));
     }
 
-    public Timestamp(Date date) {
-        this.time = new DateTime(date, UTC_CHRONOLOGY);
+    public Timestamp(final Date date) {
+        this(date.toInstant());
     }
 
-    public Timestamp(DateTime date) {
-        this.time = date.toDateTime(UTC_CHRONOLOGY);
+    public Timestamp(final org.joda.time.DateTime date) {
+        this(date.getMillis());
     }
 
-    public DateTime getTime() {
+    public Timestamp(final Instant instant) {
+        this.instant = instant;
+    }
+
+    /**
+     * @deprecated This method returns JodaTime which is deprecated in favor of JDK Instant.
+     *   * <p> Use {@link Timestamp#toInstant()} instead. </p>
+     */
+    @Deprecated
+    public org.joda.time.DateTime getTime() {
+        if (time == null) {
+            time = new org.joda.time.DateTime(instant.toEpochMilli(), org.joda.time.DateTimeZone.UTC);
+        }
         return time;
     }
 
+    public Instant toInstant() {
+        return instant;
+    }
+
     public static Timestamp now() {
         return new Timestamp();
     }
 
     public String toString() {
-        return iso8601Formatter.print(this.time);
+        // ensure minimum precision of 3 decimal places by using our own 3-decimal-place formatter when we have no nanos.
+        final DateTimeFormatter formatter = (instant.getNano() == 0 ? ISO_INSTANT_MILLIS : DateTimeFormatter.ISO_INSTANT);
+        return formatter.format(instant);
     }
 
     public long toEpochMilli() {
-        return time.getMillis();
+        return instant.toEpochMilli();
     }
 
-    // returns the fraction of a second as microseconds, not the number of microseconds since epoch
+    /**
+     * @return the fraction of a second as microseconds from 0 to 999,999; not the number of microseconds since epoch
+     */
     public long usec() {
-        // JodaTime only supports milliseconds precision we can only return usec at millisec precision.
-        // note that getMillis() return millis since epoch
-        return (new Duration(JAN_1_1970.toDateTime(DateTimeZone.UTC), this.time).getMillis() % 1000) * 1000;
+        return instant.getNano() / 1000;
+    }
+
+    /**
+     * @return the fraction of a second as nanoseconds from 0 to 999,999,999; not the number of nanoseconds since epoch
+     */
+    public long nsec() {
+        return instant.getNano();
     }
 
     @Override
     public int compareTo(Timestamp other) {
-        return time.compareTo(other.time);
+        return instant.compareTo(other.instant);
     }
     
     @Override
     public boolean equals(final Object other) {
-        return other instanceof Timestamp && time.equals(((Timestamp) other).time);
+        return other instanceof Timestamp && instant.equals(((Timestamp) other).instant);
     }
 
     @Override
     public int hashCode() {
-        return time.hashCode();
+        return instant.hashCode();
     }
 
     @Override
     public byte[] serialize() {
         return toString().getBytes();
     }
+
+    // Here we build a DateTimeFormatter that is as forgiving as Joda's ISODateTimeFormat.dateTimeParser()
+    // Required yyyy-MM-dd date
+    // Optional 'T'-prefixed HH:mm:ss.SSS time (defaults to 00:00:00.000)
+    // Optional Zone information, in standard or colons-optional formats (defaults to system zone)
+    private static final DateTimeFormatter LENIENT_ISO_DATE_TIME_FORMATTER = (new DateTimeFormatterBuilder())
+            .parseCaseInsensitive()
+            .append(DateTimeFormatter.ISO_LOCAL_DATE)
+            // Time is optional, but if present will begin with a T
+            .optionalStart().appendLiteral('T').append(DateTimeFormatter.ISO_LOCAL_TIME).optionalEnd()
+            // Timezone is optional, and may land in one of a couple different formats.
+            .optionalStart().appendZoneOrOffsetId().optionalEnd()
+            .optionalStart().appendOffset("+HHmmss", "Z").optionalEnd()
+            .parseDefaulting(ChronoField.HOUR_OF_DAY, 0)
+            .parseDefaulting(ChronoField.MINUTE_OF_HOUR, 0)
+            .parseDefaulting(ChronoField.SECOND_OF_MINUTE, 0)
+            .parseDefaulting(ChronoField.NANO_OF_SECOND, 0)
+            .toFormatter()
+            .withZone(ZoneId.systemDefault())
+            .withDecimalStyle(DecimalStyle.ofDefaultLocale());
+
+    private static Instant tryParse(final String iso8601, final Clock clock, final Locale locale) {
+        final DateTimeFormatter configuredFormatter = LENIENT_ISO_DATE_TIME_FORMATTER.withLocale(locale)
+                                                                                     .withDecimalStyle(DecimalStyle.of(locale))
+                                                                                     .withZone(clock.getZone());
+        return tryParse(iso8601, configuredFormatter)
+                .or(() -> tryFallbackParse(iso8601, configuredFormatter, (f) -> f.withDecimalStyle(DecimalStyle.STANDARD)))
+                .orElseThrow(() -> new IllegalArgumentException(String.format("Invalid ISO8601 input `%s`", iso8601)));
+    }
+
+    private static Optional<Instant> tryParse(final String iso8601,
+                                              final DateTimeFormatter configuredFormatter) {
+        try {
+            return Optional.of(configuredFormatter.parse(iso8601, Instant::from));
+        } catch (java.time.format.DateTimeParseException e) {
+            LOGGER.trace(String.format("Failed to parse `%s` with locale:`%s` and decimal_style:`%s`", iso8601, configuredFormatter.getLocale(), configuredFormatter.getDecimalStyle()), e);
+            return Optional.empty();
+        }
+    }
+
+    /**
+     * Attempts to parse the input if-and-only-if the provided {@code formatterTransformer}
+     * effectively transforms the provided {@code baseFormatter}. This is intended to be a
+     * fallback method for a maybe-modified formatter to prevent re-parsing the same input
+     * with the same formatter multiple times.
+     *
+     * @param iso8601 an ISO8601-ish string
+     * @param baseFormatter the base formatter
+     * @param formatterTransformer a transformation operator (such as using DateTimeFormat#withDecimalStyle)
+     * @return an {@code Optional}, which contains a value if-and-only-if the effective format is different
+     *         from the base format and successfully parsed the input
+     */
+    private static Optional<Instant> tryFallbackParse(final String iso8601,
+                                                      final DateTimeFormatter baseFormatter,
+                                                      final UnaryOperator<DateTimeFormatter> formatterTransformer) {
+        final DateTimeFormatter modifiedFormatter = formatterTransformer.apply(baseFormatter);
+        if (modifiedFormatter.equals(baseFormatter)) { return Optional.empty(); }
+
+        return tryParse(iso8601, modifiedFormatter);
+    }
 }
diff --git a/logstash-core/src/main/java/org/logstash/Util.java b/logstash-core/src/main/java/org/logstash/Util.java
index 14db07769..34a90530b 100644
--- a/logstash-core/src/main/java/org/logstash/Util.java
+++ b/logstash-core/src/main/java/org/logstash/Util.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import java.util.ArrayList;
@@ -5,7 +25,9 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 
-
+/**
+ * Static utility methods that provide merge methods for List and Map.
+ */
 public class Util {
     private Util() {}
 
diff --git a/logstash-core/src/main/java/org/logstash/Valuefier.java b/logstash-core/src/main/java/org/logstash/Valuefier.java
index e6ece76f0..16ebd68a8 100644
--- a/logstash-core/src/main/java/org/logstash/Valuefier.java
+++ b/logstash-core/src/main/java/org/logstash/Valuefier.java
@@ -1,7 +1,31 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZonedDateTime;
+import java.time.ZoneOffset;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -135,7 +159,7 @@ public final class Valuefier {
         );
         converters.put(
             RubyTime.class, input -> JrubyTimestampExtLibrary.RubyTimestamp.newRubyTimestamp(
-                RubyUtil.RUBY, new Timestamp(((RubyTime) input).getDateTime())
+                RubyUtil.RUBY, new Timestamp(((RubyTime) input).toInstant())
             )
         );
         converters.put(
@@ -162,6 +186,21 @@ public final class Valuefier {
         converters.put(
             RubyArray.class, input -> ConvertedList.newFromRubyArray((RubyArray) input)
         );
+        converters.put(
+                LocalDate.class, input -> JrubyTimestampExtLibrary.RubyTimestamp.newRubyTimestamp(
+                        RubyUtil.RUBY, new Timestamp(((LocalDate) input).atStartOfDay().toInstant(ZoneOffset.UTC))
+                )
+        );
+        converters.put(
+                LocalDateTime.class, input -> JrubyTimestampExtLibrary.RubyTimestamp.newRubyTimestamp(
+                        RubyUtil.RUBY, new Timestamp(((LocalDateTime) input).toInstant(ZoneOffset.UTC))
+                )
+        );
+        converters.put(
+                ZonedDateTime.class, input -> JrubyTimestampExtLibrary.RubyTimestamp.newRubyTimestamp(
+                        RubyUtil.RUBY, new Timestamp(((ZonedDateTime) input).toInstant())
+                )
+        );
         return converters;
     }
 
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/AckedBatch.java b/logstash-core/src/main/java/org/logstash/ackedqueue/AckedBatch.java
index fe76bc559..da50414ec 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/AckedBatch.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/AckedBatch.java
@@ -1,11 +1,36 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
 import java.io.IOException;
-import org.jruby.RubyHash;
-import org.jruby.runtime.ThreadContext;
+import java.util.ArrayList;
+import java.util.Collection;
 import org.logstash.Event;
-import org.logstash.ext.JrubyEventExtLibrary;
+import org.logstash.ext.JrubyEventExtLibrary.RubyEvent;
 
+import static org.logstash.RubyUtil.RUBY;
+
+/**
+ * Persistent queue batch of events collection
+ * */
 public final class AckedBatch {
     private Batch batch;
 
@@ -15,13 +40,11 @@ public final class AckedBatch {
         return ackedBatch;
     }
 
-    public RubyHash toRubyHash(ThreadContext context) {
-        final RubyHash result = RubyHash.newHash(context.runtime);
-        this.batch.getElements().forEach(e -> result.put(
-            JrubyEventExtLibrary.RubyEvent.newRubyEvent(context.runtime, (Event) e),
-            context.tru
-            )
-        );
+    public Collection<RubyEvent> events() {
+        final ArrayList<RubyEvent> result = new ArrayList<>(this.batch.size());
+        for (final Queueable e : batch.getElements()) {
+            result.add(RubyEvent.newRubyEvent(RUBY, (Event) e));
+        }
         return result;
     }
 
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/AckedReadBatch.java b/logstash-core/src/main/java/org/logstash/ackedqueue/AckedReadBatch.java
index 599c40224..2acdd391b 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/AckedReadBatch.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/AckedReadBatch.java
@@ -1,77 +1,92 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
 import org.jruby.RubyArray;
-import org.jruby.RubyHash;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
 import org.logstash.ackedqueue.ext.JRubyAckedQueueExt;
 import org.logstash.execution.MemoryReadBatch;
 import org.logstash.execution.QueueBatch;
-import org.logstash.ext.JrubyEventExtLibrary;
+import org.logstash.ext.JrubyEventExtLibrary.RubyEvent;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import static org.logstash.RubyUtil.RUBY;
 
+/**
+ * Persistent queue collection of events implementation
+ */
 public final class AckedReadBatch implements QueueBatch {
 
-    private AckedBatch ackedBatch;
+    private final AckedBatch ackedBatch;
 
-    private RubyHash originals;
+    private final Collection<RubyEvent> events;
 
-    private RubyHash generated;
-
-    public static AckedReadBatch create(final JRubyAckedQueueExt queue, final int size,
-                                        final long timeout) {
-        return new AckedReadBatch(queue, size, timeout);
-    }
-
-    private AckedReadBatch(final JRubyAckedQueueExt queue, final int size, final long timeout) {
-        ThreadContext context = RUBY.getCurrentContext();
-        AckedBatch batch = null;
+    public static AckedReadBatch create(
+            final JRubyAckedQueueExt queue,
+            final int size,
+            final long timeout) {
         try {
-            batch = queue.readBatch(size, timeout);
+            final AckedBatch batch = queue.readBatch(size, timeout);
+            return (batch == null) ? new AckedReadBatch() : new AckedReadBatch(batch);
         } catch (IOException e) {
             throw new IllegalStateException(e);
         }
-        if (batch == null) {
-            originals = RubyHash.newHash(context.runtime);
-            ackedBatch = null;
-        } else {
-            ackedBatch = batch;
-            originals = ackedBatch.toRubyHash(context);
-        }
-        generated = RubyHash.newHash(context.runtime);
+    }
+
+    public static AckedReadBatch create() {
+        return new AckedReadBatch();
+    }
+
+    private AckedReadBatch() {
+        ackedBatch = null;
+        events = new ArrayList<>();
+    }
+
+    private AckedReadBatch(AckedBatch batch) {
+        ackedBatch = batch;
+        events = batch.events();
     }
 
     @Override
-    public void merge(final IRubyObject event) {
-        if (!event.isNil() && !originals.containsKey(event)) {
-            generated.put(event, RUBY.getTrue());
-        }
-    }
-
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    @Override
-    public RubyArray to_a() {
-        ThreadContext context = RUBY.getCurrentContext();
-        final RubyArray result = context.runtime.newArray(filteredSize());
-        for (final JrubyEventExtLibrary.RubyEvent event
-                : (Collection<JrubyEventExtLibrary.RubyEvent>) originals.keys()) {
-            if (!MemoryReadBatch.isCancelled(event)) {
-                result.add(event);
-            }
-        }
-        for (final JrubyEventExtLibrary.RubyEvent event
-                : (Collection<JrubyEventExtLibrary.RubyEvent>) generated.keys()) {
-            if (!MemoryReadBatch.isCancelled(event)) {
-                result.add(event);
+    public RubyArray<RubyEvent> to_a() {
+        @SuppressWarnings({"unchecked"}) final RubyArray<RubyEvent> result = RUBY.newArray(events.size());
+        for (final RubyEvent e : events) {
+            if (!MemoryReadBatch.isCancelled(e)) {
+                result.append(e);
             }
         }
         return result;
     }
 
+    @Override
+    public Collection<RubyEvent> events() {
+        // This does not filter cancelled events because it is
+        // only used in the WorkerLoop where there are no cancelled
+        // events yet.
+        return events;
+    }
+
+    @Override
     public void close() throws IOException {
         if (ackedBatch != null) {
             ackedBatch.close();
@@ -80,6 +95,6 @@ public final class AckedReadBatch implements QueueBatch {
 
     @Override
     public int filteredSize() {
-        return originals.size() + generated.size();
+        return events.size();
     }
 }
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/Batch.java b/logstash-core/src/main/java/org/logstash/ackedqueue/Batch.java
index 3e582786a..9d08bb01a 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/Batch.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/Batch.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
 import java.io.Closeable;
@@ -6,6 +26,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+/**
+ * Container for a set of events from queue to be processed by filters/outputs.
+ * */
 public class Batch implements Closeable {
 
     private final List<Queueable> elements;
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/Checkpoint.java b/logstash-core/src/main/java/org/logstash/ackedqueue/Checkpoint.java
index 6fc26dcc1..9c151cb18 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/Checkpoint.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/Checkpoint.java
@@ -1,5 +1,30 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
+/**
+ * Persistent queue chekpoint. There is one checkpoint per queue, and simply it's a picture of some
+ * management data like first not acked sequence number.
+ *
+ * */
 public class Checkpoint {
 //    Checkpoint file structure see FileCheckpointIO
 
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/Page.java b/logstash-core/src/main/java/org/logstash/ackedqueue/Page.java
index 6d0509227..2cc77c788 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/Page.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/Page.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
 import com.google.common.primitives.Ints;
@@ -8,6 +28,10 @@ import org.codehaus.commons.nullanalysis.NotNull;
 import org.logstash.ackedqueue.io.CheckpointIO;
 import org.logstash.ackedqueue.io.PageIO;
 
+/**
+ * Represents persistent queue Page metadata, like the page number, the minimum sequence number contained in the page,
+ * the status of the page (writeable or not).
+ * */
 public final class Page implements Closeable {
     protected final int pageNum;
     protected long minSeqNum; // TODO: see if we can make it final?
@@ -137,9 +161,10 @@ public final class Page implements Closeable {
 
         final boolean done = isFullyAcked();
         if (done) {
-            if (this.writable) {
-                headPageCheckpoint();
-            } else {
+            checkpoint();
+
+            // purge fully acked tail page
+            if (!this.writable) {
                 purge();
                 final CheckpointIO cpIO = queue.getCheckpointIO();
                 cpIO.purge(cpIO.tailFileName(pageNum));
@@ -228,7 +253,7 @@ public final class Page implements Closeable {
     }
 
     public boolean hasSpace(int byteSize) {
-        return this.pageIO.hasSpace((byteSize));
+        return this.pageIO.hasSpace(byteSize);
     }
 
     /**
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/PageFactory.java b/logstash-core/src/main/java/org/logstash/ackedqueue/PageFactory.java
index 403ec3e00..2240da306 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/PageFactory.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/PageFactory.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
 import org.logstash.ackedqueue.io.PageIO;
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/PqCheck.java b/logstash-core/src/main/java/org/logstash/ackedqueue/PqCheck.java
index 6e27c152d..65c6b7425 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/PqCheck.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/PqCheck.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
 import java.io.IOException;
@@ -10,6 +30,9 @@ import java.util.Comparator;
 import java.util.stream.StreamSupport;
 import org.logstash.ackedqueue.io.FileCheckpointIO;
 
+/**
+ * Utility application to detect corrupted persistent queues.
+ * */
 public final class PqCheck {
 
     private static final String DEFAULT_PQ_DIR = "data/queue/main";
@@ -38,7 +61,7 @@ public final class PqCheck {
         }
         System.out.println(String.format("Checking queue dir: %s", path));
         try (
-            DirectoryStream<Path> checkpoints = Files.newDirectoryStream(path, "checkpoint.*")
+            DirectoryStream<Path> checkpoints = Files.newDirectoryStream(path, "checkpoint.{[0-9]*,head}")
         ) {
             StreamSupport.stream(
                 checkpoints.spliterator(), true
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/PqRepair.java b/logstash-core/src/main/java/org/logstash/ackedqueue/PqRepair.java
index a713a8b0a..2a50f62e8 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/PqRepair.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/PqRepair.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
 import java.io.File;
@@ -42,6 +62,11 @@ public final class PqRepair {
                 String.format("Given PQ path %s is not a directory.", path)
             );
         }
+
+        LOGGER.info("Start repairing queue dir: {}", path.toString());
+
+        deleteTempCheckpoint(path);
+
         final Map<Integer, Path> pageFiles = new HashMap<>();
         try (final DirectoryStream<Path> pfs = Files.newDirectoryStream(path, "page.*")) {
             pfs.forEach(p -> pageFiles.put(
@@ -65,6 +90,17 @@ public final class PqRepair {
         fixMissingPages(pageFiles, checkpointFiles);
         fixZeroSizePages(pageFiles, checkpointFiles);
         fixMissingCheckpoints(pageFiles, checkpointFiles);
+
+        LOGGER.info("Repair is done");
+    }
+
+    private static void deleteTempCheckpoint(final Path root) throws IOException {
+        try (final DirectoryStream<Path> cpTmp = Files.newDirectoryStream(root, "checkpoint.*.tmp")) {
+            for (Path cpTmpPath: cpTmp) {
+                LOGGER.info("Deleting temp checkpoint {}", cpTmpPath);
+                Files.delete(cpTmpPath);
+            }
+        }
     }
 
     private static void deleteFullyAcked(final Path root, final Map<Integer, Path> pages,
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/Queue.java b/logstash-core/src/main/java/org/logstash/ackedqueue/Queue.java
index f11aa7534..e232c99a5 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/Queue.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/Queue.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
 import java.io.Closeable;
@@ -14,7 +34,6 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -26,6 +45,9 @@ import org.logstash.ackedqueue.io.MmapPageIOV2;
 import org.logstash.ackedqueue.io.PageIO;
 import org.logstash.common.FsUtil;
 
+/**
+ * Persistent queue implementation.
+ * */
 public final class Queue implements Closeable {
 
     private long seqNum;
@@ -57,7 +79,7 @@ public final class Queue implements Closeable {
     private final Method deserializeMethod;
 
     // thread safety
-    private final Lock lock = new ReentrantLock();
+    private final ReentrantLock lock = new ReentrantLock();
     private final Condition notFull  = lock.newCondition();
     private final Condition notEmpty = lock.newCondition();
 
@@ -70,11 +92,16 @@ public final class Queue implements Closeable {
     public Queue(Settings settings) {
         try {
             final Path queueDir = Paths.get(settings.getDirPath());
-            Files.createDirectories(queueDir);
+            // Files.createDirectories raises a FileAlreadyExistsException
+            // if queue dir is symlinked, so worth checking against Files.exists
+            if (Files.exists(queueDir) == false) {
+                Files.createDirectories(queueDir);
+            }
             this.dirPath = queueDir.toRealPath();
         } catch (final IOException ex) {
-            throw new IllegalStateException(ex);
+            throw new IllegalStateException(QueueExceptionMessages.CANNOT_CREATE_QUEUE_DIR, ex);
         }
+
         this.pageCapacity = settings.getCapacity();
         this.maxBytes = settings.getQueueMaxBytes();
         this.checkpointIO = new FileCheckpointIO(dirPath, settings.getCheckpointRetry());
@@ -93,7 +120,7 @@ public final class Queue implements Closeable {
             cArg[0] = byte[].class;
             this.deserializeMethod = this.elementClass.getDeclaredMethod("deserialize", cArg);
         } catch (NoSuchMethodException e) {
-            throw new QueueRuntimeException("cannot find deserialize method on class " + this.elementClass.getName(), e);
+            throw new QueueRuntimeException(QueueExceptionMessages.CANNOT_DESERIALIZE.concat(this.elementClass.getName()), e);
         }
     }
 
@@ -138,132 +165,178 @@ public final class Queue implements Closeable {
      * @throws IOException if an IO error occurs
      */
     public void open() throws IOException {
-        final int headPageNum;
-
         if (!this.closed.get()) { throw new IOException("queue already opened"); }
 
         lock.lock();
         try {
-            // verify exclusive access to the dirPath
-            this.dirLock = FileLockFactory.obtainLock(this.dirPath, LOCK_NAME);
-
-            // Upgrade to serialization format V2
-            QueueUpgrade.upgradeQueueDirectoryToV2(dirPath);
-
-            Checkpoint headCheckpoint;
             try {
-                headCheckpoint = this.checkpointIO.read(checkpointIO.headFileName());
-            } catch (NoSuchFileException e) {
-                // if there is no head checkpoint, create a new headpage and checkpoint it and exit method
+                // verify exclusive access to the dirPath
+                this.dirLock = FileLockFactory.obtainLock(this.dirPath, LOCK_NAME);
+            } catch (LockException e) {
+                throw new LockException("The queue failed to obtain exclusive access, cause: " + e.getMessage());
+            }
 
-                logger.debug("No head checkpoint found at: {}, creating new head page", checkpointIO.headFileName());
-
-                this.ensureDiskAvailable(this.maxBytes, 0);
-
-                this.seqNum = 0;
-                headPageNum = 0;
-
-                newCheckpointedHeadpage(headPageNum);
+            try {
+                openPages();
                 this.closed.set(false);
-
-                return;
+            } catch (IOException e) {
+                // upon any exception while opening the queue and after dirlock has been obtained
+                // we need to make sure to release the dirlock. Calling the close method on a partially
+                // open queue has no effect because the closed flag is still true.
+                releaseLockAndSwallow();
+                throw(e);
             }
+        } finally {
+            lock.unlock();
+        }
+    }
 
-            // at this point we have a head checkpoint to figure queue recovery
+    private void openPages() throws IOException {
+        final int headPageNum;
 
-            // as we load pages, compute actually disk needed substracting existing pages size to the required maxBytes
-            long pqSizeBytes = 0;
+        // Upgrade to serialization format V2
+        QueueUpgrade.upgradeQueueDirectoryToV2(dirPath);
 
-            // reconstruct all tail pages state upto but excluding the head page
-            for (int pageNum = headCheckpoint.getFirstUnackedPageNum(); pageNum < headCheckpoint.getPageNum(); pageNum++) {
-                final String cpFileName = checkpointIO.tailFileName(pageNum);
-                if (!dirPath.resolve(cpFileName).toFile().exists()) {
-                    continue;
-                }
-                final Checkpoint cp = this.checkpointIO.read(cpFileName);
+        Checkpoint headCheckpoint;
+        try {
+            headCheckpoint = this.checkpointIO.read(checkpointIO.headFileName());
+        } catch (NoSuchFileException e) {
+            // if there is no head checkpoint, create a new headpage and checkpoint it and exit method
 
-                logger.debug("opening tail page: {}, in: {}, with checkpoint: {}", pageNum, this.dirPath, cp.toString());
+            logger.debug("No head checkpoint found at: {}, creating new head page", checkpointIO.headFileName());
 
-                PageIO pageIO = new MmapPageIOV2(pageNum, this.pageCapacity, this.dirPath);
-                // important to NOT pageIO.open() just yet, we must first verify if it is fully acked in which case
-                // we can purge it and we don't care about its integrity for example if it is of zero-byte file size.
-                if (cp.isFullyAcked()) {
-                    purgeTailPage(cp, pageIO);
-                } else {
-                    pageIO.open(cp.getMinSeqNum(), cp.getElementCount());
-                    addTailPage(PageFactory.newTailPage(cp, this, pageIO));
-                    pqSizeBytes += pageIO.getCapacity();
-                }
+            this.ensureDiskAvailable(this.maxBytes, 0);
 
-                // track the seqNum as we rebuild tail pages, prevent empty pages with a minSeqNum of 0 to reset seqNum
-                if (cp.maxSeqNum() > this.seqNum) {
-                    this.seqNum = cp.maxSeqNum();
-                }
+            this.seqNum = 0;
+            headPageNum = 0;
+
+            newCheckpointedHeadpage(headPageNum);
+            this.closed.set(false);
+
+            return;
+        }
+
+        // at this point we have a head checkpoint to figure queue recovery
+
+        // as we load pages, compute actually disk needed substracting existing pages size to the required maxBytes
+        long pqSizeBytes = 0;
+
+        // reconstruct all tail pages state upto but excluding the head page
+        for (int pageNum = headCheckpoint.getFirstUnackedPageNum(); pageNum < headCheckpoint.getPageNum(); pageNum++) {
+            final String cpFileName = checkpointIO.tailFileName(pageNum);
+            if (!dirPath.resolve(cpFileName).toFile().exists()) {
+                continue;
             }
+            final Checkpoint cp = this.checkpointIO.read(cpFileName);
 
-            // transform the head page into a tail page only if the headpage is non-empty
-            // in both cases it will be checkpointed to track any changes in the firstUnackedPageNum when reconstructing the tail pages
+            logger.debug("opening tail page: {}, in: {}, with checkpoint: {}", pageNum, this.dirPath, cp);
 
-            logger.debug("opening head page: {}, in: {}, with checkpoint: {}", headCheckpoint.getPageNum(), this.dirPath, headCheckpoint.toString());
-
-            PageIO pageIO = new MmapPageIOV2(headCheckpoint.getPageNum(), this.pageCapacity, this.dirPath);
-            pageIO.recover(); // optimistically recovers the head page data file and set minSeqNum and elementCount to the actual read/recovered data
-
-            pqSizeBytes += (long)pageIO.getHead();
-            ensureDiskAvailable(this.maxBytes, pqSizeBytes);
-
-            if (pageIO.getMinSeqNum() != headCheckpoint.getMinSeqNum() || pageIO.getElementCount() != headCheckpoint.getElementCount()) {
-                // the recovered page IO shows different minSeqNum or elementCount than the checkpoint, use the page IO attributes
-
-                logger.warn("recovered head data page {} is different than checkpoint, using recovered page information", headCheckpoint.getPageNum());
-                logger.debug("head checkpoint minSeqNum={} or elementCount={} is different than head pageIO minSeqNum={} or elementCount={}", headCheckpoint.getMinSeqNum(), headCheckpoint.getElementCount(), pageIO.getMinSeqNum(), pageIO.getElementCount());
-
-                long firstUnackedSeqNum = headCheckpoint.getFirstUnackedSeqNum();
-                if (firstUnackedSeqNum < pageIO.getMinSeqNum()) {
-                    logger.debug("head checkpoint firstUnackedSeqNum={} is < head pageIO minSeqNum={}, using pageIO minSeqNum", firstUnackedSeqNum, pageIO.getMinSeqNum());
-                    firstUnackedSeqNum = pageIO.getMinSeqNum();
-                }
-                headCheckpoint = new Checkpoint(headCheckpoint.getPageNum(), headCheckpoint.getFirstUnackedPageNum(), firstUnackedSeqNum, pageIO.getMinSeqNum(), pageIO.getElementCount());
-            }
-            this.headPage = PageFactory.newHeadPage(headCheckpoint, this, pageIO);
-
-            if (this.headPage.getMinSeqNum() <= 0 && this.headPage.getElementCount() <= 0) {
-                // head page is empty, let's keep it as-is
-                // but checkpoint it to update the firstUnackedPageNum if it changed
-                this.headPage.checkpoint();
+            PageIO pageIO = new MmapPageIOV2(pageNum, this.pageCapacity, this.dirPath);
+            // important to NOT pageIO.open() just yet, we must first verify if it is fully acked in which case
+            // we can purge it and we don't care about its integrity for example if it is of zero-byte file size.
+            if (cp.isFullyAcked()) {
+                purgeTailPage(cp, pageIO);
             } else {
-                // head page is non-empty, transform it into a tail page
-                this.headPage.behead();
+                pageIO.open(cp.getMinSeqNum(), cp.getElementCount());
+                addTailPage(PageFactory.newTailPage(cp, this, pageIO));
+                pqSizeBytes += pageIO.getCapacity();
+            }
 
-                if (headCheckpoint.isFullyAcked()) {
-                    purgeTailPage(headCheckpoint, pageIO);
-                } else {
-                    addTailPage(this.headPage);
-                }
+            // track the seqNum as we rebuild tail pages, prevent empty pages with a minSeqNum of 0 to reset seqNum
+            if (cp.maxSeqNum() > this.seqNum) {
+                this.seqNum = cp.maxSeqNum();
+            }
+        }
+
+        // delete zero byte page and recreate checkpoint if corrupted page is detected
+        if ( cleanedUpFullyAckedCorruptedPage(headCheckpoint, pqSizeBytes)) { return; }
+
+        // transform the head page into a tail page only if the headpage is non-empty
+        // in both cases it will be checkpointed to track any changes in the firstUnackedPageNum when reconstructing the tail pages
+
+        logger.debug("opening head page: {}, in: {}, with checkpoint: {}", headCheckpoint.getPageNum(), this.dirPath, headCheckpoint);
+
+        PageIO pageIO = new MmapPageIOV2(headCheckpoint.getPageNum(), this.pageCapacity, this.dirPath);
+        pageIO.recover(); // optimistically recovers the head page data file and set minSeqNum and elementCount to the actual read/recovered data
+
+        pqSizeBytes += (long) pageIO.getHead();
+        ensureDiskAvailable(this.maxBytes, pqSizeBytes);
+
+        if (pageIO.getMinSeqNum() != headCheckpoint.getMinSeqNum() || pageIO.getElementCount() != headCheckpoint.getElementCount()) {
+            // the recovered page IO shows different minSeqNum or elementCount than the checkpoint, use the page IO attributes
+
+            logger.warn("recovered head data page {} is different than checkpoint, using recovered page information", headCheckpoint.getPageNum());
+            logger.debug("head checkpoint minSeqNum={} or elementCount={} is different than head pageIO minSeqNum={} or elementCount={}", headCheckpoint.getMinSeqNum(), headCheckpoint.getElementCount(), pageIO.getMinSeqNum(), pageIO.getElementCount());
+
+            long firstUnackedSeqNum = headCheckpoint.getFirstUnackedSeqNum();
+            if (firstUnackedSeqNum < pageIO.getMinSeqNum()) {
+                logger.debug("head checkpoint firstUnackedSeqNum={} is < head pageIO minSeqNum={}, using pageIO minSeqNum", firstUnackedSeqNum, pageIO.getMinSeqNum());
+                firstUnackedSeqNum = pageIO.getMinSeqNum();
+            }
+            headCheckpoint = new Checkpoint(headCheckpoint.getPageNum(), headCheckpoint.getFirstUnackedPageNum(), firstUnackedSeqNum, pageIO.getMinSeqNum(), pageIO.getElementCount());
+        }
+        this.headPage = PageFactory.newHeadPage(headCheckpoint, this, pageIO);
+
+        if (this.headPage.getMinSeqNum() <= 0 && this.headPage.getElementCount() <= 0) {
+            // head page is empty, let's keep it as-is
+            // but checkpoint it to update the firstUnackedPageNum if it changed
+            this.headPage.checkpoint();
+        } else {
+            // head page is non-empty, transform it into a tail page
+            this.headPage.behead();
+
+            if (headCheckpoint.isFullyAcked()) {
+                purgeTailPage(headCheckpoint, pageIO);
+            } else {
+                addTailPage(this.headPage);
+            }
+
+            // track the seqNum as we add this new tail page, prevent empty tailPage with a minSeqNum of 0 to reset seqNum
+            if (headCheckpoint.maxSeqNum() > this.seqNum) {
+                this.seqNum = headCheckpoint.maxSeqNum();
+            }
+
+            // create a new empty head page
+            headPageNum = headCheckpoint.getPageNum() + 1;
+            newCheckpointedHeadpage(headPageNum);
+        }
+
+        // only activate the first tail page
+        if (tailPages.size() > 0) {
+            this.tailPages.get(0).getPageIO().activate();
+        }
+
+        // TODO: here do directory traversal and cleanup lingering pages? could be a background operations to not delay queue start?
+    }
+
+    /**
+     * When the queue is fully acked and zero byte page is found, delete corrupted page and recreate checkpoint head
+     * @param headCheckpoint
+     * @param pqSizeBytes
+     * @return true when corrupted page is found and cleaned
+     * @throws IOException
+     */
+    private boolean cleanedUpFullyAckedCorruptedPage(Checkpoint headCheckpoint, long pqSizeBytes) throws IOException {
+        if (headCheckpoint.isFullyAcked()) {
+            PageIO pageIO = new MmapPageIOV2(headCheckpoint.getPageNum(), this.pageCapacity, this.dirPath);
+            if (pageIO.isCorruptedPage()) {
+                logger.debug("Queue is fully acked. Found zero byte page.{}. Recreate checkpoint.head and delete corrupted page", headCheckpoint.getPageNum());
+
+                this.checkpointIO.purge(checkpointIO.headFileName());
+                pageIO.purge();
 
-                // track the seqNum as we add this new tail page, prevent empty tailPage with a minSeqNum of 0 to reset seqNum
                 if (headCheckpoint.maxSeqNum() > this.seqNum) {
                     this.seqNum = headCheckpoint.maxSeqNum();
                 }
 
-                // create a new empty head page
-                headPageNum = headCheckpoint.getPageNum() + 1;
-                newCheckpointedHeadpage(headPageNum);
+                newCheckpointedHeadpage(headCheckpoint.getPageNum() + 1);
+
+                pqSizeBytes += (long) pageIO.getHead();
+                ensureDiskAvailable(this.maxBytes, pqSizeBytes);
+                return true;
             }
-
-            // only activate the first tail page
-            if (tailPages.size() > 0) {
-                this.tailPages.get(0).getPageIO().activate();
-            }
-
-            // TODO: here do directory traversal and cleanup lingering pages? could be a background operations to not delay queue start?
-
-            this.closed.set(false);
-        } catch (LockException e) {
-            throw new LockException("The queue failed to obtain exclusive access, cause: " + e.getMessage());
-        } finally {
-            lock.unlock();
         }
+        return false;
     }
 
     /**
@@ -276,7 +349,9 @@ public final class Queue implements Closeable {
     private void purgeTailPage(Checkpoint checkpoint, PageIO pageIO) throws IOException {
         try {
             pageIO.purge();
-        } catch (NoSuchFileException e) { /* ignore */ }
+        } catch (NoSuchFileException e) { /* ignore */
+            logger.debug("tail page does not exist: {}", pageIO);
+        }
 
         // we want to keep all the "middle" checkpoints between the first unacked tail page and the head page
         // to always have a contiguous sequence of checkpoints which helps figuring queue integrity. for this
@@ -313,6 +388,7 @@ public final class Queue implements Closeable {
     private void newCheckpointedHeadpage(int pageNum) throws IOException {
         PageIO headPageIO = new MmapPageIOV2(pageNum, this.pageCapacity, this.dirPath);
         headPageIO.create();
+        logger.debug("created new head page: {}", headPageIO);
         this.headPage = PageFactory.newHeadPage(pageNum, this, headPageIO);
         this.headPage.forceCheckpoint();
     }
@@ -326,6 +402,12 @@ public final class Queue implements Closeable {
      * @throws IOException if an IO error occurs
      */
     public long write(Queueable element) throws IOException {
+        // pre-check before incurring serialization overhead;
+        // we must check again after acquiring the lock.
+        if (this.closed.get()) {
+            throw new QueueRuntimeException(QueueExceptionMessages.CANNOT_WRITE_TO_CLOSED_QUEUE);
+        }
+
         byte[] data = element.serialize();
 
         // the write strategy with regard to the isFull() state is to assume there is space for this element
@@ -337,12 +419,17 @@ public final class Queue implements Closeable {
 
         lock.lock();
         try {
-            if (! this.headPage.hasCapacity(data.length)) {
-                throw new IOException("data to be written is bigger than page capacity");
+            // ensure that the queue is still open now that this thread has acquired the lock.
+            if (this.closed.get()) {
+                throw new QueueRuntimeException(QueueExceptionMessages.CANNOT_WRITE_TO_CLOSED_QUEUE);
+            }
+
+            if (!this.headPage.hasCapacity(data.length)) {
+                throw new QueueRuntimeException(QueueExceptionMessages.BIGGER_DATA_THAN_PAGE_SIZE);
             }
 
             // create a new head page if the current does not have sufficient space left for data to be written
-            if (! this.headPage.hasSpace(data.length)) {
+            if (!this.headPage.hasSpace(data.length)) {
 
                 // TODO: verify queue state integrity WRT Queue.open()/recover() at each step of this process
 
@@ -373,6 +460,7 @@ public final class Queue implements Closeable {
                 try {
                     notFull.await();
                 } catch (InterruptedException e) {
+                    logger.debug("interrupted waiting for queue to not be full", e);
                     // the thread interrupt() has been called while in the await() blocking call.
                     // at this point the interrupted flag is reset and Thread.interrupted() will return false
                     // to any upstream calls on it. for now our choice is to return normally and set back
@@ -418,37 +506,35 @@ public final class Queue implements Closeable {
     }
 
     /**
-     * <p>Checks if the Queue is full, with "full" defined as either of:</p>
-     * <p>Assuming a maximum size of the queue larger than 0 is defined:</p>
+     * <p>Checks if the Queue is full, with "full" defined as either of:
      * <ul>
-     *     <li>The sum of the size of all allocated pages is more than the allowed maximum Queue
-     *     size</li>
-     *     <li>The sum of the size of all allocated pages equal to the allowed maximum Queue size
-     *     and the current head page has no remaining capacity.</li>
-     * </ul>
-     * <p>or assuming a max unread count larger than 0, is defined "full" is also defined as:</p>
-     * <ul>
-     *     <li>The current number of unread events exceeds or is equal to the configured maximum
-     *     number of allowed unread events.</li>
+     *     <li>{@code maxUnread} is non-zero and is met or exceeded by the total
+     *         number of unread events on all pages ({@code unreadCount})</li>
+     *     <li>{@code maxBytes} is non-zero and is exceeded by the sum of the sizes
+     *         of all allocated tail pages plus the portion of the current head page
+     *         containing events</li>
      * </ul>
      * @return True iff the queue is full
      */
     public boolean isFull() {
         lock.lock();
         try {
-            if (this.maxBytes > 0L && isMaxBytesReached()) {
-                return true;
-            } else {
-                return (this.maxUnread > 0 && this.unreadCount >= this.maxUnread);
-            }
+            return isMaxBytesReached() || isMaxUnreadReached();
         } finally {
             lock.unlock();
         }
     }
 
     private boolean isMaxBytesReached() {
-        final long persistedByteSize = getPersistedByteSize();
-        return ((persistedByteSize > this.maxBytes) || (persistedByteSize == this.maxBytes && !this.headPage.hasSpace(1)));
+        if (this.maxBytes <= 0L) {
+            return false;
+        }
+
+        return getPersistedByteSize() > this.maxBytes;
+    }
+
+    private boolean isMaxUnreadReached() {
+        return this.maxUnread > 0 && (this.unreadCount >= this.maxUnread);
     }
 
     /**
@@ -504,13 +590,18 @@ public final class Queue implements Closeable {
      * @throws IOException if an IO error occurs
      */
     public synchronized Batch nonBlockReadBatch(int limit) throws IOException {
+        final SerializedBatchHolder serializedBatchHolder;
         lock.lock();
         try {
             Page p = nextReadPage();
-            return (isHeadPage(p) && p.isFullyRead()) ? null : readPageBatch(p, limit, 0L);
+            if (isHeadPage(p) && p.isFullyRead()) {
+                return null;
+            }
+            serializedBatchHolder = readPageBatch(p, limit, 0L);
         } finally {
             lock.unlock();
         }
+        return serializedBatchHolder.deserialize();
     }
 
     /**
@@ -518,10 +609,16 @@ public final class Queue implements Closeable {
      * @param limit size limit of the batch to read. returned {@link Batch} can be smaller.
      * @param timeout the maximum time to wait in milliseconds on write operations
      * @return the read {@link Batch} or null if no element upon timeout
+     * @throws QueueRuntimeException if queue is closed
      * @throws IOException if an IO error occurs
      */
-    public synchronized Batch readBatch(int limit, long timeout) throws IOException {
+    public Batch readBatch(int limit, long timeout) throws IOException {
+        return readSerializedBatch(limit, timeout).deserialize();
+    }
+
+    private synchronized SerializedBatchHolder readSerializedBatch(int limit, long timeout) throws IOException {
         lock.lock();
+
         try {
             return readPageBatch(nextReadPage(), limit, timeout);
         } finally {
@@ -530,7 +627,7 @@ public final class Queue implements Closeable {
     }
 
     /**
-     * read a {@link Batch} from the given {@link Page}. If the page is a head page, try to maximize the
+     * read a {@link SerializedBatchHolder} from the given {@link Page}. If the page is a head page, try to maximize the
      * batch size by waiting for writes.
      * @param p the {@link Page} to read from.
      * @param limit size limit of the batch to read.
@@ -538,7 +635,7 @@ public final class Queue implements Closeable {
      * @return {@link Batch} with read elements or null if nothing was read
      * @throws IOException if an IO error occurs
      */
-    private Batch readPageBatch(Page p, int limit, long timeout) throws IOException {
+    private SerializedBatchHolder readPageBatch(Page p, int limit, long timeout) throws IOException {
         int left = limit;
         final List<byte[]> elements = new ArrayList<>(limit);
 
@@ -563,7 +660,7 @@ public final class Queue implements Closeable {
             }
 
             if (! p.isFullyRead()) {
-                boolean wasFull = isFull();
+                boolean wasFull = isMaxUnreadReached();
 
                 final SequencedList<byte[]> serialized = p.read(left);
                 int n = serialized.getElements().size();
@@ -590,7 +687,7 @@ public final class Queue implements Closeable {
             removeUnreadPage(p);
         }
 
-        return new Batch(elements, firstSeqNum, this);
+        return new SerializedBatchHolder(elements, firstSeqNum);
     }
 
     /**
@@ -693,32 +790,40 @@ public final class Queue implements Closeable {
                 notFull.signalAll();
 
             } finally {
-                try {
-                    FileLockFactory.releaseLock(this.dirLock);
-                } catch (IOException e) {
-                    // log error and ignore
-                    logger.error("Queue close releaseLock failed, error={}", e.getMessage());
-                } finally {
-                    lock.unlock();
-                }
+                releaseLockAndSwallow();
+                lock.unlock();
             }
         }
     }
 
-    /**
-     * return the {@link Page} for the next read operation.
-     * @return {@link Page} will be either a read-only tail page or the head page.
-     */
-    public Page nextReadPage() {
-        lock.lock();
+    private void releaseLockAndSwallow() {
         try {
-            // look at head page if no unreadTailPages
-            return (this.unreadTailPages.isEmpty()) ?  this.headPage : this.unreadTailPages.get(0);
-        } finally {
-            lock.unlock();
+            FileLockFactory.releaseLock(this.dirLock);
+        } catch (IOException e) {
+            // log error and ignore
+            logger.error("Queue close releaseLock failed, error={}", e.getMessage());
         }
     }
 
+    /**
+     * Return the {@link Page} for the next read operation.
+     * Caller <em>MUST</em> have exclusive access to the lock.
+     * @return {@link Page} will be either a read-only tail page or the head page.
+     * @throws QueueRuntimeException if queue is closed
+     */
+    private Page nextReadPage() {
+        if (!lock.isHeldByCurrentThread()) {
+            throw new IllegalStateException(QueueExceptionMessages.CANNOT_READ_PAGE_WITHOUT_LOCK);
+        }
+
+        if (isClosed()) {
+            throw new QueueRuntimeException(QueueExceptionMessages.CANNOT_READ_FROM_CLOSED_QUEUE);
+        }
+
+
+        return (this.unreadTailPages.isEmpty()) ?  this.headPage : this.unreadTailPages.get(0);
+    }
+
     private void removeUnreadPage(Page p) {
         if (! this.unreadTailPages.isEmpty()) {
             Page firstUnread = this.unreadTailPages.get(0);
@@ -765,7 +870,7 @@ public final class Queue implements Closeable {
         }
     }
 
-    private boolean isClosed() {
+    public boolean isClosed() {
         return this.closed.get();
     }
 
@@ -798,4 +903,18 @@ public final class Queue implements Closeable {
         final long pMaxSeq = pMinSeq + (long) page.getElementCount();
         return seqNum >= pMinSeq && seqNum < pMaxSeq;
     }
+
+    class SerializedBatchHolder {
+        private final List<byte[]> elements;
+        private final long firstSeqNum;
+
+        private SerializedBatchHolder(List<byte[]> elements, long firstSeqNum) {
+            this.elements = elements;
+            this.firstSeqNum = firstSeqNum;
+        }
+
+        private Batch deserialize() {
+            return new Batch(elements, firstSeqNum, Queue.this);
+        }
+    }
 }
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/QueueExceptionMessages.java b/logstash-core/src/main/java/org/logstash/ackedqueue/QueueExceptionMessages.java
new file mode 100644
index 000000000..6b13a2b59
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/QueueExceptionMessages.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.ackedqueue;
+
+/**
+ * A public class holds number of descriptive messages are used during the interaction with acked queue.
+ */
+public class QueueExceptionMessages {
+
+    public final static String CANNOT_READ_FROM_CLOSED_QUEUE = "Attempted to read on a closed acked queue.";
+
+    public final static String CANNOT_WRITE_TO_CLOSED_QUEUE = "Tried to write to a closed queue.";
+
+    public final static String BIGGER_DATA_THAN_PAGE_SIZE = "data to be written is bigger than page capacity";
+
+    public final static String CANNOT_CREATE_QUEUE_DIR = "Error creating queue directories.";
+
+    public final static String CANNOT_DESERIALIZE = "cannot find deserialize method on class ";
+
+    public final static String UNHANDLED_ERROR_WRITING_TO_QUEUE = "Unhandleable error occurred while writing to queue.";
+
+    public final static String CANNOT_READ_PAGE_WITHOUT_LOCK = "Cannot get next read page without first acquiring the lock.";
+
+}
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/QueueFactoryExt.java b/logstash-core/src/main/java/org/logstash/ackedqueue/QueueFactoryExt.java
index 0b965b173..b5d1288b8 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/QueueFactoryExt.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/QueueFactoryExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
 import java.io.IOException;
@@ -13,12 +33,31 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.logstash.RubyUtil;
 import org.logstash.ackedqueue.ext.JRubyWrappedAckedQueueExt;
+import org.logstash.common.SettingKeyDefinitions;
 import org.logstash.execution.AbstractWrappedQueueExt;
 import org.logstash.ext.JrubyWrappedSynchronousQueueExt;
 
+/**
+ * Persistent queue factory JRuby extension.
+ * */
 @JRubyClass(name = "QueueFactory")
 public final class QueueFactoryExt extends RubyBasicObject {
 
+    /**
+     * A static value to indicate Persistent Queue is enabled.
+     */
+    public static String PERSISTED_TYPE = "persisted";
+
+    /**
+     * A static value to indicate Memory Queue is enabled.
+     */
+    public static String MEMORY_TYPE = "memory";
+
+    /**
+     * A contextual name to expose the queue type.
+     */
+    public static String QUEUE_TYPE_CONTEXT_NAME = "queue.type";
+
     private static final long serialVersionUID = 1L;
 
     public QueueFactoryExt(final Ruby runtime, final RubyClass metaClass) {
@@ -28,34 +67,40 @@ public final class QueueFactoryExt extends RubyBasicObject {
     @JRubyMethod(meta = true)
     public static AbstractWrappedQueueExt create(final ThreadContext context, final IRubyObject recv,
         final IRubyObject settings) throws IOException {
-        final String type = getSetting(context, settings, "queue.type").asJavaString();
-        if ("persisted".equals(type)) {
+        final String type = getSetting(context, settings, QUEUE_TYPE_CONTEXT_NAME).asJavaString();
+        if (PERSISTED_TYPE.equals(type)) {
             final Path queuePath = Paths.get(
-                getSetting(context, settings, "path.queue").asJavaString(),
-                getSetting(context, settings, "pipeline.id").asJavaString()
+                getSetting(context, settings, SettingKeyDefinitions.PATH_QUEUE).asJavaString(),
+                getSetting(context, settings, SettingKeyDefinitions.PIPELINE_ID).asJavaString()
             );
-            Files.createDirectories(queuePath);
+
+            // Files.createDirectories raises a FileAlreadyExistsException
+            // if pipeline queue path is a symlink, so worth checking against Files.exists
+            if (Files.exists(queuePath) == false) {
+                Files.createDirectories(queuePath);
+            }
+
             return new JRubyWrappedAckedQueueExt(context.runtime, RubyUtil.WRAPPED_ACKED_QUEUE_CLASS)
                 .initialize(
                     context, new IRubyObject[]{
                         context.runtime.newString(queuePath.toString()),
-                        getSetting(context, settings, "queue.page_capacity"),
-                        getSetting(context, settings, "queue.max_events"),
-                        getSetting(context, settings, "queue.checkpoint.writes"),
-                        getSetting(context, settings, "queue.checkpoint.acks"),
-                        getSetting(context, settings, "queue.checkpoint.interval"),
-                        getSetting(context, settings, "queue.checkpoint.retry"),
-                        getSetting(context, settings, "queue.max_bytes")
+                        getSetting(context, settings, SettingKeyDefinitions.QUEUE_PAGE_CAPACITY),
+                        getSetting(context, settings, SettingKeyDefinitions.QUEUE_MAX_EVENTS),
+                        getSetting(context, settings, SettingKeyDefinitions.QUEUE_CHECKPOINT_WRITES),
+                        getSetting(context, settings, SettingKeyDefinitions.QUEUE_CHECKPOINT_ACKS),
+                        getSetting(context, settings, SettingKeyDefinitions.QUEUE_CHECKPOINT_INTERVAL),
+                        getSetting(context, settings, SettingKeyDefinitions.QUEUE_CHECKPOINT_RETRY),
+                        getSetting(context, settings, SettingKeyDefinitions.QUEUE_MAX_BYTES)
                     }
                 );
-        } else if ("memory".equals(type)) {
+        } else if (MEMORY_TYPE.equals(type)) {
             return new JrubyWrappedSynchronousQueueExt(
                 context.runtime, RubyUtil.WRAPPED_SYNCHRONOUS_QUEUE_CLASS
             ).initialize(
                 context, context.runtime.newFixnum(
-                    getSetting(context, settings, "pipeline.batch.size")
+                    getSetting(context, settings, SettingKeyDefinitions.PIPELINE_BATCH_SIZE)
                         .convertToInteger().getIntValue()
-                        * getSetting(context, settings, "pipeline.workers")
+                        * getSetting(context, settings, SettingKeyDefinitions.PIPELINE_WORKERS)
                         .convertToInteger().getIntValue()
                 )
             );
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/QueueRuntimeException.java b/logstash-core/src/main/java/org/logstash/ackedqueue/QueueRuntimeException.java
index d4d994ffd..e1fa4c002 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/QueueRuntimeException.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/QueueRuntimeException.java
@@ -1,5 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
+/**
+ * Runtime exception specialization for persistent queue related runtime errors.
+ * */
 public class QueueRuntimeException extends RuntimeException {
 
     private static final long serialVersionUID = 1L;
@@ -8,4 +31,7 @@ public class QueueRuntimeException extends RuntimeException {
         super(message, cause);
     }
 
+    public QueueRuntimeException(String message) {
+        super(message);
+    }
 }
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/QueueUpgrade.java b/logstash-core/src/main/java/org/logstash/ackedqueue/QueueUpgrade.java
index 7192a39ff..140120e55 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/QueueUpgrade.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/QueueUpgrade.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
 import com.google.common.primitives.Ints;
@@ -21,6 +41,9 @@ import org.logstash.ackedqueue.io.MmapPageIOV1;
 import org.logstash.ackedqueue.io.MmapPageIOV2;
 import org.logstash.ackedqueue.io.PageIO;
 
+/**
+ * Exposes the {@link #upgradeQueueDirectoryToV2} method upgrade old v1 queue disk format to the new v2
+ * */
 public final class QueueUpgrade {
 
     private static final Logger LOGGER = LogManager.getLogger(QueueUpgrade.class);
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/Queueable.java b/logstash-core/src/main/java/org/logstash/ackedqueue/Queueable.java
index 2becec11d..7cb203d25 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/Queueable.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/Queueable.java
@@ -1,7 +1,30 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
 import java.io.IOException;
 
+/**
+ * Subclasses that are stored in queues must implement this to provide serializer and deserializer.
+ * */
 public interface Queueable {
 
     byte[] serialize() throws IOException;
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/SequencedList.java b/logstash-core/src/main/java/org/logstash/ackedqueue/SequencedList.java
index abbcbe015..4a26a47e6 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/SequencedList.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/SequencedList.java
@@ -1,8 +1,31 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
 import java.util.List;
 import org.logstash.ackedqueue.io.LongVector;
 
+/**
+ * Carries sequence numbers and items read from queue.
+ * */
 public class SequencedList<E> {
     private final List<E> elements;
     private final LongVector seqNums;
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/Settings.java b/logstash-core/src/main/java/org/logstash/ackedqueue/Settings.java
index e52436e75..45b34fe0f 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/Settings.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/Settings.java
@@ -1,5 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
+/**
+ * Persistent queue settings definition.
+ * */
 public interface Settings {
 
     Class<? extends Queueable> getElementClass();
@@ -18,6 +41,9 @@ public interface Settings {
 
     boolean getCheckpointRetry();
 
+    /**
+     * Persistent queue Setting's fluent builder definition
+     * */
     interface Builder {
 
         Builder elementClass(Class<? extends Queueable> elementClass);
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/SettingsImpl.java b/logstash-core/src/main/java/org/logstash/ackedqueue/SettingsImpl.java
index 18559e5c8..dd2300188 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/SettingsImpl.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/SettingsImpl.java
@@ -1,5 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
+/**
+ * Persistent queue settings implementation.
+ * */
 public class SettingsImpl implements Settings {
     private String dirForFiles;
     private Class<? extends Queueable> elementClass;
@@ -74,6 +97,9 @@ public class SettingsImpl implements Settings {
         return this.checkpointRetry;
     }
 
+    /**
+     * Default implementation for Setting's Builder
+     * */
     private static final class BuilderImpl implements Builder {
 
         /**
@@ -143,7 +169,7 @@ public class SettingsImpl implements Settings {
         public Builder elementClass(final Class<? extends Queueable> elementClass) {
             return new BuilderImpl(
                 this.dirForFiles, elementClass, this.capacity, this.queueMaxBytes, this.maxUnread,
-                this.checkpointMaxAcks, this.checkpointMaxWrites, false
+                this.checkpointMaxAcks, this.checkpointMaxWrites, this.checkpointRetry
             );
         }
 
@@ -151,7 +177,7 @@ public class SettingsImpl implements Settings {
         public Builder capacity(final int capacity) {
             return new BuilderImpl(
                 this.dirForFiles, this.elementClass, capacity, this.queueMaxBytes, this.maxUnread,
-                this.checkpointMaxAcks, this.checkpointMaxWrites, false
+                this.checkpointMaxAcks, this.checkpointMaxWrites, this.checkpointRetry
             );
         }
 
@@ -159,7 +185,7 @@ public class SettingsImpl implements Settings {
         public Builder queueMaxBytes(final long size) {
             return new BuilderImpl(
                 this.dirForFiles, this.elementClass, this.capacity, size, this.maxUnread,
-                this.checkpointMaxAcks, this.checkpointMaxWrites, false
+                this.checkpointMaxAcks, this.checkpointMaxWrites, this.checkpointRetry
             );
         }
 
@@ -168,7 +194,7 @@ public class SettingsImpl implements Settings {
             return new BuilderImpl(
                 this.dirForFiles, this.elementClass,
                 this.capacity, this.queueMaxBytes, maxUnread, this.checkpointMaxAcks,
-                this.checkpointMaxWrites, false
+                this.checkpointMaxWrites, this.checkpointRetry
             );
         }
 
@@ -177,7 +203,7 @@ public class SettingsImpl implements Settings {
             return new BuilderImpl(
                 this.dirForFiles, this.elementClass,
                 this.capacity, this.queueMaxBytes, this.maxUnread, checkpointMaxAcks,
-                this.checkpointMaxWrites, false
+                this.checkpointMaxWrites, this.checkpointRetry
             );
         }
 
@@ -185,7 +211,7 @@ public class SettingsImpl implements Settings {
         public Builder checkpointMaxWrites(final int checkpointMaxWrites) {
             return new BuilderImpl(
                 this.dirForFiles, this.elementClass, this.capacity, this.queueMaxBytes,
-                this.maxUnread, this.checkpointMaxAcks, checkpointMaxWrites, false
+                this.maxUnread, this.checkpointMaxAcks, checkpointMaxWrites, this.checkpointRetry
             );
         }
 
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JRubyAckedQueueExt.java b/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JRubyAckedQueueExt.java
index e1f3a6eef..c65cb7c2d 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JRubyAckedQueueExt.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JRubyAckedQueueExt.java
@@ -1,6 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue.ext;
 
 import java.io.IOException;
+import java.util.Objects;
+
 import org.jruby.Ruby;
 import org.jruby.RubyBoolean;
 import org.jruby.RubyClass;
@@ -9,7 +31,6 @@ import org.jruby.RubyObject;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
-import org.jruby.javasupport.JavaObject;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.logstash.Event;
@@ -17,13 +38,18 @@ import org.logstash.RubyUtil;
 import org.logstash.ackedqueue.AckedBatch;
 import org.logstash.ackedqueue.Batch;
 import org.logstash.ackedqueue.Queue;
+import org.logstash.ackedqueue.QueueExceptionMessages;
 import org.logstash.ackedqueue.SettingsImpl;
 
+/**
+ * JRuby extension to wrap a persistent queue istance.
+ */
 @JRubyClass(name = "AckedQueue")
 public final class JRubyAckedQueueExt extends RubyObject {
 
     private static final long serialVersionUID = 1L;
 
+    @SuppressWarnings("serial")
     private Queue queue;
 
     public JRubyAckedQueueExt(final Ruby runtime, final RubyClass metaClass) {
@@ -45,15 +71,15 @@ public final class JRubyAckedQueueExt extends RubyObject {
     private void initializeQueue(String path, int capacity, int maxEvents, int checkpointMaxWrites,
                                  int checkpointMaxAcks, boolean checkpointRetry, long maxBytes) {
         this.queue = new Queue(
-            SettingsImpl.fileSettingsBuilder(path)
-                .capacity(capacity)
-                .maxUnread(maxEvents)
-                .queueMaxBytes(maxBytes)
-                .checkpointMaxAcks(checkpointMaxAcks)
-                .checkpointMaxWrites(checkpointMaxWrites)
-                .checkpointRetry(checkpointRetry)
-                .elementClass(Event.class)
-                .build()
+                SettingsImpl.fileSettingsBuilder(path)
+                        .capacity(capacity)
+                        .maxUnread(maxEvents)
+                        .queueMaxBytes(maxBytes)
+                        .checkpointMaxAcks(checkpointMaxAcks)
+                        .checkpointMaxWrites(checkpointMaxWrites)
+                        .checkpointRetry(checkpointRetry)
+                        .elementClass(Event.class)
+                        .build()
         );
     }
 
@@ -109,26 +135,28 @@ public final class JRubyAckedQueueExt extends RubyObject {
         }
     }
 
-    public void write(Event event) throws IOException {
-        this.queue.write(event);
+    public void write(Event event) {
+        try {
+            this.queue.write(event);
+        } catch (IOException e) {
+            throw new IllegalStateException(QueueExceptionMessages.UNHANDLED_ERROR_WRITING_TO_QUEUE, e);
+        }
     }
 
     @JRubyMethod(name = "read_batch", required = 2)
-    public IRubyObject ruby_read_batch(ThreadContext context, IRubyObject limit,
-        IRubyObject timeout) {
-        AckedBatch b;
+    public IRubyObject rubyReadBatch(ThreadContext context, IRubyObject limit, IRubyObject timeout) {
+        AckedBatch batch;
         try {
-            b = readBatch(RubyFixnum.num2int(limit), RubyFixnum.num2int(timeout));
+            batch = readBatch(RubyFixnum.num2int(limit), RubyFixnum.num2int(timeout));
         } catch (IOException e) {
             throw RubyUtil.newRubyIOError(context.runtime, e);
         }
-        // TODO: return proper Batch object
-        return (b == null) ? context.nil : JavaObject.wrap(context.runtime, b);
+        return RubyUtil.toRubyObject(batch);
     }
 
     public AckedBatch readBatch(int limit, long timeout) throws IOException {
-        Batch b = queue.readBatch(limit, timeout);
-        return (b == null) ? null : AckedBatch.create(b);
+        final Batch batch = queue.readBatch(limit, timeout);
+        return Objects.isNull(batch) ? null : AckedBatch.create(batch);
     }
 
     @JRubyMethod(name = "is_fully_acked?")
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JRubyWrappedAckedQueueExt.java b/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JRubyWrappedAckedQueueExt.java
index 452d77714..b132afe54 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JRubyWrappedAckedQueueExt.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JRubyWrappedAckedQueueExt.java
@@ -1,7 +1,27 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue.ext;
 
 import java.io.IOException;
-import java.util.concurrent.atomic.AtomicBoolean;
+
 import org.jruby.Ruby;
 import org.jruby.RubyBoolean;
 import org.jruby.RubyClass;
@@ -19,13 +39,15 @@ import org.logstash.ext.JrubyAckedReadClientExt;
 import org.logstash.ext.JrubyAckedWriteClientExt;
 import org.logstash.ext.JrubyEventExtLibrary;
 
+/**
+ * JRuby extension
+ */
 @JRubyClass(name = "WrappedAckedQueue")
 public final class JRubyWrappedAckedQueueExt extends AbstractWrappedQueueExt {
 
     private static final long serialVersionUID = 1L;
 
     private JRubyAckedQueueExt queue;
-    private final AtomicBoolean isClosed = new AtomicBoolean();
 
     @JRubyMethod(optional = 8)
     public JRubyWrappedAckedQueueExt initialize(ThreadContext context, IRubyObject[] args) throws IOException {
@@ -34,7 +56,7 @@ public final class JRubyWrappedAckedQueueExt extends AbstractWrappedQueueExt {
         int maxEvents = RubyFixnum.num2int(args[2]);
         int checkpointMaxWrites = RubyFixnum.num2int(args[3]);
         int checkpointMaxAcks = RubyFixnum.num2int(args[4]);
-        boolean checkpointRetry = !((RubyBoolean)args[6]).isFalse();
+        boolean checkpointRetry = !((RubyBoolean) args[6]).isFalse();
         long queueMaxBytes = RubyFixnum.num2long(args[7]);
 
         this.queue = JRubyAckedQueueExt.create(args[0].asJavaString(), capacity, maxEvents,
@@ -55,19 +77,16 @@ public final class JRubyWrappedAckedQueueExt extends AbstractWrappedQueueExt {
 
     public void close() throws IOException {
         queue.close();
-        isClosed.set(true);
     }
 
     @JRubyMethod(name = {"push", "<<"})
     public void rubyPush(ThreadContext context, IRubyObject event) {
-        checkIfClosed("write");
         queue.rubyWrite(context, ((JrubyEventExtLibrary.RubyEvent) event).getEvent());
     }
 
     @JRubyMethod(name = "read_batch")
     public IRubyObject rubyReadBatch(ThreadContext context, IRubyObject size, IRubyObject wait) {
-        checkIfClosed("read a batch");
-        return queue.ruby_read_batch(context, size, wait);
+        return queue.rubyReadBatch(context, size, wait);
     }
 
     @JRubyMethod(name = "is_empty?")
@@ -77,7 +96,7 @@ public final class JRubyWrappedAckedQueueExt extends AbstractWrappedQueueExt {
 
     @Override
     protected JRubyAbstractQueueWriteClientExt getWriteClient(final ThreadContext context) {
-        return JrubyAckedWriteClientExt.create(queue, isClosed);
+        return JrubyAckedWriteClientExt.create(queue);
     }
 
     @Override
@@ -94,10 +113,4 @@ public final class JRubyWrappedAckedQueueExt extends AbstractWrappedQueueExt {
         }
         return context.nil;
     }
-
-    private void checkIfClosed(String action) {
-        if (isClosed.get()) {
-            throw new RuntimeException("Attempted to " + action + " on a closed AckedQueue");
-        }
-    }
 }
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/io/ByteBufferCleaner.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/ByteBufferCleaner.java
index 176c3c63b..ed211a11a 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/io/ByteBufferCleaner.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/ByteBufferCleaner.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue.io;
 
 import java.nio.MappedByteBuffer;
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/io/ByteBufferCleanerImpl.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/ByteBufferCleanerImpl.java
new file mode 100644
index 000000000..b9ce84c8f
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/ByteBufferCleanerImpl.java
@@ -0,0 +1,26 @@
+package org.logstash.ackedqueue.io;
+
+import java.nio.MappedByteBuffer;
+
+import sun.misc.Unsafe;
+import java.lang.reflect.Field;
+
+public class ByteBufferCleanerImpl implements ByteBufferCleaner {
+
+    private final Unsafe unsafe;
+
+    public ByteBufferCleanerImpl() {
+        try {
+            Field unsafeField = Unsafe.class.getDeclaredField("theUnsafe");
+            unsafeField.setAccessible(true);
+            unsafe = (Unsafe) unsafeField.get(null);
+        }catch (Exception e){
+            throw new IllegalStateException(e);
+        }
+    }
+
+    @Override
+    public void clean(MappedByteBuffer buffer) {
+        unsafe.invokeCleaner(buffer);
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/io/CheckpointIO.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/CheckpointIO.java
index c3b2e5de6..447ef7baa 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/io/CheckpointIO.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/CheckpointIO.java
@@ -1,8 +1,31 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue.io;
 
 import org.logstash.ackedqueue.Checkpoint;
 import java.io.IOException;
 
+/**
+ * Internal API to access checkpoint stored in files.
+ * */
 public interface CheckpointIO {
 
     // @return Checkpoint the written checkpoint object
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/io/FileCheckpointIO.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/FileCheckpointIO.java
index d82c94713..11dd811fd 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/io/FileCheckpointIO.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/FileCheckpointIO.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue.io;
 
 import java.io.FileOutputStream;
@@ -12,7 +32,12 @@ import java.util.zip.CRC32;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.logstash.ackedqueue.Checkpoint;
+import org.logstash.util.ExponentialBackoff;
 
+
+/**
+ * File implementation for {@link CheckpointIO}
+ * */
 public class FileCheckpointIO implements CheckpointIO {
 //    Checkpoint file structure
 //
@@ -46,6 +71,7 @@ public class FileCheckpointIO implements CheckpointIO {
     private static final String HEAD_CHECKPOINT = "checkpoint.head";
     private static final String TAIL_CHECKPOINT = "checkpoint.";
     private final Path dirPath;
+    private final ExponentialBackoff backoff;
 
     public FileCheckpointIO(Path dirPath) {
         this(dirPath, false);
@@ -54,6 +80,7 @@ public class FileCheckpointIO implements CheckpointIO {
     public FileCheckpointIO(Path dirPath, boolean retry) {
         this.dirPath = dirPath;
         this.retry = retry;
+        this.backoff = new ExponentialBackoff(3L);
     }
 
     @Override
@@ -80,20 +107,21 @@ public class FileCheckpointIO implements CheckpointIO {
             out.getFD().sync();
         }
 
+        // Windows can have problem doing file move See: https://github.com/elastic/logstash/issues/12345
+        // retry a couple of times to make it works. The first two runs has no break. The rest of reties are exponential backoff.
+        final Path path = dirPath.resolve(fileName);
         try {
-            Files.move(tmpPath, dirPath.resolve(fileName), StandardCopyOption.ATOMIC_MOVE);
+            Files.move(tmpPath, path, StandardCopyOption.ATOMIC_MOVE);
         } catch (IOException ex) {
             if (retry) {
                 try {
-                    logger.error("Retrying after exception writing checkpoint: " + ex);
-                    Thread.sleep(500);
-                    Files.move(tmpPath, dirPath.resolve(fileName), StandardCopyOption.ATOMIC_MOVE);
-                } catch (IOException | InterruptedException ex2) {
-                    logger.error("Aborting after second exception writing checkpoint: " + ex2);
-                    throw ex;
+                    logger.debug("CheckpointIO retry moving '{}' to '{}'", tmpPath, path);
+                    backoff.retryable(() -> Files.move(tmpPath, path, StandardCopyOption.ATOMIC_MOVE));
+                } catch (ExponentialBackoff.RetryException re) {
+                    throw new IOException("Error writing checkpoint", re);
                 }
             } else {
-                logger.error("Error writing checkpoint: " + ex);
+                logger.error("Error writing checkpoint without retry: " + ex);
                 throw ex;
             }
         }
@@ -102,6 +130,7 @@ public class FileCheckpointIO implements CheckpointIO {
     @Override
     public void purge(String fileName) throws IOException {
         Path path = dirPath.resolve(fileName);
+        logger.debug("CheckpointIO deleting '{}'", path);
         Files.delete(path);
     }
 
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/io/IntVector.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/IntVector.java
index 3845bf6b6..2f756be7e 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/io/IntVector.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/IntVector.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue.io;
 
 final class IntVector {
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/io/LongVector.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/LongVector.java
index 033bf9fe2..05343a8a5 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/io/LongVector.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/LongVector.java
@@ -1,5 +1,31 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue.io;
 
+/**
+ * Internal class used in persistent queue implementation.
+ *
+ * It'a vector that stores primitives long (no autoboxing) expanding, by copy, the underling array when
+ * more space is needed.
+ * */
 public final class LongVector {
 
     private int count;
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/io/MmapPageIOV1.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/MmapPageIOV1.java
index 3aa56354c..25011d22b 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/io/MmapPageIOV1.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/MmapPageIOV1.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue.io;
 
 import java.io.File;
@@ -9,7 +29,7 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.zip.CRC32;
-import org.logstash.LogstashJavaCompat;
+
 import org.logstash.ackedqueue.SequencedList;
 
 /**
@@ -23,8 +43,7 @@ public final class MmapPageIOV1 implements PageIO {
     /**
      * Cleaner function for forcing unmapping of backing {@link MmapPageIOV1#buffer}.
      */
-    private static final ByteBufferCleaner BUFFER_CLEANER =
-        LogstashJavaCompat.setupBytebufferCleaner();
+    private static final ByteBufferCleaner BUFFER_CLEANER = new ByteBufferCleanerImpl();
 
     private final File file;
 
@@ -200,6 +219,13 @@ public final class MmapPageIOV1 implements PageIO {
         return this.head;
     }
 
+    @Override
+    public boolean isCorruptedPage() throws IOException {
+        try (RandomAccessFile raf = new RandomAccessFile(this.file, "rw")) {
+            return raf.length() < MmapPageIOV2.MIN_CAPACITY;
+        }
+    }
+
     private int checksum(byte[] bytes) {
         checkSummer.reset();
         checkSummer.update(bytes, 0, bytes.length);
@@ -295,4 +321,15 @@ public final class MmapPageIOV1 implements PageIO {
                 .format("Expected page version=%d but found version=%d", VERSION_ONE, version));
         }
     }
+
+    @Override
+    public String toString() {
+        return "MmapPageIOV1{" +
+                "file=" + file +
+                ", capacity=" + capacity +
+                ", minSeqNum=" + minSeqNum +
+                ", elementCount=" + elementCount +
+                ", head=" + head +
+                '}';
+    }
 }
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/io/MmapPageIOV2.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/MmapPageIOV2.java
index ee0035a85..736da422b 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/io/MmapPageIOV2.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/MmapPageIOV2.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue.io;
 
 import java.io.File;
@@ -12,9 +32,11 @@ import java.util.List;
 import java.util.zip.CRC32;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.logstash.LogstashJavaCompat;
 import org.logstash.ackedqueue.SequencedList;
 
+/**
+ * Internal API, v2 mmap implementation of {@link PageIO}
+ * */
 public final class MmapPageIOV2 implements PageIO {
 
     public static final byte VERSION_TWO = (byte) 2;
@@ -31,8 +53,7 @@ public final class MmapPageIOV2 implements PageIO {
     /**
      * Cleaner function for forcing unmapping of backing {@link MmapPageIOV2#buffer}.
      */
-    private static final ByteBufferCleaner BUFFER_CLEANER =
-        LogstashJavaCompat.setupBytebufferCleaner();
+    private static final ByteBufferCleaner BUFFER_CLEANER = new ByteBufferCleanerImpl();
 
     private final File file;
 
@@ -152,7 +173,7 @@ public final class MmapPageIOV2 implements PageIO {
                 this.elementCount += 1;
             } catch (MmapPageIOV2.PageIOInvalidElementException e) {
                 // simply stop at first invalid element
-                LOGGER.debug("PageIO recovery element index:{}, readNextElement exception: {}", i, e.getMessage());
+                LOGGER.debug("PageIO recovery for '{}' element index:{}, readNextElement exception: {}", file, i, e.getMessage());
                 break;
             }
         }
@@ -170,6 +191,7 @@ public final class MmapPageIOV2 implements PageIO {
         }
         buffer.position(0);
         buffer.put(VERSION_TWO);
+        buffer.force();
         this.head = 1;
         this.minSeqNum = 0L;
         this.elementCount = 0;
@@ -199,8 +221,9 @@ public final class MmapPageIOV2 implements PageIO {
     @Override
     public void purge() throws IOException {
         close();
-        Files.delete(this.file.toPath());
         this.head = 0;
+        LOGGER.debug("PageIO deleting '{}'", this.file);
+        Files.delete(this.file.toPath());
     }
 
     @Override
@@ -249,6 +272,13 @@ public final class MmapPageIOV2 implements PageIO {
         return this.head;
     }
 
+    @Override
+    public boolean isCorruptedPage() throws IOException {
+        try (RandomAccessFile raf = new RandomAccessFile(this.file, "rw")) {
+            return raf.length() < MIN_CAPACITY;
+        }
+    }
+
     private int checksum(byte[] bytes) {
         checkSummer.reset();
         checkSummer.update(bytes, 0, bytes.length);
@@ -272,7 +302,8 @@ public final class MmapPageIOV2 implements PageIO {
             this.capacity = pageFileCapacity;
 
             if (this.capacity < MIN_CAPACITY) {
-                throw new IOException(String.format("Page file size is too small to hold elements"));
+                throw new IOException("Page file size is too small to hold elements. " +
+                        "This is potentially a queue corruption problem. Run `pqcheck` and `pqrepair` to repair the queue.");
             }
             this.buffer = raf.getChannel().map(FileChannel.MapMode.READ_WRITE, 0, this.capacity);
         }
@@ -324,8 +355,7 @@ public final class MmapPageIOV2 implements PageIO {
             int checksum = buffer.getInt();
             int computedChecksum = (int) this.checkSummer.getValue();
             if (computedChecksum != checksum) {
-                throw new MmapPageIOV2.PageIOInvalidElementException(
-                    "Element invalid checksum");
+                throw new MmapPageIOV2.PageIOInvalidElementException("Element invalid checksum");
             }
         }
 
@@ -371,6 +401,20 @@ public final class MmapPageIOV2 implements PageIO {
         }
     }
 
+    @Override
+    public String toString() {
+        return "MmapPageIOV2{" +
+                "file=" + file +
+                ", capacity=" + capacity +
+                ", minSeqNum=" + minSeqNum +
+                ", elementCount=" + elementCount +
+                ", head=" + head +
+                '}';
+    }
+
+    /**
+     * Invalid Page structure exception
+     * */
     public static final class PageIOInvalidElementException extends IOException {
 
         private static final long serialVersionUID = 1L;
@@ -380,6 +424,9 @@ public final class MmapPageIOV2 implements PageIO {
         }
     }
 
+    /**
+     * Invalid page version exception.
+     * */
     public static final class PageIOInvalidVersionException extends IOException {
 
         private static final long serialVersionUID = 1L;
diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/io/PageIO.java b/logstash-core/src/main/java/org/logstash/ackedqueue/io/PageIO.java
index 6560b5a4c..c44779e63 100644
--- a/logstash-core/src/main/java/org/logstash/ackedqueue/io/PageIO.java
+++ b/logstash-core/src/main/java/org/logstash/ackedqueue/io/PageIO.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue.io;
 
 import org.logstash.ackedqueue.SequencedList;
@@ -5,6 +25,9 @@ import org.logstash.ackedqueue.SequencedList;
 import java.io.Closeable;
 import java.io.IOException;
 
+/**
+ * Internal API to access pages stored in files.
+ * */
 public interface PageIO extends Closeable {
 
     // the concrete class should be constructed with the pageNum, capacity and dirPath attributes
@@ -61,4 +84,7 @@ public interface PageIO extends Closeable {
 
     // @return the data container min sequence number
     long getMinSeqNum();
+
+    // check if the page size is < minimum size
+    boolean isCorruptedPage() throws IOException;
 }
diff --git a/logstash-core/src/main/java/org/logstash/common/AbstractDeadLetterQueueWriterExt.java b/logstash-core/src/main/java/org/logstash/common/AbstractDeadLetterQueueWriterExt.java
index 48d45142a..799ee311d 100644
--- a/logstash-core/src/main/java/org/logstash/common/AbstractDeadLetterQueueWriterExt.java
+++ b/logstash-core/src/main/java/org/logstash/common/AbstractDeadLetterQueueWriterExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.common;
 
 import java.io.IOException;
@@ -119,13 +139,13 @@ public abstract class AbstractDeadLetterQueueWriterExt extends RubyObject {
 
         private static final long serialVersionUID = 1L;
 
-        private IRubyObject writerWrapper;
+        private transient IRubyObject writerWrapper;
 
-        private DeadLetterQueueWriter innerWriter;
+        private transient DeadLetterQueueWriter innerWriter;
 
-        private IRubyObject pluginId;
+        private transient IRubyObject pluginId;
 
-        private IRubyObject pluginType;
+        private transient IRubyObject pluginType;
 
         private String pluginIdString;
 
@@ -178,7 +198,7 @@ public abstract class AbstractDeadLetterQueueWriterExt extends RubyObject {
                 try {
                     innerWriter.writeEntry(
                         ((JrubyEventExtLibrary.RubyEvent) event).getEvent(),
-                        pluginIdString, pluginTypeString, reason.asJavaString()
+                            pluginTypeString, pluginIdString, reason.asJavaString()
                     );
                 } catch (final IOException ex) {
                     throw new IllegalStateException(ex);
diff --git a/logstash-core/src/main/java/org/logstash/common/BufferedTokenizerExt.java b/logstash-core/src/main/java/org/logstash/common/BufferedTokenizerExt.java
index f3602f7ed..2161dc900 100644
--- a/logstash-core/src/main/java/org/logstash/common/BufferedTokenizerExt.java
+++ b/logstash-core/src/main/java/org/logstash/common/BufferedTokenizerExt.java
@@ -1,28 +1,56 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.common;
 
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
+import org.jruby.RubyEncoding;
 import org.jruby.RubyObject;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.ByteList;
 import org.logstash.RubyUtil;
 
+import java.nio.charset.Charset;
+
 @JRubyClass(name = "BufferedTokenizer")
 public class BufferedTokenizerExt extends RubyObject {
 
     private static final long serialVersionUID = 1L;
 
-    private static final IRubyObject MINUS_ONE = RubyUtil.RUBY.newFixnum(-1);
+    private static final RubyString NEW_LINE = (RubyString) RubyUtil.RUBY.newString("\n").
+                                                                freeze(RubyUtil.RUBY.getCurrentContext());
 
     private @SuppressWarnings("rawtypes") RubyArray input = RubyUtil.RUBY.newArray();
-    private IRubyObject delimiter = RubyUtil.RUBY.newString("\n");
+    private StringBuilder headToken = new StringBuilder();
+    private RubyString delimiter = NEW_LINE;
     private int sizeLimit;
     private boolean hasSizeLimit;
-    private int inputSize;
+    private long inputSize;
+    private boolean bufferFullErrorNotified = false;
+    private String encodingName;
 
     public BufferedTokenizerExt(final Ruby runtime, final RubyClass metaClass) {
         super(runtime, metaClass);
@@ -31,10 +59,14 @@ public class BufferedTokenizerExt extends RubyObject {
     @JRubyMethod(name = "initialize", optional = 2)
     public IRubyObject init(final ThreadContext context, IRubyObject[] args) {
         if (args.length >= 1) {
-            this.delimiter = args[0];
+            this.delimiter = args[0].convertToString();
         }
         if (args.length == 2) {
-            this.sizeLimit = args[1].convertToInteger().getIntValue();
+            final int sizeLimit = args[1].convertToInteger().getIntValue();
+            if (sizeLimit <= 0) {
+                throw new IllegalArgumentException("Size limit must be positive");
+            }
+            this.sizeLimit = sizeLimit;
             this.hasSizeLimit = true;
         }
         this.inputSize = 0;
@@ -55,23 +87,76 @@ public class BufferedTokenizerExt extends RubyObject {
     @JRubyMethod
     @SuppressWarnings("rawtypes")
     public RubyArray extract(final ThreadContext context, IRubyObject data) {
-        final RubyArray entities = ((RubyString) data).split(context, delimiter, MINUS_ONE);
+        RubyEncoding encoding = (RubyEncoding) data.convertToString().encoding(context);
+        encodingName = encoding.getEncoding().getCharsetName();
+        final RubyArray entities = data.convertToString().split(delimiter, -1);
+        if (!bufferFullErrorNotified) {
+            input.clear();
+            input.concat(entities);
+        } else {
+            // after a full buffer signal
+            if (input.isEmpty()) {
+                // after a buffer full error, the remaining part of the line, till next delimiter,
+                // has to be consumed, unless the input buffer doesn't still contain fragments of
+                // subsequent tokens.
+                entities.shift(context);
+                input.concat(entities);
+            } else {
+                // merge last of the input with first of incoming data segment
+                if (!entities.isEmpty()) {
+                    RubyString last = ((RubyString) input.pop(context));
+                    RubyString nextFirst = ((RubyString) entities.shift(context));
+                    entities.unshift(last.concat(nextFirst));
+                    input.concat(entities);
+                }
+            }
+        }
+
         if (hasSizeLimit) {
-            final int entitiesSize = ((RubyString) entities.first()).size();
+            if (bufferFullErrorNotified) {
+                bufferFullErrorNotified = false;
+                if (input.isEmpty()) {
+                    return RubyUtil.RUBY.newArray();
+                }
+            }
+            final int entitiesSize = ((RubyString) input.first()).size();
             if (inputSize + entitiesSize > sizeLimit) {
-                throw new IllegalStateException("input buffer full");
+                bufferFullErrorNotified = true;
+                headToken = new StringBuilder();
+                String errorMessage = String.format("input buffer full, consumed token which exceeded the sizeLimit %d; inputSize: %d, entitiesSize %d", sizeLimit, inputSize, entitiesSize);
+                inputSize = 0;
+                input.shift(context); // consume the token fragment that generates the buffer full
+                throw new IllegalStateException(errorMessage);
             }
             this.inputSize = inputSize + entitiesSize;
         }
-        input.append(entities.shift(context));
-        if (entities.isEmpty()) {
+
+        if (input.getLength() < 2) {
+            // this is a specialization case which avoid adding and removing from input accumulator
+            // when it contains just one element
+            headToken.append(input.shift(context)); // remove head
             return RubyUtil.RUBY.newArray();
         }
-        entities.unshift(input.join(context));
-        input.clear();
-        input.append(entities.pop(context));
-        inputSize = ((RubyString) input.first()).size();
-        return entities;
+
+        if (headToken.length() > 0) {
+            // if there is a pending token part, merge it with the first token segment present
+            // in the accumulator, and clean the pending token part.
+            headToken.append(input.shift(context)); // append buffer to first element and
+            // create new RubyString with the data specified encoding
+            RubyString encodedHeadToken = toEncodedRubyString(context, headToken.toString());
+            input.unshift(encodedHeadToken); // reinsert it into the array
+            headToken = new StringBuilder();
+        }
+        headToken.append(input.pop(context)); // put the leftovers in headToken for later
+        inputSize = headToken.length();
+        return input;
+    }
+
+    private RubyString toEncodedRubyString(ThreadContext context, String input) {
+        // Depends on the encodingName being set by the extract method, could potentially raise if not set.
+        RubyString result = RubyUtil.RUBY.newString(new ByteList(input.getBytes(Charset.forName(encodingName))));
+        result.force_encoding(context, RubyUtil.RUBY.newString(encodingName));
+        return result;
     }
 
     /**
@@ -83,14 +168,30 @@ public class BufferedTokenizerExt extends RubyObject {
      */
     @JRubyMethod
     public IRubyObject flush(final ThreadContext context) {
-        final IRubyObject buffer = input.join(context);
-        input.clear();
-        return buffer;
+        final IRubyObject buffer = RubyUtil.toRubyObject(headToken.toString());
+        headToken = new StringBuilder();
+        inputSize = 0;
+
+        // create new RubyString with the last data specified encoding, if exists
+        RubyString encodedHeadToken;
+        if (encodingName != null) {
+            encodedHeadToken = toEncodedRubyString(context, buffer.toString());
+        } else {
+            // When used with TCP input it could be that on socket connection the flush method
+            // is invoked while no invocation of extract, leaving the encoding name unassigned.
+            // In such case also the headToken must be empty
+            if (!buffer.toString().isEmpty()) {
+                throw new IllegalStateException("invoked flush with unassigned encoding but not empty head token, this shouldn't happen");
+            }
+            encodedHeadToken = (RubyString) buffer;
+        }
+
+        return encodedHeadToken;
     }
 
     @JRubyMethod(name = "empty?")
     public IRubyObject isEmpty(final ThreadContext context) {
-        return input.empty_p();
+        return RubyUtil.RUBY.newBoolean(headToken.toString().isEmpty() && (inputSize == 0));
     }
 
 }
diff --git a/logstash-core/src/main/java/org/logstash/common/DLQWriterAdapter.java b/logstash-core/src/main/java/org/logstash/common/DLQWriterAdapter.java
new file mode 100644
index 000000000..1fbc906ba
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/common/DLQWriterAdapter.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.common;
+
+import co.elastic.logstash.api.DeadLetterQueueWriter;
+import co.elastic.logstash.api.Event;
+import co.elastic.logstash.api.Plugin;
+
+import java.io.IOException;
+import java.util.Objects;
+
+public class DLQWriterAdapter implements DeadLetterQueueWriter {
+
+    private final org.logstash.common.io.DeadLetterQueueWriter dlqWriter;
+
+    public DLQWriterAdapter(org.logstash.common.io.DeadLetterQueueWriter dlqWriter) {
+        this.dlqWriter = Objects.requireNonNull(dlqWriter);
+    }
+
+    @Override
+    public void writeEntry(Event event, Plugin plugin, String reason) throws IOException {
+        dlqWriter.writeEntry((org.logstash.Event) event, plugin.getName(), plugin.getId(), reason);
+    }
+
+    @Override
+    public boolean isOpen() {
+        return dlqWriter != null && dlqWriter.isOpen();
+    }
+
+    @Override
+    public long getCurrentQueueSize() {
+        return dlqWriter != null ? dlqWriter.getCurrentQueueSize() : 0;
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/common/DeadLetterQueueFactory.java b/logstash-core/src/main/java/org/logstash/common/DeadLetterQueueFactory.java
index 2a884b668..16fbc0c5b 100644
--- a/logstash-core/src/main/java/org/logstash/common/DeadLetterQueueFactory.java
+++ b/logstash-core/src/main/java/org/logstash/common/DeadLetterQueueFactory.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -21,9 +41,11 @@ package org.logstash.common;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.logstash.common.io.DeadLetterQueueWriter;
+import org.logstash.common.io.QueueStorageType;
 
 import java.io.IOException;
 import java.nio.file.Paths;
+import java.time.Duration;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -53,22 +75,61 @@ public class DeadLetterQueueFactory {
      *                for each id
      * @param maxQueueSize Maximum size of the dead letter queue (in bytes). No entries will be written
      *                     that would make the size of this dlq greater than this value
-     * @return The write manager for the specific id's dead-letter-queue context
+     * @param flushInterval Maximum duration between flushes of dead letter queue files if no data is sent.
+     * @param storageType overwriting type in case of queue full: drop_older or drop_newer.
+     * @return write manager for the specific id's dead-letter-queue context
      */
-    public static DeadLetterQueueWriter getWriter(String id, String dlqPath, long maxQueueSize) {
-        return REGISTRY.computeIfAbsent(id, key -> newWriter(key, dlqPath, maxQueueSize));
+    public static DeadLetterQueueWriter getWriter(String id, String dlqPath, long maxQueueSize, Duration flushInterval, QueueStorageType storageType) {
+        return REGISTRY.computeIfAbsent(id, key -> newWriter(key, dlqPath, maxQueueSize, flushInterval, storageType));
+    }
+
+    /**
+     * Like {@link #getWriter(String, String, long, Duration, QueueStorageType)} but also setting the age duration
+     * of the segments.
+     *
+     * @param id The identifier context for this dlq manager
+     * @param dlqPath The path to use for the queue's backing data directory. contains sub-directories
+     *                for each id
+     * @param maxQueueSize Maximum size of the dead letter queue (in bytes). No entries will be written
+     *                     that would make the size of this dlq greater than this value
+     * @param flushInterval Maximum duration between flushes of dead letter queue files if no data is sent.
+     * @param storageType overwriting type in case of queue full: drop_older or drop_newer.
+     * @param age the period that DLQ events should be considered as valid, before automatic removal.
+     * @return write manager for the specific id's dead-letter-queue context
+     * */
+    public static DeadLetterQueueWriter getWriter(String id, String dlqPath, long maxQueueSize, Duration flushInterval, QueueStorageType storageType, Duration age) {
+        return REGISTRY.computeIfAbsent(id, key -> newWriter(key, dlqPath, maxQueueSize, flushInterval, storageType, age));
     }
 
     public static DeadLetterQueueWriter release(String id) {
         return REGISTRY.remove(id);
     }
 
-    private static DeadLetterQueueWriter newWriter(final String id, final String dlqPath, final long maxQueueSize) {
+    private static DeadLetterQueueWriter newWriter(final String id, final String dlqPath, final long maxQueueSize,
+                                                   final Duration flushInterval, final QueueStorageType storageType) {
         try {
-            return new DeadLetterQueueWriter(Paths.get(dlqPath, id), MAX_SEGMENT_SIZE_BYTES, maxQueueSize);
+            return DeadLetterQueueWriter
+                    .newBuilder(Paths.get(dlqPath, id), MAX_SEGMENT_SIZE_BYTES, maxQueueSize, flushInterval)
+                    .storageType(storageType)
+                    .build();
         } catch (IOException e) {
             logger.error("unable to create dead letter queue writer", e);
+            return null;
+        }
+    }
+
+    private static DeadLetterQueueWriter newWriter(final String id, final String dlqPath, final long maxQueueSize,
+                                                   final Duration flushInterval, final QueueStorageType storageType,
+                                                   final Duration age) {
+        try {
+            return DeadLetterQueueWriter
+                    .newBuilder(Paths.get(dlqPath, id), MAX_SEGMENT_SIZE_BYTES, maxQueueSize, flushInterval)
+                    .storageType(storageType)
+                    .retentionTime(age)
+                    .build();
+        } catch (IOException e) {
+            logger.error("unable to create dead letter queue writer", e);
+            return null;
         }
-        return null;
     }
 }
diff --git a/logstash-core/src/main/java/org/logstash/common/EnvironmentVariableProvider.java b/logstash-core/src/main/java/org/logstash/common/EnvironmentVariableProvider.java
new file mode 100644
index 000000000..9788c8efc
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/common/EnvironmentVariableProvider.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.common;
+
+public interface EnvironmentVariableProvider {
+
+    String get(String key);
+
+    static EnvironmentVariableProvider defaultProvider() {
+        return System::getenv;
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/common/FsUtil.java b/logstash-core/src/main/java/org/logstash/common/FsUtil.java
index 24a60525a..eb0fb74b0 100644
--- a/logstash-core/src/main/java/org/logstash/common/FsUtil.java
+++ b/logstash-core/src/main/java/org/logstash/common/FsUtil.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.common;
 
 import java.nio.file.Path;
diff --git a/logstash-core/src/main/java/org/logstash/common/IncompleteSourceWithMetadataException.java b/logstash-core/src/main/java/org/logstash/common/IncompleteSourceWithMetadataException.java
index 11f0d9099..90bfc8178 100644
--- a/logstash-core/src/main/java/org/logstash/common/IncompleteSourceWithMetadataException.java
+++ b/logstash-core/src/main/java/org/logstash/common/IncompleteSourceWithMetadataException.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.common;
 
 import org.logstash.config.ir.InvalidIRException;
diff --git a/logstash-core/src/main/java/org/logstash/common/LsQueueUtils.java b/logstash-core/src/main/java/org/logstash/common/LsQueueUtils.java
index 9266f549a..acb809376 100644
--- a/logstash-core/src/main/java/org/logstash/common/LsQueueUtils.java
+++ b/logstash-core/src/main/java/org/logstash/common/LsQueueUtils.java
@@ -1,10 +1,30 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.common;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedHashSet;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
-import org.logstash.ext.JrubyEventExtLibrary;
+import org.logstash.ext.JrubyEventExtLibrary.RubyEvent;
 
 /**
  * Utilities around {@link BlockingQueue}.
@@ -22,9 +42,12 @@ public final class LsQueueUtils {
      * @param events Events to add to Queue
      * @throws InterruptedException On interrupt during blocking queue add
      */
-    public static void addAll(final BlockingQueue<JrubyEventExtLibrary.RubyEvent> queue,
-        final Collection<JrubyEventExtLibrary.RubyEvent> events) throws InterruptedException {
-        for (final JrubyEventExtLibrary.RubyEvent event : events) {
+    public static void addAll(
+        final BlockingQueue<RubyEvent> queue,
+        final Collection<RubyEvent> events)
+        throws InterruptedException
+    {
+        for (final RubyEvent event : events) {
             queue.put(event);
         }
     }
@@ -45,13 +68,14 @@ public final class LsQueueUtils {
      * @throws InterruptedException On Interrupt during {@link BlockingQueue#poll()} or
      * {@link BlockingQueue#drainTo(Collection)}
      */
-    public static LinkedHashSet<JrubyEventExtLibrary.RubyEvent> drain(
-        final BlockingQueue<JrubyEventExtLibrary.RubyEvent> queue, final int count, final long nanos
-    ) throws InterruptedException {
+    public static Collection<RubyEvent> drain(
+        final BlockingQueue<RubyEvent> queue,
+        final int count,
+        final long nanos)
+        throws InterruptedException
+    {
         int left = count;
-        //todo: make this an ArrayList once we remove the Ruby pipeline/execution
-        final LinkedHashSet<JrubyEventExtLibrary.RubyEvent> collection =
-            new LinkedHashSet<>(4 * count / 3 + 1);
+        final ArrayList<RubyEvent> collection = new ArrayList<>(4 * count / 3 + 1);
         do {
             final int drained = drain(queue, collection, left, nanos);
             if (drained == 0) {
@@ -75,15 +99,18 @@ public final class LsQueueUtils {
      * @throws InterruptedException On Interrupt during {@link BlockingQueue#poll()} or
      * {@link BlockingQueue#drainTo(Collection)}
      */
-    private static int drain(final BlockingQueue<JrubyEventExtLibrary.RubyEvent> queue,
-        final Collection<JrubyEventExtLibrary.RubyEvent> collection, final int count,
-        final long nanos) throws InterruptedException {
+    private static int drain(
+        final BlockingQueue<RubyEvent> queue,
+        final Collection<RubyEvent> collection,
+        final int count,
+        final long nanos)
+        throws InterruptedException
+    {
         int added = 0;
         do {
             added += queue.drainTo(collection, count - added);
             if (added < count) {
-                final JrubyEventExtLibrary.RubyEvent event =
-                    queue.poll(nanos, TimeUnit.NANOSECONDS);
+                final RubyEvent event = queue.poll(nanos, TimeUnit.NANOSECONDS);
                 if (event == null) {
                     break;
                 }
diff --git a/logstash-core/src/main/java/org/logstash/common/NullDeadLetterQueueWriter.java b/logstash-core/src/main/java/org/logstash/common/NullDeadLetterQueueWriter.java
new file mode 100644
index 000000000..20eb74195
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/common/NullDeadLetterQueueWriter.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.common;
+
+import co.elastic.logstash.api.DeadLetterQueueWriter;
+import co.elastic.logstash.api.Event;
+import co.elastic.logstash.api.Plugin;
+
+import java.io.IOException;
+
+public class NullDeadLetterQueueWriter implements DeadLetterQueueWriter {
+    private static final NullDeadLetterQueueWriter INSTANCE = new NullDeadLetterQueueWriter();
+
+    private NullDeadLetterQueueWriter() {
+    }
+
+    public static NullDeadLetterQueueWriter getInstance() {
+        return INSTANCE;
+    }
+
+    @Override
+    public void writeEntry(Event event, Plugin plugin, String reason) throws IOException {
+        // no-op
+    }
+
+    @Override
+    public boolean isOpen() {
+        return false;
+    }
+
+    @Override
+    public long getCurrentQueueSize() {
+        return 0;
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/common/SettingKeyDefinitions.java b/logstash-core/src/main/java/org/logstash/common/SettingKeyDefinitions.java
new file mode 100644
index 000000000..97f00d358
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/common/SettingKeyDefinitions.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.common;
+
+/**
+ * A class to contain Logstash setting definitions broadly used in the Java scope.
+ */
+public class SettingKeyDefinitions {
+
+    public static final String PIPELINE_ID = "pipeline.id";
+
+    public static final String PIPELINE_WORKERS = "pipeline.workers";
+
+    public static final String PIPELINE_BATCH_SIZE = "pipeline.batch.size";
+
+    public static final String PATH_QUEUE = "path.queue";
+
+    public static final String QUEUE_PAGE_CAPACITY = "queue.page_capacity";
+
+    public static final String QUEUE_MAX_EVENTS = "queue.max_events";
+
+    public static final String QUEUE_CHECKPOINT_WRITES = "queue.checkpoint.writes";
+
+    public static final String QUEUE_CHECKPOINT_ACKS = "queue.checkpoint.acks";
+
+    public static final String QUEUE_CHECKPOINT_INTERVAL = "queue.checkpoint.interval";
+
+    public static final String QUEUE_CHECKPOINT_RETRY = "queue.checkpoint.retry";
+
+    public static final String QUEUE_MAX_BYTES = "queue.max_bytes";
+}
\ No newline at end of file
diff --git a/logstash-core/src/main/java/org/logstash/common/SourceWithMetadata.java b/logstash-core/src/main/java/org/logstash/common/SourceWithMetadata.java
index 9a76ef5e5..0448a8140 100644
--- a/logstash-core/src/main/java/org/logstash/common/SourceWithMetadata.java
+++ b/logstash-core/src/main/java/org/logstash/common/SourceWithMetadata.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.common;
 
 import org.logstash.config.ir.HashableWithSource;
@@ -18,6 +38,8 @@ public class SourceWithMetadata implements HashableWithSource {
     private final Integer line;
     private final Integer column;
     private final String text;
+    private int linesCount;
+    private final String metadata;
 
     public String getProtocol() {
         return this.protocol;
@@ -39,15 +61,22 @@ public class SourceWithMetadata implements HashableWithSource {
         return text;
     }
 
+    public String getMetadata() { return metadata; }
+
     private static final Pattern emptyString = Pattern.compile("^\\s*$");
 
-    public SourceWithMetadata(String protocol, String id, Integer line, Integer column, String text) throws IncompleteSourceWithMetadataException {
+    @SuppressWarnings("this-escape")
+    public SourceWithMetadata(String protocol, String id, Integer line, Integer column, String text, String metadata) throws IncompleteSourceWithMetadataException {
         this.protocol = protocol;
         this.id = id;
         this.line = line;
         this.column = column;
         this.text = text;
+        this.metadata = metadata;
 
+        // This is the reason why of the "this-escape" suppress warning, a method (attributes) is invoked on
+        // a non completely initialized object and that could generate some errors in accessing fields.
+        // This is not the case because the method is private and not overridable in sub classes.
         List<Object> badAttributes = this.attributes().stream().filter(a -> {
             if (a == null) return true;
             if (a instanceof String) {
@@ -60,15 +89,24 @@ public class SourceWithMetadata implements HashableWithSource {
           badAttributes.add(this.getText());
         }
 
-        if (!badAttributes.isEmpty()){
-            String message = "Missing attributes in SourceWithMetadata: (" + badAttributes + ") "
-                    + this.toString();
+        if (!badAttributes.isEmpty()) {
+            String message = "Missing attributes in SourceWithMetadata: (" + badAttributes + ") " + this.toString();
             throw new IncompleteSourceWithMetadataException(message);
         }
+
+        this.linesCount = text.split("\\n").length;
     }
 
     public SourceWithMetadata(String protocol, String id, String text) throws IncompleteSourceWithMetadataException {
-        this(protocol, id, 0, 0, text);
+        this(protocol, id, 0, 0, text, "");
+    }
+
+    public SourceWithMetadata(String protocol, String id, String text, String metadata) throws IncompleteSourceWithMetadataException {
+        this(protocol, id, 0, 0, text, metadata);
+    }
+
+    public SourceWithMetadata(String protocol, String id, Integer line, Integer column, String text) throws IncompleteSourceWithMetadataException {
+        this(protocol, id, line, column, text, "");
     }
 
     public int hashCode() {
@@ -93,4 +131,15 @@ public class SourceWithMetadata implements HashableWithSource {
     private Collection<Object> hashableAttributes() {
         return Arrays.asList(this.getId(), this.getProtocol(), this.getLine(), this.getColumn(), this.getText());
     }
+
+    public int getLinesCount() {
+        return linesCount;
+    }
+
+    public boolean equalsWithoutText(SourceWithMetadata other) {
+        return getProtocol().equals(other.getProtocol())
+                && getId().equals(other.getId())
+                && getLine().equals(other.getLine())
+                && getColumn().equals(other.getColumn());
+    }
 }
diff --git a/logstash-core/src/main/java/org/logstash/common/Util.java b/logstash-core/src/main/java/org/logstash/common/Util.java
index a832b1275..52495faa1 100644
--- a/logstash-core/src/main/java/org/logstash/common/Util.java
+++ b/logstash-core/src/main/java/org/logstash/common/Util.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.common;
 
 import java.nio.charset.StandardCharsets;
@@ -15,6 +35,13 @@ public class Util {
         }
     }
 
+    /**
+     * Returns the hexadecimal string of UTF-8 bytes that make up the string.
+     * @param base
+     *      the string to hash.
+     * @return
+     *      hexadecimal string that contains the hash.
+     * */
     public static String digest(String base) {
         MessageDigest digest = defaultMessageDigest();
         byte[] hash = digest.digest(base.getBytes(StandardCharsets.UTF_8));
diff --git a/logstash-core/src/main/java/org/logstash/common/io/DeadLetterQueueReader.java b/logstash-core/src/main/java/org/logstash/common/io/DeadLetterQueueReader.java
index 8a83ca718..5e4f6a5db 100644
--- a/logstash-core/src/main/java/org/logstash/common/io/DeadLetterQueueReader.java
+++ b/logstash-core/src/main/java/org/logstash/common/io/DeadLetterQueueReader.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -19,80 +39,181 @@
 package org.logstash.common.io;
 
 import java.io.Closeable;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.logstash.DLQEntry;
+import org.logstash.FileLockFactory;
+import org.logstash.LockException;
 import org.logstash.Timestamp;
 
 import java.io.IOException;
-import java.nio.file.Files;
+import java.nio.channels.FileLock;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.StandardOpenOption;
 import java.nio.file.StandardWatchEventKinds;
 import java.nio.file.WatchEvent;
 import java.nio.file.WatchKey;
 import java.nio.file.WatchService;
+import java.nio.file.attribute.FileTime;
+import java.util.Comparator;
+import java.util.LongSummaryStatistics;
+import java.util.NoSuchElementException;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
+import java.util.concurrent.atomic.LongAdder;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE;
 import static java.nio.file.StandardWatchEventKinds.ENTRY_DELETE;
-import static org.logstash.common.io.DeadLetterQueueWriter.getSegmentPaths;
+import static org.logstash.common.io.DeadLetterQueueUtils.listSegmentPaths;
 
+/**
+ * Class responsible to read messages from DLQ and manage segments deletion.
+ *
+ * This class is instantiated and used by DeadLetterQueue input plug to retrieve the messages from DLQ.
+ * When the plugin is configured to clean consumed segments, it also deletes the segments that are processed.
+ * The deletion of segments could concur with the {@link org.logstash.common.io.DeadLetterQueueWriter} age and
+ * storage policies. This means that writer side's DLQ size metric needs to be updated everytime a segment is removed.
+ * Given that reader and writer sides of DLQ can be executed on different Logstash process, the reader needs to notify
+ * the writer, to do this, the reader creates a notification file that's monitored by the writer.
+ * */
 public final class DeadLetterQueueReader implements Closeable {
     private static final Logger logger = LogManager.getLogger(DeadLetterQueueReader.class);
+    public static final String DELETED_SEGMENT_PREFIX = ".deleted_segment";
 
     private RecordIOReader currentReader;
     private final Path queuePath;
+    private final SegmentListener segmentCallback;
     private final ConcurrentSkipListSet<Path> segments;
     private final WatchService watchService;
+    private RecordIOReader lastConsumedReader;
+    private final LongAdder consumedEvents = new LongAdder();
+    private final LongAdder consumedSegments = new LongAdder();
+
+    // config settings
+    private final boolean cleanConsumed;
+    private FileLock fileLock;
 
     public DeadLetterQueueReader(Path queuePath) throws IOException {
+        this(queuePath, false, null);
+    }
+
+    public DeadLetterQueueReader(Path queuePath, boolean cleanConsumed, SegmentListener segmentCallback) throws IOException {
         this.queuePath = queuePath;
         this.watchService = FileSystems.getDefault().newWatchService();
         this.queuePath.register(watchService, ENTRY_CREATE, ENTRY_DELETE);
-        this.segments = new ConcurrentSkipListSet<>((p1, p2) -> {
-            Function<Path, Integer> id = (p) -> Integer.parseInt(p.getFileName().toString().split("\\.")[0]);
-            return id.apply(p1).compareTo(id.apply(p2));
-        });
-
-        segments.addAll(getSegmentPaths(queuePath).collect(Collectors.toList()));
+        this.segments = new ConcurrentSkipListSet<>(
+                Comparator.comparingInt(DeadLetterQueueUtils::extractSegmentId)
+        );
+        segments.addAll(listSegmentPaths(queuePath)
+                .filter(p -> p.toFile().length() > 1) // take the files that have content to process
+                .collect(Collectors.toList()));
+        this.cleanConsumed = cleanConsumed;
+        if (cleanConsumed && segmentCallback == null) {
+            throw new IllegalArgumentException("When cleanConsumed is enabled must be passed also a valid segment listener");
+        }
+        this.segmentCallback = segmentCallback;
+        this.lastConsumedReader = null;
+        if (cleanConsumed) {
+            // force single DLQ reader when clean consumed is requested
+            try {
+                fileLock = FileLockFactory.obtainLock(queuePath, "dlq_reader.lock");
+            } catch (LockException ex) {
+                throw new LockException("Existing `dlg_reader.lock` file in [" + queuePath + "]. Only one DeadLetterQueueReader with `cleanConsumed` set is allowed per Dead Letter Queue.", ex);
+            }
+        }
     }
 
     public void seekToNextEvent(Timestamp timestamp) throws IOException {
         for (Path segment : segments) {
-            currentReader = new RecordIOReader(segment);
-            byte[] event = currentReader.seekToNextEventPosition(timestamp, (b) -> {
-                try {
-                    return DLQEntry.deserialize(b).getEntryTime();
-                } catch (IOException e) {
-                    throw new IllegalStateException(e);
-                }
-            }, Timestamp::compareTo);
+            Optional<RecordIOReader> optReader = openSegmentReader(segment);
+            if (!optReader.isPresent()) {
+                continue;
+            }
+            currentReader = optReader.get();
+
+            byte[] event = currentReader.seekToNextEventPosition(timestamp, DeadLetterQueueReader::extractEntryTimestamp, Timestamp::compareTo);
             if (event != null) {
                 return;
             }
         }
-        currentReader.close();
-        currentReader = null;
+        if (currentReader != null) {
+            currentReader.close();
+            currentReader = null;
+        }
+    }
+
+    /**
+     * Opens the segment reader for the given path.
+     * Side effect: Will attempt to remove the given segment from the list of active
+     *              segments if segment is not found.
+     * @param segment Path to segment File
+     * @return Optional containing a RecordIOReader if the segment exists
+     * @throws IOException if any IO error happens during file management
+     */
+    private Optional<RecordIOReader> openSegmentReader(Path segment) throws IOException {
+        if (!Files.exists(segment)) {
+            // file was deleted by upstream process and segments list wasn't yet updated
+            segments.remove(segment);
+            return Optional.empty();
+        }
+
+        try {
+            return Optional.of(new RecordIOReader(segment));
+        } catch (NoSuchFileException ex) {
+            logger.debug("Segment file {} was deleted by DLQ writer during DLQ reader opening", segment);
+            // file was deleted by upstream process and segments list wasn't yet updated
+            segments.remove(segment);
+            return Optional.empty();
+        }
+    }
+
+    private static Timestamp extractEntryTimestamp(byte[] serialized) {
+        try {
+            return DLQEntry.deserialize(serialized).getEntryTime();
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
     }
 
     private long pollNewSegments(long timeout) throws IOException, InterruptedException {
         long startTime = System.currentTimeMillis();
         WatchKey key = watchService.poll(timeout, TimeUnit.MILLISECONDS);
         if (key != null) {
-            for (WatchEvent<?> watchEvent : key.pollEvents()) {
-                if (watchEvent.kind() == StandardWatchEventKinds.ENTRY_CREATE) {
-                    segments.addAll(getSegmentPaths(queuePath).collect(Collectors.toList()));
-                }
-                key.reset();
-            }
+            pollSegmentsOnWatch(key);
         }
         return System.currentTimeMillis() - startTime;
     }
 
+    private void pollNewSegments() throws IOException {
+        WatchKey key = watchService.poll();
+        if (key != null) {
+            pollSegmentsOnWatch(key);
+        }
+    }
+
+    private void pollSegmentsOnWatch(WatchKey key) throws IOException {
+        for (WatchEvent<?> watchEvent : key.pollEvents()) {
+            if (watchEvent.kind() == StandardWatchEventKinds.ENTRY_CREATE) {
+                segments.addAll(listSegmentPaths(queuePath).collect(Collectors.toList()));
+            } else if (watchEvent.kind() == StandardWatchEventKinds.ENTRY_DELETE) {
+                final int oldSize = segments.size();
+                segments.clear();
+                segments.addAll(listSegmentPaths(queuePath).collect(Collectors.toList()));
+                logger.debug("Notified of segment removal, switched from {} to {} segments", oldSize, segments.size());
+            }
+            key.reset();
+        }
+    }
+
     public DLQEntry pollEntry(long timeout) throws IOException, InterruptedException {
         byte[] bytes = pollEntryBytes(timeout);
         if (bytes == null) {
@@ -101,11 +222,12 @@ public final class DeadLetterQueueReader implements Closeable {
         return DLQEntry.deserialize(bytes);
     }
 
+    // package-private for test
     byte[] pollEntryBytes() throws IOException, InterruptedException {
         return pollEntryBytes(100);
     }
 
-    byte[] pollEntryBytes(long timeout) throws IOException, InterruptedException {
+    private byte[] pollEntryBytes(long timeout) throws IOException, InterruptedException {
         long timeoutRemaining = timeout;
         if (currentReader == null) {
             timeoutRemaining -= pollNewSegments(timeout);
@@ -114,36 +236,252 @@ public final class DeadLetterQueueReader implements Closeable {
                 logger.debug("No entries found: no segment files found in dead-letter-queue directory");
                 return null;
             }
-            currentReader = new RecordIOReader(segments.first());
+            Optional<RecordIOReader> optReader;
+            do {
+                final Path firstSegment;
+                try {
+                    firstSegment = segments.first();
+                } catch (NoSuchElementException ex) {
+                    // all elements were removed after the empty check
+                    logger.debug("No entries found: no segment files found in dead-letter-queue directory");
+                    return null;
+                }
+
+                optReader = openSegmentReader(firstSegment);
+                if (optReader.isPresent()) {
+                    currentReader = optReader.get();
+                }
+            } while (!optReader.isPresent());
         }
 
         byte[] event = currentReader.readEvent();
         if (event == null && currentReader.isEndOfStream()) {
-            if (currentReader.getPath().equals(segments.last())) {
+            if (consumedAllSegments()) {
                 pollNewSegments(timeoutRemaining);
             } else {
                 currentReader.close();
-                currentReader = new RecordIOReader(segments.higher(currentReader.getPath()));
-                return pollEntryBytes(timeoutRemaining);
+                if (cleanConsumed) {
+                    lastConsumedReader = currentReader;
+                }
+                Optional<RecordIOReader> optReader = openNextExistingReader(currentReader.getPath());
+                if (!optReader.isPresent()) {
+                    // segments were all already deleted files, do a poll
+                    pollNewSegments(timeoutRemaining);
+                } else {
+                    currentReader = optReader.get();
+                    return pollEntryBytes(timeoutRemaining);
+                }
             }
         }
 
         return event;
     }
 
+    /**
+     * Acknowledge last read event, must match every {@code #pollEntry} call.
+     * */
+    public void markForDelete() {
+        if (!cleanConsumed) {
+            // ack-event is useful only when clean consumed is enabled.
+            return;
+        }
+        if (lastConsumedReader == null) {
+            // no reader to a consumed segment is present
+            return;
+        }
+
+        segmentCallback.segmentCompleted();
+
+        Path lastConsumedSegmentPath = lastConsumedReader.getPath();
+
+        // delete also the older segments in case of multiple segments were consumed
+        // before the invocation of the mark method.
+        try {
+            removeSegmentsBefore(lastConsumedSegmentPath);
+        } catch (IOException ex) {
+            logger.warn("Problem occurred in cleaning the segments older than {} ", lastConsumedSegmentPath, ex);
+        }
+
+        // delete segment file only after current reader is closed.
+        // closing happens in pollEntryBytes method when it identifies the reader is at end of stream
+        final Optional<Long> deletedEvents = deleteSegment(lastConsumedSegmentPath);
+        if (deletedEvents.isPresent()) {
+            // update consumed metrics
+            consumedEvents.add(deletedEvents.get());
+            consumedSegments.increment();
+        }
+
+        // publish the metrics to the listener
+        segmentCallback.segmentsDeleted(consumedSegments.intValue(), consumedEvents.longValue());
+
+        lastConsumedReader = null;
+    }
+
+    private boolean consumedAllSegments() {
+        try {
+            return currentReader.getPath().equals(segments.last());
+        } catch (NoSuchElementException ex) {
+            // last segment was removed while processing
+            logger.debug("No last segment found, poll for new segments");
+            return true;
+        }
+    }
+
+    private Path nextExistingSegmentFile(Path currentSegmentPath) {
+        Path nextExpectedSegment;
+        boolean skip;
+        do {
+            nextExpectedSegment = segments.higher(currentSegmentPath);
+            if (nextExpectedSegment != null && !Files.exists(nextExpectedSegment)) {
+                segments.remove(nextExpectedSegment);
+                skip = true;
+            } else {
+                skip = false;
+            }
+        } while (skip);
+        return nextExpectedSegment;
+    }
+
     public void setCurrentReaderAndPosition(Path segmentPath, long position) throws IOException {
+        if (cleanConsumed) {
+            removeSegmentsBefore(segmentPath);
+        }
+
         // If the provided segment Path exist, then set the reader to start from the supplied position
-        if (Files.exists(segmentPath)) {
-            currentReader = new RecordIOReader(segmentPath);
+        Optional<RecordIOReader> optReader = openSegmentReader(segmentPath);
+        if (optReader.isPresent()) {
+            currentReader = optReader.get();
             currentReader.seekToOffset(position);
-        }else{
-            // Otherwise, set the current reader to be at the beginning of the next
-            // segment.
-            Path next = segments.higher(segmentPath);
-            if (next != null){
-                currentReader = new RecordIOReader(next);
+            return;
+        }
+        // Otherwise, set the current reader to be at the beginning of the next
+        // segment.
+        optReader = openNextExistingReader(segmentPath);
+        if (optReader.isPresent()) {
+            currentReader = optReader.get();
+            return;
+        }
+
+        pollNewSegments();
+
+        // give a second try after a re-load of segments from filesystem
+        openNextExistingReader(segmentPath)
+                .ifPresent(reader -> currentReader = reader);
+    }
+
+    private void removeSegmentsBefore(Path validSegment) throws IOException {
+        final Comparator<Path> fileTimeAndName = ((Comparator<Path>) this::compareByFileTimestamp)
+                .thenComparingInt(DeadLetterQueueUtils::extractSegmentId);
+
+        try (final Stream<Path> segmentFiles = listSegmentPaths(queuePath)) {
+            LongSummaryStatistics deletionStats = segmentFiles.filter(p -> fileTimeAndName.compare(p, validSegment) < 0)
+                    .map(this::deleteSegment)
+                    .map(o -> o.orElse(0L))
+                    .mapToLong(Long::longValue)
+                    .summaryStatistics();
+
+            // update consumed metrics
+            consumedSegments.add(deletionStats.getCount());
+            consumedEvents.add(deletionStats.getSum());
+        }
+
+        createSegmentRemovalFile(validSegment);
+    }
+
+    /**
+     * Create a notification file to signal to the upstream pipeline to update its metrics
+     * */
+    private void createSegmentRemovalFile(Path lastDeletedSegment) {
+        final Path notificationFile = queuePath.resolve(DELETED_SEGMENT_PREFIX);
+        byte[] content = (lastDeletedSegment + "\n").getBytes(StandardCharsets.UTF_8);
+        if (Files.exists(notificationFile)) {
+            updateToExistingNotification(notificationFile, content);
+            return;
+        }
+        createNotification(notificationFile, content);
+    }
+
+    private void createNotification(Path notificationFile, byte[] content) {
+        try {
+            final Path tmpNotificationFile = Files.createFile(queuePath.resolve(DELETED_SEGMENT_PREFIX + ".tmp"));
+            Files.write(tmpNotificationFile, content, StandardOpenOption.APPEND);
+            Files.move(tmpNotificationFile, notificationFile, StandardCopyOption.ATOMIC_MOVE);
+            logger.debug("Recreated notification file {}", notificationFile);
+        } catch (IOException e) {
+            logger.error("Can't create file to notify deletion of segments from DLQ reader in path {}", notificationFile, e);
+        }
+    }
+
+    private static void updateToExistingNotification(Path notificationFile, byte[] contentToAppend) {
+        try {
+            Files.write(notificationFile, contentToAppend, StandardOpenOption.APPEND);
+            logger.debug("Updated existing notification file {}", notificationFile);
+        } catch (IOException e) {
+            logger.error("Can't update file to notify deletion of segments from DLQ reader in path {}", notificationFile, e);
+        }
+        logger.debug("Notification segments delete file already exists {}", notificationFile);
+    }
+
+    private int compareByFileTimestamp(Path p1, Path p2) {
+        final Optional<FileTime> timestampResult1 = readLastModifiedTime(p1);
+        final Optional<FileTime> timestampResult2 = readLastModifiedTime(p2);
+
+        // if one of the readLastModifiedTime encountered a file not found error or generic IO error,
+        // consider them equals and fallback to the other comparator
+        if (!timestampResult1.isPresent() || !timestampResult2.isPresent()) {
+            return 0;
+        }
+
+        return timestampResult1.get().compareTo(timestampResult2.get());
+    }
+
+    /**
+     * Builder method. Read the timestamp if file on path p is present.
+     * When the file
+     * */
+    private static Optional<FileTime> readLastModifiedTime(Path p) {
+        try {
+            return Optional.of(Files.getLastModifiedTime(p));
+        } catch (NoSuchFileException fileNotFoundEx) {
+            logger.debug("File {} doesn't exist", p);
+            return Optional.empty();
+        } catch (IOException ex) {
+            logger.warn("Error reading file's timestamp for {}", p, ex);
+            return Optional.empty();
+        }
+    }
+
+    /**
+     * Remove the segment from internal tracking data structures and physically delete the corresponding
+     * file from filesystem.
+     *
+     * @return the number events contained in the removed segment, empty if a problem happened during delete.
+     * */
+    private Optional<Long> deleteSegment(Path segment) {
+        segments.remove(segment);
+        try {
+            long eventsInSegment = DeadLetterQueueUtils.countEventsInSegment(segment);
+            Files.delete(segment);
+            logger.debug("Deleted segment {}", segment);
+            return Optional.of(eventsInSegment);
+        } catch (NoSuchFileException fileNotFoundEx) {
+            logger.debug("Expected file segment {} was already removed by a writer", segment);
+            return Optional.empty();
+        } catch (IOException ex) {
+            logger.warn("Problem occurred in cleaning the segment {} after a repositioning", segment, ex);
+            return Optional.empty();
+        }
+    }
+
+    private Optional<RecordIOReader> openNextExistingReader(Path segmentPath) throws IOException {
+        Path next;
+        while ( (next = nextExistingSegmentFile(segmentPath)) != null ) {
+            Optional<RecordIOReader> optReader = openSegmentReader(next);
+            if (optReader.isPresent()) {
+                return optReader;
             }
         }
+        return Optional.empty();
     }
 
     public Path getCurrentSegment() {
@@ -154,11 +492,25 @@ public final class DeadLetterQueueReader implements Closeable {
         return currentReader.getChannelPosition();
     }
 
+    long getConsumedEvents() {
+        return consumedEvents.longValue();
+    }
+
+    int getConsumedSegments() {
+        return consumedSegments.intValue();
+    }
+
     @Override
     public void close() throws IOException {
-        if (currentReader != null) {
-            currentReader.close();
+        try {
+            if (currentReader != null) {
+                currentReader.close();
+            }
+            this.watchService.close();
+        } finally {
+            if (this.cleanConsumed) {
+                FileLockFactory.releaseLock(this.fileLock);
+            }
         }
-        this.watchService.close();
     }
 }
diff --git a/logstash-core/src/main/java/org/logstash/common/io/DeadLetterQueueUtils.java b/logstash-core/src/main/java/org/logstash/common/io/DeadLetterQueueUtils.java
new file mode 100644
index 000000000..31e9d5644
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/common/io/DeadLetterQueueUtils.java
@@ -0,0 +1,110 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.common.io;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.util.Comparator;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.logstash.common.io.RecordIOWriter.*;
+
+class DeadLetterQueueUtils {
+
+    private static final Logger logger = LogManager.getLogger(DeadLetterQueueUtils.class);
+
+    static int extractSegmentId(Path p) {
+        return Integer.parseInt(p.getFileName().toString().split("\\.log")[0]);
+    }
+
+    static Stream<Path> listFiles(Path path, String suffix) throws IOException {
+        try(final Stream<Path> files = Files.list(path)) {
+            return files.filter(p -> p.toString().endsWith(suffix))
+                    .collect(Collectors.toList()).stream();
+        }
+    }
+
+    static Stream<Path> listSegmentPaths(Path path) throws IOException {
+        return listFiles(path, ".log");
+    }
+
+    static Stream<Path> listSegmentPathsSortedBySegmentId(Path path) throws IOException {
+        return listSegmentPaths(path)
+                .sorted(Comparator.comparingInt(DeadLetterQueueUtils::extractSegmentId));
+    }
+
+    /**
+     * Count the number of 'c' and 's' records in segment.
+     * An event can't be bigger than the segments so in case of records split across multiple event blocks,
+     * the segment has to contain both the start 's' record, all the middle 'm' up to the end 'e' records.
+     * */
+    @SuppressWarnings("fallthrough")
+    static long countEventsInSegment(Path segment) throws IOException {
+        try (FileChannel channel = FileChannel.open(segment, StandardOpenOption.READ)) {
+            // verify minimal segment size
+            if (channel.size() < VERSION_SIZE + RECORD_HEADER_SIZE) {
+                return 0L;
+            }
+
+            // skip the DLQ version byte
+            channel.position(1);
+            int posInBlock = 0;
+            int currentBlockIdx = 0;
+            long countedEvents = 0;
+            do {
+                ByteBuffer headerBuffer = ByteBuffer.allocate(RECORD_HEADER_SIZE);
+                long startPosition = channel.position();
+                // if record header can't be fully contained in the block, align to the next
+                if (posInBlock + RECORD_HEADER_SIZE + 1 > BLOCK_SIZE) {
+                    channel.position((++currentBlockIdx) * BLOCK_SIZE + VERSION_SIZE);
+                    posInBlock = 0;
+                }
+
+                channel.read(headerBuffer);
+                headerBuffer.flip();
+                RecordHeader recordHeader = RecordHeader.get(headerBuffer);
+                if (recordHeader == null) {
+                    // continue with next record, skipping this
+                    logger.error("Can't decode record header, position {} current post {} current events count {}", startPosition, channel.position(), countedEvents);
+                } else {
+                    switch (recordHeader.getType()) {
+                        case START:
+                        case COMPLETE:
+                            countedEvents++;
+                        case MIDDLE:
+                        case END: {
+                            channel.position(channel.position() + recordHeader.getSize());
+                            posInBlock += RECORD_HEADER_SIZE + recordHeader.getSize();
+                        }
+                    }
+                }
+            } while (channel.position() < channel.size());
+
+            return countedEvents;
+        }
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/common/io/DeadLetterQueueWriter.java b/logstash-core/src/main/java/org/logstash/common/io/DeadLetterQueueWriter.java
index bc333bc70..94a25ad93 100644
--- a/logstash-core/src/main/java/org/logstash/common/io/DeadLetterQueueWriter.java
+++ b/logstash-core/src/main/java/org/logstash/common/io/DeadLetterQueueWriter.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -21,13 +41,30 @@ package org.logstash.common.io;
 import java.io.Closeable;
 import java.io.IOException;
 import java.nio.channels.FileLock;
+import java.nio.file.FileSystems;
 import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.StandardWatchEventKinds;
+import java.nio.file.WatchEvent;
+import java.nio.file.WatchKey;
+import java.nio.file.WatchService;
+import java.time.Clock;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.temporal.TemporalAmount;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.LongAdder;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import java.util.concurrent.locks.ReentrantLock;
+
+import com.google.common.annotations.VisibleForTesting;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.logstash.DLQEntry;
@@ -36,89 +73,377 @@ import org.logstash.FieldReference;
 import org.logstash.FileLockFactory;
 import org.logstash.Timestamp;
 
+import static org.logstash.common.io.DeadLetterQueueUtils.listFiles;
+import static org.logstash.common.io.DeadLetterQueueUtils.listSegmentPaths;
+import static org.logstash.common.io.DeadLetterQueueUtils.listSegmentPathsSortedBySegmentId;
+import static org.logstash.common.io.RecordIOReader.SegmentStatus;
+import static org.logstash.common.io.RecordIOWriter.BLOCK_SIZE;
 import static org.logstash.common.io.RecordIOWriter.RECORD_HEADER_SIZE;
+import static org.logstash.common.io.RecordIOWriter.VERSION_SIZE;
 
+/**
+ * Class responsible to write messages into DLQ and manage segments creation.
+ * Head segment is created whenever time or size limits are reached.
+ * Manage the rollover of DLQ segments files, moving the current writing head into a
+ * sealed state, ready to be consumed by the {@link org.logstash.common.io.DeadLetterQueueReader}.
+ * Age and size policies are applied by this class.
+ * The Age policy, which means eliminate DLQ segments older a certain time, is verified in 3 places:
+ * <ul>
+ *     <li>during each write operation</li>
+ *     <li>on a time based, when the head segment needs to be flushed because unused for a certain amount of time</li>
+ *     <li>when a segment is finalized, because reached maximum size (10MB) or during the shutdown of the DLQ</li>
+ * </ul>
+ *
+ * The storage policy, instead, is verified on every write operation. The storage policy is responsible to keep the
+ * size of the DLQ under certain limit, and could be configured to remove newer or older segments. In case of drop newer, if
+ * DLQ is full, new writes are skipped.
+ *
+ * The <code>DeadLetterQueueWriter</code> uses the <code>dlq-segment-checker</code> scheduled thread to watch the filesystem
+ * for notifications when forced updates of DLQ size metric are requested, reading all the segments sizes, because
+ * the {@link org.logstash.common.io.DeadLetterQueueReader} has removed some old segments, in case it was configured
+ * to clean consumed segments.
+ *
+ * This behaviour, the reader that deletes consumed segments and the writer that could eliminate older segments because of
+ * age or size policy application, generates some concurrency in interacting with segment files.
+ * */
 public final class DeadLetterQueueWriter implements Closeable {
 
-    private static final Logger logger = LogManager.getLogger(DeadLetterQueueWriter.class);
-    private static final long MAX_SEGMENT_SIZE_BYTES = 10 * 1024 * 1024;
+    private enum FinalizeWhen { ALWAYS, ONLY_IF_STALE }
 
+    private enum SealReason {
+        DLQ_CLOSE("Dead letter queue is closing"),
+        SCHEDULED_FLUSH("the segment has expired 'flush_interval'"),
+        SEGMENT_FULL("the segment has reached its maximum size");
+
+        final String motivation;
+
+        SealReason(String motivation) {
+            this.motivation = motivation;
+        }
+
+        @Override
+        public String toString() {
+            return motivation;
+        }
+    }
+
+    @VisibleForTesting
     static final String SEGMENT_FILE_PATTERN = "%d.log";
-    static final String LOCK_FILE = ".lock";
+    private static final Logger logger = LogManager.getLogger(DeadLetterQueueWriter.class);
+    private static final String TEMP_FILE_PATTERN = "%d.log.tmp";
+    private static final String LOCK_FILE = ".lock";
     private static final FieldReference DEAD_LETTER_QUEUE_METADATA_KEY =
-        FieldReference.from(String.format("%s[dead_letter_queue]", Event.METADATA_BRACKETS));
+            FieldReference.from(String.format("%s[dead_letter_queue]", Event.METADATA_BRACKETS));
+    private final ReentrantLock lock = new ReentrantLock();
     private final long maxSegmentSize;
     private final long maxQueueSize;
-    private LongAdder currentQueueSize;
+    private final QueueStorageType storageType;
+    private final AtomicLong currentQueueSize;
     private final Path queuePath;
-    private final FileLock lock;
+    private final FileLock fileLock;
     private volatile RecordIOWriter currentWriter;
-    private int currentSegmentIndex;
-    private Timestamp lastEntryTimestamp;
+    private volatile int currentSegmentIndex;
+    private volatile Timestamp lastEntryTimestamp;
+    private final Duration flushInterval;
     private final AtomicBoolean open = new AtomicBoolean(true);
+    private final LongAdder droppedEvents = new LongAdder();
+    private final LongAdder expiredEvents = new LongAdder();
+    private volatile String lastError = "no errors";
+    private final Clock clock;
+    private volatile Optional<Timestamp> oldestSegmentTimestamp;
+    private volatile Optional<Path> oldestSegmentPath = Optional.empty();
+    private final TemporalAmount retentionTime;
+    private final SchedulerService flusherService;
+    private ScheduledExecutorService scheduledFSWatcher = Executors.newScheduledThreadPool(1, r -> {
+        Thread t = new Thread(r);
+        //Allow this thread to die when the JVM dies
+        t.setDaemon(true);
+        //Set the name
+        t.setName("dlq-segment-checker");
+        return t;
+    });
+    private final WatchService consumedSegmentsCleanWatcher = FileSystems.getDefault().newWatchService();
 
-    public DeadLetterQueueWriter(Path queuePath, long maxSegmentSize, long maxQueueSize) throws IOException {
-        this.lock = FileLockFactory.obtainLock(queuePath, LOCK_FILE);
+    interface SchedulerService {
+
+        /**
+         * Register the callback action to invoke on every clock tick.
+         * */
+        void repeatedAction(Runnable action);
+
+        void shutdown();
+    }
+
+    private static class FixedRateScheduler implements SchedulerService {
+
+        private final ScheduledExecutorService scheduledExecutor;
+
+        FixedRateScheduler() {
+            scheduledExecutor = Executors.newScheduledThreadPool(1, r -> {
+                Thread t = new Thread(r);
+                //Allow this thread to die when the JVM dies
+                t.setDaemon(true);
+                //Set the name
+                t.setName("dlq-flush-check");
+                return t;
+            });
+        }
+
+        @Override
+        public void repeatedAction(Runnable action) {
+            scheduledExecutor.scheduleAtFixedRate(action, 1L, 1L, TimeUnit.SECONDS);
+        }
+
+        @Override
+        public void shutdown() {
+            scheduledExecutor.shutdown();
+        }
+    }
+
+    private static class NoopScheduler implements SchedulerService {
+        @Override
+        public void repeatedAction(Runnable action) {
+            // Noop
+        }
+
+        @Override
+        public void shutdown() {
+            // Noop
+        }
+    }
+
+    public static final class Builder {
+
+        private final Path queuePath;
+        private final long maxSegmentSize;
+        private final long maxQueueSize;
+        private final Duration flushInterval;
+        private boolean startScheduledFlusher;
+        private QueueStorageType storageType = QueueStorageType.DROP_NEWER;
+        private Duration retentionTime = null;
+        private Clock clock = Clock.systemDefaultZone();
+        private SchedulerService customSchedulerService = null;
+
+        private Builder(Path queuePath, long maxSegmentSize, long maxQueueSize, Duration flushInterval) {
+            this(queuePath, maxSegmentSize, maxQueueSize, flushInterval, true);
+        }
+
+        private Builder(Path queuePath, long maxSegmentSize, long maxQueueSize, Duration flushInterval, boolean startScheduledFlusher) {
+            this.queuePath = queuePath;
+            this.maxSegmentSize = maxSegmentSize;
+            this.maxQueueSize = maxQueueSize;
+            this.flushInterval = flushInterval;
+            this.startScheduledFlusher = startScheduledFlusher;
+        }
+
+        public Builder storageType(QueueStorageType storageType) {
+            this.storageType = storageType;
+            return this;
+        }
+
+        public Builder retentionTime(Duration retentionTime) {
+            this.retentionTime = retentionTime;
+            return this;
+        }
+
+        @VisibleForTesting
+        Builder clock(Clock clock) {
+            this.clock = clock;
+            return this;
+        }
+
+        @VisibleForTesting
+        Builder flusherService(SchedulerService service) {
+            this.customSchedulerService = service;
+            return this;
+        }
+
+        public DeadLetterQueueWriter build() throws IOException {
+            if (customSchedulerService != null && startScheduledFlusher) {
+                throw new IllegalArgumentException("Both default scheduler and custom scheduler were defined, ");
+            }
+            SchedulerService schedulerService;
+            if (customSchedulerService != null) {
+                schedulerService = customSchedulerService;
+            } else {
+                if (startScheduledFlusher) {
+                    schedulerService = new FixedRateScheduler();
+                } else {
+                    schedulerService = new NoopScheduler();
+                }
+            }
+
+            return new DeadLetterQueueWriter(queuePath, maxSegmentSize, maxQueueSize, flushInterval, storageType, retentionTime, clock, schedulerService);
+        }
+    }
+
+    public static Builder newBuilder(final Path queuePath, final long maxSegmentSize, final long maxQueueSize,
+                                     final Duration flushInterval) {
+        return new Builder(queuePath, maxSegmentSize, maxQueueSize, flushInterval);
+    }
+
+    @VisibleForTesting
+    static Builder newBuilderWithoutFlusher(final Path queuePath, final long maxSegmentSize, final long maxQueueSize) {
+        return new Builder(queuePath, maxSegmentSize, maxQueueSize, Duration.ZERO, false);
+    }
+
+    private DeadLetterQueueWriter(final Path queuePath, final long maxSegmentSize, final long maxQueueSize,
+                                  final Duration flushInterval, final QueueStorageType storageType, final Duration retentionTime,
+                                  final Clock clock, SchedulerService flusherService) throws IOException {
+        this.clock = clock;
+
+        this.fileLock = FileLockFactory.obtainLock(queuePath, LOCK_FILE);
         this.queuePath = queuePath;
         this.maxSegmentSize = maxSegmentSize;
         this.maxQueueSize = maxQueueSize;
-        this.currentQueueSize = new LongAdder();
-        this.currentQueueSize.add(getStartupQueueSize());
+        this.storageType = storageType;
+        this.flushInterval = flushInterval;
+        this.currentQueueSize = new AtomicLong(computeQueueSize());
+        this.retentionTime = retentionTime;
 
-        currentSegmentIndex = getSegmentPaths(queuePath)
+        cleanupTempFiles();
+        updateOldestSegmentReference();
+        currentSegmentIndex = listSegmentPaths(queuePath)
                 .map(s -> s.getFileName().toString().split("\\.")[0])
                 .mapToInt(Integer::parseInt)
                 .max().orElse(0);
         nextWriter();
         this.lastEntryTimestamp = Timestamp.now();
+        this.flusherService = flusherService;
+        this.flusherService.repeatedAction(this::scheduledFlushCheck);
+
+        setupConsumedSegmentsNotificationWatcher();
+    }
+
+    private void setupConsumedSegmentsNotificationWatcher() throws IOException {
+        this.queuePath.register(consumedSegmentsCleanWatcher, StandardWatchEventKinds.ENTRY_CREATE, StandardWatchEventKinds.ENTRY_MODIFY);
+        this.scheduledFSWatcher.scheduleAtFixedRate(this::watchForDeletedNotification, 3, 3, TimeUnit.SECONDS);
     }
 
     /**
-     * Constructor for Writer that uses defaults
-     *
-     * @param queuePath the path to the dead letter queue segments directory
-     * @throws IOException if the size of the file cannot be determined
-     */
-    public DeadLetterQueueWriter(String queuePath) throws IOException {
-        this(Paths.get(queuePath), MAX_SEGMENT_SIZE_BYTES, Long.MAX_VALUE);
+     * Executed by an internal scheduler to check the filesystem for a specific file
+     * names as {@value org.logstash.common.io.DeadLetterQueueReader#DELETED_SEGMENT_PREFIX}.
+     * If that file is discovered, created by the consumer of the DLQ, it means that the writer
+     * has update his size metrics because the reader cleaned some consumed segments.
+     * */
+    private void watchForDeletedNotification() {
+        final WatchKey watchKey = consumedSegmentsCleanWatcher.poll();
+        if (watchKey == null) {
+            // no files created since last run
+            return;
+        }
+
+        watchKey.pollEvents().stream()
+                .filter(DeadLetterQueueWriter::isCreatedOrUpdatedEvent)
+                .filter(evt -> evt.context() instanceof Path)
+                .map(this::resolveToPath)
+                .filter(DeadLetterQueueWriter::isDeletedNotificationFile)
+                .forEach(this::deleteNotificationAndUpdateQueueMetricSize);
+
+        // re-register for next execution
+        watchKey.reset();
     }
 
-    private long getStartupQueueSize() throws IOException {
-        return getSegmentPaths(queuePath)
-                .mapToLong((p) -> {
-                    try {
-                        return Files.size(p);
-                    } catch (IOException e) {
-                        throw new IllegalStateException(e);
-                    }
-                } )
-                .sum();
+    private static boolean isDeletedNotificationFile(Path filePath) {
+        return DeadLetterQueueReader.DELETED_SEGMENT_PREFIX.equals(filePath.getFileName().toString());
     }
 
-    private void nextWriter() throws IOException {
-        currentWriter = new RecordIOWriter(queuePath.resolve(String.format(SEGMENT_FILE_PATTERN, ++currentSegmentIndex)));
-        currentQueueSize.increment();
+    private Path resolveToPath(WatchEvent<?> evt) {
+        return this.queuePath.resolve((Path) evt.context());
     }
 
-    static Stream<Path> getSegmentPaths(Path path) throws IOException {
-        try(final Stream<Path> files = Files.list(path)) {
-            return files.filter(p -> p.toString().endsWith(".log"))
-                .collect(Collectors.toList()).stream();
+    private static boolean isCreatedOrUpdatedEvent(WatchEvent<?> watchEvent) {
+        return watchEvent.kind() == StandardWatchEventKinds.ENTRY_CREATE ||
+                watchEvent.kind() == StandardWatchEventKinds.ENTRY_MODIFY;
+    }
+
+    private void deleteNotificationAndUpdateQueueMetricSize(Path filePath) {
+        try {
+            Files.delete(filePath);
+            this.currentQueueSize.set(computeQueueSize());
+        } catch (IOException e) {
+            logger.warn("Can't remove the notification file {}", filePath, e);
         }
     }
 
-    public synchronized void writeEntry(DLQEntry entry) throws IOException {
-        innerWriteEntry(entry);
+    public boolean isOpen() {
+        return open.get();
     }
 
-    public synchronized void writeEntry(Event event, String pluginName, String pluginId, String reason) throws IOException {
-        Timestamp entryTimestamp = Timestamp.now();
-        if (entryTimestamp.getTime().isBefore(lastEntryTimestamp.getTime())) {
-            entryTimestamp = lastEntryTimestamp;
+    public Path getPath() {
+        return queuePath;
+    }
+
+    public long getCurrentQueueSize() {
+        return currentQueueSize.longValue();
+    }
+
+    public String getStoragePolicy() {
+        return storageType.name().toLowerCase(Locale.ROOT);
+    }
+
+    public long getDroppedEvents() {
+        return droppedEvents.longValue();
+    }
+
+    public long getExpiredEvents() {
+        return expiredEvents.longValue();
+    }
+
+    public String getLastError() {
+        return lastError;
+    }
+
+    public void writeEntry(Event event, String pluginName, String pluginId, String reason) throws IOException {
+        writeEntry(new DLQEntry(event, pluginName, pluginId, reason));
+    }
+
+    @Override
+    public void close() {
+        if (open.compareAndSet(true, false)) {
+            try {
+                finalizeSegment(FinalizeWhen.ALWAYS, SealReason.DLQ_CLOSE);
+            } catch (Exception e) {
+                logger.warn("Unable to close dlq writer, ignoring", e);
+            }
+            try {
+                releaseFileLock();
+            } catch (Exception e) {
+                logger.warn("Unable to release fileLock, ignoring", e);
+            }
+
+            flusherService.shutdown();
+            closeConsumedSegmentsNotification();
+        }
+    }
+
+    private void closeConsumedSegmentsNotification() {
+        scheduledFSWatcher.shutdown();
+        try {
+            if (!scheduledFSWatcher.awaitTermination(5, TimeUnit.SECONDS)) {
+                logger.warn("Can't terminate FS monitor thread in 5 seconds");
+            }
+            consumedSegmentsCleanWatcher.close();
+        } catch (InterruptedException e) {
+            logger.error("Interrupted while waiting to shutdown the FS monitor", e);
+        } catch (IOException e) {
+            logger.error("Can't close FS watcher service", e);
+        }
+    }
+
+    @VisibleForTesting
+    void writeEntry(DLQEntry entry) throws IOException {
+        lock.lock();
+        try {
+            Timestamp entryTimestamp = Timestamp.now();
+            if (entryTimestamp.compareTo(lastEntryTimestamp) < 0) {
+                entryTimestamp = lastEntryTimestamp;
+            }
+            innerWriteEntry(entry);
+            lastEntryTimestamp = entryTimestamp;
+        } finally {
+            lock.unlock();
         }
-        DLQEntry entry = new DLQEntry(event, pluginName, pluginId, reason);
-        innerWriteEntry(entry);
-        lastEntryTimestamp = entryTimestamp;
     }
 
     private void innerWriteEntry(DLQEntry entry) throws IOException {
@@ -130,14 +455,193 @@ public final class DeadLetterQueueWriter implements Closeable {
         }
         byte[] record = entry.serialize();
         int eventPayloadSize = RECORD_HEADER_SIZE + record.length;
-        if (currentQueueSize.longValue() + eventPayloadSize > maxQueueSize) {
-            logger.error("cannot write event to DLQ: reached maxQueueSize of " + maxQueueSize);
+        executeAgeRetentionPolicy();
+        boolean skipWrite = executeStoragePolicy(eventPayloadSize);
+        if (skipWrite) {
             return;
-        } else if (currentWriter.getPosition() + eventPayloadSize > maxSegmentSize) {
-            currentWriter.close();
-            nextWriter();
         }
-        currentQueueSize.add(currentWriter.writeEvent(record));
+
+        if (exceedSegmentSize(eventPayloadSize)) {
+            finalizeSegment(FinalizeWhen.ALWAYS, SealReason.SEGMENT_FULL);
+        }
+        long writtenBytes = currentWriter.writeEvent(record);
+        currentQueueSize.getAndAdd(writtenBytes);
+    }
+
+    private boolean exceedSegmentSize(int eventPayloadSize) throws IOException {
+        return currentWriter.getPosition() + eventPayloadSize > maxSegmentSize;
+    }
+
+    private void executeAgeRetentionPolicy() {
+        if (isOldestSegmentExpired()) {
+            try {
+                deleteExpiredSegments();
+            } catch (IOException ex) {
+                logger.error("Can't remove some DLQ files while cleaning expired segments", ex);
+            }
+        }
+    }
+
+    /**
+     * @param eventPayloadSize payload size in bytes.
+     * @return boolean true if event write has to be skipped.
+     * */
+    private boolean executeStoragePolicy(int eventPayloadSize) {
+        if (!exceedMaxQueueSize(eventPayloadSize)) {
+            return false;
+        }
+
+        // load currentQueueSize from filesystem because there could be a consumer
+        // that's already cleaning
+        try {
+            this.currentQueueSize.set(computeQueueSize());
+        } catch (IOException ex) {
+            logger.warn("Unable to determine DLQ size, skipping storage policy check", ex);
+            return false;
+        }
+
+        // after reload verify the condition is still valid
+        if (!exceedMaxQueueSize(eventPayloadSize)) {
+            return false;
+        }
+
+        if (storageType == QueueStorageType.DROP_NEWER) {
+            lastError = String.format("Cannot write event to DLQ(path: %s): reached maxQueueSize of %d", queuePath, maxQueueSize);
+            logger.error(lastError);
+            droppedEvents.add(1L);
+            return true;
+        } else {
+            try {
+                do {
+                    dropTailSegment();
+                } while (exceedMaxQueueSize(eventPayloadSize));
+            } catch (IOException ex) {
+                logger.error("Can't remove some DLQ files while removing older segments", ex);
+            }
+            return false;
+        }
+    }
+
+    private boolean exceedMaxQueueSize(int eventPayloadSize) {
+        return currentQueueSize.longValue() + eventPayloadSize > maxQueueSize;
+    }
+
+    private boolean isOldestSegmentExpired() {
+        if (retentionTime == null) {
+            return false;
+        }
+        final Instant now = clock.instant();
+        return oldestSegmentTimestamp
+                .map(t -> t.toInstant().isBefore(now.minus(retentionTime)))
+                .orElse(false);
+    }
+
+    private void deleteExpiredSegments() throws IOException {
+        // remove all the old segments that verifies the age retention condition
+        boolean cleanNextSegment;
+        do {
+            if (oldestSegmentPath.isPresent()) {
+                Path beheadedSegment = oldestSegmentPath.get();
+                expiredEvents.add(deleteTailSegment(beheadedSegment, "age retention policy"));
+            }
+            updateOldestSegmentReference();
+            cleanNextSegment = isOldestSegmentExpired();
+        } while (cleanNextSegment);
+
+        this.currentQueueSize.set(computeQueueSize());
+    }
+
+    /**
+     * Deletes the segment path, if present. Also return the number of events it contains.
+     *
+     * @param segment
+     *      The segment file to delete.
+     * @param motivation
+     *      Description of delete motivation.
+     * @return the number of events contained in the segment or 0 if the segment was already removed.
+     * @throws IOException if any other IO related error happens during deletion of the segment.
+     * */
+    private long deleteTailSegment(Path segment, String motivation) throws IOException {
+        try {
+            long eventsInSegment = DeadLetterQueueUtils.countEventsInSegment(segment);
+            Files.delete(segment);
+            logger.debug("Removed segment file {} due to {}", segment, motivation);
+            return eventsInSegment;
+        } catch (NoSuchFileException nsfex) {
+            // the last segment was deleted by another process, maybe the reader that's cleaning consumed segments
+            logger.debug("File not found {}, maybe removed by the reader pipeline", segment);
+            return 0;
+        }
+    }
+
+    // package-private for testing
+    void updateOldestSegmentReference() throws IOException {
+        final Optional<Path> previousOldestSegmentPath = oldestSegmentPath;
+        oldestSegmentPath = listSegmentPathsSortedBySegmentId(this.queuePath)
+                .filter(p -> p.toFile().length() > 1) // take the files that have content to process
+                .findFirst();
+        if (!oldestSegmentPath.isPresent()) {
+            oldestSegmentTimestamp = Optional.empty();
+            return;
+        }
+
+        boolean previousPathEqualsToCurrent = previousOldestSegmentPath.isPresent() && // contains a value
+                previousOldestSegmentPath.get().equals(oldestSegmentPath.get()); // and the value is the same as the current
+        if (!previousPathEqualsToCurrent) {
+            // oldest segment path has changed
+            logger.debug("Oldest segment is {}", oldestSegmentPath.get());
+        }
+
+        // extract the newest timestamp from the oldest segment
+        Optional<Timestamp> foundTimestamp = readTimestampOfLastEventInSegment(oldestSegmentPath.get());
+        if (!foundTimestamp.isPresent()) {
+            // clean also the last segment, because doesn't contain a timestamp (corrupted maybe)
+            // or is not present anymore
+            oldestSegmentPath = Optional.empty();
+        }
+        oldestSegmentTimestamp = foundTimestamp;
+    }
+
+    // package-private for testing
+    Optional<Path> getOldestSegmentPath() {
+        return oldestSegmentPath;
+    }
+
+    /**
+     * Extract the timestamp from the last DLQEntry it finds in the given segment.
+     * Start from the end of the latest block, and going backward try to read the next event from its start.
+     * */
+    static Optional<Timestamp> readTimestampOfLastEventInSegment(Path segmentPath) throws IOException {
+        byte[] eventBytes = null;
+        try (RecordIOReader recordReader = new RecordIOReader(segmentPath)) {
+            int blockId = (int) Math.ceil(((Files.size(segmentPath) - VERSION_SIZE) / (double) BLOCK_SIZE)) - 1;;
+            while (eventBytes == null && blockId >= 0) { // no event present in last block, try with the one before
+                recordReader.seekToBlock(blockId);
+                eventBytes = recordReader.readEvent();
+                blockId--;
+            }
+        } catch (NoSuchFileException nsfex) {
+            // the segment file may have been removed by the clean consumed feature on the reader side
+            return Optional.empty();
+        }
+        if (eventBytes == null) {
+            logger.warn("Cannot find a complete event into the segment file [{}], this is a DLQ segment corruption", segmentPath);
+            return Optional.empty();
+        }
+        return Optional.of(DLQEntry.deserialize(eventBytes).getEntryTime());
+    }
+
+    // package-private for testing
+    void dropTailSegment() throws IOException {
+        // remove oldest segment
+        final Optional<Path> oldestSegment = listSegmentPathsSortedBySegmentId(queuePath).findFirst();
+        if (oldestSegment.isPresent()) {
+            final Path beheadedSegment = oldestSegment.get();
+            deleteTailSegment(beheadedSegment, "dead letter queue size exceeded dead_letter_queue.max_bytes size(" + maxQueueSize + ")");
+        } else {
+            logger.info("Queue size {} exceeded, but no complete DLQ segments found", maxQueueSize);
+        }
+        this.currentQueueSize.set(computeQueueSize());
     }
 
     /**
@@ -152,42 +656,159 @@ public final class DeadLetterQueueWriter implements Closeable {
         return event.includes(DEAD_LETTER_QUEUE_METADATA_KEY);
     }
 
-    @Override
-    public void close() {
-        if (open.compareAndSet(true, false)) {
-            if (currentWriter != null) {
-                try {
-                    currentWriter.close();
-                } catch (Exception e) {
-                    logger.debug("Unable to close dlq writer", e);
-                }
-            }
-            releaseLock();
+    private void scheduledFlushCheck() {
+        logger.trace("Running scheduled check");
+        lock.lock();
+        try {
+            finalizeSegment(FinalizeWhen.ONLY_IF_STALE, SealReason.SCHEDULED_FLUSH);
+
+            updateOldestSegmentReference();
+            executeAgeRetentionPolicy();
+        } catch (Exception e) {
+            logger.warn("Unable to finalize segment", e);
+        } finally {
+            lock.unlock();
         }
     }
 
-    private void releaseLock() {
+    /**
+     * Determines whether the current writer is stale. It is stale if writes have been performed, but the
+     * last time it was written is further in the past than the flush interval.
+     * @return true if the current segment is stale.
+     */
+    private boolean isCurrentWriterStale() {
+        return currentWriter.isStale(flushInterval);
+    }
+
+    private void finalizeSegment(final FinalizeWhen finalizeWhen, SealReason sealReason) throws IOException {
+        lock.lock();
         try {
-            FileLockFactory.releaseLock(lock);
+            if (!isCurrentWriterStale() && finalizeWhen == FinalizeWhen.ONLY_IF_STALE) {
+                logger.debug("Current head segment {} is not stale", currentWriter.getPath().getFileName());
+                return;
+            }
+
+            if (currentWriter != null) {
+                if (currentWriter.hasWritten()) {
+                    currentWriter.close();
+                    sealSegment(currentSegmentIndex, sealReason);
+                } else {
+                    logger.debug("Current head segment {} is untouched", currentWriter.getPath().getFileName());
+                }
+                updateOldestSegmentReference();
+                executeAgeRetentionPolicy();
+                if (isOpen() && currentWriter.hasWritten()) {
+                    nextWriter();
+                }
+            } else {
+                logger.debug("No head segment writer yet created");
+            }
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    private void sealSegment(int segmentIndex, SealReason motivation) throws IOException {
+        Files.move(queuePath.resolve(String.format(TEMP_FILE_PATTERN, segmentIndex)),
+                queuePath.resolve(String.format(SEGMENT_FILE_PATTERN, segmentIndex)),
+                StandardCopyOption.ATOMIC_MOVE);
+        logger.debug("Sealed segment with index {} because {}", segmentIndex, motivation);
+    }
+
+    private long computeQueueSize() throws IOException {
+        return listSegmentPaths(this.queuePath)
+                .mapToLong(DeadLetterQueueWriter::safeFileSize)
+                .sum();
+    }
+
+    private static long safeFileSize(Path p) {
+        try {
+            return Files.size(p);
         } catch (IOException e) {
-            logger.debug("Unable to release lock", e);
+            return 0L;
+        }
+    }
+
+    private void releaseFileLock() {
+        try {
+            FileLockFactory.releaseLock(fileLock);
+        } catch (IOException e) {
+            logger.debug("Unable to release fileLock", e);
         }
         try {
             Files.deleteIfExists(queuePath.resolve(LOCK_FILE));
         } catch (IOException e){
-            logger.debug("Unable to delete lock file", e);
+            logger.debug("Unable to delete fileLock file", e);
         }
     }
 
-    public boolean isOpen() {
-        return open.get();
+    private void nextWriter() throws IOException {
+        Path nextSegmentPath = queuePath.resolve(String.format(TEMP_FILE_PATTERN, ++currentSegmentIndex));
+        currentWriter = new RecordIOWriter(nextSegmentPath);
+        currentQueueSize.incrementAndGet();
+        logger.debug("Created new head segment {}", nextSegmentPath);
     }
 
-    public Path getPath(){
-        return queuePath;
+    // Clean up existing temp files - files with an extension of .log.tmp. Either delete them if an existing
+    // segment file with the same base name exists, or rename the
+    // temp file to the segment file, which can happen when a process ends abnormally
+    private void cleanupTempFiles() throws IOException {
+        listFiles(queuePath, ".log.tmp")
+                .forEach(this::cleanupTempFile);
     }
 
-    public long getCurrentQueueSize() {
-        return currentQueueSize.longValue();
+    // check if there is a corresponding .log file - if yes delete the temp file, if no atomic move the
+    // temp file to be a new segment file..
+    private void cleanupTempFile(final Path tempFile) {
+        String segmentName = tempFile.getFileName().toString().split("\\.")[0];
+        Path segmentFile = queuePath.resolve(String.format("%s.log", segmentName));
+        try {
+            if (Files.exists(segmentFile)) {
+                Files.delete(tempFile);
+                logger.debug("Deleted temporary file {}", tempFile);
+            } else {
+                SegmentStatus segmentStatus = RecordIOReader.getSegmentStatus(tempFile);
+                switch (segmentStatus) {
+                    case VALID:
+                        logger.debug("Moving temp file {} to segment file {}", tempFile, segmentFile);
+                        Files.move(tempFile, segmentFile, StandardCopyOption.ATOMIC_MOVE);
+                        break;
+                    case EMPTY:
+                        deleteTemporaryEmptyFile(tempFile, segmentName);
+                        break;
+                    case INVALID:
+                        Path errorFile = queuePath.resolve(String.format("%s.err", segmentName));
+                        logger.warn("Segment file {} is in an error state, saving as {}", segmentFile, errorFile);
+                        Files.move(tempFile, errorFile, StandardCopyOption.ATOMIC_MOVE);
+                        break;
+                    default:
+                        throw new IllegalStateException("Unexpected value: " + RecordIOReader.getSegmentStatus(tempFile));
+                }
+            }
+        } catch (IOException e) {
+            throw new IllegalStateException("Unable to clean up temp file: " + tempFile, e);
+        }
+    }
+
+    // Windows can leave files in a "Delete pending" state, where the file presents as existing to certain
+    // methods, and not to others, and actively prevents a new file being created with the same file name,
+    // throwing AccessDeniedException. This method moves the temporary file to a .del file before
+    // deletion, enabling a new temp file to be created in its place.
+    private void deleteTemporaryEmptyFile(Path tempFile, String segmentName) throws IOException {
+        Path deleteTarget;
+        if (isWindows()) {
+            Path deletedFile = queuePath.resolve(String.format("%s.del", segmentName));
+            logger.debug("Moving temp file {} to {}", tempFile, deletedFile);
+            deleteTarget = deletedFile;
+            Files.move(tempFile, deletedFile, StandardCopyOption.ATOMIC_MOVE);
+        } else {
+            deleteTarget = tempFile;
+        }
+        Files.delete(deleteTarget);
+        logger.debug("Deleted temporary empty file {}", deleteTarget);
+    }
+
+    private static boolean isWindows() {
+        return System.getProperty("os.name").startsWith("Windows");
     }
 }
diff --git a/logstash-core/src/main/java/org/logstash/common/io/QueueStorageType.java b/logstash-core/src/main/java/org/logstash/common/io/QueueStorageType.java
new file mode 100644
index 000000000..08dec1d5d
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/common/io/QueueStorageType.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.common.io;
+
+public enum QueueStorageType {
+    DROP_NEWER, DROP_OLDER;
+
+    public static QueueStorageType parse(String value) {
+        switch (value) {
+            case "drop_newer":
+                return DROP_NEWER;
+            case "drop_older":
+                return DROP_OLDER;
+            default:
+                throw new IllegalArgumentException("Invalid queue type: " + value + ", admitted values are drop_newer or drop_newer");
+        }
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/common/io/RecordHeader.java b/logstash-core/src/main/java/org/logstash/common/io/RecordHeader.java
index 178f77d23..e143db2d0 100644
--- a/logstash-core/src/main/java/org/logstash/common/io/RecordHeader.java
+++ b/logstash-core/src/main/java/org/logstash/common/io/RecordHeader.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
diff --git a/logstash-core/src/main/java/org/logstash/common/io/RecordIOReader.java b/logstash-core/src/main/java/org/logstash/common/io/RecordIOReader.java
index 5e74d3de8..317e16b17 100644
--- a/logstash-core/src/main/java/org/logstash/common/io/RecordIOReader.java
+++ b/logstash-core/src/main/java/org/logstash/common/io/RecordIOReader.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -18,6 +38,9 @@
  */
 package org.logstash.common.io;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import java.io.Closeable;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -40,12 +63,17 @@ import static org.logstash.common.io.RecordIOWriter.VERSION_SIZE;
  */
 public final class RecordIOReader implements Closeable {
 
+    enum SegmentStatus { EMPTY, VALID, INVALID }
+
+    private static final Logger logger = LogManager.getLogger(RecordIOReader.class);
+    private static final int UNSET = -1;
+
     private final FileChannel channel;
+    private final Path path;
+
     private ByteBuffer currentBlock;
     private int currentBlockSizeReadFromChannel;
-    private final Path path;
-    private long channelPosition;
-    private static final int UNSET = -1;
+    private long streamPosition;
 
     public RecordIOReader(Path path) throws IOException {
         this.path = path;
@@ -55,10 +83,14 @@ public final class RecordIOReader implements Closeable {
         ByteBuffer versionBuffer = ByteBuffer.allocate(1);
         this.channel.read(versionBuffer);
         versionBuffer.rewind();
-        if (versionBuffer.get() != VERSION) {
-            throw new RuntimeException("Invalid file. check version");
+        byte versionInFile = versionBuffer.get();
+        if (versionInFile != VERSION) {
+            this.channel.close();
+            throw new IllegalStateException(String.format(
+                    "Invalid version on DLQ data file %s. Expected version: %c. Version found on file: %c",
+                    path, VERSION, versionInFile));
         }
-        this.channelPosition = this.channel.position();
+        this.streamPosition = this.channel.position();
     }
 
     public Path getPath() {
@@ -66,20 +98,28 @@ public final class RecordIOReader implements Closeable {
     }
 
     public void seekToBlock(int bid) throws IOException {
-        seekToOffset(bid * BLOCK_SIZE + VERSION_SIZE);
+        seekToOffset(bid * (long) BLOCK_SIZE + VERSION_SIZE);
     }
 
     public void seekToOffset(long channelOffset) throws IOException {
         currentBlock.rewind();
-        currentBlockSizeReadFromChannel = 0;
-        channel.position(channelOffset);
-        channelPosition = channel.position();
+
+        // align to block boundary and move from that with relative positioning
+        long segmentOffset = channelOffset - VERSION_SIZE;
+        long blockIndex = segmentOffset / BLOCK_SIZE;
+        long blockStartOffset = blockIndex * BLOCK_SIZE;
+        channel.position(blockStartOffset + VERSION_SIZE);
+        int readBytes = channel.read(currentBlock);
+        currentBlockSizeReadFromChannel = readBytes;
+        currentBlock.position((int) segmentOffset % BLOCK_SIZE);
+        streamPosition = channelOffset;
     }
 
     public <T> byte[] seekToNextEventPosition(T target, Function<byte[], T> keyExtractor, Comparator<T> keyComparator) throws IOException {
         int matchingBlock = UNSET;
         int lowBlock = 0;
-        int highBlock = (int) (channel.size() - VERSION_SIZE) / BLOCK_SIZE;
+        // blocks are 0-based so the highest is the number of blocks - 1
+        int highBlock = ((int) (channel.size() - VERSION_SIZE) / BLOCK_SIZE) - 1;
 
         while (lowBlock < highBlock) {
             int middle = (int) Math.ceil((highBlock + lowBlock) / 2.0);
@@ -126,25 +166,26 @@ public final class RecordIOReader implements Closeable {
     }
 
     public long getChannelPosition() {
-        return channelPosition;
+        return streamPosition;
     }
 
     void consumeBlock(boolean rewind) throws IOException {
-        if (rewind) {
-            currentBlockSizeReadFromChannel = 0;
-            currentBlock.rewind();
-        } else if (currentBlockSizeReadFromChannel == BLOCK_SIZE) {
+        if (!rewind && currentBlockSizeReadFromChannel == BLOCK_SIZE) {
             // already read enough, no need to read more
             return;
         }
-        int processedPosition = currentBlock.position();
+        if (rewind) {
+            currentBlockSizeReadFromChannel = 0;
+            currentBlock.rewind();
+        }
+        currentBlock.mark();
         try {
             // Move to last written to position
             currentBlock.position(currentBlockSizeReadFromChannel);
             channel.read(currentBlock);
             currentBlockSizeReadFromChannel = currentBlock.position();
         } finally {
-            currentBlock.position(processedPosition);
+            currentBlock.reset();
         }
     }
 
@@ -161,23 +202,30 @@ public final class RecordIOReader implements Closeable {
      */
      int seekToStartOfEventInBlock() {
          // Already consumed all the bytes in this block.
-         if (currentBlock.position() >= currentBlockSizeReadFromChannel){
+         if (currentBlock.position() >= currentBlockSizeReadFromChannel) {
              return -1;
          }
          while (true) {
              RecordType type = RecordType.fromByte(currentBlock.array()[currentBlock.arrayOffset() + currentBlock.position()]);
-             if (RecordType.COMPLETE.equals(type) || RecordType.START.equals(type)) {
-                 return currentBlock.position();
-             } else if (RecordType.END.equals(type)) {
-                 RecordHeader header = RecordHeader.get(currentBlock);
-                 currentBlock.position(currentBlock.position() + header.getSize());
-                 // If this is the end of stream, then cannot seek to start of block
-                 if (this.isEndOfStream()){
-                     return -1;
-                 }
-             } else {
+             if (type == null) {
                  return -1;
              }
+             switch (type) {
+                 case COMPLETE:
+                 case START:
+                     return currentBlock.position();
+                 case MIDDLE:
+                     return -1;
+                 case END:
+                     // reached END record, move forward to the next record in the block if it's present
+                     RecordHeader header = RecordHeader.get(currentBlock);
+                     currentBlock.position(currentBlock.position() + header.getSize());
+                     // If this is the end of stream, then cannot seek to start of block
+                     if (this.isEndOfStream()) {
+                         return -1;
+                     }
+                     break;
+             }
          }
      }
 
@@ -190,43 +238,50 @@ public final class RecordIOReader implements Closeable {
         consumeBlock(false);
         while (true) {
             int eventStartPosition = seekToStartOfEventInBlock();
-            if (eventStartPosition < 0) {
-                if (isEndOfStream()) {
-                    return false;
-                } else {
-                    consumeBlock(true);
-                }
-            } else {
+            if (eventStartPosition >= 0) {
                 return true;
             }
+            if (isEndOfStream()) {
+                return false;
+            }
+            consumeBlock(true);
         }
     }
 
     private void maybeRollToNextBlock() throws IOException {
         // check block position state
         if (currentBlock.remaining() < RECORD_HEADER_SIZE + 1) {
+            streamPosition = this.channel.position();
             consumeBlock(true);
         }
     }
 
-    private void getRecord(ByteBuffer buffer, RecordHeader header) {
+    private void getRecord(ByteBuffer buffer, RecordHeader header) throws IOException {
         Checksum computedChecksum = new CRC32();
         computedChecksum.update(currentBlock.array(), currentBlock.position(), header.getSize());
 
         if ((int) computedChecksum.getValue() != header.getChecksum()) {
-            throw new RuntimeException("invalid checksum of record");
+            throw new IllegalStateException("invalid checksum of record");
         }
 
         buffer.put(currentBlock.array(), currentBlock.position(), header.getSize());
         currentBlock.position(currentBlock.position() + header.getSize());
+        if (currentBlock.remaining() < RECORD_HEADER_SIZE + 1) {
+            // if the block buffer doesn't contain enough space for another record
+            // update position to last channel position.
+            streamPosition = channel.position();
+        } else {
+            streamPosition += header.getSize();
+        }
     }
 
     public byte[] readEvent() throws IOException {
         try {
-            if (channel.isOpen() == false || consumeToStartOfEvent() == false) {
+            if (!channel.isOpen() || !consumeToStartOfEvent()) {
                 return null;
             }
             RecordHeader header = RecordHeader.get(currentBlock);
+            streamPosition += RECORD_HEADER_SIZE;
             int cumReadSize = 0;
             int bufferSize = header.getTotalEventSize().orElseGet(header::getSize);
             ByteBuffer buffer = ByteBuffer.allocate(bufferSize);
@@ -235,16 +290,13 @@ public final class RecordIOReader implements Closeable {
             while (cumReadSize < bufferSize) {
                 maybeRollToNextBlock();
                 RecordHeader nextHeader = RecordHeader.get(currentBlock);
+                streamPosition += RECORD_HEADER_SIZE;
                 getRecord(buffer, nextHeader);
                 cumReadSize += nextHeader.getSize();
             }
             return buffer.array();
         } catch (ClosedByInterruptException e) {
             return null;
-        } finally {
-            if (channel.isOpen()) {
-                channelPosition = channel.position();
-            }
         }
     }
 
@@ -266,7 +318,7 @@ public final class RecordIOReader implements Closeable {
         this.currentBlock = ByteBuffer.wrap(bufferState.blockContents);
         this.currentBlock.position(bufferState.currentBlockPosition);
         this.channel.position(bufferState.channelPosition);
-        this.channelPosition = channel.position();
+        this.streamPosition = channel.position();
         this.currentBlockSizeReadFromChannel = bufferState.currentBlockSizeReadFromChannel;
     }
 
@@ -276,7 +328,7 @@ public final class RecordIOReader implements Closeable {
         private long channelPosition;
         private byte[] blockContents;
 
-        BufferState(Builder builder){
+        BufferState(Builder builder) {
             this.currentBlockPosition = builder.currentBlockPosition;
             this.currentBlockSizeReadFromChannel = builder.currentBlockSizeReadFromChannel;
             this.channelPosition = builder.channelPosition;
@@ -288,28 +340,28 @@ public final class RecordIOReader implements Closeable {
                     currentBlockPosition, currentBlockSizeReadFromChannel, channelPosition);
         }
 
-        final static class Builder{
+        final static class Builder {
             private int currentBlockPosition;
             private int currentBlockSizeReadFromChannel;
             private long channelPosition;
             private byte[] blockContents;
 
-            Builder currentBlockPosition(final int currentBlockPosition){
+            Builder currentBlockPosition(final int currentBlockPosition) {
                 this.currentBlockPosition = currentBlockPosition;
                 return this;
             }
 
-            Builder currentBlockSizeReadFromChannel(final int currentBlockSizeReadFromChannel){
+            Builder currentBlockSizeReadFromChannel(final int currentBlockSizeReadFromChannel) {
                 this.currentBlockSizeReadFromChannel = currentBlockSizeReadFromChannel;
                 return this;
             }
 
-            Builder channelPosition(final long channelPosition){
+            Builder channelPosition(final long channelPosition) {
                 this.channelPosition = channelPosition;
                 return this;
             }
 
-            Builder blockContents(final byte[] blockContents){
+            Builder blockContents(final byte[] blockContents) {
                 this.blockContents = blockContents;
                 return this;
             }
@@ -319,4 +371,26 @@ public final class RecordIOReader implements Closeable {
             }
         }
     }
+
+    /**
+     * Verify whether a segment is valid and non-empty.
+     * @param path Path to segment
+     * @return SegmentStatus EMPTY if the segment is empty, VALID if it is valid, INVALID otherwise
+     */
+    static SegmentStatus getSegmentStatus(Path path) {
+        try (RecordIOReader ioReader = new RecordIOReader(path)) {
+            boolean moreEvents = true;
+            SegmentStatus segmentStatus = SegmentStatus.EMPTY;
+            while (moreEvents) {
+                // If all events in the segment can be read, then assume that this is a valid segment
+                moreEvents = (ioReader.readEvent() != null);
+                if (moreEvents) segmentStatus = SegmentStatus.VALID;
+            }
+            return segmentStatus;
+        } catch (IOException | IllegalStateException e) {
+            logger.warn("Error reading segment file {}", path, e);
+            return SegmentStatus.INVALID;
+        }
+    }
+
 }
diff --git a/logstash-core/src/main/java/org/logstash/common/io/RecordIOWriter.java b/logstash-core/src/main/java/org/logstash/common/io/RecordIOWriter.java
index d8bbcb562..34d3b5024 100644
--- a/logstash-core/src/main/java/org/logstash/common/io/RecordIOWriter.java
+++ b/logstash-core/src/main/java/org/logstash/common/io/RecordIOWriter.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -24,7 +44,10 @@ import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
+import java.time.Duration;
+import java.time.Instant;
 import java.util.OptionalInt;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.zip.CRC32;
 import java.util.zip.Checksum;
 
@@ -75,7 +98,11 @@ public final class RecordIOWriter implements Closeable {
     static final int VERSION_SIZE = 1;
     static final char VERSION = '1';
 
+    private Path recordsFile;
+    private Instant lastWrite = null;
+
     public RecordIOWriter(Path recordsFile) throws IOException {
+        this.recordsFile = recordsFile;
         this.posInBlock = 0;
         this.currentBlockIdx = 0;
         recordsFile.toFile().createNewFile();
@@ -113,6 +140,7 @@ public final class RecordIOWriter implements Closeable {
     }
 
     public long writeEvent(byte[] eventArray) throws IOException {
+        lastWrite = Instant.now();
         ByteBuffer eventBuffer = ByteBuffer.wrap(eventArray);
         RecordType nextType = null;
         ByteBuffer slice = eventBuffer.slice();
@@ -140,6 +168,19 @@ public final class RecordIOWriter implements Closeable {
         return channel.position() - startPosition;
     }
 
+
+    public boolean hasWritten(){
+        return lastWrite != null;
+    }
+
+    public boolean isStale(Duration flushPeriod){
+        return hasWritten() && Instant.now().minus(flushPeriod).isAfter(lastWrite);
+    }
+
+    public Path getPath(){
+        return  this.recordsFile;
+    }
+
     @Override
     public void close() throws IOException {
         channel.close();
diff --git a/logstash-core/src/main/java/org/logstash/common/io/RecordType.java b/logstash-core/src/main/java/org/logstash/common/io/RecordType.java
index 3b2e90e3a..d9b5647d5 100644
--- a/logstash-core/src/main/java/org/logstash/common/io/RecordType.java
+++ b/logstash-core/src/main/java/org/logstash/common/io/RecordType.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
diff --git a/logstash-core/src/main/java/org/logstash/common/io/SegmentListener.java b/logstash-core/src/main/java/org/logstash/common/io/SegmentListener.java
new file mode 100644
index 000000000..aea62d2c5
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/common/io/SegmentListener.java
@@ -0,0 +1,21 @@
+package org.logstash.common.io;
+
+/**
+ * Listener interface to receive notification when a DLQ segment is completely read and when are removed.
+ * */
+public interface SegmentListener {
+    /**
+     * Notifies the listener about the complete consumption of a bunch of segments.
+     * */
+    void segmentCompleted();
+
+    /**
+     * Notifies the listener about the deletion of consumed segments.
+     * It reports the number of deleted segments and number of events contained in those segments.
+     *
+     * @param numberOfSegments the number of deleted segment files.
+     *
+     * @param numberOfEvents total number of events that were present in the deleted segments.
+     * */
+    void segmentsDeleted(int numberOfSegments, long numberOfEvents);
+}
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/BaseSourceComponent.java b/logstash-core/src/main/java/org/logstash/config/ir/BaseSourceComponent.java
index ac65a3d2b..e9949b1ca 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/BaseSourceComponent.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/BaseSourceComponent.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir;
 
 import org.logstash.common.SourceWithMetadata;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/CompiledPipeline.java b/logstash-core/src/main/java/org/logstash/config/ir/CompiledPipeline.java
index 9cc2546ab..e851e0fa8 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/CompiledPipeline.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/CompiledPipeline.java
@@ -1,39 +1,66 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.logstash.config.ir;
 
-import co.elastic.logstash.api.Codec;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.jruby.RubyArray;
 import org.jruby.RubyHash;
-import org.jruby.javasupport.JavaUtil;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.logstash.RubyUtil;
 import org.logstash.Rubyfier;
+import org.logstash.common.EnvironmentVariableProvider;
 import org.logstash.common.SourceWithMetadata;
 import org.logstash.config.ir.compiler.AbstractFilterDelegatorExt;
 import org.logstash.config.ir.compiler.AbstractOutputDelegatorExt;
 import org.logstash.config.ir.compiler.ComputeStepSyntaxElement;
+import org.logstash.config.ir.compiler.ConditionalEvaluationError;
 import org.logstash.config.ir.compiler.Dataset;
 import org.logstash.config.ir.compiler.DatasetCompiler;
 import org.logstash.config.ir.compiler.EventCondition;
 import org.logstash.config.ir.compiler.RubyIntegration;
 import org.logstash.config.ir.compiler.SplitDataset;
+import org.logstash.config.ir.graph.SeparatorVertex;
 import org.logstash.config.ir.graph.IfVertex;
 import org.logstash.config.ir.graph.PluginVertex;
 import org.logstash.config.ir.graph.Vertex;
 import org.logstash.config.ir.imperative.PluginStatement;
-import org.logstash.ext.JrubyEventExtLibrary;
+import org.logstash.execution.AbstractPipelineExt;
+import org.logstash.execution.QueueBatch;
+import org.logstash.ext.JrubyEventExtLibrary.RubyEvent;
+import org.logstash.plugins.ConfigVariableExpander;
+import org.logstash.secret.store.SecretStore;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static org.logstash.config.ir.compiler.Utils.copyNonCancelledEvents;
+
 /**
- * <h3>Compiled Logstash Pipeline Configuration.</h3>
+ * <h2>Compiled Logstash Pipeline Configuration.</h2>
  * This class represents an executable pipeline, compiled from the configured topology that is
  * learnt from {@link PipelineIR}.
  * Each compiled pipeline consists in graph of {@link Dataset} that represent either a
@@ -41,8 +68,6 @@ import java.util.stream.Stream;
  */
 public final class CompiledPipeline {
 
-    private static final Logger LOGGER = LogManager.getLogger(CompiledPipeline.class);
-
     /**
      * Compiler for conditional expressions that turn {@link IfVertex} into {@link EventCondition}.
      */
@@ -73,13 +98,44 @@ public final class CompiledPipeline {
      */
     private final RubyIntegration.PluginFactory pluginFactory;
 
-    public CompiledPipeline(final PipelineIR pipelineIR,
-        final RubyIntegration.PluginFactory pluginFactory) {
+    /**
+     * Callback listener to manage failed condition evaluation
+     * */
+    private final AbstractPipelineExt.ConditionalEvaluationListener conditionalErrListener;
+
+    public static final class NoopEvaluationListener implements AbstractPipelineExt.ConditionalEvaluationListener {
+
+        @Override
+        public void notify(ConditionalEvaluationError err) {
+            // NO-OP
+        }
+    }
+
+    public CompiledPipeline(
+            final PipelineIR pipelineIR,
+            final RubyIntegration.PluginFactory pluginFactory)
+    {
+        this(pipelineIR, pluginFactory, null, new NoopEvaluationListener());
+    }
+
+    public CompiledPipeline(
+            final PipelineIR pipelineIR,
+            final RubyIntegration.PluginFactory pluginFactory,
+            final SecretStore secretStore,
+            final AbstractPipelineExt.ConditionalEvaluationListener conditionalErrListener)
+    {
         this.pipelineIR = pipelineIR;
         this.pluginFactory = pluginFactory;
-        inputs = setupInputs();
-        filters = setupFilters();
-        outputs = setupOutputs();
+        this.conditionalErrListener = conditionalErrListener;
+        try (ConfigVariableExpander cve = new ConfigVariableExpander(
+                secretStore,
+                EnvironmentVariableProvider.defaultProvider())) {
+            inputs = setupInputs(cve);
+            filters = setupFilters(cve);
+            outputs = setupOutputs(cve);
+        } catch (Exception e) {
+            throw new IllegalStateException("Unable to configure plugins: " + e.getMessage(), e);
+        }
     }
 
     public Collection<AbstractOutputDelegatorExt> outputs() {
@@ -95,26 +151,40 @@ public final class CompiledPipeline {
     }
 
     /**
-     * This method contains the actual compilation of the {@link Dataset} representing the
-     * underlying pipeline from the Queue to the outputs.
-     * @return Compiled {@link Dataset} representation of the underlying {@link PipelineIR} topology
+     * Perform the actual compilation of the {@link Dataset} representing the
+     * underlying pipeline from the Queue to the outputs using the
+     * unordered  execution model.
+     * @return CompiledPipeline.CompiledExecution the compiled pipeline
      */
-    public Dataset buildExecution() {
-        return new CompiledPipeline.CompiledExecution().toDataset();
+    public CompiledPipeline.CompiledExecution buildExecution() {
+        return buildExecution(false);
+    }
+
+    /**
+     * Perform the actual compilation of the {@link Dataset} representing the
+     * underlying pipeline from the Queue to the outputs using the ordered or
+     * unordered  execution model.
+     * @param orderedExecution determines whether to build an execution that enforces order or not
+     * @return CompiledPipeline.CompiledExecution the compiled pipeline
+     */
+    public CompiledPipeline.CompiledExecution buildExecution(boolean orderedExecution) {
+        return orderedExecution
+            ? new CompiledPipeline.CompiledOrderedExecution()
+            : new CompiledPipeline.CompiledUnorderedExecution();
     }
 
     /**
      * Sets up all outputs learned from {@link PipelineIR}.
      */
-    private Map<String, AbstractOutputDelegatorExt> setupOutputs() {
+    private Map<String, AbstractOutputDelegatorExt> setupOutputs(ConfigVariableExpander cve) {
         final Collection<PluginVertex> outs = pipelineIR.getOutputPluginVertices();
         final Map<String, AbstractOutputDelegatorExt> res = new HashMap<>(outs.size());
         outs.forEach(v -> {
             final PluginDefinition def = v.getPluginDefinition();
             final SourceWithMetadata source = v.getSourceWithMetadata();
+            final Map<String, Object> args = expandArguments(def, cve);
             res.put(v.getId(), pluginFactory.buildOutput(
-                    RubyUtil.RUBY.newString(def.getName()), RubyUtil.RUBY.newFixnum(source.getLine()),
-                    RubyUtil.RUBY.newFixnum(source.getColumn()), convertArgs(def), convertJavaArgs(def)
+                RubyUtil.RUBY.newString(def.getName()), convertArgs(args), source
             ));
         });
         return res;
@@ -123,16 +193,16 @@ public final class CompiledPipeline {
     /**
      * Sets up all Ruby filters learnt from {@link PipelineIR}.
      */
-    private Map<String, AbstractFilterDelegatorExt> setupFilters() {
+    private Map<String, AbstractFilterDelegatorExt> setupFilters(ConfigVariableExpander cve) {
         final Collection<PluginVertex> filterPlugins = pipelineIR.getFilterPluginVertices();
         final Map<String, AbstractFilterDelegatorExt> res = new HashMap<>(filterPlugins.size(), 1.0F);
 
         for (final PluginVertex vertex : filterPlugins) {
             final PluginDefinition def = vertex.getPluginDefinition();
             final SourceWithMetadata source = vertex.getSourceWithMetadata();
+            final Map<String, Object> args = expandArguments(def, cve);
             res.put(vertex.getId(), pluginFactory.buildFilter(
-                    RubyUtil.RUBY.newString(def.getName()), RubyUtil.RUBY.newFixnum(source.getLine()),
-                    RubyUtil.RUBY.newFixnum(source.getColumn()), convertArgs(def), convertJavaArgs(def)
+                RubyUtil.RUBY.newString(def.getName()), convertArgs(args), source
             ));
         }
         return res;
@@ -141,72 +211,89 @@ public final class CompiledPipeline {
     /**
      * Sets up all Ruby inputs learnt from {@link PipelineIR}.
      */
-    private Collection<IRubyObject> setupInputs() {
+    private Collection<IRubyObject> setupInputs(ConfigVariableExpander cve) {
         final Collection<PluginVertex> vertices = pipelineIR.getInputPluginVertices();
         final Collection<IRubyObject> nodes = new HashSet<>(vertices.size());
         vertices.forEach(v -> {
             final PluginDefinition def = v.getPluginDefinition();
             final SourceWithMetadata source = v.getSourceWithMetadata();
+            final Map<String, Object> args = expandArguments(def, cve);
             IRubyObject o = pluginFactory.buildInput(
-                    RubyUtil.RUBY.newString(def.getName()), RubyUtil.RUBY.newFixnum(source.getLine()),
-                    RubyUtil.RUBY.newFixnum(source.getColumn()), convertArgs(def), convertJavaArgs(def));
+                RubyUtil.RUBY.newString(def.getName()), convertArgs(args), source);
             nodes.add(o);
         });
         return nodes;
     }
 
-    /**
-     * Converts plugin arguments from the format provided by {@link PipelineIR} into coercible
-     * Ruby types.
-     * @param def PluginDefinition as provided by {@link PipelineIR}
-     * @return RubyHash of plugin arguments as understood by {@link RubyIntegration.PluginFactory}
-     * methods
-     */
-    private RubyHash convertArgs(final PluginDefinition def) {
+    final RubyHash convertArgs(final Map<String, Object> input) {
         final RubyHash converted = RubyHash.newHash(RubyUtil.RUBY);
-        for (final Map.Entry<String, Object> entry : def.getArguments().entrySet()) {
+        for (final Map.Entry<String, Object> entry : input.entrySet()) {
             final Object value = entry.getValue();
             final String key = entry.getKey();
-            final Object toput;
-            if (value instanceof PluginStatement) {
-                final PluginDefinition codec = ((PluginStatement) value).getPluginDefinition();
-                toput = pluginFactory.buildCodec(
-                    RubyUtil.RUBY.newString(codec.getName()),
-                    Rubyfier.deep(RubyUtil.RUBY, codec.getArguments()),
-                    codec.getArguments()
-                );
-            } else {
-                toput = value;
-            }
-            converted.put(key, toput);
+            converted.put(key, value);
         }
+
         return converted;
     }
 
-    /**
-     * Converts plugin arguments from the format provided by {@link PipelineIR} into coercible
-     * Java types for consumption by Java plugins.
-     * @param def PluginDefinition as provided by {@link PipelineIR}
-     * @return Map of plugin arguments as understood by the {@link RubyIntegration.PluginFactory}
-     * methods that create Java plugins
-     */
-    private Map<String, Object> convertJavaArgs(final PluginDefinition def) {
-        for (final Map.Entry<String, Object> entry : def.getArguments().entrySet()) {
-            final Object value = entry.getValue();
+
+    private Map<String, Object> expandArguments(final PluginDefinition pluginDefinition, final ConfigVariableExpander cve) {
+        Map<String, Object> arguments = expandConfigVariables(cve, pluginDefinition.getArguments());
+
+        // Intercept codec definitions from LIR
+        for (final Map.Entry<String, Object> entry : arguments.entrySet()) {
             final String key = entry.getKey();
-            final IRubyObject toput;
+            final Object value = entry.getValue();
             if (value instanceof PluginStatement) {
-                final PluginDefinition codec = ((PluginStatement) value).getPluginDefinition();
-                toput = pluginFactory.buildCodec(
-                        RubyUtil.RUBY.newString(codec.getName()),
-                        Rubyfier.deep(RubyUtil.RUBY, codec.getArguments()),
-                        codec.getArguments()
-                );
-                Codec javaCodec = (Codec)JavaUtil.unwrapJavaValue(toput);
-                def.getArguments().put(key, javaCodec);
+                final PluginStatement codecPluginStatement = (PluginStatement) value;
+                final PluginDefinition codecDefinition = codecPluginStatement.getPluginDefinition();
+                final SourceWithMetadata codecSource = codecPluginStatement.getSourceWithMetadata();
+                final Map<String, Object> codecArguments = expandArguments(codecDefinition, cve);
+                IRubyObject codecInstance = pluginFactory.buildCodec(RubyUtil.RUBY.newString(codecDefinition.getName()),
+                        Rubyfier.deep(RubyUtil.RUBY, codecArguments),
+                        codecSource);
+                arguments.put(key, codecInstance);
             }
         }
-        return def.getArguments();
+
+        return arguments;
+    }
+
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    public static Map<String, Object> expandConfigVariables(ConfigVariableExpander cve, Map<String, Object> configArgs, boolean keepSecrets) {
+        Map<String, Object> expandedConfig = new HashMap<>();
+        for (Map.Entry<String, Object> e : configArgs.entrySet()) {
+            expandedConfig.put(e.getKey(), expandConfigVariable(cve, e.getValue(), keepSecrets));
+        }
+        return expandedConfig;
+    }
+
+    public static Map<String, Object> expandConfigVariables(ConfigVariableExpander cve, Map<String, Object> configArgs) {
+        return expandConfigVariables(cve, configArgs, false);
+    }
+
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    public static Object expandConfigVariable(ConfigVariableExpander cve, Object valueToExpand, boolean keepSecrets) {
+        if (valueToExpand instanceof List) {
+            List list = (List) valueToExpand;
+            List<Object> expandedObjects = new ArrayList<>();
+            for (Object o : list) {
+                expandedObjects.add(cve.expand(o, keepSecrets));
+            }
+            return expandedObjects;
+        }
+        if (valueToExpand instanceof Map) {
+            // hidden recursion here expandConfigVariables -> expandConfigVariable
+            return expandConfigVariables(cve, (Map<String, Object>) valueToExpand, keepSecrets);
+        }
+        if (valueToExpand instanceof String) {
+            return cve.expand(valueToExpand, keepSecrets);
+        }
+        return valueToExpand;
+    }
+
+    public static Object expandConfigVariableKeepingSecrets(ConfigVariableExpander cve, Object valueToExpand) {
+        return expandConfigVariable(cve, valueToExpand, true);
     }
 
     /**
@@ -227,53 +314,130 @@ public final class CompiledPipeline {
         return outputs.containsKey(vertex.getId());
     }
 
+    public final class CompiledOrderedExecution extends CompiledExecution {
+
+        @SuppressWarnings({"unchecked"})  private final RubyArray<RubyEvent> EMPTY_ARRAY = RubyUtil.RUBY.newEmptyArray();
+
+        @Override
+        public int compute(final QueueBatch batch, final boolean flush, final boolean shutdown) {
+           return compute(batch.events(), flush, shutdown);
+        }
+
+        @Override
+        public int compute(final Collection<RubyEvent> batch, final boolean flush, final boolean shutdown) {
+            if (!batch.isEmpty()) {
+                @SuppressWarnings({"unchecked"}) final RubyArray<RubyEvent> outputBatch = RubyUtil.RUBY.newArray();
+                @SuppressWarnings({"unchecked"}) final RubyArray<RubyEvent> filterBatch = RubyUtil.RUBY.newArray(1);
+                // send batch one-by-one as single-element batches down the filters
+                for (final RubyEvent e : batch) {
+                    filterBatch.set(0, e);
+                    _compute(filterBatch, outputBatch, flush, shutdown);
+                }
+                compiledOutputs.compute(outputBatch, flush, shutdown);
+                return outputBatch.size();
+            } else if (flush || shutdown) {
+                @SuppressWarnings({"unchecked"}) final RubyArray<RubyEvent> outputBatch = RubyUtil.RUBY.newArray();
+                _compute(EMPTY_ARRAY, outputBatch, flush, shutdown);
+                compiledOutputs.compute(outputBatch, flush, shutdown);
+                return outputBatch.size();
+            }
+            return 0;
+        }
+
+        private void _compute(final RubyArray<RubyEvent> batch, final RubyArray<RubyEvent> outputBatch, final boolean flush, final boolean shutdown) {
+            final Collection<RubyEvent> result = compiledFilters.compute(batch, flush, shutdown);
+            copyNonCancelledEvents(result, outputBatch);
+            compiledFilters.clear();
+        }
+    }
+
+    public final class CompiledUnorderedExecution extends CompiledExecution {
+
+        @Override
+        public int compute(final QueueBatch batch, final boolean flush, final boolean shutdown) {
+            return compute(batch.events(), flush, shutdown);
+        }
+
+        @Override
+        public int compute(final Collection<RubyEvent> batch, final boolean flush, final boolean shutdown) {
+            // we know for now this comes from batch.collection() which returns a LinkedHashSet
+            final Collection<RubyEvent> result = compiledFilters.compute(RubyArray.newArray(RubyUtil.RUBY, batch), flush, shutdown);
+            @SuppressWarnings({"unchecked"}) final RubyArray<RubyEvent> outputBatch = RubyUtil.RUBY.newArray(result.size());
+            copyNonCancelledEvents(result, outputBatch);
+            compiledFilters.clear();
+            compiledOutputs.compute(outputBatch, flush, shutdown);
+            return outputBatch.size();
+        }
+    }
+
+    public interface Execution <QB extends QueueBatch> {
+        /**
+         * @return the number of events that was processed, could be less o greater than batch.size(), depending if
+         *  the pipeline drops or clones events during the filter stage.
+         * */
+        int compute(final QB batch, final boolean flush, final boolean shutdown);
+    }
+
     /**
      * Instances of this class represent a fully compiled pipeline execution. Note that this class
      * has a separate lifecycle from {@link CompiledPipeline} because it holds per (worker-thread)
      * state and thus needs to be instantiated once per thread.
      */
-    private final class CompiledExecution {
+    public abstract class CompiledExecution implements Execution<QueueBatch> {
 
         /**
          * Compiled {@link IfVertex, indexed by their ID as returned by {@link Vertex#getId()}.
          */
-        private final Map<String, SplitDataset> iffs = new HashMap<>(5);
+        private final Map<String, SplitDataset> iffs = new HashMap<>(50);
 
         /**
          * Cached {@link Dataset} compiled from {@link PluginVertex} indexed by their ID as returned
          * by {@link Vertex#getId()} to avoid duplicate computations.
          */
-        private final Map<String, Dataset> plugins = new HashMap<>(5);
+        private final Map<String, Dataset> plugins = new HashMap<>(50);
 
-        private final Dataset compiled;
+        protected final Dataset compiledFilters;
+        protected final Dataset compiledOutputs;
 
         CompiledExecution() {
-            compiled = compile();
+            compiledFilters = compileFilters();
+            compiledOutputs = compileOutputs();
         }
 
-        Dataset toDataset() {
-            return compiled;
+        public abstract int compute(final Collection<RubyEvent> batch, final boolean flush, final boolean shutdown);
+
+        /**
+         * Instantiates the graph of compiled filter section {@link Dataset}.
+         * @return Compiled {@link Dataset} representing the filter section of the pipeline.
+         */
+        private Dataset compileFilters() {
+            final Vertex separator = pipelineIR.getGraph()
+                .vertices()
+                .filter(v -> v instanceof SeparatorVertex)
+                .findFirst()
+                .orElseThrow(() -> new IllegalStateException("Missing Filter End Vertex"));
+           return DatasetCompiler.terminalFilterDataset(flatten(Collections.emptyList(), separator));
         }
 
         /**
-         * Instantiates the graph of compiled {@link Dataset}.
-         * @return Compiled {@link Dataset} representing the pipeline.
+         * Instantiates the graph of compiled output section {@link Dataset}.
+         * @return Compiled {@link Dataset} representing the output section of the pipeline.
          */
-        private Dataset compile() {
+        private Dataset compileOutputs() {
             final Collection<Vertex> outputNodes = pipelineIR.getGraph()
                 .allLeaves().filter(CompiledPipeline.this::isOutput)
                 .collect(Collectors.toList());
             if (outputNodes.isEmpty()) {
                 return Dataset.IDENTITY;
             } else {
-                return DatasetCompiler.terminalDataset(outputNodes.stream().map(
-                    leaf -> outputDataset(leaf, flatten(Collections.emptyList(), leaf))
-                ).collect(Collectors.toList()));
+                return DatasetCompiler.terminalOutputDataset(outputNodes.stream()
+                    .map(leaf -> outputDataset(leaf, flatten(Collections.emptyList(), leaf)))
+                    .collect(Collectors.toList()));
             }
         }
 
         /**
-         * Build a {@link Dataset} representing the {@link JrubyEventExtLibrary.RubyEvent}s after
+         * Build a {@link Dataset} representing the {@link RubyEvent}s after
          * the application of the given filter.
          * @param vertex Vertex of the filter to create this {@link Dataset} for
          * @param datasets All the datasets that have children passing into this filter
@@ -284,9 +448,10 @@ public final class CompiledPipeline {
 
             if (!plugins.containsKey(vertexId)) {
                 final ComputeStepSyntaxElement<Dataset> prepared =
-                        DatasetCompiler.filterDataset(flatten(datasets, vertex),
-                                                      filters.get(vertexId));
-                LOGGER.debug("Compiled filter\n {} \n into \n {}", vertex, prepared);
+                    DatasetCompiler.filterDataset(
+                        flatten(datasets, vertex),
+                        filters.get(vertexId)
+                    );
 
                 plugins.put(vertexId, prepared.instantiate());
             }
@@ -295,7 +460,7 @@ public final class CompiledPipeline {
         }
 
         /**
-         * Build a {@link Dataset} representing the {@link JrubyEventExtLibrary.RubyEvent}s after
+         * Build a {@link Dataset} representing the {@link RubyEvent}s after
          * the application of the given output.
          * @param vertex Vertex of the output to create this {@link Dataset} for
          * @param datasets All the datasets that have children passing into this output
@@ -306,10 +471,12 @@ public final class CompiledPipeline {
 
             if (!plugins.containsKey(vertexId)) {
                 final ComputeStepSyntaxElement<Dataset> prepared =
-                        DatasetCompiler.outputDataset(flatten(datasets, vertex),
-                                                      outputs.get(vertexId),
-                                                     outputs.size() == 1);
-                LOGGER.debug("Compiled output\n {} \n into \n {}", vertex, prepared);
+                    DatasetCompiler.outputDataset(
+                        flatten(datasets, vertex),
+                        outputs.get(vertexId),
+                        outputs.size() == 1
+                    );
+
                 plugins.put(vertexId, prepared.instantiate());
             }
 
@@ -318,29 +485,30 @@ public final class CompiledPipeline {
 
         /**
          * Split the given {@link Dataset}s and return the dataset half of their elements that contains
-         * the {@link JrubyEventExtLibrary.RubyEvent} that fulfil the given {@link EventCondition}.
+         * the {@link RubyEvent} that fulfil the given {@link EventCondition}.
          * @param datasets Datasets that are the parents of the datasets to split
          * @param condition Condition that must be fulfilled
          * @param vertex Vertex id to cache the resulting {@link Dataset} under
          * @return The half of the datasets contents that fulfils the condition
          */
-        private SplitDataset split(final Collection<Dataset> datasets,
-            final EventCondition condition, final Vertex vertex) {
-            final String key = vertex.getId();
-            SplitDataset conditional = iffs.get(key);
+        private SplitDataset split(
+            final Collection<Dataset> datasets,
+            final EventCondition condition,
+            final Vertex vertex)
+        {
+            final String vertexId = vertex.getId();
+            SplitDataset conditional = iffs.get(vertexId);
             if (conditional == null) {
                 final Collection<Dataset> dependencies = flatten(datasets, vertex);
-                conditional = iffs.get(key);
+                conditional = iffs.get(vertexId);
                 // Check that compiling the dependencies did not already instantiate the conditional
                 // by requiring its else branch.
                 if (conditional == null) {
                     final ComputeStepSyntaxElement<SplitDataset> prepared =
-                        DatasetCompiler.splitDataset(dependencies, condition);
-                    LOGGER.debug(
-                        "Compiled conditional\n {} \n into \n {}", vertex, prepared
-                    );
+                        DatasetCompiler.splitDataset(dependencies, condition, conditionalErrListener);
+
                     conditional = prepared.instantiate();
-                    iffs.put(key, conditional);
+                    iffs.put(vertexId, conditional);
                 }
 
             }
@@ -356,9 +524,13 @@ public final class CompiledPipeline {
          * @param start Vertex to compile children for
          * @return Datasets originating from given {@link Vertex}
          */
-        private Collection<Dataset> flatten(final Collection<Dataset> datasets,
-            final Vertex start) {
-            final Collection<Dataset> result = compileDependencies(start, datasets,
+        private Collection<Dataset> flatten(
+            final Collection<Dataset> datasets,
+            final Vertex start)
+        {
+            final Collection<Dataset> result = compileDependencies(
+                start,
+                datasets,
                 start.incomingVertices().filter(v -> isFilter(v) || isOutput(v) || v instanceof IfVertex)
             );
             return result.isEmpty() ? datasets : result;
@@ -371,8 +543,11 @@ public final class CompiledPipeline {
          * @param dependencies Dependencies of {@code start}
          * @return Datasets compiled from vertex children
          */
-        private Collection<Dataset> compileDependencies(final Vertex start,
-            final Collection<Dataset> datasets, final Stream<Vertex> dependencies) {
+        private Collection<Dataset> compileDependencies(
+                final Vertex start,
+                final Collection<Dataset> datasets,
+                final Stream<Vertex> dependencies)
+        {
             return dependencies.map(
                 dependency -> {
                     if (isFilter(dependency)) {
@@ -380,7 +555,7 @@ public final class CompiledPipeline {
                     } else if (isOutput(dependency)) {
                         return outputDataset(dependency, datasets);
                     } else {
-                        // We know that it's an if vertex since the the input children are either
+                        // We know that it's an if vertex since the input children are either
                         // output, filter or if in type.
                         final IfVertex ifvert = (IfVertex) dependency;
                         final SplitDataset ifDataset = split(
@@ -391,13 +566,15 @@ public final class CompiledPipeline {
                         // It is important that we double check that we are actually dealing with the
                         // positive/left branch of the if condition
                         if (ifvert.outgoingBooleanEdgesByType(true)
-                            .anyMatch(edge -> Objects.equals(edge.getTo(), start))) {
+                            .anyMatch(edge -> Objects.equals(edge.getTo(), start)))
+                        {
                             return ifDataset;
                         } else {
                             return ifDataset.right();
                         }
                     }
-                }).collect(Collectors.toList());
+                }
+            ).collect(Collectors.toList());
         }
     }
 }
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/ConfigCompiler.java b/logstash-core/src/main/java/org/logstash/config/ir/ConfigCompiler.java
index 668563fc6..f722d8404 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/ConfigCompiler.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/ConfigCompiler.java
@@ -1,10 +1,40 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir;
 
+import org.jruby.RubyHash;
 import org.jruby.javasupport.JavaUtil;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.logstash.RubyUtil;
-import org.logstash.common.IncompleteSourceWithMetadataException;
 import org.logstash.common.SourceWithMetadata;
+import org.logstash.config.ir.graph.Graph;
+import org.logstash.config.ir.imperative.Statement;
+import org.logstash.plugins.ConfigVariableExpander;
+
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.stream.Collectors;
+
+import static java.util.stream.Collectors.*;
 
 /**
  * Java Implementation of the config compiler that is implemented by wrapping the Ruby
@@ -17,29 +47,79 @@ public final class ConfigCompiler {
     }
 
     /**
-     * @param config Logstash Config String
+     * @param sourcesWithMetadata Logstash Config partitioned
      * @param supportEscapes The value of the setting {@code config.support_escapes}
+     * @param cve Config variable expander. Substitute variable with value in secret store, env, default config value
      * @return Compiled {@link PipelineIR}
-     * @throws IncompleteSourceWithMetadataException On Broken Configuration
+     * @throws InvalidIRException if the configuration contains errors
      */
-    public static PipelineIR configToPipelineIR(final String config, final boolean supportEscapes)
-        throws IncompleteSourceWithMetadataException {
+    @SuppressWarnings("unchecked")
+    public static PipelineIR configToPipelineIR(final List<SourceWithMetadata> sourcesWithMetadata,
+                                                final boolean supportEscapes, ConfigVariableExpander cve) throws InvalidIRException {
+        return compileSources(sourcesWithMetadata, supportEscapes, cve);
+    }
+
+    public static PipelineIR compileSources(List<SourceWithMetadata> sourcesWithMetadata, boolean supportEscapes, ConfigVariableExpander cve) throws InvalidIRException {
+        Map<PluginDefinition.Type, List<Graph>> groupedPipelineSections = sourcesWithMetadata.stream()
+                .map(swm -> compileGraph(swm, supportEscapes, cve))
+                .flatMap(m -> m.entrySet().stream())
+                .filter(e -> e.getValue() != null)
+                .collect(groupingBy(Map.Entry::getKey,
+                            mapping(Map.Entry::getValue, toList())));
+
+        Graph inputGraph = Graph.combine(groupedPipelineSections.get(PluginDefinition.Type.INPUT).toArray(new Graph[0])).graph;
+        Graph outputGraph = Graph.combine(groupedPipelineSections.get(PluginDefinition.Type.OUTPUT).toArray(new Graph[0])).graph;
+        Graph filterGraph = groupedPipelineSections.get(PluginDefinition.Type.FILTER).stream()
+                .reduce(ConfigCompiler::chainWithUntypedException).orElse(null);
+
+        String originalSource = sourcesWithMetadata.stream().map(SourceWithMetadata::getText).collect(Collectors.joining("\n"));
+        return new PipelineIR(inputGraph, filterGraph, outputGraph, originalSource);
+    }
+
+    private static Graph chainWithUntypedException(Graph g1, Graph g2) {
+        try {
+            return g1.chain(g2);
+        } catch (InvalidIRException iirex) {
+            throw new IllegalArgumentException(iirex);
+        }
+    }
+
+    private static Map<PluginDefinition.Type, Statement> compileImperative(SourceWithMetadata sourceWithMetadata,
+                                                                           boolean supportEscapes) {
         final IRubyObject compiler = RubyUtil.RUBY.executeScript(
-            "require 'logstash/compiler'\nLogStash::Compiler",
-            ""
+                "require 'logstash/compiler'\nLogStash::Compiler",
+                ""
         );
-        final IRubyObject code =
-            compiler.callMethod(RubyUtil.RUBY.getCurrentContext(), "compile_sources",
+        // invoke Ruby interpreter to execute LSCL treetop
+        final IRubyObject code = compiler.callMethod(RubyUtil.RUBY.getCurrentContext(), "compile_imperative",
                 new IRubyObject[]{
-                    RubyUtil.RUBY.newArray(
-                        JavaUtil.convertJavaToRuby(
-                            RubyUtil.RUBY,
-                            new SourceWithMetadata("str", "pipeline", 0, 0, config)
-                        )
-                    ),
-                    RubyUtil.RUBY.newBoolean(supportEscapes)
-                }
-            );
-        return code.toJava(PipelineIR.class);
+                        JavaUtil.convertJavaToRuby(RubyUtil.RUBY, sourceWithMetadata),
+                        RubyUtil.RUBY.newBoolean(supportEscapes)
+                });
+        RubyHash hash = (RubyHash) code;
+        Map<PluginDefinition.Type, Statement> result = new HashMap<>();
+        result.put(PluginDefinition.Type.INPUT, readStatementFromRubyHash(hash, "input"));
+        result.put(PluginDefinition.Type.FILTER, readStatementFromRubyHash(hash, "filter"));
+        result.put(PluginDefinition.Type.OUTPUT, readStatementFromRubyHash(hash, "output"));
+        return result;
+    }
+
+    private static Statement readStatementFromRubyHash(RubyHash hash, String key) {
+        IRubyObject inputValue = hash.fastARef(RubyUtil.RUBY.newString(key).intern());
+        return inputValue.toJava(Statement.class);
+    }
+
+    private static Map<PluginDefinition.Type, Graph> compileGraph(SourceWithMetadata swm, boolean supportEscapes, ConfigVariableExpander cve) {
+        Map<PluginDefinition.Type, Statement> pluginStatements = compileImperative(swm, supportEscapes);
+        return pluginStatements.entrySet().stream()
+                .collect(Collectors.toMap(Map.Entry::getKey, e -> toGraphWithUntypedException(e.getValue(), cve)));
+    }
+
+    private static Graph toGraphWithUntypedException(Statement s, ConfigVariableExpander cve) {
+        try {
+            return s.toGraph(cve);
+        } catch (InvalidIRException iirex) {
+            throw new IllegalArgumentException(iirex);
+        }
     }
 }
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/DSL.java b/logstash-core/src/main/java/org/logstash/config/ir/DSL.java
index be5905a72..76a87dc8f 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/DSL.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/DSL.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir;
 
 import java.util.Arrays;
@@ -5,6 +25,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.logstash.common.IncompleteSourceWithMetadataException;
 import org.logstash.common.SourceWithMetadata;
 import org.logstash.config.ir.expression.BooleanExpression;
@@ -36,6 +58,9 @@ import org.logstash.config.ir.imperative.PluginStatement;
 import org.logstash.config.ir.imperative.Statement;
 
 public class DSL {
+
+    private static final Logger logger = LogManager.getLogger(DSL.class);
+
     public static EventValueExpression eEventValue(SourceWithMetadata meta, String fieldName) {
         return new EventValueExpression(meta, fieldName);
     }
@@ -64,7 +89,7 @@ public class DSL {
         try {
             return eValue(null, value);
         } catch (InvalidIRException e) {
-            e.printStackTrace(); // Can't happen with an int
+            logger.debug(e.getMessage(), e);
             return null;
         }
     }
@@ -73,7 +98,7 @@ public class DSL {
         try {
             return eValue(null, value);
         } catch (InvalidIRException e) {
-            e.printStackTrace(); // Can't happen with an int
+            logger.debug(e.getMessage(), e);
             return null;
         }
     }
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/Hashable.java b/logstash-core/src/main/java/org/logstash/config/ir/Hashable.java
index b8da11f39..a1285d6d6 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/Hashable.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/Hashable.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir;
 
 public interface Hashable {
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/HashableWithSource.java b/logstash-core/src/main/java/org/logstash/config/ir/HashableWithSource.java
index c8ec08dbf..351930062 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/HashableWithSource.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/HashableWithSource.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir;
 
 import org.logstash.common.Util;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/InvalidIRException.java b/logstash-core/src/main/java/org/logstash/config/ir/InvalidIRException.java
index 17342a385..1cfe1e60e 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/InvalidIRException.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/InvalidIRException.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir;
 
 public class InvalidIRException extends Exception {
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/PipelineConfig.java b/logstash-core/src/main/java/org/logstash/config/ir/PipelineConfig.java
new file mode 100644
index 000000000..2a45283c6
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/config/ir/PipelineConfig.java
@@ -0,0 +1,214 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.config.ir;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.jruby.RubyArray;
+import org.jruby.RubyClass;
+import org.jruby.RubyObject;
+import org.jruby.RubyString;
+import org.jruby.RubySymbol;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.logstash.common.IncompleteSourceWithMetadataException;
+import org.logstash.common.SourceWithMetadata;
+import org.logstash.common.Util;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.logstash.RubyUtil.RUBY;
+
+public final class PipelineConfig {
+
+    private static class LineToSource {
+        private final int startLine;
+        private final int endLine;
+        private final SourceWithMetadata source;
+
+        LineToSource(int startLine, int endLine, SourceWithMetadata source) {
+            this.startLine = startLine;
+            this.endLine = endLine;
+            this.source = source;
+        }
+
+        boolean includeLine(int lineNumber) {
+            return startLine <= lineNumber && lineNumber <= endLine;
+        }
+    }
+
+    private static final Logger logger = LogManager.getLogger(PipelineConfig.class);
+
+    private RubyClass source;
+    private String pipelineId;
+    private List<SourceWithMetadata> confParts;
+    private RubyObject settings;
+    private LocalDateTime readAt;
+    private String configHash;
+    private volatile String configString;
+    private volatile String metadata;
+    private List<LineToSource> sourceRefs;
+
+    private static final String NEWLINE = "\n";
+
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    public PipelineConfig(RubyClass source, RubySymbol pipelineId, RubyObject uncastedConfigParts, RubyObject logstashSettings) {
+        IRubyObject uncasted = uncastedConfigParts.checkArrayType();
+        final RubyArray configParts = !uncasted.isNil() ?
+                (RubyArray) uncasted :
+                RubyArray.newArray(RUBY, uncastedConfigParts);
+
+        this.source = source;
+        this.pipelineId = pipelineId.name(RUBY.getCurrentContext()).asJavaString();
+        SourceWithMetadata[] castedConfigParts = (SourceWithMetadata[]) configParts.toJava(SourceWithMetadata[].class);
+        List<SourceWithMetadata> confParts = Arrays.asList(castedConfigParts);
+        confParts.sort(Comparator.comparing(SourceWithMetadata::getProtocol)
+                .thenComparing(SourceWithMetadata::getId));
+        this.confParts = confParts;
+        this.settings = logstashSettings;
+        this.readAt = LocalDateTime.now();
+    }
+
+    public RubyClass getSource() {
+        return source;
+    }
+
+    public String getPipelineId() {
+        return pipelineId;
+    }
+
+    public List<SourceWithMetadata> getConfigParts() {
+        return confParts;
+    }
+
+    public LocalDateTime getReadAt() {
+        return readAt;
+    }
+
+    public RubyObject getSettings() {
+        return settings;
+    }
+
+    public String configHash() {
+        if (configHash == null) {
+            configHash = Util.digest(configString() + metadataString());
+        }
+        return configHash;
+    }
+
+    public String configString() {
+        if (this.configString == null) {
+            synchronized(this) {
+                if (this.configString == null) {
+                    final StringBuilder compositeConfig = new StringBuilder();
+                    for (SourceWithMetadata confPart : confParts) {
+                        // If our composite config ends without a trailing newline,
+                        // append one before appending the next config part
+                        if (compositeConfig.lastIndexOf(NEWLINE) < compositeConfig.length() - 1 ) {
+                            compositeConfig.append(NEWLINE);
+                        }
+                        compositeConfig.append(confPart.getText());
+                    }
+                    this.configString = compositeConfig.toString();
+                }
+            }
+        }
+        return this.configString;
+    }
+
+    public String metadataString() {
+        if (this.metadata == null) {
+            synchronized(this) {
+                if (this.metadata == null) {
+                    this.metadata =  confParts.stream().map(SourceWithMetadata::getMetadata).collect(Collectors.joining());
+                }
+            }
+        }
+        return this.metadata;
+    }
+
+    public boolean isSystem() {
+        return this.settings.callMethod(RUBY.getCurrentContext(), "get_value",
+                                        RubyString.newString(RUBY, "pipeline.system"))
+                .isTrue();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof PipelineConfig)) {
+            return false;
+        }
+        PipelineConfig cother = (PipelineConfig) other;
+        return configHash().equals(cother.configHash()) &&
+                this.pipelineId.equals(cother.pipelineId) &&
+                this.settings.equals(cother.settings);
+    }
+
+    @Override
+    public int hashCode() {
+        return this.configHash().hashCode();
+    }
+
+    public void displayDebugInformation() {
+        logger.debug("-------- Logstash Config ---------");
+        logger.debug("Config from source, source: {}, pipeline_id:: {}", source, pipelineId);
+
+        for (SourceWithMetadata configPart : this.confParts) {
+            logger.debug("Config string, protocol: {}, id: {}", configPart.getProtocol(), configPart.getId());
+            logger.debug("\n\n{}", configPart.getText());
+        }
+        logger.debug("Merged config");
+        logger.debug("\n\n{}", this.configString());
+    }
+
+    public SourceWithMetadata lookupSource(int globalLineNumber, int sourceColumn)
+            throws IncompleteSourceWithMetadataException {
+        LineToSource lts = this.sourceReferences().stream()
+                .filter(lts1 -> lts1.includeLine(globalLineNumber))
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("can't find the config segment related to line " + globalLineNumber));
+        return new SourceWithMetadata(lts.source.getProtocol(), lts.source.getId(),
+                globalLineNumber + 1 - lts.startLine, sourceColumn, lts.source.getText());
+    }
+
+    private List<LineToSource> sourceReferences() {
+        if (this.sourceRefs == null) {
+            int offset = 0;
+            List<LineToSource> sourceRefs = new ArrayList<>();
+
+            for (SourceWithMetadata configPart : confParts) {
+                //line numbers starts from 1 in text files
+                int startLine = configPart.getLine() + offset + 1;
+                int endLine = configPart.getLinesCount() + offset;
+                LineToSource sourceSegment = new LineToSource(startLine, endLine, configPart);
+                sourceRefs.add(sourceSegment);
+                offset += configPart.getLinesCount();
+            }
+            this.sourceRefs = Collections.unmodifiableList(sourceRefs);
+        }
+        return this.sourceRefs;
+    }
+
+}
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/PipelineIR.java b/logstash-core/src/main/java/org/logstash/config/ir/PipelineIR.java
index f227b3e96..bdb760c8f 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/PipelineIR.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/PipelineIR.java
@@ -1,13 +1,31 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir;
 
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.logstash.common.Util;
-import org.logstash.config.ir.graph.Graph;
-import org.logstash.config.ir.graph.PluginVertex;
-import org.logstash.config.ir.graph.QueueVertex;
-import org.logstash.config.ir.graph.Vertex;
+import org.logstash.config.ir.graph.*;
 
 public final class PipelineIR implements Hashable {
 
@@ -22,7 +40,9 @@ public final class PipelineIR implements Hashable {
     }
 
     private final Graph graph;
+
     private final QueueVertex queue;
+
     // Temporary until we have LIR execution
     // Then we will no longer need this property here
     private final String originalSource;
@@ -37,15 +57,21 @@ public final class PipelineIR implements Hashable {
         Graph tempGraph = inputSection.copy(); // The input section are our roots, so we can import that wholesale
 
         // Connect all the input vertices out to the queue
-        queue = new QueueVertex();
-        tempGraph = tempGraph.chain(queue);
+        QueueVertex tempQueue = new QueueVertex();
+
+        tempGraph = tempGraph.chain(tempQueue);
 
         // Now we connect the queue to the root of the filter section
         tempGraph = tempGraph.chain(filterSection);
 
+        // Connect the filter section to the filter end vertex to separate from the output section
+        tempGraph = tempGraph.chain(new SeparatorVertex("filter_to_output"));
+
         // Finally, connect the filter out node to all the outputs
         this.graph = tempGraph.chain(outputSection);
 
+        this.queue = selectQueueVertex(this.graph, tempQueue);
+
         this.graph.validate();
 
         if (this.getOriginalSource() != null && !this.getOriginalSource().matches("^\\s+$")) {
@@ -110,4 +136,13 @@ public final class PipelineIR implements Hashable {
     public String uniqueHash() {
         return this.uniqueHash;
     }
+
+    private static QueueVertex selectQueueVertex(final Graph graph, final QueueVertex tempQueue) {
+        try {
+            return (QueueVertex) graph.getVertexById(tempQueue.getId());
+        } catch(NoSuchElementException e) {
+            // it's a pipeline without a queue
+            return tempQueue;
+        }
+    }
 }
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/PluginDefinition.java b/logstash-core/src/main/java/org/logstash/config/ir/PluginDefinition.java
index 4c6e12baf..eda84f68b 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/PluginDefinition.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/PluginDefinition.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/SourceComponent.java b/logstash-core/src/main/java/org/logstash/config/ir/SourceComponent.java
index 9d0bd997b..bd7482481 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/SourceComponent.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/SourceComponent.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir;
 
 import org.logstash.common.SourceWithMetadata;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/AbstractFilterDelegatorExt.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/AbstractFilterDelegatorExt.java
index 46bc7b1c3..2411f77af 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/AbstractFilterDelegatorExt.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/AbstractFilterDelegatorExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import org.jruby.Ruby;
@@ -11,14 +31,13 @@ import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.logstash.RubyUtil;
-import org.logstash.execution.WorkerLoop;
 import org.logstash.ext.JrubyEventExtLibrary;
 import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
 import org.logstash.instrument.metrics.MetricKeys;
+import org.logstash.instrument.metrics.timer.TimerMetric;
 import org.logstash.instrument.metrics.counter.LongCounter;
 
 import java.util.Collection;
-import java.util.concurrent.TimeUnit;
 
 @JRubyClass(name = "AbstractFilterDelegator")
 public abstract class AbstractFilterDelegatorExt extends RubyObject {
@@ -29,11 +48,11 @@ public abstract class AbstractFilterDelegatorExt extends RubyObject {
 
     protected RubyString id;
 
-    protected LongCounter eventMetricOut;
+    protected transient LongCounter eventMetricOut;
 
-    protected LongCounter eventMetricIn;
+    protected transient LongCounter eventMetricIn;
 
-    protected LongCounter eventMetricTime;
+    protected transient TimerMetric eventMetricTime;
 
     public AbstractFilterDelegatorExt(final Ruby runtime, final RubyClass metaClass) {
         super(runtime, metaClass);
@@ -46,7 +65,7 @@ public abstract class AbstractFilterDelegatorExt extends RubyObject {
             metricEvents = namespacedMetric.namespace(context, MetricKeys.EVENTS_KEY);
             eventMetricOut = LongCounter.fromRubyBase(metricEvents, MetricKeys.OUT_KEY);
             eventMetricIn = LongCounter.fromRubyBase(metricEvents, MetricKeys.IN_KEY);
-            eventMetricTime = LongCounter.fromRubyBase(metricEvents, MetricKeys.DURATION_IN_MILLIS_KEY);
+            eventMetricTime = TimerMetric.fromRubyBase(metricEvents, MetricKeys.DURATION_IN_MILLIS_KEY);
             namespacedMetric.gauge(context, MetricKeys.NAME_KEY, configName(context));
         }
     }
@@ -88,11 +107,11 @@ public abstract class AbstractFilterDelegatorExt extends RubyObject {
     protected abstract IRubyObject reloadable(final ThreadContext context);
 
     @JRubyMethod(name = "threadsafe?")
-    public IRubyObject concurrency(final ThreadContext context) {
-        return getConcurrency(context);
+    public IRubyObject threadsafe(final ThreadContext context) {
+        return isThreadsafe(context);
     }
 
-    protected abstract IRubyObject getConcurrency(final ThreadContext context);
+    protected abstract IRubyObject isThreadsafe(final ThreadContext context);
 
     @JRubyMethod(name = "config_name")
     public IRubyObject configName(final ThreadContext context) {
@@ -111,9 +130,7 @@ public abstract class AbstractFilterDelegatorExt extends RubyObject {
     public RubyArray multiFilter(final IRubyObject input) {
         RubyArray batch = (RubyArray) input;
         eventMetricIn.increment((long) batch.size());
-        final long start = System.nanoTime();
-        final RubyArray result = doMultiFilter(batch);
-        eventMetricTime.increment(TimeUnit.MILLISECONDS.convert(System.nanoTime() - start, TimeUnit.NANOSECONDS));
+        final RubyArray result = eventMetricTime.time(() -> doMultiFilter(batch));
         int count = 0;
         for (final JrubyEventExtLibrary.RubyEvent event : (Collection<JrubyEventExtLibrary.RubyEvent>) result) {
             if (!event.getEvent().isCancelled()) {
@@ -131,7 +148,7 @@ public abstract class AbstractFilterDelegatorExt extends RubyObject {
     @SuppressWarnings("rawtypes")
     public RubyArray flush(final IRubyObject input) {
         RubyHash options = (RubyHash) input;
-        final ThreadContext context = WorkerLoop.THREAD_CONTEXT.get();
+        final ThreadContext context = RubyUtil.RUBY.getCurrentContext();
         final IRubyObject newEvents = doFlush(context, options);
         final RubyArray result;
         if (newEvents.isNil()) {
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/AbstractOutputDelegatorExt.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/AbstractOutputDelegatorExt.java
index 2df5c678c..88728f531 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/AbstractOutputDelegatorExt.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/AbstractOutputDelegatorExt.java
@@ -1,7 +1,27 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import java.util.Collection;
-import java.util.concurrent.TimeUnit;
+
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
@@ -16,6 +36,7 @@ import org.logstash.ext.JrubyEventExtLibrary;
 import org.logstash.instrument.metrics.AbstractMetricExt;
 import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
 import org.logstash.instrument.metrics.MetricKeys;
+import org.logstash.instrument.metrics.timer.TimerMetric;
 import org.logstash.instrument.metrics.counter.LongCounter;
 
 @JRubyClass(name = "AbstractOutputDelegator")
@@ -33,11 +54,11 @@ public abstract class AbstractOutputDelegatorExt extends RubyObject {
 
     private RubyString id;
 
-    private LongCounter eventMetricOut;
+    private transient LongCounter eventMetricOut;
 
-    private LongCounter eventMetricIn;
+    private transient LongCounter eventMetricIn;
 
-    private LongCounter eventMetricTime;
+    private transient TimerMetric eventMetricTime;
 
     public AbstractOutputDelegatorExt(final Ruby runtime, final RubyClass metaClass) {
         super(runtime, metaClass);
@@ -97,9 +118,7 @@ public abstract class AbstractOutputDelegatorExt extends RubyObject {
         final RubyArray batch = (RubyArray) events;
         final int count = batch.size();
         eventMetricIn.increment((long) count);
-        final long start = System.nanoTime();
-        doOutput(batch);
-        eventMetricTime.increment(TimeUnit.MILLISECONDS.convert(System.nanoTime() - start, TimeUnit.NANOSECONDS));
+        eventMetricTime.time(() -> doOutput(batch));
         eventMetricOut.increment((long) count);
         return this;
     }
@@ -109,12 +128,12 @@ public abstract class AbstractOutputDelegatorExt extends RubyObject {
         final ThreadContext context = RubyUtil.RUBY.getCurrentContext();
         this.id = RubyString.newString(context.runtime, id);
         synchronized (metric) {
-            namespacedMetric = metric.namespace(context, context.runtime.newSymbol(id));
+            namespacedMetric = metric.namespace(context, context.runtime.newString(id).intern());
             metricEvents = namespacedMetric.namespace(context, MetricKeys.EVENTS_KEY);
             namespacedMetric.gauge(context, MetricKeys.NAME_KEY, configName(context));
             eventMetricOut = LongCounter.fromRubyBase(metricEvents, MetricKeys.OUT_KEY);
             eventMetricIn = LongCounter.fromRubyBase(metricEvents, MetricKeys.IN_KEY);
-            eventMetricTime = LongCounter.fromRubyBase(metricEvents, MetricKeys.DURATION_IN_MILLIS_KEY);
+            eventMetricTime = TimerMetric.fromRubyBase(metricEvents, MetricKeys.DURATION_IN_MILLIS_KEY);
         }
     }
 
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/BaseDataset.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/BaseDataset.java
index 7b4c2a011..0e3cc4bee 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/BaseDataset.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/BaseDataset.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 /**
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/ClassFields.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/ClassFields.java
index e2712648e..b4f5cf5e0 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/ClassFields.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/ClassFields.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import java.util.ArrayList;
@@ -23,6 +43,10 @@ final class ClassFields {
         return addField(FieldDefinition.fromValue(definitions.size(), obj));
     }
 
+    public ValueSyntaxElement add(final String fieldName, final Object obj) {
+        return addField(FieldDefinition.fromValue(fieldName, obj));
+    }
+
     /**
      * Adds a mutable field of the given type, that doesn't have a default value and is not
      * initialized by a constructor assignment.
@@ -34,6 +58,10 @@ final class ClassFields {
         return addField(FieldDefinition.mutableUnassigned(definitions.size(), type));
     }
 
+    public ValueSyntaxElement add(final String fieldName, final Class<?> type) {
+        return addField(FieldDefinition.mutableUnassigned(fieldName, type));
+    }
+
     /**
      * Add a {@link Closure} that should be executed in the constructor after field assignments
      * have been executed.
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/Closure.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/Closure.java
index 6173a8c35..86479cf74 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/Closure.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/Closure.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import java.util.ArrayList;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/CommonActions.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/CommonActions.java
index 3db6ef5dc..a1cd558b7 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/CommonActions.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/CommonActions.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import co.elastic.logstash.api.Event;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/ComputeStepSyntaxElement.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/ComputeStepSyntaxElement.java
index 2cf86c284..eb7e13161 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/ComputeStepSyntaxElement.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/ComputeStepSyntaxElement.java
@@ -1,5 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.googlejavaformat.java.Formatter;
 import com.google.googlejavaformat.java.FormatterException;
 import java.io.IOException;
@@ -11,11 +32,13 @@ import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 import org.codehaus.commons.compiler.CompileException;
-import org.codehaus.commons.compiler.ICookable;
+import org.codehaus.janino.Scanner;
 import org.codehaus.commons.compiler.ISimpleCompiler;
 import org.codehaus.janino.SimpleCompiler;
 
@@ -29,13 +52,16 @@ public final class ComputeStepSyntaxElement<T extends Dataset> {
 
     private static final Path SOURCE_DIR = debugDir();
 
-    private static final ISimpleCompiler COMPILER = new SimpleCompiler();
+    private static final ThreadLocal<ISimpleCompiler> COMPILER = ThreadLocal.withInitial(SimpleCompiler::new);
 
     /**
-     * Cache of runtime compiled classes to prevent duplicate classes being compiled.
+     * Global cache of runtime compiled classes to prevent duplicate classes being compiled.
+     * across pipelines and workers.
      */
-    private static final Map<ComputeStepSyntaxElement<?>, Class<? extends Dataset>> CLASS_CACHE
-        = new HashMap<>();
+    private static final ConcurrentHashMap<ComputeStepSyntaxElement<?>, Class<? extends Dataset>> CLASS_CACHE
+        = new ConcurrentHashMap<>(100);
+
+    private static final AtomicLong DATASET_CLASS_INDEX = new AtomicLong(0);
 
     /**
      * Pattern to remove redundant {@code ;} from formatted code since {@link Formatter} does not
@@ -43,64 +69,104 @@ public final class ComputeStepSyntaxElement<T extends Dataset> {
      */
     private static final Pattern REDUNDANT_SEMICOLON = Pattern.compile("\n[ ]*;\n");
 
+    private static final String CLASS_NAME_PLACEHOLDER = "CLASS_NAME_PLACEHOLDER";
+
+    private static final Pattern CLASS_NAME_PLACEHOLDER_REGEX = Pattern.compile(CLASS_NAME_PLACEHOLDER);
+
     private final Iterable<MethodSyntaxElement> methods;
 
     private final ClassFields fields;
 
     private final Class<T> type;
 
+    private final String normalizedSource;
+
     public static <T extends Dataset> ComputeStepSyntaxElement<T> create(
-        final Iterable<MethodSyntaxElement> methods, final ClassFields fields,
-        final Class<T> interfce) {
+        final Iterable<MethodSyntaxElement> methods,
+        final ClassFields fields,
+        final Class<T> interfce)
+    {
         return new ComputeStepSyntaxElement<>(methods, fields, interfce);
     }
 
-    private ComputeStepSyntaxElement(final Iterable<MethodSyntaxElement> methods,
-        final ClassFields fields, final Class<T> interfce) {
+    @VisibleForTesting
+    public static int classCacheSize() {
+        return CLASS_CACHE.size();
+    }
+
+    /*
+     * Used in a test to clean start, with class loaders wiped out into Janino compiler and cleared the cached classes.
+    * */
+    @VisibleForTesting
+    public static void cleanClassCache() {
+        synchronized (COMPILER) {
+            CLASS_CACHE.clear();
+        }
+    }
+
+    private ComputeStepSyntaxElement(
+        final Iterable<MethodSyntaxElement> methods,
+        final ClassFields fields,
+        final Class<T> interfce)
+    {
         this.methods = methods;
         this.fields = fields;
         type = interfce;
+
+        // normalizes away the name of the class so that two classes of different name but otherwise
+        // equivalent syntax get correctly compared by {@link #equals(Object)}.
+        normalizedSource = generateCode(CLASS_NAME_PLACEHOLDER);
     }
 
     @SuppressWarnings("unchecked")
     public T instantiate() {
-        // We need to globally synchronize to avoid concurrency issues with the internal class
-        // loader and the CLASS_CACHE
-        synchronized (COMPILER) {
+        try {
+            final Class<? extends Dataset> clazz = compile();
+            return (T) clazz.getConstructor(Map.class).newInstance(ctorArguments());
+        } catch (final NoSuchMethodException | InvocationTargetException | InstantiationException | IllegalAccessException ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    /*
+     * Returns a {@link Class<? extends Dataset>} for this {@link ComputeStepSyntaxElement}, reusing an existing
+     * equivalent implementation from the global class cache when one is available, or otherwise compiling one.
+     *
+     * This method _is_ thread-safe, and uses the locking semantics of {@link ConcurrentHashMap#computeIfAbsent}.
+     * To do so, it relies on {@link #hashCode()} and {@link #equals(Object)}.
+     */
+    private  Class<? extends Dataset> compile() {
+        return CLASS_CACHE.computeIfAbsent(this, (__)->{
             try {
-                final Class<? extends Dataset> clazz;
-                if (CLASS_CACHE.containsKey(this)) {
-                    clazz = CLASS_CACHE.get(this);
-                } else {
-                    final String name = String.format("CompiledDataset%d", CLASS_CACHE.size());
-                    final String code = generateCode(name);
+                final ISimpleCompiler compiler = COMPILER.get();
+                final String name = String.format("CompiledDataset%d", DATASET_CLASS_INDEX.incrementAndGet());
+                final String code = CLASS_NAME_PLACEHOLDER_REGEX.matcher(normalizedSource).replaceAll(name);
+                if (SOURCE_DIR != null) {
                     final Path sourceFile = SOURCE_DIR.resolve(String.format("%s.java", name));
                     Files.write(sourceFile, code.getBytes(StandardCharsets.UTF_8));
-                    COMPILER.cookFile(sourceFile.toFile());
-                    COMPILER.setParentClassLoader(COMPILER.getClassLoader());
-                    clazz = (Class<T>) COMPILER.getClassLoader().loadClass(
-                        String.format("org.logstash.generated.%s", name)
-                    );
-                    CLASS_CACHE.put(this, clazz);
+                    compiler.cookFile(sourceFile.toFile());
+                } else {
+                    compiler.cook(code);
                 }
-                return (T) clazz.<T>getConstructor(Map.class).newInstance(ctorArguments());
-            } catch (final CompileException | ClassNotFoundException | IOException
-                | NoSuchMethodException | InvocationTargetException | InstantiationException
-                | IllegalAccessException ex) {
+                return (Class<T>) compiler.getClassLoader().loadClass(
+                    String.format("org.logstash.generated.%s", name)
+                );
+            } catch (final CompileException | ClassNotFoundException | IOException ex) {
                 throw new IllegalStateException(ex);
             }
-        }
+        });
     }
 
     @Override
     public int hashCode() {
-        return normalizedSource().hashCode();
+        return normalizedSource.hashCode();
     }
 
     @Override
     public boolean equals(final Object other) {
         return other instanceof ComputeStepSyntaxElement &&
-            normalizedSource().equals(((ComputeStepSyntaxElement<?>) other).normalizedSource());
+            normalizedSource.equals(((ComputeStepSyntaxElement<?>) other).normalizedSource);
     }
 
     private String generateCode(final String name) {
@@ -125,17 +191,15 @@ public final class ComputeStepSyntaxElement<T extends Dataset> {
     }
 
     private static Path debugDir() {
-        final Path sourceDir;
+        Path sourceDir = null;
         try {
             final Path parentDir;
-            final String dir = System.getProperty(ICookable.SYSTEM_PROPERTY_SOURCE_DEBUGGING_DIR);
-            if (dir == null) {
-                parentDir = Files.createTempDirectory("logstash");
-            } else {
+            final String dir = System.getProperty(Scanner.SYSTEM_PROPERTY_SOURCE_DEBUGGING_DIR);
+            if (dir != null) {
                 parentDir = Paths.get(dir);
+                sourceDir = parentDir.resolve("org").resolve("logstash").resolve("generated");
+                Files.createDirectories(sourceDir);
             }
-            sourceDir = parentDir.resolve("org").resolve("logstash").resolve("generated");
-            Files.createDirectories(sourceDir);
         } catch (final IOException ex) {
             throw new IllegalStateException(ex);
         }
@@ -143,7 +207,7 @@ public final class ComputeStepSyntaxElement<T extends Dataset> {
     }
 
     /**
-     * @return Array of constructor arguments
+     * @return Map of constructor arguments, key is field's name, value is the instance of the parameter to pass.
      */
     private Map<String, Object> ctorArguments() {
         final Map<String, Object> result = new HashMap<>();
@@ -154,15 +218,6 @@ public final class ComputeStepSyntaxElement<T extends Dataset> {
         return result;
     }
 
-    /**
-     * Normalizes away the name of the class so that two classes of different name but otherwise
-     * equivalent syntax get correctly compared by {@link #equals(Object)}.
-     * @return Source of this class, with its name set to {@code CONSTANT}.
-     */
-    private String normalizedSource() {
-        return this.generateCode("CONSTANT");
-    }
-
     /**
      * Generates the Java code for defining one field and constructor argument for each given value.
      * constructor for
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/ConditionalEvaluationError.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/ConditionalEvaluationError.java
new file mode 100644
index 000000000..0dd464fc2
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/ConditionalEvaluationError.java
@@ -0,0 +1,23 @@
+package org.logstash.config.ir.compiler;
+
+import org.logstash.Event;
+
+/**
+ * Exception raised when an if-condition in a pipeline throws an error at runtime.
+ * */
+public class ConditionalEvaluationError extends RuntimeException {
+    private static final long serialVersionUID = -8633589068902565868L;
+
+    // This class is serializable because of inheritance from Throwable, however it's not expected
+    // to be ever transmitted on wire on stored in some binary storage.
+    private final transient Event failedEvent;
+
+    ConditionalEvaluationError(Throwable cause, Event failedEvent) {
+        super(cause);
+        this.failedEvent = failedEvent;
+    }
+
+    public Event failedEvent() {
+        return failedEvent;
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/Dataset.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/Dataset.java
index a3478ae56..4f28aa710 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/Dataset.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/Dataset.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import java.util.Collection;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/DatasetCompiler.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/DatasetCompiler.java
index 28717e983..956bbe18f 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/DatasetCompiler.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/DatasetCompiler.java
@@ -1,9 +1,30 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.stream.Collectors;
 import org.jruby.RubyArray;
 import org.jruby.RubyHash;
@@ -11,6 +32,7 @@ import org.jruby.internal.runtime.methods.DynamicMethod;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.logstash.RubyUtil;
+import org.logstash.execution.AbstractPipelineExt;
 import org.logstash.ext.JrubyEventExtLibrary;
 
 /**
@@ -33,11 +55,14 @@ public final class DatasetCompiler {
         // Utility Class
     }
 
-    public static ComputeStepSyntaxElement<SplitDataset> splitDataset(final Collection<Dataset> parents,
-        final EventCondition condition) {
+    public static ComputeStepSyntaxElement<SplitDataset> splitDataset(
+        final Collection<Dataset> parents,
+        final EventCondition condition,
+        final AbstractPipelineExt.ConditionalEvaluationListener conditionalErrListener)
+    {
         final ClassFields fields = new ClassFields();
-        final ValueSyntaxElement ifData = fields.add(new ArrayList<>());
-        final ValueSyntaxElement elseData = fields.add(new ArrayList<>());
+        final ValueSyntaxElement ifData = fields.add("ifData", new ArrayList<>());
+        final ValueSyntaxElement elseData = fields.add("elseData", new ArrayList<>());
         final ValueSyntaxElement right = fields.add(DatasetCompiler.Complement.class);
         final VariableDefinition event =
             new VariableDefinition(JrubyEventExtLibrary.RubyEvent.class, "event");
@@ -53,23 +78,38 @@ public final class DatasetCompiler {
                 )
             )
         );
-        final ValueSyntaxElement conditionField = fields.add(condition);
+        final ValueSyntaxElement conditionField = fields.add("condition", condition);
         final DatasetCompiler.ComputeAndClear compute;
+
+        final ValueSyntaxElement errorNotifier = fields.add(conditionalErrListener);
+        Closure exceptionHandlerBlock = Closure.wrap(
+                new SyntaxFactory.MethodCallReturnValue(SyntaxFactory.value("this"), "setDone"),
+                errorNotifier.call("notify", SyntaxFactory.value("ex")),
+                SyntaxFactory.ret(ifData));
+        ValueSyntaxElement exception = SyntaxFactory.value("ex");
+
         if (parents.isEmpty()) {
+            MethodLevelSyntaxElement safeLoop = SyntaxFactory.tryBlock(
+                    conditionalLoop(event, BATCH_ARG, conditionField, ifData, elseData),
+                    ConditionalEvaluationError.class, exceptionHandlerBlock, exception
+            );
             compute = withOutputBuffering(
-                conditionalLoop(event, BATCH_ARG, conditionField, ifData, elseData),
+                Closure.wrap(safeLoop),
                 Closure.wrap(clear(elseData)), ifData, fields
             );
         } else {
             final Collection<ValueSyntaxElement> parentFields =
                 parents.stream().map(fields::add).collect(Collectors.toList());
-            final ValueSyntaxElement inputBuffer = fields.add(new ArrayList<>());
+            final ValueSyntaxElement inputBuffer = fields.add("inputBuffer", new ArrayList<>());
+            MethodLevelSyntaxElement safeLoop = SyntaxFactory.tryBlock(
+                    conditionalLoop(event, inputBuffer, conditionField, ifData, elseData),
+                    ConditionalEvaluationError.class, exceptionHandlerBlock, exception);
             compute = withOutputBuffering(
                 withInputBuffering(
-                    conditionalLoop(event, inputBuffer, conditionField, ifData, elseData),
+                    Closure.wrap(safeLoop),
                     parentFields, inputBuffer
                 ),
-                clearSyntax(parentFields).add(clear(elseData)), ifData, fields
+                clearSyntax(parentFields).add(clear(elseData)).add(clear(inputBuffer)), ifData, fields
             );
         }
         return ComputeStepSyntaxElement.create(
@@ -84,21 +124,23 @@ public final class DatasetCompiler {
      * @param plugin Filter Plugin
      * @return Dataset representing the filter plugin
      */
-    public static ComputeStepSyntaxElement<Dataset> filterDataset(final Collection<Dataset> parents,
-        final AbstractFilterDelegatorExt plugin) {
+    public static ComputeStepSyntaxElement<Dataset> filterDataset(
+        final Collection<Dataset> parents,
+        final AbstractFilterDelegatorExt plugin)
+    {
         final ClassFields fields = new ClassFields();
-        final ValueSyntaxElement outputBuffer = fields.add(new ArrayList<>());
+        final ValueSyntaxElement outputBuffer = fields.add("outputBuffer", new ArrayList<>());
         final Closure clear = Closure.wrap();
         final Closure compute;
         if (parents.isEmpty()) {
             compute = filterBody(outputBuffer, BATCH_ARG, fields, plugin);
         } else {
-            final Collection<ValueSyntaxElement> parentFields =
-                parents.stream().map(fields::add).collect(Collectors.toList());
-            @SuppressWarnings("rawtypes")
-            final RubyArray inputBuffer = RubyUtil.RUBY.newArray();
+            final Collection<ValueSyntaxElement> parentFields = createParentStatementsFields(parents, fields);
+
+            @SuppressWarnings("rawtypes") final RubyArray inputBuffer = RubyUtil.RUBY.newArray();
             clear.add(clearSyntax(parentFields));
-            final ValueSyntaxElement inputBufferField = fields.add(inputBuffer);
+            final ValueSyntaxElement inputBufferField = fields.add("inputBuffer", inputBuffer);
+
             compute = withInputBuffering(
                 filterBody(outputBuffer, inputBufferField, fields, plugin),
                 parentFields, inputBufferField
@@ -107,8 +149,66 @@ public final class DatasetCompiler {
         return prepare(withOutputBuffering(compute, clear, outputBuffer, fields));
     }
 
+    private static Collection<ValueSyntaxElement> createParentStatementsFields(Collection<Dataset> parents, ClassFields fields) {
+        if (parents.size() == 1) {
+            return List.of(fields.add("parentStatement", parents.iterator().next()));
+        }
+
+        final Collection<ValueSyntaxElement> parentFields = new ArrayList<>();
+        int i = 0;
+        for (Dataset parent : parents) {
+            ValueSyntaxElement add = fields.add("parentStatement" + i, parent);
+            parentFields.add(add);
+            i++;
+        }
+        return parentFields;
+    }
+
+    private static boolean isContainedUnderIfStatement(Collection<Dataset> parents) {
+        return parents.size() == 1 && parents.iterator().next() instanceof SplitDataset;
+    }
+
     /**
-     * <p>Builds a terminal {@link Dataset} from the given parent {@link Dataset}s.</p>
+     * <p>Builds a terminal {@link Dataset} for the filters from the given parent {@link Dataset}s.</p>
+     * <p>If the given set of parent {@link Dataset} is empty the sum is defined as the
+     * trivial dataset that does not invoke any computation whatsoever.</p>
+     * {@link Dataset#compute(RubyArray, boolean, boolean)} is always
+     * {@link Collections#emptyList()}.
+     * @param parents Parent {@link Dataset} to sum
+     * @return Dataset representing the sum of given parent {@link Dataset}
+     */
+    public static Dataset terminalFilterDataset(final Collection<Dataset> parents) {
+        if (parents.isEmpty()) {
+            return Dataset.IDENTITY;
+        }
+
+        final int count = parents.size();
+        if (count == 1) {
+            // No need for a terminal dataset here, if there is only a single parent node we can
+            // call it directly.
+            return parents.iterator().next();
+        }
+
+        final ClassFields fields = new ClassFields();
+        final Collection<ValueSyntaxElement> parentFields = createParentStatementsFields(parents, fields);
+        @SuppressWarnings("rawtypes") final RubyArray inputBuffer = RubyUtil.RUBY.newArray();
+        final ValueSyntaxElement inputBufferField = fields.add(inputBuffer);
+        final ValueSyntaxElement outputBufferField = fields.add(new ArrayList<>());
+        final Closure clear = Closure.wrap().add(clearSyntax(parentFields));
+        final Closure compute = withInputBuffering(
+            Closure.wrap(
+                // pass thru filter
+                buffer(outputBufferField, inputBufferField)
+            ),
+            parentFields,
+            inputBufferField
+        );
+
+        return prepare(withOutputBuffering(compute, clear, outputBufferField, fields)).instantiate();
+    }
+
+    /**
+     * <p>Builds a terminal {@link Dataset} for the outputs from the given parent {@link Dataset}s.</p>
      * <p>If the given set of parent {@link Dataset} is empty the sum is defined as the
      * trivial dataset that does not invoke any computation whatsoever.</p>
      * {@link Dataset#compute(RubyArray, boolean, boolean)} is always
@@ -116,29 +216,29 @@ public final class DatasetCompiler {
      * @param parents Parent {@link Dataset} to sum and terminate
      * @return Dataset representing the sum of given parent {@link Dataset}
      */
-    public static Dataset terminalDataset(final Collection<Dataset> parents) {
-        final int count = parents.size();
-        final Dataset result;
-        if (count > 1) {
-            final ClassFields fields = new ClassFields();
-            final Collection<ValueSyntaxElement> parentFields =
-                parents.stream().map(fields::add).collect(Collectors.toList());
-            result = compileOutput(
-                Closure.wrap(
-                    parentFields.stream().map(DatasetCompiler::computeDataset)
-                        .toArray(MethodLevelSyntaxElement[]::new)
-                ).add(clearSyntax(parentFields)), Closure.EMPTY, fields
-            ).instantiate();
-        } else if (count == 1) {
-            // No need for a terminal dataset here, if there is only a single parent node we can
-            // call it directly.
-            result = parents.iterator().next();
-        } else {
+    public static Dataset terminalOutputDataset(final Collection<Dataset> parents) {
+        if (parents.isEmpty()) {
             throw new IllegalArgumentException(
-                "Cannot create Terminal Dataset for an empty number of parent datasets"
+                "Cannot create terminal output dataset for an empty number of parent datasets"
             );
         }
-        return result;
+
+        final int count = parents.size();
+        if (count == 1) {
+            // No need for a terminal dataset here, if there is only a single parent node we can
+            // call it directly.
+            return parents.iterator().next();
+        }
+
+        final ClassFields fields = new ClassFields();
+        final Collection<ValueSyntaxElement> parentFields = createParentStatementsFields(parents, fields);
+        final Closure compute =  Closure.wrap(parentFields
+                .stream()
+                .map(DatasetCompiler::computeDataset)
+                .toArray(MethodLevelSyntaxElement[]::new)
+        ).add(clearSyntax(parentFields));
+
+        return compileOutput(compute, Closure.EMPTY, fields).instantiate();
     }
 
     /**
@@ -157,17 +257,23 @@ public final class DatasetCompiler {
      * @param terminal Set to true if this output is the only output in the pipeline
      * @return Output Dataset
      */
-    public static ComputeStepSyntaxElement<Dataset> outputDataset(final Collection<Dataset> parents,
-        final AbstractOutputDelegatorExt output, final boolean terminal) {
+    public static ComputeStepSyntaxElement<Dataset> outputDataset(
+        final Collection<Dataset> parents,
+        final AbstractOutputDelegatorExt output,
+        final boolean terminal)
+    {
         final ClassFields fields = new ClassFields();
         final Closure clearSyntax;
         final Closure computeSyntax;
+        final ValueSyntaxElement outputField = fields.add("outputDelegator", output);
         if (parents.isEmpty()) {
             clearSyntax = Closure.EMPTY;
-            computeSyntax = Closure.wrap(invokeOutput(fields.add(output), BATCH_ARG));
+            computeSyntax = Closure.wrap(
+                setPluginIdForLog4j(outputField),
+                invokeOutput(outputField, BATCH_ARG),
+                unsetPluginIdForLog4j());
         } else {
-            final Collection<ValueSyntaxElement> parentFields =
-                parents.stream().map(fields::add).collect(Collectors.toList());
+            final Collection<ValueSyntaxElement> parentFields = createParentStatementsFields(parents, fields);
             @SuppressWarnings("rawtypes")
             final RubyArray buffer = RubyUtil.RUBY.newArray();
             final Closure inlineClear;
@@ -178,30 +284,42 @@ public final class DatasetCompiler {
                 inlineClear = Closure.EMPTY;
                 clearSyntax = clearSyntax(parentFields);
             }
-            final ValueSyntaxElement inputBuffer = fields.add(buffer);
+            final ValueSyntaxElement inputBuffer = fields.add("inputBuffer", buffer);
             computeSyntax = withInputBuffering(
-                Closure.wrap(invokeOutput(fields.add(output), inputBuffer), inlineClear),
+                Closure.wrap(
+                    setPluginIdForLog4j(outputField),
+                    invokeOutput(outputField, inputBuffer),
+                    inlineClear,
+                    unsetPluginIdForLog4j()
+                ),
                 parentFields, inputBuffer
             );
         }
         return compileOutput(computeSyntax, clearSyntax, fields);
     }
 
-    private static ValueSyntaxElement invokeOutput(final ValueSyntaxElement output,
-        final MethodLevelSyntaxElement events) {
+    private static ValueSyntaxElement invokeOutput(
+        final ValueSyntaxElement output,
+        final MethodLevelSyntaxElement events)
+    {
         return output.call("multiReceive", events);
     }
 
-    private static Closure filterBody(final ValueSyntaxElement outputBuffer,
-        final ValueSyntaxElement inputBuffer, final ClassFields fields,
-        final AbstractFilterDelegatorExt plugin) {
-        final ValueSyntaxElement filterField = fields.add(plugin);
+    private static Closure filterBody(
+        final ValueSyntaxElement outputBuffer,
+        final ValueSyntaxElement inputBuffer,
+        final ClassFields fields,
+        final AbstractFilterDelegatorExt plugin)
+    {
+        final ValueSyntaxElement filterField = fields.add("plugin", plugin);
         final Closure body = Closure.wrap(
+            setPluginIdForLog4j(filterField),
             buffer(outputBuffer, filterField.call("multiFilter", inputBuffer))
         );
         if (plugin.hasFlush()) {
             body.add(callFilterFlush(fields, outputBuffer, filterField, !plugin.periodicFlush()));
         }
+        body.add(unsetPluginIdForLog4j());
         return body;
     }
 
@@ -210,8 +328,13 @@ public final class DatasetCompiler {
         final ValueSyntaxElement ifData, final ValueSyntaxElement elseData) {
         final ValueSyntaxElement eventVal = event.access();
         return Closure.wrap(
-                SyntaxFactory.value("org.logstash.config.ir.compiler.Utils")
-                        .call("filterEvents", inputBuffer, condition, ifData, elseData)
+            SyntaxFactory.value("org.logstash.config.ir.compiler.Utils").call(
+                "filterEvents",
+                inputBuffer,
+                condition,
+                ifData,
+                elseData
+            )
         );
     }
 
@@ -239,11 +362,15 @@ public final class DatasetCompiler {
      */
     private static Closure withInputBuffering(final Closure compute,
         final Collection<ValueSyntaxElement> parents, final ValueSyntaxElement inputBuffer) {
-        return Closure.wrap(
-                parents.stream().map(par -> SyntaxFactory.value("org.logstash.config.ir.compiler.Utils")
-                        .call("copyNonCancelledEvents", computeDataset(par), inputBuffer)
-                ).toArray(MethodLevelSyntaxElement[]::new)
-        ).add(compute).add(clear(inputBuffer));
+        return computeNonCancelledEventsBlock(parents, inputBuffer)
+                .add(compute)
+                .add(clear(inputBuffer));
+    }
+
+    private static Closure computeNonCancelledEventsBlock(Collection<ValueSyntaxElement> parents, ValueSyntaxElement inputBuffer) {
+        return Closure.wrap(parents.stream().map(par -> SyntaxFactory.value("org.logstash.config.ir.compiler.Utils")
+                .call("copyNonCancelledEvents", computeDataset(par), inputBuffer)
+        ).toArray(MethodLevelSyntaxElement[]::new));
     }
 
     /**
@@ -283,14 +410,14 @@ public final class DatasetCompiler {
         final boolean shutdownOnly) {
         final MethodLevelSyntaxElement condition;
         final ValueSyntaxElement flushArgs;
-        final ValueSyntaxElement flushFinal = fields.add(flushOpts(true));
+        final ValueSyntaxElement flushFinal = fields.add("shutdownFlushOptions", flushOpts(true));
         if (shutdownOnly) {
             condition = SyntaxFactory.and(FLUSH_ARG, SHUTDOWN_ARG);
             flushArgs = flushFinal;
         } else {
             condition = FLUSH_ARG;
             flushArgs = SyntaxFactory.ternary(
-                SHUTDOWN_ARG, flushFinal, fields.add(flushOpts(false))
+                SHUTDOWN_ARG, flushFinal, fields.add("flushOptions", flushOpts(false))
             );
         }
         return SyntaxFactory.ifCondition(
@@ -298,6 +425,21 @@ public final class DatasetCompiler {
         );
     }
 
+    private static MethodLevelSyntaxElement unsetPluginIdForLog4j() {
+        return SyntaxFactory.value("org.apache.logging.log4j.ThreadContext").call(
+                "remove",
+                SyntaxFactory.value("\"plugin.id\"")
+        );
+    }
+
+    private static MethodLevelSyntaxElement setPluginIdForLog4j(final ValueSyntaxElement plugin) {
+        return SyntaxFactory.value("org.apache.logging.log4j.ThreadContext").call(
+                "put",
+                SyntaxFactory.value("\"plugin.id\""),
+                plugin.call("getId").call("toString")
+        );
+    }
+
     private static MethodLevelSyntaxElement clear(final ValueSyntaxElement field) {
         return field.call("clear");
     }
@@ -319,8 +461,10 @@ public final class DatasetCompiler {
         );
     }
 
-    private static MethodLevelSyntaxElement buffer(final ValueSyntaxElement resultBuffer,
-        final ValueSyntaxElement argument) {
+    private static MethodLevelSyntaxElement buffer(
+        final ValueSyntaxElement resultBuffer,
+        final ValueSyntaxElement argument)
+    {
         return resultBuffer.call("addAll", argument);
     }
 
@@ -378,9 +522,13 @@ public final class DatasetCompiler {
             if (done) {
                 return data;
             }
-            parent.compute(batch, flush, shutdown);
-            done = true;
-            return data;
+            try {
+                parent.compute(batch, flush, shutdown);
+                done = true;
+                return data;
+            } catch (ConditionalEvaluationError ex) {
+                return data;
+            }
         }
 
         @Override
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/EventCondition.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/EventCondition.java
index f76b6eb35..62e3a3e69 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/EventCondition.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/EventCondition.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import java.util.HashMap;
@@ -5,7 +25,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Predicate;
+
+import org.jruby.Ruby;
+import org.jruby.RubyRegexp;
 import org.jruby.RubyString;
+import org.jruby.java.proxies.ConcreteJavaProxy;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
 import org.logstash.ConvertedList;
@@ -19,6 +43,7 @@ import org.logstash.config.ir.expression.BinaryBooleanExpression;
 import org.logstash.config.ir.expression.BooleanExpression;
 import org.logstash.config.ir.expression.EventValueExpression;
 import org.logstash.config.ir.expression.Expression;
+import org.logstash.config.ir.expression.RegexValueExpression;
 import org.logstash.config.ir.expression.ValueExpression;
 import org.logstash.config.ir.expression.binary.And;
 import org.logstash.config.ir.expression.binary.Eq;
@@ -32,8 +57,8 @@ import org.logstash.config.ir.expression.binary.Or;
 import org.logstash.config.ir.expression.binary.RegexEq;
 import org.logstash.config.ir.expression.unary.Not;
 import org.logstash.config.ir.expression.unary.Truthy;
-import org.logstash.execution.WorkerLoop;
 import org.logstash.ext.JrubyEventExtLibrary;
+import org.logstash.secret.SecretVariable;
 
 /**
  * A pipeline execution "if" condition, compiled from the {@link BooleanExpression} of an
@@ -49,7 +74,7 @@ public interface EventCondition {
     boolean fulfilled(JrubyEventExtLibrary.RubyEvent event);
 
     /**
-     * <h3>EventCondition Compiler.</h3>
+     * <h2>EventCondition Compiler.</h2>
      * Compiles {@link BooleanExpression} into {@link EventCondition} globally ensuring that no
      * duplicate {@link EventCondition} are generated by strict synchronization on the internal
      * compiler cache {@link EventCondition.Compiler#cache}.
@@ -78,6 +103,7 @@ public interface EventCondition {
          * All compilation is globally {@code synchronized} on {@link EventCondition.Compiler#cache}
          * to minimize code size by avoiding compiling logically equivalent expressions in more than
          * one instance.
+         *
          * @param expression BooleanExpress to compile
          * @return Compiled {@link EventCondition}
          */
@@ -102,7 +128,7 @@ public interface EventCondition {
                 } else if (expression instanceof Not) {
                     condition = not((Not) expression);
                 } else if (expression instanceof Gt || expression instanceof Gte
-                    || expression instanceof Lt || expression instanceof Lte) {
+                        || expression instanceof Lt || expression instanceof Lte) {
                     condition = comparison((BinaryBooleanExpression) expression);
                 } else if (expression instanceof Neq) {
                     condition = not(eq((BinaryBooleanExpression) expression));
@@ -129,7 +155,7 @@ public interface EventCondition {
                 first = buildCondition((BooleanExpression) left);
                 second = truthy((EventValueExpression) right);
             } else if (right instanceof BooleanExpression &&
-                left instanceof EventValueExpression) {
+                    left instanceof EventValueExpression) {
                 first = truthy((EventValueExpression) left);
                 second = buildCondition((BooleanExpression) right);
             } else {
@@ -160,28 +186,34 @@ public interface EventCondition {
         /**
          * Checks if a {@link BinaryBooleanExpression} consists of a {@link ValueExpression} on the
          * left and a {@link EventValueExpression} on the right.
+         *
          * @param expression Expression to check type for
          * @return True if the left branch of the {@link BinaryBooleanExpression} is a
          * {@link ValueExpression} and its right side is a {@link EventValueExpression}.
          */
         private static boolean vAndE(final BinaryBooleanExpression expression) {
             return expression.getLeft() instanceof ValueExpression &&
-                expression.getRight() instanceof EventValueExpression;
+                    expression.getRight() instanceof EventValueExpression;
         }
 
         private static boolean vAndV(final BinaryBooleanExpression expression) {
             return expression.getLeft() instanceof ValueExpression &&
-                expression.getRight() instanceof ValueExpression;
+                    expression.getRight() instanceof ValueExpression;
         }
 
         private static boolean eAndV(final BinaryBooleanExpression expression) {
             return expression.getLeft() instanceof EventValueExpression &&
-                expression.getRight() instanceof ValueExpression;
+                    expression.getRight() instanceof ValueExpression;
         }
 
         private static boolean eAndE(final BinaryBooleanExpression expression) {
             return expression.getLeft() instanceof EventValueExpression &&
-                expression.getRight() instanceof EventValueExpression;
+                    expression.getRight() instanceof EventValueExpression;
+        }
+
+        private static boolean vAndR(final BinaryBooleanExpression expression) {
+            return expression.getLeft() instanceof ValueExpression &&
+                    expression.getRight() instanceof RegexValueExpression;
         }
 
         private static EventCondition truthy(final Truthy truthy) {
@@ -189,6 +221,8 @@ public interface EventCondition {
             final Expression inner = truthy.getExpression();
             if (inner instanceof EventValueExpression) {
                 condition = truthy((EventValueExpression) inner);
+            } else if (inner instanceof ValueExpression) {
+                condition = constant(valueIsTruthy(((ValueExpression) inner).get()));
             } else {
                 throw new EventCondition.Compiler.UnexpectedTypeException(inner);
             }
@@ -201,8 +235,13 @@ public interface EventCondition {
             final Expression uright = regex.getRight();
             if (eAndV(regex)) {
                 condition = new EventCondition.Compiler.FieldMatches(
-                    ((EventValueExpression) uleft).getFieldName(),
-                    ((ValueExpression) uright).get().toString()
+                        ((EventValueExpression) uleft).getFieldName(),
+                        ((ValueExpression) uright).get().toString()
+                );
+            } else if (vAndR(regex)) {
+                condition = new EventCondition.Compiler.ConstantMatches(
+                        ((ValueExpression) uleft).get(),
+                        ((RegexValueExpression) uright).get().toString()
                 );
             } else {
                 throw new EventCondition.Compiler.UnexpectedTypeException(uleft, uright);
@@ -233,19 +272,19 @@ public interface EventCondition {
             final Expression uright = expression.getRight();
             if (eAndV(expression)) {
                 condition = compareFieldToConstant(
-                    (EventValueExpression) uleft, (ValueExpression) uright, conditional
+                        (EventValueExpression) uleft, (ValueExpression) uright, conditional
                 );
             } else if (vAndE(expression)) {
                 condition = compareFieldToConstant(
-                    (EventValueExpression) uright, (ValueExpression) uleft, converse
+                        (EventValueExpression) uright, (ValueExpression) uleft, converse
                 );
             } else if (vAndV(expression)) {
                 return compareConstants(
-                    (ValueExpression) uleft, (ValueExpression) uright, conditional
+                        (ValueExpression) uleft, (ValueExpression) uright, conditional
                 );
             } else {
                 return compareFields(
-                    (EventValueExpression) uleft, (EventValueExpression) uright, conditional
+                        (EventValueExpression) uleft, (EventValueExpression) uright, conditional
                 );
             }
             return condition;
@@ -257,26 +296,26 @@ public interface EventCondition {
             final EventCondition condition;
             if (eAndV(in) && isScalar((ValueExpression) in.getRight())) {
                 condition = new EventCondition.Compiler.FieldInConstantScalar(
-                    FieldReference.from(((EventValueExpression) left).getFieldName()),
-                    ((ValueExpression) right).get().toString()
+                        FieldReference.from(((EventValueExpression) left).getFieldName()),
+                        ((ValueExpression) right).get().toString()
                 );
             } else if (vAndE(in) && isScalar((ValueExpression) in.getLeft())) {
                 final Object leftv = ((ValueExpression) left).get();
                 final FieldReference rfield =
-                    FieldReference.from(((EventValueExpression) right).getFieldName());
+                        FieldReference.from(((EventValueExpression) right).getFieldName());
                 if (leftv instanceof String) {
                     condition = new EventCondition.Compiler.ConstantStringInField(
-                        rfield, (String) leftv
+                            rfield, (String) leftv
                     );
                 } else {
                     condition = new EventCondition.Compiler.ConstantScalarInField(rfield, leftv);
                 }
             } else if (eAndV(in) && listValueRight(in)) {
                 condition = in(
-                    (EventValueExpression) left, (List<?>) ((ValueExpression) right).get()
+                        (EventValueExpression) left, (List<?>) ((ValueExpression) right).get()
                 );
             } else if (eAndE(in)) {
-                condition = in((EventValueExpression) right, (EventValueExpression) left);
+                condition = in((EventValueExpression) left, (EventValueExpression) right);
             } else if (vAndV(in)) {
                 condition = in((ValueExpression) left, (ValueExpression) right);
             } else {
@@ -287,14 +326,15 @@ public interface EventCondition {
 
         private static EventCondition in(final EventValueExpression left, final List<?> right) {
             return new EventCondition.Compiler.FieldInConstantList(
-                FieldReference.from(left.getFieldName()), right
+                    FieldReference.from(left.getFieldName()), right
             );
         }
 
         /**
          * Compiles a constant (due to both of its sides being constant {@link ValueExpression})
          * conditional.
-         * @param left Constant left side {@link ValueExpression}
+         *
+         * @param left  Constant left side {@link ValueExpression}
          * @param right Constant right side {@link ValueExpression}
          * @return Constant {@link EventCondition}
          */
@@ -304,12 +344,12 @@ public interface EventCondition {
             final boolean res;
             if (found instanceof ConvertedList && other instanceof RubyString) {
                 res = ((ConvertedList) found).stream().anyMatch(item -> item.toString()
-                    .equals(other.toString()));
+                        .equals(other.toString()));
             } else if (found instanceof RubyString && other instanceof RubyString) {
                 res = found.toString().contains(other.toString());
             } else if (found instanceof RubyString && other instanceof ConvertedList) {
                 res = ((ConvertedList) other).stream()
-                    .anyMatch(item -> item.toString().equals(found.toString()));
+                        .anyMatch(item -> item.toString().equals(found.toString()));
             } else {
                 res = found != null && found.equals(other);
             }
@@ -326,18 +366,18 @@ public interface EventCondition {
         }
 
         private static EventCondition in(final EventValueExpression left,
-            final EventValueExpression right) {
+                                         final EventValueExpression right) {
             return new EventCondition.Compiler.FieldInField(
-                FieldReference.from(left.getFieldName()), FieldReference.from(right.getFieldName())
+                    FieldReference.from(left.getFieldName()), FieldReference.from(right.getFieldName())
             );
         }
 
         @SuppressWarnings("unchecked")
         private static EventCondition eq(final EventValueExpression evalE,
-            final ValueExpression valE) {
+                                         final ValueExpression valE) {
             return rubyFieldEquals(
-                (Comparable<IRubyObject>) Rubyfier.deep(RubyUtil.RUBY, valE.get()),
-                evalE.getFieldName()
+                    (Comparable<IRubyObject>) Rubyfier.deep(RubyUtil.RUBY, valE.get()),
+                    evalE.getFieldName()
             );
         }
 
@@ -353,14 +393,14 @@ public interface EventCondition {
                 condition = eq((EventValueExpression) left, (EventValueExpression) right);
             } else {
                 condition = constant(
-                    ((ValueExpression) left).get().equals(((ValueExpression) right).get())
+                        ((ValueExpression) left).get().equals(((ValueExpression) right).get())
                 );
             }
             return condition;
         }
 
         private static EventCondition eq(final EventValueExpression first,
-            final EventValueExpression second) {
+                                         final EventValueExpression second) {
             final FieldReference field1 = FieldReference.from(first.getFieldName());
             final FieldReference field2 = FieldReference.from(second.getFieldName());
             return event -> {
@@ -380,30 +420,30 @@ public interface EventCondition {
         }
 
         private static EventCondition compareConstants(final ValueExpression left,
-            final ValueExpression right, final Predicate<Integer> operator) {
+                                                       final ValueExpression right, final Predicate<Integer> operator) {
             return constant(operator.test(compare(left.get(), right.get())));
         }
 
         private static EventCondition compareFields(final EventValueExpression left,
-            final EventValueExpression right, final Predicate<Integer> operator) {
+                                                    final EventValueExpression right, final Predicate<Integer> operator) {
             final FieldReference one = FieldReference.from(left.getFieldName());
             final FieldReference other = FieldReference.from(right.getFieldName());
             return event -> {
                 final Event javaEvent = event.getEvent();
                 return operator.test(
-                    compare(
-                        javaEvent.getUnconvertedField(one), javaEvent.getUnconvertedField(other)
-                    )
+                        compare(
+                                javaEvent.getUnconvertedField(one), javaEvent.getUnconvertedField(other)
+                        )
                 );
             };
         }
 
         @SuppressWarnings("unchecked")
         private static EventCondition compareFieldToConstant(final EventValueExpression left,
-            final ValueExpression right, final Predicate<Integer> operator) {
+                                                             final ValueExpression right, final Predicate<Integer> operator) {
             final FieldReference one = FieldReference.from(left.getFieldName());
             final Comparable<IRubyObject> other =
-                (Comparable<IRubyObject>) Rubyfier.deep(RubyUtil.RUBY, right.get());
+                    (Comparable<IRubyObject>) Rubyfier.deep(RubyUtil.RUBY, right.get());
             return event -> {
                 final Event javaEvent = event.getEvent();
                 return operator.test(compare(javaEvent.getUnconvertedField(one), other));
@@ -420,7 +460,8 @@ public interface EventCondition {
 
         /**
          * Contains function using Ruby equivalent comparison logic.
-         * @param list List to find value in
+         *
+         * @param list  List to find value in
          * @param value Value to find in list
          * @return True iff value is in list
          */
@@ -434,35 +475,81 @@ public interface EventCondition {
         }
 
         private static EventCondition rubyFieldEquals(final Comparable<IRubyObject> left,
-            final String field) {
+                                                      final String field) {
             final FieldReference reference = FieldReference.from(field);
+
+            final Comparable<IRubyObject> decryptedLeft = eventuallyDecryptSecretVariable(left);
             return event ->
-                    left.equals(Rubyfier.deep(RubyUtil.RUBY, event.getEvent().getUnconvertedField(reference)));
+                    decryptedLeft.equals(Rubyfier.deep(RubyUtil.RUBY, event.getEvent().getUnconvertedField(reference)));
+        }
+
+        private static Comparable<IRubyObject> eventuallyDecryptSecretVariable(Comparable<IRubyObject> value) {
+            if (!(value instanceof ConcreteJavaProxy)) {
+                return value;
+            }
+            if (!((ConcreteJavaProxy) value).getJavaClass().isAssignableFrom(SecretVariable.class)) {
+                return value;
+            }
+            SecretVariable secret = ((ConcreteJavaProxy) value).toJava(SecretVariable.class);
+            return RubyUtil.RUBY.newString(secret.getSecretValue());
         }
 
         private static EventCondition constant(final boolean value) {
             return value ? event -> true : event -> false;
         }
 
+        private static boolean valueIsTruthy(Object object) {
+            if (object == null) {
+                return false;
+            }
+            final String other = object.toString();
+            return other != null && !other.isEmpty() &&
+                    !Boolean.toString(false).equals(other);
+        }
+
+        private static RubyRegexp newRegexp(String pattern) {
+            final Ruby runtime = RubyUtil.RUBY;
+            return RubyRegexp.newRegexpFromStr(runtime, runtime.newString(pattern), 0);
+        }
+
+        private static boolean matches(RubyString str, RubyRegexp regexp) {
+            return regexp.match_p(RubyUtil.RUBY.getCurrentContext(), str).isTrue(); // match? returns true/false
+        }
+
         private static final class FieldMatches implements EventCondition {
 
             private final FieldReference field;
 
-            private final RubyString regex;
+            private final RubyRegexp regexp;
 
-            private FieldMatches(final String field, final String regex) {
+            private FieldMatches(final String field, final String pattern) {
                 this.field = FieldReference.from(field);
-                this.regex = RubyUtil.RUBY.newString(regex);
+                this.regexp = newRegexp(pattern);
             }
 
             @Override
             public boolean fulfilled(final JrubyEventExtLibrary.RubyEvent event) {
-                final Object tomatch = event.getEvent().getUnconvertedField(field);
-                return tomatch instanceof RubyString &&
-                    !((RubyString) tomatch).match(WorkerLoop.THREAD_CONTEXT.get(), regex).isNil();
+                final Object toMatch = event.getEvent().getUnconvertedField(field);
+                return toMatch instanceof RubyString && matches((RubyString) toMatch, regexp);
             }
         }
 
+        private static final class ConstantMatches implements EventCondition {
+
+            private final boolean matches;
+
+            private ConstantMatches(final Object constant, final String pattern) {
+                this.matches = constant instanceof String &&
+                        matches(RubyUtil.RUBY.newString((String) constant), newRegexp(pattern));
+            }
+
+            @Override
+            public boolean fulfilled(final JrubyEventExtLibrary.RubyEvent event) {
+                return matches;
+            }
+
+        }
+
         private static final class ConstantStringInField implements EventCondition {
 
             private final FieldReference field;
@@ -481,8 +568,8 @@ public interface EventCondition {
             public boolean fulfilled(final JrubyEventExtLibrary.RubyEvent event) {
                 final Object found = event.getEvent().getUnconvertedField(field);
                 return found instanceof RubyString &&
-                    ((RubyString) found).getByteList().indexOf(bytes) > -1
-                    || found instanceof ConvertedList && contains((ConvertedList) found, string);
+                        ((RubyString) found).getByteList().indexOf(bytes) > -1
+                        || found instanceof ConvertedList && contains((ConvertedList) found, string);
             }
         }
 
@@ -501,7 +588,7 @@ public interface EventCondition {
             public boolean fulfilled(final JrubyEventExtLibrary.RubyEvent event) {
                 final Object found = event.getEvent().getUnconvertedField(field);
                 return found instanceof ConvertedList && contains((ConvertedList) found, value)
-                    || Objects.equals(found, field);
+                        || Objects.equals(found, field);
             }
         }
 
@@ -520,7 +607,7 @@ public interface EventCondition {
             public boolean fulfilled(final JrubyEventExtLibrary.RubyEvent event) {
                 final Object found = event.getEvent().getUnconvertedField(field);
                 return found instanceof RubyString &&
-                    value.indexOf(((RubyString) found).getByteList()) > -1;
+                        value.indexOf(((RubyString) found).getByteList()) > -1;
             }
         }
 
@@ -542,8 +629,8 @@ public interface EventCondition {
                 if (lfound instanceof ConvertedList || lfound instanceof ConvertedMap) {
                     return false;
                 } else if (lfound instanceof RubyString && rfound instanceof RubyString) {
-                    return ((RubyString) lfound).getByteList()
-                        .indexOf(((RubyString) rfound).getByteList()) > -1;
+                    return ((RubyString) rfound).getByteList()
+                            .indexOf(((RubyString) lfound).getByteList()) > -1;
                 } else if (rfound instanceof ConvertedList) {
                     return contains((ConvertedList) rfound, lfound);
                 } else {
@@ -567,7 +654,7 @@ public interface EventCondition {
             public boolean fulfilled(final JrubyEventExtLibrary.RubyEvent event) {
                 final Object found = event.getEvent().getUnconvertedField(field);
                 return found != null &&
-                    value.stream().anyMatch(val -> val.toString().equals(found.toString()));
+                        value.stream().anyMatch(val -> val.toString().equals(found.toString()));
             }
         }
 
@@ -582,12 +669,7 @@ public interface EventCondition {
             @Override
             public boolean fulfilled(final JrubyEventExtLibrary.RubyEvent event) {
                 final Object object = event.getEvent().getUnconvertedField(field);
-                if (object == null) {
-                    return false;
-                }
-                final String other = object.toString();
-                return other != null && !other.isEmpty() &&
-                    !Boolean.toString(false).equals(other);
+                return valueIsTruthy(object);
             }
         }
 
@@ -602,21 +684,39 @@ public interface EventCondition {
 
             UnexpectedTypeException(final Expression left, final Expression right) {
                 super(
-                    String.format("Unexpected input types %s %s", left.getClass(), right.getClass())
+                        String.format(
+                                "Unexpected conditional input combination of '%s' (left) and '%s' (right)", getUnexpectedTypeDetails(left), getUnexpectedTypeDetails(right)
+                        )
                 );
             }
 
             UnexpectedTypeException(final Object inner) {
-                super(String.format("Unexpected input type %s", inner.getClass()));
+                super(String.format("Unexpected conditional input type '%s'", getUnexpectedTypeDetails(inner)));
             }
 
             UnexpectedTypeException(final Object left, final Object right) {
                 super(
-                    String.format(
-                        "Unexpected input type combination %s %s", left.getClass(), right.getClass()
-                    )
+                        String.format(
+                                "Unexpected conditional input combination of '%s' (left) and '%s' (right)", getUnexpectedTypeDetails(left), getUnexpectedTypeDetails(right)
+                        )
                 );
             }
+
+            private static String getUnexpectedTypeDetails(Object unexpected) {
+                String details;
+                if (unexpected instanceof Expression) {
+                    Expression expression = (Expression)unexpected;
+                    details = (expression.getSourceWithMetadata() != null) ? expression.getSourceWithMetadata().toString()
+                                                                           : expression.toString();
+                } else {
+                    if (unexpected == null) {
+                        details = "<null-value>";
+                    } else {
+                        details = unexpected.toString();
+                    }
+                }
+                return String.format("%s:%s", unexpected == null ? "<no-class>" : unexpected.getClass(), details);
+            }
         }
     }
 }
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/FieldDeclarationGroup.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/FieldDeclarationGroup.java
index 457f88563..5d39b3310 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/FieldDeclarationGroup.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/FieldDeclarationGroup.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import java.util.Collection;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/FieldDefinition.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/FieldDefinition.java
index 06a361908..4ed2ba3b2 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/FieldDefinition.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/FieldDefinition.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 /**
@@ -26,6 +46,12 @@ final class FieldDefinition implements SyntaxElement {
         );
     }
 
+    public static FieldDefinition fromValue(final String fieldName, final Object value) {
+        return new FieldDefinition(
+                variableDefinition(value.getClass(), fieldName), false, null, value
+        );
+    }
+
     /**
      * Creates a mutable field with given type and without an assigned value.
      * @param index Index for naming
@@ -38,6 +64,12 @@ final class FieldDefinition implements SyntaxElement {
         );
     }
 
+    public static FieldDefinition mutableUnassigned(final String fieldName, final Class<?> type) {
+        return new FieldDefinition(
+            variableDefinition(type, fieldName), true, null, null
+        );
+    }
+
     private FieldDefinition(final VariableDefinition typeDef, final boolean mutable,
         final SyntaxElement initializer, final Object ctorArgument) {
         this.def = typeDef;
@@ -78,4 +110,9 @@ final class FieldDefinition implements SyntaxElement {
     private static VariableDefinition variableDefinition(final Class<?> type, final int index) {
         return new VariableDefinition(type, String.format("field%d", index));
     }
+
+    private static VariableDefinition variableDefinition(final Class<?> type, final String fieldName) {
+        return new VariableDefinition(type, String.format("%sField", fieldName));
+    }
+
 }
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/FilterDelegatorExt.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/FilterDelegatorExt.java
index 6a39c9e06..0e6ee681c 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/FilterDelegatorExt.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/FilterDelegatorExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -5,17 +25,21 @@ import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
 import org.jruby.RubyHash;
+import org.jruby.RubyObject;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.internal.runtime.methods.DynamicMethod;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
-import org.logstash.RubyUtil;
-import org.logstash.execution.WorkerLoop;
 import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
+import org.logstash.instrument.metrics.timer.NullTimerMetric;
 import org.logstash.instrument.metrics.counter.LongCounter;
 
+import java.util.UUID;
+
+import static org.logstash.RubyUtil.RUBY;
+
 @JRubyClass(name = "FilterDelegator")
 public final class FilterDelegatorExt extends AbstractFilterDelegatorExt {
 
@@ -25,9 +49,9 @@ public final class FilterDelegatorExt extends AbstractFilterDelegatorExt {
 
     private RubyClass filterClass;
 
-    private IRubyObject filter;
+    private transient IRubyObject filter;
 
-    private DynamicMethod filterMethod;
+    private transient DynamicMethod filterMethod;
 
     private boolean flushes;
 
@@ -44,13 +68,15 @@ public final class FilterDelegatorExt extends AbstractFilterDelegatorExt {
     }
 
     @VisibleForTesting
-    public FilterDelegatorExt initForTesting(final IRubyObject filter) {
+    public FilterDelegatorExt initForTesting(final IRubyObject filter, RubyObject configNameDouble) {
         eventMetricOut = LongCounter.DUMMY_COUNTER;
         eventMetricIn = LongCounter.DUMMY_COUNTER;
-        eventMetricTime = LongCounter.DUMMY_COUNTER;
+        eventMetricTime = NullTimerMetric.getInstance();
         this.filter = filter;
         filterMethod = filter.getMetaClass().searchMethod(FILTER_METHOD_NAME);
         flushes = filter.respondsTo("flush");
+        filterClass = configNameDouble.getType();
+        id = RUBY.newString(UUID.randomUUID().toString());
         return this;
     }
 
@@ -84,7 +110,7 @@ public final class FilterDelegatorExt extends AbstractFilterDelegatorExt {
     }
 
     @Override
-    protected IRubyObject getConcurrency(final ThreadContext context) {
+    protected IRubyObject isThreadsafe(final ThreadContext context) {
         return filter.callMethod(context, "threadsafe?");
     }
 
@@ -96,8 +122,14 @@ public final class FilterDelegatorExt extends AbstractFilterDelegatorExt {
     @Override
     @SuppressWarnings({"rawtypes"})
     protected RubyArray doMultiFilter(final RubyArray batch) {
-        return (RubyArray) filterMethod.call(
-                WorkerLoop.THREAD_CONTEXT.get(), filter, filterClass, FILTER_METHOD_NAME, batch);
+        final IRubyObject pluginId = this.getId();
+        org.apache.logging.log4j.ThreadContext.put("plugin.id", pluginId.toString());
+        try {
+            return (RubyArray) filterMethod.call(
+                    RUBY.getCurrentContext(), filter, filterClass, FILTER_METHOD_NAME, batch);
+        } finally {
+            org.apache.logging.log4j.ThreadContext.remove("plugin.id");
+        }
     }
 
     @Override
@@ -112,6 +144,6 @@ public final class FilterDelegatorExt extends AbstractFilterDelegatorExt {
 
     @Override
     protected boolean getPeriodicFlush() {
-        return filter.callMethod(RubyUtil.RUBY.getCurrentContext(), "periodic_flush").isTrue();
+        return filter.callMethod(RUBY.getCurrentContext(), "periodic_flush").isTrue();
     }
 }
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/JavaCodecDelegator.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/JavaCodecDelegator.java
new file mode 100644
index 000000000..744063326
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/JavaCodecDelegator.java
@@ -0,0 +1,118 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.config.ir.compiler;
+
+import co.elastic.logstash.api.Codec;
+import co.elastic.logstash.api.Context;
+import co.elastic.logstash.api.CounterMetric;
+import co.elastic.logstash.api.Event;
+import co.elastic.logstash.api.NamespacedMetric;
+import co.elastic.logstash.api.PluginConfigSpec;
+import co.elastic.logstash.api.TimerMetric;
+import org.logstash.instrument.metrics.MetricKeys;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.Map;
+import java.util.function.Consumer;
+
+public class JavaCodecDelegator implements Codec {
+
+    private final Codec codec;
+
+    protected final CounterMetric encodeMetricIn;
+
+    protected final TimerMetric encodeMetricTime;
+
+    protected final CounterMetric decodeMetricIn;
+
+    protected final CounterMetric decodeMetricOut;
+
+    protected final TimerMetric decodeMetricTime;
+
+    public JavaCodecDelegator(final Context context, final Codec codec) {
+        this.codec = codec;
+
+        final NamespacedMetric metric = context.getMetric(codec);
+
+        synchronized(metric.root()) {
+            metric.gauge(MetricKeys.NAME_KEY.asJavaString(), codec.getName());
+
+            final NamespacedMetric encodeMetric = metric.namespace(MetricKeys.ENCODE_KEY.asJavaString());
+            encodeMetricIn = encodeMetric.counter(MetricKeys.WRITES_IN_KEY.asJavaString());
+            encodeMetricTime = encodeMetric.timer(MetricKeys.DURATION_IN_MILLIS_KEY.asJavaString());
+
+            final NamespacedMetric decodeMetric = metric.namespace(MetricKeys.DECODE_KEY.asJavaString());
+            decodeMetricIn = decodeMetric.counter(MetricKeys.WRITES_IN_KEY.asJavaString());
+            decodeMetricOut = decodeMetric.counter(MetricKeys.OUT_KEY.asJavaString());
+            decodeMetricTime = decodeMetric.timer(MetricKeys.DURATION_IN_MILLIS_KEY.asJavaString());
+        }
+    }
+
+    @Override
+    public void decode(final ByteBuffer buffer, final Consumer<Map<String, Object>> eventConsumer) {
+        decodeMetricIn.increment();
+
+        decodeMetricTime.time(() -> codec.decode(buffer, (event) -> {
+            decodeMetricOut.increment();
+            eventConsumer.accept(event);
+        }));
+    }
+
+    @Override
+    public void flush(final ByteBuffer buffer, final Consumer<Map<String, Object>> eventConsumer) {
+        decodeMetricIn.increment();
+
+        decodeMetricTime.time(() -> codec.flush(buffer, (event) -> {
+            decodeMetricOut.increment();
+            eventConsumer.accept(event);
+        }));
+    }
+
+    @Override
+    public void encode(final Event event, final OutputStream out) throws IOException {
+        encodeMetricIn.increment();
+
+        encodeMetricTime.time(() -> codec.encode(event, out));
+    }
+
+    @Override
+    public Codec cloneCodec() {
+        return codec.cloneCodec();
+    }
+
+    @Override
+    public Collection<PluginConfigSpec<?>> configSchema() {
+        return codec.configSchema();
+    }
+
+    @Override
+    public String getName() {
+        return codec.getName();
+    }
+
+    @Override
+    public String getId() {
+        return codec.getId();
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/JavaFilterDelegatorExt.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/JavaFilterDelegatorExt.java
index 0e4638ec4..1431e681d 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/JavaFilterDelegatorExt.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/JavaFilterDelegatorExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import co.elastic.logstash.api.Event;
@@ -28,13 +48,11 @@ public class JavaFilterDelegatorExt extends AbstractFilterDelegatorExt {
 
     private static final long serialVersionUID = 1L;
 
-    private static final RubySymbol CONCURRENCY = RubyUtil.RUBY.newSymbol("java");
-
     private RubyString configName;
 
-    private Filter filter;
+    private transient Filter filter;
 
-    private FilterMatchListener filterMatchListener;
+    private transient FilterMatchListener filterMatchListener;
 
     public JavaFilterDelegatorExt(final Ruby runtime, final RubyClass metaClass) {
         super(runtime, metaClass);
@@ -47,7 +65,7 @@ public class JavaFilterDelegatorExt extends AbstractFilterDelegatorExt {
                 new JavaFilterDelegatorExt(RubyUtil.RUBY, RubyUtil.JAVA_FILTER_DELEGATOR_CLASS);
         instance.configName = RubyUtil.RUBY.newString(configName);
         AbstractNamespacedMetricExt scopedMetric =
-                metric.namespace(RubyUtil.RUBY.getCurrentContext(), RubyUtil.RUBY.newSymbol(filter.getId()));
+                metric.namespace(RubyUtil.RUBY.getCurrentContext(), RubyUtil.RUBY.newString(filter.getId()).intern());
         instance.initMetrics(id, scopedMetric);
         instance.filter = filter;
         instance.initializeFilterMatchListener(pluginArgs);
@@ -76,9 +94,10 @@ public class JavaFilterDelegatorExt extends AbstractFilterDelegatorExt {
     protected IRubyObject doFlush(final ThreadContext context, final RubyHash options) {
         if (filter.requiresFlush()) {
             Collection<Event> outputEvents = filter.flush(filterMatchListener);
-            @SuppressWarnings("rawtypes") RubyArray newBatch = RubyArray.newArray(RubyUtil.RUBY, outputEvents.size());
+            final Ruby runtime = context.runtime;
+            @SuppressWarnings("rawtypes") RubyArray newBatch = RubyArray.newArray(runtime, outputEvents.size());
             for (Event outputEvent : outputEvents) {
-                newBatch.add(JrubyEventExtLibrary.RubyEvent.newRubyEvent(RubyUtil.RUBY, (org.logstash.Event)outputEvent));
+                newBatch.add(JrubyEventExtLibrary.RubyEvent.newRubyEvent(runtime, (org.logstash.Event)outputEvent));
             }
             return newBatch;
         }
@@ -88,11 +107,13 @@ public class JavaFilterDelegatorExt extends AbstractFilterDelegatorExt {
 
     @Override
     protected IRubyObject closeImpl(final ThreadContext context) {
+        filter.close();
         return context.nil;
     }
 
     @Override
     protected IRubyObject doCloseImpl(final ThreadContext context) {
+        filter.close();
         return context.nil;
     }
 
@@ -107,8 +128,8 @@ public class JavaFilterDelegatorExt extends AbstractFilterDelegatorExt {
     }
 
     @Override
-    protected IRubyObject getConcurrency(final ThreadContext context) {
-        return CONCURRENCY;
+    protected IRubyObject isThreadsafe(final ThreadContext context) {
+        return context.tru;
     }
 
     @Override
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/JavaInputDelegatorExt.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/JavaInputDelegatorExt.java
index 6bdcece18..9e7bf0d13 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/JavaInputDelegatorExt.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/JavaInputDelegatorExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import co.elastic.logstash.api.Input;
@@ -6,11 +26,10 @@ import org.jruby.RubyClass;
 import org.jruby.RubyObject;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
-import org.jruby.javasupport.JavaObject;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.logstash.RubyUtil;
-import org.logstash.execution.JavaBasePipelineExt;
+import org.logstash.execution.AbstractPipelineExt;
 import org.logstash.execution.queue.QueueWriter;
 import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
 import org.logstash.instrument.metrics.MetricKeys;
@@ -26,22 +45,22 @@ public class JavaInputDelegatorExt extends RubyObject {
 
     private AbstractNamespacedMetricExt metric;
 
-    private JavaBasePipelineExt pipeline;
+    private AbstractPipelineExt pipeline;
 
-    private Input input;
+    private transient Input input;
 
-    private DecoratingQueueWriter decoratingQueueWriter;
+    private transient DecoratingQueueWriter decoratingQueueWriter;
 
     public JavaInputDelegatorExt(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);
     }
 
-    public static JavaInputDelegatorExt create(final JavaBasePipelineExt pipeline,
+    public static JavaInputDelegatorExt create(final AbstractPipelineExt pipeline,
                                                final AbstractNamespacedMetricExt metric, final Input input,
                                                final Map<String, Object> pluginArgs) {
         final JavaInputDelegatorExt instance =
                 new JavaInputDelegatorExt(RubyUtil.RUBY, RubyUtil.JAVA_INPUT_DELEGATOR_CLASS);
-        AbstractNamespacedMetricExt scopedMetric = metric.namespace(RubyUtil.RUBY.getCurrentContext(), RubyUtil.RUBY.newSymbol(input.getId()));
+        AbstractNamespacedMetricExt scopedMetric = metric.namespace(RubyUtil.RUBY.getCurrentContext(), RubyUtil.RUBY.newString(input.getId()).intern());
         scopedMetric.gauge(RubyUtil.RUBY.getCurrentContext(), MetricKeys.NAME_KEY, RubyUtil.RUBY.newString(input.getName()));
         instance.setMetric(RubyUtil.RUBY.getCurrentContext(), scopedMetric);
         instance.input = input;
@@ -60,10 +79,14 @@ public class JavaInputDelegatorExt extends RubyObject {
         } else {
             queueWriter = qw;
         }
-        Thread t = new Thread(() -> input.start(queueWriter::push));
+        Thread t = new Thread(() -> {
+            org.apache.logging.log4j.ThreadContext.put("pipeline.id", pipeline.pipelineId().toString());
+            org.apache.logging.log4j.ThreadContext.put("plugin.id", this.getId(context).toString());
+            input.start(queueWriter::push);
+        });
         t.setName(pipeline.pipelineId().asJavaString() + "_" + input.getName() + "_" + input.getId());
         t.start();
-        return JavaObject.wrap(context.getRuntime(), t);
+        return RubyUtil.toRubyObject(t);
     }
 
     @JRubyMethod(name = "metric=")
@@ -118,6 +141,11 @@ public class JavaInputDelegatorExt extends RubyObject {
         return this;
     }
 
+    @JRubyMethod(name = "reloadable?")
+    public IRubyObject isReloadable(final ThreadContext context) {
+        return context.tru;
+    }
+
     @SuppressWarnings("unchecked")
     private void initializeQueueWriter(Map<String, Object> pluginArgs) {
         List<Function<Map<String, Object>, Map<String, Object>>> inputActions = new ArrayList<>();
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/JavaOutputDelegatorExt.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/JavaOutputDelegatorExt.java
index 3edcc2bb4..31304e31f 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/JavaOutputDelegatorExt.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/JavaOutputDelegatorExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import java.util.Collection;
@@ -27,13 +47,13 @@ public final class JavaOutputDelegatorExt extends AbstractOutputDelegatorExt {
 
     private RubyString configName;
 
-    private Consumer<Collection<JrubyEventExtLibrary.RubyEvent>> outputFunction;
+    private transient Consumer<Collection<JrubyEventExtLibrary.RubyEvent>> outputFunction;
 
-    private Runnable closeAction;
+    private transient Runnable closeAction;
 
-    private Runnable registerAction;
+    private transient Runnable registerAction;
 
-    private Output output;
+    private transient Output output;
 
     public JavaOutputDelegatorExt(final Ruby runtime, final RubyClass metaClass) {
         super(runtime, metaClass);
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/MethodLevelSyntaxElement.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/MethodLevelSyntaxElement.java
index 213a4ba1e..88b514b0c 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/MethodLevelSyntaxElement.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/MethodLevelSyntaxElement.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 /**
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/MethodSyntaxElement.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/MethodSyntaxElement.java
index 9ff96d014..ed419e954 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/MethodSyntaxElement.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/MethodSyntaxElement.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import java.util.Arrays;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/OutputDelegatorExt.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/OutputDelegatorExt.java
index 2e6c5516c..bea5d5bab 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/OutputDelegatorExt.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/OutputDelegatorExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -12,32 +32,43 @@ import org.jruby.runtime.Block;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.logstash.execution.ExecutionContextExt;
-import org.logstash.execution.WorkerLoop;
 import org.logstash.ext.JrubyEventExtLibrary;
 import org.logstash.instrument.metrics.AbstractMetricExt;
 
+import static org.logstash.RubyUtil.RUBY;
+
 @JRubyClass(name = "OutputDelegator")
 public final class OutputDelegatorExt extends AbstractOutputDelegatorExt {
 
     private static final long serialVersionUID = 1L;
 
-    private IRubyObject outputClass;
+    private transient IRubyObject outputClass;
 
     private OutputStrategyExt.AbstractOutputStrategyExt strategy;
 
     @JRubyMethod(required = 5)
     public OutputDelegatorExt initialize(final ThreadContext context, final IRubyObject[] arguments) {
+        ExecutionContextExt executionContext = (ExecutionContextExt) arguments[2];
+        RubyClass klass = (RubyClass) arguments[0];
+        AbstractMetricExt metric = (AbstractMetricExt) arguments[1];
+        OutputStrategyExt.OutputStrategyRegistryExt strategyRegistry = (OutputStrategyExt.OutputStrategyRegistryExt) arguments[3];
+        RubyHash args = (RubyHash) arguments[4];
         return initialize(
-            context, (RubyHash) arguments[4], (RubyClass) arguments[0], (AbstractMetricExt) arguments[1],
-            (ExecutionContextExt) arguments[2],
-            (OutputStrategyExt.OutputStrategyRegistryExt) arguments[3]
+            context,
+            args,
+            klass,
+            metric,
+            executionContext,
+            strategyRegistry
         );
     }
 
-    public OutputDelegatorExt initialize(final ThreadContext context, final RubyHash args,
-        final RubyClass outputClass, final AbstractMetricExt metric,
-        final ExecutionContextExt executionContext,
-        final OutputStrategyExt.OutputStrategyRegistryExt strategyRegistry) {
+    public OutputDelegatorExt initialize(final ThreadContext context,
+                                         final RubyHash args,
+                                         final RubyClass outputClass,
+                                         final AbstractMetricExt metric,
+                                         final ExecutionContextExt executionContext,
+                                         final OutputStrategyExt.OutputStrategyRegistryExt strategyRegistry) {
         this.outputClass = outputClass;
         initMetrics(
             args.op_aref(context, RubyString.newString(context.runtime, "id")).asJavaString(),
@@ -75,9 +106,13 @@ public final class OutputDelegatorExt extends AbstractOutputDelegatorExt {
     @Override
     protected void doOutput(final Collection<JrubyEventExtLibrary.RubyEvent> batch) {
         try {
-            strategy.multiReceive(WorkerLoop.THREAD_CONTEXT.get(), (IRubyObject) batch);
+            final IRubyObject pluginId = this.getId();
+            org.apache.logging.log4j.ThreadContext.put("plugin.id", pluginId.toString());
+            strategy.multiReceive(RUBY.getCurrentContext(), (IRubyObject) batch);
         } catch (final InterruptedException ex) {
             throw new IllegalStateException(ex);
+        } finally {
+            org.apache.logging.log4j.ThreadContext.remove("plugin.id");
         }
     }
 
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/OutputStrategyExt.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/OutputStrategyExt.java
index 4f90b86a8..d46c5db06 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/OutputStrategyExt.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/OutputStrategyExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import java.util.concurrent.ArrayBlockingQueue;
@@ -12,9 +32,14 @@ import org.jruby.RubyObject;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.internal.runtime.methods.DynamicMethod;
+import org.jruby.runtime.Block;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.logstash.RubyUtil;
+import org.logstash.execution.ExecutionContextExt;
+import org.logstash.plugins.factory.ContextualizerExt;
+
+import static org.logstash.RubyUtil.PLUGIN_CONTEXTUALIZER_MODULE;
 
 public final class OutputStrategyExt {
 
@@ -54,8 +79,8 @@ public final class OutputStrategyExt {
         }
 
         @JRubyMethod
-        public IRubyObject classes() {
-            return map.rb_values();
+        public IRubyObject classes(final ThreadContext context) {
+            return map.values(context);
         }
 
         @JRubyMethod
@@ -78,7 +103,7 @@ public final class OutputStrategyExt {
                     String.format(
                         "Could not find output delegator strategy of type '%s'. Value strategies: %s",
                         type.asJavaString(),
-                        map.rb_values().stream().map(v -> ((IRubyObject) v).asJavaString())
+                        map.values(context).stream().map(v -> ((IRubyObject) v).asJavaString())
                             .collect(Collectors.joining(", "))
                     )
                 );
@@ -92,7 +117,7 @@ public final class OutputStrategyExt {
 
         private static final long serialVersionUID = 1L;
 
-        private DynamicMethod outputMethod;
+        private transient DynamicMethod outputMethod;
 
         private RubyClass outputClass;
 
@@ -144,9 +169,9 @@ public final class OutputStrategyExt {
 
         private static final long serialVersionUID = 1L;
 
-        private BlockingQueue<IRubyObject> workerQueue;
+        private transient BlockingQueue<IRubyObject> workerQueue;
 
-        private IRubyObject workerCount;
+        private transient IRubyObject workerCount;
 
         private @SuppressWarnings({"rawtypes"}) RubyArray workers;
 
@@ -156,6 +181,9 @@ public final class OutputStrategyExt {
 
         @JRubyMethod(required = 4)
         public IRubyObject initialize(final ThreadContext context, final IRubyObject[] args) {
+            final RubyClass outputClass = (RubyClass) args[0];
+            final IRubyObject metric = args[1];
+            final ExecutionContextExt executionContext = (ExecutionContextExt) args[2];
             final RubyHash pluginArgs = (RubyHash) args[3];
             workerCount = pluginArgs.op_aref(context, context.runtime.newString("workers"));
             if (workerCount.isNil()) {
@@ -165,12 +193,9 @@ public final class OutputStrategyExt {
             workerQueue = new ArrayBlockingQueue<>(count);
             workers = context.runtime.newArray(count);
             for (int i = 0; i < count; ++i) {
-                final RubyClass outputClass = (RubyClass) args[0];
-                // Calling "new" here manually to allow mocking the ctor in RSpec Tests
-                final IRubyObject output = outputClass.callMethod(context, "new", pluginArgs);
+                final IRubyObject output = ContextualizerExt.initializePlugin(context, executionContext, outputClass, pluginArgs);
                 initOutputCallsite(outputClass);
-                output.callMethod(context, "metric=", args[1]);
-                output.callMethod(context, "execution_context=", args[2]);
+                output.callMethod(context, "metric=", metric);
                 workers.append(output);
                 workerQueue.add(output);
             }
@@ -219,7 +244,7 @@ public final class OutputStrategyExt {
 
         private static final long serialVersionUID = 1L;
 
-        private IRubyObject output;
+        private transient IRubyObject output;
 
         protected SimpleAbstractOutputStrategyExt(final Ruby runtime, final RubyClass metaClass) {
             super(runtime, metaClass);
@@ -228,11 +253,15 @@ public final class OutputStrategyExt {
         @JRubyMethod(required = 4)
         public IRubyObject initialize(final ThreadContext context, final IRubyObject[] args) {
             final RubyClass outputClass = (RubyClass) args[0];
+            final IRubyObject metric = args[1];
+            final ExecutionContextExt executionContext = (ExecutionContextExt) args[2];
+            final RubyHash pluginArgs = (RubyHash) args[3];
+            // TODO: fixup mocks
             // Calling "new" here manually to allow mocking the ctor in RSpec Tests
-            output = args[0].callMethod(context, "new", args[3]);
+            output = ContextualizerExt.initializePlugin(context, executionContext, outputClass, pluginArgs);
+
             initOutputCallsite(outputClass);
-            output.callMethod(context, "metric=", args[1]);
-            output.callMethod(context, "execution_context=", args[2]);
+            output.callMethod(context, "metric=", metric);
             return this;
         }
 
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/PluginFactory.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/PluginFactory.java
deleted file mode 100644
index 304a720f4..000000000
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/PluginFactory.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.logstash.config.ir.compiler;
-
-import co.elastic.logstash.api.Codec;
-import org.jruby.RubyInteger;
-import org.jruby.RubyString;
-import org.jruby.runtime.builtin.IRubyObject;
-import co.elastic.logstash.api.Configuration;
-import co.elastic.logstash.api.Context;
-import co.elastic.logstash.api.Filter;
-import co.elastic.logstash.api.Input;
-
-import java.util.Map;
-
-/**
- * Factory that can instantiate Java plugins as well as Ruby plugins.
- */
-public interface PluginFactory extends RubyIntegration.PluginFactory {
-
-    Input buildInput(String name, String id, Configuration configuration, Context context);
-
-    Filter buildFilter(
-            String name, String id, Configuration configuration, Context context
-    );
-
-    final class Default implements PluginFactory {
-
-        private final RubyIntegration.PluginFactory rubyFactory;
-
-        public Default(final RubyIntegration.PluginFactory rubyFactory) {
-            this.rubyFactory = rubyFactory;
-        }
-
-        @Override
-        public Input buildInput(final String name, final String id, final Configuration configuration, final Context context) {
-            return null;
-        }
-
-        @Override
-        public Filter buildFilter(final String name, final String id, final Configuration configuration, final Context context) {
-            return null;
-        }
-
-        @Override
-        public IRubyObject buildInput(final RubyString name, final RubyInteger line, final RubyInteger column,
-                                      final IRubyObject args, Map<String, Object> pluginArgs) {
-            return rubyFactory.buildInput(name, line, column, args, pluginArgs);
-        }
-
-        @Override
-        public AbstractOutputDelegatorExt buildOutput(final RubyString name, final RubyInteger line,
-                                                      final RubyInteger column, final IRubyObject args,
-                                                      final Map<String, Object> pluginArgs) {
-            return rubyFactory.buildOutput(name, line, column, args, pluginArgs);
-        }
-
-        @Override
-        public AbstractFilterDelegatorExt buildFilter(final RubyString name, final RubyInteger line,
-                                                      final RubyInteger column, final IRubyObject args,
-                                                      final Map<String, Object> pluginArgs) {
-            return rubyFactory.buildFilter(name, line, column, args, pluginArgs);
-        }
-
-        @Override
-        public IRubyObject buildCodec(final RubyString name, final IRubyObject args, Map<String, Object> pluginArgs) {
-            return rubyFactory.buildCodec(name, args, pluginArgs);
-        }
-
-        @Override
-        public Codec buildDefaultCodec(final String codecName) {
-            return null;
-        }
-    }
-}
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/RubyIntegration.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/RubyIntegration.java
index d84059729..ba46b2cb8 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/RubyIntegration.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/RubyIntegration.java
@@ -1,11 +1,30 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import co.elastic.logstash.api.Codec;
-import org.jruby.RubyInteger;
+import org.jruby.RubyObject;
 import org.jruby.RubyString;
 import org.jruby.runtime.builtin.IRubyObject;
-
-import java.util.Map;
+import org.logstash.common.SourceWithMetadata;
 
 /**
  * This class holds interfaces implemented by Ruby concrete classes.
@@ -21,18 +40,16 @@ public final class RubyIntegration {
      */
     public interface PluginFactory {
 
-        IRubyObject buildInput(RubyString name, RubyInteger line, RubyInteger column,
-            IRubyObject args, Map<String, Object> pluginArgs);
+        IRubyObject buildInput(RubyString name, IRubyObject args, SourceWithMetadata source);
 
-        AbstractOutputDelegatorExt buildOutput(RubyString name, RubyInteger line, RubyInteger column,
-            IRubyObject args, Map<String, Object> pluginArgs);
+        AbstractOutputDelegatorExt buildOutput(RubyString name, IRubyObject args, SourceWithMetadata source);
 
-        AbstractFilterDelegatorExt buildFilter(RubyString name, RubyInteger line, RubyInteger column, IRubyObject args,
-            Map<String, Object> pluginArgs);
+        AbstractFilterDelegatorExt buildFilter(RubyString name, IRubyObject args, SourceWithMetadata source);
 
-        IRubyObject buildCodec(RubyString name, IRubyObject args, Map<String, Object> pluginArgs);
+        IRubyObject buildCodec(RubyString name, IRubyObject args, SourceWithMetadata source);
 
         Codec buildDefaultCodec(String codecName);
 
+        Codec buildRubyCodecWrapper(RubyObject rubyCodec);
     }
 }
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/SplitDataset.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/SplitDataset.java
index 8a83cd75b..05b32e48e 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/SplitDataset.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/SplitDataset.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 /**
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/SyntaxElement.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/SyntaxElement.java
index 167472164..cd025b5e0 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/SyntaxElement.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/SyntaxElement.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 /**
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/SyntaxFactory.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/SyntaxFactory.java
index f95652434..c81347194 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/SyntaxFactory.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/SyntaxFactory.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import java.util.Arrays;
@@ -68,6 +88,14 @@ final class SyntaxFactory {
         );
     }
 
+    public static MethodLevelSyntaxElement tryBlock(final Closure body, final Class<? extends Throwable> exceptionToCatch, Closure exceptionHandlerBlock,
+                                                    ValueSyntaxElement exception) {
+        return () -> SyntaxFactory.join(
+                "try {\n", body.generateCode(),
+                "\n} catch (" + exceptionToCatch.getCanonicalName() + " " + exception.generateCode() + ") { " + exceptionHandlerBlock.generateCode() + " }"
+        );
+    }
+
     public static MethodLevelSyntaxElement ifCondition(final MethodLevelSyntaxElement condition,
         final Closure body) {
         return ifCondition(condition, body, Closure.EMPTY);
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/Utils.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/Utils.java
index b47d268fd..cb6341058 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/Utils.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/Utils.java
@@ -1,5 +1,27 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.logstash.ext.JrubyEventExtLibrary;
 
 import java.util.Collection;
@@ -9,6 +31,7 @@ import java.util.List;
  * Static utility methods that replace common blocks of generated code in the Java execution.
  */
 public class Utils {
+    private static final Logger logger = LogManager.getLogger(Utils.class);
 
     @SuppressWarnings({"unchecked", "rawtypes"})
     // has field1.compute(batchArg, flushArg, shutdownArg) passed as input
@@ -24,7 +47,15 @@ public class Utils {
     public static void filterEvents(Collection<JrubyEventExtLibrary.RubyEvent> input, EventCondition filter,
                                     List fulfilled, List unfulfilled) {
         for (JrubyEventExtLibrary.RubyEvent e : input) {
-            if (filter.fulfilled(e)) {
+            boolean isFulfilled;
+            try {
+                isFulfilled = filter.fulfilled(e);
+            } catch (org.jruby.exceptions.TypeError | IllegalArgumentException | org.jruby.exceptions.ArgumentError ex) {
+                // in case of error evaluation of an if condition, cancel the event
+                e.getEvent().cancel();
+                throw new ConditionalEvaluationError(ex, e.getEvent());
+            }
+            if (isFulfilled) {
                 fulfilled.add(e);
             } else {
                 unfulfilled.add(e);
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/ValueSyntaxElement.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/ValueSyntaxElement.java
index e5c7e36e7..cb7632050 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/ValueSyntaxElement.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/ValueSyntaxElement.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 /**
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/VariableDefinition.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/VariableDefinition.java
index 86d9a189d..4219ac8e4 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/VariableDefinition.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/VariableDefinition.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import org.jruby.internal.runtime.methods.DynamicMethod;
@@ -52,6 +72,8 @@ final class VariableDefinition implements SyntaxElement {
             safe = EventCondition.class;
         } else if (DynamicMethod.class.isAssignableFrom(clazz)) {
             safe = DynamicMethod.class;
+        } else if (Dataset.class.isAssignableFrom(clazz)) {
+            safe = Dataset.class;
         } else {
             safe = clazz;
         }
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/expression/BinaryBooleanExpression.java b/logstash-core/src/main/java/org/logstash/config/ir/expression/BinaryBooleanExpression.java
index a64cceb12..43a893c76 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/expression/BinaryBooleanExpression.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/expression/BinaryBooleanExpression.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.expression;
 
 import org.logstash.common.SourceWithMetadata;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/expression/BooleanExpression.java b/logstash-core/src/main/java/org/logstash/config/ir/expression/BooleanExpression.java
index 4a0f62ffe..0393b67b1 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/expression/BooleanExpression.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/expression/BooleanExpression.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.expression;
 
 import org.logstash.common.SourceWithMetadata;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/expression/EventValueExpression.java b/logstash-core/src/main/java/org/logstash/config/ir/expression/EventValueExpression.java
index 59376f058..fcc2d6b82 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/expression/EventValueExpression.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/expression/EventValueExpression.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.expression;
 
 import org.logstash.config.ir.SourceComponent;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/expression/Expression.java b/logstash-core/src/main/java/org/logstash/config/ir/expression/Expression.java
index 7c33f82a5..f3368a14a 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/expression/Expression.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/expression/Expression.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.expression;
 
 import org.logstash.common.SourceWithMetadata;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/expression/ExpressionSubstitution.java b/logstash-core/src/main/java/org/logstash/config/ir/expression/ExpressionSubstitution.java
new file mode 100644
index 000000000..721566d88
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/config/ir/expression/ExpressionSubstitution.java
@@ -0,0 +1,46 @@
+package org.logstash.config.ir.expression;
+
+import org.logstash.common.SourceWithMetadata;
+import org.logstash.config.ir.CompiledPipeline;
+import org.logstash.config.ir.InvalidIRException;
+import org.logstash.plugins.ConfigVariableExpander;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+public class ExpressionSubstitution {
+    /**
+     * Replace ${VAR:defaultValue} in BinaryBooleanExpression, UnaryBooleanExpression and ValueExpression, excluding RegexValueExpression
+     * with the value in the following precedence: secret store, environment variable, default value
+     * @param cve The actual pattern matching take place
+     * @param expression The Expression to be substituted
+     * @return substituted Expression
+     */
+    public static Expression substituteBoolExpression(ConfigVariableExpander cve, Expression expression) {
+        try {
+            if (expression instanceof BinaryBooleanExpression) {
+                BinaryBooleanExpression binaryBoolExp = (BinaryBooleanExpression) expression;
+                Expression substitutedLeftExp = substituteBoolExpression(cve, binaryBoolExp.getLeft());
+                Expression substitutedRightExp = substituteBoolExpression(cve, binaryBoolExp.getRight());
+                if (substitutedLeftExp != binaryBoolExp.getLeft() || substitutedRightExp != binaryBoolExp.getRight()) {
+                    Constructor<? extends BinaryBooleanExpression> constructor = binaryBoolExp.getClass().getConstructor(SourceWithMetadata.class, Expression.class, Expression.class);
+                    return constructor.newInstance(binaryBoolExp.getSourceWithMetadata(), substitutedLeftExp, substitutedRightExp);
+                }
+            } else if (expression instanceof UnaryBooleanExpression) {
+                UnaryBooleanExpression unaryBoolExp = (UnaryBooleanExpression) expression;
+                Expression substitutedExp = substituteBoolExpression(cve, unaryBoolExp.getExpression());
+                if (substitutedExp != unaryBoolExp.getExpression()) {
+                    Constructor<? extends UnaryBooleanExpression> constructor = unaryBoolExp.getClass().getConstructor(SourceWithMetadata.class, Expression.class);
+                    return constructor.newInstance(unaryBoolExp.getSourceWithMetadata(), substitutedExp);
+                }
+            } else if (expression instanceof ValueExpression && !(expression instanceof RegexValueExpression) && (((ValueExpression) expression).get() != null)) {
+                Object expanded = CompiledPipeline.expandConfigVariableKeepingSecrets(cve, ((ValueExpression) expression).get());
+                return new ValueExpression(expression.getSourceWithMetadata(), expanded);
+            }
+
+            return expression;
+        } catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException | InvalidIRException e) {
+            throw new IllegalStateException("Unable to instantiate substituted condition expression", e);
+        }
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/expression/RegexValueExpression.java b/logstash-core/src/main/java/org/logstash/config/ir/expression/RegexValueExpression.java
index 0d93310d8..3dd7889fc 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/expression/RegexValueExpression.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/expression/RegexValueExpression.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.expression;
 
 import org.logstash.common.SourceWithMetadata;
@@ -14,7 +34,7 @@ public class RegexValueExpression extends ValueExpression {
             throw new InvalidIRException("Regex value expressions can only take strings!");
         }
 
-        this.regex = getSource();
+        this.regex = (String) value;
     }
 
     @Override
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/expression/UnaryBooleanExpression.java b/logstash-core/src/main/java/org/logstash/config/ir/expression/UnaryBooleanExpression.java
index 78018fa57..9d9bdbb71 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/expression/UnaryBooleanExpression.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/expression/UnaryBooleanExpression.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.expression;
 
 import org.logstash.config.ir.InvalidIRException;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/expression/ValueExpression.java b/logstash-core/src/main/java/org/logstash/config/ir/expression/ValueExpression.java
index 760d7853c..c93f71e43 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/expression/ValueExpression.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/expression/ValueExpression.java
@@ -1,12 +1,34 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.expression;
 
 import java.math.BigDecimal;
 import java.time.Instant;
 import java.util.List;
+
 import org.jruby.RubyHash;
 import org.logstash.common.SourceWithMetadata;
 import org.logstash.config.ir.InvalidIRException;
 import org.logstash.config.ir.SourceComponent;
+import org.logstash.secret.SecretVariable;
 
 public class ValueExpression extends Expression {
     protected final Object value;
@@ -24,7 +46,8 @@ public class ValueExpression extends Expression {
                 value instanceof String ||
                 value instanceof List ||
                 value instanceof RubyHash ||
-                value instanceof Instant
+                value instanceof Instant ||
+                value instanceof SecretVariable
         )) {
             // This *should* be caught by the treetop grammar, but we need this case just in case there's a bug
             // somewhere
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/And.java b/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/And.java
index cd1134333..eddae8738 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/And.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/And.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.expression.binary;
 
 import org.logstash.common.SourceWithMetadata;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Eq.java b/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Eq.java
index 0af8e6e2c..b73477103 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Eq.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Eq.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.expression.binary;
 
 import org.logstash.common.SourceWithMetadata;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Gt.java b/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Gt.java
index 6d10434e4..5836f8f0a 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Gt.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Gt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.expression.binary;
 
 import org.logstash.common.SourceWithMetadata;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Gte.java b/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Gte.java
index 4961dc00e..214f06dfe 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Gte.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Gte.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.expression.binary;
 
 import org.logstash.common.SourceWithMetadata;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/In.java b/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/In.java
index 7c50efad8..07da9a605 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/In.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/In.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.expression.binary;
 
 import org.logstash.common.SourceWithMetadata;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Lt.java b/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Lt.java
index becc96f6b..3fd762232 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Lt.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Lt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.expression.binary;
 
 import org.logstash.common.SourceWithMetadata;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Lte.java b/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Lte.java
index 6d5814a1c..455deade6 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Lte.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Lte.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.expression.binary;
 
 import org.logstash.common.SourceWithMetadata;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Neq.java b/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Neq.java
index 9e23e53c7..3c0579299 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Neq.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Neq.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.expression.binary;
 
 import org.logstash.common.SourceWithMetadata;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Or.java b/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Or.java
index b4019975a..688a68e34 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Or.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/Or.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.expression.binary;
 
 import org.logstash.common.SourceWithMetadata;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/RegexEq.java b/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/RegexEq.java
index b6a5d9c2c..35186a213 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/RegexEq.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/expression/binary/RegexEq.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.expression.binary;
 
 import org.logstash.config.ir.InvalidIRException;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/expression/unary/Not.java b/logstash-core/src/main/java/org/logstash/config/ir/expression/unary/Not.java
index 04dd3ccb7..764c93790 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/expression/unary/Not.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/expression/unary/Not.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.expression.unary;
 
 import org.logstash.config.ir.SourceComponent;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/expression/unary/Truthy.java b/logstash-core/src/main/java/org/logstash/config/ir/expression/unary/Truthy.java
index 3f9d655a7..79e118517 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/expression/unary/Truthy.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/expression/unary/Truthy.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.expression.unary;
 
 import org.logstash.config.ir.SourceComponent;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/graph/BooleanEdge.java b/logstash-core/src/main/java/org/logstash/config/ir/graph/BooleanEdge.java
index f1f6dbd09..420e09334 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/graph/BooleanEdge.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/graph/BooleanEdge.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph;
 
 import org.logstash.common.Util;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/graph/Edge.java b/logstash-core/src/main/java/org/logstash/config/ir/graph/Edge.java
index 8efa7806a..f72e7891e 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/graph/Edge.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/graph/Edge.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph;
 
 import java.util.stream.Stream;
@@ -13,6 +33,7 @@ public abstract class Edge implements SourceComponent {
 
     private Graph graph;
 
+    @SuppressWarnings("this-escape")
     protected Edge(Vertex from, Vertex to) throws InvalidIRException {
         this.from = from;
         this.to = to;
@@ -21,6 +42,9 @@ public abstract class Edge implements SourceComponent {
             throw new InvalidIRException("Cannot create a cyclic vertex! " + to);
         }
 
+        // This is the reason why of the "this-escape" suppress warning. The instance is passed to the method acceptsOutgoingEdge
+        // before the constructor completes, so could potentially reach some runtime errors due to fields not initialized.
+        // This is not the case because actually that method just does type check on reference.
         if (!this.from.acceptsOutgoingEdge(this)) {
             throw new Vertex.InvalidEdgeTypeException(String.format("Invalid outgoing edge %s for edge %s", this.from, this));
         }
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/graph/Graph.java b/logstash-core/src/main/java/org/logstash/config/ir/graph/Graph.java
index 38554f022..e94aa1e3a 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/graph/Graph.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/graph/Graph.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph;
 
 import org.logstash.common.Util;
@@ -412,7 +432,7 @@ public final class Graph implements SourceComponent, Hashable {
 
     public String uniqueHash() {
         return Util.digest(this.vertices().
-                filter(v -> !(v instanceof QueueVertex)). // has no metadata
+                filter(v -> !(v instanceof QueueVertex) && !(v instanceof SeparatorVertex)). // has no metadata
                 map(Vertex::getSourceWithMetadata).
                 map(SourceWithMetadata::uniqueHash).
                 sorted().
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/graph/IfVertex.java b/logstash-core/src/main/java/org/logstash/config/ir/graph/IfVertex.java
index 6163d5186..531e7f41b 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/graph/IfVertex.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/graph/IfVertex.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph;
 
 import java.util.Collection;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/graph/PlainEdge.java b/logstash-core/src/main/java/org/logstash/config/ir/graph/PlainEdge.java
index 519b1f064..7fc477fcd 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/graph/PlainEdge.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/graph/PlainEdge.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph;
 
 import org.logstash.common.Util;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/graph/PluginVertex.java b/logstash-core/src/main/java/org/logstash/config/ir/graph/PluginVertex.java
index 4187c0ae9..506de94b8 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/graph/PluginVertex.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/graph/PluginVertex.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph;
 
 import org.logstash.common.SourceWithMetadata;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/graph/QueueVertex.java b/logstash-core/src/main/java/org/logstash/config/ir/graph/QueueVertex.java
index ed66e79a3..d6e2b2549 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/graph/QueueVertex.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/graph/QueueVertex.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph;
 
 import org.logstash.common.IncompleteSourceWithMetadataException;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/graph/SeparatorVertex.java b/logstash-core/src/main/java/org/logstash/config/ir/graph/SeparatorVertex.java
new file mode 100644
index 000000000..cb9a753dd
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/config/ir/graph/SeparatorVertex.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.config.ir.graph;
+
+import org.logstash.common.IncompleteSourceWithMetadataException;
+import org.logstash.common.Util;
+import org.logstash.config.ir.SourceComponent;
+import org.logstash.common.SourceWithMetadata;
+
+public final class SeparatorVertex extends Vertex {
+
+    public SeparatorVertex(String id) throws IncompleteSourceWithMetadataException {
+        super(new SourceWithMetadata("internal", id, 0,0,"separator"), id);
+    }
+
+    @Override
+    public String toString() {
+        return this.getId();
+    }
+
+    @Override
+    public SeparatorVertex copy() {
+        try {
+            return new SeparatorVertex(this.getId());
+        } catch (IncompleteSourceWithMetadataException e) {
+            // Never happens
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public boolean sourceComponentEquals(SourceComponent other) {
+        return other instanceof SeparatorVertex && ((SeparatorVertex)other).getId() == this.getId();
+    }
+
+    // Special vertices really have no metadata
+    @Override
+    public SourceWithMetadata getSourceWithMetadata() {
+        return null;
+    }
+
+    @Override
+    public String uniqueHash() {
+        return Util.digest("SEPARATOR_" + this.getId());
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/graph/Vertex.java b/logstash-core/src/main/java/org/logstash/config/ir/graph/Vertex.java
index 15b7e604c..e5b73b080 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/graph/Vertex.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/graph/Vertex.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph;
 
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/graph/algorithms/BreadthFirst.java b/logstash-core/src/main/java/org/logstash/config/ir/graph/algorithms/BreadthFirst.java
index 8e878c66a..0c16c1716 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/graph/algorithms/BreadthFirst.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/graph/algorithms/BreadthFirst.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph.algorithms;
 
 import org.logstash.config.ir.graph.Vertex;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/graph/algorithms/DepthFirst.java b/logstash-core/src/main/java/org/logstash/config/ir/graph/algorithms/DepthFirst.java
index 40c7bc6ad..96c758a40 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/graph/algorithms/DepthFirst.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/graph/algorithms/DepthFirst.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph.algorithms;
 
 import org.logstash.config.ir.graph.Graph;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/graph/algorithms/GraphDiff.java b/logstash-core/src/main/java/org/logstash/config/ir/graph/algorithms/GraphDiff.java
index c6c973721..afc19b3ac 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/graph/algorithms/GraphDiff.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/graph/algorithms/GraphDiff.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph.algorithms;
 
 import java.util.Collection;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/graph/algorithms/TopologicalSort.java b/logstash-core/src/main/java/org/logstash/config/ir/graph/algorithms/TopologicalSort.java
index 48b7405bd..21b95966c 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/graph/algorithms/TopologicalSort.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/graph/algorithms/TopologicalSort.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph.algorithms;
 
 import org.logstash.config.ir.graph.Edge;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/imperative/ComposedParallelStatement.java b/logstash-core/src/main/java/org/logstash/config/ir/imperative/ComposedParallelStatement.java
index 7b0a1e5c4..245cae076 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/imperative/ComposedParallelStatement.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/imperative/ComposedParallelStatement.java
@@ -1,8 +1,29 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.imperative;
 
 import org.logstash.config.ir.InvalidIRException;
 import org.logstash.common.SourceWithMetadata;
 import org.logstash.config.ir.graph.Graph;
+import org.logstash.plugins.ConfigVariableExpander;
 
 import java.util.List;
 
@@ -17,11 +38,11 @@ public class ComposedParallelStatement extends ComposedStatement {
     }
 
     @Override
-    public Graph toGraph() throws InvalidIRException {
+    public Graph toGraph(ConfigVariableExpander cve) throws InvalidIRException {
         Graph g = Graph.empty();
 
         for (Statement s : getStatements()) {
-            g = Graph.combine(g, s.toGraph()).graph;
+            g = Graph.combine(g, s.toGraph(cve)).graph;
         }
 
         return g;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/imperative/ComposedSequenceStatement.java b/logstash-core/src/main/java/org/logstash/config/ir/imperative/ComposedSequenceStatement.java
index 37d5b18ce..ef507b791 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/imperative/ComposedSequenceStatement.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/imperative/ComposedSequenceStatement.java
@@ -1,8 +1,29 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.imperative;
 
 import org.logstash.config.ir.InvalidIRException;
 import org.logstash.common.SourceWithMetadata;
 import org.logstash.config.ir.graph.Graph;
+import org.logstash.plugins.ConfigVariableExpander;
 
 import java.util.List;
 
@@ -17,11 +38,11 @@ public class ComposedSequenceStatement extends ComposedStatement {
     }
 
     @Override
-    public Graph toGraph() throws InvalidIRException {
+    public Graph toGraph(ConfigVariableExpander cve) throws InvalidIRException {
         Graph g = Graph.empty();
 
         for (Statement statement : getStatements()) {
-            Graph sg = statement.toGraph();
+            Graph sg = statement.toGraph(cve);
             g = g.chain(sg);
         }
 
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/imperative/ComposedStatement.java b/logstash-core/src/main/java/org/logstash/config/ir/imperative/ComposedStatement.java
index d4f838f35..777fb79d6 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/imperative/ComposedStatement.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/imperative/ComposedStatement.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.imperative;
 
 import org.logstash.config.ir.SourceComponent;
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/imperative/IfStatement.java b/logstash-core/src/main/java/org/logstash/config/ir/imperative/IfStatement.java
index 35e3c7b83..04d242d4b 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/imperative/IfStatement.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/imperative/IfStatement.java
@@ -1,13 +1,34 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.imperative;
 
 import org.logstash.config.ir.SourceComponent;
 import org.logstash.config.ir.InvalidIRException;
 import org.logstash.common.SourceWithMetadata;
-import org.logstash.config.ir.expression.BooleanExpression;
+import org.logstash.config.ir.expression.*;
 import org.logstash.config.ir.graph.BooleanEdge;
 import org.logstash.config.ir.graph.Graph;
 import org.logstash.config.ir.graph.IfVertex;
 import org.logstash.config.ir.graph.Vertex;
+import org.logstash.plugins.ConfigVariableExpander;
 
 import java.util.Collection;
 import java.util.stream.Collectors;
@@ -79,9 +100,9 @@ public class IfStatement extends Statement {
 
 
     @Override
-    public Graph toGraph() throws InvalidIRException {
-        Graph trueGraph = getTrueStatement().toGraph();
-        Graph falseGraph = getFalseStatement().toGraph();
+    public Graph toGraph(ConfigVariableExpander cve) throws InvalidIRException {
+        Graph trueGraph = getTrueStatement().toGraph(cve);
+        Graph falseGraph = getFalseStatement().toGraph(cve);
 
         // If there is nothing in the true or false sections of this if statement,
         // we can omit the if statement altogether!
@@ -94,7 +115,8 @@ public class IfStatement extends Statement {
         Collection<Vertex> trueRoots = trueGraph.roots().map(combination.oldToNewVertices::get).collect(Collectors.toList());
         Collection<Vertex> falseRoots = falseGraph.roots().map(combination.oldToNewVertices::get).collect(Collectors.toList());
 
-        IfVertex ifVertex = new IfVertex(this.getSourceWithMetadata(), this.booleanExpression);
+        IfVertex ifVertex = new IfVertex(this.getSourceWithMetadata(),
+                (BooleanExpression) ExpressionSubstitution.substituteBoolExpression(cve, this.booleanExpression));
         newGraph.addVertex(ifVertex);
 
         for (Vertex v : trueRoots) {
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/imperative/NoopStatement.java b/logstash-core/src/main/java/org/logstash/config/ir/imperative/NoopStatement.java
index b8290214e..a8e7a4331 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/imperative/NoopStatement.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/imperative/NoopStatement.java
@@ -1,8 +1,29 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.imperative;
 
 import org.logstash.config.ir.SourceComponent;
 import org.logstash.common.SourceWithMetadata;
 import org.logstash.config.ir.graph.Graph;
+import org.logstash.plugins.ConfigVariableExpander;
 
 public class NoopStatement extends Statement {
 
@@ -23,7 +44,7 @@ public class NoopStatement extends Statement {
     }
 
     @Override
-    public Graph toGraph() {
+    public Graph toGraph(ConfigVariableExpander cve) {
         return Graph.empty();
     }
 
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/imperative/PluginStatement.java b/logstash-core/src/main/java/org/logstash/config/ir/imperative/PluginStatement.java
index 934ab536d..bb34d5359 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/imperative/PluginStatement.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/imperative/PluginStatement.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.imperative;
 
 import org.logstash.config.ir.SourceComponent;
@@ -7,6 +27,7 @@ import org.logstash.common.SourceWithMetadata;
 import org.logstash.config.ir.graph.Graph;
 import org.logstash.config.ir.graph.PluginVertex;
 import org.logstash.config.ir.graph.Vertex;
+import org.logstash.plugins.ConfigVariableExpander;
 
 public class PluginStatement extends Statement {
     private final PluginDefinition pluginDefinition;
@@ -33,7 +54,7 @@ public class PluginStatement extends Statement {
     }
 
     @Override
-    public Graph toGraph() throws InvalidIRException {
+    public Graph toGraph(ConfigVariableExpander cve) throws InvalidIRException {
         Vertex pluginVertex = new PluginVertex(getSourceWithMetadata(), pluginDefinition);
         Graph g = Graph.empty();
         g.addVertex(pluginVertex);
diff --git a/logstash-core/src/main/java/org/logstash/config/ir/imperative/Statement.java b/logstash-core/src/main/java/org/logstash/config/ir/imperative/Statement.java
index 3152a0eb9..cdd865195 100644
--- a/logstash-core/src/main/java/org/logstash/config/ir/imperative/Statement.java
+++ b/logstash-core/src/main/java/org/logstash/config/ir/imperative/Statement.java
@@ -1,16 +1,37 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.imperative;
 
 import org.logstash.config.ir.InvalidIRException;
 import org.logstash.config.ir.BaseSourceComponent;
 import org.logstash.common.SourceWithMetadata;
 import org.logstash.config.ir.graph.Graph;
+import org.logstash.plugins.ConfigVariableExpander;
 
 public abstract class Statement extends BaseSourceComponent {
     public Statement(SourceWithMetadata meta) {
         super(meta);
     }
 
-    public abstract Graph toGraph() throws InvalidIRException;
+    public abstract Graph toGraph(ConfigVariableExpander cve) throws InvalidIRException;
 
     public String toString() {
         return toString(2);
diff --git a/logstash-core/src/main/java/org/logstash/execution/AbortedBatchException.java b/logstash-core/src/main/java/org/logstash/execution/AbortedBatchException.java
new file mode 100644
index 000000000..db4b688f0
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/execution/AbortedBatchException.java
@@ -0,0 +1,7 @@
+package org.logstash.execution;
+
+public class AbortedBatchException extends Exception {
+
+    private static final long serialVersionUID = -2883406232121392458L;
+
+}
diff --git a/logstash-core/src/main/java/org/logstash/execution/AbstractPipelineExt.java b/logstash-core/src/main/java/org/logstash/execution/AbstractPipelineExt.java
index e96f0396d..ec26b9b07 100644
--- a/logstash-core/src/main/java/org/logstash/execution/AbstractPipelineExt.java
+++ b/logstash-core/src/main/java/org/logstash/execution/AbstractPipelineExt.java
@@ -1,19 +1,58 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.execution;
 
 import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.nio.file.FileStore;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalUnit;
+import java.time.Duration;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.UUID;
-import org.apache.commons.codec.binary.Hex;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.google.common.annotations.VisibleForTesting;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyBasicObject;
+import org.jruby.RubyBoolean;
 import org.jruby.RubyClass;
 import org.jruby.RubyString;
 import org.jruby.RubySymbol;
@@ -28,16 +67,53 @@ import org.logstash.ackedqueue.QueueFactoryExt;
 import org.logstash.ackedqueue.ext.JRubyAckedQueueExt;
 import org.logstash.ackedqueue.ext.JRubyWrappedAckedQueueExt;
 import org.logstash.common.DeadLetterQueueFactory;
+import org.logstash.common.EnvironmentVariableProvider;
 import org.logstash.common.IncompleteSourceWithMetadataException;
+import org.logstash.common.SettingKeyDefinitions;
+import org.logstash.common.SourceWithMetadata;
+import org.logstash.common.io.DeadLetterQueueWriter;
+import org.logstash.common.io.QueueStorageType;
+import org.logstash.config.ir.CompiledPipeline;
 import org.logstash.config.ir.ConfigCompiler;
+import org.logstash.config.ir.InvalidIRException;
+import org.logstash.config.ir.PipelineConfig;
 import org.logstash.config.ir.PipelineIR;
+import org.logstash.config.ir.compiler.AbstractFilterDelegatorExt;
+import org.logstash.config.ir.compiler.AbstractOutputDelegatorExt;
+import org.logstash.config.ir.compiler.ConditionalEvaluationError;
+import org.logstash.execution.queue.QueueWriter;
 import org.logstash.ext.JRubyAbstractQueueWriteClientExt;
 import org.logstash.ext.JRubyWrappedWriteClientExt;
+import org.logstash.health.PipelineIndicator;
 import org.logstash.instrument.metrics.AbstractMetricExt;
 import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
-import org.logstash.instrument.metrics.MetricKeys;
+import org.logstash.instrument.metrics.FlowMetric;
+import org.logstash.instrument.metrics.Metric;
+import org.logstash.instrument.metrics.MetricType;
 import org.logstash.instrument.metrics.NullMetricExt;
+import org.logstash.instrument.metrics.UpScaledMetric;
+import org.logstash.instrument.metrics.timer.TimerMetric;
+import org.logstash.instrument.metrics.UptimeMetric;
+import org.logstash.instrument.metrics.counter.LongCounter;
+import org.logstash.instrument.metrics.gauge.LazyDelegatingGauge;
+import org.logstash.instrument.metrics.gauge.NumberGauge;
+import org.logstash.plugins.ConfigVariableExpander;
+import org.logstash.plugins.factory.ExecutionContextFactoryExt;
+import org.logstash.plugins.factory.PluginFactoryExt;
+import org.logstash.plugins.factory.PluginMetricsFactoryExt;
+import org.logstash.secret.store.SecretStore;
+import org.logstash.secret.store.SecretStoreExt;
 
+import static org.logstash.instrument.metrics.MetricKeys.*;
+import static org.logstash.instrument.metrics.UptimeMetric.ScaleUnits.MILLISECONDS;
+import static org.logstash.instrument.metrics.UptimeMetric.ScaleUnits.SECONDS;
+
+/**
+ * JRuby extension to provide ancestor class for the ruby-defined {@code LogStash::JavaPipeline} class.
+ *
+ * <p>NOTE: Although this class' name implies that it is "abstract", we instantiated it directly
+ *          as a lightweight temporary-scoped pipeline in the ruby-defined {@code LogStash::PipelineAction::Reload}
+ * */
 @JRubyClass(name = "AbstractPipeline")
 public class AbstractPipelineExt extends RubyBasicObject {
 
@@ -46,41 +122,18 @@ public class AbstractPipelineExt extends RubyBasicObject {
     private static final Logger LOGGER = LogManager.getLogger(AbstractPipelineExt.class);
 
     private static final @SuppressWarnings("rawtypes") RubyArray CAPACITY_NAMESPACE =
-        RubyArray.newArray(RubyUtil.RUBY, RubyUtil.RUBY.newSymbol("capacity"));
+        RubyArray.newArray(RubyUtil.RUBY, CAPACITY_KEY);
 
     private static final @SuppressWarnings("rawtypes") RubyArray DATA_NAMESPACE =
         RubyArray.newArray(RubyUtil.RUBY, RubyUtil.RUBY.newSymbol("data"));
 
-    private static final RubySymbol PAGE_CAPACITY_IN_BYTES =
-        RubyUtil.RUBY.newSymbol("page_capacity_in_bytes");
-
-    private static final RubySymbol MAX_QUEUE_SIZE_IN_BYTES =
-        RubyUtil.RUBY.newSymbol("max_queue_size_in_bytes");
-
-    private static final RubySymbol MAX_QUEUE_UNREAD_EVENTS =
-        RubyUtil.RUBY.newSymbol("max_unread_events");
-
-    private static final RubySymbol QUEUE_SIZE_IN_BYTES =
-        RubyUtil.RUBY.newSymbol("queue_size_in_bytes");
-
-    private static final RubySymbol FREE_SPACE_IN_BYTES =
-        RubyUtil.RUBY.newSymbol("free_space_in_bytes");
-
-    private static final RubySymbol STORAGE_TYPE = RubyUtil.RUBY.newSymbol("storage_type");
-
-    private static final RubySymbol PATH = RubyUtil.RUBY.newSymbol("path");
-
-    private static final RubySymbol TYPE_KEY = RubyUtil.RUBY.newSymbol("type");
-
-    private static final RubySymbol QUEUE_KEY = RubyUtil.RUBY.newSymbol("queue");
-
-    private static final RubySymbol DLQ_KEY = RubyUtil.RUBY.newSymbol("dlq");
-
     private static final @SuppressWarnings("rawtypes") RubyArray EVENTS_METRIC_NAMESPACE = RubyArray.newArray(
-        RubyUtil.RUBY, new IRubyObject[]{MetricKeys.STATS_KEY, MetricKeys.EVENTS_KEY}
+        RubyUtil.RUBY, new IRubyObject[]{STATS_KEY, EVENTS_KEY}
     );
 
+    @SuppressWarnings("serial")
     protected PipelineIR lir;
+    private transient CompiledPipeline lirExecution;
 
     private final RubyString ephemeralId = RubyUtil.RUBY.newString(UUID.randomUUID().toString());
 
@@ -88,17 +141,18 @@ public class AbstractPipelineExt extends RubyBasicObject {
 
     private RubyString configString;
 
-    private RubyString configHash;
+    @SuppressWarnings({"rawtypes", "serial"})
+    private List<SourceWithMetadata> configParts;
 
-    private IRubyObject settings;
+    private transient IRubyObject settings;
 
-    private IRubyObject pipelineSettings;
+    private transient IRubyObject pipelineSettings;
 
-    private IRubyObject pipelineId;
+    private transient IRubyObject pipelineId;
 
-    private AbstractMetricExt metric;
+    private transient AbstractMetricExt metric;
 
-    private IRubyObject dlqWriter;
+    private transient IRubyObject dlqWriter;
 
     private PipelineReporterExt reporter;
 
@@ -108,27 +162,105 @@ public class AbstractPipelineExt extends RubyBasicObject {
 
     private QueueReadClientBase filterQueueClient;
 
+    private transient final ScopedFlowMetrics scopedFlowMetrics = new ScopedFlowMetrics();
+    private @SuppressWarnings("rawtypes") RubyArray inputs;
+    private @SuppressWarnings("rawtypes") RubyArray filters;
+    private @SuppressWarnings("rawtypes") RubyArray outputs;
+
+    private String lastErrorEvaluationReceived = "";
+    private transient DeadLetterQueueWriter javaDlqWriter;
+
     public AbstractPipelineExt(final Ruby runtime, final RubyClass metaClass) {
         super(runtime, metaClass);
     }
 
+    public interface ConditionalEvaluationListener {
+        void notify(ConditionalEvaluationError err);
+    }
+
+    public final class LogErrorEvaluationListener implements ConditionalEvaluationListener {
+        @Override
+        public void notify(ConditionalEvaluationError err) {
+            lastErrorEvaluationReceived = err.getCause().getMessage();
+            if (isDLQEnabled()) {
+                LOGGER.warn("{}. Failing event was sent to dead letter queue", lastErrorEvaluationReceived);
+            } else {
+                LOGGER.warn("{}. Event was dropped, enable debug logging to see the event's payload", lastErrorEvaluationReceived);
+            }
+            LOGGER.debug("Event generating the fault: {}", err.failedEvent().toMap().toString());
+
+            // logs the exception at debug level
+            if (LOGGER.isDebugEnabled()) {
+                debugLogStackTrace(err);
+            }
+
+            if (isDLQEnabled()) {
+                try {
+                    javaDlqWriter.writeEntry(err.failedEvent(), "if-statement", "if-statement", "condition evaluation error, " + lastErrorEvaluationReceived);
+                } catch (IOException ioex) {
+                    LOGGER.error("Can't write in DLQ", ioex);
+                }
+            }
+        }
+
+        private boolean isDLQEnabled() {
+            return javaDlqWriter != null;
+        }
+
+        private void debugLogStackTrace(ConditionalEvaluationError err) {
+            try (StringWriter sw = new StringWriter(); PrintWriter pw = new PrintWriter(sw)) {
+                err.printStackTrace(pw);
+                LOGGER.debug("{}", sw);
+            } catch (IOException ioex) {
+                LOGGER.warn("Invalid operation on closing internal resources", ioex);
+            }
+        }
+    }
+
+    @JRubyMethod(required = 4)
+    public AbstractPipelineExt initialize(final ThreadContext context, final IRubyObject[] args)
+            throws IncompleteSourceWithMetadataException, NoSuchAlgorithmException {
+        initialize(context, args[0], args[1], args[2]);
+        lirExecution = new CompiledPipeline(
+                lir,
+                new PluginFactoryExt(context.runtime, RubyUtil.PLUGIN_FACTORY_CLASS).init(
+                        lir,
+                        new PluginMetricsFactoryExt(
+                                context.runtime, RubyUtil.PLUGIN_METRICS_FACTORY_CLASS
+                        ).initialize(context, pipelineId(), metric()),
+                        new ExecutionContextFactoryExt(
+                                context.runtime, RubyUtil.EXECUTION_CONTEXT_FACTORY_CLASS
+                        ).initialize(context, args[3], this, dlqWriter(context)),
+                        RubyUtil.FILTER_DELEGATOR_CLASS
+                ),
+                getSecretStore(context),
+                new LogErrorEvaluationListener()
+        );
+        inputs = RubyArray.newArray(context.runtime, lirExecution.inputs());
+        filters = RubyArray.newArray(context.runtime, lirExecution.filters());
+        outputs = RubyArray.newArray(context.runtime, lirExecution.outputs());
+        if (getSetting(context, "config.debug").isTrue() && LOGGER.isDebugEnabled()) {
+            LOGGER.debug(
+                    "Compiled pipeline code for pipeline {} : {}", pipelineId(),
+                    lir.getGraph().toString()
+            );
+        }
+        return this;
+    }
+
     @JRubyMethod
-    public final AbstractPipelineExt initialize(final ThreadContext context,
+    private AbstractPipelineExt initialize(final ThreadContext context,
         final IRubyObject pipelineConfig, final IRubyObject namespacedMetric,
         final IRubyObject rubyLogger)
-        throws NoSuchAlgorithmException, IncompleteSourceWithMetadataException {
+        throws NoSuchAlgorithmException {
         reporter = new PipelineReporterExt(
             context.runtime, RubyUtil.PIPELINE_REPORTER_CLASS).initialize(context, rubyLogger, this
         );
         pipelineSettings = pipelineConfig;
         configString = (RubyString) pipelineSettings.callMethod(context, "config_string");
-        configHash = context.runtime.newString(
-            Hex.encodeHexString(
-                MessageDigest.getInstance("SHA1").digest(configString.getBytes())
-            )
-        );
+        configParts = pipelineSettings.toJava(PipelineConfig.class).getConfigParts();
         settings = pipelineSettings.callMethod(context, "settings");
-        final IRubyObject id = getSetting(context, "pipeline.id");
+        final IRubyObject id = getSetting(context, SettingKeyDefinitions.PIPELINE_ID);
         if (id.isNil()) {
             pipelineId = id();
         } else {
@@ -148,15 +280,17 @@ public class AbstractPipelineExt extends RubyBasicObject {
                 );
             }
         }
-        lir = ConfigCompiler.configToPipelineIR(
-            configString.asJavaString(),
-            getSetting(context, "config.support_escapes").isTrue()
-        );
+        boolean supportEscapes = getSetting(context, "config.support_escapes").isTrue();
+        try (ConfigVariableExpander cve = new ConfigVariableExpander(getSecretStore(context), EnvironmentVariableProvider.defaultProvider())) {
+            lir = ConfigCompiler.configToPipelineIR(configParts, supportEscapes, cve);
+        } catch (InvalidIRException iirex) {
+            throw new IllegalArgumentException(iirex);
+        }
         return this;
     }
 
     /**
-     * queue opening needs to happen out of the the initialize method because the
+     * queue opening needs to happen out of the initialize method because the
      * AbstractPipeline is used for pipeline config validation and the queue
      * should not be opened for this. This should be called only in the actual
      * Pipeline/JavaPipeline initialisation.
@@ -181,8 +315,10 @@ public class AbstractPipelineExt extends RubyBasicObject {
                 RubyArray.newArray(
                     context.runtime,
                     new IRubyObject[]{
-                        MetricKeys.STATS_KEY, MetricKeys.PIPELINES_KEY,
-                        pipelineId.convertToString().intern(), MetricKeys.EVENTS_KEY
+                            STATS_KEY,
+                            PIPELINES_KEY,
+                            pipelineId.convertToString().intern(),
+                            EVENTS_KEY
                     }
                 )
             )
@@ -191,6 +327,16 @@ public class AbstractPipelineExt extends RubyBasicObject {
         return context.nil;
     }
 
+    @JRubyMethod(name = "process_events_namespace_metric")
+    public final IRubyObject processEventsNamespaceMetric(final ThreadContext context) {
+        return metric.namespace(context, EVENTS_METRIC_NAMESPACE);
+    }
+
+    @JRubyMethod(name = "pipeline_events_namespace_metric")
+    public final IRubyObject pipelineEventsNamespaceMetric(final ThreadContext context) {
+        return metric.namespace(context, pipelineNamespacedPath(EVENTS_KEY));
+    }
+
     @JRubyMethod(name = "filter_queue_client")
     public final QueueReadClientBase filterQueueClient() {
         return filterQueueClient;
@@ -201,11 +347,6 @@ public class AbstractPipelineExt extends RubyBasicObject {
         return configString;
     }
 
-    @JRubyMethod(name = "config_hash")
-    public final RubyString configHash() {
-        return configHash;
-    }
-
     @JRubyMethod(name = "ephemeral_id")
     public final RubyString ephemeralId() {
         return ephemeralId;
@@ -236,19 +377,17 @@ public class AbstractPipelineExt extends RubyBasicObject {
         return JavaUtil.convertJavaToUsableRubyObject(context.runtime, lir);
     }
 
+    @JRubyMethod(name = "lir_execution")
+    public IRubyObject lirExecution(final ThreadContext context) {
+        return JavaUtil.convertJavaToUsableRubyObject(context.runtime, lirExecution);
+    }
+
     @JRubyMethod(name = "dlq_writer")
     public final IRubyObject dlqWriter(final ThreadContext context) {
         if (dlqWriter == null) {
             if (dlqEnabled(context).isTrue()) {
-                dlqWriter = JavaUtil.convertJavaToUsableRubyObject(
-                    context.runtime,
-                    DeadLetterQueueFactory.getWriter(
-                        pipelineId.asJavaString(),
-                        getSetting(context, "path.dead_letter_queue").asJavaString(),
-                        getSetting(context, "dead_letter_queue.max_bytes").convertToInteger()
-                            .getLongValue()
-                    )
-                );
+                javaDlqWriter = createDeadLetterQueueWriterFromSettings(context);
+                dlqWriter = JavaUtil.convertJavaToUsableRubyObject(context.runtime, javaDlqWriter);
             } else {
                 dlqWriter = RubyUtil.DUMMY_DLQ_WRITER_CLASS.callMethod(context, "new");
             }
@@ -256,6 +395,45 @@ public class AbstractPipelineExt extends RubyBasicObject {
         return dlqWriter;
     }
 
+    private DeadLetterQueueWriter createDeadLetterQueueWriterFromSettings(ThreadContext context) {
+        final QueueStorageType storageType = QueueStorageType.parse(getSetting(context, "dead_letter_queue.storage_policy").asJavaString());
+
+        String dlqPath = getSetting(context, "path.dead_letter_queue").asJavaString();
+        long dlqMaxBytes = getSetting(context, "dead_letter_queue.max_bytes").convertToInteger().getLongValue();
+        Duration dlqFlushInterval = Duration.ofMillis(getSetting(context, "dead_letter_queue.flush_interval").convertToInteger().getLongValue());
+
+        if (hasSetting(context, "dead_letter_queue.retain.age") && !getSetting(context, "dead_letter_queue.retain.age").isNil()) {
+            // convert to Duration
+            final Duration age = parseToDuration(getSetting(context, "dead_letter_queue.retain.age").convertToString().toString());
+            return DeadLetterQueueFactory.getWriter(pipelineId.asJavaString(), dlqPath, dlqMaxBytes,
+                    dlqFlushInterval, storageType, age);
+        }
+
+        return DeadLetterQueueFactory.getWriter(pipelineId.asJavaString(), dlqPath, dlqMaxBytes, dlqFlushInterval, storageType);
+    }
+
+    /**
+     * Convert time strings like 3d or 4h or 5m to a duration
+     * */
+    @VisibleForTesting
+    static Duration parseToDuration(String timeStr) {
+        final Matcher matcher = Pattern.compile("(?<value>\\d+)\\s*(?<time>[dhms])").matcher(timeStr);
+        if (!matcher.matches()) {
+            throw new IllegalArgumentException("Expected a time specification in the form <number>[d,h,m,s], e.g. 3m, but found [" + timeStr + "]");
+        }
+        final int value = Integer.parseInt(matcher.group("value"));
+        final String timeSpecifier = matcher.group("time");
+        final TemporalUnit unit;
+        switch (timeSpecifier) {
+            case "d": unit = ChronoUnit.DAYS; break;
+            case "h": unit = ChronoUnit.HOURS; break;
+            case "m": unit = ChronoUnit.MINUTES; break;
+            case "s": unit = ChronoUnit.SECONDS; break;
+            default: throw new IllegalStateException("Expected a time unit specification from d,h,m,s but found: [" + timeSpecifier + "]");
+        }
+        return Duration.of(value, unit);
+    }
+
     @JRubyMethod(name = "dlq_enabled?")
     public final IRubyObject dlqEnabled(final ThreadContext context) {
         return getSetting(context, "dead_letter_queue.enable");
@@ -278,10 +456,24 @@ public class AbstractPipelineExt extends RubyBasicObject {
     @JRubyMethod(name = "collect_dlq_stats")
     public final IRubyObject collectDlqStats(final ThreadContext context) {
         if (dlqEnabled(context).isTrue()) {
-            getDlqMetric(context).gauge(
-                context, QUEUE_SIZE_IN_BYTES,
-                dlqWriter(context).callMethod(context, "get_current_queue_size")
-            );
+            getDlqMetric(context).gauge(context,
+                                        QUEUE_SIZE_IN_BYTES_KEY,
+                                        dlqWriter(context).callMethod(context, "get_current_queue_size"));
+            getDlqMetric(context).gauge(context,
+                                        STORAGE_POLICY_KEY,
+                                        dlqWriter(context).callMethod(context, "get_storage_policy"));
+            getDlqMetric(context).gauge(context,
+                                        MAX_QUEUE_SIZE_IN_BYTES_KEY,
+                                        getSetting(context, "dead_letter_queue.max_bytes").convertToInteger());
+            getDlqMetric(context).gauge(context,
+                                        DROPPED_EVENTS_KEY,
+                                        dlqWriter(context).callMethod(context, "get_dropped_events"));
+            getDlqMetric(context).gauge(context,
+                                        LAST_ERROR_KEY,
+                                        dlqWriter(context).callMethod(context, "get_last_error"));
+            getDlqMetric(context).gauge(context,
+                                        EXPIRED_EVENTS_KEY,
+                                        dlqWriter(context).callMethod(context, "get_expired_events"));
         }
         return context.nil;
     }
@@ -296,47 +488,288 @@ public class AbstractPipelineExt extends RubyBasicObject {
         return getSetting(context, "pipeline.reloadable");
     }
 
+    @JRubyMethod(name = "reloadable?")
+    public RubyBoolean isReloadable(final ThreadContext context) {
+        return isConfiguredReloadable(context).isTrue() && reloadablePlugins(context).isTrue()
+                ? context.tru : context.fals;
+    }
+
+    @JRubyMethod(name = "reloadable_plugins?")
+    public RubyBoolean reloadablePlugins(final ThreadContext context) {
+        return nonReloadablePlugins(context).isEmpty() ? context.tru : context.fals;
+    }
+
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    @JRubyMethod(name = "non_reloadable_plugins")
+    public RubyArray nonReloadablePlugins(final ThreadContext context) {
+        final RubyArray result = RubyArray.newArray(context.runtime);
+        Stream.of(inputs, outputs, filters).flatMap(
+                plugins -> ((Collection<IRubyObject>) plugins).stream()
+        ).filter(
+                plugin -> !plugin.callMethod(context, "reloadable?").isTrue()
+        ).forEach(result::add);
+        return result;
+    }
+
     @JRubyMethod(name = "collect_stats")
     public final IRubyObject collectStats(final ThreadContext context) throws IOException {
-        final AbstractNamespacedMetricExt pipelineMetric = metric.namespace(
-            context,
-            RubyArray.newArray(
-                context.runtime,
-                Arrays.asList(MetricKeys.STATS_KEY, MetricKeys.PIPELINES_KEY, pipelineId.asString().intern(), QUEUE_KEY)
-            )
-        );
+        final AbstractNamespacedMetricExt pipelineMetric =
+                metric.namespace(context, pipelineNamespacedPath(QUEUE_KEY));
+
         pipelineMetric.gauge(context, TYPE_KEY, getSetting(context, "queue.type"));
         if (queue instanceof JRubyWrappedAckedQueueExt) {
             final JRubyAckedQueueExt inner = ((JRubyWrappedAckedQueueExt) queue).rubyGetQueue();
             final RubyString dirPath = inner.ruby_dir_path(context);
             final AbstractNamespacedMetricExt capacityMetrics =
                 pipelineMetric.namespace(context, CAPACITY_NAMESPACE);
-            capacityMetrics.gauge(
-                context, PAGE_CAPACITY_IN_BYTES, inner.ruby_page_capacity(context)
-            );
-            capacityMetrics.gauge(
-                context, MAX_QUEUE_SIZE_IN_BYTES, inner.ruby_max_size_in_bytes(context)
-            );
-            capacityMetrics.gauge(
-                context, MAX_QUEUE_UNREAD_EVENTS, inner.ruby_max_unread_events(context)
-            );
-            capacityMetrics.gauge(
-                context, QUEUE_SIZE_IN_BYTES, inner.ruby_persisted_size_in_bytes(context)
-            );
+
+            capacityMetrics.gauge(context, PAGE_CAPACITY_IN_BYTES_KEY, inner.ruby_page_capacity(context));
+            capacityMetrics.gauge(context, MAX_QUEUE_SIZE_IN_BYTES_KEY, inner.ruby_max_size_in_bytes(context));
+            capacityMetrics.gauge(context, MAX_QUEUE_UNREAD_EVENTS_KEY, inner.ruby_max_unread_events(context));
+            capacityMetrics.gauge(context, QUEUE_SIZE_IN_BYTES_KEY, inner.ruby_persisted_size_in_bytes(context));
+
             final AbstractNamespacedMetricExt dataMetrics =
                 pipelineMetric.namespace(context, DATA_NAMESPACE);
             final FileStore fileStore = Files.getFileStore(Paths.get(dirPath.asJavaString()));
-            dataMetrics.gauge(
-                context, FREE_SPACE_IN_BYTES,
-                context.runtime.newFixnum(fileStore.getUnallocatedSpace())
-            );
-            dataMetrics.gauge(context, STORAGE_TYPE, context.runtime.newString(fileStore.type()));
-            dataMetrics.gauge(context, PATH, dirPath);
-            pipelineMetric.gauge(context, MetricKeys.EVENTS_KEY, inner.ruby_unread_count(context));
+            dataMetrics.gauge(context, FREE_SPACE_IN_BYTES_KEY, context.runtime.newFixnum(fileStore.getUnallocatedSpace()));
+            dataMetrics.gauge(context, STORAGE_TYPE_KEY, context.runtime.newString(fileStore.type()));
+            dataMetrics.gauge(context, PATH_KEY, dirPath);
+
+            pipelineMetric.gauge(context, EVENTS_KEY, inner.ruby_unread_count(context));
         }
         return context.nil;
     }
 
+    @SuppressWarnings("DuplicatedCode") // as much as this is sub-par, refactoring makes it harder to read.
+    @JRubyMethod(name = "initialize_flow_metrics")
+    public final IRubyObject initializeFlowMetrics(final ThreadContext context) {
+        if (metric.collector(context).isNil()) { return context.nil; }
+        if (!getSetting(context, "metric.collect").isTrue()) { return context.nil; }
+
+        final UptimeMetric uptimeMetric = initOrGetUptimeMetric(context, buildNamespace(), UPTIME_IN_MILLIS_KEY);
+        final Metric<Number> uptimeInPreciseMillis = uptimeMetric.withUnitsPrecise(MILLISECONDS);
+        final Metric<Number> uptimeInPreciseSeconds = uptimeMetric.withUnitsPrecise(SECONDS);
+
+        final RubySymbol[] flowNamespace = buildNamespace(FLOW_KEY);
+        final RubySymbol[] eventsNamespace = buildNamespace(EVENTS_KEY);
+
+        final LongCounter eventsInCounter = initOrGetCounterMetric(context, eventsNamespace, IN_KEY);
+        final FlowMetric inputThroughput = createFlowMetric(INPUT_THROUGHPUT_KEY, eventsInCounter, uptimeInPreciseSeconds);
+        this.scopedFlowMetrics.register(ScopedFlowMetrics.Scope.WORKER, inputThroughput);
+        storeMetric(context, flowNamespace, inputThroughput);
+
+        final LongCounter eventsFilteredCounter = initOrGetCounterMetric(context, eventsNamespace, FILTERED_KEY);
+        final FlowMetric filterThroughput = createFlowMetric(FILTER_THROUGHPUT_KEY, eventsFilteredCounter, uptimeInPreciseSeconds);
+        this.scopedFlowMetrics.register(ScopedFlowMetrics.Scope.WORKER, filterThroughput);
+        storeMetric(context, flowNamespace, filterThroughput);
+
+        final LongCounter eventsOutCounter = initOrGetCounterMetric(context, eventsNamespace, OUT_KEY);
+        final FlowMetric outputThroughput = createFlowMetric(OUTPUT_THROUGHPUT_KEY, eventsOutCounter, uptimeInPreciseSeconds);
+        this.scopedFlowMetrics.register(ScopedFlowMetrics.Scope.WORKER, outputThroughput);
+        storeMetric(context, flowNamespace, outputThroughput);
+
+        final TimerMetric queuePushWaitInMillis = initOrGetTimerMetric(context, eventsNamespace, PUSH_DURATION_KEY);
+        final FlowMetric backpressureFlow = createFlowMetric(QUEUE_BACKPRESSURE_KEY, queuePushWaitInMillis, uptimeInPreciseMillis);
+        this.scopedFlowMetrics.register(ScopedFlowMetrics.Scope.WORKER, backpressureFlow);
+        storeMetric(context, flowNamespace, backpressureFlow);
+
+        final TimerMetric durationInMillis = initOrGetTimerMetric(context, eventsNamespace, DURATION_IN_MILLIS_KEY);
+        final FlowMetric concurrencyFlow = createFlowMetric(WORKER_CONCURRENCY_KEY, durationInMillis, uptimeInPreciseMillis);
+        this.scopedFlowMetrics.register(ScopedFlowMetrics.Scope.WORKER, concurrencyFlow);
+        storeMetric(context, flowNamespace, concurrencyFlow);
+
+        final int workerCount = getSetting(context, SettingKeyDefinitions.PIPELINE_WORKERS).convertToInteger().getIntValue();
+        final UpScaledMetric percentScaledDurationInMillis = new UpScaledMetric(durationInMillis, 100);
+        final UpScaledMetric availableWorkerTimeInMillis = new UpScaledMetric(uptimeInPreciseMillis, workerCount);
+        final FlowMetric utilizationFlow = createFlowMetric(WORKER_UTILIZATION_KEY, percentScaledDurationInMillis, availableWorkerTimeInMillis);
+        this.scopedFlowMetrics.register(ScopedFlowMetrics.Scope.WORKER, utilizationFlow);
+        storeMetric(context, flowNamespace, utilizationFlow);
+
+        initializePqFlowMetrics(context, flowNamespace, uptimeMetric);
+        initializePluginFlowMetrics(context, uptimeMetric);
+        return context.nil;
+    }
+
+    @JRubyMethod(name = "collect_flow_metrics")
+    public final IRubyObject collectFlowMetrics(final ThreadContext context) {
+        this.scopedFlowMetrics.captureAll();
+        return context.nil;
+    }
+
+    // short-term limits the scope of what is included in the flow observations
+    public final PipelineIndicator.FlowObservation collectWorkerUtilizationFlowObservation() {
+        return this.collectFlowObservation(WORKER_UTILIZATION_KEY.asJavaString()::equals);
+    }
+
+    public final PipelineIndicator.FlowObservation collectFlowObservation(final Predicate<String> filter) {
+        Map<String, Map<String, Double>> collect = this.scopedFlowMetrics.getFlowMetrics(ScopedFlowMetrics.Scope.WORKER).stream()
+                .filter(fm -> filter.test(fm.getName()))
+                .collect(Collectors.toUnmodifiableMap(FlowMetric::getName, FlowMetric::getValue));
+        return new PipelineIndicator.FlowObservation(collect);
+    }
+
+    private static FlowMetric createFlowMetric(final RubySymbol name,
+                                               final Metric<? extends Number> numeratorMetric,
+                                               final Metric<? extends Number> denominatorMetric) {
+        return FlowMetric.create(name.asJavaString(), numeratorMetric, denominatorMetric);
+    }
+
+    private static FlowMetric createFlowMetric(final RubySymbol name,
+                                               final Supplier<? extends Metric<? extends Number>> numeratorMetricSupplier,
+                                               final Supplier<? extends Metric<? extends Number>> denominatorMetricSupplier) {
+        return FlowMetric.create(name.asJavaString(), numeratorMetricSupplier, denominatorMetricSupplier);
+    }
+
+    private LongCounter initOrGetCounterMetric(final ThreadContext context,
+                                               final RubySymbol[] subPipelineNamespacePath,
+                                               final RubySymbol metricName) {
+        final IRubyObject collector = this.metric.collector(context);
+        final IRubyObject fullNamespace = pipelineNamespacedPath(subPipelineNamespacePath);
+
+        final IRubyObject retrievedMetric = collector.callMethod(context, "get", new IRubyObject[]{fullNamespace, metricName, context.runtime.newSymbol("counter")});
+        return retrievedMetric.toJava(LongCounter.class);
+    }
+
+    private TimerMetric initOrGetTimerMetric(final ThreadContext context,
+                                             final RubySymbol[] subPipelineNamespacePath,
+                                             final RubySymbol metricName) {
+        final IRubyObject collector = this.metric.collector(context);
+        final IRubyObject fullNamespace = pipelineNamespacedPath(subPipelineNamespacePath);
+
+        final IRubyObject retrievedMetric = collector.callMethod(context, "get", new IRubyObject[]{fullNamespace, metricName, context.runtime.newSymbol("timer")});
+        return retrievedMetric.toJava(TimerMetric.class);
+    }
+
+    private Optional<NumberGauge> initOrGetNumberGaugeMetric(final ThreadContext context,
+                                                             final RubySymbol[] subPipelineNamespacePath,
+                                                             final RubySymbol metricName) {
+        final IRubyObject collector = this.metric.collector(context);
+        final IRubyObject fullNamespace = pipelineNamespacedPath(subPipelineNamespacePath);
+        final IRubyObject retrievedMetric = collector.callMethod(context, "get", new IRubyObject[]{fullNamespace, metricName, context.runtime.newSymbol("gauge")});
+
+        LazyDelegatingGauge delegatingGauge = retrievedMetric.toJava(LazyDelegatingGauge.class);
+        if (Objects.isNull(delegatingGauge.getType()) || delegatingGauge.getType() != MetricType.GAUGE_NUMBER) {
+            return Optional.empty();
+        }
+
+        return Optional.of((NumberGauge) delegatingGauge.getMetric().get());
+    }
+
+    private UptimeMetric initOrGetUptimeMetric(final ThreadContext context,
+                                               final RubySymbol[] subPipelineNamespacePath,
+                                               final RubySymbol uptimeMetricName) {
+        final IRubyObject collector = this.metric.collector(context);
+        final IRubyObject fullNamespace = pipelineNamespacedPath(subPipelineNamespacePath);
+
+        final IRubyObject retrievedMetric = collector.callMethod(context, "get", new IRubyObject[]{fullNamespace, uptimeMetricName, context.runtime.newSymbol("uptime")});
+        return retrievedMetric.toJava(UptimeMetric.class);
+    }
+
+    private void initializePqFlowMetrics(final ThreadContext context, final RubySymbol[] flowNamespace, final UptimeMetric uptime) {
+        final Metric<Number> uptimeInPreciseSeconds = uptime.withUnitsPrecise(SECONDS);
+        final IRubyObject queueContext = getSetting(context, QueueFactoryExt.QUEUE_TYPE_CONTEXT_NAME);
+        if (!queueContext.isNil() && queueContext.asJavaString().equals(QueueFactoryExt.PERSISTED_TYPE)) {
+
+            final RubySymbol[] queueNamespace = buildNamespace(QUEUE_KEY);
+            final RubySymbol[] queueCapacityNamespace = buildNamespace(QUEUE_KEY, CAPACITY_KEY);
+
+            final Supplier<NumberGauge> eventsGaugeMetricSupplier = () -> initOrGetNumberGaugeMetric(context, queueNamespace, EVENTS_KEY).orElse(null);
+            final FlowMetric growthEventsFlow = createFlowMetric(QUEUE_PERSISTED_GROWTH_EVENTS_KEY, eventsGaugeMetricSupplier, () -> uptimeInPreciseSeconds);
+            this.scopedFlowMetrics.register(ScopedFlowMetrics.Scope.WORKER, growthEventsFlow);
+            storeMetric(context, flowNamespace, growthEventsFlow);
+
+            final Supplier<NumberGauge> queueSizeInBytesMetricSupplier = () -> initOrGetNumberGaugeMetric(context, queueCapacityNamespace, QUEUE_SIZE_IN_BYTES_KEY).orElse(null);
+            final FlowMetric growthBytesFlow = createFlowMetric(QUEUE_PERSISTED_GROWTH_BYTES_KEY, queueSizeInBytesMetricSupplier, () -> uptimeInPreciseSeconds);
+            this.scopedFlowMetrics.register(ScopedFlowMetrics.Scope.WORKER, growthBytesFlow);
+
+            storeMetric(context, flowNamespace, growthBytesFlow);
+        }
+    }
+
+    private void initializePluginFlowMetrics(final ThreadContext context, final UptimeMetric uptime) {
+        for (IRubyObject rubyObject: lirExecution.inputs()) {
+            IRubyObject rubyfiedId = rubyObject.callMethod(context, "id");
+            String id = rubyfiedId.toString();
+            initializePluginThroughputFlowMetric(context, uptime, id);
+        }
+
+        final int workerCount = getSetting(context, SettingKeyDefinitions.PIPELINE_WORKERS).convertToInteger().getIntValue();
+
+        for (AbstractFilterDelegatorExt delegator: lirExecution.filters()) {
+            initializePluginWorkerFlowMetrics(context, workerCount, uptime, FILTERS_KEY, delegator.getId().asJavaString());
+        }
+
+        for (AbstractOutputDelegatorExt delegator: lirExecution.outputs()) {
+            initializePluginWorkerFlowMetrics(context, workerCount, uptime, OUTPUTS_KEY, delegator.getId().asJavaString());
+        }
+    }
+
+    private void initializePluginThroughputFlowMetric(final ThreadContext context, final UptimeMetric uptime, final String id) {
+        final Metric<Number> uptimeInPreciseSeconds = uptime.withUnitsPrecise(SECONDS);
+        final RubySymbol[] eventsNamespace = buildNamespace(PLUGINS_KEY, INPUTS_KEY, RubyUtil.RUBY.newString(id).intern(), EVENTS_KEY);
+        final LongCounter eventsOut = initOrGetCounterMetric(context, eventsNamespace, OUT_KEY);
+
+        final FlowMetric throughputFlow = createFlowMetric(PLUGIN_THROUGHPUT_KEY, eventsOut, uptimeInPreciseSeconds);
+        this.scopedFlowMetrics.register(ScopedFlowMetrics.Scope.PLUGIN, throughputFlow);
+
+        final RubySymbol[] flowNamespace = buildNamespace(PLUGINS_KEY, INPUTS_KEY, RubyUtil.RUBY.newString(id).intern(), FLOW_KEY);
+        storeMetric(context, flowNamespace, throughputFlow);
+    }
+
+    private void initializePluginWorkerFlowMetrics(final ThreadContext context, final int workerCount, final UptimeMetric uptime, final RubySymbol key, final String id) {
+        final Metric<Number> uptimeInPreciseMillis = uptime.withUnitsPrecise(MILLISECONDS);
+
+        final RubySymbol[] eventsNamespace = buildNamespace(PLUGINS_KEY, key, RubyUtil.RUBY.newString(id).intern(), EVENTS_KEY);
+        final TimerMetric durationInMillis = initOrGetTimerMetric(context, eventsNamespace, DURATION_IN_MILLIS_KEY);
+        final LongCounter counterEvents = initOrGetCounterMetric(context, eventsNamespace, IN_KEY);
+        final FlowMetric workerCostPerEvent = createFlowMetric(WORKER_MILLIS_PER_EVENT_KEY, durationInMillis, counterEvents);
+        this.scopedFlowMetrics.register(ScopedFlowMetrics.Scope.PLUGIN, workerCostPerEvent);
+
+        final UpScaledMetric percentScaledDurationInMillis = new UpScaledMetric(durationInMillis, 100);
+        final UpScaledMetric availableWorkerTimeInMillis = new UpScaledMetric(uptimeInPreciseMillis, workerCount);
+        final FlowMetric workerUtilization = createFlowMetric(WORKER_UTILIZATION_KEY, percentScaledDurationInMillis, availableWorkerTimeInMillis);
+        this.scopedFlowMetrics.register(ScopedFlowMetrics.Scope.PLUGIN, workerUtilization);
+
+        final RubySymbol[] flowNamespace = buildNamespace(PLUGINS_KEY, key, RubyUtil.RUBY.newString(id).intern(), FLOW_KEY);
+        storeMetric(context, flowNamespace, workerCostPerEvent);
+        storeMetric(context, flowNamespace, workerUtilization);
+    }
+
+    private <T> void storeMetric(final ThreadContext context,
+                                 final RubySymbol[] subPipelineNamespacePath,
+                                 final Metric<T> metric) {
+        final IRubyObject collector = this.metric.collector(context);
+        final IRubyObject fullNamespace = pipelineNamespacedPath(subPipelineNamespacePath);
+        final IRubyObject metricKey = context.runtime.newString(metric.getName()).intern();
+
+        final IRubyObject wasRegistered = collector.callMethod(context, "register?", new IRubyObject[]{fullNamespace, metricKey, JavaUtil.convertJavaToUsableRubyObject(context.runtime, metric)});
+        if (!wasRegistered.toJava(Boolean.class)) {
+            LOGGER.warn(String.format("Metric registration error: `%s` could not be registered in namespace `%s`", metricKey, fullNamespace));
+        } else {
+            LOGGER.debug(String.format("Flow metric registered: `%s` in namespace `%s`", metricKey, fullNamespace));
+        }
+    }
+
+    private RubyArray<RubySymbol> pipelineNamespacedPath(final RubySymbol... subPipelineNamespacePath) {
+        final RubySymbol[] pipelineNamespacePath = new RubySymbol[] { STATS_KEY, PIPELINES_KEY, pipelineId.asString().intern() };
+        if (subPipelineNamespacePath.length == 0) {
+            return rubySymbolArray(pipelineNamespacePath);
+        }
+        final RubySymbol[] fullNamespacePath = Arrays.copyOf(pipelineNamespacePath, pipelineNamespacePath.length + subPipelineNamespacePath.length);
+        System.arraycopy(subPipelineNamespacePath, 0, fullNamespacePath, pipelineNamespacePath.length, subPipelineNamespacePath.length);
+
+        return rubySymbolArray(fullNamespacePath);
+    }
+
+    @SuppressWarnings("unchecked")
+    private RubyArray<RubySymbol> rubySymbolArray(final RubySymbol[] symbols) {
+        return getRuntime().newArray(symbols);
+    }
+
+    private RubySymbol[] buildNamespace(final RubySymbol... namespace) {
+        return namespace;
+    }
+
     @JRubyMethod(name = "input_queue_client")
     public final JRubyAbstractQueueWriteClientExt inputQueueClient() {
         return inputQueueClient;
@@ -362,22 +795,127 @@ public class AbstractPipelineExt extends RubyBasicObject {
             .initialize(inputQueueClient, pipelineId.asJavaString(), metric, pluginId);
     }
 
+    public QueueWriter getQueueWriter(final String inputName) {
+        return new JRubyWrappedWriteClientExt(RubyUtil.RUBY, RubyUtil.WRAPPED_WRITE_CLIENT_CLASS)
+                .initialize(
+                        RubyUtil.RUBY.getCurrentContext(),
+                        new IRubyObject[]{
+                                inputQueueClient(), pipelineId().convertToString().intern(),
+                                metric(), RubyUtil.RUBY.newString(inputName).intern()
+                        }
+                );
+    }
+
+    @JRubyMethod(name = "pipeline_source_details", visibility = Visibility.PROTECTED)
+    @SuppressWarnings("rawtypes")
+    public RubyArray getPipelineSourceDetails(final ThreadContext context) {
+        List<RubyString> pipelineSources = new ArrayList<>(configParts.size());
+        for (SourceWithMetadata sourceWithMetadata : configParts) {
+            String protocol = sourceWithMetadata.getProtocol();
+            switch (protocol) {
+                case "string":
+                    pipelineSources.add(RubyString.newString(context.runtime, "config string"));
+                    break;
+                case "file":
+                    pipelineSources.add(RubyString.newString(context.runtime, sourceWithMetadata.getId()));
+                    break;
+                case "x-pack-metrics":
+                    pipelineSources.add(RubyString.newString(context.runtime, "monitoring pipeline"));
+                    break;
+                case "x-pack-config-management":
+                    pipelineSources.add(RubyString.newString(context.runtime, "central pipeline management"));
+                    break;
+                case "module":
+                    pipelineSources.add(RubyString.newString(context.runtime, "module"));
+                    break;
+            }
+        }
+        return RubyArray.newArray(context.runtime, pipelineSources);
+    }
+
     protected final IRubyObject getSetting(final ThreadContext context, final String name) {
         return settings.callMethod(context, "get_value", context.runtime.newString(name));
     }
 
+    protected final boolean hasSetting(final ThreadContext context, final String name) {
+        return settings.callMethod(context, "registered?", context.runtime.newString(name)) == context.tru;
+    }
+
+    protected SecretStore getSecretStore(final ThreadContext context) {
+        String keystoreFile = hasSetting(context, "keystore.file")
+                ? getSetting(context, "keystore.file").asJavaString()
+                : null;
+        String keystoreClassname = hasSetting(context, "keystore.classname")
+                ? getSetting(context, "keystore.classname").asJavaString()
+                : null;
+        return (keystoreFile != null && keystoreClassname != null)
+                ? SecretStoreExt.getIfExists(keystoreFile, keystoreClassname)
+                : null;
+    }
+
     private AbstractNamespacedMetricExt getDlqMetric(final ThreadContext context) {
         if (dlqMetric == null) {
-            dlqMetric = metric.namespace(
-                context, RubyArray.newArray(
-                    context.runtime,
-                    Arrays.asList(
-                        MetricKeys.STATS_KEY, MetricKeys.PIPELINES_KEY,
-                        pipelineId.asString().intern(), DLQ_KEY
-                    )
-                )
-            );
+            dlqMetric = metric.namespace(context, pipelineNamespacedPath(DLQ_KEY));
         }
         return dlqMetric;
     }
+
+    @JRubyMethod
+    @SuppressWarnings("rawtypes")
+    public RubyArray inputs() {
+        return inputs;
+    }
+
+    @JRubyMethod
+    @SuppressWarnings("rawtypes")
+    public RubyArray filters() {
+        return filters;
+    }
+
+    @JRubyMethod
+    @SuppressWarnings("rawtypes")
+    public RubyArray outputs() {
+        return outputs;
+    }
+
+    @JRubyMethod(name = "shutdown_requested?")
+    public IRubyObject isShutdownRequested(final ThreadContext context) {
+        // shutdown_requested? MUST be implemented in the concrete implementation of this class.
+        throw new IllegalStateException("Pipeline implementation does not provide `shutdown_requested?`, which is a Logstash internal error.");
+    }
+
+    @VisibleForTesting
+    @JRubyMethod(name = "last_error_evaluation_received")
+    public final RubyString getLastErrorEvaluationReceived(final ThreadContext context) {
+        return RubyString.newString(context.runtime, lastErrorEvaluationReceived);
+    }
+
+    private static class ScopedFlowMetrics {
+        enum Scope {
+            WORKER,
+            PLUGIN
+        }
+        private final Map<Scope, List<FlowMetric>> flowsByScope = new ConcurrentHashMap<>();
+
+        void register(final Scope scope, final FlowMetric metric) {
+            flowsByScope.compute(scope, (s, scopedFlows) -> {
+                if (scopedFlows == null) {
+                    return List.of(metric);
+                } else {
+                    final ArrayList<FlowMetric> mutable = new ArrayList<>(scopedFlows.size() + 1);
+                    mutable.addAll(scopedFlows);
+                    mutable.add(metric);
+                    return List.copyOf(mutable);
+                }
+            });
+        }
+
+        void captureAll() {
+            flowsByScope.values().stream().flatMap(List::stream).forEach(FlowMetric::capture);
+        }
+
+        List<FlowMetric> getFlowMetrics(final Scope scope) {
+            return flowsByScope.getOrDefault(scope, List.of());
+        }
+    }
 }
diff --git a/logstash-core/src/main/java/org/logstash/execution/AbstractWrappedQueueExt.java b/logstash-core/src/main/java/org/logstash/execution/AbstractWrappedQueueExt.java
index d5ea0e700..128cc00fa 100644
--- a/logstash-core/src/main/java/org/logstash/execution/AbstractWrappedQueueExt.java
+++ b/logstash-core/src/main/java/org/logstash/execution/AbstractWrappedQueueExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.execution;
 
 import org.jruby.Ruby;
@@ -9,6 +29,9 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.logstash.ext.JRubyAbstractQueueWriteClientExt;
 
+/**
+ * Interface definition for JRuby extensions for in memory and persistent queue
+ * */
 @JRubyClass(name = "AbstractWrappedQueue")
 public abstract class AbstractWrappedQueueExt extends RubyBasicObject {
 
diff --git a/logstash-core/src/main/java/org/logstash/execution/ConvergeResultExt.java b/logstash-core/src/main/java/org/logstash/execution/ConvergeResultExt.java
index 1e715984c..4c652ad5c 100644
--- a/logstash-core/src/main/java/org/logstash/execution/ConvergeResultExt.java
+++ b/logstash-core/src/main/java/org/logstash/execution/ConvergeResultExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.execution;
 
 import org.jruby.*;
@@ -13,12 +33,15 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+/**
+ * JRuby extension, used by agent to collect the results of running pipeliene actions (Create, Update, Delete)
+ * */
 @JRubyClass(name = "ConvergeResult")
 public class ConvergeResultExt extends RubyObject {
 
     private static final long serialVersionUID = 1L;
 
-    private IRubyObject expectedActionsCount;
+    private transient IRubyObject expectedActionsCount;
     private ConcurrentHashMap<IRubyObject, ActionResultExt> actions;
 
     public ConvergeResultExt(Ruby runtime, RubyClass metaClass) {
@@ -82,12 +105,15 @@ public class ConvergeResultExt extends RubyObject {
     }
 
 
+    /**
+     * Base class for all action results classes (Failed / Success)
+     * */
     @JRubyClass(name = "ActionResult")
     public static abstract class ActionResultExt extends RubyBasicObject {
 
         private static final long serialVersionUID = 1L;
 
-        private IRubyObject executedAt;
+        private transient IRubyObject executedAt;
 
         protected ActionResultExt(Ruby runtime, RubyClass metaClass) {
             super(runtime, metaClass);
@@ -133,13 +159,16 @@ public class ConvergeResultExt extends RubyObject {
         protected abstract boolean getSuccessFul();
     }
 
+    /**
+     * Failed result of running an action.
+     * */
     @JRubyClass(name = "FailedAction")
     public static final class FailedActionExt extends ActionResultExt {
 
         private static final long serialVersionUID = 1L;
 
-        private IRubyObject message;
-        private IRubyObject backtrace;
+        private transient IRubyObject message;
+        private transient IRubyObject backtrace;
 
         public FailedActionExt(Ruby runtime, RubyClass metaClass) {
             super(runtime, metaClass);
@@ -189,6 +218,9 @@ public class ConvergeResultExt extends RubyObject {
         }
     }
 
+    /**
+     * Successful result of running an action.
+     * */
     @JRubyClass(name = "SuccessfulAction")
     public static final class SuccessfulActionExt extends ActionResultExt {
 
diff --git a/logstash-core/src/main/java/org/logstash/execution/EventDispatcherExt.java b/logstash-core/src/main/java/org/logstash/execution/EventDispatcherExt.java
index 04ca5721d..862afb810 100644
--- a/logstash-core/src/main/java/org/logstash/execution/EventDispatcherExt.java
+++ b/logstash-core/src/main/java/org/logstash/execution/EventDispatcherExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.execution;
 
 import java.util.Collection;
@@ -10,14 +30,17 @@ import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
+/**
+ * JRuby extension that provides a class to keep track of listener and dispatch events to those.
+ * */
 @JRubyClass(name = "EventDispatcher")
 public final class EventDispatcherExt extends RubyBasicObject {
 
     private static final long serialVersionUID = 1L;
 
-    private final Collection<IRubyObject> listeners = new CopyOnWriteArraySet<>();
+    private final transient Collection<IRubyObject> listeners = new CopyOnWriteArraySet<>();
 
-    private IRubyObject emitter;
+    private transient IRubyObject emitter;
 
     public EventDispatcherExt(final Ruby runtime, final RubyClass metaClass) {
         super(runtime, metaClass);
diff --git a/logstash-core/src/main/java/org/logstash/execution/ExecutionContextExt.java b/logstash-core/src/main/java/org/logstash/execution/ExecutionContextExt.java
index 4bef02b28..eb0e48be1 100644
--- a/logstash-core/src/main/java/org/logstash/execution/ExecutionContextExt.java
+++ b/logstash-core/src/main/java/org/logstash/execution/ExecutionContextExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.execution;
 
 import org.jruby.Ruby;
@@ -5,11 +25,16 @@ import org.jruby.RubyClass;
 import org.jruby.RubyObject;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.Block;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.logstash.RubyUtil;
 import org.logstash.common.AbstractDeadLetterQueueWriterExt;
 
+/**
+ * JRuby extension to provide execution context to the plugins,
+ * instantiated by {@link org.logstash.plugins.factory.ExecutionContextFactoryExt}
+ * */
 @JRubyClass(name = "ExecutionContext")
 public final class ExecutionContextExt extends RubyObject {
 
@@ -17,22 +42,24 @@ public final class ExecutionContextExt extends RubyObject {
 
     private AbstractDeadLetterQueueWriterExt dlqWriter;
 
-    private IRubyObject agent;
+    private transient IRubyObject agent;
 
-    private IRubyObject pipeline;
+    private transient IRubyObject pipeline;
 
     public ExecutionContextExt(final Ruby runtime, final RubyClass metaClass) {
         super(runtime, metaClass);
     }
 
-    @JRubyMethod(required = 5)
+    @JRubyMethod(required = 2, optional = 1)
     public ExecutionContextExt initialize(final ThreadContext context,
         final IRubyObject[] args) {
         pipeline = args[0];
         agent = args[1];
-        dlqWriter = new AbstractDeadLetterQueueWriterExt.PluginDeadLetterQueueWriterExt(
-            context.runtime, RubyUtil.PLUGIN_DLQ_WRITER_CLASS
-        ).initialize(context, args[4], args[2], args[3]);
+        if (args.length > 2 && !args[2].isNil()) {
+            dlqWriter = (AbstractDeadLetterQueueWriterExt) args[2];
+        } else {
+            dlqWriter = (AbstractDeadLetterQueueWriterExt) RubyUtil.DUMMY_DLQ_WRITER_CLASS.newInstance(context, Block.NULL_BLOCK);
+        }
         return this;
     }
 
@@ -53,6 +80,9 @@ public final class ExecutionContextExt extends RubyObject {
 
     @JRubyMethod(name = "pipeline_id")
     public IRubyObject pipelineId(final ThreadContext context) {
+        if (pipeline.isNil()) {
+            return context.nil;
+        }
         return pipeline.callMethod(context, "pipeline_id");
     }
 }
diff --git a/logstash-core/src/main/java/org/logstash/execution/JavaBasePipelineExt.java b/logstash-core/src/main/java/org/logstash/execution/JavaBasePipelineExt.java
deleted file mode 100644
index f8ac46672..000000000
--- a/logstash-core/src/main/java/org/logstash/execution/JavaBasePipelineExt.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.logstash.execution;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.jruby.Ruby;
-import org.jruby.RubyArray;
-import org.jruby.RubyBoolean;
-import org.jruby.RubyClass;
-import org.jruby.anno.JRubyClass;
-import org.jruby.anno.JRubyMethod;
-import org.jruby.javasupport.JavaUtil;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.logstash.RubyUtil;
-import org.logstash.common.IncompleteSourceWithMetadataException;
-import org.logstash.config.ir.CompiledPipeline;
-import org.logstash.execution.queue.QueueWriter;
-import org.logstash.ext.JRubyWrappedWriteClientExt;
-import org.logstash.plugins.PluginFactoryExt;
-
-import java.security.NoSuchAlgorithmException;
-import java.util.Collection;
-import java.util.stream.Stream;
-
-@JRubyClass(name = "JavaBasePipeline")
-public final class JavaBasePipelineExt extends AbstractPipelineExt {
-
-    private static final long serialVersionUID = 1L;
-
-    private static final Logger LOGGER = LogManager.getLogger(JavaBasePipelineExt.class);
-
-    private CompiledPipeline lirExecution;
-
-    private @SuppressWarnings("rawtypes") RubyArray inputs;
-
-    private @SuppressWarnings("rawtypes") RubyArray filters;
-
-    private @SuppressWarnings("rawtypes") RubyArray outputs;
-
-    public JavaBasePipelineExt(final Ruby runtime, final RubyClass metaClass) {
-        super(runtime, metaClass);
-    }
-
-    @JRubyMethod(required = 4)
-    public JavaBasePipelineExt initialize(final ThreadContext context, final IRubyObject[] args)
-        throws IncompleteSourceWithMetadataException, NoSuchAlgorithmException {
-        initialize(context, args[0], args[1], args[2]);
-        lirExecution = new CompiledPipeline(
-            lir,
-            new PluginFactoryExt.Plugins(context.runtime, RubyUtil.PLUGIN_FACTORY_CLASS).init(
-                lir,
-                new PluginFactoryExt.Metrics(
-                    context.runtime, RubyUtil.PLUGIN_METRIC_FACTORY_CLASS
-                ).initialize(context, pipelineId(), metric()),
-                new PluginFactoryExt.ExecutionContext(
-                    context.runtime, RubyUtil.EXECUTION_CONTEXT_FACTORY_CLASS
-                ).initialize(context, args[3], this, dlqWriter(context)),
-                RubyUtil.FILTER_DELEGATOR_CLASS
-            )
-        );
-        inputs = RubyArray.newArray(context.runtime, lirExecution.inputs());
-        filters = RubyArray.newArray(context.runtime, lirExecution.filters());
-        outputs = RubyArray.newArray(context.runtime, lirExecution.outputs());
-        if (getSetting(context, "config.debug").isTrue() && LOGGER.isDebugEnabled()) {
-            LOGGER.debug(
-                "Compiled pipeline code for pipeline {} : {}", pipelineId(),
-                lir.getGraph().toString()
-            );
-        }
-        return this;
-    }
-
-    @JRubyMethod(name = "lir_execution")
-    public IRubyObject lirExecution(final ThreadContext context) {
-        return JavaUtil.convertJavaToUsableRubyObject(context.runtime, lirExecution);
-    }
-
-    @JRubyMethod
-    @SuppressWarnings("rawtypes")
-    public RubyArray inputs() {
-        return inputs;
-    }
-
-    @JRubyMethod
-    @SuppressWarnings("rawtypes")
-    public RubyArray filters() {
-        return filters;
-    }
-
-    @JRubyMethod
-    @SuppressWarnings("rawtypes")
-    public RubyArray outputs() {
-        return outputs;
-    }
-
-    @JRubyMethod(name = "reloadable?")
-    public RubyBoolean isReloadable(final ThreadContext context) {
-        return isConfiguredReloadable(context).isTrue() && reloadablePlugins(context).isTrue()
-            ? context.tru : context.fals;
-    }
-
-    @JRubyMethod(name = "reloadable_plugins?")
-    public RubyBoolean reloadablePlugins(final ThreadContext context) {
-        return nonReloadablePlugins(context).isEmpty() ? context.tru : context.fals;
-    }
-
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    @JRubyMethod(name = "non_reloadable_plugins")
-    public RubyArray nonReloadablePlugins(final ThreadContext context) {
-        final RubyArray result = RubyArray.newArray(context.runtime);
-        Stream.of(inputs, outputs, filters).flatMap(
-            plugins -> ((Collection<IRubyObject>) plugins).stream()
-        ).filter(
-            plugin -> !plugin.callMethod(context, "reloadable?").isTrue()
-        ).forEach(result::add);
-        return result;
-    }
-
-    public QueueWriter getQueueWriter(final String inputName) {
-        return new JRubyWrappedWriteClientExt(RubyUtil.RUBY, RubyUtil.WRAPPED_WRITE_CLIENT_CLASS)
-            .initialize(
-                RubyUtil.RUBY.getCurrentContext(),
-                new IRubyObject[]{
-                    inputQueueClient(), pipelineId().convertToString().intern(),
-                    metric(), RubyUtil.RUBY.newSymbol(inputName)
-                }
-            );
-    }
-}
diff --git a/logstash-core/src/main/java/org/logstash/execution/MemoryReadBatch.java b/logstash-core/src/main/java/org/logstash/execution/MemoryReadBatch.java
index c68540440..6a70db2cb 100644
--- a/logstash-core/src/main/java/org/logstash/execution/MemoryReadBatch.java
+++ b/logstash-core/src/main/java/org/logstash/execution/MemoryReadBatch.java
@@ -1,50 +1,71 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.logstash.execution;
 
 import org.jruby.RubyArray;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.logstash.ext.JrubyEventExtLibrary;
-
-import java.util.LinkedHashSet;
+import org.logstash.ext.JrubyEventExtLibrary.RubyEvent;
+import java.util.ArrayList;
+import java.util.Collection;
 
 import static org.logstash.RubyUtil.RUBY;
 
+/**
+ * In memory queue collection of events implementation
+ * */
 public final class MemoryReadBatch implements QueueBatch {
 
-    private final LinkedHashSet<IRubyObject> events;
+    private final Collection<RubyEvent> events;
 
-    public MemoryReadBatch(final LinkedHashSet<IRubyObject> events) {
-        this.events = events;
+    public static boolean isCancelled(final RubyEvent event) {
+        return event.getEvent().isCancelled();
     }
 
-    public static boolean isCancelled(final IRubyObject event) {
-        return ((JrubyEventExtLibrary.RubyEvent) event).getEvent().isCancelled();
-    }
-
-    public static MemoryReadBatch create(LinkedHashSet<IRubyObject> events) {
+    public static MemoryReadBatch create(Collection<RubyEvent> events) {
         return new MemoryReadBatch(events);
     }
 
     public static MemoryReadBatch create() {
-        return create(new LinkedHashSet<>());
+        return new MemoryReadBatch(new ArrayList<>());
+    }
+
+    private MemoryReadBatch(final Collection<RubyEvent> events) {
+        this.events = events;
     }
 
     @Override
-    @SuppressWarnings({"rawtypes"})
-    public RubyArray to_a() {
-        ThreadContext context = RUBY.getCurrentContext();
-        final RubyArray result = context.runtime.newArray(events.size());
-        for (final IRubyObject event : events) {
-            if (!isCancelled(event)) {
-                result.add(event);
+    public RubyArray<RubyEvent> to_a() {
+        @SuppressWarnings({"unchecked"}) final RubyArray<RubyEvent> result = RUBY.newArray(events.size());
+        for (final RubyEvent e : events) {
+            if (!isCancelled(e)) {
+                result.append(e);
             }
         }
         return result;
     }
 
     @Override
-    public void merge(final IRubyObject event) {
-        events.add(event);
+    public Collection<RubyEvent> events() {
+        // This does not filter cancelled events because it is
+        // only used in the WorkerLoop where there are no cancelled
+        // events yet.
+        return events;
     }
 
     @Override
diff --git a/logstash-core/src/main/java/org/logstash/execution/ObservedExecution.java b/logstash-core/src/main/java/org/logstash/execution/ObservedExecution.java
new file mode 100644
index 000000000..0caccd395
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/execution/ObservedExecution.java
@@ -0,0 +1,19 @@
+package org.logstash.execution;
+
+import org.logstash.config.ir.CompiledPipeline;
+
+class ObservedExecution<QB extends QueueBatch> implements CompiledPipeline.Execution<QB> {
+    private final WorkerObserver workerObserver;
+    private final CompiledPipeline.Execution<QB> execution;
+
+    public ObservedExecution(final WorkerObserver workerObserver,
+                             final CompiledPipeline.Execution<QB> execution) {
+        this.workerObserver = workerObserver;
+        this.execution = execution;
+    }
+
+    @Override
+    public int compute(QB batch, boolean flush, boolean shutdown) {
+        return workerObserver.observeExecutionComputation(batch, () -> execution.compute(batch, flush, shutdown));
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/execution/PeriodicFlush.java b/logstash-core/src/main/java/org/logstash/execution/PeriodicFlush.java
index f8ad489f1..2d506652f 100644
--- a/logstash-core/src/main/java/org/logstash/execution/PeriodicFlush.java
+++ b/logstash-core/src/main/java/org/logstash/execution/PeriodicFlush.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.execution;
 
 import java.util.concurrent.Executors;
@@ -8,6 +28,9 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 @SuppressWarnings("try")
+/**
+ * Used by Ruby's JavaPipeline
+ * */
 public final class PeriodicFlush implements AutoCloseable {
 
     private static final Logger LOGGER = LogManager.getLogger(PeriodicFlush.class);
diff --git a/logstash-core/src/main/java/org/logstash/execution/PipelineReporterExt.java b/logstash-core/src/main/java/org/logstash/execution/PipelineReporterExt.java
index 677b19bda..6ddc3eda5 100644
--- a/logstash-core/src/main/java/org/logstash/execution/PipelineReporterExt.java
+++ b/logstash-core/src/main/java/org/logstash/execution/PipelineReporterExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.execution;
 
 import org.jruby.Ruby;
@@ -7,6 +27,7 @@ import org.jruby.RubyClass;
 import org.jruby.RubyHash;
 import org.jruby.RubyString;
 import org.jruby.RubySymbol;
+import org.jruby.RubyThread;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.Block;
@@ -16,7 +37,11 @@ import org.logstash.RubyUtil;
 import org.logstash.config.ir.compiler.AbstractOutputDelegatorExt;
 
 import java.util.Collection;
+import java.util.Optional;
 
+/**
+ * JRuby extension
+ * */
 @JRubyClass(name = "PipelineReporter")
 public final class PipelineReporterExt extends RubyBasicObject {
 
@@ -58,9 +83,9 @@ public final class PipelineReporterExt extends RubyBasicObject {
     private static final RubyString DEAD_STATUS =
         RubyUtil.RUBY.newString("dead").newFrozen();
 
-    private IRubyObject logger;
+    private transient IRubyObject logger;
 
-    private IRubyObject pipeline;
+    private transient IRubyObject pipeline;
 
     public PipelineReporterExt(final Ruby runtime, final RubyClass metaClass) {
         super(runtime, metaClass);
@@ -132,11 +157,12 @@ public final class PipelineReporterExt extends RubyBasicObject {
         return result;
     }
 
-    @SuppressWarnings({"unchecked","rawtypes"})
+    @SuppressWarnings({"unchecked", "rawtypes", "deprecation"})
     private RubyArray workerStates(final ThreadContext context, final RubyHash batchMap) {
         final RubyArray result = context.runtime.newArray();
         ((Iterable<IRubyObject>) pipeline.callMethod(context, "worker_threads"))
             .forEach(thread -> {
+
                 final RubyHash hash = RubyHash.newHash(context.runtime);
                 IRubyObject status = thread.callMethod(context, "status");
                 if (status.isNil()) {
@@ -145,17 +171,43 @@ public final class PipelineReporterExt extends RubyBasicObject {
                 hash.op_aset(context, STATUS_KEY, status);
                 hash.op_aset(context, ALIVE_KEY, thread.callMethod(context, "alive?"));
                 hash.op_aset(context, INDEX_KEY, context.runtime.newFixnum(result.size()));
-                final IRubyObject batch = batchMap.op_aref(context, thread);
-                hash.op_aset(
-                    context, INFLIGHT_COUNT_KEY,
-                    batch.isNil() ?
-                        context.runtime.newFixnum(0) : batch.callMethod(context, "size")
-                );
+
+                IRubyObject batchSize = Optional.of((RubyThread) thread)
+                        .map(RubyThread::getNativeThread)
+                        // JTODO getId has been deprecated in JDK 19, when JDK 21 is the target version use threadId() instead
+                        .map(Thread::getId)
+                        .map(id -> batchMap.op_aref(context, context.runtime.newFixnum(id)))
+                        .map(batch -> extractBatchSize(context, batch))
+                        .orElse(context.runtime.newFixnum(0L));
+
+                hash.op_aset(context, INFLIGHT_COUNT_KEY, batchSize);
                 result.add(hash);
             });
         return result;
     }
 
+    /**
+     * Attempts to safely extract the batch size from a wrapped {@link QueueBatch} or
+     * a ruby object responding to {@code size}
+     *
+     * @param context The Ruby {@code ThreadContext}
+     * @param batch a batch, which may be a wrapped {@link QueueBatch} or a ruby
+     *              object that responds to `#size`
+     * @return the detected size, or zero.
+     */
+    private IRubyObject extractBatchSize(final ThreadContext context, final IRubyObject batch) {
+        if (!batch.isNil()) {
+            if (QueueBatch.class.isAssignableFrom(batch.getJavaClass())) {
+                final int filteredSize = batch.toJava(QueueBatch.class).filteredSize();
+                return getRuntime().newFixnum(filteredSize);
+            }
+            if (batch.respondsTo("size")) {
+                return batch.callMethod(context, "size");
+            }
+        }
+        return context.runtime.newFixnum(0L);
+    }
+
     @SuppressWarnings({"unchecked","rawtypes"})
     private RubyArray outputInfo(final ThreadContext context) {
         final RubyArray result = context.runtime.newArray();
@@ -244,6 +296,11 @@ public final class PipelineReporterExt extends RubyBasicObject {
             return data.op_aref(context, method);
         }
 
+        @JRubyMethod(name = "respond_to_missing?")
+        public IRubyObject isRespondToMissing(final ThreadContext context, final IRubyObject method, final IRubyObject includePrivate) {
+            return context.tru;
+        }
+
         @JRubyMethod(name = "format_threads_by_plugin")
         @SuppressWarnings("unchecked")
         public RubyHash formatThreadsByPlugin(final ThreadContext context) {
diff --git a/logstash-core/src/main/java/org/logstash/execution/QueueBatch.java b/logstash-core/src/main/java/org/logstash/execution/QueueBatch.java
index c2c68f57d..f7b9d59ea 100644
--- a/logstash-core/src/main/java/org/logstash/execution/QueueBatch.java
+++ b/logstash-core/src/main/java/org/logstash/execution/QueueBatch.java
@@ -1,13 +1,35 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.logstash.execution;
 
 import org.jruby.RubyArray;
-import org.jruby.runtime.builtin.IRubyObject;
-
+import org.logstash.ext.JrubyEventExtLibrary.RubyEvent;
 import java.io.IOException;
+import java.util.Collection;
 
+/**
+ * Defines collection of queue events to be processed.
+ * */
 public interface QueueBatch {
     int filteredSize();
-    @SuppressWarnings({"rawtypes"}) RubyArray to_a();
-    void merge(IRubyObject event);
+    RubyArray<RubyEvent> to_a();
+    Collection<RubyEvent> events();
     void close() throws IOException;
 }
diff --git a/logstash-core/src/main/java/org/logstash/execution/QueueReadClient.java b/logstash-core/src/main/java/org/logstash/execution/QueueReadClient.java
index d1f0d45d7..869a3c758 100644
--- a/logstash-core/src/main/java/org/logstash/execution/QueueReadClient.java
+++ b/logstash-core/src/main/java/org/logstash/execution/QueueReadClient.java
@@ -1,7 +1,32 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.execution;
 
+import co.elastic.logstash.api.TimerMetric;
+
 import java.io.IOException;
 
+/**
+ * Defines the methods to interact with queues from the reader perspective
+ * */
 public interface QueueReadClient {
     QueueBatch readBatch() throws InterruptedException;
     QueueBatch newBatch();
@@ -9,5 +34,10 @@ public interface QueueReadClient {
     void addOutputMetrics(int filteredSize);
     void addFilteredMetrics(int filteredSize);
     void closeBatch(QueueBatch batch) throws IOException;
+
+    public <V, E extends Exception> V executeWithTimers(final TimerMetric.ExceptionalSupplier<V,E> supplier) throws E;
+
+    public <E extends Exception> void executeWithTimers(final TimerMetric.ExceptionalRunnable<E> runnable) throws E;
+
     boolean isEmpty();
 }
diff --git a/logstash-core/src/main/java/org/logstash/execution/QueueReadClientBase.java b/logstash-core/src/main/java/org/logstash/execution/QueueReadClientBase.java
index 951f83f8a..535cd838a 100644
--- a/logstash-core/src/main/java/org/logstash/execution/QueueReadClientBase.java
+++ b/logstash-core/src/main/java/org/logstash/execution/QueueReadClientBase.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.execution;
 
 import org.jruby.Ruby;
@@ -7,19 +27,23 @@ import org.jruby.RubyNumeric;
 import org.jruby.RubyObject;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
-import org.jruby.java.proxies.JavaProxy;
-import org.jruby.javasupport.JavaObject;
+import org.jruby.javasupport.JavaUtil;
+import org.jruby.runtime.Block;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.logstash.RubyUtil;
 import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
 import org.logstash.instrument.metrics.MetricKeys;
+import org.logstash.instrument.metrics.timer.TimerMetric;
 import org.logstash.instrument.metrics.counter.LongCounter;
 
 import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
+/**
+ * Common code shared by Persistent and In-Memory queues clients implementation
+ * */
 @JRubyClass(name = "QueueReadClientBase")
 public abstract class QueueReadClientBase extends RubyObject implements QueueReadClient {
 
@@ -29,16 +53,13 @@ public abstract class QueueReadClientBase extends RubyObject implements QueueRea
     protected long waitForNanos = 50 * 1000 * 1000; // 50 millis to nanos
     protected long waitForMillis = 50;
 
-    private final ConcurrentHashMap<Long, QueueBatch> inflightBatches =
-            new ConcurrentHashMap<>();
-    private final ConcurrentHashMap<Long, Long> inflightClocks = new ConcurrentHashMap<>();
-
-    private LongCounter eventMetricOut;
-    private LongCounter eventMetricFiltered;
-    private LongCounter eventMetricTime;
-    private LongCounter pipelineMetricOut;
-    private LongCounter pipelineMetricFiltered;
-    private LongCounter pipelineMetricTime;
+    private final ConcurrentHashMap<Long, QueueBatch> inflightBatches = new ConcurrentHashMap<>();
+    private transient LongCounter eventMetricOut;
+    private transient LongCounter eventMetricFiltered;
+    private transient TimerMetric eventMetricTime;
+    private transient LongCounter pipelineMetricOut;
+    private transient LongCounter pipelineMetricFiltered;
+    private transient TimerMetric pipelineMetricTime;
 
     protected QueueReadClientBase(final Ruby runtime, final RubyClass metaClass) {
         super(runtime, metaClass);
@@ -57,7 +78,7 @@ public abstract class QueueReadClientBase extends RubyObject implements QueueRea
         synchronized(namespacedMetric.getMetric()) {
             eventMetricOut = LongCounter.fromRubyBase(namespacedMetric, MetricKeys.OUT_KEY);
             eventMetricFiltered = LongCounter.fromRubyBase(namespacedMetric, MetricKeys.FILTERED_KEY);
-            eventMetricTime = LongCounter.fromRubyBase(namespacedMetric, MetricKeys.DURATION_IN_MILLIS_KEY);
+            eventMetricTime = TimerMetric.fromRubyBase(namespacedMetric, MetricKeys.DURATION_IN_MILLIS_KEY);
         }
         return this;
     }
@@ -68,7 +89,7 @@ public abstract class QueueReadClientBase extends RubyObject implements QueueRea
         synchronized(namespacedMetric.getMetric()) {
             pipelineMetricOut = LongCounter.fromRubyBase(namespacedMetric, MetricKeys.OUT_KEY);
             pipelineMetricFiltered = LongCounter.fromRubyBase(namespacedMetric, MetricKeys.FILTERED_KEY);
-            pipelineMetricTime = LongCounter.fromRubyBase(namespacedMetric, MetricKeys.DURATION_IN_MILLIS_KEY);
+            pipelineMetricTime = TimerMetric.fromRubyBase(namespacedMetric, MetricKeys.DURATION_IN_MILLIS_KEY);
         }
         return this;
     }
@@ -103,20 +124,15 @@ public abstract class QueueReadClientBase extends RubyObject implements QueueRea
 
     @JRubyMethod(name = "read_batch")
     public IRubyObject rubyReadBatch(final ThreadContext context) throws InterruptedException {
-        return JavaObject.wrap(context.runtime, readBatch());
+        return RubyUtil.toRubyObject(readBatch());
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public void closeBatch(QueueBatch batch) throws IOException {
         batch.close();
+        // JTODO getId has been deprecated in JDK 19, when JDK 21 is the target version use threadId() instead
         inflightBatches.remove(Thread.currentThread().getId());
-        Long startTime = inflightClocks.remove(Thread.currentThread().getId());
-        if (startTime != null && batch.filteredSize() > 0) {
-            // stop timer and record metrics iff the batch is non-empty.
-            long elapsedTimeMillis = (System.nanoTime() - startTime) / 1_000_000;
-            eventMetricTime.increment(elapsedTimeMillis);
-            pipelineMetricTime.increment(elapsedTimeMillis);
-        }
     }
 
     /**
@@ -148,11 +164,7 @@ public abstract class QueueReadClientBase extends RubyObject implements QueueRea
      * @return Extracted queue batch
      */
     private static QueueBatch extractQueueBatch(final IRubyObject batch) {
-        if (batch instanceof JavaProxy) {
-            return (QueueBatch) ((JavaObject)batch.dataGetStruct()).getValue();
-        } else {
-            return (QueueBatch)((JavaObject)batch).getValue();
-        }
+        return JavaUtil.unwrapIfJavaObject(batch);
     }
 
     /**
@@ -176,10 +188,11 @@ public abstract class QueueReadClientBase extends RubyObject implements QueueRea
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public void startMetrics(QueueBatch batch) {
+        // JTODO getId has been deprecated in JDK 19, when JDK 21 is the target version use threadId() instead
         long threadId = Thread.currentThread().getId();
         inflightBatches.put(threadId, batch);
-        inflightClocks.put(threadId, System.nanoTime());
     }
 
     @Override
@@ -194,5 +207,21 @@ public abstract class QueueReadClientBase extends RubyObject implements QueueRea
         pipelineMetricOut.increment(filteredSize);
     }
 
+    @Override
+    public <V, E extends Exception> V executeWithTimers(final co.elastic.logstash.api.TimerMetric.ExceptionalSupplier<V,E> supplier) throws E {
+        return eventMetricTime.time(() -> pipelineMetricTime.time(supplier));
+    }
+
+    @Override
+    public <E extends Exception> void executeWithTimers(co.elastic.logstash.api.TimerMetric.ExceptionalRunnable<E> runnable) throws E {
+        eventMetricTime.time(() -> pipelineMetricTime.time(runnable));
+    }
+
+    @JRubyMethod(name = "execute_with_timers")
+    public IRubyObject executeWithTimersRuby(final ThreadContext context,
+                                             final Block block) {
+        return executeWithTimers(() -> block.call(context));
+    }
+
     public abstract void close() throws IOException;
 }
diff --git a/logstash-core/src/main/java/org/logstash/execution/ShutdownWatcherExt.java b/logstash-core/src/main/java/org/logstash/execution/ShutdownWatcherExt.java
index 0682215ed..1addd6597 100644
--- a/logstash-core/src/main/java/org/logstash/execution/ShutdownWatcherExt.java
+++ b/logstash-core/src/main/java/org/logstash/execution/ShutdownWatcherExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.execution;
 
 import java.util.ArrayList;
@@ -17,6 +37,9 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.logstash.RubyUtil;
 
+/**
+ * JRuby extension, used by pipelines to execute the shutdown flow of a pipeline.
+ * */
 @JRubyClass(name = "ShutdownWatcher")
 public final class ShutdownWatcherExt extends RubyBasicObject {
 
@@ -26,7 +49,7 @@ public final class ShutdownWatcherExt extends RubyBasicObject {
 
     private static final AtomicBoolean unsafeShutdown = new AtomicBoolean(false);
 
-    private final List<IRubyObject> reports = new ArrayList<>();
+    private final transient List<IRubyObject> reports = new ArrayList<>();
 
     private final AtomicInteger attemptsCount = new AtomicInteger(0);
 
@@ -38,19 +61,7 @@ public final class ShutdownWatcherExt extends RubyBasicObject {
 
     private int abortThreshold = 3;
 
-    private IRubyObject pipeline;
-
-    @JRubyMethod(meta = true, required = 1, optional = 3)
-    public static RubyThread start(final ThreadContext context, final IRubyObject recv, final IRubyObject[] args) {
-        return new RubyThread(context.runtime, context.runtime.getThread(), () -> {
-            try {
-                new ShutdownWatcherExt(context.runtime, RubyUtil.SHUTDOWN_WATCHER_CLASS)
-                    .initialize(context, args).start(context);
-            } catch (final InterruptedException ex) {
-                throw new IllegalStateException(ex);
-            }
-        });
-    }
+    private transient IRubyObject pipeline;
 
     @JRubyMethod(name = "unsafe_shutdown?", meta = true)
     public static IRubyObject isUnsafeShutdown(final ThreadContext context,
@@ -143,9 +154,7 @@ public final class ShutdownWatcherExt extends RubyBasicObject {
             while (true) {
                 TimeUnit.SECONDS.sleep(cyclePeriod);
                 attemptsCount.incrementAndGet();
-                if (stopped(context).isTrue() ||
-                    !pipeline.callMethod(context, "thread")
-                        .callMethod(context, "alive?").isTrue()) {
+                if (stopped(context).isTrue() || pipeline.callMethod(context, "finished_execution?").isTrue()) {
                     break;
                 }
                 reports.add(pipelineReportSnapshot(context));
@@ -153,17 +162,22 @@ public final class ShutdownWatcherExt extends RubyBasicObject {
                     reports.remove(0);
                 }
                 if (cycleNumber == reportEvery - 1) {
-                    LOGGER.warn(reports.get(reports.size() - 1).callMethod(context, "to_s")
-                        .asJavaString());
+                    boolean isPqDraining = pipeline.callMethod(context, "worker_threads_draining?").isTrue();
+
+                    if (!isPqDraining) {
+                        LOGGER.warn(reports.get(reports.size() - 1).callMethod(context, "to_s").asJavaString());
+                    }
+
                     if (shutdownStalled(context).isTrue()) {
                         if (stalledCount == 0) {
-                            LOGGER.error(
-                                "The shutdown process appears to be stalled due to busy or blocked plugins. Check the logs for more information."
-                            );
+                            LOGGER.error("The shutdown process appears to be stalled due to busy or blocked plugins. Check the logs for more information.");
+                            if (isPqDraining) {
+                                String pipelineId = pipeline.callMethod(context, "pipeline_id").asJavaString();
+                                LOGGER.info("The queue for pipeline {} is draining before shutdown.", pipelineId);
+                            }
                         }
                         ++stalledCount;
-                        if (isUnsafeShutdown(context, null).isTrue() &&
-                            abortThreshold == stalledCount) {
+                        if (isUnsafeShutdown(context, null).isTrue() && abortThreshold == stalledCount) {
                             LOGGER.fatal("Forcefully quitting Logstash ...");
                             forceExit(context);
                         }
diff --git a/logstash-core/src/main/java/org/logstash/execution/WorkerLoop.java b/logstash-core/src/main/java/org/logstash/execution/WorkerLoop.java
index c3825ddf6..9d849e42d 100644
--- a/logstash-core/src/main/java/org/logstash/execution/WorkerLoop.java
+++ b/logstash-core/src/main/java/org/logstash/execution/WorkerLoop.java
@@ -1,27 +1,40 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.logstash.execution;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.LongAdder;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.jruby.runtime.ThreadContext;
-import org.logstash.RubyUtil;
 import org.logstash.config.ir.CompiledPipeline;
-import org.logstash.config.ir.compiler.Dataset;
 
+/**
+ * Pipeline execution worker, it's responsible to execute filters and output plugins for each {@link QueueBatch} that
+ * pull out from queue.
+ * */
 public final class WorkerLoop implements Runnable {
 
-    /**
-     * Hard Reference to the Ruby {@link ThreadContext} for this thread. It is ok to keep
-     * a hard reference instead of Ruby's weak references here since we can expect worker threads
-     * to be runnable most of the time.
-     */
-    public static final ThreadLocal<ThreadContext> THREAD_CONTEXT =
-        ThreadLocal.withInitial(RubyUtil.RUBY::getCurrentContext);
-
     private static final Logger LOGGER = LogManager.getLogger(WorkerLoop.class);
 
-    private final Dataset execution;
+    private final ObservedExecution<QueueBatch> execution;
 
     private final QueueReadClient readClient;
 
@@ -37,15 +50,23 @@ public final class WorkerLoop implements Runnable {
 
     private final boolean drainQueue;
 
-    public WorkerLoop(final CompiledPipeline pipeline, final QueueReadClient readClient,
-        final LongAdder filteredCounter, final LongAdder consumedCounter,
-        final AtomicBoolean flushRequested, final AtomicBoolean flushing,
-        final AtomicBoolean shutdownRequested, final boolean drainQueue) {
+    public WorkerLoop(
+            final QueueReadClient readClient,
+            final CompiledPipeline compiledPipeline,
+            final WorkerObserver workerObserver,
+            final LongAdder consumedCounter,
+            final LongAdder filteredCounter,
+            final AtomicBoolean flushRequested,
+            final AtomicBoolean flushing,
+            final AtomicBoolean shutdownRequested,
+            final boolean drainQueue,
+            final boolean preserveEventOrder)
+    {
+        this.execution = workerObserver.ofExecution(compiledPipeline.buildExecution(preserveEventOrder));
+        this.readClient = readClient;
         this.consumedCounter = consumedCounter;
         this.filteredCounter = filteredCounter;
-        this.execution = pipeline.buildExecution();
         this.drainQueue = drainQueue;
-        this.readClient = readClient;
         this.flushRequested = flushRequested;
         this.flushing = flushing;
         this.shutdownRequested = shutdownRequested;
@@ -55,38 +76,54 @@ public final class WorkerLoop implements Runnable {
     public void run() {
         try {
             boolean isShutdown = false;
+            boolean isNackBatch = false;
             do {
                 isShutdown = isShutdown || shutdownRequested.get();
                 final QueueBatch batch = readClient.readBatch();
-                consumedCounter.add(batch.filteredSize());
                 final boolean isFlush = flushRequested.compareAndSet(true, false);
-                readClient.startMetrics(batch);
-                execution.compute(batch.to_a(), isFlush, false);
-                int filteredCount = batch.filteredSize();
-                filteredCounter.add(filteredCount);
-                readClient.addOutputMetrics(filteredCount);
-                readClient.addFilteredMetrics(filteredCount);
-                readClient.closeBatch(batch);
-                if (isFlush) {
-                    flushing.set(false);
+                if (batch.filteredSize() > 0 || isFlush) {
+                    consumedCounter.add(batch.filteredSize());
+                    isNackBatch = abortableCompute(batch, isFlush, false);
+                    if (!isNackBatch) {
+                        filteredCounter.add(batch.filteredSize());
+                        readClient.closeBatch(batch);
+
+                        if (isFlush) {
+                            flushing.set(false);
+                        }
+                    }
                 }
-            } while (!isShutdown || isDraining());
-            //we are shutting down, queue is drained if it was required, now  perform a final flush.
-            //for this we need to create a new empty batch to contain the final flushed events
-            final QueueBatch batch = readClient.newBatch();
-            readClient.startMetrics(batch);
-            execution.compute(batch.to_a(), true, true);
-            readClient.closeBatch(batch);
+            } while ((!isShutdown || isDraining()) && !isNackBatch);
+
+            if (!isNackBatch) {
+                //we are shutting down, queue is drained if it was required, now  perform a final flush.
+                //for this we need to create a new empty batch to contain the final flushed events
+                final QueueBatch batch = readClient.newBatch();
+                abortableCompute(batch, true, true);
+                readClient.closeBatch(batch);
+            }
         } catch (final Exception ex) {
-            LOGGER.error(
-                "Exception in pipelineworker, the pipeline stopped processing new events, please check your filter configuration and restart Logstash.",
-                ex
-            );
             throw new IllegalStateException(ex);
         }
     }
 
-    private boolean isDraining() {
+    private boolean abortableCompute(QueueBatch batch, boolean flush, boolean shutdown) {
+        boolean isNackBatch = false;
+        try {
+            execution.compute(batch, flush, shutdown);
+        } catch (Exception ex) {
+            if (ex instanceof AbortedBatchException) {
+                isNackBatch = true;
+                LOGGER.info("Received signal to abort processing current batch. Terminating pipeline worker {}", Thread.currentThread().getName());
+            } else {
+                // if not an abort batch, continue propagating
+                throw ex;
+            }
+        }
+        return isNackBatch;
+    }
+
+    public boolean isDraining() {
         return drainQueue && !readClient.isEmpty();
     }
 }
diff --git a/logstash-core/src/main/java/org/logstash/execution/WorkerObserver.java b/logstash-core/src/main/java/org/logstash/execution/WorkerObserver.java
new file mode 100644
index 000000000..8724da63c
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/execution/WorkerObserver.java
@@ -0,0 +1,63 @@
+package org.logstash.execution;
+
+import org.logstash.config.ir.CompiledPipeline;
+import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
+import org.logstash.instrument.metrics.MetricKeys;
+import org.logstash.instrument.metrics.counter.LongCounter;
+import org.logstash.instrument.metrics.timer.TimerMetric;
+
+public class WorkerObserver {
+    private final transient LongCounter processEventsFilteredMetric;
+    private final transient LongCounter processEventsOutMetric;
+    private final transient TimerMetric processEventsDurationMetric;
+
+    private final transient LongCounter pipelineEventsFilteredMetric;
+    private final transient LongCounter pipelineEventsOutMetric;
+    private final transient TimerMetric pipelineEventsDurationMetric;
+
+    public WorkerObserver(final AbstractNamespacedMetricExt processEventsMetric,
+                          final AbstractNamespacedMetricExt pipelineEventsMetric) {
+        synchronized(processEventsMetric.getMetric()) {
+            this.processEventsOutMetric = LongCounter.fromRubyBase(processEventsMetric, MetricKeys.OUT_KEY);
+            this.processEventsFilteredMetric = LongCounter.fromRubyBase(processEventsMetric, MetricKeys.FILTERED_KEY);
+            this.processEventsDurationMetric = TimerMetric.fromRubyBase(processEventsMetric, MetricKeys.DURATION_IN_MILLIS_KEY);
+        }
+
+        synchronized(pipelineEventsMetric.getMetric()) {
+            this.pipelineEventsOutMetric = LongCounter.fromRubyBase(pipelineEventsMetric, MetricKeys.OUT_KEY);
+            this.pipelineEventsFilteredMetric = LongCounter.fromRubyBase(pipelineEventsMetric, MetricKeys.FILTERED_KEY);
+            this.pipelineEventsDurationMetric = TimerMetric.fromRubyBase(pipelineEventsMetric, MetricKeys.DURATION_IN_MILLIS_KEY);
+        }
+    }
+
+    public <QB extends QueueBatch> ObservedExecution<QB> ofExecution(final CompiledPipeline.Execution<QB> execution) {
+        return new ObservedExecution<>(this, execution);
+    }
+
+    <E extends Exception> int observeExecutionComputation(final QueueBatch batch, final co.elastic.logstash.api.TimerMetric.ExceptionalSupplier<Integer,E> supplier) throws E {
+        return executeWithTimers(() -> {
+            final int outputCount = supplier.get();
+            final int filteredCount = batch.filteredSize();
+
+            incrementFilteredMetrics(filteredCount);
+            incrementOutMetrics(outputCount);
+
+            return outputCount;
+        });
+    }
+
+    public <V, E extends Exception> V executeWithTimers(final co.elastic.logstash.api.TimerMetric.ExceptionalSupplier<V,E> supplier) throws E {
+        return processEventsDurationMetric.time(() -> pipelineEventsDurationMetric.time(supplier));
+    }
+
+    private void incrementOutMetrics(final long amount) {
+        this.processEventsOutMetric.increment(amount);
+        this.pipelineEventsOutMetric.increment(amount);
+    }
+
+    private void incrementFilteredMetrics(final long amount) {
+        this.processEventsFilteredMetric.increment(amount);
+        this.pipelineEventsFilteredMetric.increment(amount);
+    }
+
+}
diff --git a/logstash-core/src/main/java/org/logstash/execution/queue/LegacyMemoryQueueWriter.java b/logstash-core/src/main/java/org/logstash/execution/queue/LegacyMemoryQueueWriter.java
deleted file mode 100644
index f17cd118c..000000000
--- a/logstash-core/src/main/java/org/logstash/execution/queue/LegacyMemoryQueueWriter.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.logstash.execution.queue;
-
-import java.util.Map;
-import java.util.concurrent.BlockingQueue;
-import org.logstash.Event;
-import org.logstash.RubyUtil;
-import org.logstash.ext.JrubyEventExtLibrary;
-
-public final class LegacyMemoryQueueWriter implements QueueWriter {
-
-    private final BlockingQueue<JrubyEventExtLibrary.RubyEvent> queue;
-
-    public LegacyMemoryQueueWriter(final BlockingQueue<JrubyEventExtLibrary.RubyEvent> queue) {
-        this.queue = queue;
-    }
-
-    @Override
-    public void push(final Map<String, Object> event) {
-        try {
-            queue.put(JrubyEventExtLibrary.RubyEvent.newRubyEvent(RubyUtil.RUBY, new Event(event)));
-        } catch (final InterruptedException ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-
-}
diff --git a/logstash-core/src/main/java/org/logstash/execution/queue/QueueWriter.java b/logstash-core/src/main/java/org/logstash/execution/queue/QueueWriter.java
index d7c025823..5e9f95818 100644
--- a/logstash-core/src/main/java/org/logstash/execution/queue/QueueWriter.java
+++ b/logstash-core/src/main/java/org/logstash/execution/queue/QueueWriter.java
@@ -1,16 +1,38 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.execution.queue;
 
 import java.util.Map;
 
 /**
- * Writes to the Queue.
+ * Writes to the queue.
  */
 public interface QueueWriter {
 
     /**
      * Pushes a single event to the Queue, blocking indefinitely if the Queue is not ready for a
-     * write.
-     * @param event Logstash Event Data
+     * write. Implementations of this interface must produce events from a deep copy of the supplied
+     * map because upstream clients of this interface may reuse map instances between calls to push.
+     *
+     * @param event Logstash event data
      */
     void push(Map<String, Object> event);
 }
diff --git a/logstash-core/src/main/java/org/logstash/ext/JRubyAbstractQueueWriteClientExt.java b/logstash-core/src/main/java/org/logstash/ext/JRubyAbstractQueueWriteClientExt.java
index f36266227..0ddb15920 100644
--- a/logstash-core/src/main/java/org/logstash/ext/JRubyAbstractQueueWriteClientExt.java
+++ b/logstash-core/src/main/java/org/logstash/ext/JRubyAbstractQueueWriteClientExt.java
@@ -1,6 +1,27 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ext;
 
 import java.util.Collection;
+
 import org.jruby.Ruby;
 import org.jruby.RubyBasicObject;
 import org.jruby.RubyClass;
@@ -21,7 +42,7 @@ public abstract class JRubyAbstractQueueWriteClientExt extends RubyBasicObject i
 
     @JRubyMethod(name = {"push", "<<"}, required = 1)
     public final JRubyAbstractQueueWriteClientExt rubyPush(final ThreadContext context,
-        final IRubyObject event) throws InterruptedException {
+                                                           final IRubyObject event) throws InterruptedException {
         doPush(context, (JrubyEventExtLibrary.RubyEvent) event);
         return this;
     }
@@ -29,14 +50,14 @@ public abstract class JRubyAbstractQueueWriteClientExt extends RubyBasicObject i
     @SuppressWarnings("unchecked")
     @JRubyMethod(name = "push_batch", required = 1)
     public final JRubyAbstractQueueWriteClientExt rubyPushBatch(final ThreadContext context,
-        final IRubyObject batch) throws InterruptedException {
+                                                                final IRubyObject batch) throws InterruptedException {
         doPushBatch(context, (Collection<JrubyEventExtLibrary.RubyEvent>) batch);
         return this;
     }
 
     protected abstract JRubyAbstractQueueWriteClientExt doPush(ThreadContext context,
-        JrubyEventExtLibrary.RubyEvent event) throws InterruptedException;
+                                                               JrubyEventExtLibrary.RubyEvent event) throws InterruptedException;
 
     protected abstract JRubyAbstractQueueWriteClientExt doPushBatch(ThreadContext context,
-        Collection<JrubyEventExtLibrary.RubyEvent> batch) throws InterruptedException;
+                                                                    Collection<JrubyEventExtLibrary.RubyEvent> batch) throws InterruptedException;
 }
diff --git a/logstash-core/src/main/java/org/logstash/ext/JRubyLogstashErrorsExt.java b/logstash-core/src/main/java/org/logstash/ext/JRubyLogstashErrorsExt.java
index dc63b6d34..fea90adaf 100644
--- a/logstash-core/src/main/java/org/logstash/ext/JRubyLogstashErrorsExt.java
+++ b/logstash-core/src/main/java/org/logstash/ext/JRubyLogstashErrorsExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ext;
 
 import org.jruby.Ruby;
diff --git a/logstash-core/src/main/java/org/logstash/ext/JRubyWrappedWriteClientExt.java b/logstash-core/src/main/java/org/logstash/ext/JRubyWrappedWriteClientExt.java
index 8b2c3ad56..919ebf257 100644
--- a/logstash-core/src/main/java/org/logstash/ext/JRubyWrappedWriteClientExt.java
+++ b/logstash-core/src/main/java/org/logstash/ext/JRubyWrappedWriteClientExt.java
@@ -1,8 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ext;
 
 import java.util.Collection;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
+
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
@@ -12,31 +32,33 @@ import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
-import org.logstash.RubyUtil;
 import org.logstash.execution.queue.QueueWriter;
 import org.logstash.instrument.metrics.AbstractMetricExt;
 import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
 import org.logstash.instrument.metrics.MetricKeys;
 import org.logstash.instrument.metrics.counter.LongCounter;
+import org.logstash.instrument.metrics.timer.TimerMetric;
+
+import static org.logstash.instrument.metrics.MetricKeys.*;
 
 @JRubyClass(name = "WrappedWriteClient")
 public final class JRubyWrappedWriteClientExt extends RubyObject implements QueueWriter {
 
     private static final long serialVersionUID = 1L;
 
-    private static final RubySymbol PUSH_DURATION_KEY =
-        RubyUtil.RUBY.newSymbol("queue_push_duration_in_millis");
-
     private JRubyAbstractQueueWriteClientExt writeClient;
 
-    private LongCounter eventsMetricsCounter;
-    private LongCounter eventsMetricsTime;
+    private transient LongCounter eventsMetricsCounter;
 
-    private LongCounter pipelineMetricsCounter;
-    private LongCounter pipelineMetricsTime;
+    private transient TimerMetric eventsMetricsTime;
 
-    private LongCounter pluginMetricsCounter;
-    private LongCounter pluginMetricsTime;
+    private transient LongCounter pipelineMetricsCounter;
+
+    private transient TimerMetric pipelineMetricsTime;
+
+    private transient LongCounter pluginMetricsCounter;
+
+    private transient TimerMetric pluginMetricsTime;
 
     public JRubyWrappedWriteClientExt(final Ruby runtime, final RubyClass metaClass) {
         super(runtime, metaClass);
@@ -49,52 +71,58 @@ public final class JRubyWrappedWriteClientExt extends RubyObject implements Queu
             (AbstractMetricExt) args[2], args[3]);
     }
 
-    public JRubyWrappedWriteClientExt initialize(
-        final JRubyAbstractQueueWriteClientExt queueWriteClientExt, final String pipelineId,
-        final AbstractMetricExt metric, final IRubyObject pluginId) {
+    public JRubyWrappedWriteClientExt initialize(final JRubyAbstractQueueWriteClientExt queueWriteClientExt,
+                                                 final String pipelineId,
+                                                 final AbstractMetricExt metric,
+                                                 final IRubyObject pluginId) {
         this.writeClient = queueWriteClientExt;
+
+        final RubySymbol pipelineIdSym = getRuntime().newString(pipelineId).intern();
+        final RubySymbol pluginIdSym = pluginId.asString().intern();
+
         // Synchronize on the metric since setting up new fields on it is not threadsafe
         synchronized (metric) {
             final AbstractNamespacedMetricExt eventsMetrics =
-                getMetric(metric, "stats", "events");
+                getMetric(metric, STATS_KEY, EVENTS_KEY);
+
             eventsMetricsCounter = LongCounter.fromRubyBase(eventsMetrics, MetricKeys.IN_KEY);
-            eventsMetricsTime = LongCounter.fromRubyBase(eventsMetrics, PUSH_DURATION_KEY);
-            final AbstractNamespacedMetricExt pipelineMetrics =
-                getMetric(metric, "stats", "pipelines", pipelineId, "events");
-            pipelineMetricsCounter = LongCounter.fromRubyBase(pipelineMetrics, MetricKeys.IN_KEY);
-            pipelineMetricsTime = LongCounter.fromRubyBase(pipelineMetrics, PUSH_DURATION_KEY);
-            final AbstractNamespacedMetricExt pluginMetrics = getMetric(
-                metric, "stats", "pipelines", pipelineId, "plugins", "inputs",
-                pluginId.asJavaString(), "events"
-            );
+            eventsMetricsTime = TimerMetric.fromRubyBase(eventsMetrics, MetricKeys.PUSH_DURATION_KEY);
+
+            final AbstractNamespacedMetricExt pipelineEventMetrics =
+                getMetric(metric, STATS_KEY, PIPELINES_KEY, pipelineIdSym, EVENTS_KEY);
+
+            pipelineMetricsCounter = LongCounter.fromRubyBase(pipelineEventMetrics, MetricKeys.IN_KEY);
+            pipelineMetricsTime = TimerMetric.fromRubyBase(pipelineEventMetrics, MetricKeys.PUSH_DURATION_KEY);
+
+            final AbstractNamespacedMetricExt pluginMetrics =
+                    getMetric(metric, STATS_KEY, PIPELINES_KEY, pipelineIdSym, PLUGINS_KEY, INPUTS_KEY, pluginIdSym, EVENTS_KEY);
             pluginMetricsCounter =
                 LongCounter.fromRubyBase(pluginMetrics, MetricKeys.OUT_KEY);
-            pluginMetricsTime = LongCounter.fromRubyBase(pluginMetrics, PUSH_DURATION_KEY);
+            pluginMetricsTime = TimerMetric.fromRubyBase(pluginMetrics, MetricKeys.PUSH_DURATION_KEY);
         }
+
         return this;
     }
 
     @JRubyMethod(name = {"push", "<<"}, required = 1)
-    public IRubyObject push(final ThreadContext context, final IRubyObject event)
-        throws InterruptedException {
-        final long start = System.nanoTime();
+    public IRubyObject push(final ThreadContext context,
+                            final IRubyObject event) throws InterruptedException {
+        final JrubyEventExtLibrary.RubyEvent rubyEvent = (JrubyEventExtLibrary.RubyEvent) event;
+
         incrementCounters(1L);
-        final IRubyObject res = writeClient.doPush(context, (JrubyEventExtLibrary.RubyEvent) event);
-        incrementTimers(start);
-        return res;
+        return executeWithTimers(() -> writeClient.doPush(context, rubyEvent));
     }
 
     @SuppressWarnings("unchecked")
     @JRubyMethod(name = "push_batch", required = 1)
-    public IRubyObject pushBatch(final ThreadContext context, final IRubyObject batch)
-        throws InterruptedException {
-        final long start = System.nanoTime();
-        incrementCounters((long) ((Collection<IRubyObject>) batch).size());
-        final IRubyObject res = writeClient.doPushBatch(
-            context, (Collection<JrubyEventExtLibrary.RubyEvent>) batch
-        );
-        incrementTimers(start);
-        return res;
+    public IRubyObject pushBatch(final ThreadContext context,
+                                 final IRubyObject batch) throws InterruptedException {
+        final Collection<JrubyEventExtLibrary.RubyEvent> rubyEvents = (Collection<JrubyEventExtLibrary.RubyEvent>) batch;
+
+        incrementCounters(rubyEvents.size());
+        return executeWithTimers(() -> writeClient.doPushBatch(
+                context, rubyEvents
+        ));
     }
 
     /**
@@ -115,33 +143,23 @@ public final class JRubyWrappedWriteClientExt extends RubyObject implements Queu
         pluginMetricsCounter.increment(count);
     }
 
-    private void incrementTimers(final long start) {
-        final long increment = TimeUnit.MILLISECONDS.convert(
-            System.nanoTime() - start, TimeUnit.NANOSECONDS
-        );
-        eventsMetricsTime.increment(increment);
-        pipelineMetricsTime.increment(increment);
-        pluginMetricsTime.increment(increment);
+
+    private <V, E extends Exception> V executeWithTimers(final co.elastic.logstash.api.TimerMetric.ExceptionalSupplier<V,E> supplier) throws E {
+        return eventsMetricsTime.time(() -> pipelineMetricsTime.time(() -> pluginMetricsTime.time(supplier)));
     }
 
-    private static AbstractNamespacedMetricExt getMetric(final AbstractMetricExt base,
-        final String... keys) {
-        return base.namespace(RubyUtil.RUBY.getCurrentContext(), toSymbolArray(keys));
+    private <E extends Exception> void executeWithTimers(final Runnable runnable) {
+        eventsMetricsTime.time(() -> pipelineMetricsTime.time(() -> pluginMetricsTime.time(runnable::run)));
     }
 
-    private static IRubyObject toSymbolArray(final String... strings) {
-        final IRubyObject[] res = new IRubyObject[strings.length];
-        for (int i = 0; i < strings.length; ++i) {
-            res[i] = RubyUtil.RUBY.newSymbol(strings[i]);
-        }
-        return RubyUtil.RUBY.newArray(res);
+    private AbstractNamespacedMetricExt getMetric(final AbstractMetricExt base,
+                                                  final RubySymbol... keys) {
+        return base.namespace(getRuntime().getCurrentContext(), getRuntime().newArray(keys));
     }
 
     @Override
     public void push(Map<String, Object> event) {
-        final long start = System.nanoTime();
         incrementCounters(1L);
-        writeClient.push(event);
-        incrementTimers(start);
+        executeWithTimers(() -> writeClient.push(event));
     }
 }
diff --git a/logstash-core/src/main/java/org/logstash/ext/JrubyAckedReadClientExt.java b/logstash-core/src/main/java/org/logstash/ext/JrubyAckedReadClientExt.java
index 0edc14da8..273fa6cb2 100644
--- a/logstash-core/src/main/java/org/logstash/ext/JrubyAckedReadClientExt.java
+++ b/logstash-core/src/main/java/org/logstash/ext/JrubyAckedReadClientExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ext;
 
 import org.jruby.Ruby;
@@ -15,6 +35,9 @@ import org.logstash.execution.QueueReadClientBase;
 
 import java.io.IOException;
 
+/**
+ * JRuby extension to provide an implementation of queue client for Persistent queue
+ * */
 @JRubyClass(name = "AckedReadClient", parent = "QueueReadClientBase")
 public final class JrubyAckedReadClientExt extends QueueReadClientBase implements QueueReadClient {
 
@@ -56,13 +79,12 @@ public final class JrubyAckedReadClientExt extends QueueReadClientBase implement
 
     @Override
     public QueueBatch newBatch() {
-        return AckedReadBatch.create(queue, 0, 0);
+        return AckedReadBatch.create();
     }
 
     @Override
     public QueueBatch readBatch() {
-        AckedReadBatch batch =
-            AckedReadBatch.create(queue, batchSize, waitForMillis);
+        final AckedReadBatch batch = AckedReadBatch.create(queue, batchSize, waitForMillis);
         startMetrics(batch);
         return batch;
     }
diff --git a/logstash-core/src/main/java/org/logstash/ext/JrubyAckedWriteClientExt.java b/logstash-core/src/main/java/org/logstash/ext/JrubyAckedWriteClientExt.java
index 0012d189c..e58cc9314 100644
--- a/logstash-core/src/main/java/org/logstash/ext/JrubyAckedWriteClientExt.java
+++ b/logstash-core/src/main/java/org/logstash/ext/JrubyAckedWriteClientExt.java
@@ -1,9 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ext;
 
-import java.io.IOException;
 import java.util.Collection;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
+
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
 import org.jruby.anno.JRubyClass;
@@ -21,23 +40,8 @@ public final class JrubyAckedWriteClientExt extends JRubyAbstractQueueWriteClien
 
     private JRubyAckedQueueExt queue;
 
-    private AtomicBoolean closed = new AtomicBoolean();
-
-    @JRubyMethod(meta = true, required = 2)
-    public static JrubyAckedWriteClientExt create(final ThreadContext context, final IRubyObject recv,
-        final IRubyObject queue, final IRubyObject closed) {
-        return new JrubyAckedWriteClientExt(
-            context.runtime, RubyUtil.ACKED_WRITE_CLIENT_CLASS,
-            queue.toJava(
-                JRubyAckedQueueExt.class
-            ),
-            closed.toJava(AtomicBoolean.class)
-        );
-    }
-
-    public static JrubyAckedWriteClientExt create(final JRubyAckedQueueExt queue, final AtomicBoolean closed) {
-        return new JrubyAckedWriteClientExt(
-            RubyUtil.RUBY, RubyUtil.ACKED_WRITE_CLIENT_CLASS, queue, closed);
+    public static JrubyAckedWriteClientExt create(final JRubyAckedQueueExt queue) {
+        return new JrubyAckedWriteClientExt(RubyUtil.RUBY, RubyUtil.ACKED_WRITE_CLIENT_CLASS, queue);
     }
 
     public JrubyAckedWriteClientExt(final Ruby runtime, final RubyClass metaClass) {
@@ -45,43 +49,30 @@ public final class JrubyAckedWriteClientExt extends JRubyAbstractQueueWriteClien
     }
 
     private JrubyAckedWriteClientExt(final Ruby runtime, final RubyClass metaClass,
-        final JRubyAckedQueueExt queue, final AtomicBoolean closed) {
+                                     final JRubyAckedQueueExt queue) {
         super(runtime, metaClass);
         this.queue = queue;
-        this.closed = closed;
     }
 
     @Override
     protected JRubyAbstractQueueWriteClientExt doPush(final ThreadContext context,
-        final JrubyEventExtLibrary.RubyEvent event) {
-        ensureOpen();
+                                                      final JrubyEventExtLibrary.RubyEvent event) {
         queue.rubyWrite(context, event.getEvent());
         return this;
     }
 
     @Override
     protected JRubyAbstractQueueWriteClientExt doPushBatch(final ThreadContext context,
-        final Collection<JrubyEventExtLibrary.RubyEvent> batch) {
-        ensureOpen();
+                                                           final Collection<JrubyEventExtLibrary.RubyEvent> batch) {
         for (final IRubyObject event : batch) {
             queue.rubyWrite(context, ((JrubyEventExtLibrary.RubyEvent) event).getEvent());
         }
         return this;
     }
 
-    private void ensureOpen() {
-        if (closed.get()) {
-            throw new IllegalStateException("Tried to write to a closed queue.");
-        }
-    }
-
     @Override
     public void push(Map<String, Object> event) {
-        try {
-            queue.write(new Event(event));
-        } catch (IOException e) {
-            throw new IllegalStateException(e);
-        }
+        queue.write(new Event(event));
     }
 
 }
diff --git a/logstash-core/src/main/java/org/logstash/ext/JrubyEventExtLibrary.java b/logstash-core/src/main/java/org/logstash/ext/JrubyEventExtLibrary.java
index a7a44c77b..25cdcd78c 100644
--- a/logstash-core/src/main/java/org/logstash/ext/JrubyEventExtLibrary.java
+++ b/logstash-core/src/main/java/org/logstash/ext/JrubyEventExtLibrary.java
@@ -1,10 +1,32 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ext;
 
 import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
+
+import co.elastic.logstash.api.EventFactory;
+
 import org.jruby.Ruby;
-import org.jruby.RubyArray;
 import org.jruby.RubyBoolean;
 import org.jruby.RubyClass;
 import org.jruby.RubyHash;
@@ -15,14 +37,17 @@ import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.java.proxies.MapJavaProxy;
 import org.jruby.javasupport.JavaUtil;
+import org.jruby.runtime.Block;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
+
 import org.logstash.ConvertedMap;
 import org.logstash.Event;
 import org.logstash.FieldReference;
 import org.logstash.RubyUtil;
 import org.logstash.Rubyfier;
 import org.logstash.Valuefier;
+import org.logstash.plugins.BasicEventFactory;
 
 public final class JrubyEventExtLibrary {
 
@@ -42,7 +67,7 @@ public final class JrubyEventExtLibrary {
          */
         private final int hash = nextHash();
 
-        private Event event;
+        private transient Event event;
 
         public RubyEvent(final Ruby runtime, final RubyClass klass) {
             super(runtime, klass);
@@ -54,7 +79,7 @@ public final class JrubyEventExtLibrary {
 
         public static RubyEvent newRubyEvent(Ruby runtime, Event event) {
             final RubyEvent ruby =
-                new RubyEvent(runtime, RubyUtil.RUBY_EVENT_CLASS);
+                    new RubyEvent(runtime, RubyUtil.RUBY_EVENT_CLASS);
             ruby.setEvent(event);
             return ruby;
         }
@@ -68,9 +93,9 @@ public final class JrubyEventExtLibrary {
         public IRubyObject ruby_initialize(ThreadContext context, IRubyObject[] args) {
             final IRubyObject data = args.length > 0 ? args[0] : null;
             if (data instanceof RubyHash) {
-                this.event = new Event(
-                    ConvertedMap.newFromRubyHash(context, (RubyHash) data)
-                );
+                this.event = new Event(ConvertedMap.newFromRubyHash(context, (RubyHash) data));
+            } else if (data != null && data.getJavaClass().equals(Event.class)) {
+                this.event = data.toJava(Event.class);
             } else {
                 initializeFallback(context, data);
             }
@@ -78,78 +103,68 @@ public final class JrubyEventExtLibrary {
         }
 
         @JRubyMethod(name = "get", required = 1)
-        public IRubyObject ruby_get_field(ThreadContext context, RubyString reference)
-        {
+        public IRubyObject ruby_get_field(ThreadContext context, RubyString reference) {
             return Rubyfier.deep(
-                context.runtime,
-                this.event.getUnconvertedField(extractFieldReference(reference))
+                    context.runtime,
+                    this.event.getUnconvertedField(extractFieldReference(reference))
             );
         }
 
         @JRubyMethod(name = "set", required = 2)
-        public IRubyObject ruby_set_field(ThreadContext context, RubyString reference, IRubyObject value)
-        {
+        public IRubyObject ruby_set_field(ThreadContext context, RubyString reference, IRubyObject value) {
             final FieldReference r = extractFieldReference(reference);
             if (r.equals(FieldReference.TIMESTAMP_REFERENCE)) {
                 if (!(value instanceof JrubyTimestampExtLibrary.RubyTimestamp)) {
                     throw context.runtime.newTypeError("wrong argument type " + value.getMetaClass() + " (expected LogStash::Timestamp)");
                 }
-                this.event.setTimestamp(((JrubyTimestampExtLibrary.RubyTimestamp)value).getTimestamp());
+                this.event.setTimestamp(((JrubyTimestampExtLibrary.RubyTimestamp) value).getTimestamp());
             } else {
-                this.event.setField(r, Valuefier.convert(value));
+                this.event.setField(r, safeValueifierConvert(value));
             }
             return value;
         }
 
         @JRubyMethod(name = "cancel")
-        public IRubyObject ruby_cancel(ThreadContext context)
-        {
+        public IRubyObject ruby_cancel(ThreadContext context) {
             this.event.cancel();
-            return context.runtime.getTrue();
+            return context.tru;
         }
 
         @JRubyMethod(name = "uncancel")
-        public IRubyObject ruby_uncancel(ThreadContext context)
-        {
+        public IRubyObject ruby_uncancel(ThreadContext context) {
             this.event.uncancel();
-            return context.runtime.getFalse();
+            return context.fals;
         }
 
         @JRubyMethod(name = "cancelled?")
-        public IRubyObject ruby_cancelled(ThreadContext context)
-        {
+        public IRubyObject ruby_cancelled(ThreadContext context) {
             return RubyBoolean.newBoolean(context.runtime, this.event.isCancelled());
         }
 
         @JRubyMethod(name = "include?", required = 1)
         public IRubyObject ruby_includes(ThreadContext context, RubyString reference) {
-            return RubyBoolean.newBoolean(
-                context.runtime, this.event.includes(extractFieldReference(reference))
-            );
+            return RubyBoolean.newBoolean(context.runtime, this.event.includes(extractFieldReference(reference)));
         }
 
         @JRubyMethod(name = "remove", required = 1)
         public IRubyObject ruby_remove(ThreadContext context, RubyString reference) {
             return Rubyfier.deep(
-                context.runtime,
-                this.event.remove(extractFieldReference(reference))
+                    context.runtime,
+                    this.event.remove(extractFieldReference(reference))
             );
         }
 
-        @JRubyMethod(name = "clone")
-        public IRubyObject rubyClone(ThreadContext context)
-        {
+        @JRubyMethod(name = {"clone", "dup"})
+        public IRubyObject rubyClone(ThreadContext context) {
             return rubyClone(context.runtime);
         }
 
-        public RubyEvent rubyClone(Ruby runtime)
-        {
+        public RubyEvent rubyClone(Ruby runtime) {
             return RubyEvent.newRubyEvent(runtime, this.event.clone());
         }
 
         @JRubyMethod(name = "overwrite", required = 1)
-        public IRubyObject ruby_overwrite(ThreadContext context, IRubyObject value)
-        {
+        public IRubyObject ruby_overwrite(ThreadContext context, IRubyObject value) {
             if (!(value instanceof RubyEvent)) {
                 throw context.runtime.newTypeError("wrong argument type " + value.getMetaClass() + " (expected LogStash::Event)");
             }
@@ -158,8 +173,7 @@ public final class JrubyEventExtLibrary {
         }
 
         @JRubyMethod(name = "append", required = 1)
-        public IRubyObject ruby_append(ThreadContext context, IRubyObject value)
-        {
+        public IRubyObject ruby_append(ThreadContext context, IRubyObject value) {
             if (!(value instanceof RubyEvent)) {
                 throw context.runtime.newTypeError("wrong argument type " + value.getMetaClass() + " (expected LogStash::Event)");
             }
@@ -174,13 +188,12 @@ public final class JrubyEventExtLibrary {
             try {
                 return RubyString.newString(context.runtime, event.sprintf(format.toString()));
             } catch (IOException e) {
-                throw RaiseException.from(getRuntime(), RubyUtil.LOGSTASH_ERROR, "timestamp field is missing");
+                throw toRubyError(context, RubyUtil.LOGSTASH_ERROR, "timestamp field is missing", e);
             }
         }
 
         @JRubyMethod(name = "to_s")
-        public IRubyObject ruby_to_s(ThreadContext context)
-        {
+        public IRubyObject ruby_to_s(ThreadContext context) {
             return RubyString.newString(context.runtime, event.toString());
         }
 
@@ -201,18 +214,16 @@ public final class JrubyEventExtLibrary {
         }
 
         @JRubyMethod(name = "to_java")
-        public IRubyObject ruby_to_java(ThreadContext context)
-        {
+        public IRubyObject ruby_to_java(ThreadContext context) {
             return JavaUtil.convertJavaToUsableRubyObject(context.runtime, this.event);
         }
 
         @JRubyMethod(name = "to_json", rest = true)
-        public IRubyObject ruby_to_json(ThreadContext context, IRubyObject[] args)
-        {
+        public IRubyObject ruby_to_json(ThreadContext context, IRubyObject[] args) {
             try {
                 return RubyString.newString(context.runtime, event.toJson());
             } catch (Exception e) {
-                throw RaiseException.from(context.runtime, RubyUtil.GENERATOR_ERROR, e.getMessage());
+                throw toRubyError(context, RubyUtil.GENERATOR_ERROR, e);
             }
         }
 
@@ -220,39 +231,43 @@ public final class JrubyEventExtLibrary {
         // and a json array will newFromRubyArray each element into individual Event
         // @return Array<Event> array of events
         @JRubyMethod(name = "from_json", required = 1, meta = true)
-        public static IRubyObject ruby_from_json(ThreadContext context, IRubyObject recv, RubyString value)
-        {
+        public static IRubyObject ruby_from_json(ThreadContext context, IRubyObject recv, RubyString value, final Block block) {
+            if (!block.isGiven()) return fromJson(context, value, BasicEventFactory.INSTANCE);
+            return fromJson(context, value, (data) -> {
+                // LogStash::Event works fine with a Map arg (instead of a native Hash)
+                IRubyObject event = block.yield(context, RubyUtil.toRubyObject(data));
+                return ((RubyEvent) event).getEvent(); // we unwrap just to re-wrap later
+            });
+        }
+
+        private static IRubyObject fromJson(ThreadContext context, RubyString json, EventFactory eventFactory) {
             Event[] events;
             try {
-                events = Event.fromJson(value.asJavaString());
+                events = Event.fromJson(json.asJavaString(), eventFactory);
             } catch (Exception e) {
-                throw RaiseException.from(context.runtime, RubyUtil.PARSER_ERROR, e.getMessage());
+                throw toRubyError(context, RubyUtil.PARSER_ERROR, e);
             }
 
-            @SuppressWarnings("rawtypes")
-            RubyArray result = RubyArray.newArray(context.runtime, events.length);
-
             if (events.length == 1) {
                 // micro optimization for the 1 event more common use-case.
-                result.set(0, RubyEvent.newRubyEvent(context.runtime, events[0]));
-            } else {
-                for (int i = 0; i < events.length; i++) {
-                    result.set(i, RubyEvent.newRubyEvent(context.runtime, events[i]));
-                }
+                return context.runtime.newArray(RubyEvent.newRubyEvent(context.runtime, events[0]));
             }
-            return result;
+
+            IRubyObject[] rubyEvents = new IRubyObject[events.length];
+            for (int i = 0; i < events.length; i++) {
+                rubyEvents[i] = RubyEvent.newRubyEvent(context.runtime, events[i]);
+            }
+            return context.runtime.newArrayNoCopy(rubyEvents);
         }
 
         @JRubyMethod(name = "validate_value", required = 1, meta = true)
-        public static IRubyObject ruby_validate_value(ThreadContext context, IRubyObject recv, IRubyObject value)
-        {
+        public static IRubyObject ruby_validate_value(ThreadContext context, IRubyObject recv, IRubyObject value) {
             // TODO: add UTF-8 validation
             return value;
         }
 
         @JRubyMethod(name = "tag", required = 1)
-        public IRubyObject ruby_tag(ThreadContext context, RubyString value)
-        {
+        public IRubyObject ruby_tag(ThreadContext context, RubyString value) {
             //TODO(guy) should these tags be BiValues?
             this.event.tag(value.asJavaString());
             return context.nil;
@@ -266,12 +281,11 @@ public final class JrubyEventExtLibrary {
         }
 
         @JRubyMethod(name = "timestamp=", required = 1)
-        public IRubyObject ruby_set_timestamp(ThreadContext context, IRubyObject value)
-        {
+        public IRubyObject ruby_set_timestamp(ThreadContext context, IRubyObject value) {
             if (!(value instanceof JrubyTimestampExtLibrary.RubyTimestamp)) {
                 throw context.runtime.newTypeError("wrong argument type " + value.getMetaClass() + " (expected LogStash::Timestamp)");
             }
-            this.event.setTimestamp(((JrubyTimestampExtLibrary.RubyTimestamp)value).getTimestamp());
+            this.event.setTimestamp(((JrubyTimestampExtLibrary.RubyTimestamp) value).getTimestamp());
             return value;
         }
 
@@ -289,9 +303,10 @@ public final class JrubyEventExtLibrary {
          * Cold path for the Ruby constructor
          * {@link JrubyEventExtLibrary.RubyEvent#ruby_initialize(ThreadContext, IRubyObject[])} for
          * when its argument is not a {@link RubyHash}.
+         *
          * @param context Ruby {@link ThreadContext}
-         * @param data Either {@code null}, {@link org.jruby.RubyNil} or an instance of
-         * {@link MapJavaProxy}
+         * @param data    Either {@code null}, {@link org.jruby.RubyNil} or an instance of
+         *                {@link MapJavaProxy}
          */
         @SuppressWarnings("unchecked")
         private void initializeFallback(final ThreadContext context, final IRubyObject data) {
@@ -299,7 +314,7 @@ public final class JrubyEventExtLibrary {
                 this.event = new Event();
             } else if (data instanceof MapJavaProxy) {
                 this.event = new Event(ConvertedMap.newFromMap(
-                    (Map<String, Object>)((MapJavaProxy)data).getObject())
+                        (Map<String, Object>) ((MapJavaProxy) data).getObject())
                 );
             } else {
                 throw context.runtime.newTypeError("wrong argument type " + data.getMetaClass() + " (expected Hash)");
@@ -322,6 +337,22 @@ public final class JrubyEventExtLibrary {
             }
         }
 
+        /**
+         * Shared logic to wrap {@link FieldReference.IllegalSyntaxException}s that are raised by
+         * {@link Valuefier#convert(Object)} when encountering illegal syntax in a ruby-exception
+         * that can be easily handled within the ruby plugins
+         *
+         * @param value a {@link Object} to be passed to {@link Valuefier#convert(Object)}
+         * @return the resulting {@link Object} (see: {@link Valuefier#convert(Object)})
+         */
+        private static Object safeValueifierConvert(final Object value) {
+            try {
+                return Valuefier.convert(value);
+            } catch (FieldReference.IllegalSyntaxException ise) {
+                throw RubyUtil.RUBY.newRuntimeError(ise.getMessage());
+            }
+        }
+
 
         private void setEvent(Event event) {
             this.event = event;
@@ -329,11 +360,23 @@ public final class JrubyEventExtLibrary {
 
         /**
          * Generates a fixed hashcode.
+         *
          * @return HashCode value
          */
         private static int nextHash() {
             final long sequence = SEQUENCE_GENERATOR.incrementAndGet();
             return (int) (sequence ^ sequence >>> 32) + 31;
         }
+
+        private static RaiseException toRubyError(ThreadContext context, RubyClass type, Exception e) {
+            return toRubyError(context, type, e.getMessage(), e);
+        }
+
+        private static RaiseException toRubyError(ThreadContext context, RubyClass type, String message, Exception e) {
+            RaiseException ex = RaiseException.from(context.runtime, type, message);
+            ex.initCause(e);
+            return ex;
+        }
+
     }
 }
diff --git a/logstash-core/src/main/java/org/logstash/ext/JrubyMemoryReadClientExt.java b/logstash-core/src/main/java/org/logstash/ext/JrubyMemoryReadClientExt.java
index 60bd9c1d8..0a93a347c 100644
--- a/logstash-core/src/main/java/org/logstash/ext/JrubyMemoryReadClientExt.java
+++ b/logstash-core/src/main/java/org/logstash/ext/JrubyMemoryReadClientExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ext;
 
 import java.util.concurrent.BlockingQueue;
@@ -11,12 +31,15 @@ import org.logstash.execution.MemoryReadBatch;
 import org.logstash.execution.QueueBatch;
 import org.logstash.execution.QueueReadClientBase;
 
+/**
+ * JRuby extension to provide an implementation of queue client for InMemory queue
+ * */
 @JRubyClass(name = "MemoryReadClient", parent = "QueueReadClientBase")
 public final class JrubyMemoryReadClientExt extends QueueReadClientBase {
 
     private static final long serialVersionUID = 1L;
 
-    @SuppressWarnings("rawtypes") private BlockingQueue queue;
+    @SuppressWarnings({"rawtypes", "serial"}) private BlockingQueue queue;
 
     public JrubyMemoryReadClientExt(final Ruby runtime, final RubyClass metaClass) {
         super(runtime, metaClass);
@@ -57,11 +80,8 @@ public final class JrubyMemoryReadClientExt extends QueueReadClientBase {
     @Override
     @SuppressWarnings("unchecked")
     public QueueBatch readBatch() throws InterruptedException {
-        MemoryReadBatch batch = MemoryReadBatch.create(
-                LsQueueUtils.drain(queue, batchSize, waitForNanos));
+        final MemoryReadBatch batch = MemoryReadBatch.create(LsQueueUtils.drain(queue, batchSize, waitForNanos));
         startMetrics(batch);
         return batch;
     }
-
-
 }
diff --git a/logstash-core/src/main/java/org/logstash/ext/JrubyMemoryWriteClientExt.java b/logstash-core/src/main/java/org/logstash/ext/JrubyMemoryWriteClientExt.java
index 32728219c..0d9207909 100644
--- a/logstash-core/src/main/java/org/logstash/ext/JrubyMemoryWriteClientExt.java
+++ b/logstash-core/src/main/java/org/logstash/ext/JrubyMemoryWriteClientExt.java
@@ -1,8 +1,29 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ext;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.BlockingQueue;
+
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
 import org.jruby.anno.JRubyClass;
@@ -16,35 +37,34 @@ public final class JrubyMemoryWriteClientExt extends JRubyAbstractQueueWriteClie
 
     private static final long serialVersionUID = 1L;
 
-    private BlockingQueue<JrubyEventExtLibrary.RubyEvent> queue;
+    private transient BlockingQueue<JrubyEventExtLibrary.RubyEvent> queue;
 
     public JrubyMemoryWriteClientExt(final Ruby runtime, final RubyClass metaClass) {
         super(runtime, metaClass);
     }
 
     private JrubyMemoryWriteClientExt(final Ruby runtime, final RubyClass metaClass,
-        final BlockingQueue<JrubyEventExtLibrary.RubyEvent> queue) {
+                                      final BlockingQueue<JrubyEventExtLibrary.RubyEvent> queue) {
         super(runtime, metaClass);
         this.queue = queue;
     }
 
     public static JrubyMemoryWriteClientExt create(
-        final BlockingQueue<JrubyEventExtLibrary.RubyEvent> queue) {
+            final BlockingQueue<JrubyEventExtLibrary.RubyEvent> queue) {
         return new JrubyMemoryWriteClientExt(RubyUtil.RUBY,
-            RubyUtil.MEMORY_WRITE_CLIENT_CLASS, queue);
+                RubyUtil.MEMORY_WRITE_CLIENT_CLASS, queue);
     }
 
     @Override
     protected JRubyAbstractQueueWriteClientExt doPush(final ThreadContext context,
-        final JrubyEventExtLibrary.RubyEvent event)
-        throws InterruptedException {
+                                                      final JrubyEventExtLibrary.RubyEvent event) throws InterruptedException {
         queue.put(event);
         return this;
     }
 
     @Override
     public JRubyAbstractQueueWriteClientExt doPushBatch(final ThreadContext context,
-        final Collection<JrubyEventExtLibrary.RubyEvent> batch) throws InterruptedException {
+                                                        final Collection<JrubyEventExtLibrary.RubyEvent> batch) throws InterruptedException {
         LsQueueUtils.addAll(queue, batch);
         return this;
     }
diff --git a/logstash-core/src/main/java/org/logstash/ext/JrubyTimestampExtLibrary.java b/logstash-core/src/main/java/org/logstash/ext/JrubyTimestampExtLibrary.java
index 0d357a0bb..692501536 100644
--- a/logstash-core/src/main/java/org/logstash/ext/JrubyTimestampExtLibrary.java
+++ b/logstash-core/src/main/java/org/logstash/ext/JrubyTimestampExtLibrary.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ext;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -28,7 +48,7 @@ public final class JrubyTimestampExtLibrary {
 
         private static final long serialVersionUID = 1L;
 
-        private Timestamp timestamp;
+        private transient Timestamp timestamp;
 
         public RubyTimestamp(Ruby runtime, RubyClass klass) {
             super(runtime, klass);
@@ -48,6 +68,10 @@ public final class JrubyTimestampExtLibrary {
             this.timestamp = timestamp;
         }
 
+        public java.time.Instant toInstant() {
+            return this.timestamp.toInstant();
+        }
+
         // def initialize(time = Time.new)
         @JRubyMethod(optional = 1)
         public JrubyTimestampExtLibrary.RubyTimestamp initialize(final ThreadContext context,
@@ -58,7 +82,7 @@ public final class JrubyTimestampExtLibrary {
             if (time.isNil()) {
                 this.timestamp = new Timestamp();
             } else if (time instanceof RubyTime) {
-                this.timestamp = new Timestamp(((RubyTime) time).getDateTime());
+                this.timestamp = new Timestamp(((RubyTime) time).toInstant());
             } else if (time instanceof RubyString) {
                 try {
                     this.timestamp = new Timestamp(time.toString());
@@ -78,19 +102,26 @@ public final class JrubyTimestampExtLibrary {
         @JRubyMethod(name = "time")
         public RubyTime ruby_time(ThreadContext context)
         {
-            return RubyTime.newTime(context.runtime, this.timestamp.getTime());
+            final org.joda.time.DateTime milliPrecise = org.joda.time.Instant.ofEpochMilli(this.timestamp.toEpochMilli()).toDateTime();
+            final long excessNanos = Math.floorMod(this.timestamp.nsec(), 1_000_000L);
+
+            return RubyTime.newTime(context.runtime, milliPrecise, excessNanos);
         }
 
         @JRubyMethod(name = "to_i")
         public IRubyObject ruby_to_i(ThreadContext context)
         {
-            return RubyFixnum.newFixnum(context.runtime, this.timestamp.getTime().getMillis() / 1000);
+            return RubyFixnum.newFixnum(context.runtime, this.timestamp.toInstant().getEpochSecond());
         }
 
         @JRubyMethod(name = "to_f")
         public IRubyObject ruby_to_f(ThreadContext context)
         {
-            return RubyFloat.newFloat(context.runtime, this.timestamp.getTime().getMillis() / 1000.0d);
+            final java.time.Instant instant = this.timestamp.toInstant();
+
+            final double epochSecondsWithNanos = instant.getEpochSecond() + (instant.getNano() / 1_000_000_000d);
+
+            return RubyFloat.newFloat(context.runtime, epochSecondsWithNanos);
         }
 
         @JRubyMethod(name = "to_s")
@@ -142,7 +173,7 @@ public final class JrubyTimestampExtLibrary {
                 } else if (time instanceof RubyTime) {
                     return RubyTimestamp.newRubyTimestamp(
                         context.runtime,
-                        new Timestamp(((RubyTime) time).getDateTime())
+                        new Timestamp(((RubyTime) time).toInstant())
                     );
                 } else if (time instanceof RubyString) {
                     return fromRString(context.runtime, (RubyString) time);
@@ -186,7 +217,7 @@ public final class JrubyTimestampExtLibrary {
             } else {
                 t = (RubyTime)RubyTime.at(context, context.runtime.getTime(), args[0], args[1]);
             }
-            return RubyTimestamp.newRubyTimestamp(context.runtime, new Timestamp(t.getDateTime()));
+            return RubyTimestamp.newRubyTimestamp(context.runtime, new Timestamp(t.toInstant()));
         }
 
         @JRubyMethod(name = "now", meta = true)
@@ -213,18 +244,23 @@ public final class JrubyTimestampExtLibrary {
             return RubyFixnum.newFixnum(context.runtime, this.timestamp.usec());
         }
 
+        @JRubyMethod(name = {"nsec", "tv_nsec"})
+        public org.jruby.RubyInteger ruby_nsec(final ThreadContext context) {
+            return RubyFixnum.newFixnum(context.runtime, this.timestamp.nsec());
+        }
+
         @JRubyMethod(name = "year")
         public IRubyObject ruby_year(ThreadContext context)
         {
-            return RubyFixnum.newFixnum(context.runtime, this.timestamp.getTime().getYear());
+            final int year = this.timestamp.toInstant().atOffset(java.time.ZoneOffset.UTC).getYear();
+            return RubyFixnum.newFixnum(context.runtime, year);
         }
 
         @JRubyMethod(name = "<=>")
         public IRubyObject op_cmp(final ThreadContext context, final IRubyObject other) {
             if (other instanceof JrubyTimestampExtLibrary.RubyTimestamp) {
-                return ruby_time(context).op_cmp(
-                    context, ((JrubyTimestampExtLibrary.RubyTimestamp) other).ruby_time(context)
-                );
+                final int cmp = this.timestamp.compareTo(((RubyTimestamp) other).timestamp);
+                return RubyFixnum.newFixnum(context.runtime, cmp);
             }
             return context.nil;
         }
diff --git a/logstash-core/src/main/java/org/logstash/ext/JrubyWrappedSynchronousQueueExt.java b/logstash-core/src/main/java/org/logstash/ext/JrubyWrappedSynchronousQueueExt.java
index 57c031d50..dbbfb97de 100644
--- a/logstash-core/src/main/java/org/logstash/ext/JrubyWrappedSynchronousQueueExt.java
+++ b/logstash-core/src/main/java/org/logstash/ext/JrubyWrappedSynchronousQueueExt.java
@@ -1,7 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ext;
 
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
+
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
 import org.jruby.RubyNumeric;
@@ -12,12 +33,15 @@ import org.jruby.runtime.builtin.IRubyObject;
 import org.logstash.execution.AbstractWrappedQueueExt;
 import org.logstash.execution.QueueReadClientBase;
 
+/**
+ * JRuby extension to wrap in memory queue
+ * */
 @JRubyClass(name = "WrappedSynchronousQueue")
 public final class JrubyWrappedSynchronousQueueExt extends AbstractWrappedQueueExt {
 
     private static final long serialVersionUID = 1L;
 
-    private BlockingQueue<JrubyEventExtLibrary.RubyEvent> queue;
+    private transient BlockingQueue<JrubyEventExtLibrary.RubyEvent> queue;
 
     public JrubyWrappedSynchronousQueueExt(final Ruby runtime, final RubyClass metaClass) {
         super(runtime, metaClass);
diff --git a/logstash-core/src/main/java/org/logstash/health/ApiHealthReport.java b/logstash-core/src/main/java/org/logstash/health/ApiHealthReport.java
new file mode 100644
index 000000000..d2d1cbf68
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/health/ApiHealthReport.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.health;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import java.io.IOException;
+import java.util.Map;
+
+@JsonSerialize(using = ApiHealthReport.JsonSerializer.class)
+public class ApiHealthReport {
+    private final MultiIndicator.Report delegate;
+
+    public ApiHealthReport(final MultiIndicator.Report delegate) {
+        this.delegate = delegate;
+    }
+
+    public Status getStatus() {
+        return delegate.status();
+    }
+
+    public String getSymptom() {
+        return delegate.symptom();
+    }
+
+    public Map<String, Indicator.Report> getIndicators() {
+        return delegate.indicators();
+    }
+
+    public static class JsonSerializer extends com.fasterxml.jackson.databind.JsonSerializer<ApiHealthReport> {
+        @Override
+        public void serialize(final ApiHealthReport apiHealthReport,
+                              final JsonGenerator jsonGenerator,
+                              final SerializerProvider serializerProvider) throws IOException {
+            jsonGenerator.writeStartObject();
+            jsonGenerator.writeObjectField("status", apiHealthReport.getStatus());
+            jsonGenerator.writeObjectField("symptom", apiHealthReport.getSymptom());
+            jsonGenerator.writeObjectField("indicators", apiHealthReport.getIndicators());
+            jsonGenerator.writeEndObject();
+        }
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/health/Diagnosis.java b/logstash-core/src/main/java/org/logstash/health/Diagnosis.java
new file mode 100644
index 000000000..7e64f5556
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/health/Diagnosis.java
@@ -0,0 +1,113 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.health;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import java.io.IOException;
+import java.util.Objects;
+import java.util.function.UnaryOperator;
+
+@JsonSerialize(using = Diagnosis.JsonSerializer.class)
+public final class Diagnosis {
+    public final String id;
+    public final String cause;
+    public final String action;
+    public final String helpUrl;
+
+    private Diagnosis(final Builder builder) {
+        this.id = builder.id;
+        this.cause = builder.cause;
+        this.action = builder.action;
+        this.helpUrl = builder.helpUrl;
+    }
+
+    static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+        private final String id;
+        private final String cause;
+        private final String action;
+        private final String helpUrl;
+
+        public Builder() {
+            this(null, null, null, null);
+        }
+
+        Builder(final String id,
+                final String cause,
+                final String action,
+                final String helpUrl) {
+            this.id = id;
+            this.cause = cause;
+            this.action = action;
+            this.helpUrl = helpUrl;
+        }
+
+        public Builder withId(final String id) {
+            if (Objects.equals(id, this.id)) {
+                return this;
+            }
+            return new Builder(id, cause, action, helpUrl);
+        }
+
+        public Builder withCause(final String cause) {
+            if (Objects.equals(cause, this.cause)) {
+                return this;
+            }
+            return new Builder(id, cause, action, helpUrl);
+        }
+        public Builder withAction(final String action) {
+            if (Objects.equals(action, this.action)) {
+                return this;
+            }
+            return new Builder(id, cause, action, helpUrl);
+        }
+        public Builder withHelpUrl(final String helpUrl) {
+            if (Objects.equals(helpUrl, this.helpUrl)) {
+                return this;
+            }
+            return new Builder(id, cause, action, helpUrl);
+        }
+        public Builder transform(final UnaryOperator<Builder> configurator) {
+            return configurator.apply(this);
+        }
+        public synchronized Diagnosis build() {
+            return new Diagnosis(this);
+        }
+    }
+
+    public static class JsonSerializer extends com.fasterxml.jackson.databind.JsonSerializer<Diagnosis> {
+        @Override
+        public void serialize(Diagnosis diagnosis, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
+            jsonGenerator.writeStartObject();
+            if (diagnosis.id != null) {
+                jsonGenerator.writeStringField("id", diagnosis.id);
+            }
+            jsonGenerator.writeStringField("cause", diagnosis.cause);
+            jsonGenerator.writeStringField("action", diagnosis.action);
+            jsonGenerator.writeStringField("help_url", diagnosis.helpUrl);
+            jsonGenerator.writeEndObject();
+        }
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/health/HealthObserver.java b/logstash-core/src/main/java/org/logstash/health/HealthObserver.java
new file mode 100644
index 000000000..fdc091133
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/health/HealthObserver.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.health;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class HealthObserver {
+
+    private static final Logger LOGGER = LogManager.getLogger();
+
+    static final String FORCE_API_STATUS_PROPERTY = "logstash.forceApiStatus";
+
+    private final MultiIndicator rootIndicator = new MultiIndicator();
+    private final MultiIndicator pipelinesIndicator = new MultiIndicator();
+
+    public HealthObserver() {
+        this.rootIndicator.attachIndicator("pipelines", this.pipelinesIndicator);
+    }
+
+    public final Status getStatus() {
+        // Short-term escape-hatch
+        final String forceApiStatus = System.getProperty(FORCE_API_STATUS_PROPERTY);
+        if (forceApiStatus != null) {
+            if (forceApiStatus.equals("green")) {
+                return Status.GREEN;
+            } else {
+                LOGGER.warn("Unsupported `logstash.forceApiStatus`: {} (health report status will be propagated)", forceApiStatus);
+            }
+        }
+        return getReport().getStatus();
+    }
+
+    public MultiIndicator getIndicator() {
+        return this.rootIndicator;
+    }
+
+    public ApiHealthReport getReport() {
+        return new ApiHealthReport(this.rootIndicator.report());
+    }
+
+    public void attachPipelineIndicator(final String pipelineId, final PipelineIndicator.PipelineDetailsProvider detailsProvider) {
+        try {
+            this.pipelinesIndicator.attachIndicator(pipelineId, PipelineIndicator.forPipeline(pipelineId, detailsProvider));
+            LOGGER.debug(String.format("attached pipeline indicator [%s]", pipelineId));
+        } catch (final Exception e) {
+            LOGGER.warn(String.format("failed to attach pipeline indicator [%s]", pipelineId), e);
+        }
+    }
+
+    public void detachPipelineIndicator(final String pipelineId) {
+        try {
+            this.pipelinesIndicator.detachIndicator(pipelineId, null);
+            LOGGER.debug(String.format("detached pipeline indicator [%s]", pipelineId));
+        } catch (final Exception e) {
+            LOGGER.warn(String.format("failed to detach pipeline indicator [%s]", pipelineId), e);
+        }
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/health/HelpUrl.java b/logstash-core/src/main/java/org/logstash/health/HelpUrl.java
new file mode 100644
index 000000000..db2586765
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/health/HelpUrl.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.health;
+
+import org.logstash.Logstash;
+
+import java.util.Objects;
+
+public class HelpUrl {
+    static final String BASE_URL;
+    static {
+        final String versionAnchor;
+        if (Integer.parseInt(Logstash.VERSION_MAJOR) >= 9) {
+            versionAnchor = "master";
+        } else {
+            versionAnchor = String.format("%s.%s", Logstash.VERSION_MAJOR, Logstash.VERSION_MINOR);
+        }
+        BASE_URL = String.format("https://www.elastic.co/guide/en/logstash/%s/", versionAnchor);
+    }
+
+    public HelpUrl(final String page) {
+        this(page, null);
+    }
+
+    public HelpUrl withAnchor(final String anchor) {
+        return new HelpUrl(this.page, anchor);
+    }
+
+    private HelpUrl(final String page, final String anchor) {
+        Objects.requireNonNull(page, "page cannot be null");
+        this.page = page;
+        this.anchor = anchor;
+    }
+
+    private final String page;
+    private final String anchor;
+
+    private transient String resolved;
+
+    @Override
+    public String toString() {
+        if (resolved == null) {
+            final StringBuilder sb = new StringBuilder(BASE_URL);
+            sb.append(page).append(".html");
+            if (anchor != null) {
+                sb.append("#").append(anchor);
+            }
+            resolved = sb.toString();
+        }
+        return resolved;
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/health/Impact.java b/logstash-core/src/main/java/org/logstash/health/Impact.java
new file mode 100644
index 000000000..3ccda5de2
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/health/Impact.java
@@ -0,0 +1,111 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.health;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.function.UnaryOperator;
+
+@JsonSerialize(using=Impact.JsonSerializer.class)
+public final class Impact {
+    public final String id;
+    public final int severity;
+    public final String description;
+    public final Set<ImpactArea> impactAreas;
+
+    public Impact(final Builder builder) {
+        this.id = builder.id;
+        this.severity = Objects.requireNonNullElse(builder.severity, 0);
+        this.description = builder.description;
+        this.impactAreas = Set.copyOf(builder.impactAreas);
+    }
+
+    static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+        private String id;
+        private Integer severity;
+        private String description;
+        private Set<ImpactArea> impactAreas;
+
+        public Builder() {
+            this.impactAreas = Set.of();
+        }
+
+        private Builder(String id, Integer severity, String description, Set<ImpactArea> impactAreas) {
+            this.id = id;
+            this.severity = severity;
+            this.description = description;
+            this.impactAreas = Set.copyOf(impactAreas);
+        }
+
+        public synchronized Builder withId(final String id) {
+            return new Builder(id, severity, description, impactAreas);
+        }
+
+        public synchronized Builder withSeverity(int severity) {
+            return new Builder(id, severity, description, impactAreas);
+        }
+
+        public synchronized Builder withDescription(String description) {
+            return new Builder(id, severity, description, impactAreas);
+        }
+
+        public synchronized Builder withAdditionalImpactArea(ImpactArea impactArea) {
+            final Set<ImpactArea> mergedImpactAreas = new HashSet<>(impactAreas);
+            if (!mergedImpactAreas.add(impactArea)) {
+                return this;
+            } else {
+                return this.withImpactAreas(mergedImpactAreas);
+            }
+        }
+
+        public synchronized Builder withImpactAreas(Collection<ImpactArea> impactAreas) {
+            return new Builder(id, severity, description, Set.copyOf(impactAreas));
+        }
+
+        public synchronized Builder transform(final UnaryOperator<Builder> configurator) {
+            return configurator.apply(this);
+        }
+
+        public synchronized Impact build() {
+            return new Impact(this);
+        }
+    }
+
+    public static class JsonSerializer extends com.fasterxml.jackson.databind.JsonSerializer<Impact> {
+        @Override
+        public void serialize(Impact impact, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
+            jsonGenerator.writeStartObject();
+            if (impact.id != null) {
+                jsonGenerator.writeStringField("id", impact.id);
+            }
+            jsonGenerator.writeNumberField("severity", impact.severity);
+            jsonGenerator.writeStringField("description", impact.description);
+            jsonGenerator.writeObjectField("impact_areas", impact.impactAreas);
+            jsonGenerator.writeEndObject();
+        }
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/health/ImpactArea.java b/logstash-core/src/main/java/org/logstash/health/ImpactArea.java
new file mode 100644
index 000000000..94679c79a
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/health/ImpactArea.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.health;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import java.util.Objects;
+
+public enum ImpactArea {
+    PIPELINE_EXECUTION,
+    ;
+
+    private final String externalValue;
+
+    ImpactArea(final String externalValue) {
+        this.externalValue = Objects.requireNonNullElseGet(externalValue, () -> name().toLowerCase());
+    }
+
+    ImpactArea() {
+        this(null);
+    }
+
+    @JsonValue
+    public String externalValue() {
+        return this.externalValue;
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/health/Indicator.java b/logstash-core/src/main/java/org/logstash/health/Indicator.java
new file mode 100644
index 000000000..df646e135
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/health/Indicator.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.health;
+
+public interface Indicator<REPORT extends Indicator.Report> {
+    REPORT report(ReportContext reportContext);
+
+    default REPORT report() {
+        return report(ReportContext.EMPTY);
+    }
+
+    interface Report {
+        Status status();
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/health/MultiIndicator.java b/logstash-core/src/main/java/org/logstash/health/MultiIndicator.java
new file mode 100644
index 000000000..d0699f768
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/health/MultiIndicator.java
@@ -0,0 +1,164 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.health;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * A {@code MultiIndicator} is an {@link Indicator} that combines multiple sub-{@link Indicator}s and produces a
+ * summarized {@link Report}.
+ */
+public class MultiIndicator implements Indicator<MultiIndicator.Report> {
+    private static final Logger LOGGER = LogManager.getLogger();
+
+    private final Map<String, Indicator<?>> indicators = new ConcurrentHashMap<>();
+
+    public void attachIndicator(final String name,
+                                final Indicator<?> indicatorToAttach) {
+        final Indicator<?> existing = indicators.putIfAbsent(name, indicatorToAttach);
+        if (Objects.nonNull(existing) && !Objects.equals(existing, indicatorToAttach)) {
+            throw new IllegalArgumentException(String.format("Cannot attach indicator %s (%s) because a different one of the same name is already attached (%s).", name, indicatorToAttach, existing));
+        }
+        LOGGER.debug("attached indicator {}=>{} (res:{})", name, indicatorToAttach, this);
+    }
+
+    public void detachIndicator(final String name,
+                                final Indicator<?> indicatorToDetach) {
+        final Indicator<?> remaining = indicators.computeIfPresent(name, (key, existing) -> Objects.isNull(indicatorToDetach) || Objects.equals(indicatorToDetach, existing) ? null : existing);
+        if (Objects.nonNull(remaining)) {
+            throw new IllegalArgumentException("Cannot detach indicator " + name + " because a different one of the same name is attached.");
+        }
+        LOGGER.debug("detached indicator {}<={} (res:{})", name, indicatorToDetach, this);
+    }
+
+    public <INDICATOR extends Indicator<?>> Optional<INDICATOR> getIndicator(final String name,
+                                                                             final Class<INDICATOR> indicatorClass) {
+        return getIndicator(name).map(indicatorClass::cast);
+    }
+
+    public Optional<Indicator<?>> getIndicator(final String name) {
+        return Optional.ofNullable(indicators.get(name));
+    }
+
+    @Override
+    public Report report(final ReportContext reportContext) {
+        LOGGER.debug("report starting with indicators {} for {}", this.indicators, reportContext);
+        final Status.Holder combinedStatus = new Status.Holder();
+
+        final Map<String, Indicator.Report> reports = new HashMap<>();
+        final Map<Status, Set<String>> indicatorNamesByStatus = new HashMap<>();
+
+        this.indicators.forEach((indicatorName, indicator) -> {
+            if (reportContext.isMuted(indicatorName)) {
+                LOGGER.trace("sub-indicator {} is muted for {}", indicatorName, reportContext);
+            } else {
+                reportContext.descend(indicatorName, (scopedContext) -> {
+                    final Indicator.Report report = indicator.report(scopedContext);
+
+                    combinedStatus.reduce(report.status());
+                    reports.put(indicatorName, report);
+                    indicatorNamesByStatus.computeIfAbsent(report.status(), k -> new HashSet<>()).add(indicatorName);
+                });
+            }
+        });
+
+        final StringBuilder symptom = new StringBuilder();
+        // to highlight indicators by most-degraded status, we summarize in reverse-order
+        final List<String> summaryByStatus = new ArrayList<>(indicatorNamesByStatus.size());
+        for (int i = Status.values().length - 1; i >= 0; i--) {
+            final Status summarizingStatus = Status.values()[i];
+            if (indicatorNamesByStatus.containsKey(summarizingStatus)) {
+                final Set<String> indicatorNames = indicatorNamesByStatus.get(summarizingStatus);
+                summaryByStatus.add(String.format("%s "+(indicatorNames.size()==1 ? "indicator is" : "indicators are")+" %s (`%s`)",
+                        indicatorNames.size(),
+                        summarizingStatus.descriptiveValue(),
+                        String.join("`, `", indicatorNames)));
+            }
+        }
+        if (summaryByStatus.isEmpty()) {
+            symptom.append("no indicators");
+        } else if (summaryByStatus.size() == 1) {
+            symptom.append(summaryByStatus.get(0));
+        } else if (summaryByStatus.size() == 2) {
+            symptom.append(summaryByStatus.get(0)).append(" and ").append(summaryByStatus.get(1));
+        } else {
+            final int lastIndex = summaryByStatus.size() - 1;
+            symptom.append(String.join(", ", summaryByStatus.subList(0, lastIndex)))
+                    .append(", and ").append(summaryByStatus.get(lastIndex));
+        }
+
+        return new Report(combinedStatus.value(), symptom.toString(), reports);
+    }
+
+    @Override
+    public String toString() {
+        return "MultiIndicator{" +
+                "indicators=" + indicators +
+                '}';
+    }
+
+    @JsonSerialize(using=Report.JsonSerializer.class)
+    public static class Report implements Indicator.Report {
+        private final Status status;
+        private final String symptom;
+        private final Map<String, Indicator.Report> indicators;
+
+        Report(final Status status,
+               final String symptom,
+               final Map<String, Indicator.Report> indicators) {
+            this.status = status;
+            this.symptom = symptom;
+            this.indicators = Map.copyOf(indicators);
+        }
+
+        @Override
+        public Status status() {
+            return this.status;
+        }
+
+        public String symptom() {
+            return this.symptom;
+        }
+
+        public Map<String, Indicator.Report> indicators() {
+            return this.indicators;
+        }
+
+        public static class JsonSerializer extends com.fasterxml.jackson.databind.JsonSerializer<Report> {
+            @Override
+            public void serialize(final Report report,
+                                  final JsonGenerator jsonGenerator,
+                                  final SerializerProvider serializerProvider) throws IOException {
+                jsonGenerator.writeStartObject();
+                jsonGenerator.writeObjectField("status", report.status());
+                jsonGenerator.writeStringField("symptom", report.symptom);
+                jsonGenerator.writeObjectField("indicators", report.indicators());
+                jsonGenerator.writeEndObject();
+            }
+        }
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/health/PipelineIndicator.java b/logstash-core/src/main/java/org/logstash/health/PipelineIndicator.java
new file mode 100644
index 000000000..ce6a5ed10
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/health/PipelineIndicator.java
@@ -0,0 +1,336 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.health;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.logstash.instrument.metrics.MetricKeys;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Objects;
+import java.util.OptionalDouble;
+import java.util.stream.Collectors;
+
+import static org.logstash.health.Status.*;
+
+/**
+ * A {@code PipelineIndicator} is a specialized {@link ProbeIndicator} that is meant for assessing the health of
+ * an individual pipeline.
+ */
+public class PipelineIndicator extends ProbeIndicator<PipelineIndicator.Details> {
+
+    public static PipelineIndicator forPipeline(final String pipelineId,
+                                                final PipelineDetailsProvider pipelineDetailsProvider) {
+        PipelineIndicator pipelineIndicator = new PipelineIndicator(new DetailsSupplier(pipelineId, pipelineDetailsProvider));
+        pipelineIndicator.attachProbe("status", new StatusProbe());
+        pipelineIndicator.attachProbe("flow:worker_utilization", new FlowWorkerUtilizationProbe());
+        return pipelineIndicator;
+    }
+
+    private PipelineIndicator(final DetailsSupplier detailsSupplier) {
+        super("pipeline", detailsSupplier::get);
+    }
+
+    @JsonSerialize(using = Status.JsonSerializer.class)
+    public static class Status {
+        public enum State {
+            UNKNOWN,
+            LOADING,
+            RUNNING,
+            FINISHED,
+            TERMINATED,
+        }
+
+        public static final Status UNKNOWN = new Status(State.UNKNOWN);
+        public static final Status LOADING = new Status(State.LOADING);
+        public static final Status RUNNING = new Status(State.RUNNING);
+        public static final Status FINISHED = new Status(State.FINISHED);
+        public static final Status TERMINATED = new Status(State.TERMINATED);
+
+        private final State state;
+        public Status(final State state) {
+            this.state = state;
+        }
+        public State getState() {
+            return state;
+        }
+
+        public static class JsonSerializer extends com.fasterxml.jackson.databind.JsonSerializer<Status> {
+            @Override
+            public void serialize(Status value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+                gen.writeStartObject();
+                gen.writeStringField("state", value.getState().toString());
+                gen.writeEndObject();
+            }
+        }
+    }
+
+    @JsonSerialize(using = Details.JsonSerializer.class)
+    public static class Details implements Observation {
+        private final Status status;
+        private final FlowObservation flow;
+
+        public Details(Status status, FlowObservation flow) {
+            this.status = Objects.requireNonNull(status, "status cannot be null");
+            this.flow = Objects.requireNonNullElse(flow, FlowObservation.EMPTY);
+        }
+
+        public Details(final Status status) {
+            this(status, null);
+        }
+
+        public Status getStatus() {
+            return this.status;
+        }
+        public FlowObservation getFlow() { return this.flow; }
+
+        public static class JsonSerializer extends com.fasterxml.jackson.databind.JsonSerializer<Details> {
+            @Override
+            public void serialize(final Details details,
+                                  final JsonGenerator jsonGenerator,
+                                  final SerializerProvider serializerProvider) throws IOException {
+                jsonGenerator.writeStartObject();
+                jsonGenerator.writeObjectField("status", details.getStatus());
+                FlowObservation flow = details.getFlow();
+                if (flow != null && !flow.isEmpty()) {
+                    jsonGenerator.writeObjectField("flow", flow);
+                }
+                jsonGenerator.writeEndObject();
+            }
+        }
+    }
+
+    @JsonSerialize(using = FlowObservation.JsonSerializer.class)
+    public static class FlowObservation {
+        private static FlowObservation EMPTY = new FlowObservation(Map.of());
+        final Map<String, Map<String,Double>> capture;
+
+        public FlowObservation(final Map<String, Map<String,Double>> capture) {
+            this.capture = Objects.requireNonNull(capture, "capture cannot be null").entrySet()
+                                    .stream()
+                                    .collect(Collectors.toUnmodifiableMap(Map.Entry::getKey, (e) -> Map.copyOf(e.getValue())));
+        }
+
+        public OptionalDouble getRate(final String flowMetricName, final String flowMetricWindow) {
+            final Map<String, Double> flowMetrics = capture.get(flowMetricName);
+            if (flowMetrics == null) {
+                return OptionalDouble.empty();
+            }
+            final Double rate = flowMetrics.get(flowMetricWindow);
+            if (rate == null) {
+                return OptionalDouble.empty();
+            } else {
+                return OptionalDouble.of(rate);
+            }
+        }
+
+        public boolean isEmpty() {
+            return capture.isEmpty() || capture.values().stream().allMatch(Map::isEmpty);
+        }
+
+        static class JsonSerializer extends com.fasterxml.jackson.databind.JsonSerializer<FlowObservation> {
+            @Override
+            public void serialize(FlowObservation value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+                gen.writeObject(value.capture);
+            }
+        }
+    }
+
+
+    /**
+     * This interface is implemented by the ruby-Agent
+     */
+    @FunctionalInterface
+    public interface PipelineDetailsProvider {
+        Details pipelineDetails(final String pipelineId);
+    }
+
+    public static class DetailsSupplier {
+        private final String pipelineId;
+        private final PipelineDetailsProvider pipelineDetailsProvider;
+        DetailsSupplier(final String pipelineId,
+                        final PipelineDetailsProvider pipelineDetailsProvider) {
+            this.pipelineId = pipelineId;
+            this.pipelineDetailsProvider = pipelineDetailsProvider;
+        }
+
+        public Details get() {
+            return this.pipelineDetailsProvider.pipelineDetails(pipelineId);
+        }
+    }
+
+    static class StatusProbe implements Probe<Details> {
+        static final Impact.Builder NOT_PROCESSING = Impact.builder()
+                .withId(impactId("not_processing"))
+                .withDescription("the pipeline is not currently processing")
+                .withAdditionalImpactArea(ImpactArea.PIPELINE_EXECUTION);
+
+        static final HelpUrl HELP_URL = new HelpUrl("health-report-pipeline-status");
+
+        @Override
+        public Analysis analyze(final Details details) {
+            switch (details.getStatus().getState()) {
+                case LOADING:
+                    return Analysis.builder()
+                            .withStatus(YELLOW)
+                            .withDiagnosis(db -> db
+                                    .withId(diagnosisId("loading"))
+                                    .withCause("pipeline is loading")
+                                    .withAction("if pipeline does not come up quickly, you may need to check the logs to see if it is stalled")
+                                    .withHelpUrl(HELP_URL.withAnchor("loading").toString()))
+                            .withImpact(NOT_PROCESSING.withSeverity(1).withDescription("pipeline is loading").build())
+                            .build();
+                case RUNNING:
+                    return Analysis.builder()
+                            .withStatus(GREEN)
+                            .build();
+                case FINISHED:
+                    return Analysis.builder()
+                            .withStatus(YELLOW)
+                            .withDiagnosis(db -> db
+                                    .withId(diagnosisId("finished"))
+                                    .withCause("pipeline has finished running because its inputs have been closed and events have been processed")
+                                    .withAction("if you expect this pipeline to run indefinitely, you will need to configure its inputs to continue receiving or fetching events")
+                                    .withHelpUrl(HELP_URL.withAnchor("finished").toString()))
+                            .withImpact(NOT_PROCESSING.withSeverity(10).withDescription("pipeline has finished running").build())
+                            .build();
+                case TERMINATED:
+                    return Analysis.builder()
+                            .withStatus(RED)
+                            .withDiagnosis(db -> db
+                                    .withId(diagnosisId("terminated"))
+                                    .withCause("pipeline is not running, likely because it has encountered an error")
+                                    .withAction("view logs to determine the cause of abnormal pipeline shutdown")
+                                    .withHelpUrl(HELP_URL.withAnchor("terminated").toString()))
+                            .withImpact(NOT_PROCESSING.withSeverity(1).build())
+                            .build();
+                case UNKNOWN:
+                default:
+                    return Analysis.builder()
+                            .withStatus(UNKNOWN)
+                            .withDiagnosis(db -> db
+                                    .withId(diagnosisId("unknown"))
+                                    .withCause("pipeline is not known; it may have been recently deleted or failed to start")
+                                    .withAction("view logs to determine if the pipeline failed to start")
+                                    .withHelpUrl(HELP_URL.withAnchor("unknown").toString()))
+                            .withImpact(NOT_PROCESSING.withSeverity(2).build())
+                            .build();
+            }
+        }
+
+        static String diagnosisId(final String state) {
+            return String.format("logstash:health:pipeline:status:diagnosis:%s", state);
+        }
+
+        static String impactId(final String state) {
+            return String.format("logstash:health:pipeline:status:impact:%s", state);
+        }
+
+
+    }
+
+    static class FlowWorkerUtilizationProbe implements Probe<Details> {
+        static final String LAST_1_MINUTE = "last_1_minute";
+        static final String LAST_5_MINUTES = "last_5_minutes";
+
+        static final String WORKER_UTILIZATION = MetricKeys.WORKER_UTILIZATION_KEY.asJavaString();
+
+        static final Impact.Builder BLOCKED_PROCESSING = Impact.builder()
+                .withId(impactId("blocked_processing"))
+                .withDescription("the pipeline is blocked")
+                .withAdditionalImpactArea(ImpactArea.PIPELINE_EXECUTION);
+
+        static final HelpUrl HELP_URL = new HelpUrl("health-report-pipeline-flow-worker-utilization");
+
+        @Override
+        public Analysis analyze(Details observation) {
+
+            final OptionalDouble lastFiveMinutes = observation.flow.getRate(WORKER_UTILIZATION, LAST_5_MINUTES);
+            final OptionalDouble lastOneMinute = observation.flow.getRate(WORKER_UTILIZATION, LAST_1_MINUTE);
+
+            if (lastFiveMinutes.isPresent()) {
+                if (lastFiveMinutes.getAsDouble() > 99.999) {
+                    return Analysis.builder()
+                            .withStatus(RED)
+                            .withDiagnosis(db -> db
+                                    .withId(diagnosisId("5m-blocked"))
+                                    .withCause(diagnosisCause("completely blocked", "five minutes", false))
+                                    .withAction("address bottleneck or add resources")
+                                    .withHelpUrl(HELP_URL.withAnchor("blocked-5m").toString()))
+                            .withImpact(BLOCKED_PROCESSING.withSeverity(1).build())
+                            .build();
+                } else if (lastFiveMinutes.getAsDouble() >= 95.00) {
+                    final boolean isRecovering = lastOneMinute.isPresent() && lastOneMinute.getAsDouble() <= 80.00;
+                    return Analysis.builder()
+                            .withStatus(YELLOW)
+                            .withDiagnosis(db -> db
+                                    .withId(diagnosisId("5m-nearly-blocked"))
+                                    .withCause(diagnosisCause("nearly blocked", "five minutes", isRecovering))
+                                    .withAction(isRecovering ? "continue to monitor" : "address bottleneck or add resources")
+                                    .withHelpUrl(HELP_URL.withAnchor("nearly-blocked-5m").toString()))
+                            .withImpact(BLOCKED_PROCESSING.withSeverity(1).build())
+                            .build();
+                }
+            }
+
+            if (lastOneMinute.isPresent()) {
+                if (lastOneMinute.getAsDouble() > 99.999) {
+                    return Analysis.builder().withStatus(YELLOW)
+                            .withDiagnosis(db -> db
+                                    .withId(diagnosisId("1m-blocked"))
+                                    .withCause(diagnosisCause("completely blocked", "one minute", false))
+                                    .withAction("address bottleneck or add resources")
+                                    .withHelpUrl(HELP_URL.withAnchor("blocked-1m").toString()))
+                            .withImpact(BLOCKED_PROCESSING.withSeverity(2).build())
+                            .build();
+                } else if (lastOneMinute.getAsDouble() >= 95.00) {
+                        return Analysis.builder().withStatus(YELLOW)
+                                .withDiagnosis(db -> db
+                                        .withId(diagnosisId("1m-nearly-blocked"))
+                                        .withCause(diagnosisCause("nearly blocked", "one minute", false))
+                                        .withAction("address bottleneck or add resources")
+                                        .withHelpUrl(HELP_URL.withAnchor("nearly-blocked-1m").toString()))
+                                .withImpact(BLOCKED_PROCESSING.withSeverity(2).build())
+                                .build();
+                }
+            }
+
+
+            return Analysis.builder().build();
+        }
+
+        static String diagnosisCause(String condition, String period, boolean isRecovering) {
+            final StringBuilder cause = new StringBuilder("pipeline workers have been ").append(condition).append(" for at least ").append(period);
+            if (isRecovering) {
+                cause.append(", but they appear to be recovering");
+            }
+            return cause.toString();
+        }
+
+        static String diagnosisId(final String state) {
+            return String.format("logstash:health:pipeline:flow:worker_utilization:diagnosis:%s", state);
+        }
+
+        static String impactId(final String state) {
+            return String.format("logstash:health:pipeline:flow:impact:%s", state);
+        }
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/health/Probe.java b/logstash-core/src/main/java/org/logstash/health/Probe.java
new file mode 100644
index 000000000..32d0b0bf8
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/health/Probe.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.health;
+
+import java.util.Objects;
+import java.util.function.UnaryOperator;
+
+public interface Probe<OBSERVATION extends ProbeIndicator.Observation> {
+    Analysis analyze(OBSERVATION observation);
+
+    final class Analysis {
+        public final Status status;
+        public final Diagnosis diagnosis;
+        public final Impact impact;
+
+        Analysis(final Builder builder) {
+            this.status = builder.status;
+            this.diagnosis = builder.diagnosis;
+            this.impact = builder.impact;
+        }
+
+        public static Builder builder() {
+            return new Builder();
+        }
+
+        public static class Builder {
+            private final Status status;
+            private final Diagnosis diagnosis;
+            private final Impact impact;
+
+            public Builder() {
+                this(Status.GREEN, null, null);
+            }
+
+            public Builder(final Status status,
+                           final Diagnosis diagnosis,
+                           final Impact impact) {
+                this.status = status;
+                this.diagnosis = diagnosis;
+                this.impact = impact;
+            }
+
+            public Builder withStatus(final Status status) {
+                if (Objects.equals(this.status, status)) {
+                    return this;
+                }
+                return new Builder(status, this.diagnosis, this.impact);
+            }
+
+            public Builder withDiagnosis(final Diagnosis diagnosis) {
+                if (Objects.equals(this.diagnosis, diagnosis)) {
+                    return this;
+                }
+                return new Builder(status, diagnosis, impact);
+            }
+
+            public Builder withDiagnosis(final UnaryOperator<Diagnosis.Builder> diagnosisConfigurator) {
+                return this.withDiagnosis(Diagnosis.builder().transform(diagnosisConfigurator).build());
+            }
+
+            public synchronized Builder withImpact(final Impact impact) {
+                if (Objects.equals(this.impact, impact)) {
+                    return this;
+                }
+                return new Builder(status, this.diagnosis, impact);
+            }
+
+            public Builder withImpact(final UnaryOperator<Impact.Builder> impactConfigurator) {
+                return this.withImpact(Impact.builder().transform(impactConfigurator).build());
+            }
+
+            public synchronized Analysis build() {
+                return new Analysis(this);
+            }
+        }
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/health/ProbeIndicator.java b/logstash-core/src/main/java/org/logstash/health/ProbeIndicator.java
new file mode 100644
index 000000000..ddb4fce6c
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/health/ProbeIndicator.java
@@ -0,0 +1,205 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.health;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Supplier;
+
+/**
+ * A {@code ProbeIndicator} is an {@link Indicator} that has one or more {@link Probe}s attached, and can be used
+ * to produce a {@link Report}.
+ */
+public class ProbeIndicator<OBSERVATION extends ProbeIndicator.Observation> implements Indicator<ProbeIndicator.Report<OBSERVATION>> {
+    private static final Logger LOGGER = LogManager.getLogger();
+
+    // Marker Interface
+    public interface Observation {}
+
+    @FunctionalInterface
+    public interface Observer<OBSERVATION extends Observation> extends Supplier<OBSERVATION> {}
+
+    private final String subject;
+    private final Observer<OBSERVATION> observer;
+
+    private final Map<String, Probe<OBSERVATION>> probes = new ConcurrentHashMap<>();
+
+    public ProbeIndicator(final String subject,
+                          final Observer<OBSERVATION> observer,
+                          final Map<String, Probe<OBSERVATION>> probes) {
+        this(subject, observer);
+        probes.forEach(this::attachProbe);
+    }
+
+    public ProbeIndicator(final String subject,
+                          final Observer<OBSERVATION> observer) {
+        this.subject = subject;
+        this.observer = observer;
+    }
+
+    public final void attachProbe(final String name,
+                                  final Probe<OBSERVATION> probeToAttach) {
+        final Probe<OBSERVATION> existing = probes.putIfAbsent(name, probeToAttach);
+        if (Objects.nonNull(existing) && !Objects.equals(existing, probeToAttach)) {
+            throw new IllegalArgumentException("Cannot attach probe " + name + " because a different one of the same name is already attached.");
+        }
+    }
+
+    public final void detachProbe(final String name,
+                                  final Probe<OBSERVATION> probeToDetach) {
+        Probe<OBSERVATION> remaining = probes.computeIfPresent(name, (key, existing) -> Objects.equals(probeToDetach, existing) ? null : existing);
+        if (Objects.nonNull(remaining)) {
+            throw new IllegalArgumentException("Cannot detach probe " + name + " because a different one of the same name is attached.");
+        }
+    }
+
+    public final void detachProbe(final String name) {
+        probes.remove(name);
+    }
+
+    Probe<OBSERVATION> getProbe(final String name) {
+        return probes.get(name);
+    }
+
+    @Override
+    public Report<OBSERVATION> report(final ReportContext reportContext) {
+
+        LOGGER.debug("report starting with {} probes {}", this.probes.keySet(), reportContext);
+        final OBSERVATION observation = observer.get();
+
+        final Status.Holder combinedStatus = new Status.Holder();
+        final List<Diagnosis> diagnoses = new ArrayList<>();
+        final List<Impact> impacts = new ArrayList<>();
+        final Set<ImpactArea> distinctImpactAreas = new HashSet<>();
+
+        for (Map.Entry<String, Probe<OBSERVATION>> probeEntry : this.probes.entrySet()) {
+            final String probeName = probeEntry.getKey();
+            final Probe.Analysis probeAnalysis = probeEntry.getValue().analyze(observation);
+            LOGGER.trace("probe {}: {}", probeName, probeAnalysis);
+
+            if (reportContext.isMuted(probeName)) {
+                LOGGER.trace("probe {} is muted", probeName);
+            } else {
+                combinedStatus.reduce(probeAnalysis.status);
+                Optional.ofNullable(probeAnalysis.diagnosis)
+                        .ifPresent(diagnoses::add);
+                Optional.ofNullable(probeAnalysis.impact)
+                        .filter(impacts::add)
+                        .map(impact -> impact.impactAreas)
+                        .ifPresent(distinctImpactAreas::addAll);
+            }
+        }
+
+        final Status status = combinedStatus.value();
+        final StringBuilder symptomBuilder = new StringBuilder();
+        symptomBuilder.append(String.format("The %s is %s", this.subject, status.descriptiveValue()));
+        if (distinctImpactAreas.size() + diagnoses.size() > 0) {
+            symptomBuilder.append("; ")
+                    .append(String.format(distinctImpactAreas.size() == 1 ? "%s area is impacted" : "%s areas are impacted", distinctImpactAreas.size()))
+                    .append(" and ")
+                    .append(String.format(diagnoses.size() == 1 ? "%s diagnosis is available" : "%s diagnoses are available", diagnoses.size()));
+        }
+        final String symptom = symptomBuilder.toString();
+
+        return new Report<>(status, observation, symptom, diagnoses, impacts);
+    }
+
+    @Override
+    public String toString() {
+        return "ProbeIndicator{" +
+                "observer=" + observer +
+                ", probes=" + probes +
+                '}';
+    }
+
+    @JsonSerialize(using=Report.JsonSerializer.class)
+    public static class Report<DETAILS> implements Indicator.Report {
+        private final Status status;
+        private final DETAILS details;
+        private final String symptom;
+        private final List<Diagnosis> diagnosis;
+
+        private final List<Impact> impacts;
+
+        public Report(final Status status,
+                      final DETAILS details,
+                      final String symptom,
+                      final List<Diagnosis> diagnosis,
+                      final List<Impact> impacts) {
+            this.status = status;
+            this.details = details;
+            this.symptom = symptom;
+            this.diagnosis = List.copyOf(diagnosis);
+            this.impacts = List.copyOf(impacts);
+        }
+        public Status status() {
+            return status;
+        }
+        public DETAILS details() {
+            return details;
+        }
+        public String symptom() {
+            return symptom;
+        }
+        public List<Diagnosis> diagnosis() {
+            return diagnosis;
+        }
+        public List<Impact> impacts() {
+            return impacts;
+        }
+
+        public static class JsonSerializer extends com.fasterxml.jackson.databind.JsonSerializer<Report<?>> {
+            @Override
+            public void serialize(final Report<?> report,
+                                  final JsonGenerator jsonGenerator,
+                                  final SerializerProvider serializerProvider) throws IOException {
+                jsonGenerator.writeStartObject();
+
+                jsonGenerator.writeObjectField("status", report.status);
+                jsonGenerator.writeStringField("symptom", report.symptom);
+
+                if (Objects.nonNull(report.diagnosis) && !report.diagnosis.isEmpty()) {
+                    jsonGenerator.writeObjectField("diagnosis", report.diagnosis);
+                }
+
+                if (Objects.nonNull(report.impacts) && !report.impacts.isEmpty()) {
+                    jsonGenerator.writeObjectField("impacts", report.impacts);
+                }
+
+                jsonGenerator.writeObjectField("details", report.details);
+
+                jsonGenerator.writeEndObject();
+            }
+        }
+
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/health/ReportContext.java b/logstash-core/src/main/java/org/logstash/health/ReportContext.java
new file mode 100644
index 000000000..9dc2970fc
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/health/ReportContext.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.health;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+/**
+ * A {@code ReportContext} is used when building an {@link Indicator.Report} to provide contextual configuration
+ * for a specific {@link Indicator} that is being reported on.
+ */
+public class ReportContext {
+    private final List<String> path;
+
+    public static final ReportContext EMPTY = new ReportContext(List.of());
+
+    ReportContext(final List<String> path) {
+        this.path = List.copyOf(path);
+    }
+
+    public ReportContext descend(final String node) {
+        final ArrayList<String> newPath = new ArrayList<>(path);
+        newPath.add(node);
+        return new ReportContext(newPath);
+    }
+
+    public void descend(final String node, final Consumer<ReportContext> consumer) {
+        consumer.accept(this.descend(node));
+    }
+
+    public boolean isMuted(final String childNodeName) {
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return "ReportContext{" +
+                "path=" + path +
+                '}';
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/health/Status.java b/logstash-core/src/main/java/org/logstash/health/Status.java
new file mode 100644
index 000000000..ba0ce68a3
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/health/Status.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.health;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum Status {
+    GREEN("healthy"),
+    UNKNOWN("unknown"),
+    YELLOW("concerning"),
+    RED("unhealthy"),
+    ;
+
+    private final String externalValue = name().toLowerCase();
+    private final String descriptiveValue;
+
+    Status(String descriptiveValue) {
+        this.descriptiveValue = descriptiveValue;
+    }
+
+    @JsonValue
+    public String externalValue() {
+        return externalValue;
+    }
+
+    public String descriptiveValue() { return descriptiveValue; }
+
+    /**
+     * Combine this status with another status.
+     * This method is commutative.
+     * @param status the other status
+     * @return the more-degraded of the two statuses.
+     */
+    public Status reduce(Status status) {
+        if (compareTo(status) >= 0) {
+            return this;
+        } else {
+            return status;
+        }
+    }
+
+    public static class Holder {
+        private Status status = Status.GREEN;
+        public synchronized Status reduce(Status status) {
+            return this.status = this.status.reduce(status);
+        }
+        public synchronized Status value() {
+            return this.status;
+        }
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/AbstractMetric.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/AbstractMetric.java
index 775b18ab4..ddd9adbb3 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/AbstractMetric.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/AbstractMetric.java
@@ -1,8 +1,30 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics;
 
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
+import java.util.Objects;
+
 /**
  * Abstract implementation of a {@link Metric}. All metrics should subclass this.
  *
@@ -20,16 +42,12 @@ public abstract class AbstractMetric<T> implements Metric<T> {
         this.name = name;
     }
 
-    @Override
-    public abstract MetricType getType();
-
     @JsonValue
     public abstract T getValue();
 
     @Override
     public String toString() {
-        return String.format("%s -  name: %s value:%s", this.getClass().getName(), this.name, getValue() == null ? "null" :
-                getValue().toString());
+        return String.format("%s -  name: %s value:%s", this.getClass().getName(), this.name, Objects.requireNonNullElse(getValue(),"null"));
     }
 
     @Override
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/AbstractMetricExt.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/AbstractMetricExt.java
index 2d5fe178d..a0298faf1 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/AbstractMetricExt.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/AbstractMetricExt.java
@@ -1,6 +1,27 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics;
 
 import org.jruby.Ruby;
+import org.jruby.RubyArray;
 import org.jruby.RubyClass;
 import org.jruby.RubyObject;
 import org.jruby.anno.JRubyClass;
@@ -8,6 +29,9 @@ import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
+/**
+ * JRuby extension to model the metrics collection
+ * */
 @JRubyClass(name = "AbstractMetric")
 public abstract class AbstractMetricExt extends RubyObject {
 
@@ -33,4 +57,19 @@ public abstract class AbstractMetricExt extends RubyObject {
     );
 
     protected abstract IRubyObject getCollector(ThreadContext context);
+
+
+    /**
+     * Normalize the namespace to an array
+     * @param namespaceName a ruby-object, which may be an array
+     * @return an array
+     */
+    @SuppressWarnings("rawtypes")
+    protected RubyArray normalizeNamespace(final IRubyObject namespaceName) {
+        if (namespaceName instanceof RubyArray) {
+            return (RubyArray) namespaceName;
+        } else {
+            return RubyArray.newArray(namespaceName.getRuntime(), namespaceName);
+        }
+    }
 }
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/AbstractNamespacedMetricExt.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/AbstractNamespacedMetricExt.java
index 414b05b99..1a24b3cc0 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/AbstractNamespacedMetricExt.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/AbstractNamespacedMetricExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics;
 
 import org.jruby.Ruby;
@@ -28,6 +48,10 @@ public abstract class AbstractNamespacedMetricExt extends AbstractMetricExt {
         final IRubyObject value) {
         return getGauge(context, key, value);
     }
+    @JRubyMethod
+    public IRubyObject timer(final ThreadContext context, final IRubyObject key) {
+        return getTimer(context, key);
+    }
 
     @JRubyMethod(required = 1, optional = 1)
     public IRubyObject increment(final ThreadContext context, final IRubyObject[] args) {
@@ -56,6 +80,11 @@ public abstract class AbstractNamespacedMetricExt extends AbstractMetricExt {
         return getNamespaceName(context);
     }
 
+    @JRubyMethod(name = "root")
+    public AbstractMetricExt root(final ThreadContext context) {
+        return getMetric();
+    }
+
     protected abstract IRubyObject getGauge(ThreadContext context, IRubyObject key,
         IRubyObject value);
 
@@ -64,6 +93,8 @@ public abstract class AbstractNamespacedMetricExt extends AbstractMetricExt {
 
     protected abstract IRubyObject getCounter(ThreadContext context, IRubyObject key);
 
+    protected abstract IRubyObject getTimer(ThreadContext context, IRubyObject key);
+
     protected abstract IRubyObject doTime(ThreadContext context, IRubyObject key, Block block);
 
     protected abstract IRubyObject doReportTime(ThreadContext context,
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/AbstractSimpleMetricExt.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/AbstractSimpleMetricExt.java
index 663f780a1..758d9309e 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/AbstractSimpleMetricExt.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/AbstractSimpleMetricExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics;
 
 import org.jruby.Ruby;
@@ -30,7 +50,14 @@ public abstract class AbstractSimpleMetricExt extends AbstractMetricExt {
     @JRubyMethod
     public IRubyObject gauge(final ThreadContext context, final IRubyObject namespace,
         final IRubyObject key, final IRubyObject value) {
-        return getGauge(context, namespace, key, value);
+        return getGauge(context, normalizeNamespace(namespace), key, value);
+    }
+
+    @JRubyMethod
+    public IRubyObject timer(final ThreadContext context,
+                             final IRubyObject namespace,
+                             final IRubyObject key) {
+        return getTimer(context, namespace, key);
     }
 
     @JRubyMethod(name = "report_time")
@@ -40,8 +67,10 @@ public abstract class AbstractSimpleMetricExt extends AbstractMetricExt {
     }
 
     @JRubyMethod
-    public IRubyObject time(final ThreadContext context, final IRubyObject namespace,
-        final IRubyObject key, final Block block) {
+    public IRubyObject time(final ThreadContext context,
+                            final IRubyObject namespace,
+                            final IRubyObject key,
+                            final Block block) {
         return doTime(context, namespace, key, block);
     }
 
@@ -52,6 +81,8 @@ public abstract class AbstractSimpleMetricExt extends AbstractMetricExt {
     protected abstract IRubyObject getGauge(ThreadContext context, IRubyObject namespace,
         IRubyObject key, IRubyObject value);
 
+    protected abstract IRubyObject getTimer(ThreadContext context, IRubyObject namespace, IRubyObject key);
+
     protected abstract IRubyObject doReportTime(ThreadContext context, IRubyObject namespace,
         IRubyObject key, IRubyObject duration);
 
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/BaseFlowMetric.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/BaseFlowMetric.java
new file mode 100644
index 000000000..5c686323a
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/BaseFlowMetric.java
@@ -0,0 +1,147 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.instrument.metrics;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.logstash.util.SetOnceReference;
+
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.OptionalDouble;
+import java.util.function.LongSupplier;
+import java.util.function.Supplier;
+
+/**
+ * This {@link BaseFlowMetric} is a shared-common base for all internal implementations of {@link FlowMetric}.
+ */
+abstract class BaseFlowMetric extends AbstractMetric<Map<String, Double>> implements FlowMetric {
+
+    static final Logger LOGGER = LogManager.getLogger(BaseFlowMetric.class);
+
+    // metric sources
+    private final Metric<? extends Number> numeratorMetric;
+    private final Metric<? extends Number> denominatorMetric;
+
+    protected final SetOnceReference<FlowCapture> lifetimeBaseline = SetOnceReference.unset();
+
+    static final String LIFETIME_KEY = "lifetime";
+
+    final LongSupplier nanoTimeSupplier;
+
+    static final MathContext LIMITED_PRECISION = new MathContext(4, RoundingMode.HALF_UP);
+    private static final OptionalDouble NEGATIVE_INFINITY_OPTIONAL_DOUBLE = OptionalDouble.of(Double.NEGATIVE_INFINITY);
+    private static final OptionalDouble POSITIVE_INFINITY_OPTIONAL_DOUBLE = OptionalDouble.of(Double.POSITIVE_INFINITY);
+
+    BaseFlowMetric(final LongSupplier nanoTimeSupplier,
+                   final String name,
+                   final Metric<? extends Number> numeratorMetric,
+                   final Metric<? extends Number> denominatorMetric) {
+        super(name);
+        this.nanoTimeSupplier = nanoTimeSupplier;
+        this.numeratorMetric = numeratorMetric;
+        this.denominatorMetric = denominatorMetric;
+
+        if (doCapture().isEmpty()) {
+            LOGGER.trace("FlowMetric({}) -> DEFERRED", name);
+        }
+    }
+
+    @Override
+    public MetricType getType() {
+        return MetricType.FLOW_RATE;
+    }
+
+    /**
+     * Attempt to perform a capture of our metrics, setting our lifetime baseline if it is not yet set.
+     *
+     * @return a {@link Optional} that contains a {@link FlowCapture} IFF one can be created.
+     */
+    protected Optional<FlowCapture> doCapture() {
+        final Number numeratorValue = numeratorMetric.getValue();
+        if (Objects.isNull(numeratorValue)) {
+            LOGGER.trace("FlowMetric({}) numerator metric {} returned null value", name, numeratorMetric.getName());
+            return Optional.empty();
+        }
+
+        final Number denominatorValue = denominatorMetric.getValue();
+        if (Objects.isNull(denominatorValue)) {
+            LOGGER.trace("FlowMetric({}) numerator metric {} returned null value", name, denominatorMetric.getName());
+            return Optional.empty();
+        }
+
+        final FlowCapture currentCapture = new FlowCapture(nanoTimeSupplier.getAsLong(), numeratorValue, denominatorValue);
+
+        // if our lifetime baseline has not been set, set it now.
+        if (lifetimeBaseline.offer(currentCapture)) {
+            LOGGER.trace("FlowMetric({}) baseline -> {}", name, currentCapture);
+        }
+
+        return Optional.of(currentCapture);
+    }
+
+    protected void injectLifetime(final FlowCapture currentCapture, final Map<String, Double> rates) {
+        calculateRate(currentCapture, lifetimeBaseline::get).ifPresent((rate) -> rates.put(LIFETIME_KEY, rate));
+    }
+
+    /**
+     * @param current the most-recent {@link FlowCapture}
+     * @param baseline a non-null {@link FlowCapture} from which to compare.
+     * @return an {@link OptionalDouble} that will be non-empty IFF we have sufficient information
+     * to calculate a finite rate of change of the numerator relative to the denominator.
+     */
+    protected static OptionalDouble calculateRate(final FlowCapture current, final FlowCapture baseline) {
+        Objects.requireNonNull(current, "current must not be null");
+        Objects.requireNonNull(baseline, "baseline must not be null");
+        if (baseline.equals(current)) { return OptionalDouble.empty(); }
+
+        final BigDecimal deltaNumerator = current.numerator().subtract(baseline.numerator());
+        final BigDecimal deltaDenominator = current.denominator().subtract(baseline.denominator());
+
+        if (deltaDenominator.signum() == 0) {
+            switch (deltaNumerator.signum()) {
+                case -1: return NEGATIVE_INFINITY_OPTIONAL_DOUBLE;
+                case  0: return OptionalDouble.empty();
+                case +1: return POSITIVE_INFINITY_OPTIONAL_DOUBLE;
+            }
+        }
+
+        final BigDecimal rate = deltaNumerator.divide(deltaDenominator, LIMITED_PRECISION);
+
+        return OptionalDouble.of(rate.doubleValue());
+    }
+
+    /**
+     * @param current the most-recent {@link FlowCapture}
+     * @param possibleBaseline a {@link Supplier}{@code <FlowCapture>} that may return null
+     * @return an {@link OptionalDouble} that will be non-empty IFF we have sufficient information
+     * to calculate a finite rate of change of the numerator relative to the denominator.
+     */
+    protected static OptionalDouble calculateRate(final FlowCapture current, final Supplier<FlowCapture> possibleBaseline) {
+        return Optional.ofNullable(possibleBaseline.get())
+                .map((baseline) -> calculateRate(current, baseline))
+                .orElseGet(OptionalDouble::empty);
+    }
+
+}
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/ExtendedFlowMetric.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/ExtendedFlowMetric.java
new file mode 100644
index 000000000..e93655f3d
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/ExtendedFlowMetric.java
@@ -0,0 +1,362 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.instrument.metrics;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.logstash.util.SetOnceReference;
+
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.time.Duration;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.OptionalDouble;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.LongSupplier;
+import java.util.function.ToLongFunction;
+import java.util.stream.Collectors;
+
+import static org.logstash.instrument.metrics.FlowMetricRetentionPolicy.BuiltInRetentionPolicy;
+
+/**
+ * The {@link ExtendedFlowMetric} is an implementation of {@link FlowMetric} that produces
+ * a variable number of rates defined by {@link FlowMetricRetentionPolicy}-s, retaining no
+ * more {@link FlowCapture}s than necessary to satisfy the requested resolution or the
+ * requested retention. This implementation is lock-free and concurrency-safe.
+ */
+public class ExtendedFlowMetric extends BaseFlowMetric {
+    static final Logger LOGGER = LogManager.getLogger(ExtendedFlowMetric.class);
+
+    private final Collection<? extends FlowMetricRetentionPolicy> retentionPolicies;
+
+    // set-once atomic reference; see ExtendedFlowMetric#appendCapture(FlowCapture)
+    private final SetOnceReference<List<RetentionWindow>> retentionWindows = SetOnceReference.unset();
+
+    public ExtendedFlowMetric(final String name,
+                              final Metric<? extends Number> numeratorMetric,
+                              final Metric<? extends Number> denominatorMetric) {
+        this(System::nanoTime, name, numeratorMetric, denominatorMetric);
+    }
+
+    ExtendedFlowMetric(final LongSupplier nanoTimeSupplier,
+                       final String name,
+                       final Metric<? extends Number> numeratorMetric,
+                       final Metric<? extends Number> denominatorMetric,
+                       final Collection<? extends FlowMetricRetentionPolicy> retentionPolicies) {
+        super(nanoTimeSupplier, name, numeratorMetric, denominatorMetric);
+        this.retentionPolicies = List.copyOf(retentionPolicies);
+
+        this.lifetimeBaseline.asOptional().ifPresent(this::appendCapture);
+    }
+
+    public ExtendedFlowMetric(final LongSupplier nanoTimeSupplier,
+                              final String name,
+                              final Metric<? extends Number> numeratorMetric,
+                              final Metric<? extends Number> denominatorMetric) {
+        this(nanoTimeSupplier, name, numeratorMetric, denominatorMetric, EnumSet.allOf(BuiltInRetentionPolicy.class));
+    }
+
+    @Override
+    public void capture() {
+        doCapture().ifPresent(this::appendCapture);
+    }
+
+    @Override
+    public Map<String, Double> getValue() {
+        if (!lifetimeBaseline.isSet()) { return Map.of(); }
+        if (!retentionWindows.isSet()) { return Map.of(); }
+
+        final Optional<FlowCapture> possibleCapture = doCapture();
+        if (possibleCapture.isEmpty()) { return Map.of(); }
+
+        final FlowCapture currentCapture = possibleCapture.get();
+
+        final Map<String, Double> rates = new LinkedHashMap<>();
+
+        this.retentionWindows.get()
+                             .forEach(window -> window.baseline(currentCapture.nanoTime())
+                                                      .or(() -> windowDefaultBaseline(window))
+                                                      .map((baseline) -> calculateRate(currentCapture, baseline))
+                                                      .orElseGet(OptionalDouble::empty)
+                                                      .ifPresent((rate) -> rates.put(window.policy.policyName(), rate)));
+
+        injectLifetime(currentCapture, rates);
+
+        return Collections.unmodifiableMap(rates);
+    }
+
+    /**
+     * Appends the given {@link FlowCapture} to the existing {@link RetentionWindow}s, XOR creates
+     * a new list of {@link RetentionWindow} using the provided {@link FlowCapture} as a baseline.
+     * This is concurrency-safe and uses non-volatile memory access in the hot path.
+     */
+    private void appendCapture(final FlowCapture capture) {
+        this.retentionWindows.ifSetOrElseSupply(
+                (existing) -> injectIntoRetentionWindows(existing, capture),
+                (        ) -> initRetentionWindows(retentionPolicies, capture)
+        );
+    }
+
+    private static List<RetentionWindow> initRetentionWindows(final Collection<? extends FlowMetricRetentionPolicy> retentionPolicies,
+                                                              final FlowCapture capture) {
+        return retentionPolicies.stream()
+                                .map((p) -> new RetentionWindow(p, capture))
+                                .collect(Collectors.toUnmodifiableList());
+    }
+
+    private static void injectIntoRetentionWindows(final List<RetentionWindow> retentionWindows, final FlowCapture capture) {
+        retentionWindows.forEach((rw) -> rw.append(capture));
+    }
+
+    /**
+     * Internal tooling to select the younger of two captures
+     */
+    private static FlowCapture selectNewerCapture(final FlowCapture existing, final FlowCapture proposed) {
+        if (existing == null) { return proposed; }
+        if (proposed == null) { return existing; }
+
+        return (existing.nanoTime() > proposed.nanoTime()) ? existing : proposed;
+    }
+
+    /**
+     * If a window's policy allows it to report before its retention has been reached,
+     * use our lifetime baseline as a default.
+     */
+    private Optional<FlowCapture> windowDefaultBaseline(final RetentionWindow window) {
+        if (window.policy.reportBeforeSatisfied()) {
+            return this.lifetimeBaseline.asOptional();
+        }
+        return Optional.empty();
+    }
+
+    /**
+     * Internal introspection for tests to measure how many captures we are retaining.
+     * @return the number of captures in all tracked windows
+     */
+    int estimateCapturesRetained() {
+        return this.retentionWindows.orElse(Collections.emptyList())
+                                    .stream()
+                                    .map(RetentionWindow::estimateSize)
+                                    .mapToInt(Integer::intValue)
+                                    .sum();
+    }
+
+    /**
+     * Internal introspection for tests to measure excess retention.
+     * @param retentionWindowFunction given a policy, return a retention window, in nanos
+     * @return the sum of over-retention durations.
+     */
+    Duration estimateExcessRetained(final ToLongFunction<FlowMetricRetentionPolicy> retentionWindowFunction) {
+        final long currentNanoTime = nanoTimeSupplier.getAsLong();
+        final long cumulativeExcessRetained =
+                this.retentionWindows.orElse(Collections.emptyList())
+                                     .stream()
+                                     .map(s -> s.excessRetained(currentNanoTime, retentionWindowFunction))
+                                     .mapToLong(Long::longValue)
+                                     .sum();
+        return Duration.ofNanos(cumulativeExcessRetained);
+    }
+
+    /**
+     * A {@link RetentionWindow} efficiently holds sufficient {@link FlowCapture}s to
+     * meet its {@link FlowMetricRetentionPolicy}, providing access to the youngest capture
+     * that is older than the policy's allowed retention (if any).
+     * The implementation is similar to a singly-linked list whose youngest captures are at
+     * the tail and oldest captures are at the head, with an additional pre-tail stage.
+     * Compaction is always done at read-time and occasionally at write-time.
+     * Both reads and writes are non-blocking and concurrency-safe.
+     */
+    private static class RetentionWindow {
+        private final AtomicReference<FlowCapture> stagedCapture = new AtomicReference<>();
+        private final AtomicReference<Node> tail;
+        private final AtomicReference<Node> head;
+        private final FlowMetricRetentionPolicy policy;
+
+        RetentionWindow(final FlowMetricRetentionPolicy policy, final FlowCapture zeroCapture) {
+            this.policy = policy;
+            final Node zeroNode = new Node(zeroCapture);
+            this.head = new AtomicReference<>(zeroNode);
+            this.tail = new AtomicReference<>(zeroNode);
+        }
+
+        /**
+         * Append the newest {@link FlowCapture} into this {@link RetentionWindow},
+         * while respecting our {@link FlowMetricRetentionPolicy}.
+         * We tolerate minor jitter in the provided {@link FlowCapture#nanoTime()}, but
+         * expect callers of this method to minimize lag between instantiating the capture
+         * and appending it.
+         *
+         * @param newestCapture the newest capture to stage
+         */
+        private void append(final FlowCapture newestCapture) {
+            final Node casTail = this.tail.getAcquire(); // for CAS
+            final long newestCaptureNanoTime = newestCapture.nanoTime();
+
+            // stage our newest capture unless it is older than the currently-staged capture
+            final FlowCapture previouslyStaged = stagedCapture.getAndAccumulate(newestCapture, ExtendedFlowMetric::selectNewerCapture);
+
+            // promote our previously-staged capture IFF our newest capture is too far
+            // ahead of the current tail to support policy's resolution.
+            if (previouslyStaged != null && Math.subtractExact(newestCaptureNanoTime, casTail.captureNanoTime()) > policy.resolutionNanos()) {
+                // attempt to set an _unlinked_ Node to our tail
+                final Node proposedNode = new Node(previouslyStaged);
+                if (this.tail.compareAndSet(casTail, proposedNode)) {
+                    // if we succeeded at setting an unlinked node, link to it from our old tail
+                    casTail.setNext(proposedNode);
+
+                    // perform a force-compaction of our head if necessary,
+                    // detected using plain memory access
+                    final Node currentHead = head.getPlain();
+                    final long headAgeNanos = Math.subtractExact(newestCaptureNanoTime, currentHead.captureNanoTime());
+                    if (LOGGER.isTraceEnabled()) {
+                        LOGGER.trace("{} post-append result (captures: `{}` span: `{}` }", this, estimateSize(currentHead), Duration.ofNanos(headAgeNanos));
+                    }
+                    if (headAgeNanos > policy.forceCompactionNanos()) {
+                        final Node compactHead = compactHead(Math.subtractExact(newestCaptureNanoTime, policy.retentionNanos()));
+                        if (LOGGER.isDebugEnabled()) {
+                            final long compactHeadAgeNanos = Math.subtractExact(newestCaptureNanoTime, compactHead.captureNanoTime());
+                            LOGGER.debug("{} forced-compaction result (captures: `{}` span: `{}`)", this, estimateSize(compactHead), Duration.ofNanos(compactHeadAgeNanos));
+                        }
+                    }
+                }
+            }
+        }
+
+        @Override
+        public String toString() {
+            return "RetentionWindow{" +
+                    "policy=" + policy.policyName() +
+                    " id=" + System.identityHashCode(this) +
+                    '}';
+        }
+
+        /**
+         * @param nanoTime the nanoTime of the capture for which we are retrieving a baseline.
+         * @return an {@link Optional} that contains the youngest {@link FlowCapture} that is older
+         *         than this window's {@link FlowMetricRetentionPolicy} allowed retention if one
+         *         exists, and is otherwise empty.
+         */
+        public Optional<FlowCapture> baseline(final long nanoTime) {
+            final long barrier = Math.subtractExact(nanoTime, policy.retentionNanos());
+            final Node head = compactHead(barrier);
+            if (head.captureNanoTime() <= barrier) {
+                return Optional.of(head.capture);
+            } else {
+                return Optional.empty();
+            }
+        }
+
+        /**
+         * @return a computationally-expensive estimate of the number of captures in this window,
+         *         using plain memory access. This should NOT be run in unguarded production code.
+         */
+        private static int estimateSize(final Node headNode) {
+            int i = 1; // assume we have one additional staged
+            // NOTE: we chase the provided headNode's tail with plain-gets,
+            //       which tolerates missed appends from other threads.
+            for (Node current = headNode; current != null; current = current.getNextPlain()) { i++; }
+            return i;
+        }
+
+        /**
+         * @see RetentionWindow#estimateSize(Node)
+         */
+        private int estimateSize() {
+            return estimateSize(this.head.getPlain());
+        }
+
+        /**
+         * @param barrier a nanoTime that will NOT be crossed during compaction
+         * @return the head node after compaction up to the provided barrier.
+         */
+        private Node compactHead(final long barrier) {
+            return this.head.updateAndGet((existingHead) -> {
+                final Node proposedHead = existingHead.seekWithoutCrossing(barrier);
+                return Objects.requireNonNullElse(proposedHead, existingHead);
+            });
+        }
+
+        /**
+         * Internal testing support
+         */
+        private long excessRetained(final long currentNanoTime, final ToLongFunction<FlowMetricRetentionPolicy> retentionWindowFunction) {
+            final long barrier = Math.subtractExact(currentNanoTime, retentionWindowFunction.applyAsLong(this.policy));
+            return Math.max(0L, Math.subtractExact(barrier, this.head.getPlain().captureNanoTime()));
+        }
+
+        /**
+         * A {@link Node} holds a single {@link FlowCapture} and
+         * may link ahead to the next {@link Node}.
+         * It is an implementation detail of {@link RetentionWindow}.
+         */
+        private static class Node {
+            private static final VarHandle NEXT;
+            static {
+                try {
+                    MethodHandles.Lookup l = MethodHandles.lookup();
+                    NEXT = l.findVarHandle(Node.class, "next", Node.class);
+                } catch (ReflectiveOperationException e) {
+                    throw new ExceptionInInitializerError(e);
+                }
+            }
+
+            private final FlowCapture capture;
+            private volatile Node next;
+
+            Node(final FlowCapture capture) {
+                this.capture = capture;
+            }
+
+            Node seekWithoutCrossing(final long barrier) {
+                Node newestOlderThanThreshold = null;
+                Node candidate = this;
+
+                while(candidate != null && candidate.captureNanoTime() < barrier) {
+                    newestOlderThanThreshold = candidate;
+                    candidate = candidate.getNext();
+                }
+                return newestOlderThanThreshold;
+            }
+
+            long captureNanoTime() {
+                return this.capture.nanoTime();
+            }
+
+            void setNext(final Node nextNode) {
+                next = nextNode;
+            }
+
+            Node getNext() {
+                return next;
+            }
+
+            Node getNextPlain() {
+                return (Node)NEXT.get(this);
+            }
+        }
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/FlowCapture.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/FlowCapture.java
new file mode 100644
index 000000000..3b8444cd0
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/FlowCapture.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.instrument.metrics;
+
+import java.math.BigDecimal;
+
+/**
+ * A {@link FlowCapture} is used by {@link FlowMetric} to hold
+ * point-in-time data for a pair of {@link Metric}s.
+ * It is immutable.
+ */
+class FlowCapture {
+    private final Number numerator;
+    private final Number denominator;
+
+    private final long nanoTime;
+
+    FlowCapture(final long nanoTime,
+                final Number numerator,
+                final Number denominator) {
+        this.numerator = numerator;
+        this.denominator = denominator;
+        this.nanoTime = nanoTime;
+    }
+
+    /**
+     * @return the nanoTime of this capture, as provided at time
+     *         of capture by the {@link FlowMetric}.
+     */
+    public long nanoTime() {
+        return nanoTime;
+    }
+
+    /**
+     * @return the value of the numerator metric at time of capture.
+     */
+    public BigDecimal numerator() {
+        return BigDecimal.valueOf(numerator.doubleValue());
+    }
+
+    /**
+     * @return the value of the denominator metric at time of capture.
+     */
+    public BigDecimal denominator() {
+        return BigDecimal.valueOf(denominator.doubleValue());
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() +"{" +
+                "nanoTimestamp=" + nanoTime +
+                " numerator=" + numerator() +
+                " denominator=" + denominator() +
+                '}';
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/FlowMetric.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/FlowMetric.java
new file mode 100644
index 000000000..ad11f0408
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/FlowMetric.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.instrument.metrics;
+
+import java.util.Map;
+import java.util.function.Supplier;
+
+/**
+ * A {@link FlowMetric} reports the rates of change of one metric (the numerator)
+ * relative to another (the denominator), over one or more windows.
+ * The instantiator of a {@link FlowMetric} is responsible for ensuring it is
+ * sent {@link FlowMetric#capture} on a regular cadence.
+ */
+public interface FlowMetric extends Metric<Map<String,Double>> {
+    void capture();
+
+    static FlowMetric create(final String name,
+                             final Metric<? extends Number> numerator,
+                             final Metric<? extends Number> denominator) {
+        // INTERNAL-ONLY system property escape hatch
+        switch (System.getProperty("logstash.flowMetric", "extended")) {
+            case "extended": return new ExtendedFlowMetric(name, numerator, denominator);
+            case "simple"  :
+            default        : return new SimpleFlowMetric(name, numerator, denominator);
+        }
+    }
+
+    static FlowMetric create(final String name,
+                             final Supplier<? extends Metric<? extends Number>> numeratorSupplier,
+                             final Supplier<? extends Metric<? extends Number>> denominatorSupplier) {
+        return new LazyInstantiatedFlowMetric(name, numeratorSupplier, denominatorSupplier);
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/FlowMetricRetentionPolicy.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/FlowMetricRetentionPolicy.java
new file mode 100644
index 000000000..e36fba4b6
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/FlowMetricRetentionPolicy.java
@@ -0,0 +1,99 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.instrument.metrics;
+
+import java.time.Duration;
+
+interface FlowMetricRetentionPolicy {
+    String policyName();
+
+    long resolutionNanos();
+
+    long retentionNanos();
+
+    long forceCompactionNanos();
+
+    boolean reportBeforeSatisfied();
+
+    enum BuiltInRetentionPolicy implements FlowMetricRetentionPolicy {
+                              // MAX_RETENTION,  MIN_RESOLUTION
+                CURRENT(Duration.ofSeconds(10), Duration.ofSeconds(1), true),
+          LAST_1_MINUTE(Duration.ofMinutes(1),  Duration.ofSeconds(3)),
+         LAST_5_MINUTES(Duration.ofMinutes(5),  Duration.ofSeconds(15)),
+        LAST_15_MINUTES(Duration.ofMinutes(15), Duration.ofSeconds(30)),
+            LAST_1_HOUR(Duration.ofHours(1),    Duration.ofMinutes(1)),
+          LAST_24_HOURS(Duration.ofHours(24),   Duration.ofMinutes(15)),
+        ;
+
+        final long resolutionNanos;
+        final long retentionNanos;
+
+        final long forceCompactionNanos;
+
+        final boolean reportBeforeSatisfied;
+
+        final transient String nameLower;
+
+        BuiltInRetentionPolicy(final Duration maximumRetention, final Duration minimumResolution, final boolean reportBeforeSatisfied) {
+            this.retentionNanos = maximumRetention.toNanos();
+            this.resolutionNanos = minimumResolution.toNanos();
+            this.reportBeforeSatisfied = reportBeforeSatisfied;
+
+            // we generally rely on query-time compaction, and only perform insertion-time compaction
+            // if our series' head entry is significantly older than our maximum retention, which
+            // allows us to ensure a reasonable upper-bound of collection size without incurring the
+            // cost of compaction too often or inspecting the collection's size.
+            final long forceCompactionMargin = Math.max(Duration.ofSeconds(30).toNanos(),
+                                                        Math.multiplyExact(resolutionNanos, 8));
+            this.forceCompactionNanos = Math.addExact(retentionNanos, forceCompactionMargin);
+
+            this.nameLower = name().toLowerCase();
+        }
+
+        BuiltInRetentionPolicy(final Duration maximumRetention, final Duration minimumResolution) {
+            this(maximumRetention, minimumResolution, false);
+        }
+
+        @Override
+        public String policyName() {
+            return nameLower;
+        }
+
+        @Override
+        public long resolutionNanos() {
+            return this.resolutionNanos;
+        }
+
+        @Override
+        public long retentionNanos() {
+            return this.retentionNanos;
+        }
+
+        @Override
+        public long forceCompactionNanos() {
+            return this.forceCompactionNanos;
+        }
+
+        @Override
+        public boolean reportBeforeSatisfied() {
+            return this.reportBeforeSatisfied;
+        }
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/LazyInstantiatedFlowMetric.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/LazyInstantiatedFlowMetric.java
new file mode 100644
index 000000000..61c47f26b
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/LazyInstantiatedFlowMetric.java
@@ -0,0 +1,87 @@
+package org.logstash.instrument.metrics;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.logstash.util.SetOnceReference;
+
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
+
+/**
+ * A {@code LazyInstantiatedFlowMetric} is a {@link FlowMetric} whose underlying {@link Metric}s
+ * may not be available until a later time. It is initialized with two {@link Supplier}{@code <Metric>}s,
+ * and fully initializes when <em>both</em> return non-null values.
+ *
+ * @see FlowMetric#create(String, Supplier, Supplier)
+ */
+public class LazyInstantiatedFlowMetric extends AbstractMetric<Map<String, Double>> implements FlowMetric {
+
+    static final Logger LOGGER = LogManager.getLogger(LazyInstantiatedFlowMetric.class);
+
+    private final AtomicReference<Supplier<? extends Metric<? extends Number>>> numeratorSupplier;
+    private final AtomicReference<Supplier<? extends Metric<? extends Number>>> denominatorSupplier;
+
+    private final SetOnceReference<FlowMetric> inner = SetOnceReference.unset();
+
+    private static final Map<String,Double> EMPTY_MAP = Map.of();
+
+    LazyInstantiatedFlowMetric(final String name,
+                               final Supplier<? extends Metric<? extends Number>> numeratorSupplier,
+                               final Supplier<? extends Metric<? extends Number>> denominatorSupplier) {
+        super(name);
+        this.numeratorSupplier = new AtomicReference<>(numeratorSupplier);
+        this.denominatorSupplier = new AtomicReference<>(denominatorSupplier);
+    }
+
+    @Override
+    public void capture() {
+        getInner().ifPresentOrElse(FlowMetric::capture, this::warnNotInitialized);
+    }
+
+    @Override
+    public MetricType getType() {
+        return MetricType.FLOW_RATE;
+    }
+
+    @Override
+    public Map<String, Double> getValue() {
+        return getInner().map(FlowMetric::getValue).orElse(EMPTY_MAP);
+    }
+
+    private Optional<FlowMetric> getInner() {
+        return inner.asOptional().or(this::attemptCreateInner);
+    }
+
+    private Optional<FlowMetric> attemptCreateInner() {
+        if (inner.isSet()) { return inner.asOptional(); }
+
+        final Metric<? extends Number> numeratorMetric = numeratorSupplier.getAcquire().get();
+        if (Objects.isNull(numeratorMetric)) { return Optional.empty(); }
+
+        final Metric<? extends Number> denominatorMetric = denominatorSupplier.getAcquire().get();
+        if (Objects.isNull(denominatorMetric)) { return Optional.empty(); }
+
+        final FlowMetric flowMetric = FlowMetric.create(this.name, numeratorMetric, denominatorMetric);
+        if (inner.offer(flowMetric)) {
+            LOGGER.debug("Inner FlowMetric lazy-initialized for {}", this.name);
+            // ensure the scopes of our suppliers can be GC'd by replacing them with
+            // the constant-return suppliers of metrics we are already holding onto.
+            numeratorSupplier.setRelease(constantMetricSupplierFor(numeratorMetric));
+            denominatorSupplier.setRelease(constantMetricSupplierFor(denominatorMetric));
+            return Optional.of(flowMetric);
+        }
+
+        return inner.asOptional();
+    }
+
+    private void warnNotInitialized() {
+        LOGGER.warn("Underlying metrics for `{}` not yet instantiated, could not capture their rates", this.name);
+    }
+
+    private static Supplier<Metric<? extends Number>> constantMetricSupplierFor(final Metric<? extends Number> mm) {
+        return () -> mm;
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/Metric.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/Metric.java
index d51c015dc..d41e6acf1 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/Metric.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/Metric.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics;
 
 /**
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/MetricExt.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/MetricExt.java
index 9f28c1260..1303e1a75 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/MetricExt.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/MetricExt.java
@@ -1,6 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics;
 
 import java.util.concurrent.TimeUnit;
+
+import co.elastic.logstash.api.TimerMetric;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
@@ -31,10 +53,11 @@ public final class MetricExt extends AbstractSimpleMetricExt {
     private static final RubySymbol DECREMENT = RubyUtil.RUBY.newSymbol("decrement");
 
     private static final RubySymbol GAUGE = RubyUtil.RUBY.newSymbol("gauge");
-
+    private static final RubySymbol TIMER = RubyUtil.RUBY.newSymbol("timer");
     private static final RubySymbol SET = RubyUtil.RUBY.newSymbol("set");
+    private static final RubySymbol GET = RubyUtil.RUBY.newSymbol("get");
 
-    private IRubyObject collector;
+    private transient IRubyObject collector;
 
     public MetricExt(final Ruby runtime, final RubyClass metaClass) {
         super(runtime, metaClass);
@@ -71,7 +94,7 @@ public final class MetricExt extends AbstractSimpleMetricExt {
         final IRubyObject key, final IRubyObject value) {
         MetricExt.validateKey(context, null, key);
         return collector.callMethod(
-            context, "push", new IRubyObject[]{namespace, key, COUNTER, INCREMENT, value}
+            context, "push", new IRubyObject[]{normalizeNamespace(namespace), key, COUNTER, INCREMENT, value}
         );
     }
 
@@ -84,7 +107,7 @@ public final class MetricExt extends AbstractSimpleMetricExt {
         final IRubyObject key, final IRubyObject value) {
         MetricExt.validateKey(context, null, key);
         return collector.callMethod(
-            context, "push", new IRubyObject[]{namespace, key, COUNTER, DECREMENT, value}
+            context, "push", new IRubyObject[]{normalizeNamespace(namespace), key, COUNTER, DECREMENT, value}
         );
     }
 
@@ -116,34 +139,41 @@ public final class MetricExt extends AbstractSimpleMetricExt {
         final IRubyObject key, final IRubyObject value) {
         MetricExt.validateKey(context, null, key);
         return collector.callMethod(
-            context, "push", new IRubyObject[]{namespace, key, GAUGE, SET, value}
+            context, "push", new IRubyObject[]{normalizeNamespace(namespace), key, GAUGE, SET, value}
         );
     }
 
+    @Override
+    protected IRubyObject getTimer(final ThreadContext context,
+                                   final IRubyObject namespace,
+                                   final IRubyObject key) {
+        MetricExt.validateKey(context, null, key);
+        return collector.callMethod(context,
+                "get", new IRubyObject[]{normalizeNamespace(namespace), key, TIMER}
+                );
+    }
+
     @Override
     protected IRubyObject doReportTime(final ThreadContext context, final IRubyObject namespace,
         final IRubyObject key, final IRubyObject duration) {
         MetricExt.validateKey(context, null, key);
-        return collector.callMethod(
-            context, "push", new IRubyObject[]{namespace, key, COUNTER, INCREMENT, duration}
-        );
+
+        final TimerMetric timer = timer(context, namespace, key).toJava(TimerMetric.class);
+        timer.reportUntrackedMillis(duration.convertToInteger().getLongValue());
+        return context.nil;
     }
 
     @Override
-    protected IRubyObject doTime(final ThreadContext context, final IRubyObject namespace,
-        final IRubyObject key, final Block block) {
+    protected IRubyObject doTime(final ThreadContext context,
+                                 final IRubyObject namespace,
+                                 final IRubyObject key,
+                                 final Block block) {
         MetricExt.validateKey(context, null, key);
         if (!block.isGiven()) {
             return MetricExt.TimedExecution.create(this, namespace, key);
         }
-        final long startTime = System.nanoTime();
-        final IRubyObject res = block.call(context);
-        this.reportTime(context, namespace, key, RubyFixnum.newFixnum(
-            context.runtime, TimeUnit.MILLISECONDS.convert(
-                System.nanoTime() - startTime, TimeUnit.NANOSECONDS
-            )
-        ));
-        return res;
+        final TimerMetric timer = timer(context, namespace, key).toJava(TimerMetric.class);
+        return timer.time(() -> block.call(context));
     }
 
     @Override
@@ -152,7 +182,7 @@ public final class MetricExt extends AbstractSimpleMetricExt {
         validateName(context, name, RubyUtil.METRIC_NO_NAMESPACE_PROVIDED_CLASS);
         return NamespacedMetricExt.create(
             this,
-            name instanceof RubyArray ? (RubyArray) name : RubyArray.newArray(context.runtime, name)
+            normalizeNamespace(name)
         );
     }
 
@@ -165,9 +195,9 @@ public final class MetricExt extends AbstractSimpleMetricExt {
 
         private MetricExt metric;
 
-        private IRubyObject namespace;
+        private transient IRubyObject namespace;
 
-        private IRubyObject key;
+        private transient IRubyObject key;
 
         public static MetricExt.TimedExecution create(final MetricExt metric,
             final IRubyObject namespace, final IRubyObject key) {
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/MetricKeys.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/MetricKeys.java
index 501d94255..2730ab837 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/MetricKeys.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/MetricKeys.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics;
 
 import org.jruby.RubySymbol;
@@ -19,10 +39,81 @@ public final class MetricKeys {
 
     public static final RubySymbol IN_KEY = RubyUtil.RUBY.newSymbol("in");
 
-    public static final RubySymbol DURATION_IN_MILLIS_KEY =
-        RubyUtil.RUBY.newSymbol("duration_in_millis");
+    public static final RubySymbol PLUGINS_KEY = RubyUtil.RUBY.newSymbol("plugins");
+
+    public static final RubySymbol INPUTS_KEY = RubyUtil.RUBY.newSymbol("inputs");
+
+    public static final RubySymbol FILTERS_KEY = RubyUtil.RUBY.newSymbol("filters");
+
+    public static final RubySymbol OUTPUTS_KEY = RubyUtil.RUBY.newSymbol("outputs");
+
+    public static final RubySymbol DURATION_IN_MILLIS_KEY = RubyUtil.RUBY.newSymbol("duration_in_millis");
+
+    public static final RubySymbol PUSH_DURATION_KEY = RubyUtil.RUBY.newSymbol("queue_push_duration_in_millis");
+
+    public static final RubySymbol PAGE_CAPACITY_IN_BYTES_KEY = RubyUtil.RUBY.newSymbol("page_capacity_in_bytes");
+
+    public static final RubySymbol MAX_QUEUE_SIZE_IN_BYTES_KEY = RubyUtil.RUBY.newSymbol("max_queue_size_in_bytes");
+
+    public static final RubySymbol MAX_QUEUE_UNREAD_EVENTS_KEY = RubyUtil.RUBY.newSymbol("max_unread_events");
+
+    public static final RubySymbol QUEUE_SIZE_IN_BYTES_KEY = RubyUtil.RUBY.newSymbol("queue_size_in_bytes");
+
+    public static final RubySymbol FREE_SPACE_IN_BYTES_KEY = RubyUtil.RUBY.newSymbol("free_space_in_bytes");
+
+    public static final RubySymbol STORAGE_TYPE_KEY = RubyUtil.RUBY.newSymbol("storage_type");
+
+    public static final RubySymbol PATH_KEY = RubyUtil.RUBY.newSymbol("path");
+
+    public static final RubySymbol TYPE_KEY = RubyUtil.RUBY.newSymbol("type");
+
+    public static final RubySymbol QUEUE_KEY = RubyUtil.RUBY.newSymbol("queue");
+
+    public static final RubySymbol CAPACITY_KEY = RubyUtil.RUBY.newSymbol("capacity");
+
+    public static final RubySymbol DLQ_KEY = RubyUtil.RUBY.newSymbol("dlq");
+
+    public static final RubySymbol STORAGE_POLICY_KEY = RubyUtil.RUBY.newSymbol("storage_policy");
+
+    public static final RubySymbol DROPPED_EVENTS_KEY = RubyUtil.RUBY.newSymbol("dropped_events");
+
+    public static final RubySymbol EXPIRED_EVENTS_KEY = RubyUtil.RUBY.newSymbol("expired_events");
+
+    public static final RubySymbol LAST_ERROR_KEY = RubyUtil.RUBY.newSymbol("last_error");
 
     public static final RubySymbol FILTERED_KEY = RubyUtil.RUBY.newSymbol("filtered");
 
     public static final RubySymbol STATS_KEY = RubyUtil.RUBY.newSymbol("stats");
+
+    // Flow metric keys
+    public static final RubySymbol FLOW_KEY = RubyUtil.RUBY.newSymbol("flow");
+
+    public static final RubySymbol INPUT_THROUGHPUT_KEY = RubyUtil.RUBY.newSymbol("input_throughput");
+
+    public static final RubySymbol OUTPUT_THROUGHPUT_KEY = RubyUtil.RUBY.newSymbol("output_throughput");
+
+    public static final RubySymbol FILTER_THROUGHPUT_KEY = RubyUtil.RUBY.newSymbol("filter_throughput");
+
+    public static final RubySymbol QUEUE_BACKPRESSURE_KEY = RubyUtil.RUBY.newSymbol("queue_backpressure");
+
+    public static final RubySymbol WORKER_CONCURRENCY_KEY = RubyUtil.RUBY.newSymbol("worker_concurrency");
+
+    public static final RubySymbol WORKER_MILLIS_PER_EVENT_KEY = RubyUtil.RUBY.newSymbol("worker_millis_per_event");
+
+    public static final RubySymbol WORKER_UTILIZATION_KEY = RubyUtil.RUBY.newSymbol("worker_utilization");
+
+    public static final RubySymbol UPTIME_IN_MILLIS_KEY = RubyUtil.RUBY.newSymbol("uptime_in_millis");
+
+    public static final RubySymbol QUEUE_PERSISTED_GROWTH_EVENTS_KEY = RubyUtil.RUBY.newSymbol("queue_persisted_growth_events");
+
+    public static final RubySymbol QUEUE_PERSISTED_GROWTH_BYTES_KEY = RubyUtil.RUBY.newSymbol("queue_persisted_growth_bytes");
+
+    public static final RubySymbol PLUGIN_THROUGHPUT_KEY = RubyUtil.RUBY.newSymbol("throughput");
+
+    public static final RubySymbol ENCODE_KEY = RubyUtil.RUBY.newSymbol("encode");
+
+    public static final RubySymbol DECODE_KEY = RubyUtil.RUBY.newSymbol("decode");
+
+    public static final RubySymbol WRITES_IN_KEY = RubyUtil.RUBY.newSymbol("writes_in");
+
 }
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/MetricType.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/MetricType.java
index 6a3e86cdc..6d813779d 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/MetricType.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/MetricType.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics;
 
 
@@ -12,6 +32,17 @@ public enum MetricType {
      * A counter backed by a {@link Long} type
      */
     COUNTER_LONG("counter/long"),
+
+    /**
+     * A counter backed by a {@link Number} type that includes decimal precision
+     */
+    COUNTER_DECIMAL("counter/decimal"),
+
+    /**
+     * A timer backed by a {@link Long} type
+     */
+    TIMER_LONG("timer/long"),
+
     /**
      * A gauge backed by a {@link String} type
      */
@@ -35,7 +66,13 @@ public enum MetricType {
     /**
      * A gauge backed by a {@link org.logstash.ext.JrubyTimestampExtLibrary.RubyTimestamp} type. Note - Java consumers should not use this, exist for legacy Ruby code.
      */
-    GAUGE_RUBYTIMESTAMP("gauge/rubytimestamp");
+    GAUGE_RUBYTIMESTAMP("gauge/rubytimestamp"),
+
+    /**
+     * A flow-rate {@link FlowMetric}, instantiated with one or more backing {@link Metric}{@code <Number>}.
+     */
+    FLOW_RATE("flow/rate"),
+    ;
 
     private final String type;
 
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/NamespacedMetricExt.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/NamespacedMetricExt.java
index 6e2a00b36..8a77b4e2f 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/NamespacedMetricExt.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/NamespacedMetricExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics;
 
 import org.jruby.Ruby;
@@ -37,11 +57,7 @@ public final class NamespacedMetricExt extends AbstractNamespacedMetricExt {
     public NamespacedMetricExt initialize(final ThreadContext context, final IRubyObject metric,
         final IRubyObject namespaceName) {
         this.metric = (MetricExt) metric;
-        if (namespaceName instanceof RubyArray) {
-            this.namespaceName = (RubyArray) namespaceName;
-        } else {
-            this.namespaceName = RubyArray.newArray(context.runtime, namespaceName);
-        }
+        this.namespaceName = normalizeNamespace(namespaceName);
         return this;
     }
 
@@ -63,6 +79,11 @@ public final class NamespacedMetricExt extends AbstractNamespacedMetricExt {
         return metric.gauge(context, namespaceName, key, value);
     }
 
+    @Override
+    protected IRubyObject getTimer(ThreadContext context, IRubyObject key) {
+        return metric.timer(context, namespaceName, key);
+    }
+
     @Override
     protected IRubyObject doIncrement(final ThreadContext context, final IRubyObject[] args) {
         if (args.length == 1) {
@@ -102,9 +123,7 @@ public final class NamespacedMetricExt extends AbstractNamespacedMetricExt {
     protected NamespacedMetricExt createNamespaced(final ThreadContext context,
         final IRubyObject name) {
         MetricExt.validateName(context, name, RubyUtil.METRIC_NO_NAMESPACE_PROVIDED_CLASS);
-        return create(this.metric, (RubyArray) namespaceName.op_plus(
-            name instanceof RubyArray ? name : RubyArray.newArray(context.runtime, name)
-        ));
+        return create(this.metric, (RubyArray) namespaceName.op_plus(normalizeNamespace(name)));
     }
 
     @Override
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/NullMetricExt.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/NullMetricExt.java
index 5a6c680f9..c004cc20b 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/NullMetricExt.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/NullMetricExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics;
 
 import org.jruby.Ruby;
@@ -11,13 +31,16 @@ import org.jruby.runtime.Block;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.logstash.RubyUtil;
+import org.logstash.instrument.metrics.timer.NullTimerMetric;
 
 @JRubyClass(name = "NullMetric")
 public final class NullMetricExt extends AbstractSimpleMetricExt {
 
     private static final long serialVersionUID = 1L;
 
-    private IRubyObject collector;
+    private static final IRubyObject NULL_TIMER_METRIC = RubyUtil.toRubyObject(NullTimerMetric.getInstance());
+
+    private transient IRubyObject collector;
 
     public static NullMetricExt create() {
         return new NullMetricExt(
@@ -63,6 +86,14 @@ public final class NullMetricExt extends AbstractSimpleMetricExt {
         return context.nil;
     }
 
+    @Override
+    protected IRubyObject getTimer(final ThreadContext context,
+                                   final IRubyObject namespace,
+                                   final IRubyObject key) {
+        MetricExt.validateKey(context, null, key);
+        return NULL_TIMER_METRIC;
+    }
+
     @Override
     protected IRubyObject doReportTime(final ThreadContext context, final IRubyObject namespace,
         final IRubyObject key, final IRubyObject duration) {
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/NullNamespacedMetricExt.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/NullNamespacedMetricExt.java
index 0a02c26c3..152541b22 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/NullNamespacedMetricExt.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/NullNamespacedMetricExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics;
 
 import org.jruby.Ruby;
@@ -39,7 +59,7 @@ public final class NullNamespacedMetricExt extends AbstractNamespacedMetricExt {
     @JRubyMethod(optional = 2)
     public NullNamespacedMetricExt initialize(final ThreadContext context,
         final IRubyObject[] args) {
-        this.metric = args.length > 0 && !args[0].isNil() ? (NullMetricExt) args[0] : new NullMetricExt(context.runtime, metaClass);
+        this.metric = args.length > 0 && !args[0].isNil() && (args[0] instanceof NullMetricExt) ? (NullMetricExt) args[0] : new NullMetricExt(context.runtime, metaClass);
         final IRubyObject namespaceName = args.length == 2 ? args[1] : NULL;
         if (namespaceName instanceof RubyArray) {
             this.namespaceName = (RubyArray) namespaceName;
@@ -65,6 +85,11 @@ public final class NullNamespacedMetricExt extends AbstractNamespacedMetricExt {
         return context.nil;
     }
 
+    @Override
+    protected IRubyObject getTimer(ThreadContext context, IRubyObject key) {
+        return this.metric.getTimer(context, namespaceName, key);
+    }
+
     @Override
     protected IRubyObject doIncrement(final ThreadContext context, final IRubyObject[] args) {
         return context.nil;
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/SimpleFlowMetric.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/SimpleFlowMetric.java
new file mode 100644
index 000000000..85a7a6d5f
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/SimpleFlowMetric.java
@@ -0,0 +1,99 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+* under the License.
+ */
+
+package org.logstash.instrument.metrics;
+
+import java.time.Duration;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.LongSupplier;
+
+/**
+ * The {@link SimpleFlowMetric} is an implementation of {@link FlowMetric} that
+ * produces only `lifetime` and a naively-calculated `current` rate using the two
+ * most-recent {@link FlowCapture}s.
+ */
+class SimpleFlowMetric extends BaseFlowMetric {
+
+    // useful capture nodes for calculation
+
+    private final AtomicReference<FlowCapture> head;
+    private final AtomicReference<FlowCapture> instant = new AtomicReference<>();
+
+    static final String CURRENT_KEY = "current";
+
+    public SimpleFlowMetric(final String name,
+                            final Metric<? extends Number> numeratorMetric,
+                            final Metric<? extends Number> denominatorMetric) {
+        this(System::nanoTime, name, numeratorMetric, denominatorMetric);
+    }
+
+    SimpleFlowMetric(final LongSupplier nanoTimeSupplier,
+                     final String name,
+                     final Metric<? extends Number> numeratorMetric,
+                     final Metric<? extends Number> denominatorMetric) {
+        super(nanoTimeSupplier, name, numeratorMetric, denominatorMetric);
+
+        this.head = new AtomicReference<>(lifetimeBaseline.orElse(null));
+    }
+
+    @Override
+    public void capture() {
+        final Optional<FlowCapture> possibleCapture = doCapture();
+        if (possibleCapture.isEmpty()) { return; }
+
+        final FlowCapture newestHead = possibleCapture.get();
+        final FlowCapture previousHead = head.getAndSet(newestHead);
+        if (Objects.nonNull(previousHead)) {
+            instant.getAndAccumulate(previousHead, (current, given) -> {
+                // keep our current value if the given one is less than ~100ms older than our newestHead
+                // this is naive and when captures happen too frequently without relief can result in
+                // our "current" window growing indefinitely, but we are shipping with a 5s cadence
+                // and shouldn't hit this edge-case in practice.
+                return (calculateCapturePeriod(newestHead, given).toMillis() > 100) ? given : current;
+            });
+        }
+    }
+
+    /**
+     * @return a map containing all available finite rates (see {@link BaseFlowMetric#calculateRate(FlowCapture,FlowCapture)})
+     */
+    @Override
+    public Map<String, Double> getValue() {
+        final FlowCapture headCapture = head.get();
+        if (Objects.isNull(headCapture)) {
+            return Map.of();
+        }
+
+        final Map<String, Double> rates = new LinkedHashMap<>();
+
+        calculateRate(headCapture, instant::get).ifPresent((rate) -> rates.put(CURRENT_KEY,  rate));
+        injectLifetime(headCapture, rates);
+
+        return Collections.unmodifiableMap(rates);
+    }
+
+    private static Duration calculateCapturePeriod(final FlowCapture current, final FlowCapture baseline) {
+        return Duration.ofNanos(Math.subtractExact(current.nanoTime(), baseline.nanoTime()));
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/SnapshotExt.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/SnapshotExt.java
index 187ae2339..0dbf52050 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/SnapshotExt.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/SnapshotExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics;
 
 import org.jruby.Ruby;
@@ -14,9 +34,9 @@ public final class SnapshotExt extends RubyBasicObject {
 
     private static final long serialVersionUID = 1L;
 
-    private IRubyObject metricStore;
+    private transient IRubyObject metricStore;
 
-    private RubyTime createdAt;
+    private transient RubyTime createdAt;
 
     public SnapshotExt(final Ruby runtime, final RubyClass metaClass) {
         super(runtime, metaClass);
@@ -28,7 +48,7 @@ public final class SnapshotExt extends RubyBasicObject {
         if (args.length == 2) {
             createdAt = (RubyTime) args[1];
         } else {
-            createdAt = RubyTime.newInstance(context, context.runtime.getTime());
+            createdAt = RubyTime.newInstance(context, context.runtime.getTime(), new IRubyObject[0]);
         }
         return this;
     }
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/UpScaledMetric.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/UpScaledMetric.java
new file mode 100644
index 000000000..b16d9c06d
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/UpScaledMetric.java
@@ -0,0 +1,51 @@
+package org.logstash.instrument.metrics;
+
+import java.math.BigDecimal;
+
+import static org.logstash.instrument.metrics.MetricType.GAUGE_NUMBER;
+
+/**
+ * A scaled metric to apply given scale at metric get value.
+ */
+public class UpScaledMetric extends AbstractMetric<BigDecimal> implements Metric<BigDecimal> {
+
+    private final Metric<? extends Number> metric;
+
+    private final BigDecimal scaleFactor;
+
+    public UpScaledMetric(final String name,
+                          final Metric<? extends Number> metric,
+                          final int scaleFactor) {
+        super(name);
+        this.metric = metric;
+        this.scaleFactor = BigDecimal.valueOf(scaleFactor);
+    }
+
+    public UpScaledMetric(final Metric<? extends Number> metric,
+                          final int scaleFactor) {
+        this(String.format("%s_x%s", metric.getName(), scaleFactor), metric, scaleFactor);
+    }
+
+    @Override
+    public MetricType getType() {
+        return GAUGE_NUMBER;
+    }
+
+    @Override
+    public BigDecimal getValue() {
+        final Number unscaledValue = this.metric.getValue();
+        final BigDecimal scaledValue = convertToBigDecimal(unscaledValue).multiply(scaleFactor);
+        return scaledValue;
+    }
+
+    private static BigDecimal convertToBigDecimal(Number number) {
+        if (number instanceof BigDecimal) { return (BigDecimal) number; }
+        if (number instanceof Integer
+                || number instanceof Long
+                || number instanceof Short
+                || number instanceof Byte) {
+            return BigDecimal.valueOf(number.longValue());
+        }
+        return BigDecimal.valueOf(number.doubleValue());
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/UptimeMetric.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/UptimeMetric.java
new file mode 100644
index 000000000..92decd223
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/UptimeMetric.java
@@ -0,0 +1,170 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.instrument.metrics;
+
+import java.math.BigDecimal;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.function.LongSupplier;
+
+/**
+ * The {@link UptimeMetric} is an auto-advancing {@link Metric} whose value
+ * represents the amount of time since instantiation. It can be made to track the
+ * advancement of the clock in one of several {@link TimeUnit}s.
+ */
+public class UptimeMetric extends AbstractMetric<Long> {
+    private final LongSupplier nanoTimeSupplier;
+    private final long startNanos;
+
+    public enum ScaleUnits {
+        NANOSECONDS(0),
+        MICROSECONDS(3),
+        MILLISECONDS(6),
+        SECONDS(9),
+        ;
+
+        private final int nanoRelativeDecimalShift;
+
+        ScaleUnits(final int nanoRelativeDecimalShift) {
+            this.nanoRelativeDecimalShift = nanoRelativeDecimalShift;
+        }
+    }
+    private final TimeUnit timeUnit;
+
+    /**
+     * Constructs an {@link UptimeMetric} whose name is "uptime_in_millis" and whose units are milliseconds
+     */
+    public UptimeMetric() {
+        this(MetricKeys.UPTIME_IN_MILLIS_KEY.asJavaString());
+    }
+
+    /**
+     * Constructs an {@link UptimeMetric} with the provided name.
+     * @param name the name of the metric, which is used by our metric store, API retrieval, etc.
+     */
+    public UptimeMetric(final String name) {
+        this(name, System::nanoTime);
+    }
+
+    UptimeMetric(final String name, final LongSupplier nanoTimeSupplier) {
+        this(name, nanoTimeSupplier, nanoTimeSupplier.getAsLong(), TimeUnit.MILLISECONDS);
+    }
+
+    private UptimeMetric(final String name, final LongSupplier nanoTimeSupplier, final long startNanos, final TimeUnit timeUnit) {
+        super(Objects.requireNonNull(name, "name"));
+        this.nanoTimeSupplier = Objects.requireNonNull(nanoTimeSupplier, "nanoTimeSupplier");
+        this.timeUnit = Objects.requireNonNull(timeUnit, "timeUnit");
+        this.startNanos = Objects.requireNonNull(startNanos, "startNanos");
+    }
+
+    /**
+     * @return the number of {@link TimeUnit}s that have elapsed
+     *         since this {@link UptimeMetric} was instantiated
+     */
+    @Override
+    public Long getValue() {
+        return this.timeUnit.convert(getElapsedNanos(), TimeUnit.NANOSECONDS);
+    }
+
+    long getElapsedNanos() {
+        return this.nanoTimeSupplier.getAsLong() - this.startNanos;
+    }
+
+    /**
+     * @return the {@link MetricType}{@code .COUNTER_LONG} associated with
+     *         long-valued metrics that only-increment, for use in Monitoring data structuring.
+     */
+    @Override
+    public MetricType getType() {
+        return MetricType.COUNTER_LONG;
+    }
+
+    /**
+     * @return the {@link TimeUnit} associated with this {@link UptimeMetric}.
+     */
+    public TimeUnit getTimeUnit() {
+        return timeUnit;
+    }
+
+    /**
+     * Constructs a _copy_ of this {@link UptimeMetric} with a new name and timeUnit, but whose
+     * uptime is tracking from the same instant as this instance.
+     *
+     * @param name the new metric's name (typically includes units)
+     * @param timeUnit the new metric's units
+     * @return a _copy_ of this {@link UptimeMetric}.
+     */
+    public UptimeMetric withTimeUnit(final String name, final TimeUnit timeUnit) {
+        return new UptimeMetric(name, this.nanoTimeSupplier, this.startNanos, timeUnit);
+    }
+
+    /**
+     * Constructs a _view_ into this {@link UptimeMetric} whose value is a decimal number
+     * containing subunit precision.
+     *
+     * @param name the name of the metric
+     * @param scaleUnits the desired scale
+     * @return a {@link BigDecimal} representing the whole-and-fractional number
+     *         of {@link ScaleUnits} that have elapsed.
+     */
+    public ScaledView withUnitsPrecise(final String name, final ScaleUnits scaleUnits) {
+        return new ScaledView(name, this::getElapsedNanos, scaleUnits.nanoRelativeDecimalShift);
+    }
+
+    /**
+     * {@code name} defaults to something vaguely descriptive.
+     * Useful when the caller doesn't need the metric name.
+     *
+     * @see UptimeMetric#withUnitsPrecise(String, ScaleUnits)
+     */
+    public ScaledView withUnitsPrecise(final ScaleUnits scaleUnits) {
+        final String name = String.format("%s_scaled_to_%s", getName(), scaleUnits.name());
+        return this.withUnitsPrecise(name, scaleUnits);
+    }
+
+    static class ScaledView implements Metric<Number> {
+        private final String name;
+        private final int nanoRelativeDecimalShift;
+        private final LongSupplier elapsedNanosSupplier;
+
+        ScaledView(final String name,
+                   final LongSupplier elapsedNanosSupplier,
+                   final int nanoRelativeDecimalShift) {
+            this.name = name;
+            this.nanoRelativeDecimalShift = nanoRelativeDecimalShift;
+            this.elapsedNanosSupplier = elapsedNanosSupplier;
+        }
+
+        @Override
+        public String getName() {
+            return this.name;
+        }
+
+        @Override
+        public MetricType getType() {
+            return MetricType.COUNTER_DECIMAL;
+        }
+
+        @Override
+        public BigDecimal getValue() {
+            return BigDecimal.valueOf(elapsedNanosSupplier.getAsLong(), nanoRelativeDecimalShift);
+        }
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/counter/CounterMetric.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/counter/CounterMetric.java
index 1e0bc4a6d..ec792bb31 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/counter/CounterMetric.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/counter/CounterMetric.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics.counter;
 
 import org.logstash.instrument.metrics.Metric;
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/counter/LongCounter.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/counter/LongCounter.java
index 76814b768..49f4eb980 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/counter/LongCounter.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/counter/LongCounter.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics.counter;
 
 import java.util.concurrent.atomic.LongAdder;
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/AbstractGaugeMetric.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/AbstractGaugeMetric.java
index 3c37e9ae7..7a5280a6a 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/AbstractGaugeMetric.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/AbstractGaugeMetric.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics.gauge;
 
 import org.logstash.instrument.metrics.AbstractMetric;
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/BooleanGauge.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/BooleanGauge.java
index dc17ab205..bbf399dd4 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/BooleanGauge.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/BooleanGauge.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics.gauge;
 
 import org.logstash.instrument.metrics.MetricType;
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/GaugeMetric.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/GaugeMetric.java
index 2d7d39db9..d58c03416 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/GaugeMetric.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/GaugeMetric.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics.gauge;
 
 
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/LazyDelegatingGauge.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/LazyDelegatingGauge.java
index 843d2f5c1..0afaea618 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/LazyDelegatingGauge.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/LazyDelegatingGauge.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics.gauge;
 
 import org.apache.logging.log4j.LogManager;
@@ -7,6 +27,8 @@ import org.logstash.ext.JrubyTimestampExtLibrary.RubyTimestamp;
 import org.logstash.instrument.metrics.AbstractMetric;
 import org.logstash.instrument.metrics.MetricType;
 
+import java.util.Optional;
+
 /**
  * A lazy proxy to a more specific typed {@link GaugeMetric}. The metric will only be initialized if the initial value is set, or once the {@code set} operation is called.
  * <p><strong>Intended only for use with Ruby's duck typing, Java consumers should use the specific typed {@link GaugeMetric}</strong></p>
@@ -51,6 +73,11 @@ public class LazyDelegatingGauge extends AbstractMetric<Object> implements Gauge
         return lazyMetric == null ? null : lazyMetric.get();
     }
 
+    @SuppressWarnings("rawtypes")
+    public Optional getMetric() {
+        return Optional.ofNullable(lazyMetric);
+    }
+
     @Override
     public MetricType getType() {
         return lazyMetric == null ? null : lazyMetric.getType();
@@ -91,7 +118,7 @@ public class LazyDelegatingGauge extends AbstractMetric<Object> implements Gauge
             } else if (value instanceof RubyTimestamp) {
                 lazyMetric = new RubyTimeStampGauge(key, (RubyTimestamp) value);
             } else {
-                LOGGER.warn("A gauge metric of an unknown type ({}) has been create for key: {}. This may result in invalid serialization.  It is recommended to " +
+                LOGGER.warn("A gauge metric of an unknown type ({}) has been created for key: {}. This may result in invalid serialization.  It is recommended to " +
                         "log an issue to the responsible developer/development team.", value.getClass().getCanonicalName(), key);
                 lazyMetric = new UnknownGauge(key, value);
             }
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/NumberGauge.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/NumberGauge.java
index 143947f20..d5d455415 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/NumberGauge.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/NumberGauge.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics.gauge;
 
 import org.logstash.instrument.metrics.MetricType;
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/RubyHashGauge.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/RubyHashGauge.java
index a93260c0a..3c7e94637 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/RubyHashGauge.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/RubyHashGauge.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics.gauge;
 
 import org.jruby.RubyHash;
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/RubyTimeStampGauge.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/RubyTimeStampGauge.java
index 1a7ed83b8..c6cd0d3ee 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/RubyTimeStampGauge.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/RubyTimeStampGauge.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics.gauge;
 
 import org.logstash.Timestamp;
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/TextGauge.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/TextGauge.java
index 5fcfc7578..c1086f178 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/TextGauge.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/TextGauge.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics.gauge;
 
 
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/UnknownGauge.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/UnknownGauge.java
index 2f5f980c9..3b4a70627 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/UnknownGauge.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/gauge/UnknownGauge.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics.gauge;
 
 import org.logstash.instrument.metrics.MetricType;
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/timer/ConcurrentLiveTimerMetric.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/timer/ConcurrentLiveTimerMetric.java
new file mode 100644
index 000000000..4adbef05a
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/timer/ConcurrentLiveTimerMetric.java
@@ -0,0 +1,176 @@
+package org.logstash.instrument.metrics.timer;
+
+import org.logstash.instrument.metrics.AbstractMetric;
+
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.atomic.LongAdder;
+import java.util.function.LongSupplier;
+
+import static org.logstash.instrument.metrics.timer.Util.subMilliExcessNanos;
+import static org.logstash.instrument.metrics.timer.Util.wholeMillisFromNanos;
+
+/**
+ * This {@code ConcurrentLiveTimerMetric} tracks live concurrent execution.
+ * It is concurrency-safe and lock-free.
+ *
+ * <p>It works by keeping track of a {@code TrackedMillisState}, which contains
+ * a timestamped checkpoint since which concurrency has been constant. From this
+ * checkpoint the cumulative concurrently-elapsed time can be calculated.
+ *
+ * <p>When concurrency increases or decreases, the checkpoint is atomically replaced.
+ *
+ * <p>It separately records untracked millis.</p>
+ */
+public class ConcurrentLiveTimerMetric extends AbstractMetric<Long> implements TimerMetric {
+
+    private final LongAdder untrackedMillis = new LongAdder();
+
+    private final AtomicReference<TrackedMillisState> trackedMillisState;
+
+    private final LongSupplier nanoTimeSupplier;
+
+    protected ConcurrentLiveTimerMetric(final String name) {
+        this(name, System::nanoTime);
+    }
+
+    ConcurrentLiveTimerMetric(final String name, final LongSupplier nanoTimeSupplier) {
+        super(name);
+        this.nanoTimeSupplier = Objects.requireNonNullElse(nanoTimeSupplier, System::nanoTime);
+        this.trackedMillisState = new AtomicReference<>(new StaticTrackedMillisState());
+    }
+
+    @Override
+    public <T, E extends Throwable> T time(ExceptionalSupplier<T, E> exceptionalSupplier) throws E {
+        try {
+            trackedMillisState.getAndUpdate(TrackedMillisState::withIncrementedConcurrency);
+            return exceptionalSupplier.get();
+        } finally {
+            trackedMillisState.getAndUpdate(TrackedMillisState::withDecrementedConcurrency);
+        }
+    }
+
+    @Override
+    public void reportUntrackedMillis(final long untrackedMillis) {
+        this.untrackedMillis.add(untrackedMillis);
+    }
+
+    @Override
+    public Long getValue() {
+        return Math.addExact(getUntrackedMillis(), getTrackedMillis());
+    }
+
+    private long getUntrackedMillis() {
+        return this.untrackedMillis.longValue();
+    }
+
+    private long getTrackedMillis() {
+        return this.trackedMillisState.getAcquire().getValue();
+    }
+
+    interface TrackedMillisState {
+        TrackedMillisState withIncrementedConcurrency();
+        TrackedMillisState withDecrementedConcurrency();
+        long getValue();
+    }
+
+    private class StaticTrackedMillisState implements TrackedMillisState {
+        private final long cumulativeMillis;
+        private final int excessNanos;
+
+        StaticTrackedMillisState(final long cumulativeMillis,
+                                 final int excessNanos) {
+            this.cumulativeMillis = cumulativeMillis;
+            this.excessNanos = excessNanos;
+        }
+
+        public StaticTrackedMillisState() {
+            this(0L, 0);
+        }
+
+        @Override
+        public TrackedMillisState withIncrementedConcurrency() {
+            return new DynamicTrackedMillisState(nanoTimeSupplier.getAsLong(), this.cumulativeMillis, this.excessNanos, 1);
+        }
+
+        @Override
+        public TrackedMillisState withDecrementedConcurrency() {
+            throw new IllegalStateException("TimerMetrics cannot track negative concurrency");
+        }
+
+
+        @Override
+        public long getValue() {
+            return cumulativeMillis;
+        }
+    }
+
+    private class DynamicTrackedMillisState implements TrackedMillisState {
+        private final long checkpointNanoTime;
+        private final long millisAtCheckpoint;
+        private final int excessNanosAtCheckpoint;
+        private final int concurrencySinceCheckpoint;
+
+        DynamicTrackedMillisState(long checkpointNanoTime,
+                                  long millisAtCheckpoint,
+                                  int excessNanosAtCheckpoint,
+                                  int concurrencySinceCheckpoint) {
+            this.checkpointNanoTime = checkpointNanoTime;
+            this.millisAtCheckpoint = millisAtCheckpoint;
+            this.excessNanosAtCheckpoint = excessNanosAtCheckpoint;
+            this.concurrencySinceCheckpoint = concurrencySinceCheckpoint;
+        }
+
+        @Override
+        public TrackedMillisState withIncrementedConcurrency() {
+            return withAdjustedConcurrency(Vector.INCREMENT);
+        }
+
+        @Override
+        public TrackedMillisState withDecrementedConcurrency() {
+            return withAdjustedConcurrency(Vector.DECREMENT);
+        }
+
+        @Override
+        public long getValue() {
+            final long nanoAdjustment = getNanoAdjustment(nanoTimeSupplier.getAsLong());
+            final long milliAdjustment = wholeMillisFromNanos(nanoAdjustment);
+
+            return Math.addExact(this.millisAtCheckpoint, milliAdjustment);
+        }
+
+        private TrackedMillisState withAdjustedConcurrency(final Vector concurrencyAdjustmentVector) {
+            final int newConcurrency = Math.addExact(this.concurrencySinceCheckpoint, concurrencyAdjustmentVector.value());
+            final long newCheckpointNanoTime = nanoTimeSupplier.getAsLong();
+
+            final long totalNanoAdjustment = getNanoAdjustment(newCheckpointNanoTime);
+
+            final long newCheckpointMillis = Math.addExact(this.millisAtCheckpoint, wholeMillisFromNanos(totalNanoAdjustment));
+            final int newCheckpointExcessNanos = subMilliExcessNanos(totalNanoAdjustment);
+
+            if (newConcurrency <= 0) {
+                return new StaticTrackedMillisState(newCheckpointMillis, newCheckpointExcessNanos);
+            } else {
+                return new DynamicTrackedMillisState(newCheckpointNanoTime, newCheckpointMillis, newCheckpointExcessNanos, newConcurrency);
+            }
+        }
+
+        private long getNanoAdjustment(final long checkpointNanoTime) {
+            final long deltaNanoTime = Math.subtractExact(checkpointNanoTime, this.checkpointNanoTime);
+            final long calculatedNanoAdjustment = Math.multiplyExact(deltaNanoTime, this.concurrencySinceCheckpoint);
+
+            return Math.addExact(calculatedNanoAdjustment, this.excessNanosAtCheckpoint);
+        }
+    }
+
+    /**
+     * This private enum is a type-safety guard for
+     * {@link DynamicTrackedMillisState#withAdjustedConcurrency(Vector)}.
+     */
+    private enum Vector {
+        INCREMENT{ int value() { return +1; } },
+        DECREMENT{ int value() { return -1; } };
+
+        abstract int value();
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/timer/NullTimerMetric.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/timer/NullTimerMetric.java
new file mode 100644
index 000000000..625299305
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/timer/NullTimerMetric.java
@@ -0,0 +1,34 @@
+package org.logstash.instrument.metrics.timer;
+
+/**
+ * This {@code NullTimerMetric} is adheres to our internal {@link TimerMetric}
+ * interface, but does not keep track of execution time. It is used as a stand-in
+ * when metrics are disabled.
+ */
+public class NullTimerMetric implements TimerMetric {
+    private static final TimerMetric INSTANCE = new NullTimerMetric();
+
+    public static TimerMetric getInstance() { return INSTANCE; }
+
+    private NullTimerMetric() { }
+
+    @Override
+    public <T, E extends Throwable> T time(ExceptionalSupplier<T, E> exceptionalSupplier) throws E {
+        return exceptionalSupplier.get();
+    }
+
+    @Override
+    public void reportUntrackedMillis(long untrackedMillis) {
+        // no-op
+    }
+
+    @Override
+    public String getName() {
+        return "NULL";
+    }
+
+    @Override
+    public Long getValue() {
+        return 0L;
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/timer/TimerMetric.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/timer/TimerMetric.java
new file mode 100644
index 000000000..ba6ab5368
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/timer/TimerMetric.java
@@ -0,0 +1,40 @@
+package org.logstash.instrument.metrics.timer;
+
+import org.jruby.RubySymbol;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.logstash.RubyUtil;
+import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
+import org.logstash.instrument.metrics.Metric;
+import org.logstash.instrument.metrics.MetricType;
+
+/**
+ * The {@code TimerMetric} is a logstash-internal extension of its public
+ * {@link co.elastic.logstash.api.TimerMetric} counterpart that provides read-
+ * and introspection-access via {@code Metric<Long>}.
+ */
+public interface TimerMetric extends co.elastic.logstash.api.TimerMetric, Metric<Long> {
+    Long getValue();
+
+    @Override
+    default MetricType getType() {
+        return MetricType.TIMER_LONG;
+    }
+
+    static TimerMetric create(final String name) {
+        return TimerMetricFactory.INSTANCE.create(name);
+    }
+
+    static TimerMetric fromRubyBase(final AbstractNamespacedMetricExt metric,
+                                    final RubySymbol key) {
+        final ThreadContext context = RubyUtil.RUBY.getCurrentContext();
+        final IRubyObject timer = metric.timer(context, key);
+        final TimerMetric javaTimer;
+        if (TimerMetric.class.isAssignableFrom(timer.getJavaClass())) {
+            javaTimer = timer.toJava(TimerMetric.class);
+        } else {
+            javaTimer = NullTimerMetric.getInstance();
+        }
+        return javaTimer;
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/timer/TimerMetricFactory.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/timer/TimerMetricFactory.java
new file mode 100644
index 000000000..d2cb39be9
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/timer/TimerMetricFactory.java
@@ -0,0 +1,18 @@
+package org.logstash.instrument.metrics.timer;
+
+import java.util.function.LongSupplier;
+
+public class TimerMetricFactory {
+    static final TimerMetricFactory INSTANCE = new TimerMetricFactory();
+
+    private TimerMetricFactory() {
+    }
+
+    public TimerMetric create(final String name) {
+        return create(name, System::nanoTime);
+    }
+
+    TimerMetric create(final String name, final LongSupplier nanoTimeSupplier) {
+        return new ConcurrentLiveTimerMetric(name, nanoTimeSupplier);
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/instrument/metrics/timer/Util.java b/logstash-core/src/main/java/org/logstash/instrument/metrics/timer/Util.java
new file mode 100644
index 000000000..c476b055d
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/instrument/metrics/timer/Util.java
@@ -0,0 +1,15 @@
+package org.logstash.instrument.metrics.timer;
+
+public class Util {
+    private Util() {}
+
+    private static final long NANOS_PER_MILLI = 1_000_000L;
+
+    static long wholeMillisFromNanos(final long excessNanos) {
+        return Math.floorDiv(excessNanos, NANOS_PER_MILLI);
+    }
+
+    static int subMilliExcessNanos(final long excessNanos) {
+        return Math.toIntExact(Math.floorMod(excessNanos, NANOS_PER_MILLI));
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/instrument/monitors/HotThreadsMonitor.java b/logstash-core/src/main/java/org/logstash/instrument/monitors/HotThreadsMonitor.java
index 1134d62e9..e16aed00d 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/monitors/HotThreadsMonitor.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/monitors/HotThreadsMonitor.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.monitors;
 
 import java.lang.management.ManagementFactory;
@@ -125,6 +145,7 @@ public final class HotThreadsMonitor {
      *                      stacktrace_size - max depth of stack trace
      * @return A list of ThreadReport including all selected threads
      */
+    @SuppressWarnings("deprecation")
     public static List<ThreadReport> detect(Map<String, String> options) {
         String type = "cpu";
         if (options.containsKey(ORDERED_BY)) {
@@ -133,7 +154,7 @@ public final class HotThreadsMonitor {
                 throw new IllegalArgumentException("Invalid sort order");
         }
 
-        Integer threadInfoMaxDepth = 3;
+        Integer threadInfoMaxDepth = 50;
         if (options.containsKey(STACKTRACE_SIZE)) {
             threadInfoMaxDepth = Integer.valueOf(options.get(STACKTRACE_SIZE));
         }
@@ -144,6 +165,7 @@ public final class HotThreadsMonitor {
         Map<Long, ThreadReport> reports = new HashMap<>();
 
         for (long threadId : threadMXBean.getAllThreadIds()) {
+            // JTODO getId has been deprecated in JDK 19, when JDK 21 is the target version use threadId() instead
             if (Thread.currentThread().getId() == threadId) {
                 continue;
             }
diff --git a/logstash-core/src/main/java/org/logstash/instrument/monitors/MemoryMonitor.java b/logstash-core/src/main/java/org/logstash/instrument/monitors/MemoryMonitor.java
index d44e56f8f..6629c6e6a 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/monitors/MemoryMonitor.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/monitors/MemoryMonitor.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.monitors;
 
 import java.lang.management.ManagementFactory;
diff --git a/logstash-core/src/main/java/org/logstash/instrument/monitors/ProcessMonitor.java b/logstash-core/src/main/java/org/logstash/instrument/monitors/ProcessMonitor.java
index e7de05f46..2580ac2f3 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/monitors/ProcessMonitor.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/monitors/ProcessMonitor.java
@@ -1,16 +1,42 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.monitors;
 
 import com.sun.management.UnixOperatingSystemMXBean;
 import java.lang.management.ManagementFactory;
 import java.lang.management.OperatingSystemMXBean;
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import javax.management.MBeanServer;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.logstash.JavaVersionUtils;
 
 public class ProcessMonitor {
+
     private static final OperatingSystemMXBean osMxBean = ManagementFactory.getOperatingSystemMXBean();
-    private static final MBeanServer platformMxBean = ManagementFactory.getPlatformMBeanServer();
+    private static final Method CPU_LOAD_METHOD = getCpuLoadMethod();
+    private static final Logger LOGGER = LogManager.getLogger(ProcessMonitor.class);
 
     public static class Report {
         private long memTotalVirtualInBytes = -1;
@@ -27,7 +53,7 @@ public class ProcessMonitor {
             this.isUnix = osMxBean instanceof UnixOperatingSystemMXBean;
             // Defaults are -1
             if (this.isUnix) {
-                UnixOperatingSystemMXBean unixOsBean = (UnixOperatingSystemMXBean) osMxBean;;
+                UnixOperatingSystemMXBean unixOsBean = (UnixOperatingSystemMXBean) osMxBean;
 
                 this.openFds = unixOsBean.getOpenFileDescriptorCount();
                 this.maxFds =  unixOsBean.getMaxFileDescriptorCount();
@@ -35,9 +61,19 @@ public class ProcessMonitor {
                     unixOsBean.getProcessCpuTime(), TimeUnit.NANOSECONDS
                 );
                 this.cpuProcessPercent = scaleLoadToPercent(unixOsBean.getProcessCpuLoad());
-                this.cpuSystemPercent = scaleLoadToPercent(unixOsBean.getSystemCpuLoad());
+                this.cpuSystemPercent = getSystemCpuLoad(unixOsBean);
 
                 this.memTotalVirtualInBytes = unixOsBean.getCommittedVirtualMemorySize();
+            } else {
+                com.sun.management.OperatingSystemMXBean otherOsBean = (com.sun.management.OperatingSystemMXBean) osMxBean;
+
+                this.cpuMillisTotal = TimeUnit.MILLISECONDS.convert(
+                        otherOsBean.getProcessCpuTime(), TimeUnit.NANOSECONDS
+                );
+                this.cpuProcessPercent = scaleLoadToPercent(otherOsBean.getProcessCpuLoad());
+                this.cpuSystemPercent = getSystemCpuLoad(otherOsBean);
+
+                this.memTotalVirtualInBytes = otherOsBean.getCommittedVirtualMemorySize();
             }
         }
 
@@ -60,16 +96,40 @@ public class ProcessMonitor {
         }
 
         private static short scaleLoadToPercent(double load) {
-            if (osMxBean instanceof UnixOperatingSystemMXBean) {
-                if (load >= 0) {
-                    return (short) (load * 100);
-                } else {
-                    return -1;
-                }
+            if (load >= 0) {
+                return (short) (load * 100);
             } else {
                 return -1;
             }
         }
+
+        // The method `getSystemCpuLoad` is deprecated in favour of `getCpuLoad` since JDK14
+        // This method uses reflection to use the correct method depending on the version of
+        // the JDK being used.
+        private short getSystemCpuLoad(OperatingSystemMXBean mxBeanInstance) {
+            if (CPU_LOAD_METHOD == null){
+                return -1;
+            }
+            try {
+                return scaleLoadToPercent((double) CPU_LOAD_METHOD.invoke(mxBeanInstance));
+            } catch (Exception e){
+                return -1;
+            }
+        }
+    }
+
+    /**
+     * Retrieve the correct name of the method to get CPU load.
+     * @return Method if the method could be found, null otherwise
+     */
+    private static Method getCpuLoadMethod(){
+        try{
+            String methodName = (JavaVersionUtils.isJavaAtLeast(14)) ? "getCpuLoad" : "getSystemCpuLoad";
+            return Class.forName("com.sun.management.OperatingSystemMXBean").getMethod(methodName);
+        } catch (ReflectiveOperationException e){
+            LOGGER.warn("OperatingSystemMXBean CPU load method not available, CPU load will not be measured", e);
+            return null;
+        }
     }
 
     public static Report detect() {
diff --git a/logstash-core/src/main/java/org/logstash/instrument/monitors/SystemMonitor.java b/logstash-core/src/main/java/org/logstash/instrument/monitors/SystemMonitor.java
index 209e94de7..65f9ebac2 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/monitors/SystemMonitor.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/monitors/SystemMonitor.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.monitors;
 
 import java.lang.management.ManagementFactory;
diff --git a/logstash-core/src/main/java/org/logstash/instrument/reports/MemoryReport.java b/logstash-core/src/main/java/org/logstash/instrument/reports/MemoryReport.java
index fc267693c..83713a4d7 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/reports/MemoryReport.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/reports/MemoryReport.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.reports;
 
 import org.logstash.instrument.monitors.MemoryMonitor;
@@ -28,4 +48,3 @@ public class MemoryReport {
         return MemoryMonitor.detect(type);
     }
 }
-
diff --git a/logstash-core/src/main/java/org/logstash/instrument/reports/ProcessReport.java b/logstash-core/src/main/java/org/logstash/instrument/reports/ProcessReport.java
index 5b747adb0..9ea2917e9 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/reports/ProcessReport.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/reports/ProcessReport.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.reports;
 
 import org.logstash.instrument.monitors.ProcessMonitor;
diff --git a/logstash-core/src/main/java/org/logstash/instrument/reports/ThreadsReport.java b/logstash-core/src/main/java/org/logstash/instrument/reports/ThreadsReport.java
index b76222707..b570440fe 100644
--- a/logstash-core/src/main/java/org/logstash/instrument/reports/ThreadsReport.java
+++ b/logstash-core/src/main/java/org/logstash/instrument/reports/ThreadsReport.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.reports;
 
 import org.logstash.instrument.monitors.HotThreadsMonitor;
@@ -39,4 +59,3 @@ public class ThreadsReport {
         return generate(options);
     }
 }
-
diff --git a/logstash-core/src/main/java/org/logstash/jackson/StreamReadConstraintsUtil.java b/logstash-core/src/main/java/org/logstash/jackson/StreamReadConstraintsUtil.java
new file mode 100644
index 000000000..9c0e33285
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/jackson/StreamReadConstraintsUtil.java
@@ -0,0 +1,165 @@
+package org.logstash.jackson;
+
+import com.fasterxml.jackson.core.StreamReadConstraints;
+import com.google.common.collect.Sets;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.stream.Collectors;
+
+public class StreamReadConstraintsUtil {
+
+    private final Map<String,String> propertyOverrides;
+    private final Logger logger;
+
+    private StreamReadConstraints configuredStreamReadConstraints;
+
+    enum Override {
+        MAX_STRING_LENGTH(200_000_000, StreamReadConstraints.Builder::maxStringLength, StreamReadConstraints::getMaxStringLength),
+        MAX_NUMBER_LENGTH(10_000, StreamReadConstraints.Builder::maxNumberLength, StreamReadConstraints::getMaxNumberLength),
+        MAX_NESTING_DEPTH(1_000, StreamReadConstraints.Builder::maxNestingDepth, StreamReadConstraints::getMaxNestingDepth),
+        ;
+
+        static final String PROP_PREFIX = "logstash.jackson.stream-read-constraints.";
+
+        final String propertyName;
+        final int defaultValue;
+        private final IntValueApplicator applicator;
+        private final IntValueObserver observer;
+
+        Override(final int defaultValue,
+                 final IntValueApplicator applicator,
+                 final IntValueObserver observer) {
+            this.propertyName = PROP_PREFIX + this.name().toLowerCase().replace('_', '-');
+            this.defaultValue = defaultValue;
+            this.applicator = applicator;
+            this.observer = observer;
+        }
+
+        int resolve(final Integer specifiedValue) {
+            return Objects.requireNonNullElse(specifiedValue, defaultValue);
+        }
+
+        void apply(final StreamReadConstraints.Builder constraintsBuilder,
+                   @Nullable final Integer specifiedValue) {
+            this.applicator.applyIntValue(constraintsBuilder, resolve(specifiedValue));
+        }
+
+        int observe(final StreamReadConstraints constraints) {
+            return this.observer.observeIntValue(constraints);
+        }
+
+        @FunctionalInterface
+        interface IntValueObserver {
+            int observeIntValue(final StreamReadConstraints constraints);
+        }
+
+        @FunctionalInterface
+        interface IntValueApplicator {
+            @SuppressWarnings("UnusedReturnValue")
+            StreamReadConstraints.Builder applyIntValue(final StreamReadConstraints.Builder constraintsBuilder, final int value);
+        }
+    }
+
+    /**
+     * @return an instance configured by {@code System.getProperties()}
+     */
+    public static StreamReadConstraintsUtil fromSystemProperties() {
+        return new StreamReadConstraintsUtil(System.getProperties());
+    }
+
+    StreamReadConstraintsUtil(final Properties properties) {
+        this(properties, null);
+    }
+
+    StreamReadConstraintsUtil(final Properties properties,
+                              final Logger logger) {
+        this(extractProperties(properties), logger);
+    }
+
+    static private Map<String,String> extractProperties(final Properties properties) {
+        return properties.stringPropertyNames().stream()
+                .filter(propName -> propName.startsWith(Override.PROP_PREFIX))
+                .map(propName -> Map.entry(propName, properties.getProperty(propName)))
+                .filter(entry -> entry.getValue() != null)
+                .collect(Collectors.toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue));
+    }
+
+    private StreamReadConstraintsUtil(final Map<String,String> propertyOverrides,
+                              final Logger logger) {
+        this.propertyOverrides = Map.copyOf(propertyOverrides);
+        this.logger = Objects.requireNonNullElseGet(logger, () -> LogManager.getLogger(StreamReadConstraintsUtil.class));
+    }
+
+    StreamReadConstraints get() {
+        if (configuredStreamReadConstraints == null) {
+            final StreamReadConstraints.Builder builder = StreamReadConstraints.defaults().rebuild();
+
+            eachOverride((override, specifiedValue) -> override.apply(builder, specifiedValue));
+
+            this.configuredStreamReadConstraints = builder.build();
+        }
+        return configuredStreamReadConstraints;
+    }
+
+    public void applyAsGlobalDefault() {
+        StreamReadConstraints.overrideDefaultStreamReadConstraints(get());
+    }
+
+    public void validateIsGlobalDefault() {
+        validate(StreamReadConstraints.defaults());
+    }
+
+    public void validate(final StreamReadConstraints streamReadConstraints) {
+        final List<String> fatalIssues = new ArrayList<>();
+        eachOverride((override, specifiedValue) -> {
+            final int effectiveValue = override.observe(streamReadConstraints);
+            final int expectedValue = override.resolve(specifiedValue);
+
+            if (!Objects.equals(effectiveValue, expectedValue)) {
+                fatalIssues.add(String.format("`%s` (expected: `%s`, actual: `%s`)", override.propertyName, expectedValue, effectiveValue));
+            } else {
+                final String reason = Objects.nonNull(specifiedValue) ? "system properties" : "logstash default";
+                logger.info("Jackson default value override `{}` configured to `{}` ({})", override.propertyName, effectiveValue, reason);
+            }
+        });
+        for (String unsupportedProperty : getUnsupportedProperties()) {
+            logger.warn("Jackson default value override `{}` is unknown and has been ignored", unsupportedProperty);
+        }
+        if (!fatalIssues.isEmpty()) {
+            throw new IllegalStateException(String.format("Jackson default values not applied: %s", String.join(",", fatalIssues)));
+        }
+    }
+
+    void eachOverride(BiConsumer<Override,Integer> overrideIntegerBiConsumer) {
+        for (Override override : Override.values()) {
+            final String propValue = this.propertyOverrides.get(override.propertyName);
+
+            try {
+                final Integer explicitValue = Optional.ofNullable(propValue)
+                        .map(Integer::parseInt)
+                        .orElse(null);
+                overrideIntegerBiConsumer.accept(override, explicitValue);
+            } catch (IllegalArgumentException e) {
+                throw new IllegalArgumentException(String.format("System property `%s` must be positive integer value. Received: `%s`", override.propertyName, propValue), e);
+            }
+        }
+    }
+
+    Set<String> getUnsupportedProperties() {
+        Set<String> supportedProps = Arrays.stream(Override.values()).map(p -> p.propertyName).collect(Collectors.toSet());
+        Set<String> providedProps = this.propertyOverrides.keySet();
+
+        return Sets.difference(providedProps, supportedProps);
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/log/CustomLogEvent.java b/logstash-core/src/main/java/org/logstash/log/CustomLogEvent.java
index 01a444542..6de6a9671 100644
--- a/logstash-core/src/main/java/org/logstash/log/CustomLogEvent.java
+++ b/logstash-core/src/main/java/org/logstash/log/CustomLogEvent.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -28,6 +48,9 @@ import org.apache.logging.log4j.message.Message;
 
 import java.util.List;
 
+/**
+ * Customized Logstash log event
+ * */
 @JsonSerialize(using = CustomLogEventSerializer.class)
 public class CustomLogEvent extends Log4jLogEvent {
 
diff --git a/logstash-core/src/main/java/org/logstash/log/CustomLogEventSerializer.java b/logstash-core/src/main/java/org/logstash/log/CustomLogEventSerializer.java
index 6432394d9..8d91429b6 100644
--- a/logstash-core/src/main/java/org/logstash/log/CustomLogEventSerializer.java
+++ b/logstash-core/src/main/java/org/logstash/log/CustomLogEventSerializer.java
@@ -1,14 +1,46 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.log;
 
 import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.io.SegmentedStringWriter;
+import com.fasterxml.jackson.core.util.BufferRecycler;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
-
+import com.google.common.primitives.Primitives;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import java.io.IOException;
 import java.util.Map;
 
+import static org.logstash.ObjectMappers.LOG4J_JSON_MAPPER;
+
+/**
+ * Json serializer for logging messages, use in json appender.
+ */
 public class CustomLogEventSerializer extends JsonSerializer<CustomLogEvent> {
+
+    private static final Logger LOGGER = LogManager.getLogger(CustomLogEventSerializer.class);
+
     @Override
     public void serialize(CustomLogEvent event, JsonGenerator generator, SerializerProvider provider) throws IOException {
         generator.writeStartObject();
@@ -18,20 +50,9 @@ public class CustomLogEventSerializer extends JsonSerializer<CustomLogEvent> {
         generator.writeObjectField("thread", event.getThreadName());
         generator.writeFieldName("logEvent");
         generator.writeStartObject();
-        if (event.getMessage() instanceof StructuredMessage) {
-            StructuredMessage message = (StructuredMessage) event.getMessage();
-            generator.writeStringField("message", message.getMessage());
-            if (message.getParams() != null) {
-                for (Map.Entry<Object, Object> entry : message.getParams().entrySet()) {
-                    Object value = entry.getValue();
-                    try {
-                        generator.writeObjectField(entry.getKey().toString(), value);
-                    } catch (JsonMappingException e) {
-                        generator.writeObjectField(entry.getKey().toString(), value.toString());
-                    }
-                }
-            }
 
+        if (event.getMessage() instanceof StructuredMessage) {
+            writeStructuredMessage((StructuredMessage) event.getMessage(), generator);
         } else {
             generator.writeStringField("message", event.getMessage().getFormattedMessage());
         }
@@ -40,9 +61,60 @@ public class CustomLogEventSerializer extends JsonSerializer<CustomLogEvent> {
         generator.writeEndObject();
     }
 
+    private void writeStructuredMessage(StructuredMessage message, JsonGenerator generator) throws IOException {
+        generator.writeStringField("message", message.getMessage());
+
+        if (message.getParams() == null || message.getParams().isEmpty()) {
+            return;
+        }
+
+        for (final Map.Entry<Object, Object> entry : message.getParams().entrySet()) {
+            // Given that message params is a map and the generator just started a new object, containing
+            // only one 'message' field, it could clash only on this field; fixit post-fixing it with '_1'
+            final String paramName = renameParamNameIfClashingWithMessage(entry);
+            final Object paramValue = entry.getValue();
+
+            try {
+                if (isValueSafeToWrite(paramValue)) {
+                    generator.writeObjectField(paramName, paramValue);
+                    continue;
+                }
+
+                // Create a new Jackson's generator for each entry, that way, the main generator is not compromised/invalidated
+                // in case any key/value fails to write. It also uses the JSON_LOGGER_MAPPER instead of the default Log4's one,
+                // leveraging all necessary custom Ruby serializers.
+                try (final SegmentedStringWriter entryJsonWriter = new SegmentedStringWriter(new BufferRecycler());
+                     final JsonGenerator entryGenerator = LOG4J_JSON_MAPPER.getFactory().createGenerator(entryJsonWriter)) {
+                    entryGenerator.writeObject(paramValue);
+                    generator.writeFieldName(paramName);
+                    generator.writeRawValue(entryJsonWriter.getAndClear());
+                }
+            } catch (JsonMappingException e) {
+                LOGGER.debug("Failed to serialize message param type {}", paramValue.getClass(), e);
+                generator.writeObjectField(paramName, paramValue.toString());
+            }
+        }
+    }
+
+    private static String renameParamNameIfClashingWithMessage(Map.Entry<Object, Object> entry) {
+        final String paramName = entry.getKey().toString();
+        if ("message".equals(paramName)) {
+            if ("true".equalsIgnoreCase(System.getProperty("ls.log.format.json.fix_duplicate_message_fields"))) {
+                return "message_1";
+            }
+        }
+        return paramName;
+    }
+
+    private boolean isValueSafeToWrite(Object value) {
+        return value == null ||
+               value instanceof String ||
+               value.getClass().isPrimitive() ||
+               Primitives.isWrapperType(value.getClass());
+    }
+
     @Override
     public Class<CustomLogEvent> handledType() {
-
         return CustomLogEvent.class;
     }
 }
diff --git a/logstash-core/src/main/java/org/logstash/log/DefaultDeprecationLogger.java b/logstash-core/src/main/java/org/logstash/log/DefaultDeprecationLogger.java
new file mode 100644
index 000000000..9564316a0
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/log/DefaultDeprecationLogger.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.log;
+
+import co.elastic.logstash.api.DeprecationLogger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+/**
+ * Logger used to output deprecation warnings. It handles specific log4j loggers
+ *
+ * Inspired by ElasticSearch's org.elasticsearch.common.logging.DeprecationLogger
+ * */
+public class DefaultDeprecationLogger implements DeprecationLogger {
+
+    private final Logger logger;
+
+    /**
+     * Creates a new deprecation logger based on the parent logger. Automatically
+     * prefixes the logger name with "deprecation", if it starts with "org.logstash.",
+     * it replaces "org.logstash" with "org.logstash.deprecation" to maintain
+     * the "org.logstash" namespace.
+     *
+     * @param parentLogger parent logger to decorate
+     */
+    public DefaultDeprecationLogger(Logger parentLogger) {
+        String name = parentLogger.getName();
+        name = reworkLoggerName(name);
+        this.logger = LogManager.getLogger(name);
+    }
+
+    DefaultDeprecationLogger(String pluginName) {
+        String name = reworkLoggerName(pluginName);
+        this.logger = LogManager.getLogger(name);
+    }
+
+    private String reworkLoggerName(String name) {
+        if (name.startsWith("org.logstash")) {
+            name = name.replace("org.logstash.", "org.logstash.deprecation.");
+        } else {
+            name = "deprecation." + name;
+        }
+        return name;
+    }
+
+    @Override
+    public void deprecated(String message, Object... params) {
+        logger.warn(message, params);
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/log/DeprecationLoggerExt.java b/logstash-core/src/main/java/org/logstash/log/DeprecationLoggerExt.java
new file mode 100644
index 000000000..e427cea28
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/log/DeprecationLoggerExt.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.log;
+
+import co.elastic.logstash.api.DeprecationLogger;
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.RubyObject;
+import org.jruby.anno.JRubyClass;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+
+/**
+ * JRuby extension to provide deprecation logger functionality to Ruby classes
+ * */
+@JRubyClass(name = "DeprecationLogger")
+public class DeprecationLoggerExt extends RubyObject {
+
+    private static final long serialVersionUID = 1L;
+
+    private transient DeprecationLogger logger;
+
+    public DeprecationLoggerExt(final Ruby runtime, final RubyClass metaClass) {
+        super(runtime, metaClass);
+    }
+
+    DeprecationLoggerExt(final Ruby runtime, final RubyClass metaClass, final String loggerName) {
+        super(runtime, metaClass);
+        initialize(loggerName);
+    }
+
+    @JRubyMethod
+    public DeprecationLoggerExt initialize(final ThreadContext context, final IRubyObject loggerName) {
+        initialize(loggerName.asJavaString());
+        return this;
+    }
+
+    private void initialize(final String loggerName) {
+        logger = new DefaultDeprecationLogger(loggerName);
+    }
+
+    @JRubyMethod(name = "deprecated", required = 1, optional = 1)
+    public IRubyObject rubyDeprecated(final ThreadContext context, final IRubyObject[] args) {
+        if (args.length > 1) {
+            logger.deprecated(args[0].asJavaString(), args[1]);
+        } else {
+            logger.deprecated(args[0].asJavaString());
+        }
+        return this;
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/log/LoggableExt.java b/logstash-core/src/main/java/org/logstash/log/LoggableExt.java
index f16386238..caef20eaf 100644
--- a/logstash-core/src/main/java/org/logstash/log/LoggableExt.java
+++ b/logstash-core/src/main/java/org/logstash/log/LoggableExt.java
@@ -1,16 +1,41 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.log;
 
 import org.jruby.RubyClass;
 import org.jruby.RubyModule;
-import org.jruby.RubyString;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.anno.JRubyModule;
-import org.jruby.runtime.Block;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.builtin.InstanceVariables;
 import org.logstash.RubyUtil;
 
+import java.util.Locale;
+
+import static org.logstash.log.SlowLoggerExt.toLong;
+
+/**
+ * JRuby extension, it's part of log4j wrapping for JRuby.
+ * */
 @JRubyModule(name = "Loggable")
 public final class LoggableExt {
 
@@ -37,24 +62,23 @@ public final class LoggableExt {
         return self.getSingletonClass().callMethod(context, "slow_logger", args);
     }
 
-    private static RubyString log4jName(final ThreadContext context, final RubyModule self) {
-        IRubyObject name = self.name19();
-        if (name.isNil()) {
-            final RubyClass clazz;
-            if(self instanceof RubyClass) {
-                clazz = ((RubyClass) self).getRealClass();
-            } else {
-                clazz = self.getMetaClass();
-            }
-            name = clazz.name19();
-            if (name.isNil()) {
-                name = clazz.to_s();
+    @JRubyMethod(name= "deprecation_logger")
+    public static IRubyObject deprecationLogger(final ThreadContext context, final IRubyObject self) {
+        return self.getSingletonClass().callMethod(context, "deprecation_logger");
+    }
+
+    private static String log4jName(final RubyModule self) {
+        String name;
+        if (self.getBaseName() == null) { // anonymous module/class
+            RubyModule real = self;
+            if (self instanceof RubyClass) {
+                real = ((RubyClass) self).getRealClass();
             }
+            name = real.getName(); // for anonymous: "#<Class:0xcafebabe>"
+        } else {
+            name = self.getName();
         }
-        return ((RubyString) ((RubyString) name).gsub(
-            context, RubyUtil.RUBY.newString("::"), RubyUtil.RUBY.newString("."),
-            Block.NULL_BLOCK
-        )).downcase(context);
+        return name.replace("::", ".").toLowerCase(Locale.ENGLISH);
     }
 
     /**
@@ -78,9 +102,8 @@ public final class LoggableExt {
             }
             IRubyObject logger = instanceVariables.getInstanceVariable("logger");
             if (logger == null || logger.isNil()) {
-                logger = RubyUtil.LOGGER.callMethod(context, "new",
-                    LoggableExt.log4jName(context, (RubyModule) self)
-                );
+                final String loggerName = log4jName((RubyModule) self);
+                logger = RubyUtil.LOGGER.callMethod(context, "new", context.runtime.newString(loggerName));
                 instanceVariables.setInstanceVariable("logger", logger);
             }
             return logger;
@@ -90,17 +113,31 @@ public final class LoggableExt {
         public static SlowLoggerExt slowLogger(final ThreadContext context,
             final IRubyObject self, final IRubyObject[] args) {
             final InstanceVariables instanceVariables = self.getInstanceVariables();
-            SlowLoggerExt logger =
-                (SlowLoggerExt) instanceVariables.getInstanceVariable("slow_logger");
+            IRubyObject logger = instanceVariables.getInstanceVariable("slow_logger");
             if (logger == null || logger.isNil()) {
-                logger = new SlowLoggerExt(context.runtime, RubyUtil.SLOW_LOGGER).initialize(
-                    context, new IRubyObject[]{
-                        LoggableExt.log4jName(context, (RubyModule) self), args[0], args[1],
-                        args[2], args[3]
-                    }
+                final String loggerName = log4jName((RubyModule) self);
+                logger = new SlowLoggerExt(context.runtime, RubyUtil.SLOW_LOGGER, loggerName,
+                        toLong(args[0]), toLong(args[1]), toLong(args[2]), toLong(args[3])
                 );
                 instanceVariables.setInstanceVariable("slow_logger", logger);
             }
+            return (SlowLoggerExt) logger;
+        }
+
+        @JRubyMethod(name = "deprecation_logger", meta = true)
+        public static IRubyObject deprecationLogger(final ThreadContext context, final IRubyObject self) {
+            final InstanceVariables instanceVariables;
+            if (self instanceof RubyClass) {
+                instanceVariables = ((RubyClass) self).getRealClass().getInstanceVariables();
+            } else {
+                instanceVariables = self.getInstanceVariables();
+            }
+            IRubyObject logger = instanceVariables.getInstanceVariable("deprecation_logger");
+            if (logger == null || logger.isNil()) {
+                final String loggerName = log4jName((RubyModule) self);
+                logger = new DeprecationLoggerExt(context.runtime, RubyUtil.DEPRECATION_LOGGER, loggerName);
+                instanceVariables.setInstanceVariable("deprecation_logger", logger);
+            }
             return logger;
         }
     }
diff --git a/logstash-core/src/main/java/org/logstash/log/LoggerExt.java b/logstash-core/src/main/java/org/logstash/log/LoggerExt.java
index 6beeeca5d..ef5ab187b 100644
--- a/logstash-core/src/main/java/org/logstash/log/LoggerExt.java
+++ b/logstash-core/src/main/java/org/logstash/log/LoggerExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.log;
 
 import org.apache.logging.log4j.Level;
@@ -19,13 +39,17 @@ import org.jruby.runtime.builtin.IRubyObject;
 import java.io.File;
 import java.net.URI;
 
+/**
+ * JRuby extension, it's part of log4j wrapping for JRuby.
+ * Wrapper log4j Logger as Ruby like class
+ * */
 @JRubyClass(name = "Logger")
 public class LoggerExt extends RubyObject {
 
     private static final long serialVersionUID = 1L;
 
     private static final Object CONFIG_LOCK = new Object();
-    private Logger logger;
+    private transient Logger logger;
 
     public LoggerExt(final Ruby runtime, final RubyClass metaClass) {
         super(runtime, metaClass);
diff --git a/logstash-core/src/main/java/org/logstash/log/LogstashConfigurationFactory.java b/logstash-core/src/main/java/org/logstash/log/LogstashConfigurationFactory.java
new file mode 100644
index 000000000..ee1eb3f35
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/log/LogstashConfigurationFactory.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.log;
+
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.ConfigurationException;
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
+import org.apache.logging.log4j.core.config.ConfigurationSource;
+import org.apache.logging.log4j.core.config.Order;
+import org.apache.logging.log4j.core.config.plugins.Plugin;
+import org.apache.logging.log4j.core.config.properties.PropertiesConfiguration;
+import org.apache.logging.log4j.core.config.properties.PropertiesConfigurationBuilder;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+/**
+ * Logstash configuration factory customization used to remove the routing appender from log4j configuration
+ * if "separate_logs" settings is false.
+ * */
+@Plugin(name = "LogstashConfigurationFactory", category = ConfigurationFactory.CATEGORY)
+@Order(9)
+public class LogstashConfigurationFactory extends ConfigurationFactory {
+
+    static final String PIPELINE_ROUTING_APPENDER_NAME = "pipeline_routing_appender";
+    public static final String PIPELINE_SEPARATE_LOGS = "ls.pipeline.separate_logs";
+
+    @Override
+    protected String[] getSupportedTypes() {
+        return new String[] {".properties"};
+    }
+
+    @Override
+    public PropertiesConfiguration getConfiguration(final LoggerContext loggerContext, final ConfigurationSource source) {
+        final Properties properties = new Properties();
+        try (final InputStream configStream = source.getInputStream()) {
+            properties.load(configStream);
+        } catch (final IOException ioe) {
+            throw new ConfigurationException("Unable to load " + source.toString(), ioe);
+        }
+        PropertiesConfiguration propertiesConfiguration = new PropertiesConfigurationBuilder()
+                .setConfigurationSource(source)
+                .setRootProperties(properties)
+                .setLoggerContext(loggerContext)
+                .build();
+
+        if (System.getProperty(PIPELINE_SEPARATE_LOGS, "false").equals("false")) {
+            // force init to avoid overwrite of appenders section
+            propertiesConfiguration.initialize();
+            propertiesConfiguration.removeAppender(PIPELINE_ROUTING_APPENDER_NAME);
+        }
+
+        return propertiesConfiguration;
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/log/LogstashLogEventFactory.java b/logstash-core/src/main/java/org/logstash/log/LogstashLogEventFactory.java
index f13c264dd..4ecf21ab1 100644
--- a/logstash-core/src/main/java/org/logstash/log/LogstashLogEventFactory.java
+++ b/logstash-core/src/main/java/org/logstash/log/LogstashLogEventFactory.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.log;
 
 import org.apache.logging.log4j.Level;
@@ -9,6 +29,9 @@ import org.apache.logging.log4j.message.Message;
 
 import java.util.List;
 
+/**
+ * Logstash implementation of factory for Log4j LogEvent
+ * */
 public class LogstashLogEventFactory implements LogEventFactory {
     @Override
     public LogEvent createEvent(String loggerName, Marker marker, String fqcn, Level level, Message data, List<Property> properties, Throwable t) {
diff --git a/logstash-core/src/main/java/org/logstash/log/LogstashLoggerContextFactory.java b/logstash-core/src/main/java/org/logstash/log/LogstashLoggerContextFactory.java
index b232d5f31..f703c9165 100644
--- a/logstash-core/src/main/java/org/logstash/log/LogstashLoggerContextFactory.java
+++ b/logstash-core/src/main/java/org/logstash/log/LogstashLoggerContextFactory.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.log;
 
 import org.apache.logging.log4j.LogManager;
diff --git a/logstash-core/src/main/java/org/logstash/log/LogstashMessageFactory.java b/logstash-core/src/main/java/org/logstash/log/LogstashMessageFactory.java
index 7cadbbf03..28cf11fd9 100644
--- a/logstash-core/src/main/java/org/logstash/log/LogstashMessageFactory.java
+++ b/logstash-core/src/main/java/org/logstash/log/LogstashMessageFactory.java
@@ -1,14 +1,39 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.log;
 
 import org.apache.logging.log4j.message.Message;
-import org.apache.logging.log4j.message.MessageFactory;
+import org.apache.logging.log4j.message.MessageFactory2;
 import org.apache.logging.log4j.message.ObjectMessage;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.logging.log4j.message.SimpleMessage;
 
 import java.util.Map;
 
-public final class LogstashMessageFactory implements MessageFactory {
+/**
+ * Used in Log4j configuration.
+ *
+ * Requires Log4j 2.6 and above.
+ * */
+public final class LogstashMessageFactory implements MessageFactory2 {
 
     public static final LogstashMessageFactory INSTANCE = new LogstashMessageFactory();
 
@@ -30,4 +55,59 @@ public final class LogstashMessageFactory implements MessageFactory {
             return new ParameterizedMessage(message, params);
         }
     }
+
+    @Override
+    public Message newMessage(CharSequence charSequence) {
+        return new SimpleMessage(charSequence);
+    }
+
+    @Override
+    public Message newMessage(String message, Object p0) {
+        return newMessage(message, new Object[]{p0});
+    }
+
+    @Override
+    public Message newMessage(String message, Object p0, Object p1) {
+        return newMessage(message, new Object[]{p0, p1});
+    }
+
+    @Override
+    public Message newMessage(String message, Object p0, Object p1, Object p2) {
+        return newMessage(message, new Object[]{p0, p1, p2});
+    }
+
+    @Override
+    public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3) {
+        return newMessage(message, new Object[]{p0, p1, p2, p3});
+    }
+
+    @Override
+    public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4) {
+        return newMessage(message, new Object[]{p0, p1, p2, p3, p4});
+    }
+
+    @Override
+    public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) {
+        return newMessage(message, new Object[]{p0, p1, p2, p3, p4, p5});
+    }
+
+    @Override
+    public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6) {
+        return newMessage(message, new Object[]{p0, p1, p2, p3, p4, p5, p6});
+    }
+
+    @Override
+    public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7) {
+        return newMessage(message, new Object[]{p0, p1, p2, p3, p4, p5, p6, p7});
+    }
+
+    @Override
+    public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) {
+        return newMessage(message, new Object[]{p0, p1, p2, p3, p4, p5, p6, p7, p8});
+    }
+
+    @Override
+    public Message newMessage(String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) {
+        return newMessage(message, new Object[]{p0, p1, p2, p3, p4, p5, p6, p7, p8, p9});
+    }
 }
diff --git a/logstash-core/src/main/java/org/logstash/log/PipelineRoutingAppender.java b/logstash-core/src/main/java/org/logstash/log/PipelineRoutingAppender.java
new file mode 100644
index 000000000..ba54ed60a
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/log/PipelineRoutingAppender.java
@@ -0,0 +1,159 @@
+package org.logstash.log;
+
+import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
+import org.apache.logging.log4j.core.Filter;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.appender.AbstractAppender;
+import org.apache.logging.log4j.core.config.AppenderControl;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.Node;
+import org.apache.logging.log4j.core.config.Property;
+import org.apache.logging.log4j.core.config.plugins.Plugin;
+import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory;
+import org.apache.logging.log4j.core.config.plugins.PluginNode;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * Appender customization to separate logs per pipeline.
+ *
+ * It instantiates subappenders, starting from a definition.
+ *
+ * Sample of XML configuration:
+ * <pre>{@code
+ *  <PipelineRouting name="a_name">
+ *      <RollingFile
+ *            name="appender-${ctx:pipeline.id}"
+ *            fileName="${sys:ls.logs}/pipeline_${ctx:pipeline.id}.log"
+ *            filePattern="${sys:ls.logs}/pipeline_${ctx:pipeline.id}.%i.log.gz">
+ *          <PatternLayout>
+ *            <pattern>[%d{ISO8601}][%-5p][%-25c] %m%n</pattern>
+ *          </PatternLayout>
+ *          <SizeBasedTriggeringPolicy size="100MB" />
+ *          <DefaultRolloverStrategy max="30" />
+ *        </RollingFile>
+ *  </PipelineRouting>
+ *  }
+ * </pre>
+ * */
+@Plugin(name = "PipelineRouting", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true, deferChildren = true)
+public class PipelineRoutingAppender extends AbstractAppender {
+
+    /**
+     * Builder for {@link PipelineRoutingAppender} instances
+     * */
+    public static class Builder<B extends PipelineRoutingAppender.Builder<B>> extends AbstractAppender.Builder<B>
+            implements org.apache.logging.log4j.core.util.Builder<PipelineRoutingAppender> {
+
+        @PluginNode
+        private Node appenderNode;
+
+        @Override
+        public PipelineRoutingAppender build() {
+            final String name = getName();
+            if (name == null) {
+                LOGGER.error("No name defined for this RoutingAppender");
+                return null;
+            }
+            return new PipelineRoutingAppender(name, appenderNode, getConfiguration());
+        }
+    }
+
+    /**
+     * Factory method to instantiate the appender
+     * */
+    @PluginBuilderFactory
+    public static <B extends PipelineRoutingAppender.Builder<B>> B newBuilder() {
+        return new PipelineRoutingAppender.Builder<B>().asBuilder();
+    }
+
+    private final Node appenderNode;
+    private final Configuration configuration;
+    private final ConcurrentMap<String, AppenderControl> createdAppenders = new ConcurrentHashMap<>();
+    private final Map<String, AppenderControl> createdAppendersUnmodifiableView =
+            Collections.unmodifiableMap(createdAppenders);
+
+    protected PipelineRoutingAppender(String name, Node appenderNode, Configuration configuration) {
+        super(name, null, null, false, new Property[0]);
+        this.appenderNode = appenderNode;
+        this.configuration = configuration;
+    }
+
+    /**
+     * Returns an unmodifiable view of the appenders created by this {@link PipelineRoutingAppender}.
+     */
+    public Map<String, AppenderControl> getAppenders() {
+        return createdAppendersUnmodifiableView;
+    }
+
+    /**
+     * Core method to apply the logic of routing.
+     * */
+    @Override
+    public void append(LogEvent event) {
+        AppenderControl appenderControl = getControl(event);
+
+        if (appenderControl != null) {
+            appenderControl.callAppender(event);
+        }
+    }
+
+    /**
+     * Create or retrieve the sub appender for the pipeline.id provided into the event
+     * */
+    private AppenderControl getControl(LogEvent event) {
+        String key = event.getContextData().getValue("pipeline.id");
+        if (key == null) {
+            LOGGER.debug("Unable to find the pipeline.id in event's context data in routing appender, skip it");
+            // this prevent to create an appender when log events are not fish-tagged with pipeline.id,
+            // avoid to create log file like "pipeline_${ctx:pipeline.id}.log" which contains duplicated
+            // logs from the logstash-* files
+            return null;
+        }
+
+        AppenderControl appenderControl = createdAppenders.get(key);
+        if (appenderControl == null) {
+            synchronized (this) {
+                appenderControl = createdAppenders.get(key);
+                if (appenderControl == null) {
+                    //create new appender and control
+                    final Appender app = createAppender(event);
+                    if (app == null) {
+                        return null;
+                    }
+                    AppenderControl created = new AppenderControl(app, null, null);
+                    appenderControl = created;
+                    createdAppenders.put(key, created);
+                }
+            }
+        }
+        return appenderControl;
+    }
+
+
+    /**
+     * Used by @{@link #getControl(LogEvent)} to create new subappenders for not yet encountered pipelines.
+     * */
+    private Appender createAppender(final LogEvent event) {
+        for (final Node node : appenderNode.getChildren()) {
+            if (node.getType().getElementName().equals(Appender.ELEMENT_TYPE)) {
+                final Node appNode = new Node(node);
+                configuration.createConfiguration(appNode, event);
+                if (appNode.getObject() instanceof Appender) {
+                    final Appender app = appNode.getObject();
+                    app.start();
+                    return app;
+                }
+                error("Unable to create Appender of type " + node.getName());
+                return null;
+            }
+        }
+        error("No Appender was configured for  " + getName());
+        return null;
+    }
+
+}
diff --git a/logstash-core/src/main/java/org/logstash/log/PipelineRoutingFilter.java b/logstash-core/src/main/java/org/logstash/log/PipelineRoutingFilter.java
new file mode 100644
index 000000000..a4e59a27c
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/log/PipelineRoutingFilter.java
@@ -0,0 +1,50 @@
+package org.logstash.log;
+
+import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.config.plugins.Plugin;
+import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.core.filter.AbstractFilter;
+
+/**
+ * Custom filter to avoid that pipeline tagged log events goes in global appender.
+ * */
+@Plugin(name = "PipelineRoutingFilter", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true)
+public final class PipelineRoutingFilter extends AbstractFilter {
+
+    private final boolean isSeparateLogs;
+
+    /**
+     * Factory method to instantiate the filter
+     * */
+    @PluginFactory
+    public static PipelineRoutingFilter createFilter() {
+        return new PipelineRoutingFilter();
+    }
+
+    /**
+     * Avoid direct instantiation of the filter
+     * */
+    private PipelineRoutingFilter() {
+        isSeparateLogs = Boolean.getBoolean("ls.pipeline.separate_logs");
+    }
+
+    /**
+     * Contains the main logic to execute in filtering.
+     *
+     * Deny the logging of an event when separate logs feature is enabled and the event is fish tagged with a
+     * pipeline id.
+     *
+     * @param event the log to filter.
+     * */
+    @Override
+    public Result filter(LogEvent event) {
+        final boolean directedToPipelineLog = isSeparateLogs &&
+                event.getContextData().containsKey("pipeline.id");
+        if (directedToPipelineLog) {
+            return Result.DENY;
+        }
+        return Result.NEUTRAL;
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/log/RubyBasicObjectSerializer.java b/logstash-core/src/main/java/org/logstash/log/RubyBasicObjectSerializer.java
new file mode 100644
index 000000000..16a48fe8a
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/log/RubyBasicObjectSerializer.java
@@ -0,0 +1,116 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.log;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import com.fasterxml.jackson.databind.util.ClassUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.jruby.RubyBasicObject;
+import org.jruby.RubyMethod;
+import org.jruby.RubyString;
+import org.jruby.exceptions.NameError;
+import org.logstash.RubyUtil;
+
+import java.io.IOException;
+import java.util.Optional;
+
+/**
+ * Default serializer for {@link org.jruby.RubyBasicObject} since Jackson can't handle that type natively.
+ * Arrays, Collections and Maps are delegated to the default Jackson's serializer - which might end-up invoking this
+ * serializer for its elements.
+ * Values which inspect method is implemented and owned by the LogStash module will be serialized using this method return.
+ * If none of the above conditions match, it gets the serialized value by invoking the Ruby's {@code to_s} method, falling back
+ * to {@link RubyBasicObject#to_s()}  and {@link RubyBasicObject#anyToString()} in case of errors.
+ */
+public final class RubyBasicObjectSerializer extends StdSerializer<RubyBasicObject> {
+
+    private static final long serialVersionUID = -5557562960691452054L;
+    private static final Logger LOGGER = LogManager.getLogger(RubyBasicObjectSerializer.class);
+    private static final String METHOD_INSPECT = "inspect";
+    private static final String METHOD_TO_STRING = "to_s";
+
+    public RubyBasicObjectSerializer() {
+        super(RubyBasicObject.class);
+    }
+
+    @Override
+    public void serialize(final RubyBasicObject value, final JsonGenerator gen, final SerializerProvider provider) throws IOException {
+        final Optional<JsonSerializer<Object>> serializer = findTypeSerializer(value, provider);
+        if (serializer.isPresent()) {
+            try {
+                serializer.get().serialize(value, gen, provider);
+                return;
+            } catch (IOException e) {
+                LOGGER.debug("Failed to serialize value type {} using default serializer {}", value.getClass(), serializer.get().getClass(), e);
+            }
+        }
+
+        if (isCustomInspectMethodDefined(value)) {
+            try {
+                gen.writeString(value.callMethod(METHOD_INSPECT).asJavaString());
+                return;
+            } catch (Exception e) {
+                LOGGER.debug("Failed to serialize value type {} using the custom `inspect` method", value.getMetaClass(), e);
+            }
+        }
+
+        try {
+            gen.writeString(value.callMethod(METHOD_TO_STRING).asJavaString());
+            return;
+        } catch (Exception e) {
+            LOGGER.debug("Failed to serialize value type {} using `to_s` method", value.getMetaClass(), e);
+        }
+
+        try {
+            gen.writeString(value.to_s().asJavaString());
+        } catch (Exception e) {
+            LOGGER.debug("Failed to serialize value type {} using `RubyBasicObject#to_s()` method", value.getMetaClass(), e);
+            gen.writeString(value.anyToString().asJavaString());
+        }
+    }
+
+    private Optional<JsonSerializer<Object>> findTypeSerializer(final RubyBasicObject value, final SerializerProvider provider) {
+        if (ClassUtil.isCollectionMapOrArray(value.getClass())) {
+            try {
+                // Delegates the serialization to the Jackson's default serializers, which might
+                // end up using this serializer for its elements.
+                return Optional.ofNullable(provider.findTypedValueSerializer(value.getJavaClass(), false, null));
+            } catch (JsonMappingException e) {
+                // Ignored
+            }
+        }
+
+        return Optional.empty();
+    }
+
+    private boolean isCustomInspectMethodDefined(final RubyBasicObject value) {
+        try {
+            final Object candidate = value.method(RubyString.newString(RubyUtil.RUBY, METHOD_INSPECT));
+            return candidate instanceof RubyMethod && ((RubyMethod) candidate).owner(RubyUtil.RUBY.getCurrentContext()).toString().toLowerCase().startsWith("logstash");
+        } catch (NameError e) {
+            return false;
+        }
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/log/SlowLoggerExt.java b/logstash-core/src/main/java/org/logstash/log/SlowLoggerExt.java
index 96b5a5223..ed655226a 100644
--- a/logstash-core/src/main/java/org/logstash/log/SlowLoggerExt.java
+++ b/logstash-core/src/main/java/org/logstash/log/SlowLoggerExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.log;
 
 import org.apache.logging.log4j.LogManager;
@@ -14,6 +34,9 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.logstash.RubyUtil;
 
+/**
+ * JRuby extension to provide slow logger functionality to Ruby classes
+ * */
 @JRubyClass(name = "SlowLogger")
 public class SlowLoggerExt extends RubyObject {
 
@@ -25,7 +48,7 @@ public class SlowLoggerExt extends RubyObject {
     private static final RubySymbol EVENT = RubyUtil.RUBY.newSymbol("event");
     private static final RubyNumeric NANO_TO_MILLI = RubyUtil.RUBY.newFixnum(1000000);
 
-    private Logger slowLogger;
+    private transient Logger slowLogger;
     private long warnThreshold;
     private long infoThreshold;
     private long debugThreshold;
@@ -35,17 +58,36 @@ public class SlowLoggerExt extends RubyObject {
         super(runtime, metaClass);
     }
 
+    SlowLoggerExt(final Ruby runtime, final RubyClass metaClass, final String loggerName,
+                  final long warnThreshold, final long infoThreshold,
+                  final long debugThreshold, final long traceThreshold) {
+        super(runtime, metaClass);
+        initialize(loggerName, warnThreshold, infoThreshold, debugThreshold, traceThreshold);
+    }
+
     @JRubyMethod(required = 5)
     public SlowLoggerExt initialize(final ThreadContext context, final IRubyObject[] args) {
-        String loggerName = args[0].asJavaString();
-        slowLogger = LogManager.getLogger("slowlog." + loggerName);
-        warnThreshold = ((RubyNumeric) args[1]).getLongValue();
-        infoThreshold = ((RubyNumeric) args[2]).getLongValue();
-        debugThreshold = ((RubyNumeric) args[3]).getLongValue();
-        traceThreshold = ((RubyNumeric) args[4]).getLongValue();
+        initialize(args[0].asJavaString(), toLong(args[1]), toLong(args[2]), toLong(args[3]), toLong(args[4]));
         return this;
     }
 
+    private void initialize(final String loggerName,
+                            final long warnThreshold, final long infoThreshold,
+                            final long debugThreshold, final long traceThreshold) {
+        slowLogger = LogManager.getLogger("slowlog." + loggerName);
+        this.warnThreshold = warnThreshold;
+        this.infoThreshold = infoThreshold;
+        this.debugThreshold = debugThreshold;
+        this.traceThreshold = traceThreshold;
+    }
+
+    static long toLong(final IRubyObject value) {
+        if (!(value instanceof RubyNumeric)) {
+            throw RubyUtil.RUBY.newTypeError("Numeric expected, got " + value.getMetaClass());
+        }
+        return ((RubyNumeric) value).getLongValue();
+    }
+
     private RubyHash asData(final ThreadContext context, final IRubyObject pluginParams,
                             final IRubyObject event, final IRubyObject durationNanos) {
         RubyHash data = RubyHash.newHash(context.runtime);
diff --git a/logstash-core/src/main/java/org/logstash/log/StructuredMessage.java b/logstash-core/src/main/java/org/logstash/log/StructuredMessage.java
index ee6fa1bf3..9c0feee05 100644
--- a/logstash-core/src/main/java/org/logstash/log/StructuredMessage.java
+++ b/logstash-core/src/main/java/org/logstash/log/StructuredMessage.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.log;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -6,13 +26,16 @@ import org.apache.logging.log4j.message.Message;
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * Logging message extension class
+ * */
 @JsonSerialize(using = CustomLogEventSerializer.class)
 public class StructuredMessage implements Message {
 
     private static final long serialVersionUID = 1L;
 
     private final String message;
-    private final Map<Object, Object> params;
+    private final transient Map<Object, Object> params;
 
     @SuppressWarnings({"unchecked","rawtypes"})
     public StructuredMessage(String message) {
diff --git a/logstash-core/src/main/java/org/logstash/plugins/AliasRegistry.java b/logstash-core/src/main/java/org/logstash/plugins/AliasRegistry.java
new file mode 100644
index 000000000..d2d5a31b2
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/AliasRegistry.java
@@ -0,0 +1,323 @@
+package org.logstash.plugins;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.logstash.common.Util;
+import org.logstash.plugins.PluginLookup.PluginType;
+import org.logstash.plugins.aliases.AliasDocumentReplace;
+import org.logstash.plugins.aliases.AliasPlugin;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Scanner;
+import java.util.stream.Collectors;
+
+import org.yaml.snakeyaml.Yaml;
+
+public class AliasRegistry {
+
+    private static final Logger LOGGER = LogManager.getLogger(AliasRegistry.class);
+
+    final static class PluginCoordinate {
+        private final PluginType type;
+        private final String name;
+
+        public PluginCoordinate(PluginType type, String name) {
+            this.type = type;
+            this.name = name;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            PluginCoordinate that = (PluginCoordinate) o;
+            return type == that.type && Objects.equals(name, that.name);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(type, name);
+        }
+
+        PluginCoordinate withName(String name) {
+            return new PluginCoordinate(this.type, name);
+        }
+
+        @Override
+        public String toString() {
+            return "PluginCoordinate{type=" + type + ", name='" + name + "'}";
+        }
+
+        public String fullName() {
+            return "logstash-" + type.rubyLabel().toString().toLowerCase() + "-" + name;
+        }
+    }
+
+    private static class YamlWithChecksum {
+
+        private static YamlWithChecksum load(InputStream in) {
+            try (Scanner scanner = new Scanner(in, StandardCharsets.UTF_8.name())) {
+                // read the header line
+                final String header = scanner.nextLine();
+                if (!header.startsWith("#CHECKSUM:")) {
+                    throw new IllegalArgumentException("Bad header format, expected '#CHECKSUM: ...' but found " + header);
+                }
+                final String extractedHash = header.substring("#CHECKSUM:".length()).trim();
+
+                // read the comment
+                scanner.nextLine();
+
+                // collect all remaining lines
+                final StringBuilder yamlBuilder = new StringBuilder();
+                scanner.useDelimiter("\\z"); // EOF
+                if (scanner.hasNext()) {
+                    yamlBuilder.append(scanner.next());
+                }
+                final String yamlContents = yamlBuilder.toString();
+                return new YamlWithChecksum(yamlContents, extractedHash);
+            }
+        }
+
+        final String yamlContents;
+        final String checksumHash;
+
+        private YamlWithChecksum(final String yamlContents, final String checksumHash) {
+            this.yamlContents = yamlContents;
+            this.checksumHash = checksumHash;
+        }
+
+        @SuppressWarnings("unchecked")
+        private Map<PluginType, List<AliasPlugin>> decodeYaml() throws IOException {
+            Yaml yaml = new Yaml();
+            Map<String, Object> yamlMap = yaml.load(yamlContents);
+
+            // Convert the loaded YAML content to the expected type structure
+            return convertYamlMapToObject(yamlMap);
+        }
+
+        private String computeHashFromContent() {
+            return Util.digest(yamlContents);
+        }
+
+        @SuppressWarnings("unchecked")
+        private Map<PluginType, List<AliasPlugin>> convertYamlMapToObject(Map<String, Object> yamlMap) {
+            Map<PluginType, List<AliasPlugin>> result = new HashMap<>();
+
+            for (Map.Entry<String, Object> entry : yamlMap.entrySet()) {
+                PluginType pluginType = PluginType.valueOf(entry.getKey().toUpperCase());
+                List<Map<String, Object>> aliasList = (List<Map<String, Object>>) entry.getValue();
+
+                List<AliasPlugin> aliasPlugins = aliasList.stream()
+                        .map(YamlWithChecksum::convertToAliasPluginDefinition)
+                        .collect(Collectors.toList());
+
+                result.put(pluginType, aliasPlugins);
+            }
+            return result;
+        }
+
+        @SuppressWarnings("unchecked")
+        private static AliasPlugin convertToAliasPluginDefinition(Map<String, Object> aliasEntry) {
+            String aliasName = (String) aliasEntry.get("alias");
+            String from = (String) aliasEntry.get("from");
+
+            List<Map<String, String>> docs = (List<Map<String, String>>) aliasEntry.get("docs");
+            List<AliasDocumentReplace> replaceRules = convertToDocumentationReplacementRules(docs);
+
+            return new AliasPlugin(aliasName, from, replaceRules);
+        }
+
+        private static List<AliasDocumentReplace> convertToDocumentationReplacementRules(List<Map<String, String>> docs) {
+            if (docs == null) {
+                return Collections.emptyList();
+            }
+            return docs.stream()
+                    .map(YamlWithChecksum::convertSingleDocReplacementRule)
+                    .collect(Collectors.toList());
+        }
+
+        private static AliasDocumentReplace convertSingleDocReplacementRule(Map<String, String> doc) {
+            String replace = doc.get("replace");
+            String with = doc.get("with");
+            return new AliasDocumentReplace(replace, with);
+        }
+    }
+
+    static class AliasYamlLoader {
+
+        Map<PluginCoordinate, String> loadAliasesDefinitions(Path yamlPath) {
+            final FileInputStream in;
+            try {
+                in = new FileInputStream(yamlPath.toFile());
+            } catch (FileNotFoundException e) {
+                LOGGER.warn("Can't find aliases yml definition file in in path: " + yamlPath, e);
+                return Collections.emptyMap();
+            }
+
+            return loadAliasesDefinitionsFromInputStream(in);
+        }
+
+        Map<PluginCoordinate, String> loadAliasesDefinitions() {
+            final String filePath = "org/logstash/plugins/plugin_aliases.yml";
+            InputStream in = null;
+            try {
+                URL url = AliasYamlLoader.class.getClassLoader().getResource(filePath);
+                if (url != null) {
+                    URLConnection connection = url.openConnection();
+                    if (connection != null) {
+                        connection.setUseCaches(false);
+                        in = connection.getInputStream();
+                    }
+                }
+            } catch (IOException e){
+                LOGGER.warn("Unable to read alias definition in jar resources: {}", filePath, e);
+                return Collections.emptyMap();
+            }
+            if (in == null) {
+                LOGGER.warn("Malformed yaml file in yml definition file in jar resources: {}", filePath);
+                return Collections.emptyMap();
+            }
+
+            return loadAliasesDefinitionsFromInputStream(in);
+        }
+
+        private Map<PluginCoordinate, String> loadAliasesDefinitionsFromInputStream(InputStream in) {
+            final YamlWithChecksum aliasYml = YamlWithChecksum.load(in);
+            final String calculatedHash = aliasYml.computeHashFromContent();
+            if (!calculatedHash.equals(aliasYml.checksumHash)) {
+                LOGGER.warn("Bad checksum value, expected {} but found {}", calculatedHash, aliasYml.checksumHash);
+                return Collections.emptyMap();
+            }
+
+            // decode yaml to Map<PluginType, List<AliasPlugin>> structure
+            final Map<PluginType, List<AliasPlugin>> aliasedDescriptions;
+            try {
+                aliasedDescriptions = aliasYml.decodeYaml();
+            } catch (IOException ioex) {
+                LOGGER.error("Error decoding the yaml aliases file", ioex);
+                return Collections.emptyMap();
+            }
+
+            // convert aliases nested maps definitions to plugin alias definitions
+            final Map<PluginCoordinate, String> defaultDefinitions = new HashMap<>();
+            defaultDefinitions.putAll(extractDefinitions(PluginType.INPUT, aliasedDescriptions));
+            defaultDefinitions.putAll(extractDefinitions(PluginType.CODEC, aliasedDescriptions));
+            defaultDefinitions.putAll(extractDefinitions(PluginType.FILTER, aliasedDescriptions));
+            defaultDefinitions.putAll(extractDefinitions(PluginType.OUTPUT, aliasedDescriptions));
+            return defaultDefinitions;
+        }
+
+        private Map<PluginCoordinate, String> extractDefinitions(PluginType pluginType,
+                                                                 Map<PluginType, List<AliasPlugin>> aliasesYamlDefinitions) {
+            final List<AliasPlugin> aliasedPlugins = aliasesYamlDefinitions.get(pluginType);
+            if (Objects.isNull(aliasedPlugins)) {
+                return Collections.emptyMap();
+            }
+
+            Map<PluginCoordinate, String> defaultDefinitions = new HashMap<>();
+            aliasedPlugins.forEach(aliasPlugin -> {
+                defaultDefinitions.put(new PluginCoordinate(pluginType, aliasPlugin.getAliasName()), aliasPlugin.getFrom());
+            });
+            return defaultDefinitions;
+        }
+    }
+
+
+    private final Map<PluginCoordinate, String> aliases = new HashMap<>();
+    private final Map<PluginCoordinate, String> reversedAliases = new HashMap<>();
+
+    private static final AliasRegistry INSTANCE = new AliasRegistry();
+    public static AliasRegistry getInstance() {
+        return INSTANCE;
+    }
+
+    // The Default implementation of AliasRegistry.
+    // This needs to be a singleton as multiple threads accessing may cause the first thread to close the jar file
+    // leading to issues with subsequent threads loading the yaml file.
+    private AliasRegistry() {
+        final AliasYamlLoader loader = new AliasYamlLoader();
+        final Map<PluginCoordinate, String> defaultDefinitions = loader.loadAliasesDefinitions();
+        configurePluginAliases(defaultDefinitions);
+    }
+
+    /**
+     * Constructor used in tests to customize the plugins renames.
+     * The input map's key are tuples of (type, name)
+     * */
+    public AliasRegistry(Map<List<String>, String> aliasDefinitions) {
+        Map<PluginCoordinate, String> aliases = new HashMap<>();
+
+        // transform the (tye, name) into PluginCoordinate
+        for (Map.Entry<List<String>, String> e : aliasDefinitions.entrySet()) {
+            final List<String> tuple = e.getKey();
+            final PluginCoordinate key = mapTupleToCoordinate(tuple);
+            aliases.put(key, e.getValue());
+        }
+
+        configurePluginAliases(aliases);
+    }
+
+    private PluginCoordinate mapTupleToCoordinate(List<String> tuple) {
+        if (tuple.size() != 2) {
+            throw new IllegalArgumentException("Expected a tuple of 2 elements, but found: " + tuple);
+        }
+        final PluginType type = PluginType.valueOf(tuple.get(0).toUpperCase());
+        final String name = tuple.get(1);
+        final PluginCoordinate key = new PluginCoordinate(type, name);
+        return key;
+    }
+
+    private void configurePluginAliases(Map<PluginCoordinate, String> aliases) {
+        this.aliases.putAll(aliases);
+        for (Map.Entry<PluginCoordinate, String> e : this.aliases.entrySet()) {
+            final PluginCoordinate reversedAlias = e.getKey().withName(e.getValue());
+            if (reversedAliases.containsKey(reversedAlias)) {
+                throw new IllegalStateException("Found plugin " + e.getValue() + " aliased more than one time");
+            }
+            reversedAliases.put(reversedAlias, e.getKey().name);
+        }
+    }
+
+    public boolean isAlias(String type, String pluginName) {
+        final PluginType pluginType = PluginType.valueOf(type.toUpperCase());
+
+        return isAlias(pluginType, pluginName);
+    }
+
+    public boolean isAlias(PluginType type, String pluginName) {
+        return aliases.containsKey(new PluginCoordinate(type, pluginName));
+    }
+
+    public String originalFromAlias(PluginType type, String alias) {
+        return aliases.get(new PluginCoordinate(type, alias));
+    }
+
+    public String originalFromAlias(String type, String alias) {
+        return originalFromAlias(PluginType.valueOf(type.toUpperCase()), alias);
+    }
+
+    public Optional<String> aliasFromOriginal(PluginType type, String realPluginName) {
+        return Optional.ofNullable(reversedAliases.get(new PluginCoordinate(type, realPluginName)));
+    }
+
+    /**
+     * if pluginName is an alias then return the real plugin name else return it unchanged
+     */
+    public String resolveAlias(String type, String pluginName) {
+        final PluginCoordinate pluginCoord = new PluginCoordinate(PluginType.valueOf(type.toUpperCase()), pluginName);
+        return aliases.getOrDefault(pluginCoord, pluginName);
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/BasicEventFactory.java b/logstash-core/src/main/java/org/logstash/plugins/BasicEventFactory.java
new file mode 100644
index 000000000..77f49fa14
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/BasicEventFactory.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.plugins;
+
+import co.elastic.logstash.api.Event;
+import co.elastic.logstash.api.EventFactory;
+import org.logstash.ConvertedMap;
+
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * A basic {@link EventFactory} implementation for plugins.
+ *
+ * @see #INSTANCE
+ * @since Logstash 7.14
+ */
+public class BasicEventFactory implements EventFactory {
+
+    /**
+     * An event factory instance.
+     */
+    public static final EventFactory INSTANCE = new BasicEventFactory();
+
+    protected BasicEventFactory() { /* avoid direct instantiation */ }
+
+    @Override
+    public Event newEvent() {
+        return new org.logstash.Event();
+    }
+
+    @Override
+    public Event newEvent(Map<? extends Serializable, Object> data) {
+        if (data instanceof ConvertedMap) {
+            return new org.logstash.Event((ConvertedMap) data);
+        }
+        return new org.logstash.Event(data);
+    }
+
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/ConfigVariableExpander.java b/logstash-core/src/main/java/org/logstash/plugins/ConfigVariableExpander.java
new file mode 100644
index 000000000..008ddc599
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/ConfigVariableExpander.java
@@ -0,0 +1,127 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.plugins;
+
+import org.logstash.common.EnvironmentVariableProvider;
+import org.logstash.secret.SecretIdentifier;
+import org.logstash.secret.SecretVariable;
+import org.logstash.secret.store.SecretStore;
+
+import java.nio.charset.StandardCharsets;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Expand the configuration variables used in pipeline configuration, bringing them from secret store or from the
+ * environment.
+ * */
+public class ConfigVariableExpander implements AutoCloseable {
+
+    private static String SUBSTITUTION_PLACEHOLDER_REGEX = "\\$\\{(?<name>[a-zA-Z_.][a-zA-Z0-9_.]*)(:(?<default>[^}]*))?}";
+
+    private Pattern substitutionPattern = Pattern.compile(SUBSTITUTION_PLACEHOLDER_REGEX);
+    private SecretStore secretStore;
+    private EnvironmentVariableProvider envVarProvider;
+
+    /**
+     * Creates a ConfigVariableExpander that doesn't lookup any secreted placeholder.
+     *
+     * @param envVarProvider EnvironmentVariableProvider to use as source of substitutions
+     * @return an variable expander that uses envVarProvider as source
+     * */
+    public static ConfigVariableExpander withoutSecret(EnvironmentVariableProvider envVarProvider) {
+        return new ConfigVariableExpander(null, envVarProvider);
+    }
+
+    public ConfigVariableExpander(SecretStore secretStore, EnvironmentVariableProvider envVarProvider) {
+        this.secretStore = secretStore;
+        this.envVarProvider = envVarProvider;
+    }
+
+    /**
+     * Replace all substitution variable references and returns the substituted value or the original value
+     * if a substitution cannot be made.
+     *
+     * Substitution variables have the patterns: <code>${VAR}</code> or <code>${VAR:defaultValue}</code>
+     *
+     * If a substitution variable is found, the following precedence applies:
+     *   Secret store value
+     *   Environment entry value
+     *   Default value if provided in the pattern
+     *   Exception raised
+     *
+     * If a substitution variable is not found, the value is return unchanged
+     *
+     * @param value Config value in which substitution variables, if any, should be replaced.
+     * @param keepSecrets True if secret stores resolved variables must be kept secret in a Password instance
+     * @return Config value with any substitution variables replaced
+     */
+    public Object expand(Object value, boolean keepSecrets) {
+        if (!(value instanceof String)) {
+            return value;
+        }
+
+        String variable = (String) value;
+
+        Matcher m = substitutionPattern.matcher(variable);
+        if (!m.matches()) {
+            return variable;
+        }
+        String variableName = m.group("name");
+
+        if (secretStore != null) {
+            byte[] ssValue = secretStore.retrieveSecret(new SecretIdentifier(variableName));
+            if (ssValue != null) {
+                if (keepSecrets) {
+                    return new SecretVariable(variableName, new String(ssValue, StandardCharsets.UTF_8));
+                } else {
+                    return new String(ssValue, StandardCharsets.UTF_8);
+                }
+            }
+        }
+
+        if (envVarProvider != null) {
+            String evValue = envVarProvider.get(variableName);
+            if (evValue != null) {
+                return evValue;
+            }
+        }
+
+        String defaultValue = m.group("default");
+        if (defaultValue == null) {
+            throw new IllegalStateException(String.format(
+                    "Cannot evaluate `%s`. Replacement variable `%s` is not defined in a Logstash " +
+                            "secret store or an environment entry and there is no default value given.",
+                    variable, variableName));
+        }
+        return defaultValue;
+    }
+
+    public Object expand(Object value) {
+        return expand(value, false);
+    }
+
+    @Override
+    public void close() {
+        // most keystore implementations will have close() methods
+
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/ConfigurationImpl.java b/logstash-core/src/main/java/org/logstash/plugins/ConfigurationImpl.java
index 3ede75ebf..fc3bf5dc8 100644
--- a/logstash-core/src/main/java/org/logstash/plugins/ConfigurationImpl.java
+++ b/logstash-core/src/main/java/org/logstash/plugins/ConfigurationImpl.java
@@ -1,10 +1,35 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins;
 
 import co.elastic.logstash.api.Configuration;
+import co.elastic.logstash.api.Password;
 import co.elastic.logstash.api.PluginConfigSpec;
 import co.elastic.logstash.api.Codec;
+import org.jruby.RubyObject;
 import org.logstash.config.ir.compiler.RubyIntegration;
+import org.logstash.plugins.factory.RubyCodecDelegator;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Collection;
 import java.util.Map;
 
@@ -39,6 +64,27 @@ public final class ConfigurationImpl implements Configuration {
             Object o = rawSettings.get(configSpec.name());
             if (configSpec.type().isAssignableFrom(o.getClass())) {
                 return (T) o;
+            } else if (configSpec.type() == Double.class && o.getClass() == Long.class) {
+                return configSpec.type().cast(((Long)o).doubleValue());
+            } else if (configSpec.type() == Boolean.class && o instanceof String) {
+                return configSpec.type().cast(Boolean.parseBoolean((String) o));
+            } else if (configSpec.type() == Codec.class && o instanceof String && pluginFactory != null) {
+                Codec codec = pluginFactory.buildDefaultCodec((String) o);
+                return configSpec.type().cast(codec);
+            } else if (configSpec.type() == Codec.class && o instanceof RubyObject && RubyCodecDelegator.isRubyCodecSubclass((RubyObject) o)) {
+                Codec codec = pluginFactory.buildRubyCodecWrapper((RubyObject) o);
+                return configSpec.type().cast(codec);
+            } else if (configSpec.type() == URI.class && o instanceof String) {
+                try {
+                    URI uri = new URI((String) o);
+                    return configSpec.type().cast(uri);
+                } catch (URISyntaxException ex) {
+                    throw new IllegalStateException(
+                            String.format("Invalid URI specified for '%s'", configSpec.name()));
+                }
+            } else if (configSpec.type() == Password.class && o instanceof String) {
+                Password p = new Password((String) o);
+                return configSpec.type().cast(p);
             } else {
                 throw new IllegalStateException(
                         String.format("Setting value for '%s' of type '%s' incompatible with defined type of '%s'",
@@ -47,6 +93,17 @@ public final class ConfigurationImpl implements Configuration {
         } else if (configSpec.type() == Codec.class && configSpec.getRawDefaultValue() != null && pluginFactory != null) {
             Codec codec = pluginFactory.buildDefaultCodec(configSpec.getRawDefaultValue());
             return configSpec.type().cast(codec);
+        } else if (configSpec.type() == URI.class && configSpec.getRawDefaultValue() != null) {
+            try {
+                URI uri = new URI(configSpec.getRawDefaultValue());
+                return configSpec.type().cast(uri);
+            } catch (URISyntaxException ex) {
+                throw new IllegalStateException(
+                        String.format("Invalid default URI specified for '%s'", configSpec.name()));
+            }
+        } else if (configSpec.type() == Password.class && configSpec.getRawDefaultValue() != null) {
+            Password p = new Password(configSpec.getRawDefaultValue());
+            return configSpec.type().cast(p);
         } else {
             return configSpec.defaultValue();
         }
@@ -66,5 +123,4 @@ public final class ConfigurationImpl implements Configuration {
     public Collection<String> allKeys() {
         return rawSettings.keySet();
     }
-
 }
diff --git a/logstash-core/src/main/java/org/logstash/plugins/ContextImpl.java b/logstash-core/src/main/java/org/logstash/plugins/ContextImpl.java
index a8ff8411e..655242f2f 100644
--- a/logstash-core/src/main/java/org/logstash/plugins/ContextImpl.java
+++ b/logstash-core/src/main/java/org/logstash/plugins/ContextImpl.java
@@ -1,23 +1,45 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins;
 
-import co.elastic.logstash.api.Context;
-import co.elastic.logstash.api.Event;
-import co.elastic.logstash.api.EventFactory;
-import co.elastic.logstash.api.Plugin;
+import co.elastic.logstash.api.*;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.logstash.ConvertedMap;
-import org.logstash.common.io.DeadLetterQueueWriter;
-
-import java.io.Serializable;
-import java.util.Map;
+import org.logstash.log.DefaultDeprecationLogger;
 
+/**
+ * Default implementation of Logstash Plugin's {@link Context}
+ * */
 public class ContextImpl implements Context {
 
     private DeadLetterQueueWriter dlqWriter;
 
-    public ContextImpl(DeadLetterQueueWriter dlqWriter) {
+    /**
+     * This is a reference to the [stats, pipelines, *name*, plugins] metric namespace.
+     */
+    private Metric pluginsScopedMetric;
+
+    public ContextImpl(DeadLetterQueueWriter dlqWriter, Metric metric) {
         this.dlqWriter = dlqWriter;
+        this.pluginsScopedMetric = metric;
     }
 
     @Override
@@ -25,26 +47,23 @@ public class ContextImpl implements Context {
         return dlqWriter;
     }
 
+    @Override
+    public NamespacedMetric getMetric(Plugin plugin) {
+        return pluginsScopedMetric.namespace(PluginLookup.PluginType.getTypeByPlugin(plugin).metricNamespace(), plugin.getId());
+    }
+
     @Override
     public Logger getLogger(Plugin plugin) {
         return LogManager.getLogger(plugin.getClass());
     }
 
     @Override
-    public EventFactory getEventFactory() {
-        return new EventFactory() {
-            @Override
-            public Event newEvent() {
-                return new org.logstash.Event();
-            }
+    public DeprecationLogger getDeprecationLogger(Plugin plugin) {
+        return new DefaultDeprecationLogger(getLogger(plugin));
+    }
 
-            @Override
-            public Event newEvent(Map<? extends Serializable, Object> data) {
-                if (data instanceof ConvertedMap) {
-                    return new org.logstash.Event((ConvertedMap)data);
-                }
-                return new org.logstash.Event(data);
-            }
-        };
+    @Override
+    public EventFactory getEventFactory() {
+        return BasicEventFactory.INSTANCE;
     }
 }
diff --git a/logstash-core/src/main/java/org/logstash/plugins/CounterMetricImpl.java b/logstash-core/src/main/java/org/logstash/plugins/CounterMetricImpl.java
new file mode 100644
index 000000000..1d3cd839d
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/CounterMetricImpl.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.plugins;
+
+import co.elastic.logstash.api.CounterMetric;
+import org.jruby.runtime.ThreadContext;
+import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
+import org.logstash.instrument.metrics.counter.LongCounter;
+
+/**
+ * Default implementation of {@link CounterMetric}
+ * */
+public class CounterMetricImpl implements CounterMetric {
+    private LongCounter longCounter;
+
+    public CounterMetricImpl(final ThreadContext threadContext,
+                             final AbstractNamespacedMetricExt metrics,
+                             final String metric) {
+        this.longCounter = LongCounter.fromRubyBase(metrics, threadContext.getRuntime().newString(metric).intern());
+    }
+
+    @Override
+    public void increment() {
+        this.longCounter.increment();
+    }
+
+    @Override
+    public void increment(final long delta) {
+        this.longCounter.increment(delta);
+    }
+
+    @Override
+    public long getValue() {
+        return this.longCounter.getValue();
+    }
+
+    @Override
+    public void reset() {
+        this.longCounter.reset();
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/HooksRegistryExt.java b/logstash-core/src/main/java/org/logstash/plugins/HooksRegistryExt.java
index e3d2555d9..516163e06 100644
--- a/logstash-core/src/main/java/org/logstash/plugins/HooksRegistryExt.java
+++ b/logstash-core/src/main/java/org/logstash/plugins/HooksRegistryExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins;
 
 import org.jruby.Ruby;
@@ -14,6 +34,9 @@ import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+/**
+ * JRuby extension class that collect all the emitters and hooks
+ * */
 @JRubyClass(name = "HooksRegistry")
 public final class HooksRegistryExt extends RubyObject {
 
diff --git a/logstash-core/src/main/java/org/logstash/plugins/NamespacedMetricImpl.java b/logstash-core/src/main/java/org/logstash/plugins/NamespacedMetricImpl.java
new file mode 100644
index 000000000..bb61ac12a
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/NamespacedMetricImpl.java
@@ -0,0 +1,130 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.plugins;
+
+import co.elastic.logstash.api.CounterMetric;
+import co.elastic.logstash.api.Metric;
+import co.elastic.logstash.api.NamespacedMetric;
+import org.jruby.RubyArray;
+import org.jruby.RubyObject;
+import org.jruby.RubySymbol;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.logstash.Rubyfier;
+import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
+import org.logstash.instrument.metrics.timer.TimerMetric;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+/**
+ * Wraps a {@link AbstractNamespacedMetricExt} that represents a nested namespace and adds
+ * metrics and other namespaces to it.
+ */
+public class NamespacedMetricImpl implements NamespacedMetric {
+
+    private final ThreadContext threadContext;
+
+    private final AbstractNamespacedMetricExt metrics;
+
+    public NamespacedMetricImpl(final ThreadContext threadContext, final AbstractNamespacedMetricExt metrics) {
+        this.threadContext = threadContext;
+        this.metrics = metrics;
+    }
+
+    @Override
+    public void gauge(final String key, final Object value) {
+        this.metrics.gauge(this.threadContext, this.getSymbol(key), Rubyfier.deep(this.threadContext.getRuntime(), value));
+    }
+
+    @Override
+    public CounterMetric counter(final String metric) {
+        return new CounterMetricImpl(this.threadContext, this.metrics, metric);
+    }
+
+    @Override
+    public co.elastic.logstash.api.TimerMetric timer(final String metric) {
+        return TimerMetric.fromRubyBase(metrics, threadContext.getRuntime().newString(metric).intern());
+    }
+
+    @Override
+    public NamespacedMetric namespace(final String... key) {
+        final IRubyObject[] rubyfiedKeys = Stream.of(key)
+            .map(this::getSymbol)
+            .toArray(IRubyObject[]::new);
+
+        return new NamespacedMetricImpl(
+            this.threadContext,
+            this.metrics.namespace(this.threadContext, RubyArray.newArray(this.threadContext.getRuntime(), rubyfiedKeys))
+        );
+    }
+
+    @Override
+    public void increment(final String key) {
+        this.metrics.increment(this.threadContext, new IRubyObject[] { this.getSymbol(key) });
+    }
+
+    @Override
+    public void increment(final String key, final int amount) {
+        this.metrics.increment(this.threadContext, new IRubyObject[] {
+            this.getSymbol(key),
+            this.convert(amount)
+        });
+    }
+
+    @Override
+    public <T> T time(final String key, final Supplier<T> callable) {
+        return timer(key).time(callable::get);
+    }
+
+    @Override
+    public void reportTime(final String key, final long duration) {
+        timer(key).reportUntrackedMillis(duration);
+    }
+
+    @Override
+    public String[] namespaceName() {
+        final List<String> names = new ArrayList<>();
+
+        for (final Object o : this.metrics.namespaceName(this.threadContext)) {
+            if (o instanceof RubyObject) {
+                names.add(((RubyObject) o).to_s().toString());
+            }
+        }
+
+        return names.toArray(new String[0]);
+    }
+
+    @Override
+    public Metric root() {
+        return new RootMetricImpl(this.threadContext, this.metrics.root(this.threadContext));
+    }
+
+    private RubySymbol getSymbol(final String s) {
+        return this.threadContext.getRuntime().newString(s).intern();
+    }
+
+    private IRubyObject convert(final Object o) {
+        return Rubyfier.deep(this.threadContext.getRuntime(), o);
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/PluginClassLoader.java b/logstash-core/src/main/java/org/logstash/plugins/PluginClassLoader.java
new file mode 100644
index 000000000..03688370f
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/PluginClassLoader.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.plugins;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ * Classloader for Java plugins to isolate their dependencies. Will not load any classes in the
+ * <code>co.elastic.logstash</code> or <code>org.logstash</code> packages to avoid the possibility
+ * of clashes with classes in Logstash core.
+ */
+public class PluginClassLoader extends URLClassLoader {
+
+    private ClassLoader appClassLoader;
+
+    private PluginClassLoader(URL[] urls, ClassLoader appClassLoader) {
+        super(urls, null);
+        this.appClassLoader = appClassLoader;
+    }
+
+    /**
+     * Creates an instance of the plugin classloader.
+     * @param jarPath Full path to the Java plugin's JAR file.
+     * @param appClassLoader Application classloader to be used for classes not found
+     *                       in the plugin's JAR file.
+     * @return New instance of the plugin classloader.
+     */
+    public static PluginClassLoader create(String jarPath, ClassLoader appClassLoader) {
+        Path pluginJar = Paths.get(jarPath);
+        if (!Files.exists(pluginJar)) {
+            throw new IllegalStateException("PluginClassLoader unable to locate jar file: " + jarPath);
+        }
+        try {
+            URL[] pluginJarUrl = new URL[]{pluginJar.toUri().toURL()};
+            return new PluginClassLoader(pluginJarUrl, appClassLoader);
+        } catch (MalformedURLException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    @Override
+    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+        synchronized (getClassLoadingLock(name)) {
+            Class<?> c = findLoadedClass(name);
+            if (!name.startsWith("co.elastic.logstash.") && !name.startsWith("org.logstash.")) {
+                if (c == null) {
+                    try {
+                        c = findClass(name);
+                    } catch (ClassNotFoundException e) {
+                        c = super.loadClass(name, resolve);
+                    }
+                }
+            } else {
+                c = appClassLoader.loadClass(name);
+            }
+            if (resolve) {
+                resolveClass(c);
+            }
+            return c;
+        }
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/PluginFactoryExt.java b/logstash-core/src/main/java/org/logstash/plugins/PluginFactoryExt.java
deleted file mode 100644
index 1176058fa..000000000
--- a/logstash-core/src/main/java/org/logstash/plugins/PluginFactoryExt.java
+++ /dev/null
@@ -1,449 +0,0 @@
-package org.logstash.plugins;
-
-import co.elastic.logstash.api.Configuration;
-import co.elastic.logstash.api.Context;
-import co.elastic.logstash.api.Codec;
-import co.elastic.logstash.api.Filter;
-import co.elastic.logstash.api.Input;
-import co.elastic.logstash.api.Output;
-import org.jruby.Ruby;
-import org.jruby.RubyArray;
-import org.jruby.RubyBasicObject;
-import org.jruby.RubyClass;
-import org.jruby.RubyHash;
-import org.jruby.RubyInteger;
-import org.jruby.RubyString;
-import org.jruby.RubySymbol;
-import org.jruby.anno.JRubyClass;
-import org.jruby.anno.JRubyMethod;
-import org.jruby.javasupport.JavaUtil;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.logstash.RubyUtil;
-import org.logstash.common.AbstractDeadLetterQueueWriterExt;
-import org.logstash.common.io.DeadLetterQueueWriter;
-import org.logstash.config.ir.PipelineIR;
-import org.logstash.config.ir.compiler.AbstractFilterDelegatorExt;
-import org.logstash.config.ir.compiler.AbstractOutputDelegatorExt;
-import org.logstash.config.ir.compiler.FilterDelegatorExt;
-import org.logstash.config.ir.compiler.JavaFilterDelegatorExt;
-import org.logstash.config.ir.compiler.JavaInputDelegatorExt;
-import org.logstash.config.ir.compiler.JavaOutputDelegatorExt;
-import org.logstash.config.ir.compiler.OutputDelegatorExt;
-import org.logstash.config.ir.compiler.OutputStrategyExt;
-import org.logstash.config.ir.compiler.RubyIntegration;
-import org.logstash.config.ir.graph.Vertex;
-import org.logstash.execution.ExecutionContextExt;
-import org.logstash.execution.JavaBasePipelineExt;
-import org.logstash.instrument.metrics.AbstractMetricExt;
-import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
-import org.logstash.instrument.metrics.MetricKeys;
-import org.logstash.instrument.metrics.NullMetricExt;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Map;
-import java.util.UUID;
-
-public final class PluginFactoryExt {
-
-    @JRubyClass(name = "PluginFactory")
-    public static final class Plugins extends RubyBasicObject
-        implements RubyIntegration.PluginFactory {
-
-        private static final long serialVersionUID = 1L;
-
-        private static final RubyString ID_KEY = RubyUtil.RUBY.newString("id");
-
-        private final Collection<String> pluginsById = new HashSet<>();
-
-        private PipelineIR lir;
-
-        private PluginFactoryExt.ExecutionContext executionContext;
-
-        private PluginFactoryExt.Metrics metrics;
-
-        private RubyClass filterClass;
-
-        @JRubyMethod(name = "filter_delegator", meta = true, required = 5)
-        public static IRubyObject filterDelegator(final ThreadContext context,
-                                                  final IRubyObject recv, final IRubyObject[] args) {
-            final RubyHash arguments = (RubyHash) args[2];
-            final IRubyObject filterInstance = args[1].callMethod(context, "new", arguments);
-            final RubyString id = (RubyString) arguments.op_aref(context, ID_KEY);
-            filterInstance.callMethod(
-                    context, "metric=",
-                    ((AbstractMetricExt) args[3]).namespace(context, id.intern())
-            );
-            filterInstance.callMethod(context, "execution_context=", args[4]);
-            return new FilterDelegatorExt(context.runtime, RubyUtil.FILTER_DELEGATOR_CLASS)
-                    .initialize(context, filterInstance, id);
-        }
-
-        public Plugins(final Ruby runtime, final RubyClass metaClass) {
-            super(runtime, metaClass);
-        }
-
-        @JRubyMethod(required = 4)
-        public PluginFactoryExt.Plugins initialize(final ThreadContext context,
-                                                   final IRubyObject[] args) {
-            return init(
-                    args[0].toJava(PipelineIR.class),
-                    (PluginFactoryExt.Metrics) args[1], (PluginFactoryExt.ExecutionContext) args[2],
-                    (RubyClass) args[3]
-            );
-        }
-
-        public PluginFactoryExt.Plugins init(final PipelineIR lir, final PluginFactoryExt.Metrics metrics,
-                                             final PluginFactoryExt.ExecutionContext executionContext,
-                                             final RubyClass filterClass) {
-            this.lir = lir;
-            this.metrics = metrics;
-            this.executionContext = executionContext;
-            this.filterClass = filterClass;
-            return this;
-        }
-
-        @SuppressWarnings("unchecked")
-        @Override
-        public IRubyObject buildInput(final RubyString name, final RubyInteger line, final RubyInteger column,
-                                      final IRubyObject args, Map<String, Object> pluginArgs) {
-            return plugin(
-                    RubyUtil.RUBY.getCurrentContext(), PluginLookup.PluginType.INPUT,
-                    name.asJavaString(), line.getIntValue(), column.getIntValue(),
-                    (Map<String, IRubyObject>) args, pluginArgs
-            );
-        }
-
-        @JRubyMethod(required = 4)
-        public IRubyObject buildInput(final ThreadContext context, final IRubyObject[] args) {
-            return buildInput(
-                    (RubyString) args[0], args[1].convertToInteger(), args[2].convertToInteger(),
-                    args[3], null
-            );
-        }
-
-        @SuppressWarnings("unchecked")
-        @Override
-        public AbstractOutputDelegatorExt buildOutput(final RubyString name, final RubyInteger line,
-                                                      final RubyInteger column, final IRubyObject args,
-                                                      Map<String, Object> pluginArgs) {
-            return (AbstractOutputDelegatorExt) plugin(
-                    RubyUtil.RUBY.getCurrentContext(), PluginLookup.PluginType.OUTPUT,
-                    name.asJavaString(), line.getIntValue(), column.getIntValue(),
-                    (Map<String, IRubyObject>) args, pluginArgs
-            );
-        }
-
-        @JRubyMethod(required = 4)
-        public AbstractOutputDelegatorExt buildOutput(final ThreadContext context,
-                                                      final IRubyObject[] args) {
-            return buildOutput(
-                    (RubyString) args[0], args[1].convertToInteger(), args[2].convertToInteger(), args[3], null
-            );
-        }
-
-        @SuppressWarnings("unchecked")
-        @Override
-        public AbstractFilterDelegatorExt buildFilter(final RubyString name, final RubyInteger line,
-                                                      final RubyInteger column, final IRubyObject args,
-                                                      Map<String, Object> pluginArgs) {
-            return (AbstractFilterDelegatorExt) plugin(
-                    RubyUtil.RUBY.getCurrentContext(), PluginLookup.PluginType.FILTER,
-                    name.asJavaString(), line.getIntValue(), column.getIntValue(),
-                    (Map<String, IRubyObject>) args, pluginArgs
-            );
-        }
-
-        @SuppressWarnings("unchecked")
-        @Override
-        public IRubyObject buildCodec(final RubyString name, final IRubyObject args, Map<String, Object> pluginArgs) {
-            return plugin(
-                    RubyUtil.RUBY.getCurrentContext(), PluginLookup.PluginType.CODEC,
-                    name.asJavaString(), 0, 0, (Map<String, IRubyObject>) args, pluginArgs
-            );
-        }
-
-        @Override
-        public Codec buildDefaultCodec(String codecName) {
-            return (Codec) JavaUtil.unwrapJavaValue(plugin(
-                    RubyUtil.RUBY.getCurrentContext(), PluginLookup.PluginType.CODEC,
-                    codecName, 0, 0, Collections.emptyMap(), Collections.emptyMap()
-            ));
-        }
-
-        @SuppressWarnings("unchecked")
-        @JRubyMethod(required = 4, optional = 1)
-        public IRubyObject plugin(final ThreadContext context, final IRubyObject[] args) {
-            return plugin(
-                    context,
-                    PluginLookup.PluginType.valueOf(args[0].asJavaString().toUpperCase(Locale.ENGLISH)),
-                    args[1].asJavaString(),
-                    args[2].convertToInteger().getIntValue(),
-                    args[3].convertToInteger().getIntValue(),
-                    args.length > 4 ? (Map<String, IRubyObject>) args[4] : new HashMap<>(),
-                    null
-            );
-        }
-
-        @SuppressWarnings("unchecked")
-        private IRubyObject plugin(final ThreadContext context, final PluginLookup.PluginType type, final String name,
-                                   final int line, final int column, final Map<String, IRubyObject> args,
-                                   Map<String, Object> pluginArgs) {
-            final String id;
-            final PluginLookup.PluginClass pluginClass = PluginLookup.lookup(type, name);
-
-            if (type == PluginLookup.PluginType.CODEC) {
-                id = UUID.randomUUID().toString();
-            } else {
-                id = lir.getGraph().vertices().filter(
-                        v -> v.getSourceWithMetadata() != null
-                                && v.getSourceWithMetadata().getLine() == line
-                                && v.getSourceWithMetadata().getColumn() == column
-                ).findFirst().map(Vertex::getId).orElse(null);
-            }
-            if (id == null) {
-                throw context.runtime.newRaiseException(
-                        RubyUtil.CONFIGURATION_ERROR_CLASS,
-                        String.format(
-                                "Could not determine ID for %s/%s", type.rubyLabel().asJavaString(), name
-                        )
-                );
-            }
-            if (pluginsById.contains(id)) {
-                throw context.runtime.newRaiseException(
-                        RubyUtil.CONFIGURATION_ERROR_CLASS,
-                        String.format("Two plugins have the id '%s', please fix this conflict", id)
-                );
-            }
-            pluginsById.add(id);
-            final AbstractNamespacedMetricExt typeScopedMetric = metrics.create(context, type.rubyLabel());
-
-            if (pluginClass.language() == PluginLookup.PluginLanguage.RUBY) {
-
-                final Map<String, Object> newArgs = new HashMap<>(args);
-                newArgs.put("id", id);
-                final RubyClass klass = (RubyClass) pluginClass.klass();
-                final ExecutionContextExt executionCntx = executionContext.create(
-                        context, RubyUtil.RUBY.newString(id), klass.callMethod(context, "config_name")
-                );
-                final RubyHash rubyArgs = RubyHash.newHash(context.runtime);
-                rubyArgs.putAll(newArgs);
-                if (type == PluginLookup.PluginType.OUTPUT) {
-                    return new OutputDelegatorExt(context.runtime, RubyUtil.RUBY_OUTPUT_DELEGATOR_CLASS).initialize(
-                            context,
-                            new IRubyObject[]{
-                                    klass, typeScopedMetric, executionCntx,
-                                    OutputStrategyExt.OutputStrategyRegistryExt.instance(context, null),
-                                    rubyArgs
-                            }
-                    );
-                } else if (type == PluginLookup.PluginType.FILTER) {
-                    return filterDelegator(
-                            context, null,
-                            new IRubyObject[]{
-                                    filterClass, klass, rubyArgs, typeScopedMetric, executionCntx
-                            }
-                    );
-                } else {
-                    final IRubyObject pluginInstance = klass.callMethod(context, "new", rubyArgs);
-                    final AbstractNamespacedMetricExt scopedMetric = typeScopedMetric.namespace(context, RubyUtil.RUBY.newSymbol(id));
-                    scopedMetric.gauge(context, MetricKeys.NAME_KEY, pluginInstance.callMethod(context, "config_name"));
-                    pluginInstance.callMethod(context, "metric=", scopedMetric);
-                    pluginInstance.callMethod(context, "execution_context=", executionCntx);
-                    return pluginInstance;
-                }
-            } else {
-                if (type == PluginLookup.PluginType.OUTPUT) {
-                    final Class<Output> cls = (Class<Output>) pluginClass.klass();
-                    Output output = null;
-                    if (cls != null) {
-                        try {
-                            final Constructor<Output> ctor = cls.getConstructor(String.class, Configuration.class, Context.class);
-                            Configuration config = new ConfigurationImpl(pluginArgs, this);
-                            output = ctor.newInstance(id, config, executionContext.toContext(type));
-                            PluginUtil.validateConfig(output, config);
-                        } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException ex) {
-                            throw new IllegalStateException(ex);
-                        }
-                    }
-
-                    if (output != null) {
-                        return JavaOutputDelegatorExt.create(name, id, typeScopedMetric, output);
-                    } else {
-                        throw new IllegalStateException("Unable to instantiate output: " + pluginClass);
-                    }
-                } else if (type == PluginLookup.PluginType.FILTER) {
-                    final Class<Filter> cls = (Class<Filter>) pluginClass.klass();
-                    Filter filter = null;
-                    if (cls != null) {
-                        try {
-                            final Constructor<Filter> ctor = cls.getConstructor(String.class, Configuration.class, Context.class);
-                            Configuration config = new ConfigurationImpl(pluginArgs);
-                            filter = ctor.newInstance(id, config, executionContext.toContext(type));
-                            PluginUtil.validateConfig(filter, config);
-                        } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException ex) {
-                            throw new IllegalStateException(ex);
-                        }
-                    }
-
-                    if (filter != null) {
-                        return JavaFilterDelegatorExt.create(name, id, typeScopedMetric, filter, pluginArgs);
-                    } else {
-                        throw new IllegalStateException("Unable to instantiate filter: " + pluginClass);
-                    }
-                } else if (type == PluginLookup.PluginType.INPUT) {
-                    final Class<Input> cls = (Class<Input>) pluginClass.klass();
-                    Input input = null;
-                    if (cls != null) {
-                        try {
-                            final Constructor<Input> ctor = cls.getConstructor(String.class, Configuration.class, Context.class);
-                            Configuration config = new ConfigurationImpl(pluginArgs, this);
-                            input = ctor.newInstance(id, config, executionContext.toContext(type));
-                            PluginUtil.validateConfig(input, config);
-                        } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException ex) {
-                            if (ex instanceof InvocationTargetException) {
-                                throw new IllegalStateException((ex).getCause());
-                            }
-                            throw new IllegalStateException(ex);
-                        }
-                    }
-
-                    if (input != null) {
-                        return JavaInputDelegatorExt.create((JavaBasePipelineExt) executionContext.pipeline, typeScopedMetric, input, pluginArgs);
-                    } else {
-                        throw new IllegalStateException("Unable to instantiate input: " + pluginClass);
-                    }
-                } else if (type == PluginLookup.PluginType.CODEC) {
-                    final Class<Codec> cls = (Class<Codec>) pluginClass.klass();
-                    Codec codec = null;
-                    if (cls != null) {
-                        try {
-                            final Constructor<Codec> ctor = cls.getConstructor(Configuration.class, Context.class);
-                            Configuration config = new ConfigurationImpl(pluginArgs);
-                            codec = ctor.newInstance(config, executionContext.toContext(type));
-                            PluginUtil.validateConfig(codec, config);
-                        } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException ex) {
-                            if (ex instanceof InvocationTargetException) {
-                                throw new IllegalStateException((ex).getCause());
-                            }
-                            throw new IllegalStateException(ex);
-                        }
-                    }
-
-                    if (codec != null) {
-                        return JavaUtil.convertJavaToRuby(RubyUtil.RUBY, codec);
-                    } else {
-                        throw new IllegalStateException("Unable to instantiate codec: " + pluginClass);
-                    }
-                }
-                else {
-                    throw new IllegalStateException("Unable to create plugin: " + pluginClass.toReadableString());
-                }
-            }
-        }
-    }
-
-    @JRubyClass(name = "ExecutionContextFactory")
-    public static final class ExecutionContext extends RubyBasicObject {
-
-        private static final long serialVersionUID = 1L;
-
-        private IRubyObject agent;
-
-        private IRubyObject pipeline;
-
-        private IRubyObject dlqWriter;
-
-        public ExecutionContext(final Ruby runtime, final RubyClass metaClass) {
-            super(runtime, metaClass);
-        }
-
-        @JRubyMethod
-        public PluginFactoryExt.ExecutionContext initialize(final ThreadContext context,
-            final IRubyObject agent, final IRubyObject pipeline, final IRubyObject dlqWriter) {
-            this.agent = agent;
-            this.pipeline = pipeline;
-            this.dlqWriter = dlqWriter;
-            return this;
-        }
-
-        @JRubyMethod
-        public ExecutionContextExt create(final ThreadContext context, final IRubyObject id,
-            final IRubyObject classConfigName) {
-            return new ExecutionContextExt(
-                context.runtime, RubyUtil.EXECUTION_CONTEXT_CLASS
-            ).initialize(
-                context, new IRubyObject[]{pipeline, agent, id, classConfigName, dlqWriter}
-            );
-        }
-
-        public Context toContext(PluginLookup.PluginType pluginType) {
-            DeadLetterQueueWriter dlq = null;
-            if (pluginType == PluginLookup.PluginType.OUTPUT) {
-                if (dlqWriter instanceof AbstractDeadLetterQueueWriterExt.PluginDeadLetterQueueWriterExt) {
-                    IRubyObject innerWriter =
-                            ((AbstractDeadLetterQueueWriterExt.PluginDeadLetterQueueWriterExt) dlqWriter)
-                                    .innerWriter(RubyUtil.RUBY.getCurrentContext());
-
-                    if (innerWriter != null) {
-                        if (innerWriter.getJavaClass().equals(DeadLetterQueueWriter.class)) {
-                            dlq = innerWriter.toJava(DeadLetterQueueWriter.class);
-                        }
-                    }
-                }
-            }
-
-            return new ContextImpl(dlq);
-        }
-    }
-
-    @JRubyClass(name = "PluginMetricFactory")
-    public static final class Metrics extends RubyBasicObject {
-
-        private static final long serialVersionUID = 1L;
-
-        private static final RubySymbol PLUGINS = RubyUtil.RUBY.newSymbol("plugins");
-
-        private RubySymbol pipelineId;
-
-        private AbstractMetricExt metric;
-
-        public Metrics(final Ruby runtime, final RubyClass metaClass) {
-            super(runtime, metaClass);
-        }
-
-        @JRubyMethod
-        public PluginFactoryExt.Metrics initialize(final ThreadContext context,
-            final IRubyObject pipelineId, final IRubyObject metrics) {
-            this.pipelineId = pipelineId.convertToString().intern();
-            if (metrics.isNil()) {
-                this.metric = new NullMetricExt(context.runtime, RubyUtil.NULL_METRIC_CLASS);
-            } else {
-                this.metric = (AbstractMetricExt) metrics;
-            }
-            return this;
-        }
-
-        @JRubyMethod
-        public AbstractNamespacedMetricExt create(final ThreadContext context, final IRubyObject pluginType) {
-            return metric.namespace(
-                context,
-                RubyArray.newArray(
-                    context.runtime,
-                    Arrays.asList(
-                        MetricKeys.STATS_KEY, MetricKeys.PIPELINES_KEY, pipelineId, PLUGINS
-                    )
-                )
-            ).namespace(
-                context, RubyUtil.RUBY.newSymbol(String.format("%ss", pluginType.asJavaString()))
-            );
-        }
-    }
-}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/PluginLookup.java b/logstash-core/src/main/java/org/logstash/plugins/PluginLookup.java
index ef946c065..fbef56f73 100644
--- a/logstash-core/src/main/java/org/logstash/plugins/PluginLookup.java
+++ b/logstash-core/src/main/java/org/logstash/plugins/PluginLookup.java
@@ -1,31 +1,75 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins;
 
+import co.elastic.logstash.api.Codec;
+import co.elastic.logstash.api.Filter;
+import co.elastic.logstash.api.Input;
+import co.elastic.logstash.api.Output;
+import co.elastic.logstash.api.Plugin;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.jruby.RubyClass;
 import org.jruby.RubyString;
+import org.jruby.java.proxies.JavaProxy;
 import org.jruby.javasupport.JavaClass;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.logstash.RubyUtil;
 import org.logstash.plugins.discovery.PluginRegistry;
+import org.logstash.plugins.factory.PluginFactoryExt;
+
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Java Implementation of the plugin that is implemented by wrapping the Ruby
  * {@code LogStash::Plugin} class for the Ruby plugin lookup.
  */
-public final class PluginLookup {
+public final class PluginLookup implements PluginFactoryExt.PluginResolver {
+
+    private static final String INPUT_PLUGIN_TYPE_NAME = "input";
+    private static final String FILTER_PLUGIN_TYPE_NAME = "filter";
+    private static final String OUTPUT_PLUGIN_TYPE_NAME = "output";
+    private static final String CODEC_PLUGIN_TYPE_NAME = "codec";
 
     private static final IRubyObject RUBY_REGISTRY = RubyUtil.RUBY.executeScript(
             "require 'logstash/plugins/registry'\nrequire 'logstash/plugin'\nLogStash::Plugin",
             ""
     );
 
-    private PluginLookup() {
-        // Utility Class
+    private final PluginRegistry pluginRegistry;
+
+    public PluginLookup(PluginRegistry pluginRegistry) {
+        this.pluginRegistry = pluginRegistry;
     }
 
     @SuppressWarnings("rawtypes")
-    public static PluginLookup.PluginClass lookup(final PluginLookup.PluginType type, final String name) {
-        Class javaClass = PluginRegistry.getPluginClass(type, name);
+    @Override
+    public PluginClass resolve(PluginType type, String name) {
+        Class<?> javaClass = pluginRegistry.getPluginClass(type, name);
         if (javaClass != null) {
+
+            if (!PluginValidator.validatePlugin(type, javaClass)) {
+                throw new IllegalStateException("Java plugin '" + name + "' is incompatible with the current Logstash plugin API");
+            }
+
             return new PluginLookup.PluginClass() {
 
                 @Override
@@ -48,10 +92,16 @@ public final class PluginLookup {
                     ? PluginLanguage.RUBY
                     : PluginLanguage.JAVA;
 
-            Object resolvedClass = klass instanceof JavaClass
-                    ? ((JavaClass) klass).javaClass()
+            klass = (klass instanceof JavaProxy) ? ((JavaProxy) klass).getObject() : klass;
+
+            Object resolvedClass = klass instanceof java.lang.Class
+                    ? ((java.lang.Class) klass)
                     : klass;
 
+            if (language == PluginLanguage.JAVA && !PluginValidator.validatePlugin(type, (Class) resolvedClass)) {
+                throw new IllegalStateException("Java plugin '" + name + "' is incompatible with the current Logstash plugin API");
+            }
+
             return new PluginLookup.PluginClass() {
                 @Override
                 public PluginLookup.PluginLanguage language() {
@@ -66,6 +116,9 @@ public final class PluginLookup {
         }
     }
 
+    /**
+     * Descriptor of a plugin implementation. Defines the implementation language and the plugin class
+     * */
     public interface PluginClass {
         PluginLookup.PluginLanguage language();
 
@@ -76,21 +129,67 @@ public final class PluginLookup {
         }
     }
 
+    /**
+     * Enum all the implementation languages used by plugins
+     * */
     public enum PluginLanguage {
         JAVA, RUBY
     }
 
+    /**
+     * Enum all the plugins types used inside Logstash
+     * */
     public enum PluginType {
-        INPUT("input"), FILTER("filter"), OUTPUT("output"), CODEC("codec");
 
-        private final RubyString label;
+        @JsonProperty(INPUT_PLUGIN_TYPE_NAME)
+        INPUT(INPUT_PLUGIN_TYPE_NAME, "inputs", Input.class),
 
-        PluginType(final String label) {
-            this.label = RubyUtil.RUBY.newString(label);
+        @JsonProperty(FILTER_PLUGIN_TYPE_NAME)
+        FILTER(FILTER_PLUGIN_TYPE_NAME, "filters", Filter.class),
+
+        @JsonProperty(OUTPUT_PLUGIN_TYPE_NAME)
+        OUTPUT(OUTPUT_PLUGIN_TYPE_NAME, "outputs", Output.class),
+
+        @JsonProperty(CODEC_PLUGIN_TYPE_NAME)
+        CODEC(CODEC_PLUGIN_TYPE_NAME, "codecs", Codec.class);
+
+        private final RubyString rubyLabel;
+        private final String metricNamespace;
+        private final Class<? extends Plugin> pluginClass;
+
+        PluginType(final String label, final String metricNamespace, final Class<? extends Plugin> pluginClass) {
+            this.rubyLabel = RubyUtil.RUBY.newString(label);
+            this.metricNamespace = metricNamespace;
+            this.pluginClass = pluginClass;
         }
 
         public RubyString rubyLabel() {
-            return label;
+            return rubyLabel;
+        }
+
+        public String metricNamespace() {
+            return metricNamespace;
+        }
+
+        public Class<? extends Plugin> pluginClass() {
+            return pluginClass;
+        }
+
+        public static PluginType getTypeByPlugin(Plugin plugin) {
+            for (final PluginType type : PluginType.values()) {
+                if (type.pluginClass().isInstance(plugin)) {
+                    return type;
+                }
+            }
+
+            final String allowedPluginTypes = Stream.of(PluginType.values())
+                .map((t) -> t.pluginClass().getName()).collect(Collectors.joining(", "));
+
+            throw new IllegalArgumentException(String.format(
+                "Plugin [%s] does not extend one of: %s",
+                plugin.getName(),
+                allowedPluginTypes
+            ));
         }
     }
 }
diff --git a/logstash-core/src/main/java/org/logstash/plugins/PluginUtil.java b/logstash-core/src/main/java/org/logstash/plugins/PluginUtil.java
index 23e450f85..3a23e1814 100644
--- a/logstash-core/src/main/java/org/logstash/plugins/PluginUtil.java
+++ b/logstash-core/src/main/java/org/logstash/plugins/PluginUtil.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins;
 
 import co.elastic.logstash.api.Configuration;
@@ -13,6 +33,9 @@ import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 
+/**
+ * Plugin's utility methods
+ * */
 public class PluginUtil {
 
     private PluginUtil() { /* utility methods */ }
diff --git a/logstash-core/src/main/java/org/logstash/plugins/PluginValidator.java b/logstash-core/src/main/java/org/logstash/plugins/PluginValidator.java
new file mode 100644
index 000000000..458d21fbf
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/PluginValidator.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.plugins;
+
+import co.elastic.logstash.api.Codec;
+import co.elastic.logstash.api.Filter;
+import co.elastic.logstash.api.Input;
+import co.elastic.logstash.api.Output;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+/**
+ * Validates that Java plugins support the Java plugin API in this release of Logstash.
+ */
+public class PluginValidator {
+
+    private static final Method[] inputMethods;
+    private static final Method[] filterMethods;
+    private static final Method[] codecMethods;
+    private static final Method[] outputMethods;
+
+    static {
+        inputMethods = Input.class.getMethods();
+        filterMethods = Filter.class.getMethods();
+        codecMethods = Codec.class.getMethods();
+        outputMethods = Output.class.getMethods();
+    }
+
+    public static boolean validatePlugin(PluginLookup.PluginType type, Class<?> pluginClass) {
+        switch (type) {
+            case INPUT:
+                return containsAllMethods(inputMethods, pluginClass.getMethods());
+            case FILTER:
+                return containsAllMethods(filterMethods, pluginClass.getMethods());
+            case CODEC:
+                return containsAllMethods(codecMethods, pluginClass.getMethods());
+            case OUTPUT:
+                return containsAllMethods(outputMethods, pluginClass.getMethods());
+            default:
+                throw new IllegalStateException("Unknown plugin type for validation: " + type);
+        }
+    }
+
+    private static boolean containsAllMethods(Method[] apiMethods, Method[] pluginMethods) {
+        boolean matches = true;
+        for (int k = 0; matches && k < apiMethods.length; k++) {
+            int finalK = k;
+            matches = Arrays.stream(pluginMethods).anyMatch(m -> methodsMatch(apiMethods[finalK], m));
+        }
+        return matches;
+    }
+
+    private static boolean methodsMatch(Method apiMethod, Method pluginMethod) {
+        return apiMethod.getName().equals(pluginMethod.getName()) &&
+                apiMethod.getReturnType() == pluginMethod.getReturnType() &&
+                Arrays.equals(apiMethod.getParameterTypes(), pluginMethod.getParameterTypes());
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/RootMetricImpl.java b/logstash-core/src/main/java/org/logstash/plugins/RootMetricImpl.java
new file mode 100644
index 000000000..c28d8f1c0
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/RootMetricImpl.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.plugins;
+
+import co.elastic.logstash.api.Metric;
+import co.elastic.logstash.api.NamespacedMetric;
+import org.jruby.RubyArray;
+import org.jruby.RubyString;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.logstash.instrument.metrics.AbstractMetricExt;
+
+import java.util.stream.Stream;
+
+/**
+ * Wraps a {@link AbstractMetricExt} and represents a "root metric" that must be
+ * namespaced in order to write metrics to.
+ */
+public class RootMetricImpl implements Metric {
+    private final ThreadContext threadContext;
+    private final AbstractMetricExt metrics;
+
+    public RootMetricImpl(final ThreadContext threadContext, final AbstractMetricExt root) {
+        this.threadContext = threadContext;
+        this.metrics = root;
+    }
+
+    @Override
+    public NamespacedMetric namespace(final String... key) {
+        final IRubyObject[] rubyfiedKeys = Stream.of(key)
+            .map(this.threadContext.getRuntime()::newString)
+            .map(RubyString::intern)
+            .toArray(IRubyObject[]::new);
+
+        return new NamespacedMetricImpl(
+            this.threadContext,
+            this.metrics.namespace(this.threadContext, RubyArray.newArray(this.threadContext.getRuntime(), rubyfiedKeys))
+        );
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/UniversalPluginExt.java b/logstash-core/src/main/java/org/logstash/plugins/UniversalPluginExt.java
index a481ecfd1..cb00788a5 100644
--- a/logstash-core/src/main/java/org/logstash/plugins/UniversalPluginExt.java
+++ b/logstash-core/src/main/java/org/logstash/plugins/UniversalPluginExt.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins;
 
 import org.jruby.Ruby;
diff --git a/logstash-core/src/main/java/org/logstash/plugins/aliases/AliasDocumentReplace.java b/logstash-core/src/main/java/org/logstash/plugins/aliases/AliasDocumentReplace.java
new file mode 100644
index 000000000..1bbad6bc2
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/aliases/AliasDocumentReplace.java
@@ -0,0 +1,34 @@
+package org.logstash.plugins.aliases;
+
+import javax.annotation.Nonnull;
+
+/**
+ * A POJO class linked to {@link AliasPlugin} to map AliasRegistry.yml structure.
+ */
+public class AliasDocumentReplace {
+
+    /**
+     * A document entry need to be replaced.
+     */
+    @Nonnull
+    private String replace;
+
+    /**
+     * A value where document entry need to be replaced with.
+     */
+    @Nonnull
+    private String with;
+
+    public AliasDocumentReplace(String replace, String with) {
+        this.replace = replace;
+        this.with = with;
+    }
+
+    public String getReplace() {
+        return this.replace;
+    }
+
+    public String getWith() {
+        return this.with;
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/aliases/AliasPlugin.java b/logstash-core/src/main/java/org/logstash/plugins/aliases/AliasPlugin.java
new file mode 100644
index 000000000..dbf798708
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/aliases/AliasPlugin.java
@@ -0,0 +1,47 @@
+package org.logstash.plugins.aliases;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.List;
+
+/**
+ * A POJO class to map AliasRegistry.yml structure.
+ */
+public class AliasPlugin {
+
+    /**
+     * Name of the aliased plugin.
+     */
+    @Nonnull
+    private final String aliasName;
+
+    /**
+     * The plugin name where aliased plugin made from.
+     */
+    @Nonnull
+    private final String from;
+
+    /**
+     * List of replace entries when transforming artifact doc to aliased plugin doc.
+     */
+    @Nullable
+    private List<AliasDocumentReplace> docHeaderReplaces;
+
+    public AliasPlugin(String aliasName, String from, List<AliasDocumentReplace> docHeaderReplaces) {
+        this.aliasName = aliasName;
+        this.from = from;
+        this.docHeaderReplaces = docHeaderReplaces;
+    }
+
+    @Nonnull
+    public String getAliasName() {
+        return aliasName;
+    }
+
+    @Nonnull
+    public String getFrom() {
+        return from;
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/codecs/Dots.java b/logstash-core/src/main/java/org/logstash/plugins/codecs/Dots.java
new file mode 100644
index 000000000..acad62ff8
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/codecs/Dots.java
@@ -0,0 +1,88 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.plugins.codecs;
+
+import co.elastic.logstash.api.Codec;
+import co.elastic.logstash.api.Configuration;
+import co.elastic.logstash.api.Context;
+import co.elastic.logstash.api.Event;
+import co.elastic.logstash.api.LogstashPlugin;
+import co.elastic.logstash.api.PluginConfigSpec;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.Consumer;
+
+/**
+ * Java implementation of the "dots" codec
+ * */
+@LogstashPlugin(name = "jdots")
+public class Dots implements Codec {
+
+    private final String id;
+
+    public Dots(final String id, final Configuration configuration, final Context context) {
+        this((id != null && !id.isEmpty()) ? id : UUID.randomUUID().toString());
+    }
+
+    public Dots(final Configuration configuration, final Context context) {
+        this(UUID.randomUUID().toString());
+    }
+
+    private Dots(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public void decode(ByteBuffer buffer, Consumer<Map<String, Object>> eventConsumer) {
+        throw new UnsupportedOperationException("Cannot decode with the jdots codec");
+    }
+
+    @Override
+    public void flush(ByteBuffer buffer, Consumer<Map<String, Object>> eventConsumer) {
+    }
+
+    @Override
+    public void encode(Event event, OutputStream out) throws IOException {
+        out.write('.');
+        out.flush();
+    }
+
+    @Override
+    public Codec cloneCodec() {
+        return new Dots(UUID.randomUUID().toString());
+    }
+
+    @Override
+    public Collection<PluginConfigSpec<?>> configSchema() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public String getId() {
+        return id;
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/codecs/Line.java b/logstash-core/src/main/java/org/logstash/plugins/codecs/Line.java
index 30555c1ab..9e3570c50 100644
--- a/logstash-core/src/main/java/org/logstash/plugins/codecs/Line.java
+++ b/logstash-core/src/main/java/org/logstash/plugins/codecs/Line.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins.codecs;
 
 import co.elastic.logstash.api.Codec;
@@ -9,12 +29,12 @@ import co.elastic.logstash.api.PluginConfigSpec;
 import org.logstash.StringInterpolation;
 
 import java.io.IOException;
+import java.io.OutputStream;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.CharacterCodingException;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CoderResult;
 import java.nio.charset.CodingErrorAction;
 import java.util.Arrays;
@@ -26,6 +46,9 @@ import java.util.function.Consumer;
 
 import static org.logstash.ObjectMappers.JSON_MAPPER;
 
+/**
+ * Java implementation of the "line" codec
+ * */
 @LogstashPlugin(name = "java_line")
 public class Line implements Codec {
 
@@ -52,31 +75,36 @@ public class Line implements Codec {
 
     private final CharBuffer charBuffer = ByteBuffer.allocateDirect(64 * 1024).asCharBuffer();
     private final CharsetDecoder decoder;
-    private final CharsetEncoder encoder;
     private String remainder = "";
 
-    private Event currentEncodedEvent;
-    private CharBuffer currentEncoding;
-
     /**
      * Required constructor.
      *
+     * @param id            plugin id
+     * @param configuration Logstash Configuration
+     * @param context       Logstash Context
+     */
+    public Line(final String id, final Configuration configuration, final Context context) {
+        this(context, configuration.get(DELIMITER_CONFIG), configuration.get(CHARSET_CONFIG), configuration.get(FORMAT_CONFIG),
+                (id != null && !id.isEmpty()) ? id : UUID.randomUUID().toString());
+    }
+
+    /*
      * @param configuration Logstash Configuration
      * @param context       Logstash Context
      */
     public Line(final Configuration configuration, final Context context) {
-        this(context, configuration.get(DELIMITER_CONFIG), configuration.get(CHARSET_CONFIG), configuration.get(FORMAT_CONFIG));
+        this(null, configuration, context);
     }
 
-    private Line(Context context, String delimiter, String charsetName, String format) {
+    private Line(Context context, String delimiter, String charsetName, String format, String id) {
         this.context = context;
-        this.id = UUID.randomUUID().toString();
+        this.id = id;
         this.delimiter = delimiter;
         this.charset = Charset.forName(charsetName);
         this.format = format;
         decoder = charset.newDecoder();
         decoder.onMalformedInput(CodingErrorAction.IGNORE);
-        encoder = charset.newEncoder();
     }
 
     @Override
@@ -125,34 +153,12 @@ public class Line implements Codec {
     }
 
     @Override
-    public boolean encode(Event event, ByteBuffer buffer) throws EncodeException {
-        try {
-            if (currentEncodedEvent != null && event != currentEncodedEvent) {
-                throw new EncodeException("New event supplied before encoding of previous event was completed");
-            } else if (currentEncodedEvent == null) {
-                String eventEncoding = (format == null
-                        ? JSON_MAPPER.writeValueAsString(event.getData())
-                        : StringInterpolation.evaluate(event, format))
-                        + delimiter;
-                currentEncoding = CharBuffer.wrap(eventEncoding);
-            }
-
-            CoderResult result = encoder.encode(currentEncoding, buffer, true);
-            buffer.flip();
-            if (result.isError()) {
-                result.throwException();
-            }
-
-            if (result.isOverflow()) {
-                currentEncodedEvent = event;
-                return false;
-            } else {
-                currentEncodedEvent = null;
-                return true;
-            }
-        } catch (IOException e) {
-            throw new IllegalStateException(e);
-        }
+    public void encode(Event event, OutputStream output) throws IOException {
+        String outputString = (format == null
+                ? JSON_MAPPER.writeValueAsString(event.getData())
+                : StringInterpolation.evaluate(event, format))
+                + delimiter;
+        output.write(outputString.getBytes(charset));
     }
 
     private Map<String, Object> simpleMap(String message) {
@@ -172,6 +178,6 @@ public class Line implements Codec {
 
     @Override
     public Codec cloneCodec() {
-        return new Line(context, delimiter, charset.name(), format);
+        return new Line(context, delimiter, charset.name(), format, UUID.randomUUID().toString());
     }
 }
diff --git a/logstash-core/src/main/java/org/logstash/plugins/codecs/Plain.java b/logstash-core/src/main/java/org/logstash/plugins/codecs/Plain.java
new file mode 100644
index 000000000..6ea5afd14
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/codecs/Plain.java
@@ -0,0 +1,141 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.plugins.codecs;
+
+import co.elastic.logstash.api.Codec;
+import co.elastic.logstash.api.Configuration;
+import co.elastic.logstash.api.Context;
+import co.elastic.logstash.api.Event;
+import co.elastic.logstash.api.LogstashPlugin;
+import co.elastic.logstash.api.PluginConfigSpec;
+import org.logstash.StringInterpolation;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CodingErrorAction;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.Consumer;
+
+/**
+ * The plain codec accepts input bytes as events with no decoding beyond the application of a specified
+ * character set. For encoding, an optional format string may be specified.
+ */
+@LogstashPlugin(name = "java_plain")
+public class Plain implements Codec {
+
+    private static final PluginConfigSpec<String> CHARSET_CONFIG =
+            PluginConfigSpec.stringSetting("charset", "UTF-8");
+
+    private static final PluginConfigSpec<String> FORMAT_CONFIG =
+            PluginConfigSpec.stringSetting("format");
+
+    static final String MESSAGE_FIELD = "message";
+
+    private Context context;
+
+    private final Map<String, Object> map = new HashMap<>();
+
+    private final Charset charset;
+    private String format = null;
+    private String id;
+
+    private final CharBuffer charBuffer = ByteBuffer.allocateDirect(64 * 1024).asCharBuffer();
+    private final CharsetDecoder decoder;
+
+    /**
+     * Required constructor.
+     *
+     * @param id            plugin id
+     * @param configuration Logstash Configuration
+     * @param context       Logstash Context
+     */
+    public Plain(final String id, final Configuration configuration, final Context context) {
+        this(context, configuration.get(CHARSET_CONFIG), configuration.get(FORMAT_CONFIG),
+                (id != null && !id.isEmpty()) ? id : UUID.randomUUID().toString());
+    }
+    /**
+     * @param configuration Logstash Configuration
+     * @param context       Logstash Context
+     */
+    public Plain(final Configuration configuration, final Context context) {
+        this(null, configuration, context);
+    }
+
+    private Plain(Context context, String charsetName, String format, String id) {
+        this.context = context;
+        this.id = id;
+        this.charset = Charset.forName(charsetName);
+        this.format = format;
+        decoder = charset.newDecoder();
+        decoder.onMalformedInput(CodingErrorAction.IGNORE);
+    }
+
+    @Override
+    public void decode(ByteBuffer buffer, Consumer<Map<String, Object>> eventConsumer) {
+        if (buffer.position() < buffer.limit()) {
+            decoder.decode(buffer, charBuffer, true);
+            charBuffer.flip();
+            eventConsumer.accept(simpleMap(charBuffer.toString()));
+            charBuffer.clear();
+        }
+    }
+
+    @Override
+    public void flush(ByteBuffer buffer, Consumer<Map<String, Object>> eventConsumer) {
+        decode(buffer, eventConsumer);
+    }
+
+    @Override
+    public void encode(Event event, OutputStream output) throws IOException {
+        String outputString = (format == null
+                ? event.toString()
+                : StringInterpolation.evaluate(event, format));
+        output.write(outputString.getBytes(charset));
+    }
+
+    private Map<String, Object> simpleMap(String message) {
+        map.put(MESSAGE_FIELD, message);
+        return map;
+    }
+
+    @Override
+    public Collection<PluginConfigSpec<?>> configSchema() {
+        return Arrays.asList(CHARSET_CONFIG, FORMAT_CONFIG);
+    }
+
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    @Override
+    public Codec cloneCodec() {
+        return new Plain(context, charset.name(), format, UUID.randomUUID().toString());
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/discovery/AbstractScanner.java b/logstash-core/src/main/java/org/logstash/plugins/discovery/AbstractScanner.java
deleted file mode 100644
index 088e86700..000000000
--- a/logstash-core/src/main/java/org/logstash/plugins/discovery/AbstractScanner.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.logstash.plugins.discovery;
-
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Multimap;
-
-/**
- *
- */
-@SuppressWarnings({"RawUseOfParameterizedType", "unchecked"})
-public abstract class AbstractScanner implements Scanner {
-
-    private Configuration configuration;
-    private Multimap<String, String> store;
-    private Predicate<String> resultFilter = Predicates.alwaysTrue(); //accept all by default
-
-    public boolean acceptsInput(String file) {
-        return getMetadataAdapter().acceptsInput(file);
-    }
-
-    public Object scan(Vfs.File file, Object classObject) {
-        if (classObject == null) {
-            try {
-                classObject = configuration.getMetadataAdapter().getOfCreateClassObject(file);
-            } catch (Exception e) {
-                throw new ReflectionsException("could not create class object from file " + file.getRelativePath(), e);
-            }
-        }
-        scan(classObject);
-        return classObject;
-    }
-
-    public abstract void scan(Object cls);
-
-    //
-    public Configuration getConfiguration() {
-        return configuration;
-    }
-
-    public void setConfiguration(final Configuration configuration) {
-        this.configuration = configuration;
-    }
-
-    public Multimap<String, String> getStore() {
-        return store;
-    }
-
-    public void setStore(final Multimap<String, String> store) {
-        this.store = store;
-    }
-
-    public Predicate<String> getResultFilter() {
-        return resultFilter;
-    }
-
-    public void setResultFilter(Predicate<String> resultFilter) {
-        this.resultFilter = resultFilter;
-    }
-
-    @Override
-    public Scanner filterResultsBy(Predicate<String> filter) {
-        this.setResultFilter(filter);
-        return this;
-    }
-
-    public boolean acceptResult(final String fqn) {
-        return fqn != null && resultFilter.apply(fqn);
-    }
-
-    @SuppressWarnings("rawtypes")
-    protected MetadataAdapter getMetadataAdapter() {
-        return configuration.getMetadataAdapter();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return this == o || o != null && getClass() == o.getClass();
-    }
-
-    @Override
-    public int hashCode() {
-        return getClass().hashCode();
-    }
-}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/discovery/ClasspathHelper.java b/logstash-core/src/main/java/org/logstash/plugins/discovery/ClasspathHelper.java
deleted file mode 100644
index 8d73d5e43..000000000
--- a/logstash-core/src/main/java/org/logstash/plugins/discovery/ClasspathHelper.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package org.logstash.plugins.discovery;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-/**
- * Helper methods for working with the classpath.
- */
-public abstract class ClasspathHelper {
-
-    /**
-     * Gets the current thread context class loader.
-     * {@code Thread.currentThread().getContextClassLoader()}.
-     *
-     * @return the context class loader, may be null
-     */
-    public static ClassLoader contextClassLoader() {
-        return Thread.currentThread().getContextClassLoader();
-    }
-
-    /**
-     * Gets the class loader of this library.
-     * {@code Reflections.class.getClassLoader()}.
-     *
-     * @return the static library class loader, may be null
-     */
-    public static ClassLoader staticClassLoader() {
-        return Reflections.class.getClassLoader();
-    }
-
-    /**
-     * Returns an array of class Loaders initialized from the specified array.
-     * <p>
-     * If the input is null or empty, it defaults to both {@link #contextClassLoader()} and {@link #staticClassLoader()}
-     *
-     * @param classLoaders provided ClassLoaders
-     * @return the array of class loaders, not null
-     */
-    public static ClassLoader[] classLoaders(ClassLoader... classLoaders) {
-        if (classLoaders != null && classLoaders.length != 0) {
-            return classLoaders;
-        } else {
-            ClassLoader contextClassLoader = contextClassLoader(), staticClassLoader = staticClassLoader();
-            return contextClassLoader != null ?
-                staticClassLoader != null && contextClassLoader != staticClassLoader ?
-                    new ClassLoader[]{contextClassLoader, staticClassLoader} :
-                    new ClassLoader[]{contextClassLoader} :
-                new ClassLoader[] {};
-
-        }
-    }
-
-    public static Collection<URL> forPackage(String name, ClassLoader... classLoaders) {
-        return forResource(resourceName(name), classLoaders);
-    }
-
-    /**
-     * Returns a distinct collection of URLs based on a resource.
-     * <p>
-     * This searches for the resource name, using {@link ClassLoader#getResources(String)}.
-     * For example, {@code forResource(test.properties)} effectively returns URLs from the
-     * classpath containing files of that name.
-     * <p>
-     * If the optional {@link ClassLoader}s are not specified, then both {@link #contextClassLoader()}
-     * and {@link #staticClassLoader()} are used for {@link ClassLoader#getResources(String)}.
-     * <p>
-     * The returned URLs retains the order of the given {@code classLoaders}.
-     *
-     * @param resourceName resource name on which to search
-     * @param classLoaders optional ClassLoaders to search
-     * @return the collection of URLs, not null
-     */
-    public static Collection<URL> forResource(String resourceName, ClassLoader... classLoaders) {
-        final List<URL> result = new ArrayList<>();
-        final ClassLoader[] loaders = classLoaders(classLoaders);
-        for (ClassLoader classLoader : loaders) {
-            try {
-                final Enumeration<URL> urls = classLoader.getResources(resourceName);
-                while (urls.hasMoreElements()) {
-                    final URL url = urls.nextElement();
-                    int index = url.toExternalForm().lastIndexOf(resourceName);
-                    if (index != -1) {
-                        // Add old url as contextUrl to support exotic url handlers
-                        result.add(new URL(url, url.toExternalForm().substring(0, index)));
-                    } else {
-                        result.add(url);
-                    }
-                }
-            } catch (IOException e) {
-            }
-        }
-        return distinctUrls(result);
-    }
-
-    /**
-     * Returns the URL that contains a {@code Class}.
-     * <p>
-     * This searches for the class using {@link ClassLoader#getResource(String)}.
-     * <p>
-     * If the optional {@link ClassLoader}s are not specified, then both {@link #contextClassLoader()}
-     * and {@link #staticClassLoader()} are used for {@link ClassLoader#getResources(String)}.
-     *
-     * @param aClass class for which to search
-     * @param classLoaders optional ClassLoaders to search
-     * @return the URL containing the class, null if not found
-     */
-    public static URL forClass(Class<?> aClass, ClassLoader... classLoaders) {
-        final ClassLoader[] loaders = classLoaders(classLoaders);
-        final String resourceName = aClass.getName().replace(".", "/") + ".class";
-        for (ClassLoader classLoader : loaders) {
-            try {
-                final URL url = classLoader.getResource(resourceName);
-                if (url != null) {
-                    final String normalizedUrl = url.toExternalForm().substring(0, url.toExternalForm().lastIndexOf(aClass.getPackage().getName().replace(".", "/")));
-                    return new URL(normalizedUrl);
-                }
-            } catch (MalformedURLException e) {
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns a distinct collection of URLs based on URLs derived from class loaders.
-     * <p>
-     * This finds the URLs using {@link URLClassLoader#getURLs()} using both
-     * {@link #contextClassLoader()} and {@link #staticClassLoader()}.
-     * <p>
-     * The returned URLs retains the order of the given {@code classLoaders}.
-     *
-     * @return the collection of URLs, not null
-     */
-    public static Collection<URL> forClassLoader() {
-        return forClassLoader(classLoaders());
-    }
-
-    /**
-     * Returns a distinct collection of URLs based on URLs derived from class loaders.
-     * <p>
-     * This finds the URLs using {@link URLClassLoader#getURLs()} using the specified
-     * class loader, searching up the parent hierarchy.
-     * <p>
-     * If the optional {@link ClassLoader}s are not specified, then both {@link #contextClassLoader()}
-     * and {@link #staticClassLoader()} are used for {@link ClassLoader#getResources(String)}.
-     * <p>
-     * The returned URLs retains the order of the given {@code classLoaders}.
-     *
-     * @param classLoaders optional ClassLoaders to search
-     * @return the collection of URLs, not null
-     */
-    public static Collection<URL> forClassLoader(ClassLoader... classLoaders) {
-        final Collection<URL> result = new ArrayList<>();
-        final ClassLoader[] loaders = classLoaders(classLoaders);
-        for (ClassLoader classLoader : loaders) {
-            while (classLoader != null) {
-                if (classLoader instanceof URLClassLoader) {
-                    URL[] urls = ((URLClassLoader) classLoader).getURLs();
-                    if (urls != null) {
-                        result.addAll(Arrays.asList(urls));
-                    }
-                }
-                classLoader = classLoader.getParent();
-            }
-        }
-        return distinctUrls(result);
-    }
-
-    private static String resourceName(String name) {
-        if (name != null) {
-            String resourceName = name.replace(".", "/");
-            resourceName = resourceName.replace("\\", "/");
-            if (resourceName.startsWith("/")) {
-                resourceName = resourceName.substring(1);
-            }
-            return resourceName;
-        }
-        return null;
-    }
-
-    //http://michaelscharf.blogspot.co.il/2006/11/javaneturlequals-and-hashcode-make.html
-    private static Collection<URL> distinctUrls(Collection<URL> urls) {
-        Map<String, URL> distinct = new LinkedHashMap<>(urls.size());
-        for (URL url : urls) {
-            distinct.put(url.toExternalForm(), url);
-        }
-        return distinct.values();
-    }
-}
-
diff --git a/logstash-core/src/main/java/org/logstash/plugins/discovery/Configuration.java b/logstash-core/src/main/java/org/logstash/plugins/discovery/Configuration.java
deleted file mode 100644
index 225e10272..000000000
--- a/logstash-core/src/main/java/org/logstash/plugins/discovery/Configuration.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.logstash.plugins.discovery;
-
-import com.google.common.base.Predicate;
-import java.net.URL;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-
-public interface Configuration {
-    /**
-     * @return the scanner instances used for scanning different metadata
-     */
-    Set<Scanner> getScanners();
-
-    /**
-     * @return the urls to be scanned
-     */
-    Set<URL> getUrls();
-
-    /**
-     * @return the metadata adapter used to fetch metadata from classes
-     */
-    @SuppressWarnings("rawtypes")
-    MetadataAdapter getMetadataAdapter();
-
-    /**
-     * @return the fully qualified name filter used to filter types to be scanned
-     */
-    Predicate<String> getInputsFilter();
-
-    /**
-     * @return executor service used to scan files. if null, scanning is done in a simple for loop
-     */
-    ExecutorService getExecutorService();
-
-    /**
-     * @return class loaders, might be used for resolving methods/fields
-     */
-    ClassLoader[] getClassLoaders();
-
-    boolean shouldExpandSuperTypes();
-}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/discovery/ConfigurationBuilder.java b/logstash-core/src/main/java/org/logstash/plugins/discovery/ConfigurationBuilder.java
deleted file mode 100644
index a23aa7eb4..000000000
--- a/logstash-core/src/main/java/org/logstash/plugins/discovery/ConfigurationBuilder.java
+++ /dev/null
@@ -1,245 +0,0 @@
-package org.logstash.plugins.discovery;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.Lists;
-import com.google.common.collect.ObjectArrays;
-import com.google.common.collect.Sets;
-import java.net.URL;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-
-public final class ConfigurationBuilder implements Configuration {
-
-    private final Set<Scanner> scanners;
-
-    private Set<URL> urls;
-    @SuppressWarnings("rawtypes") protected MetadataAdapter metadataAdapter;
-
-    private Predicate<String> inputsFilter;
-
-    private ExecutorService executorService;
-
-    private ClassLoader[] classLoaders;
-    private boolean expandSuperTypes = true;
-
-    public ConfigurationBuilder() {
-        scanners = Sets.newHashSet(new TypeAnnotationsScanner(), new SubTypesScanner());
-        urls = Sets.newHashSet();
-    }
-
-    @SuppressWarnings({"unchecked","rawtypes"})
-    public static ConfigurationBuilder build(final Object... params) {
-        ConfigurationBuilder builder = new ConfigurationBuilder();
-
-        //flatten
-        List<Object> parameters = Lists.newArrayList();
-        if (params != null) {
-            for (Object param : params) {
-                if (param != null) {
-                    if (param.getClass().isArray()) {
-                        for (Object p : (Object[]) param)
-                            if (p != null) {
-                                parameters.add(p);
-                            }
-                    } else if (param instanceof Iterable) {
-                        for (Object p : (Iterable) param)
-                            if (p != null) {
-                                parameters.add(p);
-                            }
-                    } else {
-                        parameters.add(param);
-                    }
-                }
-            }
-        }
-
-        List<ClassLoader> loaders = Lists.newArrayList();
-        for (Object param : parameters)
-            if (param instanceof ClassLoader) {
-                loaders.add((ClassLoader) param);
-            }
-
-        ClassLoader[] classLoaders = loaders.isEmpty() ? null : loaders.toArray(new ClassLoader[loaders.size()]);
-        FilterBuilder filter = new FilterBuilder();
-        List<Scanner> scanners = Lists.newArrayList();
-
-        for (Object param : parameters) {
-            if (param instanceof String) {
-                builder.addUrls(ClasspathHelper.forPackage((String) param, classLoaders));
-                filter.includePackage((String) param);
-            } else if (param instanceof Class) {
-                if (Scanner.class.isAssignableFrom((Class) param)) {
-                    try {
-                        builder.addScanners((Scanner) ((Class) param).getConstructor().newInstance());
-                    } catch (Exception e) { /*fallback*/ }
-                }
-                builder.addUrls(ClasspathHelper.forClass((Class) param, classLoaders));
-                filter.includePackage((Class) param);
-            } else if (param instanceof Scanner) {
-                scanners.add((Scanner) param);
-            } else if (param instanceof URL) {
-                builder.addUrls((URL) param);
-            } else if (param instanceof ClassLoader) { /* already taken care */ } else if (param instanceof Predicate) {
-                filter.add((Predicate<String>) param);
-            } else if (param instanceof ExecutorService) {
-                builder.setExecutorService((ExecutorService) param);
-            }
-        }
-
-        if (builder.getUrls().isEmpty()) {
-            if (classLoaders != null) {
-                builder.addUrls(ClasspathHelper.forClassLoader(classLoaders)); //default urls getResources("")
-            } else {
-                builder.addUrls(ClasspathHelper.forClassLoader()); //default urls getResources("")
-            }
-        }
-
-        builder.filterInputsBy(filter);
-        if (!scanners.isEmpty()) {
-            builder.setScanners(scanners.toArray(new Scanner[scanners.size()]));
-        }
-        if (!loaders.isEmpty()) {
-            builder.addClassLoaders(loaders);
-        }
-
-        return builder;
-    }
-
-    @Override
-
-    public Set<Scanner> getScanners() {
-        return scanners;
-    }
-
-    /**
-     * set the scanners instances for scanning different metadata
-     * @param scanners provided scanners
-     * @return updated {@link ConfigurationBuilder} instance
-     */
-    public ConfigurationBuilder setScanners(final Scanner... scanners) {
-        this.scanners.clear();
-        return addScanners(scanners);
-    }
-
-    /**
-     * set the scanners instances for scanning different metadata
-     * @param scanners provided scanners
-     * @return updated {@link ConfigurationBuilder} instance
-     */
-    public ConfigurationBuilder addScanners(final Scanner... scanners) {
-        this.scanners.addAll(Sets.newHashSet(scanners));
-        return this;
-    }
-
-    @Override
-
-    public Set<URL> getUrls() {
-        return urls;
-    }
-
-    /**
-     * add urls to be scanned
-     * <p>use {@link ClasspathHelper} convenient methods to get the relevant urls
-     * @param urls provided URLs
-     * @return updated {@link ConfigurationBuilder} instance
-     */
-    public ConfigurationBuilder addUrls(final Collection<URL> urls) {
-        this.urls.addAll(urls);
-        return this;
-    }
-
-    /**
-     * add urls to be scanned
-     * <p>use {@link ClasspathHelper} convenient methods to get the relevant urls
-     * @param urls provided URLs
-     * @return updated {@link ConfigurationBuilder} instance
-     */
-    public ConfigurationBuilder addUrls(final URL... urls) {
-        this.urls.addAll(Sets.newHashSet(urls));
-        return this;
-    }
-
-    /**
-     * @return the metadata adapter.
-     * if javassist library exists in the classpath, this method returns {@link JavassistAdapter} otherwise defaults to {@link JavaReflectionAdapter}.
-     * <p>the {@link JavassistAdapter} is preferred in terms of performance and class loading.
-     */
-    @SuppressWarnings("rawtypes")
-    @Override
-    public MetadataAdapter getMetadataAdapter() {
-        if (metadataAdapter != null) {
-            return metadataAdapter;
-        } else {
-            try {
-                return metadataAdapter = new JavassistAdapter();
-            } catch (Throwable e) {
-                return metadataAdapter = new JavaReflectionAdapter();
-            }
-        }
-    }
-
-    @Override
-    public Predicate<String> getInputsFilter() {
-        return inputsFilter;
-    }
-
-    /**
-     * sets the input filter for all resources to be scanned.
-     * <p> supply a {@link Predicate} or use the {@link FilterBuilder}
-     * @param inputsFilter provided inputs filter
-     * @return updated {@link ConfigurationBuilder} instance
-     */
-    public ConfigurationBuilder filterInputsBy(Predicate<String> inputsFilter) {
-        this.inputsFilter = inputsFilter;
-        return this;
-    }
-
-    @Override
-    public ExecutorService getExecutorService() {
-        return executorService;
-    }
-
-    /**
-     * sets the executor service used for scanning.
-     * @param executorService provided executor service
-     * @return updated {@link ConfigurationBuilder} instance
-     */
-    public ConfigurationBuilder setExecutorService(ExecutorService executorService) {
-        this.executorService = executorService;
-        return this;
-    }
-
-    /**
-     * @return class loader, might be used for scanning or resolving methods/fields
-     */
-    @Override
-    public ClassLoader[] getClassLoaders() {
-        return classLoaders;
-    }
-
-    @Override
-    public boolean shouldExpandSuperTypes() {
-        return expandSuperTypes;
-    }
-
-    /**
-     * add class loader, might be used for resolving methods/fields
-     * @param classLoaders provided class loaders
-     * @return updated {@link ConfigurationBuilder} instance
-     */
-    public ConfigurationBuilder addClassLoaders(ClassLoader... classLoaders) {
-        this.classLoaders = this.classLoaders == null ? classLoaders : ObjectArrays.concat(this.classLoaders, classLoaders, ClassLoader.class);
-        return this;
-    }
-
-    /**
-     * add class loader, might be used for resolving methods/fields
-     * @param classLoaders provided class loaders
-     * @return updated {@link ConfigurationBuilder} instance
-     */
-    public ConfigurationBuilder addClassLoaders(Collection<ClassLoader> classLoaders) {
-        return addClassLoaders(classLoaders.toArray(new ClassLoader[classLoaders.size()]));
-    }
-}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/discovery/FilterBuilder.java b/logstash-core/src/main/java/org/logstash/plugins/discovery/FilterBuilder.java
deleted file mode 100644
index 1f981fae6..000000000
--- a/logstash-core/src/main/java/org/logstash/plugins/discovery/FilterBuilder.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package org.logstash.plugins.discovery;
-
-import com.google.common.base.Joiner;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Lists;
-import java.util.List;
-import java.util.regex.Pattern;
-
-public class FilterBuilder implements Predicate<String> {
-    private final List<Predicate<String>> chain;
-
-    public FilterBuilder() {
-        chain = Lists.newArrayList();
-    }
-
-    /**
-     * exclude a regular expression
-     * @param regex regex to exclude
-     * @return updated {@link FilterBuilder} instance
-     */
-    public FilterBuilder exclude(final String regex) {
-        add(new FilterBuilder.Exclude(regex));
-        return this;
-    }
-
-    /**
-     * add a Predicate to the chain of predicates
-     * @param filter predicate to add
-     * @return updated {@link FilterBuilder} instance
-     */
-    public FilterBuilder add(Predicate<String> filter) {
-        chain.add(filter);
-        return this;
-    }
-
-    /**
-     * include a package of a given class
-     * @param aClass provided class
-     * @return updated {@link FilterBuilder} instance
-     */
-    public FilterBuilder includePackage(final Class<?> aClass) {
-        return add(new FilterBuilder.Include(packageNameRegex(aClass)));
-    }
-
-    /**
-     * include packages of given prefixes
-     * @param prefixes package prefixes
-     * @return updated {@link FilterBuilder} instance
-     */
-    public FilterBuilder includePackage(final String... prefixes) {
-        for (String prefix : prefixes) {
-            add(new FilterBuilder.Include(prefix(prefix)));
-        }
-        return this;
-    }
-
-    private static String packageNameRegex(Class<?> aClass) {
-        return prefix(aClass.getPackage().getName() + ".");
-    }
-
-    public static String prefix(String qualifiedName) {
-        return qualifiedName.replace(".", "\\.") + ".*";
-    }
-
-    @Override
-    public String toString() {
-        return Joiner.on(", ").join(chain);
-    }
-
-    public boolean apply(String regex) {
-        boolean accept = chain == null || chain.isEmpty() || chain.get(0) instanceof FilterBuilder.Exclude;
-
-        if (chain != null) {
-            for (Predicate<String> filter : chain) {
-                if (accept && filter instanceof FilterBuilder.Include) {
-                    continue;
-                } //skip if this filter won't change
-                if (!accept && filter instanceof FilterBuilder.Exclude) {
-                    continue;
-                }
-                accept = filter.apply(regex);
-                if (!accept && filter instanceof FilterBuilder.Exclude) {
-                    break;
-                } //break on first exclusion
-            }
-        }
-        return accept;
-    }
-
-    public abstract static class Matcher implements Predicate<String> {
-        final Pattern pattern;
-
-        public Matcher(final String regex) {
-            pattern = Pattern.compile(regex);
-        }
-
-        public abstract boolean apply(String regex);
-
-        @Override
-        public String toString() {
-            return pattern.pattern();
-        }
-    }
-
-    public static class Include extends FilterBuilder.Matcher {
-        public Include(final String patternString) {
-            super(patternString);
-        }
-
-        @Override
-        public boolean apply(final String regex) {
-            return pattern.matcher(regex).matches();
-        }
-
-        @Override
-        public String toString() {
-            return "+" + super.toString();
-        }
-    }
-
-    public static class Exclude extends FilterBuilder.Matcher {
-        public Exclude(final String patternString) {
-            super(patternString);
-        }
-
-        @Override
-        public boolean apply(final String regex) {
-            return !pattern.matcher(regex).matches();
-        }
-
-        @Override
-        public String toString() {
-            return "-" + super.toString();
-        }
-    }
-
-}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/discovery/JavaReflectionAdapter.java b/logstash-core/src/main/java/org/logstash/plugins/discovery/JavaReflectionAdapter.java
deleted file mode 100644
index 8edc965b9..000000000
--- a/logstash-core/src/main/java/org/logstash/plugins/discovery/JavaReflectionAdapter.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.logstash.plugins.discovery;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-@SuppressWarnings("rawtypes")
-public final class JavaReflectionAdapter implements MetadataAdapter<Class> {
-
-    public List<String> getClassAnnotationNames(Class aClass) {
-        return getAnnotationNames(aClass.getDeclaredAnnotations());
-    }
-
-    public Class getOfCreateClassObject(Vfs.File file) { return getOfCreateClassObject(file, new ClassLoader[]{}); }
-
-    public Class getOfCreateClassObject(Vfs.File file, ClassLoader... loaders) {
-        String name = file.getRelativePath().replace("/", ".").replace(".class", "");
-        return ReflectionUtils.forName(name, loaders);
-    }
-
-    public String getClassName(Class cls) {
-        return cls.getName();
-    }
-
-    public String getSuperclassName(Class cls) {
-        Class superclass = cls.getSuperclass();
-        return superclass != null ? superclass.getName() : "";
-    }
-
-    public List<String> getInterfacesNames(Class cls) {
-        Class[] classes = cls.getInterfaces();
-        List<String> names = new ArrayList<>(classes != null ? classes.length : 0);
-        if (classes != null) {
-            for (Class cls1 : classes) names.add(cls1.getName());
-        }
-        return names;
-    }
-
-    public boolean acceptsInput(String file) {
-        return file.endsWith(".class");
-    }
-
-    private List<String> getAnnotationNames(Annotation[] annotations) {
-        List<String> names = new ArrayList<>(annotations.length);
-        for (Annotation annotation : annotations) {
-            names.add(annotation.annotationType().getName());
-        }
-        return names;
-    }
-
-    public static String getName(Class type) {
-        if (type.isArray()) {
-            try {
-                Class cl = type;
-                int dim = 0;
-                while (cl.isArray()) {
-                    dim++;
-                    cl = cl.getComponentType();
-                }
-                return cl.getName() + Utils.repeat("[]", dim);
-            } catch (Throwable e) {
-                // do nothing
-            }
-        }
-        return type.getName();
-    }
-}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/discovery/JavassistAdapter.java b/logstash-core/src/main/java/org/logstash/plugins/discovery/JavassistAdapter.java
deleted file mode 100644
index 570473699..000000000
--- a/logstash-core/src/main/java/org/logstash/plugins/discovery/JavassistAdapter.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.logstash.plugins.discovery;
-
-import com.google.common.collect.Lists;
-import java.io.BufferedInputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.List;
-import javassist.bytecode.AnnotationsAttribute;
-import javassist.bytecode.ClassFile;
-import javassist.bytecode.annotation.Annotation;
-
-/**
- *
- */
-public class JavassistAdapter implements MetadataAdapter<ClassFile> {
-
-    /**
-     * setting this to false will result in returning only visible annotations from the relevant methods here (only {@link java.lang.annotation.RetentionPolicy#RUNTIME})
-     */
-    public static boolean includeInvisibleTag = true;
-
-    public List<String> getClassAnnotationNames(final ClassFile aClass) {
-        return getAnnotationNames((AnnotationsAttribute) aClass.getAttribute(AnnotationsAttribute.visibleTag),
-            includeInvisibleTag ? (AnnotationsAttribute) aClass.getAttribute(AnnotationsAttribute.invisibleTag) : null);
-    }
-
-    public ClassFile getOfCreateClassObject(final Vfs.File file) {
-        InputStream inputStream = null;
-        try {
-            inputStream = file.openInputStream();
-            DataInputStream dis = new DataInputStream(new BufferedInputStream(inputStream));
-            return new ClassFile(dis);
-        } catch (IOException e) {
-            throw new ReflectionsException("could not create class file from " + file.getName(), e);
-        } finally {
-            Utils.close(inputStream);
-        }
-    }
-
-    //
-    public String getClassName(final ClassFile cls) {
-        return cls.getName();
-    }
-
-    public String getSuperclassName(final ClassFile cls) {
-        return cls.getSuperclass();
-    }
-
-    public List<String> getInterfacesNames(final ClassFile cls) {
-        return Arrays.asList(cls.getInterfaces());
-    }
-
-    public boolean acceptsInput(String file) {
-        return file.endsWith(".class");
-    }
-
-    //
-    private List<String> getAnnotationNames(final AnnotationsAttribute... annotationsAttributes) {
-        List<String> result = Lists.newArrayList();
-
-        if (annotationsAttributes != null) {
-            for (AnnotationsAttribute annotationsAttribute : annotationsAttributes) {
-                if (annotationsAttribute != null) {
-                    for (Annotation annotation : annotationsAttribute.getAnnotations()) {
-                        result.add(annotation.getTypeName());
-                    }
-                }
-            }
-        }
-
-        return result;
-    }
-
-}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/discovery/MetadataAdapter.java b/logstash-core/src/main/java/org/logstash/plugins/discovery/MetadataAdapter.java
deleted file mode 100644
index 23b7e018c..000000000
--- a/logstash-core/src/main/java/org/logstash/plugins/discovery/MetadataAdapter.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.logstash.plugins.discovery;
-
-import java.util.List;
-
-/**
- *
- */
-public interface MetadataAdapter<C> {
-
-    //
-    String getClassName(final C cls);
-
-    String getSuperclassName(final C cls);
-
-    List<String> getInterfacesNames(final C cls);
-
-    List<String> getClassAnnotationNames(final C aClass);
-
-    C getOfCreateClassObject(Vfs.File file) throws Exception;
-
-    boolean acceptsInput(String file);
-
-}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/discovery/PluginRegistry.java b/logstash-core/src/main/java/org/logstash/plugins/discovery/PluginRegistry.java
index 8a1f232d7..301d5430d 100644
--- a/logstash-core/src/main/java/org/logstash/plugins/discovery/PluginRegistry.java
+++ b/logstash-core/src/main/java/org/logstash/plugins/discovery/PluginRegistry.java
@@ -1,6 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins.discovery;
 
-import org.logstash.plugins.PluginLookup;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.logstash.plugins.AliasRegistry;
 import co.elastic.logstash.api.Codec;
 import co.elastic.logstash.api.Configuration;
 import co.elastic.logstash.api.Context;
@@ -8,99 +30,154 @@ import co.elastic.logstash.api.Filter;
 import co.elastic.logstash.api.Input;
 import co.elastic.logstash.api.LogstashPlugin;
 import co.elastic.logstash.api.Output;
+import org.logstash.plugins.PluginLookup.PluginType;
+import org.reflections.Reflections;
+import org.reflections.util.ClasspathHelper;
+import org.reflections.util.ConfigurationBuilder;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 
 /**
- * Registry for built-in Java plugins (not installed via logstash-plugin)
- */
+ * Registry for built-in Java plugins (not installed via logstash-plugin).
+ * This is singleton ofr two reasons:
+ * <ul>
+ *  <li>it's a registry so no need for multiple instances</li>
+ *  <li>the Reflections library used need to run in single thread during discovery phase</li>
+ * </ul>
+ * */
 public final class PluginRegistry {
 
-    private static final Map<String, Class<Input>> INPUTS = new HashMap<>();
-    private static final Map<String, Class<Filter>> FILTERS = new HashMap<>();
-    private static final Map<String, Class<Output>> OUTPUTS = new HashMap<>();
-    private static final Map<String, Class<Codec>> CODECS = new HashMap<>();
+    private static final Logger LOGGER = LogManager.getLogger(PluginRegistry.class);
 
-    static {
+    private final Map<String, Class<Input>> inputs = new HashMap<>();
+    private final Map<String, Class<Filter>> filters = new HashMap<>();
+    private final Map<String, Class<Output>> outputs = new HashMap<>();
+    private final Map<String, Class<Codec>> codecs = new HashMap<>();
+    private static final Object LOCK = new Object();
+    private static volatile PluginRegistry INSTANCE;
+    private final AliasRegistry aliasRegistry = AliasRegistry.getInstance();
+
+    private PluginRegistry() {
         discoverPlugins();
     }
 
-    private PluginRegistry() {} // utility class
-
+    public static PluginRegistry getInstance() {
+        if (INSTANCE == null) {
+            synchronized (LOCK) {
+                if (INSTANCE == null) {
+                    INSTANCE = new PluginRegistry();
+                }
+            }
+        }
+        return INSTANCE;
+    }
+    
     @SuppressWarnings("unchecked")
-    private static void discoverPlugins() {
-        Reflections reflections = new Reflections("");
+    private void discoverPlugins() {
+        // the constructor of Reflection must be called only by one thread, else there is a
+        // risk that the first thread that completes close the Zip files for the others.
+        // scan all .class present in package classpath
+        final ConfigurationBuilder configurationBuilder = new ConfigurationBuilder()
+                .setUrls(ClasspathHelper.forPackage("org.logstash.plugins"))
+                .filterInputsBy(input -> input.endsWith(".class"));
+        Reflections reflections = new Reflections(configurationBuilder);
+
         Set<Class<?>> annotated = reflections.getTypesAnnotatedWith(LogstashPlugin.class);
         for (final Class<?> cls : annotated) {
             for (final Annotation annotation : cls.getAnnotations()) {
                 if (annotation instanceof LogstashPlugin) {
                     String name = ((LogstashPlugin) annotation).name();
                     if (Filter.class.isAssignableFrom(cls)) {
-                        FILTERS.put(name, (Class<Filter>) cls);
+                        filters.put(name, (Class<Filter>) cls);
                     }
                     if (Output.class.isAssignableFrom(cls)) {
-                        OUTPUTS.put(name, (Class<Output>) cls);
+                        outputs.put(name, (Class<Output>) cls);
                     }
                     if (Input.class.isAssignableFrom(cls)) {
-                        INPUTS.put(name, (Class<Input>) cls);
+                        inputs.put(name, (Class<Input>) cls);
                     }
                     if (Codec.class.isAssignableFrom(cls)) {
-                        CODECS.put(name, (Class<Codec>) cls);
+                        codecs.put(name, (Class<Codec>) cls);
                     }
 
                     break;
                 }
             }
         }
+
+        // after loaded all plugins, check if aliases has to be provided
+        addAliasedPlugins(PluginType.FILTER, filters);
+        addAliasedPlugins(PluginType.OUTPUT, outputs);
+        addAliasedPlugins(PluginType.INPUT, inputs);
+        addAliasedPlugins(PluginType.CODEC, codecs);
     }
 
-    public static Class<?> getPluginClass(PluginLookup.PluginType pluginType, String pluginName) {
-        if (pluginType == PluginLookup.PluginType.FILTER) {
-            return getFilterClass(pluginName);
+    private <T> void addAliasedPlugins(PluginType type, Map<String, Class<T>> pluginCache) {
+        final Map<String, Class<T>> aliasesToAdd = new HashMap<>();
+        for (Map.Entry<String, Class<T>> e : pluginCache.entrySet()) {
+            final String realPluginName = e.getKey();
+            final Optional<String> alias = aliasRegistry.aliasFromOriginal(type, realPluginName);
+            if (alias.isPresent()) {
+                final String aliasName = alias.get();
+                if (!pluginCache.containsKey(aliasName)) {
+                    // no real plugin with same alias name was found
+                    aliasesToAdd.put(aliasName, e.getValue());
+                    final String typeStr = type.name().toLowerCase();
+                    LOGGER.info("Plugin {}-{} is aliased as {}-{}", typeStr, realPluginName, typeStr, aliasName);
+                }
+            }
         }
-        if (pluginType == PluginLookup.PluginType.OUTPUT) {
-            return getOutputClass(pluginName);
+        for (Map.Entry<String, Class<T>> e : aliasesToAdd.entrySet()) {
+            pluginCache.put(e.getKey(), e.getValue());
         }
-        if (pluginType == PluginLookup.PluginType.INPUT) {
-            return getInputClass(pluginName);
+    }
+
+    public Class<?> getPluginClass(PluginType pluginType, String pluginName) {
+        
+        switch (pluginType) {
+            case FILTER:
+                return getFilterClass(pluginName);
+            case OUTPUT:
+                return getOutputClass(pluginName);
+            case INPUT:
+                return getInputClass(pluginName);
+            case CODEC:
+                return getCodecClass(pluginName);
+            default:
+                throw new IllegalStateException("Unknown plugin type: " + pluginType);
         }
-        if (pluginType == PluginLookup.PluginType.CODEC) {
-            return getCodecClass(pluginName);
-        }
-
-        throw new IllegalStateException("Unknown plugin type: " + pluginType);
-
     }
 
-    public static Class<Input> getInputClass(String name) {
-        return INPUTS.get(name);
+    public Class<Input> getInputClass(String name) {
+        return inputs.get(name);
     }
 
-    public static Class<Filter> getFilterClass(String name) {
-        return FILTERS.get(name);
+    public Class<Filter> getFilterClass(String name) {
+        return filters.get(name);
     }
 
-    public static Class<Codec> getCodecClass(String name) {
-        return CODECS.get(name);
+    public Class<Codec> getCodecClass(String name) {
+        return codecs.get(name);
     }
 
-    public static Class<Output> getOutputClass(String name) {
-        return OUTPUTS.get(name);
+    public Class<Output> getOutputClass(String name) {
+        return outputs.get(name);
     }
 
-    public static Codec getCodec(String name, Configuration configuration, Context context) {
-        if (name != null && CODECS.containsKey(name)) {
-            return instantiateCodec(CODECS.get(name), configuration, context);
+    public Codec getCodec(String name, Configuration configuration, Context context) {
+        if (name != null && codecs.containsKey(name)) {
+            return instantiateCodec(codecs.get(name), configuration, context);
         }
         return null;
     }
 
     @SuppressWarnings({"unchecked","rawtypes"})
-    private static Codec instantiateCodec(Class clazz, Configuration configuration, Context context) {
+    private Codec instantiateCodec(Class clazz, Configuration configuration, Context context) {
         try {
             Constructor<Codec> constructor = clazz.getConstructor(Configuration.class, Context.class);
             return constructor.newInstance(configuration, context);
diff --git a/logstash-core/src/main/java/org/logstash/plugins/discovery/ReflectionUtils.java b/logstash-core/src/main/java/org/logstash/plugins/discovery/ReflectionUtils.java
deleted file mode 100644
index 8bc2a6c53..000000000
--- a/logstash-core/src/main/java/org/logstash/plugins/discovery/ReflectionUtils.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.logstash.plugins.discovery;
-
-import com.google.common.collect.Lists;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-@SuppressWarnings("unchecked")
-public abstract class ReflectionUtils {
-
-
-    public static boolean includeObject;
-
-    /**
-     * @param type type to query
-     * @return immediate supertype and interfaces of the given {@code type}
-     */
-    public static Set<Class<?>> getSuperTypes(Class<?> type) {
-        Set<Class<?>> result = new LinkedHashSet<>();
-        Class<?> superclass = type.getSuperclass();
-        Class<?>[] interfaces = type.getInterfaces();
-        if (superclass != null && (includeObject || !superclass.equals(Object.class))) {
-            result.add(superclass);
-        }
-        if (interfaces != null && interfaces.length > 0) {
-            result.addAll(Arrays.asList(interfaces));
-        }
-        return result;
-    }
-
-    //predicates
-
-    public static Class<?> forName(String typeName, ClassLoader... classLoaders) {
-        if (getPrimitiveNames().contains(typeName)) {
-            return getPrimitiveTypes().get(getPrimitiveNames().indexOf(typeName));
-        } else {
-            String type;
-            if (typeName.contains("[")) {
-                int i = typeName.indexOf("[");
-                type = typeName.substring(0, i);
-                String array = typeName.substring(i).replace("]", "");
-
-                if (getPrimitiveNames().contains(type)) {
-                    type = getPrimitiveDescriptors().get(getPrimitiveNames().indexOf(type));
-                } else {
-                    type = "L" + type + ";";
-                }
-
-                type = array + type;
-            } else {
-                type = typeName;
-            }
-
-            List<ReflectionsException> reflectionsExceptions = Lists.newArrayList();
-            for (ClassLoader classLoader : ClasspathHelper.classLoaders(classLoaders)) {
-                if (type.contains("[")) {
-                    try {
-                        return Class.forName(type, false, classLoader);
-                    } catch (Throwable e) {
-                        reflectionsExceptions.add(new ReflectionsException("could not get type for name " + typeName, e));
-                    }
-                }
-                try {
-                    return classLoader.loadClass(type);
-                } catch (Throwable e) {
-                    reflectionsExceptions.add(new ReflectionsException("could not get type for name " + typeName, e));
-                }
-            }
-            return null;
-        }
-    }
-
-    /**
-     * @param <T> Search will include subclasses of this type
-     * @param classes list of names of Java types
-     * @param classLoaders class loaders to search
-     * @return list of Java types given string representations of their names
-     */
-    public static <T> List<Class<? extends T>> forNames(final Iterable<String> classes, ClassLoader... classLoaders) {
-        List<Class<? extends T>> result = new ArrayList<>();
-        for (String className : classes) {
-            Class<?> type = forName(className, classLoaders);
-            if (type != null) {
-                result.add((Class<? extends T>) type);
-            }
-        }
-        return result;
-    }
-
-    private static List<String> primitiveNames;
-    @SuppressWarnings("rawtypes") private static List<Class> primitiveTypes;
-    private static List<String> primitiveDescriptors;
-
-    private static void initPrimitives() {
-        if (primitiveNames == null) {
-            primitiveNames = Lists.newArrayList("boolean", "char", "byte", "short", "int", "long", "float", "double", "void");
-            primitiveTypes = Lists.newArrayList(boolean.class, char.class, byte.class, short.class, int.class, long.class, float.class, double.class, void.class);
-            primitiveDescriptors = Lists.newArrayList("Z", "C", "B", "S", "I", "J", "F", "D", "V");
-        }
-    }
-
-    private static List<String> getPrimitiveNames() {
-        initPrimitives();
-        return primitiveNames;
-    }
-
-    @SuppressWarnings("rawtypes")
-    private static List<Class> getPrimitiveTypes() {
-        initPrimitives();
-        return primitiveTypes;
-    }
-
-    private static List<String> getPrimitiveDescriptors() {
-        initPrimitives();
-        return primitiveDescriptors;
-    }
-
-}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/discovery/Reflections.java b/logstash-core/src/main/java/org/logstash/plugins/discovery/Reflections.java
deleted file mode 100644
index 61e20356f..000000000
--- a/logstash-core/src/main/java/org/logstash/plugins/discovery/Reflections.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package org.logstash.plugins.discovery;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Sets;
-import java.lang.annotation.Annotation;
-import java.lang.annotation.Inherited;
-import java.net.URL;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-
-public class Reflections {
-
-    protected final Configuration configuration;
-    protected Store store;
-
-    public Reflections(final Configuration configuration) {
-        this.configuration = configuration;
-        store = new Store(configuration);
-
-        if (configuration.getScanners() != null && !configuration.getScanners().isEmpty()) {
-            //inject to scanners
-            for (Scanner scanner : configuration.getScanners()) {
-                scanner.setConfiguration(configuration);
-                scanner.setStore(store.getOrCreate(scanner.getClass().getSimpleName()));
-            }
-
-            scan();
-
-            if (configuration.shouldExpandSuperTypes()) {
-                expandSuperTypes();
-            }
-        }
-    }
-
-    public Reflections(final String prefix, final Scanner... scanners) {
-        this((Object) prefix, scanners);
-    }
-
-    public Reflections(final Object... params) {
-        this(ConfigurationBuilder.build(params));
-    }
-
-    @SuppressWarnings("rawtypes")
-    protected void scan() {
-        if (configuration.getUrls() == null || configuration.getUrls().isEmpty()) {
-            return;
-        }
-        ExecutorService executorService = configuration.getExecutorService();
-        List<Future<?>> futures = Lists.newArrayList();
-
-        for (final URL url : configuration.getUrls()) {
-            try {
-                if (executorService != null) {
-                    futures.add(executorService.submit(() -> scan(url)));
-                } else {
-                    scan(url);
-                }
-            } catch (ReflectionsException e) {
-            }
-        }
-
-        if (executorService != null) {
-            for (Future future : futures) {
-                try {
-                    future.get();
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }
-
-        if (executorService != null) {
-            executorService.shutdown();
-        }
-    }
-
-    protected void scan(URL url) {
-        Vfs.Dir dir = Vfs.fromURL(url);
-
-        try {
-            for (final Vfs.File file : dir.getFiles()) {
-                // scan if inputs filter accepts file relative path or fqn
-                Predicate<String> inputsFilter = configuration.getInputsFilter();
-                String path = file.getRelativePath();
-                String fqn = path.replace('/', '.');
-                if (inputsFilter == null || inputsFilter.apply(path) || inputsFilter.apply(fqn)) {
-                    Object classObject = null;
-                    for (Scanner scanner : configuration.getScanners()) {
-                        try {
-                            if (scanner.acceptsInput(path) || scanner.acceptResult(fqn)) {
-                                classObject = scanner.scan(file, classObject);
-                            }
-                        } catch (Exception e) {
-                        }
-                    }
-                }
-            }
-        } finally {
-            dir.close();
-        }
-    }
-
-    public void expandSuperTypes() {
-        if (store.keySet().contains(index(SubTypesScanner.class))) {
-            Multimap<String, String> mmap = store.get(index(SubTypesScanner.class));
-            Sets.SetView<String> keys = Sets.difference(mmap.keySet(), Sets.newHashSet(mmap.values()));
-            Multimap<String, String> expand = HashMultimap.create();
-            for (String key : keys) {
-                final Class<?> type = ReflectionUtils.forName(key);
-                if (type != null) {
-                    expandSupertypes(expand, key, type);
-                }
-            }
-            mmap.putAll(expand);
-        }
-    }
-
-    private void expandSupertypes(Multimap<String, String> mmap, String key, Class<?> type) {
-        for (Class<?> supertype : ReflectionUtils.getSuperTypes(type)) {
-            if (mmap.put(supertype.getName(), key)) {
-                expandSupertypes(mmap, supertype.getName(), supertype);
-            }
-        }
-    }
-
-    public Set<Class<?>> getTypesAnnotatedWith(final Class<? extends Annotation> annotation) {
-        return getTypesAnnotatedWith(annotation, false);
-    }
-
-    public Set<Class<?>> getTypesAnnotatedWith(final Class<? extends Annotation> annotation, boolean honorInherited) {
-        Iterable<String> annotated = store.get(index(TypeAnnotationsScanner.class), annotation.getName());
-        Iterable<String> classes = getAllAnnotated(annotated, annotation.isAnnotationPresent(Inherited.class), honorInherited);
-        return Sets.newHashSet(Iterables.concat(ReflectionUtils.forNames(annotated, loaders()), ReflectionUtils.forNames(classes, loaders())));
-    }
-
-    protected Iterable<String> getAllAnnotated(Iterable<String> annotated, boolean inherited, boolean honorInherited) {
-        Iterable<String> subTypes = Iterables.concat(annotated, store.getAll(index(TypeAnnotationsScanner.class), annotated));
-        return Iterables.concat(subTypes, store.getAll(index(SubTypesScanner.class), subTypes));
-    }
-
-    private static String index(Class<? extends Scanner> scannerClass) {
-        return scannerClass.getSimpleName();
-    }
-
-    private ClassLoader[] loaders() {
-        return configuration.getClassLoaders();
-    }
-
-}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/discovery/ReflectionsException.java b/logstash-core/src/main/java/org/logstash/plugins/discovery/ReflectionsException.java
deleted file mode 100644
index dcde5c576..000000000
--- a/logstash-core/src/main/java/org/logstash/plugins/discovery/ReflectionsException.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.logstash.plugins.discovery;
-
-public class ReflectionsException extends RuntimeException {
-
-    private static final long serialVersionUID = 1L;
-
-    public ReflectionsException(String message) {
-        super(message);
-    }
-
-    public ReflectionsException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}
-
diff --git a/logstash-core/src/main/java/org/logstash/plugins/discovery/Scanner.java b/logstash-core/src/main/java/org/logstash/plugins/discovery/Scanner.java
deleted file mode 100644
index ef7fd62b2..000000000
--- a/logstash-core/src/main/java/org/logstash/plugins/discovery/Scanner.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.logstash.plugins.discovery;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.Multimap;
-
-/**
- *
- */
-public interface Scanner {
-
-    void setConfiguration(Configuration configuration);
-
-    Multimap<String, String> getStore();
-
-    void setStore(Multimap<String, String> store);
-
-    Scanner filterResultsBy(Predicate<String> filter);
-
-    boolean acceptsInput(String file);
-
-    Object scan(Vfs.File file, Object classObject);
-
-    boolean acceptResult(String fqn);
-}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/discovery/Store.java b/logstash-core/src/main/java/org/logstash/plugins/discovery/Store.java
deleted file mode 100644
index 609f3151e..000000000
--- a/logstash-core/src/main/java/org/logstash/plugins/discovery/Store.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package org.logstash.plugins.discovery;
-
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
-import com.google.common.collect.SetMultimap;
-import com.google.common.collect.Sets;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-public final class Store {
-
-    private transient boolean concurrent;
-    private final Map<String, Multimap<String, String>> storeMap;
-
-    //used via reflection
-    @SuppressWarnings("UnusedDeclaration")
-    protected Store() {
-        storeMap = new HashMap<>();
-        concurrent = false;
-    }
-
-    public Store(Configuration configuration) {
-        storeMap = new HashMap<>();
-        concurrent = configuration.getExecutorService() != null;
-    }
-
-    /**
-     * @return all indices
-     */
-    public Set<String> keySet() {
-        return storeMap.keySet();
-    }
-
-    /**
-     * @param index specified index
-     * @return existing or newly-created multimap object for the given {@code index}
-     */
-    public Multimap<String, String> getOrCreate(String index) {
-        Multimap<String, String> mmap = storeMap.get(index);
-        if (mmap == null) {
-            SetMultimap<String, String> multimap =
-                Multimaps.newSetMultimap(new HashMap<>(),
-                    () -> Collections.newSetFromMap(new ConcurrentHashMap<>()));
-            mmap = concurrent ? Multimaps.synchronizedSetMultimap(multimap) : multimap;
-            storeMap.put(index, mmap);
-        }
-        return mmap;
-    }
-
-    public Multimap<String, String> get(String index) {
-        Multimap<String, String> mmap = storeMap.get(index);
-        if (mmap == null) {
-            throw new ReflectionsException("Scanner " + index + " was not configured");
-        }
-        return mmap;
-    }
-
-    /**
-     * @param index specified index
-     * @param keys specified keys
-     * @return values stored for the given {@code index} and {@code keys}
-     */
-    public Iterable<String> get(String index, String... keys) {
-        return get(index, Arrays.asList(keys));
-    }
-
-    /**
-     * @param index specified index
-     * @param keys specified keys
-     * @return values stored for the given {@code index} and {@code keys}
-     */
-    public Iterable<String> get(String index, Iterable<String> keys) {
-        Multimap<String, String> mmap = get(index);
-        IterableChain<String> result = new IterableChain<>();
-        for (String key : keys) {
-            result.addAll(mmap.get(key));
-        }
-        return result;
-    }
-
-    /**
-     * @param index specified index
-     * @param keys specified keys
-     * @param result accumulates intermediate results
-     * @return values stored for the given {@code index} and {@code keys}, including keys
-     */
-    private Iterable<String> getAllIncluding(String index, Iterable<String> keys, IterableChain<String> result) {
-        result.addAll(keys);
-        for (String key : keys) {
-            Iterable<String> values = get(index, key);
-            if (values.iterator().hasNext()) {
-                getAllIncluding(index, values, result);
-            }
-        }
-        return result;
-    }
-
-    /**
-     * @param index specified index
-     * @param keys specified keys
-     * @return values stored for the given {@code index} and {@code keys}, not including keys
-     */
-    public Iterable<String> getAll(String index, Iterable<String> keys) {
-        return getAllIncluding(index, get(index, keys), new IterableChain<>());
-    }
-
-    private static class IterableChain<T> implements Iterable<T> {
-        private final List<Iterable<T>> chain = Lists.newArrayList();
-
-        private void addAll(Iterable<T> iterable) {
-            chain.add(iterable);
-        }
-
-        public Iterator<T> iterator() {
-            return Iterables.concat(chain).iterator();
-        }
-    }
-}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/discovery/SubTypesScanner.java b/logstash-core/src/main/java/org/logstash/plugins/discovery/SubTypesScanner.java
deleted file mode 100644
index 820565998..000000000
--- a/logstash-core/src/main/java/org/logstash/plugins/discovery/SubTypesScanner.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.logstash.plugins.discovery;
-
-import java.util.List;
-
-/** scans for superclass and interfaces of a class, allowing a reverse lookup for subtypes */
-public class SubTypesScanner extends AbstractScanner {
-
-    /** created new SubTypesScanner. will exclude direct Object subtypes */
-    public SubTypesScanner() {
-        this(true); //exclude direct Object subtypes by default
-    }
-
-    /** created new SubTypesScanner.
-     * @param excludeObjectClass if false, include direct {@link Object} subtypes in results.  */
-    public SubTypesScanner(boolean excludeObjectClass) {
-        if (excludeObjectClass) {
-            filterResultsBy(new FilterBuilder().exclude(Object.class.getName())); //exclude direct Object subtypes
-        }
-    }
-
-    @SuppressWarnings({"unchecked"})
-    public void scan(final Object cls) {
-        String className = getMetadataAdapter().getClassName(cls);
-        String superclass = getMetadataAdapter().getSuperclassName(cls);
-
-        if (acceptResult(superclass)) {
-            getStore().put(superclass, className);
-        }
-
-        for (String anInterface : (List<String>) getMetadataAdapter().getInterfacesNames(cls)) {
-            if (acceptResult(anInterface)) {
-                getStore().put(anInterface, className);
-            }
-        }
-    }
-}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/discovery/TypeAnnotationsScanner.java b/logstash-core/src/main/java/org/logstash/plugins/discovery/TypeAnnotationsScanner.java
deleted file mode 100644
index 3b31cc6ad..000000000
--- a/logstash-core/src/main/java/org/logstash/plugins/discovery/TypeAnnotationsScanner.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.logstash.plugins.discovery;
-
-import java.lang.annotation.Inherited;
-import java.util.List;
-
-/**
- * scans for class's annotations, where @Retention(RetentionPolicy.RUNTIME)
- */
-@SuppressWarnings("unchecked")
-public class TypeAnnotationsScanner extends AbstractScanner {
-
-    @Override
-    public void scan(final Object cls) {
-        final String className = getMetadataAdapter().getClassName(cls);
-
-        for (String annotationType : (List<String>) getMetadataAdapter().getClassAnnotationNames(cls)) {
-
-            if (acceptResult(annotationType) ||
-                annotationType.equals(Inherited.class.getName())) { //as an exception, accept Inherited as well
-                getStore().put(annotationType, className);
-            }
-        }
-    }
-
-}
-
diff --git a/logstash-core/src/main/java/org/logstash/plugins/discovery/Utils.java b/logstash-core/src/main/java/org/logstash/plugins/discovery/Utils.java
deleted file mode 100644
index bdb3046a7..000000000
--- a/logstash-core/src/main/java/org/logstash/plugins/discovery/Utils.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.logstash.plugins.discovery;
-
-import com.google.common.base.Joiner;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Convenient methods for plugin discovery.
- */
-public abstract class Utils {
-
-    public static String repeat(String string, int times) {
-        StringBuilder sb = new StringBuilder();
-
-        for (int i = 0; i < times; i++) {
-            sb.append(string);
-        }
-
-        return sb.toString();
-    }
-
-    /**
-     * @param s string to test
-     * @return Java5-compatible isEmpty result
-     */
-    public static boolean isEmpty(String s) {
-        return s == null || s.length() == 0;
-    }
-
-    public static boolean isEmpty(Object[] objects) {
-        return objects == null || objects.length == 0;
-    }
-
-    public static void close(InputStream closeable) {
-        try {
-            if (closeable != null) {
-                closeable.close();
-            }
-        } catch (IOException e) {
-        }
-    }
-
-    public static String name(@SuppressWarnings("rawtypes") Class type) {
-        if (!type.isArray()) {
-            return type.getName();
-        } else {
-            int dim = 0;
-            while (type.isArray()) {
-                dim++;
-                type = type.getComponentType();
-            }
-            return type.getName() + repeat("[]", dim);
-        }
-    }
-
-    public static List<String> names(Iterable<Class<?>> types) {
-        List<String> result = new ArrayList<>();
-        for (Class<?> type : types) result.add(name(type));
-        return result;
-    }
-
-    public static List<String> names(Class<?>... types) {
-        return names(Arrays.asList(types));
-    }
-
-    public static String name(@SuppressWarnings("rawtypes") Constructor constructor) {
-        return constructor.getName() + "." + "<init>" + "(" + Joiner.on(", ").join(names(constructor.getParameterTypes())) + ")";
-    }
-
-    public static String name(Method method) {
-        return method.getDeclaringClass().getName() + "." + method.getName() + "(" + Joiner.on(", ").join(names(method.getParameterTypes())) + ")";
-    }
-
-    public static String name(Field field) {
-        return field.getDeclaringClass().getName() + "." + field.getName();
-    }
-}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/discovery/Vfs.java b/logstash-core/src/main/java/org/logstash/plugins/discovery/Vfs.java
deleted file mode 100644
index 5de32413f..000000000
--- a/logstash-core/src/main/java/org/logstash/plugins/discovery/Vfs.java
+++ /dev/null
@@ -1,634 +0,0 @@
-package org.logstash.plugins.discovery;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.AbstractIterator;
-import com.google.common.collect.Lists;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.JarURLConnection;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLDecoder;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Stack;
-import java.util.jar.JarFile;
-import java.util.jar.JarInputStream;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-
-public abstract class Vfs {
-    private static List<Vfs.UrlType> defaultUrlTypes = Lists.newArrayList(Vfs.DefaultUrlTypes.values());
-
-    /**
-     * an abstract vfs dir
-     */
-    public interface Dir {
-        String getPath();
-
-        Iterable<Vfs.File> getFiles();
-
-        void close();
-    }
-
-    /**
-     * an abstract vfs file
-     */
-    public interface File {
-        String getName();
-
-        String getRelativePath();
-
-        InputStream openInputStream() throws IOException;
-    }
-
-    /**
-     * a matcher and factory for a url
-     */
-    public interface UrlType {
-        boolean matches(URL url) throws Exception;
-
-        Vfs.Dir createDir(URL url) throws Exception;
-    }
-
-    /**
-     * @param url URL from which to create a Dir
-     * @return Dir created from the given url, using the defaultUrlTypes
-     */
-    public static Vfs.Dir fromURL(final URL url) {
-        return fromURL(url, defaultUrlTypes);
-    }
-
-    /**
-     * @param url URL from which to create a Dir
-     * @param urlTypes given URL types
-     * @return Dir created from the given url, using the given urlTypes
-     */
-    public static Vfs.Dir fromURL(final URL url, final List<Vfs.UrlType> urlTypes) {
-        for (final Vfs.UrlType type : urlTypes) {
-            try {
-                if (type.matches(url)) {
-                    final Vfs.Dir dir = type.createDir(url);
-                    if (dir != null) {
-                        return dir;
-                    }
-                }
-            } catch (final Throwable e) {
-            }
-        }
-
-        throw new ReflectionsException("could not create Vfs.Dir from url, no matching UrlType was found [" + url.toExternalForm() + "]\n" +
-            "either use fromURL(final URL url, final List<UrlType> urlTypes) or " +
-            "use the static setDefaultURLTypes(final List<UrlType> urlTypes) or addDefaultURLTypes(UrlType urlType) " +
-            "with your specialized UrlType.");
-    }
-
-    /**
-     * @param url provided URL
-     * @return {@link Vfs.File} from provided URL
-     */
-    public static java.io.File getFile(final URL url) {
-        java.io.File file;
-        String path;
-
-        try {
-            path = url.toURI().getSchemeSpecificPart();
-            if ((file = new java.io.File(path)).exists()) {
-                return file;
-            }
-        } catch (final URISyntaxException e) {
-        }
-
-        try {
-            path = URLDecoder.decode(url.getPath(), "UTF-8");
-            if (path.contains(".jar!")) {
-                path = path.substring(0, path.lastIndexOf(".jar!") + ".jar".length());
-            }
-            if ((file = new java.io.File(path)).exists()) {
-                return file;
-            }
-
-        } catch (final UnsupportedEncodingException e) {
-        }
-
-        try {
-            path = url.toExternalForm();
-            if (path.startsWith("jar:")) {
-                path = path.substring("jar:".length());
-            }
-            if (path.startsWith("wsjar:")) {
-                path = path.substring("wsjar:".length());
-            }
-            if (path.startsWith("file:")) {
-                path = path.substring("file:".length());
-            }
-            if (path.contains(".jar!")) {
-                path = path.substring(0, path.indexOf(".jar!") + ".jar".length());
-            }
-            if ((file = new java.io.File(path)).exists()) {
-                return file;
-            }
-
-            path = path.replace("%20", " ");
-            if ((file = new java.io.File(path)).exists()) {
-                return file;
-            }
-
-        } catch (final Exception e) {
-        }
-
-        return null;
-    }
-
-    private static boolean hasJarFileInPath(final URL url) {
-        return url.toExternalForm().matches(".*\\.jar(\\!.*|$)");
-    }
-
-    public enum DefaultUrlTypes implements Vfs.UrlType {
-        jarFile {
-            @Override
-            public boolean matches(final URL url) {
-                return url.getProtocol().equals("file") && hasJarFileInPath(url);
-            }
-
-            @Override
-            public Vfs.Dir createDir(final URL url) throws Exception {
-                return new Vfs.ZipDir(new JarFile(getFile(url)));
-            }
-        },
-
-        jarUrl {
-            @Override
-            public boolean matches(final URL url) {
-                return "jar".equals(url.getProtocol()) || "zip".equals(url.getProtocol()) || "wsjar".equals(url.getProtocol());
-            }
-
-            @Override
-            public Vfs.Dir createDir(final URL url) throws Exception {
-                try {
-                    final URLConnection urlConnection = url.openConnection();
-                    if (urlConnection instanceof JarURLConnection) {
-                        return new Vfs.ZipDir(((JarURLConnection) urlConnection).getJarFile());
-                    }
-                } catch (final Throwable e) { /*fallback*/ }
-                final java.io.File file = getFile(url);
-                if (file != null) {
-                    return new Vfs.ZipDir(new JarFile(file));
-                }
-                return null;
-            }
-        },
-
-        directory {
-            @Override
-            public boolean matches(final URL url) {
-                if (url.getProtocol().equals("file") && !hasJarFileInPath(url)) {
-                    final java.io.File file = getFile(url);
-                    return file != null && file.isDirectory();
-                } else {
-                    return false;
-                }
-            }
-
-            @Override
-            public Vfs.Dir createDir(final URL url) {
-                return new Vfs.SystemDir(getFile(url));
-            }
-        },
-
-        jboss_vfs {
-            @Override
-            public boolean matches(final URL url) {
-                return url.getProtocol().equals("vfs");
-            }
-
-            @Override
-            public Vfs.Dir createDir(final URL url) throws Exception {
-                final Object content = url.openConnection().getContent();
-                final Class<?> virtualFile = ClasspathHelper.contextClassLoader().loadClass("org.jboss.vfs.VirtualFile");
-                final java.io.File physicalFile = (java.io.File) virtualFile.getMethod("getPhysicalFile").invoke(content);
-                final String name = (String) virtualFile.getMethod("getName").invoke(content);
-                java.io.File file = new java.io.File(physicalFile.getParentFile(), name);
-                if (!file.exists() || !file.canRead()) {
-                    file = physicalFile;
-                }
-                return file.isDirectory() ? new Vfs.SystemDir(file) : new Vfs.ZipDir(new JarFile(file));
-            }
-        },
-
-        jboss_vfsfile {
-            @Override
-            public boolean matches(final URL url) {
-                return "vfszip".equals(url.getProtocol()) || "vfsfile".equals(url.getProtocol());
-            }
-
-            @Override
-            public Vfs.Dir createDir(final URL url) {
-                return new Vfs.UrlTypeVFS().createDir(url);
-            }
-        },
-
-        bundle {
-            @Override
-            public boolean matches(final URL url) {
-                return url.getProtocol().startsWith("bundle");
-            }
-
-            @Override
-            public Vfs.Dir createDir(final URL url) throws Exception {
-                return fromURL((URL) ClasspathHelper.contextClassLoader().
-                    loadClass("org.eclipse.core.runtime.FileLocator").getMethod("resolve", URL.class).invoke(null, url));
-            }
-        },
-
-        jarInputStream {
-            @Override
-            public boolean matches(final URL url) {
-                return url.toExternalForm().contains(".jar");
-            }
-
-            @Override
-            public Vfs.Dir createDir(final URL url) {
-                return new Vfs.JarInputDir(url);
-            }
-        }
-    }
-
-    private static final class JarInputDir implements Vfs.Dir {
-        private final URL url;
-        JarInputStream jarInputStream;
-        long cursor;
-        long nextCursor;
-
-        public JarInputDir(final URL url) {
-            this.url = url;
-        }
-
-        @Override
-        public String getPath() {
-            return url.getPath();
-        }
-
-        @Override
-        public Iterable<Vfs.File> getFiles() {
-            return () -> new AbstractIterator<Vfs.File>() {
-
-                {
-                    try {
-                        jarInputStream = new JarInputStream(url.openConnection().getInputStream());
-                    } catch (final Exception e) {
-                        throw new ReflectionsException("Could not open url connection", e);
-                    }
-                }
-
-                @Override
-                protected Vfs.File computeNext() {
-                    while (true) {
-                        try {
-                            final ZipEntry entry = jarInputStream.getNextJarEntry();
-                            if (entry == null) {
-                                return endOfData();
-                            }
-
-                            long size = entry.getSize();
-                            if (size < 0) {
-                                size = 0xffffffffl + size; //JDK-6916399
-                            }
-                            nextCursor += size;
-                            if (!entry.isDirectory()) {
-                                return new Vfs.JarInputFile(entry, Vfs.JarInputDir.this, cursor, nextCursor);
-                            }
-                        } catch (final IOException e) {
-                            throw new ReflectionsException("could not get next zip entry", e);
-                        }
-                    }
-                }
-            };
-        }
-
-        @Override
-        public void close() {
-            Utils.close(jarInputStream);
-        }
-    }
-
-    public static class JarInputFile implements Vfs.File {
-        private final ZipEntry entry;
-        private final Vfs.JarInputDir jarInputDir;
-        private final long fromIndex;
-        private final long endIndex;
-
-        public JarInputFile(final ZipEntry entry, final Vfs.JarInputDir jarInputDir, final long cursor, final long nextCursor) {
-            this.entry = entry;
-            this.jarInputDir = jarInputDir;
-            fromIndex = cursor;
-            endIndex = nextCursor;
-        }
-
-        @Override
-        public String getName() {
-            final String name = entry.getName();
-            return name.substring(name.lastIndexOf("/") + 1);
-        }
-
-        @Override
-        public String getRelativePath() {
-            return entry.getName();
-        }
-
-        @Override
-        public InputStream openInputStream() {
-            return new InputStream() {
-                @Override
-                public int read() throws IOException {
-                    if (jarInputDir.cursor >= fromIndex && jarInputDir.cursor <= endIndex) {
-                        final int read = jarInputDir.jarInputStream.read();
-                        jarInputDir.cursor++;
-                        return read;
-                    } else {
-                        return -1;
-                    }
-                }
-            };
-        }
-    }
-
-    public static final class ZipDir implements Vfs.Dir {
-        final java.util.zip.ZipFile jarFile;
-
-        public ZipDir(final JarFile jarFile) {
-            this.jarFile = jarFile;
-        }
-
-        @Override
-        public String getPath() {
-            return jarFile.getName();
-        }
-
-        @Override
-        public Iterable<Vfs.File> getFiles() {
-            return () -> new AbstractIterator<Vfs.File>() {
-                final Enumeration<? extends ZipEntry> entries = jarFile.entries();
-
-                @Override
-                protected Vfs.File computeNext() {
-                    while (entries.hasMoreElements()) {
-                        final ZipEntry entry = entries.nextElement();
-                        if (!entry.isDirectory()) {
-                            return new Vfs.ZipFile(Vfs.ZipDir.this, entry);
-                        }
-                    }
-
-                    return endOfData();
-                }
-            };
-        }
-
-        @Override
-        public void close() {
-            try {
-                jarFile.close();
-            } catch (final IOException e) {
-            }
-        }
-
-        @Override
-        public String toString() {
-            return jarFile.getName();
-        }
-    }
-
-    public static final class ZipFile implements Vfs.File {
-        private final Vfs.ZipDir root;
-        private final ZipEntry entry;
-
-        public ZipFile(final Vfs.ZipDir root, final ZipEntry entry) {
-            this.root = root;
-            this.entry = entry;
-        }
-
-        @Override
-        public String getName() {
-            final String name = entry.getName();
-            return name.substring(name.lastIndexOf("/") + 1);
-        }
-
-        @Override
-        public String getRelativePath() {
-            return entry.getName();
-        }
-
-        @Override
-        public InputStream openInputStream() throws IOException {
-            return root.jarFile.getInputStream(entry);
-        }
-
-        @Override
-        public String toString() {
-            return root.getPath() + "!" + java.io.File.separatorChar + entry.toString();
-        }
-    }
-
-    public static final class SystemDir implements Vfs.Dir {
-        private final java.io.File file;
-
-        public SystemDir(final java.io.File file) {
-            if (file != null && (!file.isDirectory() || !file.canRead())) {
-                throw new RuntimeException("cannot use dir " + file);
-            }
-
-            this.file = file;
-        }
-
-        @Override
-        public String getPath() {
-            if (file == null) {
-                return "/NO-SUCH-DIRECTORY/";
-            }
-            return file.getPath().replace("\\", "/");
-        }
-
-        @Override
-        public Iterable<Vfs.File> getFiles() {
-            if (file == null || !file.exists()) {
-                return Collections.emptyList();
-            }
-            return () -> new AbstractIterator<Vfs.File>() {
-                final Stack<java.io.File> stack = new Stack<>();
-
-                {
-                    stack.addAll(listFiles(file));
-                }
-
-                @Override
-                protected Vfs.File computeNext() {
-                    while (!stack.isEmpty()) {
-                        final java.io.File file = stack.pop();
-                        if (file.isDirectory()) {
-                            stack.addAll(listFiles(file));
-                        } else {
-                            return new Vfs.SystemFile(Vfs.SystemDir.this, file);
-                        }
-                    }
-
-                    return endOfData();
-                }
-            };
-        }
-
-        private static List<java.io.File> listFiles(final java.io.File file) {
-            final java.io.File[] files = file.listFiles();
-
-            if (files != null) {
-                return Lists.newArrayList(files);
-            } else {
-                return Lists.newArrayList();
-            }
-        }
-
-        @Override
-        public void close() {
-        }
-
-        @Override
-        public String toString() {
-            return getPath();
-        }
-    }
-
-    private static final class UrlTypeVFS implements Vfs.UrlType {
-        public static final String[] REPLACE_EXTENSION = {".ear/", ".jar/", ".war/", ".sar/", ".har/", ".par/"};
-
-        final String VFSZIP = "vfszip";
-        final String VFSFILE = "vfsfile";
-
-        @Override
-        public boolean matches(final URL url) {
-            return VFSZIP.equals(url.getProtocol()) || VFSFILE.equals(url.getProtocol());
-        }
-
-        @Override
-        public Vfs.Dir createDir(final URL url) {
-            try {
-                final URL adaptedUrl = adaptURL(url);
-                return new Vfs.ZipDir(new JarFile(adaptedUrl.getFile()));
-            } catch (final Exception e) {
-                try {
-                    return new Vfs.ZipDir(new JarFile(url.getFile()));
-                } catch (final IOException e1) {
-                }
-            }
-            return null;
-        }
-
-        public URL adaptURL(final URL url) throws MalformedURLException {
-            if (VFSZIP.equals(url.getProtocol())) {
-                return replaceZipSeparators(url.getPath(), realFile);
-            } else if (VFSFILE.equals(url.getProtocol())) {
-                return new URL(url.toString().replace(VFSFILE, "file"));
-            } else {
-                return url;
-            }
-        }
-
-        URL replaceZipSeparators(final String path, final Predicate<java.io.File> acceptFile)
-            throws MalformedURLException {
-            int pos = 0;
-            while (pos != -1) {
-                pos = findFirstMatchOfDeployableExtention(path, pos);
-
-                if (pos > 0) {
-                    final java.io.File file = new java.io.File(path.substring(0, pos - 1));
-                    if (acceptFile.apply(file)) {
-                        return replaceZipSeparatorStartingFrom(path, pos);
-                    }
-                }
-            }
-
-            throw new ReflectionsException("Unable to identify the real zip file in path '" + path + "'.");
-        }
-
-        int findFirstMatchOfDeployableExtention(final String path, final int pos) {
-            final Pattern p = Pattern.compile("\\.[ejprw]ar/");
-            final Matcher m = p.matcher(path);
-            if (m.find(pos)) {
-                return m.end();
-            } else {
-                return -1;
-            }
-        }
-
-        Predicate<java.io.File> realFile = file -> file.exists() && file.isFile();
-
-        URL replaceZipSeparatorStartingFrom(final String path, final int pos)
-            throws MalformedURLException {
-            final String zipFile = path.substring(0, pos - 1);
-            String zipPath = path.substring(pos);
-
-            int numSubs = 1;
-            for (final String ext : REPLACE_EXTENSION) {
-                while (zipPath.contains(ext)) {
-                    zipPath = zipPath.replace(ext, ext.substring(0, 4) + "!");
-                    numSubs++;
-                }
-            }
-
-            String prefix = "";
-            for (int i = 0; i < numSubs; i++) {
-                prefix += "zip:";
-            }
-
-            if (zipPath.trim().length() == 0) {
-                return new URL(prefix + "/" + zipFile);
-            } else {
-                return new URL(prefix + "/" + zipFile + "!" + zipPath);
-            }
-        }
-    }
-
-    private static final class SystemFile implements Vfs.File {
-        private final Vfs.SystemDir root;
-        private final java.io.File file;
-
-        public SystemFile(final Vfs.SystemDir root, final java.io.File file) {
-            this.root = root;
-            this.file = file;
-        }
-
-        @Override
-        public String getName() {
-            return file.getName();
-        }
-
-        @Override
-        public String getRelativePath() {
-            final String filepath = file.getPath().replace("\\", "/");
-            if (filepath.startsWith(root.getPath())) {
-                return filepath.substring(root.getPath().length() + 1);
-            }
-
-            return null; //should not get here
-        }
-
-        @Override
-        public InputStream openInputStream() {
-            try {
-                return new FileInputStream(file);
-            } catch (final FileNotFoundException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        @Override
-        public String toString() {
-            return file.toString();
-        }
-    }
-}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/factory/AbstractPluginCreator.java b/logstash-core/src/main/java/org/logstash/plugins/factory/AbstractPluginCreator.java
new file mode 100644
index 000000000..4685a01bd
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/factory/AbstractPluginCreator.java
@@ -0,0 +1,45 @@
+package org.logstash.plugins.factory;
+
+import co.elastic.logstash.api.Configuration;
+import co.elastic.logstash.api.Context;
+import co.elastic.logstash.api.Plugin;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
+import org.logstash.plugins.ConfigurationImpl;
+import org.logstash.plugins.PluginLookup;
+import org.logstash.plugins.PluginUtil;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Map;
+
+abstract class AbstractPluginCreator<T extends Plugin> {
+
+    protected PluginFactoryExt pluginsFactory = null;
+
+    abstract IRubyObject createDelegator(String name, Map<String, Object> pluginArgs, String id,
+                                AbstractNamespacedMetricExt typeScopedMetric,
+                                PluginLookup.PluginClass pluginClass, Context pluginContext);
+
+    protected T instantiateAndValidate(Map<String, Object> pluginArgs, String id, Context pluginContext,
+                                       PluginLookup.PluginClass pluginClass) {
+        @SuppressWarnings("unchecked")
+        final Class<T> cls = (Class<T>) pluginClass.klass();
+        if (cls == null) {
+            throw new IllegalStateException("Unable to instantiate type: " + pluginClass);
+        }
+
+        try {
+            final Constructor<T> ctor = cls.getConstructor(String.class, Configuration.class, Context.class);
+            Configuration config = new ConfigurationImpl(pluginArgs, pluginsFactory);
+            T plugin = ctor.newInstance(id, config, pluginContext);
+            PluginUtil.validateConfig(plugin, config);
+            return plugin;
+        } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException ex) {
+            if (ex instanceof InvocationTargetException && ex.getCause() != null) {
+                throw new IllegalStateException((ex).getCause());
+            }
+            throw new IllegalStateException(ex);
+        }
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/factory/CodecPluginCreator.java b/logstash-core/src/main/java/org/logstash/plugins/factory/CodecPluginCreator.java
new file mode 100644
index 000000000..e62c14296
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/factory/CodecPluginCreator.java
@@ -0,0 +1,23 @@
+package org.logstash.plugins.factory;
+
+import co.elastic.logstash.api.Codec;
+import co.elastic.logstash.api.Context;
+import org.jruby.javasupport.JavaUtil;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.logstash.RubyUtil;
+import org.logstash.config.ir.compiler.JavaCodecDelegator;
+import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
+import org.logstash.plugins.PluginLookup;
+
+import java.util.Map;
+
+class CodecPluginCreator extends AbstractPluginCreator<Codec> {
+
+    @Override
+    public IRubyObject createDelegator(String name, Map<String, Object> pluginArgs, String id,
+                                       AbstractNamespacedMetricExt typeScopedMetric,
+                                       PluginLookup.PluginClass pluginClass, Context pluginContext) {
+        Codec codec = instantiateAndValidate(pluginArgs, id, pluginContext, pluginClass);
+        return JavaUtil.convertJavaToRuby(RubyUtil.RUBY, new JavaCodecDelegator(pluginContext, codec));
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/factory/ContextualizerExt.java b/logstash-core/src/main/java/org/logstash/plugins/factory/ContextualizerExt.java
new file mode 100644
index 000000000..becba99cb
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/factory/ContextualizerExt.java
@@ -0,0 +1,99 @@
+package org.logstash.plugins.factory;
+
+import org.jruby.RubyClass;
+import org.jruby.RubyHash;
+import org.jruby.RubyModule;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.anno.JRubyModule;
+import org.jruby.runtime.Block;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.logstash.RubyUtil;
+import org.logstash.execution.ExecutionContextExt;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.jruby.runtime.Helpers.invokeSuper;
+import static org.logstash.RubyUtil.PLUGIN_CONTEXTUALIZER_MODULE;
+
+/**
+ * The {@link ContextualizerExt} is used to inject {@link org.logstash.execution.ExecutionContextExt } to plugins
+ * before they are initialized.
+ *
+ * @see ContextualizerExt#initializePlugin(ThreadContext, IRubyObject, IRubyObject[], Block)
+ */
+@JRubyModule(name = "Contextualizer")
+public class ContextualizerExt {
+
+    private static final String EXECUTION_CONTEXT_IVAR_NAME = "@execution_context";
+
+    /*
+     * @overload PluginContextualizer::initialize_plugin(execution_context, plugin_class, *plugin_args, &pluginBlock)
+     */
+    @JRubyMethod(name = "initialize_plugin", meta = true, required = 2, rest = true)
+    public static IRubyObject initializePlugin(final ThreadContext context,
+                                               final IRubyObject recv,
+                                               final IRubyObject[] args,
+                                               final Block block) {
+        final List<IRubyObject> argsList = new ArrayList<>(Arrays.asList(args));
+        final ExecutionContextExt executionContext = RubyUtil.nilSafeCast(argsList.remove(0));
+        final RubyClass pluginClass = (RubyClass) argsList.remove(0);
+        final IRubyObject[] pluginArgs = argsList.toArray(new IRubyObject[]{});
+
+        return initializePlugin(context, (RubyModule) recv, executionContext, pluginClass, pluginArgs, block);
+    }
+
+    public static IRubyObject initializePlugin(final ThreadContext context,
+                                               @Nullable final ExecutionContextExt executionContextExt,
+                                               final RubyClass pluginClass,
+                                               final RubyHash pluginArgs) {
+        return initializePlugin(context, PLUGIN_CONTEXTUALIZER_MODULE, executionContextExt, pluginClass, new IRubyObject[]{pluginArgs}, Block.NULL_BLOCK);
+    }
+
+    private static IRubyObject initializePlugin(final ThreadContext context,
+                                               final RubyModule recv,
+                                               @Nullable final ExecutionContextExt executionContext,
+                                               final RubyClass pluginClass,
+                                               final IRubyObject[] pluginArgs,
+                                               final Block block) {
+        synchronized (ContextualizerExt.class) {
+            if (!pluginClass.hasModuleInPrepends(recv)) {
+                pluginClass.prepend(context, new IRubyObject[]{recv});
+            }
+        }
+
+        final IRubyObject[] pluginInitArgs;
+        if (executionContext == null) {
+            pluginInitArgs = pluginArgs;
+        } else {
+            List<IRubyObject> pluginInitArgList = new ArrayList<>(1 + pluginArgs.length);
+            pluginInitArgList.add(executionContext);
+            pluginInitArgList.addAll(Arrays.asList(pluginArgs));
+            pluginInitArgs = pluginInitArgList.toArray(new IRubyObject[]{});
+        }
+
+        // We must use IRubyObject#callMethod(...,"new",...) here to continue supporting
+        // mocking/validating from rspec.
+        return  pluginClass.callMethod(context, "new", pluginInitArgs, block);
+    }
+
+    @JRubyMethod(name = "initialize", rest = true, frame = true) // framed for invokeSuper
+    public static IRubyObject initialize(final ThreadContext context,
+                                         final IRubyObject recv,
+                                         final IRubyObject[] args,
+                                         final Block block) {
+        final List<IRubyObject> argsList = new ArrayList<>(Arrays.asList(args));
+
+        if (args.length > 0 && args[0] instanceof ExecutionContextExt) {
+            final ExecutionContextExt executionContext = (ExecutionContextExt) argsList.remove(0);
+            recv.getInstanceVariables().setInstanceVariable(EXECUTION_CONTEXT_IVAR_NAME, executionContext);
+        }
+
+        final IRubyObject[] restArgs = argsList.toArray(new IRubyObject[]{});
+
+        return invokeSuper(context, recv, restArgs, block);
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/factory/ExecutionContextFactoryExt.java b/logstash-core/src/main/java/org/logstash/plugins/factory/ExecutionContextFactoryExt.java
new file mode 100644
index 000000000..84359a62f
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/factory/ExecutionContextFactoryExt.java
@@ -0,0 +1,84 @@
+package org.logstash.plugins.factory;
+
+import co.elastic.logstash.api.Context;
+import co.elastic.logstash.api.DeadLetterQueueWriter;
+import org.jruby.Ruby;
+import org.jruby.RubyBasicObject;
+import org.jruby.RubyClass;
+import org.jruby.anno.JRubyClass;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.logstash.RubyUtil;
+import org.logstash.common.AbstractDeadLetterQueueWriterExt;
+import org.logstash.common.DLQWriterAdapter;
+import org.logstash.common.NullDeadLetterQueueWriter;
+import org.logstash.execution.ExecutionContextExt;
+import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
+import org.logstash.plugins.ContextImpl;
+import org.logstash.plugins.NamespacedMetricImpl;
+import org.logstash.plugins.PluginLookup;
+
+/**
+ * JRuby extension, factory class for plugins execution contexts
+ * */
+@JRubyClass(name = "ExecutionContextFactory")
+public final class ExecutionContextFactoryExt extends RubyBasicObject {
+
+    private static final long serialVersionUID = 1L;
+
+    private transient IRubyObject agent;
+
+    private transient IRubyObject pipeline;
+
+    private transient IRubyObject dlqWriter;
+
+    public ExecutionContextFactoryExt(final Ruby runtime, final RubyClass metaClass) {
+        super(runtime, metaClass);
+    }
+
+    @JRubyMethod
+    public ExecutionContextFactoryExt initialize(final ThreadContext context, final IRubyObject agent,
+                                                 final IRubyObject pipeline, final IRubyObject dlqWriter) {
+        this.agent = agent;
+        this.pipeline = pipeline;
+        this.dlqWriter = dlqWriter;
+        return this;
+    }
+
+    @JRubyMethod
+    public ExecutionContextExt create(final ThreadContext context, final IRubyObject id,
+                                      final IRubyObject classConfigName) {
+        final AbstractDeadLetterQueueWriterExt dlqWriterForInstance = new AbstractDeadLetterQueueWriterExt.PluginDeadLetterQueueWriterExt(
+                context.runtime, RubyUtil.PLUGIN_DLQ_WRITER_CLASS
+        ).initialize(context, dlqWriter, id, classConfigName);
+
+        return new ExecutionContextExt(
+            context.runtime, RubyUtil.EXECUTION_CONTEXT_CLASS
+        ).initialize(
+            context, new IRubyObject[]{pipeline, agent, dlqWriterForInstance}
+        );
+    }
+
+    Context toContext(PluginLookup.PluginType pluginType, AbstractNamespacedMetricExt metric) {
+        DeadLetterQueueWriter dlq = NullDeadLetterQueueWriter.getInstance();
+        if (dlqWriter instanceof AbstractDeadLetterQueueWriterExt.PluginDeadLetterQueueWriterExt) {
+            IRubyObject innerWriter =
+                    ((AbstractDeadLetterQueueWriterExt.PluginDeadLetterQueueWriterExt) dlqWriter)
+                            .innerWriter(RubyUtil.RUBY.getCurrentContext());
+            if (innerWriter != null) {
+                if (org.logstash.common.io.DeadLetterQueueWriter.class.isAssignableFrom(innerWriter.getJavaClass())) {
+                    dlq = new DLQWriterAdapter(innerWriter.toJava(org.logstash.common.io.DeadLetterQueueWriter.class));
+                }
+            }
+        } else if (dlqWriter.getJavaClass().equals(DeadLetterQueueWriter.class)) {
+            dlq = dlqWriter.toJava(DeadLetterQueueWriter.class);
+        }
+
+        return new ContextImpl(dlq, new NamespacedMetricImpl(RubyUtil.RUBY.getCurrentContext(), metric));
+    }
+
+    IRubyObject getPipeline() {
+        return pipeline;
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/factory/FilterPluginCreator.java b/logstash-core/src/main/java/org/logstash/plugins/factory/FilterPluginCreator.java
new file mode 100644
index 000000000..5d98f7d4f
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/factory/FilterPluginCreator.java
@@ -0,0 +1,21 @@
+package org.logstash.plugins.factory;
+
+import co.elastic.logstash.api.Context;
+import co.elastic.logstash.api.Filter;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.logstash.config.ir.compiler.JavaFilterDelegatorExt;
+import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
+import org.logstash.plugins.PluginLookup;
+
+import java.util.Map;
+
+class FilterPluginCreator extends AbstractPluginCreator<Filter> {
+
+    @Override
+    public IRubyObject createDelegator(String name, Map<String, Object> pluginArgs, String id,
+                                       AbstractNamespacedMetricExt typeScopedMetric,
+                                       PluginLookup.PluginClass pluginClass, Context pluginContext) {
+        Filter filter = instantiateAndValidate(pluginArgs, id, pluginContext, pluginClass);
+        return JavaFilterDelegatorExt.create(name, id, typeScopedMetric, filter, pluginArgs);
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/factory/InputPluginCreator.java b/logstash-core/src/main/java/org/logstash/plugins/factory/InputPluginCreator.java
new file mode 100644
index 000000000..7dda183ce
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/factory/InputPluginCreator.java
@@ -0,0 +1,27 @@
+package org.logstash.plugins.factory;
+
+import co.elastic.logstash.api.Context;
+import co.elastic.logstash.api.Input;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.logstash.config.ir.compiler.JavaInputDelegatorExt;
+import org.logstash.execution.AbstractPipelineExt;
+import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
+import org.logstash.plugins.PluginLookup;
+
+import java.util.Map;
+
+class InputPluginCreator extends AbstractPluginCreator<Input> {
+
+    InputPluginCreator(PluginFactoryExt pluginsFactory) {
+        this.pluginsFactory = pluginsFactory;
+    }
+
+    @Override
+    public IRubyObject createDelegator(String name, Map<String, Object> pluginArgs, String id,
+                                       AbstractNamespacedMetricExt typeScopedMetric,
+                                       PluginLookup.PluginClass pluginClass, Context pluginContext) {
+        Input input = instantiateAndValidate(pluginArgs, id, pluginContext, pluginClass);
+        return JavaInputDelegatorExt.create((AbstractPipelineExt) pluginsFactory.getExecutionContextFactory().getPipeline(),
+                typeScopedMetric, input, pluginArgs);
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/factory/OutputPluginCreator.java b/logstash-core/src/main/java/org/logstash/plugins/factory/OutputPluginCreator.java
new file mode 100644
index 000000000..25039546f
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/factory/OutputPluginCreator.java
@@ -0,0 +1,25 @@
+package org.logstash.plugins.factory;
+
+import co.elastic.logstash.api.Context;
+import co.elastic.logstash.api.Output;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.logstash.config.ir.compiler.JavaOutputDelegatorExt;
+import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
+import org.logstash.plugins.PluginLookup;
+
+import java.util.Map;
+
+class OutputPluginCreator extends AbstractPluginCreator<Output> {
+
+    OutputPluginCreator(PluginFactoryExt pluginsFactory) {
+        this.pluginsFactory = pluginsFactory;
+    }
+
+    @Override
+    public IRubyObject createDelegator(String name, Map<String, Object> pluginArgs, String id,
+                                       AbstractNamespacedMetricExt typeScopedMetric,
+                                       PluginLookup.PluginClass pluginClass, Context pluginContext) {
+        Output output = instantiateAndValidate(pluginArgs, id, pluginContext, pluginClass);
+        return JavaOutputDelegatorExt.create(name, id, typeScopedMetric, output);
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/factory/PluginFactoryExt.java b/logstash-core/src/main/java/org/logstash/plugins/factory/PluginFactoryExt.java
new file mode 100644
index 000000000..13d231a21
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/factory/PluginFactoryExt.java
@@ -0,0 +1,364 @@
+package org.logstash.plugins.factory;
+
+import co.elastic.logstash.api.*;
+import org.jruby.*;
+import org.jruby.anno.JRubyClass;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.javasupport.JavaUtil;
+import org.jruby.runtime.Block;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.logstash.RubyUtil;
+import org.logstash.common.EnvironmentVariableProvider;
+import org.logstash.common.SourceWithMetadata;
+import org.logstash.config.ir.PipelineIR;
+import org.logstash.config.ir.compiler.*;
+import org.logstash.config.ir.graph.Vertex;
+import org.logstash.execution.ExecutionContextExt;
+import org.logstash.instrument.metrics.AbstractMetricExt;
+import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
+import org.logstash.instrument.metrics.MetricKeys;
+import org.logstash.plugins.ConfigVariableExpander;
+import org.logstash.plugins.PluginLookup;
+import org.logstash.plugins.discovery.PluginRegistry;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * JRuby extension to implement the factory that create plugin instances
+ * */
+@JRubyClass(name = "PluginFactory")
+public final class PluginFactoryExt extends RubyBasicObject
+    implements RubyIntegration.PluginFactory {
+
+    /**
+     * Definition of plugin resolver, maps plugin type and name to the plugin's class.
+     * */
+    @FunctionalInterface
+    public interface PluginResolver {
+        PluginLookup.PluginClass resolve(PluginLookup.PluginType type, String name);
+    }
+
+    private static final long serialVersionUID = 1L;
+
+    private static final RubyString ID_KEY = RubyUtil.RUBY.newString("id");
+
+    private final transient Collection<String> pluginsById = ConcurrentHashMap.newKeySet();
+
+    private transient PipelineIR lir;
+
+    private ExecutionContextFactoryExt executionContextFactory;
+
+    private PluginMetricsFactoryExt metrics;
+
+    private RubyClass filterDelegatorClass;
+
+    private transient ConfigVariableExpander configVariables;
+
+    private transient PluginResolver pluginResolver;
+
+    private final transient Map<PluginLookup.PluginType, AbstractPluginCreator<? extends Plugin>> pluginCreatorsRegistry = new HashMap<>(4);
+
+    @JRubyMethod(name = "filter_delegator", meta = true, required = 5)
+    public static IRubyObject filterDelegator(final ThreadContext context,
+                                              final IRubyObject recv, final IRubyObject... args) {
+        //  filterDelegatorClass, klass, rubyArgs, typeScopedMetric, executionCntx
+        final RubyClass filterDelegatorClass = (RubyClass) args[0];
+        final RubyClass klass = (RubyClass) args[1];
+        final RubyHash arguments = (RubyHash) args[2];
+        final AbstractMetricExt typeScopedMetric = (AbstractMetricExt) args[3];
+        final ExecutionContextExt executionContext = (ExecutionContextExt) args[4];
+
+        final IRubyObject filterInstance = ContextualizerExt.initializePlugin(context, executionContext, klass, arguments);
+
+        final RubyString id = (RubyString) arguments.op_aref(context, ID_KEY);
+        filterInstance.callMethod(
+                context, "metric=",
+                typeScopedMetric.namespace(context, id.intern())
+        );
+
+        return filterDelegatorClass.newInstance(context, filterInstance, id, Block.NULL_BLOCK);
+    }
+
+    public PluginFactoryExt(final Ruby runtime, final RubyClass metaClass) {
+        this(runtime, metaClass, new PluginLookup(PluginRegistry.getInstance()));
+    }
+
+    PluginFactoryExt(final Ruby runtime, final RubyClass metaClass, PluginResolver pluginResolver) {
+        super(runtime, metaClass);
+        this.pluginResolver = pluginResolver;
+    }
+
+    public PluginFactoryExt init(final PipelineIR lir,
+                                     final PluginMetricsFactoryExt metrics,
+                                     final ExecutionContextFactoryExt executionContextFactoryExt,
+                                     final RubyClass filterClass) {
+        return this.init(lir, metrics, executionContextFactoryExt, filterClass, EnvironmentVariableProvider.defaultProvider());
+    }
+
+    PluginFactoryExt init(final PipelineIR lir,
+                          final PluginMetricsFactoryExt metrics,
+                          final ExecutionContextFactoryExt executionContextFactoryExt,
+                          final RubyClass filterClass,
+                          final EnvironmentVariableProvider envVars) {
+        this.lir = lir;
+        this.metrics = metrics;
+        this.executionContextFactory = executionContextFactoryExt;
+        this.filterDelegatorClass = filterClass;
+        this.pluginCreatorsRegistry.put(PluginLookup.PluginType.INPUT, new InputPluginCreator(this));
+        this.pluginCreatorsRegistry.put(PluginLookup.PluginType.CODEC, new CodecPluginCreator());
+        this.pluginCreatorsRegistry.put(PluginLookup.PluginType.FILTER, new FilterPluginCreator());
+        this.pluginCreatorsRegistry.put(PluginLookup.PluginType.OUTPUT, new OutputPluginCreator(this));
+        this.configVariables = ConfigVariableExpander.withoutSecret(envVars);
+        return this;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public IRubyObject buildInput(final RubyString name,
+                                  final IRubyObject args,
+                                  final SourceWithMetadata source) {
+        return plugin(
+                RubyUtil.RUBY.getCurrentContext(),
+                PluginLookup.PluginType.INPUT,
+                name.asJavaString(),
+                (RubyHash) args,
+                source
+        );
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public AbstractOutputDelegatorExt buildOutput(final RubyString name,
+                                                  final IRubyObject args,
+                                                  final SourceWithMetadata source) {
+        return (AbstractOutputDelegatorExt) plugin(
+                RubyUtil.RUBY.getCurrentContext(), PluginLookup.PluginType.OUTPUT, name.asJavaString(),
+                (RubyHash) args, source
+        );
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public AbstractFilterDelegatorExt buildFilter(final RubyString name,
+                                                  final IRubyObject args,
+                                                  final SourceWithMetadata source) {
+        return (AbstractFilterDelegatorExt) plugin(
+                RubyUtil.RUBY.getCurrentContext(), PluginLookup.PluginType.FILTER, name.asJavaString(),
+                (RubyHash) args, source
+        );
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public IRubyObject buildCodec(final RubyString name,
+                                  final IRubyObject args,
+                                  final SourceWithMetadata source) {
+        return plugin(
+                RubyUtil.RUBY.getCurrentContext(),
+                PluginLookup.PluginType.CODEC,
+                name.asJavaString(),
+                (RubyHash) args,
+                source
+        );
+    }
+
+    @Override
+    public Codec buildDefaultCodec(String codecName) {
+        final IRubyObject pluginInstance = plugin(
+                RubyUtil.RUBY.getCurrentContext(),
+                PluginLookup.PluginType.CODEC,
+                codecName,
+                RubyHash.newHash(RubyUtil.RUBY),
+                null
+        );
+        final Codec codec = (Codec) JavaUtil.unwrapJavaValue(pluginInstance);
+        if (codec != null) {
+            return codec;
+        }
+
+        // no unwrap is possible so this is a real Ruby instance
+        return new RubyCodecDelegator(RubyUtil.RUBY.getCurrentContext(), pluginInstance);
+    }
+
+    @Override
+    public Codec buildRubyCodecWrapper(RubyObject rubyCodec) {
+        return new RubyCodecDelegator(RubyUtil.RUBY.getCurrentContext(), rubyCodec);
+    }
+
+    @SuppressWarnings("unchecked")
+    @JRubyMethod(required = 3, optional = 1)
+    public IRubyObject plugin(final ThreadContext context, final IRubyObject[] args) {
+        final SourceWithMetadata source = args.length > 3 ? (SourceWithMetadata) JavaUtil.unwrapIfJavaObject(args[3]) : null;
+
+        return plugin(
+                context,
+                PluginLookup.PluginType.valueOf(args[0].asJavaString().toUpperCase(Locale.ENGLISH)),
+                args[1].asJavaString(),
+                (RubyHash) args[2],
+                source
+        );
+    }
+
+    @SuppressWarnings("unchecked")
+    private IRubyObject plugin(final ThreadContext context,
+                               final PluginLookup.PluginType type,
+                               final String name,
+                               final RubyHash args,
+                               final SourceWithMetadata source) {
+        final String id = generateOrRetrievePluginId(type, source, args);
+
+        if (id == null) {
+            throw context.runtime.newRaiseException(
+                    RubyUtil.CONFIGURATION_ERROR_CLASS,
+                    String.format(
+                            "Could not determine ID for %s/%s", type.rubyLabel().asJavaString(), name
+                    )
+            );
+        }
+        if (!pluginsById.add(id)) {
+            throw context.runtime.newRaiseException(
+                    RubyUtil.CONFIGURATION_ERROR_CLASS,
+                    String.format("Two plugins have the id '%s', please fix this conflict", id)
+            );
+        }
+
+        final AbstractNamespacedMetricExt typeScopedMetric = metrics.create(context, type.rubyLabel());
+
+        final PluginLookup.PluginClass pluginClass = pluginResolver.resolve(type, name);
+        if (pluginClass.language() == PluginLookup.PluginLanguage.RUBY) {
+
+            final Map<String, Object> newArgs = new HashMap<>(args);
+            newArgs.put("id", id);
+            final RubyClass klass = (RubyClass) pluginClass.klass();
+            final ExecutionContextExt executionCntx = executionContextFactory.create(
+                    context, RubyUtil.RUBY.newString(id), klass.callMethod(context, "config_name")
+            );
+            final RubyHash rubyArgs = RubyHash.newHash(context.runtime);
+            rubyArgs.putAll(newArgs);
+            if (type == PluginLookup.PluginType.OUTPUT) {
+                return new OutputDelegatorExt(context.runtime, RubyUtil.RUBY_OUTPUT_DELEGATOR_CLASS).initialize(
+                        context,
+                        new IRubyObject[]{
+                                klass, typeScopedMetric, executionCntx,
+                                OutputStrategyExt.OutputStrategyRegistryExt.instance(context, null),
+                                rubyArgs
+                        }
+                );
+            } else if (type == PluginLookup.PluginType.FILTER) {
+                return filterDelegator(
+                        context, null,
+                        filterDelegatorClass, klass, rubyArgs, typeScopedMetric, executionCntx);
+            } else {
+                final IRubyObject pluginInstance = ContextualizerExt.initializePlugin(context, executionCntx, klass, rubyArgs);
+
+                final AbstractNamespacedMetricExt scopedMetric = typeScopedMetric.namespace(context, RubyUtil.RUBY.newString(id).intern());
+                scopedMetric.gauge(context, MetricKeys.NAME_KEY, pluginInstance.callMethod(context, "config_name"));
+                pluginInstance.callMethod(context, "metric=", scopedMetric);
+                return pluginInstance;
+            }
+        } else {
+            AbstractPluginCreator<? extends Plugin> pluginCreator = pluginCreatorsRegistry.get(type);
+            if (pluginCreator == null) {
+                throw new IllegalStateException("Unable to create plugin: " + pluginClass.toReadableString());
+            }
+
+            Context contextWithMetrics = executionContextFactory.toContext(type, metrics.getRoot(context));
+            return pluginCreator.createDelegator(name, convertToJavaCoercible(args), id, typeScopedMetric, pluginClass, contextWithMetrics);
+        }
+    }
+
+    private Map<String, Object> convertToJavaCoercible(Map<String, Object> input) {
+        final Map<String, Object> output = new HashMap<>(input);
+
+        // Intercept Codecs
+        for (final Map.Entry<String, Object> entry : input.entrySet()) {
+            final String key = entry.getKey();
+            final Object value = entry.getValue();
+            if (value instanceof IRubyObject) {
+                final Object unwrapped = JavaUtil.unwrapJavaValue((IRubyObject) value);
+                if (unwrapped instanceof Codec) {
+                    output.put(key, unwrapped);
+                }
+            }
+        }
+
+        return output;
+    }
+
+    // TODO: caller seems to think that the args is `Map<String, IRubyObject>`, but
+    //       at least any `id` present is actually a `String`.
+    private String generateOrRetrievePluginId(final PluginLookup.PluginType type,
+                                              final SourceWithMetadata source,
+                                              final Map<String, ?> args) {
+        final Optional<String> unprocessedId;
+        if (source == null) {
+            unprocessedId = extractId(() -> extractIdFromArgs(args),
+                                      this::generateUUID);
+        } else {
+            unprocessedId = extractId(() -> extractIdFromLIR(source),
+                                      () -> extractIdFromArgs(args),
+                                      () -> generateUUIDForCodecs(type));
+        }
+
+        return unprocessedId
+                .map(configVariables::expand)
+                .filter(String.class::isInstance)
+                .map(String.class::cast)
+                .orElse(null);
+    }
+
+    private Optional<String> extractId(final IdExtractor... extractors) {
+        for (IdExtractor extractor : extractors) {
+            final Optional<String> extracted = extractor.extract();
+            if (extracted.isPresent()) {
+                return extracted;
+            }
+        }
+        return Optional.empty();
+    }
+
+    @FunctionalInterface
+    interface IdExtractor {
+        Optional<String> extract();
+    }
+
+    private Optional<String> extractIdFromArgs(final Map<String, ?> args) {
+        if (!args.containsKey("id")) {
+            return Optional.empty();
+        }
+
+        final Object explicitId = args.get("id");
+        if (explicitId instanceof String) {
+            return Optional.of((String) explicitId);
+        } else if (explicitId instanceof RubyString) {
+            return Optional.of(((RubyString) explicitId).asJavaString());
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    private Optional<String> generateUUID() {
+        return Optional.of(UUID.randomUUID().toString());
+    }
+
+    private Optional<String> generateUUIDForCodecs(final PluginLookup.PluginType pluginType) {
+        if (pluginType == PluginLookup.PluginType.CODEC) {
+            return generateUUID();
+        }
+        return Optional.empty();
+    }
+
+    private Optional<String> extractIdFromLIR(final SourceWithMetadata source) {
+        return lir.getGraph().vertices()
+                .filter(v -> v.getSourceWithMetadata() != null
+                        && v.getSourceWithMetadata().equalsWithoutText(source))
+                .findFirst()
+                .map(Vertex::getId);
+    }
+
+    ExecutionContextFactoryExt getExecutionContextFactory() {
+        return executionContextFactory;
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/factory/PluginMetricsFactoryExt.java b/logstash-core/src/main/java/org/logstash/plugins/factory/PluginMetricsFactoryExt.java
new file mode 100644
index 000000000..d8456f93c
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/factory/PluginMetricsFactoryExt.java
@@ -0,0 +1,59 @@
+package org.logstash.plugins.factory;
+
+import org.jruby.*;
+import org.jruby.anno.JRubyClass;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.logstash.RubyUtil;
+import org.logstash.instrument.metrics.AbstractMetricExt;
+import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
+import org.logstash.instrument.metrics.NullMetricExt;
+
+import java.util.Arrays;
+
+import static org.logstash.instrument.metrics.MetricKeys.*;
+
+/**
+ * JRuby extension to implement a factory class for Plugin's metrics
+ * */
+@JRubyClass(name = "PluginMetricsFactory")
+public final class PluginMetricsFactoryExt extends RubyBasicObject {
+
+    private static final long serialVersionUID = 1L;
+
+    private RubySymbol pipelineId;
+
+    private AbstractMetricExt metric;
+
+    public PluginMetricsFactoryExt(final Ruby runtime, final RubyClass metaClass) {
+        super(runtime, metaClass);
+    }
+
+    @JRubyMethod
+    public PluginMetricsFactoryExt initialize(final ThreadContext context,
+                                              final IRubyObject pipelineId, final IRubyObject metrics) {
+        this.pipelineId = pipelineId.convertToString().intern();
+        if (metrics.isNil()) {
+            this.metric = new NullMetricExt(context.runtime, RubyUtil.NULL_METRIC_CLASS);
+        } else {
+            this.metric = (AbstractMetricExt) metrics;
+        }
+        return this;
+    }
+
+    AbstractNamespacedMetricExt getRoot(final ThreadContext context) {
+        return metric.namespace(
+            context,
+            RubyArray.newArray(
+                context.runtime,
+                Arrays.asList(STATS_KEY, PIPELINES_KEY, pipelineId, PLUGINS_KEY)));
+    }
+
+    @JRubyMethod
+    public AbstractNamespacedMetricExt create(final ThreadContext context, final IRubyObject pluginType) {
+        return getRoot(context).namespace(
+            context, RubyUtil.RUBY.newString(String.format("%ss", pluginType.asJavaString())).intern()
+        );
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/factory/RubyCodecDelegator.java b/logstash-core/src/main/java/org/logstash/plugins/factory/RubyCodecDelegator.java
new file mode 100644
index 000000000..b70bb185f
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/factory/RubyCodecDelegator.java
@@ -0,0 +1,133 @@
+package org.logstash.plugins.factory;
+
+import co.elastic.logstash.api.Codec;
+import co.elastic.logstash.api.Event;
+import co.elastic.logstash.api.PluginConfigSpec;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.jruby.RubyArray;
+import org.jruby.RubyClass;
+import org.jruby.RubyString;
+import org.jruby.runtime.Block;
+import org.jruby.runtime.JavaInternalBlockBody;
+import org.jruby.runtime.Signature;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.logstash.RubyUtil;
+import org.logstash.ext.JrubyEventExtLibrary;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import java.util.Map;
+import java.util.function.Consumer;
+
+public class RubyCodecDelegator implements Codec {
+
+    private static final Logger LOGGER = LogManager.getLogger(RubyCodecDelegator.class);
+
+    private final ThreadContext currentContext;
+    private final IRubyObject pluginInstance;
+    private final String wrappingId;
+
+    public RubyCodecDelegator(ThreadContext currentContext, IRubyObject pluginInstance) {
+        this.currentContext = currentContext;
+        this.pluginInstance = pluginInstance;
+
+        verifyCodecAncestry(pluginInstance);
+        invokeRubyRegister(currentContext, pluginInstance);
+
+        wrappingId = "jw-" + wrappedPluginId();
+    }
+
+    private String wrappedPluginId() {
+        RubyString id = (RubyString) pluginInstance.callMethod(this.currentContext, "id");
+        return id.toString();
+    }
+
+    private static void verifyCodecAncestry(IRubyObject pluginInstance) {
+        if (!isRubyCodecSubclass(pluginInstance)) {
+            throw new IllegalStateException("Ruby wrapped codec is expected to subclass LogStash::Codecs::Base");
+        }
+    }
+
+    public static boolean isRubyCodecSubclass(IRubyObject pluginInstance) {
+        final RubyClass codecBaseClass = RubyUtil.RUBY.getModule("LogStash").getModule("Codecs").getClass("Base");
+        return pluginInstance.getType().hasModuleInHierarchy(codecBaseClass);
+    }
+
+    private void invokeRubyRegister(ThreadContext currentContext, IRubyObject pluginInstance) {
+        pluginInstance.callMethod(currentContext, "register");
+    }
+
+    @Override
+    public void decode(ByteBuffer buffer, Consumer<Map<String, Object>> eventConsumer) {
+        // invoke Ruby's codec #decode(data, block) and use a Block to capture the yielded LogStash::Event to
+        // back to Java and pass to the eventConsumer.
+        if (buffer.remaining() == 0) {
+            // no data to decode
+            return;
+        }
+
+        // setup the block callback bridge to invoke eventConsumer
+        final Block consumerWrapper = new Block(new JavaInternalBlockBody(currentContext.runtime, Signature.ONE_ARGUMENT) {
+            @Override
+            @SuppressWarnings("unchecked")
+            public IRubyObject yield(ThreadContext context, IRubyObject[] args) {
+                // Expect only one argument, the LogStash::Event instantiated by the Ruby codec
+                final IRubyObject event = args[0];
+                eventConsumer.accept( ((JrubyEventExtLibrary.RubyEvent) event).getEvent().getData() );
+                return event;
+            }
+        });
+
+        byte[] byteInput = new byte[buffer.remaining()];
+        buffer.get(byteInput);
+        final RubyString data = RubyUtil.RUBY.newString(new String(byteInput));
+        IRubyObject[] methodParams = new IRubyObject[]{data};
+        pluginInstance.callMethod(this.currentContext, "decode", methodParams, consumerWrapper);
+    }
+
+    @Override
+    public void flush(ByteBuffer buffer, Consumer<Map<String, Object>> eventConsumer) {
+        decode(buffer, eventConsumer);
+    }
+
+    @Override
+    @SuppressWarnings({"uncheked", "rawtypes"})
+    public void encode(Event event, OutputStream output) throws IOException {
+        // convert co.elastic.logstash.api.Event to JrubyEventExtLibrary.RubyEvent
+        if (!(event instanceof org.logstash.Event)) {
+            throw new IllegalStateException("The object to encode must be of type org.logstash.Event");
+        }
+
+        final JrubyEventExtLibrary.RubyEvent rubyEvent = JrubyEventExtLibrary.RubyEvent.newRubyEvent(currentContext.runtime, (org.logstash.Event) event);
+        final RubyArray param = RubyArray.newArray(currentContext.runtime, rubyEvent);
+        final RubyArray encoded = (RubyArray) pluginInstance.callMethod(this.currentContext, "multi_encode", param);
+
+        // method return an nested array, the outer contains just one element
+        // while the inner contains the original event and encoded event in form of String
+        final RubyString result = ((RubyArray) encoded.eltInternal(0)).eltInternal(1).convertToString();
+        output.write(result.getByteList().getUnsafeBytes(), result.getByteList().getBegin(), result.getByteList().getRealSize());
+    }
+
+    @Override
+    public Codec cloneCodec() {
+        return new RubyCodecDelegator(this.currentContext, this.pluginInstance);
+    }
+
+    @Override
+    public Collection<PluginConfigSpec<?>> configSchema() {
+        // this method is invoked only for real java codecs, the one that are configured
+        // in pipeline config that needs configuration validation. In this case the validation
+        // is already done on the Ruby codec.
+        return null;
+    }
+
+    @Override
+    public String getId() {
+        return wrappingId;
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/filters/Uuid.java b/logstash-core/src/main/java/org/logstash/plugins/filters/Uuid.java
index 2c8a23735..db3b79c7c 100644
--- a/logstash-core/src/main/java/org/logstash/plugins/filters/Uuid.java
+++ b/logstash-core/src/main/java/org/logstash/plugins/filters/Uuid.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins.filters;
 
 import co.elastic.logstash.api.Configuration;
@@ -13,6 +33,9 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.UUID;
 
+/**
+ * Java implementation of the "uuid" filter
+ * */
 @LogstashPlugin(name = "java_uuid")
 public class Uuid implements Filter {
 
diff --git a/logstash-core/src/main/java/org/logstash/plugins/inputs/Generator.java b/logstash-core/src/main/java/org/logstash/plugins/inputs/Generator.java
new file mode 100644
index 000000000..ab58663e8
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/inputs/Generator.java
@@ -0,0 +1,220 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.plugins.inputs;
+
+import co.elastic.logstash.api.Configuration;
+import co.elastic.logstash.api.Context;
+import co.elastic.logstash.api.Input;
+import co.elastic.logstash.api.LogstashPlugin;
+import co.elastic.logstash.api.PluginConfigSpec;
+import co.elastic.logstash.api.PluginHelper;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+
+/**
+ * Java implementation of the "generator" input
+ * */
+@LogstashPlugin(name = "java_generator")
+public class Generator implements Input {
+
+    public static final PluginConfigSpec<Long> COUNT_CONFIG =
+            PluginConfigSpec.numSetting("count", 0);
+    public static final PluginConfigSpec<List<Object>> LINES_CONFIG =
+            PluginConfigSpec.arraySetting("lines");
+    public static final PluginConfigSpec<String> MESSAGE_CONFIG =
+            PluginConfigSpec.stringSetting("message", "Hello world!");
+    public static final PluginConfigSpec<Long> THREADS_CONFIG =
+            PluginConfigSpec.numSetting("threads", 1);
+    public static final PluginConfigSpec<Double> EPS_CONFIG =
+            PluginConfigSpec.floatSetting("eps", 0);
+
+    private final String hostname;
+    private final long count;
+    private final double eps;
+    private String id;
+    private long threads;
+    private volatile boolean stopRequested = false;
+    private final CountDownLatch countDownLatch;
+    private String[] lines;
+    private int[] linesIndex;
+    private long[] sequence;
+    private ScheduledFuture<?>[] futures;
+    private List<Map<String, Object>> events;
+
+    /**
+     * Required constructor.
+     *
+     * @param id            Plugin id
+     * @param configuration Logstash Configuration
+     * @param context       Logstash Context
+     */
+    public Generator(final String id, final Configuration configuration, final Context context) {
+        this.id = id;
+        this.count = configuration.get(COUNT_CONFIG);
+        this.eps = configuration.get(EPS_CONFIG);
+        this.threads = configuration.get(THREADS_CONFIG);
+        if (this.threads < 1) {
+            throw new IllegalStateException("May not specify fewer than one generator thread");
+        }
+        this.countDownLatch = new CountDownLatch((int) threads);
+
+        String host;
+        try {
+            host = InetAddress.getLocalHost().getHostName();
+        } catch (UnknownHostException e) {
+            host = "[unknownHost]";
+        }
+        this.hostname = host;
+
+        // specifying "lines" will override "message"
+        List<Object> linesConfig = configuration.get(LINES_CONFIG);
+        if (linesConfig != null) {
+            lines = new String[linesConfig.size()];
+            for (int k = 0; k < linesConfig.size(); k++) {
+                lines[k] = (String) linesConfig.get(k);
+            }
+
+        } else {
+            lines = new String[]{configuration.get(MESSAGE_CONFIG)};
+        }
+    }
+
+    @Override
+    public void start(Consumer<Map<String, Object>> writer) {
+        if (eps > 0) {
+            startThrottledGenerator(writer);
+        } else {
+            startUnthrottledGenerator(writer);
+        }
+    }
+
+    private void startUnthrottledGenerator(Consumer<Map<String, Object>> writer) {
+        sequence = new long[(int) threads];
+        events = new ArrayList<>();
+        linesIndex = new int[(int) threads];
+
+        for (int k = 0; k < threads; k++) {
+            Map<String, Object> event = new HashMap<>();
+            event.put("hostname", hostname);
+            event.put("thread_number", k);
+            events.add(event);
+            if (k > 0) {
+                final int finalK = k;
+                Thread t = new Thread(() -> {
+                    while (runGenerator(writer, finalK, () -> countDownLatch.countDown())) {
+                    }
+                });
+                t.setName("generator_" + getId() + "_" + k);
+                t.start();
+            }
+        }
+
+        // run first generator on this thread
+        while (runGenerator(writer, 0, () -> countDownLatch.countDown())) {}
+    }
+
+    private void startThrottledGenerator(Consumer<Map<String, Object>> writer) {
+        ScheduledExecutorService ses = Executors.newScheduledThreadPool((int) threads);
+        int delayMilli = (int) (1000.0 / eps);
+        sequence = new long[(int) threads];
+        futures = new ScheduledFuture<?>[(int) threads];
+        events = new ArrayList<>();
+        linesIndex = new int[(int) threads];
+        for (int k = 0; k < threads; k++) {
+            Map<String, Object> event = new HashMap<>();
+            event.put("hostname", hostname);
+            event.put("thread_number", k);
+            events.add(event);
+            final int finalk = k;
+            futures[k] = ses.scheduleAtFixedRate(() -> runGenerator(writer, finalk, () -> {
+                        countDownLatch.countDown();
+                        futures[finalk].cancel(false);
+                    }),0, delayMilli, TimeUnit.MILLISECONDS);
+        }
+
+        boolean finished = false;
+        while (!stopRequested && !finished) {
+            try {
+                Thread.sleep(1000);
+                boolean allCancelled = true;
+                for (int k = 0; k < threads; k++) {
+                    allCancelled = allCancelled && futures[k].isCancelled();
+                }
+                if (allCancelled) {
+                    finished = true;
+                    ses.shutdownNow();
+                }
+            } catch (InterruptedException ex) {
+                // do nothing
+            }
+        }
+    }
+
+    private boolean runGenerator(Consumer<Map<String, Object>> writer, int thread, Runnable finishAction) {
+        if (stopRequested || ((count > 0) && (sequence[thread] >= count))) {
+            finishAction.run();
+            return false;
+        } else {
+            events.get(thread).put("sequence", sequence[thread]);
+            events.get(thread).put("message", lines[linesIndex[thread]++]);
+            writer.accept(events.get(thread));
+            if (linesIndex[thread] == lines.length) {
+                linesIndex[thread] = 0;
+                sequence[thread]++;
+            }
+            return true;
+        }
+    }
+
+    @Override
+    public void stop() {
+        stopRequested = true;
+    }
+
+    @Override
+    public void awaitStop() throws InterruptedException {
+        countDownLatch.await();
+    }
+
+    @Override
+    public Collection<PluginConfigSpec<?>> configSchema() {
+        return PluginHelper.commonInputSettings(Arrays.asList(COUNT_CONFIG, LINES_CONFIG, MESSAGE_CONFIG,
+                THREADS_CONFIG, EPS_CONFIG));
+    }
+
+    @Override
+    public String getId() {
+        return id;
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/inputs/Stdin.java b/logstash-core/src/main/java/org/logstash/plugins/inputs/Stdin.java
index 01af92072..017f36754 100644
--- a/logstash-core/src/main/java/org/logstash/plugins/inputs/Stdin.java
+++ b/logstash-core/src/main/java/org/logstash/plugins/inputs/Stdin.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins.inputs;
 
 import co.elastic.logstash.api.Codec;
@@ -23,6 +43,9 @@ import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.function.Consumer;
 
+/**
+ * Java implementation of the "stdin" input
+ * */
 @LogstashPlugin(name = "java_stdin")
 public class Stdin implements Input, Consumer<Map<String, Object>> {
 
@@ -52,7 +75,10 @@ public class Stdin implements Input, Consumer<Map<String, Object>> {
         this(id, configuration, context, new FileInputStream(FileDescriptor.in).getChannel());
     }
 
+    @SuppressWarnings("this-escape")
     Stdin(final String id, final Configuration configuration, final Context context, FileChannel inputChannel) {
+        // This is the reason why of the "this-escape" suppress warning, but this is used just to grab the class
+        // for the logger.
         logger = context.getLogger(this);
         this.id = id;
         try {
diff --git a/logstash-core/src/main/java/org/logstash/plugins/outputs/Sink.java b/logstash-core/src/main/java/org/logstash/plugins/outputs/Sink.java
new file mode 100644
index 000000000..3caf37d18
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/outputs/Sink.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.plugins.outputs;
+
+import co.elastic.logstash.api.Configuration;
+import co.elastic.logstash.api.Context;
+import co.elastic.logstash.api.Event;
+import co.elastic.logstash.api.LogstashPlugin;
+import co.elastic.logstash.api.Output;
+import co.elastic.logstash.api.PluginConfigSpec;
+import co.elastic.logstash.api.PluginHelper;
+
+import java.util.Collection;
+
+/**
+ * Java implementation of "sink" output plugin
+ * */
+@LogstashPlugin(name = "sink")
+public class Sink implements Output {
+
+
+    private final String id;
+
+    public Sink(final String id, final Configuration configuration, final Context context) {
+        this.id = id;
+    }
+
+    @Override
+    public void output(Collection<Event> events) {
+
+    }
+
+    @Override
+    public void stop() {
+
+    }
+
+    @Override
+    public void awaitStop() throws InterruptedException {
+
+    }
+
+    @Override
+    public Collection<PluginConfigSpec<?>> configSchema() {
+        return PluginHelper.commonOutputSettings();
+    }
+
+    @Override
+    public String getId() {
+        return id;
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/outputs/Stdout.java b/logstash-core/src/main/java/org/logstash/plugins/outputs/Stdout.java
index 20e998d27..47124091e 100644
--- a/logstash-core/src/main/java/org/logstash/plugins/outputs/Stdout.java
+++ b/logstash-core/src/main/java/org/logstash/plugins/outputs/Stdout.java
@@ -1,32 +1,53 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins.outputs;
 
+import co.elastic.logstash.api.Codec;
 import co.elastic.logstash.api.Configuration;
 import co.elastic.logstash.api.Context;
 import co.elastic.logstash.api.Event;
 import co.elastic.logstash.api.LogstashPlugin;
+import co.elastic.logstash.api.Output;
 import co.elastic.logstash.api.PluginConfigSpec;
 import co.elastic.logstash.api.PluginHelper;
-import co.elastic.logstash.api.Codec;
-import co.elastic.logstash.api.Output;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.nio.ByteBuffer;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.concurrent.CountDownLatch;
 
+/**
+ * Java implementation of the "stdout" output plugin
+ * */
 @LogstashPlugin(name = "java_stdout")
 public class Stdout implements Output {
 
     public static final PluginConfigSpec<Codec> CODEC_CONFIG =
-            PluginConfigSpec.codecSetting("codec", "java-line");
+            PluginConfigSpec.codecSetting("codec", "java_line");
 
     private Codec codec;
     private OutputStream outputStream;
     private final CountDownLatch done = new CountDownLatch(1);
     private String id;
-    private ByteBuffer encodeBuffer = ByteBuffer.wrap(new byte[16 * 1024]);
 
     /**
      * Required constructor.
@@ -51,17 +72,10 @@ public class Stdout implements Output {
     @Override
     public void output(final Collection<Event> events) {
         try {
-            boolean encodeCompleted;
             for (Event e : events) {
-                encodeBuffer.clear();
-                do {
-                    encodeCompleted = codec.encode(e, encodeBuffer);
-                    outputStream.write(encodeBuffer.array(), encodeBuffer.position(), encodeBuffer.limit());
-                    encodeBuffer.flip();
-                }
-                while (!encodeCompleted);
+                codec.encode(e, outputStream);
             }
-        } catch (Codec.EncodeException | IOException ex) {
+        } catch (IOException ex) {
             throw new IllegalStateException(ex);
         }
     }
diff --git a/logstash-core/src/main/java/org/logstash/plugins/pipeline/AbstractPipelineBus.java b/logstash-core/src/main/java/org/logstash/plugins/pipeline/AbstractPipelineBus.java
new file mode 100644
index 000000000..5589f74f4
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/pipeline/AbstractPipelineBus.java
@@ -0,0 +1,53 @@
+package org.logstash.plugins.pipeline;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.logstash.RubyUtil;
+import org.logstash.ext.JrubyEventExtLibrary;
+
+import java.util.Arrays;
+import java.util.stream.Stream;
+
+public abstract class AbstractPipelineBus implements PipelineBus {
+
+    private static final Logger LOGGER = LogManager.getLogger(AbstractPipelineBus.class);
+
+    protected static void doSendEvents(JrubyEventExtLibrary.RubyEvent[] orderedEvents, AddressState.ReadOnly addressState, boolean ensureDelivery) {
+        boolean sendWasSuccess = false;
+        ReceiveResponse lastResponse = null;
+        boolean partialProcessing;
+        int lastFailedPosition = 0;
+        do {
+            Stream<JrubyEventExtLibrary.RubyEvent> clones = Arrays.stream(orderedEvents)
+                    .skip(lastFailedPosition)
+                    .map(e -> e.rubyClone(RubyUtil.RUBY));
+
+            PipelineInput input = addressState.getInput(); // Save on calls to getInput since it's volatile
+            if (input != null) {
+                lastResponse = input.internalReceive(clones);
+                sendWasSuccess = lastResponse.wasSuccess();
+            }
+            partialProcessing = ensureDelivery && !sendWasSuccess;
+            if (partialProcessing) {
+                if (lastResponse != null && lastResponse.getStatus() == PipelineInput.ReceiveStatus.FAIL) {
+                    // when last call to internalReceive generated a fail for the subset of the orderedEvents
+                    // it is handling, restart from the cumulative last-failed position of the batch so that
+                    // the next attempt will operate on a subset that excludes those successfully received.
+                    lastFailedPosition += lastResponse.getSequencePosition();
+                    LOGGER.warn("Attempted to send events to '{}' but that address reached error condition with {} events remaining. " +
+                            "Will Retry. Root cause {}", addressState.getAddress(), orderedEvents.length - lastFailedPosition, lastResponse.getCauseMessage());
+                } else {
+                    LOGGER.warn("Attempted to send event to '{}' but that address was unavailable. " +
+                            "Maybe the destination pipeline is down or stopping? Will Retry.", addressState.getAddress());
+                }
+
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    LOGGER.error("Sleep unexpectedly interrupted in bus retry loop", e);
+                }
+            }
+        } while (partialProcessing);
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/pipeline/AddressState.java b/logstash-core/src/main/java/org/logstash/plugins/pipeline/AddressState.java
index 2b90453d8..499768fba 100644
--- a/logstash-core/src/main/java/org/logstash/plugins/pipeline/AddressState.java
+++ b/logstash-core/src/main/java/org/logstash/plugins/pipeline/AddressState.java
@@ -1,20 +1,48 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins.pipeline;
 
+import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * Class for representing the state of an internal address.
+ * Represents the state of an internal address.
  */
 public class AddressState {
     private final String address;
+
     private final Set<PipelineOutput> outputs = ConcurrentHashMap.newKeySet();
     private volatile PipelineInput input = null;
 
-    AddressState(String address) {
+    private transient ReadOnly readOnlyView;
+
+    public AddressState(final String address) {
         this.address = address;
     }
 
+    public String getAddress() {
+        return this.address;
+    }
+
     /**
      * Add the given output and ensure associated input's receivers are updated
      * @param output output to be added
@@ -38,14 +66,13 @@ public class AddressState {
      * @return true if successful, false if another input is listening
      */
     public synchronized boolean assignInputIfMissing(PipelineInput newInput) {
+        // We aren't changing anything
         if (input == null) {
             input = newInput;
             return true;
-        } else if (input == newInput) {
-            return true; // We aren't changing anything
+        } else {
+            return input == newInput;
         }
-
-        return false;
     }
 
     /**
@@ -76,4 +103,29 @@ public class AddressState {
     public Set<PipelineOutput> getOutputs() {
         return outputs;
     }
+
+    public ReadOnly getReadOnlyView() {
+        if (readOnlyView == null) {
+            this.readOnlyView = new ReadOnly();
+        }
+        return readOnlyView;
+    }
+
+    public class ReadOnly {
+        public String getAddress() {
+            return AddressState.this.getAddress();
+        }
+        public Set<PipelineOutput> getOutputs() {
+            return Collections.unmodifiableSet(AddressState.this.getOutputs());
+        }
+        public PipelineInput getInput() {
+            return AddressState.this.getInput();
+        }
+        public boolean isRunning() {
+            return AddressState.this.isRunning();
+        }
+        public boolean isEmpty() {
+            return AddressState.this.isEmpty();
+        }
+    }
 }
diff --git a/logstash-core/src/main/java/org/logstash/plugins/pipeline/PipelineBus.java b/logstash-core/src/main/java/org/logstash/plugins/pipeline/PipelineBus.java
index 1d5f92f00..f274dd2e2 100644
--- a/logstash-core/src/main/java/org/logstash/plugins/pipeline/PipelineBus.java
+++ b/logstash-core/src/main/java/org/logstash/plugins/pipeline/PipelineBus.java
@@ -1,218 +1,115 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.logstash.plugins.pipeline;
 
+import com.google.common.annotations.VisibleForTesting;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.logstash.RubyUtil;
 import org.logstash.ext.JrubyEventExtLibrary;
 
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Stream;
+import java.util.Collection;
+import java.util.Optional;
+import java.util.Set;
 
 /**
- * This class is essentially the communication bus / central state for the `pipeline` inputs/outputs to talk to each
- * other.
+ * A {@code PipelineBus} is the communication bus that allows {@link PipelineOutput}s to
+ * send events to {@link PipelineInput}s.
  *
- * This class is threadsafe.
+ * @implSpec implementations must be threadsafe for all operations.
  */
-public class PipelineBus {
-    final ConcurrentHashMap<String, AddressState> addressStates = new ConcurrentHashMap<>();
-    final ConcurrentHashMap<PipelineOutput, ConcurrentHashMap<String, AddressState>> outputsToAddressStates = new ConcurrentHashMap<>();
-    volatile boolean blockOnUnlisten = false;
-   private static final Logger logger = LogManager.getLogger(PipelineBus.class);
+public interface PipelineBus {
+
+    Logger LOGGER = LogManager.getLogger(PipelineBus.class);
+
+    /**
+     * API-stable entry-point for creating a {@link PipelineBus}
+     * @return a new pipeline bus
+     */
+    static PipelineBus create() {
+        return new PipelineBusV2();
+    }
 
     /**
      * Sends events from the provided output.
-     * @param sender The output sending the events.
-     * @param events A collection of JRuby events
+     *
+     * @param sender         The output sending the events.
+     * @param events         A collection of JRuby events
      * @param ensureDelivery set to true if you want this to retry indefinitely in the event an event send fails
      */
-    public void sendEvents(final PipelineOutput sender,
-                          final Collection<JrubyEventExtLibrary.RubyEvent> events,
-                          final boolean ensureDelivery) {
-        if (events.isEmpty()) return; // This can happen on pipeline shutdown or in some other situations
-
-        final ConcurrentHashMap<String, AddressState> addressesToInputs = outputsToAddressStates.get(sender);
-
-        addressesToInputs.forEach( (address, addressState) -> {
-            final Stream<JrubyEventExtLibrary.RubyEvent> clones = events.stream().map(e -> e.rubyClone(RubyUtil.RUBY));
-
-            PipelineInput input = addressState.getInput(); // Save on calls to getInput since it's volatile
-            boolean sendWasSuccess = input != null && input.internalReceive(clones);
-
-            // Retry send if the initial one failed
-            while (ensureDelivery && !sendWasSuccess) {
-                // We need to refresh the input in case the mapping has updated between loops
-                String message = String.format("Attempted to send event to '%s' but that address was unavailable. " +
-                        "Maybe the destination pipeline is down or stopping? Will Retry.", address);
-                logger.warn(message);
-                input = addressState.getInput();
-                sendWasSuccess = input != null && input.internalReceive(clones);
-                try {
-                    Thread.sleep(1000);
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    logger.error("Sleep unexpectedly interrupted in bus retry loop", e);
-                }
-            }
-        });
-    }
+    void sendEvents(PipelineOutput sender,
+                    Collection<JrubyEventExtLibrary.RubyEvent> events,
+                    boolean ensureDelivery);
 
     /**
      * Should be called by an output on register
-     * @param output output to be registered
+     *
+     * @param output    output to be registered
      * @param addresses collection of addresses on which to register this sender
      */
-    public void registerSender(final PipelineOutput output, final Iterable<String> addresses) {
-        addresses.forEach((String address) -> {
-            addressStates.compute(address, (k, value) -> {
-               final AddressState state = value != null ? value : new AddressState(address);
-               state.addOutput(output);
-
-               return state;
-            });
-        });
-
-        updateOutputReceivers(output);
-    }
+    void registerSender(PipelineOutput output, Iterable<String> addresses);
 
     /**
      * Should be called by an output on close
-     * @param output output that will be unregistered
+     *
+     * @param output    output that will be unregistered
      * @param addresses collection of addresses this sender was registered with
      */
-    public void unregisterSender(final PipelineOutput output, final Iterable<String> addresses) {
-        addresses.forEach(address -> {
-            addressStates.computeIfPresent(address, (k, state) -> {
-                state.removeOutput(output);
-
-                if (state.isEmpty()) return null;
-
-                return state;
-            });
-        });
-
-        outputsToAddressStates.remove(output);
-    }
-
-    /**
-     * Updates the internal state for this output to reflect the fact that there may be a change
-     * in the inputs receiving events from it.
-     * @param output output to update
-     */
-    private void updateOutputReceivers(final PipelineOutput output) {
-        outputsToAddressStates.compute(output, (k, value) -> {
-            ConcurrentHashMap<String, AddressState> outputAddressToInputMapping = value != null ? value : new ConcurrentHashMap<>();
-
-            addressStates.forEach( (address, state) -> {
-                if (state.hasOutput(output)) outputAddressToInputMapping.put(address, state);
-            });
-
-            return outputAddressToInputMapping;
-        });
-    }
+    void unregisterSender(PipelineOutput output, Iterable<String> addresses);
 
     /**
      * Listens to a given address with the provided listener
      * Only one listener can listen on an address at a time
-     * @param input Input to register as listener
+     *
+     * @param input   Input to register as listener
      * @param address Address on which to listen
      * @return true if the listener successfully subscribed
      */
-    public boolean listen(final PipelineInput input, final String address) {
-        final boolean[] result = new boolean[1];
-
-        addressStates.compute(address, (k, value) -> {
-           AddressState state = value != null ? value : new AddressState(address);
-
-            if (state.assignInputIfMissing(input)) {
-                state.getOutputs().forEach(this::updateOutputReceivers);
-                result[0] = true;
-            } else {
-                result[0] = false;
-            }
-
-            return state;
-        });
-
-        return result[0];
-    }
+    boolean listen(PipelineInput input, String address);
 
     /**
      * Stop listening on the given address with the given listener
-     * Will change behavior depending on whether {@link #isBlockOnUnlisten()} is true or not.
+     * Will change behavior depending on whether {@link #setBlockOnUnlisten(boolean)} is true or not.
      * Will call a blocking method if it is, a non-blocking one if it isn't
-     * @param input Input that should stop listening
+     *
+     * @param input   Input that should stop listening
      * @param address Address on which the input should stop listening
      * @throws InterruptedException if interrupted while attempting to stop listening
      */
-    public void unlisten(final PipelineInput input, final String address) throws InterruptedException {
-        if (isBlockOnUnlisten()) {
-            unlistenBlock(input, address);
-        } else {
-            unlistenNonblock(input, address);
-        }
-    }
+    void unlisten(PipelineInput input, String address) throws InterruptedException;
 
     /**
-     * Stop listening on the given address with the given listener
-     * @param input Input that should stop listening
-     * @param address Address on which to stop listening
-     * @throws InterruptedException if interrupted while attempting to stop listening
+     * Configure behaviour of {@link #unlisten(PipelineInput, String)} to be blocking,
+     * which allows a DAG to shut down senders-first
+     *
+     * @param blockOnUnlisten true iff future invocations of {@link #unlisten} should block
      */
-    public void unlistenBlock(final PipelineInput input, final String address) throws InterruptedException {
-        final boolean[] waiting = {true};
-
-        // Block until all senders are done
-        // Outputs shutdown before their connected inputs
-        while (true) {
-            addressStates.compute(address, (k, state) -> {
-                // If this happens the pipeline was asked to shutdown
-                // twice, so there's no work to do
-                if (state == null) {
-                    waiting[0] = false;
-                    return null;
-                }
-
-                if (state.getOutputs().isEmpty()) {
-                    state.unassignInput(input);
-
-                    waiting[0] = false;
-                    return null;
-                }
-
-                return state;
-            });
-
-            if (waiting[0] == false) {
-                break;
-            } else {
-                Thread.sleep(100);
-            }
-        }
-    }
+    void setBlockOnUnlisten(boolean blockOnUnlisten);
 
     /**
-     * Unlisten to use during reloads. This lets upstream outputs block while this input is missing
-     * @param input Input that should stop listening
-     * @param address Address on which to stop listening
+     * This package-private sub-interface allows implementations to provide testable
+     * hooks without exposing them publicly
      */
-    public void unlistenNonblock(final PipelineInput input, final String address) {
-        addressStates.computeIfPresent(address, (k, state) -> {
-           state.unassignInput(input);
-           state.getOutputs().forEach(this::updateOutputReceivers);
-           return state.isEmpty() ? null : state;
-        });
+    @VisibleForTesting
+    interface Testable extends PipelineBus {
+        @VisibleForTesting Optional<AddressState.ReadOnly> getAddressState(final String address);
+        @VisibleForTesting Optional<Set<AddressState.ReadOnly>> getAddressStates(final PipelineOutput sender);
+        @VisibleForTesting boolean isBlockOnUnlisten();
     }
-
-    public boolean isBlockOnUnlisten() {
-        return blockOnUnlisten;
-    }
-
-    public void setBlockOnUnlisten(boolean blockOnUnlisten) {
-        this.blockOnUnlisten = blockOnUnlisten;
-    }
-
-
 }
diff --git a/logstash-core/src/main/java/org/logstash/plugins/pipeline/PipelineBusV2.java b/logstash-core/src/main/java/org/logstash/plugins/pipeline/PipelineBusV2.java
new file mode 100644
index 000000000..082b3bc3c
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/pipeline/PipelineBusV2.java
@@ -0,0 +1,188 @@
+package org.logstash.plugins.pipeline;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.logstash.ext.JrubyEventExtLibrary;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+class PipelineBusV2 extends AbstractPipelineBus implements PipelineBus {
+
+    // The canonical source of truth for mapping addresses to their AddressStates
+    protected final AddressStateMapping addressStates = new AddressStateMapping();
+
+    // A cached mapping from any given registered sender (PipelineOutput) to a query-only view of
+    // the AddressState-s to which it is registered.
+    protected final Map<PipelineOutput, Set<AddressState.ReadOnly>> addressStatesBySender = new ConcurrentHashMap<>();
+
+    // effectively a set-on-shutdown flag
+    protected volatile boolean blockOnUnlisten = false;
+
+    private static final Logger LOGGER = LogManager.getLogger(PipelineBusV2.class);
+
+    @Override
+    public void sendEvents(final PipelineOutput sender,
+                           final Collection<JrubyEventExtLibrary.RubyEvent> events,
+                           final boolean ensureDelivery) {
+        if (events.isEmpty()) return;
+
+        final Set<AddressState.ReadOnly> addressStates = addressStatesBySender.get(sender);
+        if (addressStates == null) {
+            throw new IllegalStateException("cannot send events from unregistered sender");
+        }
+
+        // In case of retry on the same set events, a stable order is needed, else
+        // the risk is to reprocess twice some events. Collection can't guarantee order stability.
+        JrubyEventExtLibrary.RubyEvent[] orderedEvents = events.toArray(new JrubyEventExtLibrary.RubyEvent[0]);
+
+        addressStates.forEach(addressState -> doSendEvents(orderedEvents, addressState, ensureDelivery));
+    }
+
+    @Override
+    public void registerSender(final PipelineOutput sender,
+                               final Iterable<String> addresses) {
+        Objects.requireNonNull(sender, "sender must not be null");
+        Objects.requireNonNull(addresses, "addresses must not be null");
+        addressStatesBySender.compute(sender, (po, existing) -> {
+            return StreamSupport.stream(addresses.spliterator(), false)
+                                .map((addr) -> addressStates.mutate(addr, (as) -> as.addOutput(po)))
+                                .collect(Collectors.toUnmodifiableSet());
+        });
+    }
+
+    @Override
+    public void unregisterSender(final PipelineOutput sender,
+                                 final Iterable<String> addresses) {
+        Objects.requireNonNull(sender, "sender must not be null");
+        Objects.requireNonNull(addresses, "addresses must not be null");
+        addressStatesBySender.compute(sender, (po, existing) -> {
+            addresses.forEach((addr) -> addressStates.mutate(addr, (as) -> as.removeOutput(po)));
+            return null;
+        });
+    }
+
+    @Override
+    public boolean listen(final PipelineInput listener,
+                          final String address) {
+        Objects.requireNonNull(listener, "listener must not be null");
+        Objects.requireNonNull(address, "address must not be null");
+        final AddressState.ReadOnly result = addressStates.mutate(address, (addressState) -> {
+            addressState.assignInputIfMissing(listener);
+        });
+        return (result != null && result.getInput() == listener);
+    }
+
+    @Override
+    public void unlisten(final PipelineInput listener,
+                         final String address) throws InterruptedException {
+        Objects.requireNonNull(listener, "listener must not be null");
+        Objects.requireNonNull(address, "address must not be null");
+        if (this.blockOnUnlisten) {
+            unlistenBlocking(listener, address);
+        } else {
+            unlistenNonblock(listener, address);
+        }
+    }
+
+    private void unlistenNonblock(final PipelineInput listener,
+                                   final String address) {
+        addressStates.mutate(address, (addressState) -> addressState.unassignInput(listener));
+    }
+
+    private void unlistenBlocking(final PipelineInput listener,
+                          final String address) throws InterruptedException {
+        synchronized (Objects.requireNonNull(listener, "listener must not be null")) {
+            while(!tryUnlistenOrphan(listener, address)) {
+                listener.wait(10000);
+            }
+        }
+    }
+
+    /**
+     * Makes a singular attempt to unlisten to the address that succeeds if and only if
+     * there are no senders registered to the address
+     * @param listener the {@link PipelineInput} that to unlisten
+     * @param address the address from which to unlisten
+     * @return true iff this listener is not listening after the attempt
+     */
+    private boolean tryUnlistenOrphan(final PipelineInput listener,
+                                      final String address) {
+        final AddressState.ReadOnly result = addressStates.mutate(address, (addressState) -> {
+            final Set<PipelineOutput> outputs = addressState.getOutputs();
+            if (outputs.isEmpty()) {
+                addressState.unassignInput(listener);
+            } else {
+                LOGGER.trace(() -> String.format("input `%s` is not ready to unlisten from `%s` because the address still has attached senders (%s)", listener.getId(), address, outputs.stream().map(PipelineOutput::getId).collect(Collectors.toSet())));
+            }
+        });
+        return result == null || result.getInput() != listener;
+    }
+
+    @Override
+    public void setBlockOnUnlisten(final boolean blockOnUnlisten) {
+        this.blockOnUnlisten = blockOnUnlisten;
+    }
+
+    protected static class AddressStateMapping {
+
+        private final Map<String, AddressState> mapping = new ConcurrentHashMap<>();
+
+        public AddressState.ReadOnly mutate(final String address,
+                                            final Consumer<AddressState> consumer) {
+            final AddressState result = mapping.compute(address, (a, addressState) -> {
+                if (addressState == null) {
+                    addressState = new AddressState(address);
+                }
+
+                consumer.accept(addressState);
+
+                return addressState.isEmpty() ? null : addressState;
+            });
+
+            if (result == null) {
+                return null;
+            } else {
+                // If the resulting addressState had a listener, ensure that any waiting
+                // threads get notified so that they can resume immediately
+                final PipelineInput currentInput = result.getInput();
+                if (currentInput != null) {
+                    synchronized (currentInput) { currentInput.notifyAll(); }
+                }
+                return result.getReadOnlyView();
+            }
+        }
+
+        private AddressState.ReadOnly get(final String address) {
+            final AddressState result = mapping.get(address);
+            return result == null ? null : result.getReadOnlyView();
+        }
+    }
+
+    @VisibleForTesting
+    static class Testable extends PipelineBusV2 implements PipelineBus.Testable {
+
+        @Override
+        @VisibleForTesting
+        public boolean isBlockOnUnlisten() {
+            return this.blockOnUnlisten;
+        }
+
+        @Override
+        @VisibleForTesting
+        public Optional<AddressState.ReadOnly> getAddressState(final String address) {
+            return Optional.ofNullable(addressStates.get(address));
+        }
+
+        @Override
+        @VisibleForTesting
+        public Optional<Set<AddressState.ReadOnly>> getAddressStates(final PipelineOutput sender) {
+            return Optional.ofNullable(addressStatesBySender.get(sender));
+        }
+
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/plugins/pipeline/PipelineInput.java b/logstash-core/src/main/java/org/logstash/plugins/pipeline/PipelineInput.java
index 0e63864a4..8baea9872 100644
--- a/logstash-core/src/main/java/org/logstash/plugins/pipeline/PipelineInput.java
+++ b/logstash-core/src/main/java/org/logstash/plugins/pipeline/PipelineInput.java
@@ -1,20 +1,48 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins.pipeline;
 
 import org.logstash.ext.JrubyEventExtLibrary;
 
 import java.util.stream.Stream;
 
+/**
+ * Represents the in endpoint of a pipeline to pipeline communication.
+ * */
 public interface PipelineInput {
-    /**
-     * Accepts an event
-     * It might be rejected if the input is stopping
-     * @param events a collection of events
-     * @return true if the event was successfully received
-     */
-    boolean internalReceive(Stream<JrubyEventExtLibrary.RubyEvent> events);
+
+    enum ReceiveStatus {CLOSING, COMPLETED, FAIL}
 
     /**
+     * Accepts an event. It might be rejected if the input is stopping.
      *
+     * @param events a collection of events
+     * @return response instance which contains the status of the execution, if events were successfully received
+     *      or reached an error or the input was closing.
+     */
+    ReceiveResponse internalReceive(Stream<JrubyEventExtLibrary.RubyEvent> events);
+
+    String getId();
+
+    /**
      * @return true if the input is running
      */
     boolean isRunning();
diff --git a/logstash-core/src/main/java/org/logstash/plugins/pipeline/PipelineOutput.java b/logstash-core/src/main/java/org/logstash/plugins/pipeline/PipelineOutput.java
index d80609496..2ad07bcbd 100644
--- a/logstash-core/src/main/java/org/logstash/plugins/pipeline/PipelineOutput.java
+++ b/logstash-core/src/main/java/org/logstash/plugins/pipeline/PipelineOutput.java
@@ -1,9 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins.pipeline;
 
-import org.logstash.ext.JrubyEventExtLibrary;
-
-import java.util.Map;
-import java.util.function.Function;
-
+/**
+ * Represents the out endpoint of a pipeline to pipeline communication.
+ * */
 public interface PipelineOutput {
+    String getId();
 }
diff --git a/logstash-core/src/main/java/org/logstash/plugins/pipeline/ReceiveResponse.java b/logstash-core/src/main/java/org/logstash/plugins/pipeline/ReceiveResponse.java
new file mode 100644
index 000000000..e74737956
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/plugins/pipeline/ReceiveResponse.java
@@ -0,0 +1,49 @@
+package org.logstash.plugins.pipeline;
+
+public final class ReceiveResponse {
+    private final PipelineInput.ReceiveStatus status;
+    private final Integer sequencePosition;
+    private final Throwable cause;
+
+    public static ReceiveResponse closing() {
+        return new ReceiveResponse(PipelineInput.ReceiveStatus.CLOSING);
+    }
+
+    public static ReceiveResponse completed() {
+        return new ReceiveResponse(PipelineInput.ReceiveStatus.COMPLETED);
+    }
+
+    public static ReceiveResponse failedAt(int sequencePosition, Throwable cause) {
+        return new ReceiveResponse(PipelineInput.ReceiveStatus.FAIL, sequencePosition, cause);
+    }
+
+    private ReceiveResponse(PipelineInput.ReceiveStatus status) {
+        this(status, null);
+    }
+
+    private ReceiveResponse(PipelineInput.ReceiveStatus status, Integer sequencePosition) {
+        this(status, sequencePosition, null);
+    }
+
+    private ReceiveResponse(PipelineInput.ReceiveStatus status, Integer sequencePosition, Throwable cause) {
+        this.status = status;
+        this.sequencePosition = sequencePosition;
+        this.cause = cause;
+    }
+
+    public PipelineInput.ReceiveStatus getStatus() {
+        return status;
+    }
+
+    public Integer getSequencePosition() {
+        return sequencePosition;
+    }
+
+    public boolean wasSuccess() {
+        return status == PipelineInput.ReceiveStatus.COMPLETED;
+    }
+
+    public String getCauseMessage() {
+        return cause != null ? cause.getMessage() : "UNDEFINED ERROR";
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/secret/SecretIdentifier.java b/logstash-core/src/main/java/org/logstash/secret/SecretIdentifier.java
index 8bf77141f..08f43abb1 100644
--- a/logstash-core/src/main/java/org/logstash/secret/SecretIdentifier.java
+++ b/logstash-core/src/main/java/org/logstash/secret/SecretIdentifier.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.secret;
 
 import java.util.Locale;
diff --git a/logstash-core/src/main/java/org/logstash/secret/SecretVariable.java b/logstash-core/src/main/java/org/logstash/secret/SecretVariable.java
new file mode 100644
index 000000000..ddd887c66
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/secret/SecretVariable.java
@@ -0,0 +1,36 @@
+package org.logstash.secret;
+
+/**
+ * Value clas to carry the secret key id and secret value.
+ *
+ * Used to avoid inadvertently leak of secrets.
+ * */
+public final class SecretVariable {
+
+    private final String key;
+    private final String secretValue;
+
+    public SecretVariable(String key, String secretValue) {
+        this.key = key;
+        this.secretValue = secretValue;
+    }
+
+    public String getSecretValue() {
+        return secretValue;
+    }
+
+    @Override
+    public String toString() {
+        return "${" +key + "}";
+    }
+
+    // Ruby code compatibility, value attribute
+    public String getValue() {
+        return getSecretValue();
+    }
+
+    // Ruby code compatibility, inspect method
+    public String inspect() {
+        return toString();
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/secret/cli/SecretStoreCli.java b/logstash-core/src/main/java/org/logstash/secret/cli/SecretStoreCli.java
index 143da1227..0cf277aa0 100644
--- a/logstash-core/src/main/java/org/logstash/secret/cli/SecretStoreCli.java
+++ b/logstash-core/src/main/java/org/logstash/secret/cli/SecretStoreCli.java
@@ -1,8 +1,31 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.secret.cli;
 
 import org.logstash.secret.SecretIdentifier;
 import org.logstash.secret.store.*;
 
+import java.nio.CharBuffer;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -14,22 +37,145 @@ import static org.logstash.secret.store.SecretStoreFactory.LOGSTASH_MARKER;
  */
 public class SecretStoreCli {
 
+    private static final CharsetEncoder ASCII_ENCODER = StandardCharsets.US_ASCII.newEncoder();
     private final Terminal terminal;
     private final SecretStoreFactory secretStoreFactory;
 
-    enum Command {
-        CREATE("create"), LIST("list"), ADD("add"), REMOVE("remove"), HELP("--help");
+    enum CommandOptions {
+        HELP("help"),
+        /**
+         * Common flag used to change the read source to the standard input. It has no effect as
+         * this tool already reads values from the stdin by default, but still necessary (BC) to
+         * not consider this flag as an actual value.
+         */
+        STDIN("stdin");
+
+        private static final String PREFIX = "--";
 
         private final String option;
 
-        Command(String option) {
-            this.option = option;
+        CommandOptions(final String option) {
+            this.option = String.format("%s%s", PREFIX, option);
         }
 
-        static Optional<Command> fromString(final String input) {
-            Optional<Command> command = EnumSet.allOf(Command.class).stream().filter(c -> c.option.equals(input)).findFirst();
+        static Optional<CommandOptions> fromString(final String option) {
+            if (option == null || !option.startsWith(PREFIX)) {
+                return Optional.empty();
+            }
+
+            return Arrays.stream(values())
+                    .filter(p -> p.option.equals(option))
+                    .findFirst();
+        }
+
+        String getOption() {
+            return option;
+        }
+    }
+
+    static class CommandLine {
+        private final Command command;
+        private final List<String> arguments;
+        private final Set<CommandOptions> options;
+
+        CommandLine(final Command command, final String[] arguments) {
+            this.command = command;
+            this.arguments = parseCommandArguments(command, arguments);
+            this.options = parseCommandOptions(command, arguments);
+        }
+
+        private static List<String> parseCommandArguments(final Command command, final String[] arguments) {
+            if (arguments == null || arguments.length == 0) {
+                return List.of();
+            }
+
+            final Set<String> commandValidOptions = command.getValidOptions()
+                    .stream()
+                    .map(CommandOptions::getOption)
+                    .collect(Collectors.toSet());
+
+            // Includes all arguments values until it reaches the end or found a command option/flag
+            String[] filteredArguments = arguments;
+            for (int i = 0; i < arguments.length; i++) {
+                if (commandValidOptions.contains(arguments[i])) {
+                    filteredArguments = Arrays.copyOfRange(arguments, 0, i);
+                    break;
+                }
+            }
+
+            return Arrays.asList(filteredArguments);
+        }
+
+        private static Set<CommandOptions> parseCommandOptions(final Command command, final String[] arguments) {
+            final Set<CommandOptions> providedOptions = EnumSet.noneOf(CommandOptions.class);
+            if (arguments == null) {
+                return providedOptions;
+            }
+
+            for (final String argument : arguments) {
+                if (argument.startsWith(CommandOptions.PREFIX)) {
+                    final Optional<CommandOptions> option = CommandOptions.fromString(argument);
+                    if (option.isEmpty() || !command.validOptions.contains(option.get())) {
+                        throw new InvalidCommandException(String.format("Unrecognized option '%s' for command '%s'", argument, command.command));
+                    }
+                    providedOptions.add(option.get());
+                }
+            }
+
+            return providedOptions;
+        }
+
+        boolean hasOption(final CommandOptions option) {
+            return options.contains(option);
+        }
+
+        Command getCommand() {
             return command;
         }
+
+        List<String> getArguments() {
+            return Collections.unmodifiableList(arguments);
+        }
+    }
+
+    static class InvalidCommandException extends RuntimeException {
+        private static final long serialVersionUID = 8402825920204022022L;
+
+        public InvalidCommandException(final String message) {
+            super(message);
+        }
+    }
+
+    enum Command {
+        CREATE("create"),
+        LIST("list"),
+        ADD("add", List.of(CommandOptions.STDIN)),
+        REMOVE("remove");
+
+        private final Set<CommandOptions> validOptions = EnumSet.of(CommandOptions.HELP);
+
+        private final String command;
+
+        Command(final String command) {
+            this.command = command;
+        }
+
+        Command(final String command, final Collection<CommandOptions> validOptions) {
+            this.command = command;
+            this.validOptions.addAll(validOptions);
+        }
+
+        static Optional<CommandLine> parse(final String command, final String[] arguments) {
+            final Optional<Command> foundCommand = Arrays.stream(values())
+                    .filter(c -> c.command.equals(command))
+                    .findFirst();
+
+            return foundCommand.map(value -> new CommandLine(value, arguments));
+        }
+
+        Set<CommandOptions> getValidOptions() {
+            return Collections.unmodifiableSet(validOptions);
+        }
     }
 
     public SecretStoreCli(Terminal terminal){
@@ -45,16 +191,28 @@ public class SecretStoreCli {
      * Entry point to issue a command line command.
      * @param primaryCommand The string representation of a {@link SecretStoreCli.Command}, if the String does not map to a {@link SecretStoreCli.Command}, then it will show the help menu.
      * @param config The configuration needed to work a secret store. May be null for help.
-     * @param argument This can be either the identifier for a secret, or a sub command like --help. May be null.
+     * @param allArguments This can be either identifiers for a secret, or a sub command like --help. May be null.
      */
-    public void command(String primaryCommand, SecureConfig config, String argument) {
+    public void command(String primaryCommand, SecureConfig config, String... allArguments) {
         terminal.writeLine("");
-        final Command command = Command.fromString(primaryCommand).orElse(Command.HELP);
-        final Optional<Command> sub = Command.fromString(argument);
-        boolean help = Command.HELP.equals(sub.orElse(null));
-        switch (command) {
+
+        final Optional<CommandLine> commandParseResult;
+        try {
+            commandParseResult = Command.parse(primaryCommand, allArguments);
+        } catch (InvalidCommandException e) {
+            terminal.writeLine(String.format("ERROR: %s", e.getMessage()));
+            return;
+        }
+
+        if (commandParseResult.isEmpty()) {
+            printHelp();
+            return;
+        }
+
+        final CommandLine commandLine = commandParseResult.get();
+        switch (commandLine.getCommand()) {
             case CREATE: {
-                if (help){
+                if (commandLine.hasOption(CommandOptions.HELP)){
                     terminal.writeLine("Creates a new keystore. For example: 'bin/logstash-keystore create'");
                     return;
                 }
@@ -69,7 +227,7 @@ public class SecretStoreCli {
                 break;
             }
             case LIST: {
-                if (help){
+                if (commandLine.hasOption(CommandOptions.HELP)){
                     terminal.writeLine("List all secret identifiers from the keystore. For example: " +
                             "`bin/logstash-keystore list`. Note - only the identifiers will be listed, not the secrets.");
                     return;
@@ -81,90 +239,104 @@ public class SecretStoreCli {
                 break;
             }
             case ADD: {
-                if (help){
-                    terminal.writeLine("Adds a new secret to the keystore. For example: " +
+                if (commandLine.hasOption(CommandOptions.HELP)){
+                    terminal.writeLine("Add secrets to the keystore. For example: " +
                             "`bin/logstash-keystore add my-secret`, at the prompt enter your secret. You will use the identifier ${my-secret} in your Logstash configuration.");
                     return;
                 }
-                if (argument == null || argument.isEmpty()) {
-                    terminal.writeLine("ERROR: You must supply a identifier to add. (e.g. bin/logstash-keystore add my-secret)");
+                if (commandLine.getArguments().isEmpty()) {
+                    terminal.writeLine("ERROR: You must supply an identifier to add. (e.g. bin/logstash-keystore add my-secret)");
                     return;
                 }
                 if (secretStoreFactory.exists(config.clone())) {
-                    SecretIdentifier id = new SecretIdentifier(argument);
-                    SecretStore secretStore = secretStoreFactory.load(config);
-                    byte[] s = secretStore.retrieveSecret(id);
-                    if (s == null) {
-                        terminal.write(String.format("Enter value for %s: ", argument));
-                        char[] secret = terminal.readSecret();
-                        if(secret == null || secret.length == 0){
-                            terminal.writeLine("ERROR: You must supply a identifier to add. (e.g. bin/logstash-keystore add my-secret)");
-                            return;
+                    final SecretStore secretStore = secretStoreFactory.load(config);
+                    for (String argument : commandLine.getArguments()) {
+                        final SecretIdentifier id = new SecretIdentifier(argument);
+                        final byte[] existingValue = secretStore.retrieveSecret(id);
+                        if (existingValue != null) {
+                            SecretStoreUtil.clearBytes(existingValue);
+                            terminal.write(String.format("%s already exists. Overwrite ? [y/N] ", argument));
+                            if (!isYes(terminal.readLine())) {
+                                continue;
+                            }
                         }
+
+                        final String enterValueMessage = String.format("Enter value for %s: ", argument);
+                        char[] secret = null;
+                        while(secret == null) {
+                            terminal.write(enterValueMessage);
+                            final char[] readSecret = terminal.readSecret();
+
+                            if (readSecret == null || readSecret.length == 0) {
+                                terminal.writeLine("ERROR: Value cannot be empty");
+                                continue;
+                            }
+
+                            if (!ASCII_ENCODER.canEncode(CharBuffer.wrap(readSecret))) {
+                                terminal.writeLine("ERROR: Value must contain only ASCII characters");
+                                continue;
+                            }
+
+                            secret = readSecret;
+                        }
+
                         add(secretStore, id, SecretStoreUtil.asciiCharToBytes(secret));
-                    } else {
-                        SecretStoreUtil.clearBytes(s);
-                        terminal.write(String.format("%s already exists. Overwrite ? [y/N] ", argument));
-                        if (isYes(terminal.readLine())) {
-                            terminal.write(String.format("Enter value for %s: ", argument));
-                            char[] secret = terminal.readSecret();
-                            add(secretStore, id, SecretStoreUtil.asciiCharToBytes(secret));
-                        }
                     }
                 } else {
-                    terminal.writeLine(String.format("ERROR: Logstash keystore not found. Use 'create' command to create one."));
+                    terminal.writeLine("ERROR: Logstash keystore not found. Use 'create' command to create one.");
                 }
                 break;
             }
             case REMOVE: {
-                if (help){
-                    terminal.writeLine("Removes a secret from the keystore. For example: " +
+                if (commandLine.hasOption(CommandOptions.HELP)){
+                    terminal.writeLine("Remove secrets from the keystore. For example: " +
                             "`bin/logstash-keystore remove my-secret`");
                     return;
                 }
-                if (argument == null || argument.isEmpty()) {
+                if (commandLine.getArguments().isEmpty()) {
                     terminal.writeLine("ERROR: You must supply a value to remove. (e.g. bin/logstash-keystore remove my-secret)");
                     return;
                 }
-                SecretIdentifier id = new SecretIdentifier(argument);
 
-                SecretStore secretStore = secretStoreFactory.load(config);
-                byte[] s = secretStore.retrieveSecret(id);
-                if (s == null) {
-                    terminal.writeLine(String.format("ERROR: '%s' does not exist in the Logstash keystore.", argument));
-                } else {
-                    SecretStoreUtil.clearBytes(s);
-                    secretStore.purgeSecret(id);
-                    terminal.writeLine(String.format("Removed '%s' from the Logstash keystore.", id.getKey()));
+                final SecretStore secretStore = secretStoreFactory.load(config);
+                for (String argument : commandLine.getArguments()) {
+                    SecretIdentifier id = new SecretIdentifier(argument);
+                    if (secretStore.containsSecret(id)) {
+                        secretStore.purgeSecret(id);
+                        terminal.writeLine(String.format("Removed '%s' from the Logstash keystore.", id.getKey()));
+                    } else {
+                        terminal.writeLine(String.format("ERROR: '%s' does not exist in the Logstash keystore.", argument));
+                    }
                 }
-                break;
-            }
-            case HELP: {
-                terminal.writeLine("Usage:");
-                terminal.writeLine("--------");
-                terminal.writeLine("bin/logstash-keystore [option] command [argument]");
-                terminal.writeLine("");
-                terminal.writeLine("Commands:");
-                terminal.writeLine("--------");
-                terminal.writeLine("create - Creates a new Logstash keystore  (e.g. bin/logstash-keystore create)");
-                terminal.writeLine("list   - List entries in the keystore  (e.g. bin/logstash-keystore list)");
-                terminal.writeLine("add    - Add a value to the keystore (e.g. bin/logstash-keystore add my-secret)");
-                terminal.writeLine("remove - Remove a value from the keystore  (e.g. bin/logstash-keystore remove my-secret)");
-                terminal.writeLine("");
-                terminal.writeLine("Argument:");
-                terminal.writeLine("--------");
-                terminal.writeLine("--help - Display command specific help  (e.g. bin/logstash-keystore add --help)");
-                terminal.writeLine("");
-                terminal.writeLine("Options:");
-                terminal.writeLine("--------");
-                terminal.writeLine("--path.settings - Set the directory for the keystore. This is should be the same directory as the logstash.yml settings file. " +
-                        "The default is the config directory under Logstash home. (e.g. bin/logstash-keystore --path.settings /tmp/foo create)");
-                terminal.writeLine("");
+
                 break;
             }
         }
     }
 
+    private void printHelp(){
+        terminal.writeLine("Usage:");
+        terminal.writeLine("--------");
+        terminal.writeLine("bin/logstash-keystore [option] command [argument]");
+        terminal.writeLine("");
+        terminal.writeLine("Commands:");
+        terminal.writeLine("--------");
+        terminal.writeLine("create - Creates a new Logstash keystore  (e.g. bin/logstash-keystore create)");
+        terminal.writeLine("list   - List entries in the keystore  (e.g. bin/logstash-keystore list)");
+        terminal.writeLine("add    - Add values to the keystore (e.g. bin/logstash-keystore add secret-one secret-two)");
+        terminal.writeLine("remove - Remove values from the keystore  (e.g. bin/logstash-keystore remove secret-one secret-two)");
+        terminal.writeLine("");
+        terminal.writeLine("Argument:");
+        terminal.writeLine("--------");
+        terminal.writeLine("--help - Display command specific help  (e.g. bin/logstash-keystore add --help)");
+        terminal.writeLine("");
+        terminal.writeLine("Options:");
+        terminal.writeLine("--------");
+        terminal.writeLine("--path.settings - Set the directory for the keystore. This is should be the same directory as the logstash.yml settings file. " +
+                "The default is the config directory under Logstash home. (e.g. bin/logstash-keystore --path.settings /tmp/foo create)");
+        terminal.writeLine("");
+    }
+
     private void add(SecretStore secretStore, SecretIdentifier id, byte[] secret) {
         secretStore.persistSecret(id, secret);
         terminal.writeLine(String.format("Added '%s' to the Logstash keystore.", id.getKey()));
diff --git a/logstash-core/src/main/java/org/logstash/secret/cli/Terminal.java b/logstash-core/src/main/java/org/logstash/secret/cli/Terminal.java
index 6009ea17c..a27590d4b 100644
--- a/logstash-core/src/main/java/org/logstash/secret/cli/Terminal.java
+++ b/logstash-core/src/main/java/org/logstash/secret/cli/Terminal.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.secret.cli;
 
 import java.util.Scanner;
@@ -61,7 +81,7 @@ public class Terminal {
         if (useConsole) {
             return System.console().readPassword();
         } else {
-            return scanner.next().toCharArray();
+            return scanner.nextLine().toCharArray();
         }
     }
 
diff --git a/logstash-core/src/main/java/org/logstash/secret/password/DigitValidator.java b/logstash-core/src/main/java/org/logstash/secret/password/DigitValidator.java
new file mode 100644
index 000000000..5021ade5f
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/secret/password/DigitValidator.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.secret.password;
+
+import java.util.Optional;
+
+/**
+ * A validator which check if given password appropriates digit regex.
+ */
+public class DigitValidator implements Validator {
+
+    /**
+     A regex for digit number inclusion.
+     */
+    private static final String DIGIT_REGEX = ".*\\d.*";
+
+    /**
+     A policy failure reasoning if password does not contain digit number(s).
+     */
+    private static final String DIGIT_REASONING = "must contain at least one digit between 0 and 9";
+
+    @Override
+    public Optional<String> validate(String password) {
+        return password.matches(DIGIT_REGEX)
+                ? Optional.empty()
+                : Optional.of(DIGIT_REASONING);
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/secret/password/EmptyStringValidator.java b/logstash-core/src/main/java/org/logstash/secret/password/EmptyStringValidator.java
new file mode 100644
index 000000000..830e9c02c
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/secret/password/EmptyStringValidator.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.secret.password;
+
+import com.google.common.base.Strings;
+
+import java.util.Optional;
+
+/**
+ * A validator which check if given password appropriates empty policy.
+ */
+public class EmptyStringValidator implements Validator {
+
+    /**
+     A policy failure reasoning for empty password.
+     */
+    private static final String EMPTY_PASSWORD_REASONING = "must not be empty";
+
+    @Override
+    public Optional<String> validate(String password) {
+        return Strings.isNullOrEmpty(password)
+                ? Optional.of(EMPTY_PASSWORD_REASONING)
+                : Optional.empty();
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/secret/password/LengthValidator.java b/logstash-core/src/main/java/org/logstash/secret/password/LengthValidator.java
new file mode 100644
index 000000000..fe5d72e46
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/secret/password/LengthValidator.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.secret.password;
+
+import com.google.common.base.Strings;
+
+import java.util.Optional;
+
+/**
+ * A validator which check if given password appropriates length policy.
+ */
+public class LengthValidator implements Validator {
+
+    /**
+     Required minimum length of the password.
+     */
+    private static final int MINIMUM_LENGTH = 8;
+
+    /**
+     Required maximum length of the password.
+     */
+    private static final int MAXIMUM_LENGTH = 1024;
+
+    /**
+     Required minimum length of the password.
+     */
+    private int minimumLength = MINIMUM_LENGTH;
+
+    public LengthValidator(int minimumLength) {
+        if (minimumLength < MINIMUM_LENGTH || minimumLength > MAXIMUM_LENGTH) {
+            throw new IllegalArgumentException("Password length should be between " + MINIMUM_LENGTH + " and " + MAXIMUM_LENGTH + ".");
+        }
+        this.minimumLength = minimumLength;
+    }
+
+    @Override
+    public Optional<String> validate(String password) {
+        final String LENGTH_REASONING = "must be length of between " + minimumLength + " and " + MAXIMUM_LENGTH;
+        return Strings.isNullOrEmpty(password) || password.length() < minimumLength
+                ? Optional.of(LENGTH_REASONING)
+                : Optional.empty();
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/secret/password/LowerCaseValidator.java b/logstash-core/src/main/java/org/logstash/secret/password/LowerCaseValidator.java
new file mode 100644
index 000000000..867f78339
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/secret/password/LowerCaseValidator.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.secret.password;
+
+import java.util.Optional;
+
+/**
+ * A validator which check if given password appropriates lower case policy.
+ */
+public class LowerCaseValidator implements Validator {
+
+    /**
+     A regex for lower case character inclusion.
+     */
+    private static final String LOWER_CASE_REGEX = ".*[a-z].*";
+
+    /**
+     A policy failure reasoning if password does not contain lower case character(s).
+     */
+    private static final String LOWER_CASE_REASONING = "must contain at least one lower case";
+
+    @Override
+    public Optional<String> validate(String password) {
+        return password.matches(LOWER_CASE_REGEX)
+                ? Optional.empty()
+                : Optional.of(LOWER_CASE_REASONING);
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/secret/password/PasswordParamConverter.java b/logstash-core/src/main/java/org/logstash/secret/password/PasswordParamConverter.java
new file mode 100644
index 000000000..b70ec4987
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/secret/password/PasswordParamConverter.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.secret.password;
+
+import com.google.common.base.Strings;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+
+/**
+ * Converter class for password params.
+ */
+public class PasswordParamConverter {
+
+    @SuppressWarnings("rawtypes")
+    private static final Map<Class, Function<String, ?>> converters = new HashMap<>();
+
+    static {
+        converters.put(Integer.class, Integer::parseInt);
+        converters.put(String.class, String::toString);
+        converters.put(Boolean.class, Boolean::parseBoolean);
+        converters.put(Double.class, Double::parseDouble);
+    }
+
+    /**
+     * Converts given value to expected klass.
+     * @param klass a class type of the desired output value.
+     * @param value a value to be converted.
+     * @param <T> desired type.
+     * @return converted value.
+     * throws {@link IllegalArgumentException} if klass is not supported or value is empty.
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> T convert(Class<T> klass, String value) {
+        if (Strings.isNullOrEmpty(value)) {
+            throw new IllegalArgumentException("Value must not be empty.");
+        }
+
+        if (Objects.isNull(converters.get(klass))) {
+            throw new IllegalArgumentException("No conversion supported for given class.");
+        }
+        return (T)converters.get(klass).apply(value);
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/secret/password/PasswordPolicyParam.java b/logstash-core/src/main/java/org/logstash/secret/password/PasswordPolicyParam.java
new file mode 100644
index 000000000..ac3aad124
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/secret/password/PasswordPolicyParam.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.secret.password;
+
+public class PasswordPolicyParam {
+
+    private String type;
+
+    private String value;
+
+    public PasswordPolicyParam() {}
+
+    public PasswordPolicyParam(String type, String value) {
+        this.type = type;
+        this.value = value;
+    }
+
+    public String getType() {
+        return this.type;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+}
diff --git a/logstash-core/src/main/java/org/logstash/secret/password/PasswordPolicyType.java b/logstash-core/src/main/java/org/logstash/secret/password/PasswordPolicyType.java
new file mode 100644
index 000000000..095816c1a
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/secret/password/PasswordPolicyType.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.secret.password;
+
+/**
+ * Types of password policy declarations.
+ */
+public enum PasswordPolicyType {
+
+    EMPTY_STRING,
+    DIGIT,
+    LOWER_CASE,
+    UPPER_CASE,
+    SYMBOL,
+    LENGTH
+
+}
diff --git a/logstash-core/src/main/java/org/logstash/secret/password/PasswordValidator.java b/logstash-core/src/main/java/org/logstash/secret/password/PasswordValidator.java
new file mode 100644
index 000000000..690193f43
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/secret/password/PasswordValidator.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.secret.password;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * A class to validate the given password string and give a reasoning for validation failures.
+ * Default validation policies are based on complex password generation recommendation from several institutions
+ * such as NIST (https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-63b.pdf),
+ * OWASP (https://github.com/OWASP/www-community/blob/master/pages/OWASP_Validation_Regex_Repository.md), etc...
+ */
+public class PasswordValidator {
+
+    /**
+     * List of validators set through a constructor.
+     */
+    @VisibleForTesting
+    protected List<Validator> validators;
+
+    /**
+     * A constructor to initialize the password validator.
+     * @param policies required policies with their parameters.
+     */
+    public PasswordValidator(Map<PasswordPolicyType, PasswordPolicyParam> policies) {
+        validators = new ArrayList<>();
+        policies.forEach((policy, param) -> {
+            switch (policy) {
+                case DIGIT:
+                    validators.add(new DigitValidator());
+                    break;
+                case LENGTH:
+                    int minimumLength = param.getType().equals("MINIMUM_LENGTH")
+                            ? PasswordParamConverter.convert(Integer.class, param.getValue())
+                            : 8;
+                    validators.add(new LengthValidator(minimumLength));
+                    break;
+                case SYMBOL:
+                    validators.add(new SymbolValidator());
+                    break;
+                case LOWER_CASE:
+                    validators.add(new LowerCaseValidator());
+                    break;
+                case UPPER_CASE:
+                    validators.add(new UpperCaseValidator());
+                    break;
+                case EMPTY_STRING:
+                    validators.add(new EmptyStringValidator());
+                    break;
+            }
+        });
+    }
+
+    /**
+     * Validates given string against strong password policy and returns the list of failure reasoning.
+     * Empty return list means password policy requirements meet.
+     * @param password a password string going to be validated.
+     * @return List of failure reasoning.
+     */
+    public String validate(String password) {
+        return validators.stream()
+                .map(validator -> validator.validate(password))
+                .filter(Optional::isPresent).map(Optional::get)
+                .reduce("", (partialString, element) -> (partialString.isEmpty() ? "" : partialString + ", ") + element);
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/secret/password/SymbolValidator.java b/logstash-core/src/main/java/org/logstash/secret/password/SymbolValidator.java
new file mode 100644
index 000000000..6fff4950d
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/secret/password/SymbolValidator.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.secret.password;
+
+import java.util.Optional;
+
+/**
+ * A validator which check if given password appropriates symbol regex.
+ */
+public class SymbolValidator implements Validator {
+
+    /**
+     A regex for special character inclusion.
+     */
+    private static final String SYMBOL_REGEX = ".*[~!@#$%^&*()_+|<>?:{}].*";
+
+    /**
+     A policy failure reasoning if password does not contain special character(s).
+     */
+    private static final String SYMBOL_REASONING = "must contain at least one special character";
+
+    @Override
+    public Optional<String> validate(String password) {
+        return password.matches(SYMBOL_REGEX)
+                ? Optional.empty()
+                : Optional.of(SYMBOL_REASONING);
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/secret/password/UpperCaseValidator.java b/logstash-core/src/main/java/org/logstash/secret/password/UpperCaseValidator.java
new file mode 100644
index 000000000..8d82001bd
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/secret/password/UpperCaseValidator.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.secret.password;
+
+import java.util.Optional;
+
+/**
+ * A validator which check if given password appropriates upper case policy.
+ */
+public class UpperCaseValidator implements Validator {
+
+    /**
+     A regex for upper case character inclusion.
+     */
+    private static final String UPPER_CASE_REGEX = ".*[A-Z].*";
+
+    /**
+     A policy failure reasoning if password does not contain upper case character(s).
+     */
+    private static final String UPPER_CASE_REASONING = "must contain at least one upper case";
+
+    @Override
+    public Optional<String> validate(String password) {
+        return password.matches(UPPER_CASE_REGEX)
+                ? Optional.empty()
+                : Optional.of(UPPER_CASE_REASONING);
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/secret/password/Validator.java b/logstash-core/src/main/java/org/logstash/secret/password/Validator.java
new file mode 100644
index 000000000..c24aaadda
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/secret/password/Validator.java
@@ -0,0 +1,15 @@
+package org.logstash.secret.password;
+
+import java.util.Optional;
+
+/**
+ * A validator interface for password validation policies.
+ */
+public interface Validator {
+    /**
+     * Validates the input password.
+     * @param password a password string
+     * @return optional empty if succeeds or value for reasoning.
+     */
+    Optional<String> validate(String password);
+}
diff --git a/logstash-core/src/main/java/org/logstash/secret/store/SecretStore.java b/logstash-core/src/main/java/org/logstash/secret/store/SecretStore.java
index 44e3a1e72..ec304d13d 100644
--- a/logstash-core/src/main/java/org/logstash/secret/store/SecretStore.java
+++ b/logstash-core/src/main/java/org/logstash/secret/store/SecretStore.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.secret.store;
 
 
@@ -74,4 +94,11 @@ public interface SecretStore {
      */
     byte[] retrieveSecret(SecretIdentifier id);
 
+    /**
+     * Check if a secret exists in the store.
+     *
+     * @param id The {@link SecretIdentifier} to identify the secret to find
+     * @return true if a secret exists, false otherwise
+     */
+    boolean containsSecret(SecretIdentifier id);
 }
diff --git a/logstash-core/src/main/java/org/logstash/secret/store/SecretStoreException.java b/logstash-core/src/main/java/org/logstash/secret/store/SecretStoreException.java
index b7270e2dd..33bb02654 100644
--- a/logstash-core/src/main/java/org/logstash/secret/store/SecretStoreException.java
+++ b/logstash-core/src/main/java/org/logstash/secret/store/SecretStoreException.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.secret.store;
 
 import org.logstash.secret.SecretIdentifier;
@@ -17,6 +37,9 @@ public class SecretStoreException extends RuntimeException {
         super(message);
     }
 
+    /**
+     * Error in retrive a secret from a keystore
+     * */
     static public class RetrievalException extends SecretStoreException {
         private static final long serialVersionUID = 1L;
         public RetrievalException(SecretIdentifier secretIdentifier, Throwable cause) {
@@ -24,6 +47,9 @@ public class SecretStoreException extends RuntimeException {
         }
     }
 
+    /**
+     * Error in listing secrets in key store
+     * */
     static public class ListException extends SecretStoreException {
         private static final long serialVersionUID = 1L;
         public ListException(Throwable cause) {
@@ -31,6 +57,9 @@ public class SecretStoreException extends RuntimeException {
         }
     }
 
+    /**
+     * Error in creating Logstash key store
+     * */
     static public class CreateException extends SecretStoreException {
         private static final long serialVersionUID = 1L;
         public CreateException(String message, Throwable cause) {
@@ -42,6 +71,9 @@ public class SecretStoreException extends RuntimeException {
         }
     }
 
+    /**
+     * Error in loading a key store, probably because it's not a Logstash keystore
+     * */
     static public class LoadException extends SecretStoreException {
         private static final long serialVersionUID = 1L;
         public LoadException(String message, Throwable cause) {
@@ -53,6 +85,9 @@ public class SecretStoreException extends RuntimeException {
         }
     }
 
+    /**
+     * Error in persisting a secret into a keystore
+     * */
     static public class PersistException extends SecretStoreException {
         private static final long serialVersionUID = 1L;
         public PersistException(SecretIdentifier secretIdentifier, Throwable cause) {
@@ -60,6 +95,9 @@ public class SecretStoreException extends RuntimeException {
         }
     }
 
+    /**
+     * Error in purge a secret from a keystore
+     * */
     static public class PurgeException extends SecretStoreException {
         private static final long serialVersionUID = 1L;
         public PurgeException(SecretIdentifier secretIdentifier, Throwable cause) {
@@ -67,6 +105,9 @@ public class SecretStoreException extends RuntimeException {
         }
     }
 
+    /**
+     * Generic error
+     * */
     static public class UnknownException extends SecretStoreException {
         private static final long serialVersionUID = 1L;
         public UnknownException(String message, Throwable cause) {
@@ -74,6 +115,9 @@ public class SecretStoreException extends RuntimeException {
         }
     }
 
+    /**
+     * Problem with "keystore.classname", can't be instantiated or class can't be found
+     * */
     static public class ImplementationNotFoundException extends SecretStoreException {
         private static final long serialVersionUID = 1L;
         public ImplementationNotFoundException(String message, Throwable throwable) {
@@ -81,6 +125,9 @@ public class SecretStoreException extends RuntimeException {
         }
     }
 
+    /**
+     * Problem with the value of "keystore.classname", class is invalid or not accessible
+     * */
     static public class ImplementationInvalidException extends SecretStoreException {
         private static final long serialVersionUID = 1L;
         public ImplementationInvalidException(String message, Throwable throwable) {
@@ -88,6 +135,9 @@ public class SecretStoreException extends RuntimeException {
         }
     }
 
+    /**
+     * Launched when there is problem accessing a keystore, for example the user provided empty password
+     * */
     static public class AccessException extends SecretStoreException {
         private static final long serialVersionUID = 1L;
         public AccessException(String message, Throwable throwable) {
@@ -99,6 +149,9 @@ public class SecretStoreException extends RuntimeException {
         }
     }
 
+    /**
+     * Launched when a keystore already exists
+     * */
     static public class AlreadyExistsException extends SecretStoreException {
         private static final long serialVersionUID = 1L;
         public AlreadyExistsException(String message) {
@@ -106,6 +159,9 @@ public class SecretStoreException extends RuntimeException {
         }
     }
 
+    /**
+     * Never used
+     * */
     static public class InvalidConfigurationException extends SecretStoreException {
         private static final long serialVersionUID = 1L;
         public InvalidConfigurationException(String message) {
diff --git a/logstash-core/src/main/java/org/logstash/secret/store/SecretStoreExt.java b/logstash-core/src/main/java/org/logstash/secret/store/SecretStoreExt.java
index 827e5205a..b1f1a2ba2 100644
--- a/logstash-core/src/main/java/org/logstash/secret/store/SecretStoreExt.java
+++ b/logstash-core/src/main/java/org/logstash/secret/store/SecretStoreExt.java
@@ -1,9 +1,32 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.secret.store;
 
 import org.jruby.RubyHash;
 import org.logstash.RubyUtil;
 import org.logstash.secret.SecretIdentifier;
 
+/**
+ * Collect static methods to access Java keystore
+ * */
 public class SecretStoreExt {
 
     private static final SecretStoreFactory SECRET_STORE_FACTORY = SecretStoreFactory.fromEnvironment();
diff --git a/logstash-core/src/main/java/org/logstash/secret/store/SecretStoreFactory.java b/logstash-core/src/main/java/org/logstash/secret/store/SecretStoreFactory.java
index 097ad6dec..5c90d0680 100644
--- a/logstash-core/src/main/java/org/logstash/secret/store/SecretStoreFactory.java
+++ b/logstash-core/src/main/java/org/logstash/secret/store/SecretStoreFactory.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.secret.store;
 
 import org.apache.logging.log4j.LogManager;
@@ -140,8 +160,5 @@ public class SecretStoreFactory {
             secureConfig.add(KEYSTORE_ACCESS_KEY, keystore_pass.toCharArray());
             keystore_pass = null;
         }
-
-        //futile attempt to remove the original pass from memory
-        System.gc();
     }
 }
diff --git a/logstash-core/src/main/java/org/logstash/secret/store/SecretStoreUtil.java b/logstash-core/src/main/java/org/logstash/secret/store/SecretStoreUtil.java
index 85639af0a..2a40da360 100644
--- a/logstash-core/src/main/java/org/logstash/secret/store/SecretStoreUtil.java
+++ b/logstash-core/src/main/java/org/logstash/secret/store/SecretStoreUtil.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.secret.store;
 
 import java.nio.ByteBuffer;
diff --git a/logstash-core/src/main/java/org/logstash/secret/store/SecureConfig.java b/logstash-core/src/main/java/org/logstash/secret/store/SecureConfig.java
index 07b70e90a..9d63cf89d 100644
--- a/logstash-core/src/main/java/org/logstash/secret/store/SecureConfig.java
+++ b/logstash-core/src/main/java/org/logstash/secret/store/SecureConfig.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.secret.store;
 
 import java.nio.CharBuffer;
diff --git a/logstash-core/src/main/java/org/logstash/secret/store/backend/JavaKeyStore.java b/logstash-core/src/main/java/org/logstash/secret/store/backend/JavaKeyStore.java
index 90c64c165..f75a021d9 100644
--- a/logstash-core/src/main/java/org/logstash/secret/store/backend/JavaKeyStore.java
+++ b/logstash-core/src/main/java/org/logstash/secret/store/backend/JavaKeyStore.java
@@ -1,21 +1,55 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.secret.store.backend;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.logstash.secret.SecretIdentifier;
-import org.logstash.secret.store.*;
+import org.logstash.secret.store.SecretStore;
+import org.logstash.secret.store.SecretStoreFactory;
+import org.logstash.secret.store.SecretStoreException;
+import org.logstash.secret.store.SecretStoreUtil;
+import org.logstash.secret.store.SecureConfig;
 
 import javax.crypto.SecretKey;
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.PBEKeySpec;
-import java.io.*;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.channels.FileLock;
 import java.nio.channels.SeekableByteChannel;
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.*;
+import java.nio.file.AccessDeniedException;
+import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
 import java.nio.file.attribute.PosixFileAttributeView;
 import java.nio.file.attribute.PosixFilePermissions;
 import java.security.KeyStore;
@@ -25,10 +59,13 @@ import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
-import java.util.*;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Random;
+import java.util.Set;
 import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.concurrent.locks.ReentrantLock;
 
 import static org.logstash.secret.store.SecretStoreFactory.LOGSTASH_MARKER;
 
@@ -41,14 +78,13 @@ public final class JavaKeyStore implements SecretStore {
     private static final String KEYSTORE_TYPE = "pkcs12";
     private static final Logger LOGGER = LogManager.getLogger(JavaKeyStore.class);
     private static final String PATH_KEY = "keystore.file";
-    private static final CharsetEncoder asciiEncoder = StandardCharsets.US_ASCII.newEncoder();
+    private final CharsetEncoder asciiEncoder = StandardCharsets.US_ASCII.newEncoder();
     private KeyStore keyStore;
     private char[] keyStorePass;
     private Path keyStorePath;
     private ProtectionParameter protectionParameter;
-    private Lock readLock;
+    private Lock lock;
     private boolean useDefaultPass = false;
-    private Lock writeLock;
     //package private for testing
     static String filePermissions = "rw-r--r--";
     private static final boolean IS_WINDOWS = System.getProperty("os.name").startsWith("Windows");
@@ -69,7 +105,7 @@ public final class JavaKeyStore implements SecretStore {
         }
         try {
             init(config);
-            writeLock.lock();
+            lock.lock();
             LOGGER.debug("Creating new keystore at {}.", keyStorePath.toAbsolutePath());
             String keyStorePermissions = filePermissions;
             //create the keystore on disk with a default entry to identify this as a logstash keystore
@@ -100,7 +136,7 @@ public final class JavaKeyStore implements SecretStore {
         } catch (Exception e) { //should never happen
             throw new SecretStoreException.UnknownException("Error while trying to create the Logstash keystore. ", e);
         } finally {
-            releaseLock(writeLock);
+            releaseLock(lock);
             config.clearValues();
         }
     }
@@ -109,7 +145,7 @@ public final class JavaKeyStore implements SecretStore {
     public void delete(SecureConfig config) {
         try {
             initLocks();
-            writeLock.lock();
+            lock.lock();
             if (exists(config)) {
                 Files.delete(Paths.get(new String(config.getPlainText(PATH_KEY))));
             }
@@ -118,7 +154,7 @@ public final class JavaKeyStore implements SecretStore {
         } catch (Exception e) { //should never happen
             throw new SecretStoreException.UnknownException("Error while trying to delete the Logstash keystore", e);
         } finally {
-            releaseLock(writeLock);
+            releaseLock(lock);
             config.clearValues();
         }
     }
@@ -138,14 +174,6 @@ public final class JavaKeyStore implements SecretStore {
         return new File(new String(path)).exists();
     }
 
-    // Object#finalize() is deprecated, but `Cleaner` alternative did not ship until Java 9;
-    // since this project still supports Java 8, suppress the warning.
-    @SuppressWarnings("deprecation")
-    @Override
-    protected void finalize() throws Throwable {
-        SecretStoreUtil.clearChars(keyStorePass);
-    }
-
     /**
      * Obtains the keystore password depending on if the password is explicitly defined and/or if this is a new keystore.
      *
@@ -170,35 +198,35 @@ public final class JavaKeyStore implements SecretStore {
 
         useDefaultPass = !config.has(SecretStoreFactory.KEYSTORE_ACCESS_KEY);
 
-        if (useDefaultPass) {
-            if (existing) {
-                //read the pass
-                SeekableByteChannel byteChannel = Files.newByteChannel(keyStorePath, StandardOpenOption.READ);
-                if (byteChannel.size() > 1) {
-                    byteChannel.position(byteChannel.size() - 1);
-                    ByteBuffer byteBuffer = ByteBuffer.allocate(1);
-                    byteChannel.read(byteBuffer);
-                    int size = byteBuffer.array()[0] & 0xff;
-                    if (size > 0 && byteChannel.size() >= size + 1) {
-                        byteBuffer = ByteBuffer.allocate(size);
-                        byteChannel.position(byteChannel.size() - size - 1);
-                        byteChannel.read(byteBuffer);
-                        return SecretStoreUtil.deObfuscate(SecretStoreUtil.asciiBytesToChar(byteBuffer.array()));
-                    }
-                }
-            } else {
-                //create the pass
-                byte[] randomBytes = new byte[32];
-                new Random().nextBytes(randomBytes);
-                return SecretStoreUtil.base64EncodeToChars(randomBytes);
-            }
-        } else {
+        if (!useDefaultPass) {
             //explicit user defined pass
             //keystore passwords require ascii encoding, only base64 encode if necessary
             return asciiEncoder.canEncode(CharBuffer.wrap(plainText)) ? plainText : SecretStoreUtil.base64Encode(plainText);
         }
-        throw new SecretStoreException.AccessException(
-                String.format("Could not determine keystore password. Please ensure the file at %s is a valid Logstash keystore", keyStorePath.toAbsolutePath()));
+        if (!existing) {
+            //create the pass
+            byte[] randomBytes = new byte[32];
+            new Random().nextBytes(randomBytes);
+            return SecretStoreUtil.base64EncodeToChars(randomBytes);
+        }
+        //read the pass
+        SeekableByteChannel byteChannel = Files.newByteChannel(keyStorePath, StandardOpenOption.READ);
+        if (byteChannel.size() == 0) {
+            throw new SecretStoreException.AccessException(
+                    String.format("Could not determine keystore password. Keystore file is empty. Please ensure the file at %s is a valid Logstash keystore", keyStorePath.toAbsolutePath()));
+        }
+        byteChannel.position(byteChannel.size() - 1);
+        ByteBuffer byteBuffer = ByteBuffer.allocate(1);
+        byteChannel.read(byteBuffer);
+        int size = byteBuffer.array()[0] & 0xff;
+        if (size <= 0 || byteChannel.size() < size + 1) {
+            throw new SecretStoreException.AccessException(
+                    String.format("Could not determine keystore password. Please ensure the file at %s is a valid Logstash keystore", keyStorePath.toAbsolutePath()));
+        }
+        byteBuffer = ByteBuffer.allocate(size);
+        byteChannel.position(byteChannel.size() - size - 1);
+        byteChannel.read(byteBuffer);
+        return SecretStoreUtil.deObfuscate(SecretStoreUtil.asciiBytesToChar(byteBuffer.array()));
     }
 
     private void init(SecureConfig config) throws IOException, KeyStoreException {
@@ -214,16 +242,14 @@ public final class JavaKeyStore implements SecretStore {
     }
 
     private void initLocks(){
-        ReadWriteLock readWriteLock = new ReentrantReadWriteLock();
-        readLock = readWriteLock.readLock();
-        writeLock = readWriteLock.writeLock();
+        lock = new ReentrantLock();
     }
 
     @Override
     public Collection<SecretIdentifier> list() {
         Set<SecretIdentifier> identifiers = new HashSet<>();
         try {
-            readLock.lock();
+            lock.lock();
             loadKeyStore();
             Enumeration<String> aliases = keyStore.aliases();
             while (aliases.hasMoreElements()) {
@@ -233,7 +259,7 @@ public final class JavaKeyStore implements SecretStore {
         } catch (Exception e) {
             throw new SecretStoreException.ListException(e);
         } finally {
-            releaseLock(readLock);
+            releaseLock(lock);
         }
         return identifiers;
     }
@@ -255,7 +281,7 @@ public final class JavaKeyStore implements SecretStore {
         }
         try {
             init(config);
-            readLock.lock();
+            lock.lock();
             try (final InputStream is = Files.newInputStream(keyStorePath)) {
                 try {
                     keyStore.load(is, this.keyStorePass);
@@ -282,7 +308,7 @@ public final class JavaKeyStore implements SecretStore {
         } catch (Exception e) { //should never happen
             throw new SecretStoreException.UnknownException("Error while trying to load the Logstash keystore", e);
         } finally {
-            releaseLock(readLock);
+            releaseLock(lock);
             config.clearValues();
         }
     }
@@ -299,7 +325,7 @@ public final class JavaKeyStore implements SecretStore {
     @Override
     public void persistSecret(SecretIdentifier identifier, byte[] secret) {
         try {
-            writeLock.lock();
+            lock.lock();
             loadKeyStore();
             SecretKeyFactory factory = SecretKeyFactory.getInstance("PBE");
             //PBEKey requires an ascii password, so base64 encode it
@@ -317,14 +343,14 @@ public final class JavaKeyStore implements SecretStore {
         } catch (Exception e) {
             throw new SecretStoreException.PersistException(identifier, e);
         } finally {
-            releaseLock(writeLock);
+            releaseLock(lock);
         }
     }
 
     @Override
     public void purgeSecret(SecretIdentifier identifier) {
         try {
-            writeLock.lock();
+            lock.lock();
             loadKeyStore();
             keyStore.deleteEntry(identifier.toExternalForm());
             saveKeyStore();
@@ -332,7 +358,18 @@ public final class JavaKeyStore implements SecretStore {
         } catch (Exception e) {
             throw new SecretStoreException.PurgeException(identifier, e);
         } finally {
-            releaseLock(writeLock);
+            releaseLock(lock);
+        }
+    }
+
+    @Override
+    public boolean containsSecret(SecretIdentifier identifier) {
+        try {
+            loadKeyStore();
+            return keyStore.containsAlias(identifier.toExternalForm());
+        } catch (Exception e) {
+            throw new SecretStoreException.LoadException(String.format("Found a keystore at %s, but failed to load it.",
+                    keyStorePath.toAbsolutePath().toString()));
         }
     }
 
@@ -346,7 +383,7 @@ public final class JavaKeyStore implements SecretStore {
     public byte[] retrieveSecret(SecretIdentifier identifier) {
         if (identifier != null && identifier.getKey() != null && !identifier.getKey().isEmpty()) {
             try {
-                readLock.lock();
+                lock.lock();
                 loadKeyStore();
                 SecretKeyFactory factory = SecretKeyFactory.getInstance("PBE");
                 KeyStore.SecretKeyEntry secretKeyEntry = (KeyStore.SecretKeyEntry) keyStore.getEntry(identifier.toExternalForm(), protectionParameter);
@@ -365,7 +402,7 @@ public final class JavaKeyStore implements SecretStore {
             } catch (Exception e) {
                 throw new SecretStoreException.RetrievalException(identifier, e);
             } finally {
-                releaseLock(readLock);
+                releaseLock(lock);
             }
         }
         return null;
@@ -408,4 +445,3 @@ public final class JavaKeyStore implements SecretStore {
         return !(chars == null || chars.length == 0);
     }
 }
-
diff --git a/logstash-core/src/main/java/org/logstash/settings/BaseSetting.java b/logstash-core/src/main/java/org/logstash/settings/BaseSetting.java
new file mode 100644
index 000000000..ec25bd62f
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/settings/BaseSetting.java
@@ -0,0 +1,208 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.settings;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Predicate;
+
+/**
+ * Root class for all setting definitions.
+ * */
+public class BaseSetting<T> implements Setting<T> {
+
+    private String name; // not final because can be updated by deprecate
+    T defaultValue;
+    private T value = null;
+    private final boolean strict;
+    private final Predicate<T> validator;
+    private boolean valueIsSet = false;
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public BaseSetting<T> clone() {
+        try {
+            BaseSetting<T> clone = (BaseSetting<T>) super.clone();
+            // copy mutable state here, so the clone can't change the internals of the original
+            clone.value = value;
+            clone.valueIsSet = valueIsSet;
+            return clone;
+        } catch (CloneNotSupportedException e) {
+            throw new AssertionError();
+        }
+    }
+
+    public static final class Builder<T> {
+        private final String name;
+        private boolean strict = true;
+        private T defaultValue = null;
+        private Predicate<T> validator = noValidator();
+
+        public Builder(String name) {
+            this.name = name;
+        }
+
+        public Builder<T> defaultValue(T defaultValue) {
+            this.defaultValue = defaultValue;
+            return this;
+        }
+
+        public Builder<T> strict(boolean strict) {
+            this.strict = strict;
+            return this;
+        }
+
+        public Builder<T> validator(Predicate<T> validator) {
+            this.validator = validator;
+            return this;
+        }
+
+        public BaseSetting<T> build() {
+            return new BaseSetting<>(name, defaultValue, strict, validator);
+        }
+    }
+
+    public static <T> Builder<T> create(String name) {
+        return new Builder<>(name);
+    }
+
+    /**
+     * Specifically used by Coercible subclass to initialize doing validation in a second phase.
+     * */
+    protected BaseSetting(String name, boolean strict, Predicate<T> validator) {
+        Objects.requireNonNull(name);
+        Objects.requireNonNull(validator);
+        this.name = name;
+        this.strict = strict;
+        this.validator = validator;
+    }
+
+    @SuppressWarnings("this-escape")
+    protected BaseSetting(String name, T defaultValue, boolean strict, Predicate<T> validator) {
+        Objects.requireNonNull(name);
+        Objects.requireNonNull(validator);
+        this.name = name;
+        this.defaultValue = defaultValue;
+        this.strict = strict;
+        this.validator = validator;
+        if (strict) {
+           validate(defaultValue);
+        }
+    }
+
+    /**
+     * Creates a copy of the setting with the original name to deprecate
+     * */
+    protected BaseSetting<T> deprecate(String deprecatedName) {
+        // this force to get a copy of the original Setting, in case of a BooleanSetting it retains also all of its
+        // coercing mechanisms
+        BaseSetting<T> clone = this.clone();
+        clone.updateName(deprecatedName);
+        return clone;
+    }
+
+    private void updateName(String deprecatedName) {
+        this.name = deprecatedName;
+    }
+
+    protected static <T> Predicate<T> noValidator() {
+        return t -> true;
+    }
+
+    public void validate(T input) throws IllegalArgumentException {
+        if (!validator.test(input)) {
+            throw new IllegalArgumentException("Failed to validate setting " + this.name + " with value: " + input);
+        }
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public T value() {
+        if (valueIsSet) {
+            return value;
+        } else {
+            return defaultValue;
+        }
+    }
+
+    public boolean isSet() {
+        return this.valueIsSet;
+    }
+
+    public boolean isStrict() {
+        return strict;
+    }
+
+    public void setSafely(T newValue) {
+        if (strict) {
+            validate(newValue);
+        }
+        this.value = newValue;
+        this.valueIsSet = true;
+    }
+
+    public void reset() {
+        this.value = null;
+        this.valueIsSet = false;
+    }
+
+    public void validateValue() {
+        validate(this.value());
+    }
+
+    public T getDefault() {
+        return this.defaultValue;
+    }
+
+    public void format(List<String> output) {
+        T effectiveValue = this.value;
+        String settingName = this.name;
+
+        if (effectiveValue != null && effectiveValue.equals(defaultValue)) {
+            // print setting and its default value
+            output.add(String.format("%s: %s", settingName, effectiveValue));
+        } else if (defaultValue == null) {
+            // print setting and warn it has been set
+            output.add(String.format("*%s: %s", settingName, effectiveValue));
+        } else if (effectiveValue == null) {
+            // default setting not set by user
+            output.add(String.format("%s: %s", settingName, defaultValue));
+        } else {
+            // print setting, warn it has been set, and show default value
+            output.add(String.format("*%s: %s (default: %s)", settingName, effectiveValue, defaultValue));
+        }
+    }
+
+    public List<Setting<T>> withDeprecatedAlias(String deprecatedAlias) {
+        return withDeprecatedAlias(deprecatedAlias, null);
+    }
+    public List<Setting<T>> withDeprecatedAlias(String deprecatedAlias, String obsoletedVersion) {
+        return SettingWithDeprecatedAlias.wrap(this, deprecatedAlias, obsoletedVersion);
+    }
+
+    public Setting<T> nullable() {
+        return new NullableSetting<>(this);
+    }
+ }
+
+
+
diff --git a/logstash-core/src/main/java/org/logstash/settings/Boolean.java b/logstash-core/src/main/java/org/logstash/settings/Boolean.java
new file mode 100644
index 000000000..2b9feb6f4
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/settings/Boolean.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.settings;
+
+public class Boolean extends Coercible<java.lang.Boolean> {
+
+    public Boolean(String name, boolean defaultValue) {
+        super(name, defaultValue, true, noValidator());
+    }
+
+    public Boolean(String name, boolean defaultValue, boolean strict) {
+        super(name, defaultValue, strict, noValidator());
+    }
+
+    @Override
+    public java.lang.Boolean coerce(Object obj) {
+        if (obj instanceof String) {
+            switch((String) obj) {
+                case "true": return true;
+                case "false": return false;
+                default: throw new IllegalArgumentException(coercionFailureMessage(obj));
+            }
+        }
+        if (obj instanceof java.lang.Boolean) {
+            return (java.lang.Boolean) obj;
+        }
+        throw new IllegalArgumentException(coercionFailureMessage(obj));
+    }
+
+    private String coercionFailureMessage(Object obj) {
+        return String.format("Cannot coerce `%s` to boolean (%s)", obj, getName());
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/main/java/org/logstash/settings/Coercible.java b/logstash-core/src/main/java/org/logstash/settings/Coercible.java
new file mode 100644
index 000000000..ec6688969
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/settings/Coercible.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.settings;
+
+import java.util.function.Predicate;
+
+public abstract class Coercible<T> extends BaseSetting<T> {
+
+    @SuppressWarnings("this-escape")
+    public Coercible(String name, T defaultValue, boolean strict, Predicate<T> validator) {
+        super(name, strict, validator);
+
+        if (strict) {
+            T coercedDefault = coerce(defaultValue);
+            validate(coercedDefault);
+            this.defaultValue = coercedDefault;
+        } else {
+            this.defaultValue = defaultValue;
+        }
+    }
+
+    @Override
+    public void set(Object value) {
+        T coercedValue = coerce(value);
+        validate(coercedValue);
+        super.setSafely(coercedValue);
+    }
+
+    @Override
+    public void setSafely(T value) {
+        this.set(value);
+    }
+
+    public abstract T coerce(Object obj);
+}
diff --git a/logstash-core/src/main/java/org/logstash/settings/DeprecatedAlias.java b/logstash-core/src/main/java/org/logstash/settings/DeprecatedAlias.java
new file mode 100644
index 000000000..8d4a44d63
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/settings/DeprecatedAlias.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.settings;
+
+import co.elastic.logstash.api.DeprecationLogger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.logstash.log.DefaultDeprecationLogger;
+
+/**
+ * A <code>DeprecatedAlias</code> provides a deprecated alias for a setting, and is meant
+ * to be used exclusively through @see org.logstash.settings.SettingWithDeprecatedAlias#wrap()
+ * */
+public final class DeprecatedAlias<T> extends SettingDelegator<T> {
+    private static final Logger LOGGER = LogManager.getLogger();
+
+    private static final DeprecationLogger DEPRECATION_LOGGER = new DefaultDeprecationLogger(LOGGER);
+
+    private final SettingWithDeprecatedAlias<T> canonicalProxy;
+
+    private final String obsoletedVersion;
+
+    DeprecatedAlias(SettingWithDeprecatedAlias<T> canonicalProxy, String aliasName, String obsoletedVersion) {
+        super(canonicalProxy.getCanonicalSetting().deprecate(aliasName));
+        this.canonicalProxy = canonicalProxy;
+        this.obsoletedVersion = obsoletedVersion;
+    }
+
+    // Because loggers are configure after the Settings declaration, this method is intended for lazy-logging
+    // check https://github.com/elastic/logstash/pull/16339
+    public void observePostProcess() {
+        if (isSet()) {
+            StringBuilder sb = new StringBuilder();
+            sb.append("The setting `").append(getName()).append("` is a deprecated alias for `").append(canonicalProxy.getName()).append("`");
+
+            if (this.obsoletedVersion != null && !this.obsoletedVersion.isEmpty()) {
+                sb.append(" and will be removed in version ").append(this.obsoletedVersion).append(".");
+            } else {
+                sb.append(" and will be removed in a future release of Logstash.");
+            }
+
+            sb.append(" Please use `").append(canonicalProxy.getName()).append("` instead");
+
+            DEPRECATION_LOGGER.deprecated(sb.toString());
+        }
+    }
+
+    @Override
+    public T value() {
+        LOGGER.warn("The value of setting `{}` has been queried by its deprecated alias `{}`. " +
+                "Code should be updated to query `{}` instead", canonicalProxy.getName(), getName(), canonicalProxy.getName());
+        return super.value();
+    }
+
+    @Override
+    public void validateValue() {
+        // bypass deprecation warning
+        if (isSet()) {
+            getDelegate().validateValue();
+        }
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/settings/NullableSetting.java b/logstash-core/src/main/java/org/logstash/settings/NullableSetting.java
new file mode 100644
index 000000000..0b1b27e3c
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/settings/NullableSetting.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.settings;
+
+public class NullableSetting<T> extends SettingDelegator<T> {
+
+    NullableSetting(BaseSetting<T> delegate) {
+        super(delegate);
+    }
+
+    @Override
+    public void validate(T input) throws IllegalArgumentException {
+        if (input == null) {
+            return;
+        }
+        getDelegate().validate(input);
+    }
+
+    // prevent delegate from intercepting
+    @Override
+    public void validateValue() {
+        validate(value());
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/settings/Setting.java b/logstash-core/src/main/java/org/logstash/settings/Setting.java
new file mode 100644
index 000000000..f97f9055c
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/settings/Setting.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.settings;
+
+import java.util.List;
+
+public interface Setting<T> extends Cloneable {
+
+    String getName();
+
+    T value();
+
+    boolean isSet();
+
+    boolean isStrict();
+
+    void setSafely(T newValue);
+
+    @SuppressWarnings("unchecked")
+    default void set(Object newValue) {
+        //this could throw a class cast error
+        setSafely((T) newValue);
+    }
+
+    void reset();
+
+    void validateValue();
+
+    void validate(T input);
+
+    T getDefault();
+
+    void format(List<String> output);
+}
diff --git a/logstash-core/src/main/java/org/logstash/settings/SettingDelegator.java b/logstash-core/src/main/java/org/logstash/settings/SettingDelegator.java
new file mode 100644
index 000000000..bc0bf9250
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/settings/SettingDelegator.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.settings;
+
+import java.util.List;
+import java.util.Objects;
+
+abstract class SettingDelegator<T> implements Setting<T> {
+    private BaseSetting<T> delegate;
+
+    /**
+     * Use this constructor to wrap another setting.
+     * */
+    SettingDelegator(BaseSetting<T> delegate) {
+        Objects.requireNonNull(delegate);
+        this.delegate = delegate;
+    }
+
+    BaseSetting<T> getDelegate() {
+        return delegate;
+    }
+
+    @Override
+    public String getName() {
+        return delegate.getName();
+    }
+
+    @Override
+    public T value() {
+        return delegate.value();
+    }
+
+    @Override
+    public boolean isSet() {
+        return delegate.isSet();
+    }
+
+    @Override
+    public boolean isStrict() {
+        return delegate.isStrict();
+    }
+
+    @Override
+    public void setSafely(T newValue) {
+        delegate.setSafely(newValue);
+    }
+
+    @Override
+    public void reset() {
+        delegate.reset();
+    }
+
+    @Override
+    public void validateValue() {
+        delegate.validateValue();
+    }
+
+    @Override
+    public T getDefault() {
+        return delegate.getDefault();
+    }
+
+    @Override
+    public void format(List<String> output) {
+        delegate.format(output);
+    }
+
+    @Override
+    public void validate(T input) {
+        delegate.validate(input);
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/settings/SettingNullableString.java b/logstash-core/src/main/java/org/logstash/settings/SettingNullableString.java
new file mode 100644
index 000000000..4ea215bfd
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/settings/SettingNullableString.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.settings;
+
+import java.util.List;
+
+public class SettingNullableString extends SettingString {
+
+    public SettingNullableString(String name, String defaultValue, boolean strict, List<String> possibleStrings) {
+        super(name, defaultValue, strict, possibleStrings);
+    }
+
+    public SettingNullableString(String name, String defaultValue) {
+        super(name, defaultValue);
+    }
+
+    public SettingNullableString(String name, String defaultValue, boolean strict) {
+        super(name, defaultValue, strict);
+    }
+
+    public SettingNullableString(String name) {
+        super(name, null);
+    }
+
+    @Override
+    public void validate(String input) throws IllegalArgumentException {
+        if (input == null) {
+            return;
+        }
+        super.validate(input);
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/settings/SettingNumeric.java b/logstash-core/src/main/java/org/logstash/settings/SettingNumeric.java
new file mode 100644
index 000000000..f2e71be89
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/settings/SettingNumeric.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.settings;
+
+public class SettingNumeric extends Coercible<Number> {
+
+    public SettingNumeric(String name, Number defaultValue) {
+        super(name, defaultValue, true, noValidator());
+    }
+
+    // constructor used only in tests, but needs to be public to be used in Ruby spec
+    public SettingNumeric(String name, Number defaultValue, boolean strict) {
+        super(name, defaultValue, strict, noValidator());
+    }
+
+    @Override
+    public Number coerce(Object obj) {
+        if (obj == null) {
+            throw new IllegalArgumentException("Failed to coerce value to SettingNumeric. Received null");
+        }
+        if (obj instanceof Number) {
+            return (Number) obj;
+        }
+        try {
+            return Integer.parseInt(obj.toString());
+        } catch (NumberFormatException e) {
+            // ugly flow control
+        }
+        try {
+            return Float.parseFloat(obj.toString());
+        } catch (NumberFormatException e) {
+            // ugly flow control
+        }
+
+        // no integer neither float parsing succeed, invalid coercion
+        throw new IllegalArgumentException(coercionFailureMessage(obj));
+    }
+
+    private String coercionFailureMessage(Object obj) {
+        return String.format("Failed to coerce value to SettingNumeric. Received %s (%s)", obj, obj.getClass());
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/settings/SettingString.java b/logstash-core/src/main/java/org/logstash/settings/SettingString.java
new file mode 100644
index 000000000..98f86c40c
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/settings/SettingString.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.settings;
+
+import java.util.Collections;
+import java.util.List;
+
+public class SettingString extends BaseSetting<String> {
+
+    private List<String> possibleStrings = Collections.emptyList();
+
+    public SettingString(String name, String defaultValue, boolean strict, List<String> possibleStrings) {
+        super(name, strict, noValidator()); // this super doesn't call validate either if it's strict
+        this.possibleStrings = possibleStrings;
+        this.defaultValue = defaultValue;
+
+        if (strict) {
+            staticValidate(defaultValue, possibleStrings, name);
+        }
+    }
+
+    public SettingString(String name, String defaultValue) {
+        this(name, defaultValue, true, Collections.emptyList());
+    }
+
+    public SettingString(String name, String defaultValue, boolean strict) {
+        this(name, defaultValue, strict, Collections.emptyList());
+    }
+
+    @Override
+    public void validate(String input) throws IllegalArgumentException {
+        if (input == null) {
+            throw new IllegalArgumentException(String.format("Setting \"%s\" must be a String. Received:  (NilClass)", this.getName()));
+        }
+        staticValidate(input, possibleStrings, this.getName());
+    }
+
+    private static void staticValidate(String input, List<String> possibleStrings, String name) {
+        if (!possibleStrings.isEmpty() && !possibleStrings.contains(input)) {
+            throw new IllegalArgumentException(String.format("Invalid value \"%s: %s\" . Options are: %s", name, input, possibleStrings));
+        }
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/settings/SettingWithDeprecatedAlias.java b/logstash-core/src/main/java/org/logstash/settings/SettingWithDeprecatedAlias.java
new file mode 100644
index 000000000..c0c00379f
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/settings/SettingWithDeprecatedAlias.java
@@ -0,0 +1,108 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.settings;
+
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * A <code>SettingWithDeprecatedAlias</code> wraps any <code>Setting</code> to provide a deprecated
+ * alias, and hooks @see org.logstash.settings.Setting#validate_value() to ensure that a deprecation
+ * warning is fired when the setting is provided by its deprecated alias,
+ * or to produce an error when both the canonical name and deprecated
+ * alias are used together.
+ * */
+// This class is public else the getDeprecatedAlias method can't be seen from setting_with_deprecated_alias_spec.rb
+public class SettingWithDeprecatedAlias<T> extends SettingDelegator<T> {
+    
+    /**
+     * Wraps the provided setting, returning a pair of connected settings
+     * including the canonical setting and a deprecated alias.
+     * @param canonicalSetting the setting to wrap
+     * @param deprecatedAliasName the name for the deprecated alias
+     * @param obsoletedVersion the version of Logstash that deprecated alias will be removed
+     *
+     * @return List of [SettingWithDeprecatedAlias, DeprecatedAlias]
+     * */
+    static <T> List<Setting<T>> wrap(BaseSetting<T> canonicalSetting, String deprecatedAliasName, String obsoletedVersion) {
+        final SettingWithDeprecatedAlias<T> settingProxy = new SettingWithDeprecatedAlias<>(canonicalSetting, deprecatedAliasName, obsoletedVersion);
+        return Arrays.asList(settingProxy, settingProxy.deprecatedAlias);
+    }
+
+    private DeprecatedAlias<T> deprecatedAlias;
+
+    @SuppressWarnings("this-escape")
+    protected SettingWithDeprecatedAlias(BaseSetting<T> canonicalSetting, String deprecatedAliasName, String obsoletedVersion) {
+        super(canonicalSetting);
+
+        this.deprecatedAlias = new DeprecatedAlias<T>(this, deprecatedAliasName, obsoletedVersion);
+    }
+
+    BaseSetting<T> getCanonicalSetting() {
+        return getDelegate();
+    }
+
+    public DeprecatedAlias<T> getDeprecatedAlias() {
+        return deprecatedAlias;
+    }
+
+    @Override
+    public void setSafely(T value) {
+        getCanonicalSetting().setSafely(value);
+    }
+
+    @Override
+    public T value() {
+        if (getCanonicalSetting().isSet()) {
+            return super.value();
+        }
+        // bypass warning by querying the wrapped setting's value
+        if (deprecatedAlias.isSet()) {
+            return deprecatedAlias.getDelegate().value();
+        }
+        return getDefault();
+    }
+
+    @Override
+    public boolean isSet() {
+        return getCanonicalSetting().isSet() || deprecatedAlias.isSet();
+    }
+
+    @Override
+    public void format(List<String> output) {
+        if (!(deprecatedAlias.isSet() && !getCanonicalSetting().isSet())) {
+            super.format(output);
+            return;
+        }
+        output.add(String.format("*%s: %s (via deprecated `%s`; default: %s)",
+                getName(), value(), deprecatedAlias.getName(), getDefault()));
+    }
+
+    @Override
+    public void validateValue() {
+        if (deprecatedAlias.isSet() && getCanonicalSetting().isSet()) {
+            throw new IllegalStateException(String.format("Both `%s` and its deprecated alias `%s` have been set. " +
+                    "Please only set `%s`", getCanonicalSetting().getName(), deprecatedAlias.getName(), getCanonicalSetting().getName()));
+        }
+        super.validateValue();
+    }
+
+}
diff --git a/logstash-core/src/main/java/org/logstash/util/CATrustedFingerprintTrustStrategy.java b/logstash-core/src/main/java/org/logstash/util/CATrustedFingerprintTrustStrategy.java
new file mode 100644
index 000000000..cb3cb54d4
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/util/CATrustedFingerprintTrustStrategy.java
@@ -0,0 +1,137 @@
+package org.logstash.util;
+
+import com.google.common.io.BaseEncoding;
+import org.apache.http.conn.ssl.TrustStrategy;
+
+import java.security.InvalidKeyException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.SignatureException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Set;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+public class CATrustedFingerprintTrustStrategy implements TrustStrategy {
+
+    private final Set<Fingerprint> trustedFingerprints;
+    private final Supplier<Date> dateSupplier;
+
+    public CATrustedFingerprintTrustStrategy(final String hexEncodedTrustedFingerprint) {
+        this(hexEncodedTrustedFingerprint, Date::new);
+    }
+
+    public CATrustedFingerprintTrustStrategy(final String hexEncodedTrustedFingerprint, final Supplier<Date> dateSupplier) {
+        this(Set.of(Fingerprint.fromHex(hexEncodedTrustedFingerprint)), dateSupplier);
+    }
+
+    public CATrustedFingerprintTrustStrategy(final Collection<String> hexEncodedTrustedFingerprints) {
+        this(hexEncodedTrustedFingerprints, Date::new);
+    }
+
+    public CATrustedFingerprintTrustStrategy(final Collection<String> hexEncodedTrustedFingerprints, final Supplier<Date> dateSupplier) {
+        this(hexEncodedTrustedFingerprints.stream()
+                .map(Fingerprint::fromHex)
+                .collect(Collectors.toUnmodifiableSet()),
+             dateSupplier);
+    }
+
+    CATrustedFingerprintTrustStrategy(final Set<Fingerprint> trustedFingerprints) {
+        this(trustedFingerprints, Date::new);
+    }
+
+    /**
+     *
+     * @param trustedFingerprints one or more {@link Fingerprint}s
+     * @param dateSupplier a {@link Date} from this {@link Supplier} is used when checking the validitiy of
+     *                     a matching certificate
+     */
+    CATrustedFingerprintTrustStrategy(final Set<Fingerprint> trustedFingerprints, final Supplier<Date> dateSupplier) {
+        this.trustedFingerprints = Set.copyOf(trustedFingerprints);
+        this.dateSupplier = dateSupplier;
+    }
+
+    @Override
+    public boolean isTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+        if (chain.length == 0 || this.trustedFingerprints.isEmpty()) { return false; }
+
+        final MessageDigest sha256Digest = sha256();
+
+        // traverse up the chain until we find one whose fingerprint matches
+        for (int i = 0; i < chain.length; i++) {
+            final X509Certificate currentCandidate = chain[i];
+            final byte[] derEncoding = currentCandidate.getEncoded();
+            Fingerprint candidateFingerprint = new Fingerprint(sha256Digest.digest(derEncoding));
+            if (this.trustedFingerprints.contains(candidateFingerprint)) {
+                final Date currentDate = dateSupplier.get();
+                currentCandidate.checkValidity(currentDate);
+
+                // zip back down the chain and make sure everything is valid
+                for(; i > 0; i--) {
+                    final X509Certificate signer = chain[i];
+                    final X509Certificate signed = chain[i-1];
+
+                    verifyAndValidate(signed, signer, currentDate);
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private MessageDigest sha256() {
+        try {
+            return MessageDigest.getInstance("SHA-256");
+        } catch (NoSuchAlgorithmException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    private void verifyAndValidate(final X509Certificate signed, final X509Certificate signer, final Date currentDate) throws CertificateException {
+        try {
+            signed.verify(signer.getPublicKey());
+            signed.checkValidity(currentDate);
+        } catch (SignatureException e) {
+            throw new CertificateException(e);
+        } catch (NoSuchAlgorithmException | InvalidKeyException | NoSuchProviderException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    private static class Fingerprint {
+        private static final BaseEncoding HEX_ENCODING = BaseEncoding.base16().upperCase();
+
+        static Fingerprint fromHex(final String hexEncodedFingerprint) {
+            try {
+                final byte[] bytes = HEX_ENCODING.decode(hexEncodedFingerprint.toUpperCase());
+                return new Fingerprint(bytes);
+            } catch (Exception e) {
+                throw new IllegalStateException(String.format("BAD INPUT: `%s`", hexEncodedFingerprint), e);
+            }
+        }
+
+        private final byte[] value;
+
+        private Fingerprint(final byte[] fingerprint) {
+            this.value = fingerprint;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            Fingerprint that = (Fingerprint) o;
+            return Arrays.equals(value, that.value);
+        }
+
+        @Override
+        public int hashCode() {
+            return Arrays.hashCode(value);
+        }
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/util/CheckedSupplier.java b/logstash-core/src/main/java/org/logstash/util/CheckedSupplier.java
new file mode 100644
index 000000000..df81ffc5a
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/util/CheckedSupplier.java
@@ -0,0 +1,6 @@
+package org.logstash.util;
+
+@FunctionalInterface
+public interface CheckedSupplier<T> {
+    T get() throws Exception;
+}
diff --git a/logstash-core/src/main/java/org/logstash/util/CloudSettingAuth.java b/logstash-core/src/main/java/org/logstash/util/CloudSettingAuth.java
new file mode 100644
index 000000000..c251bf415
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/util/CloudSettingAuth.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.util;
+
+import co.elastic.logstash.api.Password;
+import org.logstash.RubyUtil;
+
+/**
+ * Represents and decode credentials to access Elastic cloud instance.
+ * */
+public class CloudSettingAuth {
+
+    private String original;
+    private String username;
+    private Password password;
+
+    public CloudSettingAuth(String value) {
+        if (value == null) {
+            return;
+        }
+        this.original = value;
+        final String[] parts = this.original.split(":");
+        if (parts.length != 2 || parts[0].isEmpty() || parts[1].isEmpty()) {
+            throw RubyUtil.RUBY.newArgumentError("Cloud Auth username and password format should be \"<username>:<password>\".");
+        }
+
+        this.username = parts[0];
+        this.password = new Password(parts[1]);
+    }
+
+    public String getOriginal() {
+        return original;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public Password getPassword() {
+        return password;
+    }
+
+    @Override
+    public String toString() {
+        return String.join(":", username, password.toString());
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/util/CloudSettingId.java b/logstash-core/src/main/java/org/logstash/util/CloudSettingId.java
new file mode 100644
index 000000000..9fb6cd6f7
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/util/CloudSettingId.java
@@ -0,0 +1,196 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.util;
+
+import org.logstash.RubyUtil;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Base64;
+
+/*
+ * The constructor is expecting a 'cloud.id', a string in 2 variants.
+ * 1 part example: 'dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRub3RhcmVhbCRpZGVudGlmaWVy'
+ * 2 part example: 'foobar:dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRub3RhcmVhbCRpZGVudGlmaWVy'
+ * The two part variant has a 'label' prepended with a colon separator. The label is not encoded.
+ * The 1 part (or second section of the 2 part variant) is base64 encoded.
+ * The original string before encoding has three segments separated by a dollar sign.
+ * e.g. 'us-east-1.aws.found.io$notareal$identifier'
+ * The first segment is the cloud base url, e.g. 'us-east-1.aws.found.io'
+ * The second segment is the elasticsearch host identifier, e.g. 'notareal'
+ * The third segment is the kibana host identifier, e.g. 'identifier'
+ * The 'cloud.id' value decoded into the various fields.
+ */
+/**
+ * Represents and decode an Elastic cloudid of an instance.
+ * */
+public class CloudSettingId {
+
+    private static class HostAndPort {
+        static final HostAndPort NO_HOST = new HostAndPort("", null);
+        private final String host;
+        private final String port;
+
+        private HostAndPort(String host, String port) {
+            this.host = host;
+            this.port = port;
+        }
+
+        String portOrDefault(String defaultPort) {
+            return port == null ? defaultPort : port;
+        }
+
+        static HostAndPort parseHostAndPort(String part, String guidanceMessageWhenHostEqualsUndefined) {
+            final String[] hostParts = part.split(":");
+            String host = hostParts[0];
+            if ("undefined".equals(host)) {
+                throw RubyUtil.RUBY.newArgumentError(guidanceMessageWhenHostEqualsUndefined);
+            }
+            String port = null;
+            if (hostParts.length > 1) {
+                port = hostParts[1];
+            }
+            return new HostAndPort(host, port);
+        }
+    }
+
+    public static final String DOT_SEPARATOR = ".";
+    public static final String CLOUD_PORT = "443";
+
+    private String original;
+    private String decoded;
+    private String label;
+    private String elasticsearchScheme;
+    private String elasticsearchHost;
+    private String elasticsearchPort;
+    private String kibanaScheme;
+    private String kibanaHost;
+    private String kibanaPort;
+    private String[] otherIdentifiers = new String[0];
+
+    public CloudSettingId(String value) {
+        if (value == null) {
+            return;
+        }
+        original = value;
+        final String[] parts = original.split(":");
+        label = parts[0];
+        String encoded = null;
+        if (parts.length > 1) {
+            encoded = parts[1];
+        }
+        if (encoded == null || encoded.isEmpty()) {
+            try {
+                decoded = new String(Base64.getUrlDecoder().decode(label), StandardCharsets.UTF_8);
+            } catch (IllegalArgumentException iaex) {
+                decoded = "";
+            }
+            label = "";
+        } else {
+            try {
+                decoded = new String(Base64.getUrlDecoder().decode(encoded), StandardCharsets.UTF_8);
+            } catch (IllegalArgumentException iaex) {
+                decoded = "";
+            }
+        }
+        long separatorCount = decoded.chars().filter(c -> c == '$').count();
+        if (separatorCount < 2) {
+            throw RubyUtil.RUBY.newArgumentError("Cloud Id, after decoding, is invalid. Format: '<segment1>$<segment2>$<segment3>'. Received: \"" + decoded + "\".");
+        }
+        final String[] segments = decoded.split("\\$");
+        if (Arrays.stream(segments).anyMatch(String::isEmpty)) {
+            throw RubyUtil.RUBY.newArgumentError("Cloud Id, after decoding, is invalid. Format: '<segment1>$<segment2>$<segment3>'. Received: \"" + decoded + "\".");
+        }
+        String cloudBase = segments[0];
+        String cloudHost = DOT_SEPARATOR + cloudBase;
+        final String[] hostParts = cloudHost.split(":");
+        final HostAndPort cloud = new HostAndPort(hostParts[0], hostParts.length > 1 ? hostParts[1] : CLOUD_PORT);
+
+        final HostAndPort elasticsearch = HostAndPort.parseHostAndPort(segments[1], "Cloud Id, after decoding, elasticsearch segment is 'undefined', literally.");
+        elasticsearchPort = elasticsearch.portOrDefault(cloud.port);
+        elasticsearchHost = elasticsearch.host + cloud.host + ":" + elasticsearchPort;
+        elasticsearchScheme = "https";
+
+        final HostAndPort kibana;
+        if (segments.length > 2) {
+            kibana = HostAndPort.parseHostAndPort(segments[2], "Cloud Id, after decoding, the kibana segment is 'undefined', literally. You may need to enable Kibana in the Cloud UI.");
+        } else {
+            // non-sense really to have '.my-host:443' but we're mirroring others
+            kibana = HostAndPort.NO_HOST;
+        }
+        kibanaPort = kibana.portOrDefault(cloud.port);
+        kibanaHost = kibana.host + cloud.host + ":" + kibanaPort;
+        kibanaScheme = "https";
+
+        if (segments.length > 3) {
+            otherIdentifiers = Arrays.copyOfRange(segments, 3, segments.length);
+        }
+    }
+
+    public String getOriginal() {
+        return original;
+    }
+
+    public String getDecoded() {
+        return decoded;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public String getElasticsearchScheme() {
+        return elasticsearchScheme;
+    }
+
+    public String getElasticsearchHost() {
+        return elasticsearchHost;
+    }
+
+    public String getElasticsearchPort() {
+        return elasticsearchPort;
+    }
+
+    public String getKibanaScheme() {
+        return kibanaScheme;
+    }
+
+    public String getKibanaHost() {
+        return kibanaHost;
+    }
+
+    public String getKibanaPort() {
+        return kibanaPort;
+    }
+
+    public String[] getOtherIdentifiers() {
+        return otherIdentifiers;
+    }
+
+    @Override
+    public String toString() {
+        return decoded;
+    }
+
+    public static String cloudIdEncode(String... args) {
+        final String joinedArgs = String.join("$", args);
+        return Base64.getUrlEncoder().encodeToString(joinedArgs.getBytes());
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/util/EscapeHandler.java b/logstash-core/src/main/java/org/logstash/util/EscapeHandler.java
new file mode 100644
index 000000000..a51e3db58
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/util/EscapeHandler.java
@@ -0,0 +1,71 @@
+package org.logstash.util;
+
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.regex.Pattern;
+
+public interface EscapeHandler {
+    String unescape(String escaped);
+    String escape(String unescaped);
+
+    EscapeHandler NONE = new EscapeHandler() {
+        @Override
+        public String unescape(final String escaped) {
+            return escaped;
+        }
+
+        @Override
+        public String escape(final String unescaped) {
+            return unescaped;
+        }
+    };
+
+    EscapeHandler PERCENT = new EscapeHandler() {
+        private final Pattern ESCAPE_REQUIRED_PERCENT_LITERAL = Pattern.compile("%(?=[0-9A-F]{2})");
+
+        @Override
+        public String escape(final String unescaped) {
+            // When a percent-literal is followed by a pair of hex digits, we must escape it.
+            return ESCAPE_REQUIRED_PERCENT_LITERAL.matcher(unescaped).replaceAll("%25")
+                    .replace("[", "%5B")
+                    .replace("]", "%5D");
+        }
+
+        private final Pattern PERCENT_ENCODED_SEQUENCE = Pattern.compile("%[0-9A-F]{2}");
+        private final Pattern UNESCAPED_PERCENT_LITERAL = Pattern.compile("%(?![0-9A-F]{2})");
+
+        public String unescape(String escaped) {
+            if (!escaped.contains("%")) { return escaped; }
+            if (!PERCENT_ENCODED_SEQUENCE.matcher(escaped).find()) { return escaped; }
+
+            // In order to support unescaped percent-literals without implementing
+            // our own percent-decoder, we need to detect them and escape them before
+            // handing off to java's URLDecoder.
+            escaped = UNESCAPED_PERCENT_LITERAL.matcher(escaped).replaceAll("%25");
+
+            return URLDecoder.decode(escaped, StandardCharsets.UTF_8);
+        }
+    };
+
+    EscapeHandler AMPERSAND = new EscapeHandler() {
+        private final Pattern AMPERSAND_ENCODED_SEQUENCE = Pattern.compile("&#([0-9]{2,});");
+
+        @Override
+        public String escape(final String unescaped) {
+            return unescaped.replaceAll(AMPERSAND_ENCODED_SEQUENCE.pattern(), "&#38;#$1;")
+                    .replace("[", "&#91;")
+                    .replace("]", "&#93;");
+        }
+
+        @Override
+        public String unescape(final String escaped) {
+            if (!escaped.contains("&")) { return escaped; }
+
+            return AMPERSAND_ENCODED_SEQUENCE.matcher(escaped).replaceAll(matchResult -> {
+                final int codePoint = Integer.parseInt(matchResult.group(1));
+                final char[] chars = Character.toChars(codePoint);
+                return String.copyValueOf(chars);
+            });
+        }
+    };
+}
diff --git a/logstash-core/src/main/java/org/logstash/util/ExponentialBackoff.java b/logstash-core/src/main/java/org/logstash/util/ExponentialBackoff.java
new file mode 100644
index 000000000..8c96f7cfe
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/util/ExponentialBackoff.java
@@ -0,0 +1,65 @@
+package org.logstash.util;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.Random;
+
+public class ExponentialBackoff {
+    private final long maxRetry;
+    private static final int[] BACKOFF_SCHEDULE_MS = {100, 200, 400, 800, 1_600, 3_200, 6_400, 12_800, 25_600, 51_200};
+    private static final int BACKOFF_MAX_MS = 60_000;
+
+    private static final Logger logger = LogManager.getLogger(ExponentialBackoff.class);
+
+    public ExponentialBackoff(long maxRetry) {
+        this.maxRetry = maxRetry;
+    }
+
+    public <T> T retryable(CheckedSupplier<T> action) throws RetryException {
+        long attempt = 0L;
+
+        do {
+            try {
+                attempt++;
+                return action.get();
+            } catch (Exception ex) {
+                logger.error("Backoff retry exception", ex);
+            }
+
+            if (hasRetry(attempt)) {
+                try {
+                    int ms = backoffTime(attempt);
+                    logger.info("Retry({}) will execute in {} second", attempt, ms/1000.0);
+                    Thread.sleep(ms);
+                } catch (InterruptedException e) {
+                    throw new RetryException("Backoff retry aborted", e);
+                }
+            }
+        } while (hasRetry(attempt));
+
+        throw new RetryException("Reach max retry");
+    }
+
+    private int backoffTime(Long attempt) {
+        return (attempt - 1 < BACKOFF_SCHEDULE_MS.length)?
+                BACKOFF_SCHEDULE_MS[attempt.intValue() - 1] + new Random().nextInt(1000) :
+                BACKOFF_MAX_MS;
+    }
+
+    private boolean hasRetry(long attempt) {
+        return attempt <= maxRetry;
+    }
+
+    public static class RetryException extends Exception {
+        private static final long serialVersionUID = 1L;
+
+        public RetryException(String message) {
+            super(message);
+        }
+
+        public RetryException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/util/JavaVersion.java b/logstash-core/src/main/java/org/logstash/util/JavaVersion.java
new file mode 100644
index 000000000..7bf1ac85b
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/util/JavaVersion.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.util;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Helper class to compare current version of JVM with a target version.
+ * Based on JavaVersion class from elasticsearch java version checker tool
+ */
+public class JavaVersion implements Comparable<JavaVersion> {
+
+    public static final JavaVersion CURRENT = parse(System.getProperty("java.specification.version"));
+    public static final JavaVersion JAVA_17 = parse("17");
+    public static final JavaVersion JAVA_21 = parse("21");
+
+    private final List<Integer> version;
+
+    private JavaVersion(List<Integer> version){
+        this.version = version;
+    }
+
+    static JavaVersion parse(final String value) {
+        if (value.matches("^0*[0-9]+(\\.[0-9]+)*$") == false) {
+            throw new IllegalArgumentException(value);
+        }
+
+        final List<Integer> version = new ArrayList<Integer>();
+        final String[] components = value.split("\\.");
+        for (final String component : components) {
+            version.add(Integer.valueOf(component));
+        }
+        return new JavaVersion(version);
+    }
+
+    public static int majorVersion(final JavaVersion javaVersion) {
+        Objects.requireNonNull(javaVersion);
+        if (javaVersion.version.get(0) > 1) {
+            return javaVersion.version.get(0);
+        } else {
+            return javaVersion.version.get(1);
+        }
+    }
+
+    private static int compare(final JavaVersion leftVersion, final JavaVersion rightVersion) {
+        List<Integer> left = leftVersion.version;
+        List<Integer> right = rightVersion.version;
+        // lexicographically compare two lists, treating missing entries as zeros
+        final int len = Math.max(left.size(), right.size());
+        for (int i = 0; i < len; i++) {
+            final int l = (i < left.size()) ? left.get(i) : 0;
+            final int r = (i < right.size()) ? right.get(i) : 0;
+            if (l < r) {
+                return -1;
+            }
+            if (r < l) {
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    @Override
+    public int compareTo(JavaVersion other) {
+        return compare(this, other);
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/main/java/org/logstash/util/JavaVersionChecker.java b/logstash-core/src/main/java/org/logstash/util/JavaVersionChecker.java
new file mode 100644
index 000000000..e69de29bb
diff --git a/logstash-core/src/main/java/org/logstash/util/SetOnceReference.java b/logstash-core/src/main/java/org/logstash/util/SetOnceReference.java
new file mode 100644
index 000000000..74ecf21e1
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/util/SetOnceReference.java
@@ -0,0 +1,289 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.util;
+
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+/**
+ * An object reference that may be set exactly once to a non-{@code null} value.
+ *
+ * <p>{@code SetOnceReference} is primarily intended as an alternative to
+ * {@link java.util.concurrent.atomic.AtomicReference} when a value is desired
+ * to be set exactly once.
+ *
+ * <p>Once the value has been set, this object becomes immutable.
+ * As such, all hot-paths of this implementation avoid volatile memory
+ * access on reads wherever possible.
+ *
+ * @param <T> the type of value
+ */
+public class SetOnceReference<T> {
+    private static final VarHandle VALUE;
+    static {
+        try {
+            MethodHandles.Lookup l = MethodHandles.lookup();
+            VALUE = l.findVarHandle(SetOnceReference.class, "value", Object.class);
+        } catch (ReflectiveOperationException e) {
+            throw new ExceptionInInitializerError(e);
+        }
+    }
+
+    @SuppressWarnings("unused") // exclusively accessed through VALUE VarHandle
+    private volatile T value;
+
+    private SetOnceReference() {
+    }
+
+    /**
+     * Returns a {@code SetOnceReference} instance whose value has NOT been set.
+     *
+     * @return an empty {@code SetOnceReference} instance
+     * @param <V> the value's type
+     */
+    public static <V> SetOnceReference<V> unset() {
+        return new SetOnceReference<>();
+    }
+
+    private SetOnceReference(final T value) {
+        if (Objects.nonNull(value)) {
+            VALUE.setRelease(this, value);
+        }
+    }
+
+    /**
+     * Returns a {@code SetOnceReference} instance whose value has already been set
+     * to the provided non-{@code null} value. The resulting instance is immutable.
+     *
+     * @param value a non-{@code null} value to hold
+     * @return a non-empty {@link SetOnceReference} instance
+     * @param <V> the value's type
+     */
+    public static <V> SetOnceReference<V> of(final V value) {
+        return new SetOnceReference<>(Objects.requireNonNull(value));
+    }
+
+    /**
+     * Returns a {@code SetOnceReference} instance whose value may or may not have
+     * already been set. If the provided value is non-{@code null}, then the resulting
+     * instance will be immutable.
+     *
+     * @param value a possibly-{@code null} value to hold
+     * @return a possibly-unset {@link SetOnceReference} instance
+     * @param <V> the value's type
+     */
+    public static <V> SetOnceReference<V> ofNullable(final V value) {
+        return new SetOnceReference<>(value);
+    }
+
+    /**
+     * @return true if the value has been previously set.
+     */
+    public boolean isSet() {
+        return Objects.nonNull(getPreferPlain());
+    }
+
+    /**
+     * If the value has been set, returns the value, otherwise throws
+     * {@code NoSuchElementException}.
+     *
+     * @return the non-{@code null} value
+     * @throws NoSuchElementException if the value has not been set
+     */
+    public T get() {
+        final T retrievedValue = this.getPreferPlain();
+        if (Objects.nonNull(retrievedValue)) { return retrievedValue; }
+
+        throw new NoSuchElementException("Value has not been set");
+    }
+
+    /**
+     * If the value has been set, returns the value, otherwise returns other
+     * without modifying the receiver.
+     *
+     * @param other the value to be returned if this value has not been set. May be {@code null}.
+     * @return the value, if set, otherwise other
+     */
+    public T orElse(final T other) {
+        final T retrievedValue = this.getPreferPlain();
+        if (Objects.isNull(retrievedValue)) {  return other; }
+        return retrievedValue;
+    }
+
+    /**
+     * @return an immutable {@link Optional} describing the current value.
+     */
+    public Optional<T> asOptional() {
+        return Optional.ofNullable(this.getPreferPlain());
+    }
+
+    /**
+     * Offer the proposed value, setting it if-and-only-if it has not yet been set.
+     *
+     * @param proposedValue a non-{@code null} proposed value
+     * @return true if-and-only-if our proposed value was accepted
+     */
+    public boolean offer(final T proposedValue) {
+        Objects.requireNonNull(proposedValue, "proposedValue");
+
+        return offer(() -> proposedValue);
+    }
+
+    /**
+     * Attempt to supply a new value if-and-only-if it is not set,
+     * avoiding volatile reads when possible
+     *
+     * @param supplier a side-effect-free supplier that may return {@code null}.
+     *                 In a race condition, this supplier may be called by multiple threads
+     *                 simultaneously, but the result of only one of those will be set
+     *
+     * @return true if-and-only-if the value we supplied was set
+     */
+    public boolean offer(final Supplier<T> supplier) {
+        Objects.requireNonNull(supplier, "supplier");
+
+        if (Objects.isNull(this.getPreferPlain())) {
+            final T proposedValue = supplier.get();
+            if (Objects.isNull(proposedValue)) { return false; }
+
+            return this.setValue(proposedValue);
+        }
+
+        return false;
+    }
+
+    /**
+     * Attempt to supply a new value if-and-only-if it is not set,
+     * avoiding volatile reads when possible, returning the value that has been set.
+     *
+     * @param proposedValue a proposed value to set
+     * @return the value that is set, which may differ from that which was offered.
+     */
+    public T offerAndGet(final T proposedValue) {
+        Objects.requireNonNull(proposedValue, "proposedValue");
+
+        return offerAndGet(() -> proposedValue);
+    }
+
+    /**
+     * Attempt to supply a new value if-and-only-if it is not set,
+     * avoiding volatile reads when possible.
+     *
+     * @param supplier a side-effect-free supplier that must not return {@code null}.
+     *                 In a race condition, this supplier may be called by multiple threads
+     *                 simultaneously, but the result of only one of those will be set
+     */
+    public T offerAndGet(final Supplier<T> supplier) {
+        Objects.requireNonNull(supplier, "supplier");
+
+        T retrievedValue = this.getPreferPlain();
+        if (Objects.nonNull(retrievedValue)) { return retrievedValue; }
+
+        final T proposedValue = Objects.requireNonNull(supplier.get());
+        if (this.setValue(proposedValue)) {  return proposedValue; }
+
+        return Objects.requireNonNull(this.getAcquire());
+    }
+
+    /**
+     * Attempt to supply a new value if-and-only-if it is not set,
+     * using a {@code Supplier} that may return {@code null},
+     * avoiding volatile reads when possible.
+     *
+     * @param supplier a side-effect-free supplier that may return {@code null}.
+     *                 In a race condition, this supplier may be called by multiple threads
+     *                 simultaneously, but the result of only one of those will be set
+     * @return an optional describing the value
+     */
+    public Optional<T> offerAndGetOptional(final Supplier<T> supplier) {
+        Objects.requireNonNull(supplier, "supplier");
+
+        final T retrievedValue = this.getPreferPlain();
+        if (Objects.nonNull(retrievedValue)) { return Optional.of(retrievedValue); }
+
+        final T proposedValue = supplier.get();
+        if (Objects.isNull(proposedValue)) { return Optional.empty(); }
+
+        if (this.setValue(proposedValue)) { return Optional.of(proposedValue); }
+
+        return Optional.of(this.getAcquire());
+    }
+
+    /**
+     * Consume the already-set value, or supply one.
+     * Supply a new value if-and-only-if it is not set, or else consume the value that has been set,
+     * avoiding volatile reads when possible.
+     *
+     * @param consumer consume the existing value if-and-only-if our thread did not
+     *                 successfully supply a new value.
+     * @param supplier a side-effect-free supplier that does not return {@code null}.
+     *                 In a race condition, this supplier may be called by multiple threads
+     *                 simultaneously, but the result of only one of those will be set
+     * @return true if-and-only-if the value we supplied was set
+     */
+    public boolean ifSetOrElseSupply(final Consumer<T> consumer, final Supplier<T> supplier) {
+        Objects.requireNonNull(supplier, "supplier");
+        Objects.requireNonNull(consumer, "consumer");
+
+        T existingValue = this.getPreferPlain();
+        if (Objects.isNull(existingValue)) {
+            final T proposedValue = Objects.requireNonNull(supplier.get());
+            if (this.setValue(proposedValue)) { return true; }
+
+            existingValue = this.getAcquire();
+        }
+
+        consumer.accept(existingValue);
+        return false;
+    }
+
+    /**
+     * @return the value, if set, otherwise {@code null}
+     */
+    @SuppressWarnings("unchecked")
+    private T getPreferPlain() {
+        final T existingValue = (T)VALUE.get(this);
+        if (Objects.nonNull(existingValue)) { return existingValue; }
+
+        return this.getAcquire();
+    }
+
+    /**
+     * @return the value, if set, using volatile read
+     */
+    private T getAcquire() {
+        //noinspection unchecked
+        return (T) VALUE.getAcquire(this);
+    }
+
+    /**
+     * Set the proposed value if-and-only-if the value has not been set.
+     * @param proposedValue a non-{@code null} proposed value
+     * @return true if-and-only-if this thread set the value.
+     */
+    private boolean setValue(final T proposedValue) {
+        return VALUE.compareAndSet(this, null, proposedValue);
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/util/TimeValue.java b/logstash-core/src/main/java/org/logstash/util/TimeValue.java
new file mode 100644
index 000000000..479f17b7e
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/util/TimeValue.java
@@ -0,0 +1,129 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.util;
+
+import org.logstash.RubyUtil;
+
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Express a period of time, expressing in numerical quantity and time unit, for example "3 seconds"
+ * */
+public class TimeValue {
+
+    public static TimeValue fromValue(Object value) {
+        if (value instanceof TimeValue) {
+            return (TimeValue) value;
+        }
+        if (value instanceof String) {
+            final String normalized = ((String) value).toLowerCase().trim();
+            if (normalized.endsWith("nanos")) {
+                return new TimeValue(parse(normalized, 5), TimeUnit.NANOSECONDS);
+            }
+            if (normalized.endsWith("micros")) {
+                return new TimeValue(parse(normalized, 6), TimeUnit.MICROSECONDS);
+            }
+            if (normalized.endsWith("ms")) {
+                return new TimeValue(parse(normalized, 2), TimeUnit.MILLISECONDS);
+            }
+            if (normalized.endsWith("s")) {
+                return new TimeValue(parse(normalized, 1), TimeUnit.SECONDS);
+            }
+            if (normalized.endsWith("m")) {
+                return new TimeValue(parse(normalized, 1), TimeUnit.MINUTES);
+            }
+            if (normalized.endsWith("h")) {
+                return new TimeValue(parse(normalized, 1), TimeUnit.HOURS);
+            }
+            if (normalized.endsWith("d")) {
+                return new TimeValue(parse(normalized, 1), TimeUnit.DAYS);
+            }
+            if (normalized.matches("^-0*1")) {
+                return new TimeValue(-1, TimeUnit.NANOSECONDS);
+            }
+            throw RubyUtil.RUBY.newArgumentError("invalid time unit: \"" + value + "\"");
+        }
+        throw RubyUtil.RUBY.newArgumentError("value is not a string: " + value + " [" + value.getClass().getName() + "]");
+    }
+
+    private static int parse(String value, int suffix) {
+        final String numericPart = value.substring(0, value.length() - suffix).trim();
+        try {
+            return Integer.parseInt(numericPart);
+        } catch (NumberFormatException ex) {
+            throw RubyUtil.RUBY.newArgumentError("invalid value for Integer(): \"" + numericPart + "\"");
+        }
+    }
+
+    private final long duration;
+    private final TimeUnit timeUnit;
+
+    /**
+     * @param duration number of timeUnit
+     * @param timeUnit could be one of nanosecond, microsecond, millisecond, second, minute, hour, day, nanosecond
+     * */
+    public TimeValue(int duration, String timeUnit) {
+        this(duration, TimeUnit.valueOf((timeUnit + "s").toUpperCase()));
+    }
+
+    protected TimeValue(long duration, TimeUnit timeUnit) {
+        this.duration = duration;
+        this.timeUnit = timeUnit;
+    }
+
+    public long getDuration() {
+        return duration;
+    }
+
+    public String getTimeUnit() {
+        final String value = timeUnit.toString();
+        return value.substring(0, value.length() - 1); // remove last "s"
+    }
+
+    public long toNanos() {
+        return timeUnit.toNanos(duration);
+    }
+
+    public long toSeconds() {
+        return timeUnit.toSeconds(duration);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        TimeValue timeValue = (TimeValue) o;
+        return (duration == timeValue.duration &&
+                timeUnit == timeValue.timeUnit) || (this.toNanos() == timeValue.toNanos());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(duration, timeUnit);
+    }
+
+    @Override
+    public String toString() {
+        return "TimeValue{" +
+                "duration=" + duration +
+                ", timeUnit=" + timeUnit +
+                '}';
+    }
+}
diff --git a/logstash-core/src/main/java/org/logstash/util/UtilExt.java b/logstash-core/src/main/java/org/logstash/util/UtilExt.java
new file mode 100644
index 000000000..41b3825a4
--- /dev/null
+++ b/logstash-core/src/main/java/org/logstash/util/UtilExt.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.util;
+
+import org.jruby.RubyThread;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.anno.JRubyModule;
+import org.jruby.runtime.Block;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+
+/**
+ * Utility methods class
+ * */
+@JRubyModule(name = "Util") // LogStash::Util
+public class UtilExt {
+
+    @JRubyMethod(module = true)
+    @SuppressWarnings("deprecation")
+    public static IRubyObject get_thread_id(final ThreadContext context, IRubyObject self, IRubyObject thread) {
+        if (!(thread instanceof RubyThread)) {
+            throw context.runtime.newTypeError(thread, context.runtime.getThread());
+        }
+        final Thread javaThread = ((RubyThread) thread).getNativeThread(); // weak-reference
+        // even if thread is dead the RubyThread instance might stick around while the Java thread
+        // instance already could have been garbage collected - let's return nil for dead meat :
+        // JTODO getId has been deprecated in JDK 19, when JDK 21 is the target version use threadId() instead
+        return javaThread == null ? context.nil : context.runtime.newFixnum(javaThread.getId());
+    }
+
+    @JRubyMethod(module = true)
+    public static IRubyObject get_thread_name(final ThreadContext context, IRubyObject self, IRubyObject thread) {
+        if (!(thread instanceof RubyThread)) {
+            throw context.runtime.newTypeError(thread, context.runtime.getThread());
+        }
+        final Thread javaThread = ((RubyThread) thread).getNativeThread(); // weak-reference
+        // even if thread is dead the RubyThread instance might stick around while the Java thread
+        // instance already could have been garbage collected - let's return nil for dead meat :
+        return javaThread == null ? context.nil : context.runtime.newString(javaThread.getName());
+    }
+
+    @JRubyMethod(module = true) // JRuby.reference(target).synchronized { ... }
+    public static IRubyObject synchronize(final ThreadContext context, IRubyObject self, IRubyObject target, Block block) {
+        synchronized (target) {
+            return block.yieldSpecific(context);
+        }
+    }
+
+}
diff --git a/logstash-core/src/main/resources/log4j2.properties b/logstash-core/src/main/resources/log4j2.properties
index 2fa707c6a..6e6cbc3e7 100644
--- a/logstash-core/src/main/resources/log4j2.properties
+++ b/logstash-core/src/main/resources/log4j2.properties
@@ -9,3 +9,6 @@ appender.console.layout.pattern = [%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %c
 rootLogger.level = error
 rootLogger.appenderRefs = stdout
 rootLogger.appenderRef.stdout.ref = STDOUT
+
+logger.pqrepair.name = org.logstash.ackedqueue.PqRepair
+logger.pqrepair.level = info
\ No newline at end of file
diff --git a/logstash-core/src/main/resources/org/logstash/plugins/AliasRegistry.yml b/logstash-core/src/main/resources/org/logstash/plugins/AliasRegistry.yml
new file mode 100644
index 000000000..39ab241a6
--- /dev/null
+++ b/logstash-core/src/main/resources/org/logstash/plugins/AliasRegistry.yml
@@ -0,0 +1,10 @@
+input:
+  - alias: elastic_agent
+    from: beats
+    docs:
+      - replace: ":plugin: beats"
+        with: ":plugin: elastic_agent"
+      - replace: ":plugin-uc: Beats"
+        with: ":plugin-uc: Elastic Agent"
+      - replace: ":plugin-singular: Beat"
+        with: ":plugin-singular: Elastic Agent"
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/AccessorsTest.java b/logstash-core/src/test/java/org/logstash/AccessorsTest.java
index 34751a0b8..272dc15e7 100644
--- a/logstash-core/src/test/java/org/logstash/AccessorsTest.java
+++ b/logstash-core/src/test/java/org/logstash/AccessorsTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import java.io.Serializable;
@@ -12,7 +32,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class AccessorsTest {
+public class AccessorsTest extends RubyTestBase {
 
     @Test
     public void testBareGet() throws Exception {
diff --git a/logstash-core/src/test/java/org/logstash/ClonerTest.java b/logstash-core/src/test/java/org/logstash/ClonerTest.java
index 3db559182..83827b204 100644
--- a/logstash-core/src/test/java/org/logstash/ClonerTest.java
+++ b/logstash-core/src/test/java/org/logstash/ClonerTest.java
@@ -1,11 +1,34 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import org.jruby.RubyString;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.ByteList;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
 
-public class ClonerTest {
+public class ClonerTest extends RubyTestBase {
     @Test
     public void testRubyStringCloning() {
         String javaString = "fooBar";
@@ -13,14 +36,61 @@ public class ClonerTest {
 
         RubyString result = Cloner.deep(original);
         // Check object identity
-        assertTrue(result != original);
-
-        // Check different underlying bytes
-        assertTrue(result.getByteList() != original.getByteList());
-
+        assertNotSame(original, result);
         // Check string equality
-        assertEquals(result, original);
+        assertEquals(original, result);
 
         assertEquals(javaString, result.asJavaString());
     }
+
+    @Test
+    public void testRubyStringCloningAndAppend() {
+        String javaString = "fooBar";
+        RubyString original = RubyString.newString(RubyUtil.RUBY, javaString);
+
+        RubyString result = Cloner.deep(original);
+
+        result.append(RubyUtil.RUBY.newString("X"));
+
+        assertNotEquals(result, original);
+
+        ThreadContext context = RubyUtil.RUBY.getCurrentContext();
+        assertTrue(original.op_equal(context, RubyString.newString(RubyUtil.RUBY, javaString)).isTrue());
+        assertEquals(javaString, original.asJavaString());
+    }
+
+    @Test
+    public void testRubyStringCloningAndChangeOriginal() {
+        String javaString = "fooBar";
+        RubyString original = RubyString.newString(RubyUtil.RUBY, javaString);
+
+        RubyString result = Cloner.deep(original);
+
+        ThreadContext context = RubyUtil.RUBY.getCurrentContext();
+        IRubyObject index = RubyUtil.RUBY.newFixnum(5);
+        original.op_aset(context, index, RubyUtil.RUBY.newString("z")); // original[5] = 'z'
+
+        assertNotEquals(result, original);
+
+        assertTrue(result.op_equal(context, RubyString.newString(RubyUtil.RUBY, javaString)).isTrue());
+        assertEquals(javaString, result.asJavaString());
+        assertEquals("fooBaz", original.asJavaString());
+    }
+
+    @Test // @Tag("Performance Optimization")
+    public void testRubyStringCloningMemoryOptimization() {
+        ByteList bytes = ByteList.create("0123456789");
+        RubyString original = RubyString.newString(RubyUtil.RUBY, bytes);
+
+        RubyString result = Cloner.deep(original);
+        assertNotSame(original, result);
+
+        assertSame(bytes, original.getByteList());
+        // NOTE: this is an implementation detail or the underlying sharing :
+        assertSame(bytes, result.getByteList()); // bytes-list shared
+
+        // but when string is modified it will stop using the same byte container
+        result.concat(RubyUtil.RUBY.getCurrentContext(), RubyUtil.RUBY.newString(" "));
+        assertNotSame(bytes, result.getByteList()); // byte-list copied on write
+    }
 }
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/ConvertedMapTest.java b/logstash-core/src/test/java/org/logstash/ConvertedMapTest.java
index e9da6c394..14224ab12 100644
--- a/logstash-core/src/test/java/org/logstash/ConvertedMapTest.java
+++ b/logstash-core/src/test/java/org/logstash/ConvertedMapTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import static org.junit.Assert.*;
diff --git a/logstash-core/src/test/java/org/logstash/DLQEntryTest.java b/logstash-core/src/test/java/org/logstash/DLQEntryTest.java
index f56dec1d7..bd15ebea5 100644
--- a/logstash-core/src/test/java/org/logstash/DLQEntryTest.java
+++ b/logstash-core/src/test/java/org/logstash/DLQEntryTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -28,7 +48,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertNotNull;
 
-public class DLQEntryTest {
+public class DLQEntryTest extends RubyTestBase {
     @Test
     public void testConstruct() throws Exception {
         Event event = new Event(Collections.singletonMap("key", "value"));
diff --git a/logstash-core/src/test/java/org/logstash/EventTest.java b/logstash-core/src/test/java/org/logstash/EventTest.java
index d823d6dbf..e93088d77 100644
--- a/logstash-core/src/test/java/org/logstash/EventTest.java
+++ b/logstash-core/src/test/java/org/logstash/EventTest.java
@@ -1,5 +1,31 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
+import org.jruby.RubyString;
+import org.jruby.RubySymbol;
+import org.jruby.RubyTime;
+import org.jruby.java.proxies.ConcreteJavaProxy;
+import org.junit.Test;
+
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -10,11 +36,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.jruby.RubyString;
-import org.jruby.RubySymbol;
-import org.jruby.RubyTime;
-import org.jruby.java.proxies.ConcreteJavaProxy;
-import org.junit.Test;
 
 import static net.javacrumbs.jsonunit.JsonAssert.assertJsonEquals;
 import static org.hamcrest.CoreMatchers.is;
@@ -24,7 +45,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public final class EventTest {
+public final class EventTest extends RubyTestBase {
 
     @Test
     public void queueableInterfaceRoundTrip() throws Exception {
@@ -136,6 +157,21 @@ public final class EventTest {
         assertJsonEquals("{\"@timestamp\":\"" + e.getTimestamp().toString() + "\",\"foo\":\"bar\",\"@version\":\"1\"}", e.toJson());
     }
 
+    @Test
+    public void testFieldThatIsNotAValidNestedFieldReference() throws Exception {
+        Map<String, Object> data = new HashMap<>();
+        data.put("this[key]", "value");
+        final Event e = new Event(data);
+        assertJsonEquals("{\"@timestamp\":\"" + e.getTimestamp().toString() + "\",\"this[key]\":\"value\",\"@version\":\"1\"}", e.toJson());
+    }
+    @Test
+    public void testFieldThatLooksLikeAValidNestedFieldReference() throws Exception {
+        Map<String, Object> data = new HashMap<>();
+        data.put("[deeply][nested][field]", "value");
+        final Event e = new Event(data);
+        assertJsonEquals("{\"@timestamp\":\"" + e.getTimestamp().toString() + "\",\"[deeply][nested][field]\":\"value\",\"@version\":\"1\"}", e.toJson());
+    }
+
     @Test
     public void testSimpleIntegerFieldToJson() throws Exception {
         Map<String, Object> data = new HashMap<>();
@@ -453,4 +489,80 @@ public final class EventTest {
         assertEquals(list, Arrays.asList("hello"));
 
     }
+
+    @Test
+    public void removeMetadataField() {
+        final Event event = new Event();
+        final Map<String, Object> metadata = new HashMap<>();
+        metadata.put("foo", "bar");
+        event.setField("@metadata", metadata);
+
+        final RubyString s = (RubyString)event.remove("[@metadata][foo]");
+        assertEquals(s.toString(), "bar");
+
+        assertFalse(event.includes("[@metadata][foo]"));
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void removeMetadata() {
+        final Event event = new Event();
+        final Map<String, Object> metadata = new HashMap<>();
+        metadata.put("foo", "bar");
+        event.setField("@metadata", metadata);
+
+        final Map<String, Object> m = (Map)(event.remove("[@metadata]"));
+        assertEquals(m.get("foo"), "bar");
+
+        assertTrue(event.getMetadata().isEmpty());
+        assertFalse(event.includes("[@metadata][foo]"));
+    }
+
+    @Test(expected = Event.InvalidTagsTypeException.class)
+    public void setTagsWithMapShouldThrow() {
+        final Event event = new Event();
+        event.setField("[tags][foo]", "bar");
+    }
+
+    @Test
+    public void createEventWithTagsWithMapShouldRename() {
+        final Event event = new Event(Map.of("tags", Map.of("poison", "true")));
+
+        assertEquals(event.getField(Event.TAGS), Collections.singletonList(Event.TAGS_FAILURE_TAG));
+        assertEquals(event.getField("[_tags][0][poison]"), "true");
+    }
+
+    @Test(expected = Event.InvalidTagsTypeException.class)
+    public void setTagsWithNumberShouldThrow() {
+        final Event event = new Event();
+        event.setField("[tags]", 123L);
+    }
+
+    @Test
+    public void allowTopLevelTagsString() {
+        final Event event = new Event();
+        event.setField("[tags]", "bar");
+
+        assertNull(event.getField(Event.TAGS_FAILURE));
+        assertEquals(event.getField("[tags]"), "bar");
+        
+        event.setField("[tags]", "foo");
+        assertEquals(event.getField("[tags]"), "foo");
+    }
+
+    @Test
+    public void createEventWithoutTagShouldHaveEmptyTags() {
+        final Event event = new Event(Map.of("world", "cup"));
+        assertNull(event.getField(Event.TAGS));
+        assertNull(event.getField(Event.TAGS_FAILURE));
+    }
+    
+    @Test
+    public void allowTopLevelTagsListOfStrings() {
+        final Event event = new Event();
+        event.setField("[tags]", List.of("foo", "bar"));
+
+        assertNull(event.getField(Event.TAGS_FAILURE));
+        assertEquals(event.getField("[tags]"), List.of("foo", "bar"));
+    }
 }
diff --git a/logstash-core/src/test/java/org/logstash/FieldReferenceTest.java b/logstash-core/src/test/java/org/logstash/FieldReferenceTest.java
index 687bb6f8e..1a63e238d 100644
--- a/logstash-core/src/test/java/org/logstash/FieldReferenceTest.java
+++ b/logstash-core/src/test/java/org/logstash/FieldReferenceTest.java
@@ -1,166 +1,312 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import java.lang.reflect.Field;
+import java.util.List;
 import java.util.Map;
 import org.hamcrest.CoreMatchers;
+import org.jruby.RubyString;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+        FieldReferenceTest.EscapeNone.class,
+        FieldReferenceTest.EscapePercent.class,
+        FieldReferenceTest.EscapeAmpersand.class,
+})
 public final class FieldReferenceTest {
+    private static abstract class Base extends RubyTestBase {
+        public abstract String getEscapeMode();
 
-    @SuppressWarnings("unchecked")
-    @Before
-    public void clearParsingCache() throws Exception {
-        final Field cacheField = FieldReference.class.getDeclaredField("CACHE");
-        cacheField.setAccessible(true);
-        final Map<CharSequence, FieldReference> cache =
-                (Map<CharSequence, FieldReference>) cacheField.get(null);
-        cache.clear();
-    }
-
-    @SuppressWarnings("unchecked")
-    @Before
-    public void clearDedupCache() throws Exception  {
-        final Field cacheField = FieldReference.class.getDeclaredField("DEDUP");
-        cacheField.setAccessible(true);
-        final Map<CharSequence, FieldReference> cache =
-                (Map<CharSequence, FieldReference>) cacheField.get(null);
-        cache.clear();
-    }
-
-    @Test
-    public void deduplicatesTimestamp() throws Exception {
-        assertTrue(FieldReference.from("@timestamp") == FieldReference.from("[@timestamp]"));
-    }
-
-    @Test
-    public void testParseEmptyString() {
-        final FieldReference emptyReference = FieldReference.from("");
-        assertNotNull(emptyReference);
-        assertEquals(
-                emptyReference, FieldReference.from(RubyUtil.RUBY.newString(""))
-        );
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test
-    public void testCacheUpperBound() throws NoSuchFieldException, IllegalAccessException {
-        final Field cacheField = FieldReference.class.getDeclaredField("CACHE");
-        cacheField.setAccessible(true);
-        final Map<CharSequence, FieldReference> cache =
-                (Map<CharSequence, FieldReference>) cacheField.get(null);
-        final int initial = cache.size();
-        for (int i = 0; i < 10_001 - initial; ++i) {
-            FieldReference.from(String.format("[array][%d]", i));
+        @Before
+        public void overrideGlobalEscapeMode() {
+            FieldReference.setEscapeStyle(getEscapeMode());
+        }
+        @After
+        public void restoreGlobalEscapeMode() {
+            // Default value for `config.field_reference.escape_style`
+            FieldReference.setEscapeStyle("none");
+        }
+
+        @Before
+        @After
+        public void clearInternalCaches() {
+            getInternalCache("CACHE").clear();
+            getInternalCache("DEDUP").clear();
+            getInternalCache("RUBY_CACHE").clear();
+        }
+
+        @Test
+        public void deduplicatesTimestamp() throws Exception {
+            assertTrue(FieldReference.from("@timestamp") == FieldReference.from("[@timestamp]"));
+        }
+
+        @Test
+        public void testParseEmptyString() {
+            final FieldReference emptyReference = FieldReference.from("");
+            assertNotNull(emptyReference);
+            assertEquals(
+                    emptyReference, FieldReference.from(RubyUtil.RUBY.newString(""))
+            );
+        }
+
+        @Test
+        public void testCacheUpperBound() {
+            final Map<String, FieldReference> cache = getInternalCache("CACHE");
+            final int initial = cache.size();
+            for (int i = 0; i < 10_001 - initial; ++i) {
+                FieldReference.from(String.format("[array][%d]", i));
+            }
+            assertThat(cache.size(), CoreMatchers.is(10_000));
+        }
+
+        @Test
+        public void testRubyCacheUpperBound() {
+            final Map<RubyString, FieldReference> cache = getInternalCache("RUBY_CACHE");
+            final int initial = cache.size();
+            for (int i = 0; i < 10_050 - initial; ++i) {
+                final RubyString rubyString = RubyUtil.RUBY.newString(String.format("[array][%d]", i));
+                FieldReference.from(rubyString);
+            }
+            assertThat(cache.size(), CoreMatchers.is(10_000));
+        }
+
+        @Test
+        public void testParseSingleBareField() throws Exception {
+            FieldReference f = FieldReference.from("foo");
+            assertEquals(0, f.getPath().length);
+            assertEquals("foo", f.getKey());
+        }
+
+        @Test
+        public void testParseSingleFieldPath() throws Exception {
+            FieldReference f = FieldReference.from("[foo]");
+            assertEquals(0, f.getPath().length);
+            assertEquals("foo", f.getKey());
+        }
+
+        @Test
+        public void testParse2FieldsPath() throws Exception {
+            FieldReference f = FieldReference.from("[foo][bar]");
+            assertArrayEquals(new String[]{"foo"}, f.getPath());
+            assertEquals("bar", f.getKey());
+        }
+
+        @Test
+        public void testParse3FieldsPath() throws Exception {
+            FieldReference f = FieldReference.from("[foo][bar][baz]");
+            assertArrayEquals(new String[]{"foo", "bar"}, f.getPath());
+            assertEquals("baz", f.getKey());
+        }
+
+        @Test
+        public void testEmbeddedSingleReference() throws Exception {
+            FieldReference f = FieldReference.from("[[foo]][bar]");
+            assertArrayEquals(new String[]{"foo"}, f.getPath());
+            assertEquals("bar", f.getKey());
+        }
+
+        @Test
+        public void testEmbeddedDeepReference() throws Exception {
+            FieldReference f = FieldReference.from("[[foo][bar]][baz]");
+            assertArrayEquals(new String[]{"foo", "bar"}, f.getPath());
+            assertEquals("baz", f.getKey());
+        }
+
+        @Test
+        public void testParseMetadataParent() throws Exception {
+            FieldReference f = FieldReference.from("[@metadata]");
+            assertEquals(0, f.getPath().length);
+            assertEquals("@metadata", f.getKey());
+            assertEquals(FieldReference.META_PARENT, f.type());
+        }
+
+        @Test
+        public void testParseMetadataChild() throws Exception {
+            FieldReference f = FieldReference.from("[@metadata][nested][field]");
+            assertEquals(1, f.getPath().length);
+            assertEquals("field", f.getKey());
+            assertEquals(FieldReference.META_CHILD, f.type());
+        }
+
+        @Test(expected = FieldReference.IllegalSyntaxException.class)
+        public void testParseInvalidEmbeddedDeepReference() throws Exception {
+            FieldReference f = FieldReference.from("[[foo][bar]nope][baz]");
+        }
+
+        @Test(expected = FieldReference.IllegalSyntaxException.class)
+        public void testParseInvalidEmbeddedDeepReference2() throws Exception {
+            FieldReference f = FieldReference.from("[nope[foo][bar]][baz]");
+        }
+
+        @Test(expected = FieldReference.IllegalSyntaxException.class)
+        public void testParseInvalidNoCloseBracket() throws Exception {
+            FieldReference.from("[foo][bar][baz");
+        }
+
+        @Test(expected = FieldReference.IllegalSyntaxException.class)
+        public void testParseInvalidNoInitialOpenBracket() throws Exception {
+            FieldReference.from("foo[bar][baz]");
+        }
+
+        @Test(expected = FieldReference.IllegalSyntaxException.class)
+        public void testParseInvalidMissingMiddleBracket() throws Exception {
+            FieldReference.from("[foo]bar[baz]");
+        }
+
+        @Test(expected = FieldReference.IllegalSyntaxException.class)
+        public void testParseInvalidOnlyOpenBracket() throws Exception {
+            FieldReference.from("[");
+        }
+
+        @Test(expected = FieldReference.IllegalSyntaxException.class)
+        public void testParseInvalidOnlyCloseBracket() throws Exception {
+            FieldReference.from("]");
+        }
+
+        @Test(expected = FieldReference.IllegalSyntaxException.class)
+        public void testParseInvalidLotsOfOpenBrackets() throws Exception {
+            FieldReference.from("[[[[[[[[[[[]");
+        }
+
+        @Test(expected = FieldReference.IllegalSyntaxException.class)
+        public void testParseInvalidDoubleCloseBrackets() throws Exception {
+            FieldReference.from("[foo]][bar]");
+        }
+
+        @Test(expected = FieldReference.IllegalSyntaxException.class)
+        public void testParseNestingSquareBrackets() throws Exception {
+            FieldReference.from("[this[is]terrible]");
+        }
+
+        @Test(expected = FieldReference.IllegalSyntaxException.class)
+        public void testParseChainedNestingSquareBrackets() throws Exception {
+            FieldReference.from("[this[is]terrible][and][it[should-not[work]]]");
+        }
+
+        @Test(expected = FieldReference.IllegalSyntaxException.class)
+        public void testParseLiteralSquareBrackets() throws Exception {
+            FieldReference.from("this[index]");
+        }
+
+        @SuppressWarnings("unchecked")
+        private <K, V> Map<K, V> getInternalCache(final String fieldName) {
+            final Field cacheField;
+            try {
+                cacheField = FieldReference.class.getDeclaredField(fieldName);
+                cacheField.setAccessible(true);
+                return (Map<K, V>) cacheField.get(null);
+            } catch (NoSuchFieldException | IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
         }
-        assertThat(cache.size(), CoreMatchers.is(10_000));
     }
 
-    @Test
-    public void testParseSingleBareField() throws Exception {
-        FieldReference f = FieldReference.from("foo");
-        assertEquals(0, f.getPath().length);
-        assertEquals("foo", f.getKey());
+    public static class EscapeNone extends Base {
+
+        @Override
+        public String getEscapeMode() {
+            return "none";
+        }
     }
 
-    @Test
-    public void testParseSingleFieldPath() throws Exception {
-        FieldReference f = FieldReference.from("[foo]");
-        assertEquals(0, f.getPath().length);
-        assertEquals("foo", f.getKey());
+    public static class EscapePercent extends Base {
+
+        @Override
+        public String getEscapeMode() {
+            return "percent";
+        }
+
+        @Test
+        public void testReadFieldWithSquareBracketLiteralsInPath() {
+            final FieldReference fr = FieldReference.from("[foo][bar%5Bbingo%5D][okay]");
+            assertEquals(2, fr.getPath().length);
+            assertEquals("foo", fr.getPath()[0]);
+            assertEquals("bar[bingo]", fr.getPath()[1]);
+            assertEquals("okay", fr.getKey());
+        }
+
+        @Test
+        public void testReadFieldWithSquareBracketLiteralsInKey() {
+            final FieldReference fr = FieldReference.from("[foo][okay][bar%5Bbingo%5D]");
+            assertEquals(2, fr.getPath().length);
+            assertEquals("foo", fr.getPath()[0]);
+            assertEquals("okay", fr.getPath()[1]);
+            assertEquals("bar[bingo]", fr.getKey());
+        }
+
+        @Test
+        public void testReadFieldWithPercentLiteralInKey() {
+            final FieldReference fr = FieldReference.from("[foo][bar][95%]");
+            assertEquals(2, fr.getPath().length);
+            assertEquals("foo", fr.getPath()[0]);
+            assertEquals("bar", fr.getPath()[1]);
+            assertEquals("95%", fr.getKey());
+        }
     }
 
-    @Test
-    public void testParse2FieldsPath() throws Exception {
-        FieldReference f = FieldReference.from("[foo][bar]");
-        assertArrayEquals(new String[]{"foo"}, f.getPath());
-        assertEquals("bar", f.getKey());
-    }
+    public static class EscapeAmpersand extends Base {
 
-    @Test
-    public void testParse3FieldsPath() throws Exception {
-        FieldReference f = FieldReference.from("[foo][bar][baz]");
-        assertArrayEquals(new String[]{"foo", "bar"}, f.getPath());
-        assertEquals("baz", f.getKey());
-    }
+        @Override
+        public String getEscapeMode() {
+            return "ampersand";
+        }
 
-    @Test
-    public void testEmbeddedSingleReference() throws Exception {
-        FieldReference f = FieldReference.from("[[foo]][bar]");
-        assertArrayEquals(new String[]{"foo"}, f.getPath());
-        assertEquals("bar", f.getKey());
-    }
 
-    @Test
-    public void testEmbeddedDeepReference() throws Exception {
-        FieldReference f = FieldReference.from("[[foo][bar]][baz]");
-        assertArrayEquals(new String[]{"foo", "bar"}, f.getPath());
-        assertEquals("baz", f.getKey());
-    }
+        @Test
+        public void testReadFieldWithSquareBracketLiteralsInPath() {
+            final FieldReference fr = FieldReference.from("[foo][bar&#91;bingo&#93;][okay]");
+            assertEquals(2, fr.getPath().length);
+            assertEquals("foo", fr.getPath()[0]);
+            assertEquals("bar[bingo]", fr.getPath()[1]);
+            assertEquals("okay", fr.getKey());
+        }
 
-    @Test(expected=FieldReference.IllegalSyntaxException.class)
-    public void testParseInvalidEmbeddedDeepReference() throws Exception {
-        FieldReference f = FieldReference.from("[[foo][bar]nope][baz]");
-    }
+        @Test
+        public void testReadFieldWithSquareBracketLiteralsInKey() {
+            final FieldReference fr = FieldReference.from("[foo][okay][bar&#91;bingo&#93;]");
+            assertEquals(2, fr.getPath().length);
+            assertEquals("foo", fr.getPath()[0]);
+            assertEquals("okay", fr.getPath()[1]);
+            assertEquals("bar[bingo]", fr.getKey());
+        }
 
-    @Test(expected=FieldReference.IllegalSyntaxException.class)
-    public void testParseInvalidEmbeddedDeepReference2() throws Exception {
-        FieldReference f = FieldReference.from("[nope[foo][bar]][baz]");
-    }
-
-    @Test(expected=FieldReference.IllegalSyntaxException.class)
-    public void testParseInvalidNoCloseBracket() throws Exception {
-        FieldReference.from("[foo][bar][baz");
-    }
-
-    @Test(expected=FieldReference.IllegalSyntaxException.class)
-    public void testParseInvalidNoInitialOpenBracket() throws Exception {
-        FieldReference.from("foo[bar][baz]");
-    }
-
-    @Test(expected=FieldReference.IllegalSyntaxException.class)
-    public void testParseInvalidMissingMiddleBracket() throws Exception {
-        FieldReference.from("[foo]bar[baz]");
-    }
-
-    @Test(expected=FieldReference.IllegalSyntaxException.class)
-    public void testParseInvalidOnlyOpenBracket() throws Exception {
-        FieldReference.from("[");
-    }
-
-    @Test(expected=FieldReference.IllegalSyntaxException.class)
-    public void testParseInvalidOnlyCloseBracket() throws Exception {
-        FieldReference.from("]");
-    }
-
-    @Test(expected=FieldReference.IllegalSyntaxException.class)
-    public void testParseInvalidLotsOfOpenBrackets() throws Exception {
-        FieldReference.from("[[[[[[[[[[[]");
-    }
-
-    @Test(expected=FieldReference.IllegalSyntaxException.class)
-    public void testParseInvalidDoubleCloseBrackets() throws Exception {
-        FieldReference.from("[foo]][bar]");
-    }
-
-    @Test(expected=FieldReference.IllegalSyntaxException.class)
-    public void testParseNestingSquareBrackets() throws Exception {
-        FieldReference.from("[this[is]terrible]");
-    }
-
-    @Test(expected=FieldReference.IllegalSyntaxException.class)
-    public void testParseChainedNestingSquareBrackets() throws Exception {
-        FieldReference.from("[this[is]terrible][and][it[should-not[work]]]");
-    }
-
-    @Test(expected=FieldReference.IllegalSyntaxException.class)
-    public void testParseLiteralSquareBrackets() throws Exception {
-        FieldReference.from("this[index]");
+        @Test
+        public void testReadFieldWithAmpersandLiteralInKey() {
+            final FieldReference fr = FieldReference.from("[foo][bar][this&that]");
+            assertEquals(2, fr.getPath().length);
+            assertEquals("foo", fr.getPath()[0]);
+            assertEquals("bar", fr.getPath()[1]);
+            assertEquals("this&that", fr.getKey());
+        }
     }
 }
diff --git a/logstash-core/src/test/java/org/logstash/FileLockFactoryMain.java b/logstash-core/src/test/java/org/logstash/FileLockFactoryMain.java
index 84aa5bc2e..97b3307a1 100644
--- a/logstash-core/src/test/java/org/logstash/FileLockFactoryMain.java
+++ b/logstash-core/src/test/java/org/logstash/FileLockFactoryMain.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import java.io.IOException;
diff --git a/logstash-core/src/test/java/org/logstash/FileLockFactoryTest.java b/logstash-core/src/test/java/org/logstash/FileLockFactoryTest.java
index bf7e88a6e..a29276fd4 100644
--- a/logstash-core/src/test/java/org/logstash/FileLockFactoryTest.java
+++ b/logstash-core/src/test/java/org/logstash/FileLockFactoryTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import java.nio.file.Path;
diff --git a/logstash-core/src/test/java/org/logstash/JavafierTest.java b/logstash-core/src/test/java/org/logstash/JavafierTest.java
index d93ee6b51..8ed3de0af 100644
--- a/logstash-core/src/test/java/org/logstash/JavafierTest.java
+++ b/logstash-core/src/test/java/org/logstash/JavafierTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import org.jruby.RubyBignum;
@@ -6,7 +26,7 @@ import org.junit.Test;
 import java.math.BigInteger;
 import static org.junit.Assert.assertEquals;
 
-public class JavafierTest {
+public class JavafierTest extends RubyTestBase {
 
     @Test
     public void testRubyBignum() {
diff --git a/logstash-core/src/test/java/org/logstash/KeyNodeTest.java b/logstash-core/src/test/java/org/logstash/KeyNodeTest.java
index df9a0243c..c4b1a00e6 100644
--- a/logstash-core/src/test/java/org/logstash/KeyNodeTest.java
+++ b/logstash-core/src/test/java/org/logstash/KeyNodeTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import org.junit.Test;
diff --git a/logstash-core/src/test/java/org/logstash/ObjectMappersTest.java b/logstash-core/src/test/java/org/logstash/ObjectMappersTest.java
new file mode 100644
index 000000000..ad30631e7
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/ObjectMappersTest.java
@@ -0,0 +1,73 @@
+package org.logstash;
+
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ser.BeanSerializerFactory;
+import com.fasterxml.jackson.databind.ser.Serializers;
+import com.fasterxml.jackson.databind.type.TypeFactory;
+import org.jruby.RubyBasicObject;
+import org.junit.Test;
+import org.logstash.log.RubyBasicObjectSerializer;
+
+import java.util.LinkedList;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.logstash.ObjectMappers.RUBY_BASIC_OBJECT_SERIALIZERS_MODULE_ID;
+import static org.logstash.ObjectMappers.RUBY_SERIALIZERS_MODULE_ID;
+
+public class ObjectMappersTest {
+
+    @Test
+    public void testLog4jOMRegisterRubySerializersModule() {
+        assertTrue(ObjectMappers.LOG4J_JSON_MAPPER.getRegisteredModuleIds().contains(RUBY_SERIALIZERS_MODULE_ID));
+    }
+
+    @Test
+    public void testLog4jOMRegisterRubyBasicObjectSerializersModule() {
+        assertTrue(ObjectMappers.LOG4J_JSON_MAPPER.getRegisteredModuleIds().contains(RUBY_BASIC_OBJECT_SERIALIZERS_MODULE_ID));
+    }
+
+    @Test
+    public void testLog4jOMRegisterRubyBasicObjectSerializersFirst() {
+        final ObjectMapper mapper = ObjectMappers.LOG4J_JSON_MAPPER;
+        final BeanSerializerFactory factory = (BeanSerializerFactory) mapper.getSerializerFactory();
+
+        final LinkedList<Serializers> list = new LinkedList<>();
+        for (Serializers serializer : factory.getFactoryConfig().serializers()) {
+            list.add(serializer);
+        }
+
+        // RubyBasicObjectSerializer + Log4jJsonModule
+        assertTrue(list.size() > 1);
+
+        final Serializers rubyBasicObjectSerializer = list.get(list.size() - 2);
+        final JavaType valueType = TypeFactory.defaultInstance().constructType(RubyBasicObject.class);
+        final JsonSerializer<?> found = rubyBasicObjectSerializer.findSerializer(mapper.getSerializationConfig(), valueType, null);
+
+        assertNotNull(found);
+        assertTrue("RubyBasicObjectSerializer must be registered before others non-default serializers", found instanceof RubyBasicObjectSerializer);
+    }
+
+    @Test
+    public void testStreamReadConstraintsGlobalDefaults() {
+        // if the statically-initialized stream read constraints are NOT the global default, then the
+        // subsequently-initialized mappers themselves will not necessarily have the configured constraints.
+        assertThatCode(ObjectMappers.CONFIGURED_STREAM_READ_CONSTRAINTS::validateIsGlobalDefault).doesNotThrowAnyException();
+    }
+
+    @Test
+    public void testStreamReadConstraintsAppliedToCBORMapper() {
+        assertThat(ObjectMappers.CBOR_MAPPER.getFactory().streamReadConstraints())
+                .satisfies(ObjectMappers.CONFIGURED_STREAM_READ_CONSTRAINTS::validate);
+    }
+
+    @Test
+    public void testStreamReadConstraintsAppliedToJSONMapper() {
+        assertThat(ObjectMappers.JSON_MAPPER.getFactory().streamReadConstraints())
+                .satisfies(ObjectMappers.CONFIGURED_STREAM_READ_CONSTRAINTS::validate);
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/RSpecTests.java b/logstash-core/src/test/java/org/logstash/RSpecTests.java
index 835483651..acc7b54a0 100644
--- a/logstash-core/src/test/java/org/logstash/RSpecTests.java
+++ b/logstash-core/src/test/java/org/logstash/RSpecTests.java
@@ -1,12 +1,30 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.assertj.core.util.Files;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.junit.Assert;
 import org.junit.Test;
@@ -19,13 +37,13 @@ import org.junit.runners.Parameterized.Parameters;
  * Runs the Logstash RSpec suit.
  */
 @RunWith(Parameterized.class)
-public final class RSpecTests {
+public class RSpecTests extends RubyTestBase {
 
     @Parameters(name="{0}")
     public static Collection<Object[]> data() {
         return Arrays.asList(new Object[][] {
-                { "compliance", "spec/compliance/**/*_spec.rb"},
-                { "core tests", "spec/unit/**/*_spec.rb,logstash-core/spec/**/*_spec.rb" }
+                { "compliance", "spec/compliance/**/*_spec.rb" },
+                { "core tests", "spec/unit/**/*_spec.rb" + ',' + "logstash-core/spec/**/*_spec.rb" }
         });
     }
 
@@ -37,9 +55,7 @@ public final class RSpecTests {
 
     @Test
     public void rspecTests() throws Exception {
-        final String root = Files.currentFolder().getParent();
         RubyUtil.RUBY.getENV().put("IS_JUNIT_RUN", "true");
-        RubyUtil.RUBY.setCurrentDirectory(root);
         RubyUtil.RUBY.getGlobalVariables().set(
             "$JUNIT_ARGV",
             Rubyfier.deep(
@@ -47,7 +63,7 @@ public final class RSpecTests {
                     "-fd", "--pattern", specGlob
                 ))
         );
-        final Path rspec = Paths.get(root, "lib/bootstrap/rspec.rb");
+        final Path rspec = LS_HOME.resolve("lib").resolve("bootstrap").resolve("rspec.rb");
         final IRubyObject result = RubyUtil.RUBY.executeScript(
             new String(java.nio.file.Files.readAllBytes(rspec), StandardCharsets.UTF_8),
             rspec.toFile().getAbsolutePath()
diff --git a/logstash-core/src/test/java/org/logstash/RubyTestBase.java b/logstash-core/src/test/java/org/logstash/RubyTestBase.java
new file mode 100644
index 000000000..aaa3bdf8c
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/RubyTestBase.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash;
+
+import org.jruby.Ruby;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ * The point of this testing base is to initialize the global runtime.
+ * This is necessary as LS relies on a static RubyUtil.RUBY to be the runtime used by LS.
+ *
+ * Any test using the org.jruby API directly or indirectly should depend on this class.
+ */
+public abstract class RubyTestBase {
+
+    public static final Path LS_HOME;
+
+    static {
+        Path root;
+        if (System.getProperty("logstash.root.dir") == null) {
+            // make sure we work from IDE as well as when run with Gradle
+            root = Paths.get("").toAbsolutePath();
+            if (root.endsWith("logstash-core")) root = root.getParent();
+        } else {
+            root = Paths.get(System.getProperty("logstash.root.dir")).toAbsolutePath();
+        }
+
+        if (!root.resolve("versions.yml").toFile().exists()) {
+            throw new AssertionError("versions.yml not found is logstash root dir: " + root);
+        }
+        LS_HOME = root;
+
+        initializeGlobalRuntime(LS_HOME);
+    }
+
+    static Ruby initializeGlobalRuntime(final Path currentDir) {
+        String[] args = new String[] { "--disable-did_you_mean" };
+        Ruby runtime = Ruby.newInstance(Logstash.initRubyConfig(LS_HOME, currentDir, args));
+        if (runtime != RubyUtil.RUBY) throw new AssertionError("runtime already initialized. perhaps a Test class isn't subclassing RubyTestBase as it should?");
+        return runtime;
+    }
+
+}
diff --git a/logstash-core/src/test/java/org/logstash/RubyfierTest.java b/logstash-core/src/test/java/org/logstash/RubyfierTest.java
index 589b17dd0..84921aeac 100644
--- a/logstash-core/src/test/java/org/logstash/RubyfierTest.java
+++ b/logstash-core/src/test/java/org/logstash/RubyfierTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import org.jruby.RubyArray;
@@ -21,7 +41,7 @@ import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
 
-public class RubyfierTest {
+public class RubyfierTest extends RubyTestBase {
 
     @Test
     public void testDeepWithString() {
diff --git a/logstash-core/src/test/java/org/logstash/StringInterpolationTest.java b/logstash-core/src/test/java/org/logstash/StringInterpolationTest.java
index 1371a4952..c4b0f446b 100644
--- a/logstash-core/src/test/java/org/logstash/StringInterpolationTest.java
+++ b/logstash-core/src/test/java/org/logstash/StringInterpolationTest.java
@@ -1,19 +1,45 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 
+import org.awaitility.Awaitility;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.time.Duration;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
 
 
-public class StringInterpolationTest {
+public class StringInterpolationTest extends RubyTestBase {
+
     @Test
     public void testCompletelyStaticTemplate() throws IOException {
         Event event = getTestEvent();
@@ -50,12 +76,19 @@ public class StringInterpolationTest {
     }
 
     @Test
-    public void TestMixDateAndFields() throws IOException {
+    public void testMixDateAndFields() throws IOException {
         Event event = getTestEvent();
         String path = "/full/%{+YYYY}/weeee/%{bar}";
         assertEquals("/full/2015/weeee/foo", StringInterpolation.evaluate(event, path));
     }
 
+    @Test
+    public void testMixDateAndFieldsJavaSyntax() throws IOException {
+        Event event = getTestEvent();
+        String path = "/full/%{{YYYY-DDD}}/weeee/%{bar}";
+        assertEquals("/full/2015-274/weeee/foo", StringInterpolation.evaluate(event, path));
+    }
+
     @Test
     public void testUnclosedTag() throws IOException {
         Event event = getTestEvent();
@@ -64,35 +97,44 @@ public class StringInterpolationTest {
     }
 
     @Test
-    public void TestStringIsOneDateTag() throws IOException {
+    public void testStringIsOneDateTag() throws IOException {
         Event event = getTestEvent();
         String path = "%{+YYYY}";
         assertEquals("2015", StringInterpolation.evaluate(event, path));
     }
 
     @Test
-    public void TestFieldRef() throws IOException {
+    public void testStringIsJavaDateTag() throws IOException {
+        Event event = getTestEvent();
+        String path = "%{{YYYY-'W'ww}}";
+        assertEquals("2015-W40", StringInterpolation.evaluate(event, path));
+    }
+
+    @Test
+    public void testFieldRef() throws IOException {
         Event event = getTestEvent();
         String path = "%{[j][k1]}";
         assertEquals("v", StringInterpolation.evaluate(event, path));
     }
 
     @Test
-    public void TestEpochSeconds() throws IOException {
+    public void testEpochSeconds() throws IOException {
         Event event = getTestEvent();
         String path = "%{+%ss}";
+        // `+%ss` bypasses the EPOCH syntax and instead matches the JODA syntax.
+        // which produces the literal `%` followed by a two-s seconds value `00`
         assertEquals("%00", StringInterpolation.evaluate(event, path));
     }
 
     @Test
-    public void TestEpoch() throws IOException {
+    public void testEpoch() throws IOException {
         Event event = getTestEvent();
         String path = "%{+%s}";
         assertEquals("1443657600", StringInterpolation.evaluate(event, path));
     }
 
     @Test
-    public void TestValueIsArray() throws IOException {
+    public void testValueIsArray() throws IOException {
         ArrayList<String> l = new ArrayList<>();
         l.add("Hello");
         l.add("world");
@@ -105,13 +147,30 @@ public class StringInterpolationTest {
     }
 
     @Test
-    public void TestValueIsHash() throws IOException {
+    public void testValueIsHash() throws IOException {
         Event event = getTestEvent();
 
         String path = "%{j}";
         assertEquals("{\"k1\":\"v\"}", StringInterpolation.evaluate(event, path));
     }
 
+    @Test
+    public void testPatternTimeNowGenerateFreshTimestamp() throws IOException, InterruptedException {
+        Event event = getTestEvent();
+        Timestamp before = new Timestamp();
+        Awaitility.await("Make sure we sleep enough get another current timestamp")
+                .atMost(Duration.ofSeconds(1))
+                .until(() -> Instant.now().isAfter(before.toInstant()));
+        Timestamp result = new Timestamp(StringInterpolation.evaluate(event, "%{{TIME_NOW}}"));
+        assertTrue(before.compareTo(result) < 0);
+    }
+
+    @Test
+    public void testBadPatternTimeNowShouldThrowException() throws IOException {
+        Event event = getTestEvent();
+        assertThrows(IllegalArgumentException.class, () -> StringInterpolation.evaluate(event, "%{{BAD_TIME_NOW}}"));
+    }
+
     public Event getTestEvent() {
         Map<String, Object> data = new HashMap<>();
         Map<String, String> inner = new HashMap<>();
diff --git a/logstash-core/src/test/java/org/logstash/TimestampTest.java b/logstash-core/src/test/java/org/logstash/TimestampTest.java
index 58959ab7f..d3bfd65ad 100644
--- a/logstash-core/src/test/java/org/logstash/TimestampTest.java
+++ b/logstash-core/src/test/java/org/logstash/TimestampTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
 import org.joda.time.DateTime;
@@ -5,42 +25,100 @@ import org.joda.time.DateTimeZone;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.time.Clock;
 import java.time.Instant;
+import java.time.ZoneId;
+import java.util.Locale;
 
 import static org.junit.Assert.*;
 
 public class TimestampTest {
 
 
+    static final Clock OFFSET_CLOCK = Clock.systemUTC().withZone(ZoneId.of("-08:00"));
+    static final Locale LOCALE = Locale.US;
+
     @Test
+    @SuppressWarnings({"deprecation"})
     public void testCircularIso8601() throws Exception {
         Timestamp t1 = new Timestamp();
         Timestamp t2 = new Timestamp(t1.toString());
+        //noinspection deprecation
         assertEquals(t1.getTime(), t2.getTime());
+        assertEquals(t1.toInstant(), t2.toInstant());
     }
 
     @Test
-    public void testToIso8601() throws Exception {
-        Timestamp t = new Timestamp("2014-09-23T00:00:00-0800");
+    public void testToString() throws Exception {
+        Timestamp t = new Timestamp("2014-09-23T12:34:56.789012345-0800", OFFSET_CLOCK, LOCALE);
+        assertEquals("2014-09-23T20:34:56.789012345Z", t.toString());
+    }
+
+    @Test
+    public void testToStringNoNanos() throws Exception {
+        Timestamp t = new Timestamp("2014-09-23T12:34:56.000000000-0800", OFFSET_CLOCK, LOCALE);
+        assertEquals("2014-09-23T20:34:56.000Z", t.toString());
+    }
+
+    @Test
+    public void testParsingDateTimeNoOffset() throws Exception {
+        final Timestamp t = new Timestamp("2014-09-23T12:34:56.789012345", OFFSET_CLOCK, LOCALE);
+        assertEquals("2014-09-23T20:34:56.789012345Z", t.toString());
+    }
+    @Test
+    public void testParsingDateNoOffset() throws Exception {
+        final Timestamp t = new Timestamp("2014-09-23", OFFSET_CLOCK, LOCALE);
         assertEquals("2014-09-23T08:00:00.000Z", t.toString());
     }
 
-    // Timestamp should always be in a UTC representation
     @Test
+    public void testParsingDateWithOffset() throws Exception {
+        final Timestamp t = new Timestamp("2014-09-23-08:00", OFFSET_CLOCK, LOCALE);
+        assertEquals("2014-09-23T08:00:00.000Z", t.toString());
+    }
+
+    @Test
+    public void testParsingDateTimeWithZOffset() throws Exception {
+        final Timestamp t = new Timestamp("2014-09-23T13:49:52.987654321Z", OFFSET_CLOCK, LOCALE);
+        assertEquals("2014-09-23T13:49:52.987654321Z", t.toString());
+    }
+
+    @Test
+    public void testParsingDateTimeWithCommaDecimalStyleLocale() throws Exception {
+        final Locale germanLocale = Locale.GERMANY;
+        final Clock germanClock = Clock.systemUTC().withZone(ZoneId.of("+02:00")); // DST doesn't matter
+
+        // comma-decimal
+        final Timestamp t1 = new Timestamp("2014-09-23T13:49:52,987654321Z", germanClock, germanLocale);
+        assertEquals("2014-09-23T13:49:52.987654321Z", t1.toString());
+
+        // fallback to stop-decimal
+        final Timestamp t2 = new Timestamp("2014-09-23T13:49:52.987654321Z", germanClock, germanLocale);
+        assertEquals("2014-09-23T13:49:52.987654321Z", t2.toString());
+    }
+
+    // Timestamp should always be in a UTC representation
+    // TODO: remove spec, since `Instant` is UTC by default.
+    @Test
+    @SuppressWarnings({"deprecation"})
     public void testUTC() throws Exception {
         Timestamp t;
 
         t = new Timestamp();
+        //noinspection deprecation
         assertEquals(DateTimeZone.UTC, t.getTime().getZone());
 
         t = new Timestamp("2014-09-23T00:00:00-0800");
+        //noinspection deprecation
         assertEquals(DateTimeZone.UTC, t.getTime().getZone());
 
         t = new Timestamp("2014-09-23T08:00:00.000Z");
+        //noinspection deprecation
         assertEquals(DateTimeZone.UTC, t.getTime().getZone());
 
         long ms = DateTime.now(DateTimeZone.forID("EST")).getMillis();
         t = new Timestamp(ms);
+        //noinspection deprecation
         assertEquals(DateTimeZone.UTC, t.getTime().getZone());
     }
 
@@ -62,4 +140,11 @@ public class TimestampTest {
         Assert.assertEquals(i.toEpochMilli(), millis);
     }
 
+    @Test
+    public void testNanoPrecision() {
+        final String input = "2021-04-02T00:28:17.987654321Z";
+        final Timestamp t1 = new Timestamp(input);
+
+        assertEquals(987654321, t1.toInstant().getNano());
+    }
 }
diff --git a/logstash-core/src/test/java/org/logstash/ValuefierTest.java b/logstash-core/src/test/java/org/logstash/ValuefierTest.java
index 0e8838743..ecc27d454 100644
--- a/logstash-core/src/test/java/org/logstash/ValuefierTest.java
+++ b/logstash-core/src/test/java/org/logstash/ValuefierTest.java
@@ -1,5 +1,29 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -14,14 +38,16 @@ import org.jruby.java.proxies.ConcreteJavaProxy;
 import org.jruby.java.proxies.MapJavaProxy;
 import org.jruby.javasupport.Java;
 import org.jruby.runtime.builtin.IRubyObject;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.logstash.ext.JrubyTimestampExtLibrary;
 
 import static junit.framework.TestCase.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertThrows;
+
+public class ValuefierTest extends RubyTestBase {
 
-public class ValuefierTest {
     @Test
     public void testMapJavaProxy() {
         Map<IRubyObject, IRubyObject> map = new HashMap<>();
@@ -72,15 +98,35 @@ public class ValuefierTest {
         assertEquals(JrubyTimestampExtLibrary.RubyTimestamp.class, result.getClass());
     }
 
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
+    @Test
+    public void testLocalDate() {
+        LocalDate ld = LocalDate.now();
+        Object result = Valuefier.convert(ld);
+
+        assertEquals(JrubyTimestampExtLibrary.RubyTimestamp.class, result.getClass());
+    }
+
+    @Test
+    public void testLocalDateTime() {
+        LocalDateTime ldt = LocalDateTime.now();
+        Object result = Valuefier.convert(ldt);
+
+        assertEquals(JrubyTimestampExtLibrary.RubyTimestamp.class, result.getClass());
+    }
+
+    @Test
+    public void testZonedDateTime() {
+        ZonedDateTime zdt = ZonedDateTime.of(2022,4,4,5,6,13,123, ZoneId.of("Europe/London"));
+        JrubyTimestampExtLibrary.RubyTimestamp result = (JrubyTimestampExtLibrary.RubyTimestamp) Valuefier.convert(zdt);
+        assertEquals(zdt.toInstant().toEpochMilli(), result.getTimestamp().toEpochMilli());
+    }
 
     @Test
     public void testUnhandledObject() {
         RubyMatchData md = new RubyMatchData(RubyUtil.RUBY);
-        exception.expect(MissingConverterException.class);
-        exception.expectMessage("Missing Converter handling for full class name=org.jruby.RubyMatchData, simple name=RubyMatchData");
-        Valuefier.convert(md);
+
+        MissingConverterException missingConverterException = assertThrows(MissingConverterException.class, () -> Valuefier.convert(md));
+        assertThat(missingConverterException.getMessage(), containsString("Missing Converter handling for full class name=org.jruby.RubyMatchData, simple name=RubyMatchData"));
     }
 
     @Test
diff --git a/logstash-core/src/test/java/org/logstash/ackedqueue/CheckpointTest.java b/logstash-core/src/test/java/org/logstash/ackedqueue/CheckpointTest.java
index 83d1ac5aa..428f4ccef 100644
--- a/logstash-core/src/test/java/org/logstash/ackedqueue/CheckpointTest.java
+++ b/logstash-core/src/test/java/org/logstash/ackedqueue/CheckpointTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
 import org.junit.Test;
diff --git a/logstash-core/src/test/java/org/logstash/ackedqueue/HeadPageTest.java b/logstash-core/src/test/java/org/logstash/ackedqueue/HeadPageTest.java
index 30fb5b69b..810ad7f03 100644
--- a/logstash-core/src/test/java/org/logstash/ackedqueue/HeadPageTest.java
+++ b/logstash-core/src/test/java/org/logstash/ackedqueue/HeadPageTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
 import java.io.IOException;
diff --git a/logstash-core/src/test/java/org/logstash/ackedqueue/PqRepairTest.java b/logstash-core/src/test/java/org/logstash/ackedqueue/PqRepairTest.java
index 3d62f2f58..e8dc6eb06 100644
--- a/logstash-core/src/test/java/org/logstash/ackedqueue/PqRepairTest.java
+++ b/logstash-core/src/test/java/org/logstash/ackedqueue/PqRepairTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
 import java.io.IOException;
@@ -75,6 +95,14 @@ public final class PqRepairTest {
         verifyQueue(0, 1, 4, 5);
     }
 
+    @Test
+    public void testRemoveTempCheckPoint() throws Exception {
+        Files.createFile(dataPath.resolve("checkpoint.head.tmp"));
+        Files.createFile(dataPath.resolve("checkpoint.1.tmp"));
+        PqRepair.repair(dataPath);
+        verifyQueue();
+    }
+
     private void verifyQueue() throws IOException {
         verifyQueue(IntStream.range(0, 6).toArray());
     }
diff --git a/logstash-core/src/test/java/org/logstash/ackedqueue/QueueTest.java b/logstash-core/src/test/java/org/logstash/ackedqueue/QueueTest.java
index e0d44199a..1b69fb1be 100644
--- a/logstash-core/src/test/java/org/logstash/ackedqueue/QueueTest.java
+++ b/logstash-core/src/test/java/org/logstash/ackedqueue/QueueTest.java
@@ -1,5 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
+import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.channels.FileChannel;
@@ -18,6 +39,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -26,13 +48,17 @@ import org.junit.Ignore;
 import org.junit.rules.TemporaryFolder;
 import org.logstash.ackedqueue.io.MmapPageIOV2;
 
+import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.fail;
 import static org.logstash.ackedqueue.QueueTestHelpers.computeCapacityForMmapPageIO;
+import static org.junit.Assert.assertThrows;
 
 public class QueueTest {
 
@@ -493,9 +519,12 @@ public class QueueTest {
     public void reachMaxSizeTest() throws IOException, InterruptedException {
         Queueable element = new StringElement("0123456789"); // 10 bytes
 
+        int pageSize = computeCapacityForMmapPageIO(element, 10);
+        int queueMaxSize = (pageSize * 10) - 1; // 100th will overflow max capacity while still on 10th page
+
         // allow 10 elements per page but only 100 events in total
         Settings settings = TestSettings.persistedQueueSettings(
-                computeCapacityForMmapPageIO(element, 10), computeCapacityForMmapPageIO(element, 100), dataPath
+                pageSize, queueMaxSize, dataPath
         );
         try (Queue q = new Queue(settings)) {
             q.open();
@@ -516,6 +545,36 @@ public class QueueTest {
         }
     }
 
+    @Test(timeout = 50_000)
+    public void preciselyMaxSizeTest() throws IOException, InterruptedException {
+        Queueable element = new StringElement("0123456789"); // 10 bytes
+
+        int pageSize = computeCapacityForMmapPageIO(element, 10);
+        int queueMaxSize = (pageSize * 10); // 100th will precisely fit max capacity
+
+        // allow 10 elements per page but only 100 events in total
+        Settings settings = TestSettings.persistedQueueSettings(
+                pageSize, queueMaxSize, dataPath
+        );
+        try (Queue q = new Queue(settings)) {
+            q.open();
+
+            int elementCount = 100; // should be able to write 100 events before getting full
+            for (int i = 0; i < elementCount; i++) {
+                q.write(element);
+            }
+
+            assertThat(q.isFull(), is(false));
+
+            // we expect this next write call to block so let's wrap it in a Future
+            executor.submit(() -> q.write(element));
+            while (!q.isFull()) {
+                Thread.sleep(10);
+            }
+            assertThat(q.isFull(), is(true));
+        }
+    }
+
     @Test(timeout = 50_000)
     public void ackingMakesQueueNotFullAgainTest() throws IOException, InterruptedException, ExecutionException {
 
@@ -949,6 +1008,44 @@ public class QueueTest {
         }
     }
 
+    @Test
+    public void testZeroByteFullyAckedHeadPageOnOpen() throws IOException {
+        Queueable element = new StringElement("0123456789"); // 10 bytes
+        Settings settings = TestSettings.persistedQueueSettings(computeCapacityForMmapPageIO(element), dataPath);
+
+        // the goal here is to recreate a condition where the queue has a head page of size zero with
+        // a checkpoint that indicates it is full acknowledged
+        // see issue #10855
+
+        try(Queue q = new Queue(settings)) {
+            q.open();
+            q.write(element);
+
+            Batch batch = q.readBatch( 1, TimeUnit.SECONDS.toMillis(1));
+            batch.close();
+            assertThat(batch.size(), is(1));
+            assertThat(q.isFullyAcked(), is(true));
+        }
+
+        // now we have a queue state where page 0 is fully acked but not purged
+        // manually truncate page 0 to zero byte to mock corrupted page
+        FileChannel c = new FileOutputStream(Paths.get(dataPath, "page.0").toFile(), true).getChannel();
+        c.truncate(0);
+        c.close();
+
+        try(Queue q = new Queue(settings)) {
+            // here q.open used to crash with:
+            // java.io.IOException: Page file size is too small to hold elements
+            // because head page recover() check integrity of file size
+            q.open();
+
+            // recreated head page and checkpoint
+            File page1 = Paths.get(dataPath, "page.1").toFile();
+            assertThat(page1.exists(), is(true));
+            assertThat(page1.length(), is(greaterThan(0L)));
+        }
+    }
+
     @Test
     public void pageCapacityChangeOnExistingQueue() throws IOException {
         final Queueable element = new StringElement("foobarbaz1");
@@ -1023,4 +1120,78 @@ public class QueueTest {
             queue.open();
         }
     }
+
+    @Test
+    public void lockIsReleasedUponOpenException() throws Exception {
+        Settings settings = SettingsImpl.builder(TestSettings.persistedQueueSettings(100, dataPath))
+                .queueMaxBytes(Long.MAX_VALUE)
+                .build();
+        try {
+            Queue queue = new Queue(settings);
+            queue.open();
+            fail("expected queue.open() to throws when not enough disk free");
+        } catch (IOException e) {
+            assertThat(e.getMessage(), containsString("Unable to allocate"));
+        }
+
+        // at this point the Queue lock should be released and Queue.open should not throw a LockException
+        try (Queue queue = new Queue(TestSettings.persistedQueueSettings(10, dataPath))) {
+            queue.open();
+        }
+    }
+
+    @Test
+    public void firstUnackedPagePointToFullyAckedPurgedPage() throws Exception {
+        Queueable element = new StringElement("0123456789"); // 10 bytes
+        Settings settings = TestSettings.persistedQueueSettings(computeCapacityForMmapPageIO(element), dataPath);
+        // simulate a scenario that a tail page fail to complete fully ack, crash in the middle of purge
+        // normal purge: write fully acked checkpoint -> delete tail page -> (boom!) delete checkpoint -> write head page
+        // the queue head page, firstUnackedPageNum, points to a removed page which is fully acked
+        // the queue should be able to open and remove dangling checkpoint
+
+        try(Queue q = new Queue(settings)) {
+            q.open();
+            // create two pages
+            q.write(element);
+            q.write(element);
+        }
+
+
+        try(Queue q = new Queue(settings)) {
+            // now we have head checkpoint pointing to page.0
+            // manually delete page.0
+            Paths.get(dataPath, "page.0").toFile().delete();
+            // create a fully acked checkpoint.0 to mock a partial acked action
+            // which purges the tail page and the checkpoint file remains
+            Checkpoint cp = q.getCheckpointIO().read("checkpoint.0");
+            Paths.get(dataPath, "checkpoint.0").toFile().delete();
+            Checkpoint mockAckedCp = new Checkpoint(cp.getPageNum(), cp.getFirstUnackedPageNum(), cp.getFirstUnackedSeqNum() + 1, cp.getMinSeqNum(), cp.getElementCount());
+            q.getCheckpointIO().write("checkpoint.0", mockAckedCp);
+
+            // here q.open used to crash with:
+            // java.io.IOException: Page file size is too small to hold elements
+            // because checkpoint has outdated state saying it is not fully acked
+            q.open();
+
+            // dangling checkpoint should be deleted
+            File cp0 = Paths.get(dataPath, "checkpoint.0").toFile();
+            assertFalse("Dangling page's checkpoint file should be removed", cp0.exists());
+        }
+    }
+
+    @Test
+    public void writeToClosedQueueException() throws Exception {
+        Settings settings = TestSettings.persistedQueueSettings(100, dataPath);
+        Queue queue = new Queue(settings);
+
+        queue.open();
+        queue.write(new StringElement("First test string to be written in queue."));
+        queue.write(new StringElement("Second test string to be written in queue."));
+        queue.close();
+
+        final QueueRuntimeException qre = assertThrows(QueueRuntimeException.class, () -> {
+            queue.write(new StringElement("Third test string to be REJECTED to write in queue."));
+        });
+        assertThat(qre.getMessage(), containsString("Tried to write to a closed queue."));
+    }
 }
diff --git a/logstash-core/src/test/java/org/logstash/ackedqueue/QueueTestHelpers.java b/logstash-core/src/test/java/org/logstash/ackedqueue/QueueTestHelpers.java
index 1eded8f4e..b01680516 100644
--- a/logstash-core/src/test/java/org/logstash/ackedqueue/QueueTestHelpers.java
+++ b/logstash-core/src/test/java/org/logstash/ackedqueue/QueueTestHelpers.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
 import java.io.IOException;
diff --git a/logstash-core/src/test/java/org/logstash/ackedqueue/SettingsImplTest.java b/logstash-core/src/test/java/org/logstash/ackedqueue/SettingsImplTest.java
new file mode 100644
index 000000000..708231a30
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/ackedqueue/SettingsImplTest.java
@@ -0,0 +1,32 @@
+package org.logstash.ackedqueue;
+
+import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class SettingsImplTest {
+
+    @Test
+    public void verifyConfiguredValues() {
+        Settings settings =  SettingsImpl.fileSettingsBuilder("PATH/TO/Q")
+                .capacity(10)
+                .maxUnread(1024)
+                .queueMaxBytes(2147483647)
+                .checkpointMaxAcks(1)
+                .checkpointMaxWrites(1)
+                .checkpointRetry(true)
+                .elementClass(StringElement.class)
+                .build();
+
+        assertEquals(settings.getDirPath(), "PATH/TO/Q");
+        assertEquals(settings.getCapacity(), 10);
+        assertEquals(settings.getMaxUnread(), 1024);
+        assertEquals(settings.getQueueMaxBytes(), 2147483647);
+        assertEquals(settings.getCheckpointMaxAcks(), 1);
+        assertEquals(settings.getCheckpointMaxWrites(), 1);
+        assertTrue(settings.getCheckpointRetry());
+        assertEquals(settings.getElementClass(), StringElement.class);
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/ackedqueue/StringElement.java b/logstash-core/src/test/java/org/logstash/ackedqueue/StringElement.java
index 99092a908..d825b6837 100644
--- a/logstash-core/src/test/java/org/logstash/ackedqueue/StringElement.java
+++ b/logstash-core/src/test/java/org/logstash/ackedqueue/StringElement.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
 import java.nio.ByteBuffer;
diff --git a/logstash-core/src/test/java/org/logstash/ackedqueue/TestSettings.java b/logstash-core/src/test/java/org/logstash/ackedqueue/TestSettings.java
index c2fde02f7..bd7a8112e 100644
--- a/logstash-core/src/test/java/org/logstash/ackedqueue/TestSettings.java
+++ b/logstash-core/src/test/java/org/logstash/ackedqueue/TestSettings.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue;
 
 public class TestSettings {
diff --git a/logstash-core/src/test/java/org/logstash/ackedqueue/io/FileCheckpointIOTest.java b/logstash-core/src/test/java/org/logstash/ackedqueue/io/FileCheckpointIOTest.java
index 7ff54ef20..2ec024e55 100644
--- a/logstash-core/src/test/java/org/logstash/ackedqueue/io/FileCheckpointIOTest.java
+++ b/logstash-core/src/test/java/org/logstash/ackedqueue/io/FileCheckpointIOTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue.io;
 
 import org.junit.Before;
diff --git a/logstash-core/src/test/java/org/logstash/ackedqueue/io/FileMmapIOTest.java b/logstash-core/src/test/java/org/logstash/ackedqueue/io/FileMmapIOTest.java
index adf930ae7..e29e25a80 100644
--- a/logstash-core/src/test/java/org/logstash/ackedqueue/io/FileMmapIOTest.java
+++ b/logstash-core/src/test/java/org/logstash/ackedqueue/io/FileMmapIOTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue.io;
 
 import java.nio.file.Path;
diff --git a/logstash-core/src/test/java/org/logstash/ackedqueue/io/IntVectorTest.java b/logstash-core/src/test/java/org/logstash/ackedqueue/io/IntVectorTest.java
index 7bc9741d8..1db10e640 100644
--- a/logstash-core/src/test/java/org/logstash/ackedqueue/io/IntVectorTest.java
+++ b/logstash-core/src/test/java/org/logstash/ackedqueue/io/IntVectorTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue.io;
 
 import org.junit.Test;
diff --git a/logstash-core/src/test/java/org/logstash/ackedqueue/io/LongVectorTest.java b/logstash-core/src/test/java/org/logstash/ackedqueue/io/LongVectorTest.java
index 10c20ebcc..10a690be6 100644
--- a/logstash-core/src/test/java/org/logstash/ackedqueue/io/LongVectorTest.java
+++ b/logstash-core/src/test/java/org/logstash/ackedqueue/io/LongVectorTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue.io;
 
 import org.junit.Test;
diff --git a/logstash-core/src/test/java/org/logstash/ackedqueue/io/MmapPageIOTest.java b/logstash-core/src/test/java/org/logstash/ackedqueue/io/MmapPageIOTest.java
index 9a9266dc1..4ec2660d1 100644
--- a/logstash-core/src/test/java/org/logstash/ackedqueue/io/MmapPageIOTest.java
+++ b/logstash-core/src/test/java/org/logstash/ackedqueue/io/MmapPageIOTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ackedqueue.io;
 
 import java.nio.file.Path;
diff --git a/logstash-core/src/test/java/org/logstash/common/AbstractDeadLetterQueueWriterExtTest.java b/logstash-core/src/test/java/org/logstash/common/AbstractDeadLetterQueueWriterExtTest.java
new file mode 100644
index 000000000..335dec971
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/common/AbstractDeadLetterQueueWriterExtTest.java
@@ -0,0 +1,79 @@
+package org.logstash.common;
+
+import org.jruby.RubyString;
+import org.jruby.javasupport.JavaUtil;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.logstash.DLQEntry;
+import org.logstash.RubyTestBase;
+import org.logstash.RubyUtil;
+import org.logstash.common.io.DeadLetterQueueReader;
+import org.logstash.common.io.DeadLetterQueueWriter;
+import org.logstash.common.io.QueueStorageType;
+import org.logstash.ext.JrubyEventExtLibrary;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.time.Duration;
+
+public class AbstractDeadLetterQueueWriterExtTest extends RubyTestBase {
+
+    static final int DLQ_VERSION_SIZE = 1;
+
+    @Rule
+    public TemporaryFolder tmpFolder = new TemporaryFolder();
+
+    @Test
+    public void testDLQWriterDoesntInvertPluginIdAndPluginTypeAttributes() throws IOException, InterruptedException {
+        final Path dlqPath = tmpFolder.newFolder("dead_letter_queue").toPath();
+        final String pluginId = "id_value";
+        final String pluginType = "elasticsearch";
+        final String dlqName = "main";
+
+        writeAnEventIntoDLQ(dlqPath, pluginId, pluginType, dlqName);
+
+        String segment = "1.log";
+        DeadLetterQueueReader dlqReader = openDeadLetterQueueReader(dlqPath, dlqName, segment);
+
+        DLQEntry dlqEntry = dlqReader.pollEntry(1_000);
+        assertNotNull("A DLQEntry must be present in the queue", dlqEntry);
+        assertEquals(pluginId, dlqEntry.getPluginId());
+        assertEquals(pluginType, dlqEntry.getPluginType());
+    }
+
+    private DeadLetterQueueReader openDeadLetterQueueReader(Path dlqPath, String dlqName, String segment) throws IOException {
+        DeadLetterQueueReader dlqReader = new DeadLetterQueueReader(dlqPath);
+        Path currentSegmentFile = dlqPath.resolve(dlqName).resolve(segment);
+        dlqReader.setCurrentReaderAndPosition(currentSegmentFile, DLQ_VERSION_SIZE);
+        assertEquals(currentSegmentFile, dlqReader.getCurrentSegment());
+        return dlqReader;
+    }
+
+    private void writeAnEventIntoDLQ(Path dlqPath, String pluginId, String pluginType, String dlqName) {
+        final ThreadContext context = RubyUtil.RUBY.getCurrentContext();
+        RubyString id = RubyString.newString(RubyUtil.RUBY, pluginId);
+        RubyString classConfigName = RubyString.newString(RubyUtil.RUBY, pluginType);
+
+        final DeadLetterQueueWriter javaDlqWriter = DeadLetterQueueFactory.getWriter(dlqName, dlqPath.toString(), 1024 * 1024, Duration.ofHours(1), QueueStorageType.DROP_NEWER);
+        IRubyObject dlqWriter = JavaUtil.convertJavaToUsableRubyObject(context.runtime, javaDlqWriter);
+
+        final AbstractDeadLetterQueueWriterExt dlqWriterForInstance = new AbstractDeadLetterQueueWriterExt.PluginDeadLetterQueueWriterExt(
+                RubyUtil.RUBY, RubyUtil.PLUGIN_DLQ_WRITER_CLASS
+        ).initialize(context, dlqWriter, id, classConfigName);
+
+        // create a Logstash event to store into DLQ
+        JrubyEventExtLibrary.RubyEvent event = JrubyEventExtLibrary.RubyEvent.newRubyEvent(RubyUtil.RUBY);
+        event.getEvent().setField("name", "John");
+
+        dlqWriterForInstance.doWrite(context, event, RubyString.newString(RubyUtil.RUBY, "A reason to DLQ-ing"));
+
+        dlqWriterForInstance.close(context);
+    }
+
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/common/BufferedTokenizerExtTest.java b/logstash-core/src/test/java/org/logstash/common/BufferedTokenizerExtTest.java
new file mode 100644
index 000000000..524abb36e
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/common/BufferedTokenizerExtTest.java
@@ -0,0 +1,161 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.common;
+
+import org.jruby.RubyArray;
+import org.jruby.RubyEncoding;
+import org.jruby.RubyString;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.junit.Before;
+import org.junit.Test;
+import org.logstash.RubyTestBase;
+import org.logstash.RubyUtil;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.logstash.RubyUtil.RUBY;
+
+@SuppressWarnings("unchecked")
+public final class BufferedTokenizerExtTest extends RubyTestBase {
+
+    private BufferedTokenizerExt sut;
+    private ThreadContext context;
+
+    @Before
+    public void setUp() {
+        sut = new BufferedTokenizerExt(RubyUtil.RUBY, RubyUtil.BUFFERED_TOKENIZER);
+        context = RUBY.getCurrentContext();
+        IRubyObject[] args = {};
+        sut.init(context, args);
+    }
+
+    @Test
+    public void shouldTokenizeASingleToken() {
+        RubyArray<RubyString> tokens = (RubyArray<RubyString>) sut.extract(context, RubyUtil.RUBY.newString("foo\n"));
+
+        assertEquals(List.of("foo"), tokens);
+    }
+
+    @Test
+    public void shouldMergeMultipleToken() {
+        RubyArray<RubyString> tokens = (RubyArray<RubyString>) sut.extract(context, RubyUtil.RUBY.newString("foo"));
+        assertTrue(tokens.isEmpty());
+
+        tokens = (RubyArray<RubyString>) sut.extract(context, RubyUtil.RUBY.newString("bar\n"));
+        assertEquals(List.of("foobar"), tokens);
+    }
+
+    @Test
+    public void shouldTokenizeMultipleToken() {
+        RubyArray<RubyString> tokens = (RubyArray<RubyString>) sut.extract(context, RubyUtil.RUBY.newString("foo\nbar\n"));
+
+        assertEquals(List.of("foo", "bar"), tokens);
+    }
+
+    @Test
+    public void shouldIgnoreEmptyPayload() {
+        RubyArray<RubyString> tokens = (RubyArray<RubyString>) sut.extract(context, RubyUtil.RUBY.newString(""));
+        assertTrue(tokens.isEmpty());
+
+        tokens = (RubyArray<RubyString>) sut.extract(context, RubyUtil.RUBY.newString("foo\nbar"));
+        assertEquals(List.of("foo"), tokens);
+    }
+
+    @Test
+    public void shouldTokenizeEmptyPayloadWithNewline() {
+        RubyArray<RubyString> tokens = (RubyArray<RubyString>) sut.extract(context, RubyUtil.RUBY.newString("\n"));
+        assertEquals(List.of(""), tokens);
+
+        tokens = (RubyArray<RubyString>) sut.extract(context, RubyUtil.RUBY.newString("\n\n\n"));
+        assertEquals(List.of("", "", ""), tokens);
+    }
+
+    @Test
+    public void shouldNotChangeEncodingOfTokensAfterPartitioning() {
+        RubyString rubyString = RubyString.newString(RUBY, new byte[]{(byte) 0xA3, 0x0A, 0x41}); // £ character, newline, A
+        IRubyObject rubyInput = rubyString.force_encoding(context, RUBY.newString("ISO8859-1"));
+        RubyArray<RubyString> tokens = (RubyArray<RubyString>)sut.extract(context, rubyInput);
+
+        // read the first token, the £ string
+        IRubyObject firstToken = tokens.shift(context);
+        assertEquals("£", firstToken.toString());
+
+        // verify encoding "ISO8859-1" is preserved in the Java to Ruby String conversion
+        RubyEncoding encoding = (RubyEncoding) firstToken.callMethod(context, "encoding");
+        assertEquals("ISO-8859-1", encoding.toString());
+    }
+
+    @Test
+    public void shouldNotChangeEncodingOfTokensAfterPartitioningInCaseMultipleExtractionInInvoked() {
+        RubyString rubyString = RubyString.newString(RUBY, new byte[]{(byte) 0xA3}); // £ character
+        IRubyObject rubyInput = rubyString.force_encoding(context, RUBY.newString("ISO8859-1"));
+        sut.extract(context, rubyInput);
+        IRubyObject capitalAInLatin1 = RubyString.newString(RUBY, new byte[]{(byte) 0x41})
+                .force_encoding(context, RUBY.newString("ISO8859-1"));
+        RubyArray<RubyString> tokens = (RubyArray<RubyString>)sut.extract(context, capitalAInLatin1);
+        assertTrue(tokens.isEmpty());
+
+        tokens = (RubyArray<RubyString>)sut.extract(context, RubyString.newString(RUBY, new byte[]{(byte) 0x0A}));
+
+        // read the first token, the £ string
+        IRubyObject firstToken = tokens.shift(context);
+        assertEquals("£A", firstToken.toString());
+
+        // verify encoding "ISO8859-1" is preserved in the Java to Ruby String conversion
+        RubyEncoding encoding = (RubyEncoding) firstToken.callMethod(context, "encoding");
+        assertEquals("ISO-8859-1", encoding.toString());
+    }
+
+    @Test
+    public void shouldNotChangeEncodingOfTokensAfterPartitioningWhenRetrieveLastFlushedToken() {
+        RubyString rubyString = RubyString.newString(RUBY, new byte[]{(byte) 0xA3, 0x0A, 0x41}); // £ character, newline, A
+        IRubyObject rubyInput = rubyString.force_encoding(context, RUBY.newString("ISO8859-1"));
+        RubyArray<RubyString> tokens = (RubyArray<RubyString>)sut.extract(context, rubyInput);
+
+        // read the first token, the £ string
+        IRubyObject firstToken = tokens.shift(context);
+        assertEquals("£", firstToken.toString());
+
+        // flush and check that the remaining A is still encoded in ISO8859-1
+        IRubyObject lastToken = sut.flush(context);
+        assertEquals("A", lastToken.toString());
+
+        // verify encoding "ISO8859-1" is preserved in the Java to Ruby String conversion
+        RubyEncoding encoding = (RubyEncoding) lastToken.callMethod(context, "encoding");
+        assertEquals("ISO-8859-1", encoding.toString());
+    }
+
+    @Test
+    public void givenDirectFlushInvocationUTF8EncodingIsApplied() {
+        RubyString rubyString = RubyString.newString(RUBY, new byte[]{(byte) 0xA3, 0x41}); // £ character, A
+        IRubyObject rubyInput = rubyString.force_encoding(context, RUBY.newString("ISO8859-1"));
+
+        // flush and check that the remaining A is still encoded in ISO8859-1
+        IRubyObject lastToken = sut.flush(context);
+        assertEquals("", lastToken.toString());
+
+        // verify encoding "ISO8859-1" is preserved in the Java to Ruby String conversion
+        RubyEncoding encoding = (RubyEncoding) lastToken.callMethod(context, "encoding");
+        assertEquals("UTF-8", encoding.toString());
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/common/BufferedTokenizerExtWithDelimiterTest.java b/logstash-core/src/test/java/org/logstash/common/BufferedTokenizerExtWithDelimiterTest.java
new file mode 100644
index 000000000..19872e66c
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/common/BufferedTokenizerExtWithDelimiterTest.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.common;
+
+import org.jruby.RubyArray;
+import org.jruby.RubyString;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.junit.Before;
+import org.junit.Test;
+import org.logstash.RubyTestBase;
+import org.logstash.RubyUtil;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.logstash.RubyUtil.RUBY;
+
+@SuppressWarnings("unchecked")
+public final class BufferedTokenizerExtWithDelimiterTest extends RubyTestBase {
+
+    private BufferedTokenizerExt sut;
+    private ThreadContext context;
+
+    @Before
+    public void setUp() {
+        sut = new BufferedTokenizerExt(RubyUtil.RUBY, RubyUtil.BUFFERED_TOKENIZER);
+        context = RUBY.getCurrentContext();
+        IRubyObject[] args = {RubyUtil.RUBY.newString("||")};
+        sut.init(context, args);
+    }
+
+    @Test
+    public void shouldTokenizeMultipleToken() {
+        RubyArray<RubyString> tokens = (RubyArray<RubyString>) sut.extract(context, RubyUtil.RUBY.newString("foo||b|r||"));
+
+        assertEquals(List.of("foo", "b|r"), tokens);
+    }
+
+    @Test
+    public void shouldIgnoreEmptyPayload() {
+        RubyArray<RubyString> tokens = (RubyArray<RubyString>) sut.extract(context, RubyUtil.RUBY.newString(""));
+        assertTrue(tokens.isEmpty());
+
+        tokens = (RubyArray<RubyString>) sut.extract(context, RubyUtil.RUBY.newString("foo||bar"));
+        assertEquals(List.of("foo"), tokens);
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/common/BufferedTokenizerExtWithSizeLimitTest.java b/logstash-core/src/test/java/org/logstash/common/BufferedTokenizerExtWithSizeLimitTest.java
new file mode 100644
index 000000000..c25ee01b4
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/common/BufferedTokenizerExtWithSizeLimitTest.java
@@ -0,0 +1,191 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.common;
+
+import org.hamcrest.Matchers;
+import org.jruby.RubyArray;
+import org.jruby.RubyString;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.junit.Before;
+import org.junit.Test;
+import org.logstash.RubyTestBase;
+import org.logstash.RubyUtil;
+import org.logstash.util.JavaVersion;
+
+import javax.management.Attribute;
+import javax.management.InstanceNotFoundException;
+import javax.management.ReflectionException;
+import java.lang.management.ManagementFactory;
+import java.lang.management.OperatingSystemMXBean;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assume.assumeThat;
+import static org.junit.Assume.assumeTrue;
+import static org.logstash.RubyUtil.RUBY;
+
+@SuppressWarnings("unchecked")
+public final class BufferedTokenizerExtWithSizeLimitTest extends RubyTestBase {
+
+    public static final int GB = 1024 * 1024 * 1024;
+    private BufferedTokenizerExt sut;
+    private ThreadContext context;
+
+    @Before
+    public void setUp() {
+        initSUTWithSizeLimit(10);
+    }
+
+    private void initSUTWithSizeLimit(int sizeLimit) {
+        sut = new BufferedTokenizerExt(RubyUtil.RUBY, RubyUtil.BUFFERED_TOKENIZER);
+        context = RUBY.getCurrentContext();
+        IRubyObject[] args = {RubyUtil.RUBY.newString("\n"), RubyUtil.RUBY.newFixnum(sizeLimit)};
+        sut.init(context, args);
+    }
+
+    @Test
+    public void givenTokenWithinSizeLimitWhenExtractedThenReturnTokens() {
+        RubyArray<RubyString> tokens = (RubyArray<RubyString>) sut.extract(context, RubyUtil.RUBY.newString("foo\nbar\n"));
+
+        assertEquals(List.of("foo", "bar"), tokens);
+    }
+
+    @Test
+    public void givenTokenExceedingSizeLimitWhenExtractedThenThrowsAnError() {
+        Exception thrownException = assertThrows(IllegalStateException.class, () -> {
+            sut.extract(context, RubyUtil.RUBY.newString("this_is_longer_than_10\nkaboom"));
+        });
+        assertThat(thrownException.getMessage(), containsString("input buffer full"));
+    }
+
+    @Test
+    public void givenExtractedThrownLimitErrorWhenFeedFreshDataThenReturnTokenStartingFromEndOfOffendingToken() {
+        Exception thrownException = assertThrows(IllegalStateException.class, () -> {
+            sut.extract(context, RubyUtil.RUBY.newString("this_is_longer_than_10\nkaboom"));
+        });
+        assertThat(thrownException.getMessage(), containsString("input buffer full"));
+
+        RubyArray<RubyString> tokens = (RubyArray<RubyString>) sut.extract(context, RubyUtil.RUBY.newString("\nanother"));
+        assertEquals("After buffer full error should resume from the end of line", List.of("kaboom"), tokens);
+    }
+
+    @Test
+    public void givenExtractInvokedWithDifferentFramingAfterBufferFullErrorTWhenFeedFreshDataThenReturnTokenStartingFromEndOfOffendingToken() {
+        sut.extract(context, RubyUtil.RUBY.newString("aaaa"));
+
+        Exception thrownException = assertThrows(IllegalStateException.class, () -> {
+            sut.extract(context, RubyUtil.RUBY.newString("aaaaaaa"));
+        });
+        assertThat(thrownException.getMessage(), containsString("input buffer full"));
+
+        RubyArray<RubyString> tokens = (RubyArray<RubyString>) sut.extract(context, RubyUtil.RUBY.newString("aa\nbbbb\nccc"));
+        assertEquals(List.of("bbbb"), tokens);
+    }
+
+    @Test
+    public void giveMultipleSegmentsThatGeneratesMultipleBufferFullErrorsThenIsAbleToRecoverTokenization() {
+        sut.extract(context, RubyUtil.RUBY.newString("aaaa"));
+
+        //first buffer full on 13 "a" letters
+        Exception thrownException = assertThrows(IllegalStateException.class, () -> {
+            sut.extract(context, RubyUtil.RUBY.newString("aaaaaaa"));
+        });
+        assertThat(thrownException.getMessage(), containsString("input buffer full"));
+
+        // second buffer full on 11 "b" letters
+        Exception secondThrownException = assertThrows(IllegalStateException.class, () -> {
+            sut.extract(context, RubyUtil.RUBY.newString("aa\nbbbbbbbbbbb\ncc"));
+        });
+        assertThat(secondThrownException.getMessage(), containsString("input buffer full"));
+
+        // now should resemble processing on c and d
+        RubyArray<RubyString> tokens = (RubyArray<RubyString>) sut.extract(context, RubyUtil.RUBY.newString("ccc\nddd\n"));
+        assertEquals(List.of("ccccc", "ddd"), tokens);
+    }
+
+    @Test
+    public void givenTooLongInputExtractDoesntOverflow() {
+        // This test has proven to go OOM on JDK 11 and JDK 17, also if physical memory is 16GB.
+        // JDK 21 successfully executes the test due to internal changes or efficiency of G1GC (the default GC).
+        // Tested also others GC on JDK 11 without any success:
+        // - ZGC
+        // - Parallel GC
+        // - CMS
+        // remove this code when the minimal JDK version for Logstash is JDK 21 or greater.
+
+        assumeThat("Expect at least JDK 21", JavaVersion.CURRENT, Matchers.greaterThanOrEqualTo(JavaVersion.JAVA_21));
+        long expectedNeedHeapMemory = 10L * GB;
+        // To understand the motivation of 10GB heap please read https://github.com/elastic/logstash/pull/17373#issuecomment-2750378212
+        assumeTrue("Skip the test because VM hasn't enough physical memory", hasEnoughPhysicalMemory(expectedNeedHeapMemory));
+
+        assertEquals("Xmx must equals to what's defined in the Gradle's javaTests task",
+                expectedNeedHeapMemory, Runtime.getRuntime().maxMemory());
+
+        // re-init the tokenizer with big sizeLimit
+        initSUTWithSizeLimit((int) (2L * GB) - 3);
+        // Integer.MAX_VALUE is 2 * GB
+        RubyString bigFirstPiece = generateString("a", Integer.MAX_VALUE - 1024);
+        sut.extract(context, bigFirstPiece);
+
+        // add another small fragment to trigger int overflow
+        // sizeLimit is (2^32-1)-3 first segment length is (2^32-1) - 1024 second is 1024 +2
+        // so the combined length of first and second is > sizeLimit and should throw an exception
+        // but because of overflow it's negative and happens to be < sizeLimit
+        Exception thrownException = assertThrows(IllegalStateException.class, () -> {
+            sut.extract(context, generateString("a", 1024 + 2));
+        });
+        assertThat(thrownException.getMessage(), containsString("input buffer full"));
+    }
+
+    private RubyString generateString(String fill, int size) {
+        return RubyUtil.RUBY.newString(fill.repeat(size));
+    }
+
+    private boolean hasEnoughPhysicalMemory(long requiredPhysicalMemory) {
+        long physicalMemory;
+        try {
+            physicalMemory = readPhysicalMemorySize();
+        } catch (InstanceNotFoundException | ReflectionException e) {
+            System.out.println("Can't read attribute JMX OS bean");
+            return false;
+        } catch (IllegalStateException e) {
+            System.out.println(e.getMessage());
+            return false;
+        }
+        System.out.println("Physical memory on the VM is: " + physicalMemory + " bytes");
+        return physicalMemory > requiredPhysicalMemory;
+    }
+
+    private long readPhysicalMemorySize() throws ReflectionException, InstanceNotFoundException {
+        OperatingSystemMXBean op = ManagementFactory.getOperatingSystemMXBean();
+
+        List<Attribute> attributes = ManagementFactory.getPlatformMBeanServer()
+                .getAttributes(op.getObjectName(), new String[]{"TotalPhysicalMemorySize"} ).asList();
+        if (attributes.isEmpty()) {
+            throw new IllegalStateException("Attribute TotalPhysicalMemorySize is not available from JMX OS bean");
+        }
+        Attribute a = attributes.get(0);
+        return (long) (Long) a.getValue();
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/common/ConfigVariableExpanderTest.java b/logstash-core/src/test/java/org/logstash/common/ConfigVariableExpanderTest.java
new file mode 100644
index 000000000..6f6e430fe
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/common/ConfigVariableExpanderTest.java
@@ -0,0 +1,145 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.common;
+
+import org.hamcrest.MatcherAssert;
+import org.junit.Assert;
+import org.junit.Test;
+import org.logstash.plugins.ConfigVariableExpander;
+import org.logstash.secret.SecretIdentifier;
+import org.logstash.secret.SecretVariable;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.Map;
+
+import static org.hamcrest.Matchers.instanceOf;
+import static org.logstash.secret.store.SecretStoreFactoryTest.MemoryStore;
+
+public class ConfigVariableExpanderTest {
+
+    @Test
+    public void testNonStringValueReturnsUnchanged() {
+        long nonStringValue = 42L;
+        ConfigVariableExpander cve = getFakeCve(Collections.emptyMap(), Collections.emptyMap());
+        Object expandedValue = cve.expand(nonStringValue);
+        Assert.assertEquals(nonStringValue, expandedValue);
+    }
+
+    @Test
+    public void testExpansionWithoutVariable() throws Exception {
+        String key = "foo";
+        ConfigVariableExpander cve = getFakeCve(Collections.emptyMap(), Collections.emptyMap());
+        String expandedValue = (String) cve.expand(key);
+        Assert.assertEquals(key, expandedValue);
+    }
+
+    @Test
+    public void testSimpleExpansion() throws Exception {
+        String key = "foo";
+        String val = "bar";
+        ConfigVariableExpander cve = getFakeCve(Collections.emptyMap(), Collections.singletonMap(key, val));
+
+        String expandedValue = (String) cve.expand("${" + key + "}");
+        Assert.assertEquals(val, expandedValue);
+    }
+
+    @Test
+    public void testExpansionWithDefaultValue() throws Exception {
+        String key = "foo";
+        String val = "bar";
+        String defaultValue = "baz";
+        ConfigVariableExpander cve = getFakeCve(Collections.emptyMap(), Collections.emptyMap());
+
+        String expandedValue = (String) cve.expand("${" + key + ":" + defaultValue + "}");
+        Assert.assertEquals(defaultValue, expandedValue);
+    }
+
+    @Test
+    public void testExpansionWithoutValueThrows() throws Exception {
+        String key = "foo";
+        ConfigVariableExpander cve = getFakeCve(Collections.emptyMap(), Collections.emptyMap());
+
+        try {
+            String expandedValue = (String) cve.expand("${" + key + "}");
+            Assert.fail("Exception should have been thrown");
+        } catch (IllegalStateException ise) {
+            Assert.assertTrue(ise.getMessage().startsWith("Cannot evaluate"));
+        }
+    }
+
+    @Test
+    public void testPrecedenceOfSecretStoreValue() throws Exception {
+        String key = "foo";
+        String ssVal = "ssbar";
+        String evVal = "evbar";
+        String defaultValue = "defaultbar";
+        ConfigVariableExpander cve = getFakeCve(
+                Collections.singletonMap(key, ssVal),
+                Collections.singletonMap(key, evVal));
+
+        String expandedValue = (String) cve.expand("${" + key + ":" + defaultValue + "}");
+        Assert.assertEquals(ssVal, expandedValue);
+    }
+
+    @Test
+    public void testPrecedenceOfSecretStoreValueKeepingSecrets() {
+        String key = "foo";
+        String ssVal = "ssbar";
+        String evVal = "evbar";
+        String defaultValue = "defaultbar";
+        ConfigVariableExpander cve = getFakeCve(
+                Collections.singletonMap(key, ssVal),
+                Collections.singletonMap(key, evVal));
+
+        Object expandedValue = cve.expand("${" + key + ":" + defaultValue + "}", true);
+        MatcherAssert.assertThat(expandedValue, instanceOf(SecretVariable.class));
+        Assert.assertEquals(ssVal, ((SecretVariable) expandedValue).getSecretValue());
+    }
+
+    @Test
+    public void testPrecedenceOfEnvironmentVariableValue() throws Exception {
+        String key = "foo";
+        String evVal = "evbar";
+        String defaultValue = "defaultbar";
+        ConfigVariableExpander cve = getFakeCve(
+                Collections.emptyMap(),
+                Collections.singletonMap(key, evVal));
+
+        String expandedValue = (String) cve.expand("${" + key + ":" + defaultValue + "}");
+        Assert.assertEquals(evVal, expandedValue);
+    }
+
+    // used by tests IfVertexTest, EventConditionTest
+    public static ConfigVariableExpander getFakeCve(
+            final Map<String, Object> ssValues, final Map<String, String> envVarValues) {
+
+        MemoryStore ms = new MemoryStore();
+        for (Map.Entry<String, Object> e : ssValues.entrySet()) {
+            if (e.getValue() instanceof String) {
+                ms.persistSecret(new SecretIdentifier(e.getKey()),
+                        ((String) e.getValue()).getBytes(StandardCharsets.UTF_8));
+            }
+        }
+        return new ConfigVariableExpander(ms, envVarValues::get);
+    }
+
+}
diff --git a/logstash-core/src/test/java/org/logstash/common/DeadLetterQueueFactoryTest.java b/logstash-core/src/test/java/org/logstash/common/DeadLetterQueueFactoryTest.java
index bbd2f2490..cf85824d7 100644
--- a/logstash-core/src/test/java/org/logstash/common/DeadLetterQueueFactoryTest.java
+++ b/logstash-core/src/test/java/org/logstash/common/DeadLetterQueueFactoryTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -24,9 +44,11 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.logstash.common.io.DeadLetterQueueWriter;
+import org.logstash.common.io.QueueStorageType;
 
 import java.io.IOException;
 import java.nio.file.Path;
+import java.time.Duration;
 
 import static junit.framework.TestCase.assertSame;
 import static org.junit.Assert.assertTrue;
@@ -47,9 +69,9 @@ public class DeadLetterQueueFactoryTest {
     public void testSameBeforeRelease() throws IOException {
         try {
             Path pipelineA = dir.resolve(PIPELINE_NAME);
-            DeadLetterQueueWriter writer = DeadLetterQueueFactory.getWriter(PIPELINE_NAME, pipelineA.toString(), 10000);
+            DeadLetterQueueWriter writer = DeadLetterQueueFactory.getWriter(PIPELINE_NAME, pipelineA.toString(), 10000, Duration.ofSeconds(1), QueueStorageType.DROP_NEWER);
             assertTrue(writer.isOpen());
-            DeadLetterQueueWriter writer2 = DeadLetterQueueFactory.getWriter(PIPELINE_NAME, pipelineA.toString(), 10000);
+            DeadLetterQueueWriter writer2 = DeadLetterQueueFactory.getWriter(PIPELINE_NAME, pipelineA.toString(), 10000, Duration.ofSeconds(1), QueueStorageType.DROP_NEWER);
             assertSame(writer, writer2);
             writer.close();
         } finally {
@@ -61,11 +83,11 @@ public class DeadLetterQueueFactoryTest {
     public void testOpenableAfterRelease() throws IOException {
         try {
             Path pipelineA = dir.resolve(PIPELINE_NAME);
-            DeadLetterQueueWriter writer = DeadLetterQueueFactory.getWriter(PIPELINE_NAME, pipelineA.toString(), 10000);
+            DeadLetterQueueWriter writer = DeadLetterQueueFactory.getWriter(PIPELINE_NAME, pipelineA.toString(), 10000, Duration.ofSeconds(1), QueueStorageType.DROP_NEWER);
             assertTrue(writer.isOpen());
             writer.close();
             DeadLetterQueueFactory.release(PIPELINE_NAME);
-            writer = DeadLetterQueueFactory.getWriter(PIPELINE_NAME, pipelineA.toString(), 10000);
+            writer = DeadLetterQueueFactory.getWriter(PIPELINE_NAME, pipelineA.toString(), 10000, Duration.ofSeconds(1), QueueStorageType.DROP_NEWER);
             assertTrue(writer.isOpen());
             writer.close();
         }finally{
diff --git a/logstash-core/src/test/java/org/logstash/common/FsUtilTest.java b/logstash-core/src/test/java/org/logstash/common/FsUtilTest.java
index 013383837..39c0b2c85 100644
--- a/logstash-core/src/test/java/org/logstash/common/FsUtilTest.java
+++ b/logstash-core/src/test/java/org/logstash/common/FsUtilTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.common;
 
 import org.hamcrest.CoreMatchers;
diff --git a/logstash-core/src/test/java/org/logstash/common/SourceWithMetadataTest.java b/logstash-core/src/test/java/org/logstash/common/SourceWithMetadataTest.java
index ae87850cb..ee1b8c0bd 100644
--- a/logstash-core/src/test/java/org/logstash/common/SourceWithMetadataTest.java
+++ b/logstash-core/src/test/java/org/logstash/common/SourceWithMetadataTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.common;
 
 import org.junit.Test;
diff --git a/logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueReaderTest.java b/logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueReaderTest.java
index 55994aca1..d6b2365a7 100644
--- a/logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueReaderTest.java
+++ b/logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueReaderTest.java
@@ -20,30 +20,59 @@
 package org.logstash.common.io;
 
 
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.logstash.DLQEntry;
 import org.logstash.Event;
+import org.logstash.LockException;
 import org.logstash.Timestamp;
 import org.logstash.ackedqueue.StringElement;
 
 import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.attribute.FileTime;
+import java.time.Clock;
+import java.time.Duration;
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
 import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.logstash.common.io.DeadLetterQueueTestUtils.GB;
+import static org.logstash.common.io.DeadLetterQueueTestUtils.MB;
 import static org.logstash.common.io.RecordIOWriter.BLOCK_SIZE;
+import static org.logstash.common.io.RecordIOWriter.RECORD_HEADER_SIZE;
 import static org.logstash.common.io.RecordIOWriter.VERSION_SIZE;
 
 public class DeadLetterQueueReaderTest {
+    public static final int INTERNAL_FRAG_PAYLOAD_SIZE = BLOCK_SIZE - RECORD_HEADER_SIZE - 5;
     private Path dir;
+    private int defaultDlqSize = 100_000_000; // 100mb
+
+    private static final int PAD_FOR_BLOCK_SIZE_EVENT = 32490;
 
     @Rule
     public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -120,28 +149,36 @@ public class DeadLetterQueueReaderTest {
     // This test checks that polling after a block has been mostly filled with an event is handled correctly.
     @Test
     public void testRereadFinalBlock() throws Exception {
-        Event event = new Event(Collections.emptyMap());
+        Event event = createEventWithConstantSerializationOverhead(Collections.emptyMap());
 
         // Fill event with not quite enough characters to fill block. Fill event with valid RecordType characters - this
         // was the cause of https://github.com/elastic/logstash/issues/7868
-        event.setField("message", generateMessageContent(32500));
+        event.setField("message", generateMessageContent(32495));
         long startTime = System.currentTimeMillis();
         int messageSize = 0;
-        try(DeadLetterQueueWriter writeManager = new DeadLetterQueueWriter(dir, 10 * 1024 * 1024, 1_000_000_000)) {
+        try(DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilder(dir, 10 * 1024 * 1024, defaultDlqSize, Duration.ofSeconds(1))
+                .build()) {
             for (int i = 0; i < 2; i++) {
-                DLQEntry entry = new DLQEntry(event, "", "", "", new Timestamp(startTime++));
-                messageSize += entry.serialize().length;
+                DLQEntry entry = new DLQEntry(event, "", "", String.valueOf(i), constantSerializationLengthTimestamp(startTime++));
+                final int serializationLength = entry.serialize().length;
+                assertThat("setup: serialized entry size...", serializationLength, is(lessThan(BLOCK_SIZE)));
+                messageSize += serializationLength;
                 writeManager.writeEntry(entry);
             }
+            assertThat(messageSize, is(greaterThan(BLOCK_SIZE)));
         }
         try (DeadLetterQueueReader readManager = new DeadLetterQueueReader(dir)) {
-            for (int i = 0; i < 3;i++) {
-                readManager.pollEntry(100);
+            for (int i = 0; i < 2;i++) {
+                final DLQEntry dlqEntry = readManager.pollEntry(100);
+                assertThat(String.format("read index `%s`", i), dlqEntry, is(notNullValue()));
+                assertThat("", dlqEntry.getReason(), is(String.valueOf(i)));
             }
+            final DLQEntry entryBeyondEnd = readManager.pollEntry(100);
+            assertThat("read beyond end", entryBeyondEnd, is(nullValue()));
         }
     }
 
-
     @Test
     public void testSeek() throws Exception {
         Event event = new Event(Collections.emptyMap());
@@ -172,32 +209,27 @@ public class DeadLetterQueueReaderTest {
     }
 
     private void writeSegmentSizeEntries(int count) throws IOException {
-        Event event = new Event(Collections.emptyMap());
-        DLQEntry templateEntry = new DLQEntry(event, "1", "1", String.valueOf(0));
+        final Event event = createEventWithConstantSerializationOverhead();
+        long startTime = System.currentTimeMillis();
+        DLQEntry templateEntry = new DLQEntry(event, "1", "1", String.valueOf(0), constantSerializationLengthTimestamp(startTime));
         int size = templateEntry.serialize().length + RecordIOWriter.RECORD_HEADER_SIZE + VERSION_SIZE;
-        DeadLetterQueueWriter writeManager = null;
-        try {
-            writeManager = new DeadLetterQueueWriter(dir, size, 10000000);
+        try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilder(dir, size, defaultDlqSize, Duration.ofSeconds(1))
+                .build()) {
             for (int i = 1; i <= count; i++) {
-                writeManager.writeEntry(new DLQEntry(event, "1", "1", String.valueOf(i)));
+                writeManager.writeEntry(new DLQEntry(event, "1", "1", String.valueOf(i), constantSerializationLengthTimestamp(startTime++)));
             }
-        } finally {
-            writeManager.close();
         }
     }
 
 
     private void validateEntries(Path firstLog, int startEntry, int endEntry, int startPosition) throws IOException, InterruptedException {
-        DeadLetterQueueReader readManager = null;
-        try {
-            readManager = new DeadLetterQueueReader(dir);
+        try (DeadLetterQueueReader readManager = new DeadLetterQueueReader(dir)) {
             readManager.setCurrentReaderAndPosition(firstLog, startPosition);
             for (int i = startEntry; i <= endEntry; i++) {
                 DLQEntry readEntry = readManager.pollEntry(100);
                 assertThat(readEntry.getReason(), equalTo(String.valueOf(i)));
             }
-        } finally {
-            readManager.close();
         }
     }
 
@@ -208,15 +240,16 @@ public class DeadLetterQueueReaderTest {
     // This test tests for a single event that ends on a block boundary
     @Test
     public void testBlockBoundary() throws Exception {
-
         final int PAD_FOR_BLOCK_SIZE_EVENT = 32490;
-        Event event = new Event();
+        Event event = createEventWithConstantSerializationOverhead();
         char[] field = new char[PAD_FOR_BLOCK_SIZE_EVENT];
         Arrays.fill(field, 'e');
         event.setField("T", new String(field));
-        Timestamp timestamp = new Timestamp();
+        Timestamp timestamp = constantSerializationLengthTimestamp();
 
-        try(DeadLetterQueueWriter writeManager = new DeadLetterQueueWriter(dir, 10 * 1024 * 1024, 1_000_000_000)) {
+        try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilder(dir, 10 * 1024 * 1024, defaultDlqSize, Duration.ofSeconds(1))
+                .build()) {
             for (int i = 0; i < 2; i++) {
                 DLQEntry entry = new DLQEntry(event, "", "", "", timestamp);
                 assertThat(entry.serialize().length + RecordIOWriter.RECORD_HEADER_SIZE, is(BLOCK_SIZE));
@@ -233,15 +266,17 @@ public class DeadLetterQueueReaderTest {
     // This test has multiple messages, with a message ending on a block boundary
     @Test
     public void testBlockBoundaryMultiple() throws Exception {
-        Event event = new Event(Collections.emptyMap());
+        Event event = createEventWithConstantSerializationOverhead();
         char[] field = new char[7929];
         Arrays.fill(field, 'x');
         event.setField("message", new String(field));
         long startTime = System.currentTimeMillis();
         int messageSize = 0;
-        try(DeadLetterQueueWriter writeManager = new DeadLetterQueueWriter(dir, 10 * 1024 * 1024, 1_000_000_000)) {
+        try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilder(dir, 10 * 1024 * 1024, defaultDlqSize, Duration.ofSeconds(1))
+                .build()) {
             for (int i = 1; i <= 5; i++) {
-                DLQEntry entry = new DLQEntry(event, "", "", "", new Timestamp(startTime++));
+                DLQEntry entry = new DLQEntry(event, "", "", "", constantSerializationLengthTimestamp(startTime++));
                 messageSize += entry.serialize().length;
                 writeManager.writeEntry(entry);
                 if (i == 4){
@@ -256,15 +291,149 @@ public class DeadLetterQueueReaderTest {
         }
     }
 
-    // This test tests for a single event that ends on a block and segment boundary
     @Test
-    public void testBlockAndSegmentBoundary() throws Exception {
-        final int PAD_FOR_BLOCK_SIZE_EVENT = 32490;
+    public void testFlushAfterWriterClose() throws Exception {
         Event event = new Event();
+        event.setField("T", generateMessageContent(PAD_FOR_BLOCK_SIZE_EVENT/8));
+        Timestamp timestamp = new Timestamp();
+
+        try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilder(dir, BLOCK_SIZE, defaultDlqSize, Duration.ofSeconds(1))
+                .build()) {
+            for (int i = 0; i < 6; i++) {
+                DLQEntry entry = new DLQEntry(event, "", "", Integer.toString(i), timestamp);
+                writeManager.writeEntry(entry);
+            }
+        }
+        try (DeadLetterQueueReader readManager = new DeadLetterQueueReader(dir)) {
+            for (int i = 0; i < 6;i++) {
+                DLQEntry entry = readManager.pollEntry(100);
+                assertThat(entry.getReason(), is(String.valueOf(i)));
+            }
+        }
+    }
+
+    @Test
+    public void testFlushAfterSegmentComplete() throws Exception {
+        Event event = new Event();
+        final int EVENTS_BEFORE_FLUSH = randomBetween(1, 32);
+        event.setField("T", generateMessageContent(PAD_FOR_BLOCK_SIZE_EVENT));
+        Timestamp timestamp = new Timestamp();
+        try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilder(dir, BLOCK_SIZE * EVENTS_BEFORE_FLUSH, defaultDlqSize, Duration.ofHours(1))
+                .build()) {
+            for (int i = 1; i < EVENTS_BEFORE_FLUSH; i++) {
+                DLQEntry entry = new DLQEntry(event, "", "", Integer.toString(i), timestamp);
+                writeManager.writeEntry(entry);
+            }
+
+            try (DeadLetterQueueReader readManager = new DeadLetterQueueReader(dir)) {
+                for (int i = 1; i < EVENTS_BEFORE_FLUSH; i++) {
+                    DLQEntry entry = readManager.pollEntry(100);
+                    assertThat(entry, is(nullValue()));
+                }
+            }
+
+            writeManager.writeEntry(new DLQEntry(event, "", "", "flush event", timestamp));
+
+            try (DeadLetterQueueReader readManager = new DeadLetterQueueReader(dir)) {
+                for (int i = 1; i < EVENTS_BEFORE_FLUSH; i++) {
+                    DLQEntry entry = readManager.pollEntry(100);
+                    assertThat(entry.getReason(), is(String.valueOf(i)));
+                }
+            }
+        }
+    }
+
+    @Test
+    public void testMultiFlushAfterSegmentComplete() throws Exception {
+        Event event = new Event();
+        final int eventsInSegment = randomBetween(1, 32);
+        // Write enough events to not quite complete a second segment.
+        final int totalEventsToWrite = (2 * eventsInSegment) - 1;
         event.setField("T", generateMessageContent(PAD_FOR_BLOCK_SIZE_EVENT));
         Timestamp timestamp = new Timestamp();
 
-        try(DeadLetterQueueWriter writeManager = new DeadLetterQueueWriter(dir, BLOCK_SIZE, 1_000_000_000)) {
+        try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilder(dir, BLOCK_SIZE * eventsInSegment, defaultDlqSize, Duration.ofHours(1))
+                .build()) {
+            for (int i = 1; i < totalEventsToWrite; i++) {
+                DLQEntry entry = new DLQEntry(event, "", "", Integer.toString(i), timestamp);
+                writeManager.writeEntry(entry);
+            }
+
+            try (DeadLetterQueueReader readManager = new DeadLetterQueueReader(dir)) {
+
+                for (int i = 1; i < eventsInSegment; i++) {
+                    DLQEntry entry = readManager.pollEntry(100);
+                    assertThat(entry.getReason(), is(String.valueOf(i)));
+                }
+
+
+                for (int i = eventsInSegment + 1; i < totalEventsToWrite; i++) {
+                    DLQEntry entry = readManager.pollEntry(100);
+                    assertThat(entry, is(nullValue()));
+                }
+            }
+
+            writeManager.writeEntry(new DLQEntry(event, "", "", "flush event", timestamp));
+
+            try (DeadLetterQueueReader readManager = new DeadLetterQueueReader(dir)) {
+                for (int i = 1; i < totalEventsToWrite; i++) {
+                    DLQEntry entry = readManager.pollEntry(100);
+                    assertThat(entry.getReason(), is(String.valueOf(i)));
+                }
+            }
+        }
+    }
+
+    @Test
+    public void testFlushAfterDelay() throws Exception {
+        Event event = new Event();
+        int eventsPerBlock = randomBetween(1,16);
+        int eventsToWrite = eventsPerBlock - 1;
+        event.setField("T", generateMessageContent(PAD_FOR_BLOCK_SIZE_EVENT/eventsPerBlock));
+        Timestamp timestamp = new Timestamp();
+
+        System.out.println("events per block= " + eventsPerBlock);
+
+        try(DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilder(dir, BLOCK_SIZE, defaultDlqSize, Duration.ofSeconds(2))
+                .build()) {
+            for (int i = 1; i < eventsToWrite; i++) {
+                DLQEntry entry = new DLQEntry(event, "", "", Integer.toString(i), timestamp);
+                writeManager.writeEntry(entry);
+            }
+
+            try (DeadLetterQueueReader readManager = new DeadLetterQueueReader(dir)) {
+                for (int i = 1; i < eventsToWrite; i++) {
+                    DLQEntry entry = readManager.pollEntry(100);
+                    assertThat(entry, is(nullValue()));
+                }
+            }
+
+            Thread.sleep(3000);
+
+            try (DeadLetterQueueReader readManager = new DeadLetterQueueReader(dir)) {
+                for (int i = 1; i < eventsToWrite; i++) {
+                    DLQEntry entry = readManager.pollEntry(100);
+                    assertThat(entry.getReason(), is(String.valueOf(i)));
+                }
+            }
+
+        }
+    }
+
+    // This test tests for a single event that ends on a block and segment boundary
+    @Test
+    public void testBlockAndSegmentBoundary() throws Exception {
+        Event event = createEventWithConstantSerializationOverhead();
+        event.setField("T", generateMessageContent(PAD_FOR_BLOCK_SIZE_EVENT));
+        Timestamp timestamp = constantSerializationLengthTimestamp();
+
+        try(DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilder(dir, BLOCK_SIZE, defaultDlqSize, Duration.ofSeconds(1))
+                .build()) {
             for (int i = 0; i < 2; i++) {
                 DLQEntry entry = new DLQEntry(event, "", "", "", timestamp);
                 assertThat(entry.serialize().length + RecordIOWriter.RECORD_HEADER_SIZE, is(BLOCK_SIZE));
@@ -281,11 +450,13 @@ public class DeadLetterQueueReaderTest {
     @Test
     public void testWriteReadRandomEventSize() throws Exception {
         Event event = new Event(Collections.emptyMap());
-        int eventCount = 3000;
-        int maxEventSize = BLOCK_SIZE * 2;
+        int maxEventSize = BLOCK_SIZE * 2; // 64kb
+        int eventCount = 1024; // max = 1000 * 64kb = 64mb
         long startTime = System.currentTimeMillis();
 
-        try(DeadLetterQueueWriter writeManager = new DeadLetterQueueWriter(dir, 10 * 1024 * 1024, 1_000_000_000L)) {
+        try(DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilder(dir, 10 * 1024 * 1024, defaultDlqSize, Duration.ofSeconds(1))
+                .build()) {
             for (int i = 0; i < eventCount; i++) {
                 event.setField("message", generateMessageContent((int)(Math.random() * (maxEventSize))));
                 DLQEntry entry = new DLQEntry(event, "", "", String.valueOf(i), new Timestamp(startTime++));
@@ -332,7 +503,398 @@ public class DeadLetterQueueReaderTest {
                           String.valueOf(FIRST_WRITE_EVENT_COUNT));
     }
 
-    private String generateMessageContent(int size) {
+    @Test
+    public void testSeekByTimestampMoveAfterDeletedSegment() throws IOException, InterruptedException {
+        final long startTime = 1646296760000L;
+        final int eventsPerSegment = prepareFilledSegmentFiles(2, startTime);
+
+        try (DeadLetterQueueReader reader = new DeadLetterQueueReader(dir)) {
+            // remove the first segment
+            Files.delete(dir.resolve(segmentFileName(1)));
+
+            //Exercise, seek in the middle of first segment
+            final Timestamp seekTarget = new Timestamp(startTime + (eventsPerSegment / 2));
+            reader.seekToNextEvent(seekTarget);
+
+            // Verify, hit the first event of the second segment
+            DLQEntry readEntry = reader.pollEntry(100);
+            assertEquals("Must load first event of next available segment", readEntry.getReason(), String.format("%05d", eventsPerSegment));
+            final Timestamp firstEventSecondSegmentTimestamp = new Timestamp(startTime + eventsPerSegment);
+            assertEquals(firstEventSecondSegmentTimestamp, readEntry.getEntryTime());
+        }
+    }
+
+    @Test
+    public void testSeekByTimestampWhenAllSegmentsAreDeleted() throws IOException, InterruptedException {
+        final long startTime = System.currentTimeMillis();
+        final int eventsPerSegment = prepareFilledSegmentFiles(2, startTime);
+
+        try (DeadLetterQueueReader reader = new DeadLetterQueueReader(dir)) {
+            // remove the first segment
+            Files.delete(dir.resolve(segmentFileName(1)));
+            Files.delete(dir.resolve(segmentFileName(2)));
+
+            //Exercise, seek in the middle of first segment
+            final Timestamp seekTarget = new Timestamp(startTime + (eventsPerSegment / 2));
+            reader.seekToNextEvent(seekTarget);
+
+            // Verify, hit the first event of the second segment
+            DLQEntry readEntry = reader.pollEntry(100);
+            assertNull("No entry is available after all segments are deleted", readEntry);
+        }
+    }
+
+    @Test
+    public void testSeekByTimestampWhenSegmentIs1Byte() throws IOException, InterruptedException {
+        final long startTime = System.currentTimeMillis();
+        Files.write(dir.resolve("1.log"), "1".getBytes());
+
+        try (DeadLetterQueueReader reader = new DeadLetterQueueReader(dir)) {
+
+            //Exercise
+            final Timestamp seekTarget = new Timestamp(startTime);
+            reader.seekToNextEvent(seekTarget);
+
+            // Verify, no entry is available, reader should seek without exception
+            DLQEntry readEntry = reader.pollEntry(100);
+            assertNull("No entry is available after all segments are deleted", readEntry);
+        }
+    }
+
+    /**
+     * Tests concurrently reading and writing from the DLQ.
+     * @throws Exception On Failure
+     */
+    @Test
+    public void testConcurrentWriteReadRandomEventSize() throws Exception {
+        final ExecutorService exec = Executors.newSingleThreadExecutor();
+        try {
+            final int maxEventSize = BLOCK_SIZE * 2;
+            final int eventCount = 300;
+            exec.submit(() -> {
+                final Event event = new Event();
+                long startTime = System.currentTimeMillis();
+                try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                        .newBuilder(dir, 10 * 1024 * 1024, defaultDlqSize, Duration.ofSeconds(10))
+                        .build()) {
+                    for (int i = 0; i < eventCount; i++) {
+                        event.setField(
+                                "message",
+                                generateMessageContent((int) (Math.random() * (maxEventSize)))
+                        );
+                        writeManager.writeEntry(
+                                new DLQEntry(
+                                        event, "", "", String.valueOf(i),
+                                        new Timestamp(startTime++)
+                                )
+                        );
+                    }
+                } catch (final IOException ex) {
+                    throw new IllegalStateException(ex);
+                }
+            });
+
+            int i = 0;
+            try (DeadLetterQueueReader readManager = new DeadLetterQueueReader(dir)) {
+                while(i < eventCount) {
+                    DLQEntry entry = readManager.pollEntry(10_000L);
+                    if (entry != null){
+                        assertThat(entry.getReason(), is(String.valueOf(i)));
+                        i++;
+                    }
+                }
+            } catch (Exception e){
+                throw new IllegalArgumentException("Failed to process entry number" + i, e);
+            }
+        } finally {
+            exec.shutdown();
+            if (!exec.awaitTermination(2L, TimeUnit.MINUTES)) {
+                Assert.fail("Failed to shut down record writer");
+            }
+        }
+    }
+
+    @Test
+    public void testReaderFindSegmentHoleAfterSimulatingRetentionPolicyClean() throws IOException, InterruptedException {
+        final int eventsPerSegment = prepareFilledSegmentFiles(3);
+        assertEquals(319, eventsPerSegment);
+
+        int remainingEventsInSegment = eventsPerSegment;
+
+        try (DeadLetterQueueReader reader = new DeadLetterQueueReader(dir)) {
+            // read the first event to initialize reader structures
+            final DLQEntry dlqEntry = reader.pollEntry(1_000);
+            assertEquals("00000", dlqEntry.getReason());
+            remainingEventsInSegment--;
+
+            // simulate a storage policy clean, drop the middle segment file
+            final List<Path> allSegments = listSegmentsSorted(dir);
+            assertThat(allSegments.size(), greaterThanOrEqualTo(2));
+            Files.delete(allSegments.remove(0)); // tail segment
+            Files.delete(allSegments.remove(0)); // the segment after
+
+            // consume the first segment
+            for (int i = 0; i < remainingEventsInSegment; i++) {
+                reader.pollEntry(1_000);
+            }
+
+            // Exercise
+            // consume the first event after the hole
+            final DLQEntry entryAfterHole = reader.pollEntry(1_000);
+
+            assertEquals(String.format("%05d", eventsPerSegment * 2), entryAfterHole.getReason());
+        }
+    }
+
+    @Test
+    public void testReaderWhenAllRemaningSegmentsAreRemoved() throws IOException, InterruptedException {
+        int remainingEventsInSegment = prepareFilledSegmentFiles(3);
+
+        try (DeadLetterQueueReader reader = new DeadLetterQueueReader(dir)) {
+            // read the first event to initialize reader structures
+            final DLQEntry dlqEntry = reader.pollEntry(1_000);
+            assertEquals("00000", dlqEntry.getReason());
+            remainingEventsInSegment--;
+
+            // simulate a retention policy clean, that drops the remaining segments
+            Files.list(dir)
+                    .sorted()
+                    .skip(1)
+                    .forEach(DeadLetterQueueReaderTest::deleteSegment);
+
+            // consume the first segment
+            for (int i = 0; i < remainingEventsInSegment; i++) {
+                reader.pollEntry(1_000);
+            }
+
+            // Exercise
+            // consume the first event after the hole
+            final DLQEntry entryAfterHole = reader.pollEntry(1_000);
+            assertNull(entryAfterHole);
+        }
+    }
+
+    private static void deleteSegment(Path file) {
+        try {
+            Files.delete(file);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void testSeekToMiddleWhileTheLogIsRemoved() throws IOException, InterruptedException {
+        writeSegmentSizeEntries(3);
+
+        try (DeadLetterQueueReader readManager = new DeadLetterQueueReader(dir)) {
+
+            // removes 2 segments simulating a retention policy action
+            Files.delete(dir.resolve("1.log"));
+            Files.delete(dir.resolve("2.log"));
+
+            readManager.setCurrentReaderAndPosition(dir.resolve("1.log"), 1);
+
+            DLQEntry readEntry = readManager.pollEntry(100);
+            assertThat(readEntry.getReason(), equalTo(String.valueOf(3)));
+        }
+    }
+
+    @Test
+    public void testStoreReaderPositionAndRestart() throws IOException, InterruptedException {
+        // write some data into a segment file
+        Path segmentPath = dir.resolve(segmentFileName(0));
+        RecordIOWriter writer = new RecordIOWriter(segmentPath);
+        for (int j = 0; j < 10; j++) {
+            writer.writeEvent((new StringElement("" + j)).serialize());
+        }
+        writer.close();
+
+        // read the first event and save read position
+        Path currentSegment;
+        long currentPosition;
+        try (DeadLetterQueueReader reader = new DeadLetterQueueReader(dir)) {
+            byte[] rawStr = reader.pollEntryBytes();
+            assertNotNull(rawStr);
+            assertEquals("0", new String(rawStr, StandardCharsets.UTF_8));
+            currentSegment = reader.getCurrentSegment();
+            currentPosition = reader.getCurrentPosition();
+        }
+
+        // reopen the reader from the last saved position and read next element
+        try (DeadLetterQueueReader reader = new DeadLetterQueueReader(dir)) {
+            reader.setCurrentReaderAndPosition(currentSegment, currentPosition);
+
+            byte[] rawStr = reader.pollEntryBytes();
+            assertNotNull(rawStr);
+            assertEquals("1", new String(rawStr, StandardCharsets.UTF_8));
+        }
+    }
+
+    @Test
+    public void testReaderWithBlockInternalFragmentation() throws IOException, InterruptedException {
+        writeSegmentWithFirstBlockContainingInternalFragmentation();
+
+        try (DeadLetterQueueReader reader = new DeadLetterQueueReader(dir)) {
+            byte[] rawStr = reader.pollEntryBytes();
+            assertNotNull(rawStr);
+            assertEquals(stringOf(INTERNAL_FRAG_PAYLOAD_SIZE, 'A'), new String(rawStr, StandardCharsets.UTF_8));
+
+            rawStr = reader.pollEntryBytes();
+            assertNotNull(rawStr);
+            assertEquals("BBBBBBBBBB", new String(rawStr, StandardCharsets.UTF_8));
+        }
+    }
+
+    private static String stringOf(int length, char ch) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < length; i++) {
+            sb.append(ch);
+        }
+        return sb.toString();
+    }
+
+    @Test
+    public void testStoreReaderPositionWithBlocksWithInternalFragmentation() throws IOException, InterruptedException {
+        writeSegmentWithFirstBlockContainingInternalFragmentation();
+
+        // read the first event and save read position
+        Path currentSegment;
+        long currentPosition;
+        try (DeadLetterQueueReader reader = new DeadLetterQueueReader(dir)) {
+            byte[] rawStr = reader.pollEntryBytes();
+            assertNotNull(rawStr);
+            assertEquals(stringOf(INTERNAL_FRAG_PAYLOAD_SIZE, 'A'), new String(rawStr, StandardCharsets.UTF_8));
+            currentSegment = reader.getCurrentSegment();
+            currentPosition = reader.getCurrentPosition();
+        }
+
+        // reopen the reader from the last saved position and read next element
+        try (DeadLetterQueueReader reader = new DeadLetterQueueReader(dir)) {
+            reader.setCurrentReaderAndPosition(currentSegment, currentPosition);
+
+            byte[] rawStr = reader.pollEntryBytes();
+            assertNotNull(rawStr);
+            assertEquals("BBBBBBBBBB", new String(rawStr, StandardCharsets.UTF_8));
+        }
+    }
+
+    @Test
+    public void testStoreReaderPositionWithBlocksWithInternalFragmentationOnceMessageIsBiggerThenBlock() throws IOException, InterruptedException {
+        final int payloadSize = INTERNAL_FRAG_PAYLOAD_SIZE + BLOCK_SIZE;
+        byte[] almostFullBlockPayload = new byte[payloadSize];
+        Arrays.fill(almostFullBlockPayload, (byte) 'A');
+        Path segmentPath = dir.resolve(segmentFileName(0));
+        RecordIOWriter writer = new RecordIOWriter(segmentPath);
+        writer.writeEvent(almostFullBlockPayload);
+
+        // write a second segment with small payload
+        byte[] smallPayload = new byte[10];
+        Arrays.fill(smallPayload, (byte) 'B');
+        writer.writeEvent(smallPayload);
+
+        writer.close();
+
+        // read the first event and save read position
+        Path currentSegment;
+        long currentPosition;
+        try (DeadLetterQueueReader reader = new DeadLetterQueueReader(dir)) {
+            byte[] rawStr = reader.pollEntryBytes();
+            assertNotNull(rawStr);
+            assertEquals(stringOf(payloadSize, 'A'), new String(rawStr, StandardCharsets.UTF_8));
+            currentSegment = reader.getCurrentSegment();
+            currentPosition = reader.getCurrentPosition();
+        }
+
+        // reopen the reader from the last saved position and read next element
+        try (DeadLetterQueueReader reader = new DeadLetterQueueReader(dir)) {
+            reader.setCurrentReaderAndPosition(currentSegment, currentPosition);
+
+            byte[] rawStr = reader.pollEntryBytes();
+            assertNotNull(rawStr);
+            assertEquals("BBBBBBBBBB", new String(rawStr, StandardCharsets.UTF_8));
+        }
+    }
+
+    private void writeSegmentWithFirstBlockContainingInternalFragmentation() throws IOException {
+        byte[] almostFullBlockPayload = new byte[INTERNAL_FRAG_PAYLOAD_SIZE];
+        Arrays.fill(almostFullBlockPayload, (byte) 'A');
+        Path segmentPath = dir.resolve(segmentFileName(0));
+        RecordIOWriter writer = new RecordIOWriter(segmentPath);
+        writer.writeEvent(almostFullBlockPayload);
+
+        // write a second segment with small payload
+        byte[] smallPayload = new byte[10];
+        Arrays.fill(smallPayload, (byte) 'B');
+        writer.writeEvent(smallPayload);
+
+        writer.close();
+    }
+
+    /**
+     * Produces a {@link Timestamp} whose epoch milliseconds is _near_ the provided value
+     * such that the result will have a constant serialization length of 24 bytes.
+     *
+     * If the provided epoch millis is exactly a whole second with no remainder, one millisecond
+     * is added to the value to ensure that there are remainder millis.
+     *
+     * @param millis
+     * @return
+     */
+    static Timestamp constantSerializationLengthTimestamp(long millis) {
+        if ( millis % 1000 == 0) { millis += 1; }
+
+        final Timestamp timestamp = new Timestamp(millis);
+        assertThat(String.format("pre-validation: expected timestamp to serialize to exactly 24 bytes, got `%s`", timestamp),
+                   timestamp.serialize().length, is(24));
+        return new Timestamp(millis);
+    }
+
+    static Timestamp constantSerializationLengthTimestamp(Clock clock) {
+        return constantSerializationLengthTimestamp(clock.instant().toEpochMilli());
+    }
+
+    private Timestamp constantSerializationLengthTimestamp() {
+        return constantSerializationLengthTimestamp(System.currentTimeMillis());
+    }
+
+    private static Timestamp constantSerializationLengthTimestamp(final Timestamp basis) {
+        return constantSerializationLengthTimestamp(basis.toEpochMilli());
+    }
+
+    /**
+     * Because many of the tests here rely on _exact_ alignment of serialization byte size,
+     * and the {@link Timestamp} has a variable-sized serialization length, we need a way to
+     * generated events whose serialization length will not vary depending on the millisecond
+     * in which the test was run.
+     *
+     * This method uses the normal method of creating an event, and ensures that the value of
+     * the timestamp field will serialize to a constant length, truncating precision and
+     * possibly shifting the value to ensure that there is sub-second remainder millis.
+     *
+     * @param data
+     * @return
+     */
+    static Event createEventWithConstantSerializationOverhead(final Map<String, Object> data) {
+        final Event event = new Event(data);
+
+        final Timestamp existingTimestamp = event.getTimestamp();
+        if (existingTimestamp != null) {
+            event.setTimestamp(constantSerializationLengthTimestamp(existingTimestamp));
+        }
+
+        return event;
+    }
+
+    private static Event createEventWithConstantSerializationOverhead() {
+        return createEventWithConstantSerializationOverhead(Collections.emptyMap());
+    }
+
+    private int randomBetween(int from, int to){
+        Random r = new Random();
+        return r.nextInt((to - from) + 1) + from;
+    }
+
+    static String generateMessageContent(int size) {
         char[] valid = new char[RecordType.values().length + 1];
         int j = 0;
         valid[j] = 'x';
@@ -357,11 +919,209 @@ public class DeadLetterQueueReaderTest {
     }
 
     private void writeEntries(final Event event, int offset, final int numberOfEvents, long startTime) throws IOException {
-        try (DeadLetterQueueWriter writeManager = new DeadLetterQueueWriter(dir, 10 * 1024 * 1024, 10_000_000)) {
+        try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilder(dir, 10 * 1024 * 1024, defaultDlqSize, Duration.ofSeconds(1))
+                .build()) {
             for (int i = offset; i <= offset + numberOfEvents; i++) {
                 DLQEntry entry = new DLQEntry(event, "foo", "bar", String.valueOf(i), new Timestamp(startTime++));
                 writeManager.writeEntry(entry);
             }
         }
     }
+
+    private int prepareFilledSegmentFiles(int segments) throws IOException {
+        return prepareFilledSegmentFiles(segments, System.currentTimeMillis());
+    }
+
+    private int prepareFilledSegmentFiles(int segments, long start) throws IOException {
+        final Event event = createEventWithConstantSerializationOverhead(Collections.emptyMap());
+        event.setField("message", generateMessageContent(32479));
+
+        DLQEntry entry = new DLQEntry(event, "", "", String.format("%05d", 1), constantSerializationLengthTimestamp(start));
+        assertEquals("Serialized dlq entry + header MUST be 32Kb (size of a block)", BLOCK_SIZE, entry.serialize().length + 13);
+
+        final int maxSegmentSize = 10 * MB;
+        final int loopPerSegment = (int) Math.floor((maxSegmentSize - 1.0) / BLOCK_SIZE);
+        try (DeadLetterQueueWriter writer = DeadLetterQueueWriter
+                .newBuilder(dir, maxSegmentSize, defaultDlqSize, Duration.ofSeconds(1))
+                .build()) {
+            final int loops = loopPerSegment * segments;
+            for (int i = 0; i < loops; i++) {
+                entry = new DLQEntry(event, "", "", String.format("%05d", i), constantSerializationLengthTimestamp(start++));
+                writer.writeEntry(entry);
+            }
+        }
+
+        assertEquals(segments, Files.list(dir).count());
+        return loopPerSegment;
+    }
+
+    @Test
+    public void testRestartFromCommitPointRealData() throws IOException, InterruptedException, URISyntaxException {
+        URL url = this.getClass().getResource("1.log");
+        Path path = Paths.get(url.toURI());
+
+        try (DeadLetterQueueReader reader = new DeadLetterQueueReader(path.getParent())) {
+            reader.setCurrentReaderAndPosition(path, 0x3593F0);
+
+            for (int i = 0; i < 10_000 - 3_376; i++) {
+                byte[] rawStr = reader.pollEntryBytes();
+                assertNotNull(rawStr);
+                assertThat(new String(rawStr, StandardCharsets.UTF_8), containsString("Could not index event to Elasticsearch. status: 400"));
+            }
+        }
+    }
+
+    static class MockSegmentListener implements SegmentListener {
+        boolean notified = false;
+        long events = 0L;
+        int segments = 0;
+
+        @Override
+        public void segmentCompleted() {
+            notified = true;
+        }
+
+        @Override
+        public void segmentsDeleted(int numberOfSegments, long numberOfEvents) {
+            events += numberOfEvents;
+            segments += numberOfSegments;
+        }
+    }
+
+    @Test
+    public void testReaderWithCleanConsumedIsEnabledDeleteFullyConsumedSegmentsAfterBeingAcknowledged() throws IOException, InterruptedException {
+        final int eventsPerSegment = prepareFilledSegmentFiles(2);
+
+        MockSegmentListener listener = new MockSegmentListener();
+
+        try (DeadLetterQueueReader reader = new DeadLetterQueueReader(dir, true, listener)) {
+            // to reach endOfStream on the first segment, a read more than the size has to be done.
+            for (int i = 0; i < eventsPerSegment + 1; i++) {
+                reader.pollEntry(1_000);
+                reader.markForDelete();
+            }
+
+            // Verify
+            Set<String> segments = DeadLetterQueueUtils.listSegmentPaths(dir)
+                    .map(Path::getFileName)
+                    .map(Path::toString)
+                    .collect(Collectors.toSet());
+            assertEquals("Only head segment file MUST be present", Set.of("2.log"), segments);
+            assertTrue("Reader's client must be notified of the segment deletion", listener.notified);
+            assertEquals("Must report the deletion of 1 segment", 1, listener.segments);
+            assertEquals("Must report the correct number of deleted events", eventsPerSegment, listener.events);
+        }
+    }
+
+    @Test
+    public void testReaderWithCleanConsumedIsEnabledWhenSetCurrentPositionThenCleanupTrashedSegments() throws IOException {
+        prepareFilledSegmentFiles(2);
+
+        try (DeadLetterQueueReader reader = new DeadLetterQueueReader(dir, true, new MockSegmentListener())) {
+            final List<Path> allSegments = listSegmentsSorted(dir);
+            verifySegmentFiles(allSegments, "1.log", "2.log");
+
+            Path lastSegmentPath = allSegments.get(1);
+            reader.setCurrentReaderAndPosition(lastSegmentPath, VERSION_SIZE);
+
+            // verify
+            Set<Path> segmentFiles = DeadLetterQueueUtils.listSegmentPaths(dir).collect(Collectors.toSet());
+            assertEquals(Set.of(lastSegmentPath), segmentFiles);
+            assertEquals("Just the 1.log segment should be marked as consumed", 1, reader.getConsumedSegments());
+        }
+    }
+
+    private void verifySegmentFiles(List<Path> allSegments, String... fileNames) {
+        List<String> segmentPathNames = allSegments.stream()
+                .map(Path::getFileName)
+                .map(Path::toString)
+                .collect(Collectors.toList());
+        assertEquals(Arrays.asList(fileNames), segmentPathNames);
+    }
+
+    private List<Path> listSegmentsSorted(Path dir) throws IOException {
+        return DeadLetterQueueUtils.listSegmentPaths(dir)
+                .sorted(Comparator.comparingInt(DeadLetterQueueUtils::extractSegmentId))
+                .collect(Collectors.toList());
+    }
+
+
+    @Test
+    public void testReaderCleanMultipleConsumedSegmentsAfterMarkForDeleteAndDontTouchLockOrWriterHeadFiles() throws IOException, InterruptedException {
+        int eventsPerSegment = prepareFilledSegmentFiles(3);
+        // insert also a .lock file, must be the oldest one
+        Path lockFile = Files.createFile(dir.resolve(".lock"));
+        FileTime oneSecondAgo = FileTime.from(Instant.now().minusMillis(1_000));
+        Files.setAttribute(lockFile, "basic:lastModifiedTime", oneSecondAgo); // this attribute is used in segments sorting
+        // simulate a writer's segment head
+        Files.createFile(dir.resolve("4.log.tmp"));
+
+        MockSegmentListener listener = new MockSegmentListener();
+        try (DeadLetterQueueReader reader = new DeadLetterQueueReader(dir, true, listener)) {
+            verifySegmentFiles(listSegmentsSorted(dir), "1.log", "2.log", "3.log");
+
+            // consume fully two segments plus one more event to trigger the endOfStream on the second segment
+            for (int i = 0; i < (2 * eventsPerSegment) + 1; i++) {
+                reader.pollEntry(100L);
+            }
+
+            verifySegmentFiles(listSegmentsSorted(dir), "1.log", "2.log", "3.log");
+
+            reader.markForDelete();
+
+            verifySegmentFiles(listSegmentsSorted(dir), "3.log");
+
+            assertEquals("Must report the deletion of 2 segments", 2, listener.segments);
+            assertEquals("Must report the correct number of deleted events", eventsPerSegment * listener.segments, listener.events);
+
+            // verify no other files are removed
+            try (Stream<Path> stream = Files.list(dir)) {
+                Set<String> files = stream
+                        .map(Path::getFileName)
+                        .map(Path::toString)
+                        .collect(Collectors.toSet());
+                assertTrue("No segments file remain untouched", files.containsAll(Arrays.asList(".lock", "4.log.tmp")));
+            }
+        }
+    }
+
+    @Test
+    public void testReaderDoesntIncrementStatisticsOnDeletionError() throws IOException, InterruptedException {
+        int eventsPerSegment = prepareFilledSegmentFiles(3);
+
+        MockSegmentListener listener = new MockSegmentListener();
+        try (DeadLetterQueueReader reader = new DeadLetterQueueReader(dir, true, listener)) {
+            verifySegmentFiles(listSegmentsSorted(dir), "1.log", "2.log", "3.log");
+
+            // consume fully two segments plus one more event to trigger the endOfStream on the second segment
+            for (int i = 0; i < (2 * eventsPerSegment) + 1; i++) {
+                reader.pollEntry(100L);
+            }
+
+            verifySegmentFiles(listSegmentsSorted(dir), "1.log", "2.log", "3.log");
+
+            // simulate an error in last consumed segment (2.log)
+            Files.delete(dir.resolve("2.log"));
+
+            reader.markForDelete();
+
+            verifySegmentFiles(listSegmentsSorted(dir), "3.log");
+
+            assertEquals("Must report the deletion of 1 segment", 1, listener.segments);
+            assertEquals("Must report the correct number of deleted events", eventsPerSegment * listener.segments, listener.events);
+        }
+    }
+
+    @Test
+    @SuppressWarnings("try")
+    public void testReaderLockProhibitMultipleInstances() throws IOException {
+        try (DeadLetterQueueReader reader = new DeadLetterQueueReader(dir, true, new MockSegmentListener())) {
+            try (DeadLetterQueueReader secondReader = new DeadLetterQueueReader(dir, true, new MockSegmentListener())) {
+            } catch (LockException lockException) {
+                // ok it's expected to happen here
+                assertThat(lockException.getMessage(), startsWith("Existing `dlg_reader.lock` file"));
+            }
+        }
+    }
 }
diff --git a/logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueTestUtils.java b/logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueTestUtils.java
new file mode 100644
index 000000000..36b284d7a
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueTestUtils.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.common.io;
+
+import static org.logstash.common.io.RecordIOWriter.BLOCK_SIZE;
+import static org.logstash.common.io.RecordIOWriter.VERSION_SIZE;
+
+public class DeadLetterQueueTestUtils {
+    public static final int MB = 1024 * 1024;
+    public static final int GB = 1024 * 1024 * 1024;
+    public static final int FULL_SEGMENT_FILE_SIZE = 319 * BLOCK_SIZE + VERSION_SIZE; // 319 records that fills completely a block plus the 1 byte header of the segment file
+}
diff --git a/logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueWriterAgeRetentionTest.java b/logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueWriterAgeRetentionTest.java
new file mode 100644
index 000000000..6edcf46b9
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueWriterAgeRetentionTest.java
@@ -0,0 +1,395 @@
+package org.logstash.common.io;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.Clock;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.util.Collections;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.awaitility.Awaitility;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.logstash.DLQEntry;
+import org.logstash.Event;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeThat;
+import static org.logstash.common.io.DeadLetterQueueTestUtils.FULL_SEGMENT_FILE_SIZE;
+import static org.logstash.common.io.DeadLetterQueueTestUtils.GB;
+import static org.logstash.common.io.DeadLetterQueueTestUtils.MB;
+import static org.logstash.common.io.RecordIOWriter.BLOCK_SIZE;
+import static org.logstash.common.io.RecordIOWriter.RECORD_HEADER_SIZE;
+import static org.logstash.common.io.RecordIOWriter.VERSION_SIZE;
+
+public class DeadLetterQueueWriterAgeRetentionTest {
+
+    // 319 events of 32Kb generates 10 Mb of data
+    private static final int EVENTS_TO_FILL_A_SEGMENT = 319;
+    private ForwardableClock fakeClock;
+
+    static class ForwardableClock extends Clock {
+
+        private Clock currentClock;
+
+        ForwardableClock(Clock clock) {
+            this.currentClock = clock;
+        }
+
+        void forward(Duration period) {
+            currentClock = Clock.offset(currentClock, period);
+        }
+
+        @Override
+        public ZoneId getZone() {
+            return currentClock.getZone();
+        }
+
+        @Override
+        public Clock withZone(ZoneId zone) {
+            return currentClock.withZone(zone);
+        }
+
+        @Override
+        public Instant instant() {
+            return currentClock.instant();
+        }
+    }
+
+    private static class SynchronizedScheduledService implements DeadLetterQueueWriter.SchedulerService {
+
+        private Runnable action;
+
+        @Override
+        public void repeatedAction(Runnable action) {
+            this.action = action;
+        }
+
+        @Override
+        public void shutdown() {
+            // Noop
+        }
+
+        void executeAction() {
+            action.run();
+        }
+    }
+
+    private Path dir;
+
+    @Rule
+    public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+    private SynchronizedScheduledService synchScheduler;
+
+    @Before
+    public void setUp() throws Exception {
+        dir = temporaryFolder.newFolder().toPath();
+        final Clock pointInTimeFixedClock = Clock.fixed(Instant.parse("2022-02-22T10:20:30.00Z"), ZoneId.of("Europe/Rome"));
+        fakeClock = new ForwardableClock(pointInTimeFixedClock);
+        synchScheduler = new SynchronizedScheduledService();
+    }
+
+    @Test
+    public void testRemovesOlderSegmentsWhenWriteOnReopenedDLQContainingExpiredSegments() throws IOException {
+        final Event event = DeadLetterQueueReaderTest.createEventWithConstantSerializationOverhead(Collections.emptyMap());
+        event.setField("message", DeadLetterQueueReaderTest.generateMessageContent(32479));
+
+        final Clock pointInTimeFixedClock = Clock.fixed(Instant.parse("2022-02-22T10:20:30.00Z"), ZoneId.of("Europe/Rome"));
+        final ForwardableClock fakeClock = new ForwardableClock(pointInTimeFixedClock);
+        // given DLQ with first segment filled of expired events
+        prepareDLQWithFirstSegmentOlderThanRetainPeriod(event, fakeClock, Duration.ofDays(2));
+
+        // Exercise
+        final long prevQueueSize;
+        final long beheadedQueueSize;
+        try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilder(dir, 10 * MB, 1 * GB, Duration.ofSeconds(1))
+                .retentionTime(Duration.ofDays(2))
+                .clock(fakeClock)
+                .build()) {
+            prevQueueSize = writeManager.getCurrentQueueSize();
+            assertEquals("Queue size is composed of one just one empty file with version byte", VERSION_SIZE, prevQueueSize);
+
+            // write new entry that trigger clean of age retained segment
+            DLQEntry entry = new DLQEntry(event, "", "", String.format("%05d", 320), DeadLetterQueueReaderTest.constantSerializationLengthTimestamp(System.currentTimeMillis()));
+            // when a new write happens in a reopened queue
+            writeManager.writeEntry(entry);
+            beheadedQueueSize = writeManager.getCurrentQueueSize();
+            assertEquals("No event is expired after reopen of DLQ", 0, writeManager.getExpiredEvents());
+        }
+
+        // then the age policy must remove the expired segments
+        assertEquals("Write should push off the age expired segments", VERSION_SIZE + BLOCK_SIZE, beheadedQueueSize);
+    }
+
+    private void prepareDLQWithFirstSegmentOlderThanRetainPeriod(Event event, ForwardableClock fakeClock, Duration retainedPeriod) throws IOException {
+        final Duration littleMoreThanRetainedPeriod = retainedPeriod.plusMinutes(1);
+        long startTime = fakeClock.instant().minus(littleMoreThanRetainedPeriod).toEpochMilli();
+        int messageSize = 0;
+        try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilder(dir, 10 * MB, 1 * GB, Duration.ofSeconds(1))
+                .retentionTime(retainedPeriod)
+                .clock(fakeClock)
+                .build()) {
+
+            // 320 generates 10 Mb of data
+            for (int i = 0; i < EVENTS_TO_FILL_A_SEGMENT; i++) {
+                DLQEntry entry = new DLQEntry(event, "", "", String.format("%05d", i), DeadLetterQueueReaderTest.constantSerializationLengthTimestamp(startTime++));
+                final int serializationLength = entry.serialize().length;
+                assertEquals("setup: serialized entry size...", serializationLength + RECORD_HEADER_SIZE, BLOCK_SIZE);
+                messageSize += serializationLength;
+                writeManager.writeEntry(entry);
+            }
+            assertThat(messageSize, is(greaterThan(BLOCK_SIZE)));
+        }
+    }
+
+    @Test
+    public void testRemovesOlderSegmentsWhenWritesIntoDLQContainingExpiredSegments() throws IOException {
+        final Event event = DeadLetterQueueReaderTest.createEventWithConstantSerializationOverhead(Collections.emptyMap());
+        event.setField("message", DeadLetterQueueReaderTest.generateMessageContent(32479));
+
+        long startTime = fakeClock.instant().toEpochMilli();
+        int messageSize = 0;
+
+        final Duration retention = Duration.ofDays(2);
+        try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilder(dir, 10 * MB, 1 * GB, Duration.ofSeconds(1))
+                .retentionTime(retention)
+                .clock(fakeClock)
+                .build()) {
+
+            // 319 generates 10 Mb of data
+            for (int i = 0; i < EVENTS_TO_FILL_A_SEGMENT; i++) {
+                DLQEntry entry = new DLQEntry(event, "", "", String.format("%05d", i), DeadLetterQueueReaderTest.constantSerializationLengthTimestamp(startTime++));
+                final int serializationLength = entry.serialize().length;
+                assertEquals("setup: serialized entry size...", serializationLength + RECORD_HEADER_SIZE, BLOCK_SIZE);
+                messageSize += serializationLength;
+                writeManager.writeEntry(entry);
+            }
+            assertThat(messageSize, is(greaterThan(BLOCK_SIZE)));
+
+            // Exercise
+            // write an event that goes in second segment
+            fakeClock.forward(retention.plusSeconds(1));
+            final long prevQueueSize = writeManager.getCurrentQueueSize();
+            assertEquals("Queue size is composed of one full segment files", FULL_SEGMENT_FILE_SIZE, prevQueueSize);
+
+            // write new entry that trigger clean of age retained segment
+            DLQEntry entry = new DLQEntry(event, "", "", String.format("%05d", 320), DeadLetterQueueReaderTest.constantSerializationLengthTimestamp(System.currentTimeMillis()));
+            // when a new write happens in the same writer
+            writeManager.writeEntry(entry);
+            final long beheadedQueueSize = writeManager.getCurrentQueueSize();
+
+            // then the age policy must remove the expired segments
+            assertEquals("Write should push off the age expired segments",VERSION_SIZE + BLOCK_SIZE, beheadedQueueSize);
+            assertEquals("The number of events removed should count as expired", EVENTS_TO_FILL_A_SEGMENT, writeManager.getExpiredEvents());
+        }
+    }
+
+    @Test
+    public void testRemoveMultipleOldestSegmentsWhenRetainedAgeIsExceeded() throws IOException {
+        final Event event = DeadLetterQueueReaderTest.createEventWithConstantSerializationOverhead(Collections.emptyMap());
+        event.setField("message", DeadLetterQueueReaderTest.generateMessageContent(32479));
+
+        long startTime = fakeClock.instant().toEpochMilli();
+        int messageSize = 0;
+
+        final Duration retention = Duration.ofDays(2);
+        try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilder(dir, 10 * MB, 1 * GB, Duration.ofSeconds(1))
+                .retentionTime(retention)
+                .clock(fakeClock)
+                .build()) {
+
+            // given DLQ with a couple of segments filled of expired events
+            // 319 generates 10 Mb of data
+            for (int i = 0; i < EVENTS_TO_FILL_A_SEGMENT * 2; i++) {
+                DLQEntry entry = new DLQEntry(event, "", "", String.format("%05d", i), DeadLetterQueueReaderTest.constantSerializationLengthTimestamp(startTime++));
+                final int serializationLength = entry.serialize().length;
+                assertEquals("setup: serialized entry size...", serializationLength + RECORD_HEADER_SIZE, BLOCK_SIZE);
+                messageSize += serializationLength;
+                writeManager.writeEntry(entry);
+            }
+            assertThat(messageSize, is(greaterThan(BLOCK_SIZE)));
+
+            // when the age expires the retention and a write is done
+            // make the retention age to pass for the first 2 full segments
+            fakeClock.forward(retention.plusSeconds(1));
+
+            // Exercise
+            // write an event that goes in second segment
+            final long prevQueueSize = writeManager.getCurrentQueueSize();
+            assertEquals("Queue size is composed of 2 full segment files", 2 * FULL_SEGMENT_FILE_SIZE, prevQueueSize);
+
+            // write new entry that trigger clean of age retained segment
+            DLQEntry entry = new DLQEntry(event, "", "", String.format("%05d", 320), DeadLetterQueueReaderTest.constantSerializationLengthTimestamp(System.currentTimeMillis()));
+            writeManager.writeEntry(entry);
+            final long beheadedQueueSize = writeManager.getCurrentQueueSize();
+
+            // then the age policy must remove the expired segments
+            assertEquals("Write should push off the age expired segments",VERSION_SIZE + BLOCK_SIZE, beheadedQueueSize);
+            assertEquals("The number of events removed should count as expired", EVENTS_TO_FILL_A_SEGMENT * 2, writeManager.getExpiredEvents());
+        }
+    }
+
+    @Test
+    public void testDLQWriterCloseRemovesExpiredSegmentWhenCurrentWriterIsUntouched() throws IOException {
+        final Event event = DeadLetterQueueReaderTest.createEventWithConstantSerializationOverhead(
+                Collections.singletonMap("message", "Not so important content"));
+
+        // write some data in the new segment
+        final Clock pointInTimeFixedClock = Clock.fixed(Instant.now(), ZoneId.of("Europe/Rome"));
+        final ForwardableClock fakeClock = new ForwardableClock(pointInTimeFixedClock);
+
+        Duration retainedPeriod = Duration.ofDays(1);
+        long startTime = fakeClock.instant().toEpochMilli();
+        try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilderWithoutFlusher(dir, 10 * MB, 1 * GB)
+                .retentionTime(retainedPeriod)
+                .clock(fakeClock)
+                .build()) {
+
+            DLQEntry entry = new DLQEntry(event, "", "", "00001", DeadLetterQueueReaderTest.constantSerializationLengthTimestamp(startTime));
+            writeManager.writeEntry(entry);
+        }
+
+        Set<String> segments = listFileNames(dir);
+        assertEquals("Once closed the just written segment, only 1 file must be present", Set.of("1.log"), segments);
+
+        // move forward 3 days, so that the first segment becomes eligible to be deleted by the age retention policy
+        fakeClock.forward(Duration.ofDays(3));
+        try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilderWithoutFlusher(dir, 10 * MB, 1 * GB)
+                .retentionTime(retainedPeriod)
+                .clock(fakeClock)
+                .build()) {
+            // leave it untouched
+            assertTrue(writeManager.isOpen());
+
+            // close so that it should clean the expired segments, close in implicitly invoked by try-with-resource statement
+        }
+
+        Set<String> actual = listFileNames(dir);
+        assertThat("Age expired segment is removed", actual, not(hasItem("1.log")));
+    }
+
+    private Set<String> listFileNames(Path path) throws IOException {
+        return Files.list(path)
+                .map(Path::getFileName)
+                .map(Path::toString)
+                .collect(Collectors.toSet());
+    }
+
+    @Test
+    public void testDLQWriterFlusherRemovesExpiredSegmentWhenCurrentWriterIsStale() throws IOException {
+        final Event event = DeadLetterQueueReaderTest.createEventWithConstantSerializationOverhead(
+                Collections.singletonMap("message", "Not so important content"));
+
+        // write some data in the new segment
+        final Clock pointInTimeFixedClock = Clock.fixed(Instant.now(), ZoneId.of("Europe/Rome"));
+        final ForwardableClock fakeClock = new ForwardableClock(pointInTimeFixedClock);
+
+        Duration retainedPeriod = Duration.ofDays(1);
+        Duration flushInterval = Duration.ofSeconds(1);
+        try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilder(dir, 10 * MB, 1 * GB, flushInterval)
+                .retentionTime(retainedPeriod)
+                .clock(fakeClock)
+                .build()) {
+
+            DLQEntry entry = new DLQEntry(event, "", "", "00001", DeadLetterQueueReaderTest.constantSerializationLengthTimestamp(fakeClock));
+            writeManager.writeEntry(entry);
+        }
+
+        Set<String> segments = listFileNames(dir);
+        assertEquals("Once closed the just written segment, only 1 file must be present", Set.of("1.log"), segments);
+
+        // move forward 3 days, so that the first segment becomes eligible to be deleted by the age retention policy
+        fakeClock.forward(Duration.ofDays(3));
+        try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilderWithoutFlusher(dir, 10 * MB, 1 * GB)
+                .retentionTime(retainedPeriod)
+                .clock(fakeClock)
+                .flusherService(synchScheduler)
+                .build()) {
+            // write an element to make head segment stale
+            final Event anotherEvent = DeadLetterQueueReaderTest.createEventWithConstantSerializationOverhead(
+                    Collections.singletonMap("message", "Another not so important content"));
+            DLQEntry entry = new DLQEntry(anotherEvent, "", "", "00002", DeadLetterQueueReaderTest.constantSerializationLengthTimestamp(fakeClock));
+            writeManager.writeEntry(entry);
+
+            triggerExecutionOfFlush();
+
+            // flusher should clean the expired segments
+            Set<String> actual = listFileNames(dir);
+            assertThat("Age expired segment is removed by flusher", actual, not(hasItem("1.log")));
+        }
+    }
+
+    @Test
+    public void testDLQWriterFlusherRemovesExpiredSegmentWhenCurrentHeadSegmentIsEmpty() throws IOException {
+        final Event event = DeadLetterQueueReaderTest.createEventWithConstantSerializationOverhead(
+                Collections.singletonMap("message", "Not so important content"));
+
+        // write some data in the new segment
+        final Clock pointInTimeFixedClock = Clock.fixed(Instant.now(), ZoneId.of("Europe/Rome"));
+        final ForwardableClock fakeClock = new ForwardableClock(pointInTimeFixedClock);
+
+        Duration retainedPeriod = Duration.ofDays(1);
+        try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilderWithoutFlusher(dir, 10 * MB, 1 * GB)
+                .retentionTime(retainedPeriod)
+                .clock(fakeClock)
+                .flusherService(synchScheduler)
+                .build()) {
+
+            DLQEntry entry = new DLQEntry(event, "", "", "00001", DeadLetterQueueReaderTest.constantSerializationLengthTimestamp(fakeClock));
+            Instant beforeWriteEntry = Instant.now();
+            writeManager.writeEntry(entry);
+
+            // WARN: writeEntry set the lastWrite instant which is later checked by isStale in RecordIOWriter
+            // against now - flush period. Given that flush period is 0, it could be that now is the same
+            // instant as lastWrite, while should be greater than, so put an artificial small delay
+            Awaitility.await("Let the time flow a little so that last write is recognized to be in the past")
+                      .atMost(Duration.ofSeconds(1))
+                      .until(() -> Instant.now().isAfter(beforeWriteEntry));
+
+            triggerExecutionOfFlush();
+
+            // wait the flush interval so that the current head segment is sealed
+            Awaitility.await("After the flush interval head segment is sealed and a fresh empty head is created")
+                    .atMost(Duration.ofSeconds(1))
+                    .until(()  -> Set.of("1.log", "2.log.tmp", ".lock").equals(listFileNames(dir)));
+
+            // move forward the time so that the age policy is kicked in when the current head segment is empty
+            fakeClock.forward(retainedPeriod.plusMinutes(2));
+
+            triggerExecutionOfFlush();
+
+            // wait the flush period
+            Awaitility.await("Remains the untouched head segment while the expired is removed")
+                    // wait at least the flush period
+                    .atMost(Duration.ofSeconds(1))
+                    // check the expired sealed segment is removed
+                    .until(()  -> Set.of("2.log.tmp", ".lock").equals(listFileNames(dir)));
+        }
+    }
+
+    private void triggerExecutionOfFlush() {
+        synchScheduler.executeAction();
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueWriterTest.java b/logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueWriterTest.java
index 61bd9a681..040a06dbd 100644
--- a/logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueWriterTest.java
+++ b/logstash-core/src/test/java/org/logstash/common/io/DeadLetterQueueWriterTest.java
@@ -25,7 +25,18 @@ import java.nio.channels.OverlappingFileLockException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
+import org.awaitility.Awaitility;
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -33,17 +44,22 @@ import org.junit.rules.TemporaryFolder;
 import org.logstash.DLQEntry;
 import org.logstash.Event;
 import org.logstash.LockException;
+import org.logstash.Timestamp;
 
 import static junit.framework.TestCase.assertFalse;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.junit.Assert.*;
+import static org.logstash.common.io.DeadLetterQueueTestUtils.FULL_SEGMENT_FILE_SIZE;
+import static org.logstash.common.io.DeadLetterQueueTestUtils.MB;
+import static org.logstash.common.io.RecordIOWriter.BLOCK_SIZE;
 import static org.logstash.common.io.RecordIOWriter.RECORD_HEADER_SIZE;
 import static org.logstash.common.io.RecordIOWriter.VERSION_SIZE;
 
 public class DeadLetterQueueWriterTest {
+
     private Path dir;
 
     @Rule
@@ -59,7 +75,9 @@ public class DeadLetterQueueWriterTest {
     @Test
     public void testLockFileManagement() throws Exception {
         Path lockFile = dir.resolve(".lock");
-        DeadLetterQueueWriter writer = new DeadLetterQueueWriter(dir, 1000, 1000000);
+        DeadLetterQueueWriter writer = DeadLetterQueueWriter
+                .newBuilder(dir, 1_000, 100_000, Duration.ofSeconds(1))
+                .build();
         assertTrue(Files.exists(lockFile));
         writer.close();
         assertFalse(Files.exists(lockFile));
@@ -67,9 +85,13 @@ public class DeadLetterQueueWriterTest {
 
     @Test
     public void testFileLocking() throws Exception {
-        DeadLetterQueueWriter writer = new DeadLetterQueueWriter(dir, 1000, 1000000);
+        DeadLetterQueueWriter writer = DeadLetterQueueWriter
+                .newBuilder(dir, 1_000, 100_000, Duration.ofSeconds(1))
+                .build();
         try {
-            new DeadLetterQueueWriter(dir, 1000, 100000);
+            DeadLetterQueueWriter
+                    .newBuilder(dir, 100, 1_000, Duration.ofSeconds(1))
+                    .build();
             fail();
         } catch (LockException e) {
         } finally {
@@ -81,7 +103,9 @@ public class DeadLetterQueueWriterTest {
     public void testUncleanCloseOfPreviousWriter() throws Exception {
         Path lockFilePath = dir.resolve(".lock");
         boolean created = lockFilePath.toFile().createNewFile();
-        DeadLetterQueueWriter writer = new DeadLetterQueueWriter(dir, 1000, 1000000);
+        DeadLetterQueueWriter writer = DeadLetterQueueWriter
+                .newBuilder(dir, 1_000, 100_000, Duration.ofSeconds(1))
+                .build();
 
         FileChannel channel = FileChannel.open(lockFilePath, StandardOpenOption.WRITE);
         try {
@@ -96,7 +120,9 @@ public class DeadLetterQueueWriterTest {
 
     @Test
     public void testWrite() throws Exception {
-        DeadLetterQueueWriter writer = new DeadLetterQueueWriter(dir, 1000, 1000000);
+        DeadLetterQueueWriter writer = DeadLetterQueueWriter
+                .newBuilder(dir, 1_000, 100_000, Duration.ofSeconds(1))
+                .build();
         DLQEntry entry = new DLQEntry(new Event(), "type", "id", "reason");
         writer.writeEntry(entry);
         writer.close();
@@ -109,9 +135,11 @@ public class DeadLetterQueueWriterTest {
         DLQEntry entry = new DLQEntry(new Event(), "type", "id", "reason");
         DLQEntry dlqEntry = new DLQEntry(dlqEvent, "type", "id", "reason");
 
-        try (DeadLetterQueueWriter writer = new DeadLetterQueueWriter(dir, 1000, 1000000);) {
+        try (DeadLetterQueueWriter writer = DeadLetterQueueWriter
+                .newBuilder(dir, 1_000, 100_000, Duration.ofSeconds(1))
+                .build()) {
             writer.writeEntry(entry);
-            long dlqLengthAfterEvent  = dlqLength();
+            long dlqLengthAfterEvent = dlqLength();
 
             assertThat(dlqLengthAfterEvent, is(not(EMPTY_DLQ)));
             writer.writeEntry(dlqEntry);
@@ -124,29 +152,468 @@ public class DeadLetterQueueWriterTest {
         DLQEntry entry = new DLQEntry(new Event(), "type", "id", "reason");
 
         int payloadLength = RECORD_HEADER_SIZE + VERSION_SIZE + entry.serialize().length;
-        final int MESSAGE_COUNT= 5;
+        final int MESSAGE_COUNT = 5;
         long MAX_QUEUE_LENGTH = payloadLength * MESSAGE_COUNT;
-        DeadLetterQueueWriter writer = null;
 
-        try{
-            writer = new DeadLetterQueueWriter(dir, payloadLength, MAX_QUEUE_LENGTH);
+
+        try (DeadLetterQueueWriter writer = DeadLetterQueueWriter
+                .newBuilder(dir, payloadLength, MAX_QUEUE_LENGTH, Duration.ofSeconds(1))
+                .build()) {
+
             for (int i = 0; i < MESSAGE_COUNT; i++)
                 writer.writeEntry(entry);
 
+            // Sleep to allow flush to happen
+            sleep(3000);
             assertThat(dlqLength(), is(MAX_QUEUE_LENGTH));
             writer.writeEntry(entry);
+            sleep(2000);
             assertThat(dlqLength(), is(MAX_QUEUE_LENGTH));
-        } finally {
-            if (writer != null) {
-                writer.close();
+        }
+    }
+
+    @Test
+    public void testSlowFlush() throws Exception {
+        try (DeadLetterQueueWriter writer = DeadLetterQueueWriter
+                .newBuilder(dir, 1_000, 1_000_000, Duration.ofSeconds(1))
+                .build()) {
+            DLQEntry entry = new DLQEntry(new Event(), "type", "id", "1");
+            writer.writeEntry(entry);
+            entry = new DLQEntry(new Event(), "type", "id", "2");
+            // Sleep to allow flush to happen\
+            sleep(3000);
+            writer.writeEntry(entry);
+            sleep(2000);
+            // Do not close here - make sure that the slow write is processed
+
+            try (DeadLetterQueueReader reader = new DeadLetterQueueReader(dir)) {
+                assertThat(reader.pollEntry(100).getReason(), is("1"));
+                assertThat(reader.pollEntry(100).getReason(), is("2"));
             }
         }
     }
 
+
+    @Test
+    public void testNotFlushed() throws Exception {
+        try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilder(dir, BLOCK_SIZE, 1_000_000_000, Duration.ofSeconds(5))
+                .build()) {
+            for (int i = 0; i < 4; i++) {
+                DLQEntry entry = new DLQEntry(new Event(), "type", "id", "1");
+                writeManager.writeEntry(entry);
+            }
+
+            // Allow for time for scheduled flush check
+            Thread.sleep(1000);
+
+            try (DeadLetterQueueReader readManager = new DeadLetterQueueReader(dir)) {
+                for (int i = 0; i < 4; i++) {
+                    DLQEntry entry = readManager.pollEntry(100);
+                    assertThat(entry, is(CoreMatchers.nullValue()));
+                }
+            }
+        }
+    }
+
+
+    @Test
+    public void testCloseFlush() throws Exception {
+        try (DeadLetterQueueWriter writer = DeadLetterQueueWriter
+                .newBuilder(dir, 1_000, 1_000_000, Duration.ofHours(1))
+                .build()) {
+            DLQEntry entry = new DLQEntry(new Event(), "type", "id", "1");
+            writer.writeEntry(entry);
+        }
+        try (DeadLetterQueueReader reader = new DeadLetterQueueReader(dir)) {
+            assertThat(reader.pollEntry(100).getReason(), is("1"));
+        }
+    }
+
+    private void sleep(long millis) throws InterruptedException {
+        Thread.sleep(millis);
+        Thread.yield();
+    }
+
     private long dlqLength() throws IOException {
-        try(final Stream<Path> files = Files.list(dir)) {
+        try (final Stream<Path> files = Files.list(dir)) {
             return files.filter(p -> p.toString().endsWith(".log"))
                 .mapToLong(p -> p.toFile().length()).sum();
         }
     }
+
+    static String generateASCIIMessageContent(int size, byte fillChar) {
+        byte[] fillArray = new byte[size];
+        Arrays.fill(fillArray, fillChar);
+        return new String(fillArray);
+    }
+
+    @Test
+    public void testRemoveOldestSegmentWhenRetainedSizeIsExceededAndDropOlderModeIsEnabled() throws IOException {
+        Event event = DeadLetterQueueReaderTest.createEventWithConstantSerializationOverhead(Collections.emptyMap());
+        event.setField("message", DeadLetterQueueReaderTest.generateMessageContent(32479));
+        long startTime = System.currentTimeMillis();
+
+        int messageSize = 0;
+        try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilder(dir, 10 * MB, 20 * MB, Duration.ofSeconds(1))
+                .build()) {
+
+            // 320 generates 10 Mb of data
+            for (int i = 0; i < (320 * 2) - 1; i++) {
+                DLQEntry entry = new DLQEntry(event, "", "", String.format("%05d", i), DeadLetterQueueReaderTest.constantSerializationLengthTimestamp(startTime));
+                final int serializationLength = entry.serialize().length;
+                assertEquals("Serialized entry fills block payload", BLOCK_SIZE - RECORD_HEADER_SIZE, serializationLength);
+                messageSize += serializationLength;
+                writeManager.writeEntry(entry);
+            }
+            assertThat(messageSize, Matchers.is(greaterThan(BLOCK_SIZE)));
+        }
+
+        // but every segment file has 1 byte header, 639 messages of 32Kb generates 3 files
+        // 0.log with 319
+        // 1.log with 319
+        // 2.log with 1
+        List<String> segmentFileNames = Files.list(dir)
+                .map(Path::getFileName)
+                .map(Path::toString)
+                .sorted()
+                .collect(Collectors.toList());
+        assertEquals(3, segmentFileNames.size());
+        final String fileToBeRemoved = segmentFileNames.get(0);
+
+        // Exercise
+        // with another 32Kb message write we go to write the third file and trigger the 20Mb limit of retained store
+        final long prevQueueSize;
+        final long beheadedQueueSize;
+        long droppedEvent;
+        try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilder(dir, 10 * MB, 20 * MB, Duration.ofSeconds(1))
+                .storageType(QueueStorageType.DROP_OLDER)
+                .build()) {
+            prevQueueSize = writeManager.getCurrentQueueSize();
+            final int expectedQueueSize = 2 * // number of full segment files
+                    FULL_SEGMENT_FILE_SIZE  + // size of a segment file
+                    VERSION_SIZE + BLOCK_SIZE + // the third segment file with just one message
+                    VERSION_SIZE; // the header of the head tmp file created in opening
+            assertEquals("Queue size is composed of 2 full segment files plus one with an event plus another with just the header byte",
+                    expectedQueueSize, prevQueueSize);
+            DLQEntry entry = new DLQEntry(event, "", "", String.format("%05d", (320 * 2) - 1), DeadLetterQueueReaderTest.constantSerializationLengthTimestamp(startTime));
+            writeManager.writeEntry(entry);
+            beheadedQueueSize = writeManager.getCurrentQueueSize();
+            droppedEvent = writeManager.getDroppedEvents();
+        }
+
+        // 1.log with 319
+        // 2.log with 1
+        // 3.log with 1, created because the close flushes and beheaded the tail file.
+        Set<String> afterBeheadSegmentFileNames = Files.list(dir)
+                .map(Path::getFileName)
+                .map(Path::toString)
+                .collect(Collectors.toSet());
+        assertEquals(3, afterBeheadSegmentFileNames.size());
+        assertThat(afterBeheadSegmentFileNames, Matchers.not(Matchers.contains(fileToBeRemoved)));
+        final long expectedQueueSize = prevQueueSize +
+                BLOCK_SIZE - // the space of the newly inserted message
+                FULL_SEGMENT_FILE_SIZE - //the size of the removed segment file
+                VERSION_SIZE; // the size of a previous head file (n.log.tmp) that doesn't exist anymore.
+        assertEquals("Total queue size must be decremented by the size of the first segment file",
+                expectedQueueSize, beheadedQueueSize);
+        assertEquals("Last segment removal doesn't increment dropped events counter",
+                0, droppedEvent);
+    }
+
+    @Test
+    public void testRemoveSegmentsOrder() throws IOException {
+        try (DeadLetterQueueWriter sut = DeadLetterQueueWriter
+                .newBuilder(dir, 10 * MB, 20 * MB, Duration.ofSeconds(1))
+                .build()) {
+            // create some segments files
+            Files.createFile(dir.resolve("9.log"));
+            Files.createFile(dir.resolve("10.log"));
+
+            // Exercise
+            sut.dropTailSegment();
+
+            // Verify
+            final Set<String> segments = Files.list(dir)
+                    .map(Path::getFileName)
+                    .map(Path::toString)
+                    .filter(s -> !s.endsWith(".tmp")) // skip current writer head file 1.log.tmp
+                    .filter(s -> !".lock".equals(s)) // skip .lock file created by writer
+                    .collect(Collectors.toSet());
+            assertEquals(Collections.singleton("10.log"), segments);
+        }
+    }
+
+    @Test
+    public void testUpdateOldestSegmentReference() throws IOException {
+        try (DeadLetterQueueWriter sut = DeadLetterQueueWriter
+                .newBuilderWithoutFlusher(dir, 10 * MB, 20 * MB)
+                .build()) {
+
+            final byte[] eventBytes = new DLQEntry(new Event(), "", "", "").serialize();
+
+            try(RecordIOWriter writer = new RecordIOWriter(dir.resolve("1.log"))){
+                writer.writeEvent(eventBytes);
+            }
+
+            try(RecordIOWriter writer = new RecordIOWriter(dir.resolve("2.log"))){
+                writer.writeEvent(eventBytes);
+            }
+
+            try(RecordIOWriter writer = new RecordIOWriter(dir.resolve("3.log"))){
+                writer.writeEvent(eventBytes);
+            }
+
+            // Exercise
+            sut.updateOldestSegmentReference();
+
+            // Verify
+            final Optional<Path> oldestSegmentPath = sut.getOldestSegmentPath();
+            assertTrue(oldestSegmentPath.isPresent());
+            assertEquals("1.log", oldestSegmentPath.get().getFileName().toString());
+        }
+    }
+
+    @Test
+    public void testUpdateOldestSegmentReferenceWithDeletedSegment() throws IOException {
+        try (DeadLetterQueueWriter sut = DeadLetterQueueWriter
+                .newBuilderWithoutFlusher(dir, 10 * MB, 20 * MB)
+                .build()) {
+
+            final byte[] eventBytes = new DLQEntry(new Event(), "", "", "").serialize();
+            try(RecordIOWriter writer = new RecordIOWriter(dir.resolve("1.log"))){
+                writer.writeEvent(eventBytes);
+            }
+
+            try(RecordIOWriter writer = new RecordIOWriter(dir.resolve("2.log"))){
+                writer.writeEvent(eventBytes);
+            }
+
+            // Exercise
+            sut.updateOldestSegmentReference();
+
+            // Delete 1.log (oldest)
+            Files.delete(sut.getOldestSegmentPath().get());
+
+            sut.updateOldestSegmentReference();
+
+            // Verify
+            assertEquals("2.log",sut.getOldestSegmentPath().get().getFileName().toString());
+        }
+    }
+
+    @Test
+    public void testUpdateOldestSegmentReferenceWithAllDeletedSegments() throws IOException {
+        try (DeadLetterQueueWriter sut = DeadLetterQueueWriter
+                .newBuilderWithoutFlusher(dir, 10 * MB, 20 * MB)
+                .build()) {
+
+            final byte[] eventBytes = new DLQEntry(new Event(), "", "", "").serialize();
+            final String[] allSegments = {"1.log", "2.log"};
+            for (String segment : allSegments) {
+                try(RecordIOWriter writer = new RecordIOWriter(dir.resolve(segment))){
+                    writer.writeEvent(eventBytes);
+                }
+            }
+
+            // Update with segment files
+            sut.updateOldestSegmentReference();
+            assertEquals("1.log",sut.getOldestSegmentPath().get().getFileName().toString());
+
+            // Delete all segments
+            for (String segment : allSegments) {
+                Files.delete(dir.resolve(segment));
+            }
+
+            // Update with no segment files
+            sut.updateOldestSegmentReference();
+
+            // Verify
+            assertTrue(sut.getOldestSegmentPath().isEmpty());
+        }
+    }
+
+    @Test
+    public void testUpdateOldestSegmentReferenceWithNonLexicographicallySortableFileNames() throws IOException {
+        try (DeadLetterQueueWriter sut = DeadLetterQueueWriter
+                .newBuilderWithoutFlusher(dir, 10 * MB, 20 * MB)
+                .build()) {
+
+            final byte[] eventBytes = new DLQEntry(new Event(), "", "", "").serialize();
+            try(RecordIOWriter writer = new RecordIOWriter(dir.resolve("2.log"))){
+                writer.writeEvent(eventBytes);
+            }
+
+            try(RecordIOWriter writer = new RecordIOWriter(dir.resolve("10.log"))){
+                writer.writeEvent(eventBytes);
+            }
+
+            // Exercise
+            sut.updateOldestSegmentReference();
+
+            // Verify
+            assertEquals("2.log",sut.getOldestSegmentPath().get().getFileName().toString());
+        }
+    }
+
+    @Test
+    public void testReadTimestampOfLastEventInSegment() throws IOException {
+        final Timestamp expectedTimestamp = Timestamp.now();
+        final byte[] eventBytes = new DLQEntry(new Event(), "", "", "", expectedTimestamp).serialize();
+
+        final Path segmentPath = dir.resolve("1.log");
+        try (RecordIOWriter writer = new RecordIOWriter(segmentPath)) {
+            writer.writeEvent(eventBytes);
+        }
+
+        // Exercise
+        Optional<Timestamp> timestamp = DeadLetterQueueWriter.readTimestampOfLastEventInSegment(segmentPath);
+
+        // Verify
+        assertTrue(timestamp.isPresent());
+        assertEquals(expectedTimestamp, timestamp.get());
+    }
+
+    @Test
+    public void testReadTimestampOfLastEventInSegmentWithDeletedSegment() throws IOException {
+        // Exercise
+        Optional<Timestamp> timestamp = DeadLetterQueueWriter.readTimestampOfLastEventInSegment(Path.of("non_existing_file.txt"));
+
+        // Verify
+        assertTrue(timestamp.isEmpty());
+    }
+
+    @Test
+    public void testDropEventCountCorrectlyNotEnqueuedEvents() throws IOException, InterruptedException {
+        Event blockAlmostFullEvent = DeadLetterQueueReaderTest.createEventWithConstantSerializationOverhead(Collections.emptyMap());
+        int serializationHeader = 286;
+        int notEnoughHeaderSpace = 5;
+        blockAlmostFullEvent.setField("message", DeadLetterQueueReaderTest.generateMessageContent(BLOCK_SIZE - serializationHeader - RECORD_HEADER_SIZE + notEnoughHeaderSpace));
+
+        Event bigEvent = DeadLetterQueueReaderTest.createEventWithConstantSerializationOverhead(Collections.emptyMap());
+        bigEvent.setField("message", DeadLetterQueueReaderTest.generateMessageContent(2 * BLOCK_SIZE));
+
+        try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilder(dir, 10 * MB, 20 * MB, Duration.ofSeconds(1))
+                .build()) {
+            // enqueue a record with size smaller than BLOCK_SIZE
+            DLQEntry entry = new DLQEntry(blockAlmostFullEvent, "", "", "00001", DeadLetterQueueReaderTest.constantSerializationLengthTimestamp(System.currentTimeMillis()));
+            assertEquals("Serialized plus header must not leave enough space for another record header ",
+                    entry.serialize().length, BLOCK_SIZE - RECORD_HEADER_SIZE - notEnoughHeaderSpace);
+            writeManager.writeEntry(entry);
+
+            // enqueue a record bigger than BLOCK_SIZE
+            entry = new DLQEntry(bigEvent, "", "", "00002", DeadLetterQueueReaderTest.constantSerializationLengthTimestamp(System.currentTimeMillis()));
+            assertThat("Serialized entry has to split in multiple blocks", entry.serialize().length, is(greaterThan(2 * BLOCK_SIZE)));
+            writeManager.writeEntry(entry);
+        }
+
+        // fill the queue to push out the segment with the 2 previous events
+        Event event = DeadLetterQueueReaderTest.createEventWithConstantSerializationOverhead(Collections.emptyMap());
+        event.setField("message", DeadLetterQueueReaderTest.generateMessageContent(32479));
+        try (DeadLetterQueueWriter writeManager = DeadLetterQueueWriter
+                .newBuilder(dir, 10 * MB, 20 * MB, Duration.ofSeconds(1))
+                .storageType(QueueStorageType.DROP_NEWER)
+                .build()) {
+
+            long startTime = System.currentTimeMillis();
+            // 319 events of 32K generates almost 2 segments of 10 Mb of data
+            for (int i = 0; i < (320 * 2) - 2; i++) {
+                DLQEntry entry = new DLQEntry(event, "", "", String.format("%05d", i), DeadLetterQueueReaderTest.constantSerializationLengthTimestamp(startTime));
+                final int serializationLength = entry.serialize().length;
+                assertEquals("Serialized entry fills block payload", BLOCK_SIZE - RECORD_HEADER_SIZE, serializationLength);
+                if (i == 636) {
+                    // wait flusher thread flushes the data. When DLQ full condition is reached then the size is checked against
+                    // the effective file sizes loaded from FS. This is due to writer-reader interaction
+                    Thread.sleep(2_000);
+                }
+                writeManager.writeEntry(entry);
+            }
+
+            // 1.log with 2 events
+            // 2.log with 319
+            // 3.log with 319
+            assertEquals(2, writeManager.getDroppedEvents());
+        }
+    }
+
+    @Test(expected = Test.None.class)
+    public void testInitializeWriterWith1ByteEntry() throws Exception {
+        Files.write(dir.resolve("1.log"), "1".getBytes());
+
+        DeadLetterQueueWriter writer = DeadLetterQueueWriter
+                .newBuilder(dir, 1_000, 100_000, Duration.ofSeconds(1))
+                .build();
+        writer.close();
+    }
+
+    @Test
+    public void givenDLQWriterCreatedSomeSegmentsWhenReaderWithCleanConsumedNotifyTheDeletionOfSomeThenWriterUpdatesItsMetricsSize() throws IOException, InterruptedException {
+        try (DeadLetterQueueWriter writer = DeadLetterQueueWriter
+                .newBuilder(dir, 1 * MB, 100 * MB, Duration.ofSeconds(1))
+                .build()) {
+
+            // fill at least 3 segments
+            int dlqEntryCount = writeThreeFullSegments(writer);
+
+            long beforeConsumptionQueueSize = writer.getCurrentQueueSize();
+
+            // open a DLQ reader with clean consumed and consume fully one segment
+            readOneFullSegmentAndTriggerCleanConsumed(dlqEntryCount);
+
+            Awaitility.await("Measured queue size decreases because of the reader consumption")
+                    // wait at least the watcher execution period
+                    .atMost(Duration.ofSeconds(5))
+                    .until(() -> writer.getCurrentQueueSize() < beforeConsumptionQueueSize);
+        }
+    }
+
+    private void readOneFullSegmentAndTriggerCleanConsumed(int dlqEntryCount) throws IOException, InterruptedException {
+        long segmentsBeforeReaderDeletesConsumed;
+        int consumedSegments;
+        DeadLetterQueueReaderTest.MockSegmentListener listener = new DeadLetterQueueReaderTest.MockSegmentListener();
+        try (DeadLetterQueueReader reader = new DeadLetterQueueReader(dir, true, listener)) {
+            // consume completely a segment
+            int dlqEntryToRead = dlqEntryCount / 3;
+            // consumes 1/3 of overall event counts plus a little bit to be sure the first segment is completely
+            // consumed
+            for (int i = 0; i < dlqEntryToRead + 2; i++) {
+                DLQEntry entry = reader.pollEntry(100);
+                assertNotNull("DLQ can't be empties", entry);
+                assertEquals("reason", entry.getReason());
+            }
+
+            segmentsBeforeReaderDeletesConsumed = countDlqSegments(dir);
+            // mark for delete creates the notification .deleted_segment file if clean_consumed is true
+            reader.markForDelete();
+            consumedSegments = reader.getConsumedSegments();
+        }
+
+        assertEquals("Must have been consumed just one segment", segmentsBeforeReaderDeletesConsumed - consumedSegments, countDlqSegments(dir));
+    }
+
+    private int writeThreeFullSegments(DeadLetterQueueWriter writer) throws IOException {
+        Event dlqEvent = DeadLetterQueueReaderTest.createEventWithConstantSerializationOverhead(Collections.emptyMap());
+        dlqEvent.setField("message", DeadLetterQueueReaderTest.generateMessageContent(32479));
+        DLQEntry dlqEntry = new DLQEntry(dlqEvent, "type", "id", "reason");
+
+        int dlqEntryCount = 0;
+        do {
+            writer.writeEntry(dlqEntry);
+            dlqEntryCount ++;
+        } while (countDlqSegments(dir) < 3);
+        final long numberOfSegmentsAfterFill = countDlqSegments(dir);
+        assertEquals("DLQ MUST be composed of 3 segments", 3L, numberOfSegmentsAfterFill);
+        return dlqEntryCount;
+    }
+
+    private long countDlqSegments(Path dir) throws IOException {
+        try (final Stream<Path> files = Files.list(dir)) {
+            return files.filter(p -> p.toString().endsWith(".log"))
+                    .count();
+        }
+    }
+
 }
diff --git a/logstash-core/src/test/java/org/logstash/common/io/RecordIOReaderTest.java b/logstash-core/src/test/java/org/logstash/common/io/RecordIOReaderTest.java
index 58d8aba68..29f216ac7 100644
--- a/logstash-core/src/test/java/org/logstash/common/io/RecordIOReaderTest.java
+++ b/logstash-core/src/test/java/org/logstash/common/io/RecordIOReaderTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.common.io;
 
 import org.junit.Before;
@@ -8,9 +28,12 @@ import org.logstash.ackedqueue.StringElement;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
 import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.OptionalInt;
 import java.util.function.Function;
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -20,6 +43,7 @@ import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.logstash.common.io.RecordIOWriter.BLOCK_SIZE;
 import static org.logstash.common.io.RecordIOWriter.RECORD_HEADER_SIZE;
+import static org.logstash.common.io.RecordIOWriter.VERSION;
 
 public class RecordIOReaderTest {
     private Path file;
@@ -69,7 +93,6 @@ public class RecordIOReaderTest {
 
         RecordIOReader reader = new RecordIOReader(file);
         reader.seekToBlock(1);
-        reader.consumeBlock(true);
         assertThat(reader.seekToStartOfEventInBlock(), equalTo(1026));
 
         reader.close();
@@ -133,24 +156,61 @@ public class RecordIOReaderTest {
         int blocks = (int)Math.ceil(expectedSize / (double)BLOCK_SIZE);
         int fillSize = expectedSize - (blocks * RECORD_HEADER_SIZE);
 
-        try(RecordIOWriter writer = new RecordIOWriter(file)){
+        try (RecordIOWriter writer = new RecordIOWriter(file)) {
             for (char i = 0; i < eventCount; i++) {
                 char[] blockSize = fillArray(fillSize);
                 blockSize[0] = i;
-                assertThat(writer.writeEvent(new StringElement(new String(blockSize)).serialize()), is((long)expectedSize));
+                byte[] payload = new StringElement(new String(blockSize)).serialize();
+                assertThat(writer.writeEvent(payload), is((long)expectedSize));
             }
         }
 
-        try(RecordIOReader reader = new RecordIOReader(file)) {
-            Function<byte[], Character> toChar = (b) -> (char) ByteBuffer.wrap(b).get(0);
-
+        try (RecordIOReader reader = new RecordIOReader(file)) {
+            Comparator<Character> charComparator = Comparator.comparing(Function.identity());
             for (char i = 0; i < eventCount; i++) {
-                reader.seekToNextEventPosition(i, toChar, Comparator.comparing(o -> o));
-                assertThat(toChar.apply(reader.readEvent()), equalTo(i));
+                reader.seekToNextEventPosition(i, RecordIOReaderTest::extractFirstChar, charComparator);
+                assertThat(extractFirstChar(reader.readEvent()), equalTo(i));
             }
         }
     }
 
+    private static Character extractFirstChar(byte[] b) {
+        return (char) ByteBuffer.wrap(b).get(0);
+    }
+
+    @Test
+    public void testObviouslyInvalidSegment() throws Exception {
+        assertThat(RecordIOReader.getSegmentStatus(file), is(RecordIOReader.SegmentStatus.INVALID));
+    }
+
+    @Test
+    public void testPartiallyWrittenSegment() throws Exception {
+        try(RecordIOWriter writer = new RecordIOWriter(file)) {
+            writer.writeRecordHeader(
+                    new RecordHeader(RecordType.COMPLETE, 100, OptionalInt.empty(), 0));
+        }
+        assertThat(RecordIOReader.getSegmentStatus(file), is(RecordIOReader.SegmentStatus.INVALID));
+    }
+
+    @Test
+    public void testEmptySegment() throws Exception {
+        try(RecordIOWriter writer = new RecordIOWriter(file)){
+            // Do nothing. Creating a new writer is the same behaviour as starting and closing
+            // This line avoids a compiler warning.
+            writer.toString();
+        }
+        assertThat(RecordIOReader.getSegmentStatus(file), is(RecordIOReader.SegmentStatus.EMPTY));
+    }
+
+    @Test
+    public void testValidSegment() throws Exception {
+        try(RecordIOWriter writer = new RecordIOWriter(file)){
+            writer.writeEvent(new byte[]{ 72, 101, 108, 108, 111});
+        }
+
+        assertThat(RecordIOReader.getSegmentStatus(file), is(RecordIOReader.SegmentStatus.VALID));
+    }
+
     @Test
     public void testReadWhileWriteAcrossBoundary() throws Exception {
         char[] tooBig = fillArray( BLOCK_SIZE/4);
@@ -172,6 +232,25 @@ public class RecordIOReaderTest {
         }
     }
 
+    @Test
+    public void testVersion() throws IOException {
+        RecordIOWriter writer = new RecordIOWriter(file);
+        FileChannel channel = FileChannel.open(file, StandardOpenOption.READ);
+        ByteBuffer versionBuffer = ByteBuffer.allocate(1);
+        channel.read(versionBuffer);
+        versionBuffer.rewind();
+        channel.close();
+        assertThat(versionBuffer.get() == VERSION, equalTo(true));
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void testVersionMismatch() throws IOException {
+        FileChannel channel = FileChannel.open(file, StandardOpenOption.WRITE);
+        channel.write(ByteBuffer.wrap(new byte[] { '2' }));
+        channel.close();
+        RecordIOReader reader = new RecordIOReader(file);
+    }
+
     private char[] fillArray(final int fillSize) {
         char[] blockSize= new char[fillSize];
         Arrays.fill(blockSize, 'e');
diff --git a/logstash-core/src/test/java/org/logstash/common/io/RecordIOWriterTest.java b/logstash-core/src/test/java/org/logstash/common/io/RecordIOWriterTest.java
index 2edb06893..9f2eeca65 100644
--- a/logstash-core/src/test/java/org/logstash/common/io/RecordIOWriterTest.java
+++ b/logstash-core/src/test/java/org/logstash/common/io/RecordIOWriterTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.common.io;
 
 import org.junit.Before;
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/CompiledPipelineTest.java b/logstash-core/src/test/java/org/logstash/config/ir/CompiledPipelineTest.java
index 4017509b8..3aa945897 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/CompiledPipelineTest.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/CompiledPipelineTest.java
@@ -1,7 +1,31 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir;
 
 import co.elastic.logstash.api.Codec;
 import com.google.common.base.Strings;
+
+import java.io.IOException;
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -14,7 +38,8 @@ import java.util.function.Consumer;
 import java.util.function.Supplier;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.MatcherAssert;
-import org.jruby.RubyInteger;
+import org.jruby.RubyArray;
+import org.jruby.RubyObject;
 import org.jruby.RubyString;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.junit.After;
@@ -24,16 +49,18 @@ import org.logstash.ConvertedList;
 import org.logstash.ConvertedMap;
 import org.logstash.Event;
 import org.logstash.RubyUtil;
-import org.logstash.common.IncompleteSourceWithMetadataException;
+import org.logstash.common.EnvironmentVariableProvider;
+import org.logstash.common.SourceWithMetadata;
 import org.logstash.config.ir.compiler.AbstractFilterDelegatorExt;
 import org.logstash.config.ir.compiler.AbstractOutputDelegatorExt;
+import org.logstash.config.ir.compiler.ComputeStepSyntaxElement;
 import org.logstash.config.ir.compiler.FilterDelegatorExt;
-import org.logstash.config.ir.compiler.PluginFactory;
+import org.logstash.config.ir.compiler.RubyIntegration;
 import org.logstash.ext.JrubyEventExtLibrary;
-import co.elastic.logstash.api.Configuration;
-import co.elastic.logstash.api.Filter;
-import co.elastic.logstash.api.Input;
-import co.elastic.logstash.api.Context;
+import org.logstash.plugins.ConfigVariableExpander;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Tests for {@link CompiledPipeline}.
@@ -50,7 +77,7 @@ public final class CompiledPipelineTest extends RubyEnvTestCase {
     /**
      * Mock filter that does not modify the batch.
      */
-    private static final IRubyObject IDENTITY_FILTER = RubyUtil.RUBY.evalScriptlet(
+    static final IRubyObject IDENTITY_FILTER = RubyUtil.RUBY.evalScriptlet(
         String.join(
             "\n",
             "output = Object.new",
@@ -64,7 +91,7 @@ public final class CompiledPipelineTest extends RubyEnvTestCase {
     /**
      * Mock filter that adds the value 'bar' to the field 'foo' for every event in the batch.
      */
-    private static final IRubyObject ADD_FIELD_FILTER = RubyUtil.RUBY.evalScriptlet(
+    static final IRubyObject ADD_FIELD_FILTER = RubyUtil.RUBY.evalScriptlet(
         String.join(
             "\n",
             "output = Object.new",
@@ -94,11 +121,13 @@ public final class CompiledPipelineTest extends RubyEnvTestCase {
         EVENT_SINKS.remove(runId);
     }
 
+    @SuppressWarnings({"unchecked"})
     @Test
     public void buildsTrivialPipeline() throws Exception {
+        final ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
         final PipelineIR pipelineIR = ConfigCompiler.configToPipelineIR(
-            "input {mockinput{}} output{mockoutput{}}", false
-        );
+                IRHelpers.toSourceWithMetadata("input {mockinput{}} output{mockoutput{}}"), false,
+                cve);
         final JrubyEventExtLibrary.RubyEvent testEvent =
             JrubyEventExtLibrary.RubyEvent.newRubyEvent(RubyUtil.RUBY, new Event());
         new CompiledPipeline(pipelineIR,
@@ -113,12 +142,14 @@ public final class CompiledPipelineTest extends RubyEnvTestCase {
         MatcherAssert.assertThat(outputEvents.contains(testEvent), CoreMatchers.is(true));
     }
 
+    @SuppressWarnings({"unchecked"})
     @Test
     public void buildsStraightPipeline() throws Exception {
+        final ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
         final PipelineIR pipelineIR = ConfigCompiler.configToPipelineIR(
-            "input {mockinput{}} filter { mockfilter {} mockfilter {} mockfilter {}} output{mockoutput{}}",
-            false
-        );
+                IRHelpers.toSourceWithMetadata("input {mockinput{}} filter { mockfilter {} mockfilter {} mockfilter {}} output{mockoutput{}}"),
+            false,
+                cve);
         final JrubyEventExtLibrary.RubyEvent testEvent =
             JrubyEventExtLibrary.RubyEvent.newRubyEvent(RubyUtil.RUBY, new Event());
         new CompiledPipeline(
@@ -134,9 +165,11 @@ public final class CompiledPipelineTest extends RubyEnvTestCase {
         MatcherAssert.assertThat(outputEvents.contains(testEvent), CoreMatchers.is(true));
     }
 
+    @SuppressWarnings({"unchecked"})
     @Test
     public void buildsForkedPipeline() throws Exception {
-        final PipelineIR pipelineIR = ConfigCompiler.configToPipelineIR(
+        final ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
+        final PipelineIR pipelineIR = ConfigCompiler.configToPipelineIR(IRHelpers.toSourceWithMetadata(
             "input {mockinput{}} filter { " +
                 "if [foo] != \"bar\" { " +
                 "mockfilter {} " +
@@ -144,9 +177,9 @@ public final class CompiledPipelineTest extends RubyEnvTestCase {
                 "if [foo] != \"bar\" { " +
                 "mockfilter {} " +
                 "}} " +
-                "} output {mockoutput{} }",
-            false
-        );
+                "} output {mockoutput{} }"),
+            false,
+                cve);
         final JrubyEventExtLibrary.RubyEvent testEvent =
             JrubyEventExtLibrary.RubyEvent.newRubyEvent(RubyUtil.RUBY, new Event());
         final Map<String, Supplier<IRubyObject>> filters = new HashMap<>();
@@ -249,12 +282,54 @@ public final class CompiledPipelineTest extends RubyEnvTestCase {
         assertCorrectFieldToFieldComparison(gte, 7, 8, false);
     }
 
+    @Test
+    public void correctlyCompilesRegexMatchesWithConstant() throws InvalidIRException {
+        verifyRegex("=~", 1);
+    }
+
+    @Test
+    public void correctlyCompilesRegexNoMatchesWithConstant() throws InvalidIRException {
+        verifyRegex("!~", 0);
+    }
+
+    @SuppressWarnings({"unchecked"})
+    private void verifyRegex(String operator, int expectedEvents)
+            throws InvalidIRException {
+        final Event event = new Event();
+
+        final JrubyEventExtLibrary.RubyEvent testEvent =
+                JrubyEventExtLibrary.RubyEvent.newRubyEvent(RubyUtil.RUBY, event);
+
+        final ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
+
+        new CompiledPipeline(
+                ConfigCompiler.configToPipelineIR(
+                        IRHelpers.toSourceWithMetadata("input {mockinput{}} output { " +
+                                String.format("if \"z\" %s /z/ { ", operator) +
+                                " mockoutput{} } }"),
+                        false,
+                        cve),
+                new CompiledPipelineTest.MockPluginFactory(
+                        Collections.singletonMap("mockinput", () -> null),
+                        Collections.singletonMap("mockaddfilter", () -> null),
+                        Collections.singletonMap("mockoutput", mockOutputSupplier())
+                )
+        ).buildExecution()
+                .compute(RubyUtil.RUBY.newArray(testEvent), false, false);
+        final Collection<JrubyEventExtLibrary.RubyEvent> outputEvents = EVENT_SINKS.get(runId);
+        MatcherAssert.assertThat(outputEvents.size(), CoreMatchers.is(expectedEvents));
+        MatcherAssert.assertThat(outputEvents.contains(testEvent), CoreMatchers.is(expectedEvents >= 1));
+        outputEvents.clear();
+    }
+
+    @SuppressWarnings({"unchecked"})
     @Test
     public void equalityCheckOnCompositeField() throws Exception {
+        final ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
         final PipelineIR pipelineIR = ConfigCompiler.configToPipelineIR(
-                "input {mockinput{}} filter { if 4 == [list] { mockaddfilter {} } if 5 == [map] { mockaddfilter {} } } output {mockoutput{} }",
-                false
-        );
+                IRHelpers.toSourceWithMetadata("input {mockinput{}} filter { if 4 == [list] { mockaddfilter {} } if 5 == [map] { mockaddfilter {} } } output {mockoutput{} }"),
+                false,
+                cve);
         final Collection<String> s = new ArrayList<>();
         s.add("foo");
         final Map<String, Object> m = new HashMap<>();
@@ -280,12 +355,14 @@ public final class CompiledPipelineTest extends RubyEnvTestCase {
         MatcherAssert.assertThat(testEvent.getEvent().getField("foo"), CoreMatchers.nullValue());
     }
 
+    @SuppressWarnings({"unchecked"})
     @Test
     public void conditionalWithNullField() throws Exception {
+        final ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
         final PipelineIR pipelineIR = ConfigCompiler.configToPipelineIR(
-                "input {mockinput{}} filter { if [foo] == [bar] { mockaddfilter {} } } output {mockoutput{} }",
-                false
-        );
+                IRHelpers.toSourceWithMetadata("input {mockinput{}} filter { if [foo] == [bar] { mockaddfilter {} } } output {mockoutput{} }"),
+                false,
+                cve);
         final JrubyEventExtLibrary.RubyEvent testEvent =
                 JrubyEventExtLibrary.RubyEvent.newRubyEvent(RubyUtil.RUBY, new Event());
         final Map<String, Supplier<IRubyObject>> filters = new HashMap<>();
@@ -304,12 +381,14 @@ public final class CompiledPipelineTest extends RubyEnvTestCase {
         MatcherAssert.assertThat(testEvent.getEvent().getField("foo"), CoreMatchers.is("bar"));
     }
 
+    @SuppressWarnings({"unchecked"})
     @Test
     public void conditionalNestedMetaFieldPipeline() throws Exception {
+        final ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
         final PipelineIR pipelineIR = ConfigCompiler.configToPipelineIR(
-            "input {mockinput{}} filter { if [@metadata][foo][bar] { mockaddfilter {} } } output {mockoutput{} }",
-            false
-        );
+                IRHelpers.toSourceWithMetadata("input {mockinput{}} filter { if [@metadata][foo][bar] { mockaddfilter {} } } output {mockoutput{} }"),
+            false,
+                cve);
         final JrubyEventExtLibrary.RubyEvent testEvent =
             JrubyEventExtLibrary.RubyEvent.newRubyEvent(RubyUtil.RUBY, new Event());
         final Map<String, Supplier<IRubyObject>> filters = new HashMap<>();
@@ -329,10 +408,12 @@ public final class CompiledPipelineTest extends RubyEnvTestCase {
         MatcherAssert.assertThat(testEvent.getEvent().getField("foo"), CoreMatchers.nullValue());
     }
 
+    @SuppressWarnings({"unchecked"})
     @Test
     public void moreThan255Parents() throws Exception {
+        final ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
         final PipelineIR pipelineIR = ConfigCompiler.configToPipelineIR(
-            "input {mockinput{}} filter { " +
+                IRHelpers.toSourceWithMetadata("input {mockinput{}} filter { " +
                 "if [foo] != \"bar\" { " +
                 "mockfilter {} " +
                 "mockaddfilter {} " +
@@ -340,9 +421,9 @@ public final class CompiledPipelineTest extends RubyEnvTestCase {
                 "mockfilter {} " +
                 Strings.repeat("} else if [foo] != \"bar\" {" +
                     "mockfilter {} ", 300) + " } } " +
-                "} output {mockoutput{} }",
-            false
-        );
+                "} output {mockoutput{} }"),
+            false,
+                cve);
         final JrubyEventExtLibrary.RubyEvent testEvent =
             JrubyEventExtLibrary.RubyEvent.newRubyEvent(RubyUtil.RUBY, new Event());
         final Map<String, Supplier<IRubyObject>> filters = new HashMap<>();
@@ -382,19 +463,22 @@ public final class CompiledPipelineTest extends RubyEnvTestCase {
         verifyComparison(expected, String.format("[brr] %s [baz]", op), event);
     }
 
-    private void verifyComparison(final boolean expected, final String conditional,
-        final Event event) throws IncompleteSourceWithMetadataException {
+    @SuppressWarnings({"unchecked"})
+    private void verifyComparison(final boolean expected, final String conditional, final Event event)
+            throws InvalidIRException {
         final JrubyEventExtLibrary.RubyEvent testEvent =
             JrubyEventExtLibrary.RubyEvent.newRubyEvent(RubyUtil.RUBY, event);
+        final ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
+
         new CompiledPipeline(
             ConfigCompiler.configToPipelineIR(
-                "input {mockinput{}} filter { " +
+                    IRHelpers.toSourceWithMetadata("input {mockinput{}} filter { " +
                     String.format("if %s { ", conditional) +
                     " mockaddfilter {} " +
                     "} " +
-                    "} output {mockoutput{} }",
-                false
-            ),
+                    "} output {mockoutput{} }"),
+                false,
+                    cve),
             new CompiledPipelineTest.MockPluginFactory(
                 Collections.singletonMap("mockinput", () -> null),
                 Collections.singletonMap("mockaddfilter", () -> ADD_FIELD_FILTER),
@@ -418,9 +502,9 @@ public final class CompiledPipelineTest extends RubyEnvTestCase {
     }
 
     /**
-     * Configurable Mock {@link PluginFactory}
+     * Configurable Mock {@link RubyIntegration.PluginFactory}
      */
-    private static final class MockPluginFactory implements PluginFactory {
+    static final class MockPluginFactory implements RubyIntegration.PluginFactory {
 
         private final Map<String, Supplier<IRubyObject>> inputs;
 
@@ -438,28 +522,28 @@ public final class CompiledPipelineTest extends RubyEnvTestCase {
         }
 
         @Override
-        public IRubyObject buildInput(final RubyString name, final RubyInteger line,
-            final RubyInteger column, final IRubyObject args, Map<String, Object> pluginArgs) {
+        public IRubyObject buildInput(final RubyString name, final IRubyObject args,
+                                      SourceWithMetadata source) {
             return setupPlugin(name, inputs);
         }
 
         @Override
-        public AbstractOutputDelegatorExt buildOutput(final RubyString name, final RubyInteger line,
-            final RubyInteger column, final IRubyObject args, Map<String, Object> pluginArgs) {
+        public AbstractOutputDelegatorExt buildOutput(final RubyString name, final IRubyObject args,
+                                                      SourceWithMetadata source) {
             return PipelineTestUtil.buildOutput(setupPlugin(name, outputs));
         }
 
         @Override
-        public AbstractFilterDelegatorExt buildFilter(final RubyString name, final RubyInteger line,
-                                                      final RubyInteger column, final IRubyObject args,
-                                                      Map<String, Object> pluginArgs) {
+        public AbstractFilterDelegatorExt buildFilter(final RubyString name, final IRubyObject args,
+                                                      SourceWithMetadata source) {
+            final RubyObject configNameDouble = org.logstash.config.ir.PluginConfigNameMethodDouble.create(name);
             return new FilterDelegatorExt(
                 RubyUtil.RUBY, RubyUtil.FILTER_DELEGATOR_CLASS)
-                .initForTesting(setupPlugin(name, filters));
+                    .initForTesting(setupPlugin(name, filters), configNameDouble);
         }
 
         @Override
-        public IRubyObject buildCodec(final RubyString name, final IRubyObject args, Map<String, Object> pluginArgs) {
+        public IRubyObject buildCodec(final RubyString name, final IRubyObject args, SourceWithMetadata source) {
             throw new IllegalStateException("No codec setup expected in this test.");
         }
 
@@ -468,6 +552,11 @@ public final class CompiledPipelineTest extends RubyEnvTestCase {
             return null;
         }
 
+        @Override
+        public Codec buildRubyCodecWrapper(RubyObject rubyCodec) {
+            return null;
+        }
+
         private static <T> T setupPlugin(final RubyString name,
             final Map<String, Supplier<T>> suppliers) {
             final String key = name.asJavaString();
@@ -478,15 +567,186 @@ public final class CompiledPipelineTest extends RubyEnvTestCase {
             }
             return suppliers.get(name.asJavaString()).get();
         }
+    }
+
+    @Test
+    @SuppressWarnings({"unchecked"})
+    public void testCacheCompiledClassesWithDifferentId() throws IOException, InvalidIRException {
+        final FixedPluginFactory pluginFactory = new FixedPluginFactory(
+                () -> null,
+                () -> IDENTITY_FILTER,
+                mockOutputSupplier()
+        );
+
+        final PipelineIR baselinePipeline = ConfigCompiler.configToPipelineIR(
+                IRHelpers.toSourceWithMetadataFromPath("org/logstash/config/ir/cache/pipeline1.conf"),
+                false, null);
+        final CompiledPipeline cBaselinePipeline = new CompiledPipeline(baselinePipeline, pluginFactory);
+        final ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
+
+        final PipelineIR pipelineWithDifferentId = ConfigCompiler.configToPipelineIR(
+                IRHelpers.toSourceWithMetadataFromPath("org/logstash/config/ir/cache/pipeline2.conf"),
+                false, cve);
+        final CompiledPipeline cPipelineWithDifferentId = new CompiledPipeline(pipelineWithDifferentId, pluginFactory);
+
+        // actual test: compiling a pipeline with an extra filter should only create 1 extra class
+        ComputeStepSyntaxElement.cleanClassCache();
+        cBaselinePipeline.buildExecution();
+        final int cachedBefore = ComputeStepSyntaxElement.classCacheSize();
+        cPipelineWithDifferentId.buildExecution();
+        final int cachedAfter = ComputeStepSyntaxElement.classCacheSize();
+
+        final String message = String.format("unexpected cache size, cachedAfter: %d, cachedBefore: %d", cachedAfter, cachedBefore);
+        assertEquals(message, 0, cachedAfter - cachedBefore);
+    }
+
+    @Test
+    @SuppressWarnings({"unchecked"})
+    public void testReuseCompiledClasses() throws IOException, InvalidIRException {
+        final FixedPluginFactory pluginFactory = new FixedPluginFactory(
+                () -> null,
+                () -> IDENTITY_FILTER,
+                mockOutputSupplier()
+        );
+        final ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
+
+        // this pipeline generates 10 classes
+        // - 7 for the filters for the nested and leaf Datasets
+        // - 3 for the sequence of outputs with a conditional
+        final PipelineIR baselinePipeline = ConfigCompiler.configToPipelineIR(
+                IRHelpers.toSourceWithMetadataFromPath("org/logstash/config/ir/cache/pipeline_reuse_baseline.conf"),
+                false, cve);
+        final CompiledPipeline cBaselinePipeline = new CompiledPipeline(baselinePipeline, pluginFactory);
+
+        // this pipeline is much bigger than the baseline
+        // but is carefully crafted to reuse the same classes as the baseline pipeline
+        final PipelineIR pipelineTwiceAsBig = ConfigCompiler.configToPipelineIR(
+                IRHelpers.toSourceWithMetadataFromPath("org/logstash/config/ir/cache/pipeline_reuse_test.conf"),
+                false, cve);
+        final CompiledPipeline cPipelineTwiceAsBig = new CompiledPipeline(pipelineTwiceAsBig, pluginFactory);
+
+        // test: compiling a much bigger pipeline and asserting no additional classes are generated
+        ComputeStepSyntaxElement.cleanClassCache();
+        cBaselinePipeline.buildExecution();
+        final int cachedBefore = ComputeStepSyntaxElement.classCacheSize();
+        cPipelineTwiceAsBig.buildExecution();
+        final int cachedAfter = ComputeStepSyntaxElement.classCacheSize();
+
+        final String message = String.format("unexpected cache size, cachedAfter: %d, cachedBefore: %d", cachedAfter, cachedBefore);
+        assertEquals(message, 0, cachedAfter - cachedBefore);
+    }
+
+    @Test
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public void compilerBenchmark() throws Exception {
+        final PipelineIR baselinePipelineIR = createPipelineIR(200);
+        final PipelineIR testPipelineIR = createPipelineIR(400);
+        final JrubyEventExtLibrary.RubyEvent testEvent =
+                JrubyEventExtLibrary.RubyEvent.newRubyEvent(RubyUtil.RUBY, new Event());
+
+        final FixedPluginFactory pluginFactory = new FixedPluginFactory(
+                () -> null,
+                () -> IDENTITY_FILTER,
+                mockOutputSupplier()
+        );
+        final CompiledPipeline baselineCompiledPipeline = new CompiledPipeline(baselinePipelineIR, pluginFactory);
+
+        final CompiledPipeline testCompiledPipeline = new CompiledPipeline(testPipelineIR, pluginFactory);
+
+        final long compilationBaseline = time(ChronoUnit.MILLIS, () -> {
+            final CompiledPipeline.CompiledExecution compiledExecution = baselineCompiledPipeline.buildExecution();
+            compiledExecution.compute(RubyUtil.RUBY.newArray(testEvent), false, false);
+        });
+
+        final long compilationTest = time(ChronoUnit.MILLIS, () -> {
+            final CompiledPipeline.CompiledExecution compiledExecution = testCompiledPipeline.buildExecution();
+            compiledExecution.compute(RubyUtil.RUBY.newArray(testEvent), false, false);
+        });
+
+        // sanity checks
+        final Collection<JrubyEventExtLibrary.RubyEvent> outputEvents = EVENT_SINKS.get(runId);
+        MatcherAssert.assertThat(outputEvents.size(), CoreMatchers.is(2));
+        MatcherAssert.assertThat(outputEvents.contains(testEvent), CoreMatchers.is(true));
+
+        // regression check
+        final String testMessage = "regression in pipeline compilation, doubling the filters require more than 5 " +
+                "time, baseline: " + compilationBaseline + " secs, test: " + compilationTest + " secs";
+        assertTrue(testMessage, compilationTest/compilationBaseline <= 5);
+    }
+
+    private long time(ChronoUnit seconds, Runnable r) {
+        LocalTime start = LocalTime.now();
+        r.run();
+        LocalTime stop = LocalTime.now();
+        return seconds.between(start, stop);
+    }
+
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    private PipelineIR createPipelineIR(int numFilters) throws InvalidIRException {
+        final String pipelineConfig = createBigPipelineDefinition(numFilters);
+        final RubyArray swms = IRHelpers.toSourceWithMetadata(pipelineConfig);
+        final ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
+        return ConfigCompiler.configToPipelineIR(swms,false, cve);
+    }
+
+    private String createBigPipelineDefinition(int numFilters) {
+        return "input { stdin {}} filter {" + createBigFilterSection(numFilters) + "} output { stdout {}}";
+    }
+
+    private String createBigFilterSection(int numFilters) {
+        final StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < numFilters; i++) {
+            sb.append("mutate { id => \"").append(i).append("\" rename => [\"a_field\", \"into_another\"]}\n");
+        }
+        return sb.toString();
+    }
+
+    /**
+     * Fixed Mock {@link RubyIntegration.PluginFactory}
+     * */
+    static final class FixedPluginFactory implements RubyIntegration.PluginFactory {
+
+        private Supplier<IRubyObject> input;
+        private Supplier<IRubyObject> filter;
+        private Supplier<Consumer<Collection<JrubyEventExtLibrary.RubyEvent>>> output;
+
+        FixedPluginFactory(Supplier<IRubyObject> input,  Supplier<IRubyObject> filter,
+                           Supplier<Consumer<Collection<JrubyEventExtLibrary.RubyEvent>>> output) {
+            this.input = input;
+            this.filter = filter;
+            this.output = output;
+        }
 
         @Override
-        public Input buildInput(final String name, final String id, final Configuration configuration, final Context context) {
+        public IRubyObject buildInput(RubyString name, IRubyObject args, SourceWithMetadata source) {
+            return this.input.get();
+        }
+
+        @Override
+        public AbstractOutputDelegatorExt buildOutput(RubyString name, IRubyObject args, SourceWithMetadata source) {
+            return PipelineTestUtil.buildOutput(this.output.get());
+        }
+
+        @Override
+        public AbstractFilterDelegatorExt buildFilter(RubyString name, IRubyObject args, SourceWithMetadata source) {
+            final RubyObject configNameDouble = org.logstash.config.ir.PluginConfigNameMethodDouble.create(name);
+            return new FilterDelegatorExt(
+                    RubyUtil.RUBY, RubyUtil.FILTER_DELEGATOR_CLASS)
+                    .initForTesting(this.filter.get(), configNameDouble);
+        }
+
+        @Override
+        public IRubyObject buildCodec(RubyString name, IRubyObject args, SourceWithMetadata source) {
             return null;
         }
 
         @Override
-        public Filter buildFilter(final String name, final String id,
-                                  final Configuration configuration, final Context context) {
+        public Codec buildDefaultCodec(String codecName) {
+            return null;
+        }
+
+        @Override
+        public Codec buildRubyCodecWrapper(RubyObject rubyCodec) {
             return null;
         }
     }
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/ConfigCompilerTest.java b/logstash-core/src/test/java/org/logstash/config/ir/ConfigCompilerTest.java
index 1314dd0ec..f8173f0ed 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/ConfigCompilerTest.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/ConfigCompilerTest.java
@@ -1,20 +1,54 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir;
 
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 import org.junit.Test;
-import org.logstash.common.IncompleteSourceWithMetadataException;
+import org.logstash.common.EnvironmentVariableProvider;
+import org.logstash.common.SourceWithMetadata;
 import org.logstash.config.ir.graph.Graph;
+import org.logstash.config.ir.graph.PluginVertex;
+import org.logstash.plugins.ConfigVariableExpander;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.*;
 
 public class ConfigCompilerTest extends RubyEnvTestCase {
 
     @Test
     public void testConfigToPipelineIR() throws Exception {
+        SourceWithMetadata swm = new SourceWithMetadata("proto", "path", 1, 1, "input {stdin{}} output{stdout{}}");
+        final ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
         final PipelineIR pipelineIR =
-            ConfigCompiler.configToPipelineIR("input {stdin{}} output{stdout{}}", false);
+                ConfigCompiler.configToPipelineIR(Collections.singletonList(swm), false, cve);
         assertThat(pipelineIR.getOutputPluginVertices().size(), is(1));
         assertThat(pipelineIR.getFilterPluginVertices().size(), is(0));
     }
@@ -23,6 +57,7 @@ public class ConfigCompilerTest extends RubyEnvTestCase {
      * Tests that repeatedly parsing the same config (containing a large number of duplicated sections)
      * into a {@link Graph} repeatedly results in a graph with a constant (i.e. deterministic)
      * hash code as returned by {@link Graph#uniqueHash()}.
+     *
      * @throws Exception On Failure
      */
     @Test
@@ -43,6 +78,7 @@ public class ConfigCompilerTest extends RubyEnvTestCase {
      * Tests that repeatedly parsing the same complex config String into a {@link Graph} repeatedly
      * results in a graph with a constant (i.e. deterministic) hash code as returned by
      * {@link Graph#uniqueHash()}.
+     *
      * @throws Exception On Failure
      */
     @Test
@@ -60,8 +96,100 @@ public class ConfigCompilerTest extends RubyEnvTestCase {
         assertThat(graphHash(config), is(first));
     }
 
-    private static String graphHash(final String config)
-        throws IncompleteSourceWithMetadataException {
-        return ConfigCompiler.configToPipelineIR(config, false).uniqueHash();
+    private static String graphHash(final String config) throws InvalidIRException {
+        SourceWithMetadata swm = new SourceWithMetadata("proto", "path", 1, 1, config);
+        final ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
+        return ConfigCompiler.configToPipelineIR(Collections.singletonList(swm), false, cve).uniqueHash();
+    }
+
+    @Test
+    public void testCompileWithAnEmptySource() throws InvalidIRException {
+        List<SourceWithMetadata> sourcesWithMetadata = Arrays.asList(
+                new SourceWithMetadata("str", "in_plugin", 0, 0, "input { input_0 {} } "),
+                new SourceWithMetadata("str", "out_plugin", 0, 0, "output { output_0 {} } "),
+                new SourceWithMetadata("str", "<empty>", 0, 0, "     ")
+        );
+
+        PipelineIR pipeline = ConfigCompiler.compileSources(sourcesWithMetadata, false, null);
+
+        assertEquals("should compile only the text parts", 2L, pipeline.pluginVertices().count());
+    }
+
+    @Test
+    public void testCompileWithFullyCommentedSource() throws InvalidIRException {
+        List<SourceWithMetadata> sourcesWithMetadata = Arrays.asList(
+                new SourceWithMetadata("str", "in_plugin", 0, 0, "input { input_0 {} } "),
+                new SourceWithMetadata("str","commented_filter",0,0,"#filter{...}\n"),
+                new SourceWithMetadata("str","out_plugin",0,0,"output { output_0 {} } ")
+        );
+
+        PipelineIR pipeline = ConfigCompiler.compileSources(sourcesWithMetadata, false, null);
+
+        assertEquals("should compile only non commented text parts", 2L, pipeline.pluginVertices().count());
+    }
+
+    @Test
+    public void testCompilingPipelineWithMultipleSources() throws InvalidIRException {
+        String sourceId = "fake_sourcefile";
+        String sourceProtocol = "test_proto";
+        SourceWithMetadata sourceWithMetadata = new SourceWithMetadata(sourceProtocol, sourceId, 0, 0, "booo");
+
+        String[] sources = new String[] {
+                "input { input_0 {} } filter { filter_0 {} } output { output_0 {} }",
+                "input { input_1 {} } filter { filter_1 {} } output { output_1 {} }"};
+
+        List<SourceWithMetadata> sourcesWithMetadata = Arrays.asList(
+                new SourceWithMetadata(sourceProtocol + "_" + 0, sourceId + "_" + 0, 0, 0, sources[0]),
+                new SourceWithMetadata(sourceProtocol + "_" + 1, sourceId + "_" + 1, 0, 0, sources[1]));
+
+        PipelineIR pipeline = ConfigCompiler.compileSources(sourcesWithMetadata, false, null);
+
+        assertFalse("should generate a hash", pipeline.uniqueHash().isEmpty());
+        assertEquals("should provide the original source", String.join("\n", sources),
+                pipeline.getOriginalSource());
+        verifyApplyingProtocolAndIdMetadata(pipeline);
+    }
+
+    private void verifyApplyingProtocolAndIdMetadata(PipelineIR pipeline) {
+        for (PluginVertex pv : pipeline.getPluginVertices()) {
+            String nameIdx = last(pv.getPluginDefinition().getName().split("_"));
+            String sourceProtocolIdx = last(pv.getSourceWithMetadata().getProtocol().split("_"));
+            String sourceIdIdx = last(pv.getSourceWithMetadata().getId().split("_"));
+            assertEquals("should apply the correct source metadata to protocol", nameIdx, sourceProtocolIdx);
+            assertEquals("should apply the correct source metadata to id", nameIdx, sourceIdIdx);
+        }
+    }
+
+    private static String last(String[] s) {
+        return s[s.length - 1];
+    }
+
+    @Test
+    public void testComplexConfigs() throws IOException {
+        Path path = Paths.get(".").toAbsolutePath().resolve("../spec/support/lscl_configs").normalize();
+        Files.list(path).forEach(this::verifyComplexConfig);
+    }
+
+    private void verifyComplexConfig(Path path) {
+        String configName = path.getFileName().toString();
+
+        String source = null;
+        try {
+            source = new String(Files.readAllBytes(path));
+        } catch (IOException e) {
+            fail(configName + " not readable");
+        }
+
+        PipelineIR pipelineIR = null;
+        try {
+            SourceWithMetadata sourceWithMetadata = new SourceWithMetadata("test_proto", "fake_sourcefile", 0, 0, source);
+            ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
+            pipelineIR = ConfigCompiler.compileSources(Collections.singletonList(sourceWithMetadata), false, cve);
+        } catch (InvalidIRException iirex) {
+            fail("error compiling " + configName + ": " + iirex.getMessage());
+        }
+
+        assertNotNull(configName + " should compile", pipelineIR);
+        assertFalse(configName + " should have a hash", pipelineIR.uniqueHash().isEmpty());
     }
 }
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/EventConditionTest.java b/logstash-core/src/test/java/org/logstash/config/ir/EventConditionTest.java
new file mode 100644
index 000000000..c7130b7e4
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/config/ir/EventConditionTest.java
@@ -0,0 +1,233 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.config.ir;
+
+import org.jruby.RubyArray;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.logstash.RubyUtil;
+import org.logstash.common.ConfigVariableExpanderTest;
+import org.logstash.common.EnvironmentVariableProvider;
+import org.logstash.ext.JrubyEventExtLibrary;
+import org.logstash.plugins.ConfigVariableExpander;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.LinkedTransferQueue;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+import static org.logstash.config.ir.CompiledPipelineTest.IDENTITY_FILTER;
+import static org.logstash.ext.JrubyEventExtLibrary.RubyEvent;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public final class EventConditionTest extends RubyEnvTestCase {
+
+    /**
+     * Globally accessible map of test run id to a queue of {@link JrubyEventExtLibrary.RubyEvent}
+     * that can be used by Ruby outputs.
+     */
+    private static final Map<Long, Collection<RubyEvent>> EVENT_SINKS =
+            new ConcurrentHashMap<>();
+
+    private static final AtomicLong TEST_RUN = new AtomicLong();
+
+    /**
+     * Unique identifier for this test run so that mock test outputs can correctly identify
+     * their event sink in {@link #EVENT_SINKS}.
+     */
+    private long runId;
+
+    @Before
+    public void beforeEach() {
+        runId = TEST_RUN.incrementAndGet();
+        EVENT_SINKS.put(runId, new LinkedTransferQueue<>());
+    }
+
+    @After
+    public void afterEach() {
+        EVENT_SINKS.remove(runId);
+    }
+
+    @Test
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    public void testInclusionWithFieldInField() throws Exception {
+        final ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
+        final PipelineIR pipelineIR = ConfigCompiler.configToPipelineIR(
+                IRHelpers.toSourceWithMetadata("input {mockinput{}} filter { " +
+                        "mockfilter {} } " +
+                        "output { " +
+                        "  if [left] in [right] { " +
+                        "    mockoutput{}" +
+                        "  } }"),
+                false,
+                cve);
+
+        // left list values never match
+        RubyEvent leftIsList = RubyEvent.newRubyEvent(RubyUtil.RUBY);
+        List listValues = Arrays.asList("foo", "bar", "baz");
+        leftIsList.getEvent().setField("left", listValues);
+        leftIsList.getEvent().setField("right", listValues);
+
+        // left map values never match
+        RubyEvent leftIsMap = RubyEvent.newRubyEvent(RubyUtil.RUBY);
+        Map mapValues = Collections.singletonMap("foo", "bar");
+        leftIsMap.getEvent().setField("left", mapValues);
+        leftIsMap.getEvent().setField("right", mapValues);
+
+        // left and right string values match when right.contains(left)
+        RubyEvent leftIsString1 = RubyEvent.newRubyEvent(RubyUtil.RUBY);
+        leftIsString1.getEvent().setField("left", "foo");
+        leftIsString1.getEvent().setField("right", "zfooz");
+        RubyEvent leftIsString2 = RubyEvent.newRubyEvent(RubyUtil.RUBY);
+        leftIsString2.getEvent().setField("left", "foo");
+        leftIsString2.getEvent().setField("right", "zzz");
+
+        // right list value matches when right.contains(left)
+        RubyEvent rightIsList1 = RubyEvent.newRubyEvent(RubyUtil.RUBY);
+        rightIsList1.getEvent().setField("left", "bar");
+        rightIsList1.getEvent().setField("right", listValues);
+        RubyEvent rightIsList2 = RubyEvent.newRubyEvent(RubyUtil.RUBY);
+        rightIsList2.getEvent().setField("left", "zzz");
+        rightIsList2.getEvent().setField("right", listValues);
+
+        // non-string values match when left == right
+        RubyEvent nonStringValue1 = RubyEvent.newRubyEvent(RubyUtil.RUBY);
+        nonStringValue1.getEvent().setField("left", 42L);
+        nonStringValue1.getEvent().setField("right", 42L);
+        RubyEvent nonStringValue2 = RubyEvent.newRubyEvent(RubyUtil.RUBY);
+        nonStringValue2.getEvent().setField("left", 42L);
+        nonStringValue2.getEvent().setField("right", 43L);
+
+        RubyArray inputBatch = RubyUtil.RUBY.newArray(leftIsList, leftIsMap, leftIsString1, leftIsString2,
+                rightIsList1, rightIsList2, nonStringValue1, nonStringValue2);
+
+        new CompiledPipeline(
+                pipelineIR,
+                new CompiledPipelineTest.MockPluginFactory(
+                        Collections.singletonMap("mockinput", () -> null),
+                        Collections.singletonMap("mockfilter", () -> IDENTITY_FILTER),
+                        Collections.singletonMap("mockoutput", mockOutputSupplier())
+                )
+        ).buildExecution().compute(inputBatch, false, false);
+        final RubyEvent[] outputEvents = EVENT_SINKS.get(runId).toArray(new RubyEvent[0]);
+
+        assertThat(outputEvents.length, is(3));
+        assertThat(outputEvents[0], is(leftIsString1));
+        assertThat(outputEvents[1], is(rightIsList1));
+        assertThat(outputEvents[2], is(nonStringValue1));
+    }
+
+    @Test
+    public void testConditionWithConstantValue() throws Exception {
+        testConditionWithConstantValue("\"[abc]\"", 1);
+    }
+
+    @Test
+    public void testConditionWithConstantFalseLiteralValue() throws Exception {
+        testConditionWithConstantValue("\"false\"", 0);
+    }
+
+    @Test
+    public void testConditionWithConstantEmptyStringValue() throws Exception {
+        testConditionWithConstantValue("\"\"", 0);
+    }
+
+    @SuppressWarnings({"unchecked"})
+    private void testConditionWithConstantValue(String condition, int expectedMatches) throws Exception {
+        final ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
+        final PipelineIR pipelineIR = ConfigCompiler.configToPipelineIR(
+                IRHelpers.toSourceWithMetadata("input {mockinput{}} filter { " +
+                        "mockfilter {} } " +
+                        "output { " +
+                        "  if " + condition + " { " +
+                        "    mockoutput{}" +
+                        "  } }"),
+                false,
+                cve);
+
+        new CompiledPipeline(
+                pipelineIR,
+                new CompiledPipelineTest.MockPluginFactory(
+                        Collections.singletonMap("mockinput", () -> null),
+                        Collections.singletonMap("mockfilter", () -> IDENTITY_FILTER),
+                        Collections.singletonMap("mockoutput", mockOutputSupplier())
+                ))
+                .buildExecution()
+                .compute(RubyUtil.RUBY.newArray(RubyEvent.newRubyEvent(RubyUtil.RUBY)), false, false);
+
+        final Collection<RubyEvent> outputEvents = EVENT_SINKS.get(runId);
+        assertThat(outputEvents.size(), is(expectedMatches));
+    }
+
+    private Supplier<Consumer<Collection<RubyEvent>>> mockOutputSupplier() {
+        return () -> events -> events.forEach(
+                event -> EVENT_SINKS.get(runId).add(event)
+        );
+    }
+
+    private Supplier<IRubyObject> nullInputSupplier() {
+        return () -> null;
+    }
+
+    @Test
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    public void testConditionWithSecretStoreVariable() throws InvalidIRException {
+        ConfigVariableExpander cve = ConfigVariableExpanderTest.getFakeCve(
+                Collections.singletonMap("secret_key", "s3cr3t"), Collections.emptyMap());
+
+        final PipelineIR pipelineIR = ConfigCompiler.configToPipelineIR(
+                IRHelpers.toSourceWithMetadata("input {mockinput{}} " +
+                        "output { " +
+                        "  if [left] == \"${secret_key}\" { " +
+                        "    mockoutput{}" +
+                        "  } }"),
+                false,
+                cve);
+
+        // left and right string values match when right.contains(left)
+        RubyEvent leftIsString1 = RubyEvent.newRubyEvent(RubyUtil.RUBY);
+        leftIsString1.getEvent().setField("left", "s3cr3t");
+
+        RubyArray inputBatch = RubyUtil.RUBY.newArray(leftIsString1);
+
+        new CompiledPipeline(
+                pipelineIR,
+                new CompiledPipelineTest.MockPluginFactory(
+                        Collections.singletonMap("mockinput", nullInputSupplier()),
+                        Collections.emptyMap(), // no filters
+                        Collections.singletonMap("mockoutput", mockOutputSupplier())
+                )
+        ).buildExecution().compute(inputBatch, false, false);
+        final RubyEvent[] outputEvents = EVENT_SINKS.get(runId).toArray(new RubyEvent[0]);
+
+        assertThat(outputEvents.length, is(1));
+        assertThat(outputEvents[0], is(leftIsString1));
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/IRHelpers.java b/logstash-core/src/test/java/org/logstash/config/ir/IRHelpers.java
index 8d4b1cb48..5d784aff3 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/IRHelpers.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/IRHelpers.java
@@ -1,6 +1,32 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir;
 
+import com.google.common.io.Files;
 import org.hamcrest.MatcherAssert;
+import org.jruby.RubyArray;
+import org.jruby.javasupport.JavaUtil;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.logstash.RubyUtil;
+import org.logstash.common.EnvironmentVariableProvider;
 import org.logstash.common.IncompleteSourceWithMetadataException;
 import org.logstash.common.SourceWithMetadata;
 import org.logstash.config.ir.expression.BooleanExpression;
@@ -10,11 +36,13 @@ import org.logstash.config.ir.graph.Edge;
 import org.logstash.config.ir.graph.Graph;
 import org.logstash.config.ir.graph.Vertex;
 import org.logstash.config.ir.graph.algorithms.GraphDiff;
+import org.logstash.plugins.ConfigVariableExpander;
 
-import java.util.HashMap;
-import java.util.Objects;
-import java.util.Random;
-import java.util.UUID;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.util.*;
 import java.util.concurrent.Callable;
 
 import static org.logstash.config.ir.DSL.*;
@@ -122,16 +150,17 @@ public class IRHelpers {
     public static PipelineIR samplePipeline() throws Exception {
         Random rng = new Random(81892198);
         Callable<SourceWithMetadata> meta = () -> randMeta(rng);
+        ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
 
-        Graph inputSection = iComposeParallel(iPlugin(meta.call(), INPUT, "generator"), iPlugin(meta.call(), INPUT, "stdin")).toGraph();
+        Graph inputSection = iComposeParallel(iPlugin(meta.call(), INPUT, "generator"), iPlugin(meta.call(), INPUT, "stdin")).toGraph(null);
         Graph filterSection = iIf(meta.call(), eEq(eEventValue("[foo]"), eEventValue("[bar]")),
                                     iPlugin(meta.call(), FILTER, "grok"),
-                                    iPlugin(meta.call(), FILTER, "kv")).toGraph();
+                                    iPlugin(meta.call(), FILTER, "kv")).toGraph(cve);
         Graph outputSection = iIf(meta.call(), eGt(eEventValue("[baz]"), eValue(1000)),
                                     iComposeParallel(
                                             iPlugin(meta.call(), OUTPUT, "s3"),
                                             iPlugin(meta.call(), OUTPUT, "elasticsearch")),
-                                    iPlugin(meta.call(), OUTPUT, "stdout")).toGraph();
+                                    iPlugin(meta.call(), OUTPUT, "stdout")).toGraph(cve);
 
         return new PipelineIR(inputSection, filterSection, outputSection);
     }
@@ -165,4 +194,39 @@ public class IRHelpers {
         }
         return out.toString();
     }
+
+
+    @SuppressWarnings("rawtypes")
+    public static RubyArray toSourceWithMetadata(String config) throws IncompleteSourceWithMetadataException {
+        return RubyUtil.RUBY.newArray(JavaUtil.convertJavaToRuby(
+                RubyUtil.RUBY, new SourceWithMetadata("proto", "path", 1, 1, config)));
+    }
+
+    /**
+     * Load pipeline configuration from a path returning the list of SourceWithMetadata.
+     *
+     * The path refers to test's resources, if it point to single file that file is loaded, if reference a directory
+     * then the full list of contained files is loaded in name order.
+     * */
+    @SuppressWarnings("rawtypes")
+    public static RubyArray toSourceWithMetadataFromPath(String configPath) throws IncompleteSourceWithMetadataException, IOException {
+        URL url = IRHelpers.class.getClassLoader().getResource(configPath);
+        String path = url.getPath();
+        final File filePath = new File(path);
+        final List<File> files;
+        if (filePath.isDirectory()) {
+            files = Arrays.asList(filePath.listFiles());
+            Collections.sort(files);
+        } else {
+            files = Collections.singletonList(filePath);
+        }
+
+        List<IRubyObject> rubySwms = new ArrayList<>();
+        for (File configFile : files) {
+            final List<String> fileContent = Files.readLines(configFile, Charset.defaultCharset());
+            final SourceWithMetadata swm = new SourceWithMetadata("file", configFile.getPath(), 1, 1, String.join("\n", fileContent));
+            rubySwms.add(JavaUtil.convertJavaToRuby(RubyUtil.RUBY, swm));
+        }
+        return RubyUtil.RUBY.newArray(rubySwms);
+    }
 }
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/PipelineConfigTest.java b/logstash-core/src/test/java/org/logstash/config/ir/PipelineConfigTest.java
new file mode 100644
index 000000000..6464b277c
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/config/ir/PipelineConfigTest.java
@@ -0,0 +1,253 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.config.ir;
+
+import org.hamcrest.Description;
+import org.hamcrest.TypeSafeMatcher;
+import org.jruby.*;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.junit.Before;
+import org.junit.Test;
+import org.logstash.RubyUtil;
+import org.logstash.common.IncompleteSourceWithMetadataException;
+import org.logstash.common.SourceWithMetadata;
+
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class PipelineConfigTest extends RubyEnvTestCase {
+
+    private static class IsBeforeOrSameMatcher extends TypeSafeMatcher<LocalDateTime> {
+
+        private LocalDateTime after;
+
+        IsBeforeOrSameMatcher(LocalDateTime after) {
+            this.after = after;
+        }
+
+        @Override
+        protected boolean matchesSafely(LocalDateTime item) {
+            return item.isBefore(after) || item.isEqual(after);
+        }
+
+        @Override
+        public void describeTo(Description description) {
+            description.appendText(" is before " + after);
+        }
+    }
+
+    public static final String PIPELINE_ID = "main";
+    private RubyClass source;
+    private RubySymbol pipelineIdSym;
+    private String configMerged;
+    private SourceWithMetadata[] unorderedConfigParts;
+
+    private final static RubyObject SETTINGS = (RubyObject) RubyUtil.RUBY.evalScriptlet(
+            "require 'logstash/environment'\n" + // this is needed to register "pipeline.system" setting
+            "require 'logstash/settings'\n" +
+            "LogStash::SETTINGS");
+    private PipelineConfig sut;
+    private SourceWithMetadata[] orderedConfigParts;
+    public static final String PIPELINE_CONFIG_PART_2 =
+            "output {\n" +
+            "  stdout\n" +
+            "}";
+    public static final String PIPELINE_CONFIG_PART_1 =
+            "input {\n" +
+            "  generator1\n" +
+            "}";
+
+    static class SourceCollector {
+        private final StringBuilder compositeSource = new StringBuilder();
+        private final List<SourceWithMetadata> orderedConfigParts = new ArrayList<>();
+
+        void appendSource(final String protocol, final String id, final int line, final int column, final String text, final String metadata) throws IncompleteSourceWithMetadataException {
+            orderedConfigParts.add(new SourceWithMetadata(protocol, id, line, column, text, metadata));
+
+            if (compositeSource.length() > 0 && !compositeSource.toString().endsWith("\n")) {
+                compositeSource.append("\n");
+            }
+            compositeSource.append(text);
+        }
+
+        String compositeSource() {
+            return this.compositeSource.toString();
+        }
+
+        SourceWithMetadata[] orderedConfigParts() {
+            return this.orderedConfigParts.toArray(new SourceWithMetadata[]{});
+        }
+    }
+
+    @Before
+    public void setUp() throws IncompleteSourceWithMetadataException {
+
+        source = RubyUtil.RUBY.getClass("LogStash::Config::Source::Local");
+        pipelineIdSym = RubyUtil.RUBY.newString(PIPELINE_ID).intern();
+
+        final SourceCollector sourceCollector = new SourceCollector();
+        sourceCollector.appendSource("file", "/tmp/1", 0, 0, "input { generator1 }\n", "{\"version\": \"1\"}");
+        sourceCollector.appendSource("file", "/tmp/2", 0, 0, "input { generator2 }", "{\"version\": \"1\"}");
+        sourceCollector.appendSource("file", "/tmp/3", 0, 0, "input { generator3 }\n", "{\"version\": \"1\"}");
+        sourceCollector.appendSource("file", "/tmp/4", 0, 0, "input { generator4 }", "{\"version\": \"1\"}");
+        sourceCollector.appendSource("file", "/tmp/5", 0, 0, "input { generator5 }\n", "{\"version\": \"1\"}");
+        sourceCollector.appendSource("file", "/tmp/6", 0, 0, "input { generator6 }", "{\"version\": \"1\"}");
+        sourceCollector.appendSource("string", "config_string", 0, 0, "input { generator1 }", "{\"version\": \"1\"}");
+
+        orderedConfigParts = sourceCollector.orderedConfigParts();
+        configMerged = sourceCollector.compositeSource();
+
+        List<SourceWithMetadata> unorderedList = Arrays.asList(orderedConfigParts);
+        Collections.shuffle(unorderedList);
+        unorderedConfigParts = unorderedList.toArray(new SourceWithMetadata[0]);
+
+        sut = new PipelineConfig(source, pipelineIdSym, toRubyArray(unorderedConfigParts), SETTINGS);
+    }
+
+    @Test
+    public void testReturnsTheSource() {
+        assertEquals("returns the source", source, sut.getSource());
+        assertEquals("returns the pipeline id", PIPELINE_ID, sut.getPipelineId());
+        assertNotNull("returns the config_hash", sut.configHash());
+        assertNotNull("returns the config_hash", sut.metadataString());
+        assertEquals("returns the merged `ConfigPart#config_string`", configMerged, sut.configString());
+        assertThat("records when the config was read", sut.getReadAt(), isBeforeOrSame(LocalDateTime.now()));
+    }
+
+    private static IsBeforeOrSameMatcher isBeforeOrSame(LocalDateTime after) {
+        return new IsBeforeOrSameMatcher(after);
+    }
+
+    @SuppressWarnings("rawtypes")
+    private static RubyArray toRubyArray(SourceWithMetadata[] arr) {
+        List<IRubyObject> wrappedContent = Arrays.stream(arr).map(RubyUtil::toRubyObject).collect(Collectors.toList());
+        return RubyArray.newArray(RubyUtil.RUBY, wrappedContent);
+    }
+
+    @Test
+    public void testObjectEqualityOnConfigHashAndPipelineId() {
+        PipelineConfig anotherExactPipeline = new PipelineConfig(source, pipelineIdSym, toRubyArray(orderedConfigParts), SETTINGS);
+        assertEquals(anotherExactPipeline, sut);
+
+        final RubyObject CLONED_SETTINGS = (RubyObject)SETTINGS.callMethod("clone");
+        PipelineConfig anotherExactPipelineWithClonedSettings = new PipelineConfig(source, pipelineIdSym, toRubyArray(orderedConfigParts), CLONED_SETTINGS);
+        assertEquals(anotherExactPipelineWithClonedSettings, sut);
+
+        PipelineConfig notMatchingPipeline = new PipelineConfig(source, pipelineIdSym, RubyArray.newEmptyArray(RubyUtil.RUBY), SETTINGS);
+        assertNotEquals(notMatchingPipeline, sut);
+
+        PipelineConfig notSamePipelineId = new PipelineConfig(source, RubySymbol.newSymbol(RubyUtil.RUBY, "another_pipeline"), toRubyArray(unorderedConfigParts), SETTINGS);
+        assertNotEquals(notSamePipelineId, sut);
+    }
+
+    @Test
+    public void testIsSystemWhenPipelineIsNotSystemPipeline() {
+        assertFalse("returns false if the pipeline is not a system pipeline", sut.isSystem());
+    }
+
+    @Test
+    public void testIsSystemWhenPipelineIsSystemPipeline() {
+        RubyObject mockedSettings = mockSettings(Collections.singletonMap("pipeline.system", true));
+        sut = new PipelineConfig(source, pipelineIdSym, toRubyArray(unorderedConfigParts), mockedSettings);
+
+        assertTrue("returns true if the pipeline is a system pipeline", sut.isSystem());
+    }
+
+    public RubyObject mockSettings(Map<String, Object> settingsValues) {
+        IRubyObject settings = SETTINGS.callMethod("clone");
+        settingsValues.forEach((k, v) -> {
+            RubyString rk = RubyString.newString(RubyUtil.RUBY, k);
+            IRubyObject rv = RubyUtil.toRubyObject(v);
+            settings.callMethod(RubyUtil.RUBY.getCurrentContext(), "set", new IRubyObject[]{rk, rv});
+        });
+        return (RubyObject) settings;
+    }
+
+    @Test
+    public void testSourceAndLineRemapping_pipelineDefinedInSingleFileOneLine() throws IncompleteSourceWithMetadataException {
+        String oneLinerPipeline = "input { generator1 }";
+        final SourceWithMetadata swm = new SourceWithMetadata("file", "/tmp/1", 0, 0, oneLinerPipeline);
+        sut = new PipelineConfig(source, pipelineIdSym, toRubyArray(new SourceWithMetadata[]{swm}), SETTINGS);
+
+        assertEquals("return the same line of the queried", 1, (int) sut.lookupSource(1, 0).getLine());
+    }
+
+    @Test
+    public void testSourceAndLineRemapping_pipelineDefinedInSingleFileMultiLine() throws IncompleteSourceWithMetadataException {
+        final SourceWithMetadata swm = new SourceWithMetadata("file", "/tmp/1", 0, 0, PIPELINE_CONFIG_PART_1);
+        sut = new PipelineConfig(source, pipelineIdSym, toRubyArray(new SourceWithMetadata[]{swm}), SETTINGS);
+
+        assertEquals("return the same line of the queried L1", 1, (int) sut.lookupSource(1, 0).getLine());
+        assertEquals("return the same line of the queried L2", 2, (int) sut.lookupSource(2, 0).getLine());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testSourceAndLineRemapping_pipelineDefinedInSingleFileMultiLine_dontmatch() throws IncompleteSourceWithMetadataException {
+        final SourceWithMetadata swm = new SourceWithMetadata("file", "/tmp/1", 0, 0, PIPELINE_CONFIG_PART_1);
+        sut = new PipelineConfig(source, pipelineIdSym, toRubyArray(new SourceWithMetadata[]{swm}), SETTINGS);
+
+        sut.lookupSource(100, -1);
+    }
+
+    @Test
+    public void testSourceAndLineRemapping_pipelineDefinedMInMultipleFiles() throws IncompleteSourceWithMetadataException {
+        final SourceWithMetadata[] parts = {
+                new SourceWithMetadata("file", "/tmp/input", 0, 0, PIPELINE_CONFIG_PART_1),
+                new SourceWithMetadata("file", "/tmp/output", 0, 0, PIPELINE_CONFIG_PART_2)
+        };
+        sut = new PipelineConfig(source, pipelineIdSym, toRubyArray(parts), SETTINGS);
+
+        assertEquals("return the line of first segment", 2, (int) sut.lookupSource(2, 0).getLine());
+        assertEquals("return the id of first segment", "/tmp/input", sut.lookupSource(2, 0).getId());
+        assertEquals("return the line of second segment", 1, (int) sut.lookupSource(4, 0).getLine());
+        assertEquals("return the id of second segment", "/tmp/output", sut.lookupSource(4, 0).getId());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testSourceAndLineRemapping_pipelineDefinedMInMultipleFiles_dontmatch() throws IncompleteSourceWithMetadataException {
+        final SourceWithMetadata[] parts = {
+                new SourceWithMetadata("file", "/tmp/input", 0, 0, PIPELINE_CONFIG_PART_1),
+                new SourceWithMetadata("file", "/tmp/output", 0, 0, PIPELINE_CONFIG_PART_2)
+        };
+        sut = new PipelineConfig(source, pipelineIdSym, toRubyArray(parts), SETTINGS);
+
+        sut.lookupSource(100, 0);
+    }
+
+    @Test
+    public void testSourceAndLineRemapping_pipelineDefinedMInMultipleFiles_withEmptyLinesInTheMiddle() throws IncompleteSourceWithMetadataException {
+        final SourceWithMetadata[] parts = {
+                new SourceWithMetadata("file", "/tmp/input", 0, 0, PIPELINE_CONFIG_PART_1 + "\n"),
+                new SourceWithMetadata("file", "/tmp/output", 0, 0, PIPELINE_CONFIG_PART_2)
+        };
+        sut = new PipelineConfig(source, pipelineIdSym, toRubyArray(parts), SETTINGS);
+
+        assertEquals("shouldn't slide the line mapping of subsequent", 1, (int) sut.lookupSource(4, 0).getLine());
+        assertEquals("shouldn't slide the id mapping of subsequent", "/tmp/output", sut.lookupSource(4, 0).getId());
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/PipelineIRTest.java b/logstash-core/src/test/java/org/logstash/config/ir/PipelineIRTest.java
index 653f4ccda..34bceaa49 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/PipelineIRTest.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/PipelineIRTest.java
@@ -1,9 +1,36 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir;
 
 import org.junit.Test;
+import org.logstash.common.EnvironmentVariableProvider;
 import org.logstash.common.Util;
 import org.logstash.config.ir.graph.Graph;
+import org.logstash.plugins.ConfigVariableExpander;
+import org.logstash.config.ir.graph.QueueVertex;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.any;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.hasItem;
 import static org.junit.Assert.assertEquals;
 import static org.logstash.config.ir.DSL.*;
 import static org.logstash.config.ir.PluginDefinition.Type.*;
@@ -11,13 +38,15 @@ import static org.logstash.config.ir.IRHelpers.randMeta;
 
 public class PipelineIRTest {
     public Graph makeInputSection() throws InvalidIRException {
-        return iComposeParallel(iPlugin(randMeta(), INPUT, "generator"), iPlugin(randMeta(), INPUT, "stdin")).toGraph();
+        return iComposeParallel(iPlugin(randMeta(), INPUT, "generator"), iPlugin(randMeta(), INPUT, "stdin"))
+                .toGraph(ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider()));
     }
 
     public Graph makeFilterSection() throws InvalidIRException {
         return iIf(randMeta(), eEq(eEventValue("[foo]"), eEventValue("[bar]")),
                                     iPlugin(randMeta(), FILTER, "grok"),
-                                    iPlugin(randMeta(), FILTER, "kv")).toGraph();
+                                    iPlugin(randMeta(), FILTER, "kv"))
+                .toGraph(ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider()));
     }
 
     public Graph makeOutputSection() throws InvalidIRException {
@@ -25,7 +54,8 @@ public class PipelineIRTest {
                                     iComposeParallel(
                                             iPlugin(randMeta(), OUTPUT, "s3"),
                                             iPlugin(randMeta(), OUTPUT, "elasticsearch")),
-                                    iPlugin(randMeta(), OUTPUT, "stdout")).toGraph();
+                                    iPlugin(randMeta(), OUTPUT, "stdout"))
+                .toGraph(ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider()));
     }
 
     @Test
@@ -48,4 +78,11 @@ public class PipelineIRTest {
         PipelineIR pipelineIR = new PipelineIR(makeInputSection(), makeFilterSection(), makeOutputSection(), source);
         assertEquals(pipelineIR.uniqueHash(), Util.digest(source));
     }
+
+    @Test
+    public void testGetPostQueue() throws InvalidIRException {
+        String source = "input { stdin {} } output { stdout {} }";
+        PipelineIR pipelineIR = new PipelineIR(makeInputSection(), makeFilterSection(), makeOutputSection(), source);
+        assertThat(pipelineIR.getPostQueue(), not(hasItem(any(QueueVertex.class))));
+    }
 }
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/PipelineTestUtil.java b/logstash-core/src/test/java/org/logstash/config/ir/PipelineTestUtil.java
index e5142ab1e..d647c8191 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/PipelineTestUtil.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/PipelineTestUtil.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir;
 
 import java.util.Collection;
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/PluginConfigNameMethodDouble.java b/logstash-core/src/test/java/org/logstash/config/ir/PluginConfigNameMethodDouble.java
new file mode 100644
index 000000000..5bf4fb054
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/config/ir/PluginConfigNameMethodDouble.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.config.ir;
+
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.RubyObject;
+import org.jruby.RubyString;
+import org.jruby.anno.JRubyClass;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+
+import static org.logstash.RubyUtil.RUBY;
+
+/**
+ * Fake class to double the Ruby's method config_name()
+ * */
+@JRubyClass(name = "PluginConfigNameMethodDouble")
+public class PluginConfigNameMethodDouble extends RubyObject {
+
+    private static final long serialVersionUID = 1L;
+
+    static final RubyClass RUBY_META_CLASS;
+    private RubyString filterName;
+
+    static {
+        RUBY_META_CLASS = RUBY.defineClass("PluginConfigNameMethodDouble", RUBY.getObject(),
+                PluginConfigNameMethodDouble::new);
+        RUBY_META_CLASS.defineAnnotatedMethods(org.logstash.config.ir.compiler.FakeOutClass.class);
+    }
+
+    PluginConfigNameMethodDouble(final Ruby runtime, final RubyClass metaClass) {
+        super(runtime, metaClass);
+    }
+
+    static PluginConfigNameMethodDouble create(RubyString filterName) {
+        final PluginConfigNameMethodDouble instance = new PluginConfigNameMethodDouble(RUBY, RUBY_META_CLASS);
+        instance.filterName = filterName;
+        return instance;
+    }
+
+    @JRubyMethod
+    public IRubyObject name(final ThreadContext context) {
+        return RUBY.newString("example");
+    }
+
+    @JRubyMethod(name = "config_name")
+    public IRubyObject configName(final ThreadContext context, final IRubyObject recv) {
+        return filterName;
+    }
+
+    @JRubyMethod
+    public IRubyObject initialize(final ThreadContext context, final IRubyObject args) {
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/RubyEnvTestCase.java b/logstash-core/src/test/java/org/logstash/config/ir/RubyEnvTestCase.java
index 4470c8cd8..4897125e6 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/RubyEnvTestCase.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/RubyEnvTestCase.java
@@ -1,13 +1,35 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir;
 
 import java.nio.file.Path;
-import java.nio.file.Paths;
+
 import org.jruby.RubyHash;
+import org.jruby.runtime.load.LibrarySearcher;
 import org.jruby.runtime.load.LoadService;
 import org.junit.BeforeClass;
+import org.logstash.RubyTestBase;
 import org.logstash.RubyUtil;
 
-public abstract class RubyEnvTestCase {
+public abstract class RubyEnvTestCase extends RubyTestBase {
 
     @BeforeClass
     public static void before() {
@@ -20,16 +42,16 @@ public abstract class RubyEnvTestCase {
      */
     private static void ensureLoadpath() {
         final LoadService loader = RubyUtil.RUBY.getLoadService();
-        if (loader.findFileForLoad("logstash/compiler").library == null) {
+        final LibrarySearcher librarySearcher = new LibrarySearcher(loader);
+        if (librarySearcher.findLibraryForLoad("logstash/compiler") == null) {
+            final String gems = LS_HOME.
+                    resolve("vendor").resolve("bundle").resolve("jruby").resolve("3.1.0").
+                    toFile().getAbsolutePath();
             final RubyHash environment = RubyUtil.RUBY.getENV();
-            final Path root = Paths.get(
-                System.getProperty("logstash.core.root.dir", "")
-            ).toAbsolutePath();
-            final String gems = root.getParent().resolve("vendor").resolve("bundle")
-                .resolve("jruby").resolve("2.5.0").toFile().getAbsolutePath();
             environment.put("GEM_HOME", gems);
             environment.put("GEM_PATH", gems);
-            loader.addPaths(root.resolve("lib").toFile().getAbsolutePath());
+            Path logstashCore = LS_HOME.resolve("logstash-core");
+            loader.addPaths(logstashCore.resolve("lib").toFile().getAbsolutePath());
         }
     }
 }
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/compiler/CommonActionsTest.java b/logstash-core/src/test/java/org/logstash/config/ir/compiler/CommonActionsTest.java
index 31214c95b..aa24028ed 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/compiler/CommonActionsTest.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/compiler/CommonActionsTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import org.junit.Assert;
@@ -225,11 +245,16 @@ public class CommonActionsTest {
         // remove tags when "tags" fields isn't tags
         e = new Event();
         Long nonTagValue = 42L;
-        e.setField(TAGS, nonTagValue);
+        try {
+            e.setField(TAGS, nonTagValue);
+        } catch (Event.InvalidTagsTypeException ex) {
+
+        }
+
         CommonActions.removeTag(e, Collections.singletonList(testTag));
         o = e.getField(TAGS);
         Assert.assertFalse(o instanceof List);
-        Assert.assertEquals(nonTagValue, o);
+        Assert.assertNull(o);
 
         // remove dynamically-named tag
         e = new Event();
@@ -242,4 +267,56 @@ public class CommonActionsTest {
         Assert.assertTrue(o instanceof List);
         Assert.assertEquals(0, ((List) o).size());
     }
+
+    @Test
+    public void testRemoveFieldFromMetadata() {
+        // remove a field
+        Event e = new Event();
+        String testField = "test_field";
+        String testFieldRef = "[@metadata][" + testField + "]";
+        String testValue = "test_value";
+        e.setField(testFieldRef, testValue);
+        CommonActions.removeField(e, Collections.singletonList(testFieldRef));
+        Assert.assertFalse(e.getMetadata().keySet().contains(testField));
+
+        // remove non-existent field
+        e = new Event();
+        String testField2 = "test_field2";
+        String testField2Ref = "[@metadata][" + testField2 + "]";
+        e.setField(testField2Ref, testValue);
+        CommonActions.removeField(e, Collections.singletonList(testFieldRef));
+        Assert.assertFalse(e.getMetadata().keySet().contains(testField));
+        Assert.assertTrue(e.getMetadata().keySet().contains(testField2));
+
+        // remove multiple fields
+        e = new Event();
+        List<String> fields = new ArrayList<>();
+        List<String> fieldsRef = new ArrayList<>();
+        for (int k = 0; k < 3; k++) {
+            String field = testField + k;
+            String fieldRef = "[@metadata][" + field + "]";
+            e.setField(fieldRef, testValue);
+            fields.add(field);
+            fieldsRef.add(fieldRef);
+        }
+        e.setField(testFieldRef, testValue);
+        CommonActions.removeField(e, fieldsRef);
+        for (String field : fields) {
+            Assert.assertFalse(e.getMetadata().keySet().contains(field));
+        }
+        Assert.assertTrue(e.getMetadata().keySet().contains(testField));
+
+        // remove dynamically-named field
+        e = new Event();
+        String otherField = "other_field";
+        String otherFieldRef = "[@metadata][" + otherField + "]";
+        String otherValue = "other_value";
+        e.setField(otherFieldRef, otherValue);
+        String derivativeField = otherValue + "_foo";
+        String derivativeFieldRef = "[@metadata][" + derivativeField + "]";
+        e.setField(derivativeFieldRef, otherValue);
+        CommonActions.removeField(e, Collections.singletonList("[@metadata][" + "%{" + otherField + "}_foo" + "]"));
+        Assert.assertFalse(e.getMetadata().keySet().contains(derivativeField));
+        Assert.assertTrue(e.getMetadata().keySet().contains(otherField));
+    }
 }
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/compiler/DatasetCompilerTest.java b/logstash-core/src/test/java/org/logstash/config/ir/compiler/DatasetCompilerTest.java
index 231245456..c38f4e29e 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/compiler/DatasetCompilerTest.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/compiler/DatasetCompilerTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import java.util.Collections;
@@ -6,6 +26,7 @@ import org.junit.Test;
 import org.logstash.Event;
 import org.logstash.FieldReference;
 import org.logstash.RubyUtil;
+import org.logstash.config.ir.CompiledPipeline;
 import org.logstash.config.ir.PipelineTestUtil;
 import org.logstash.ext.JrubyEventExtLibrary;
 
@@ -34,7 +55,8 @@ public final class DatasetCompilerTest {
     public void compilesSplitDataset() {
         final FieldReference key = FieldReference.from("foo");
         final SplitDataset left = DatasetCompiler.splitDataset(
-            Collections.emptyList(), event -> event.getEvent().includes(key)
+            Collections.emptyList(), event -> event.getEvent().includes(key),
+            new CompiledPipeline.NoopEvaluationListener()
         ).instantiate();
         final Event trueEvent = new Event();
         trueEvent.setField(key, "val");
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/compiler/FakeOutClass.java b/logstash-core/src/test/java/org/logstash/config/ir/compiler/FakeOutClass.java
index 1d8e00f01..c076dc158 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/compiler/FakeOutClass.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/compiler/FakeOutClass.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import org.jruby.Ruby;
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/compiler/JavaCodecDelegatorTest.java b/logstash-core/src/test/java/org/logstash/config/ir/compiler/JavaCodecDelegatorTest.java
new file mode 100644
index 000000000..4fb7d1770
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/config/ir/compiler/JavaCodecDelegatorTest.java
@@ -0,0 +1,260 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.config.ir.compiler;
+
+import co.elastic.logstash.api.Codec;
+import co.elastic.logstash.api.Event;
+import co.elastic.logstash.api.Metric;
+import co.elastic.logstash.api.PluginConfigSpec;
+import com.google.common.collect.ImmutableMap;
+import org.jruby.RubyHash;
+import org.junit.Before;
+import org.junit.Test;
+import org.logstash.plugins.ContextImpl;
+import org.logstash.plugins.MetricTestCase;
+import org.mockito.Mockito;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.Map;
+import java.util.function.Consumer;
+
+import static org.junit.Assert.assertEquals;
+
+public class JavaCodecDelegatorTest extends MetricTestCase {
+    private Codec codec;
+
+    @Before
+    public void setup() {
+        this.codec = Mockito.mock(AbstractCodec.class);
+        Mockito.when(this.codec.getId()).thenCallRealMethod();
+        Mockito.when(this.codec.getName()).thenCallRealMethod();
+
+        super.setup();
+    }
+
+    @Test
+    public void plainCodecDelegatorInitializesCleanly() {
+        constructCodecDelegator();
+    }
+
+    @Test
+    public void plainCodecPluginPushesPluginNameToMetric() {
+        constructCodecDelegator();
+        final RubyHash metricStore = getMetricStore(new String[]{"codecs", "foo"});
+        final String pluginName = getMetricStringValue(metricStore, "name");
+
+        assertEquals(codec.getName(), pluginName);
+    }
+
+    @Test
+    public void delegatesClone() {
+        final JavaCodecDelegator codecDelegator = constructCodecDelegator();
+        codecDelegator.cloneCodec();
+        Mockito.verify(codec, Mockito.times(1)).cloneCodec();
+    }
+
+    @Test
+    public void delegatesConfigSchema() {
+        final JavaCodecDelegator codecDelegator = constructCodecDelegator();
+        codecDelegator.configSchema();
+        Mockito.verify(codec, Mockito.times(1)).configSchema();
+    }
+
+    @Test
+    public void delegatesGetName() {
+        Mockito.when(codec.getName()).thenReturn("MyLogstashPluginName");
+        final JavaCodecDelegator codecDelegator = constructCodecDelegator();
+        assertEquals("MyLogstashPluginName", codecDelegator.getName());
+    }
+
+    @Test
+    public void delegatesGetId() {
+        Mockito.when(codec.getId()).thenReturn("MyLogstashPluginId");
+        final JavaCodecDelegator codecDelegator = constructCodecDelegator();
+        assertEquals("MyLogstashPluginId", codecDelegator.getId());
+    }
+
+    @Test
+    public void decodeDelegatesCall() {
+        final Map<String, Object> ret = ImmutableMap.of("message", "abcdef");
+
+        codec = Mockito.spy(new AbstractCodec() {
+            @Override
+            public void decode(final ByteBuffer buffer, final Consumer<Map<String, Object>> eventConsumer) {
+                eventConsumer.accept(ret);
+            }
+        });
+
+        final JavaCodecDelegator codecDelegator = constructCodecDelegator();
+
+        final ByteBuffer buf = ByteBuffer.wrap(new byte[] {1, 2, 3});
+        @SuppressWarnings("unchecked")
+        final Consumer<Map<String, Object>> consumer = (Consumer<Map<String, Object>>) Mockito.mock(Consumer.class);
+
+        codecDelegator.decode(buf, consumer);
+
+        Mockito.verify(codec, Mockito.times(1)).decode(Mockito.eq(buf), Mockito.any());
+        Mockito.verify(consumer, Mockito.times(1)).accept(ret);
+    }
+
+    @Test
+    public void decodeIncrementsEventCount() {
+        codec = new AbstractCodec() {
+            @Override
+            public void decode(final ByteBuffer buffer, final Consumer<Map<String, Object>> eventConsumer) {
+                eventConsumer.accept(ImmutableMap.of("message", "abcdef"));
+                eventConsumer.accept(ImmutableMap.of("message", "1234567"));
+            }
+        };
+
+        final JavaCodecDelegator codecDelegator = constructCodecDelegator();
+
+        codecDelegator.decode(ByteBuffer.wrap(new byte[] {1, 2, 3}), (e) -> {});
+
+        assertEquals(1, getMetricLongValue("decode", "writes_in"));
+        assertEquals(2, getMetricLongValue("decode", "out"));
+    }
+
+    @Test
+    public void flushDelegatesCall() {
+        final Map<String, Object> ret = ImmutableMap.of("message", "abcdef");
+
+        codec = Mockito.spy(new AbstractCodec() {
+            @Override
+            public void flush(final ByteBuffer buffer, final Consumer<Map<String, Object>> eventConsumer) {
+                eventConsumer.accept(ret);
+            }
+        });
+
+        final JavaCodecDelegator codecDelegator = constructCodecDelegator();
+
+        final ByteBuffer buf = ByteBuffer.wrap(new byte[] {1, 2, 3});
+        @SuppressWarnings("unchecked")
+        final Consumer<Map<String, Object>> consumer = (Consumer<Map<String, Object>>) Mockito.mock(Consumer.class);
+
+        codecDelegator.flush(buf, consumer);
+
+        Mockito.verify(codec, Mockito.times(1)).flush(Mockito.eq(buf), Mockito.any());
+        Mockito.verify(consumer, Mockito.times(1)).accept(ret);
+    }
+
+    @Test
+    public void flushIncrementsEventCount() {
+        codec = new AbstractCodec() {
+            @Override
+            public void flush(final ByteBuffer buffer, final Consumer<Map<String, Object>> eventConsumer) {
+                eventConsumer.accept(ImmutableMap.of("message", "abcdef"));
+                eventConsumer.accept(ImmutableMap.of("message", "1234567"));
+            }
+        };
+
+        final JavaCodecDelegator codecDelegator = constructCodecDelegator();
+
+        codecDelegator.flush(ByteBuffer.wrap(new byte[] {1, 2, 3}), (e) -> {});
+
+        assertEquals(1, getMetricLongValue("decode", "writes_in"));
+        assertEquals(2, getMetricLongValue("decode", "out"));
+    }
+
+    @Test
+    public void encodeDelegatesCall() throws IOException {
+        codec = Mockito.spy(new AbstractCodec() {
+            @Override
+            public void encode(final Event event, final OutputStream out) {}
+        });
+
+        final JavaCodecDelegator codecDelegator = constructCodecDelegator();
+
+        final Event e = new org.logstash.Event();
+        final OutputStream out = new ByteArrayOutputStream();
+
+        codecDelegator.encode(e, out);
+
+        Mockito.verify(codec, Mockito.times(1)).encode(e, out);
+    }
+
+    @Test
+    public void encodeIncrementsEventCount() throws IOException {
+        codec = new AbstractCodec() {
+            @Override
+            public void encode(final Event event, final OutputStream out) {}
+        };
+
+        final JavaCodecDelegator codecDelegator = constructCodecDelegator();
+
+        codecDelegator.encode(new org.logstash.Event(), new ByteArrayOutputStream());
+
+        assertEquals(1, getMetricLongValue("encode", "writes_in"));
+    }
+
+    private RubyHash getMetricStore(final String type) {
+        return getMetricStore(new String[]{"codecs", "foo", type});
+    }
+
+    private long getMetricLongValue(final String type, final String symbolName) {
+        return getMetricLongValue(getMetricStore(type), symbolName);
+    }
+
+    private JavaCodecDelegator constructCodecDelegator() {
+        return new JavaCodecDelegator(new ContextImpl(null, this.getInstance()), codec);
+    }
+
+    private abstract class AbstractCodec implements Codec {
+        @Override
+        public void decode(final ByteBuffer buffer, final Consumer<Map<String, Object>> eventConsumer) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void flush(final ByteBuffer buffer, final Consumer<Map<String, Object>> eventConsumer) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void encode(final Event event, final OutputStream out) throws IOException {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Codec cloneCodec() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Collection<PluginConfigSpec<?>> configSchema() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public String getId() {
+            return "foo";
+        }
+
+        @Override
+        public String getName() {
+            return "bar";
+        }
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/compiler/OutputDelegatorTest.java b/logstash-core/src/test/java/org/logstash/config/ir/compiler/OutputDelegatorTest.java
index 8c098f806..b91256fa9 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/compiler/OutputDelegatorTest.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/compiler/OutputDelegatorTest.java
@@ -1,36 +1,49 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.compiler;
 
 import javax.annotation.concurrent.NotThreadSafe;
 import org.assertj.core.data.Percentage;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
-import org.jruby.RubyFixnum;
 import org.jruby.RubyHash;
-import org.jruby.RubyString;
 import org.jruby.RubySymbol;
-import org.jruby.java.proxies.ConcreteJavaProxy;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.logstash.Event;
-import org.logstash.config.ir.RubyEnvTestCase;
-import org.logstash.execution.ExecutionContextExt;
-import org.logstash.instrument.metrics.NamespacedMetricExt;
+import org.logstash.instrument.metrics.MetricKeys;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.logstash.RubyUtil.EXECUTION_CONTEXT_CLASS;
-import static org.logstash.RubyUtil.NAMESPACED_METRIC_CLASS;
 import static org.logstash.RubyUtil.RUBY;
 import static org.logstash.RubyUtil.RUBY_OUTPUT_DELEGATOR_CLASS;
+import static org.logstash.instrument.metrics.MetricKeys.EVENTS_KEY;
 
 @SuppressWarnings("rawtypes")
 @NotThreadSafe
-public class OutputDelegatorTest extends RubyEnvTestCase {
+public class OutputDelegatorTest extends PluginDelegatorTestCase {
 
-    private NamespacedMetricExt metric;
-    private ExecutionContextExt executionContext;
     private RubyHash pluginArgs;
     private RubyArray events;
     private static final int EVENT_COUNT = 7;
@@ -43,25 +56,21 @@ public class OutputDelegatorTest extends RubyEnvTestCase {
 
     @Before
     public void setup() {
+        super.setup();
         events = RUBY.newArray(EVENT_COUNT);
         for (int k = 0; k < EVENT_COUNT; k++) {
             events.add(k, new Event());
         }
-        final ThreadContext context = RUBY.getCurrentContext();
-        RubyArray namespaces = RubyArray.newArray(RUBY, 1);
-        namespaces.add(0, RubySymbol.newSymbol(RUBY, "output"));
-        IRubyObject metricWithCollector =
-                runRubyScript("require \"logstash/instrument/collector\"\n" +
-                        "metricWithCollector = LogStash::Instrument::Metric.new(LogStash::Instrument::Collector.new)");
-
-        metric = new NamespacedMetricExt(RUBY, NAMESPACED_METRIC_CLASS)
-                .initialize(context, metricWithCollector, namespaces);
-        executionContext = new ExecutionContextExt(RUBY, EXECUTION_CONTEXT_CLASS);
         pluginArgs = RubyHash.newHash(RUBY);
         pluginArgs.put("id", "foo");
         pluginArgs.put("arg1", "val1");
     }
 
+    @Override
+    protected String getBaseMetricsPath() {
+        return "output/foo";
+    }
+
     @Test
     public void plainOutputPluginInitializesCleanly() {
         constructOutputDelegator();
@@ -93,6 +102,7 @@ public class OutputDelegatorTest extends RubyEnvTestCase {
         assertEquals(EVENT_COUNT, getMetricLongValue("out"));
     }
 
+    @Ignore("Test failing intermittently for some time. See https://github.com/elastic/logstash/issues/11956")
     @Test
     public void multiReceiveRecordsDurationInMillis() {
         final int delay = 100;
@@ -183,11 +193,6 @@ public class OutputDelegatorTest extends RubyEnvTestCase {
 
     }
 
-    private static IRubyObject runRubyScript(String script) {
-        IRubyObject m = RUBY.evalScriptlet(script);
-        return m;
-    }
-
     private OutputDelegatorExt constructOutputDelegator() {
         return new OutputDelegatorExt(RUBY, RUBY_OUTPUT_DELEGATOR_CLASS).initialize(RUBY.getCurrentContext(), new IRubyObject[]{
             FAKE_OUT_CLASS,
@@ -199,44 +204,19 @@ public class OutputDelegatorTest extends RubyEnvTestCase {
     }
 
     private RubyHash getMetricStore() {
-        return getMetricStore(new String[]{"output", "foo", "events"});
-    }
-
-    private RubyHash getMetricStore(String[] path) {
-        RubyHash metricStore = (RubyHash) metric.collector(RUBY.getCurrentContext())
-                .callMethod(RUBY.getCurrentContext(), "snapshot_metric")
-                .callMethod(RUBY.getCurrentContext(), "metric_store")
-                .callMethod(RUBY.getCurrentContext(), "get_with_path", new IRubyObject[]{RUBY.newString("output/foo")});
-
-        RubyHash rh = metricStore;
-        for (String p : path) {
-            rh = (RubyHash) rh.op_aref(RUBY.getCurrentContext(), RUBY.newSymbol(p));
-        }
-        return rh;
-    }
-
-    private String getMetricStringValue(RubyHash metricStore, String symbolName) {
-        ConcreteJavaProxy counter = (ConcreteJavaProxy) metricStore.op_aref(RUBY.getCurrentContext(), RUBY.newSymbol(symbolName));
-        RubyString value = (RubyString) counter.callMethod("value");
-        return value.asJavaString();
+        return getMetricStore(new String[]{"output", "foo", EVENTS_KEY.asJavaString()});
     }
 
     private long getMetricLongValue(String symbolName) {
         return getMetricLongValue(getMetricStore(), symbolName);
     }
 
-    private long getMetricLongValue(RubyHash metricStore, String symbolName) {
-        ConcreteJavaProxy counter = (ConcreteJavaProxy) metricStore.op_aref(RUBY.getCurrentContext(), RUBY.newSymbol(symbolName));
-        RubyFixnum count = (RubyFixnum) counter.callMethod("value");
-        return count.getLongValue();
-    }
-
     private static class StrategyPair {
         RubySymbol symbol;
         Class klazz;
 
         StrategyPair(String symbolName, Class c) {
-            this.symbol = RUBY.newSymbol(symbolName);
+            this.symbol = RUBY.newString(symbolName).intern();
             this.klazz = c;
         }
     }
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/compiler/PluginDelegatorTestCase.java b/logstash-core/src/test/java/org/logstash/config/ir/compiler/PluginDelegatorTestCase.java
new file mode 100644
index 000000000..187d323af
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/config/ir/compiler/PluginDelegatorTestCase.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.config.ir.compiler;
+
+import org.jruby.RubyArray;
+import org.jruby.RubyFixnum;
+import org.jruby.RubyHash;
+import org.jruby.RubyString;
+import org.jruby.RubySymbol;
+import org.jruby.java.proxies.ConcreteJavaProxy;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.junit.Before;
+import org.logstash.config.ir.RubyEnvTestCase;
+import org.logstash.execution.ExecutionContextExt;
+import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
+import org.logstash.instrument.metrics.NamespacedMetricExt;
+
+import static org.logstash.RubyUtil.EXECUTION_CONTEXT_CLASS;
+import static org.logstash.RubyUtil.NAMESPACED_METRIC_CLASS;
+import static org.logstash.RubyUtil.RUBY;
+
+public abstract class PluginDelegatorTestCase extends RubyEnvTestCase {
+    protected AbstractNamespacedMetricExt metric;
+    protected ExecutionContextExt executionContext;
+
+    @Before
+    public void setup() {
+        final ThreadContext context = RUBY.getCurrentContext();
+        @SuppressWarnings("rawtypes")
+        final RubyArray namespaces = RubyArray.newArray(RUBY, 1);
+        namespaces.add(0, RUBY.newString(getBaseMetricsPath().split("/")[0]).intern());
+        IRubyObject metricWithCollector =
+            runRubyScript("require \"logstash/instrument/collector\"\n" +
+                              "metricWithCollector = LogStash::Instrument::Metric.new(LogStash::Instrument::Collector.new)");
+
+        metric = new NamespacedMetricExt(RUBY, NAMESPACED_METRIC_CLASS)
+            .initialize(context, metricWithCollector, namespaces);
+        executionContext = new ExecutionContextExt(RUBY, EXECUTION_CONTEXT_CLASS);
+    }
+
+    protected static IRubyObject runRubyScript(String script) {
+        IRubyObject m = RUBY.evalScriptlet(script);
+        return m;
+    }
+
+    protected RubyHash getMetricStore(String[] path) {
+        RubyHash metricStore = (RubyHash) metric.collector(RUBY.getCurrentContext())
+            .callMethod(RUBY.getCurrentContext(), "snapshot_metric")
+            .callMethod(RUBY.getCurrentContext(), "metric_store")
+            .callMethod(RUBY.getCurrentContext(), "get_with_path", new IRubyObject[]{RUBY.newString(getBaseMetricsPath())});
+
+        RubyHash rh = metricStore;
+        for (String p : path) {
+            rh = (RubyHash) rh.op_aref(RUBY.getCurrentContext(), RUBY.newString(p).intern());
+        }
+        return rh;
+    }
+
+    protected abstract String getBaseMetricsPath();
+
+    protected String getMetricStringValue(RubyHash metricStore, String symbolName) {
+        ConcreteJavaProxy counter = (ConcreteJavaProxy) metricStore.op_aref(RUBY.getCurrentContext(), RUBY.newString(symbolName).intern());
+        RubyString value = (RubyString) counter.callMethod("value");
+        return value.asJavaString();
+    }
+
+    protected long getMetricLongValue(RubyHash metricStore, String symbolName) {
+        ConcreteJavaProxy counter = (ConcreteJavaProxy) metricStore.op_aref(RUBY.getCurrentContext(), RUBY.newString(symbolName).intern());
+        RubyFixnum count = (RubyFixnum) counter.callMethod("value");
+        return count.getLongValue();
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/compiler/PluginFactoryTest.java b/logstash-core/src/test/java/org/logstash/config/ir/compiler/PluginFactoryTest.java
deleted file mode 100644
index 6264d3957..000000000
--- a/logstash-core/src/test/java/org/logstash/config/ir/compiler/PluginFactoryTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.logstash.config.ir.compiler;
-
-import org.junit.Test;
-
-/**
- * Tests for {@link PluginFactory.Default}.
- */
-public final class PluginFactoryTest {
-
-    @Test
-    public void testBuildJavaFilter() throws Exception {
-
-    }
-
-}
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/expression/ExpressionSubstitutionTest.java b/logstash-core/src/test/java/org/logstash/config/ir/expression/ExpressionSubstitutionTest.java
new file mode 100644
index 000000000..10ce35529
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/config/ir/expression/ExpressionSubstitutionTest.java
@@ -0,0 +1,91 @@
+package org.logstash.config.ir.expression;
+
+import com.google.common.collect.ImmutableMap;
+import org.junit.Test;
+import org.logstash.common.EnvironmentVariableProvider;
+import org.logstash.common.SourceWithMetadata;
+import org.logstash.config.ir.InvalidIRException;
+import org.logstash.config.ir.expression.binary.And;
+import org.logstash.config.ir.expression.binary.Eq;
+import org.logstash.config.ir.expression.binary.Or;
+import org.logstash.config.ir.expression.unary.Not;
+import org.logstash.plugins.ConfigVariableExpander;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+
+public class ExpressionSubstitutionTest {
+
+    @Test
+    public void basicBinaryBooleanSubstitution() throws InvalidIRException {
+        SourceWithMetadata swm = new SourceWithMetadata("proto", "path", 1, 8, "if \"${SMALL}\" == 1 { add_tag => \"pass\" }");
+        ValueExpression left = new ValueExpression(swm, "${SMALL}");
+        ValueExpression right = new ValueExpression(swm, "1");
+        BinaryBooleanExpression expression = new Eq(swm, left, right);
+
+        ConfigVariableExpander cve = getConfigVariableExpander();
+        BinaryBooleanExpression substituted = (BinaryBooleanExpression) ExpressionSubstitution.substituteBoolExpression(cve, expression);
+        assertEquals(((ValueExpression) substituted.getLeft()).get(), "1");
+    }
+
+    @Test
+    public void basicUnaryBooleanSubstitution() throws InvalidIRException {
+        SourceWithMetadata swm = new SourceWithMetadata("proto", "path", 1, 8, "if !(\"${BIG}\" == 100) { add_tag => \"not\" }");
+        ValueExpression valueExp = new ValueExpression(swm, "${BIG}");
+        UnaryBooleanExpression expression = new Not(swm, valueExp);
+
+        ConfigVariableExpander cve = getConfigVariableExpander();
+        UnaryBooleanExpression substituted = (UnaryBooleanExpression) ExpressionSubstitution.substituteBoolExpression(cve, expression);
+        assertEquals(((ValueExpression) substituted.getExpression()).get(), "100");
+    }
+
+    @Test
+    public void noRegexSubstitution() throws InvalidIRException {
+        SourceWithMetadata swm = new SourceWithMetadata("proto", "path", 1, 8, "if [version] =~ /${SMALL}/ { add_tag => \"regex\" }");
+        EventValueExpression left = new EventValueExpression(swm, "version");
+        RegexValueExpression right = new RegexValueExpression(swm, "${SMALL}");
+        BinaryBooleanExpression expression = new Eq(swm, left, right);
+
+        ConfigVariableExpander cve = getConfigVariableExpander();
+        BinaryBooleanExpression substituted = (BinaryBooleanExpression) ExpressionSubstitution.substituteBoolExpression(cve, expression);
+        assertEquals(substituted.getRight(), expression.getRight());
+    }
+
+    @Test
+    public void nestedBinaryBooleanSubstitution() throws InvalidIRException {
+        SourceWithMetadata swm = new SourceWithMetadata("proto", "path", 1, 8,
+                "if \"${SMALL}\" == 1 and 100 == \"${BIG}\" or [version] == 1 { add_tag => \"pass\" }");
+        ValueExpression smallLeft = new ValueExpression(swm, "${SMALL}");
+        ValueExpression smallRight = new ValueExpression(swm, "1");
+        BinaryBooleanExpression smallExp = new Eq(swm, smallLeft, smallRight);
+
+        ValueExpression bigLeft = new ValueExpression(swm, "100");
+        ValueExpression bigRight = new ValueExpression(swm, "${BIG}");
+        BinaryBooleanExpression bigExp = new Eq(swm, bigLeft, bigRight);
+
+        EventValueExpression versionLeft = new EventValueExpression(swm, "version");
+        ValueExpression versionRight = new ValueExpression(swm, "1");
+        BinaryBooleanExpression versionExp = new Eq(swm, versionLeft, versionRight);
+
+        And andExp = new And(swm, smallExp, bigExp);
+        Or orExp = new Or(swm, andExp, versionExp);
+
+        ConfigVariableExpander cve = getConfigVariableExpander();
+        BinaryBooleanExpression substituted = (BinaryBooleanExpression) ExpressionSubstitution.substituteBoolExpression(cve, orExp);
+        And subAnd = (And) substituted.getLeft();
+        BinaryBooleanExpression subSmallExp = (BinaryBooleanExpression) subAnd.getLeft();
+        BinaryBooleanExpression subBigExp = (BinaryBooleanExpression) subAnd.getRight();
+        assertEquals(((ValueExpression) subSmallExp.getLeft()).get(), "1");
+        assertEquals(((ValueExpression) subBigExp.getRight()).get(), "100");
+    }
+
+    public Map<String, String> envVar() {
+        return ImmutableMap.of("APP", "foobar", "SMALL", "1", "BIG", "100");
+    }
+
+    public ConfigVariableExpander getConfigVariableExpander() {
+        return ConfigVariableExpander.withoutSecret(envVar()::get);
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/graph/BooleanEdgeTest.java b/logstash-core/src/test/java/org/logstash/config/ir/graph/BooleanEdgeTest.java
index 865412f4f..2c5c2cd3d 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/graph/BooleanEdgeTest.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/graph/BooleanEdgeTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph;
 
 import org.junit.experimental.theories.DataPoint;
@@ -7,7 +27,7 @@ import org.junit.runner.RunWith;
 import org.logstash.config.ir.InvalidIRException;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.logstash.config.ir.IRHelpers.*;
 
 @RunWith(Theories.class)
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/graph/EdgeTest.java b/logstash-core/src/test/java/org/logstash/config/ir/graph/EdgeTest.java
index 2b55279f7..a6682c848 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/graph/EdgeTest.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/graph/EdgeTest.java
@@ -1,10 +1,30 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph;
 
 import org.junit.Test;
 import org.logstash.config.ir.IRHelpers;
 import org.logstash.config.ir.InvalidIRException;
 
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.CoreMatchers.*;
 
 public class EdgeTest {
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/graph/GraphTest.java b/logstash-core/src/test/java/org/logstash/config/ir/graph/GraphTest.java
index 26737b892..f4be4bc49 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/graph/GraphTest.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/graph/GraphTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph;
 
 import org.junit.Test;
@@ -10,7 +30,10 @@ import java.util.Collections;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.logstash.config.ir.IRHelpers.createTestExpression;
 import static org.logstash.config.ir.IRHelpers.createTestVertex;
 import static org.logstash.config.ir.IRHelpers.randMeta;
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/graph/IfVertexTest.java b/logstash-core/src/test/java/org/logstash/config/ir/graph/IfVertexTest.java
index 9c9f77992..dfb5ae523 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/graph/IfVertexTest.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/graph/IfVertexTest.java
@@ -1,10 +1,38 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph;
 
 import org.junit.Test;
+import org.logstash.common.ConfigVariableExpanderTest;
+import org.logstash.config.ir.DSL;
 import org.logstash.config.ir.InvalidIRException;
+import org.logstash.config.ir.expression.BooleanExpression;
+import org.logstash.config.ir.expression.ExpressionSubstitution;
+import org.logstash.config.ir.expression.binary.Eq;
+import org.logstash.plugins.ConfigVariableExpander;
+
+import java.util.Collections;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.logstash.config.ir.IRHelpers.*;
 
 public class IfVertexTest {
@@ -60,4 +88,21 @@ public class IfVertexTest {
         return new IfVertex(randMeta(), createTestExpression());
     }
 
+    @Test
+    public void testIfVertexWithSecretsIsntLeaked() throws InvalidIRException {
+        BooleanExpression booleanExpression = DSL.eEq(DSL.eEventValue("password"), DSL.eValue("${secret_key}"));
+
+        ConfigVariableExpander cve = ConfigVariableExpanderTest.getFakeCve(
+                Collections.singletonMap("secret_key", "s3cr3t"), Collections.emptyMap());
+
+        IfVertex ifVertex = new IfVertex(randMeta(),
+                (BooleanExpression) ExpressionSubstitution.substituteBoolExpression(cve, booleanExpression));
+
+        // Exercise
+        String output = ifVertex.toString();
+
+        // Verify
+        assertThat(output, not(containsString("s3cr3t")));
+    }
+
 }
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/graph/PlainEdgeTest.java b/logstash-core/src/test/java/org/logstash/config/ir/graph/PlainEdgeTest.java
index b84d16d6b..b5ed58bce 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/graph/PlainEdgeTest.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/graph/PlainEdgeTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph;
 
 import org.junit.Test;
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/graph/PluginVertexTest.java b/logstash-core/src/test/java/org/logstash/config/ir/graph/PluginVertexTest.java
index eb4a78a4e..37b7cee6d 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/graph/PluginVertexTest.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/graph/PluginVertexTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph;
 
 import org.junit.Test;
@@ -9,7 +29,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.logstash.config.ir.IRHelpers.*;
 
 public class PluginVertexTest {
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/graph/QueueVertexTest.java b/logstash-core/src/test/java/org/logstash/config/ir/graph/QueueVertexTest.java
index ca8fdad0d..38a2d3517 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/graph/QueueVertexTest.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/graph/QueueVertexTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph;
 
 import org.junit.Test;
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/graph/VertexTest.java b/logstash-core/src/test/java/org/logstash/config/ir/graph/VertexTest.java
index 05e5f3bb8..16de35fb8 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/graph/VertexTest.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/graph/VertexTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph;
 
 import org.junit.Test;
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/graph/algorithms/BreadthFirstTest.java b/logstash-core/src/test/java/org/logstash/config/ir/graph/algorithms/BreadthFirstTest.java
index 3fa6dda6c..0a1613c4e 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/graph/algorithms/BreadthFirstTest.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/graph/algorithms/BreadthFirstTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph.algorithms;
 
 import org.junit.Test;
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/graph/algorithms/DepthFirstTest.java b/logstash-core/src/test/java/org/logstash/config/ir/graph/algorithms/DepthFirstTest.java
index 80cad6584..b2566031a 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/graph/algorithms/DepthFirstTest.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/graph/algorithms/DepthFirstTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph.algorithms;
 
 import org.junit.Before;
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/graph/algorithms/GraphDiffTest.java b/logstash-core/src/test/java/org/logstash/config/ir/graph/algorithms/GraphDiffTest.java
index 576e416dc..70427b37a 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/graph/algorithms/GraphDiffTest.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/graph/algorithms/GraphDiffTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph.algorithms;
 
 import org.junit.Test;
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/graph/algorithms/TopologicalSortTest.java b/logstash-core/src/test/java/org/logstash/config/ir/graph/algorithms/TopologicalSortTest.java
index c1d9bd396..23c50b350 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/graph/algorithms/TopologicalSortTest.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/graph/algorithms/TopologicalSortTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.graph.algorithms;
 
 import org.junit.Test;
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/imperative/DSLTest.java b/logstash-core/src/test/java/org/logstash/config/ir/imperative/DSLTest.java
index 5131c873f..71a6bfe2a 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/imperative/DSLTest.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/imperative/DSLTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.imperative;
 
 import org.junit.Test;
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/imperative/IfStatementTest.java b/logstash-core/src/test/java/org/logstash/config/ir/imperative/IfStatementTest.java
index 0275f8e6e..5c875723c 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/imperative/IfStatementTest.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/imperative/IfStatementTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.imperative;
 
 import org.junit.Test;
@@ -5,15 +25,14 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import java.util.stream.Stream;
 
-import org.logstash.common.SourceWithMetadata;
+import org.logstash.common.EnvironmentVariableProvider;
 import org.logstash.config.ir.DSL;
 import org.logstash.config.ir.InvalidIRException;
 import org.logstash.config.ir.PluginDefinition;
 import org.logstash.config.ir.expression.BooleanExpression;
-import org.logstash.config.ir.expression.Expression;
 import org.logstash.config.ir.graph.*;
+import org.logstash.plugins.ConfigVariableExpander;
 
 import static org.logstash.config.ir.IRHelpers.*;
 
@@ -21,6 +40,7 @@ public class IfStatementTest {
 
     @Test
     public void testEmptyIf() throws InvalidIRException {
+        ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
         Statement trueStatement = new NoopStatement(randMeta());
         Statement falseStatement = new NoopStatement(randMeta());
         IfStatement ifStatement = new IfStatement(
@@ -30,12 +50,13 @@ public class IfStatementTest {
                 falseStatement
         );
 
-        Graph ifStatementGraph = ifStatement.toGraph();
+        Graph ifStatementGraph = ifStatement.toGraph(cve);
         assertTrue(ifStatementGraph.isEmpty());
     }
 
     @Test
     public void testIfWithOneTrueStatement() throws InvalidIRException {
+        ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
         PluginDefinition pluginDef = testPluginDefinition();
         Statement trueStatement = new PluginStatement(randMeta(), pluginDef);
         Statement falseStatement = new NoopStatement(randMeta());
@@ -47,7 +68,7 @@ public class IfStatementTest {
                 falseStatement
         );
 
-        Graph ifStatementGraph = ifStatement.toGraph();
+        Graph ifStatementGraph = ifStatement.toGraph(cve);
         assertFalse(ifStatementGraph.isEmpty());
         
         Graph expected = new Graph();
@@ -62,6 +83,7 @@ public class IfStatementTest {
 
     @Test
     public void testIfWithOneFalseStatement() throws InvalidIRException {
+        ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
         PluginDefinition pluginDef = testPluginDefinition();
         Statement trueStatement = new NoopStatement(randMeta());
         Statement falseStatement = new PluginStatement(randMeta(), pluginDef);
@@ -73,7 +95,7 @@ public class IfStatementTest {
                 falseStatement
         );
 
-        Graph ifStatementGraph = ifStatement.toGraph();
+        Graph ifStatementGraph = ifStatement.toGraph(cve);
         assertFalse(ifStatementGraph.isEmpty());
 
         Graph expected = new Graph();
@@ -88,6 +110,7 @@ public class IfStatementTest {
 
     @Test
     public void testIfWithOneTrueOneFalseStatement() throws InvalidIRException {
+        ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
         PluginDefinition pluginDef = testPluginDefinition();
         Statement trueStatement = new PluginStatement(randMeta(), pluginDef);
         Statement falseStatement = new PluginStatement(randMeta(), pluginDef);
@@ -99,7 +122,7 @@ public class IfStatementTest {
                 falseStatement
         );
 
-        Graph ifStatementGraph = ifStatement.toGraph();
+        Graph ifStatementGraph = ifStatement.toGraph(cve);
         assertFalse(ifStatementGraph.isEmpty());
 
         Graph expected = new Graph();
diff --git a/logstash-core/src/test/java/org/logstash/config/ir/imperative/ImperativeToGraphtest.java b/logstash-core/src/test/java/org/logstash/config/ir/imperative/ImperativeToGraphtest.java
index 109e2b003..7c5375257 100644
--- a/logstash-core/src/test/java/org/logstash/config/ir/imperative/ImperativeToGraphtest.java
+++ b/logstash-core/src/test/java/org/logstash/config/ir/imperative/ImperativeToGraphtest.java
@@ -1,10 +1,32 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.config.ir.imperative;
 
 import org.junit.Test;
+import org.logstash.common.EnvironmentVariableProvider;
 import org.logstash.config.ir.InvalidIRException;
 import org.logstash.config.ir.graph.Graph;
 import org.logstash.config.ir.graph.IfVertex;
 import org.logstash.config.ir.graph.PluginVertex;
+import org.logstash.plugins.ConfigVariableExpander;
 
 import static org.logstash.config.ir.DSL.*;
 import static org.logstash.config.ir.IRHelpers.assertSyntaxEquals;
@@ -15,7 +37,8 @@ public class ImperativeToGraphtest {
 
     @Test
     public void convertSimpleExpression() throws InvalidIRException {
-        Graph imperative =  iComposeSequence(randMeta(), iPlugin(randMeta(), FILTER, "json"), iPlugin(randMeta(), FILTER, "stuff")).toGraph();
+        ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
+        Graph imperative =  iComposeSequence(randMeta(), iPlugin(randMeta(), FILTER, "json"), iPlugin(randMeta(), FILTER, "stuff")).toGraph(cve);
         imperative.validate(); // Verify this is a valid graph
 
         Graph regular = Graph.empty();
@@ -26,10 +49,11 @@ public class ImperativeToGraphtest {
 
     @Test
     public void testIdsDontAffectSourceComponentEquality() throws InvalidIRException {
+        ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
         Graph imperative =  iComposeSequence(
                 iPlugin(randMeta(), FILTER, "json", "oneid"),
                 iPlugin(randMeta(), FILTER, "stuff", "anotherid")
-        ).toGraph();
+        ).toGraph(cve);
         imperative.validate(); // Verify this is a valid graph
 
         Graph regular = Graph.empty();
@@ -43,6 +67,7 @@ public class ImperativeToGraphtest {
 
     @Test
     public void convertComplexExpression() throws InvalidIRException {
+        ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
         Graph imperative = iComposeSequence(
                 iPlugin(randMeta(), FILTER, "p1"),
                 iPlugin(randMeta(), FILTER, "p2"),
@@ -50,7 +75,7 @@ public class ImperativeToGraphtest {
                         iPlugin(randMeta(), FILTER, "p3"),
                         iComposeSequence(iPlugin(randMeta(), FILTER, "p4"), iPlugin(randMeta(), FILTER, "p5"))
                 )
-        ).toGraph();
+        ).toGraph(cve);
         imperative.validate(); // Verify this is a valid graph
 
         PluginVertex p1 = gPlugin(randMeta(), FILTER, "p1");
@@ -73,6 +98,7 @@ public class ImperativeToGraphtest {
     // partial leaves. This makes sure they all wire-up right
     @Test
     public void deepDanglingPartialLeaves() throws InvalidIRException {
+        ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
         Graph imperative = iComposeSequence(
                  iPlugin(randMeta(), FILTER, "p0"),
                  iIf(randMeta(), eTruthy(eValue(1)),
@@ -86,7 +112,7 @@ public class ImperativeToGraphtest {
                  ),
                  iPlugin(randMeta(), FILTER, "pLast")
 
-         ).toGraph();
+         ).toGraph(cve);
         imperative.validate(); // Verify this is a valid graph
 
         IfVertex if1 = gIf(randMeta(), eTruthy(eValue(1)));
@@ -121,6 +147,7 @@ public class ImperativeToGraphtest {
     // single node
     @Test
     public void convertComplexExpressionWithTerminal() throws InvalidIRException {
+        ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
         Graph imperative = iComposeSequence(
             iPlugin(randMeta(), FILTER, "p1"),
             iIf(randMeta(), eTruthy(eValue(1)),
@@ -134,7 +161,7 @@ public class ImperativeToGraphtest {
                 )
             ),
             iPlugin(randMeta(), FILTER, "terminal")
-        ).toGraph();
+        ).toGraph(cve);
         imperative.validate(); // Verify this is a valid graph
 
         PluginVertex p1 = gPlugin(randMeta(), FILTER,"p1");
diff --git a/logstash-core/src/test/java/org/logstash/execution/AbstractPipelineExtTest.java b/logstash-core/src/test/java/org/logstash/execution/AbstractPipelineExtTest.java
new file mode 100644
index 000000000..5f38649b1
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/execution/AbstractPipelineExtTest.java
@@ -0,0 +1,34 @@
+package org.logstash.execution;
+
+import org.junit.Test;
+
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+
+import static org.junit.Assert.assertEquals;
+
+public class AbstractPipelineExtTest {
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testParseToDurationWithBadDurationFormatThrowsAnError() {
+        AbstractPipelineExt.parseToDuration("+3m");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testParseToDurationWithUnrecognizedTimeUnitThrowsAnError() {
+        AbstractPipelineExt.parseToDuration("3y");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testParseToDurationWithUnspecifiedTimeUnitThrowsAnError() {
+        AbstractPipelineExt.parseToDuration("3");
+    }
+
+    @Test
+    public void testParseToDurationSuccessfullyParseExpectedFormats() {
+        assertEquals(Duration.of(4, ChronoUnit.DAYS), AbstractPipelineExt.parseToDuration("4d"));
+        assertEquals(Duration.of(3, ChronoUnit.HOURS), AbstractPipelineExt.parseToDuration("3h"));
+        assertEquals(Duration.of(2, ChronoUnit.MINUTES), AbstractPipelineExt.parseToDuration("2m"));
+        assertEquals(Duration.of(1, ChronoUnit.SECONDS), AbstractPipelineExt.parseToDuration("1s"));
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/execution/ObservedExecutionTest.java b/logstash-core/src/test/java/org/logstash/execution/ObservedExecutionTest.java
new file mode 100644
index 000000000..bd0d04ba6
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/execution/ObservedExecutionTest.java
@@ -0,0 +1,163 @@
+package org.logstash.execution;
+
+import org.jruby.Ruby;
+import org.jruby.RubyArray;
+import org.jruby.runtime.ThreadContext;
+import org.junit.Test;
+import org.logstash.config.ir.CompiledPipeline;
+import org.logstash.config.ir.RubyEnvTestCase;
+import org.logstash.ext.JrubyEventExtLibrary;
+import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
+import org.logstash.instrument.metrics.ManualAdvanceClock;
+import org.logstash.instrument.metrics.MetricExt;
+import org.logstash.instrument.metrics.MetricExtFactory;
+import org.logstash.instrument.metrics.MetricKeys;
+import org.logstash.instrument.metrics.counter.LongCounter;
+import org.logstash.instrument.metrics.timer.TimerMetric;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
+
+public class ObservedExecutionTest extends RubyEnvTestCase {
+
+    /**
+     * This test emulates events flowing through multiple workers in two pipelines to ensure
+     * that our {@link ObservedExecution} correctly records event counts for filtered and output,
+     * along with the timing of execution.
+     */
+    @Test
+    public void compute() throws IOException {
+        final ManualAdvanceClock manualAdvanceClock = new ManualAdvanceClock(Instant.now());
+        final MetricExt rootMetric = MetricExtFactory.newMetricExtFromTestClock(manualAdvanceClock);
+        final MockCompiledExecution mockQueueBatchExecution = new MockCompiledExecution(manualAdvanceClock);
+
+        final AbstractNamespacedMetricExt processEventsNamespace = namespaceMetric(rootMetric, "events");
+        final AbstractNamespacedMetricExt pipelineAEventsNamespace = namespaceMetric(rootMetric, "pipelines", "a", "events");
+        final AbstractNamespacedMetricExt pipelineBEventsNamespace = namespaceMetric(rootMetric, "pipelines", "b", "events");
+
+        // we create two worker observers, one for each pipeline, connected to the relevant metric namespaces
+        final WorkerObserver pipelineAWorkerObserver = new WorkerObserver(processEventsNamespace, pipelineAEventsNamespace);
+        final WorkerObserver pipelineBWorkerObserver = new WorkerObserver(processEventsNamespace, pipelineBEventsNamespace);
+
+        // we create three observed executions to test, one for pipeline A, and two for pipeline B
+        final ObservedExecution<MockQueueBatch> executionPipelineAWorker1 = pipelineAWorkerObserver.ofExecution(mockQueueBatchExecution);
+        final ObservedExecution<MockQueueBatch> executionPipelineBWorker1 = pipelineBWorkerObserver.ofExecution(mockQueueBatchExecution);
+        final ObservedExecution<MockQueueBatch> executionPipelineBWorker2 = pipelineBWorkerObserver.ofExecution(mockQueueBatchExecution);
+
+        // in pipeline A, we take 110.9ms to filter 100 events and output 10 events
+        final MockQueueBatch mockQueueBatchA = new MockQueueBatch(100, 10, 110_900_000L);
+        final int eventsOutputA = executionPipelineAWorker1.compute(mockQueueBatchA, false, false);
+        assertThat(eventsOutputA, is(equalTo(10)));
+
+        // in pipeline B on worker 1, we take 1010.9ms to filter 1000 events and output 100 events
+        final MockQueueBatch mockQueueBatchB = new MockQueueBatch(1000, 100, 1_010_900_000L);
+        final int eventsOutputB = executionPipelineBWorker1.compute(mockQueueBatchB, false, false);
+        assertThat(eventsOutputB, is(equalTo(100)));
+
+        // again in pipeline B on worker 1, we take 10010.9ms to filter 1000 events and output 1000 events
+        final MockQueueBatch mockQueueBatchB2 = new MockQueueBatch(1000, 1000, 10_010_900_000L);
+        final int eventsOutputB2 = executionPipelineBWorker1.compute(mockQueueBatchB2, false, false);
+        assertThat(eventsOutputB2, is(equalTo(1000)));
+
+        // and in pipeline B on worker 2, we take 100010.9ms to filter 1000 events and output 10000 events
+        final MockQueueBatch mockQueueBatchB3 = new MockQueueBatch(1000, 10000, 100_010_900_000L);
+        final int eventsOutputB3 = executionPipelineBWorker2.compute(mockQueueBatchB3, false, false);
+        assertThat(eventsOutputB3, is(equalTo(10000)));
+
+        // validate that the inbound filter counts made it to our independent pipeline metrics and to the combined process
+        final LongCounter pipelineAEventsFilteredCounter = LongCounter.fromRubyBase(pipelineAEventsNamespace, MetricKeys.FILTERED_KEY);
+        final LongCounter pipelineBEventsFilteredCounter = LongCounter.fromRubyBase(pipelineBEventsNamespace, MetricKeys.FILTERED_KEY);
+        final LongCounter processEventsFilteredCounter = LongCounter.fromRubyBase(processEventsNamespace, MetricKeys.FILTERED_KEY);
+        assertThat(pipelineAEventsFilteredCounter.getValue(), is(equalTo(100L)));
+        assertThat(pipelineBEventsFilteredCounter.getValue(), is(equalTo(3000L)));
+        assertThat(processEventsFilteredCounter.getValue(), is(equalTo(3100L)));
+
+        // validate that the outbound execution counts made it to our independent pipeline metrics and to the combined process
+        final LongCounter pipelineAEventsOutCounter = LongCounter.fromRubyBase(pipelineAEventsNamespace, MetricKeys.OUT_KEY);
+        final LongCounter pipelineBEventsOutCounter = LongCounter.fromRubyBase(pipelineBEventsNamespace, MetricKeys.OUT_KEY);
+        final LongCounter processEventsOutCounter = LongCounter.fromRubyBase(processEventsNamespace, MetricKeys.OUT_KEY);
+        assertThat(pipelineAEventsOutCounter.getValue(), is(equalTo(10L)));
+        assertThat(pipelineBEventsOutCounter.getValue(), is(equalTo(11100L)));
+        assertThat(processEventsOutCounter.getValue(), is(equalTo(11110L)));
+
+        // validate that the timings were reported to our independent pipeline metrics and to the combined process
+        final TimerMetric pipelineADurationTimer = TimerMetric.fromRubyBase(pipelineAEventsNamespace, MetricKeys.DURATION_IN_MILLIS_KEY);
+        final TimerMetric pipelineBDurationTimer = TimerMetric.fromRubyBase(pipelineBEventsNamespace, MetricKeys.DURATION_IN_MILLIS_KEY);
+        final TimerMetric processDurationTimer = TimerMetric.fromRubyBase(processEventsNamespace, MetricKeys.DURATION_IN_MILLIS_KEY);
+        assertThat(pipelineADurationTimer.getValue(), is(equalTo(110L)));    // 110.9 -> 110
+        assertThat(pipelineBDurationTimer.getValue(), is(equalTo(111032L))); // 1010.9 + 10010.9 + 100010.9 = 111032.7 -> 111032
+        assertThat(processDurationTimer.getValue(), is(equalTo(111143L)));   // 110.9 + 101.9 + 1001.9 + 10001.9 = 111143.6 -> 111143
+    }
+
+    private AbstractNamespacedMetricExt namespaceMetric(final MetricExt metricExt, final String... namespaces) {
+        final Ruby runtime = metricExt.getRuntime();
+        final ThreadContext context = runtime.getCurrentContext();
+
+        return metricExt.namespace(context, runtime.newArray(Arrays.stream(namespaces).map(runtime::newSymbol).collect(Collectors.toList())));
+    }
+
+    /**
+     * This {@code MockCompiledExecution} is an implementation of {@link CompiledPipeline.Execution}
+     * whose behaviour for {@code compute} is determined by the {@link MockQueueBatch} it receives.
+     * it is instantiated with a {@link ManualAdvanceClock}, which it advances during execution by
+     * {@code MockQueueBatch.executionDurationNanos}, and each computation returns the provided
+     * {@code MockQueueBatch.computationOutputSize} as its result.
+     */
+    static class MockCompiledExecution implements CompiledPipeline.Execution<MockQueueBatch> {
+        private final ManualAdvanceClock manualAdvanceClock;
+
+        public MockCompiledExecution(final ManualAdvanceClock manualAdvanceClock) {
+            this.manualAdvanceClock = manualAdvanceClock;
+        }
+
+        @Override
+        public int compute(MockQueueBatch batch, boolean flush, boolean shutdown) {
+            this.manualAdvanceClock.advance(Duration.ofNanos(batch.executionDurationNanos));
+            return batch.computationOutputSize;
+        }
+    }
+
+    /**
+     * A minimal implementation of {@code QueueBatch} exclusively for use with {@link MockCompiledExecution}
+     * and providing the minimum subset of {@code QueueBatch}'s interface to satisfy {@link ObservedExecution<MockQueueBatch>}.
+     */
+    static class MockQueueBatch implements QueueBatch {
+        private final int initialSize;
+        private final int computationOutputSize;
+
+        private final long executionDurationNanos;
+
+        public MockQueueBatch(int initialSize, int computationOutputSize, long executionDurationNanos) {
+            this.initialSize = initialSize;
+            this.computationOutputSize = computationOutputSize;
+            this.executionDurationNanos = executionDurationNanos;
+        }
+
+        @Override
+        public int filteredSize() {
+            return this.initialSize;
+        }
+
+        @Override
+        public RubyArray<JrubyEventExtLibrary.RubyEvent> to_a() {
+            throw new IllegalStateException("Mock Batch `to_a` method is not defined.");
+        }
+
+        @Override
+        public Collection<JrubyEventExtLibrary.RubyEvent> events() {
+            throw new IllegalStateException("Mock Batch `events` method is not defined.");
+        }
+        @Override
+        public void close() throws IOException {
+            // no-op
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/execution/ShutdownWatcherExtTest.java b/logstash-core/src/test/java/org/logstash/execution/ShutdownWatcherExtTest.java
index 74233e556..79ca8ac0a 100644
--- a/logstash-core/src/test/java/org/logstash/execution/ShutdownWatcherExtTest.java
+++ b/logstash-core/src/test/java/org/logstash/execution/ShutdownWatcherExtTest.java
@@ -1,64 +1,107 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.execution;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.IntStream;
 import javax.annotation.concurrent.NotThreadSafe;
+
+import org.apache.logging.log4j.junit.LoggerContextRule;
+import org.apache.logging.log4j.test.appender.ListAppender;
 import org.assertj.core.api.Assertions;
 import org.jruby.RubySystemExit;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.junit.Before;
+import org.junit.ClassRule;
 import org.junit.Test;
+import org.logstash.RubyTestBase;
 import org.logstash.RubyUtil;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Tests for {@link ShutdownWatcherExt}.
  */
 @NotThreadSafe
-public final class ShutdownWatcherExtTest {
+public final class ShutdownWatcherExtTest extends RubyTestBase {
+
+    private static final String CONFIG = "log4j2-test1.xml";
+    private static final Path PIPELINE_TEMPLATE = Paths.get("./src/test/resources/shutdown_watcher_ext_pipeline_template.rb").toAbsolutePath();
+    private ListAppender appender;
+
+    @ClassRule
+    public static LoggerContextRule CTX = new LoggerContextRule(CONFIG);
+
+    @Before
+    public void setup() {
+        appender = CTX.getListAppender("EventLogger").clear();
+    }
 
     @Test
-    public void testShouldForceShutdown() throws InterruptedException {
+    public void pipelineWithUnsafeShutdownShouldForceShutdown() throws InterruptedException, IOException {
+        String pipeline = resolvedPipeline(false);
+        watcherShutdownStallingPipeline(pipeline);
+
+        // non drain pipeline should print stall msg
+        boolean printStalling = appender.getMessages().stream().anyMatch((msg) -> msg.contains("stalling"));
+        assertTrue(printStalling);
+    }
+
+
+    @Test
+    public void pipelineWithDrainShouldNotPrintStallMsg() throws InterruptedException, IOException {
+        String pipeline = resolvedPipeline(true);
+        watcherShutdownStallingPipeline(pipeline);
+
+        boolean printStalling = appender.getMessages().stream().anyMatch((msg) -> msg.contains("stalling"));
+        assertFalse(printStalling);
+    }
+
+    private void watcherShutdownStallingPipeline(String rubyScript) throws InterruptedException {
         final ExecutorService exec = Executors.newSingleThreadExecutor();
         try {
             final Future<IRubyObject> res = exec.submit(() -> {
                 final ThreadContext context = RubyUtil.RUBY.getCurrentContext();
                 ShutdownWatcherExt.setUnsafeShutdown(context, null, context.tru);
                 return new ShutdownWatcherExt(context.runtime, RubyUtil.SHUTDOWN_WATCHER_CLASS)
-                    .initialize(
-                        context, new IRubyObject[]{
-                            RubyUtil.RUBY.evalScriptlet(
-                                String.join(
-                                    "\n",
-                                    "pipeline = Object.new",
-                                    "reporter = Object.new",
-                                    "snapshot = Object.new",
-                                    "inflight_count = java.util.concurrent.atomic.AtomicInteger.new",
-                                    "snapshot.define_singleton_method(:inflight_count) do",
-                                    "inflight_count.increment_and_get + 1",
-                                    "end",
-                                    "threads = {}",
-                                    "snapshot.define_singleton_method(:stalling_threads) do",
-                                    "threads",
-                                    "end",
-                                    "reporter.define_singleton_method(:snapshot) do",
-                                    "snapshot",
-                                    "end",
-                                    "pipeline.define_singleton_method(:thread) do",
-                                    "Thread.current",
-                                    "end",
-                                    "pipeline.define_singleton_method(:reporter) do",
-                                    "reporter",
-                                    "end",
-                                    "pipeline"
-                                )
-                            ),
-                            context.runtime.newFloat(0.01)
-                        }
-                    ).start(context);
+                        .initialize(
+                                context, new IRubyObject[]{
+                                        RubyUtil.RUBY.evalScriptlet(rubyScript),
+                                        context.runtime.newFloat(0.01)
+                                }
+                        ).start(context);
             });
             res.get();
             Assertions.fail("Shutdown watcher did not invoke system exit(-1)");
@@ -73,6 +116,13 @@ public final class ShutdownWatcherExtTest {
                 Assertions.fail("Failed to shut down shutdown watcher thread");
             }
         }
+    }
 
+    private static String getPipelineTemplate() throws IOException {
+        return new String(Files.readAllBytes(PIPELINE_TEMPLATE));
+    }
+
+    private static String resolvedPipeline(Boolean isDraining) throws IOException {
+        return getPipelineTemplate().replace("%{value_placeholder}", isDraining.toString());
     }
 }
diff --git a/logstash-core/src/test/java/org/logstash/ext/JrubyEventExtLibraryTest.java b/logstash-core/src/test/java/org/logstash/ext/JrubyEventExtLibraryTest.java
index 8cd1e5327..ad9c4673f 100644
--- a/logstash-core/src/test/java/org/logstash/ext/JrubyEventExtLibraryTest.java
+++ b/logstash-core/src/test/java/org/logstash/ext/JrubyEventExtLibraryTest.java
@@ -1,22 +1,51 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ext;
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import org.assertj.core.api.Assertions;
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
+import org.jruby.RubyBoolean;
+import org.jruby.RubyHash;
 import org.jruby.RubyString;
+import org.jruby.exceptions.RuntimeError;
 import org.jruby.javasupport.JavaUtil;
+import org.jruby.runtime.Block;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.junit.Assert;
 import org.junit.Test;
 import org.logstash.ObjectMappers;
+import org.logstash.RubyTestBase;
 import org.logstash.RubyUtil;
 
 /**
  * Tests for {@link JrubyEventExtLibrary.RubyEvent}.
  */
-public final class JrubyEventExtLibraryTest {
+public final class JrubyEventExtLibraryTest extends RubyTestBase {
 
     @Test
     public void shouldSetJavaProxy() throws IOException {
@@ -55,6 +84,40 @@ public final class JrubyEventExtLibraryTest {
             .contains("\"テストフィールド\":\"someValue\"");
     }
 
+    @Test
+    public void correctlyRaiseRubyRuntimeErrorWhenGivenInvalidFieldReferences() {
+        final ThreadContext context = RubyUtil.RUBY.getCurrentContext();
+        final JrubyEventExtLibrary.RubyEvent event =
+                JrubyEventExtLibrary.RubyEvent.newRubyEvent(context.runtime);
+        final RubyString key = rubyString("il[[]]]legal");
+        final RubyString value = rubyString("foo");
+        try {
+            event.ruby_set_field(context, key, value);
+        } catch (RuntimeError rubyRuntimeError) {
+            MatcherAssert.assertThat(rubyRuntimeError.getLocalizedMessage(), CoreMatchers.containsString("Invalid FieldReference"));
+            return;
+        }
+        Assert.fail("expected ruby RuntimeError was not thrown.");
+    }
+
+    @Test
+    public void correctlySetsValueWhenGivenMapWithKeysThatHaveFieldReferenceSpecialCharacters() {
+        final ThreadContext context = RubyUtil.RUBY.getCurrentContext();
+        final JrubyEventExtLibrary.RubyEvent event =
+                JrubyEventExtLibrary.RubyEvent.newRubyEvent(context.runtime);
+        final RubyString key = rubyString("foo");
+        final RubyHash value = RubyHash.newHash(context.runtime, Collections.singletonMap(rubyString("il[[]]]legal"), rubyString("okay")), context.nil);
+
+        event.ruby_set_field(context, key, value);
+        IRubyObject retrievedValue = event.ruby_get_field(context, key);
+        MatcherAssert.assertThat(retrievedValue, CoreMatchers.equalTo(value));
+
+        RubyHash eventHash = (RubyHash) event.ruby_to_hash_with_metadata(context);
+        IRubyObject nestedValue = eventHash.dig(context, rubyString("foo"), rubyString("il[[]]]legal"));
+        Assert.assertFalse(nestedValue.isNil());
+        Assert.assertEquals(rubyString("okay"), nestedValue);
+    }
+
     private static RubyString rubyString(final String java) {
         return RubyUtil.RUBY.newString(java);
     }
diff --git a/logstash-core/src/test/java/org/logstash/ext/JrubyMemoryReadClientExtTest.java b/logstash-core/src/test/java/org/logstash/ext/JrubyMemoryReadClientExtTest.java
index cb7521bc4..dff3c4845 100644
--- a/logstash-core/src/test/java/org/logstash/ext/JrubyMemoryReadClientExtTest.java
+++ b/logstash-core/src/test/java/org/logstash/ext/JrubyMemoryReadClientExtTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ext;
 
 import java.io.IOException;
@@ -6,8 +26,8 @@ import java.util.concurrent.BlockingQueue;
 import org.jruby.RubyHash;
 import org.jruby.runtime.ThreadContext;
 import org.junit.Test;
+import org.logstash.RubyTestBase;
 import org.logstash.execution.QueueBatch;
-import org.logstash.execution.WorkerLoop;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -15,18 +35,20 @@ import static org.hamcrest.MatcherAssert.assertThat;
 /**
  * Tests for {@link JrubyMemoryReadClientExt}.
  */
-public final class JrubyMemoryReadClientExtTest {
+public final class JrubyMemoryReadClientExtTest extends RubyTestBase {
 
     @Test
+    @SuppressWarnings("deprecation")
     public void testInflightBatchesTracking() throws InterruptedException, IOException {
         final BlockingQueue<JrubyEventExtLibrary.RubyEvent> queue =
             new ArrayBlockingQueue<>(10);
         final JrubyMemoryReadClientExt client =
             JrubyMemoryReadClientExt.create(queue, 5, 50);
-        final ThreadContext context = WorkerLoop.THREAD_CONTEXT.get();
+        final ThreadContext context = client.getRuntime().getCurrentContext();
         final QueueBatch batch = client.readBatch();
         final RubyHash inflight = client.rubyGetInflightBatches(context);
         assertThat(inflight.size(), is(1));
+        // JTODO getId has been deprecated in JDK 19, when JDK 21 is the target version use threadId() instead
         assertThat(inflight.get(Thread.currentThread().getId()), is(batch));
         client.closeBatch(batch);
         assertThat(client.rubyGetInflightBatches(context).size(), is(0));
diff --git a/logstash-core/src/test/java/org/logstash/ext/JrubyTimestampExtLibraryTest.java b/logstash-core/src/test/java/org/logstash/ext/JrubyTimestampExtLibraryTest.java
index c3fb68a4b..86a8b0f7a 100644
--- a/logstash-core/src/test/java/org/logstash/ext/JrubyTimestampExtLibraryTest.java
+++ b/logstash-core/src/test/java/org/logstash/ext/JrubyTimestampExtLibraryTest.java
@@ -1,17 +1,43 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ext;
 
+import java.time.Instant;
+import java.time.ZonedDateTime;
 import java.util.concurrent.TimeUnit;
 import org.assertj.core.api.Assertions;
+import org.jruby.RubyString;
+import org.jruby.RubyTime;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.junit.Test;
+import org.logstash.RubyTestBase;
 import org.logstash.RubyUtil;
+import org.logstash.Timestamp;
 
 /**
  * Tests for {@link JrubyTimestampExtLibrary}.
  */
-public final class JrubyTimestampExtLibraryTest {
+public final class JrubyTimestampExtLibraryTest extends RubyTestBase {
 
     @Test
     public void testConstructorNew() {
@@ -38,10 +64,8 @@ public final class JrubyTimestampExtLibraryTest {
     @Test
     public void testConstructFromRubyDateTime() {
         final ThreadContext context = RubyUtil.RUBY.getCurrentContext();
-        final IRubyObject now =
-            context.runtime.evalScriptlet("require 'date'\nDateTime.now.to_time.utc");
-        final JrubyTimestampExtLibrary.RubyTimestamp t =
-            newRubyTimestamp(context, new IRubyObject[]{now});
+        final IRubyObject now = RubyTime.newTime(context.runtime, System.currentTimeMillis());
+        final JrubyTimestampExtLibrary.RubyTimestamp t = newRubyTimestamp(context, new IRubyObject[]{now});
         Assertions.assertThat(
             Math.abs(
                 t.ruby_time(context).to_f().getDoubleValue() - now.convertToFloat().getDoubleValue()
@@ -80,6 +104,49 @@ public final class JrubyTimestampExtLibraryTest {
         ).isFalse();
     }
 
+    @Test
+    public void testCoerceInstanceOfRubyTimestamp() {
+        final ThreadContext context = RubyUtil.RUBY.getCurrentContext();
+        final JrubyTimestampExtLibrary.RubyTimestamp source = JrubyTimestampExtLibrary.RubyTimestamp.newRubyTimestamp(context.runtime, Timestamp.now());
+
+        final IRubyObject coerced = JrubyTimestampExtLibrary.RubyTimestamp.ruby_coerce(context, RubyUtil.RUBY_TIMESTAMP_CLASS, source);
+
+        Assertions.assertThat(coerced)
+                .isNotNull()
+                .isInstanceOfSatisfying(JrubyTimestampExtLibrary.RubyTimestamp.class, koerced -> {
+                   Assertions.assertThat(koerced).isEqualTo(source);
+                });
+    }
+
+    @Test
+    public void testCoerceInstanceOfRubyTime() {
+        final ThreadContext context = RubyUtil.RUBY.getCurrentContext();
+        final RubyTime rubyTime = RubyTime.newTimeFromNanoseconds(context.runtime, 1L);
+
+        final IRubyObject coerced = JrubyTimestampExtLibrary.RubyTimestamp.ruby_coerce(context, RubyUtil.RUBY_TIMESTAMP_CLASS, rubyTime);
+
+        Assertions.assertThat(coerced)
+                .isNotNull()
+                .isInstanceOfSatisfying(JrubyTimestampExtLibrary.RubyTimestamp.class, koerced -> {
+                    Assertions.assertThat(koerced.getTimestamp().toInstant()).isEqualTo(rubyTime.toInstant());
+                });
+    }
+
+    @Test
+    public void testCoerceInstanceOfRubyString() {
+        final ThreadContext context = RubyUtil.RUBY.getCurrentContext();
+        final RubyString timestamp = RubyString.newString(context.runtime, "2021-08-30T08:04:57.918273645-08:00");
+        final Instant instant = ZonedDateTime.parse(timestamp).toInstant();
+        final JrubyTimestampExtLibrary.RubyTimestamp source = newRubyTimestamp(context, new IRubyObject[]{ timestamp });
+
+        final IRubyObject coerced = JrubyTimestampExtLibrary.RubyTimestamp.ruby_coerce(context, RubyUtil.RUBY_TIMESTAMP_CLASS, source);
+
+        Assertions.assertThat(coerced)
+                .isNotNull()
+                .isInstanceOfSatisfying(JrubyTimestampExtLibrary.RubyTimestamp.class, koerced -> Assertions.assertThat(koerced.getTimestamp().toInstant()).isEqualTo(instant));
+
+    }
+
     private static JrubyTimestampExtLibrary.RubyTimestamp newRubyTimestamp(
         final ThreadContext context, final IRubyObject[] args) {
         return new JrubyTimestampExtLibrary.RubyTimestamp(
diff --git a/logstash-core/src/test/java/org/logstash/ext/TimestampTest.java b/logstash-core/src/test/java/org/logstash/ext/TimestampTest.java
index ef35fde50..7fd5e72bf 100644
--- a/logstash-core/src/test/java/org/logstash/ext/TimestampTest.java
+++ b/logstash-core/src/test/java/org/logstash/ext/TimestampTest.java
@@ -1,13 +1,34 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.ext;
 
 import org.junit.Test;
+import org.logstash.RubyTestBase;
 import org.logstash.RubyUtil;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-public final class TimestampTest {
+public final class TimestampTest extends RubyTestBase {
 
     @Test
     public void testClone() {
diff --git a/logstash-core/src/test/java/org/logstash/health/HealthObserverTest.java b/logstash-core/src/test/java/org/logstash/health/HealthObserverTest.java
new file mode 100644
index 000000000..77313a17e
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/health/HealthObserverTest.java
@@ -0,0 +1,93 @@
+package org.logstash.health;
+
+import org.hamcrest.Matchers;
+import org.junit.Test;
+
+import java.util.Objects;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.logstash.health.HealthObserver.FORCE_API_STATUS_PROPERTY;
+
+public class HealthObserverTest {
+
+    private final HealthObserver healthObserver = new HealthObserver();
+
+    @Test
+    public void testStatusWhenNotForcedPropagates() {
+        withUnsetSystemProperty(FORCE_API_STATUS_PROPERTY, () -> {
+            for (Status reportStatus : Status.values()) {
+                withIndicator(new TestIndicator(reportStatus), () -> {
+                    assertThat(String.format("Status[%s] should propagate", reportStatus), healthObserver.getStatus(), Matchers.is(reportStatus));
+                });
+            }
+        });
+    }
+
+    @Test
+    public void testStatusWhenForcedGreenEmitsGreen() {
+        withSystemProperty(FORCE_API_STATUS_PROPERTY, "green", () -> {
+            for (Status reportStatus : Status.values()) {
+                withIndicator(new TestIndicator(reportStatus), () -> {
+                    assertThat(String.format("Status[%s] should not propagate", reportStatus), healthObserver.getStatus(), Matchers.is(Status.GREEN));
+                });
+            }
+        });
+    }
+
+    @Test
+    public void testStatusWhenForcedNonsensePropagates() {
+        withSystemProperty(FORCE_API_STATUS_PROPERTY, "nonsense", () -> {
+            for (Status reportStatus : Status.values()) {
+                withIndicator(new TestIndicator(reportStatus), () -> {
+                    assertThat(String.format("Status[%s] should propagate", reportStatus), healthObserver.getStatus(), Matchers.is(reportStatus));
+                });
+            }
+        });
+    }
+
+    void withUnsetSystemProperty(final String propertyName, final Runnable action) {
+        withSystemProperty(propertyName, null, action);
+    }
+
+    void withSystemProperty(final String name, final String value, final Runnable action) {
+        synchronized (System.class) {
+            final String oldValue;
+            if (Objects.isNull(value)) {
+                oldValue = System.clearProperty(name);
+            } else {
+                oldValue = System.setProperty(name, value);
+            }
+            try {
+                action.run();
+            } finally {
+                if (oldValue != null) {
+                    System.setProperty(name, oldValue);
+                } else {
+                    System.clearProperty(name);
+                }
+            }
+        }
+    }
+
+    void withIndicator(Indicator<?> indicator, Runnable runnable) {
+        this.healthObserver.getIndicator().attachIndicator("single", indicator);
+        try {
+            runnable.run();
+        } finally {
+            this.healthObserver.getIndicator().detachIndicator("single", indicator);
+        }
+    }
+
+    static class TestIndicator implements Indicator<Indicator.Report> {
+        private final Status status;
+
+        public TestIndicator(final Status status) {
+            this.status = status;
+        }
+
+        @Override
+        public Report report(ReportContext reportContext) {
+            return () -> this.status;
+        }
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/health/PipelineIndicatorTest.java b/logstash-core/src/test/java/org/logstash/health/PipelineIndicatorTest.java
new file mode 100644
index 000000000..3b242dee7
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/health/PipelineIndicatorTest.java
@@ -0,0 +1,182 @@
+package org.logstash.health;
+
+import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+
+import java.util.Map;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.both;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+
+@RunWith(Enclosed.class)
+public class PipelineIndicatorTest {
+    public static class StatusProbeTest {
+        private static final PipelineIndicator.StatusProbe statusProbe = new PipelineIndicator.StatusProbe();
+
+        @Test
+        public void testRunning() {
+            final PipelineIndicator.Details details = detailsForStatus(PipelineIndicator.Status.RUNNING);
+
+            final Probe.Analysis analysis = statusProbe.analyze(details);
+            assertThat(analysis.status, is(Status.GREEN));
+            assertThat(analysis.diagnosis, is(nullValue()));
+            assertThat(analysis.impact, is(nullValue()));
+        }
+
+        @Test
+        public void testLoading() {
+            final PipelineIndicator.Details details = detailsForStatus(PipelineIndicator.Status.LOADING);
+
+            final Probe.Analysis analysis = statusProbe.analyze(details);
+            assertThat(analysis.status, is(Status.YELLOW));
+            assertThat(analysis.diagnosis, is(notNullValue()));
+            assertThat(analysis.diagnosis.cause, containsString("loading"));
+            assertThat(analysis.diagnosis.helpUrl, containsString("/health-report-pipeline-status.html#loading"));
+            assertThat(analysis.impact, is(notNullValue()));
+            assertThat(analysis.impact.id, containsString("not_processing"));
+            assertThat(analysis.impact.impactAreas, contains(ImpactArea.PIPELINE_EXECUTION));
+        }
+
+        @Test
+        public void testFinished() {
+            final PipelineIndicator.Details details = detailsForStatus(PipelineIndicator.Status.FINISHED);
+
+            final Probe.Analysis analysis = statusProbe.analyze(details);
+            assertThat(analysis.status, is(Status.YELLOW));
+            assertThat(analysis.diagnosis, is(notNullValue()));
+            assertThat(analysis.diagnosis.cause, containsString("finished"));
+            assertThat(analysis.diagnosis.helpUrl, containsString("/health-report-pipeline-status.html#finished"));
+            assertThat(analysis.impact, is(notNullValue()));
+            assertThat(analysis.impact.id, containsString("not_processing"));
+            assertThat(analysis.impact.impactAreas, contains(ImpactArea.PIPELINE_EXECUTION));
+        }
+
+        @Test
+        public void testTerminated() {
+            final PipelineIndicator.Details details = detailsForStatus(PipelineIndicator.Status.TERMINATED);
+
+            final Probe.Analysis analysis = statusProbe.analyze(details);
+            assertThat(analysis.status, is(Status.RED));
+            assertThat(analysis.diagnosis, is(notNullValue()));
+            assertThat(analysis.diagnosis.cause, containsString("error"));
+            assertThat(analysis.diagnosis.helpUrl, containsString("/health-report-pipeline-status.html#terminated"));
+            assertThat(analysis.impact, is(notNullValue()));
+            assertThat(analysis.impact.id, containsString("not_processing"));
+            assertThat(analysis.impact.impactAreas, contains(ImpactArea.PIPELINE_EXECUTION));
+        }
+
+        @Test
+        public void testUnknown() {
+            final PipelineIndicator.Details details = detailsForStatus(PipelineIndicator.Status.UNKNOWN);
+
+            final Probe.Analysis analysis = statusProbe.analyze(details);
+            assertThat(analysis.status, is(Status.UNKNOWN));
+            assertThat(analysis.diagnosis, is(notNullValue()));
+            assertThat(analysis.diagnosis.cause, containsString("not known"));
+            assertThat(analysis.diagnosis.helpUrl, containsString("/health-report-pipeline-status.html#unknown"));
+            assertThat(analysis.impact, is(notNullValue()));
+            assertThat(analysis.impact.id, containsString("not_processing"));
+            assertThat(analysis.impact.impactAreas, contains(ImpactArea.PIPELINE_EXECUTION));
+        }
+
+        static PipelineIndicator.Details detailsForStatus(PipelineIndicator.Status status) {
+            return new PipelineIndicator.Details(status);
+        }
+    }
+
+    public static class FlowWorkerUtilizationProbeTest {
+
+        private static final String WORKER_UTILIZATION = "worker_utilization";
+        private static final PipelineIndicator.FlowWorkerUtilizationProbe flowWorkerUtilizationProbe = new PipelineIndicator.FlowWorkerUtilizationProbe();
+
+        @Test
+        public void testFlowWorkerUtilizationNew() throws Exception {
+            final PipelineIndicator.Details details = detailsForFlow(Map.of(WORKER_UTILIZATION, flowAnalysis(30.2, 87.0)));
+
+            Probe.Analysis analysis = flowWorkerUtilizationProbe.analyze(details);
+            assertThat(analysis.status, is(Status.GREEN));
+        }
+
+        @Test
+        public void testFlowWorkerUtilizationOK() throws Exception {
+            final PipelineIndicator.Details details = detailsForFlow(Map.of(WORKER_UTILIZATION, flowAnalysis(30.2, 38.4, 87.0)));
+
+            Probe.Analysis analysis = flowWorkerUtilizationProbe.analyze(details);
+            assertThat(analysis.status, is(Status.GREEN));
+        }
+
+        @Test
+        public void testFlowWorkerUtilizationNearlyBlockedOneMinute() throws Exception {
+            final PipelineIndicator.Details details = detailsForFlow(Map.of(WORKER_UTILIZATION, flowAnalysis(30.2, 97.1, 87.0)));
+
+            Probe.Analysis analysis = flowWorkerUtilizationProbe.analyze(details);
+            assertThat(analysis.status, is(Status.YELLOW));
+            assertThat(analysis.diagnosis.cause, containsString("nearly blocked"));
+            assertThat(analysis.diagnosis.helpUrl, containsString("/health-report-pipeline-flow-worker-utilization.html#nearly-blocked-1m"));
+        }
+
+        @Test
+        public void testFlowWorkerUtilizationCompletelyBlockedOneMinute() throws Exception {
+            final PipelineIndicator.Details details = detailsForFlow(Map.of(WORKER_UTILIZATION, flowAnalysis(30.2, 100, 87.0)));
+
+            Probe.Analysis analysis = flowWorkerUtilizationProbe.analyze(details);
+            assertThat(analysis.status, is(Status.YELLOW));
+            assertThat(analysis.diagnosis.cause, containsString("completely blocked"));
+            assertThat(analysis.diagnosis.helpUrl, containsString("/health-report-pipeline-flow-worker-utilization.html#blocked-1m"));
+        }
+
+        @Test
+        public void testFlowWorkerUtilizationNearlyBlockedFiveMinutes() throws Exception {
+            final PipelineIndicator.Details details = detailsForFlow(Map.of(WORKER_UTILIZATION, flowAnalysis(30.2, 97.1, 96.1, 87.0)));
+
+            Probe.Analysis analysis = flowWorkerUtilizationProbe.analyze(details);
+            assertThat(analysis.status, is(Status.YELLOW));
+            assertThat(analysis.diagnosis.cause, containsString("nearly blocked"));
+            assertThat(analysis.diagnosis.helpUrl, containsString("/health-report-pipeline-flow-worker-utilization.html#nearly-blocked-5m"));
+        }
+
+        @Test
+        public void testFlowWorkerUtilizationCompletelyBlockedFiveMinutes() throws Exception {
+            final PipelineIndicator.Details details = detailsForFlow(Map.of(WORKER_UTILIZATION, flowAnalysis(30.2, 100, 100, 87.0)));
+
+            Probe.Analysis analysis = flowWorkerUtilizationProbe.analyze(details);
+            assertThat(analysis.status, is(Status.RED));
+            assertThat(analysis.diagnosis.cause, containsString("completely blocked"));
+            assertThat(analysis.diagnosis.helpUrl, containsString("/health-report-pipeline-flow-worker-utilization.html#blocked-5m"));
+        }
+
+        @Test
+        public void testFlowWorkerUtilizationNearlyBlockedFiveMinutesRecovering() throws Exception {
+            final PipelineIndicator.Details details = detailsForFlow(Map.of(WORKER_UTILIZATION, flowAnalysis(30.2, 79, 97, 87.0)));
+
+            Probe.Analysis analysis = flowWorkerUtilizationProbe.analyze(details);
+            assertThat(analysis.status, is(Status.YELLOW));
+            assertThat(analysis.diagnosis.cause, both(containsString("nearly blocked")).and(containsString("recovering")));
+            assertThat(analysis.diagnosis.helpUrl, containsString("/health-report-pipeline-flow-worker-utilization.html#nearly-blocked-5m"));
+        }
+
+        private static PipelineIndicator.Details detailsForFlow(final Map<String, Map<String,Double>> flow) {
+            return detailsForFlow(PipelineIndicator.Status.RUNNING, flow);
+        }
+
+        private static PipelineIndicator.Details detailsForFlow(final PipelineIndicator.Status status, final Map<String, Map<String,Double>> flow) {
+            return new PipelineIndicator.Details(status, new PipelineIndicator.FlowObservation(flow));
+        }
+
+        private static Map<String, Double> flowAnalysis(final double current, final double lifetime) {
+            return Map.of("current", current, "lifetime", lifetime);
+        }
+        private static Map<String, Double> flowAnalysis(final double current, final double lastOneMinute, final double lifetime) {
+            return Map.of("current", current, "last_1_minute", lastOneMinute, "lifetime", lifetime);
+        }
+        private static Map<String, Double> flowAnalysis(final double current, final double lastOneMinute, final double lastFiveMinutes, final double lifetime) {
+            return Map.of("current", current, "last_1_minute", lastOneMinute, "last_5_minutes", lastFiveMinutes, "lifetime", lifetime);
+        }
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/health/ProbeIndicatorTest.java b/logstash-core/src/test/java/org/logstash/health/ProbeIndicatorTest.java
new file mode 100644
index 000000000..0ec860111
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/health/ProbeIndicatorTest.java
@@ -0,0 +1,128 @@
+package org.logstash.health;
+
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertThrows;
+
+public class ProbeIndicatorTest {
+
+    @Test
+    public void attachProbeWhenNotExists() throws Exception {
+        final ProbeIndicator<ProbeSubject> probeIndicator = new ProbeIndicator<>("subject", ProbeSubject::new);
+        final Probe<ProbeSubject> existingProbe = new ProbeImplementation();
+        probeIndicator.attachProbe("existing", existingProbe);
+
+        final Probe<ProbeSubject> probeToAdd = new ProbeImplementation();
+        probeIndicator.attachProbe("new", probeToAdd);
+
+        assertThat(probeIndicator.getProbe("new"), is(probeToAdd));
+        assertThat(probeIndicator.getProbe("existing"), is(existingProbe));
+    }
+
+    @Test
+    public void attachProbeWhenExists() throws Exception {
+        final ProbeIndicator<ProbeSubject> probeIndicator = new ProbeIndicator<>("subject", ProbeSubject::new);
+        final Probe<ProbeSubject> existingProbe = new ProbeImplementation();
+        probeIndicator.attachProbe("existing", existingProbe);
+
+        final Probe<ProbeSubject> probeToAdd = new ProbeImplementation();
+        assertThrows(IllegalArgumentException.class, () -> probeIndicator.attachProbe("existing", probeToAdd));
+
+        assertThat(probeIndicator.getProbe("existing"), is(existingProbe));
+    }
+
+    @Test
+    public void attachProbeWhenAttached() throws Exception {
+        final ProbeIndicator<ProbeSubject> probeIndicator = new ProbeIndicator<>("subject", ProbeSubject::new);
+        final Probe<ProbeSubject> existingProbe = new ProbeImplementation();
+        probeIndicator.attachProbe("existing", existingProbe);
+
+        // attach it again
+        probeIndicator.attachProbe("existing", existingProbe);
+
+        assertThat(probeIndicator.getProbe("existing"), is(existingProbe));
+    }
+
+
+    @Test
+    public void detachProbeByNameWhenAttached() {
+        final ProbeIndicator<ProbeSubject> probeIndicator = new ProbeIndicator<>("subject", ProbeSubject::new);
+        final Probe<ProbeSubject> existingProbe = new ProbeImplementation();
+        probeIndicator.attachProbe("existing", existingProbe);
+        final Probe<ProbeSubject> existingProbeToRemove = new ProbeImplementation();
+        probeIndicator.attachProbe("to_remove", existingProbeToRemove);
+
+        probeIndicator.detachProbe("to_remove");
+
+        assertThat(probeIndicator.getProbe("existing"), is(existingProbe));
+        assertThat(probeIndicator.getProbe("to_remove"), is(nullValue()));
+    }
+
+    @Test
+    public void detachProbeByNameWhenDetached() {
+        final ProbeIndicator<ProbeSubject> probeIndicator = new ProbeIndicator<>("subject", ProbeSubject::new);
+        final Probe<ProbeSubject> existingProbe = new ProbeImplementation();
+        probeIndicator.attachProbe("existing", existingProbe);
+
+        probeIndicator.detachProbe("to_remove");
+
+        assertThat(probeIndicator.getProbe("existing"), is(existingProbe));
+        assertThat(probeIndicator.getProbe("to_remove"), is(nullValue()));
+    }
+
+    @Test
+    public void detachProbeByValueWhenAttached() {
+        final ProbeIndicator<ProbeSubject> probeIndicator = new ProbeIndicator<>("subject", ProbeSubject::new);
+        final Probe<ProbeSubject> existingProbe = new ProbeImplementation();
+        probeIndicator.attachProbe("existing", existingProbe);
+        final Probe<ProbeSubject> existingProbeToRemove = new ProbeImplementation();
+        probeIndicator.attachProbe("to_remove", existingProbeToRemove);
+
+        probeIndicator.detachProbe("to_remove", existingProbeToRemove);
+
+        assertThat(probeIndicator.getProbe("existing"), is(existingProbe));
+        assertThat(probeIndicator.getProbe("to_remove"), is(nullValue()));
+    }
+
+    @Test
+    public void detachProbeByValueWhenDetached() {
+        final ProbeIndicator<ProbeSubject> probeIndicator = new ProbeIndicator<>("subject", ProbeSubject::new);
+        final Probe<ProbeSubject> existingProbe = new ProbeImplementation();
+        probeIndicator.attachProbe("existing", existingProbe);
+        final Probe<ProbeSubject> existingProbeToRemove = new ProbeImplementation();
+
+        probeIndicator.detachProbe("to_remove", existingProbeToRemove);
+
+        assertThat(probeIndicator.getProbe("existing"), is(existingProbe));
+        assertThat(probeIndicator.getProbe("to_remove"), is(nullValue()));
+    }
+
+    @Test
+    public void detachProbeByValueWhenConflict() {
+        final ProbeIndicator<ProbeSubject> probeIndicator = new ProbeIndicator<>("subject", ProbeSubject::new);
+        final Probe<ProbeSubject> existingProbe = new ProbeImplementation();
+        probeIndicator.attachProbe("existing", existingProbe);
+        final Probe<ProbeSubject> anotherProbeToRemove = new ProbeImplementation();
+
+        assertThrows(IllegalArgumentException.class, () -> probeIndicator.detachProbe("existing", anotherProbeToRemove));
+
+        assertThat(probeIndicator.getProbe("existing"), is(existingProbe));
+        assertThat(probeIndicator.getProbe("to_remove"), is(nullValue()));
+    }
+
+    @Test
+    public void report() {
+    }
+
+    private static class ProbeSubject implements ProbeIndicator.Observation {}
+
+    private static class ProbeImplementation implements Probe<ProbeSubject> {
+        @Override
+        public Analysis analyze(ProbeSubject observation) {
+            return Analysis.builder().build();
+        }
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/health/StatusTest.java b/logstash-core/src/test/java/org/logstash/health/StatusTest.java
new file mode 100644
index 000000000..32eca41d5
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/health/StatusTest.java
@@ -0,0 +1,106 @@
+package org.logstash.health;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static com.google.common.collect.Collections2.orderedPermutations;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.logstash.health.Status.*;
+
+@RunWith(Enclosed.class)
+public class StatusTest {
+
+    public static class Tests {
+        @Test
+        public void testReduceUnknown() {
+            assertThat(UNKNOWN.reduce(UNKNOWN), is(UNKNOWN));
+            assertThat(UNKNOWN.reduce(GREEN), is(UNKNOWN));
+            assertThat(UNKNOWN.reduce(YELLOW), is(YELLOW));
+            assertThat(UNKNOWN.reduce(RED), is(RED));
+        }
+
+        @Test
+        public void testReduceGreen() {
+            assertThat(GREEN.reduce(UNKNOWN), is(UNKNOWN));
+            assertThat(GREEN.reduce(GREEN), is(GREEN));
+            assertThat(GREEN.reduce(YELLOW), is(YELLOW));
+            assertThat(GREEN.reduce(RED), is(RED));
+        }
+
+        @Test
+        public void testReduceYellow() {
+            assertThat(YELLOW.reduce(UNKNOWN), is(YELLOW));
+            assertThat(YELLOW.reduce(GREEN), is(YELLOW));
+            assertThat(YELLOW.reduce(YELLOW), is(YELLOW));
+            assertThat(YELLOW.reduce(RED), is(RED));
+        }
+
+        @Test
+        public void testReduceRed() {
+            assertThat(RED.reduce(UNKNOWN), is(RED));
+            assertThat(RED.reduce(GREEN), is(RED));
+            assertThat(RED.reduce(YELLOW), is(RED));
+            assertThat(RED.reduce(RED), is(RED));
+        }
+    }
+
+    @RunWith(Parameterized.class)
+    public static class JacksonSerialization {
+        @Parameters(name = "{0}")
+        public static Iterable<?> data() {
+            return EnumSet.allOf(Status.class);
+        }
+
+        @Parameter
+        public Status status;
+
+        private final ObjectMapper mapper = new ObjectMapper();
+
+        @Test
+        public void testSerialization() throws Exception {
+            assertThat(mapper.writeValueAsString(status), is(equalTo('"' + status.name().toLowerCase() + '"')));
+        }
+    }
+
+    @RunWith(Parameterized.class)
+    public static class ReduceCommutativeSpecification {
+        @Parameters(name = "{0}<=>{1}")
+        public static Collection<Object[]> data() {
+            return getCombinations(EnumSet.allOf(Status.class), 2);
+        }
+
+        @Parameter(0)
+        public Status statusA;
+        @Parameter(1)
+        public Status statusB;
+
+        @Test
+        public void testReduceCommutative() {
+            assertThat(statusA.reduce(statusB), is(statusB.reduce(statusA)));
+        }
+
+        private static <T extends Comparable<T>> List<Object[]> getCombinations(Collection<T> source, int count) {
+            return orderedPermutations(source).stream()
+                    .map((l) -> l.subList(0, count))
+                    .map(ArrayList::new).peek(Collections::sort)
+                    .collect(Collectors.toSet())
+                    .stream()
+                    .map(List::toArray)
+                    .collect(Collectors.toList());
+        }
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/ExtendedFlowMetricTest.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/ExtendedFlowMetricTest.java
new file mode 100644
index 000000000..215b18f13
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/ExtendedFlowMetricTest.java
@@ -0,0 +1,190 @@
+package org.logstash.instrument.metrics;
+
+import org.junit.Test;
+import org.logstash.instrument.metrics.counter.LongCounter;
+import org.logstash.instrument.metrics.gauge.AbstractGaugeMetric;
+import org.logstash.instrument.metrics.gauge.NumberGauge;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Map;
+import java.util.function.Consumer;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.anEmptyMap;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.hasKey;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.lessThan;
+import static org.hamcrest.Matchers.not;
+
+public class ExtendedFlowMetricTest {
+    @Test
+    public void testBaselineFunctionality() {
+        final ManualAdvanceClock clock = new ManualAdvanceClock(Instant.now());
+        final LongCounter numeratorMetric = new LongCounter(MetricKeys.EVENTS_KEY.asJavaString());
+        final Metric<Number> denominatorMetric = new UptimeMetric("uptime", clock::nanoTime).withUnitsPrecise(UptimeMetric.ScaleUnits.SECONDS);
+
+        final ExtendedFlowMetric flowMetric = new ExtendedFlowMetric(clock::nanoTime, "flow", numeratorMetric, denominatorMetric);
+
+        // more than one day of 1s-granularity captures
+        // with increasing increments of our numerator metric.
+        for(int i=1; i<100_000; i++) {
+            clock.advance(Duration.ofSeconds(1));
+            numeratorMetric.increment(i);
+            flowMetric.capture();
+
+            // since we enforce compaction only on reads, ensure it doesn't grow unbounded with only writes
+            // or hold onto captures from before our force compaction threshold
+            assertThat(flowMetric.estimateCapturesRetained(), is(lessThan(320)));
+            assertThat(flowMetric.estimateExcessRetained(FlowMetricRetentionPolicy::forceCompactionNanos), is(equalTo(Duration.ZERO)));
+        }
+
+        // calculate the supplied rates
+        final Map<String, Double> flowMetricValue = flowMetric.getValue();
+        assertThat(flowMetricValue, hasEntry("current",         99990.0));
+        assertThat(flowMetricValue, hasEntry("last_1_minute",   99970.0));
+        assertThat(flowMetricValue, hasEntry("last_5_minutes",  99850.0));
+        assertThat(flowMetricValue, hasEntry("last_15_minutes", 99550.0));
+        assertThat(flowMetricValue, hasEntry("last_1_hour",     98180.0));
+        assertThat(flowMetricValue, hasEntry("last_24_hours",   56750.0));
+        assertThat(flowMetricValue, hasEntry("lifetime",        50000.0));
+
+        // ensure we are fully-compact.
+        assertThat(flowMetric.estimateCapturesRetained(), is(lessThan(250)));
+        assertThat(flowMetric.estimateExcessRetained(this::maxRetentionPlusMinResolutionBuffer), is(equalTo(Duration.ZERO)));
+    }
+
+    @Test
+    public void testFunctionalityWhenMetricInitiallyReturnsNullValue() {
+        final ManualAdvanceClock clock = new ManualAdvanceClock(Instant.now());
+        final NullableLongMetric numeratorMetric = new NullableLongMetric(MetricKeys.EVENTS_KEY.asJavaString());
+        final Metric<Number> denominatorMetric = new UptimeMetric("uptime", clock::nanoTime).withUnitsPrecise(UptimeMetric.ScaleUnits.SECONDS);
+
+        final ExtendedFlowMetric flowMetric = new ExtendedFlowMetric(clock::nanoTime, "flow", numeratorMetric, denominatorMetric);
+
+        // for 1000 seconds, our captures hit a metric that is returning null.
+        for(int i=1; i < 1000; i++) {
+            clock.advance(Duration.ofSeconds(1));
+            flowMetric.capture();
+        }
+
+        // our metric has only returned null so far, so we don't expect any captures.
+        assertThat(flowMetric.getValue(), is(anEmptyMap()));
+
+        // increment our metric by a lot, ensuring that the first non-null value available
+        // is big enough to be detected if it is included in our rates
+        numeratorMetric.increment(10_000_000L);
+
+        // now we begin incrementing out metric, which makes it stop returning null.
+        for(int i=1; i<3_000; i++) {
+            clock.advance(Duration.ofSeconds(1));
+            numeratorMetric.increment(i);
+            flowMetric.capture();
+        }
+
+        // ensure that our metrics cover the _available_ data and no more.
+        final Map<String, Double> flowMetricValue = flowMetric.getValue();
+        assertThat(flowMetricValue, hasEntry("current",         2994.0));
+        assertThat(flowMetricValue, hasEntry("last_1_minute",   2969.0));
+        assertThat(flowMetricValue, hasEntry("last_5_minutes",  2843.0));
+        assertThat(flowMetricValue, hasEntry("last_15_minutes", 2536.0));
+        assertThat(flowMetricValue, not(hasKey("last_1_hour")));   // window not met
+        assertThat(flowMetricValue, not(hasKey("last_24_hours"))); // window not met
+        assertThat(flowMetricValue, hasEntry("lifetime",        1501.0));
+    }
+    @Test
+    public void testFunctionalityWithinSecondsOfInitialization() {
+        final ManualAdvanceClock clock = new ManualAdvanceClock(Instant.now());
+        final LongCounter numeratorMetric = new LongCounter(MetricKeys.EVENTS_KEY.asJavaString());
+        final Metric<Number> denominatorMetric = new UptimeMetric("uptime", clock::nanoTime).withUnitsPrecise(UptimeMetric.ScaleUnits.SECONDS);
+
+        final ExtendedFlowMetric flowMetric = new ExtendedFlowMetric(clock::nanoTime, "flow", numeratorMetric, denominatorMetric);
+
+        assertThat(flowMetric.getValue(), is(anEmptyMap()));
+
+        clock.advance(Duration.ofSeconds(1));
+        numeratorMetric.increment(17);
+
+        // clock has advanced 1s, but we have performed no explicit captures.
+        final Map<String, Double> flowMetricValue = flowMetric.getValue();
+        assertThat(flowMetricValue, is(not(anEmptyMap())));
+        assertThat(flowMetricValue, hasEntry("current",         17.0));
+        assertThat(flowMetricValue, hasEntry("lifetime",        17.0));
+    }
+
+    // NOTE: in this test neither numerator nor denominator is tied to our clock,
+    // so our clock is ONLY used for retention and NOT factored in to the math for
+    // the rate of change of our numerator relative to our denominator.
+    // This is useful for clock-invert rates like time-per-event or for ratio
+    // rates like events-out-per-events-in where the denominator is not guaranteed
+    // to be constantly incrementing.
+    @Test
+    public void testNonMovingDenominator() {
+        final ManualAdvanceClock clock = new ManualAdvanceClock(Instant.now());
+        final NumberGauge numeratorMetric = new NumberGauge("numerator", 0);
+        final NumberGauge denominatorMetric = new NumberGauge("denominator", 0);
+
+        final ExtendedFlowMetric flowMetric = new ExtendedFlowMetric(clock::nanoTime, "flow", numeratorMetric, denominatorMetric);
+
+        assertThat(flowMetric.getValue(), is(anEmptyMap()));
+
+        clock.advance(Duration.ofSeconds(1));
+        numeratorMetric.set(17);
+        flowMetric.capture();
+
+        // our numerator has advanced, but our denominator has not.
+        // now: (17/0); baseline: (0/0); (17-0)/(0-0) -> (17/0)
+        // numerator has infinite growth relative to denominator
+        validateMetricValue(flowMetric, (flowMetricValue) -> {
+            assertThat(flowMetricValue, is(not(anEmptyMap())));
+            assertThat(flowMetricValue, hasEntry("current", Double.POSITIVE_INFINITY));
+            assertThat(flowMetricValue, hasEntry("lifetime", Double.POSITIVE_INFINITY));
+        });
+
+        // change denominator, advance clock, capture
+        clock.advance(Duration.ofSeconds(1));
+        denominatorMetric.set(13);
+        flowMetric.capture();
+
+        // both numerator and denominator have changed since baselines
+        // now: (17/13); baseline: (0/0); (17-0)/(13-0) -> 1.308 numerators per denominator
+        validateMetricValue(flowMetric, (flowMetricValue) -> {
+            assertThat(flowMetricValue, is(not(anEmptyMap())));
+            assertThat(flowMetricValue, hasEntry("current", 1.308));
+            assertThat(flowMetricValue, hasEntry("lifetime", 1.308));
+        });
+
+        // our denominator moves and we do a series of captures
+        denominatorMetric.set(12);
+        for (int i = 0; i < 20; i++) {
+            clock.advance(Duration.ofSeconds(1));
+            flowMetric.capture();
+        }
+
+        // our numerator moves _negative_ relative to the capture from 10s ago.
+        clock.advance(Duration.ofSeconds(1));
+        numeratorMetric.set(10);
+        flowMetric.capture();
+
+        // now: (10/12)
+        validateMetricValue(flowMetric, (flowMetricValue) -> {
+            assertThat(flowMetricValue, is(not(anEmptyMap())));
+            // current window baseline: (17/12); (17-10)/(12-12) -> (-7/0)
+            assertThat(flowMetricValue, hasEntry("current", Double.NEGATIVE_INFINITY));
+            // lifetime baseline: (0/0); (10-0)/(12-0) -> (10/12)
+            assertThat(flowMetricValue, hasEntry("lifetime", 0.8333));
+        });
+    }
+
+    private <T> void validateMetricValue(final Metric<T> metric, final Consumer<T> validator) {
+        validator.accept(metric.getValue());
+    }
+
+
+    private long maxRetentionPlusMinResolutionBuffer(final FlowMetricRetentionPolicy policy) {
+        return Math.addExact(policy.retentionNanos(), policy.resolutionNanos());
+    }
+
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/ManualAdvanceClock.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/ManualAdvanceClock.java
new file mode 100644
index 000000000..a226282d0
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/ManualAdvanceClock.java
@@ -0,0 +1,62 @@
+package org.logstash.instrument.metrics;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+
+public class ManualAdvanceClock extends TestClock {
+    private final ZoneId zoneId;
+    private final AtomicReference<Instant> currentInstant;
+    private final Instant zeroInstant;
+
+    public ManualAdvanceClock(final Instant currentInstant, final ZoneId zoneId) {
+        this(currentInstant, new AtomicReference<>(currentInstant), zoneId);
+    }
+
+    public ManualAdvanceClock(final Instant currentInstant) {
+        this(currentInstant, null);
+    }
+
+    private ManualAdvanceClock(final Instant zeroInstant, final AtomicReference<Instant> currentInstant, final ZoneId zoneId) {
+        this.zeroInstant = zeroInstant;
+        this.currentInstant = currentInstant;
+        this.zoneId = Objects.requireNonNullElseGet(zoneId, ZoneId::systemDefault);
+    }
+
+    @Override
+    public ZoneId getZone() {
+        return this.zoneId;
+    }
+
+    @Override
+    public TestClock withZone(ZoneId zone) {
+        return new ManualAdvanceClock(this.zeroInstant, this.currentInstant, zone);
+    }
+
+    @Override
+    public Instant instant() {
+        return currentInstant.get();
+    }
+
+    /**
+     * @return an only-incrementing long value, meant as a drop-in replacement
+     *         for {@link System#nanoTime()}, using this {@link ManualAdvanceClock}
+     *         as the time source, and carrying the same constraints.
+     */
+    public long nanoTime() {
+        return zeroInstant.until(instant(), ChronoUnit.NANOS);
+    }
+
+    public void advance(final Duration duration) {
+        if (duration.isZero()) {
+            return;
+        }
+        if (duration.isNegative()) {
+            throw new IllegalArgumentException("duration must not be negative");
+        }
+        this.currentInstant.updateAndGet(previous -> previous.plus(duration));
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/MetricExtFactory.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/MetricExtFactory.java
new file mode 100644
index 000000000..0026b19f1
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/MetricExtFactory.java
@@ -0,0 +1,80 @@
+package org.logstash.instrument.metrics;
+
+import org.jruby.RubyClass;
+import org.jruby.RubyModule;
+import org.jruby.javasupport.JavaUtil;
+import org.jruby.runtime.Block;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.logstash.RubyUtil;
+import org.logstash.instrument.metrics.timer.TestTimerMetricFactory;
+
+import java.util.function.Function;
+
+import static org.logstash.RubyUtil.METRIC_CLASS;
+
+/**
+ * This {@code MetricExtFactory} can be used from any tests that
+ * inherit from {@link org.logstash.config.ir.RubyEnvTestCase}, which ensures
+ * that the ruby-parts of Logstash are loaded and/or available.
+ */
+public class MetricExtFactory {
+    private final TestClock testClock;
+
+    public MetricExtFactory(final TestClock testClock) {
+        this.testClock = testClock;
+    }
+
+    private static final RubyClass COLLECTOR_CLASS = (RubyClass) RubyUtil.RUBY.evalScriptlet(
+            "require 'logstash/instrument/collector'\n" +
+                    "::LogStash::Instrument::Collector");
+
+    private static final RubyClass INTERCEPTOR_MODULE_CLASS = (RubyClass) RubyUtil.RUBY.evalScriptlet(
+            String.join("\n",
+                    "Class.new(Module) do",
+                    "  def initialize(intercept_type, metric_factory)",
+                    "    define_method(:initialize_metric) do |type, namespaces_path, key|",
+                    "      return super(type, namespaces_path, key) unless type == intercept_type",
+                    "      metric_factory.create(key)",
+                    "    end",
+                    "  end",
+                    "end"
+            )
+    );
+
+    public static MetricExt newMetricExtFromTestClock(final TestClock testClock) {
+        return new MetricExtFactory(testClock).newRoot();
+    }
+
+    public MetricExt newRoot() {
+        final IRubyObject metricCollector = COLLECTOR_CLASS.callMethod("new");
+
+        rubyExtend(metricCollector, metricFactoryInterceptor("uptime", (new TestUptimeMetricFactory(testClock::nanoTime))::newUptimeMetric));
+        rubyExtend(metricCollector, metricFactoryInterceptor("timer", (new TestTimerMetricFactory(testClock::nanoTime))::newTimerMetric));
+
+        return (MetricExt)METRIC_CLASS.newInstance(RubyUtil.RUBY.getCurrentContext(), metricCollector, Block.NULL_BLOCK);
+    }
+
+    private RubyModule metricFactoryInterceptor(final String type, final Function<String,?> javaMetricFactory) {
+        final ThreadContext context = RubyUtil.RUBY.getCurrentContext();
+
+        final IRubyObject interceptType = context.runtime.newString(type).intern();
+        final IRubyObject metricFactory = JavaUtil.convertJavaToUsableRubyObject(context.runtime, MetricFactory.of(javaMetricFactory));
+        final IRubyObject interceptorModule = INTERCEPTOR_MODULE_CLASS.newInstance(context, interceptType, metricFactory, Block.NULL_BLOCK);
+
+        return (RubyModule) interceptorModule;
+    }
+
+    private static void rubyExtend(final IRubyObject base, final RubyModule module) {
+        base.callMethod(base.getRuntime().getCurrentContext(), "extend", module);
+    }
+
+    @FunctionalInterface
+    interface MetricFactory {
+        IRubyObject create(final IRubyObject key);
+
+        static MetricFactory of(final Function<String,?> javaMetricFactory) {
+            return key -> JavaUtil.convertJavaToUsableRubyObject(RubyUtil.RUBY, javaMetricFactory.apply(key.asJavaString()));
+        }
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/MetricTypeTest.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/MetricTypeTest.java
index 7a7bec6e1..941ffe87a 100644
--- a/logstash-core/src/test/java/org/logstash/instrument/metrics/MetricTypeTest.java
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/MetricTypeTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics;
 
 import org.junit.Test;
@@ -22,12 +42,15 @@ public class MetricTypeTest {
     public void ensurePassivity(){
         Map<MetricType, String> nameMap = new HashMap<>(EnumSet.allOf(MetricType.class).size());
         nameMap.put(MetricType.COUNTER_LONG, "counter/long");
+        nameMap.put(MetricType.COUNTER_DECIMAL, "counter/decimal");
+        nameMap.put(MetricType.TIMER_LONG, "timer/long");
         nameMap.put(MetricType.GAUGE_TEXT, "gauge/text");
         nameMap.put(MetricType.GAUGE_BOOLEAN, "gauge/boolean");
         nameMap.put(MetricType.GAUGE_NUMBER, "gauge/number");
         nameMap.put(MetricType.GAUGE_UNKNOWN, "gauge/unknown");
         nameMap.put(MetricType.GAUGE_RUBYHASH, "gauge/rubyhash");
         nameMap.put(MetricType.GAUGE_RUBYTIMESTAMP, "gauge/rubytimestamp");
+        nameMap.put(MetricType.FLOW_RATE, "flow/rate");
 
         //ensure we are testing all of the enumerations
         assertThat(EnumSet.allOf(MetricType.class).size()).isEqualTo(nameMap.size());
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/NullableLongMetric.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/NullableLongMetric.java
new file mode 100644
index 000000000..bf9443537
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/NullableLongMetric.java
@@ -0,0 +1,26 @@
+package org.logstash.instrument.metrics;
+
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+
+class NullableLongMetric extends AbstractMetric<Long> {
+    private AtomicReference<Long> value = new AtomicReference<>();
+
+    public NullableLongMetric(String name) {
+        super(name);
+    }
+
+    @Override
+    public MetricType getType() {
+        return MetricType.COUNTER_LONG;
+    }
+
+    @Override
+    public Long getValue() {
+        return value.get();
+    }
+
+    public void increment(final long amount) {
+        value.updateAndGet((v) -> Math.addExact(Objects.requireNonNullElse(v, 0L), amount));
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/SimpleFlowMetricTest.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/SimpleFlowMetricTest.java
new file mode 100644
index 000000000..f6ea280f7
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/SimpleFlowMetricTest.java
@@ -0,0 +1,103 @@
+package org.logstash.instrument.metrics;
+
+import org.junit.Test;
+import org.logstash.instrument.metrics.counter.LongCounter;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.anEmptyMap;
+import static org.hamcrest.Matchers.hasEntry;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.logstash.instrument.metrics.SimpleFlowMetric.LIFETIME_KEY;
+import static org.logstash.instrument.metrics.SimpleFlowMetric.CURRENT_KEY;
+
+public class SimpleFlowMetricTest {
+    @Test
+    public void testBaselineFunctionality() {
+        final ManualAdvanceClock clock = new ManualAdvanceClock(Instant.now());
+        final LongCounter numeratorMetric = new LongCounter(MetricKeys.EVENTS_KEY.asJavaString());
+        final Metric<Number> denominatorMetric = new UptimeMetric("uptime", clock::nanoTime).withUnitsPrecise(UptimeMetric.ScaleUnits.SECONDS);
+        final FlowMetric instance = new SimpleFlowMetric(clock::nanoTime, "flow", numeratorMetric, denominatorMetric);
+
+        final Map<String, Double> ratesBeforeCaptures = instance.getValue();
+        assertTrue(ratesBeforeCaptures.isEmpty());
+
+        // 5 seconds pass, during which 1000 events are processed
+        clock.advance(Duration.ofSeconds(5));
+        numeratorMetric.increment(1000);
+        instance.capture();
+        final Map<String, Double> ratesAfterFirstCapture = instance.getValue();
+        assertFalse(ratesAfterFirstCapture.isEmpty());
+        assertEquals(Map.of(LIFETIME_KEY, 200.0, CURRENT_KEY, 200.0), ratesAfterFirstCapture);
+
+        // 5 more seconds pass, during which 2000 more events are processed
+        clock.advance(Duration.ofSeconds(5));
+        numeratorMetric.increment(2000);
+        instance.capture();
+        final Map<String, Double> ratesAfterSecondCapture = instance.getValue();
+        assertFalse(ratesAfterSecondCapture.isEmpty());
+        assertEquals(Map.of(LIFETIME_KEY, 300.0, CURRENT_KEY, 400.0), ratesAfterSecondCapture);
+
+        // 30 seconds pass, during which 11700 more events are seen by our numerator
+        for (Integer eventCount : List.of(1883, 2117, 1901, 2299, 1608, 1892)) {
+            clock.advance(Duration.ofSeconds(5));
+            numeratorMetric.increment(eventCount);
+            instance.capture();
+        }
+        final Map<String, Double> ratesAfterNthCapture = instance.getValue();
+        assertFalse(ratesAfterNthCapture.isEmpty());
+        assertEquals(Map.of(LIFETIME_KEY, 367.5, CURRENT_KEY, 378.4), ratesAfterNthCapture);
+
+        // less than half a second passes, during which 0 events are seen by our numerator.
+        // when our two most recent captures are very close together, we want to make sure that
+        // we continue to provide _meaningful_ metrics, namely that:
+        // (a) our CURRENT_KEY and LIFETIME_KEY account for newest capture, and
+        // (b) our CURRENT_KEY does not report _only_ the delta since the very-recent capture
+        clock.advance(Duration.ofMillis(10));
+        instance.capture();
+        final Map<String, Double> ratesAfterSmallAdvanceCapture = instance.getValue();
+        assertFalse(ratesAfterNthCapture.isEmpty());
+        assertEquals(Map.of(LIFETIME_KEY, 367.4, CURRENT_KEY, 377.6), ratesAfterSmallAdvanceCapture);
+    }
+
+    @Test
+    public void testFunctionalityWhenMetricInitiallyReturnsNullValue() {
+        final ManualAdvanceClock clock = new ManualAdvanceClock(Instant.now());
+        final NullableLongMetric numeratorMetric = new NullableLongMetric(MetricKeys.EVENTS_KEY.asJavaString());
+        final Metric<Number> denominatorMetric = new UptimeMetric("uptime", clock::nanoTime).withUnitsPrecise(UptimeMetric.ScaleUnits.SECONDS);
+
+        final SimpleFlowMetric flowMetric = new SimpleFlowMetric(clock::nanoTime, "flow", numeratorMetric, denominatorMetric);
+
+        // for 1000 seconds, our captures hit a metric that is returning null.
+        for(int i=1; i < 1000; i++) {
+            clock.advance(Duration.ofSeconds(1));
+            flowMetric.capture();
+        }
+
+        // our metric has only returned null so far, so we don't expect any captures.
+        assertThat(flowMetric.getValue(), is(anEmptyMap()));
+
+        // increment our metric by a lot, ensuring that the first non-null value available
+        // is big enough to be detected if it is included in our rates
+        numeratorMetric.increment(10_000_000L);
+
+        // now we begin incrementing out metric, which makes it stop returning null.
+        for(int i=1; i<3_000; i++) {
+            clock.advance(Duration.ofSeconds(1));
+            numeratorMetric.increment(i);
+            flowMetric.capture();
+        }
+
+        // ensure that our metrics cover the _available_ data and no more.
+        final Map<String, Double> flowMetricValue = flowMetric.getValue();
+        assertThat(flowMetricValue, hasEntry("current",         2999.0));
+        assertThat(flowMetricValue, hasEntry("lifetime",        1501.0));
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/TestClock.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/TestClock.java
new file mode 100644
index 000000000..197ecc7e0
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/TestClock.java
@@ -0,0 +1,7 @@
+package org.logstash.instrument.metrics;
+
+import java.time.Clock;
+
+public abstract class TestClock extends Clock {
+    abstract public long nanoTime();
+}
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/TestUptimeMetricFactory.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/TestUptimeMetricFactory.java
new file mode 100644
index 000000000..04ae51e8c
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/TestUptimeMetricFactory.java
@@ -0,0 +1,15 @@
+package org.logstash.instrument.metrics;
+
+import java.util.function.LongSupplier;
+
+public class TestUptimeMetricFactory {
+    private final LongSupplier nanoTimeSupplier;
+
+    public TestUptimeMetricFactory(LongSupplier nanoTimeSupplier) {
+        this.nanoTimeSupplier = nanoTimeSupplier;
+    }
+
+    public UptimeMetric newUptimeMetric(final String name) {
+        return new UptimeMetric(name, nanoTimeSupplier);
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/UpScaledMetricTest.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/UpScaledMetricTest.java
new file mode 100644
index 000000000..5938c5e09
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/UpScaledMetricTest.java
@@ -0,0 +1,35 @@
+package org.logstash.instrument.metrics;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.time.Duration;
+import java.time.Instant;
+
+public class UpScaledMetricTest {
+
+    Metric<Number> uptimeMetric;
+
+    ManualAdvanceClock clock;
+
+    @Before
+    public void setUp() {
+        clock = new ManualAdvanceClock(Instant.now());
+        uptimeMetric = new UptimeMetric("uptime", clock::nanoTime).withUnitsPrecise(UptimeMetric.ScaleUnits.SECONDS);
+    }
+
+    @Test
+    public void testGetType() {
+        UpScaledMetric upScaledMetric = new UpScaledMetric("up_scaled_metric", uptimeMetric, 2);
+        Assert.assertEquals(upScaledMetric.getType(), MetricType.GAUGE_NUMBER);
+    }
+
+    @Test
+    public void testGetValue() {
+        UpScaledMetric upScaledMetric = new UpScaledMetric("up_scaled_metric", uptimeMetric, 10);
+        clock.advance(Duration.ofSeconds(10));
+        Assert.assertTrue(BigDecimal.valueOf(100.0d).compareTo(upScaledMetric.getValue()) == 0);
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/UptimeMetricTest.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/UptimeMetricTest.java
new file mode 100644
index 000000000..61f700f83
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/UptimeMetricTest.java
@@ -0,0 +1,95 @@
+package org.logstash.instrument.metrics;
+
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertEquals;
+
+public class UptimeMetricTest {
+
+    @Test
+    public void testDefaultConstructor() {
+        final UptimeMetric defaultConstructorUptimeMetric = new UptimeMetric();
+        assertEquals(MetricKeys.UPTIME_IN_MILLIS_KEY.asJavaString(), defaultConstructorUptimeMetric.getName());
+        assertEquals(TimeUnit.MILLISECONDS, defaultConstructorUptimeMetric.getTimeUnit());
+    }
+
+    @Test
+    public void getNameExplicit() {
+        final String customName = "custom_uptime_name";
+        assertEquals(customName, new UptimeMetric(customName).getName());
+    }
+
+    @Test
+    public void getType() {
+        assertEquals(MetricType.COUNTER_LONG, new UptimeMetric().getType());
+    }
+
+    @Test
+    public void getValue() {
+        final ManualAdvanceClock clock = new ManualAdvanceClock(Instant.now());
+        final UptimeMetric uptimeMetric = new UptimeMetric("up", clock::nanoTime);
+        assertEquals(Long.valueOf(0L), uptimeMetric.getValue());
+
+        clock.advance(Duration.ofMillis(123));
+        assertEquals(Long.valueOf(123L), uptimeMetric.getValue());
+
+        clock.advance(Duration.ofMillis(456));
+        assertEquals(Long.valueOf(579L), uptimeMetric.getValue());
+
+        clock.advance(Duration.ofMinutes(15));
+        assertEquals(Long.valueOf(900579L), uptimeMetric.getValue());
+
+        clock.advance(Duration.ofHours(712));
+        assertEquals(Long.valueOf(2564100579L), uptimeMetric.getValue());
+    }
+
+    @Test
+    public void withTemporalUnit() {
+        final ManualAdvanceClock clock = new ManualAdvanceClock(Instant.now());
+        final UptimeMetric uptimeMetric = new UptimeMetric("up_millis", clock::nanoTime);
+        clock.advance(Duration.ofMillis(1_000_000_000));
+
+        // set-up: ensure advancing nanos reflects in our milli-based uptime
+        assertEquals(Long.valueOf(1_000_000_000), uptimeMetric.getValue());
+
+        final UptimeMetric secondsBasedCopy = uptimeMetric.withTimeUnit("up_seconds", TimeUnit.SECONDS);
+        assertEquals(Long.valueOf(1_000_000), secondsBasedCopy.getValue());
+
+        clock.advance(Duration.ofMillis(1_999));
+        assertEquals(Long.valueOf(1_000_001_999), uptimeMetric.getValue());
+        assertEquals(Long.valueOf(1_000_001), secondsBasedCopy.getValue());
+    }
+
+    @Test
+    public void withUnitsPrecise() {
+        final ManualAdvanceClock clock = new ManualAdvanceClock(Instant.now());
+        final UptimeMetric uptimeMetric = new UptimeMetric("up_millis", clock::nanoTime);
+        clock.advance(Duration.ofNanos(123_456_789_987L)); // 123.xx seconds
+
+        // set-up: ensure advancing nanos reflects in our milli-based uptime
+        assertEquals(Long.valueOf(123_456L), uptimeMetric.getValue());
+
+        final UptimeMetric.ScaledView secondsBasedView = uptimeMetric.withUnitsPrecise("up_seconds", UptimeMetric.ScaleUnits.SECONDS);
+        final UptimeMetric.ScaledView millisecondsBasedView = uptimeMetric.withUnitsPrecise("up_millis", UptimeMetric.ScaleUnits.MILLISECONDS);
+        final UptimeMetric.ScaledView microsecondsBasedView = uptimeMetric.withUnitsPrecise("up_micros", UptimeMetric.ScaleUnits.MICROSECONDS);
+        final UptimeMetric.ScaledView nanosecondsBasedView = uptimeMetric.withUnitsPrecise("up_nanos", UptimeMetric.ScaleUnits.NANOSECONDS);
+
+        assertEquals(new BigDecimal("123.456789987"), secondsBasedView.getValue());
+        assertEquals(new BigDecimal("123456.789987"), millisecondsBasedView.getValue());
+        assertEquals(new BigDecimal("123456789.987"), microsecondsBasedView.getValue());
+        assertEquals(new BigDecimal("123456789987"), nanosecondsBasedView.getValue());
+
+        clock.advance(Duration.ofMillis(1_999));
+        assertEquals(Long.valueOf(125_455L), uptimeMetric.getValue());
+        assertEquals(new BigDecimal("125.455789987"), secondsBasedView.getValue());
+        assertEquals(new BigDecimal("125455.789987"), millisecondsBasedView.getValue());
+        assertEquals(new BigDecimal("125455789.987"), microsecondsBasedView.getValue());
+        assertEquals(new BigDecimal("125455789987"), nanosecondsBasedView.getValue());
+    }
+
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/counter/LongCounterTest.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/counter/LongCounterTest.java
index 0d1fd96fb..cd1453fd7 100644
--- a/logstash-core/src/test/java/org/logstash/instrument/metrics/counter/LongCounterTest.java
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/counter/LongCounterTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics.counter;
 
 import org.junit.Before;
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/BooleanGaugeTest.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/BooleanGaugeTest.java
index b29a1f631..a0923c42d 100644
--- a/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/BooleanGaugeTest.java
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/BooleanGaugeTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics.gauge;
 
 import org.junit.Test;
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/LazyDelegatingGaugeTest.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/LazyDelegatingGaugeTest.java
index 84b76d316..0a5617877 100644
--- a/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/LazyDelegatingGaugeTest.java
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/LazyDelegatingGaugeTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics.gauge;
 
 import java.net.URI;
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/NumberGaugeTest.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/NumberGaugeTest.java
index 2b6f0c233..fde491913 100644
--- a/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/NumberGaugeTest.java
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/NumberGaugeTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics.gauge;
 
 import org.junit.Test;
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/RubyHashGaugeTest.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/RubyHashGaugeTest.java
index 631fc4a79..bdc663228 100644
--- a/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/RubyHashGaugeTest.java
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/RubyHashGaugeTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics.gauge;
 
 import org.jruby.RubyHash;
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/RubyTimeStampGaugeTest.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/RubyTimeStampGaugeTest.java
index 82b47c59f..accc385b5 100644
--- a/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/RubyTimeStampGaugeTest.java
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/RubyTimeStampGaugeTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics.gauge;
 
 import org.junit.Test;
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/TextGaugeTest.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/TextGaugeTest.java
index 5b19b0c99..45d421857 100644
--- a/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/TextGaugeTest.java
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/TextGaugeTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics.gauge;
 
 import org.junit.Test;
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/UnknownGaugeTest.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/UnknownGaugeTest.java
index 6b071e861..a8b010975 100644
--- a/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/UnknownGaugeTest.java
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/gauge/UnknownGaugeTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instrument.metrics.gauge;
 
 import org.junit.Test;
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/timer/BlockingTask.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/timer/BlockingTask.java
new file mode 100644
index 000000000..72bf1859f
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/timer/BlockingTask.java
@@ -0,0 +1,124 @@
+package org.logstash.instrument.metrics.timer;
+
+import com.google.common.util.concurrent.Monitor;
+
+import java.time.Duration;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+/**
+ * A {@code BlockingTask} is a test tool for coordinating sequential operations in what
+ * is normally asynchronous code. Its {@link Factory} provides methods for spawning tasks
+ * that block in an {@code ExecutorService} until they are released by your code.
+ * @param <T>
+ */
+class BlockingTask<T> {
+
+    public static class Factory {
+        private final ExecutorService executorService;
+
+        public Factory(final ExecutorService executorService) {
+            this.executorService = executorService;
+        }
+
+        /**
+         * Executes the provided {@code Consumer<ControlChannel>} in the executor service
+         * and blocks until control is yielded in the executing thread by sending
+         * {@link ControlChannel#markReadyAndBlockUntilRelease}.
+         *
+         * @param function your task, which <em>MUST</em> send {@link ControlChannel#markReadyAndBlockUntilRelease}.
+         * @return a {@code BlockingTask} for you to send {@link BlockingTask#complete()}
+         *
+         * @param <TT> the return-type of your function, which may be {@code Void}.
+         */
+        public <TT> BlockingTask<TT> wrapping(final Function<ControlChannel, TT> function) {
+            final ControlChannel controlChannel = new ControlChannel();
+            final Future<TT> future = executorService.submit(() -> {
+                return function.apply(controlChannel);
+            });
+
+            controlChannel.blockUntilReady();
+
+            return new BlockingTask<TT>(controlChannel, future);
+        }
+
+        /**
+         * Spawns a task in the executor and blocks the current thread until the task is running.
+         *
+         * <p>Your deferred action will be executed <em>after</em> the task is released
+         * and <em>before</em> control is returned to the thread that releases it.
+         *
+         * @param supplier your code, which will be executed in the executor pool when this task is released.
+         * @return a {@code BlockingTask} waiting
+         *
+         * @param <TT> the return-type of your supplier, which may be {@code Void}.
+         */
+        public <TT> BlockingTask<TT> deferUntilReleased(final Supplier<TT> supplier) {
+            return wrapping((controlChannel) -> {
+                controlChannel.markReadyAndBlockUntilRelease();
+                return supplier.get();
+            });
+        }
+    }
+
+    private final ControlChannel controlChannel;
+    private final Future<T> future;
+
+    private static final Duration SAFEGUARD = Duration.ofSeconds(10);
+
+    private BlockingTask(final ControlChannel controlChannel,
+                         final Future<T> future) {
+        this.controlChannel = controlChannel;
+        this.future = future;
+    }
+
+    public T complete() throws ExecutionException, InterruptedException, TimeoutException {
+        controlChannel.release();
+        return future.get(SAFEGUARD.getSeconds(), TimeUnit.SECONDS);
+    }
+
+    public static class ControlChannel {
+        private volatile boolean isReady = false;
+        private volatile boolean isReleased = false;
+
+        private final Monitor monitor = new Monitor();
+        private final Monitor.Guard guardReady = monitor.newGuard(() -> isReady);
+        private final Monitor.Guard guardRelease = monitor.newGuard(() -> isReleased);
+
+        public void markReadyAndBlockUntilRelease() {
+            try {
+                monitor.enterInterruptibly(10, TimeUnit.SECONDS);
+                this.isReady = true;
+                monitor.waitFor(guardRelease, SAFEGUARD);
+                monitor.leave();
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        private void blockUntilReady() {
+            try {
+                monitor.enterWhen(guardReady, SAFEGUARD);
+                monitor.leave();
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        private void release() {
+            try {
+                monitor.enterInterruptibly(SAFEGUARD);
+                isReleased = true;
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            } finally {
+                monitor.leave();
+            }
+        }
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/timer/ConcurrentLiveTimerMetricTest.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/timer/ConcurrentLiveTimerMetricTest.java
new file mode 100644
index 000000000..69519891e
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/timer/ConcurrentLiveTimerMetricTest.java
@@ -0,0 +1,15 @@
+package org.logstash.instrument.metrics.timer;
+
+import org.junit.Test;
+
+public class ConcurrentLiveTimerMetricTest extends TimerMetricTest {
+    @Override
+    TimerMetric initTimerMetric(final String name) {
+        return testTimerMetricFactory.newConcurrentLiveTimerMetric(name);
+    }
+
+    @Test
+    public void testValueDuringConcurrentTrackedExecutions() throws Exception {
+        sharedTestWithConcurrentTrackedExecutions(true);
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/timer/TestTimerMetricFactory.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/timer/TestTimerMetricFactory.java
new file mode 100644
index 000000000..d7589e085
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/timer/TestTimerMetricFactory.java
@@ -0,0 +1,33 @@
+package org.logstash.instrument.metrics.timer;
+
+import org.logstash.instrument.metrics.TestClock;
+
+import java.util.function.LongSupplier;
+
+/**
+ * This {@code TestTimerMetricFactory} provides factory methods for constructing implementations
+ * of {@link TimerMetric} for use in test that are connected to a nano-time supplier (typically
+ * {@link TestClock#nanoTime()} from {@link org.logstash.instrument.metrics.ManualAdvanceClock}).
+ *
+ * <p>The factory methods use the package-private constructors provided by the respective
+ * implementations, but are <em>public</em>, which makes them available to other test packages.
+ */
+public class TestTimerMetricFactory {
+    private final LongSupplier nanoTimeSupplier;
+
+    public TestTimerMetricFactory(TestClock testClock) {
+        this(testClock::nanoTime);
+    }
+
+    public TestTimerMetricFactory(final LongSupplier nanoTimeSupplier) {
+        this.nanoTimeSupplier = nanoTimeSupplier;
+    }
+
+    public ConcurrentLiveTimerMetric newConcurrentLiveTimerMetric(final String name) {
+        return new ConcurrentLiveTimerMetric(name, this.nanoTimeSupplier);
+    }
+
+    public TimerMetric newTimerMetric(final String name) {
+        return TimerMetricFactory.INSTANCE.create(name, this.nanoTimeSupplier);
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/instrument/metrics/timer/TimerMetricTest.java b/logstash-core/src/test/java/org/logstash/instrument/metrics/timer/TimerMetricTest.java
new file mode 100644
index 000000000..d61f9e45f
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/instrument/metrics/timer/TimerMetricTest.java
@@ -0,0 +1,208 @@
+package org.logstash.instrument.metrics.timer;
+
+import org.junit.Test;
+import org.logstash.instrument.metrics.ManualAdvanceClock;
+import org.logstash.instrument.metrics.MetricType;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
+
+/**
+ * This {@code TimerMetricTest} is meant to be inherited by tests covering the
+ * implementations of {@link TimerMetric}, and includes baseline tests for guaranteeing
+ * that the value of the metric includes the duration of execution before control is
+ * given back to the caller.
+ *
+ * <p>At an <em>interface</em>-level, we only guarantee that tracked executions will
+ * be committed into the value <em>before</em> control is returned to the caller, which
+ * means that the value may or may not include "uncommitted" or mid-execution
+ * tracked timings. As a result, these shared tests can only validate the cumulative
+ * value when there are zero currently-tracked executions in-flight. Implementations
+ * that report live-tracking will need to validate mid-execution behaviour on their
+ * own.</p>
+ */
+public abstract class TimerMetricTest {
+
+    protected final ManualAdvanceClock manualAdvanceClock = new ManualAdvanceClock(Instant.now());
+    protected final TestTimerMetricFactory testTimerMetricFactory = new TestTimerMetricFactory(manualAdvanceClock);
+
+    private final ExecutorService executorService = Executors.newFixedThreadPool(5);
+    private final BlockingTask.Factory blockingTaskFactory = new BlockingTask.Factory(executorService);
+
+    abstract TimerMetric initTimerMetric(String name);
+
+    @Test
+    public void testBaselineFunctionality() {
+        final TimerMetric timerMetric = initTimerMetric("duration_in_millis");
+
+        assertThat(timerMetric.getValue(), is(equalTo(0L)));
+
+        // nothing executing, no advance
+        manualAdvanceClock.advance(Duration.ofSeconds(30));
+        assertThat(timerMetric.getValue(), is(equalTo(0L)));
+
+        // single execution, advances whole millis
+        timerMetric.time(() -> {
+            manualAdvanceClock.advance(Duration.ofNanos(1234567890L));
+        });
+        assertThat(timerMetric.getValue(), is(equalTo(1234L)));
+
+        // nothing executing, no advance
+        manualAdvanceClock.advance(Duration.ofSeconds(30));
+        assertThat(timerMetric.getValue(), is(equalTo(1234L)));
+
+        // untracked execution, advances as expected
+        timerMetric.reportUntrackedMillis(7326L);
+        assertThat(timerMetric.getValue(), is(equalTo(8560L)));
+    }
+
+    @Test
+    public void testValueAfterConcurrentTrackedExecutions() throws Exception {
+        sharedTestWithConcurrentTrackedExecutions(false);
+    }
+
+    /**
+     * This shared test optionally validates the value of the timer metric after
+     * each state change, enabling additional validations for live timers.
+     *
+     * @param validateLiveTracking whether to validate the value of the timer after each clock change.
+     * @throws Exception
+     */
+    void sharedTestWithConcurrentTrackedExecutions(final boolean validateLiveTracking) throws Exception {
+        final TimerMetric timerMetric = initTimerMetric("duration_in_millis");
+
+        // assert baseline timer is not incrementing when time is passing
+        assertThat(timerMetric.getValue(), is(equalTo(0L)));
+        manualAdvanceClock.advance(Duration.ofMillis(10_000_000_000L));
+        assertThat(timerMetric.getValue(), is(equalTo(0L)));
+
+        // methodology note: each state-change affects a single column in a decimal-formatted long,
+        // which gives us a bread-crumb for identifying the cause of issues when our expectation
+        // does not match
+        long expectedAdvance = 0L;
+
+        final BlockingTask<Void> taskOne = timedBlockingTask(timerMetric);
+        manualAdvanceClock.advance(Duration.ofMillis(1L));
+        expectedAdvance += Math.multiplyExact(1L, 1);
+        if (validateLiveTracking) { assertThat(timerMetric.getValue(), is(equalTo(expectedAdvance))); }
+
+        final BlockingTask<Void> taskTwo = timedBlockingTask(timerMetric);
+        manualAdvanceClock.advance(Duration.ofMillis(10L));
+        expectedAdvance += Math.multiplyExact(10L, 2);
+        if (validateLiveTracking) { assertThat(timerMetric.getValue(), is(equalTo(expectedAdvance))); }
+
+        taskOne.complete();
+        manualAdvanceClock.advance(Duration.ofMillis(100L));
+        expectedAdvance += Math.multiplyExact(100L, 1);
+        if (validateLiveTracking) { assertThat(timerMetric.getValue(), is(equalTo(expectedAdvance))); }
+
+        final BlockingTask<Void> taskThree = timedBlockingTask(timerMetric);
+        manualAdvanceClock.advance(Duration.ofMillis(1_000L));
+        expectedAdvance += Math.multiplyExact(1_000L, 2);
+        if (validateLiveTracking) { assertThat(timerMetric.getValue(), is(equalTo(expectedAdvance))); }
+
+        final BlockingTask<Void> taskFour = timedBlockingTask(timerMetric);
+        manualAdvanceClock.advance(Duration.ofMillis(10_000L));
+        expectedAdvance += Math.multiplyExact(10_000L, 3);
+        if (validateLiveTracking) { assertThat(timerMetric.getValue(), is(equalTo(expectedAdvance))); }
+
+        taskThree.complete();
+        manualAdvanceClock.advance(Duration.ofMillis(100_000L));
+        expectedAdvance += Math.multiplyExact(100_000L, 2);
+        if (validateLiveTracking) { assertThat(timerMetric.getValue(), is(equalTo(expectedAdvance))); }
+
+        taskTwo.complete();
+        manualAdvanceClock.advance(Duration.ofMillis(1_000_000L));
+        expectedAdvance += Math.multiplyExact(1_000_000L, 1);
+        if (validateLiveTracking) { assertThat(timerMetric.getValue(), is(equalTo(expectedAdvance))); }
+
+        taskFour.complete();
+        manualAdvanceClock.advance(Duration.ofMillis(10_000_000L));
+        expectedAdvance += Math.multiplyExact(10_000_000L, 0);
+        if (validateLiveTracking) { assertThat(timerMetric.getValue(), is(equalTo(expectedAdvance))); }
+
+        final BlockingTask<Void> taskFive = timedBlockingTask(timerMetric);
+        manualAdvanceClock.advance(Duration.ofMillis(100_000_000L));
+        expectedAdvance += Math.multiplyExact(100_000_000L, 1);
+        if (validateLiveTracking) { assertThat(timerMetric.getValue(), is(equalTo(expectedAdvance))); }
+
+        taskFive.complete();
+        manualAdvanceClock.advance(Duration.ofMillis(1_000_000_000L));
+        expectedAdvance += Math.multiplyExact(1_000_000_000L, 0);
+        if (validateLiveTracking) { assertThat(timerMetric.getValue(), is(equalTo(expectedAdvance))); }
+
+        // note: we assert both
+        assertThat(timerMetric.getValue(), is(equalTo(101_232_121L)));
+        assertThat(timerMetric.getValue(), is(equalTo(expectedAdvance)));
+    }
+
+    @Test
+    public void testReturnValue() {
+        final TimerMetric timerMetric = initTimerMetric("ok");
+
+        final Optional<String> original = Optional.of("hello");
+
+        final Optional<String> result = timerMetric.time(() -> original);
+
+        assertSame(original, result);
+    }
+
+    @Test
+    public void testName() {
+        final TimerMetric timerMetric = initTimerMetric("testing-timer-metric");
+        assertThat(timerMetric.getName(), equalTo("testing-timer-metric"));
+    }
+
+    @Test
+    public void testType() {
+        final TimerMetric timerMetric = initTimerMetric("testing-timer-metric-2");
+        assertThat(timerMetric.getType(), equalTo(MetricType.TIMER_LONG));
+    }
+
+    private static class ACheckedException extends Exception {
+        private static final long serialVersionUID = 1L;
+        public ACheckedException(String message) {
+            super(message);
+        }
+    }
+
+    @Test
+    public void testThrowing() {
+        final TimerMetric timerMetric = initTimerMetric("oh no");
+        final ACheckedException checkedException = new ACheckedException("gotcha");
+        try {
+            timerMetric.time(() -> { throw checkedException; });
+        } catch (ACheckedException chk) {
+            assertSame(checkedException, chk);
+            return;
+        }
+        fail("Checked exception not caught!");
+    }
+
+    @Test
+    public void testAccumulatesExcessNanos() {
+        final TimerMetric timerMetric = initTimerMetric("precisely");
+
+        for (int i = 0; i < 1000; i++) {
+            timerMetric.time(() -> manualAdvanceClock.advance(Duration.ofNanos(999_999L)));
+        }
+
+        assertThat(timerMetric.getValue(), is(equalTo(999L)));
+    }
+
+    private BlockingTask<Void> timedBlockingTask(final TimerMetric timerMetric) {
+        return blockingTaskFactory.wrapping((controlChannel) -> {
+            timerMetric.time(controlChannel::markReadyAndBlockUntilRelease);
+            return null;
+        });
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/instruments/monitors/HotThreadMonitorTest.java b/logstash-core/src/test/java/org/logstash/instruments/monitors/HotThreadMonitorTest.java
index 3334269f4..ec6765fca 100644
--- a/logstash-core/src/test/java/org/logstash/instruments/monitors/HotThreadMonitorTest.java
+++ b/logstash-core/src/test/java/org/logstash/instruments/monitors/HotThreadMonitorTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instruments.monitors;
 
 
diff --git a/logstash-core/src/test/java/org/logstash/instruments/monitors/MemoryMonitorTest.java b/logstash-core/src/test/java/org/logstash/instruments/monitors/MemoryMonitorTest.java
index bb03c99bf..3e1be5831 100644
--- a/logstash-core/src/test/java/org/logstash/instruments/monitors/MemoryMonitorTest.java
+++ b/logstash-core/src/test/java/org/logstash/instruments/monitors/MemoryMonitorTest.java
@@ -1,7 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instruments.monitors;
 
 import org.junit.Test;
-import org.logstash.LogstashJavaCompat;
 import org.logstash.instrument.monitors.MemoryMonitor;
 
 import java.util.Map;
@@ -18,11 +37,7 @@ public class MemoryMonitorTest {
     public void testEachHeapSpaceRepresented() {
         Map<String, Map<String, Object>> heap = MemoryMonitor.detect(MemoryMonitor.Type.All).getHeap();
         assertThat(heap, notNullValue());
-        if (LogstashJavaCompat.IS_JAVA_9_OR_GREATER) {
-            assertThat(heap.keySet(), hasItems("G1 Old Gen", "G1 Survivor Space", "G1 Eden Space"));
-        } else {
-            assertThat(heap.keySet(), hasItems("PS Survivor Space", "PS Old Gen", "PS Eden Space"));
-        }
+        assertThat(heap.keySet(), hasItems("G1 Old Gen", "G1 Survivor Space", "G1 Eden Space"));
     }
 
     @Test
diff --git a/logstash-core/src/test/java/org/logstash/instruments/monitors/ProcessMonitorTest.java b/logstash-core/src/test/java/org/logstash/instruments/monitors/ProcessMonitorTest.java
index 4f474281d..a4d8fcb15 100644
--- a/logstash-core/src/test/java/org/logstash/instruments/monitors/ProcessMonitorTest.java
+++ b/logstash-core/src/test/java/org/logstash/instruments/monitors/ProcessMonitorTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instruments.monitors;
 
 import org.junit.Test;
@@ -25,7 +45,6 @@ public class ProcessMonitorTest {
     @SuppressWarnings("unchecked")
     public void testReportCpuStats(){
         Map<String, Object> processStats = ProcessMonitor.detect().toMap();
-        assumeTrue((Boolean) processStats.get("is_unix"));
         assertThat("cpu", processStats.get("cpu"), instanceOf(Map.class));
         Map<String, Object> cpuStats = (Map<String, Object>) processStats.get("cpu");
         assertThat("cpu.process_percent", (Short)cpuStats.get("process_percent") >= 0, is(true));
diff --git a/logstash-core/src/test/java/org/logstash/instruments/monitors/SystemMonitorTest.java b/logstash-core/src/test/java/org/logstash/instruments/monitors/SystemMonitorTest.java
index c3907bd09..92e51f689 100644
--- a/logstash-core/src/test/java/org/logstash/instruments/monitors/SystemMonitorTest.java
+++ b/logstash-core/src/test/java/org/logstash/instruments/monitors/SystemMonitorTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.instruments.monitors;
 
 import org.junit.Test;
diff --git a/logstash-core/src/test/java/org/logstash/jackson/StreamReadConstraintsUtilTest.java b/logstash-core/src/test/java/org/logstash/jackson/StreamReadConstraintsUtilTest.java
new file mode 100644
index 000000000..949d960dc
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/jackson/StreamReadConstraintsUtilTest.java
@@ -0,0 +1,252 @@
+package org.logstash.jackson;
+
+import com.fasterxml.jackson.core.StreamReadConstraints;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.junit.LoggerContextRule;
+import org.apache.logging.log4j.test.appender.ListAppender;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.Properties;
+import java.util.function.BiConsumer;
+
+import org.apache.logging.log4j.Level;
+import org.logstash.ObjectMappers;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.logstash.jackson.StreamReadConstraintsUtil.Override.*;
+
+public class StreamReadConstraintsUtilTest {
+
+    @ClassRule
+    public static final LoggerContextRule LOGGER_CONTEXT_RULE = new LoggerContextRule("log4j2-log-stream-read-constraints.xml");
+
+    @Rule
+    public final DefaultsRestorer defaultsRestorer = new DefaultsRestorer();
+
+    private ListAppender listAppender;
+    private Logger observedLogger;
+
+    @Before
+    public void setUpLoggingListAppender() {
+        this.observedLogger = LOGGER_CONTEXT_RULE.getLogger(StreamReadConstraintsUtil.class);
+        this.listAppender = LOGGER_CONTEXT_RULE.getListAppender("EventListAppender").clear();
+    }
+
+    @Test
+    public void configuresDefaultsByDefault() {
+        Objects.requireNonNull(ObjectMappers.CBOR_MAPPER); // force static init
+        StreamReadConstraintsUtil.fromSystemProperties().validateIsGlobalDefault();
+    }
+
+    @Test
+    public void configuresMaxStringLength() {
+        final Properties properties = new Properties();
+        properties.setProperty(MAX_STRING_LENGTH.propertyName, "10101");
+
+        fromProperties(properties, (configuredUtil, defaults) -> {
+            final StreamReadConstraints configuredConstraints = configuredUtil.get();
+
+            assertThat(configuredConstraints).returns(10101, from(StreamReadConstraints::getMaxStringLength));
+
+            assertThat(configuredConstraints).as("inherited defaults")
+                    .returns(defaults.getMaxDocumentLength(), from(StreamReadConstraints::getMaxDocumentLength))
+                    .returns(defaults.getMaxNameLength(), from(StreamReadConstraints::getMaxNameLength))
+                    .returns(MAX_NESTING_DEPTH.defaultValue, from(StreamReadConstraints::getMaxNestingDepth))
+                    .returns(MAX_NUMBER_LENGTH.defaultValue, from(StreamReadConstraints::getMaxNumberLength));
+
+            assertThatThrownBy(configuredUtil::validateIsGlobalDefault).isInstanceOf(IllegalStateException.class).hasMessageContaining(MAX_STRING_LENGTH.propertyName);
+
+            configuredUtil.applyAsGlobalDefault();
+            assertThatCode(configuredUtil::validateIsGlobalDefault).doesNotThrowAnyException();
+        });
+    }
+
+    @Test
+    public void configuresMaxStringLengthInvalid() {
+        final Properties properties = new Properties();
+        properties.setProperty(MAX_STRING_LENGTH.propertyName, "NaN");
+
+        fromProperties(properties, (configuredUtil, defaults) -> assertThatThrownBy(configuredUtil::get)
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining(MAX_STRING_LENGTH.propertyName));
+    }
+
+    @Test
+    public void configuresMaxStringLengthNegative() {
+        final Properties properties = new Properties();
+        properties.setProperty(MAX_STRING_LENGTH.propertyName, "-1000");
+
+        fromProperties(properties, (configuredUtil, defaults) -> assertThatThrownBy(configuredUtil::get)
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining(MAX_STRING_LENGTH.propertyName));
+    }
+
+    @Test
+    public void configuresMaxNumberLength() {
+        final Properties properties = new Properties();
+        properties.setProperty(MAX_NUMBER_LENGTH.propertyName, "101");
+
+        fromProperties(properties, (configuredUtil, defaults) -> {
+            final StreamReadConstraints configuredConstraints = configuredUtil.get();
+
+            assertThat(configuredConstraints).returns(101, from(StreamReadConstraints::getMaxNumberLength));
+
+            assertThat(configuredConstraints).as("inherited defaults")
+                    .returns(defaults.getMaxDocumentLength(), from(StreamReadConstraints::getMaxDocumentLength))
+                    .returns(defaults.getMaxNameLength(), from(StreamReadConstraints::getMaxNameLength))
+                    .returns(MAX_NESTING_DEPTH.defaultValue, from(StreamReadConstraints::getMaxNestingDepth))
+                    .returns(MAX_STRING_LENGTH.defaultValue, from(StreamReadConstraints::getMaxStringLength));
+
+            assertThatThrownBy(configuredUtil::validateIsGlobalDefault).isInstanceOf(IllegalStateException.class).hasMessageContaining(MAX_NUMBER_LENGTH.propertyName);
+
+            configuredUtil.applyAsGlobalDefault();
+            assertThatCode(configuredUtil::validateIsGlobalDefault).doesNotThrowAnyException();
+        });
+    }
+
+    @Test
+    public void configuresMaxNumberLengthInvalid() {
+        final Properties properties = new Properties();
+        properties.setProperty(MAX_NUMBER_LENGTH.propertyName, "NaN");
+
+        fromProperties(properties, (configuredUtil, defaults) -> assertThatThrownBy(configuredUtil::get)
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining(MAX_NUMBER_LENGTH.propertyName));
+    }
+
+    @Test
+    public void configuresMaxNumberLengthNegative() {
+        final Properties properties = new Properties();
+        properties.setProperty(MAX_NUMBER_LENGTH.propertyName, "-1000");
+
+        fromProperties(properties, (configuredUtil, defaults) -> assertThatThrownBy(configuredUtil::get)
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining(MAX_NUMBER_LENGTH.propertyName));
+    }
+
+    @Test
+    public void configuresMaxNestingDepth() {
+        final Properties properties = new Properties();
+        properties.setProperty(MAX_NESTING_DEPTH.propertyName, "101");
+
+        fromProperties(properties, (configuredUtil, defaults) -> {
+            final StreamReadConstraints configuredConstraints = configuredUtil.get();
+
+            assertThat(configuredConstraints).returns(101, from(StreamReadConstraints::getMaxNestingDepth));
+
+            assertThat(configuredConstraints).as("inherited defaults")
+                    .returns(defaults.getMaxDocumentLength(), from(StreamReadConstraints::getMaxDocumentLength))
+                    .returns(defaults.getMaxNameLength(), from(StreamReadConstraints::getMaxNameLength))
+                    .returns(MAX_STRING_LENGTH.defaultValue, from(StreamReadConstraints::getMaxStringLength))
+                    .returns(MAX_NUMBER_LENGTH.defaultValue, from(StreamReadConstraints::getMaxNumberLength));
+
+            assertThatThrownBy(configuredUtil::validateIsGlobalDefault).isInstanceOf(IllegalStateException.class).hasMessageContaining(MAX_NESTING_DEPTH.propertyName);
+
+            configuredUtil.applyAsGlobalDefault();
+            assertThatCode(configuredUtil::validateIsGlobalDefault).doesNotThrowAnyException();
+        });
+    }
+
+    @Test
+    public void configuresMaxNestingDepthInvalid() {
+        final Properties properties = new Properties();
+        properties.setProperty(MAX_NESTING_DEPTH.propertyName, "NaN");
+
+        fromProperties(properties, (configuredUtil, defaults) -> assertThatThrownBy(configuredUtil::get)
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining(MAX_NESTING_DEPTH.propertyName));
+    }
+
+    @Test
+    public void configuresMaxNestingDepthNegative() {
+        final Properties properties = new Properties();
+        properties.setProperty(MAX_NESTING_DEPTH.propertyName, "-1000");
+
+        fromProperties(properties, (configuredUtil, defaults) -> assertThatThrownBy(configuredUtil::get)
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining(MAX_NESTING_DEPTH.propertyName));
+    }
+
+    @Test
+    public void validatesApplication() {
+        final Properties properties = new Properties();
+        properties.setProperty(PROP_PREFIX + "unsupported-option1", "100");
+        properties.setProperty(PROP_PREFIX + "unsupported-option2", "100");
+        properties.setProperty(MAX_NESTING_DEPTH.propertyName, "1010");
+        properties.setProperty(MAX_STRING_LENGTH.propertyName, "1011");
+        properties.setProperty(MAX_NUMBER_LENGTH.propertyName, "1110");
+
+        System.out.format("START%n");
+
+        fromProperties(properties, (configuredUtil, defaults) -> {
+            configuredUtil.applyAsGlobalDefault();
+            configuredUtil.validateIsGlobalDefault();
+        });
+
+        assertLogObserved(Level.INFO, "override `" + MAX_NESTING_DEPTH.propertyName + "` configured to `1010`");
+        assertLogObserved(Level.INFO, "override `" + MAX_STRING_LENGTH.propertyName + "` configured to `1011`");
+        assertLogObserved(Level.INFO, "override `" + MAX_NUMBER_LENGTH.propertyName + "` configured to `1110`");
+
+        assertLogObserved(Level.WARN, "override `" + PROP_PREFIX + "unsupported-option1` is unknown and has been ignored");
+        assertLogObserved(Level.WARN, "override `" + PROP_PREFIX + "unsupported-option1` is unknown and has been ignored");
+    }
+
+    @Test
+    public void validatesApplicationWithDefaults() {
+        final Properties properties = new Properties(); // empty -- no overrides
+
+        fromProperties(properties, (configuredUtil, defaults) -> {
+            configuredUtil.applyAsGlobalDefault();
+            configuredUtil.validateIsGlobalDefault();
+
+            assertLogObserved(Level.INFO, "override `" + MAX_NESTING_DEPTH.propertyName + "` configured to `" + MAX_NESTING_DEPTH.defaultValue + "` (logstash default)");
+            assertLogObserved(Level.INFO, "override `" + MAX_STRING_LENGTH.propertyName + "` configured to `" + MAX_STRING_LENGTH.defaultValue + "` (logstash default)");
+            assertLogObserved(Level.INFO, "override `" + MAX_NUMBER_LENGTH.propertyName + "` configured to `" + MAX_NUMBER_LENGTH.defaultValue + "` (logstash default)");
+        });
+    }
+
+    private void assertLogObserved(final Level level, final String... messageFragments) {
+        List<LogEvent> logEvents = listAppender.getEvents();
+        assertThat(logEvents)
+                .withFailMessage("Expected %s to contain a %s-level log event containing %s", logEvents, level, Arrays.toString(messageFragments))
+                .filteredOn(logEvent -> logEvent.getLevel().equals(level))
+                .anySatisfy(logEvent -> assertThat(logEvent.getMessage().getFormattedMessage()).contains(messageFragments));
+    }
+
+    private synchronized void fromProperties(final Properties properties,
+                                             final BiConsumer<StreamReadConstraintsUtil, StreamReadConstraints> defaultsConsumer) {
+        final StreamReadConstraints defaults = StreamReadConstraints.defaults();
+        final StreamReadConstraintsUtil util = new StreamReadConstraintsUtil(properties, this.observedLogger);
+
+        defaultsConsumer.accept(util, defaults);
+    }
+
+    /**
+     * A TestRule to snapshot the current defaults from jackson prior to test execution, and to
+     * ensure that snapshot is restored after test execution has completed.
+     */
+    public static class DefaultsRestorer extends org.junit.rules.ExternalResource {
+        private StreamReadConstraints snapshot;
+
+        public StreamReadConstraints getSnapshot() {
+            return this.snapshot;
+        }
+
+        @Override
+        protected void before() throws Throwable {
+            this.snapshot = StreamReadConstraints.defaults();
+        }
+
+        @Override
+        protected void after() {
+            StreamReadConstraints.overrideDefaultStreamReadConstraints(this.snapshot);
+        }
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/log/CustomLogEventTests.java b/logstash-core/src/test/java/org/logstash/log/CustomLogEventTests.java
index 7fa89743e..7b320e4ee 100644
--- a/logstash-core/src/test/java/org/logstash/log/CustomLogEventTests.java
+++ b/logstash-core/src/test/java/org/logstash/log/CustomLogEventTests.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -23,27 +43,34 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.junit.LoggerContextRule;
 import org.apache.logging.log4j.test.appender.ListAppender;
+import org.jruby.RubyHash;
+import org.jruby.runtime.builtin.IRubyObject;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.logstash.ObjectMappers;
+import org.logstash.RubyUtil;
 
+import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 public class CustomLogEventTests {
     private static final String CONFIG = "log4j2-test1.xml";
-    private ListAppender appender;
+    public static final String STRICT_JSON_PROPERTY_NAME = "ls.log.format.json.fix_duplicate_message_fields";
 
     @ClassRule
     public static LoggerContextRule CTX = new LoggerContextRule(CONFIG);
 
     @Test
     public void testPatternLayout() {
-        appender = CTX.getListAppender("EventLogger").clear();
+        ListAppender appender = CTX.getListAppender("EventLogger").clear();
         Logger logger = LogManager.getLogger("EventLogger");
         logger.info("simple message");
         logger.warn("complex message", Collections.singletonMap("foo", "bar"));
@@ -62,7 +89,7 @@ public class CustomLogEventTests {
     @Test
     @SuppressWarnings("unchecked")
     public void testJSONLayout() throws Exception {
-        appender = CTX.getListAppender("JSONEventLogger").clear();
+        ListAppender appender = CTX.getListAppender("JSONEventLogger").clear();
         Logger logger = LogManager.getLogger("JSONEventLogger");
         logger.info("simple message");
         logger.warn("complex message", Collections.singletonMap("foo", "bar"));
@@ -113,4 +140,70 @@ public class CustomLogEventTests {
         logEvent = Collections.singletonMap("message", "ignored params 4");
         assertEquals(logEvent, fifthMessage.get("logEvent"));
     }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testJSONLayoutWithRubyObjectArgument() throws JsonProcessingException {
+        final ListAppender appender = CTX.getListAppender("JSONEventLogger").clear();
+        final Logger logger = LogManager.getLogger("JSONEventLogger");
+
+        final IRubyObject fooRubyObject = RubyUtil.RUBY.evalScriptlet("Class.new do def initialize\n @foo = true\n end\n def to_s\n 'foo_value'\n end end.new");
+        final Map<Object, Object> arguments = RubyHash.newHash(RubyUtil.RUBY);
+        arguments.put("foo", fooRubyObject);
+        arguments.put("bar", "bar_value");
+        arguments.put("one", 1);
+
+        final Map<Object, Object> mapArgValue = RubyHash.newHash(RubyUtil.RUBY);
+        mapArgValue.put("first", 1);
+        mapArgValue.put("second", 2);
+        arguments.put("map", mapArgValue);
+
+        logger.error("Error with hash: {}", arguments);
+
+        final List<String> loggedMessages = appender.getMessages();
+        assertFalse(loggedMessages.isEmpty());
+        assertFalse(loggedMessages.get(0).isEmpty());
+
+        final Map<String, Object> message =  ObjectMappers.JSON_MAPPER.readValue(loggedMessages.get(0), Map.class);
+        final Map<String, Object> logEvent = (Map<String, Object>) message.get("logEvent");
+
+        assertEquals("Error with hash: {}", logEvent.get("message"));
+        assertEquals("foo_value", logEvent.get("foo"));
+        assertEquals("bar_value", logEvent.get("bar"));
+        assertEquals(1, logEvent.get("one"));
+
+        final Map<String, Object> logEventMapValue = (Map<String, Object>) logEvent.get("map");
+        assertEquals(1, logEventMapValue.get("first"));
+        assertEquals(2, logEventMapValue.get("second"));
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testJSONLayoutWhenParamsContainsAnotherMessageField() throws JsonProcessingException {
+        String prevSetting = System.getProperty(STRICT_JSON_PROPERTY_NAME);
+        System.setProperty(STRICT_JSON_PROPERTY_NAME, Boolean.TRUE.toString());
+
+        ListAppender appender = CTX.getListAppender("JSONEventLogger").clear();
+        Logger logger = LogManager.getLogger("JSONEventLogger");
+
+        Map<String, String> paramsWithAnotherMessageField = Collections.singletonMap("message", "something to say");
+        logger.error("here is a map: {}", paramsWithAnotherMessageField);
+
+        List<String> messages = appender.getMessages();
+        assertEquals(1, messages.size());
+
+        Map<String, Object> loggedMessage = ObjectMappers.JSON_MAPPER.readValue(messages.get(0), Map.class);
+        assertEquals(5, loggedMessage.size());
+
+        Map<String, Object> actualLogEvent = (Map<String, Object>) loggedMessage.get("logEvent");
+        assertEquals("here is a map: {}", actualLogEvent.get("message"));
+        assertEquals("something to say", actualLogEvent.get("message_1"));
+
+        // tear down
+        if (prevSetting == null) {
+            System.clearProperty(STRICT_JSON_PROPERTY_NAME);
+        } else {
+            System.setProperty(STRICT_JSON_PROPERTY_NAME, prevSetting);
+        }
+    }
 }
diff --git a/logstash-core/src/test/java/org/logstash/log/DefaultDeprecationLoggerTest.java b/logstash-core/src/test/java/org/logstash/log/DefaultDeprecationLoggerTest.java
new file mode 100644
index 000000000..5cd47cac7
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/log/DefaultDeprecationLoggerTest.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.log;
+
+import org.apache.logging.log4j.LogManager;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.After;
+
+import java.io.IOException;
+
+import static org.junit.Assert.assertTrue;
+
+public class DefaultDeprecationLoggerTest {
+
+    private static final String CONFIG = "log4j2-log-deprecation-test.properties";
+    private static SystemPropsSnapshotHelper snapshotHelper = new SystemPropsSnapshotHelper();
+
+    @BeforeClass
+    public static void beforeClass() {
+        snapshotHelper.takeSnapshot("log4j.configurationFile", "ls.log.format", "ls.logs",
+                LogstashConfigurationFactory.PIPELINE_SEPARATE_LOGS);
+        LogTestUtils.reloadLogConfiguration();
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        snapshotHelper.restoreSnapshot("log4j.configurationFile", "ls.log.format", "ls.logs",
+                LogstashConfigurationFactory.PIPELINE_SEPARATE_LOGS);
+    }
+
+    @Before
+    public void setUp() throws IOException {
+        System.setProperty("log4j.configurationFile", CONFIG);
+        System.setProperty("ls.log.format", "plain");
+        System.setProperty("ls.logs", "build/logs");
+
+        LogTestUtils.deleteLogFile("logstash-deprecation.log");
+    }
+
+    @After
+    public void tearDown() throws IOException {
+        LogManager.shutdown();
+        LogTestUtils.deleteLogFile("logstash-deprecation.log");
+        LogTestUtils.reloadLogConfiguration();
+    }
+
+    @Test
+    public void testDeprecationLoggerWriteOut_root() throws IOException {
+        final DefaultDeprecationLogger deprecationLogger = new DefaultDeprecationLogger(LogManager.getLogger("test"));
+
+        // Exercise
+        deprecationLogger.deprecated("Simple deprecation message");
+
+        String logs = LogTestUtils.loadLogFileContent("logstash-deprecation.log");
+        assertTrue("Deprecation logs MUST contains the out line", logs.matches(".*\\[deprecation\\.test.*\\].*Simple deprecation message"));
+    }
+
+    @Test
+    public void testDeprecationLoggerWriteOut_nested() throws IOException {
+        final DefaultDeprecationLogger deprecationLogger = new DefaultDeprecationLogger(LogManager.getLogger("org.logstash.my_nested_logger"));
+
+        // Exercise
+        deprecationLogger.deprecated("Simple deprecation message");
+
+        String logs = LogTestUtils.loadLogFileContent("logstash-deprecation.log");
+        assertTrue("Deprecation logs MUST contains the out line", logs.matches(".*\\[org\\.logstash\\.deprecation\\.my_nested_logger.*\\].*Simple deprecation message"));
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/log/LogTestUtils.java b/logstash-core/src/test/java/org/logstash/log/LogTestUtils.java
new file mode 100644
index 000000000..9f4476433
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/log/LogTestUtils.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.log;
+
+import org.apache.logging.log4j.core.LoggerContext;
+
+import java.io.IOException;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.junit.Assert.assertTrue;
+
+class LogTestUtils {
+
+    static String loadLogFileContent(String logfileName) throws IOException {
+        Path path = FileSystems.getDefault()
+                .getPath(System.getProperty("user.dir"), System.getProperty("ls.logs"), logfileName);
+
+        assertTrue("Log [" + path.toString() + "] file MUST exists", Files.exists(path));
+        try (Stream<String> lines = Files.lines(path)) {
+            return lines.collect(Collectors.joining());
+        }
+    }
+
+    static void reloadLogConfiguration() {
+        LoggerContext context = LoggerContext.getContext(false);
+        context.stop(1, TimeUnit.SECONDS); // this forces the Log4j config to be discarded
+    }
+
+    static void deleteLogFile(String logfileName) throws IOException {
+        Path path = FileSystems.getDefault()
+                .getPath(System.getProperty("user.dir"), System.getProperty("ls.logs"), logfileName);
+        Files.deleteIfExists(path);
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/log/LogstashConfigurationFactoryTest.java b/logstash-core/src/test/java/org/logstash/log/LogstashConfigurationFactoryTest.java
new file mode 100644
index 000000000..3399e314f
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/log/LogstashConfigurationFactoryTest.java
@@ -0,0 +1,132 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.log;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.ThreadContext;
+import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.appender.routing.RoutingAppender;
+import org.apache.logging.log4j.core.config.AppenderControl;
+import org.apache.logging.log4j.core.config.Configuration;
+
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.test.appender.ListAppender;
+import org.junit.*;
+
+import java.util.List;
+import java.util.Map;
+
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertNull;
+import static junit.framework.TestCase.assertEquals;
+
+public class LogstashConfigurationFactoryTest {
+
+    private static final String CONFIG = "log4j2-log-pipeline-test.properties";
+
+    private static Map<String, String> dumpedLog4jThreadContext;
+    private static SystemPropsSnapshotHelper snapshotHelper = new SystemPropsSnapshotHelper();
+
+    @BeforeClass
+    public static void beforeClass() {
+        snapshotHelper.takeSnapshot("log4j.configurationFile", "ls.log.format", "ls.logs",
+                LogstashConfigurationFactory.PIPELINE_SEPARATE_LOGS);
+        dumpedLog4jThreadContext = ThreadContext.getImmutableContext();
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        ThreadContext.putAll(dumpedLog4jThreadContext);
+        snapshotHelper.restoreSnapshot("log4j.configurationFile", "ls.log.format", "ls.logs",
+                LogstashConfigurationFactory.PIPELINE_SEPARATE_LOGS);
+        forceLog4JContextRefresh();
+    }
+
+    @Before
+    public void setUp() {
+        System.setProperty("log4j.configurationFile", CONFIG);
+        System.setProperty("ls.log.format", "plain");
+        System.setProperty("ls.logs", "build/logs");
+        System.setProperty(LogstashConfigurationFactory.PIPELINE_SEPARATE_LOGS, "true");
+
+        ThreadContext.clearAll();
+    }
+
+    @Test
+    public void testAppenderPerPipelineIsCreatedAfterLogLine() {
+        forceLog4JContextRefresh();
+
+        Logger logger = LogManager.getLogger(LogstashConfigurationFactoryTest.class);
+        ThreadContext.put("pipeline.id", "pipeline_1");
+        logger.info("log for pipeline 1");
+
+        ThreadContext.remove("pipeline_1");
+        ThreadContext.put("pipeline.id", "pipeline_2");
+        logger.info("log for pipeline 2");
+
+        verifyPipelineReceived("pipeline_1", "log for pipeline 1");
+        verifyPipelineReceived("pipeline_2", "log for pipeline 2");
+    }
+
+    private void verifyPipelineReceived(String pipelineSubAppenderName, String expectedMessage) {
+        LoggerContext context = LoggerContext.getContext(false);
+        final Configuration config = context.getConfiguration();
+        PipelineRoutingAppender routingApp = config.getAppender(LogstashConfigurationFactory.PIPELINE_ROUTING_APPENDER_NAME);
+        Map<String, AppenderControl> appenders = routingApp.getAppenders();
+        assertNotNull("Routing appenders MUST be defined", appenders);
+        AppenderControl appenderControl = appenders.get(pipelineSubAppenderName);
+        assertNotNull("sub-appender for pipeline " + pipelineSubAppenderName + " MUST be defined", appenderControl);
+        Appender appender = appenderControl.getAppender();
+        assertNotNull("Appender for pipeline " + pipelineSubAppenderName + " can't be NULL", appender);
+        ListAppender pipeline1Appender = (ListAppender) appender;
+        List<LogEvent> pipeline1LogEvents = pipeline1Appender.getEvents();
+        assertEquals(1, pipeline1LogEvents.size());
+        assertEquals(expectedMessage, pipeline1LogEvents.get(0).getMessage().getFormattedMessage());
+    }
+
+    @Test
+    public void testDisableAppenderPerPipelineIsCreatedAfterLogLine() {
+        System.setProperty(LogstashConfigurationFactory.PIPELINE_SEPARATE_LOGS, Boolean.FALSE.toString());
+        forceLog4JContextRefresh();
+
+        Logger logger = LogManager.getLogger(LogstashConfigurationFactoryTest.class);
+
+        ThreadContext.put("pipeline.id", "pipeline_1");
+        logger.info("log for pipeline 1");
+
+        ThreadContext.remove("pipeline_1");
+        ThreadContext.put("pipeline.id", "pipeline_2");
+        logger.info("log for pipeline 2");
+
+        LoggerContext context = LoggerContext.getContext(false);
+        final Configuration config = context.getConfiguration();
+        RoutingAppender routingApp = config.getAppender(LogstashConfigurationFactory.PIPELINE_ROUTING_APPENDER_NAME);
+        assertNull("No routing appender should be present", routingApp);
+    }
+
+    private static void forceLog4JContextRefresh() {
+        LoggerContext context = LoggerContext.getContext(false);
+        context.reconfigure();
+    }
+
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/log/LogstashLoggerContextFactoryTest.java b/logstash-core/src/test/java/org/logstash/log/LogstashLoggerContextFactoryTest.java
index a70feb30f..c51aff9c2 100644
--- a/logstash-core/src/test/java/org/logstash/log/LogstashLoggerContextFactoryTest.java
+++ b/logstash-core/src/test/java/org/logstash/log/LogstashLoggerContextFactoryTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.log;
 
 
diff --git a/logstash-core/src/test/java/org/logstash/log/PipelineRoutingAppenderTest.java b/logstash-core/src/test/java/org/logstash/log/PipelineRoutingAppenderTest.java
new file mode 100644
index 000000000..5b9309927
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/log/PipelineRoutingAppenderTest.java
@@ -0,0 +1,67 @@
+package org.logstash.log;
+
+import org.apache.logging.log4j.EventLogger;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.AppenderControl;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.junit.LoggerContextRule;
+import org.apache.logging.log4j.message.StructuredDataMessage;
+import org.apache.logging.log4j.test.appender.ListAppender;
+import org.junit.After;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class PipelineRoutingAppenderTest {
+
+    private static final String CONFIG = "log4j-pipeline-routing.xml";
+
+    private ListAppender app;
+
+    private final LoggerContextRule loggerContextRule = new LoggerContextRule(CONFIG);
+
+    // this is needed to initialize log context
+    @Rule
+    public RuleChain rules = loggerContextRule.withCleanFilesRule();
+
+    @After
+    public void tearDown() {
+        this.app.clear();
+        this.loggerContextRule.getLoggerContext().stop();
+    }
+
+    @Test
+    public void routingTest() {
+        final String pipelineId = "test_pipeline";
+        StructuredDataMessage msg = new StructuredDataMessage("Test", "This is a test", "Service");
+        org.apache.logging.log4j.ThreadContext.put("pipeline.id", pipelineId);
+        EventLogger.logEvent(msg);
+
+        this.app = findListAppender(pipelineId);
+        assertEquals("appender-" + pipelineId, app.getName());
+
+        final List<LogEvent> list = app.getEvents();
+        assertNotNull("No events generated", list);
+        assertEquals("Incorrect number of events. Expected 1, got " + list.size(), 1, list.size());
+    }
+
+    private ListAppender findListAppender(String pipelineId) {
+        LoggerContext context = LoggerContext.getContext(false);
+        final Configuration config = context.getConfiguration();
+        PipelineRoutingAppender routingApp = config.getAppender("pipeline_routing");
+        assertNotNull("Can't find pipeline routing appender", routingApp);
+        Map<String, AppenderControl> appenders = routingApp.getAppenders();
+        assertTrue("Subappender must exists with id " + pipelineId, appenders.containsKey(pipelineId));
+        final AppenderControl appenderControl = appenders.get(pipelineId);
+        return (ListAppender) appenderControl.getAppender();
+    }
+
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/log/PipelineRoutingFilterTest.java b/logstash-core/src/test/java/org/logstash/log/PipelineRoutingFilterTest.java
new file mode 100644
index 000000000..a5ed4cea1
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/log/PipelineRoutingFilterTest.java
@@ -0,0 +1,62 @@
+package org.logstash.log;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.MarkerManager;
+import org.apache.logging.log4j.core.Filter;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.config.Property;
+import org.apache.logging.log4j.core.impl.Log4jLogEvent;
+import org.apache.logging.log4j.message.SimpleMessage;
+import org.junit.After;
+import org.junit.Test;
+
+import java.util.Collections;
+
+import static org.junit.Assert.assertEquals;
+
+public class PipelineRoutingFilterTest {
+
+    @After
+    public void tearDown() {
+        System.clearProperty(LogstashConfigurationFactory.PIPELINE_SEPARATE_LOGS);
+    }
+
+    @Test
+    public void testShouldLetEventFlowIfSeparateLogFeatureIsDisabled() {
+        final PipelineRoutingFilter sut = PipelineRoutingFilter.createFilter();
+
+        LogEvent log = new Log4jLogEvent();
+        final Filter.Result res = sut.filter(log);
+
+        assertEquals("When ls.pipeline.separate_logs is false the filter MUST be neutral", Filter.Result.NEUTRAL, res);
+    }
+
+    @Test
+    public void testShouldLetEventFlowIfSeparateLogFeatureIsEnabledAndTheEventIsNotPipelineTagged() {
+        System.setProperty(LogstashConfigurationFactory.PIPELINE_SEPARATE_LOGS, "true");
+        final PipelineRoutingFilter sut = PipelineRoutingFilter.createFilter();
+
+        LogEvent log = new Log4jLogEvent();
+        final Filter.Result res = sut.filter(log);
+
+        assertEquals("When ls.pipeline.separate_logs is enabled and log event is not tagged the filter MUST be neutral",
+                Filter.Result.NEUTRAL, res);
+    }
+
+    @Test
+    public void testDenyEventFlowIfSeparateLogFeatureIsEnabledAndTheEventIsPipelineTagged() {
+        System.setProperty(LogstashConfigurationFactory.PIPELINE_SEPARATE_LOGS, "true");
+        final PipelineRoutingFilter sut = PipelineRoutingFilter.createFilter();
+
+        final Property prop = Property.createProperty("pipeline.id", "test_pipeline");
+
+        LogEvent log = new Log4jLogEvent("logstash.test.filer",
+                new MarkerManager.Log4jMarker("marker"), "a", Level.DEBUG,
+                new SimpleMessage("test message"), Collections.singletonList(prop), null);
+        final Filter.Result res = sut.filter(log);
+
+        assertEquals("When ls.pipeline.separate_logs is enabled and log event is tagged the filter MUST deny the flowing",
+                Filter.Result.DENY, res);
+    }
+
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/log/PluginDeprecationLoggerTest.java b/logstash-core/src/test/java/org/logstash/log/PluginDeprecationLoggerTest.java
new file mode 100644
index 000000000..2a5e3682e
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/log/PluginDeprecationLoggerTest.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.log;
+
+import org.junit.*;
+import org.logstash.Event;
+import org.logstash.plugins.ConfigurationImpl;
+import org.logstash.plugins.ContextImpl;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertTrue;
+
+public class PluginDeprecationLoggerTest {
+
+    private static final String CONFIG = "log4j2-log-deprecation-test.properties";
+    private static SystemPropsSnapshotHelper snapshotHelper = new SystemPropsSnapshotHelper();
+
+    @BeforeClass
+    public static void beforeClass() {
+        snapshotHelper.takeSnapshot("log4j.configurationFile", "ls.log.format", "ls.logs",
+                LogstashConfigurationFactory.PIPELINE_SEPARATE_LOGS);
+        LogTestUtils.reloadLogConfiguration();
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        snapshotHelper.restoreSnapshot("log4j.configurationFile", "ls.log.format", "ls.logs",
+                LogstashConfigurationFactory.PIPELINE_SEPARATE_LOGS);
+        LogTestUtils.reloadLogConfiguration();
+    }
+
+    @Before
+    public void setUp() throws IOException {
+        System.setProperty("log4j.configurationFile", CONFIG);
+        System.setProperty("ls.log.format", "plain");
+        System.setProperty("ls.logs", "build/logs");
+
+        LogTestUtils.deleteLogFile("logstash-deprecation.log");
+    }
+
+    @After
+    public void tearDown() throws IOException {
+        LogTestUtils.reloadLogConfiguration();
+        LogTestUtils.deleteLogFile("logstash-deprecation.log");
+    }
+
+    @Test
+    public void testJavaPluginUsesDeprecationLogger() throws IOException {
+        Map<String, Object> config = new HashMap<>();
+        TestingDeprecationPlugin sut = new TestingDeprecationPlugin(new ConfigurationImpl(config), new ContextImpl(null, null));
+
+        // Exercise
+        Event evt = new Event(Collections.singletonMap("message", "Spock move me back"));
+        sut.encode(evt, null);
+
+        // Verify
+        String logs = LogTestUtils.loadLogFileContent("logstash-deprecation.log");
+        assertTrue("Deprecation logs MUST contains the out line", logs.matches(".*Deprecated feature teleportation"));
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/log/RubyBasicObjectSerializerTest.java b/logstash-core/src/test/java/org/logstash/log/RubyBasicObjectSerializerTest.java
new file mode 100644
index 000000000..2bca31654
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/log/RubyBasicObjectSerializerTest.java
@@ -0,0 +1,195 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.log;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import org.jruby.Ruby;
+import org.jruby.RubyArray;
+import org.jruby.RubyHash;
+import org.jruby.RubySymbol;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertTrue;
+import static org.logstash.RubyUtil.*;
+
+public class RubyBasicObjectSerializerTest {
+    private final ObjectMapper mapper = new ObjectMapper().registerModule(new SimpleModule().addSerializer(new RubyBasicObjectSerializer()));
+
+    @Test
+    public void testSerializerPriority() throws JsonProcessingException {
+        final String expectedOutput = "value_from_custom_serializer";
+
+        mapper.registerModule(new SimpleModule().addSerializer(new StdSerializer<>(RubySymbol.class) {
+            private static final long serialVersionUID = 2531452116050620859L;
+
+            @Override
+            public void serialize(RubySymbol value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+                gen.writeRawValue(expectedOutput);
+            }
+        }));
+
+        final RubySymbol symbol = RubySymbol.newSymbol(RUBY, "value");
+        final String serializedValue = mapper.writeValueAsString(symbol);
+
+        assertEquals(expectedOutput, serializedValue);
+    }
+
+    @Test
+    public void testSerializationWithJavaListValue() throws JsonProcessingException {
+        final String listSerializedValue = mapper.writeValueAsString(List.of(RubySymbol.newSymbol(RUBY, "foo"), RubySymbol.newSymbol(RUBY, "bar")));
+
+        final List<String> values = mapper.readerForListOf(String.class).readValue(listSerializedValue);
+        assertEquals(2, values.size());
+        assertTrue(values.containsAll(List.of("foo", "bar")));
+    }
+
+    @Test
+    public void testSerializationWithRubyArrayValue() throws JsonProcessingException {
+        final RubyArray<RubySymbol> rubyArray = new RubyArray<>(RUBY, 2);
+        rubyArray.push(RubySymbol.newSymbol(RUBY, "one"));
+        rubyArray.push(RubySymbol.newSymbol(RUBY, "two"));
+
+        final String listSerializedValue = mapper.writeValueAsString(rubyArray);
+
+        final List<String> values = mapper.readerForListOf(String.class).readValue(listSerializedValue);
+        assertEquals(2, values.size());
+        assertTrue(values.containsAll(List.of("one", "two")));
+    }
+
+    @Test
+    public void testSerializationWithArrayValue() throws JsonProcessingException {
+        final RubySymbol[] array = new RubySymbol[]{RubySymbol.newSymbol(RUBY, "one"), RubySymbol.newSymbol(RUBY, "two")};
+
+        final String arraySerializedValue = mapper.writeValueAsString(array);
+
+        final List<String> values = mapper.readerForListOf(String.class).readValue(arraySerializedValue);
+        assertEquals(2, values.size());
+        assertTrue(values.containsAll(List.of("one", "two")));
+    }
+
+    @Test
+    public void testSerializationWithRubyMapValue() throws JsonProcessingException {
+        final RubyHash rubyHash = RubyHash.newHash(RUBY);
+        rubyHash.put("1", RubySymbol.newSymbol(RUBY, "one"));
+        rubyHash.put("2", RubySymbol.newSymbol(RUBY, "two"));
+
+        final String listSerializedValue = mapper.writeValueAsString(rubyHash);
+
+        final Map<String, String> values = mapper.readerForMapOf(String.class).readValue(listSerializedValue);
+
+        assertEquals(2, values.size());
+        assertEquals("one", values.get("1"));
+        assertEquals("two", values.get("2"));
+    }
+
+    @Test
+    public void testValueWithNoCustomInspectMethod() throws JsonProcessingException {
+        final IRubyObject rubyObject = createRubyObject(null, "'value_from_to_s'", null);
+
+        final String result = mapper.writeValueAsString(rubyObject);
+
+        assertEquals("\"value_from_to_s\"", result);
+    }
+
+    @Test
+    public void testLogstashOwnedValueWithNoCustomInspectMethod() throws JsonProcessingException {
+        final IRubyObject rubyObject = createRubyObject("Logstash", "'value_from_to_s'", null);
+
+        final String result = mapper.writeValueAsString(rubyObject);
+
+        assertEquals("\"value_from_to_s\"", result);
+    }
+
+    @Test
+    public void testLogstashOwnedValueWithCustomInspectMethod() throws JsonProcessingException {
+        final IRubyObject rubyObject = createRubyObject("Logstash", "'value_from_to_s'", "'value_from_inspect'");
+
+        final String result = mapper.writeValueAsString(rubyObject);
+
+        assertEquals("\"value_from_inspect\"", result);
+    }
+
+    @Test
+    public void testFailingInspectMethodFallback() throws JsonProcessingException {
+        final IRubyObject rubyObject = createRubyObject("Logstash", "'value_from_to_s'", "@called = true\n raise 'not ok'");
+
+        final String result = mapper.writeValueAsString(rubyObject);
+
+        boolean inspectCalled = rubyObject.getInstanceVariables().getInstanceVariable("@called").toJava(Boolean.class);
+
+        assertTrue(inspectCalled);
+        assertEquals("\"value_from_to_s\"", result);
+    }
+
+    @Test
+    public void testFailingToSMethodFallback() throws JsonProcessingException {
+        final IRubyObject rubyObject = createRubyObject("Logstash", "@called = true\n raise 'mayday!'", null);
+
+        final String result = mapper.writeValueAsString(rubyObject);
+
+        boolean toSCalled = rubyObject.getInstanceVariables().getInstanceVariable("@called").toJava(Boolean.class);
+
+        assertTrue(toSCalled);
+        assertTrue(result.startsWith("\"#<Logstash::Test:"));
+    }
+
+    private IRubyObject createRubyObject(final String moduleName, final String toSBody, final String inspectBody) {
+        final StringBuilder sb = new StringBuilder();
+        if (moduleName != null) {
+            sb.append(String.format("module %s\n", moduleName));
+        }
+
+        sb.append("class Test\n");
+        if (toSBody != null) {
+            sb.append(String.format("def to_s\n %s \nend\n", toSBody));
+        }
+
+        if (inspectBody != null) {
+            sb.append(String.format("def inspect\n %s \nend\n", inspectBody));
+        }
+
+        sb.append("end\n");
+
+        if (moduleName != null) {
+            sb.append("end\n");
+        }
+
+        if (moduleName != null) {
+            sb.append(String.format("%s::Test.new", moduleName));
+        } else {
+            sb.append("Test.new");
+        }
+
+        // A new instance is required so classes definitions doesn't clash between tests
+        return Ruby.newInstance().evalScriptlet(sb.toString());
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/log/SystemPropsSnapshotHelper.java b/logstash-core/src/test/java/org/logstash/log/SystemPropsSnapshotHelper.java
new file mode 100644
index 000000000..2e996d3b4
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/log/SystemPropsSnapshotHelper.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.log;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Utility class to save & restore a specified list of System properties
+ * */
+class SystemPropsSnapshotHelper {
+
+    private final Map<String, String> systemPropertiesDump = new HashMap<>();
+
+    public void takeSnapshot(String... propertyNames) {
+        for (String propertyName : propertyNames) {
+            dumpSystemProperty(propertyName);
+        }
+    }
+
+    public void restoreSnapshot(String... propertyNames) {
+        for (String propertyName : propertyNames) {
+            dumpSystemProperty(propertyName);
+        }
+    }
+
+    private void dumpSystemProperty(String propertyName) {
+        systemPropertiesDump.put(propertyName, System.getProperty(propertyName));
+    }
+
+    private void restoreSystemProperty(String propertyName) {
+        if (systemPropertiesDump.get(propertyName) == null) {
+            System.clearProperty(propertyName);
+        } else {
+            System.setProperty(propertyName, systemPropertiesDump.get(propertyName));
+        }
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/log/TestingDeprecationPlugin.java b/logstash-core/src/test/java/org/logstash/log/TestingDeprecationPlugin.java
new file mode 100644
index 000000000..cdaa85a9d
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/log/TestingDeprecationPlugin.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.log;
+
+import co.elastic.logstash.api.*;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.Map;
+import java.util.function.Consumer;
+
+@LogstashPlugin(name = "java_deprecation_plugin")
+public class TestingDeprecationPlugin implements Codec {
+
+    private final DeprecationLogger deprecationLogger;
+
+    /**
+     * Required constructor.
+     *
+     * @param configuration Logstash Configuration
+     * @param context       Logstash Context
+     */
+    @SuppressWarnings("this-escape")
+    public TestingDeprecationPlugin(final Configuration configuration, final Context context) {
+        deprecationLogger = context.getDeprecationLogger(this);
+    }
+
+    @Override
+    public Collection<PluginConfigSpec<?>> configSchema() {
+        return null;
+    }
+
+    @Override
+    public String getId() {
+        return null;
+    }
+
+    @Override
+    public void decode(ByteBuffer buffer, Consumer<Map<String, Object>> eventConsumer) {
+
+    }
+
+    @Override
+    public void flush(ByteBuffer buffer, Consumer<Map<String, Object>> eventConsumer) {
+
+    }
+
+    @Override
+    public void encode(Event event, OutputStream output) throws IOException {
+        deprecationLogger.deprecated("Deprecated feature {}", "teleportation");
+    }
+
+    @Override
+    public Codec cloneCodec() {
+        return null;
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/plugins/AliasRegistryTest.java b/logstash-core/src/test/java/org/logstash/plugins/AliasRegistryTest.java
new file mode 100644
index 000000000..2387bbb7c
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/plugins/AliasRegistryTest.java
@@ -0,0 +1,47 @@
+package org.logstash.plugins;
+
+import org.junit.Test;
+import org.logstash.plugins.PluginLookup.PluginType;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URI;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+public class AliasRegistryTest {
+
+    @Test
+    public void testLoadAliasesFromYAML() {
+        final AliasRegistry sut = AliasRegistry.getInstance();
+
+        assertEquals("aliased_input1 should be the alias for beats input",
+                "beats", sut.originalFromAlias(PluginType.INPUT, "aliased_input1"));
+        assertEquals("aliased_input2 should be the alias for tcp input",
+                "tcp", sut.originalFromAlias(PluginType.INPUT, "aliased_input2"));
+        assertEquals("aliased_filter should be the alias for json filter",
+                "json", sut.originalFromAlias(PluginType.FILTER, "aliased_filter"));
+    }
+
+    @Test
+    public void testProductionConfigAliasesGemsExists() throws IOException {
+        final Path currentPath = Paths.get("./src/main/resources/org/logstash/plugins/plugin_aliases.yml").toAbsolutePath();
+        final AliasRegistry.AliasYamlLoader aliasLoader = new AliasRegistry.AliasYamlLoader();
+        final Map<AliasRegistry.PluginCoordinate, String> aliasesDefinitions = aliasLoader.loadAliasesDefinitions(currentPath);
+
+        for (AliasRegistry.PluginCoordinate alias : aliasesDefinitions.keySet()) {
+            final String gemName = alias.fullName();
+            URL url = URI.create("https://rubygems.org/api/v1/gems/" + gemName +".json").toURL();
+            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+            connection.setRequestMethod("GET");
+            connection.setRequestProperty("Accept", "application/json");
+
+            final String errorMsg = "Aliased plugin " + gemName + "specified in " + currentPath + " MUST be published on RubyGems";
+            assertEquals(errorMsg, 200, connection.getResponseCode());
+        }
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/plugins/ConfigurationImplTest.java b/logstash-core/src/test/java/org/logstash/plugins/ConfigurationImplTest.java
index 2a171e2f2..3493467e1 100644
--- a/logstash-core/src/test/java/org/logstash/plugins/ConfigurationImplTest.java
+++ b/logstash-core/src/test/java/org/logstash/plugins/ConfigurationImplTest.java
@@ -1,12 +1,34 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins;
 
 import co.elastic.logstash.api.Configuration;
+import co.elastic.logstash.api.Password;
 import co.elastic.logstash.api.PluginConfigSpec;
 import co.elastic.logstash.api.Codec;
 import org.junit.Assert;
 import org.junit.Test;
 import org.logstash.plugins.codecs.Line;
 
+import java.net.URI;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -105,5 +127,107 @@ public class ConfigurationImplTest {
         Assert.assertTrue(codec instanceof Line);
     }
 
-}
+    @Test
+    public void testDowncastFromLongToDouble() {
+        long defaultValue = 1L;
+        PluginConfigSpec<Double> doubleConfig = PluginConfigSpec.floatSetting(numberKey, defaultValue, false, false);
+        Configuration config = new ConfigurationImpl(Collections.singletonMap(numberKey, defaultValue));
+        double x = config.get(doubleConfig);
+        Assert.assertEquals(defaultValue, x, 0.001);
+    }
 
+    @Test
+    public void testUriValue() {
+        String defaultUri = "https://user:password@www.site.com:99";
+        String uri = "https://user:password@www.site2.com:99";
+        PluginConfigSpec<URI> uriConfig = PluginConfigSpec.uriSetting("test", defaultUri);
+        Configuration config = new ConfigurationImpl(Collections.singletonMap("test", uri));
+        URI u = config.get(uriConfig);
+        Assert.assertEquals(uri, u.toString());
+    }
+
+    @Test
+    public void testUriDefaultValue() {
+        String defaultUri = "https://user:password@www.site.com:99";
+        PluginConfigSpec<URI> uriConfig = PluginConfigSpec.uriSetting("test", defaultUri);
+        Configuration config = new ConfigurationImpl(Collections.emptyMap());
+        URI u = config.get(uriConfig);
+        Assert.assertEquals(defaultUri, u.toString());
+    }
+
+    @Test
+    public void testBadUriThrows() {
+        String uri = "http://www.si%%te.com";
+        PluginConfigSpec<URI> uriConfig = PluginConfigSpec.uriSetting("test", uri);
+        Configuration config = new ConfigurationImpl(Collections.singletonMap("test", uri));
+        try {
+            config.get(uriConfig);
+            Assert.fail("Did not catch invalid URI");
+        } catch (IllegalStateException e1) {
+            Assert.assertTrue(e1.getMessage().contains("Invalid URI specified for"));
+        } catch (Exception e2) {
+            Assert.fail("Did not throw correct exception for invalid URI");
+        }
+    }
+
+    @Test
+    public void testBadDefaultUriThrows() {
+        String uri = "http://www.si%%te.com";
+        PluginConfigSpec<URI> uriConfig = PluginConfigSpec.uriSetting("test", uri);
+        Configuration config = new ConfigurationImpl(Collections.emptyMap());
+        try {
+            config.get(uriConfig);
+            Assert.fail("Did not catch invalid URI");
+        } catch (IllegalStateException e1) {
+            Assert.assertTrue(e1.getMessage().contains("Invalid default URI specified for"));
+        } catch (Exception e2) {
+            Assert.fail("Did not throw correct exception for invalid URI");
+        }
+    }
+
+    @Test
+    public void testPassword() {
+        String myPassword = "mysecret";
+        PluginConfigSpec<Password> passwordConfig = PluginConfigSpec.passwordSetting("passwordTest");
+        Configuration config = new ConfigurationImpl(Collections.singletonMap("passwordTest", myPassword));
+        Password p = config.get(passwordConfig);
+        Assert.assertEquals(Password.class, p.getClass());
+        Assert.assertEquals(myPassword, p.getPassword());
+        Assert.assertEquals("<password>", p.toString());
+    }
+
+    @Test
+    public void testPasswordDefaultValue() {
+        // default values for passwords are a bad idea, but they should still work
+        String myPassword = "mysecret";
+        PluginConfigSpec<Password> passwordConfig = PluginConfigSpec.passwordSetting("passwordTest", myPassword, false, false);
+        Configuration config = new ConfigurationImpl(Collections.emptyMap());
+        Password p = config.get(passwordConfig);
+        Assert.assertEquals(Password.class, p.getClass());
+        Assert.assertEquals(myPassword, p.getPassword());
+        Assert.assertEquals("<password>", p.toString());
+    }
+
+    @Test
+    public void testBooleanValues() {
+        PluginConfigSpec<Boolean> booleanConfig = PluginConfigSpec.booleanSetting(booleanKey, false, false, false);
+        Configuration config = new ConfigurationImpl(Collections.singletonMap(booleanKey, "tRuE"));
+        boolean value = config.get(booleanConfig);
+        Assert.assertTrue(value);
+
+        config = new ConfigurationImpl(Collections.singletonMap(booleanKey, "false"));
+        value = config.get(booleanConfig);
+        Assert.assertFalse(value);
+
+        booleanConfig = PluginConfigSpec.booleanSetting(booleanKey, false, false, false);
+        config = new ConfigurationImpl(Collections.emptyMap());
+        value = config.get(booleanConfig);
+        Assert.assertFalse(value);
+
+        booleanConfig = PluginConfigSpec.booleanSetting(booleanKey, true, false, false);
+        config = new ConfigurationImpl(Collections.emptyMap());
+        value = config.get(booleanConfig);
+        Assert.assertTrue(value);
+    }
+
+}
diff --git a/logstash-core/src/test/java/org/logstash/plugins/CounterMetricImplTest.java b/logstash-core/src/test/java/org/logstash/plugins/CounterMetricImplTest.java
new file mode 100644
index 000000000..02be8c102
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/plugins/CounterMetricImplTest.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.plugins;
+
+import co.elastic.logstash.api.CounterMetric;
+import co.elastic.logstash.api.NamespacedMetric;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class CounterMetricImplTest extends MetricTestCase {
+    @Test
+    public void testIncrement() {
+        final NamespacedMetric namespace = this.getInstance().namespace("ayo");
+        final CounterMetric metric = namespace.counter("abcdef");
+        metric.increment();
+        assertThat(metric.getValue()).isEqualTo(1);
+        assertThat(getMetricLongValue(getMetricStore(new String[]{"ayo"}), "abcdef")).isEqualTo(1);
+    }
+
+    @Test
+    public void testIncrementByAmount() {
+        final NamespacedMetric namespace = this.getInstance().namespace("ayo");
+        final CounterMetric metric = namespace.counter("abcdef");
+        metric.increment(5);
+        assertThat(metric.getValue()).isEqualTo(5);
+        assertThat(getMetricLongValue(getMetricStore(new String[]{"ayo"}), "abcdef")).isEqualTo(5);
+    }
+
+    @Test
+    public void testReset() {
+        final NamespacedMetric namespace = this.getInstance().namespace("ayo");
+        final CounterMetric metric = namespace.counter("abcdef");
+
+        metric.increment(1);
+        assertThat(metric.getValue()).isEqualTo(1);
+        assertThat(getMetricLongValue(getMetricStore(new String[]{"ayo"}), "abcdef")).isEqualTo(1);
+
+        metric.reset();
+        assertThat(metric.getValue()).isEqualTo(0);
+        assertThat(getMetricLongValue(getMetricStore(new String[]{"ayo"}), "abcdef")).isEqualTo(0);
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/plugins/MetricTestCase.java b/logstash-core/src/test/java/org/logstash/plugins/MetricTestCase.java
new file mode 100644
index 000000000..7b766251a
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/plugins/MetricTestCase.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.plugins;
+
+import co.elastic.logstash.api.Metric;
+import com.google.common.base.Joiner;
+import org.jruby.RubyFixnum;
+import org.jruby.RubyHash;
+import org.jruby.RubyString;
+import org.jruby.java.proxies.ConcreteJavaProxy;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.junit.Before;
+import org.logstash.RubyUtil;
+import org.logstash.config.ir.RubyEnvTestCase;
+import org.logstash.execution.ExecutionContextExt;
+import org.logstash.instrument.metrics.AbstractNamespacedMetricExt;
+import org.logstash.instrument.metrics.NamespacedMetricExt;
+
+import static org.logstash.RubyUtil.*;
+
+public abstract class MetricTestCase extends RubyEnvTestCase {
+    protected AbstractNamespacedMetricExt metric;
+    protected ExecutionContextExt executionContext;
+
+    @Before
+    public void setup() {
+        final IRubyObject metricWithCollector =
+            runRubyScript("require \"logstash/instrument/collector\"\n" +
+                              "metricWithCollector = LogStash::Instrument::Metric.new(LogStash::Instrument::Collector.new)");
+
+        metric = new NamespacedMetricExt(RUBY, NAMESPACED_METRIC_CLASS)
+            .initialize(RUBY.getCurrentContext(), metricWithCollector, RUBY.newEmptyArray());
+        executionContext = new ExecutionContextExt(RUBY, EXECUTION_CONTEXT_CLASS);
+    }
+
+    public static IRubyObject runRubyScript(String script) {
+        IRubyObject m = RUBY.evalScriptlet(script);
+        return m;
+    }
+
+    protected RubyHash getMetricStore(String[] path) {
+        RubyHash metricStore = (RubyHash) metric.collector(RUBY.getCurrentContext())
+            .callMethod(RUBY.getCurrentContext(), "snapshot_metric")
+            .callMethod(RUBY.getCurrentContext(), "metric_store")
+            .callMethod(RUBY.getCurrentContext(), "get_with_path", RUBY.newString(Joiner.on("/").join(path)));
+
+        RubyHash rh = metricStore;
+        for (String p : path) {
+            rh = (RubyHash) rh.op_aref(RUBY.getCurrentContext(), RUBY.newString(p).intern());
+        }
+        return rh;
+    }
+
+    protected String getMetricStringValue(RubyHash metricStore, String symbolName) {
+        ConcreteJavaProxy counter = (ConcreteJavaProxy) metricStore.op_aref(RUBY.getCurrentContext(), RUBY.newString(symbolName).intern());
+        RubyString value = (RubyString) counter.callMethod("value");
+        return value.asJavaString();
+    }
+
+    protected long getMetricLongValue(RubyHash metricStore, String symbolName) {
+        ConcreteJavaProxy counter = (ConcreteJavaProxy) metricStore.op_aref(RUBY.getCurrentContext(), RUBY.newString(symbolName).intern());
+        RubyFixnum count = (RubyFixnum) counter.callMethod("value");
+        return count.getLongValue();
+    }
+
+    protected Metric getInstance() {
+        return new RootMetricImpl(RubyUtil.RUBY.getCurrentContext(), this.metric);
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/plugins/NamespacedMetricImplTest.java b/logstash-core/src/test/java/org/logstash/plugins/NamespacedMetricImplTest.java
new file mode 100644
index 000000000..f705089f2
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/plugins/NamespacedMetricImplTest.java
@@ -0,0 +1,161 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.plugins;
+
+import co.elastic.logstash.api.Metric;
+import co.elastic.logstash.api.NamespacedMetric;
+import org.assertj.core.data.Percentage;
+import org.jruby.RubyHash;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.util.Arrays;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class NamespacedMetricImplTest extends MetricTestCase {
+    @Test
+    public void testGauge() {
+        doTestGauge("test");
+    }
+    @Test
+    public void testGaugeNested() {
+        doTestGauge("test", "deep");
+    }
+
+    @Test
+    public void testGaugeUnicode() {
+        doTestGauge("test", "Ümlãut-åccênt", "okay");
+    }
+
+    public void doTestGauge(final String... metricNamespace) {
+        final NamespacedMetric metrics = this.getInstance().namespace(metricNamespace);
+
+        metrics.gauge("abc", "def");
+        {
+            final RubyHash metricStore = getMetricStore(Arrays.copyOf(metricNamespace, metricNamespace.length));
+            assertThat(this.getMetricStringValue(metricStore, "abc")).isEqualTo("def");
+        }
+
+        metrics.gauge("abc", "123");
+        {
+            final RubyHash metricStore = getMetricStore(Arrays.copyOf(metricNamespace, metricNamespace.length));
+            assertThat(this.getMetricStringValue(metricStore, "abc")).isEqualTo("123");
+        }
+    }
+
+    @Test
+    public void testIncrement() {
+        final NamespacedMetric metrics = this.getInstance().namespace("test");
+
+        metrics.increment("abc");
+        {
+            final RubyHash metricStore = getMetricStore(new String[]{"test"});
+            assertThat(this.getMetricLongValue(metricStore, "abc")).isEqualTo(1);
+        }
+
+        metrics.increment("abc");
+        {
+            final RubyHash metricStore = getMetricStore(new String[]{"test"});
+            assertThat(this.getMetricLongValue(metricStore, "abc")).isEqualTo(2);
+        }
+    }
+
+    @Test
+    public void testIncrementWithAmount() {
+        final NamespacedMetric metrics = this.getInstance().namespace("test");
+
+        metrics.increment("abc", 2);
+        {
+            final RubyHash metricStore = getMetricStore(new String[]{"test"});
+            assertThat(this.getMetricLongValue(metricStore, "abc")).isEqualTo(2);
+        }
+
+        metrics.increment("abc", 3);
+        {
+            final RubyHash metricStore = getMetricStore(new String[]{"test"});
+            assertThat(this.getMetricLongValue(metricStore, "abc")).isEqualTo(5);
+        }
+    }
+
+    @Ignore("Test failing intermittently for some time. See https://github.com/elastic/logstash/issues/11925")
+    @Test
+    public void testTimeCallable() {
+        final NamespacedMetric metrics = this.getInstance().namespace("test");
+        metrics.time("abc", () -> {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+            return null;
+        });
+        final RubyHash metricStore = getMetricStore(new String[]{"test"});
+        assertThat(this.getMetricLongValue(metricStore, "abc")).isCloseTo(100, Percentage.withPercentage(5));
+    }
+
+    @Test
+    public void testReportTime() {
+        final NamespacedMetric metrics = this.getInstance().namespace("test");
+
+        metrics.reportTime("abc", 123);
+        {
+            final RubyHash metricStore = getMetricStore(new String[]{"test"});
+            assertThat(this.getMetricLongValue(metricStore, "abc")).isEqualTo(123);
+        }
+
+        metrics.reportTime("abc", 877);
+        {
+            final RubyHash metricStore = getMetricStore(new String[]{"test"});
+            assertThat(this.getMetricLongValue(metricStore, "abc")).isEqualTo(1000);
+        }
+    }
+
+    @Test
+    public void testNamespace() {
+        final NamespacedMetric metrics = this.getInstance().namespace("test");
+
+        final NamespacedMetric namespaced = metrics.namespace("abcdef");
+        assertThat(namespaced.namespaceName()).containsExactly("test", "abcdef");
+
+        final NamespacedMetric namespaced2 = namespaced.namespace("12345", "qwerty");
+        assertThat(namespaced2.namespaceName()).containsExactly("test", "abcdef", "12345", "qwerty");
+    }
+
+    @Test
+    public void testNamespaceUnicodeFragment() {
+        final NamespacedMetric metrics = this.getInstance().namespace("test", "Ünîcødé", "nÉs†iñG");
+
+        final NamespacedMetric namespaced = metrics.namespace("abcdef");
+        assertThat(namespaced.namespaceName()).containsExactly("test", "Ünîcødé", "nÉs†iñG", "abcdef");
+
+        final NamespacedMetric namespaced2 = namespaced.namespace("12345", "qwerty");
+        assertThat(namespaced2.namespaceName()).containsExactly("test", "Ünîcødé", "nÉs†iñG", "abcdef", "12345", "qwerty");
+    }
+
+    @Test
+    public void testRoot() {
+        final NamespacedMetric metrics = this.getInstance().namespace("test");
+        final Metric root = metrics.root();
+        final NamespacedMetric namespaced = root.namespace("someothernamespace");
+        assertThat(namespaced.namespaceName()).containsExactly("someothernamespace");
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/plugins/PluginUtilValidateConfigTest.java b/logstash-core/src/test/java/org/logstash/plugins/PluginUtilValidateConfigTest.java
index 01d27b8d1..c47de0e53 100644
--- a/logstash-core/src/test/java/org/logstash/plugins/PluginUtilValidateConfigTest.java
+++ b/logstash-core/src/test/java/org/logstash/plugins/PluginUtilValidateConfigTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins;
 
 import co.elastic.logstash.api.Configuration;
@@ -216,6 +236,3 @@ public class PluginUtilValidateConfigTest {
         }
     }
 }
-
-
-
diff --git a/logstash-core/src/test/java/org/logstash/plugins/PluginValidatorTest.java b/logstash-core/src/test/java/org/logstash/plugins/PluginValidatorTest.java
new file mode 100644
index 000000000..551e09047
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/plugins/PluginValidatorTest.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.plugins;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.logstash.plugins.codecs.Line;
+import org.logstash.plugins.filters.Uuid;
+import org.logstash.plugins.inputs.Generator;
+import org.logstash.plugins.inputs.Stdin;
+import org.logstash.plugins.outputs.Stdout;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Enumeration;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+
+public class PluginValidatorTest {
+
+    @Test
+    public void testValidInputPlugin() {
+        Assert.assertTrue(PluginValidator.validatePlugin(PluginLookup.PluginType.INPUT, Stdin.class));
+        Assert.assertTrue(PluginValidator.validatePlugin(PluginLookup.PluginType.INPUT, Generator.class));
+    }
+
+    @Test
+    public void testValidFilterPlugin() {
+        Assert.assertTrue(PluginValidator.validatePlugin(PluginLookup.PluginType.FILTER, Uuid.class));
+    }
+
+    @Test
+    public void testValidCodecPlugin() {
+        Assert.assertTrue(PluginValidator.validatePlugin(PluginLookup.PluginType.CODEC, Line.class));
+    }
+
+    @Test
+    public void testValidOutputPlugin() {
+        Assert.assertTrue(PluginValidator.validatePlugin(PluginLookup.PluginType.OUTPUT, Stdout.class));
+    }
+
+    @Ignore("Test failing on windows for many weeks. See https://github.com/elastic/logstash/issues/10926")
+    @Test
+    public void testInvalidInputPlugin() throws IOException {
+        Path tempJar = null;
+        try {
+            tempJar = Files.createTempFile("pluginValidationTest", "inputPlugin.jar");
+            final InputStream resourceJar =
+                    getClass().getResourceAsStream("logstash-input-java_input_example-1.0.3.jar");
+            Files.copy(resourceJar, tempJar, REPLACE_EXISTING);
+
+            URL[] jarUrl = {tempJar.toUri().toURL()};
+            URLClassLoader cl = URLClassLoader.newInstance(jarUrl);
+            Class<?> oldInputClass = cl.loadClass("org.logstash.javaapi.JavaInputExample");
+
+            Assert.assertNotNull(oldInputClass);
+            Assert.assertFalse(PluginValidator.validatePlugin(PluginLookup.PluginType.INPUT, oldInputClass));
+        } catch (Exception ex) {
+            Assert.fail("Failed with exception: " + ex);
+        } finally {
+            if (tempJar != null) {
+                Files.deleteIfExists(tempJar);
+            }
+        }
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/plugins/TestContext.java b/logstash-core/src/test/java/org/logstash/plugins/TestContext.java
index 82c1796de..4cfbeeb29 100644
--- a/logstash-core/src/test/java/org/logstash/plugins/TestContext.java
+++ b/logstash-core/src/test/java/org/logstash/plugins/TestContext.java
@@ -1,10 +1,27 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins;
 
-import co.elastic.logstash.api.Context;
-import co.elastic.logstash.api.EventFactory;
-import co.elastic.logstash.api.Plugin;
+import co.elastic.logstash.api.*;
 import org.apache.logging.log4j.Logger;
-import org.logstash.common.io.DeadLetterQueueWriter;
 
 public class TestContext implements Context {
 
@@ -13,11 +30,21 @@ public class TestContext implements Context {
         return null;
     }
 
+    @Override
+    public NamespacedMetric getMetric(final Plugin plugin) {
+        return null;
+    }
+
     @Override
     public Logger getLogger(Plugin plugin) {
         return null;
     }
 
+    @Override
+    public DeprecationLogger getDeprecationLogger(Plugin plugin) {
+        return null;
+    }
+
     @Override
     public EventFactory getEventFactory() { return null; }
 
diff --git a/logstash-core/src/test/java/org/logstash/plugins/TestPluginFactory.java b/logstash-core/src/test/java/org/logstash/plugins/TestPluginFactory.java
index 2eb8ed9b9..d30db1a48 100644
--- a/logstash-core/src/test/java/org/logstash/plugins/TestPluginFactory.java
+++ b/logstash-core/src/test/java/org/logstash/plugins/TestPluginFactory.java
@@ -1,41 +1,69 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins;
 
 import co.elastic.logstash.api.Codec;
-import org.jruby.RubyInteger;
+import org.jruby.RubyObject;
 import org.jruby.RubyString;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.logstash.common.SourceWithMetadata;
 import org.logstash.config.ir.compiler.AbstractFilterDelegatorExt;
 import org.logstash.config.ir.compiler.AbstractOutputDelegatorExt;
 import org.logstash.config.ir.compiler.RubyIntegration;
 import org.logstash.plugins.codecs.Line;
 
 import java.util.Collections;
-import java.util.Map;
 
 public class TestPluginFactory implements RubyIntegration.PluginFactory {
 
     @Override
-    public IRubyObject buildInput(RubyString name, RubyInteger line, RubyInteger column, IRubyObject args, Map<String, Object> pluginArgs) {
+    public IRubyObject buildInput(RubyString name, IRubyObject args,
+                                  SourceWithMetadata source) {
         return null;
     }
 
     @Override
-    public AbstractOutputDelegatorExt buildOutput(RubyString name, RubyInteger line, RubyInteger column, IRubyObject args, Map<String, Object> pluginArgs) {
+    public AbstractOutputDelegatorExt buildOutput(RubyString name, IRubyObject args,
+                                                  SourceWithMetadata source) {
         return null;
     }
 
     @Override
-    public AbstractFilterDelegatorExt buildFilter(RubyString name, RubyInteger line, RubyInteger column, IRubyObject args, Map<String, Object> pluginArgs) {
+    public AbstractFilterDelegatorExt buildFilter(RubyString name, IRubyObject args,
+                                                  SourceWithMetadata source) {
         return null;
     }
 
     @Override
-    public IRubyObject buildCodec(RubyString name, IRubyObject args, Map<String, Object> pluginArgs) {
+    public IRubyObject buildCodec(RubyString name, IRubyObject args, SourceWithMetadata source) {
         return null;
     }
 
     @Override
     public Codec buildDefaultCodec(String codecName) {
-        return new Line(new ConfigurationImpl(Collections.emptyMap()), new ContextImpl(null));
+        return new Line(new ConfigurationImpl(Collections.emptyMap()), new ContextImpl(null, null));
+    }
+
+    @Override
+    public Codec buildRubyCodecWrapper(RubyObject rubyCodec) {
+        return null;
     }
 }
diff --git a/logstash-core/src/test/java/org/logstash/plugins/TestingPlugin.java b/logstash-core/src/test/java/org/logstash/plugins/TestingPlugin.java
index b43be8ead..5cddf1db7 100644
--- a/logstash-core/src/test/java/org/logstash/plugins/TestingPlugin.java
+++ b/logstash-core/src/test/java/org/logstash/plugins/TestingPlugin.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins;
 
 import co.elastic.logstash.api.LogstashPlugin;
diff --git a/logstash-core/src/test/java/org/logstash/plugins/codecs/LineTest.java b/logstash-core/src/test/java/org/logstash/plugins/codecs/LineTest.java
index f8e303910..43ea6a639 100644
--- a/logstash-core/src/test/java/org/logstash/plugins/codecs/LineTest.java
+++ b/logstash-core/src/test/java/org/logstash/plugins/codecs/LineTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins.codecs;
 
 import co.elastic.logstash.api.Codec;
@@ -7,13 +27,15 @@ import org.logstash.Event;
 import org.logstash.plugins.ConfigurationImpl;
 import org.logstash.plugins.TestContext;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
+import java.nio.charset.Charset;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Consumer;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -22,7 +44,7 @@ public class LineTest {
 
     @Test
     public void testSimpleDecode() {
-        String input = "abc";
+        String input = new String("abc".getBytes(), Charset.forName("UTF-8"));
         testDecode(null, null, input, 0, 1, new String[]{input});
     }
 
@@ -45,7 +67,7 @@ public class LineTest {
 
     @Test
     public void testDecodeWithTrailingDelimiter() {
-        String delimiter = "\n";
+        String delimiter = System.lineSeparator();
         String[] inputs = {"foo", "bar", "baz"};
         String input = String.join(delimiter, inputs) + delimiter;
 
@@ -55,7 +77,7 @@ public class LineTest {
     @Test
     public void testSuccessiveDecodesWithTrailingDelimiter() {
         // setup inputs
-        String delimiter = "\n";
+        String delimiter = System.lineSeparator();
         String[] inputs = {"foo", "bar", "baz"};
         String input = String.join(delimiter, inputs) + delimiter;
         byte[] inputBytes = input.getBytes();
@@ -114,17 +136,18 @@ public class LineTest {
 
     @Test
     public void testDecodeWithUtf8() {
-        String input = "München 安装中文输入法";
+        String input = new String("München 安装中文输入法".getBytes(), Charset.forName("UTF-8"));
         testDecode(null, null, input + Line.DEFAULT_DELIMITER, 1, 0, new String[]{input});
     }
 
     @Test
-    public void testDecodeAcrossMultibyteCharBoundary() {
+    public void testDecodeAcrossMultibyteCharBoundary() throws Exception {
         final int BUFFER_SIZE = 12;
         int lastPos = 0;
         TestEventConsumer eventConsumer = new TestEventConsumer();
-        String input = "安安安\n安安安\n安安安";
-        byte[] bytes = input.getBytes();
+        String delimiter = System.lineSeparator();
+        String input = new String(("安安安" + delimiter + "安安安" + delimiter + "安安安").getBytes(), Charset.forName("UTF-8"));
+        byte[] bytes = input.getBytes("UTF-8");
         assertTrue(bytes.length > input.length());
         ByteBuffer b1 = ByteBuffer.allocate(BUFFER_SIZE);
         b1.put(bytes, lastPos, 12);
@@ -161,7 +184,12 @@ public class LineTest {
     private void testDecode(String delimiter, String charset, String inputString, Integer expectedPreflushEvents, Integer expectedFlushEvents, String[] expectedMessages) {
         Line line = getLineCodec(delimiter, charset);
 
-        byte[] inputBytes = inputString.getBytes();
+        byte[] inputBytes = null;
+        try {
+            inputBytes = inputString.getBytes("UTF-8");
+        } catch (UnsupportedEncodingException ex) {
+            Assert.fail();
+        }
         TestEventConsumer eventConsumer = new TestEventConsumer();
         ByteBuffer inputBuffer = ByteBuffer.wrap(inputBytes, 0, inputBytes.length);
         line.decode(inputBuffer, eventConsumer);
@@ -181,7 +209,7 @@ public class LineTest {
         compareMessages(expectedMessages, eventConsumer.events, flushConsumer.events);
     }
 
-    private static void compareMessages(String[] expectedMessages, List<Map<String, Object>> events, List<Map<String, Object>> flushedEvents) {
+    static void compareMessages(String[] expectedMessages, List<Map<String, Object>> events, List<Map<String, Object>> flushedEvents) {
         if (expectedMessages != null) {
             for (int k = 0; k < events.size(); k++) {
                 assertEquals(expectedMessages[k], events.get(k).get(Line.MESSAGE_FIELD));
@@ -204,7 +232,7 @@ public class LineTest {
     }
 
     @Test
-    public void testDecodeWithCharset() throws Exception {
+    public void testDecodeWithCharset() {
         TestEventConsumer flushConsumer = new TestEventConsumer();
 
         // decode with cp-1252
@@ -231,121 +259,45 @@ public class LineTest {
     }
 
     @Test
-    public void testEncode() throws Codec.EncodeException {
-        String delimiter = "z";
-        String message = "Hello world";
-        String expectedResult = message + delimiter;
-        Map<String, Object> config = new HashMap<>();
-        config.put("delimiter", delimiter);
-        config.put("format", "%{message}");
-        Line line = new Line(new ConfigurationImpl(config), new TestContext());
-        Event e = new Event(Collections.singletonMap("message", message));
-        byte[] b = new byte[100];
-        ByteBuffer buffer = ByteBuffer.wrap(b);
-        boolean result = line.encode(e, buffer);
-        Assert.assertTrue(result);
-        String resultString = new String(buffer.array(), buffer.position(), buffer.limit());
-        Assert.assertEquals(expectedResult, resultString);
+    public void testEncode() throws IOException {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        Line line = new Line(new ConfigurationImpl(Collections.emptyMap()), null);
+        Event e = new Event();
+        e.setField("myfield1", "myvalue1");
+        e.setField("myfield2", 42L);
+        line.encode(e, outputStream);
+        e.setField("myfield1", "myvalue2");
+        e.setField("myfield2", 43L);
+        line.encode(e, outputStream);
+
+        String delimiter = Line.DEFAULT_DELIMITER;
+        String resultingString = outputStream.toString();
+        // first delimiter should occur at the halfway point of the string
+        assertEquals(resultingString.indexOf(delimiter), (resultingString.length() / 2) - delimiter.length());
+        // second delimiter should occur at end of string
+        assertEquals(resultingString.lastIndexOf(delimiter), resultingString.length() - delimiter.length());
     }
 
     @Test
-    public void testMultipleEncodesForEvent() throws Codec.EncodeException {
+    public void testEncodeWithUtf8() throws IOException {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         String delimiter = "z";
-        String message = "Hello world";
-        String expectedResult = message + delimiter;
-        Map<String, Object> config = new HashMap<>();
-        config.put("delimiter", delimiter);
-        config.put("format", "%{message}");
-        Line line = new Line(new ConfigurationImpl(config), new TestContext());
-        Event e = new Event(Collections.singletonMap("message", message));
-        byte[] b = new byte[10];
-        ByteBuffer buffer = ByteBuffer.wrap(b);
-
-        boolean result = line.encode(e, buffer);
-        Assert.assertFalse(result);
-        String resultString = new String(buffer.array(), buffer.position(), buffer.limit());
-
-        buffer.clear();
-        result = line.encode(e, buffer);
-        Assert.assertTrue(result);
-        resultString += new String(buffer.array(), buffer.position(), buffer.limit());
-
-        Assert.assertEquals(expectedResult, resultString);
-    }
-
-    @Test
-    public void testEncodeNewEventBeforeFinishingPreviousThrows() {
-        String delimiter = "z";
-        String message = "Hello world";
+        String message = new String("München 安装中文输入法".getBytes(), Charset.forName("UTF-8"));
         Map<String, Object> config = new HashMap<>();
         config.put("delimiter", delimiter);
         config.put("format", "%{message}");
         Line line = new Line(new ConfigurationImpl(config), new TestContext());
         Event e1 = new Event(Collections.singletonMap("message", message));
-        Event e2 = new Event(Collections.singletonMap("message", message));
-        byte[] b = new byte[10];
-        ByteBuffer buffer = ByteBuffer.wrap(b);
-        try {
-            line.encode(e1, buffer);
-            line.encode(e2, buffer);
-            Assert.fail("EncodeException should be thrown because previous event was not fully encoded");
-        } catch (Codec.EncodeException ex) {
-            // this exception should be thrown
-        }
-    }
-
-    @Test
-    public void testEncodeWithUtf8() throws Codec.EncodeException {
-        String delimiter = "z";
-        String message = "München 安装中文输入法";
-        Map<String, Object> config = new HashMap<>();
-        config.put("delimiter", delimiter);
-        config.put("format", "%{message}");
-        Line line = new Line(new ConfigurationImpl(config), new TestContext());
-        Event e1 = new Event(Collections.singletonMap("message", message));
-        byte[] b = new byte[100];
-        ByteBuffer buffer = ByteBuffer.wrap(b);
-        boolean result = line.encode(e1, buffer);
-        Assert.assertTrue(result);
+        line.encode(e1, outputStream);
         String expectedResult = message + delimiter;
-        Assert.assertEquals(expectedResult, new String(buffer.array(), buffer.position(), buffer.limit()));
+        Assert.assertEquals(expectedResult, new String(outputStream.toByteArray(), Charset.forName("UTF-8")));
     }
 
     @Test
-    public void testEncodeAcrossMultibyteCharBoundary() throws Codec.EncodeException {
-        String message = "安安安安安安安安安";
-        String delimiter = "";
-        Map<String, Object> config = new HashMap<>();
-        config.put("delimiter", delimiter);
-        config.put("format", "%{message}");
-        Line line = new Line(new ConfigurationImpl(config), new TestContext());
-        Event e1 = new Event(Collections.singletonMap("message", message));
-        byte[] b = new byte[10];
-        ByteBuffer buffer = ByteBuffer.wrap(b);
-
-        boolean result = line.encode(e1, buffer);
-        String intermediateResult = new String(buffer.array(), buffer.position(), buffer.limit());
-        Assert.assertFalse(result);
-        Assert.assertEquals("安安安", intermediateResult);
-
-        buffer.clear();
-        result = line.encode(e1, buffer);
-        intermediateResult = new String(buffer.array(), buffer.position(), buffer.limit());
-        Assert.assertFalse(result);
-        Assert.assertEquals("安安安", intermediateResult);
-
-        buffer.clear();
-        result = line.encode(e1, buffer);
-        intermediateResult = new String(buffer.array(), buffer.position(), buffer.limit());
-        Assert.assertTrue(result);
-        Assert.assertEquals("安安安", intermediateResult);
-    }
-
-
-    @Test
-    public void testEncodeWithCharset() throws Exception {
+    public void testEncodeWithCharset() throws IOException {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         byte[] rightSingleQuoteInUtf8 = {(byte) 0xE2, (byte) 0x80, (byte) 0x99};
-        String rightSingleQuote = new String(rightSingleQuoteInUtf8);
+        String rightSingleQuote = new String(rightSingleQuoteInUtf8, Charset.forName("UTF-8"));
 
         // encode with cp-1252
         Map<String, Object> config = new HashMap<>();
@@ -353,24 +305,38 @@ public class LineTest {
         config.put("format", "%{message}");
         config.put("delimiter", "");
         Event e1 = new Event(Collections.singletonMap("message", rightSingleQuote));
-        Line cp1252decoder = new Line(new ConfigurationImpl(config), new TestContext());
+        Line cp1252encoder = new Line(new ConfigurationImpl(config), new TestContext());
         byte[] rightSingleQuoteInCp1252 = {(byte) 0x92};
-        byte[] b = new byte[100];
-        ByteBuffer buffer = ByteBuffer.wrap(b);
 
-        boolean result = cp1252decoder.encode(e1, buffer);
-        Assert.assertTrue(result);
-        byte[] resultBytes = new byte[buffer.limit() - buffer.position()];
-        System.arraycopy(buffer.array(), buffer.position(), resultBytes, 0, buffer.limit() - buffer.position());
+        cp1252encoder.encode(e1, outputStream);
+        byte[] resultBytes = outputStream.toByteArray();
         Assert.assertArrayEquals(rightSingleQuoteInCp1252, resultBytes);
     }
 
     @Test
-    public void testClone() throws Codec.EncodeException {
+    public void testEncodeWithFormat() throws IOException {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        Line line = new Line(new ConfigurationImpl(Collections.singletonMap("format", "%{host}-%{message}")), null);
+        String message = "Hello world";
+        String host = "test";
+        String expectedOutput = host + "-" + message + Line.DEFAULT_DELIMITER;
+        Event e = new Event();
+        e.setField("message", message);
+        e.setField("host", host);
+
+        line.encode(e, outputStream);
+
+        String resultingString = outputStream.toString();
+        assertEquals(expectedOutput, resultingString);
+    }
+
+    @Test
+    public void testClone() throws IOException  {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         String delimiter = "x";
         String charset = "cp1252";
         byte[] rightSingleQuoteInUtf8 = {(byte) 0xE2, (byte) 0x80, (byte) 0x99};
-        String rightSingleQuote = new String(rightSingleQuoteInUtf8);
+        String rightSingleQuote = new String(rightSingleQuoteInUtf8, Charset.forName("UTF-8"));
 
         // encode with cp-1252
         Map<String, Object> config = new HashMap<>();
@@ -387,25 +353,8 @@ public class LineTest {
 
         // verify charset and delimiter
         byte[] rightSingleQuoteAndXInCp1252 = {(byte) 0x92, (byte) 0x78};
-        byte[] b = new byte[100];
-        ByteBuffer buffer = ByteBuffer.wrap(b);
-
-        boolean result = line2.encode(e1, buffer);
-        Assert.assertTrue(result);
-        byte[] resultBytes = new byte[buffer.limit() - buffer.position()];
-        System.arraycopy(buffer.array(), buffer.position(), resultBytes, 0, buffer.limit() - buffer.position());
-        Assert.assertArrayEquals(rightSingleQuoteAndXInCp1252, resultBytes);
+        line2.encode(e1, outputStream);
+        Assert.assertArrayEquals(rightSingleQuoteAndXInCp1252, outputStream.toByteArray());
     }
 
 }
-
-class TestEventConsumer implements Consumer<Map<String, Object>> {
-
-    List<Map<String, Object>> events = new ArrayList<>();
-
-    @Override
-    public void accept(Map<String, Object> stringObjectMap) {
-        events.add(new HashMap<>(stringObjectMap));
-    }
-}
-
diff --git a/logstash-core/src/test/java/org/logstash/plugins/codecs/PlainTest.java b/logstash-core/src/test/java/org/logstash/plugins/codecs/PlainTest.java
new file mode 100644
index 000000000..1c5fe8f68
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/plugins/codecs/PlainTest.java
@@ -0,0 +1,198 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.plugins.codecs;
+
+import co.elastic.logstash.api.Codec;
+import org.junit.Assert;
+import org.junit.Test;
+import org.logstash.Event;
+import org.logstash.plugins.ConfigurationImpl;
+import org.logstash.plugins.TestContext;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.logstash.plugins.codecs.LineTest.compareMessages;
+
+public class PlainTest {
+
+    @Test
+    public void testSimpleDecode() {
+        String input = new String("abc".getBytes(), Charset.forName("UTF-8"));
+        testDecode( null, input, 1, new String[]{input});
+    }
+
+    @Test
+    public void testEmptyDecode() {
+        String input = new String("".getBytes(), Charset.forName("UTF-8"));
+        testDecode( null, input, 0, new String[]{});
+    }
+
+    @Test
+    public void testDecodeWithUtf8() {
+        String input = new String("München 安装中文输入法".getBytes(), Charset.forName("UTF-8"));
+        testDecode(null, input, 1, new String[]{input});
+    }
+
+    @Test
+    public void testDecodeWithCharset() {
+        TestEventConsumer eventConsumer = new TestEventConsumer();
+
+        // decode with cp-1252
+        Plain cp1252decoder = new Plain(new ConfigurationImpl(Collections.singletonMap("charset", "cp1252")), new TestContext());
+        byte[] rightSingleQuoteInCp1252 = {(byte) 0x92};
+        ByteBuffer b1 = ByteBuffer.wrap(rightSingleQuoteInCp1252);
+        cp1252decoder.decode(b1, eventConsumer);
+        assertEquals(1, eventConsumer.events.size());
+        cp1252decoder.flush(b1, eventConsumer);
+        assertEquals(1, eventConsumer.events.size());
+        String fromCp1252 = (String) eventConsumer.events.get(0).get(Plain.MESSAGE_FIELD);
+
+        // decode with UTF-8
+        eventConsumer.events.clear();
+        Plain utf8decoder = new Plain(new ConfigurationImpl(Collections.emptyMap()), new TestContext());
+        byte[] rightSingleQuoteInUtf8 = {(byte) 0xE2, (byte) 0x80, (byte) 0x99};
+        ByteBuffer b2 = ByteBuffer.wrap(rightSingleQuoteInUtf8);
+        utf8decoder.decode(b2, eventConsumer);
+        assertEquals(1, eventConsumer.events.size());
+        utf8decoder.flush(b2, eventConsumer);
+        assertEquals(1, eventConsumer.events.size());
+        String fromUtf8 = (String) eventConsumer.events.get(0).get(Plain.MESSAGE_FIELD);
+        assertEquals(fromCp1252, fromUtf8);
+    }
+
+    private void testDecode(String charset, String inputString, Integer expectedPreflushEvents, String[] expectedMessages) {
+        Plain plain = getPlainCodec(charset);
+
+        byte[] inputBytes = null;
+        try {
+            inputBytes = inputString.getBytes("UTF-8");
+        } catch (UnsupportedEncodingException ex) {
+            Assert.fail();
+        }
+        TestEventConsumer eventConsumer = new TestEventConsumer();
+        ByteBuffer inputBuffer = ByteBuffer.wrap(inputBytes, 0, inputBytes.length);
+        plain.decode(inputBuffer, eventConsumer);
+        if (expectedPreflushEvents != null) {
+            assertEquals(expectedPreflushEvents.intValue(), eventConsumer.events.size());
+        }
+
+        inputBuffer.compact();
+        inputBuffer.flip();
+
+        // flushing the plain codec should never produce events
+        TestEventConsumer flushConsumer = new TestEventConsumer();
+        plain.flush(inputBuffer, flushConsumer);
+        assertEquals(0, flushConsumer.events.size());
+
+        compareMessages(expectedMessages, eventConsumer.events, flushConsumer.events);
+    }
+
+    private static Plain getPlainCodec(String charset) {
+        Map<String, Object> config = new HashMap<>();
+        if (charset != null) {
+            config.put("charset", charset);
+        }
+        return new Plain(new ConfigurationImpl(config), new TestContext());
+    }
+
+    @Test
+    public void testEncodeWithUtf8() throws IOException {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        String message = new String("München 安装中文输入法".getBytes(), Charset.forName("UTF-8"));
+        Map<String, Object> config = new HashMap<>();
+        config.put("format", "%{message}");
+        Plain codec = new Plain(new ConfigurationImpl(config), new TestContext());
+        Event e1 = new Event(Collections.singletonMap("message", message));
+        codec.encode(e1, outputStream);
+        Assert.assertEquals(message, new String(outputStream.toByteArray(), Charset.forName("UTF-8")));
+    }
+
+    @Test
+    public void testEncodeWithCharset() throws IOException {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        byte[] rightSingleQuoteInUtf8 = {(byte) 0xE2, (byte) 0x80, (byte) 0x99};
+        String rightSingleQuote = new String(rightSingleQuoteInUtf8, Charset.forName("UTF-8"));
+
+        // encode with cp-1252
+        Map<String, Object> config = new HashMap<>();
+        config.put("charset", "cp1252");
+        config.put("format", "%{message}");
+        config.put("delimiter", "");
+        Event e1 = new Event(Collections.singletonMap("message", rightSingleQuote));
+        Plain cp1252encoder = new Plain(new ConfigurationImpl(config), new TestContext());
+        byte[] rightSingleQuoteInCp1252 = {(byte) 0x92};
+
+        cp1252encoder.encode(e1, outputStream);
+        byte[] resultBytes = outputStream.toByteArray();
+        Assert.assertArrayEquals(rightSingleQuoteInCp1252, resultBytes);
+    }
+
+    @Test
+    public void testEncodeWithFormat() throws IOException {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        Plain encoder = new Plain(new ConfigurationImpl(Collections.singletonMap("format", "%{host}-%{message}")), null);
+        String message = "Hello world";
+        String host = "test";
+        String expectedOutput = host + "-" + message;
+        Event e = new Event();
+        e.setField("message", message);
+        e.setField("host", host);
+
+        encoder.encode(e, outputStream);
+
+        String resultingString = outputStream.toString();
+        assertEquals(expectedOutput, resultingString);
+    }
+
+    @Test
+    public void testClone() throws IOException  {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        String charset = "cp1252";
+        byte[] rightSingleQuoteInUtf8 = {(byte) 0xE2, (byte) 0x80, (byte) 0x99};
+        String rightSingleQuote = new String(rightSingleQuoteInUtf8, Charset.forName("UTF-8"));
+
+        // encode with cp-1252
+        Map<String, Object> config = new HashMap<>();
+        config.put("charset", charset);
+        config.put("format", "%{message}");
+        Event e1 = new Event(Collections.singletonMap("message", rightSingleQuote));
+        Plain codec = new Plain(new ConfigurationImpl(config), new TestContext());
+
+        // clone codec
+        Codec clone = codec.cloneCodec();
+        Assert.assertEquals(codec.getClass(), clone.getClass());
+        Plain plain2 = (Plain)clone;
+
+        // verify charset and delimiter
+        byte[] rightSingleQuoteInCp1252 = {(byte) 0x92};
+        plain2.encode(e1, outputStream);
+        Assert.assertArrayEquals(rightSingleQuoteInCp1252, outputStream.toByteArray());
+    }
+
+}
diff --git a/logstash-core/src/test/java/org/logstash/plugins/codecs/TestEventConsumer.java b/logstash-core/src/test/java/org/logstash/plugins/codecs/TestEventConsumer.java
new file mode 100644
index 000000000..bc5b3ad5a
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/plugins/codecs/TestEventConsumer.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.logstash.plugins.codecs;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+
+public class TestEventConsumer implements Consumer<Map<String, Object>> {
+
+    List<Map<String, Object>> events = new ArrayList<>();
+
+    @Override
+    public void accept(Map<String, Object> stringObjectMap) {
+        events.add(new HashMap<>(stringObjectMap));
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/plugins/factory/PluginFactoryExtTest.java b/logstash-core/src/test/java/org/logstash/plugins/factory/PluginFactoryExtTest.java
new file mode 100644
index 000000000..c4eae19c1
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/plugins/factory/PluginFactoryExtTest.java
@@ -0,0 +1,155 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.plugins.factory;
+
+import co.elastic.logstash.api.*;
+import org.jruby.RubyHash;
+import org.jruby.RubyString;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.junit.Test;
+import org.logstash.RubyUtil;
+import org.logstash.common.EnvironmentVariableProvider;
+import org.logstash.common.SourceWithMetadata;
+import org.logstash.config.ir.ConfigCompiler;
+import org.logstash.config.ir.InvalidIRException;
+import org.logstash.config.ir.PipelineIR;
+import org.logstash.config.ir.RubyEnvTestCase;
+import org.logstash.instrument.metrics.NamespacedMetricExt;
+import org.logstash.plugins.ConfigVariableExpander;
+import org.logstash.plugins.MetricTestCase;
+import org.logstash.plugins.PluginLookup;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Consumer;
+
+import static org.junit.Assert.assertEquals;
+import static org.logstash.RubyUtil.NAMESPACED_METRIC_CLASS;
+import static org.logstash.RubyUtil.RUBY;
+
+/**
+ * Tests for {@link PluginFactoryExt}.
+ */
+public final class PluginFactoryExtTest extends RubyEnvTestCase {
+
+    static class MockInputPlugin implements Input {
+        private final String id;
+
+        @SuppressWarnings("unused")
+        public MockInputPlugin(String id, Configuration config, Context ctx) {
+            this.id = id;
+        }
+
+        @Override
+        public Collection<PluginConfigSpec<?>> configSchema() {
+            return Collections.emptyList();
+        }
+
+        @Override
+        public String getId() {
+            return id;
+        }
+
+        @Override
+        public void start(Consumer<Map<String, Object>> writer) {
+        }
+
+        @Override
+        public void stop() {
+        }
+
+        @Override
+        public void awaitStop() throws InterruptedException {
+        }
+    }
+
+    @Test
+    public void testPluginIdResolvedWithEnvironmentVariables() throws InvalidIRException {
+        PluginFactoryExt.PluginResolver mockPluginResolver = wrapWithSearchable(MockInputPlugin.class);
+
+        SourceWithMetadata sourceWithMetadata = new SourceWithMetadata("proto", "path", 1, 8, "input {mockinput{ id => \"${CUSTOM}\"}} output{mockoutput{}}");
+        final PipelineIR pipelineIR = compilePipeline(sourceWithMetadata);
+
+        PluginMetricsFactoryExt metricsFactory = createMetricsFactory();
+        ExecutionContextFactoryExt execContextFactory = createExecutionContextFactory();
+        Map<String, String> envVars = new HashMap<>();
+        envVars.put("CUSTOM", "test");
+        PluginFactoryExt sut = new PluginFactoryExt(RubyUtil.RUBY, RubyUtil.PLUGIN_FACTORY_CLASS,
+                mockPluginResolver);
+        sut.init(pipelineIR, metricsFactory, execContextFactory, RubyUtil.FILTER_DELEGATOR_CLASS, envVars::get);
+
+        RubyString pluginName = RubyUtil.RUBY.newString("mockinput");
+
+        // Exercise
+        IRubyObject pluginInstance = sut.buildInput(pluginName, RubyHash.newHash(RubyUtil.RUBY), sourceWithMetadata);
+
+        //Verify
+        IRubyObject id = pluginInstance.callMethod(RUBY.getCurrentContext(), "id");
+        assertEquals("Resolved config setting MUST be evaluated with substitution", envVars.get("CUSTOM"), id.toString());
+    }
+
+    private static PipelineIR compilePipeline(SourceWithMetadata sourceWithMetadata) throws InvalidIRException {
+        final ConfigVariableExpander cve = ConfigVariableExpander.withoutSecret(EnvironmentVariableProvider.defaultProvider());
+        return ConfigCompiler.configToPipelineIR(Collections.singletonList(sourceWithMetadata), false, cve);
+    }
+
+    private static ExecutionContextFactoryExt createExecutionContextFactory() {
+        ExecutionContextFactoryExt execContextFactory = new ExecutionContextFactoryExt(RubyUtil.RUBY,
+                RubyUtil.EXECUTION_CONTEXT_FACTORY_CLASS);
+        execContextFactory.initialize(RubyUtil.RUBY.getCurrentContext(), null, null,
+                RubyUtil.RUBY.newString("no DLQ"));
+        return execContextFactory;
+    }
+
+    private static PluginMetricsFactoryExt createMetricsFactory() {
+        final IRubyObject metricWithCollector =
+                MetricTestCase.runRubyScript("require \"logstash/instrument/collector\"\n" +
+                        "metricWithCollector = LogStash::Instrument::Metric.new(LogStash::Instrument::Collector.new)");
+
+        NamespacedMetricExt metric = new NamespacedMetricExt(RUBY, NAMESPACED_METRIC_CLASS)
+                .initialize(RUBY.getCurrentContext(), metricWithCollector, RUBY.newEmptyArray());
+
+
+        PluginMetricsFactoryExt metricsFactory = new PluginMetricsFactoryExt(RubyUtil.RUBY, RubyUtil.PLUGIN_METRICS_FACTORY_CLASS);
+        metricsFactory.initialize(RubyUtil.RUBY.getCurrentContext(), RubyUtil.RUBY.newString("main"), metric);
+        return metricsFactory;
+    }
+
+    private static PluginFactoryExt.PluginResolver wrapWithSearchable(final Class<? extends Input> pluginClass) {
+        return new PluginFactoryExt.PluginResolver() {
+            @Override
+            public PluginLookup.PluginClass resolve(PluginLookup.PluginType type, String name) {
+                return new PluginLookup.PluginClass() {
+                    @Override
+                    public PluginLookup.PluginLanguage language() {
+                        return PluginLookup.PluginLanguage.JAVA;
+                    }
+
+                    @Override
+                    public Object klass() {
+                        return pluginClass;
+                    }
+                };
+            }
+        };
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/plugins/filters/UuidTest.java b/logstash-core/src/test/java/org/logstash/plugins/filters/UuidTest.java
index d2982a433..d88b69a13 100644
--- a/logstash-core/src/test/java/org/logstash/plugins/filters/UuidTest.java
+++ b/logstash-core/src/test/java/org/logstash/plugins/filters/UuidTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins.filters;
 
 import co.elastic.logstash.api.Configuration;
@@ -23,7 +43,7 @@ public class UuidTest {
     public void testUuidWithoutRequiredConfigThrows() {
         try {
             Configuration config = new ConfigurationImpl(Collections.emptyMap());
-            Uuid uuid = new Uuid(ID, config, new ContextImpl(null));
+            Uuid uuid = new Uuid(ID, config, new ContextImpl(null, null));
             PluginUtil.validateConfig(uuid, config);
             Assert.fail("java-uuid filter without required config should have thrown exception");
         } catch (IllegalStateException ex) {
@@ -40,7 +60,7 @@ public class UuidTest {
         Map<String, Object> rawConfig = new HashMap<>();
         rawConfig.put(Uuid.TARGET_CONFIG.name(), targetField);
         Configuration config = new ConfigurationImpl(rawConfig);
-        Uuid uuid = new Uuid(ID, config, new ContextImpl(null));
+        Uuid uuid = new Uuid(ID, config, new ContextImpl(null, null));
         PluginUtil.validateConfig(uuid, config);
 
         org.logstash.Event e = new org.logstash.Event();
@@ -61,7 +81,7 @@ public class UuidTest {
         rawConfig.put(Uuid.TARGET_CONFIG.name(), targetField);
         rawConfig.put(Uuid.OVERWRITE_CONFIG.name(), true);
         Configuration config = new ConfigurationImpl(rawConfig);
-        Uuid uuid = new Uuid(ID, config, new ContextImpl(null));
+        Uuid uuid = new Uuid(ID, config, new ContextImpl(null, null));
         PluginUtil.validateConfig(uuid, config);
 
         org.logstash.Event e = new org.logstash.Event();
diff --git a/logstash-core/src/test/java/org/logstash/plugins/inputs/StdinTest.java b/logstash-core/src/test/java/org/logstash/plugins/inputs/StdinTest.java
index dc77056c4..598ba583e 100644
--- a/logstash-core/src/test/java/org/logstash/plugins/inputs/StdinTest.java
+++ b/logstash-core/src/test/java/org/logstash/plugins/inputs/StdinTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins.inputs;
 
 import org.junit.Test;
@@ -10,6 +30,7 @@ import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
+import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -44,9 +65,13 @@ public class StdinTest {
 
     @Test
     public void testUtf8Events() throws IOException {
-        String[] inputs = {"München1", "安装中文输入法", "München3"};
+        String[] inputs = {
+                new String("München1".getBytes(), Charset.forName("UTF-8")),
+                new String("安装中文输入法".getBytes(), Charset.forName("UTF-8")),
+                new String("München3".getBytes(), Charset.forName("UTF-8"))
+        };
         String testInput = String.join(Line.DEFAULT_DELIMITER, inputs) + Line.DEFAULT_DELIMITER;
-        TestConsumer queueWriter = testStdin(testInput.getBytes());
+        TestConsumer queueWriter = testStdin(testInput.getBytes("UTF-8"));
 
         List<Map<String, Object>> events = queueWriter.getEvents();
         assertEquals(3, events.size());
diff --git a/logstash-core/src/test/java/org/logstash/plugins/outputs/StdoutTest.java b/logstash-core/src/test/java/org/logstash/plugins/outputs/StdoutTest.java
index 9744b6bb8..1acd460b7 100644
--- a/logstash-core/src/test/java/org/logstash/plugins/outputs/StdoutTest.java
+++ b/logstash-core/src/test/java/org/logstash/plugins/outputs/StdoutTest.java
@@ -1,7 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.plugins.outputs;
 
 import co.elastic.logstash.api.Event;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import org.junit.Assert;
 import org.junit.Test;
 import org.logstash.plugins.ConfigurationImpl;
 import org.logstash.plugins.TestContext;
@@ -69,4 +90,24 @@ public class StdoutTest {
         e3.setField("myField", "event3");
         return Arrays.asList(e1, e2, e3);
     }
+
+    @Test
+    public void testEventLargerThanBuffer() {
+        StringBuilder message = new StringBuilder();
+        String repeatedMessage = "foo";
+        for (int k = 0; k < (16 * 1024 / repeatedMessage.length()); k++) {
+            message.append("foo");
+        }
+
+        org.logstash.Event e = new org.logstash.Event();
+        e.setField("message", message.toString());
+
+        OutputStream dummyOutputStream = new ByteArrayOutputStream(17 * 1024);
+        Stdout stdout = new Stdout(ID, new ConfigurationImpl(Collections.emptyMap(), new TestPluginFactory()),
+                new TestContext(), dummyOutputStream);
+        stdout.output(Collections.singletonList(e));
+        stdout.stop();
+
+        Assert.assertTrue(dummyOutputStream.toString().contains(message.toString()));
+    }
 }
diff --git a/logstash-core/src/test/java/org/logstash/plugins/pipeline/PipelineBusTest.java b/logstash-core/src/test/java/org/logstash/plugins/pipeline/PipelineBusTest.java
index 4f2dc9302..a340bb2d4 100644
--- a/logstash-core/src/test/java/org/logstash/plugins/pipeline/PipelineBusTest.java
+++ b/logstash-core/src/test/java/org/logstash/plugins/pipeline/PipelineBusTest.java
@@ -1,33 +1,71 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.logstash.plugins.pipeline;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import static junit.framework.TestCase.assertTrue;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.core.Is.is;
+import static org.assertj.core.api.Assertions.assertThatCode;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 import org.logstash.RubyUtil;
 import org.logstash.ext.JrubyEventExtLibrary;
 
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.LongAdder;
 import java.util.stream.Stream;
 
+@RunWith(Parameterized.class)
 public class PipelineBusTest {
     static String address = "fooAddr";
     static String otherAddress = "fooAddr";
     static Collection<String> addresses = Arrays.asList(address, otherAddress);
 
-    PipelineBus bus;
+    @Parameterized.Parameters(name = "{0}")
+    public static Collection<Class<? extends PipelineBus.Testable>> data() {
+        return Set.of(PipelineBusV2.Testable.class);
+    }
+
+    @Parameterized.Parameter
+    public Class<PipelineBus.Testable> busClass;
+
+    PipelineBus.Testable bus;
     TestPipelineInput input;
     TestPipelineOutput output;
 
     @Before
-    public void setup() {
-        bus = new PipelineBus();
+    public void setup() throws ReflectiveOperationException {
+        bus = busClass.getDeclaredConstructor().newInstance();
         input = new TestPipelineInput();
         output = new TestPipelineOutput();
     }
@@ -35,35 +73,111 @@ public class PipelineBusTest {
     @Test
     public void subscribeUnsubscribe() throws InterruptedException {
         assertThat(bus.listen(input, address)).isTrue();
-        assertThat(bus.addressStates.get(address).getInput()).isSameAs(input);
+        assertThat(bus.getAddressState(address)).hasValueSatisfying((addressState -> {
+            assertThat(addressState.getInput()).isSameAs(input);
+        }));
 
         bus.unlisten(input, address);
 
         // Key should have been pruned
-        assertThat(bus.addressStates.containsKey(address)).isFalse();
+        assertThat(bus.getAddressState(address)).isNotPresent();
     }
 
     @Test
     public void senderRegisterUnregister() {
         bus.registerSender(output, addresses);
 
-        assertThat(bus.addressStates.get(address).hasOutput(output)).isTrue();
+        assertThat(bus.getAddressState(address)).hasValueSatisfying((addressState) -> {
+            assertThat(addressState.getOutputs()).contains(output);
+        });
 
         bus.unregisterSender(output, addresses);
 
         // We should have pruned this address
-        assertThat(bus.addressStates.containsKey(address)).isFalse();
+        assertThat(bus.getAddressState(address)).isNotPresent();
     }
 
     @Test
-    public void activeSenderPreventsPrune() {
+    public void activeSenderPreventsPrune() throws InterruptedException {
         bus.registerSender(output, addresses);
         bus.listen(input, address);
-        bus.unlistenNonblock(input, address);
 
-        assertThat(bus.addressStates.containsKey(address)).isTrue();
+        assertThat(bus.getAddressState(address)).hasValueSatisfying((addressState -> {
+            assertThat(addressState.getInput()).isSameAs(input);
+            assertThat(addressState.getOutputs()).contains(output);
+        }));
+
+        bus.setBlockOnUnlisten(false);
+        bus.unlisten(input, address);
+
+        assertThat(bus.getAddressState(address)).hasValueSatisfying((addressState -> {
+            assertThat(addressState.getInput()).isNull();
+            assertThat(addressState.getOutputs()).contains(output);
+        }));
+
         bus.unregisterSender(output, addresses);
-        assertThat(bus.addressStates.containsKey(address)).isFalse();
+
+        assertThat(bus.getAddressState(address)).isNotPresent();
+    }
+
+    @Test
+    public void multipleSendersPreventPrune() throws InterruptedException {
+        // begin with 1:1 single output to input
+        bus.registerSender(output, Collections.singleton(address));
+        bus.listen(input, address);
+        assertThat(bus.getAddressState(address)).hasValueSatisfying((addressState -> {
+            assertThat(addressState.getInput()).isSameAs(input);
+            assertThat(addressState.getOutputs()).contains(output);
+        }));
+        bus.sendEvents(output, Collections.singletonList(rubyEvent()), false);
+        assertThat(input.eventCount.longValue()).isEqualTo(1L);
+
+        // attach another output2 as a sender
+        final TestPipelineOutput output2 = new TestPipelineOutput();
+        bus.registerSender(output2, Collections.singleton(address));
+        assertThat(bus.getAddressState(address)).hasValueSatisfying((addressState -> {
+            assertThat(addressState.getInput()).isSameAs(input);
+            assertThat(addressState.getOutputs()).contains(output, output2);
+        }));
+        bus.sendEvents(output, Collections.singletonList(rubyEvent()), false);
+        bus.sendEvents(output2, Collections.singletonList(rubyEvent()), false);
+        assertThat(input.eventCount.longValue()).isEqualTo(3L);
+
+        // unlisten with first input, simulating a pipeline restart
+        assertThat(bus.isBlockOnUnlisten()).isFalse();
+        bus.unlisten(input, address);
+        assertThat(bus.getAddressState(address)).hasValueSatisfying((addressState -> {
+            assertThat(addressState.getInput()).isNull();
+            assertThat(addressState.getOutputs()).contains(output, output2);
+        }));
+
+        // unregister one of the two senders, ensuring that the address state remains in-tact
+        bus.unregisterSender(output, Collections.singleton(address));
+        assertThat(bus.getAddressState(address)).hasValueSatisfying((addressState -> {
+            assertThat(addressState.getInput()).isNull();
+            assertThat(addressState.getOutputs()).contains(output2);
+        }));
+
+        // listen with a new input, emulating the completion of a pipeline restart
+        final TestPipelineInput input2 = new TestPipelineInput();
+        assertThat(bus.listen(input2, address)).isTrue();
+        assertThat(bus.getAddressState(address)).hasValueSatisfying((addressState -> {
+            assertThat(addressState.getInput()).isSameAs(input2);
+            assertThat(addressState.getOutputs()).contains(output2);
+        }));
+        bus.sendEvents(output2, Collections.singletonList(rubyEvent()), false);
+        assertThat(input2.eventCount.longValue()).isEqualTo(1L);
+
+        // shut down our remaining sender, ensuring address state remains in-tact
+        bus.unregisterSender(output2, Collections.singleton(address));
+        assertThat(bus.getAddressState(address)).hasValueSatisfying((addressState -> {
+            assertThat(addressState.getInput()).isSameAs(input2);
+            assertThat(addressState.getOutputs()).isEmpty();
+        }));
+
+        // upon unlistening, ensure orphan address state has been cleaned up
+        bus.unlisten(input2, address);
+        assertThat(bus.getAddressState(address)).isNotPresent();
     }
 
 
@@ -73,9 +187,15 @@ public class PipelineBusTest {
         bus.listen(input, address);
         bus.unregisterSender(output, addresses);
 
-        assertThat(bus.addressStates.containsKey(address)).isTrue();
+        assertThat(bus.getAddressState(address)).hasValueSatisfying((addressState -> {
+            assertThat(addressState.getInput()).isSameAs(input);
+            assertThat(addressState.getOutputs()).isEmpty();
+        }));
+
+        bus.setBlockOnUnlisten(false);
         bus.unlisten(input, address);
-        assertThat(bus.addressStates.containsKey(address)).isFalse();
+
+        assertThat(bus.getAddressState(address)).isNotPresent();
     }
 
     @Test
@@ -83,15 +203,25 @@ public class PipelineBusTest {
         bus.registerSender(output, addresses);
         bus.listen(input, address);
 
-        ConcurrentHashMap<String, AddressState> outputAddressesToInputs = bus.outputsToAddressStates.get(output);
-        assertThat(outputAddressesToInputs.size()).isEqualTo(1);
+        assertThat(bus.getAddressStates(output)).hasValueSatisfying((addressStates) -> {
+            assertThat(addressStates).hasSize(1);
+        });
 
         bus.unregisterSender(output, addresses);
-        assertThat(bus.outputsToAddressStates.get(output)).isNull();
+        assertThat(bus.getAddressStates(output)).isNotPresent();
+        assertThat(bus.getAddressState(address)).hasValueSatisfying((addressState) -> {
+            assertThat(addressState.getInput()).isSameAs(input);
+            assertThat(addressState.getOutputs()).isEmpty();
+        });
 
         bus.registerSender(output, addresses);
-        assertThat(bus.outputsToAddressStates.get(output).size()).isEqualTo(1);
-
+        assertThat(bus.getAddressStates(output)).hasValueSatisfying((addressStates) -> {
+            assertThat(addressStates).hasSize(1);
+        });
+        assertThat(bus.getAddressState(address)).hasValueSatisfying((addressState) -> {
+            assertThat(addressState.getInput()).isSameAs(input);
+            assertThat(addressState.getOutputs()).contains(output);
+        });
     }
 
     @Test
@@ -99,16 +229,15 @@ public class PipelineBusTest {
         bus.registerSender(output, addresses);
         bus.listen(input, address);
 
-        final ConcurrentHashMap<String, AddressState> outputAddressesToInputs = bus.outputsToAddressStates.get(output);
-
-        outputAddressesToInputs.get(address).getInput().internalReceive(Stream.of(rubyEvent()));
+        bus.sendEvents(output, Collections.singletonList(rubyEvent()), false);
         assertThat(input.eventCount.longValue()).isEqualTo(1L);
 
         bus.unlisten(input, address);
 
         TestPipelineInput newInput = new TestPipelineInput();
         bus.listen(newInput, address);
-        outputAddressesToInputs.get(address).getInput().internalReceive(Stream.of(rubyEvent()));
+
+        bus.sendEvents(output, Collections.singletonList(rubyEvent()), false);
 
         // The new event went to the new input, not the old one
         assertThat(newInput.eventCount.longValue()).isEqualTo(1L);
@@ -117,7 +246,7 @@ public class PipelineBusTest {
 
     @Test
     public void sendingEmptyListToNowhereStillReturns() {
-        bus.registerSender(output, Arrays.asList("not_an_address"));
+        bus.registerSender(output, List.of("not_an_address"));
         bus.sendEvents(output, Collections.emptyList(), true);
     }
 
@@ -180,11 +309,97 @@ public class PipelineBusTest {
 
         // This should unblock the listener thread
         bus.unregisterSender(output, addresses);
-        unlistenThread.join();
+        TimeUnit.SECONDS.toMillis(30);
+        unlistenThread.join(Duration.ofSeconds(30).toMillis());
+        assertThat(unlistenThread.getState()).isEqualTo(Thread.State.TERMINATED);
 
-        assertThat(bus.addressStates).isEmpty();
+        assertThat(bus.getAddressState(address)).isNotPresent();
     }
 
+    @Test
+    public void blockingShutdownDeadlock() throws InterruptedException {
+        final ExecutorService executor = Executors.newFixedThreadPool(10);
+        try {
+            for (int i = 0; i < 100; i++) {
+                bus.registerSender(output, addresses);
+                bus.listen(input, address);
+                bus.setBlockOnUnlisten(true);
+
+                // we use a CountDownLatch to increase the likelihood
+                // of simultaneous execution
+                final CountDownLatch startLatch = new CountDownLatch(2);
+                final CompletableFuture<Void> unlistenFuture = CompletableFuture.runAsync(asRunnable(() -> {
+                    startLatch.countDown();
+                    startLatch.await();
+                    bus.unlisten(input, address);
+                }), executor);
+                final CompletableFuture<Void> unregisterFuture = CompletableFuture.runAsync(asRunnable(() -> {
+                    startLatch.countDown();
+                    startLatch.await();
+                    bus.unregisterSender(output, addresses);
+                }), executor);
+
+                // ensure that our tasks all exit successfully, quickly
+                assertThatCode(() -> CompletableFuture.allOf(unlistenFuture, unregisterFuture).get(1, TimeUnit.SECONDS))
+                        .withThreadDumpOnError()
+                        .withFailMessage("Expected unlisten and unregisterSender to not deadlock, but they did not return in a reasonable amount of time in the <%s>th iteration", i)
+                        .doesNotThrowAnyException();
+            }
+        } finally {
+            executor.shutdownNow();
+        }
+    }
+
+    @FunctionalInterface
+    interface ExceptionalRunnable<E extends Throwable> {
+        void run() throws E;
+    }
+
+    private Runnable asRunnable(final ExceptionalRunnable<?> exceptionalRunnable) {
+        return () -> {
+            try {
+                exceptionalRunnable.run();
+            } catch (Throwable e) {
+                throw new RuntimeException(e);
+            }
+        };
+    }
+
+
+    @Test
+    public void whenInputFailsOutputRetryOnlyNotYetDelivered() throws InterruptedException {
+        bus.registerSender(output, addresses);
+        int expectedReceiveInvocations = 2;
+        CountDownLatch sendsCoupleOfCallsLatch = new CountDownLatch(expectedReceiveInvocations);
+        int positionOfFailure = 1;
+        input = new TestFailPipelineInput(sendsCoupleOfCallsLatch, positionOfFailure);
+        bus.listen(input, address);
+
+        final List<JrubyEventExtLibrary.RubyEvent> events = new ArrayList<>();
+        events.add(rubyEvent());
+        events.add(rubyEvent());
+        events.add(rubyEvent());
+
+        CountDownLatch senderThreadStarted = new CountDownLatch(1);
+        Thread sendThread = new Thread(() -> {
+            senderThreadStarted.countDown();
+
+            // Exercise
+            bus.sendEvents(output, events, true);
+        });
+        sendThread.start();
+
+        senderThreadStarted.await(); // Ensure server thread is started
+
+        // Ensure that send actually happened a couple of times.
+        // Send method retry mechanism sleeps 1 second on each retry!
+        boolean coupleOfCallsDone = sendsCoupleOfCallsLatch.await(3, TimeUnit.SECONDS);
+        sendThread.join();
+
+        // Verify
+        assertThat(coupleOfCallsDone).isTrue();
+        assertThat(((TestFailPipelineInput)input).getLastBatchSize()).isEqualTo(events.size() - positionOfFailure);
+    }
 
     private JrubyEventExtLibrary.RubyEvent rubyEvent() {
       return JrubyEventExtLibrary.RubyEvent.newRubyEvent(RubyUtil.RUBY);
@@ -194,9 +409,14 @@ public class PipelineBusTest {
         public LongAdder eventCount = new LongAdder();
 
         @Override
-        public boolean internalReceive(Stream<JrubyEventExtLibrary.RubyEvent> events) {
+        public ReceiveResponse internalReceive(Stream<JrubyEventExtLibrary.RubyEvent> events) {
             eventCount.add(events.count());
-            return true;
+            return ReceiveResponse.completed();
+        }
+
+        @Override
+        public String getId() {
+            return "anonymous";
         }
 
         @Override
@@ -206,5 +426,40 @@ public class PipelineBusTest {
     }
 
     static class TestPipelineOutput implements PipelineOutput {
+        @Override
+        public String getId() {
+            return "anonymous";
+        }
+    }
+
+    static class TestFailPipelineInput extends TestPipelineInput {
+        private final CountDownLatch receiveCalls;
+        private int receiveInvocationsCount = 0;
+        private final int positionOfFailure;
+        private int lastBatchSize = 0;
+
+        public TestFailPipelineInput(CountDownLatch failedCallsLatch, int positionOfFailure) {
+            this.receiveCalls = failedCallsLatch;
+            this.positionOfFailure = positionOfFailure;
+        }
+
+        @Override
+        public ReceiveResponse internalReceive(Stream<JrubyEventExtLibrary.RubyEvent> events) {
+            receiveCalls.countDown();
+            if (receiveInvocationsCount == 0) {
+                // simulate a fail on first invocation at desired position
+                receiveInvocationsCount++;
+                return ReceiveResponse.failedAt(positionOfFailure, new Exception("An artificial fail"));
+            } else {
+                receiveInvocationsCount++;
+                lastBatchSize = (int) events.count();
+
+                return ReceiveResponse.completed();
+            }
+        }
+
+        int getLastBatchSize() {
+            return lastBatchSize;
+        }
     }
 }
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/secret/SecretIdentifierTest.java b/logstash-core/src/test/java/org/logstash/secret/SecretIdentifierTest.java
index 1f537c518..75fe9e86e 100644
--- a/logstash-core/src/test/java/org/logstash/secret/SecretIdentifierTest.java
+++ b/logstash-core/src/test/java/org/logstash/secret/SecretIdentifierTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.secret;
 
 
diff --git a/logstash-core/src/test/java/org/logstash/secret/cli/SecretStoreCliTest.java b/logstash-core/src/test/java/org/logstash/secret/cli/SecretStoreCliTest.java
index 93dfe3b05..7416a7ec9 100644
--- a/logstash-core/src/test/java/org/logstash/secret/cli/SecretStoreCliTest.java
+++ b/logstash-core/src/test/java/org/logstash/secret/cli/SecretStoreCliTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.secret.cli;
 
 import org.junit.Before;
@@ -8,11 +28,16 @@ import org.logstash.secret.store.SecretStoreFactory;
 import org.logstash.secret.store.SecureConfig;
 
 import java.nio.file.Paths;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.Map;
+import java.util.Optional;
+import java.util.Queue;
 import java.util.UUID;
 
+import static junit.framework.TestCase.assertTrue;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.logstash.secret.store.SecretStoreFactory.ENVIRONMENT_PASS_KEY;
 
@@ -34,6 +59,7 @@ public class SecretStoreCliTest {
         final SecretStoreFactory secretStoreFactory = SecretStoreFactory.withEnvironment(environment);
 
         cli = new SecretStoreCli(terminal, secretStoreFactory);
+
         existingStoreConfig = new SecureConfig();
         existingStoreConfig.add("keystore.file",
                 Paths.get(this.getClass().getClassLoader().getResource("logstash.keystore.with.default.pass").toURI()).toString().toCharArray());
@@ -44,14 +70,14 @@ public class SecretStoreCliTest {
 
     @Test
     public void testBadCommand() {
-        cli.command("nonsense", null, null);
+        cli.command("nonsense", null);
         assertPrimaryHelped();
     }
 
     @Test
     public void testHelpAdd() {
         cli.command("add", null, "--help");
-        assertThat(terminal.out).containsIgnoringCase("Adds a new secret to the keystore");
+        assertThat(terminal.out).containsIgnoringCase("Add secrets to the keystore");
     }
 
     @Test
@@ -69,12 +95,12 @@ public class SecretStoreCliTest {
     @Test
     public void testHelpRemove() {
         cli.command("remove", null, "--help");
-        assertThat(terminal.out).containsIgnoringCase("Removes a secret from the keystore");
+        assertThat(terminal.out).containsIgnoringCase("Remove secrets from the keystore");
     }
 
     @Test
     public void testList() {
-        cli.command("list", existingStoreConfig, null);
+        cli.command("list", existingStoreConfig);
 
        // contents of the existing store is a-z for both the key and value
         for (int i = 65; i <= 90; i++) {
@@ -86,104 +112,182 @@ public class SecretStoreCliTest {
 
     @Test
     public void testCreateNewAllYes() {
-        terminal.in = "y";
-        cli.command("create", newStoreConfig, null);
+        terminal.in.add("y");
+        cli.command("create", newStoreConfig);
         assertCreated();
     }
 
     @Test
     public void testCreateNewAllNo() {
-        terminal.in = "n";
-        cli.command("create", newStoreConfig, null);
+        terminal.in.add("n");
+        cli.command("create", newStoreConfig);
         assertNotCreated();
     }
 
     @Test
     public void testCreateNoEnvironmentWarning() {
-        cli.command("create", newStoreConfig, null);
+        cli.command("create", newStoreConfig);
         assertThat(terminal.out).contains("Please set the environment variable `LOGSTASH_KEYSTORE_PASS`. Failure to do so will result in reduced security.");
     }
 
 
     @Test
     public void testDoubleCreateWarning() {
-        terminal.in = "y";
-        cli.command("create", newStoreConfig, null);
-        assertCreated();
-        terminal.reset();
+        createKeyStore();
 
-        cli.command("create", newStoreConfig, null);
+        cli.command("create", newStoreConfig);
         assertThat(terminal.out).contains("Overwrite");
         assertNotCreated();
     }
 
     @Test
     public void testAddEmptyValue() {
-        terminal.in = "y";
-        cli.command("create", newStoreConfig, null);
-        assertCreated();
-        terminal.reset();
+        createKeyStore();
+
+        terminal.in.add(""); // sets the empty value
+        terminal.in.add("value");
 
-        terminal.in = ""; // sets the value
         String id = UUID.randomUUID().toString();
         cli.command("add", newStoreConfig.clone(), id);
-        assertThat(terminal.out).containsIgnoringCase("ERROR");
+        assertThat(terminal.out).containsIgnoringCase("ERROR: Value cannot be empty");
+    }
+
+    @Test
+    public void testAddNonAsciiValue() {
+        createKeyStore();
+
+        terminal.in.add("€€€€€"); // sets non-ascii value value
+        terminal.in.add("value");
+
+        String id = UUID.randomUUID().toString();
+        cli.command("add", newStoreConfig.clone(), id);
+        assertThat(terminal.out).containsIgnoringCase("ERROR: Value must contain only ASCII characters");
     }
 
     @Test
     public void testAdd() {
-        terminal.in = "y";
-        cli.command("create", newStoreConfig, null);
-        assertCreated();
-        terminal.reset();
+        createKeyStore();
 
-        terminal.in = UUID.randomUUID().toString(); // sets the value
+        terminal.in.add(UUID.randomUUID().toString()); // sets the value
         String id = UUID.randomUUID().toString();
         cli.command("add", newStoreConfig.clone(), id);
         terminal.reset();
 
-        cli.command("list", newStoreConfig, null);
+        cli.command("list", newStoreConfig);
         assertListed(id);
     }
 
     @Test
-    public void testRemove() {
-        terminal.in = "y";
-        cli.command("create", newStoreConfig, null);
-        assertCreated();
+    public void testAddWithNoIdentifiers() {
+        final String expectedMessage = "ERROR: You must supply an identifier to add";
+
+        createKeyStore();
+
+        String[] nullArguments = null;
+        cli.command("add", newStoreConfig.clone(), nullArguments);
+        assertThat(terminal.out).containsIgnoringCase(expectedMessage);
+
         terminal.reset();
 
-        terminal.in = UUID.randomUUID().toString(); // sets the value
+        cli.command("add", newStoreConfig.clone());
+        assertThat(terminal.out).containsIgnoringCase(expectedMessage);
+    }
+
+    @Test
+    public void testAddMultipleKeys() {
+        createKeyStore();
+
+        terminal.in.add(UUID.randomUUID().toString());
+        terminal.in.add(UUID.randomUUID().toString());
+
+        final String keyOne = UUID.randomUUID().toString();
+        final String keyTwo = UUID.randomUUID().toString();
+        cli.command("add", newStoreConfig.clone(), keyOne, keyTwo);
+        terminal.reset();
+
+        cli.command("list", newStoreConfig);
+        assertListed(keyOne, keyTwo);
+    }
+
+    @Test
+    public void testAddWithoutCreatedKeystore() {
+        cli.command("add", newStoreConfig.clone(), UUID.randomUUID().toString());
+        assertThat(terminal.out).containsIgnoringCase("ERROR: Logstash keystore not found. Use 'create' command to create one.");
+    }
+
+    @Test
+    public void testAddWithStdinOption() {
+        createKeyStore();
+
+        terminal.in.add(UUID.randomUUID().toString()); // sets the value
+        terminal.in.add(UUID.randomUUID().toString()); // sets the value
+
+        String id = UUID.randomUUID().toString();
+        cli.command("add", newStoreConfig.clone(), id, SecretStoreCli.CommandOptions.STDIN.getOption());
+        terminal.reset();
+
+        cli.command("list", newStoreConfig);
+        assertListed(id);
+        assertNotListed(SecretStoreCli.CommandOptions.STDIN.getOption());
+    }
+
+    @Test
+    public void testRemove() {
+        createKeyStore();
+
+        terminal.in.add(UUID.randomUUID().toString()); // sets the value
         String id = UUID.randomUUID().toString();
         cli.command("add", newStoreConfig.clone(), id);
         System.out.println(terminal.out);
         terminal.reset();
 
-        cli.command("list", newStoreConfig.clone(), null);
+        cli.command("list", newStoreConfig.clone());
         assertListed(id);
         terminal.reset();
 
         cli.command("remove", newStoreConfig.clone(), id);
         terminal.reset();
 
-        cli.command("list", newStoreConfig, null);
+        cli.command("list", newStoreConfig);
         assertThat(terminal.out).doesNotContain(id);
     }
 
     @Test
-    public void testRemoveMissing() {
-        terminal.in = "y";
-        cli.command("create", newStoreConfig, null);
-        assertCreated();
+    public void testRemoveMultipleKeys() {
+        createKeyStore();
+
+        terminal.in.add(UUID.randomUUID().toString());
+        terminal.in.add(UUID.randomUUID().toString());
+
+        final String keyOne = UUID.randomUUID().toString();
+        final String keyTwo = UUID.randomUUID().toString();
+
+        cli.command("add", newStoreConfig.clone(), keyOne, keyTwo);
         terminal.reset();
 
-        terminal.in = UUID.randomUUID().toString(); // sets the value
+        cli.command("list", newStoreConfig.clone());
+        assertListed(keyOne, keyTwo);
+        terminal.reset();
+
+        cli.command("remove", newStoreConfig.clone(), keyOne, keyTwo);
+        terminal.reset();
+
+        cli.command("list", newStoreConfig);
+        assertThat(terminal.out).doesNotContain(keyOne);
+        assertThat(terminal.out).doesNotContain(keyTwo);
+    }
+
+    @Test
+    public void testRemoveMissing() {
+        createKeyStore();
+
+        terminal.in.add(UUID.randomUUID().toString()); // sets the value
         String id = UUID.randomUUID().toString();
         cli.command("add", newStoreConfig.clone(), id);
         System.out.println(terminal.out);
         terminal.reset();
 
-        cli.command("list", newStoreConfig.clone(), null);
+        cli.command("list", newStoreConfig.clone());
         assertListed(id);
         terminal.reset();
 
@@ -191,6 +295,81 @@ public class SecretStoreCliTest {
         assertThat(terminal.out).containsIgnoringCase("error");
     }
 
+    @Test
+    public void testRemoveWithNoIdentifiers() {
+        final String expectedMessage = "ERROR: You must supply a value to remove.";
+
+        createKeyStore();
+
+        String[] nullArguments = null;
+        cli.command("remove", newStoreConfig.clone(), nullArguments);
+        assertThat(terminal.out).containsIgnoringCase(expectedMessage);
+
+        terminal.reset();
+
+        cli.command("remove", newStoreConfig.clone());
+        assertThat(terminal.out).containsIgnoringCase(expectedMessage);
+    }
+
+    @Test
+    public void testCommandWithUnrecognizedOption() {
+        createKeyStore();
+
+        terminal.in.add("foo");
+
+        final String invalidOption = "--invalid-option";
+        cli.command("add", newStoreConfig.clone(), UUID.randomUUID().toString(), invalidOption);
+        assertThat(terminal.out).contains(String.format("Unrecognized option '%s' for command 'add'", invalidOption));
+
+        terminal.reset();
+        cli.command("list", newStoreConfig);
+        assertNotListed(invalidOption);
+    }
+
+    @Test
+    public void testCommandParseWithValidCommand() {
+        final String[] args = new String[]{
+                "FOO",
+                "BAR",
+                "--stdin",
+                "ANYTHING"
+        };
+
+        final Optional<SecretStoreCli.CommandLine> commandLineParseResult = SecretStoreCli.Command
+                .parse("add", args);
+
+        assertThat(commandLineParseResult).isPresent();
+
+        final SecretStoreCli.CommandLine commandLine = commandLineParseResult.get();
+        assertThat(commandLine.getCommand()).isEqualTo(SecretStoreCli.Command.ADD);
+        assertThat(commandLine.getArguments()).containsExactly("FOO", "BAR");
+        assertThat(commandLine.hasOption(SecretStoreCli.CommandOptions.STDIN)).isTrue();
+    }
+
+    @Test
+    public void testCommandParseWithInvalidCommand() {
+        final Optional<SecretStoreCli.CommandLine> commandLineParseResult = SecretStoreCli.Command
+                .parse("non-existing-command", new String[0]);
+
+        assertThat(commandLineParseResult).isEmpty();
+    }
+
+    @Test
+    public void tesCommandsAllowHelpOption() {
+        for (final SecretStoreCli.Command value : SecretStoreCli.Command.values()) {
+            assertThat(value.getValidOptions())
+                    .withFailMessage("Command '%s' must support the '--help' option", value.name())
+                    .contains(SecretStoreCli.CommandOptions.HELP);
+        }
+    }
+
+    private void createKeyStore() {
+        terminal.reset();
+        terminal.in.add("y");
+        cli.command("create", newStoreConfig);
+        assertCreated();
+        terminal.reset();
+    }
 
     private void assertNotCreated() {
         assertThat(terminal.out).doesNotContain("Created Logstash keystore");
@@ -200,8 +379,12 @@ public class SecretStoreCliTest {
         assertThat(terminal.out).contains("Created Logstash keystore");
     }
 
-    private void assertListed(String expected) {
-        assertThat(terminal.out).contains(expected);
+    private void assertListed(String... expected) {
+        assertTrue(Arrays.stream(expected).allMatch(terminal.out::contains));
+    }
+
+    private void assertNotListed(String... expected) {
+        assertTrue(Arrays.stream(expected).noneMatch(terminal.out::contains));
     }
 
     private void assertPrimaryHelped() {
@@ -223,7 +406,7 @@ public class SecretStoreCliTest {
 
     class TestTerminal extends Terminal {
         public String out = "";
-        public String in = "";
+        public final Queue<String> in = new LinkedList<>();
 
         @Override
         public void writeLine(String text) {
@@ -237,16 +420,16 @@ public class SecretStoreCliTest {
 
         @Override
         public String readLine() {
-            return in;
+            return in.poll();
         }
 
         @Override
         public char[] readSecret() {
-            return in.toCharArray();
+            return in.poll().toCharArray();
         }
 
         public void reset() {
-            in = "";
+            in.clear();
             out = "";
         }
     }
diff --git a/logstash-core/src/test/java/org/logstash/secret/password/DigitValidatorTest.java b/logstash-core/src/test/java/org/logstash/secret/password/DigitValidatorTest.java
new file mode 100644
index 000000000..82aff67e7
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/secret/password/DigitValidatorTest.java
@@ -0,0 +1,33 @@
+package org.logstash.secret.password;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Optional;
+
+/**
+ * A test class for {@link DigitValidator}
+ */
+public class DigitValidatorTest {
+
+    private DigitValidator digitValidator;
+
+    @Before
+    public void setUp() {
+        digitValidator = new DigitValidator();
+    }
+
+    @Test
+    public void testValidateSuccess() {
+        Optional<String> result = digitValidator.validate("Password123");
+        Assert.assertFalse(result.isPresent());
+    }
+
+    @Test
+    public void testValidateFailure() {
+        Optional<String> result = digitValidator.validate("Password");
+        Assert.assertTrue(result.isPresent());
+        Assert.assertEquals(result.get(), "must contain at least one digit between 0 and 9");
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/secret/password/EmptyStringValidatorTest.java b/logstash-core/src/test/java/org/logstash/secret/password/EmptyStringValidatorTest.java
new file mode 100644
index 000000000..4e3d76817
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/secret/password/EmptyStringValidatorTest.java
@@ -0,0 +1,33 @@
+package org.logstash.secret.password;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Optional;
+
+/**
+ * A test class for {@link EmptyStringValidator}
+ */
+public class EmptyStringValidatorTest {
+
+    private EmptyStringValidator emptyStringValidator;
+
+    @Before
+    public void setUp() {
+        emptyStringValidator = new EmptyStringValidator();
+    }
+
+    @Test
+    public void testValidateSuccess() {
+        Optional<String> result = emptyStringValidator.validate("Password123");
+        Assert.assertFalse(result.isPresent());
+    }
+
+    @Test
+    public void testValidateFailure() {
+        Optional<String> result = emptyStringValidator.validate("");
+        Assert.assertTrue(result.isPresent());
+        Assert.assertEquals(result.get(), "must not be empty");
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/secret/password/LengthValidatorTest.java b/logstash-core/src/test/java/org/logstash/secret/password/LengthValidatorTest.java
new file mode 100644
index 000000000..298de93ad
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/secret/password/LengthValidatorTest.java
@@ -0,0 +1,33 @@
+package org.logstash.secret.password;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Optional;
+
+/**
+ * A test class for {@link LengthValidator}
+ */
+public class LengthValidatorTest {
+
+    private LengthValidator lengthValidator;
+
+    @Before
+    public void setUp() {
+        lengthValidator = new LengthValidator(10);
+    }
+
+    @Test
+    public void testValidateSuccess() {
+        Optional<String> result = lengthValidator.validate("Password123");
+        Assert.assertFalse(result.isPresent());
+    }
+
+    @Test
+    public void testValidateFailure() {
+        Optional<String> result = lengthValidator.validate("Pwd");
+        Assert.assertTrue(result.isPresent());
+        Assert.assertEquals(result.get(), "must be length of between 10 and 1024");
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/secret/password/LowerCaseValidatorTest.java b/logstash-core/src/test/java/org/logstash/secret/password/LowerCaseValidatorTest.java
new file mode 100644
index 000000000..0ce40e251
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/secret/password/LowerCaseValidatorTest.java
@@ -0,0 +1,33 @@
+package org.logstash.secret.password;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Optional;
+
+/**
+ * A test class for {@link LowerCaseValidator}
+ */
+public class LowerCaseValidatorTest {
+
+    private LowerCaseValidator lowerCaseValidator;
+
+    @Before
+    public void setUp() {
+        lowerCaseValidator = new LowerCaseValidator();
+    }
+
+    @Test
+    public void testValidateSuccess() {
+        Optional<String> result = lowerCaseValidator.validate("Password123");
+        Assert.assertFalse(result.isPresent());
+    }
+
+    @Test
+    public void testValidateFailure() {
+        Optional<String> result = lowerCaseValidator.validate("PASSWORD");
+        Assert.assertTrue(result.isPresent());
+        Assert.assertEquals(result.get(), "must contain at least one lower case");
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/secret/password/PasswordParamConverterTest.java b/logstash-core/src/test/java/org/logstash/secret/password/PasswordParamConverterTest.java
new file mode 100644
index 000000000..ac862a682
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/secret/password/PasswordParamConverterTest.java
@@ -0,0 +1,35 @@
+package org.logstash.secret.password;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * A test class for {@link PasswordParamConverter}
+ */
+public class PasswordParamConverterTest {
+
+    @Test
+    public void testConvert() {
+        int intResult = PasswordParamConverter.convert(Integer.class, "8");
+        Assert.assertEquals(8, intResult);
+
+        String stringResult = PasswordParamConverter.convert(String.class, "test");
+        Assert.assertEquals("test", stringResult);
+
+        boolean booleanResult = PasswordParamConverter.convert(Boolean.class, "false");
+        Assert.assertEquals(false, booleanResult);
+
+        double doubleResult = PasswordParamConverter.convert(Double.class, "0.0012");
+        Assert.assertEquals(0.0012, doubleResult, 0);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testEmptyValue() {
+        PasswordParamConverter.convert(Double.class, "");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testUnsupportedKlass() {
+        PasswordParamConverter.convert(Float.class, "0.012f");
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/secret/password/PasswordValidatorTest.java b/logstash-core/src/test/java/org/logstash/secret/password/PasswordValidatorTest.java
new file mode 100644
index 000000000..65192e5fa
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/secret/password/PasswordValidatorTest.java
@@ -0,0 +1,47 @@
+package org.logstash.secret.password;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Test for {@link PasswordValidator}
+ */
+public class PasswordValidatorTest {
+
+    private PasswordValidator passwordValidator;
+
+    @Before
+    public void setUp() {
+        Map<PasswordPolicyType, PasswordPolicyParam> policies = new HashMap<>();
+        policies.put(PasswordPolicyType.EMPTY_STRING, new PasswordPolicyParam());
+        policies.put(PasswordPolicyType.DIGIT, new PasswordPolicyParam());
+        policies.put(PasswordPolicyType.LENGTH, new PasswordPolicyParam("MINIMUM_LENGTH", "8"));
+        policies.put(PasswordPolicyType.LOWER_CASE, new PasswordPolicyParam());
+        policies.put(PasswordPolicyType.UPPER_CASE, new PasswordPolicyParam());
+        policies.put(PasswordPolicyType.SYMBOL, new PasswordPolicyParam());
+        passwordValidator = new PasswordValidator(policies);
+    }
+
+    @Test
+    public void testPolicyMap() {
+        Assert.assertEquals(6, passwordValidator.validators.size());
+    }
+
+    @Test
+    public void testValidPassword() {
+        String output = passwordValidator.validate("Password123$");
+        Assert.assertTrue(output.isEmpty());
+    }
+
+    @Test
+    public void testPolicyCombinedOutput() {
+        String specialCharacterErrorMessage = "must contain at least one special character";
+        String upperCaseErrorMessage = "must contain at least one upper case";
+        String output = passwordValidator.validate("password123");
+        Assert.assertTrue(output.contains(specialCharacterErrorMessage) && output.contains(upperCaseErrorMessage));
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/secret/password/SymbolValidatorTest.java b/logstash-core/src/test/java/org/logstash/secret/password/SymbolValidatorTest.java
new file mode 100644
index 000000000..e16bf52e4
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/secret/password/SymbolValidatorTest.java
@@ -0,0 +1,33 @@
+package org.logstash.secret.password;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Optional;
+
+/**
+ * A test class for {@link SymbolValidator}
+ */
+public class SymbolValidatorTest {
+
+    private SymbolValidator symbolValidator;
+
+    @Before
+    public void setUp() {
+        symbolValidator = new SymbolValidator();
+    }
+
+    @Test
+    public void testValidateSuccess() {
+        Optional<String> result = symbolValidator.validate("Password123$");
+        Assert.assertFalse(result.isPresent());
+    }
+
+    @Test
+    public void testValidateFailure() {
+        Optional<String> result = symbolValidator.validate("Password123");
+        Assert.assertTrue(result.isPresent());
+        Assert.assertEquals(result.get(), "must contain at least one special character");
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/secret/password/UpperCaseValidatorTest.java b/logstash-core/src/test/java/org/logstash/secret/password/UpperCaseValidatorTest.java
new file mode 100644
index 000000000..ff004a91d
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/secret/password/UpperCaseValidatorTest.java
@@ -0,0 +1,33 @@
+package org.logstash.secret.password;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Optional;
+
+/**
+ * A test class for {@link UpperCaseValidator}
+ */
+public class UpperCaseValidatorTest {
+
+    private UpperCaseValidator upperCaseValidator;
+
+    @Before
+    public void setUp() {
+        upperCaseValidator = new UpperCaseValidator();
+    }
+
+    @Test
+    public void testValidateSuccess() {
+        Optional<String> result = upperCaseValidator.validate("Password123$");
+        Assert.assertFalse(result.isPresent());
+    }
+
+    @Test
+    public void testValidateFailure() {
+        Optional<String> result = upperCaseValidator.validate("password123");
+        Assert.assertTrue(result.isPresent());
+        Assert.assertEquals(result.get(), "must contain at least one upper case");
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/secret/store/SecretStoreFactoryTest.java b/logstash-core/src/test/java/org/logstash/secret/store/SecretStoreFactoryTest.java
index c753da617..7bf133745 100644
--- a/logstash-core/src/test/java/org/logstash/secret/store/SecretStoreFactoryTest.java
+++ b/logstash-core/src/test/java/org/logstash/secret/store/SecretStoreFactoryTest.java
@@ -1,8 +1,27 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.secret.store;
 
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 import org.logstash.secret.SecretIdentifier;
 import org.logstash.secret.store.backend.JavaKeyStore;
@@ -16,6 +35,7 @@ import java.util.Map;
 import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertThrows;
 import static org.logstash.secret.store.SecretStoreFactory.ENVIRONMENT_PASS_KEY;
 import static org.logstash.secret.store.SecretStoreFactory.KEYSTORE_ACCESS_KEY;
 import static org.logstash.secret.store.SecretStoreFactory.LOGSTASH_MARKER;
@@ -29,9 +49,6 @@ public class SecretStoreFactoryTest {
     @Rule
     public TemporaryFolder folder = new TemporaryFolder();
 
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
     private static final SecretStoreFactory secretStoreFactory = SecretStoreFactory.fromEnvironment();
 
     @Test
@@ -45,12 +62,12 @@ public class SecretStoreFactoryTest {
 
     @Test
     public void testAlternativeImplementationInvalid() {
-        thrown.expect(SecretStoreException.ImplementationNotFoundException.class);
         SecureConfig secureConfig = new SecureConfig();
         secureConfig.add("keystore.classname", "junk".toCharArray());
-        SecretStore secretStore = secretStoreFactory.load(secureConfig);
-        assertThat(secretStore).isInstanceOf(MemoryStore.class);
-        validateMarker(secretStore);
+
+        assertThrows(SecretStoreException.ImplementationNotFoundException.class, () -> {
+            secretStoreFactory.load(secureConfig);
+        });
     }
 
     @Test
@@ -120,9 +137,10 @@ public class SecretStoreFactoryTest {
      */
     @Test
     public void testErrorLoading() {
-        thrown.expect(SecretStoreException.LoadException.class);
-        //default implementation requires a path
-        secretStoreFactory.load(new SecureConfig());
+        assertThrows(SecretStoreException.LoadException.class, () -> {
+            //default implementation requires a path
+            secretStoreFactory.load(new SecureConfig());
+        });
     }
 
     private void validateMarker(SecretStore secretStore) {
@@ -133,10 +151,11 @@ public class SecretStoreFactoryTest {
     /**
      * Valid alternate implementation
      */
-    static class MemoryStore implements SecretStore {
+    public static class MemoryStore implements SecretStore {
 
         Map<SecretIdentifier, ByteBuffer> secrets = new HashMap(1);
 
+        @SuppressWarnings("this-escape")
         public MemoryStore() {
             persistSecret(LOGSTASH_MARKER, LOGSTASH_MARKER.getKey().getBytes(StandardCharsets.UTF_8));
         }
@@ -176,9 +195,13 @@ public class SecretStoreFactoryTest {
             secrets.remove(id);
         }
 
+        @Override
+        public boolean containsSecret(SecretIdentifier id) { return secrets.containsKey(id); }
+
         @Override
         public byte[] retrieveSecret(SecretIdentifier id) {
-            return secrets.get(id).array();
+            ByteBuffer bb = secrets.get(id);
+            return bb != null ? bb.array() : null;
         }
     }
 
diff --git a/logstash-core/src/test/java/org/logstash/secret/store/SecretStoreUtilTest.java b/logstash-core/src/test/java/org/logstash/secret/store/SecretStoreUtilTest.java
index 48a472f7c..f5e8ee3fa 100644
--- a/logstash-core/src/test/java/org/logstash/secret/store/SecretStoreUtilTest.java
+++ b/logstash-core/src/test/java/org/logstash/secret/store/SecretStoreUtilTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.secret.store;
 
 import org.junit.Before;
diff --git a/logstash-core/src/test/java/org/logstash/secret/store/SecureConfigTest.java b/logstash-core/src/test/java/org/logstash/secret/store/SecureConfigTest.java
index 5b83955b2..947b93f48 100644
--- a/logstash-core/src/test/java/org/logstash/secret/store/SecureConfigTest.java
+++ b/logstash-core/src/test/java/org/logstash/secret/store/SecureConfigTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.secret.store;
 
 import org.junit.Before;
diff --git a/logstash-core/src/test/java/org/logstash/secret/store/backend/JavaKeyStoreTest.java b/logstash-core/src/test/java/org/logstash/secret/store/backend/JavaKeyStoreTest.java
index ed2013cd9..bfd9615dd 100644
--- a/logstash-core/src/test/java/org/logstash/secret/store/backend/JavaKeyStoreTest.java
+++ b/logstash-core/src/test/java/org/logstash/secret/store/backend/JavaKeyStoreTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.secret.store.backend;
 
 
@@ -5,7 +25,6 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 import org.logstash.secret.SecretIdentifier;
 import org.logstash.secret.store.SecretStore;
@@ -26,15 +45,18 @@ import java.nio.file.Paths;
 import java.nio.file.attribute.PosixFileAttributeView;
 import java.nio.file.attribute.PosixFilePermission;
 import java.util.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 import static java.nio.file.attribute.PosixFilePermission.*;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Fail.fail;
-import static org.hamcrest.CoreMatchers.isA;
+import static org.junit.Assert.assertThrows;
 import static org.logstash.secret.store.SecretStoreFactory.LOGSTASH_MARKER;
 
 /**
@@ -46,8 +68,6 @@ public class JavaKeyStoreTest {
     private final static String EXTERNAL_TEST_WRITE = "test_external_write";
     @Rule
     public TemporaryFolder folder = new TemporaryFolder();
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
     private JavaKeyStore keyStore;
     private char[] keyStorePath;
     private SecureConfig withDefaultPassConfig;
@@ -188,7 +208,6 @@ public class JavaKeyStoreTest {
      */
     @Test
     public void notLogstashKeystore() throws Exception {
-        thrown.expect(SecretStoreException.class);
         SecureConfig altConfig = new SecureConfig();
         Path altPath = folder.newFolder().toPath().resolve("alt.not.a.logstash.keystore");
         try (OutputStream out = Files.newOutputStream(altPath)) {
@@ -197,7 +216,10 @@ public class JavaKeyStoreTest {
             out.write(randomBytes);
         }
         altConfig.add("keystore.file", altPath.toString().toCharArray());
-        new JavaKeyStore().load(altConfig);
+
+        assertThrows(SecretStoreException.class, () -> {
+            new JavaKeyStore().load(altConfig);
+        });
     }
 
     /**
@@ -207,9 +229,11 @@ public class JavaKeyStoreTest {
      */
     @Test
     public void notLogstashKeystoreNoMarker() throws Exception {
-        thrown.expect(SecretStoreException.LoadException.class);
         withDefinedPassConfig.add("keystore.file", Paths.get(this.getClass().getClassLoader().getResource("not.a.logstash.keystore").toURI()).toString().toCharArray().clone());
-        new JavaKeyStore().load(withDefinedPassConfig);
+
+        assertThrows(SecretStoreException.LoadException.class, () -> {
+            new JavaKeyStore().load(withDefinedPassConfig);
+        });
     }
 
     /**
@@ -291,7 +315,6 @@ public class JavaKeyStoreTest {
      */
     @Test
     public void tamperedKeystore() throws Exception {
-        thrown.expect(SecretStoreException.AccessException.class);
         byte[] keyStoreAsBytes = Files.readAllBytes(Paths.get(new String(keyStorePath)));
         //bump the middle byte by 1
         int tamperLocation = keyStoreAsBytes.length / 2;
@@ -300,7 +323,10 @@ public class JavaKeyStoreTest {
         Files.write(tamperedPath, keyStoreAsBytes);
         SecureConfig sc = new SecureConfig();
         sc.add("keystore.file", tamperedPath.toString().toCharArray());
-        new JavaKeyStore().load(sc);
+
+        assertThrows(SecretStoreException.class, () -> {
+            new JavaKeyStore().load(sc);
+        });
     }
 
     /**
@@ -310,10 +336,12 @@ public class JavaKeyStoreTest {
      */
     @Test
     public void testAlreadyCreated() throws IOException {
-        thrown.expect(SecretStoreException.AlreadyExistsException.class);
         SecureConfig secureConfig = new SecureConfig();
         secureConfig.add("keystore.file", keyStorePath.clone());
-        new JavaKeyStore().create(secureConfig);
+
+        assertThrows(SecretStoreException.AlreadyExistsException.class, () -> {
+            new JavaKeyStore().create(secureConfig);
+        });
     }
 
     /**
@@ -340,7 +368,6 @@ public class JavaKeyStoreTest {
 
     @Test
     public void testDelete() throws IOException {
-        thrown.expect(SecretStoreException.LoadException.class);
         Path altPath = folder.newFolder().toPath().resolve("alt.logstash.keystore");
         SecureConfig altConfig = new SecureConfig();
         altConfig.add("keystore.file", altPath.toString().toCharArray());
@@ -350,8 +377,10 @@ public class JavaKeyStoreTest {
         assertThat(new String(marker, StandardCharsets.UTF_8)).isEqualTo(LOGSTASH_MARKER.getKey());
         secretStore.delete(altConfig.clone());
         assertThat(secretStore.exists(altConfig.clone())).isFalse();
-       new JavaKeyStore().load(altConfig.clone());
 
+        assertThrows(SecretStoreException.LoadException.class, () -> {
+            new JavaKeyStore().load(altConfig.clone());
+        });
     }
 
     /**
@@ -361,12 +390,14 @@ public class JavaKeyStoreTest {
      */
     @Test
     public void testEmptyNotAllowedOnCreate() throws IOException {
-        thrown.expect(SecretStoreException.CreateException.class);
         Path altPath = folder.newFolder().toPath().resolve("alt.logstash.keystore");
         SecureConfig altConfig = new SecureConfig();
         altConfig.add("keystore.file", altPath.toString().toCharArray());
         altConfig.add(SecretStoreFactory.KEYSTORE_ACCESS_KEY, "".toCharArray());
-        new JavaKeyStore().create(altConfig);
+
+        assertThrows(SecretStoreException.CreateException.class, () -> {
+            new JavaKeyStore().create(altConfig);
+        });
     }
 
     /**
@@ -376,7 +407,6 @@ public class JavaKeyStoreTest {
      */
     @Test
     public void testEmptyNotAllowedOnExisting() throws Exception {
-        thrown.expect(SecretStoreException.AccessException.class);
         Path altPath = folder.newFolder().toPath().resolve("alt.logstash.keystore");
         SecureConfig altConfig = new SecureConfig();
         altConfig.add("keystore.file", altPath.toString().toCharArray());
@@ -384,7 +414,10 @@ public class JavaKeyStoreTest {
         altConfig2.add("keystore.file", altPath.toString().toCharArray());
         altConfig2.add(SecretStoreFactory.KEYSTORE_ACCESS_KEY, "".toCharArray());
         new JavaKeyStore().create(altConfig);
-        new JavaKeyStore().load(altConfig2);
+
+        assertThrows(SecretStoreException.AccessException.class, () -> {
+            new JavaKeyStore().load(altConfig2);
+        });
     }
 
     /**
@@ -561,17 +594,20 @@ public class JavaKeyStoreTest {
 
     @Test
     public void testLoadNotCreated() throws IOException {
-        thrown.expect(SecretStoreException.LoadException.class);
         Path altPath = folder.newFolder().toPath().resolve("alt.logstash.keystore");
         SecureConfig secureConfig = new SecureConfig();
         secureConfig.add("keystore.file", altPath.toString().toCharArray());
-        new JavaKeyStore().load(secureConfig.clone());
+
+        assertThrows(SecretStoreException.LoadException.class, () -> {
+            new JavaKeyStore().load(secureConfig.clone());
+        });
     }
 
     @Test
     public void testNoPathDefined() {
-        thrown.expect(SecretStoreException.LoadException.class);
-        new JavaKeyStore().load(new SecureConfig());
+        assertThrows(SecretStoreException.LoadException.class, () -> {
+            new JavaKeyStore().load(new SecureConfig());
+        });
     }
 
     /**
@@ -665,8 +701,37 @@ public class JavaKeyStoreTest {
      */
     @Test
     public void wrongPassword() throws Exception {
-        thrown.expect(SecretStoreException.AccessException.class);
         withDefinedPassConfig.add(SecretStoreFactory.KEYSTORE_ACCESS_KEY, "wrongpassword".toCharArray());
-        new JavaKeyStore().load(withDefinedPassConfig);
+
+        assertThrows(SecretStoreException.AccessException.class, () -> {
+            new JavaKeyStore().load(withDefinedPassConfig);
+        });
+    }
+
+    @Test(timeout = 40_000)
+    public void concurrentReadTest() throws Exception {
+
+        final int KEYSTORE_COUNT = 250;
+
+        final ExecutorService executorService = Executors.newFixedThreadPool(KEYSTORE_COUNT);
+        String password = "pAssW3rd!";
+        keyStore.persistSecret(new SecretIdentifier("password"), password.getBytes(StandardCharsets.UTF_8));
+        try{
+            Callable<byte[]> reader = () -> keyStore.retrieveSecret(new SecretIdentifier("password"));
+
+            List<Future<byte[]>> futures = new ArrayList<>();
+            for (int i = 0; i < KEYSTORE_COUNT; i++) {
+                futures.add(executorService.submit(reader));
+            }
+
+            for (Future<byte[]> future : futures) {
+                byte[] result = future.get();
+                assertThat(result).isNotNull();
+                assertThat(new String(result, StandardCharsets.UTF_8)).isEqualTo(password);
+            }
+        } finally {
+            executorService.shutdownNow();
+            executorService.awaitTermination(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
+        }
     }
 }
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/settings/BooleanTest.java b/logstash-core/src/test/java/org/logstash/settings/BooleanTest.java
new file mode 100644
index 000000000..c99f6552b
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/settings/BooleanTest.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.settings;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class BooleanTest {
+
+
+    private Boolean sut;
+
+    @Before
+    public void setUp() {
+        sut = new Boolean("api.enabled", true);
+    }
+
+    @Test
+    public void givenLiteralBooleanStringValueWhenCoercedToBooleanValueThenIsValidBooleanSetting() {
+        sut.set("false");
+
+        Assert.assertFalse(sut.value());
+    }
+
+    @Test
+    public void givenBooleanInstanceWhenCoercedThenReturnValidBooleanSetting() {
+        sut.set(java.lang.Boolean.FALSE);
+
+        Assert.assertFalse(sut.value());
+    }
+
+    @Test
+    public void givenInvalidStringLiteralForBooleanValueWhenCoercedThenThrowsAnError() {
+        IllegalArgumentException exception = Assert.assertThrows(IllegalArgumentException.class, () -> sut.set("bananas"));
+        assertThat(exception.getMessage(), equalTo("Cannot coerce `bananas` to boolean (api.enabled)"));
+    }
+
+    @Test
+    public void givenInvalidTypeInstanceForBooleanValueWhenCoercedThenThrowsAnError() {
+        IllegalArgumentException exception = Assert.assertThrows(IllegalArgumentException.class, () -> sut.set(1));
+        assertThat(exception.getMessage(), equalTo("Cannot coerce `1` to boolean (api.enabled)"));
+    }
+
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/settings/SettingNullableStringTest.java b/logstash-core/src/test/java/org/logstash/settings/SettingNullableStringTest.java
new file mode 100644
index 000000000..aaa3cee7c
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/settings/SettingNullableStringTest.java
@@ -0,0 +1,71 @@
+package org.logstash.settings;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.*;
+
+@RunWith(Enclosed.class)
+public class SettingNullableStringTest {
+
+    public static class WithValueConstraintCase{
+        private static final List<String> POSSIBLE_VALUES = List.of("a", "b", "c");
+        private SettingString sut;
+
+        @Before
+        public void setUp() throws Exception {
+            sut = new SettingNullableString("mytext", POSSIBLE_VALUES.iterator().next(), true, POSSIBLE_VALUES);
+        }
+
+        @Test
+        public void whenSetConstrainedToValueNotPresentInPossibleValuesThenThrowAHelpfulError() {
+            IllegalArgumentException ex = assertThrows(IllegalArgumentException.class, () -> {
+                sut.set("d");
+            });
+            assertThat(ex.getMessage(), containsString("Invalid value \"mytext: d\""));
+        }
+
+        @Test
+        public void whenSetConstrainedToValuePresentInPossibleValuesThenSetValue() {
+            sut.set("a");
+
+            assertEquals("a", sut.value());
+        }
+
+        @Test
+        public void whenSetConstrainedToNullThenSetValue() {
+            sut.set(null);
+
+            assertNull(sut.value());
+        }
+    }
+
+    public static class WithoutValueConstraintCase {
+        private SettingString sut;
+
+        @Before
+        public void setUp() throws Exception {
+            sut = new SettingNullableString("mytext", "foo", true);
+        }
+
+        @Test
+        public void whenSetUnconstrainedToNonNullValueThenSetValue() {
+            sut.set("a");
+
+            assertEquals("a", sut.value());
+        }
+
+        @Test
+        public void whenSetUnconstrainedToNullThenSetValue() {
+            sut.set(null);
+
+            assertNull(sut.value());
+        }
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/settings/SettingNumericTest.java b/logstash-core/src/test/java/org/logstash/settings/SettingNumericTest.java
new file mode 100644
index 000000000..a7ee796d6
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/settings/SettingNumericTest.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.settings;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+// Mirrored from spec/logstash/settings/numeric_spec.rb
+public class SettingNumericTest {
+
+    private SettingNumeric sut;
+
+    @Before
+    public void setUp() {
+        sut = new SettingNumeric("a number", null, false);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void givenValueThatIsNotStringWhenSetIsInvokedThrowsException() {
+        sut.set("not-a-number");
+    }
+
+    @Test
+    public void givenValueStringThatRepresentFloatWhenSetIsInvokedShouldCoerceThatStringToTheNumber() {
+        sut.set("1.1");
+
+        float value = (Float) sut.value();
+        assertEquals(1.1f, value, 0.001);
+    }
+
+    @Test
+    public void givenValueStringThatRepresentIntegerWhenSetIsInvokedShouldCoerceThatStringToTheNumber() {
+        sut.set("1");
+
+        int value = (Integer) sut.value();
+        assertEquals(1, value);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void givenNullValueThenCoerceThrowSpecificError() {
+        sut.set(null);
+    }
+
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/settings/SettingStringTest.java b/logstash-core/src/test/java/org/logstash/settings/SettingStringTest.java
new file mode 100644
index 000000000..4661bcbbe
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/settings/SettingStringTest.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.logstash.settings;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+
+@RunWith(Enclosed.class)
+public class SettingStringTest {
+
+    public static class WithValueConstraintCase {
+        private static final List<String> POSSIBLE_VALUES = List.of("a", "b", "c");
+        private SettingString sut;
+
+        @Before
+        public void setUp() throws Exception {
+            sut = new SettingString("mytext", POSSIBLE_VALUES.iterator().next(), true, POSSIBLE_VALUES);
+        }
+
+        @Test
+        public void whenSetValueNotPresentInPossibleValuesThenThrowAHelpfulError() {
+            IllegalArgumentException ex = assertThrows(IllegalArgumentException.class, () -> {
+                sut.set("d");
+            });
+            assertThat(ex.getMessage(), containsString("Invalid value \"mytext: d\""));
+        }
+
+        @Test
+        public void whenSetConstrainedToValuePresentInPossibleValuesThenSetValue() {
+            sut.set("a");
+
+            assertEquals("a", sut.value());
+        }
+
+        @Test
+        public void whenSetConstrainedToNullThenThrowAHelpfulError() {
+            IllegalArgumentException ex = assertThrows(IllegalArgumentException.class, () -> {
+                sut.set(null);
+            });
+            assertThat(ex.getMessage(), containsString("Setting \"mytext\" must be a String"));
+        }
+    }
+
+    public static class WithoutValueConstraintCase {
+        private SettingString sut;
+
+        @Before
+        public void setUp() throws Exception {
+            sut = new SettingString("mytext", "foo", true);
+        }
+
+        @Test
+        public void whenSetUnconstrainedToNonNullValueThenSetValue() {
+            sut.set("a");
+
+            assertEquals("a", sut.value());
+        }
+
+        @Test
+        public void whenSetUnconstrainedToNullThenThrowAHelpfulError() {
+            IllegalArgumentException ex = assertThrows(IllegalArgumentException.class, () -> {
+                sut.set(null);
+            });
+            assertThat(ex.getMessage(), containsString("Setting \"mytext\" must be a String"));
+        }
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/util/CATrustedFingerprintTrustStrategyTest.java b/logstash-core/src/test/java/org/logstash/util/CATrustedFingerprintTrustStrategyTest.java
new file mode 100644
index 000000000..08b818946
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/util/CATrustedFingerprintTrustStrategyTest.java
@@ -0,0 +1,110 @@
+package org.logstash.util;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class CATrustedFingerprintTrustStrategyTest {
+    private static final X509Certificate CERTIFICATE_ROOT = loadX509Certificate("x509_certificates/generated/root.crt");
+    private static final X509Certificate CERTIFICATE_INTERMEDIATE = loadX509Certificate("x509_certificates/generated/intermediate-ca.crt");
+    private static final X509Certificate CERTIFICATE_SERVER = loadX509Certificate("x509_certificates/generated/server_from_intermediate.crt");
+
+    private static final String FINGERPRINT_ROOT = loadFingerprint("x509_certificates/generated/root.der.sha256");
+    private static final String FINGERPRINT_INTERMEDIATE = loadFingerprint("x509_certificates/generated/intermediate-ca.der.sha256");
+    private static final String FINGERPRINT_SERVER = loadFingerprint("x509_certificates/generated/server_from_intermediate.der.sha256");
+
+    private static final Date DATE_CERTS_GENERATION = loadGeneratedDate("x509_certificates/generated/GENERATED_AT");
+    private static final Date DATE_CERTS_VALID = Date.from(DATE_CERTS_GENERATION.toInstant().plus(5, ChronoUnit.MINUTES));
+    private static final Date DATE_CERTS_EXPIRED = Date.from(DATE_CERTS_GENERATION.toInstant().plus(5000, ChronoUnit.DAYS));
+
+    @Before
+    public void puts() {
+        System.out.format("ROOT: `%s` (%s)\n", FINGERPRINT_ROOT, CERTIFICATE_ROOT.getSubjectX500Principal());
+        System.out.format("INTR: `%s` (%s)\n", FINGERPRINT_INTERMEDIATE, CERTIFICATE_INTERMEDIATE.getSubjectX500Principal());
+        System.out.format("SRVR: `%s` (%s)\n", FINGERPRINT_SERVER, CERTIFICATE_SERVER.getSubjectX500Principal());
+    }
+
+    @Test
+    public void testIsTrustedWhenAMatchingValidCertificateIsRootOfTheChain() throws CertificateException {
+        final CATrustedFingerprintTrustStrategy trustStrategy = new CATrustedFingerprintTrustStrategy(FINGERPRINT_ROOT, ()-> DATE_CERTS_VALID);
+        final X509Certificate[] chain = {CERTIFICATE_SERVER, CERTIFICATE_INTERMEDIATE, CERTIFICATE_ROOT};
+
+        assertTrue(trustStrategy.isTrusted(chain, "noop"));
+    }
+
+    @Test
+    public void testIsTrustedWhenAMatchingValidCertificateIsIntermediateOfTheChain() throws CertificateException {
+        final CATrustedFingerprintTrustStrategy trustStrategy = new CATrustedFingerprintTrustStrategy(FINGERPRINT_INTERMEDIATE, ()-> DATE_CERTS_VALID);
+        final X509Certificate[] chain = {CERTIFICATE_SERVER, CERTIFICATE_INTERMEDIATE, CERTIFICATE_ROOT};
+
+        assertTrue(trustStrategy.isTrusted(chain, "noop"));
+    }
+
+    @Test(expected = CertificateException.class)
+    public void testIsTrustedWhenAMatchingExpiredCertificateIsOnTheChain() throws CertificateException {
+        final CATrustedFingerprintTrustStrategy trustStrategy = new CATrustedFingerprintTrustStrategy(FINGERPRINT_ROOT, ()-> DATE_CERTS_EXPIRED);
+        final X509Certificate[] chain = {CERTIFICATE_SERVER, CERTIFICATE_INTERMEDIATE, CERTIFICATE_ROOT};
+
+        trustStrategy.isTrusted(chain, "noop");
+    }
+
+    @Test
+    public void testIsTrustedWhenNoMatchingCertificateIsOnTheChain() throws CertificateException {
+        final CATrustedFingerprintTrustStrategy trustStrategy = new CATrustedFingerprintTrustStrategy("abad1deaabad1deaabad1deaabad1deaabad1deaabad1deaabad1deaabad1dea", ()-> DATE_CERTS_VALID);
+        final X509Certificate[] chain = {CERTIFICATE_SERVER, CERTIFICATE_INTERMEDIATE, CERTIFICATE_ROOT};
+
+        assertFalse(trustStrategy.isTrusted(chain, "noop"));
+    }
+
+    @Test(expected = CertificateException.class)
+    public void testIsTrustedWhenDisjointedChainPresented() throws CertificateException {
+        final CATrustedFingerprintTrustStrategy trustStrategy = new CATrustedFingerprintTrustStrategy(FINGERPRINT_ROOT, ()-> DATE_CERTS_VALID);
+        final X509Certificate[] chain = {CERTIFICATE_SERVER, CERTIFICATE_ROOT};
+
+        trustStrategy.isTrusted(chain, "noop");
+    }
+
+    private static InputStream getResource(final String name) {
+        return CATrustedFingerprintTrustStrategyTest.class.getResourceAsStream(name);
+    }
+
+    private static X509Certificate loadX509Certificate(final String name) {
+        try {
+            final CertificateFactory cf = CertificateFactory.getInstance("X.509");
+            return (X509Certificate) cf.generateCertificate(getResource(name));
+        } catch (CertificateException e) {
+            throw new IllegalStateException(String.format("FILE: %s", name), e);
+        }
+    }
+
+    private static String loadFingerprint(final String name) {
+        final InputStream inputStream = getResource(name);
+        try {
+            return new String(inputStream.readAllBytes(), StandardCharsets.UTF_8).trim();
+        } catch (IOException e) {
+            throw new IllegalStateException(String.format("FILE: %s", name), e);
+        }
+    }
+
+    private static Date loadGeneratedDate(final String name) {
+        try {
+            final String generatedDate = new String(getResource(name).readAllBytes(), StandardCharsets.UTF_8);
+            return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX").parse(generatedDate);
+        } catch (IOException | ParseException e) {
+            throw new IllegalStateException(String.format("FILE: %s", name), e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/util/CloudSettingAuthTest.java b/logstash-core/src/test/java/org/logstash/util/CloudSettingAuthTest.java
new file mode 100644
index 000000000..e116e4ee0
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/util/CloudSettingAuthTest.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.util;
+
+import org.junit.Test;
+
+import org.logstash.RubyTestBase;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.*;
+
+public class CloudSettingAuthTest extends RubyTestBase {
+
+    @Test
+    public void testThrowExceptionWhenGivenStringWithoutSeparatorOrPassword() {
+        Exception thrownException = assertThrows(org.jruby.exceptions.ArgumentError.class, () -> {
+            new CloudSettingAuth("foobarbaz");
+        });
+        assertThat(thrownException.getMessage(), containsString("Cloud Auth username and password format should be"));
+    }
+
+    @Test
+    public void testThrowExceptionWhenGivenStringWithoutPassword() {
+        Exception thrownException = assertThrows(org.jruby.exceptions.ArgumentError.class, () -> {
+            new CloudSettingAuth("foo:");
+        });
+        assertThat(thrownException.getMessage(), containsString("Cloud Auth username and password format should be"));
+    }
+
+    @Test
+    public void testThrowExceptionWhenGivenStringWithoutUsername() {
+        Exception thrownException = assertThrows(org.jruby.exceptions.ArgumentError.class, () -> {
+            new CloudSettingAuth(":bar");
+        });
+        assertThat(thrownException.getMessage(), containsString("Cloud Auth username and password format should be"));
+    }
+
+    @Test
+    public void testThrowExceptionWhenGivenStringWhichIsEmpty() {
+        Exception thrownException = assertThrows(org.jruby.exceptions.ArgumentError.class, () -> {
+            new CloudSettingAuth("");
+        });
+        assertThat(thrownException.getMessage(), containsString("Cloud Auth username and password format should be"));
+    }
+
+    @Test
+    public void testNullInputDoenstThrowAnException() {
+        new CloudSettingAuth(null);
+    }
+
+
+    @Test
+    public void testWhenGivenStringWhichIsCloudAuthSetTheString() {
+        final CloudSettingAuth sut = new CloudSettingAuth("frodo:baggins");
+        assertEquals("frodo", sut.getUsername());
+        assertEquals("baggins", sut.getPassword().getValue());
+        assertEquals("frodo:<password>", sut.toString());
+    }
+
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/util/CloudSettingIdTest.java b/logstash-core/src/test/java/org/logstash/util/CloudSettingIdTest.java
new file mode 100644
index 000000000..1e04c30cd
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/util/CloudSettingIdTest.java
@@ -0,0 +1,201 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.util;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.logstash.RubyTestBase;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
+
+public class CloudSettingIdTest extends RubyTestBase {
+
+    private String input = "foobar:dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRub3RhcmVhbCRpZGVudGlmaWVy";
+    private CloudSettingId sut;
+
+    @Before
+    public void setUp() {
+        sut = new CloudSettingId(input);
+    }
+
+    // when given unacceptable input
+    @Test
+    public void testNullInputDoenstThrowAnException() {
+        new CloudSettingId(null);
+    }
+
+    @Test
+    public void testNullInputMakesAllGettersReturnNull() {
+        sut = new CloudSettingId(null);
+        assertNull(sut.getOriginal());
+        assertNull(sut.getDecoded());
+        assertNull(sut.getLabel());
+        assertNull(sut.getElasticsearchHost());
+        assertNull(sut.getKibanaHost());
+        assertNull(sut.getElasticsearchScheme());
+        assertNull(sut.getKibanaScheme());
+    }
+
+    @Test
+    public void testThrowExceptionWhenMalformedValueIsGiven() {
+        String[] raw = new String[] {"first", "second"};
+        String encoded = CloudSettingId.cloudIdEncode(raw);
+
+        Exception thrownException = assertThrows(org.jruby.exceptions.ArgumentError.class, () -> {
+            new CloudSettingId(encoded);
+        });
+        assertThat(thrownException.getMessage(), containsString("Cloud Id, after decoding, is invalid. Format: '<segment1>$<segment2>$<segment3>'. Received: \"" + String.join("$", raw) + "\"."));
+    }
+
+    @Test
+    public void testThrowExceptionWhenAtLeatOneSegmentIsEmpty() {
+        String[] raw = new String[] {"first", "", "third"};
+        String encoded = CloudSettingId.cloudIdEncode(raw);
+
+        Exception thrownException = assertThrows(org.jruby.exceptions.ArgumentError.class, () -> {
+            new CloudSettingId(encoded);
+        });
+        assertThat(thrownException.getMessage(), containsString("Cloud Id, after decoding, is invalid. Format: '<segment1>$<segment2>$<segment3>'. Received: \"" + String.join("$", raw) + "\"."));
+    }
+
+    @Test
+    public void testThrowExceptionWhenElasticSegmentSegmentIsUndefined() {
+        String[] raw = new String[] {"us-east-1.aws.found.io", "undefined", "my-kibana"};
+        String encoded = CloudSettingId.cloudIdEncode(raw);
+
+        Exception thrownException = assertThrows(org.jruby.exceptions.ArgumentError.class, () -> {
+            new CloudSettingId(encoded);
+        });
+        assertThat(thrownException.getMessage(), containsString("Cloud Id, after decoding, elasticsearch segment is 'undefined', literally."));
+    }
+
+    @Test
+    public void testThrowExceptionWhenKibanaSegmentSegmentIsUndefined() {
+        String[] raw = new String[] {"us-east-1.aws.found.io", "my-elastic-cluster", "undefined"};
+        String encoded = CloudSettingId.cloudIdEncode(raw);
+
+        Exception thrownException = assertThrows(org.jruby.exceptions.ArgumentError.class, () -> {
+            new CloudSettingId(encoded);
+        });
+        assertThat(thrownException.getMessage(), containsString("Cloud Id, after decoding, the kibana segment is 'undefined', literally. You may need to enable Kibana in the Cloud UI."));
+
+    }
+
+    // without a label
+    @Test
+    public void testDecodingWithoutLabelSegment() {
+        sut = new CloudSettingId("dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRub3RhcmVhbCRpZGVudGlmaWVy");
+
+        assertEquals("#label is empty", "", sut.getLabel());
+        assertEquals("#decode is set", "us-east-1.aws.found.io$notareal$identifier", sut.getDecoded());
+    }
+
+    // when given acceptable input, the accessors:
+    @Test
+    public void testAccessorsWithAcceptableInput() {
+        assertEquals("#original has a value", input, sut.getOriginal());
+        assertEquals("#decoded has a value", "us-east-1.aws.found.io$notareal$identifier", sut.getDecoded());
+        assertEquals("#label has a value", "foobar", sut.getLabel());
+        assertEquals("#elasticsearch_host has a value", "notareal.us-east-1.aws.found.io:443", sut.getElasticsearchHost());
+        assertEquals("#elasticsearch_scheme has a value", "https", sut.getElasticsearchScheme());
+        assertEquals("#kibana_host has a value", "identifier.us-east-1.aws.found.io:443", sut.getKibanaHost());
+        assertEquals("#kibana_scheme has a value", "https", sut.getKibanaScheme());
+        assertEquals("#to_s has a value of #decoded", sut.toString(), sut.getDecoded());
+    }
+
+    @Test
+    public void testWhenCloudIdContainsPortDescriptionForESAndKibana() {
+        sut = new CloudSettingId("different-es-kb-port:dXMtY2VudHJhbDEuZ2NwLmNsb3VkLmVzLmlvJGFjMzFlYmI5MDI0MTc3MzE1NzA0M2MzNGZkMjZmZDQ2OjkyNDMkYTRjMDYyMzBlNDhjOGZjZTdiZTg4YTA3NGEzYmIzZTA6OTI0NA==");
+
+        assertEquals("decodes the elasticsearch port corretly", "ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io:9243", sut.getElasticsearchHost());
+        assertEquals("decodes the kibana port corretly", "a4c06230e48c8fce7be88a074a3bb3e0.us-central1.gcp.cloud.es.io:9244", sut.getKibanaHost());
+    }
+
+    @Test
+    public void testWhenCloudIdContainsCloudPort() {
+        sut = new CloudSettingId("custom-port:dXMtY2VudHJhbDEuZ2NwLmNsb3VkLmVzLmlvOjkyNDMkYWMzMWViYjkwMjQxNzczMTU3MDQzYzM0ZmQyNmZkNDYkYTRjMDYyMzBlNDhjOGZjZTdiZTg4YTA3NGEzYmIzZTA=");
+
+        assertEquals("decodes the elasticsearch port corretly", "ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io:9243", sut.getElasticsearchHost());
+        assertEquals("decodes the kibana port corretly", "a4c06230e48c8fce7be88a074a3bb3e0.us-central1.gcp.cloud.es.io:9243", sut.getKibanaHost());
+    }
+
+    @Test
+    public void testWhenCloudIdOnlyDefinesKibanaPort() {
+        sut = new CloudSettingId("only-kb-set:dXMtY2VudHJhbDEuZ2NwLmNsb3VkLmVzLmlvJGFjMzFlYmI5MDI0MTc3MzE1NzA0M2MzNGZkMjZmZDQ2JGE0YzA2MjMwZTQ4YzhmY2U3YmU4OGEwNzRhM2JiM2UwOjkyNDQ=");
+
+        assertEquals("defaults the elasticsearch port to 443", "ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io:443", sut.getElasticsearchHost());
+        assertEquals("decodes the kibana port corretly", "a4c06230e48c8fce7be88a074a3bb3e0.us-central1.gcp.cloud.es.io:9244", sut.getKibanaHost());
+    }
+
+    @Test
+    public void testWhenCloudIdDefinesCloudPortAndKibanaPort() {
+        sut = new CloudSettingId("host-and-kb-set:dXMtY2VudHJhbDEuZ2NwLmNsb3VkLmVzLmlvOjkyNDMkYWMzMWViYjkwMjQxNzczMTU3MDQzYzM0ZmQyNmZkNDYkYTRjMDYyMzBlNDhjOGZjZTdiZTg4YTA3NGEzYmIzZTA6OTI0NA==");
+
+        assertEquals("sets the elasticsearch port to cloud port", "ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io:9243", sut.getElasticsearchHost());
+        assertEquals("overrides cloud port with the kibana port", "a4c06230e48c8fce7be88a074a3bb3e0.us-central1.gcp.cloud.es.io:9244", sut.getKibanaHost());
+    }
+
+    @Test
+    public void testWhenCloudIdDefinesExtraData() {
+        sut = new CloudSettingId("extra-items:dXMtY2VudHJhbDEuZ2NwLmNsb3VkLmVzLmlvJGFjMzFlYmI5MDI0MTc3MzE1NzA0M2MzNGZkMjZmZDQ2JGE0YzA2MjMwZTQ4YzhmY2U3YmU4OGEwNzRhM2JiM2UwJGFub3RoZXJpZCRhbmRhbm90aGVy");
+
+        assertEquals("captures the elasticsearch host", "ac31ebb90241773157043c34fd26fd46.us-central1.gcp.cloud.es.io:443", sut.getElasticsearchHost());
+        assertEquals("captures the kibana host", "a4c06230e48c8fce7be88a074a3bb3e0.us-central1.gcp.cloud.es.io:443", sut.getKibanaHost());
+        assertArrayEquals("captures the remaining identifiers", new String[] {"anotherid", "andanother"}, sut.getOtherIdentifiers());
+    }
+
+    // when given acceptable input (with empty kibana uuid), the accessors:
+    @Test
+    public void testGivenAcceptableInputEmptyKibanaUUID() {
+        input = "a-test:ZWNlLmhvbWUubGFuJHRlc3Qk";
+        sut = new CloudSettingId(input); // ece.home.lan$test$
+
+        assertEquals("#original has a value", input, sut.getOriginal());
+        assertEquals("#decoded has a value", "ece.home.lan$test$", sut.getDecoded());
+        assertEquals("#label has a value", "a-test", sut.getLabel());
+        assertEquals("#elasticsearch_host has a value", "test.ece.home.lan:443", sut.getElasticsearchHost());
+        assertEquals("#elasticsearch_scheme has a value", "https", sut.getElasticsearchScheme());
+        // NOTE: kibana part is not relevant -> this is how python/beats(go) code behaves
+        assertEquals("#kibana_host has a value", ".ece.home.lan:443", sut.getKibanaHost());
+        assertEquals("#kibana_scheme has a value", "https", sut.getKibanaScheme());
+        assertEquals("#toString has a value of #decoded", sut.getDecoded(), sut.toString());
+    }
+
+    // a lengthy real-world input, the accessors:
+    @Test
+    public void testWithRealWorldInput() {
+        //eastus2.azure.elastic-cloud.com:9243$40b343116cfa4ebcb76c11ee2329f92d$43d09252502c4189a376fd0cf2cd0848
+        input = "ZWFzdHVzMi5henVyZS5lbGFzdGljLWNsb3VkLmNvbTo5MjQzJDQwYjM0MzExNmNmYTRlYmNiNzZjMTFlZTIzMjlmOTJkJDQzZDA5MjUyNTAyYzQxODlhMzc2ZmQwY2YyY2QwODQ4";
+        sut = new CloudSettingId(input);
+
+        assertEquals("#original has a value", input, sut.getOriginal());
+        assertEquals("#decoded has a value", "eastus2.azure.elastic-cloud.com:9243$40b343116cfa4ebcb76c11ee2329f92d$43d09252502c4189a376fd0cf2cd0848", sut.getDecoded());
+        assertEquals("#label has a value", "", sut.getLabel());
+        assertEquals("#elasticsearch_host has a value", "40b343116cfa4ebcb76c11ee2329f92d.eastus2.azure.elastic-cloud.com:9243", sut.getElasticsearchHost());
+        assertEquals("#kibana_host has a value", "43d09252502c4189a376fd0cf2cd0848.eastus2.azure.elastic-cloud.com:9243", sut.getKibanaHost());
+        assertEquals("#toString has a value of #decoded", sut.getDecoded(), sut.toString());
+    }
+}
diff --git a/logstash-core/src/test/java/org/logstash/util/ExponentialBackoffTest.java b/logstash-core/src/test/java/org/logstash/util/ExponentialBackoffTest.java
new file mode 100644
index 000000000..4663e4b0c
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/util/ExponentialBackoffTest.java
@@ -0,0 +1,39 @@
+package org.logstash.util;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import java.io.IOException;
+
+public class ExponentialBackoffTest {
+    @Test
+    public void testWithoutException() throws Exception {
+        ExponentialBackoff backoff = new ExponentialBackoff(1L);
+        CheckedSupplier<Integer> supplier = () -> 1 + 1;
+        Assertions.assertThatCode(() -> backoff.retryable(supplier)).doesNotThrowAnyException();
+        Assertions.assertThat(backoff.retryable(supplier)).isEqualTo(2);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testOneException() throws Exception {
+        ExponentialBackoff backoff = new ExponentialBackoff(1L);
+        CheckedSupplier<Boolean> supplier = Mockito.mock(CheckedSupplier.class);
+        Mockito.when(supplier.get()).thenThrow(new IOException("can't write to disk")).thenReturn(true);
+        Boolean b = backoff.retryable(supplier);
+        Assertions.assertThat(b).isEqualTo(true);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testExceptionsReachMaxRetry() throws Exception {
+        ExponentialBackoff backoff = new ExponentialBackoff(2L);
+        CheckedSupplier<Boolean> supplier = Mockito.mock(CheckedSupplier.class);
+        Mockito.when(supplier.get()).thenThrow(new IOException("can't write to disk"));
+        Assertions.assertThatThrownBy(() -> backoff.retryable(supplier))
+                .isInstanceOf(ExponentialBackoff.RetryException.class)
+                .hasMessageContaining("max retry");
+    }
+
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/java/org/logstash/util/SetOnceReferenceTest.java b/logstash-core/src/test/java/org/logstash/util/SetOnceReferenceTest.java
new file mode 100644
index 000000000..5dc469790
--- /dev/null
+++ b/logstash-core/src/test/java/org/logstash/util/SetOnceReferenceTest.java
@@ -0,0 +1,284 @@
+package org.logstash.util;
+
+import org.junit.Test;
+
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.sameInstance;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertThrows;
+
+public class SetOnceReferenceTest {
+    @Test
+    public void testFromUnset() {
+        checkUnsetReference(SetOnceReference.unset());
+    }
+
+    @Test
+    public void testFromOfWithValue() {
+        final Sentinel sentinel = new Sentinel();
+        checkSetReferenceIsImmutable(SetOnceReference.of(sentinel), sentinel);
+    }
+
+    @Test
+    public void testFromOfWithNull() {
+        assertThrows(NullPointerException.class, () -> SetOnceReference.of(null));
+    }
+
+    @Test
+    public void testFromOfNullableWithNull() {
+        checkUnsetReference(SetOnceReference.ofNullable(null));
+    }
+
+    @Test
+    public void testFromOfNullableWithValue() {
+        final Sentinel sentinel = new Sentinel();
+        checkSetReferenceIsImmutable(SetOnceReference.ofNullable(sentinel), sentinel);
+    }
+
+    @Test
+    public void testUnsetOfferValue() {
+        final Sentinel offeredSentinel = new Sentinel();
+        final SetOnceReference<Sentinel> reference = SetOnceReference.unset();
+        assertThat(reference.offer(offeredSentinel), is(true));
+
+        checkSetReferenceIsImmutable(reference, offeredSentinel);
+    }
+
+    @Test
+    public void testUnsetOfferSupplier() {
+        final Sentinel offeredSentinel = new Sentinel();
+        final SetOnceReference<Sentinel> reference = SetOnceReference.unset();
+        assertThat(reference.offer(() -> offeredSentinel), is(true));
+
+        checkSetReferenceIsImmutable(reference, offeredSentinel);
+    }
+
+    @Test
+    public void testUnsetOfferNullValue() {
+        final SetOnceReference<Sentinel> reference = SetOnceReference.unset();
+        assertThrows(NullPointerException.class, () -> reference.offer((Sentinel) null));
+    }
+
+    @Test
+    public void testUnsetOfferSupplierThatReturnsNullValue() {
+        final SetOnceReference<Sentinel> reference = SetOnceReference.unset();
+        assertThat(reference.offer(() -> null), is(false));
+
+        checkUnsetReference(reference);
+    }
+
+    @Test
+    public void testUnsetIfSetOrElseSupply() {
+        final Sentinel suppliedSentinel = new Sentinel();
+        final SetOnceReference<Sentinel> reference = SetOnceReference.unset();
+
+        final MutableReference<Boolean> supplierCalled = new MutableReference<>(false);
+        final MutableReference<Boolean> consumerCalled = new MutableReference<>(false);
+
+        final boolean returnValue = reference.ifSetOrElseSupply(
+                (v) -> consumerCalled.setValue(true),
+                () -> { supplierCalled.setValue(true); return suppliedSentinel; }
+        );
+
+        assertThat(returnValue, is(true));
+        assertThat(supplierCalled.getValue(), is(true));
+        assertThat(consumerCalled.getValue(), is(false));
+
+        checkSetReferenceIsImmutable(reference, suppliedSentinel);
+    }
+
+    @Test
+    public void testUnsetIfSetOrElseSupplyNullValue() {
+        final Sentinel nullSentinel = null;
+        final SetOnceReference<Sentinel> reference = SetOnceReference.unset();
+
+        final MutableReference<Boolean> consumerCalled = new MutableReference<>(false);
+
+        //noinspection ConstantConditions
+        assertThrows(NullPointerException.class, () ->
+            reference.ifSetOrElseSupply(
+                    (v) -> consumerCalled.setValue(true),
+                    () -> nullSentinel
+            )
+        );
+
+        assertThat(consumerCalled.getValue(), is(false));
+
+        checkUnsetReference(reference);
+    }
+
+    @Test
+    public void testUnsetOfferAndGetWithValue() {
+        final Sentinel suppliedSentinel = new Sentinel();
+        final SetOnceReference<Sentinel> reference = SetOnceReference.unset();
+
+        assertThat(reference.offerAndGet(suppliedSentinel), is(sameInstance(suppliedSentinel)));
+
+        checkSetReferenceIsImmutable(reference, suppliedSentinel);
+    }
+    @Test
+    public void testUnsetOfferAndGetWithNullValue() {
+        final Sentinel nullSentinel = null;
+        final SetOnceReference<Sentinel> reference = SetOnceReference.unset();
+
+        //noinspection ConstantConditions
+        assertThrows(NullPointerException.class, () -> reference.offerAndGet(nullSentinel));
+
+        checkUnsetReference(reference);
+    }
+
+    @Test
+    public void testUnsetOfferAndGetWithSupplier() {
+        final Sentinel suppliedSentinel = new Sentinel();
+        final SetOnceReference<Sentinel> reference = SetOnceReference.unset();
+
+        assertThat(reference.offerAndGet(() -> suppliedSentinel), is(sameInstance(suppliedSentinel)));
+
+        checkSetReferenceIsImmutable(reference, suppliedSentinel);
+    }
+    @Test
+    public void testUnsetOfferAndGetWithNullReturningSupplier() {
+        final Sentinel nullSentinel = null;
+        final SetOnceReference<Sentinel> reference = SetOnceReference.unset();
+
+        //noinspection ConstantConditions
+        assertThrows(NullPointerException.class, () -> reference.offerAndGet(() -> nullSentinel));
+
+        checkUnsetReference(reference);
+    }
+
+    @Test
+    public void testUnsetOfferAndGetOptionalWithValue() {
+        final Sentinel suppliedSentinel = new Sentinel();
+        final SetOnceReference<Sentinel> reference = SetOnceReference.unset();
+
+        assertThat(reference.offerAndGetOptional(() -> suppliedSentinel), is(equalTo(Optional.of(suppliedSentinel))));
+
+        checkSetReferenceIsImmutable(reference, suppliedSentinel);
+    }
+
+
+    @Test
+    public void testUnsetOfferAndGetOptionalWithNullValue() {
+        final Sentinel nullSentinel = null;
+        final SetOnceReference<Sentinel> reference = SetOnceReference.unset();
+
+        //noinspection ConstantConditions
+        assertThat(reference.offerAndGetOptional(() -> nullSentinel), is(equalTo(Optional.empty())));
+
+        checkUnsetReference(reference);
+    }
+
+    void checkUnsetReference(final SetOnceReference<Sentinel> unsetReference) {
+        assertThat(unsetReference.isSet(), is(false));
+        assertThrows(NoSuchElementException.class, unsetReference::get);
+        assertThat(unsetReference.orElse(null), is(nullValue()));
+        assertThat(unsetReference.asOptional(), is(equalTo(Optional.empty())));
+
+        // double-check that none of the above mutated our reference
+        assertThat(unsetReference.isSet(), is(false));
+    }
+
+    void checkExpectedValue(final SetOnceReference<Sentinel> immutable, final Sentinel expectedValue) {
+        Objects.requireNonNull(expectedValue);
+
+        assertThat(immutable.isSet(), is(true));
+        assertThat(immutable.get(), is(sameInstance(expectedValue)));
+        assertThat(immutable.orElse(new Sentinel()), is(sameInstance(expectedValue)));
+        assertThat(immutable.asOptional(), is(equalTo(Optional.of(expectedValue))));
+    }
+
+    void checkSetReferenceIsImmutable(final SetOnceReference<Sentinel> immutable, final Sentinel expectedValue) {
+        Objects.requireNonNull(expectedValue);
+
+        checkExpectedValue(immutable, expectedValue); // sanity check
+
+        checkImmutableOffer(immutable, expectedValue);
+        checkImmutableIfSetOrElseSupply(immutable, expectedValue);
+        checkImmutableOfferAndGetValue(immutable, expectedValue);
+        checkImmutableOfferAndGetSupplier(immutable, expectedValue);
+
+        checkExpectedValue(immutable, expectedValue);
+    }
+
+    void checkImmutableOffer(final SetOnceReference<Sentinel> immutable, final Sentinel expectedValue) {
+        assertThat(immutable.offer(new Sentinel()), is(false));
+
+        checkExpectedValue(immutable, expectedValue);
+    }
+
+    void checkImmutableOfferAndGetValue(final SetOnceReference<Sentinel> immutable, final Sentinel expectedValue) {
+        assertThat(immutable.offerAndGet(new Sentinel()), is(sameInstance(expectedValue)));
+
+        checkExpectedValue(immutable, expectedValue);
+    }
+
+    void checkImmutableOfferAndGetSupplier(final SetOnceReference<Sentinel> immutable, final Sentinel expectedValue) {
+        final MutableReference<Boolean> supplierCalled = new MutableReference<>(false);
+        final Supplier<Sentinel> sentinelSupplier = () -> {
+            supplierCalled.setValue(true);
+            return new Sentinel();
+        };
+        assertThat(immutable.offerAndGet(sentinelSupplier), is(sameInstance(expectedValue)));
+        assertThat(supplierCalled.getValue(), is(false));
+
+        checkExpectedValue(immutable, expectedValue);
+    }
+
+    void checkImmutableIfSetOrElseSupply(final SetOnceReference<Sentinel> immutable, final Sentinel expectedValue) {
+        final MutableReference<Boolean> supplierCalled = new MutableReference<>(false);
+        final MutableReference<Boolean> consumerCalled = new MutableReference<>(false);
+        final MutableReference<Sentinel> consumed = new MutableReference<>(null);
+
+        final boolean returnValue = immutable.ifSetOrElseSupply(
+                (v) -> { consumerCalled.setValue(true); consumed.setValue(v); },
+                () -> { supplierCalled.setValue(true); return new Sentinel(); }
+        );
+
+        assertThat(returnValue, is(false));
+        assertThat(supplierCalled.getValue(), is(false));
+        assertThat(consumerCalled.getValue(), is(true));
+        assertThat(consumed.getValue(), is(sameInstance(expectedValue)));
+
+        checkExpectedValue(immutable, expectedValue);
+    }
+
+    private static class MutableReference<T> {
+        T value;
+
+        public MutableReference(T value) {
+            this.value = value;
+        }
+
+        public T getValue() {
+            return value;
+        }
+
+        public void setValue(T value) {
+            this.value = value;
+        }
+    }
+
+    private static class Sentinel {
+        private static final AtomicLong ID_GENERATOR = new AtomicLong();
+        private final long id;
+        private Sentinel(){
+            this.id = ID_GENERATOR.incrementAndGet();
+        }
+
+        @Override
+        public String toString() {
+            return "Sentinel{" +
+                    "id=" + id +
+                    '}';
+        }
+    }
+}
\ No newline at end of file
diff --git a/logstash-core/src/test/resources/log4j-pipeline-routing.xml b/logstash-core/src/test/resources/log4j-pipeline-routing.xml
new file mode 100644
index 000000000..7ed55a706
--- /dev/null
+++ b/logstash-core/src/test/resources/log4j-pipeline-routing.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<Configuration status="OFF" name="RoutingTest">
+  <Properties>
+    <Property name="filename">build/routing1/routingtest-$${sd:type}.log</Property>
+  </Properties>
+  <ThresholdFilter level="debug"/>
+
+  <Appenders>
+    <Console name="STDOUT">
+      <PatternLayout pattern="%m%n"/>
+    </Console>
+    <PipelineRouting name="pipeline_routing">
+      <List name="appender-${ctx:pipeline.id}">
+        <ThresholdFilter level="debug"/>
+      </List>
+    </PipelineRouting>
+  </Appenders>
+
+  <Loggers>
+    <Logger name="EventLogger" level="info" additivity="false">
+      <AppenderRef ref="pipeline_routing"/>
+    </Logger>
+
+    <Root level="error">
+      <AppenderRef ref="STDOUT"/>
+    </Root>
+  </Loggers>
+
+</Configuration>
\ No newline at end of file
diff --git a/logstash-core/src/test/resources/log4j2-log-deprecation-test.properties b/logstash-core/src/test/resources/log4j2-log-deprecation-test.properties
new file mode 100644
index 000000000..6794c96e1
--- /dev/null
+++ b/logstash-core/src/test/resources/log4j2-log-deprecation-test.properties
@@ -0,0 +1,28 @@
+status = error
+name = LogstashPropertiesConfig
+
+# Deprecation log
+appender.deprecation_rolling.type = RollingFile
+appender.deprecation_rolling.name = deprecation_plain_rolling
+appender.deprecation_rolling.fileName = ${sys:ls.logs}/logstash-deprecation.log
+appender.deprecation_rolling.filePattern = ${sys:ls.logs}/logstash-deprecation-%d{yyyy-MM-dd}-%i.log.gz
+appender.deprecation_rolling.policies.type = Policies
+appender.deprecation_rolling.policies.time.type = TimeBasedTriggeringPolicy
+appender.deprecation_rolling.policies.time.interval = 1
+appender.deprecation_rolling.policies.time.modulate = true
+appender.deprecation_rolling.layout.type = PatternLayout
+appender.deprecation_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]} %m%n
+appender.deprecation_rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.deprecation_rolling.policies.size.size = 100MB
+appender.deprecation_rolling.strategy.type = DefaultRolloverStrategy
+appender.deprecation_rolling.strategy.max = 30
+
+logger.deprecation.name = org.logstash.deprecation
+logger.deprecation.level = WARN
+logger.deprecation.appenderRef.deprecation_rolling.ref = deprecation_plain_rolling
+logger.deprecation.additivity = false
+
+logger.deprecation_root.name = deprecation
+logger.deprecation_root.level = WARN
+logger.deprecation_root.appenderRef.deprecation_rolling.ref = deprecation_plain_rolling
+logger.deprecation_root.additivity = false
diff --git a/logstash-core/src/test/resources/log4j2-log-pipeline-test.properties b/logstash-core/src/test/resources/log4j2-log-pipeline-test.properties
new file mode 100644
index 000000000..6c24ef2de
--- /dev/null
+++ b/logstash-core/src/test/resources/log4j2-log-pipeline-test.properties
@@ -0,0 +1,25 @@
+status = error
+name = LogstashPropertiesConfig
+
+appender.rolling.type = RollingFile
+appender.rolling.name = plain_rolling
+appender.rolling.fileName = ${sys:ls.logs}/logstash-plain.log
+appender.rolling.filePattern = ${sys:ls.logs}/logstash-plain-%d{yyyy-MM-dd}-%i.log.gz
+appender.rolling.policies.type = Policies
+appender.rolling.policies.time.type = TimeBasedTriggeringPolicy
+appender.rolling.policies.time.interval = 1
+appender.rolling.policies.time.modulate = true
+appender.rolling.layout.type = PatternLayout
+appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{plugin.name}]} %-.10000m%n
+appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.rolling.policies.size.size = 100MB
+appender.rolling.strategy.type = DefaultRolloverStrategy
+appender.rolling.strategy.max = 30
+
+appender.routing.type = PipelineRouting
+appender.routing.name = pipeline_routing_appender
+appender.routing.pipeline.type = List
+appender.routing.pipeline.name = appender-${mdc:pipeline.id}
+
+rootLogger.level = DEBUG
+rootLogger.appenderRef.routing.ref = pipeline_routing_appender
diff --git a/logstash-core/src/test/resources/log4j2-log-stream-read-constraints.xml b/logstash-core/src/test/resources/log4j2-log-stream-read-constraints.xml
new file mode 100644
index 000000000..581e13274
--- /dev/null
+++ b/logstash-core/src/test/resources/log4j2-log-stream-read-constraints.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="ALL" name="LoggerTest">
+
+    <Appenders>
+        <List name="EventListAppender" /><!-- No pattern layout enables whole event capture-->
+    </Appenders>
+
+    <Loggers>
+        <Root level="all">
+            <AppenderRef ref="EventListAppender"/>
+        </Root>
+    </Loggers>
+
+</Configuration>
\ No newline at end of file
diff --git a/logstash-core/src/test/resources/log4j2.properties b/logstash-core/src/test/resources/log4j2.properties
new file mode 100644
index 000000000..49fb75a00
--- /dev/null
+++ b/logstash-core/src/test/resources/log4j2.properties
@@ -0,0 +1,11 @@
+name=default
+appenders = console
+
+appender.console.type = Console
+appender.console.name = STDOUT
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = [%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %c{1} - %msg%n
+
+rootLogger.level = info
+rootLogger.appenderRefs = stdout
+rootLogger.appenderRef.stdout.ref = STDOUT
diff --git a/logstash-core/src/test/resources/org/logstash/common/io/1.log b/logstash-core/src/test/resources/org/logstash/common/io/1.log
new file mode 100644
index 000000000..39c7bdd04
Binary files /dev/null and b/logstash-core/src/test/resources/org/logstash/common/io/1.log differ
diff --git a/logstash-core/src/test/resources/org/logstash/config/ir/cache/pipeline1.conf b/logstash-core/src/test/resources/org/logstash/config/ir/cache/pipeline1.conf
new file mode 100644
index 000000000..768365c28
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/config/ir/cache/pipeline1.conf
@@ -0,0 +1,14 @@
+input {
+  stdin { id => "stdin_id_1" }
+}
+
+filter {
+  mutate {
+    id => "mutate_id_1"
+    rename => ["a_field", "into_another"]
+  }
+}
+
+output {
+  stdout { id => "stdout_id_1" }
+}
diff --git a/logstash-core/src/test/resources/org/logstash/config/ir/cache/pipeline2.conf b/logstash-core/src/test/resources/org/logstash/config/ir/cache/pipeline2.conf
new file mode 100644
index 000000000..1ae8670c8
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/config/ir/cache/pipeline2.conf
@@ -0,0 +1,16 @@
+# pipeline similar to pipeline 1 but with different ids
+# no extra classes should be generated because of this
+input {
+  stdin { id => "stdin_id_1" }
+}
+
+filter {
+  mutate {
+    id => "mutate_id_1"
+    rename => ["a_field", "into_another"]
+  }
+}
+
+output {
+  stdout { id => "stdout_id_1" }
+}
diff --git a/logstash-core/src/test/resources/org/logstash/config/ir/cache/pipeline_reuse_baseline.conf b/logstash-core/src/test/resources/org/logstash/config/ir/cache/pipeline_reuse_baseline.conf
new file mode 100644
index 000000000..a612588e9
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/config/ir/cache/pipeline_reuse_baseline.conf
@@ -0,0 +1,33 @@
+input {
+  stdin { }
+}
+
+filter {
+  if [a] {
+    noop {}
+    if [a] { noop {} }
+  }
+  if [a] {
+    if [a] {
+      noop {}
+      if [a] { noop {} }
+      if [a] { noop {} }
+    }
+  }
+  if [a] {
+    if [a] {
+      if [a] {
+        noop {}
+        noop {}
+        if [a] { noop {} }
+      }
+    }
+  }
+}
+output {
+  if [a] { noop {} }
+  else { noop {} }
+  stdout {}
+  stdout {}
+#  stdout {}
+}
diff --git a/logstash-core/src/test/resources/org/logstash/config/ir/cache/pipeline_reuse_test.conf b/logstash-core/src/test/resources/org/logstash/config/ir/cache/pipeline_reuse_test.conf
new file mode 100644
index 000000000..e4477feb8
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/config/ir/cache/pipeline_reuse_test.conf
@@ -0,0 +1,84 @@
+input {
+  stdin { }
+  stdin { }
+  stdin { }
+  stdin { }
+  stdin { }
+}
+
+filter {
+  if [a] {
+    noop {}
+    if [a] { noop {} }
+    if [a] { noop {} }
+    if [a] { noop {} }
+    if [a] { noop {} }
+    if [a] { noop {} }
+  }
+  if [a] {
+    noop {}
+    noop {}
+    noop {}
+    if [a] { noop {} }
+    if [a] { noop {} }
+    if [a] { noop {} }
+    if [a] { noop {} }
+  }
+  if [a] {
+    noop {}
+    if [a] { noop {} }
+  }
+  if [a] {
+    if [a] {
+      noop {}
+      if [a] { noop {} }
+    }
+  }
+  if [a] {
+    if [a] {
+      noop {}
+      if [a] { noop {} }
+    }
+  }
+  if [a] {
+    if [a] {
+      noop {}
+      if [a] { noop {} }
+    }
+    if [a] {
+      noop {}
+      if [a] { noop {} }
+    }
+  }
+  if [a] {
+    if [a] {
+      noop {}
+      if [a] { noop {} }
+      if [a] { noop {} }
+      if [a] { noop {} }
+    }
+  }
+  if [a] {
+    if [a] {
+      if [a] {
+        noop {}
+        if [a] { noop {} }
+        if [a] { noop {} }
+        if [a] { noop {} }
+      }
+    }
+  }
+}
+output {
+  if [a] {
+    noop {}
+  } else {
+    noop {}
+  }
+  if [a] {
+    noop {}
+  } else {
+    noop {}
+  }
+}
+
diff --git a/logstash-core/src/test/resources/org/logstash/plugins/AliasRegistry.yml b/logstash-core/src/test/resources/org/logstash/plugins/AliasRegistry.yml
new file mode 100644
index 000000000..48b852bdc
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/plugins/AliasRegistry.yml
@@ -0,0 +1,16 @@
+input:
+  - alias: aliased_input1
+    from: beats
+    docs:
+      - replace: ":plugin: beats"
+        with: ":plugin: elastic_agent"
+      - replace: ":plugin-uc: Beats"
+        with: ":plugin-uc: Elastic Agent"
+      - replace: ":plugin-singular: Beat"
+        with: ":plugin-singular: Elastic Agent"
+  - alias: aliased_input2
+    from: tcp
+
+filter:
+  - alias: aliased_filter
+    from: json
diff --git a/logstash-core/src/test/resources/org/logstash/plugins/logstash-input-java_input_example-1.0.3.jar b/logstash-core/src/test/resources/org/logstash/plugins/logstash-input-java_input_example-1.0.3.jar
new file mode 100644
index 000000000..2651386c8
Binary files /dev/null and b/logstash-core/src/test/resources/org/logstash/plugins/logstash-input-java_input_example-1.0.3.jar differ
diff --git a/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generate.sh b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generate.sh
new file mode 100755
index 000000000..59baddfb2
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generate.sh
@@ -0,0 +1,51 @@
+# warning: do not use the certificates produced by this tool in production. This is for testing purposes only
+set -e
+
+cd "$(dirname "$0")"
+
+rm -rf generated
+mkdir generated
+cd generated
+
+echo "GENERATED CERTIFICATES FOR TESTING ONLY." >> ./README.txt
+echo "DO NOT USE THESE CERTIFICATES IN PRODUCTION" >> ./README.txt
+
+# certificate authority
+openssl genrsa -out root.key 4096
+openssl req -new -x509 -days 1826 -extensions ca -key root.key -out root.crt -subj "/C=PT/ST=NA/L=Lisbon/O=MyLab/CN=root" -config ../openssl.cnf
+openssl x509 -in root.crt -inform pem -outform der | sha256sum | awk '{print $1}' > root.der.sha256
+
+# intermediate CA
+openssl genrsa -out intermediate-ca.key 4096
+openssl req -new -key intermediate-ca.key -out intermediate-ca.csr -subj "/C=PT/ST=NA/L=Lisbon/O=MyLab/CN=intermediate-ca" -config ../openssl.cnf
+openssl x509 -req -days 1000 -extfile ../openssl.cnf -extensions intermediate_ca -in intermediate-ca.csr -CA root.crt -CAkey root.key -out intermediate-ca.crt -set_serial 01
+openssl x509 -in intermediate-ca.crt -inform pem -outform der | sha256sum | awk '{print $1}' > intermediate-ca.der.sha256
+
+# server certificate from intermediate CA
+openssl genrsa -out server_from_intermediate.key 4096
+openssl req -new -key server_from_intermediate.key -out server_from_intermediate.csr -subj "/C=PT/ST=NA/L=Lisbon/O=MyLab/CN=server" -config ../openssl.cnf
+openssl x509 -req -extensions server_cert -extfile ../openssl.cnf -days 1000 -in server_from_intermediate.csr -CA intermediate-ca.crt -CAkey intermediate-ca.key -set_serial 02 -out server_from_intermediate.crt
+openssl x509 -in server_from_intermediate.crt -inform pem -outform der | sha256sum | awk '{print $1}' > server_from_intermediate.der.sha256
+
+# server certificate from root
+openssl genrsa -out server_from_root.key 4096
+openssl req -new -key server_from_root.key -out server_from_root.csr -subj "/C=PT/ST=NA/L=Lisbon/O=MyLab/CN=server" -config ../openssl.cnf
+openssl x509 -req -extensions server_cert -extfile ../openssl.cnf -days 1000 -in server_from_root.csr -CA root.crt -CAkey root.key -set_serial 03 -out server_from_root.crt
+openssl x509 -in server_from_root.crt -inform pem -outform der | sha256sum | awk '{print $1}'  > server_from_root.der.sha256
+
+# create server chain pems.
+cat intermediate-ca.crt server_from_intermediate.crt > server_from_intermediate.chain.crt
+cat server_from_root.crt > server_from_root.chain.crt
+
+# verify :allthethings
+openssl verify -CAfile root.crt intermediate-ca.crt
+openssl verify -CAfile root.crt server_from_root.crt
+openssl verify -CAfile root.crt -untrusted intermediate-ca.crt server_from_intermediate.crt
+openssl verify -CAfile root.crt server_from_root.chain.crt
+openssl verify -CAfile root.crt server_from_intermediate.chain.crt
+
+# output ISO8601 timestamp to file
+date -Iseconds > GENERATED_AT
+
+# cleanup csr, we don't need them
+rm -rf *.csr
diff --git a/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/GENERATED_AT b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/GENERATED_AT
new file mode 100644
index 000000000..e0e2b16c3
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/GENERATED_AT
@@ -0,0 +1 @@
+2022-05-17T20:07:57+00:00
diff --git a/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/README.txt b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/README.txt
new file mode 100644
index 000000000..e4fa8b79f
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/README.txt
@@ -0,0 +1,2 @@
+GENERATED CERTIFICATES FOR TESTING ONLY.
+DO NOT USE THESE CERTIFICATES IN PRODUCTION
diff --git a/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/intermediate-ca.crt b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/intermediate-ca.crt
new file mode 100644
index 000000000..236feff56
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/intermediate-ca.crt
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFgDCCA2igAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJQVDEL
+MAkGA1UECAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UECgwFTXlMYWIxDTAL
+BgNVBAMMBHJvb3QwHhcNMjIwNTE3MjAwNzU1WhcNMjUwMjEwMjAwNzU1WjBVMQsw
+CQYDVQQGEwJQVDELMAkGA1UECAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UE
+CgwFTXlMYWIxGDAWBgNVBAMMD2ludGVybWVkaWF0ZS1jYTCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBANUt3f0Jfn8LWBGklt/jzuseLGbkZqFDwGX+hbCQ
+MSKKyL/5GRKCP8iMfBntISGtOWbF+3rQvNXi91Oj9ZEWVR/CWLae/zezSKZOiEaX
+VZow8g3I1K3WZBfvBmoO8kQTaux600LjCcJksEDsjTdiwtL4Cng+MHNpWve9Hh1D
+IquTISpHbGC/5Uyqq3Fw0bEM715QfyWqfjZnD9TZdu+u3SNM/RRbKK3Fe5govOom
+nj2bhfikBurlj8KpvVS8/HmXTkNeOMHmzrwEGSeeU1/Mmo88qGzM55HRA3DPqn78
+Hh02otlceEhKopTTG9nDOa6i8lRtNOTzGq+/CSdZ2ERpG5gVC25Meeio2m8v6iXQ
+I4SuGsMVzsNgk1pCsnKn6xpFPsjHNC4ITY2Lr+j66Sbp7vU8GqUX8e6w1y4hGAyj
+Yia313/b7HMxCHvxL/PJrw0sF635Q/DYif3zrywFzPVHKfwg4IdSALtQggaRFuXB
+siF+XX5X3xTKv1rNCXeNaxbx24jXKhd7v/GV1oG5M3pluj43u9+QvxZ+WOWpoGdc
+EVOPi/82hPyl0Cq/z5zNEOkuaqDTolAHEifbWXF9sKq22D9fT2ogz2omFgT63Qhj
+/XnHfLjYSwnQStyiOxGrUmcYfBHHM/OchAMKFH1+/IXZsyYmFBXreyk+dSejxZBB
+SgfPAgMBAAGjZjBkMB0GA1UdDgQWBBQYyP9goG/0xiQSOLAqF5OqBfL0hjAfBgNV
+HSMEGDAWgBTZKG+SIPcMoSX0oibvlgtOoQnGnjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAVAeVrYH6p12N9cPf
+VtUgTSpZ619fifNpTRbXpdVxEVZfinZ6+6hNy5jIg4wL+8nbD8OmpVPWgxYcEWTt
+yer2B6hh2D+P9XkIChJ2OF+TiZ0dBpnMNk04Uzoty9eu/PzRq4ZSJSTApzFnO6ZZ
+o2yDlpBmeAWxldj8t12732AFSJ+WxXrP+QSHeJQDNNG/rPr+mkrq9uveFpb2+zKg
+hkyy2AZAIqEoj+U+E83kxl4kchNbjatiaq9wVYLChpYPAY1sUgMRE5g+82R3R3Ak
+Km33dWgKRDSu0A/p2WS4xDm7Jh5nB76Py9VxYqX0boP+1X+XiDgHaxbfizD+xs23
+D1T1Mppxciw4TNtiCsCeS+vUnv0RAic1FNAL7n+DgY5ImeWFQeO4HFof2aQ3pnIp
+iRDWS68lgy2Fd5iHPZSSUBC5/QW59u7n9KiRO5CVCmA2AMx0fCL6t7SQ6lKhr6Cw
+KqgzTWQmIfaOAcm2ARUofW4fXdQi0hIxuzx0rn81B1bL1Ktzj30VraQK1KiR3Tx3
+udunxqjTuWWyKu00dCLPNRfGyM/W+DWxjYvZF9JHB292aaa4riCoOtySZ0WwsNqU
+qLjN9pRXtWpe03LQgylK4o9KqAmaR7nAGCr2icqVSiY0W3U02+j+dhi4FfIUBA8W
+wDjYHXJ545BUr7lkujJ24tO8tBE=
+-----END CERTIFICATE-----
diff --git a/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/intermediate-ca.der.sha256 b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/intermediate-ca.der.sha256
new file mode 100644
index 000000000..636f7ef85
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/intermediate-ca.der.sha256
@@ -0,0 +1 @@
+dfb69ff77651063393dc3e77423382390a3c21859253457259f6a637a2515cda
diff --git a/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/intermediate-ca.key b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/intermediate-ca.key
new file mode 100644
index 000000000..c37b848b8
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/intermediate-ca.key
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIJKAIBAAKCAgEA1S3d/Ql+fwtYEaSW3+PO6x4sZuRmoUPAZf6FsJAxIorIv/kZ
+EoI/yIx8Ge0hIa05ZsX7etC81eL3U6P1kRZVH8JYtp7/N7NIpk6IRpdVmjDyDcjU
+rdZkF+8Gag7yRBNq7HrTQuMJwmSwQOyNN2LC0vgKeD4wc2la970eHUMiq5MhKkds
+YL/lTKqrcXDRsQzvXlB/Jap+NmcP1Nl2767dI0z9FFsorcV7mCi86iaePZuF+KQG
+6uWPwqm9VLz8eZdOQ144webOvAQZJ55TX8yajzyobMznkdEDcM+qfvweHTai2Vx4
+SEqilNMb2cM5rqLyVG005PMar78JJ1nYRGkbmBULbkx56Kjaby/qJdAjhK4awxXO
+w2CTWkKycqfrGkU+yMc0LghNjYuv6PrpJunu9TwapRfx7rDXLiEYDKNiJrfXf9vs
+czEIe/Ev88mvDSwXrflD8NiJ/fOvLAXM9Ucp/CDgh1IAu1CCBpEW5cGyIX5dflff
+FMq/Ws0Jd41rFvHbiNcqF3u/8ZXWgbkzemW6Pje735C/Fn5Y5amgZ1wRU4+L/zaE
+/KXQKr/PnM0Q6S5qoNOiUAcSJ9tZcX2wqrbYP19PaiDPaiYWBPrdCGP9ecd8uNhL
+CdBK3KI7EatSZxh8Eccz85yEAwoUfX78hdmzJiYUFet7KT51J6PFkEFKB88CAwEA
+AQKCAgBqaLe7G6cZsUbnn5lz7lmVwPz26yFTc+cwwihnZsIv9MiaErPyKjO+Xml/
+4367OaVCaKbLui/YL6+2/0uPfW9GKBNyLNFGM2abJO4fFmEzUyUvvkRy9WYHEFfK
+TuWdF3gyzGhxpbR0ZSAZeDpRICoRdqB7PseehENVEABdKOrAa/ONEBPIA2FosHRd
+bqwszUEaeeHNolnXvAAKBfa5Uzas7TwSkiIvAzlbTVJnKpmoNN5dqzqMu8PTrjiE
+eMUpyF3XgMuh9hzRetY3kW8ajZ3Ey8libbFVdthZ0j7PnfdGK8SD7QVZSG/5C5uG
+Sk2bn1iIze4uLi7u9NOT4ePy2ehcSqyWykG8oQ7HAKlYQorFjAHfDMrNjqNkY6iJ
+6NoXlNqMGw696vfSWLTlQ38vd3D8QVLOGh2zQwoprhp3+okbk1/jwWE8W2jpnkq7
+Cfcs4ynZ/X9ZQoarn3vHexc7yeTdtsTHKGaoIGzOSB2sWai+AGFkwQStbqdxizy0
+8N1fwFrYqFCkFs5TywvyAp56w3XWr8M4luMVI7jJYuiRD9LAB4kMXXdaiiPW46Qy
+AVKC/RUcE4ISHsQMxG2SC0tTtxL8dwNgZjYc17BhygFwunnn10AQVAGim/FYTndt
+/phwnC7KGGhdOXs1DP2VlMi9eoX7mV0eCdLNT+KRe6Dj/wcI0QKCAQEA+ujJmWNv
+R3YCmtaybT+jOFVZJ1FXCRIw8Q8Z3U2h5sCuvINSH3kTxtDuAjy8GJ2gv/iJHTnB
+SZvDH124RxHMv8XPINoHTD4+YTW7bdGC70GHD30zhv5BAHUxE/MLgawOerMmuaOw
+HHV9S4E6Yw7Wecy0nGr3rQ0yu0wmyESfJ96f2cK/t4FajzTYU9c8DciXbp2hZItV
+olE7cCk6rBI7YG2nk8f3zdMpUzRiGtZYRNFB63yBjl9MBC9zJYMhYe+6RhVi2iq/
+SMB3QPZTY869fa2YO4zj/JK1v1XPh+lNZSD3C5y3MmRAVtp/692sjMTet+zGvxYm
+3MAkjtU/SpfCuQKCAQEA2YEcXNBZehg5uFfo9aLfWU5Yp71RGOpeeGAixp/Ae5ZY
+ilYC7Cxu7yiqsWTkKDPCYr0Tt1Odb+RKIRF/pug7Aczw7h5fjjJ+TWLorjyBVlWh
+YbOXk5RAT1zD9nx53SbI/SfEVNxo4CKdWF3UcZ9D90pLLD+3s3TBSjcUvDX/Oroo
+SEbrBqBHzdfIiZzXVc2G+D6tZ8gCgqFmEMnKPurhyy0+PMvHLICP5Ny7jI9YuEP5
+5YJg/fvKHJcmTZ5Bv1jaSdU7I8Cmx/ntZjxMT119vp+C/uBjTvs1M2xjR5nINRgN
+XXPd89gS1UNYc26XCe6RTzSUEh4JnXDrFjwgSfH6xwKCAQBa9TTQJFnc4A0FsLsy
+G5XCAD63oCcbJLsVSFIqBdChZEx0Dm8g9bWTp34A1Z+ilNIHhcO/Eobddlf/8Ouy
+5+L/ymfSEvf+TbozZ1Uw9Hiw32Jk3RBm6ZkK33EROFR9h7AgDv4E4jAfwP/Q9WID
+MwfRU8JNygFLfLNdbrfIdgf0XiI4wP7bOUtpCtE5Y5djr8ol0YMGffRnSWdwu6GH
+a3yW8mmDi0RsGxaqER1XeUi6edmZ0qLsx+M4yTLG8IiThmJSscIKMODzMMKKjEGi
+tvm+q8W6INMtZsn4ONVpAcyK0q58SS2oWOtyEPe6u7untF7A8lcCQreH4yfdl7TA
+B9ARAoIBAQCFUdF7xq4B29WNfD0sS5BR4mcPMkkCV65eZLcMPqGyX16YNM6Hy1iY
+ObofEDOVvNw6v6DVL2iCTFFv4ZT4TsLUgLVxj6aMt8CZWLY9DpNMwyIvi/CuIiIl
+QzxO2s+r0flCy1xZk9yo/i6qGqF8n93+N0jKr6e/VSKhhg+sqgBvE+pbGzU2k4pP
+zyN5zmxjiJ5hjbGmun9naNzyD25rkHeknW/XviSwz4DkDLTdHISKNgh4OKmRJQQm
+8DMnQokUa7cpqI0ehhj03Oo6T12LDEhmTsnxxsK4h9x9T8OvAMEqYjrW/I2gyOIK
+XMRbxP7JtLTW8uiMDmNgYPWIZIR6LtvDAoIBACSV0WnwlFdr7RfGdEXf/JB7BQ+u
+zYm1S+z2q1/Ggr/ujfV7CzeCx+SF+Uz/QjVT5nuUwSV5DL/PpTCzF54wAzA2iV5c
+eBOmv25A+5BT2BwtnYh2I99j1MQtKPzmoN1j7e3dOUtBXCBnXluZjmekqcE7i/Te
+HVr1RxzYZxYchjAUlHM2s6CMliczPVAVlwVtQIkAWDPsf3XSqe/Rc+ccf/0aEOiv
+SkXuimQXZjlJbplFEosVoMKFd7/P0+cPuyDbp2J3cn8LdCC2t00tWFEWsh1e4P+q
+j90TN2BZTiAOdvdk+cnhDJa6E0vVRjyeLJJTz64t+KqSJzkZ1eoO8txcSno=
+-----END RSA PRIVATE KEY-----
diff --git a/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/root.crt b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/root.crt
new file mode 100644
index 000000000..bf5dce052
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/root.crt
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFejCCA2KgAwIBAgIJAPoiDTMR74nBMA0GCSqGSIb3DQEBCwUAMEoxCzAJBgNV
+BAYTAlBUMQswCQYDVQQIDAJOQTEPMA0GA1UEBwwGTGlzYm9uMQ4wDAYDVQQKDAVN
+eUxhYjENMAsGA1UEAwwEcm9vdDAeFw0yMjA1MTcyMDA3NTRaFw0yNzA1MTcyMDA3
+NTRaMEoxCzAJBgNVBAYTAlBUMQswCQYDVQQIDAJOQTEPMA0GA1UEBwwGTGlzYm9u
+MQ4wDAYDVQQKDAVNeUxhYjENMAsGA1UEAwwEcm9vdDCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBAPMU1j0wYpZhsqlqtzJr3aba6wEFqU3G77Ul2tkW80VL
+r3+e86Nz8sw55Qa5lMejR/5Qbc8ssR4jNDG8qBMHL8Tugyj+TLFz+sxExIjEt0kD
+2v9wxITTucP74oxe7onW+w1+XNkGXKbY1+HxhVxGCR3XQxYum7ecfgWdx4E6WXOj
+04+l5SpWYUEb2bwOdiDOChe59v5ARKapNlaSkOxRAHMNfAcs2zw6UDK62Gry3YJZ
+P3XE+95TR6JxIVUgYvM8Iu/4hdhnOijt/Q4v8LdyhVVi9gtukat6y6EVnWiconWe
+56Rx97paMxkE0GcrWZki60UT5dBmZrt6VxEl1mHUgaUqdV2HVlH50xkBdTfKfcfg
+Xi54WbfETrmmZHtYCu0uCbjPruXHyt9Rgljl0kD5+A/ee+A8TJsjIOvaUhywLnqK
+cEkhtbjIfRhzvepHJ4kKu7OVqJOjZxLcSlsjIWkXXty66tsXx/KmY4f53EkSBEGL
+36h/bKa3UfX4uKr9jEdfxrNPWwQ5AVBVurdHZe5tQ/Ybt5g7QaDqETod8bomqK0Q
+fgiBmbo/NQTfCh8bWfplmWvGIFTqVd2OfC4z1NQvX94opzxd3RrgqjcEh8pU9YLA
+H0TNYvW04fOH6wBkOzU8TZElq7kfBRRupvp4TpMAKn/ULyGaDbjzmepfQ4asAyG1
+AgMBAAGjYzBhMB0GA1UdDgQWBBTZKG+SIPcMoSX0oibvlgtOoQnGnjAfBgNVHSME
+GDAWgBTZKG+SIPcMoSX0oibvlgtOoQnGnjAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAAKONXFVQlB0To5BTBF5oF0FW
+6lNRFgMNma85xVu6qcZHcm7CsOlyHAaMgwRrilxOlPP6adgCLafu7lFtSE4+XNRA
+HP0RTFGGVUM89VNYPo3OIDh3fYBgR+JlEuOqRMPBO65XyYSqDL32UHPPhMX90D5e
+KY5jyT7NTLT3AhapIGVOpJBosItf8XwzGCElAnywmupgZ3zRg9BA2YojizpNQgv/
+xnXiouDvTDoPYvMlUFgM9g4AsdXJ2quwx+cXNryqISMAp8QB/mMXLREv5oWNk2v7
+N6FMYv57yZp4VO1ACYEZk5H/6aA4yhKoy/t+bIXvVPW94NwWB/KTH3NYPCWPt0pN
+lGITyWovH+Hp5aUjWBXfFZd4THh2pdUoq9JynH+l/fI5tj1r7YyDYRioGLgDMM7O
+8Gl/BxiZ8329Hh/BC+03CMQYW0/98XEkRJS5Vo55IEf5efY6K5n5JM6XWuqh0NxZ
+J0FUnvdLsJ0X2jQYzYBq6onTJO75WI/FkdT8Ir8Jl+3IXSsKdeLc1k5sjQHBUccE
+JUa/qJPPS3rdZEvBrL+SxrPoxXNTpNYOQJE6QaEDYs0yXozj/0OQCAUGYdK/fY4u
+9HeyVweix9u9axqGZVFlgSMuxEwOs5QFtgoEKHAaHibLcZlzaPW7Yupz74Z4Xd8c
+mylbGbi2vUDX2qibwLo=
+-----END CERTIFICATE-----
diff --git a/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/root.der.sha256 b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/root.der.sha256
new file mode 100644
index 000000000..375a9ae77
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/root.der.sha256
@@ -0,0 +1 @@
+3700208913f1b4955cf4df3cfcd241a5d98c00131966da6a78fe70532c22696c
diff --git a/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/root.key b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/root.key
new file mode 100644
index 000000000..223f7bbb4
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/root.key
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIJKgIBAAKCAgEA8xTWPTBilmGyqWq3MmvdptrrAQWpTcbvtSXa2RbzRUuvf57z
+o3PyzDnlBrmUx6NH/lBtzyyxHiM0MbyoEwcvxO6DKP5MsXP6zETEiMS3SQPa/3DE
+hNO5w/vijF7uidb7DX5c2QZcptjX4fGFXEYJHddDFi6bt5x+BZ3HgTpZc6PTj6Xl
+KlZhQRvZvA52IM4KF7n2/kBEpqk2VpKQ7FEAcw18ByzbPDpQMrrYavLdglk/dcT7
+3lNHonEhVSBi8zwi7/iF2Gc6KO39Di/wt3KFVWL2C26Rq3rLoRWdaJyidZ7npHH3
+ulozGQTQZytZmSLrRRPl0GZmu3pXESXWYdSBpSp1XYdWUfnTGQF1N8p9x+BeLnhZ
+t8ROuaZke1gK7S4JuM+u5cfK31GCWOXSQPn4D9574DxMmyMg69pSHLAueopwSSG1
+uMh9GHO96kcniQq7s5Wok6NnEtxKWyMhaRde3Lrq2xfH8qZjh/ncSRIEQYvfqH9s
+prdR9fi4qv2MR1/Gs09bBDkBUFW6t0dl7m1D9hu3mDtBoOoROh3xuiaorRB+CIGZ
+uj81BN8KHxtZ+mWZa8YgVOpV3Y58LjPU1C9f3iinPF3dGuCqNwSHylT1gsAfRM1i
+9bTh84frAGQ7NTxNkSWruR8FFG6m+nhOkwAqf9QvIZoNuPOZ6l9DhqwDIbUCAwEA
+AQKCAgBiBuwivulzFbEUCzoXtlIroKsWvW66M9ilJ7/qvguazVvXzoUYTIEEhPBs
+Vti97YXx9ANkgfRnX/EDgb4R9lr4QutX072f7lKcn7rWIOZ9JnXhf1tw6WVHuMNy
+sjHmGnEhzuyohJ1Gl7nvnxOV05SHmTCvuFoJoK1dnHRBFAPQ06dUjaUt/qm3tQCI
+ixhuQEjnqpIFlGta/nAwV2jkNAJHY4+54QgEcMu4uYrfDlPv5gfmeWrNDK6dvpuf
+lbDxwDWiqolnbLGSoe7kEsczY5aLiZ4JnCxYh+uoaWwSLOCDKHLn6SHq38ctdriI
+cn3ueJuCPvT1puYVAtAr1SNwTl99L7uDREI+2lIF/jSMeaDBrkvgRzN1oShRyvLp
+P00ld3dR3vvmBgbh9YR544PaSfwjqgPmJ83hPof35xPsBzNS58ia80vt6Hvcmjug
+1c5SCRp6BoGR6/t28c9auPiJhAgvGhL/z44X+RaU+K3K0n3QPD/XR0QBwe0xLZVh
+upScIfJndEha4D/BwMUIlB8ejEpjAweCPOOWH3d8xinJyHEbkwxPfl0w8bsTNfSZ
+45wl9qelesZs18i1hFkJdo43v3nApPHFKUYWHtIGlte8NEYz00hIfkVvcqK9Eo6Z
+P4n3KbNMzZttS6+vHVFr3MtXSWUD8U+/EW6aQzAWmKs7lF+YgQKCAQEA/NAEHV1y
+S1UiQrZGDu9hHVMaeuod38cEixc0FZaYmrbgseMjfKxj1UHCA8XHV7v/93do+8iJ
+847jnhHWqEh0FZ8BTJuCT92rEafP8uoxltpDdTQISUEsKdppM01SyGdDVz6AA8bo
+Xr68ac5n3zcFDUlv41LOgkF4ed+9BdniCRgnB3Y8q+gp5tLP+Hf0FvtYK5vw3Vap
+q8q947vEfjnKUzNNtOsMiVxnX6kaouh2c07h7P5kujK1ES2A0M9BdmD1bI2IAqMM
+sFgX8ugQHm72np2pSdGTXNxRrsoUA54etN1DvGcYFUMkFXdCK3MwDs3FV2wH/a2O
+hFBXDENAOExXFQKCAQEA9iVpiMKSNHIL78NdRMBNaYlEGeqSG80BAZFy53UMpges
+zk1uBelBkSG+goZPylT1mj9xuVfC6pKZdkiX1KoEc0DIUpIRxn5PEt6KmV6TspDJ
+0oXg9F67R71N+509CeCkKvCADiAZXpDeq9s0pLdqaDXsmaDQS1B8ncBD4ECuXj3c
+7qfGAVP8IL+7IKHCZP9xiCFCc2nbSbp1FQ7qHookk23ADXynxfu/hALH2fSQ3rMS
+cNJIFGtd6LazW4cTkEAMbBFkgvKxQk6QAMa5XsSxpC75vzKYsXHDd297OuSa5V9J
+zwy/41KJzxLS6A8e0kkZxz5Jf5JahQoc3N5GFnZIIQKCAQEA69fantJYF3LaPUXx
+YWlrPYITR+sz51iwIlmJG0KcJmjIgOqWZm4jzARGTGKrLmuRxHg/FfPkzbPVH9cg
+W2kL8kedXKwOCxeNyTC1y7UygbooCCR8PmpwGrNIRLWzroS2y6LgpaVfjVN+TW5i
+dFfNfLGvkW/keps9GuTgX579QOKpNkrVGsHApTaxEOhGa1Ia1MPrFXENY9gFAXhf
+PCoJV0ibC1XjIhlzzkfhM2yNY9CI7x/7M8CuLdI3Q5S1Swv0qEn4Qg19ft0PqmlW
+8C0wIJSQIu9B+/UEtnyJ4z4VA0EPOakrTFqQRP42WnZgtM69dGqxobPRKhoQur3a
+ISsGaQKCAQEAy93gsqy0e0uaJ1MgBLlhZG+UQALQUMZSdwIIsTt45mqk7Zmj7rFq
+5NGWAHVN0L7dTIwPnPrbLX2OLTGizzihxvN49yqUHlqvE2nOUYjLu7G/9uV7k+qC
+IsDfve5Vh8DPN+FJrmlXmcNTKfO8flCLiRRgij1vR3G6RM3hafMoeFW0jtXWYXM1
+98nVKwnO/+eyGJWze/PI9B/CqVZZAkJYWOMllgYQzyHbVXMYI6Uz979JHriLip4C
+gaQQmVYfFfJ2V2twXCS2O7zl+D6feaZfmyRtJba6UP1wb5Od9QEyaZeqghqFM7pA
++YkVta4QUQrKlwM3zLliz524mhZe5mvBAQKCAQEAjFUvQ9GxNaewXBTa5Xb5qi2L
+iyGAY5BCeIakQWcUwDw0R97Hv2bJGAmKx+8iQFZjZDJ39kYSZhhSZbluTYzVLQys
+QqdiNcExGmtUuzOxcAlGKmT5tI1RPfRR8H9joDSicFmlnc5P/0xCxONz4lMIBJTk
+XeidcUO/aYZrbU55Xz6GVfTUY8FeHz3qgJq5iZul9mLgVJFmQfOTUTAPTfsSzlxC
+6gspyyoQ678V9QF5POtCB8XivZZ3pfgfnmo6+lwdgSMY70fiHVGwyN5455tENavL
+8wopEZmUrP88b4OED9nPGhpv5yhwJWSSgwoPKlB/GmJa97INisWQnEKsH/rCXw==
+-----END RSA PRIVATE KEY-----
diff --git a/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_intermediate.chain.crt b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_intermediate.chain.crt
new file mode 100644
index 000000000..df220bbaa
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_intermediate.chain.crt
@@ -0,0 +1,68 @@
+-----BEGIN CERTIFICATE-----
+MIIFgDCCA2igAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJQVDEL
+MAkGA1UECAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UECgwFTXlMYWIxDTAL
+BgNVBAMMBHJvb3QwHhcNMjIwNTE3MjAwNzU1WhcNMjUwMjEwMjAwNzU1WjBVMQsw
+CQYDVQQGEwJQVDELMAkGA1UECAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UE
+CgwFTXlMYWIxGDAWBgNVBAMMD2ludGVybWVkaWF0ZS1jYTCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBANUt3f0Jfn8LWBGklt/jzuseLGbkZqFDwGX+hbCQ
+MSKKyL/5GRKCP8iMfBntISGtOWbF+3rQvNXi91Oj9ZEWVR/CWLae/zezSKZOiEaX
+VZow8g3I1K3WZBfvBmoO8kQTaux600LjCcJksEDsjTdiwtL4Cng+MHNpWve9Hh1D
+IquTISpHbGC/5Uyqq3Fw0bEM715QfyWqfjZnD9TZdu+u3SNM/RRbKK3Fe5govOom
+nj2bhfikBurlj8KpvVS8/HmXTkNeOMHmzrwEGSeeU1/Mmo88qGzM55HRA3DPqn78
+Hh02otlceEhKopTTG9nDOa6i8lRtNOTzGq+/CSdZ2ERpG5gVC25Meeio2m8v6iXQ
+I4SuGsMVzsNgk1pCsnKn6xpFPsjHNC4ITY2Lr+j66Sbp7vU8GqUX8e6w1y4hGAyj
+Yia313/b7HMxCHvxL/PJrw0sF635Q/DYif3zrywFzPVHKfwg4IdSALtQggaRFuXB
+siF+XX5X3xTKv1rNCXeNaxbx24jXKhd7v/GV1oG5M3pluj43u9+QvxZ+WOWpoGdc
+EVOPi/82hPyl0Cq/z5zNEOkuaqDTolAHEifbWXF9sKq22D9fT2ogz2omFgT63Qhj
+/XnHfLjYSwnQStyiOxGrUmcYfBHHM/OchAMKFH1+/IXZsyYmFBXreyk+dSejxZBB
+SgfPAgMBAAGjZjBkMB0GA1UdDgQWBBQYyP9goG/0xiQSOLAqF5OqBfL0hjAfBgNV
+HSMEGDAWgBTZKG+SIPcMoSX0oibvlgtOoQnGnjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAVAeVrYH6p12N9cPf
+VtUgTSpZ619fifNpTRbXpdVxEVZfinZ6+6hNy5jIg4wL+8nbD8OmpVPWgxYcEWTt
+yer2B6hh2D+P9XkIChJ2OF+TiZ0dBpnMNk04Uzoty9eu/PzRq4ZSJSTApzFnO6ZZ
+o2yDlpBmeAWxldj8t12732AFSJ+WxXrP+QSHeJQDNNG/rPr+mkrq9uveFpb2+zKg
+hkyy2AZAIqEoj+U+E83kxl4kchNbjatiaq9wVYLChpYPAY1sUgMRE5g+82R3R3Ak
+Km33dWgKRDSu0A/p2WS4xDm7Jh5nB76Py9VxYqX0boP+1X+XiDgHaxbfizD+xs23
+D1T1Mppxciw4TNtiCsCeS+vUnv0RAic1FNAL7n+DgY5ImeWFQeO4HFof2aQ3pnIp
+iRDWS68lgy2Fd5iHPZSSUBC5/QW59u7n9KiRO5CVCmA2AMx0fCL6t7SQ6lKhr6Cw
+KqgzTWQmIfaOAcm2ARUofW4fXdQi0hIxuzx0rn81B1bL1Ktzj30VraQK1KiR3Tx3
+udunxqjTuWWyKu00dCLPNRfGyM/W+DWxjYvZF9JHB292aaa4riCoOtySZ0WwsNqU
+qLjN9pRXtWpe03LQgylK4o9KqAmaR7nAGCr2icqVSiY0W3U02+j+dhi4FfIUBA8W
+wDjYHXJ545BUr7lkujJ24tO8tBE=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIGSTCCBDGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJQVDEL
+MAkGA1UECAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UECgwFTXlMYWIxGDAW
+BgNVBAMMD2ludGVybWVkaWF0ZS1jYTAeFw0yMjA1MTcyMDA3NTVaFw0yNTAyMTAy
+MDA3NTVaMEwxCzAJBgNVBAYTAlBUMQswCQYDVQQIDAJOQTEPMA0GA1UEBwwGTGlz
+Ym9uMQ4wDAYDVQQKDAVNeUxhYjEPMA0GA1UEAwwGc2VydmVyMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEA3H9kFpqEFrdMDsF+SkaZIheXBaZFVW7QZuZI
+Du2dQL5mKN6rO/XAc5GBXR/z/XfZRKlH22fCzoWGJzJEsQ4GX8Ztl5CNMBWc2WCJ
+dWY/YALRGLLbL4fQkzZe3MaKZ6jFLk7acd2cYGX53R5He8XhxUC8Z0b7OlVe0/hP
+R6QgB/+xyfWwndqsvEjbECbhdjDydM43ruPaeWDXeFFFXLs+t89bChc7PjDOQK35
+RmnPC8M6ddDewTSNH1GhzPSnsnoLlpaAsGfcU3Iik/VNhx6QYZZeojH57mWPaFUN
+skIZXzo41TNpb1SzYT8LkuxVkFV2ifCCoFgCU0xBMu1LvAzaPdiJIhzU7Sg87gxF
+K57lT5EamO4ezg0M415nXbwRNArZ+5674FAjxeBEojAuXw+4K8NvmLtckddG+uwc
+cOw/mqZxm1G4sTP0e0ve/JA+PRNznTBKnLRdPFPQkWBiDpB2fyWHWKSoXugPNApm
+CrysSjptIGvzyPVGSTc1WpATaOELub9kpolJtcI7VFYIu923MHRpKTNktKgcHo/L
+xg51oIIGvctPWQc/tur2pCEL3ohFtxeQwnX9PaaVwc2/c8n2VL8WKXQrLAifILcB
++NZhtaZswXja4pA4CKAC0PURgHJrtSDHVgKr/1SvNLH0rvTdbqlmNda5wzYRjYj+
+7wcxgekCAwEAAaOCASswggEnMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZA
+MDMGCWCGSAGG+EIBDQQmFiRPcGVuU1NMIEdlbmVyYXRlZCBTZXJ2ZXIgQ2VydGlm
+aWNhdGUwHQYDVR0OBBYEFGQFgN29vgmD/5PDU8NTa5i29O6cMHIGA1UdIwRrMGmA
+FBjI/2Cgb/TGJBI4sCoXk6oF8vSGoU6kTDBKMQswCQYDVQQGEwJQVDELMAkGA1UE
+CAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UECgwFTXlMYWIxDTALBgNVBAMM
+BHJvb3SCAQEwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMBoG
+A1UdEQQTMBGCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQUFAAOCAgEABFfy
+fmp5yQUUHXu4LZTndGXgbmexLqsH6HjDL/MarRihjlPTcBJxjxvA1R6xEs3lQ21b
+DWFNA/t+hl53+hcG6A6+/Q1l64shP2N4mXmPjHJW1ctYeCU6SzaUGw1vshRw51w/
+IIC8Cd0hpksRXzJOJi8qH1pG4D0zgXUuWjN6LKolDrJ/sY9uJDXQAw4xYhjhWchQ
+S44WHQjrM2qlqq6I2nVm8rHcz+LqrpKBxe0gVXpHUFv/xX65se7VRIamXQFsrFvt
+17edQrjjU8asDOypNFNUfh8VLscNtkXLU6jNZmkmHeOQAJkB8L7Nx+kqiidjhOJq
+rRa4mqTZYgMIQ4IW9yyxRmbjWV1dpkg5hOX+GyEEWYlJM5b0TSTsrE5c/NSedKoO
+27866ih/WNvbtHJ6cTyBLG9dZA8kLDWnYFTTMRL2zjbrYCz32ftx6IjxjJ4ZyTLX
+zHj79FfBuha6fCPAE76u1qyJuL9yK5HULnPGRJ0MDwx1r7XLVsuV4FYnXMA9vijT
+PhZmWaUp9f6HiuTGR/Fk9ga+TCr7vL8/RYumfb7Z2i6GrJz4tACfuJSeSfMB6E/h
+hCtxHXGnkqKnpxw/+99jo8Gf4EhAhxoXdbCv7Q95WqAjbPnK0hboadn5U/J7ELbd
+5GqVUDvupKTC/6Z1iACH9Nn0LymPLrbwskWfB3o=
+-----END CERTIFICATE-----
diff --git a/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_intermediate.crt b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_intermediate.crt
new file mode 100644
index 000000000..b7fd7724b
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_intermediate.crt
@@ -0,0 +1,36 @@
+-----BEGIN CERTIFICATE-----
+MIIGSTCCBDGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJQVDEL
+MAkGA1UECAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UECgwFTXlMYWIxGDAW
+BgNVBAMMD2ludGVybWVkaWF0ZS1jYTAeFw0yMjA1MTcyMDA3NTVaFw0yNTAyMTAy
+MDA3NTVaMEwxCzAJBgNVBAYTAlBUMQswCQYDVQQIDAJOQTEPMA0GA1UEBwwGTGlz
+Ym9uMQ4wDAYDVQQKDAVNeUxhYjEPMA0GA1UEAwwGc2VydmVyMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEA3H9kFpqEFrdMDsF+SkaZIheXBaZFVW7QZuZI
+Du2dQL5mKN6rO/XAc5GBXR/z/XfZRKlH22fCzoWGJzJEsQ4GX8Ztl5CNMBWc2WCJ
+dWY/YALRGLLbL4fQkzZe3MaKZ6jFLk7acd2cYGX53R5He8XhxUC8Z0b7OlVe0/hP
+R6QgB/+xyfWwndqsvEjbECbhdjDydM43ruPaeWDXeFFFXLs+t89bChc7PjDOQK35
+RmnPC8M6ddDewTSNH1GhzPSnsnoLlpaAsGfcU3Iik/VNhx6QYZZeojH57mWPaFUN
+skIZXzo41TNpb1SzYT8LkuxVkFV2ifCCoFgCU0xBMu1LvAzaPdiJIhzU7Sg87gxF
+K57lT5EamO4ezg0M415nXbwRNArZ+5674FAjxeBEojAuXw+4K8NvmLtckddG+uwc
+cOw/mqZxm1G4sTP0e0ve/JA+PRNznTBKnLRdPFPQkWBiDpB2fyWHWKSoXugPNApm
+CrysSjptIGvzyPVGSTc1WpATaOELub9kpolJtcI7VFYIu923MHRpKTNktKgcHo/L
+xg51oIIGvctPWQc/tur2pCEL3ohFtxeQwnX9PaaVwc2/c8n2VL8WKXQrLAifILcB
++NZhtaZswXja4pA4CKAC0PURgHJrtSDHVgKr/1SvNLH0rvTdbqlmNda5wzYRjYj+
+7wcxgekCAwEAAaOCASswggEnMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZA
+MDMGCWCGSAGG+EIBDQQmFiRPcGVuU1NMIEdlbmVyYXRlZCBTZXJ2ZXIgQ2VydGlm
+aWNhdGUwHQYDVR0OBBYEFGQFgN29vgmD/5PDU8NTa5i29O6cMHIGA1UdIwRrMGmA
+FBjI/2Cgb/TGJBI4sCoXk6oF8vSGoU6kTDBKMQswCQYDVQQGEwJQVDELMAkGA1UE
+CAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UECgwFTXlMYWIxDTALBgNVBAMM
+BHJvb3SCAQEwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMBoG
+A1UdEQQTMBGCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQUFAAOCAgEABFfy
+fmp5yQUUHXu4LZTndGXgbmexLqsH6HjDL/MarRihjlPTcBJxjxvA1R6xEs3lQ21b
+DWFNA/t+hl53+hcG6A6+/Q1l64shP2N4mXmPjHJW1ctYeCU6SzaUGw1vshRw51w/
+IIC8Cd0hpksRXzJOJi8qH1pG4D0zgXUuWjN6LKolDrJ/sY9uJDXQAw4xYhjhWchQ
+S44WHQjrM2qlqq6I2nVm8rHcz+LqrpKBxe0gVXpHUFv/xX65se7VRIamXQFsrFvt
+17edQrjjU8asDOypNFNUfh8VLscNtkXLU6jNZmkmHeOQAJkB8L7Nx+kqiidjhOJq
+rRa4mqTZYgMIQ4IW9yyxRmbjWV1dpkg5hOX+GyEEWYlJM5b0TSTsrE5c/NSedKoO
+27866ih/WNvbtHJ6cTyBLG9dZA8kLDWnYFTTMRL2zjbrYCz32ftx6IjxjJ4ZyTLX
+zHj79FfBuha6fCPAE76u1qyJuL9yK5HULnPGRJ0MDwx1r7XLVsuV4FYnXMA9vijT
+PhZmWaUp9f6HiuTGR/Fk9ga+TCr7vL8/RYumfb7Z2i6GrJz4tACfuJSeSfMB6E/h
+hCtxHXGnkqKnpxw/+99jo8Gf4EhAhxoXdbCv7Q95WqAjbPnK0hboadn5U/J7ELbd
+5GqVUDvupKTC/6Z1iACH9Nn0LymPLrbwskWfB3o=
+-----END CERTIFICATE-----
diff --git a/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_intermediate.der.sha256 b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_intermediate.der.sha256
new file mode 100644
index 000000000..99ba032a4
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_intermediate.der.sha256
@@ -0,0 +1 @@
+ddf798cd453f19ee4300c4e4ac1f56b897ebbd9853f406d1947419b0e0fb91b2
diff --git a/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_intermediate.key b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_intermediate.key
new file mode 100644
index 000000000..0f57ae9b4
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_intermediate.key
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIJKwIBAAKCAgEA3H9kFpqEFrdMDsF+SkaZIheXBaZFVW7QZuZIDu2dQL5mKN6r
+O/XAc5GBXR/z/XfZRKlH22fCzoWGJzJEsQ4GX8Ztl5CNMBWc2WCJdWY/YALRGLLb
+L4fQkzZe3MaKZ6jFLk7acd2cYGX53R5He8XhxUC8Z0b7OlVe0/hPR6QgB/+xyfWw
+ndqsvEjbECbhdjDydM43ruPaeWDXeFFFXLs+t89bChc7PjDOQK35RmnPC8M6ddDe
+wTSNH1GhzPSnsnoLlpaAsGfcU3Iik/VNhx6QYZZeojH57mWPaFUNskIZXzo41TNp
+b1SzYT8LkuxVkFV2ifCCoFgCU0xBMu1LvAzaPdiJIhzU7Sg87gxFK57lT5EamO4e
+zg0M415nXbwRNArZ+5674FAjxeBEojAuXw+4K8NvmLtckddG+uwccOw/mqZxm1G4
+sTP0e0ve/JA+PRNznTBKnLRdPFPQkWBiDpB2fyWHWKSoXugPNApmCrysSjptIGvz
+yPVGSTc1WpATaOELub9kpolJtcI7VFYIu923MHRpKTNktKgcHo/Lxg51oIIGvctP
+WQc/tur2pCEL3ohFtxeQwnX9PaaVwc2/c8n2VL8WKXQrLAifILcB+NZhtaZswXja
+4pA4CKAC0PURgHJrtSDHVgKr/1SvNLH0rvTdbqlmNda5wzYRjYj+7wcxgekCAwEA
+AQKCAgEArxgSGMj2nztLEGSirsTFEYd+C6RvZloq76tqCUCzIRiQ819uxpxuCNfA
+zHx1OhAT3iw2vYn17h2l3DZUyeyDL0bY/ARzuX1QImZAgZOCO/HArUZKO8Iz5NLG
+HbcjbRFeE1nWqZj7dqlD80z6ItWOZR70/WYmVbo5JUYHXrJ8JR3sxp1tdMyTYqjQ
+HFFjtIFF529iVGTntn8qW4bd97dRJJFqj+bGyqni/wWn7zxSh9qt76S/XtkmP3qJ
+a8HT8SxtS1WUN4EiOrllr+yZdfTVXkkUOORKvf60FHuF9sn6b95CBztePGQcVdrE
+jBVUFNto2Dy+3ilFH3RsSc6Z12i1W/G+nxSv/LQMJOWM4KY5+Ykxh2aQZn0q/Ei0
+8U9vGLKpZmo93jeSJSuvSgQ0D23TJbKP9GuiDH3+wV2SKJJAdELsmZMCJXcIl94b
+t21OgzBOV6ZMbIWbn+h2eS1cNw+1ij8fErQ/OH+r3WAmSFcu5a/7jmAo8gEnMUzc
+g5ELF+3U8w18VI2FZ+4tuc5c1D4uvlSnPBoDJdFNOgXKHWv4JOpyGLokOaZfQ0Nu
+fWnsOqZOes7Y07swYxAI2e3VaK85IA6A8h7uu8OisIa0eD7R2S/YZyV1izGKRxl6
+xxYw9b2CSkDkUCfwoz9jf6PPdkcThquKFyd8mw7z0Q9ciRjlIEkCggEBAPRHCArx
+EPTJMgNeoOWqWBN5yzxmCck5KQtTh6SPo0ZEjeln5IOIYDpYJRzcOp8d8rS5VJxq
+OQcq84JFPKARghVda6uKUMYHSWZLKAuQs9GouNnA+apxSn2mQGYG2iczrFbo7keA
+F9YsmbgTBAkKKDFM1MWWXk8hat1r12ZAOqOKDoHVkdUKlGnR+PotZU2ob10rLHYV
+sbktx7gj86qbjGTwb1VwKNWGs+4IHOgiYWcdFEm4zld+BFB3c13sRvyV/5gwScKq
+aDoSx5L/TZEo426UFNKV5pfKqOmy5XFrQJ+v8nZlqKQ56QvTXT/ziYcLEhJIu1MJ
+HfumXKy0hLbcC6cCggEBAOcUOOL04h0Tae+5xu2Og5TApZfeL58g0p3XgiF1232D
+EzLVKrXokvvCh7QHEZwuz8pCapceOYb3U2RulYbNB5lPJ2WVuYc66Y2RIH5kPTQh
+LFm+mgvl/rRb/b9ejrdprL1lPJcOOO2PiyQit9ng0Vadl9kiJoJTucgnMI3bSFOe
+VUWmIbD1+d3eV9OTJvhoGjLKj8t9O3EYXxJtpwNSTpRFpGVg2NZ9DzanWr3jFM/3
+4dS45r+5lT4sMDNczxmdDr3hRrrBrIce4K9D7ldI0Ww6HfJsc7Ix45CkbWnGUnvk
+NNoQhsrFLz53R7tw94Ls9yczqQqXu36GOefm2bHod+8CggEBAO3exXwyJvrXePZD
+DZbXfBDrBvd3vYvPN6Kp4mpi3PGuDCr/WkyjXmEyOGGUKxmLBi7qUfRGk+Xg82Ml
+nNWadvvrDs/qTqGnstgD06j/bbt5+xdAjV5mF82nOQqhHYoTDX1MMcw6dfu/Tqkr
+C0DqPR1U3dTSil+wAOpA+228md1qsJnJqMq2FLO/Hh4wWnd2z4sAYblTgs76P4OW
+rs6xzdL1NtUR9RGIrGncSJnb8NGCRaFMbtJQCk95IkSRssaAInbGfu0rF3eFlgYU
+yinSkTW6yVQPWI7zb+yyoi8B69oUcZzNfZz+L2uulR2TP5bbNuvLG27Ob/3/kDs1
+Rg7y0/0CggEBALm/5q6BnNU0it6aHo9NFPZZGYOHpg4rK0KYPtG41JQC7kbZVbje
+WHCqAb20RPKgKoXyd448TI/ydgVwYx/15hrVptygy38p2x3iQBV5bD1gQS9u6JOR
+8Pl4TPQtBVnoR2QDYf4m/5nu3jFQ+yrX7k7K5Yo0SnJO7TM4VW5ii7QzvWX8Um7W
+e2Fe3oiDbDsYK58Sdx5i74pMxfehTzR7UBEeHjUj8YoRA06ynl2vkUZPgygk7c/G
+VXKhwKk4/H0hY/08fkeXcaE4L/KTD574OOffm70IcsQWGFBn7E+vjRRr8BQuXrvW
+X9C9v1qsRznmVBIeE88hAyWErj18sxewv98CggEBANUl4/yhlSBhX/KvRrRvSjiM
+Tv0FlleEBtgyoNzCyKO4Zyv1gSYjRGF4VzItgFeU62vC20tamRHY30Bj720tgZSU
+m82VcCjGG/klIXcBdZPZRPiX5StiXJS/U+L8Gzrw6U2FdckpCwOAWGVrh+eQbTTl
+RQTDMRgRyOE5Uk6vUvvXuxoj5Dh6EzqdPZy1dVTfgFftbPGJDF6/01PjlHsS0Xd9
+7icre33Ze+M0snc5XhYAPuyo4m0EwZhlNEWwhi75h1O/yHWWzFUXOs25aalaSjip
+2tdrw8J0blQ7Liw3m6e33SWSZeGZQLA4p+C4P1p+1Ka2YpUvBPCXeJikH7yZz9g=
+-----END RSA PRIVATE KEY-----
diff --git a/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_root.chain.crt b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_root.chain.crt
new file mode 100644
index 000000000..fc96342f3
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_root.chain.crt
@@ -0,0 +1,36 @@
+-----BEGIN CERTIFICATE-----
+MIIGRjCCBC6gAwIBAgIBAzANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJQVDEL
+MAkGA1UECAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UECgwFTXlMYWIxDTAL
+BgNVBAMMBHJvb3QwHhcNMjIwNTE3MjAwNzU3WhcNMjUwMjEwMjAwNzU3WjBMMQsw
+CQYDVQQGEwJQVDELMAkGA1UECAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UE
+CgwFTXlMYWIxDzANBgNVBAMMBnNlcnZlcjCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBANCH7xGzfyrjlsSEphVulAv5KyDfjnvWhN0SsbkLiO3w7sTOCaDQ
+0yAyLnpkkNPuqb3RkBhJA6exK4b2AaEO+L6fWaxB2Uto1INzy+Mdq5QTFjC1Ze6K
+i9M8pKeXt/cqWBx61hBaS7sj1T8znr4qeCc5BGa2OJuos+Y+fYcnL4QyG9FJqx6C
+NG840vhOdwPIRgEfRiX4ia0NkqFBtCbVGOLLUbAwqYqZFKS7NmZkejUxq7n2hQle
+Q/OHEmzNAZaqAQbZHwIzIDsqqbxYUHkcWue7H2nNt/KYhBbuAN7/ZsuOYklju9TH
+6L1R6utmSWyCakHWY2+wYNIMYam89lsXWKul6gDIxwLgnHiE8X0qyZ/K5MIoY16K
+lD4RxuPwlg1EIj5QZ1Po4wPfzSkv9gGJF/MxYQxTy8n+TrSg7q6uN4GrWRJFXpMg
+PAuHLcg+oxOIrraPcliPNyKh4vNVnXRdVLOhEnb9RL2DZGdzmQFD+dJmKitxRrNV
+RAMZ3IgCfxr5jTXAhOxpY+aPI+tdixsLHL+ESwcQ4kcaazhM06Tw2B/wRqsr8+xN
+ObpaD+kzybl5XYd/y3zTYKsxDEyeIIBg/uGhk1V84zYIGxYTdZEYzenKKi+OnhEI
+fu0eG7hTY5WT4hxFecbsWw3OYrCNJUxp2OlEQ/kwHUc5+kXcmW0Z6Fc1AgMBAAGj
+ggEzMIIBLzAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGQDAzBglghkgBhvhC
+AQ0EJhYkT3BlblNTTCBHZW5lcmF0ZWQgU2VydmVyIENlcnRpZmljYXRlMB0GA1Ud
+DgQWBBT6GmW3MZKpAOVt5yVI2DrpnPsSYTB6BgNVHSMEczBxgBTZKG+SIPcMoSX0
+oibvlgtOoQnGnqFOpEwwSjELMAkGA1UEBhMCUFQxCzAJBgNVBAgMAk5BMQ8wDQYD
+VQQHDAZMaXNib24xDjAMBgNVBAoMBU15TGFiMQ0wCwYDVQQDDARyb290ggkA+iIN
+MxHvicEwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMBoGA1Ud
+EQQTMBGCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQUFAAOCAgEAxwH91Q4r
+1JJNTF/XyeXGc8nmeBFtdbs3W8TvfF/3sEqPUQZSl+IWejaGw3USc9S0NV8PGQVz
+qHOLVJfiLtTSGukaIwOAtTfIRSHmLMD8adtdxtmaNB0IfmMBrKgC0D+Sv5iA4HFG
+d20ExeTamJtk4XVnWb9yAd333GYSpRi/IvYjy2U+5NL/9r0G+esLTt4VQG84g+ec
+IWitlFqEhyhX2ioYoMC1cYIkeAm8AirQjNCqAyM/pMLWpogLtooRMIZbfLSqtNXY
+paP328hum5s98JpjPaNqOClRmewUjLBPDzrgHX422j+gkhd9GnhfKLVe9X6AVnki
+poaPh3TWry28o8dMspxBn5EtJEdb64N4aSdrJxiU2TqKy1TM8dRBmDcvkamt5Lvj
+2VlT2Xz2SlYTKL4HA8XlJcOqm0EN5OymNvnbS/5Ydh45EQA9ZtMmlSWlqw73kT/O
+/QVoIDfUboGTuL3YYxD+NAneYF6ed2ZAaAbYrm3iM9ZV1LP/qcle2A2g34uSvkXb
+iWTgPCJvmqrKg5WUY4DWUaHQY4XifhNU9FXi+WX2KyyTpY9yNxMlBrg8RbVZ2HC8
+3PEEjIYZkJPwxWEfcEdd4pkNpLsKH3EivDvze7ZPe2yWQ/+njZykp/RouwZ55+nc
+NE/tbmPF1WCC9FcXlnrgYq5WcQ2PFr/t/ko=
+-----END CERTIFICATE-----
diff --git a/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_root.crt b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_root.crt
new file mode 100644
index 000000000..fc96342f3
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_root.crt
@@ -0,0 +1,36 @@
+-----BEGIN CERTIFICATE-----
+MIIGRjCCBC6gAwIBAgIBAzANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJQVDEL
+MAkGA1UECAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UECgwFTXlMYWIxDTAL
+BgNVBAMMBHJvb3QwHhcNMjIwNTE3MjAwNzU3WhcNMjUwMjEwMjAwNzU3WjBMMQsw
+CQYDVQQGEwJQVDELMAkGA1UECAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UE
+CgwFTXlMYWIxDzANBgNVBAMMBnNlcnZlcjCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBANCH7xGzfyrjlsSEphVulAv5KyDfjnvWhN0SsbkLiO3w7sTOCaDQ
+0yAyLnpkkNPuqb3RkBhJA6exK4b2AaEO+L6fWaxB2Uto1INzy+Mdq5QTFjC1Ze6K
+i9M8pKeXt/cqWBx61hBaS7sj1T8znr4qeCc5BGa2OJuos+Y+fYcnL4QyG9FJqx6C
+NG840vhOdwPIRgEfRiX4ia0NkqFBtCbVGOLLUbAwqYqZFKS7NmZkejUxq7n2hQle
+Q/OHEmzNAZaqAQbZHwIzIDsqqbxYUHkcWue7H2nNt/KYhBbuAN7/ZsuOYklju9TH
+6L1R6utmSWyCakHWY2+wYNIMYam89lsXWKul6gDIxwLgnHiE8X0qyZ/K5MIoY16K
+lD4RxuPwlg1EIj5QZ1Po4wPfzSkv9gGJF/MxYQxTy8n+TrSg7q6uN4GrWRJFXpMg
+PAuHLcg+oxOIrraPcliPNyKh4vNVnXRdVLOhEnb9RL2DZGdzmQFD+dJmKitxRrNV
+RAMZ3IgCfxr5jTXAhOxpY+aPI+tdixsLHL+ESwcQ4kcaazhM06Tw2B/wRqsr8+xN
+ObpaD+kzybl5XYd/y3zTYKsxDEyeIIBg/uGhk1V84zYIGxYTdZEYzenKKi+OnhEI
+fu0eG7hTY5WT4hxFecbsWw3OYrCNJUxp2OlEQ/kwHUc5+kXcmW0Z6Fc1AgMBAAGj
+ggEzMIIBLzAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGQDAzBglghkgBhvhC
+AQ0EJhYkT3BlblNTTCBHZW5lcmF0ZWQgU2VydmVyIENlcnRpZmljYXRlMB0GA1Ud
+DgQWBBT6GmW3MZKpAOVt5yVI2DrpnPsSYTB6BgNVHSMEczBxgBTZKG+SIPcMoSX0
+oibvlgtOoQnGnqFOpEwwSjELMAkGA1UEBhMCUFQxCzAJBgNVBAgMAk5BMQ8wDQYD
+VQQHDAZMaXNib24xDjAMBgNVBAoMBU15TGFiMQ0wCwYDVQQDDARyb290ggkA+iIN
+MxHvicEwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMBoGA1Ud
+EQQTMBGCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQUFAAOCAgEAxwH91Q4r
+1JJNTF/XyeXGc8nmeBFtdbs3W8TvfF/3sEqPUQZSl+IWejaGw3USc9S0NV8PGQVz
+qHOLVJfiLtTSGukaIwOAtTfIRSHmLMD8adtdxtmaNB0IfmMBrKgC0D+Sv5iA4HFG
+d20ExeTamJtk4XVnWb9yAd333GYSpRi/IvYjy2U+5NL/9r0G+esLTt4VQG84g+ec
+IWitlFqEhyhX2ioYoMC1cYIkeAm8AirQjNCqAyM/pMLWpogLtooRMIZbfLSqtNXY
+paP328hum5s98JpjPaNqOClRmewUjLBPDzrgHX422j+gkhd9GnhfKLVe9X6AVnki
+poaPh3TWry28o8dMspxBn5EtJEdb64N4aSdrJxiU2TqKy1TM8dRBmDcvkamt5Lvj
+2VlT2Xz2SlYTKL4HA8XlJcOqm0EN5OymNvnbS/5Ydh45EQA9ZtMmlSWlqw73kT/O
+/QVoIDfUboGTuL3YYxD+NAneYF6ed2ZAaAbYrm3iM9ZV1LP/qcle2A2g34uSvkXb
+iWTgPCJvmqrKg5WUY4DWUaHQY4XifhNU9FXi+WX2KyyTpY9yNxMlBrg8RbVZ2HC8
+3PEEjIYZkJPwxWEfcEdd4pkNpLsKH3EivDvze7ZPe2yWQ/+njZykp/RouwZ55+nc
+NE/tbmPF1WCC9FcXlnrgYq5WcQ2PFr/t/ko=
+-----END CERTIFICATE-----
diff --git a/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_root.der.sha256 b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_root.der.sha256
new file mode 100644
index 000000000..3aebaf886
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_root.der.sha256
@@ -0,0 +1 @@
+9a1ceb7664315d5d62bd382ca9258704746a8056922bb36ca263762932e528fa
diff --git a/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_root.key b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_root.key
new file mode 100644
index 000000000..647cd2486
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/generated/server_from_root.key
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIJKQIBAAKCAgEA0IfvEbN/KuOWxISmFW6UC/krIN+Oe9aE3RKxuQuI7fDuxM4J
+oNDTIDIuemSQ0+6pvdGQGEkDp7ErhvYBoQ74vp9ZrEHZS2jUg3PL4x2rlBMWMLVl
+7oqL0zykp5e39ypYHHrWEFpLuyPVPzOevip4JzkEZrY4m6iz5j59hycvhDIb0Umr
+HoI0bzjS+E53A8hGAR9GJfiJrQ2SoUG0JtUY4stRsDCpipkUpLs2ZmR6NTGrufaF
+CV5D84cSbM0BlqoBBtkfAjMgOyqpvFhQeRxa57sfac238piEFu4A3v9my45iSWO7
+1MfovVHq62ZJbIJqQdZjb7Bg0gxhqbz2WxdYq6XqAMjHAuCceITxfSrJn8rkwihj
+XoqUPhHG4/CWDUQiPlBnU+jjA9/NKS/2AYkX8zFhDFPLyf5OtKDurq43gatZEkVe
+kyA8C4ctyD6jE4iuto9yWI83IqHi81WddF1Us6ESdv1EvYNkZ3OZAUP50mYqK3FG
+s1VEAxnciAJ/GvmNNcCE7Glj5o8j612LGwscv4RLBxDiRxprOEzTpPDYH/BGqyvz
+7E05uloP6TPJuXldh3/LfNNgqzEMTJ4ggGD+4aGTVXzjNggbFhN1kRjN6coqL46e
+EQh+7R4buFNjlZPiHEV5xuxbDc5isI0lTGnY6URD+TAdRzn6RdyZbRnoVzUCAwEA
+AQKCAgB10Ze9hJEBBn2Uou3DhiqXaTx44lZ6mYWP8pP/XQkMhuggwdimx9XBhxjD
+hjZdx6aX3ONxFS+/e1aAdlYNTYw1B4t+y+Wduaj4bGBx/b2HeBE9i///er/tpYHS
+PuJt/7qwvKZdrubC4UgG4X97KjugzZIzBhmNuQ+LsxrxVa5/HmChKuJH5oEBpjVs
+nciYlnsW/zh/E6GV6OlDuv+yQQxCd2W8CoKAEGWdfTkLORHjJCFGfIZF+MCjw1kh
+p+KR4ZOa7umaMJCxXTVxeOReySqDazIgcV7Q7mMTIX3UgLDvqY7WsEbbvec9sB7u
+yWgKqtSmRh8AZ8MManpzkJQQe2xY6de0B9ThWYlwPXGkz+deFlEQTpVXJ61uPKD7
+5C+cA0m9ZXXEvwTfkpwLT84U9x2VhZ5ecTTLP9xFIjbWpjJkRmpXRmPWEj2FS++X
+kXwEEj3m5daAuPWtiFSGrOMphYnLaQE6NvGiJ4nJUeyrJMeAxgbhmP1U5n3Q+IUl
+hQQTCjIIIqbpeGvUh3SKIDIrXQIB3tHXaUMykNR0j76dmsyhLQyu+OZyxZLvkXuS
+uliN0lQmAhhzSqMJA0wMloSEyAfDDT8rCWHFPQWXGfc4UYd75OwLjqQ6OLHMvhjB
+vq/gbYf3iqqMxqTNMEYfpFV1mQKaWCBLsQPINOnpEOsbd3r7sQKCAQEA6T0WDRDx
+udypwrLE4VcpRecaXZE9sTndHyCGEgp+ZmZLT3EvD4Nz5T7xBZkGFb5LfTJfkVrd
+KEvbkD8Fcv4DJ7umEZAwQ8C3yiDGDDymelVFWqq4cIHdKEW+nbaXJXqDWwWlsM+B
+H85XA11lMTs0t3CYk4fTmCeqpa3ObFWcm7ZFL0+0Q5ThPZcCkoqPR3Px4102RLDM
+WDsdbhvNg1uVzy7RCHDHM91atTFWvEDIUkyf14ctFuuos++JTyoTXPEtn1x0uIEM
+YyPiqtxLdc3k2sDnrDdhFxBzpP6dl8CvDmoda/W4MXZGl3RG15rOfIYUtYedbmLJ
+Ux2YUDdeMXQw8wKCAQEA5OGWFdTr6U8MBZI/z+c8Ni5BHNVaFlr5T6+SdectR7kD
+Wm4tjg7nO6hP7AUP/WKVSpHRErpmkVHvAYEAZFcKP3uzKM5FufiwdGxdlp+wL6ji
+7J5uCnnS+HPCIo2wRjzMgOwwu+ha4lQL4Julr+Ni0phyJsoIju+ov0AiIlxSmd7j
+XwVnRqdNTw3aPdKWOTXSkrdnPuMbbrR6hsEKjTDnbL5ji1GBxRzXvuYCgr11C7rC
+DxkMwz56G2aaFcrm8Rs0fFKH4YamGV9gGgsONh/sSsFbnH3M+WVdvHFQcTvdcNz7
+tNvdfxDHLfLBW5KNwZKGDfT/IcbtkR4ffni0bnOhNwKCAQEAsGrfGgT+AgqxcS5N
+EvEdq90RKULpufq9kYTFRDIhx4yKXE2NPhu89uJz5jsHyjyE1u7aMJTdAVTXf7Tb
+h04wzsX16AT7LNRBcCb4Blt9xLxo2BqXpankwUh31M0+aD/RyXBtEl7yGT+2uznS
+h7lzt2j4T2cGmmkuf2EG6RScf38Pt6h+/jtHX5GwhW0+0NoXVVW07aIY/ofAS//F
+pB0LJIoR3GOJmWZN7Q2jwILzwqRoptp9NYAMvAVsA7Acs0lNq+N/+erKltaW5Yv5
+m+KfvwL4eV/uFUcBYgSg6R76ilmjZXyX1PnUjUyLJRvYIYI9ec1ZPByGkVKqWcp3
+ecqcFwKCAQEAuMsN80h6xF8m9KSU0tX+fjwwJAh5+Mywt86ocHsayuqss2l7bFPK
+DBejl4qq00iyAofihr1qrG+7ibpOx7SiuIi2KP8JutH4HbeUhFUf2gsAVEzBycF8
+PU6w8lb1eHAEKR8JZd1+63cyM8FXL8Bl/GRK3diGumjzFJ7CMH3bzxHu/7wMGzZe
+q7Iif4Gz+jLjdcOQH20bq/EZcA0R6NcQMnMxSb2gCbZ01lM8ubQfeT3rCmeOL2EV
+E2RuiaPNe+McKDg2LzcYiinAHKbKbZaun9inj5zeTomx+cB/Uz0jV8mDjA1sMvgn
+6Igz5yxXOW+EvmYNS4ciLeVlRiZMf1TqVwKCAQBW3zT75oJXf8BDf3ezP8YfQXRp
+QPyKoFzluqGQbr4r/H+VQNbCGO3Ai5eeTrsWOVoNhNabdPnSjbxahVNLT/D/bgab
+z4jpYNcXaXrWuhlJOzH/vCIwvR2tJz3cVSQLacIs3w/m+isvfRVcfpHCVguoTtLz
+biufSPJ2VFb6TutZanKTK7hpUhYfmlOcVwXOxr+wHXkA1obhc3vUhth3ZaXgRkbt
+OPc9d3ZkRlYIaP/lkuctK5UKzIKQAFP+k0zu7iKHFY36iiXduAnhmm1UplnoPOlw
+5+VXgJWfB6t1nqGKLQyHSDh8g76YUTE6NZWRj/r0bfrsHV95OVgbCLRoJNs0
+-----END RSA PRIVATE KEY-----
diff --git a/logstash-core/src/test/resources/org/logstash/util/x509_certificates/openssl.cnf b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/openssl.cnf
new file mode 100644
index 000000000..83bd0699e
--- /dev/null
+++ b/logstash-core/src/test/resources/org/logstash/util/x509_certificates/openssl.cnf
@@ -0,0 +1,53 @@
+[ req ]
+distinguished_name= req_distinguished_name
+attributes= req_attributes
+
+[ req_distinguished_name ]
+countryName= Country Name (2 letter code)
+countryName_min= 2
+countryName_max= 2
+stateOrProvinceName= State or Province Name (full name)
+localityName= Locality Name (eg, city)
+0.organizationName= Organization Name (eg, company)
+organizationalUnitName= Organizational Unit Name (eg, section)
+commonName= Common Name (eg, fully qualified host name)
+commonName_max= 64
+emailAddress= Email Address
+emailAddress_max= 64
+
+[ req_attributes ]
+challengePassword= A challenge password
+challengePassword_min= 4
+challengePassword_max= 20
+
+[ ca ]
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer
+basicConstraints = critical, CA:true
+keyUsage = critical, digitalSignature, cRLSign, keyCertSign
+
+[ intermediate_ca ]
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer
+basicConstraints = critical, CA:true, pathlen:0
+keyUsage = critical, digitalSignature, cRLSign, keyCertSign
+
+[ client_cert ]
+basicConstraints = CA:FALSE
+nsCertType = client, email
+nsComment = "OpenSSL Generated Client Certificate"
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid,issuer
+keyUsage = critical, nonRepudiation, digitalSignature, keyEncipherment
+extendedKeyUsage = clientAuth, emailProtection
+subjectAltName = "DNS:localhost, IP:127.0.0.1"
+
+[ server_cert ]
+basicConstraints = CA:FALSE
+nsCertType = server
+nsComment = "OpenSSL Generated Server Certificate"
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid,issuer:always
+keyUsage = critical, digitalSignature, keyEncipherment
+extendedKeyUsage = serverAuth
+subjectAltName = "DNS:localhost, IP:127.0.0.1"
diff --git a/logstash-core/src/test/resources/shutdown_watcher_ext_pipeline_template.rb b/logstash-core/src/test/resources/shutdown_watcher_ext_pipeline_template.rb
new file mode 100644
index 000000000..07e7241bc
--- /dev/null
+++ b/logstash-core/src/test/resources/shutdown_watcher_ext_pipeline_template.rb
@@ -0,0 +1,33 @@
+pipeline = Object.new
+reporter = Object.new
+snapshot = Object.new
+inflight_count = java.util.concurrent.atomic.AtomicInteger.new
+snapshot.define_singleton_method(:inflight_count) do
+  inflight_count.increment_and_get + 1
+end
+threads = {}
+snapshot.define_singleton_method(:stalling_threads) do
+  threads
+end
+snapshot.define_singleton_method(:to_s) do
+  "inflight_count=>" + inflight_count.get.to_s + ", stalling_threads_info=>{...}"
+end
+reporter.define_singleton_method(:snapshot) do
+  snapshot
+end
+pipeline.define_singleton_method(:thread) do
+  Thread.current
+end
+pipeline.define_singleton_method(:finished_execution?) do
+  false
+end
+pipeline.define_singleton_method(:reporter) do
+  reporter
+end
+pipeline.define_singleton_method(:worker_threads_draining?) do
+  %{value_placeholder}
+end
+pipeline.define_singleton_method(:pipeline_id) do
+  "fake_test_pipeline"
+end
+pipeline
diff --git a/modules/README.md b/modules/README.md
deleted file mode 100644
index a1cbe3b62..000000000
--- a/modules/README.md
+++ /dev/null
@@ -1,96 +0,0 @@
-# Module settings and structure
-
-## settings 
-
-### logstash.yml
-
-```
-modules:
-  - name: netflow
-  var.output.elasticsearch.host: "es.mycloud.com"
-  var.output.elasticsearch.user: "foo"
-  var.output.elasticsearch.password: "password"
-  var.input.tcp.port: 5606
-```
-
-### command-line
-
-```
-bin/logstash \
- --modules netflow \
- -M "netflow.var.output.elasticsearch.host=es.mycloud.com" \
- -M "netflow.var.output.elasticsearch.user=foo" \
- -M "netflow.var.output.elasticsearch.password=password" \
- -M "netflow.var.input.tcp.port=5606"
-```
-
-## Current Gem structure
-```
-GEM File structure
-logstash-module-netflow
-├── configuration
-│   ├── elasticsearch
-│   │   └── netflow.json
-│   ├── kibana
-│   │   ├── dashboard
-│   │   │   └── netflow.json (contains '["dash1", "dash2"]')
-│   │   │   └── dash1.json ("panelJSON" contains refs to visualization panels 1,2 and search 1)
-│   │   │   └── dash2.json ("panelJSON" contains refs to visualization panel 3  and search 2)
-│   │   ├── index-pattern
-|   |   |   └── netflow.json
-│   │   ├── search
-|   |   |   └── search1.json
-|   |   |   └── search2.json
-│   │   └── vizualization
-|   |   |   └── panel1.json
-|   |   |   └── panel2.json
-|   |   |   └── panel3.json
-│   └── logstash
-│       └── netflow.conf.erb
-├── lib
-│   └── logstash_registry.rb
-└── logstash-module-netflow.gemspec
-```
-## Proposed multi-version Gem structure
-```
-GEM File structure
-logstash-module-netflow
-├── configuration
-│   ├── elasticsearch
-│   │   └── netflow.json
-│   ├── kibana
-│   │   ├── dashboard
-│   │   │   └── netflow.json (contains '{"v5.5.0": ["dash1", "dash2"], "v6.0.4": ["dash1", "dash2"]')
-│   │   │   └── v5.5.0
-│   │   │   |   └── dash1.json ("panelJSON" contains refs to visualization panels 1,2 and search 1)
-│   │   │   |   └── dash2.json ("panelJSON" contains refs to visualization panel 3  and search 2)
-│   │   │   └── v6.0.4
-│   │   │       └── dash1.json ("panelJSON" contains refs to visualization panels 1,2 and search 1)
-│   │   │       └── dash2.json ("panelJSON" contains refs to visualization panel 3  and search 2)
-│   │   ├── index-pattern
-│   │   │   └── v5
-|   |   |   |   └── netflow.json
-│   │   │   └── v6
-|   |   |       └── netflow.json
-│   │   ├── search
-│   │   │   └── v5
-|   |   |   |   └── search1.json
-|   |   |   |   └── search2.json
-│   │   │   └── v6
-|   |   |       └── search1.json
-|   |   |       └── search2.json
-│   │   └── vizualization
-│   │   │   └── v5
-|   |   |   |   └── panel1.json
-|   |   |   |   └── panel2.json
-|   |   |   |   └── panel3.json
-│   │   │   └── v6
-|   |   |       └── panel1.json
-|   |   |       └── panel2.json
-|   |   |       └── panel3.json
-│   └── logstash
-│       └── netflow.conf.erb
-├── lib
-│   └── logstash_registry.rb
-└── logstash-module-netflow.gemspec
-```
diff --git a/modules/fb_apache/README.md b/modules/fb_apache/README.md
deleted file mode 100644
index 6e8faeb24..000000000
--- a/modules/fb_apache/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# IMPORTANT
-
-This module is only here for testing and should not be used in production.
-
diff --git a/modules/fb_apache/configuration/elasticsearch/fb_apache.json b/modules/fb_apache/configuration/elasticsearch/fb_apache.json
deleted file mode 100644
index 1c1a6bbed..000000000
--- a/modules/fb_apache/configuration/elasticsearch/fb_apache.json
+++ /dev/null
@@ -1,674 +0,0 @@
-{
-  "mappings": {
-    "_meta": {
-      "version": "5.4.0"
-    },
-    "date_detection": false,
-    "dynamic_templates": [
-      {
-        "strings_as_keyword": {
-          "mapping": {
-            "ignore_above": 1024,
-            "type": "keyword"
-          },
-          "match_mapping_type": "string"
-        }
-      }
-    ],
-    "properties": {
-      "@timestamp": {
-        "type": "date"
-      },
-      "apache2": {
-        "properties": {
-          "access": {
-            "properties": {
-              "agent": {
-                "norms": false,
-                "type": "text"
-              },
-              "body_sent": {
-                "properties": {
-                  "bytes": {
-                    "type": "long"
-                  }
-                }
-              },
-              "geoip": {
-                "properties": {
-                  "continent_name": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "country_iso_code": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "location": {
-                    "type": "geo_point"
-                  }
-                }
-              },
-              "http_version": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "method": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "referrer": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "remote_ip": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "response_code": {
-                "type": "long"
-              },
-              "url": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "user_agent": {
-                "properties": {
-                  "device": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "major": {
-                    "type": "long"
-                  },
-                  "minor": {
-                    "type": "long"
-                  },
-                  "name": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "os": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "os_major": {
-                    "type": "long"
-                  },
-                  "os_minor": {
-                    "type": "long"
-                  },
-                  "os_name": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "patch": {
-                    "type": "long"
-                  }
-                }
-              },
-              "user_name": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              }
-            }
-          },
-          "error": {
-            "properties": {
-              "client": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "level": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "message": {
-                "norms": false,
-                "type": "text"
-              },
-              "module": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "pid": {
-                "type": "long"
-              },
-              "tid": {
-                "type": "long"
-              }
-            }
-          }
-        }
-      },
-      "auditd": {
-        "properties": {
-          "log": {
-            "properties": {
-              "a0": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "acct": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "geoip": {
-                "properties": {
-                  "city_name": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "continent_name": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "country_iso_code": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "location": {
-                    "type": "geo_point"
-                  },
-                  "region_name": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  }
-                }
-              },
-              "item": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "items": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "new_auid": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "new_ses": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "old_auid": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "old_ses": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "pid": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "ppid": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "record_type": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "res": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "sequence": {
-                "type": "long"
-              }
-            }
-          }
-        }
-      },
-      "beat": {
-        "properties": {
-          "hostname": {
-            "ignore_above": 1024,
-            "type": "keyword"
-          },
-          "name": {
-            "ignore_above": 1024,
-            "type": "keyword"
-          },
-          "version": {
-            "ignore_above": 1024,
-            "type": "keyword"
-          }
-        }
-      },
-      "error": {
-        "ignore_above": 1024,
-        "type": "keyword"
-      },
-      "fields": {
-        "properties": {}
-      },
-      "fileset": {
-        "properties": {
-          "module": {
-            "ignore_above": 1024,
-            "type": "keyword"
-          },
-          "name": {
-            "ignore_above": 1024,
-            "type": "keyword"
-          }
-        }
-      },
-      "input_type": {
-        "ignore_above": 1024,
-        "type": "keyword"
-      },
-      "message": {
-        "norms": false,
-        "type": "text"
-      },
-      "meta": {
-        "properties": {
-          "cloud": {
-            "properties": {
-              "availability_zone": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "instance_id": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "machine_type": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "project_id": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "provider": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "region": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              }
-            }
-          }
-        }
-      },
-      "mysql": {
-        "properties": {
-          "error": {
-            "properties": {
-              "level": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "message": {
-                "norms": false,
-                "type": "text"
-              },
-              "thread_id": {
-                "type": "long"
-              },
-              "timestamp": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              }
-            }
-          },
-          "slowlog": {
-            "properties": {
-              "host": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "id": {
-                "type": "long"
-              },
-              "ip": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "lock_time": {
-                "properties": {
-                  "sec": {
-                    "type": "float"
-                  }
-                }
-              },
-              "query": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "query_time": {
-                "properties": {
-                  "sec": {
-                    "type": "float"
-                  }
-                }
-              },
-              "rows_examined": {
-                "type": "long"
-              },
-              "rows_sent": {
-                "type": "long"
-              },
-              "timestamp": {
-                "type": "long"
-              },
-              "user": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              }
-            }
-          }
-        }
-      },
-      "nginx": {
-        "properties": {
-          "access": {
-            "properties": {
-              "agent": {
-                "norms": false,
-                "type": "text"
-              },
-              "body_sent": {
-                "properties": {
-                  "bytes": {
-                    "type": "long"
-                  }
-                }
-              },
-              "geoip": {
-                "properties": {
-                  "continent_name": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "country_iso_code": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "location": {
-                    "type": "geo_point"
-                  }
-                }
-              },
-              "http_version": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "method": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "referrer": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "remote_ip": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "response_code": {
-                "type": "long"
-              },
-              "url": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "user_agent": {
-                "properties": {
-                  "device": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "major": {
-                    "type": "long"
-                  },
-                  "minor": {
-                    "type": "long"
-                  },
-                  "name": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "os": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "os_major": {
-                    "type": "long"
-                  },
-                  "os_minor": {
-                    "type": "long"
-                  },
-                  "os_name": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "patch": {
-                    "type": "long"
-                  }
-                }
-              },
-              "user_name": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              }
-            }
-          },
-          "error": {
-            "properties": {
-              "connection_id": {
-                "type": "long"
-              },
-              "level": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "message": {
-                "norms": false,
-                "type": "text"
-              },
-              "pid": {
-                "type": "long"
-              },
-              "tid": {
-                "type": "long"
-              }
-            }
-          }
-        }
-      },
-      "offset": {
-        "type": "long"
-      },
-      "read_timestamp": {
-        "ignore_above": 1024,
-        "type": "keyword"
-      },
-      "source": {
-        "ignore_above": 1024,
-        "type": "keyword"
-      },
-      "system": {
-        "properties": {
-          "auth": {
-            "properties": {
-              "groupadd": {
-                "properties": {
-                  "gid": {
-                    "type": "long"
-                  },
-                  "name": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  }
-                }
-              },
-              "hostname": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "message": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "pid": {
-                "type": "long"
-              },
-              "program": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "ssh": {
-                "properties": {
-                  "dropped_ip": {
-                    "type": "ip"
-                  },
-                  "event": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "geoip": {
-                    "properties": {
-                      "city_name": {
-                        "ignore_above": 1024,
-                        "type": "keyword"
-                      },
-                      "continent_name": {
-                        "ignore_above": 1024,
-                        "type": "keyword"
-                      },
-                      "country_iso_code": {
-                        "ignore_above": 1024,
-                        "type": "keyword"
-                      },
-                      "location": {
-                        "type": "geo_point"
-                      },
-                      "region_name": {
-                        "ignore_above": 1024,
-                        "type": "keyword"
-                      }
-                    }
-                  },
-                  "ip": {
-                    "type": "ip"
-                  },
-                  "method": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "port": {
-                    "type": "long"
-                  },
-                  "signature": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  }
-                }
-              },
-              "sudo": {
-                "properties": {
-                  "command": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "error": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "pwd": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "tty": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "user": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  }
-                }
-              },
-              "timestamp": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "user": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "useradd": {
-                "properties": {
-                  "gid": {
-                    "type": "long"
-                  },
-                  "home": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "name": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "shell": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "uid": {
-                    "type": "long"
-                  }
-                }
-              }
-            }
-          },
-          "syslog": {
-            "properties": {
-              "hostname": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "message": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "pid": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "program": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "timestamp": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              }
-            }
-          }
-        }
-      },
-      "tags": {
-        "ignore_above": 1024,
-        "type": "keyword"
-      },
-      "type": {
-        "ignore_above": 1024,
-        "type": "keyword"
-      }
-    }
-  },
-  "order": 0,
-  "settings": {
-    "index.mapping.total_fields.limit": 10000,
-    "index.refresh_interval": "5s"
-  },
-  "index_patterns": "fb_apache-*"
-}
\ No newline at end of file
diff --git a/modules/fb_apache/configuration/kibana/dashboard/Filebeat-Apache2-Dashboard.json b/modules/fb_apache/configuration/kibana/dashboard/Filebeat-Apache2-Dashboard.json
deleted file mode 100644
index 82612f05d..000000000
--- a/modules/fb_apache/configuration/kibana/dashboard/Filebeat-Apache2-Dashboard.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "hits": 0, 
-  "timeRestore": false, 
-  "description": "", 
-  "title": "Filebeat Apache2 Dashboard", 
-  "uiStateJSON": "{\"P-1\":{\"mapCenter\":[40.713955826286046,-0.17578125]}}", 
-  "panelsJSON": "[{\"col\":1,\"id\":\"Apache2-access-unique-IPs-map\",\"panelIndex\":1,\"row\":1,\"size_x\":12,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"Apache2-response-codes-of-top-URLs\",\"panelIndex\":2,\"row\":6,\"size_x\":8,\"size_y\":3,\"type\":\"visualization\"},{\"col\":9,\"id\":\"Apache2-browsers\",\"panelIndex\":3,\"row\":6,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":11,\"id\":\"Apache2-operating-systems\",\"panelIndex\":4,\"row\":4,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"Apache2-error-logs-over-time\",\"panelIndex\":5,\"row\":9,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"Apache2-response-codes-over-time\",\"panelIndex\":6,\"row\":4,\"size_x\":10,\"size_y\":2,\"type\":\"visualization\"},{\"id\":\"Apache2-errors-log\",\"type\":\"search\",\"panelIndex\":7,\"size_x\":12,\"size_y\":3,\"col\":1,\"row\":11,\"columns\":[\"apache2.error.client\",\"apache2.error.level\",\"apache2.error.module\",\"apache2.error.message\"],\"sort\":[\"@timestamp\",\"desc\"]}]", 
-  "optionsJSON": "{\"darkTheme\":false}", 
-  "version": 1, 
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}]}"
-  }
-}
\ No newline at end of file
diff --git a/modules/fb_apache/configuration/kibana/dashboard/fb_apache.json b/modules/fb_apache/configuration/kibana/dashboard/fb_apache.json
deleted file mode 100644
index bc849e9c4..000000000
--- a/modules/fb_apache/configuration/kibana/dashboard/fb_apache.json
+++ /dev/null
@@ -1 +0,0 @@
-["Filebeat-Apache2-Dashboard"]
diff --git a/modules/fb_apache/configuration/kibana/index-pattern/fb_apache.json b/modules/fb_apache/configuration/kibana/index-pattern/fb_apache.json
deleted file mode 100644
index c084edc2b..000000000
--- a/modules/fb_apache/configuration/kibana/index-pattern/fb_apache.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fields": "[{\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"beat.name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"beat.hostname\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"beat.version\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"@timestamp\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"date\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"tags\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"fields\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.provider\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.instance_id\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.machine_type\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.availability_zone\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.project_id\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.region\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"source\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"offset\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": false, \"name\": \"message\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"type\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"input_type\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"error\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"read_timestamp\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"fileset.module\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"fileset.name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.access.remote_ip\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.access.user_name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.access.method\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.access.url\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.access.http_version\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.access.response_code\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.access.body_sent.bytes\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.access.referrer\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": false, \"name\": \"apache2.access.agent\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.access.user_agent.device\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.access.user_agent.major\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.access.user_agent.minor\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.access.user_agent.patch\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.access.user_agent.name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.access.user_agent.os\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.access.user_agent.os_major\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.access.user_agent.os_minor\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.access.user_agent.os_name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.access.geoip.continent_name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.access.geoip.country_iso_code\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.access.geoip.location\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"geo_point\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.error.level\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.error.client\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": false, \"name\": \"apache2.error.message\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.error.pid\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.error.tid\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"apache2.error.module\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"auditd.log.record_type\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"auditd.log.old_auid\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"auditd.log.new_auid\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"auditd.log.old_ses\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"auditd.log.new_ses\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"auditd.log.sequence\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"auditd.log.acct\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"auditd.log.pid\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"auditd.log.ppid\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"auditd.log.items\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"auditd.log.item\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"auditd.log.a0\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"auditd.log.res\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"auditd.log.geoip.continent_name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"auditd.log.geoip.city_name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"auditd.log.geoip.region_name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"auditd.log.geoip.country_iso_code\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"auditd.log.geoip.location\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"geo_point\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"mysql.error.timestamp\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"mysql.error.thread_id\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"mysql.error.level\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": false, \"name\": \"mysql.error.message\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"mysql.slowlog.user\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"mysql.slowlog.host\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"mysql.slowlog.ip\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"mysql.slowlog.query_time.sec\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"mysql.slowlog.lock_time.sec\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"mysql.slowlog.rows_sent\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"mysql.slowlog.rows_examined\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"mysql.slowlog.timestamp\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"mysql.slowlog.query\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"mysql.slowlog.id\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.access.remote_ip\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.access.user_name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.access.method\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.access.url\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.access.http_version\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.access.response_code\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.access.body_sent.bytes\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.access.referrer\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": false, \"name\": \"nginx.access.agent\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.access.user_agent.device\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.access.user_agent.major\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.access.user_agent.minor\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.access.user_agent.patch\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.access.user_agent.name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.access.user_agent.os\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.access.user_agent.os_major\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.access.user_agent.os_minor\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.access.user_agent.os_name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.access.geoip.continent_name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.access.geoip.country_iso_code\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.access.geoip.location\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"geo_point\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.error.level\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.error.pid\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.error.tid\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"nginx.error.connection_id\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": false, \"name\": \"nginx.error.message\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.timestamp\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.hostname\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.program\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.pid\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.message\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.user\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.ssh.event\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.ssh.method\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.ssh.ip\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.ssh.dropped_ip\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.ssh.port\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.ssh.signature\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.ssh.geoip.continent_name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.ssh.geoip.city_name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.ssh.geoip.region_name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.ssh.geoip.country_iso_code\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.ssh.geoip.location\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"geo_point\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.sudo.error\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.sudo.tty\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.sudo.pwd\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.sudo.user\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.sudo.command\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.useradd.name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.useradd.uid\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.useradd.gid\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.useradd.home\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.useradd.shell\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.groupadd.name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.auth.groupadd.gid\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"number\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.syslog.timestamp\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.syslog.hostname\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.syslog.program\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.syslog.pid\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"system.syslog.message\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": false, \"name\": \"_id\", \"searchable\": false, \"indexed\": false, \"doc_values\": false, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"_type\", \"searchable\": true, \"indexed\": false, \"doc_values\": false, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": false, \"name\": \"_index\", \"searchable\": false, \"indexed\": false, \"doc_values\": false, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": false, \"name\": \"_score\", \"searchable\": false, \"indexed\": false, \"doc_values\": false, \"type\": \"number\", \"scripted\": false}]", 
-  "fieldFormatMap": "{\"@timestamp\": {\"id\": \"date\"}, \"nginx.access.body_sent.bytes\": {\"id\": \"bytes\"}, \"apache2.access.body_sent.bytes\": {\"id\": \"bytes\"}}", 
-  "timeFieldName": "@timestamp", 
-  "title": "fb_apache-*"
-}
\ No newline at end of file
diff --git a/modules/fb_apache/configuration/kibana/search/Apache2-access-logs.json b/modules/fb_apache/configuration/kibana/search/Apache2-access-logs.json
deleted file mode 100644
index c637adaf9..000000000
--- a/modules/fb_apache/configuration/kibana/search/Apache2-access-logs.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "sort": [
-    "@timestamp", 
-    "desc"
-  ], 
-  "hits": 0, 
-  "description": "", 
-  "title": "Apache2 access logs", 
-  "version": 1, 
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"fb_apache-*\",\"query\":{\"query_string\":{\"query\":\"_exists_:apache2.access\",\"analyze_wildcard\":true}},\"filter\":[],\"highlight\":{\"pre_tags\":[\"@kibana-highlighted-field@\"],\"post_tags\":[\"@/kibana-highlighted-field@\"],\"fields\":{\"*\":{}},\"require_field_match\":false,\"fragment_size\":2147483647}}"
-  }, 
-  "columns": [
-    "apache2.access.remote_ip", 
-    "apache2.access.method", 
-    "apache2.access.url", 
-    "apache2.access.response_code"
-  ]
-}
\ No newline at end of file
diff --git a/modules/fb_apache/configuration/kibana/search/Apache2-errors-log.json b/modules/fb_apache/configuration/kibana/search/Apache2-errors-log.json
deleted file mode 100644
index 42cde4909..000000000
--- a/modules/fb_apache/configuration/kibana/search/Apache2-errors-log.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "sort": [
-    "@timestamp", 
-    "desc"
-  ], 
-  "hits": 0, 
-  "description": "", 
-  "title": "Apache2 errors log", 
-  "version": 1, 
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"fb_apache-*\",\"query\":{\"query_string\":{\"query\":\"_exists_:apache2.error\",\"analyze_wildcard\":true}},\"filter\":[],\"highlight\":{\"pre_tags\":[\"@kibana-highlighted-field@\"],\"post_tags\":[\"@/kibana-highlighted-field@\"],\"fields\":{\"*\":{}},\"require_field_match\":false,\"fragment_size\":2147483647}}"
-  }, 
-  "columns": [
-    "apache2.error.client", 
-    "apache2.error.level", 
-    "apache2.error.module", 
-    "apache2.error.message"
-  ]
-}
\ No newline at end of file
diff --git a/modules/fb_apache/configuration/kibana/visualization/Apache2-access-unique-IPs-map.json b/modules/fb_apache/configuration/kibana/visualization/Apache2-access-unique-IPs-map.json
deleted file mode 100644
index 2a6b48ca8..000000000
--- a/modules/fb_apache/configuration/kibana/visualization/Apache2-access-unique-IPs-map.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "visState": "{\"title\":\"Apache2 access unique IPs map\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Scaled Circle Markers\",\"isDesaturated\":true,\"addTooltip\":true,\"heatMaxZoom\":16,\"heatMinOpacity\":0.1,\"heatRadius\":25,\"heatBlur\":15,\"heatNormalizeData\":true,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[15,5],\"wms\":{\"enabled\":false,\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\",\"options\":{\"version\":\"1.3.0\",\"layers\":\"0\",\"format\":\"image/png\",\"transparent\":true,\"attribution\":\"Maps provided by USGS\",\"styles\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"apache2.access.remote_ip\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"apache2.access.geoip.location\",\"autoPrecision\":true}}],\"listeners\":{}}", 
-  "description": "", 
-  "title": "Apache2 access unique IPs map", 
-  "uiStateJSON": "{\"mapCenter\":[14.944784875088372,5.09765625]}", 
-  "version": 1, 
-  "savedSearchId": "Apache2-access-logs", 
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/modules/fb_apache/configuration/kibana/visualization/Apache2-browsers.json b/modules/fb_apache/configuration/kibana/visualization/Apache2-browsers.json
deleted file mode 100644
index db6bd7b8e..000000000
--- a/modules/fb_apache/configuration/kibana/visualization/Apache2-browsers.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "visState": "{\"title\":\"Apache2 browsers\",\"type\":\"pie\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"bottom\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"apache2.access.remote_ip\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"apache2.access.user_agent.name\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"apache2.access.user_agent.major\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}", 
-  "description": "", 
-  "title": "Apache2 browsers", 
-  "uiStateJSON": "{}", 
-  "version": 1, 
-  "savedSearchId": "Apache2-access-logs", 
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/modules/fb_apache/configuration/kibana/visualization/Apache2-error-logs-over-time.json b/modules/fb_apache/configuration/kibana/visualization/Apache2-error-logs-over-time.json
deleted file mode 100644
index caab40732..000000000
--- a/modules/fb_apache/configuration/kibana/visualization/Apache2-error-logs-over-time.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "visState": "{\"title\":\"Apache2 error logs over time\",\"type\":\"histogram\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"scale\":\"linear\",\"mode\":\"stacked\",\"times\":[],\"addTimeMarker\":false,\"defaultYExtents\":false,\"setYExtents\":false,\"yAxis\":{}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"interval\":\"auto\",\"customInterval\":\"2h\",\"min_doc_count\":1,\"extended_bounds\":{}}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"apache2.error.level\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}", 
-  "description": "", 
-  "title": "Apache2 error logs over time", 
-  "uiStateJSON": "{}", 
-  "version": 1, 
-  "savedSearchId": "Apache2-errors-log", 
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/modules/fb_apache/configuration/kibana/visualization/Apache2-operating-systems.json b/modules/fb_apache/configuration/kibana/visualization/Apache2-operating-systems.json
deleted file mode 100644
index 47f388e89..000000000
--- a/modules/fb_apache/configuration/kibana/visualization/Apache2-operating-systems.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "visState": "{\"title\":\"Apache2 operating systems\",\"type\":\"pie\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"bottom\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"apache2.access.remote_ip\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"apache2.access.user_agent.os_name\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"apache2.access.user_agent.os_major\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}", 
-  "description": "", 
-  "title": "Apache2 operating systems", 
-  "uiStateJSON": "{}", 
-  "version": 1, 
-  "savedSearchId": "Apache2-access-logs", 
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/modules/fb_apache/configuration/kibana/visualization/Apache2-response-codes-of-top-URLs.json b/modules/fb_apache/configuration/kibana/visualization/Apache2-response-codes-of-top-URLs.json
deleted file mode 100644
index a7aba5f73..000000000
--- a/modules/fb_apache/configuration/kibana/visualization/Apache2-response-codes-of-top-URLs.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "visState": "{\"title\":\"Apache2 response codes of top URLs\",\"type\":\"pie\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"split\",\"params\":{\"field\":\"apache2.access.url\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"URL\",\"row\":false}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"apache2.access.response_code\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}", 
-  "description": "", 
-  "title": "Apache2 response codes of top URLs", 
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"200\":\"#7EB26D\",\"404\":\"#EF843C\"}}}", 
-  "version": 1, 
-  "savedSearchId": "Apache2-access-logs", 
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/modules/fb_apache/configuration/kibana/visualization/Apache2-response-codes-over-time.json b/modules/fb_apache/configuration/kibana/visualization/Apache2-response-codes-over-time.json
deleted file mode 100644
index 7c24a1ea0..000000000
--- a/modules/fb_apache/configuration/kibana/visualization/Apache2-response-codes-over-time.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "visState": "{\"title\":\"Apache2 response codes over time\",\"type\":\"histogram\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"scale\":\"linear\",\"mode\":\"stacked\",\"times\":[],\"addTimeMarker\":false,\"defaultYExtents\":false,\"setYExtents\":false,\"yAxis\":{}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"interval\":\"auto\",\"customInterval\":\"2h\",\"min_doc_count\":1,\"extended_bounds\":{}}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"apache2.access.response_code\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}", 
-  "description": "", 
-  "title": "Apache2 response codes over time", 
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"200\":\"#629E51\",\"404\":\"#EF843C\"}}}", 
-  "version": 1, 
-  "savedSearchId": "Apache2-access-logs", 
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/modules/fb_apache/configuration/logstash/fb_apache.conf.erb b/modules/fb_apache/configuration/logstash/fb_apache.conf.erb
deleted file mode 100644
index 6f6ecb77a..000000000
--- a/modules/fb_apache/configuration/logstash/fb_apache.conf.erb
+++ /dev/null
@@ -1,32 +0,0 @@
-input {
-  beats {
-    port => <%= setting('var.input.beats.port', '5044') %>
-  }
-}
-
-filter {
-  grok {
-    match => { "message" => [ '%{IPORHOST:apache2.access.remote_ip} - %{DATA:apache2.access.user_name} \[%{HTTPDATE:apache2.access.time}\] "%{WORD:apache2.access.method} %{DATA:apache2.access.url} HTTP/%{NUMBER:apache2.access.http_version}" %{NUMBER:apache2.access.response_code} (?:%{NUMBER:apache2.access.body_sent.bytes}|-)( "%{DATA:apache2.access.referrer}")?( "%{DATA:apache2.access.agent}")?', '%{IPORHOST:apache2.access.remote_ip} - %{DATA:apache2.access.user_name} \[%{HTTPDATE:apache2.access.time}\] "-" %{NUMBER:apache2.access.response_code} -'] }
-    remove_field => [ "message" ]
-  }
-
-  date {
-    match => [ "apache2.access.time", "dd/MMM/YYYY:HH:mm:ss Z" ]
-    remove_field => [ "apache2.access.time" ]
-  }
-
-  useragent {
-    source => "apache2.access.agent"
-    target => "apache2.access.user_agent"
-    remove_field => [ "apache2.access.agent" ]
-  }
-
-  geoip {
-    source => "apache2.access.remote_ip"
-    target => "apache2.access.geoip"
-  }
-}
-
-output {
-  <%= elasticsearch_output_config() %>
-}
diff --git a/modules/fb_apache/lib/logstash_registry.rb b/modules/fb_apache/lib/logstash_registry.rb
deleted file mode 100644
index 6eec19b91..000000000
--- a/modules/fb_apache/lib/logstash_registry.rb
+++ /dev/null
@@ -1 +0,0 @@
-LogStash::PLUGIN_REGISTRY.add(:modules, "fb_apache", LogStash::Modules::Scaffold.new("fb_apache", File.join(File.dirname(__FILE__), "..", "configuration")))
diff --git a/modules/netflow/README.md b/modules/netflow/README.md
deleted file mode 100644
index d745af6e9..000000000
--- a/modules/netflow/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Netflow Module README
-
-## Configuration
-
-There is only one variable associated with netflow, which is the port on which to listen for traffic.
-
-The default port is `2055`.
-
-For Elasticsearch-specific configuration—which is common to all modules—see the official Logstash documentation.
-
-### Launching from the command-line
-
-```
-$LS_HOME/bin/logstash --modules netflow -M netflow.var.input.udp.port=XXXX
-```
-
-### Adding to `logstash.yml`
-
-Ensure these lines are properly added to your `logstash.yml`:
-
-```
-modules:
-  - name: netflow
-    var.input.udp.port: XXXX
-```
-
-With this properly configured, when Logstash is started, it will run the module.
\ No newline at end of file
diff --git a/modules/netflow/configuration/elasticsearch/netflow.json b/modules/netflow/configuration/elasticsearch/netflow.json
deleted file mode 100644
index ee5c72de8..000000000
--- a/modules/netflow/configuration/elasticsearch/netflow.json
+++ /dev/null
@@ -1,1052 +0,0 @@
-{
-    "order": 0,
-    "index_patterns": "netflow-*",
-    "mappings": {
-        "_meta": {
-            "version": "7.0.0"
-        },
-        "dynamic_templates": [
-            {
-                "application_id": {
-                    "path_match": "netflow.application_id",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "bgp_ipv4_next_hop": {
-                    "path_match": "netflow.bgp_ipv4_next_hop",
-                    "mapping": {
-                        "type": "ip"
-                    }
-                }
-            },
-            {
-                "bgp_ipv6_next_hop": {
-                    "path_match": "netflow.bgp_ipv6_next_hop",
-                    "mapping": {
-                        "type": "ip"
-                    }
-                }
-            },
-            {
-                "conn_id": {
-                    "path_match": "netflow.conn_id",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "dst_as": {
-                    "path_match": "netflow.dst_as",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "dst_tos": {
-                    "path_match": "netflow.dst_tos",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "dst_vlan": {
-                    "path_match": "netflow.dst_vlan",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "engine_id": {
-                    "path_match": "netflow.engine_id",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "engine_type": {
-                    "path_match": "netflow.engine_type",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "event_time_msec": {
-                    "path_match": "netflow.event_time_msec",
-                    "mapping": {
-                        "type": "long"
-                    }
-                }
-            },
-            {
-                "flow_active_timeout": {
-                    "path_match": "netflow.flow_active_timeout",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "flow_end_reason": {
-                    "path_match": "netflow.flow_end_reason",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "flow_inactive_timeout": {
-                    "path_match": "netflow.flow_inactive_timeout",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "flow_records": {
-                    "path_match": "netflow.flow_records",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "flow_sampler_id": {
-                    "path_match": "netflow.flow_sampler_id",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "flow_sampler_mode": {
-                    "path_match": "netflow.flow_sampler_mode",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "flow_sampler_random_interval": {
-                    "path_match": "netflow.flow_sampler_random_interval",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "flow_start_msec": {
-                    "path_match": "netflow.flow_start_msec",
-                    "mapping": {
-                        "type": "long"
-                    }
-                }
-            },
-            {
-                "flows": {
-                    "path_match": "netflow.flows",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "flowset_id": {
-                    "path_match": "netflow.flowset_id",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "fw_event": {
-                    "path_match": "netflow.fw_event",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "fw_ext_event": {
-                    "path_match": "netflow.fw_ext_event",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "fwd_flow_delta_bytes": {
-                    "path_match": "netflow.fwd_flow_delta_bytes",
-                    "mapping": {
-                        "type": "long"
-                    }
-                }
-            },
-            {
-                "icmp_code": {
-                    "path_match": "netflow.icmp_code",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "icmp_code_ipv6": {
-                    "path_match": "netflow.icmp_code_ipv6",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "icmp_type": {
-                    "path_match": "netflow.icmp_type",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "icmp_type_ipv6": {
-                    "path_match": "netflow.icmp_type_ipv6",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "if_desc": {
-                    "path_match": "netflow.if_desc",
-                    "mapping": {
-                        "type": "keyword",
-                        "norms": false
-                    }
-                }
-            },
-            {
-                "if_name": {
-                    "path_match": "netflow.if_name",
-                    "mapping": {
-                        "type": "keyword",
-                        "norms": false
-                    }
-                }
-            },
-            {
-                "in_bytes": {
-                    "path_match": "netflow.in_bytes",
-                    "mapping": {
-                        "type": "long"
-                    }
-                }
-            },
-            {
-                "in_dst_mac": {
-                    "path_match": "netflow.in_dst_mac",
-                    "mapping": {
-                        "type": "keyword",
-                        "norms": false
-                    }
-                }
-            },
-            {
-                "in_permanent_bytes": {
-                    "path_match": "netflow.in_permanent_bytes",
-                    "mapping": {
-                        "type": "long"
-                    }
-                }
-            },
-            {
-                "in_permanent_pkts": {
-                    "path_match": "netflow.in_permanent_pkts",
-                    "mapping": {
-                        "type": "long"
-                    }
-                }
-            },
-            {
-                "in_pkts": {
-                    "path_match": "netflow.in_pkts",
-                    "mapping": {
-                        "type": "long"
-                    }
-                }
-            },
-            {
-                "in_src_mac": {
-                    "path_match": "netflow.in_src_mac",
-                    "mapping": {
-                        "type": "keyword",
-                        "norms": false
-                    }
-                }
-            },
-            {
-                "ip_protocol_version": {
-                    "path_match": "netflow.ip_protocol_version",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "ipv4_dst_addr": {
-                    "path_match": "netflow.ipv4_dst_addr",
-                    "mapping": {
-                        "type": "ip"
-                    }
-                }
-            },
-            {
-                "ipv4_dst_prefix": {
-                    "path_match": "netflow.ipv4_dst_prefix",
-                    "mapping": {
-                        "type": "ip"
-                    }
-                }
-            },
-            {
-                "ipv4_ident": {
-                    "path_match": "netflow.ipv4_ident",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "ipv4_next_hop": {
-                    "path_match": "netflow.ipv4_next_hop",
-                    "mapping": {
-                        "type": "ip"
-                    }
-                }
-            },
-            {
-                "ipv4_src_addr": {
-                    "path_match": "netflow.ipv4_src_addr",
-                    "mapping": {
-                        "type": "ip"
-                    }
-                }
-            },
-            {
-                "ipv4_src_prefix": {
-                    "path_match": "netflow.ipv4_src_prefix",
-                    "mapping": {
-                        "type": "ip"
-                    }
-                }
-            },
-            {
-                "ipv6_dst_addr": {
-                    "path_match": "netflow.ipv6_dst_addr",
-                    "mapping": {
-                        "type": "ip"
-                    }
-                }
-            },
-            {
-                "ipv6_dst_mask": {
-                    "path_match": "netflow.ipv6_dst_mask",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "ipv6_flow_label": {
-                    "path_match": "netflow.ipv6_flow_label",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "ipv6_next_hop": {
-                    "path_match": "netflow.ipv6_next_hop",
-                    "mapping": {
-                        "type": "ip"
-                    }
-                }
-            },
-            {
-                "ipv6_option_headers": {
-                    "path_match": "netflow.ipv6_option_headers",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "ipv6_src_addr": {
-                    "path_match": "netflow.ipv6_src_addr",
-                    "mapping": {
-                        "type": "ip"
-                    }
-                }
-            },
-            {
-                "ipv6_src_mask": {
-                    "path_match": "netflow.ipv6_src_mask",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "l4_dst_port": {
-                    "path_match": "netflow.l4_dst_port",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "l4_src_port": {
-                    "path_match": "netflow.l4_src_port",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "max_pkt_length": {
-                    "path_match": "netflow.max_pkt_length",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "max_ttl": {
-                    "path_match": "netflow.max_ttl",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "min_pkt_length": {
-                    "path_match": "netflow.min_pkt_length",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "min_ttl": {
-                    "path_match": "netflow.min_ttl",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "mpls_label_stack_octets.bottom_of_stack": {
-                    "path_match": "netflow.mpls_label_stack_octets.bottom_of_stack",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "mpls_label_stack_octets.experimental": {
-                    "path_match": "netflow.mpls_label_stack_octets.experimental",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "mpls_label_stack_octets.label": {
-                    "path_match": "netflow.mpls_label_stack_octets.label",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "mpls_label_stack_octets.ttl": {
-                    "path_match": "netflow.mpls_label_stack_octets.ttl",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "mpls_top_label_ip_addr": {
-                    "path_match": "netflow.mpls_top_label_ip_addr",
-                    "mapping": {
-                        "type": "ip"
-                    }
-                }
-            },
-            {
-                "mpls_top_label_type": {
-                    "path_match": "netflow.mpls_top_label_type",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "mul_dst_bytes": {
-                    "path_match": "netflow.mul_dst_bytes",
-                    "mapping": {
-                        "type": "long"
-                    }
-                }
-            },
-            {
-                "mul_dst_pkts": {
-                    "path_match": "netflow.mul_dst_pkts",
-                    "mapping": {
-                        "type": "long"
-                    }
-                }
-            },
-            {
-                "mul_igmp_type": {
-                    "path_match": "netflow.mul_igmp_type",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "out_bytes": {
-                    "path_match": "netflow.out_bytes",
-                    "mapping": {
-                        "type": "long"
-                    }
-                }
-            },
-            {
-                "out_dst_mac": {
-                    "path_match": "netflow.out_dst_mac",
-                    "mapping": {
-                        "type": "keyword",
-                        "norms": false
-                    }
-                }
-            },
-            {
-                "out_pkts": {
-                    "path_match": "netflow.out_pkts",
-                    "mapping": {
-                        "type": "long"
-                    }
-                }
-            },
-            {
-                "out_src_mac": {
-                    "path_match": "netflow.out_src_mac",
-                    "mapping": {
-                        "type": "keyword",
-                        "norms": false
-                    }
-                }
-            },
-            {
-                "rev_flow_delta_bytes": {
-                    "path_match": "netflow.rev_flow_delta_bytes",
-                    "mapping": {
-                        "type": "long"
-                    }
-                }
-            },
-            {
-                "sampler_name": {
-                    "path_match": "netflow.sampler_name",
-                    "mapping": {
-                        "type": "keyword",
-                        "norms": false
-                    }
-                }
-            },
-            {
-                "sampling_algorithm": {
-                    "path_match": "netflow.sampling_algorithm",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "src_as": {
-                    "path_match": "netflow.src_as",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "src_mask": {
-                    "path_match": "netflow.src_mask",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "src_tos": {
-                    "path_match": "netflow.src_tos",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "src_vlan": {
-                    "path_match": "netflow.src_vlan",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "tcp_dst_port": {
-                    "path_match": "netflow.tcp_dst_port",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "tcp_src_port": {
-                    "path_match": "netflow.tcp_src_port",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "total_bytes_exp": {
-                    "path_match": "netflow.total_bytes_exp",
-                    "mapping": {
-                        "type": "long"
-                    }
-                }
-            },
-            {
-                "total_flows_exp": {
-                    "path_match": "netflow.total_flows_exp",
-                    "mapping": {
-                        "type": "long"
-                    }
-                }
-            },
-            {
-                "total_pkts_exp": {
-                    "path_match": "netflow.total_pkts_exp",
-                    "mapping": {
-                        "type": "long"
-                    }
-                }
-            },
-            {
-                "udp_dst_port": {
-                    "path_match": "netflow.udp_dst_port",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "udp_src_port": {
-                    "path_match": "netflow.udp_src_port",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "username": {
-                    "path_match": "netflow.username",
-                    "mapping": {
-                        "type": "keyword",
-                        "norms": false
-                    }
-                }
-            },
-            {
-                "xlate_dst_addr_ipv4": {
-                    "path_match": "netflow.xlate_dst_addr_ipv4",
-                    "mapping": {
-                        "type": "ip"
-                    }
-                }
-            },
-            {
-                "xlate_dst_addr_ipv6": {
-                    "path_match": "netflow.xlate_dst_addr_ipv6",
-                    "mapping": {
-                        "type": "ip"
-                    }
-                }
-            },
-            {
-                "xlate_dst_port": {
-                    "path_match": "netflow.xlate_dst_port",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "xlate_src_addr_ipv4": {
-                    "path_match": "netflow.xlate_src_addr_ipv4",
-                    "mapping": {
-                        "type": "ip"
-                    }
-                }
-            },
-            {
-                "xlate_src_addr_ipv6": {
-                    "path_match": "netflow.xlate_src_addr_ipv6",
-                    "mapping": {
-                        "type": "ip"
-                    }
-                }
-            },
-            {
-                "xlate_src_port": {
-                    "path_match": "netflow.xlate_src_port",
-                    "mapping": {
-                        "type": "integer"
-                    }
-                }
-            },
-            {
-                "string_fields": {
-                    "mapping": {
-                        "norms": false,
-                        "type": "keyword"
-                    },
-                    "match_mapping_type": "string",
-                    "match": "*"
-                }
-            }
-        ],
-        "properties": {
-            "@version": {
-                "type": "keyword"
-            },
-            "@timestamp": {
-                "type": "date"
-            },
-            "geoip": {
-                "dynamic": true,
-                "properties": {
-                    "asn": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "as_org": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "autonomous_system": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "city_name": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "continent_code": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "country_code2": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "country_code3": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "country_name": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "dma_code": {
-                        "type": "integer"
-                    },
-                    "ip": {
-                        "type": "ip"
-                    },
-                    "latitude": {
-                        "type": "float"
-                    },
-                    "location": {
-                        "type": "geo_point"
-                    },
-                    "longitude": {
-                        "type": "float"
-                    },
-                    "postal_code": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "region_code": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "region_name": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "timezone": {
-                        "type": "keyword",
-                        "norms": false
-                    }
-                }
-            },
-            "geoip_dst": {
-                "dynamic": true,
-                "properties": {
-                    "asn": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "as_org": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "autonomous_system": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "city_name": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "continent_code": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "country_code2": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "country_code3": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "country_name": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "dma_code": {
-                        "type": "integer"
-                    },
-                    "ip": {
-                        "type": "ip"
-                    },
-                    "latitude": {
-                        "type": "float"
-                    },
-                    "location": {
-                        "type": "geo_point"
-                    },
-                    "longitude": {
-                        "type": "float"
-                    },
-                    "postal_code": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "region_code": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "region_name": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "timezone": {
-                        "type": "keyword",
-                        "norms": false
-                    }
-                }
-            },
-            "geoip_src": {
-                "dynamic": true,
-                "properties": {
-                    "asn": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "as_org": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "autonomous_system": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "city_name": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "continent_code": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "country_code2": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "country_code3": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "country_name": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "dma_code": {
-                        "type": "integer"
-                    },
-                    "ip": {
-                        "type": "ip"
-                    },
-                    "latitude": {
-                        "type": "float"
-                    },
-                    "location": {
-                        "type": "geo_point"
-                    },
-                    "longitude": {
-                        "type": "float"
-                    },
-                    "postal_code": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "region_code": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "region_name": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "timezone": {
-                        "type": "keyword",
-                        "norms": false
-                    }
-                }
-            },
-            "netflow": {
-                "dynamic": true,
-                "type": "object",
-                "properties": {
-                    "bytes": {
-                        "type": "long"
-                    },
-                    "direction": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "dst_addr": {
-                        "type": "ip"
-                    },
-                    "dst_mask_len": {
-                        "type": "integer"
-                    },
-                    "dst_port": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "dst_port_name": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "first_switched": {
-                        "type": "date"
-                    },
-                    "flow_seq_num": {
-                        "type": "long"
-                    },
-                    "input_snmp": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "ip_version": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "last_switched": {
-                        "type": "date"
-                    },
-                    "next_hop": {
-                        "type": "ip"
-                    },
-                    "output_snmp": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "packets": {
-                        "type": "long"
-                    },
-                    "protocol": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "protocol_name": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "sampling_interval": {
-                        "type": "integer"
-                    },
-                    "src_addr": {
-                        "type": "ip"
-                    },
-                    "src_mask_len": {
-                        "type": "integer"
-                    },
-                    "src_port": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "src_port_name": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "tcp_flags": {
-                        "type": "integer"
-                    },
-                    "tcp_flags_label": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "tos": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "version": {
-                        "type": "keyword",
-                        "norms": false
-                    },
-                    "vlan": {
-                        "type": "keyword",
-                        "norms": false
-                    }
-                }
-            }
-        }
-    },
-    "aliases": { }
-}
diff --git a/modules/netflow/configuration/kibana/5.x/dashboard/04157d70-6591-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/5.x/dashboard/04157d70-6591-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 713735210..000000000
--- a/modules/netflow/configuration/kibana/5.x/dashboard/04157d70-6591-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Flow Exporters", "uiStateJSON": "{}", "panelsJSON": "[{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":1,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":1,\"id\":\"f8731d50-2fd6-11e7-97a8-85d8d5a99269\",\"panelIndex\":2,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"size_x\":4,\"size_y\":2,\"panelIndex\":3,\"type\":\"visualization\",\"id\":\"caea3760-6591-11e7-bfc3-d74b7bb89482\",\"col\":5,\"row\":2},{\"size_x\":4,\"size_y\":2,\"panelIndex\":4,\"type\":\"visualization\",\"id\":\"1fa2c100-6592-11e7-bfc3-d74b7bb89482\",\"col\":9,\"row\":2},{\"size_x\":6,\"size_y\":2,\"panelIndex\":5,\"type\":\"visualization\",\"id\":\"00248240-6593-11e7-b8de-af19b696fa44\",\"col\":7,\"row\":4},{\"size_x\":6,\"size_y\":2,\"panelIndex\":6,\"type\":\"visualization\",\"id\":\"206d6e90-6593-11e7-8b83-5b2419db46fa\",\"col\":7,\"row\":6},{\"size_x\":6,\"size_y\":2,\"panelIndex\":8,\"type\":\"visualization\",\"id\":\"e2a7fc60-6592-11e7-8b83-5b2419db46fa\",\"col\":1,\"row\":6},{\"size_x\":6,\"size_y\":2,\"panelIndex\":10,\"type\":\"visualization\",\"id\":\"9a4938d0-6592-11e7-b8de-af19b696fa44\",\"col\":1,\"row\":4}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/dashboard/0809c1f0-6719-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/5.x/dashboard/0809c1f0-6719-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 9c796b400..000000000
--- a/modules/netflow/configuration/kibana/5.x/dashboard/0809c1f0-6719-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Top-N", "uiStateJSON": "{\"P-2\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-3\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-4\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-5\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-6\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-7\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-8\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"}}}},\"P-9\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}}", "panelsJSON": "[{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":1,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"size_x\":6,\"size_y\":5,\"panelIndex\":2,\"type\":\"visualization\",\"id\":\"b58e1380-6719-11e7-b5b8-29fbded8e37c\",\"col\":1,\"row\":2},{\"size_x\":6,\"size_y\":5,\"panelIndex\":3,\"type\":\"visualization\",\"id\":\"9f113d80-6719-11e7-b5b8-29fbded8e37c\",\"col\":7,\"row\":2},{\"size_x\":6,\"size_y\":5,\"panelIndex\":4,\"type\":\"visualization\",\"id\":\"02e25f10-671a-11e7-b5b8-29fbded8e37c\",\"col\":1,\"row\":7},{\"size_x\":6,\"size_y\":5,\"panelIndex\":5,\"type\":\"visualization\",\"id\":\"ef7699a0-6719-11e7-b5b8-29fbded8e37c\",\"col\":7,\"row\":7},{\"size_x\":6,\"size_y\":5,\"panelIndex\":6,\"type\":\"visualization\",\"id\":\"326fae40-671a-11e7-b5b8-29fbded8e37c\",\"col\":1,\"row\":12},{\"size_x\":6,\"size_y\":5,\"panelIndex\":7,\"type\":\"visualization\",\"id\":\"51006340-671a-11e7-b5b8-29fbded8e37c\",\"col\":7,\"row\":12},{\"size_x\":6,\"size_y\":5,\"panelIndex\":8,\"type\":\"visualization\",\"id\":\"d4a408a0-671a-11e7-b5b8-29fbded8e37c\",\"col\":1,\"row\":17},{\"size_x\":6,\"size_y\":5,\"panelIndex\":9,\"type\":\"visualization\",\"id\":\"7e9cb7e0-671a-11e7-b5b8-29fbded8e37c\",\"col\":7,\"row\":17}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/dashboard/10584050-6234-11e7-8236-19b4b4941e22.json b/modules/netflow/configuration/kibana/5.x/dashboard/10584050-6234-11e7-8236-19b4b4941e22.json
deleted file mode 100644
index f4f375179..000000000
--- a/modules/netflow/configuration/kibana/5.x/dashboard/10584050-6234-11e7-8236-19b4b4941e22.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Traffic Analysis", "uiStateJSON": "{\"P-15\":{\"vis\":{\"legendOpen\":true}},\"P-26\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-27\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-29\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-30\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-48\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-49\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-50\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-51\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-52\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-53\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}}", "panelsJSON": "[{\"col\":7,\"id\":\"6a597070-6233-11e7-aa4b-5f8c56ec33b8\",\"panelIndex\":1,\"row\":22,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":4,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":7,\"id\":\"6c67b990-628c-11e7-95ed-8966ac93bd5a\",\"panelIndex\":5,\"row\":28,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"52279a00-628c-11e7-95ed-8966ac93bd5a\",\"panelIndex\":6,\"row\":28,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"622844d0-6288-11e7-bcd8-a16ef1d32773\",\"panelIndex\":7,\"row\":10,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"2c9567c0-6289-11e7-bcd8-a16ef1d32773\",\"panelIndex\":9,\"row\":22,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"b61f84d0-6289-11e7-bcd8-a16ef1d32773\",\"panelIndex\":10,\"row\":16,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"6ad67290-6289-11e7-bcd8-a16ef1d32773\",\"panelIndex\":11,\"row\":16,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"91ae4100-6288-11e7-bcd8-a16ef1d32773\",\"panelIndex\":12,\"row\":10,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"735d6c70-628e-11e7-a842-b787fa3508ce\",\"panelIndex\":13,\"row\":4,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"56a23ac0-628e-11e7-a842-b787fa3508ce\",\"panelIndex\":14,\"row\":4,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"7c2cfd10-2fc7-11e7-8936-6f5fd5520124\",\"panelIndex\":15,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"a8b68cb0-2fc8-11e7-8d8b-45ec51795dad\",\"panelIndex\":16,\"row\":8,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"5fd2fe30-2fc7-11e7-8936-6f5fd5520124\",\"panelIndex\":17,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"47d426a0-2fc8-11e7-8b06-97426538fddd\",\"panelIndex\":18,\"row\":8,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"69f864d0-2fd7-11e7-97a8-85d8d5a99269\",\"panelIndex\":19,\"row\":14,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"b88a8790-2fd7-11e7-bd03-932d3e38a4ff\",\"panelIndex\":20,\"row\":14,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"97f430b0-622e-11e7-b0a5-e9bda2f6d168\",\"panelIndex\":21,\"row\":20,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"ac4cbc90-622d-11e7-b0a5-e9bda2f6d168\",\"panelIndex\":22,\"row\":20,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"324b0a00-2fc9-11e7-bd31-a722d271a9cc\",\"panelIndex\":23,\"row\":26,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"9b5d3b80-2fc9-11e7-bd31-a722d271a9cc\",\"panelIndex\":24,\"row\":26,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"65f3b500-6557-11e7-87c3-994b88f84501\",\"panelIndex\":25,\"row\":6,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":11,\"id\":\"55be8550-655e-11e7-9dda-9f993e2ba58b\",\"panelIndex\":26,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"3277ea90-6578-11e7-8471-e5432f50acbd\",\"panelIndex\":27,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"a3541940-6556-11e7-a807-e52f264c6cfd\",\"panelIndex\":28,\"row\":6,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":11,\"id\":\"8500a670-6579-11e7-8471-e5432f50acbd\",\"panelIndex\":29,\"row\":8,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"71272b10-6579-11e7-8471-e5432f50acbd\",\"panelIndex\":30,\"row\":8,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"8d2cb120-6233-11e7-aa4b-5f8c56ec33b8\",\"panelIndex\":31,\"row\":24,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"99382ab0-6555-11e7-8d48-19b0c51bbbbd\",\"panelIndex\":34,\"row\":30,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"f5f79b00-6555-11e7-b27e-8f8b3770f1df\",\"panelIndex\":35,\"row\":30,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"3ee07620-6556-11e7-995a-3584c2c6482c\",\"panelIndex\":38,\"row\":12,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"caf2c4b0-6556-11e7-be5f-c5cca8dd73b6\",\"panelIndex\":42,\"row\":12,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"a13402f0-6557-11e7-a3eb-4b30743c9370\",\"panelIndex\":44,\"row\":24,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"0de63e90-6558-11e7-8547-3d133170b50d\",\"panelIndex\":45,\"row\":18,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"39ecd800-6558-11e7-bea4-0f5fadb995cc\",\"panelIndex\":47,\"row\":18,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"9accd4a0-657a-11e7-8471-e5432f50acbd\",\"panelIndex\":48,\"row\":14,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":11,\"id\":\"b13956f0-657a-11e7-8471-e5432f50acbd\",\"panelIndex\":49,\"row\":14,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"size_x\":2,\"size_y\":2,\"panelIndex\":50,\"type\":\"visualization\",\"id\":\"a2099810-657b-11e7-8471-e5432f50acbd\",\"col\":11,\"row\":20},{\"size_x\":2,\"size_y\":2,\"panelIndex\":51,\"type\":\"visualization\",\"id\":\"c4987cc0-657b-11e7-8471-e5432f50acbd\",\"col\":11,\"row\":26},{\"size_x\":2,\"size_y\":2,\"panelIndex\":52,\"type\":\"visualization\",\"id\":\"b3e2af90-657b-11e7-8471-e5432f50acbd\",\"col\":5,\"row\":26},{\"size_x\":2,\"size_y\":2,\"panelIndex\":53,\"type\":\"visualization\",\"id\":\"82fcfc50-657b-11e7-8471-e5432f50acbd\",\"col\":5,\"row\":20}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/dashboard/310ae6e0-2fdf-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/5.x/dashboard/310ae6e0-2fdf-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 973bb0e48..000000000
--- a/modules/netflow/configuration/kibana/5.x/dashboard/310ae6e0-2fdf-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Conversation Partners", "uiStateJSON": "{\"P-1\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"}}}}}", "panelsJSON": "[{\"col\":1,\"id\":\"a7a47e70-2fde-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":1,\"row\":4,\"size_x\":12,\"size_y\":5,\"type\":\"visualization\"},{\"col\":9,\"id\":\"de9da770-2fcb-11e7-8df8-b363df28ab61\",\"panelIndex\":2,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"4440e130-2fdd-11e7-afd7-595689f3f18c\",\"panelIndex\":3,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"4898db90-2fdb-11e7-84e6-333bd21ad9fd\",\"panelIndex\":4,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":5,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/dashboard/653cf1e0-2fd2-11e7-99ed-49759aed30f5.json b/modules/netflow/configuration/kibana/5.x/dashboard/653cf1e0-2fd2-11e7-99ed-49759aed30f5.json
deleted file mode 100644
index 7421e03d0..000000000
--- a/modules/netflow/configuration/kibana/5.x/dashboard/653cf1e0-2fd2-11e7-99ed-49759aed30f5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Overview", "uiStateJSON": "{}", "panelsJSON": "[{\"col\":1,\"id\":\"de9da770-2fcb-11e7-8df8-b363df28ab61\",\"panelIndex\":12,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"23d6dc80-2fd6-11e7-bc99-41245d9394f2\",\"panelIndex\":13,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":9,\"id\":\"8dcbcce0-2fd6-11e7-a82c-3146dd695923\",\"panelIndex\":14,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"69f864d0-2fd7-11e7-97a8-85d8d5a99269\",\"panelIndex\":15,\"row\":4,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":17,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":9,\"id\":\"b88a8790-2fd7-11e7-bd03-932d3e38a4ff\",\"panelIndex\":21,\"row\":4,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"ac4cbc90-622d-11e7-b0a5-e9bda2f6d168\",\"panelIndex\":22,\"row\":6,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"97f430b0-622e-11e7-b0a5-e9bda2f6d168\",\"panelIndex\":23,\"row\":4,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"f6be96c0-622f-11e7-abbc-93bb293f5057\",\"panelIndex\":24,\"row\":6,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":9,\"id\":\"3fa5f6f0-2fca-11e7-ab32-99f279b941ef\",\"panelIndex\":25,\"row\":6,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"size_x\":4,\"size_y\":2,\"panelIndex\":26,\"type\":\"visualization\",\"id\":\"64b144f0-658e-11e7-bfc3-d74b7bb89482\",\"col\":1,\"row\":8},{\"size_x\":4,\"size_y\":2,\"panelIndex\":27,\"type\":\"visualization\",\"id\":\"a4ade270-658e-11e7-bfc3-d74b7bb89482\",\"col\":5,\"row\":8},{\"size_x\":4,\"size_y\":2,\"panelIndex\":29,\"type\":\"visualization\",\"id\":\"3026fe40-658f-11e7-bfc3-d74b7bb89482\",\"col\":9,\"row\":8}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/dashboard/a932b600-2fd2-11e7-99ed-49759aed30f5.json b/modules/netflow/configuration/kibana/5.x/dashboard/a932b600-2fd2-11e7-99ed-49759aed30f5.json
deleted file mode 100644
index 2afa15599..000000000
--- a/modules/netflow/configuration/kibana/5.x/dashboard/a932b600-2fd2-11e7-99ed-49759aed30f5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Geo Location", "uiStateJSON": "{\"P-16\":{\"mapCenter\":[20.632784250388028,16.69921875],\"mapZoom\":2}}", "panelsJSON": "[{\"col\":5,\"id\":\"99c1a4a0-2f60-11e7-8936-6f5fd5520124\",\"panelIndex\":16,\"row\":2,\"size_x\":8,\"size_y\":6,\"type\":\"visualization\"},{\"size_x\":4,\"size_y\":2,\"panelIndex\":17,\"type\":\"visualization\",\"id\":\"6702de70-2fca-11e7-8fcd-8dc6c60d4592\",\"col\":1,\"row\":2},{\"size_x\":4,\"size_y\":2,\"panelIndex\":18,\"type\":\"visualization\",\"id\":\"793a6f00-2fdd-11e7-afd7-595689f3f18c\",\"col\":1,\"row\":4},{\"size_x\":4,\"size_y\":2,\"panelIndex\":19,\"type\":\"visualization\",\"id\":\"264fb270-2fdb-11e7-84e6-333bd21ad9fd\",\"col\":1,\"row\":6},{\"size_x\":12,\"size_y\":1,\"panelIndex\":20,\"type\":\"visualization\",\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"col\":1,\"row\":1}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/dashboard/ca480720-2fdf-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/5.x/dashboard/ca480720-2fdf-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 5e0a41544..000000000
--- a/modules/netflow/configuration/kibana/5.x/dashboard/ca480720-2fdf-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Flow Records", "uiStateJSON": "{\"P-3\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}}", "panelsJSON": "[{\"col\":4,\"id\":\"6a7e4790-2fe0-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":2,\"row\":2,\"size_x\":9,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"bbac23d0-2fe0-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":3,\"row\":2,\"size_x\":3,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":4,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"size_x\":12,\"size_y\":4,\"panelIndex\":5,\"type\":\"search\",\"id\":\"0d0216f0-2fe0-11e7-9d02-3f49bde5c1d5\",\"col\":1,\"row\":4,\"columns\":[\"netflow.src_addr\",\"netflow.src_port_name\",\"netflow.dst_addr\",\"netflow.dst_port_name\",\"netflow.protocol_name\",\"netflow.bytes\",\"netflow.packets\"],\"sort\":[\"@timestamp\",\"desc\"]}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/dashboard/d7e31d40-6589-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/5.x/dashboard/d7e31d40-6589-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 9557f34a2..000000000
--- a/modules/netflow/configuration/kibana/5.x/dashboard/d7e31d40-6589-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Autonomous Systems", "uiStateJSON": "{}", "panelsJSON": "[{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":1,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":7,\"id\":\"8c6ce180-657e-11e7-bd38-dd04615e7f62\",\"panelIndex\":2,\"row\":4,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"836b2010-657e-11e7-9748-5d4091219eef\",\"panelIndex\":3,\"row\":6,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"399c9fe0-657e-11e7-bd38-dd04615e7f62\",\"panelIndex\":4,\"row\":4,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"4a548ff0-657e-11e7-9748-5d4091219eef\",\"panelIndex\":5,\"row\":6,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"size_x\":4,\"size_y\":2,\"panelIndex\":6,\"type\":\"visualization\",\"id\":\"7aaa68d0-658a-11e7-bfc3-d74b7bb89482\",\"col\":1,\"row\":2},{\"size_x\":4,\"size_y\":2,\"panelIndex\":7,\"type\":\"visualization\",\"id\":\"793a6f00-2fdd-11e7-afd7-595689f3f18c\",\"col\":5,\"row\":2},{\"size_x\":4,\"size_y\":2,\"panelIndex\":8,\"type\":\"visualization\",\"id\":\"264fb270-2fdb-11e7-84e6-333bd21ad9fd\",\"col\":9,\"row\":2}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/dashboard/netflow.json b/modules/netflow/configuration/kibana/5.x/dashboard/netflow.json
deleted file mode 100644
index 57fb3d414..000000000
--- a/modules/netflow/configuration/kibana/5.x/dashboard/netflow.json
+++ /dev/null
@@ -1 +0,0 @@
-["a932b600-2fd2-11e7-99ed-49759aed30f5", "10584050-6234-11e7-8236-19b4b4941e22", "d7e31d40-6589-11e7-bfc3-d74b7bb89482", "310ae6e0-2fdf-11e7-9d02-3f49bde5c1d5", "653cf1e0-2fd2-11e7-99ed-49759aed30f5", "04157d70-6591-11e7-bfc3-d74b7bb89482", "ca480720-2fdf-11e7-9d02-3f49bde5c1d5", "0809c1f0-6719-11e7-b5b8-29fbded8e37c"]
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/index-pattern/netflow.json b/modules/netflow/configuration/kibana/5.x/index-pattern/netflow.json
deleted file mode 100644
index 714ccae0f..000000000
--- a/modules/netflow/configuration/kibana/5.x/index-pattern/netflow.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "title":"netflow-*",
-  "timeFieldName":"@timestamp",
-  "notExpandable":true,
-  "fields":"[{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"@version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"geoip.as_org\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.asn\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.autonomous_system\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.continent_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_code2\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_code3\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.dma_code\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.latitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.longitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.postal_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.region_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.timezone\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.as_org\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.asn\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.autonomous_system\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.continent_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.country_code2\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.country_code3\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.dma_code\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.latitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.longitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.postal_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.region_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.timezone\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.as_org\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.asn\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.autonomous_system\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.continent_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.country_code2\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.country_code3\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.dma_code\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.latitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.longitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.postal_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.region_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.timezone\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.direction\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_addr\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_as\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_locality\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_mac\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_mask_len\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_port\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_port_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_vlan\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.engine_id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.engine_type\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.first_switched\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.flow_locality\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.flow_records\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.flow_seq_num\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.flowset_id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.input_snmp\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.ip_protocol_version\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.ip_version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.last_switched\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.next_hop\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.output_snmp\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.packets\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.protocol\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.protocol_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.sampling_algorithm\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.sampling_interval\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_addr\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_as\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_locality\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_mac\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_mask_len\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_port\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_port_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.tcp_flag_tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.tcp_flags\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.tcp_flags_label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.tos\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.vlan\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]"
-}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/search/0d0216f0-2fe0-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/5.x/search/0d0216f0-2fe0-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 77c89dbcb..000000000
--- a/modules/netflow/configuration/kibana/5.x/search/0d0216f0-2fe0-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"sort": ["@timestamp", "desc"], "hits": 0, "description": "", "title": "Netflow: Flow Records", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"highlightAll\":true,\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[],\"version\":true}"}, "columns": ["netflow.src_addr", "netflow.src_port_name", "netflow.dst_addr", "netflow.dst_port_name", "netflow.protocol_name", "netflow.bytes", "netflow.packets"]}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/search/netflow.json b/modules/netflow/configuration/kibana/5.x/search/netflow.json
deleted file mode 100644
index 733ef3aa6..000000000
--- a/modules/netflow/configuration/kibana/5.x/search/netflow.json
+++ /dev/null
@@ -1 +0,0 @@
-["0d0216f0-2fe0-11e7-9d02-3f49bde5c1d5"]
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/00248240-6593-11e7-b8de-af19b696fa44.json b/modules/netflow/configuration/kibana/5.x/visualization/00248240-6593-11e7-b8de-af19b696fa44.json
deleted file mode 100644
index 287e7eead..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/00248240-6593-11e7-b8de-af19b696fa44.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Egress Interfaces (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.output_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.output_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Egress Interfaces (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/02e25f10-671a-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/5.x/visualization/02e25f10-671a-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index a29c7298e..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/02e25f10-671a-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Source Ports\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.src_port_name\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Source Ports", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/04990fe0-6592-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/5.x/visualization/04990fe0-6592-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 9d5447463..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/04990fe0-6592-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Egress Interfaces (packets)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.output_snmp\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Egress Interface\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Egress Interfaces (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/0927de10-6556-11e7-b27e-8f8b3770f1df.json b/modules/netflow/configuration/kibana/5.x/visualization/0927de10-6556-11e7-b27e-8f8b3770f1df.json
deleted file mode 100644
index ffef433ab..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/0927de10-6556-11e7-b27e-8f8b3770f1df.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"geoip.country_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.country_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Countries (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/0de63e90-6558-11e7-8547-3d133170b50d.json b/modules/netflow/configuration/kibana/5.x/visualization/0de63e90-6558-11e7-8547-3d133170b50d.json
deleted file mode 100644
index 10bdcbf9f..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/0de63e90-6558-11e7-8547-3d133170b50d.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Types of Service (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.tos:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tos:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Types of Service (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/1026edb0-2fcc-11e7-842d-39925ea8ac40.json b/modules/netflow/configuration/kibana/5.x/visualization/1026edb0-2fcc-11e7-842d-39925ea8ac40.json
deleted file mode 100644
index 72a927e76..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/1026edb0-2fcc-11e7-842d-39925ea8ac40.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: IP Version (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.ip_version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"IP Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: IP Version (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/12ca1180-6593-11e7-9bf4-ed832088be20.json b/modules/netflow/configuration/kibana/5.x/visualization/12ca1180-6593-11e7-9bf4-ed832088be20.json
deleted file mode 100644
index c4d99f23e..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/12ca1180-6593-11e7-9bf4-ed832088be20.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Egress Interfaces (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.output_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.output_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Egress Interfaces (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/1418ce10-6592-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/5.x/visualization/1418ce10-6592-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 044779e36..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/1418ce10-6592-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Egress Interfaces (bytes)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.output_snmp\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Egress Interface\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Egress Interfaces (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/16438600-2fcb-11e7-befb-31e033c79e4e.json b/modules/netflow/configuration/kibana/5.x/visualization/16438600-2fcb-11e7-befb-31e033c79e4e.json
deleted file mode 100644
index edeaa0c0f..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/16438600-2fcb-11e7-befb-31e033c79e4e.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Direction (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.direction\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Direction\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Direction (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/178b0af0-6230-11e7-9a50-efc26ded795d.json b/modules/netflow/configuration/kibana/5.x/visualization/178b0af0-6230-11e7-9a50-efc26ded795d.json
deleted file mode 100644
index 0be4bd9ec..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/178b0af0-6230-11e7-9a50-efc26ded795d.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Locality (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.flow_locality\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Locality\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Locality (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/1e7d8770-2fc7-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/5.x/visualization/1e7d8770-2fc7-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index 651863dc9..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/1e7d8770-2fc7-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Sources (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Sources (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/1fa2c100-6592-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/5.x/visualization/1fa2c100-6592-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 8e85e5b5c..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/1fa2c100-6592-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Egress Interfaces (flow records)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.output_snmp\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Egress Interface\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Egress Interfaces (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/206d6e90-6593-11e7-8b83-5b2419db46fa.json b/modules/netflow/configuration/kibana/5.x/visualization/206d6e90-6593-11e7-8b83-5b2419db46fa.json
deleted file mode 100644
index 780c8bfdd..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/206d6e90-6593-11e7-8b83-5b2419db46fa.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Egress Interfaces (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.output_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.output_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Egress Interfaces (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/231fe630-6558-11e7-8547-3d133170b50d.json b/modules/netflow/configuration/kibana/5.x/visualization/231fe630-6558-11e7-8547-3d133170b50d.json
deleted file mode 100644
index 41a84a30a..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/231fe630-6558-11e7-8547-3d133170b50d.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Types of Service (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.tos:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tos:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Types of Service (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/23d6dc80-2fd6-11e7-bc99-41245d9394f2.json b/modules/netflow/configuration/kibana/5.x/visualization/23d6dc80-2fd6-11e7-bc99-41245d9394f2.json
deleted file mode 100644
index adc7f588e..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/23d6dc80-2fd6-11e7-bc99-41245d9394f2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destinations and Ports (bytes)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_addr\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destinations and Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/264fb270-2fdb-11e7-84e6-333bd21ad9fd.json b/modules/netflow/configuration/kibana/5.x/visualization/264fb270-2fdb-11e7-84e6-333bd21ad9fd.json
deleted file mode 100644
index d4c9cd130..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/264fb270-2fdb-11e7-84e6-333bd21ad9fd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination and Source Ports (flow records)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Flow Records\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination Port\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination and Source Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/26e166f0-2fe2-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/5.x/visualization/26e166f0-2fe2-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 824d78d96..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/26e166f0-2fe2-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Dashboard Navigation\",\"type\":\"markdown\",\"params\":{\"markdown\":\"[Overview](#/dashboard/653cf1e0-2fd2-11e7-99ed-49759aed30f5) | [Conversation Partners](#/dashboard/310ae6e0-2fdf-11e7-9d02-3f49bde5c1d5) | [Traffic Analysis](#/dashboard/10584050-6234-11e7-8236-19b4b4941e22) | [Top-N](#/dashboard/0809c1f0-6719-11e7-b5b8-29fbded8e37c) | [Geo Location](#/dashboard/a932b600-2fd2-11e7-99ed-49759aed30f5) | [Autonomous Systems](#/dashboard/d7e31d40-6589-11e7-bfc3-d74b7bb89482) | [Flow Exporters](#/dashboard/04157d70-6591-11e7-bfc3-d74b7bb89482) | [Raw Flow Records](#/dashboard/ca480720-2fdf-11e7-9d02-3f49bde5c1d5)\\n***\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Dashboard Navigation", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/2aeac270-6230-11e7-84f1-9728c106b1b6.json b/modules/netflow/configuration/kibana/5.x/visualization/2aeac270-6230-11e7-84f1-9728c106b1b6.json
deleted file mode 100644
index e0df55dfc..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/2aeac270-6230-11e7-84f1-9728c106b1b6.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Locality (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.flow_locality\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Locality\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Locality (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/2c9567c0-6289-11e7-bcd8-a16ef1d32773.json b/modules/netflow/configuration/kibana/5.x/visualization/2c9567c0-6289-11e7-bcd8-a16ef1d32773.json
deleted file mode 100644
index a90386061..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/2c9567c0-6289-11e7-bcd8-a16ef1d32773.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.tcp_flags_label:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tcp_flags_label:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/3026fe40-658f-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/5.x/visualization/3026fe40-658f-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 439a66ec7..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/3026fe40-658f-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Version (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Version (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/313a9880-2fd6-11e7-bc99-41245d9394f2.json b/modules/netflow/configuration/kibana/5.x/visualization/313a9880-2fd6-11e7-bc99-41245d9394f2.json
deleted file mode 100644
index ea92c668c..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/313a9880-2fd6-11e7-bc99-41245d9394f2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destinations and Ports (packets)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.packets\",\n        \"customLabel\": \"Packets\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_addr\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destinations and Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/324b0a00-2fc9-11e7-bd31-a722d271a9cc.json b/modules/netflow/configuration/kibana/5.x/visualization/324b0a00-2fc9-11e7-bd31-a722d271a9cc.json
deleted file mode 100644
index 14aa3dc20..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/324b0a00-2fc9-11e7-bd31-a722d271a9cc.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.country_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Countries (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/326fae40-671a-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/5.x/visualization/326fae40-671a-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index dc7bc7990..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/326fae40-671a-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Protocols\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Protocols", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/3277ea90-6578-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/5.x/visualization/3277ea90-6578-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index 7e635a2eb..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/3277ea90-6578-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.src_addr\",\"customLabel\":\"Sources\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Source Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/399c9fe0-657e-11e7-bd38-dd04615e7f62.json b/modules/netflow/configuration/kibana/5.x/visualization/399c9fe0-657e-11e7-bd38-dd04615e7f62.json
deleted file mode 100644
index 8502a7159..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/399c9fe0-657e-11e7-bd38-dd04615e7f62.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Autonomous Systems (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"geoip_src.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_src.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Autonomous Systems (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/39e3dab0-2fcb-11e7-befb-31e033c79e4e.json b/modules/netflow/configuration/kibana/5.x/visualization/39e3dab0-2fcb-11e7-befb-31e033c79e4e.json
deleted file mode 100644
index 4a175ff05..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/39e3dab0-2fcb-11e7-befb-31e033c79e4e.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Version\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Version", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/39ecd800-6558-11e7-bea4-0f5fadb995cc.json b/modules/netflow/configuration/kibana/5.x/visualization/39ecd800-6558-11e7-bea4-0f5fadb995cc.json
deleted file mode 100644
index 321546703..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/39ecd800-6558-11e7-bea4-0f5fadb995cc.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLANs (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.vlan:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.vlan:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: VLANs (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/3ee07620-6556-11e7-995a-3584c2c6482c.json b/modules/netflow/configuration/kibana/5.x/visualization/3ee07620-6556-11e7-995a-3584c2c6482c.json
deleted file mode 100644
index 9f31eb410..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/3ee07620-6556-11e7-995a-3584c2c6482c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Ports (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.dst_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/3fa5f6f0-2fca-11e7-ab32-99f279b941ef.json b/modules/netflow/configuration/kibana/5.x/visualization/3fa5f6f0-2fca-11e7-ab32-99f279b941ef.json
deleted file mode 100644
index 52ab78c12..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/3fa5f6f0-2fca-11e7-ab32-99f279b941ef.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries and Cities (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.country_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.city_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Countries and Cities (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/41a7e3a0-658f-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/5.x/visualization/41a7e3a0-658f-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index cd08fa420..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/41a7e3a0-658f-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Version (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Version (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/43e698c0-657e-11e7-99b6-af4533b21b46.json b/modules/netflow/configuration/kibana/5.x/visualization/43e698c0-657e-11e7-99b6-af4533b21b46.json
deleted file mode 100644
index aa96a138b..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/43e698c0-657e-11e7-99b6-af4533b21b46.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Autonomous Systems (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"geoip_src.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_src.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flows records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Autonomous Systems (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/4440e130-2fdd-11e7-afd7-595689f3f18c.json b/modules/netflow/configuration/kibana/5.x/visualization/4440e130-2fdd-11e7-afd7-595689f3f18c.json
deleted file mode 100644
index 28d8290e5..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/4440e130-2fdd-11e7-afd7-595689f3f18c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations and Sources (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations and Sources (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/44b3cb70-2fd6-11e7-bc99-41245d9394f2.json b/modules/netflow/configuration/kibana/5.x/visualization/44b3cb70-2fd6-11e7-bc99-41245d9394f2.json
deleted file mode 100644
index 55b294e2f..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/44b3cb70-2fd6-11e7-bc99-41245d9394f2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destinations and Ports (flow records)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Flow Records\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_addr\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destinations and Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/47d426a0-2fc8-11e7-8b06-97426538fddd.json b/modules/netflow/configuration/kibana/5.x/visualization/47d426a0-2fc8-11e7-8b06-97426538fddd.json
deleted file mode 100644
index 1ce79aace..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/47d426a0-2fc8-11e7-8b06-97426538fddd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination Ports (bytes)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/4898db90-2fdb-11e7-84e6-333bd21ad9fd.json b/modules/netflow/configuration/kibana/5.x/visualization/4898db90-2fdb-11e7-84e6-333bd21ad9fd.json
deleted file mode 100644
index d68f4c33d..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/4898db90-2fdb-11e7-84e6-333bd21ad9fd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination and Source Ports (bytes)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination Port\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination and Source Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/49a2d6b0-2fc9-11e7-8224-a900ea73fa5f.json b/modules/netflow/configuration/kibana/5.x/visualization/49a2d6b0-2fc9-11e7-8224-a900ea73fa5f.json
deleted file mode 100644
index 041d8adc8..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/49a2d6b0-2fc9-11e7-8224-a900ea73fa5f.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.country_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Countries (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/4a548ff0-657e-11e7-9748-5d4091219eef.json b/modules/netflow/configuration/kibana/5.x/visualization/4a548ff0-657e-11e7-9748-5d4091219eef.json
deleted file mode 100644
index d5deb3d27..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/4a548ff0-657e-11e7-9748-5d4091219eef.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Autonomous Systems (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"geoip_src.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_src.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Autonomous Systems (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/4a6f6030-6558-11e7-bea4-0f5fadb995cc.json b/modules/netflow/configuration/kibana/5.x/visualization/4a6f6030-6558-11e7-bea4-0f5fadb995cc.json
deleted file mode 100644
index d58a47e30..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/4a6f6030-6558-11e7-bea4-0f5fadb995cc.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLANs (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.vlan:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.vlan:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: VLANs (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/4dc994a0-2fd7-11e7-97a8-85d8d5a99269.json b/modules/netflow/configuration/kibana/5.x/visualization/4dc994a0-2fd7-11e7-97a8-85d8d5a99269.json
deleted file mode 100644
index dceaf28c9..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/4dc994a0-2fd7-11e7-97a8-85d8d5a99269.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Types of Service (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.tos\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Type of Service\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Types of Service (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/4ea0a8d0-658f-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/5.x/visualization/4ea0a8d0-658f-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 002986eeb..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/4ea0a8d0-658f-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Version (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Version (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/4f3525d0-2fc7-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/5.x/visualization/4f3525d0-2fc7-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index 72a9f6e4f..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/4f3525d0-2fc7-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/51006340-671a-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/5.x/visualization/51006340-671a-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 5cb7ec44c..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/51006340-671a-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Autonomous Systems\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"geoip.autonomous_system\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Autonomous System\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Autonomous Systems", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/52279a00-628c-11e7-95ed-8966ac93bd5a.json b/modules/netflow/configuration/kibana/5.x/visualization/52279a00-628c-11e7-95ed-8966ac93bd5a.json
deleted file mode 100644
index d9e1be23c..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/52279a00-628c-11e7-95ed-8966ac93bd5a.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"geoip.country_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.country_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Countries (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/55be8550-655e-11e7-9dda-9f993e2ba58b.json b/modules/netflow/configuration/kibana/5.x/visualization/55be8550-655e-11e7-9dda-9f993e2ba58b.json
deleted file mode 100644
index 65bdb5add..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/55be8550-655e-11e7-9dda-9f993e2ba58b.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Count\",\"type\":\"metric\",\"params\":{\"handleNoResults\":true,\"fontSize\":\"32\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.dst_addr\",\"customLabel\":\"Destinations\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Count", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/55f66b20-2fdd-11e7-afd7-595689f3f18c.json b/modules/netflow/configuration/kibana/5.x/visualization/55f66b20-2fdd-11e7-afd7-595689f3f18c.json
deleted file mode 100644
index 4e215a933..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/55f66b20-2fdd-11e7-afd7-595689f3f18c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations and Sources (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations and Sources (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/56a23ac0-628e-11e7-a842-b787fa3508ce.json b/modules/netflow/configuration/kibana/5.x/visualization/56a23ac0-628e-11e7-a842-b787fa3508ce.json
deleted file mode 100644
index ac903fd95..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/56a23ac0-628e-11e7-a842-b787fa3508ce.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.dst_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/5c5d6f60-2fdb-11e7-84e6-333bd21ad9fd.json b/modules/netflow/configuration/kibana/5.x/visualization/5c5d6f60-2fdb-11e7-84e6-333bd21ad9fd.json
deleted file mode 100644
index 203bd5538..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/5c5d6f60-2fdb-11e7-84e6-333bd21ad9fd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination and Source Ports (packets)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.packets\",\n        \"customLabel\": \"Packets\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination Port\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination and Source Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/5e58cc00-6556-11e7-995a-3584c2c6482c.json b/modules/netflow/configuration/kibana/5.x/visualization/5e58cc00-6556-11e7-995a-3584c2c6482c.json
deleted file mode 100644
index b05776a8c..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/5e58cc00-6556-11e7-995a-3584c2c6482c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Ports (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.dst_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/5fd2fe30-2fc7-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/5.x/visualization/5fd2fe30-2fc7-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index 41433dc1d..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/5fd2fe30-2fc7-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/622844d0-6288-11e7-bcd8-a16ef1d32773.json b/modules/netflow/configuration/kibana/5.x/visualization/622844d0-6288-11e7-bcd8-a16ef1d32773.json
deleted file mode 100644
index d012edf9e..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/622844d0-6288-11e7-bcd8-a16ef1d32773.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Ports (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.dst_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/64b144f0-658e-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/5.x/visualization/64b144f0-658e-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index f5c588cf6..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/64b144f0-658e-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Flow Exporters (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"host\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Flow Exporter\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Flow Exporters (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/65f3b500-6557-11e7-87c3-994b88f84501.json b/modules/netflow/configuration/kibana/5.x/visualization/65f3b500-6557-11e7-87c3-994b88f84501.json
deleted file mode 100644
index f84a2a03f..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/65f3b500-6557-11e7-87c3-994b88f84501.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Sources (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.src_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Sources (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/6702de70-2fca-11e7-8fcd-8dc6c60d4592.json b/modules/netflow/configuration/kibana/5.x/visualization/6702de70-2fca-11e7-8fcd-8dc6c60d4592.json
deleted file mode 100644
index cf3908f9c..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/6702de70-2fca-11e7-8fcd-8dc6c60d4592.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries and Cities (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.country_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.city_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Countries and Cities (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/691cda40-2fc9-11e7-823a-89e4bb55eaa1.json b/modules/netflow/configuration/kibana/5.x/visualization/691cda40-2fc9-11e7-823a-89e4bb55eaa1.json
deleted file mode 100644
index 3441317a1..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/691cda40-2fc9-11e7-823a-89e4bb55eaa1.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.country_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Countries (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/69f864d0-2fd7-11e7-97a8-85d8d5a99269.json b/modules/netflow/configuration/kibana/5.x/visualization/69f864d0-2fd7-11e7-97a8-85d8d5a99269.json
deleted file mode 100644
index 6eea98f5d..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/69f864d0-2fd7-11e7-97a8-85d8d5a99269.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Types of Service (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.tos\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Type of Service\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Types of Service (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/6a597070-6233-11e7-aa4b-5f8c56ec33b8.json b/modules/netflow/configuration/kibana/5.x/visualization/6a597070-6233-11e7-aa4b-5f8c56ec33b8.json
deleted file mode 100644
index 8831c4f8f..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/6a597070-6233-11e7-aa4b-5f8c56ec33b8.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous Systems (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"geoip.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous Systems (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/6a7e4790-2fe0-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/5.x/visualization/6a7e4790-2fe0-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index b66c1f49f..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/6a7e4790-2fe0-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Flow Records\",\"type\":\"histogram\",\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"category\"}],\"defaultYExtents\":false,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"legendPosition\":\"right\",\"mode\":\"stacked\",\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Flow Records\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Count\"},\"type\":\"value\"}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.last_switched\",\"interval\":\"s\",\"customInterval\":\"2h\",\"min_doc_count\":1,\"extended_bounds\":{},\"customLabel\":\"Timeline\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"netflow.version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Flow Records", "uiStateJSON": "{\"vis\":{\"legendOpen\":true}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/6ad67290-6289-11e7-bcd8-a16ef1d32773.json b/modules/netflow/configuration/kibana/5.x/visualization/6ad67290-6289-11e7-bcd8-a16ef1d32773.json
deleted file mode 100644
index b81b1fbd2..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/6ad67290-6289-11e7-bcd8-a16ef1d32773.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Types of Service (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.tos:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tos:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Types of Service (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/6c67b990-628c-11e7-95ed-8966ac93bd5a.json b/modules/netflow/configuration/kibana/5.x/visualization/6c67b990-628c-11e7-95ed-8966ac93bd5a.json
deleted file mode 100644
index fadc7dfca..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/6c67b990-628c-11e7-95ed-8966ac93bd5a.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Cities (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"geoip.city_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.city_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Cities (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/6f6d05b0-2fc8-11e7-bf24-57efade8fd83.json b/modules/netflow/configuration/kibana/5.x/visualization/6f6d05b0-2fc8-11e7-bf24-57efade8fd83.json
deleted file mode 100644
index 6ce6aea70..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/6f6d05b0-2fc8-11e7-bf24-57efade8fd83.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination Ports (flow records)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Flow Records\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/71272b10-6579-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/5.x/visualization/71272b10-6579-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index 92cecc9c6..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/71272b10-6579-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Source Port Count\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addLegend\": false,\n    \"addTooltip\": true,\n    \"fontSize\": \"32\",\n    \"gauge\": {\n      \"autoExtend\": false,\n      \"backStyle\": \"Full\",\n      \"colorSchema\": \"Green to Red\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 100\n        }\n      ],\n      \"gaugeColorMode\": \"None\",\n      \"gaugeStyle\": \"Full\",\n      \"gaugeType\": \"Metric\",\n      \"invertColors\": false,\n      \"labels\": {\n        \"color\": \"black\",\n        \"show\": true\n      },\n      \"orientation\": \"vertical\",\n      \"percentageMode\": false,\n      \"scale\": {\n        \"color\": \"#333\",\n        \"labels\": false,\n        \"show\": false,\n        \"width\": 2\n      },\n      \"style\": {\n        \"bgColor\": false,\n        \"bgFill\": \"#000\",\n        \"fontSize\": \"36\",\n        \"labelColor\": false,\n        \"subText\": \"\"\n      },\n      \"type\": \"simple\",\n      \"useRange\": false,\n      \"verticalSplit\": false\n    },\n    \"handleNoResults\": true,\n    \"type\": \"gauge\"\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"customLabel\": \"Source Ports\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Source Port Count", "uiStateJSON": "{\n  \"vis\": {\n    \"defaultColors\": {\n      \"0 - 100\": \"rgb(0,104,55)\"\n    }\n  }\n}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/735d6c70-628e-11e7-a842-b787fa3508ce.json b/modules/netflow/configuration/kibana/5.x/visualization/735d6c70-628e-11e7-a842-b787fa3508ce.json
deleted file mode 100644
index a36c13993..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/735d6c70-628e-11e7-a842-b787fa3508ce.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Sources (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.src_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Sources (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/73c37440-658e-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/5.x/visualization/73c37440-658e-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 4a690fc0b..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/73c37440-658e-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Flow Exporters (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"host\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Flow Exporter\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Flow Exporters (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/793a6f00-2fdd-11e7-afd7-595689f3f18c.json b/modules/netflow/configuration/kibana/5.x/visualization/793a6f00-2fdd-11e7-afd7-595689f3f18c.json
deleted file mode 100644
index 50fb5a1ed..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/793a6f00-2fdd-11e7-afd7-595689f3f18c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations and Sources (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations and Sources (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/7aaa68d0-658a-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/5.x/visualization/7aaa68d0-658a-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index f59fe89db..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/7aaa68d0-658a-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination and Source ASs (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip_dst.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination AS\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip_src.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source AS\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destination and Source ASs (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/7c2cfd10-2fc7-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/5.x/visualization/7c2cfd10-2fc7-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index 0b476ff94..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/7c2cfd10-2fc7-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Sources (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Sources (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/7e9a7980-622e-11e7-b0a5-e9bda2f6d168.json b/modules/netflow/configuration/kibana/5.x/visualization/7e9a7980-622e-11e7-b0a5-e9bda2f6d168.json
deleted file mode 100644
index 400104775..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/7e9a7980-622e-11e7-b0a5-e9bda2f6d168.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.tcp_flags_label\",\"size\":255,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"TCP Flags\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/7e9cb7e0-671a-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/5.x/visualization/7e9cb7e0-671a-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 6130531e3..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/7e9cb7e0-671a-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Flow Exporters\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"host\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Flow Exporter\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Flow Exporters", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/7f7aac00-2fc8-11e7-8bc1-177080983dbf.json b/modules/netflow/configuration/kibana/5.x/visualization/7f7aac00-2fc8-11e7-8bc1-177080983dbf.json
deleted file mode 100644
index 819ce3c20..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/7f7aac00-2fc8-11e7-8bc1-177080983dbf.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Ports (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_port_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Port\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/82fcfc50-657b-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/5.x/visualization/82fcfc50-657b-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index f818ef5ec..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/82fcfc50-657b-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.tcp_flags_label\",\"customLabel\":\"TCP Flag States\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/835e6090-6557-11e7-87c3-994b88f84501.json b/modules/netflow/configuration/kibana/5.x/visualization/835e6090-6557-11e7-87c3-994b88f84501.json
deleted file mode 100644
index 077d090bf..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/835e6090-6557-11e7-87c3-994b88f84501.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Sources (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.src_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Sources (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/836b2010-657e-11e7-9748-5d4091219eef.json b/modules/netflow/configuration/kibana/5.x/visualization/836b2010-657e-11e7-9748-5d4091219eef.json
deleted file mode 100644
index 23c6fdcff..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/836b2010-657e-11e7-9748-5d4091219eef.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Autonomous Systems (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"geoip_dst.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_dst.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Autonomous Systems (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/84e4c9f0-2fd7-11e7-97a8-85d8d5a99269.json b/modules/netflow/configuration/kibana/5.x/visualization/84e4c9f0-2fd7-11e7-97a8-85d8d5a99269.json
deleted file mode 100644
index eda88c1d6..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/84e4c9f0-2fd7-11e7-97a8-85d8d5a99269.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Types of Service (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.tos\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Type of Service\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Types of Service (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/8500a670-6579-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/5.x/visualization/8500a670-6579-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index c178c829e..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/8500a670-6579-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination Port Count\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addLegend\": false,\n    \"addTooltip\": true,\n    \"fontSize\": \"32\",\n    \"gauge\": {\n      \"autoExtend\": false,\n      \"backStyle\": \"Full\",\n      \"colorSchema\": \"Green to Red\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 100\n        }\n      ],\n      \"gaugeColorMode\": \"None\",\n      \"gaugeStyle\": \"Full\",\n      \"gaugeType\": \"Metric\",\n      \"invertColors\": false,\n      \"labels\": {\n        \"color\": \"black\",\n        \"show\": true\n      },\n      \"orientation\": \"vertical\",\n      \"percentageMode\": false,\n      \"scale\": {\n        \"color\": \"#333\",\n        \"labels\": false,\n        \"show\": false,\n        \"width\": 2\n      },\n      \"style\": {\n        \"bgColor\": false,\n        \"bgFill\": \"#000\",\n        \"fontSize\": \"36\",\n        \"labelColor\": false,\n        \"subText\": \"\"\n      },\n      \"type\": \"simple\",\n      \"useRange\": false,\n      \"verticalSplit\": false\n    },\n    \"handleNoResults\": true,\n    \"type\": \"gauge\"\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"customLabel\": \"Destination Ports\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination Port Count", "uiStateJSON": "{\n  \"vis\": {\n    \"defaultColors\": {\n      \"0 - 100\": \"rgb(0,104,55)\"\n    }\n  }\n}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/87dbc0a0-657e-11e7-99b6-af4533b21b46.json b/modules/netflow/configuration/kibana/5.x/visualization/87dbc0a0-657e-11e7-99b6-af4533b21b46.json
deleted file mode 100644
index 0870127bd..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/87dbc0a0-657e-11e7-99b6-af4533b21b46.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Autonomous Systems (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"geoip_dst.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_dst.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flows records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Autonomous Systems (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/8a52f7a0-2fc7-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/5.x/visualization/8a52f7a0-2fc7-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index 1834df905..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/8a52f7a0-2fc7-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Sources (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Sources (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/8c6ce180-657e-11e7-bd38-dd04615e7f62.json b/modules/netflow/configuration/kibana/5.x/visualization/8c6ce180-657e-11e7-bd38-dd04615e7f62.json
deleted file mode 100644
index e3fc1fd84..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/8c6ce180-657e-11e7-bd38-dd04615e7f62.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Autonomous Systems (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"geoip_dst.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_dst.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Autonomous Systems (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/8d2cb120-6233-11e7-aa4b-5f8c56ec33b8.json b/modules/netflow/configuration/kibana/5.x/visualization/8d2cb120-6233-11e7-aa4b-5f8c56ec33b8.json
deleted file mode 100644
index 4b0204c67..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/8d2cb120-6233-11e7-aa4b-5f8c56ec33b8.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous Systems (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"geoip.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous Systems (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/8dcbcce0-2fd6-11e7-a82c-3146dd695923.json b/modules/netflow/configuration/kibana/5.x/visualization/8dcbcce0-2fd6-11e7-a82c-3146dd695923.json
deleted file mode 100644
index d4303ca39..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/8dcbcce0-2fd6-11e7-a82c-3146dd695923.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Sources and Ports (bytes)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_addr\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Sources and Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/8f35efc0-2fcc-11e7-842d-39925ea8ac40.json b/modules/netflow/configuration/kibana/5.x/visualization/8f35efc0-2fcc-11e7-842d-39925ea8ac40.json
deleted file mode 100644
index c3818b58b..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/8f35efc0-2fcc-11e7-842d-39925ea8ac40.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: IP Version and Protocols (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.ip_version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"IP Version\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: IP Version and Protocols (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/91ae4100-6288-11e7-bcd8-a16ef1d32773.json b/modules/netflow/configuration/kibana/5.x/visualization/91ae4100-6288-11e7-bcd8-a16ef1d32773.json
deleted file mode 100644
index 39e5c1963..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/91ae4100-6288-11e7-bcd8-a16ef1d32773.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Ports (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.src_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/97f430b0-622e-11e7-b0a5-e9bda2f6d168.json b/modules/netflow/configuration/kibana/5.x/visualization/97f430b0-622e-11e7-b0a5-e9bda2f6d168.json
deleted file mode 100644
index 8e684f027..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/97f430b0-622e-11e7-b0a5-e9bda2f6d168.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.tcp_flags_label\",\"size\":255,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"TCP Flags\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/99382ab0-6555-11e7-8d48-19b0c51bbbbd.json b/modules/netflow/configuration/kibana/5.x/visualization/99382ab0-6555-11e7-8d48-19b0c51bbbbd.json
deleted file mode 100644
index 42b758d7e..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/99382ab0-6555-11e7-8d48-19b0c51bbbbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Cities (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"geoip.city_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.city_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Cities (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/99c1a4a0-2f60-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/5.x/visualization/99c1a4a0-2f60-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index bc876cd22..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/99c1a4a0-2f60-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Geo Location Heatmap\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Heatmap\",\"isDesaturated\":true,\"addTooltip\":true,\"heatMaxZoom\":16,\"heatMinOpacity\":\"0.32\",\"heatRadius\":\"24\",\"heatBlur\":\"16\",\"heatNormalizeData\":true,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[15,5],\"wms\":{\"enabled\":false,\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\",\"options\":{\"version\":\"1.3.0\",\"layers\":\"0\",\"format\":\"image/png\",\"transparent\":true,\"attribution\":\"Maps provided by USGS\",\"styles\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.location\",\"autoPrecision\":true,\"precision\":2,\"customLabel\":\"Location\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Geo Location Heatmap", "uiStateJSON": "{\"mapCenter\":[8.407168163601076,9.4921875]}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/99e49de0-2fcc-11e7-842d-39925ea8ac40.json b/modules/netflow/configuration/kibana/5.x/visualization/99e49de0-2fcc-11e7-842d-39925ea8ac40.json
deleted file mode 100644
index b33bf5844..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/99e49de0-2fcc-11e7-842d-39925ea8ac40.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Protocols (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Protocols (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/9a4938d0-6592-11e7-b8de-af19b696fa44.json b/modules/netflow/configuration/kibana/5.x/visualization/9a4938d0-6592-11e7-b8de-af19b696fa44.json
deleted file mode 100644
index 5bf13524a..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/9a4938d0-6592-11e7-b8de-af19b696fa44.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Ingress Interfaces (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.input_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.input_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Ingress Interfaces (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/9accd4a0-657a-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/5.x/visualization/9accd4a0-657a-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index 81e822cc4..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/9accd4a0-657a-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: ToS Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.tos\",\"customLabel\":\"Types of Service\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: ToS Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/9b5d3b80-2fc9-11e7-bd31-a722d271a9cc.json b/modules/netflow/configuration/kibana/5.x/visualization/9b5d3b80-2fc9-11e7-bd31-a722d271a9cc.json
deleted file mode 100644
index b090e4edc..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/9b5d3b80-2fc9-11e7-bd31-a722d271a9cc.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Cities (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.city_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Cities (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/9f113d80-6719-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/5.x/visualization/9f113d80-6719-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 335b17d0b..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/9f113d80-6719-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Destinations\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Destination\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Destinations", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/9f9e54b0-2fd6-11e7-a82c-3146dd695923.json b/modules/netflow/configuration/kibana/5.x/visualization/9f9e54b0-2fd6-11e7-a82c-3146dd695923.json
deleted file mode 100644
index 5958480c9..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/9f9e54b0-2fd6-11e7-a82c-3146dd695923.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Sources and Ports (packets)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.packets\",\n        \"customLabel\": \"Packets\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_addr\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Sources and Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/a13402f0-6557-11e7-a3eb-4b30743c9370.json b/modules/netflow/configuration/kibana/5.x/visualization/a13402f0-6557-11e7-a3eb-4b30743c9370.json
deleted file mode 100644
index 19fe02da6..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/a13402f0-6557-11e7-a3eb-4b30743c9370.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.tcp_flags_label:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tcp_flags_label:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/a2099810-657b-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/5.x/visualization/a2099810-657b-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index 2a0f7aa07..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/a2099810-657b-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous System Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"geoip.autonomous_system\",\"customLabel\":\"Autonomous Systems\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous System Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/a3541940-6556-11e7-a807-e52f264c6cfd.json b/modules/netflow/configuration/kibana/5.x/visualization/a3541940-6556-11e7-a807-e52f264c6cfd.json
deleted file mode 100644
index 8b15e7be6..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/a3541940-6556-11e7-a807-e52f264c6cfd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.dst_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/a4ade270-658e-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/5.x/visualization/a4ade270-658e-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 9f1db8814..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/a4ade270-658e-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Direction (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.direction\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Direction\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Direction (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/a7a47e70-2fde-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/5.x/visualization/a7a47e70-2fde-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 3ed157264..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/a7a47e70-2fde-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Conversation Partners\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Conversation Partners", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/a8b68cb0-2fc8-11e7-8d8b-45ec51795dad.json b/modules/netflow/configuration/kibana/5.x/visualization/a8b68cb0-2fc8-11e7-8d8b-45ec51795dad.json
deleted file mode 100644
index 31e9491f3..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/a8b68cb0-2fc8-11e7-8d8b-45ec51795dad.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Source Ports (bytes)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Source Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/a8eadac0-658c-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/5.x/visualization/a8eadac0-658c-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 78466c9b2..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/a8eadac0-658c-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Traffic Volume by Destination Port\",\n  \"type\": \"area\",\n  \"params\": {\n    \"grid\": {\n      \"categoryLines\": false,\n      \"style\": {\n        \"color\": \"#eee\"\n      }\n    },\n    \"categoryAxes\": [\n      {\n        \"id\": \"CategoryAxis-1\",\n        \"type\": \"category\",\n        \"position\": \"bottom\",\n        \"show\": true,\n        \"style\": {},\n        \"scale\": {\n          \"type\": \"linear\"\n        },\n        \"labels\": {\n          \"show\": true,\n          \"truncate\": 100\n        },\n        \"title\": {\n          \"text\": \"Time\"\n        }\n      }\n    ],\n    \"valueAxes\": [\n      {\n        \"id\": \"ValueAxis-1\",\n        \"name\": \"LeftAxis-1\",\n        \"type\": \"value\",\n        \"position\": \"left\",\n        \"show\": true,\n        \"style\": {},\n        \"scale\": {\n          \"type\": \"linear\",\n          \"mode\": \"normal\"\n        },\n        \"labels\": {\n          \"show\": true,\n          \"rotate\": 0,\n          \"filter\": false,\n          \"truncate\": 100\n        },\n        \"title\": {\n          \"text\": \"Bytes\"\n        }\n      }\n    ],\n    \"seriesParams\": [\n      {\n        \"show\": \"true\",\n        \"type\": \"area\",\n        \"mode\": \"stacked\",\n        \"data\": {\n          \"label\": \"Bytes\",\n          \"id\": \"1\"\n        },\n        \"valueAxis\": \"ValueAxis-1\",\n        \"drawLinesBetweenPoints\": true,\n        \"showCircles\": false,\n        \"interpolate\": \"cardinal\"\n      }\n    ],\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"times\": [],\n    \"addTimeMarker\": false\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"date_histogram\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.last_switched\",\n        \"interval\": \"auto\",\n        \"customInterval\": \"2h\",\n        \"min_doc_count\": 1,\n        \"extended_bounds\": {},\n        \"customLabel\": \"Time\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"group\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Traffic Volume by Destination Port", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/ac4cbc90-622d-11e7-b0a5-e9bda2f6d168.json b/modules/netflow/configuration/kibana/5.x/visualization/ac4cbc90-622d-11e7-b0a5-e9bda2f6d168.json
deleted file mode 100644
index 7a5f6bd30..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/ac4cbc90-622d-11e7-b0a5-e9bda2f6d168.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous Systems (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Autonomous System\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous Systems (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/ad5cb080-622e-11e7-b0a5-e9bda2f6d168.json b/modules/netflow/configuration/kibana/5.x/visualization/ad5cb080-622e-11e7-b0a5-e9bda2f6d168.json
deleted file mode 100644
index 46dcb5544..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/ad5cb080-622e-11e7-b0a5-e9bda2f6d168.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.tcp_flags_label\",\"size\":255,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"TCP Flags\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/af1425a0-2fc7-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/5.x/visualization/af1425a0-2fc7-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index 9a448e61a..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/af1425a0-2fc7-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/af23cb20-2fc9-11e7-8224-a900ea73fa5f.json b/modules/netflow/configuration/kibana/5.x/visualization/af23cb20-2fc9-11e7-8224-a900ea73fa5f.json
deleted file mode 100644
index 392445794..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/af23cb20-2fc9-11e7-8224-a900ea73fa5f.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Cities (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.city_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Cities (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/b02faaf0-2fcb-11e7-8df8-b363df28ab61.json b/modules/netflow/configuration/kibana/5.x/visualization/b02faaf0-2fcb-11e7-8df8-b363df28ab61.json
deleted file mode 100644
index 63c839f71..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/b02faaf0-2fcb-11e7-8df8-b363df28ab61.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: IP Version (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.ip_version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"IP Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: IP Version (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/b13956f0-657a-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/5.x/visualization/b13956f0-657a-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index d0302eeda..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/b13956f0-657a-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLAN Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.vlan\",\"customLabel\":\"VLANs\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: VLAN Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/b2c9a3d0-658e-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/5.x/visualization/b2c9a3d0-658e-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 6dbda475a..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/b2c9a3d0-658e-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Direction (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.direction\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Direction\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Direction (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/b2d02df0-6556-11e7-a807-e52f264c6cfd.json b/modules/netflow/configuration/kibana/5.x/visualization/b2d02df0-6556-11e7-a807-e52f264c6cfd.json
deleted file mode 100644
index 8c142fdb2..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/b2d02df0-6556-11e7-a807-e52f264c6cfd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.dst_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/b3e2af90-657b-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/5.x/visualization/b3e2af90-657b-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index e2ed3b6e0..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/b3e2af90-657b-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Country Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"geoip.country_name\",\"customLabel\":\"Countries\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Country Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/b58e1380-6719-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/5.x/visualization/b58e1380-6719-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 79a84236c..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/b58e1380-6719-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Sources\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Sources", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/b61f84d0-6289-11e7-bcd8-a16ef1d32773.json b/modules/netflow/configuration/kibana/5.x/visualization/b61f84d0-6289-11e7-bcd8-a16ef1d32773.json
deleted file mode 100644
index 39cb5931b..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/b61f84d0-6289-11e7-bcd8-a16ef1d32773.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLANs (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.vlan:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.vlan:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: VLANs (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/b6a092e0-2fcc-11e7-9bae-a35d2fe38fc2.json b/modules/netflow/configuration/kibana/5.x/visualization/b6a092e0-2fcc-11e7-9bae-a35d2fe38fc2.json
deleted file mode 100644
index 81a54099b..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/b6a092e0-2fcc-11e7-9bae-a35d2fe38fc2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: IP Version (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.ip_version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"IP Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: IP Version (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/b74bbb70-2fd6-11e7-a82c-3146dd695923.json b/modules/netflow/configuration/kibana/5.x/visualization/b74bbb70-2fd6-11e7-a82c-3146dd695923.json
deleted file mode 100644
index dc66b8395..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/b74bbb70-2fd6-11e7-a82c-3146dd695923.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Sources and Ports (flow records)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Flow Records\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_addr\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Sources and Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/b88a8790-2fd7-11e7-bd03-932d3e38a4ff.json b/modules/netflow/configuration/kibana/5.x/visualization/b88a8790-2fd7-11e7-bd03-932d3e38a4ff.json
deleted file mode 100644
index d69c6798d..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/b88a8790-2fd7-11e7-bd03-932d3e38a4ff.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLANs (bytes)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.vlan\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"VLAN\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: VLANs (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/bb8e3d90-2fca-11e7-9fcf-99b4b8159f98.json b/modules/netflow/configuration/kibana/5.x/visualization/bb8e3d90-2fca-11e7-9fcf-99b4b8159f98.json
deleted file mode 100644
index 18f82618e..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/bb8e3d90-2fca-11e7-9fcf-99b4b8159f98.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries and Cities (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.country_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.city_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Countries and Cities (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/bbac23d0-2fe0-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/5.x/visualization/bbac23d0-2fe0-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 6e50cf6d1..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/bbac23d0-2fe0-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Flow Records\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Flow Records", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/bfec6260-6592-11e7-9bf4-ed832088be20.json b/modules/netflow/configuration/kibana/5.x/visualization/bfec6260-6592-11e7-9bf4-ed832088be20.json
deleted file mode 100644
index c11358aed..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/bfec6260-6592-11e7-9bf4-ed832088be20.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Ingress Interfaces (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.input_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.input_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Ingress Interfaces (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/c4987cc0-657b-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/5.x/visualization/c4987cc0-657b-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index 721d37d97..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/c4987cc0-657b-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: City Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"geoip.city_name\",\"customLabel\":\"Cities\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: City Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/c61bd8b0-658c-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/5.x/visualization/c61bd8b0-658c-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 4896722ab..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/c61bd8b0-658c-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Traffic Volume by Source Port\",\n  \"type\": \"area\",\n  \"params\": {\n    \"grid\": {\n      \"categoryLines\": false,\n      \"style\": {\n        \"color\": \"#eee\"\n      }\n    },\n    \"categoryAxes\": [\n      {\n        \"id\": \"CategoryAxis-1\",\n        \"type\": \"category\",\n        \"position\": \"bottom\",\n        \"show\": true,\n        \"style\": {},\n        \"scale\": {\n          \"type\": \"linear\"\n        },\n        \"labels\": {\n          \"show\": true,\n          \"truncate\": 100\n        },\n        \"title\": {\n          \"text\": \"Time\"\n        }\n      }\n    ],\n    \"valueAxes\": [\n      {\n        \"id\": \"ValueAxis-1\",\n        \"name\": \"LeftAxis-1\",\n        \"type\": \"value\",\n        \"position\": \"left\",\n        \"show\": true,\n        \"style\": {},\n        \"scale\": {\n          \"type\": \"linear\",\n          \"mode\": \"normal\"\n        },\n        \"labels\": {\n          \"show\": true,\n          \"rotate\": 0,\n          \"filter\": false,\n          \"truncate\": 100\n        },\n        \"title\": {\n          \"text\": \"Bytes\"\n        }\n      }\n    ],\n    \"seriesParams\": [\n      {\n        \"show\": \"true\",\n        \"type\": \"area\",\n        \"mode\": \"stacked\",\n        \"data\": {\n          \"label\": \"Bytes\",\n          \"id\": \"1\"\n        },\n        \"valueAxis\": \"ValueAxis-1\",\n        \"drawLinesBetweenPoints\": true,\n        \"showCircles\": false,\n        \"interpolate\": \"cardinal\"\n      }\n    ],\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"times\": [],\n    \"addTimeMarker\": false\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"date_histogram\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.last_switched\",\n        \"interval\": \"auto\",\n        \"customInterval\": \"2h\",\n        \"min_doc_count\": 1,\n        \"extended_bounds\": {},\n        \"customLabel\": \"Time\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"group\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Traffic Volume by Source Port", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/c6319680-2fc9-11e7-823a-89e4bb55eaa1.json b/modules/netflow/configuration/kibana/5.x/visualization/c6319680-2fc9-11e7-823a-89e4bb55eaa1.json
deleted file mode 100644
index b72f29aaa..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/c6319680-2fc9-11e7-823a-89e4bb55eaa1.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Cities (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.city_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Cities (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/c6b36620-2fc8-11e7-87d6-cdce05879baf.json b/modules/netflow/configuration/kibana/5.x/visualization/c6b36620-2fc8-11e7-87d6-cdce05879baf.json
deleted file mode 100644
index 12569f797..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/c6b36620-2fc8-11e7-87d6-cdce05879baf.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Source Ports (flow records)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Flow Records\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Source Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/ca786e30-622d-11e7-b0a5-e9bda2f6d168.json b/modules/netflow/configuration/kibana/5.x/visualization/ca786e30-622d-11e7-b0a5-e9bda2f6d168.json
deleted file mode 100644
index 33dee4b2b..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/ca786e30-622d-11e7-b0a5-e9bda2f6d168.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous Systems (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Autonomous System\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous Systems (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/caea3760-6591-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/5.x/visualization/caea3760-6591-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index c614b431e..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/caea3760-6591-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Ingress Interfaces (flow records)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.input_snmp\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Ingress Interface\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Ingress Interfaces (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/caf2c4b0-6556-11e7-be5f-c5cca8dd73b6.json b/modules/netflow/configuration/kibana/5.x/visualization/caf2c4b0-6556-11e7-be5f-c5cca8dd73b6.json
deleted file mode 100644
index c41547f1f..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/caf2c4b0-6556-11e7-be5f-c5cca8dd73b6.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Ports (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.src_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/d07a2870-2fcc-11e7-9bae-a35d2fe38fc2.json b/modules/netflow/configuration/kibana/5.x/visualization/d07a2870-2fcc-11e7-9bae-a35d2fe38fc2.json
deleted file mode 100644
index bdf3d88ae..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/d07a2870-2fcc-11e7-9bae-a35d2fe38fc2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: IP Version and Protocols (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.ip_version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"IP Version\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: IP Version and Protocols (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/d297fe60-2fd7-11e7-af27-99e728e71e91.json b/modules/netflow/configuration/kibana/5.x/visualization/d297fe60-2fd7-11e7-af27-99e728e71e91.json
deleted file mode 100644
index 3c083014e..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/d297fe60-2fd7-11e7-af27-99e728e71e91.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLANs (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.vlan\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"VLAN\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: VLANs (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/d2a2db30-658a-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/5.x/visualization/d2a2db30-658a-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 2485949c8..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/d2a2db30-658a-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination and Source ASs (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip_dst.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination AS\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip_src.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source AS\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destination and Source ASs (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/d4a408a0-671a-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/5.x/visualization/d4a408a0-671a-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 121ee308b..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/d4a408a0-671a-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Cities\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showMeticsAtAllLevels\":false,\"showPartialRows\":true,\"showTotal\":true,\"sort\":{\"columnIndex\":null,\"direction\":null},\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"geoip.country_name\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Country\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"geoip.city_name\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Cities", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/d8f24780-2fcc-11e7-9bae-a35d2fe38fc2.json b/modules/netflow/configuration/kibana/5.x/visualization/d8f24780-2fcc-11e7-9bae-a35d2fe38fc2.json
deleted file mode 100644
index 5726f7273..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/d8f24780-2fcc-11e7-9bae-a35d2fe38fc2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Protocols (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Protocols (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/d9fdbd80-6555-11e7-8d48-19b0c51bbbbd.json b/modules/netflow/configuration/kibana/5.x/visualization/d9fdbd80-6555-11e7-8d48-19b0c51bbbbd.json
deleted file mode 100644
index 5140e74fc..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/d9fdbd80-6555-11e7-8d48-19b0c51bbbbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Cities (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"geoip.city_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.city_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Cities (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/daa62090-6557-11e7-a3eb-4b30743c9370.json b/modules/netflow/configuration/kibana/5.x/visualization/daa62090-6557-11e7-a3eb-4b30743c9370.json
deleted file mode 100644
index bc4d21c02..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/daa62090-6557-11e7-a3eb-4b30743c9370.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.tcp_flags_label:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tcp_flags_label:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/dcf88c60-6233-11e7-aa4b-5f8c56ec33b8.json b/modules/netflow/configuration/kibana/5.x/visualization/dcf88c60-6233-11e7-aa4b-5f8c56ec33b8.json
deleted file mode 100644
index b5c28766f..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/dcf88c60-6233-11e7-aa4b-5f8c56ec33b8.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous Systems (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"geoip.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flows records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous Systems (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/de9b3dd0-2fc8-11e7-844c-67b9b101127b.json b/modules/netflow/configuration/kibana/5.x/visualization/de9b3dd0-2fc8-11e7-844c-67b9b101127b.json
deleted file mode 100644
index 00f3c1814..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/de9b3dd0-2fc8-11e7-844c-67b9b101127b.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Source Ports (packets)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.packets\",\n        \"customLabel\": \"Packets\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Source Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/de9da770-2fcb-11e7-8df8-b363df28ab61.json b/modules/netflow/configuration/kibana/5.x/visualization/de9da770-2fcb-11e7-8df8-b363df28ab61.json
deleted file mode 100644
index e576bf57d..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/de9da770-2fcb-11e7-8df8-b363df28ab61.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: IP Version and Protocols (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.ip_version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"IP Version\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: IP Version and Protocols (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/e2a7fc60-6592-11e7-8b83-5b2419db46fa.json b/modules/netflow/configuration/kibana/5.x/visualization/e2a7fc60-6592-11e7-8b83-5b2419db46fa.json
deleted file mode 100644
index 21445a0ce..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/e2a7fc60-6592-11e7-8b83-5b2419db46fa.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Ingress Interfaces (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.input_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.input_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Ingress Interfaces (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/e2f43d10-6591-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/5.x/visualization/e2f43d10-6591-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 8caead0e1..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/e2f43d10-6591-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Ingress Interfaces (bytes)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.input_snmp\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Ingress Interface\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Ingress Interfaces (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/e3ef9130-658a-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/5.x/visualization/e3ef9130-658a-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 21b84b4db..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/e3ef9130-658a-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination and Source ASs (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip_dst.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination AS\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip_src.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source AS\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destination and Source ASs (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/e8251d30-2fd7-11e7-a4f6-dbb93cfb4a10.json b/modules/netflow/configuration/kibana/5.x/visualization/e8251d30-2fd7-11e7-a4f6-dbb93cfb4a10.json
deleted file mode 100644
index ce99c6763..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/e8251d30-2fd7-11e7-a4f6-dbb93cfb4a10.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLANs (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.vlan\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"VLAN\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: VLANs (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/ef7699a0-6719-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/5.x/visualization/ef7699a0-6719-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index d2e84a449..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/ef7699a0-6719-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Destination Ports\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.dst_port_name\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Destination\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Destination Ports", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/f11380e0-6591-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/5.x/visualization/f11380e0-6591-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 6988e1057..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/f11380e0-6591-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Ingress Interfaces (packets)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.input_snmp\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Ingress Interface\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Ingress Interfaces (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/f2fea250-2fcb-11e7-8df8-b363df28ab61.json b/modules/netflow/configuration/kibana/5.x/visualization/f2fea250-2fcb-11e7-8df8-b363df28ab61.json
deleted file mode 100644
index d11744ec2..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/f2fea250-2fcb-11e7-8df8-b363df28ab61.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Protocols (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Protocols (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/f5f79b00-6555-11e7-b27e-8f8b3770f1df.json b/modules/netflow/configuration/kibana/5.x/visualization/f5f79b00-6555-11e7-b27e-8f8b3770f1df.json
deleted file mode 100644
index e0f66eec5..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/f5f79b00-6555-11e7-b27e-8f8b3770f1df.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"geoip.country_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.country_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Countries (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/f687e140-622d-11e7-b0a5-e9bda2f6d168.json b/modules/netflow/configuration/kibana/5.x/visualization/f687e140-622d-11e7-b0a5-e9bda2f6d168.json
deleted file mode 100644
index dd617f198..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/f687e140-622d-11e7-b0a5-e9bda2f6d168.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous Systems (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Autonomous System\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous Systems (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/f6be96c0-622f-11e7-abbc-93bb293f5057.json b/modules/netflow/configuration/kibana/5.x/visualization/f6be96c0-622f-11e7-abbc-93bb293f5057.json
deleted file mode 100644
index 8dcf4e344..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/f6be96c0-622f-11e7-abbc-93bb293f5057.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Locality (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.flow_locality\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Locality\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Locality (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/f8731d50-2fd6-11e7-97a8-85d8d5a99269.json b/modules/netflow/configuration/kibana/5.x/visualization/f8731d50-2fd6-11e7-97a8-85d8d5a99269.json
deleted file mode 100644
index 05d2e79dc..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/f8731d50-2fd6-11e7-97a8-85d8d5a99269.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Flow Exporter\",\"field\":\"host\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":50},\"schema\":\"segment\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"title\":\"Netflow: Flow Exporters (flow records)\",\"type\":\"pie\"}", "description": "", "title": "Netflow: Flow Exporters (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/fd081e50-6556-11e7-be5f-c5cca8dd73b6.json b/modules/netflow/configuration/kibana/5.x/visualization/fd081e50-6556-11e7-be5f-c5cca8dd73b6.json
deleted file mode 100644
index 5a1e3199f..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/fd081e50-6556-11e7-be5f-c5cca8dd73b6.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Ports (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.src_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/5.x/visualization/netflow.json b/modules/netflow/configuration/kibana/5.x/visualization/netflow.json
deleted file mode 100644
index 3943af169..000000000
--- a/modules/netflow/configuration/kibana/5.x/visualization/netflow.json
+++ /dev/null
@@ -1 +0,0 @@
-["39e3dab0-2fcb-11e7-befb-31e033c79e4e", "1026edb0-2fcc-11e7-842d-39925ea8ac40", "b6a092e0-2fcc-11e7-9bae-a35d2fe38fc2", "99c1a4a0-2f60-11e7-8936-6f5fd5520124", "b02faaf0-2fcb-11e7-8df8-b363df28ab61", "d07a2870-2fcc-11e7-9bae-a35d2fe38fc2", "8f35efc0-2fcc-11e7-842d-39925ea8ac40", "de9da770-2fcb-11e7-8df8-b363df28ab61", "d8f24780-2fcc-11e7-9bae-a35d2fe38fc2", "99e49de0-2fcc-11e7-842d-39925ea8ac40", "f2fea250-2fcb-11e7-8df8-b363df28ab61", "ad5cb080-622e-11e7-b0a5-e9bda2f6d168", "7e9a7980-622e-11e7-b0a5-e9bda2f6d168", "97f430b0-622e-11e7-b0a5-e9bda2f6d168", "2aeac270-6230-11e7-84f1-9728c106b1b6", "178b0af0-6230-11e7-9a50-efc26ded795d", "f6be96c0-622f-11e7-abbc-93bb293f5057", "8d2cb120-6233-11e7-aa4b-5f8c56ec33b8", "6a597070-6233-11e7-aa4b-5f8c56ec33b8", "dcf88c60-6233-11e7-aa4b-5f8c56ec33b8", "6ad67290-6289-11e7-bcd8-a16ef1d32773", "2c9567c0-6289-11e7-bcd8-a16ef1d32773", "b61f84d0-6289-11e7-bcd8-a16ef1d32773", "52279a00-628c-11e7-95ed-8966ac93bd5a", "56a23ac0-628e-11e7-a842-b787fa3508ce", "735d6c70-628e-11e7-a842-b787fa3508ce", "a3541940-6556-11e7-a807-e52f264c6cfd", "f5f79b00-6555-11e7-b27e-8f8b3770f1df", "65f3b500-6557-11e7-87c3-994b88f84501", "b2d02df0-6556-11e7-a807-e52f264c6cfd", "0927de10-6556-11e7-b27e-8f8b3770f1df", "0de63e90-6558-11e7-8547-3d133170b50d", "a13402f0-6557-11e7-a3eb-4b30743c9370", "231fe630-6558-11e7-8547-3d133170b50d", "daa62090-6557-11e7-a3eb-4b30743c9370", "39ecd800-6558-11e7-bea4-0f5fadb995cc", "835e6090-6557-11e7-87c3-994b88f84501", "4a6f6030-6558-11e7-bea4-0f5fadb995cc", "a7a47e70-2fde-11e7-9d02-3f49bde5c1d5", "bb8e3d90-2fca-11e7-9fcf-99b4b8159f98", "6702de70-2fca-11e7-8fcd-8dc6c60d4592", "3fa5f6f0-2fca-11e7-ab32-99f279b941ef", "691cda40-2fc9-11e7-823a-89e4bb55eaa1", "49a2d6b0-2fc9-11e7-8224-a900ea73fa5f", "324b0a00-2fc9-11e7-bd31-a722d271a9cc", "c6319680-2fc9-11e7-823a-89e4bb55eaa1", "99382ab0-6555-11e7-8d48-19b0c51bbbbd", "6c67b990-628c-11e7-95ed-8966ac93bd5a", "ca786e30-622d-11e7-b0a5-e9bda2f6d168", "f687e140-622d-11e7-b0a5-e9bda2f6d168", "ac4cbc90-622d-11e7-b0a5-e9bda2f6d168", "d9fdbd80-6555-11e7-8d48-19b0c51bbbbd", "af23cb20-2fc9-11e7-8224-a900ea73fa5f", "9b5d3b80-2fc9-11e7-bd31-a722d271a9cc", "84e4c9f0-2fd7-11e7-97a8-85d8d5a99269", "69f864d0-2fd7-11e7-97a8-85d8d5a99269", "4dc994a0-2fd7-11e7-97a8-85d8d5a99269", "e8251d30-2fd7-11e7-a4f6-dbb93cfb4a10", "b88a8790-2fd7-11e7-bd03-932d3e38a4ff", "d297fe60-2fd7-11e7-af27-99e728e71e91", "793a6f00-2fdd-11e7-afd7-595689f3f18c", "4440e130-2fdd-11e7-afd7-595689f3f18c", "af1425a0-2fc7-11e7-8936-6f5fd5520124", "4f3525d0-2fc7-11e7-8936-6f5fd5520124", "5fd2fe30-2fc7-11e7-8936-6f5fd5520124", "55f66b20-2fdd-11e7-afd7-595689f3f18c", "8a52f7a0-2fc7-11e7-8936-6f5fd5520124", "1e7d8770-2fc7-11e7-8936-6f5fd5520124", "7c2cfd10-2fc7-11e7-8936-6f5fd5520124", "9accd4a0-657a-11e7-8471-e5432f50acbd", "3277ea90-6578-11e7-8471-e5432f50acbd", "b13956f0-657a-11e7-8471-e5432f50acbd", "55be8550-655e-11e7-9dda-9f993e2ba58b", "a2099810-657b-11e7-8471-e5432f50acbd", "82fcfc50-657b-11e7-8471-e5432f50acbd", "b3e2af90-657b-11e7-8471-e5432f50acbd", "c4987cc0-657b-11e7-8471-e5432f50acbd", "bbac23d0-2fe0-11e7-9d02-3f49bde5c1d5", "399c9fe0-657e-11e7-bd38-dd04615e7f62", "43e698c0-657e-11e7-99b6-af4533b21b46", "e3ef9130-658a-11e7-bfc3-d74b7bb89482", "836b2010-657e-11e7-9748-5d4091219eef", "7aaa68d0-658a-11e7-bfc3-d74b7bb89482", "d2a2db30-658a-11e7-bfc3-d74b7bb89482", "8c6ce180-657e-11e7-bd38-dd04615e7f62", "4a548ff0-657e-11e7-9748-5d4091219eef", "87dbc0a0-657e-11e7-99b6-af4533b21b46", "73c37440-658e-11e7-bfc3-d74b7bb89482", "64b144f0-658e-11e7-bfc3-d74b7bb89482", "f8731d50-2fd6-11e7-97a8-85d8d5a99269", "a4ade270-658e-11e7-bfc3-d74b7bb89482", "16438600-2fcb-11e7-befb-31e033c79e4e", "6a7e4790-2fe0-11e7-9d02-3f49bde5c1d5", "b2c9a3d0-658e-11e7-bfc3-d74b7bb89482", "41a7e3a0-658f-11e7-bfc3-d74b7bb89482", "4ea0a8d0-658f-11e7-bfc3-d74b7bb89482", "3026fe40-658f-11e7-bfc3-d74b7bb89482", "9a4938d0-6592-11e7-b8de-af19b696fa44", "bfec6260-6592-11e7-9bf4-ed832088be20", "f11380e0-6591-11e7-bfc3-d74b7bb89482", "04990fe0-6592-11e7-bfc3-d74b7bb89482", "1fa2c100-6592-11e7-bfc3-d74b7bb89482", "e2f43d10-6591-11e7-bfc3-d74b7bb89482", "1418ce10-6592-11e7-bfc3-d74b7bb89482", "caea3760-6591-11e7-bfc3-d74b7bb89482", "8500a670-6579-11e7-8471-e5432f50acbd", "e2a7fc60-6592-11e7-8b83-5b2419db46fa", "206d6e90-6593-11e7-8b83-5b2419db46fa", "00248240-6593-11e7-b8de-af19b696fa44", "47d426a0-2fc8-11e7-8b06-97426538fddd", "12ca1180-6593-11e7-9bf4-ed832088be20", "5c5d6f60-2fdb-11e7-84e6-333bd21ad9fd", "264fb270-2fdb-11e7-84e6-333bd21ad9fd", "4898db90-2fdb-11e7-84e6-333bd21ad9fd", "44b3cb70-2fd6-11e7-bc99-41245d9394f2", "23d6dc80-2fd6-11e7-bc99-41245d9394f2", "622844d0-6288-11e7-bcd8-a16ef1d32773", "6f6d05b0-2fc8-11e7-bf24-57efade8fd83", "5e58cc00-6556-11e7-995a-3584c2c6482c", "7f7aac00-2fc8-11e7-8bc1-177080983dbf", "71272b10-6579-11e7-8471-e5432f50acbd", "313a9880-2fd6-11e7-bc99-41245d9394f2", "8dcbcce0-2fd6-11e7-a82c-3146dd695923", "caf2c4b0-6556-11e7-be5f-c5cca8dd73b6", "91ae4100-6288-11e7-bcd8-a16ef1d32773", "de9b3dd0-2fc8-11e7-844c-67b9b101127b", "c6b36620-2fc8-11e7-87d6-cdce05879baf", "a8b68cb0-2fc8-11e7-8d8b-45ec51795dad", "fd081e50-6556-11e7-be5f-c5cca8dd73b6", "a8eadac0-658c-11e7-bfc3-d74b7bb89482", "c61bd8b0-658c-11e7-bfc3-d74b7bb89482", "9f9e54b0-2fd6-11e7-a82c-3146dd695923", "b74bbb70-2fd6-11e7-a82c-3146dd695923", "3ee07620-6556-11e7-995a-3584c2c6482c", "d4a408a0-671a-11e7-b5b8-29fbded8e37c", "51006340-671a-11e7-b5b8-29fbded8e37c", "ef7699a0-6719-11e7-b5b8-29fbded8e37c", "9f113d80-6719-11e7-b5b8-29fbded8e37c", "02e25f10-671a-11e7-b5b8-29fbded8e37c", "326fae40-671a-11e7-b5b8-29fbded8e37c", "7e9cb7e0-671a-11e7-b5b8-29fbded8e37c", "b58e1380-6719-11e7-b5b8-29fbded8e37c", "26e166f0-2fe2-11e7-9d02-3f49bde5c1d5"]
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/dashboard/04157d70-6591-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/6.x/dashboard/04157d70-6591-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 713735210..000000000
--- a/modules/netflow/configuration/kibana/6.x/dashboard/04157d70-6591-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Flow Exporters", "uiStateJSON": "{}", "panelsJSON": "[{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":1,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":1,\"id\":\"f8731d50-2fd6-11e7-97a8-85d8d5a99269\",\"panelIndex\":2,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"size_x\":4,\"size_y\":2,\"panelIndex\":3,\"type\":\"visualization\",\"id\":\"caea3760-6591-11e7-bfc3-d74b7bb89482\",\"col\":5,\"row\":2},{\"size_x\":4,\"size_y\":2,\"panelIndex\":4,\"type\":\"visualization\",\"id\":\"1fa2c100-6592-11e7-bfc3-d74b7bb89482\",\"col\":9,\"row\":2},{\"size_x\":6,\"size_y\":2,\"panelIndex\":5,\"type\":\"visualization\",\"id\":\"00248240-6593-11e7-b8de-af19b696fa44\",\"col\":7,\"row\":4},{\"size_x\":6,\"size_y\":2,\"panelIndex\":6,\"type\":\"visualization\",\"id\":\"206d6e90-6593-11e7-8b83-5b2419db46fa\",\"col\":7,\"row\":6},{\"size_x\":6,\"size_y\":2,\"panelIndex\":8,\"type\":\"visualization\",\"id\":\"e2a7fc60-6592-11e7-8b83-5b2419db46fa\",\"col\":1,\"row\":6},{\"size_x\":6,\"size_y\":2,\"panelIndex\":10,\"type\":\"visualization\",\"id\":\"9a4938d0-6592-11e7-b8de-af19b696fa44\",\"col\":1,\"row\":4}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/dashboard/0809c1f0-6719-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/6.x/dashboard/0809c1f0-6719-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 9c796b400..000000000
--- a/modules/netflow/configuration/kibana/6.x/dashboard/0809c1f0-6719-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Top-N", "uiStateJSON": "{\"P-2\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-3\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-4\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-5\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-6\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-7\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-8\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"}}}},\"P-9\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}}", "panelsJSON": "[{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":1,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"size_x\":6,\"size_y\":5,\"panelIndex\":2,\"type\":\"visualization\",\"id\":\"b58e1380-6719-11e7-b5b8-29fbded8e37c\",\"col\":1,\"row\":2},{\"size_x\":6,\"size_y\":5,\"panelIndex\":3,\"type\":\"visualization\",\"id\":\"9f113d80-6719-11e7-b5b8-29fbded8e37c\",\"col\":7,\"row\":2},{\"size_x\":6,\"size_y\":5,\"panelIndex\":4,\"type\":\"visualization\",\"id\":\"02e25f10-671a-11e7-b5b8-29fbded8e37c\",\"col\":1,\"row\":7},{\"size_x\":6,\"size_y\":5,\"panelIndex\":5,\"type\":\"visualization\",\"id\":\"ef7699a0-6719-11e7-b5b8-29fbded8e37c\",\"col\":7,\"row\":7},{\"size_x\":6,\"size_y\":5,\"panelIndex\":6,\"type\":\"visualization\",\"id\":\"326fae40-671a-11e7-b5b8-29fbded8e37c\",\"col\":1,\"row\":12},{\"size_x\":6,\"size_y\":5,\"panelIndex\":7,\"type\":\"visualization\",\"id\":\"51006340-671a-11e7-b5b8-29fbded8e37c\",\"col\":7,\"row\":12},{\"size_x\":6,\"size_y\":5,\"panelIndex\":8,\"type\":\"visualization\",\"id\":\"d4a408a0-671a-11e7-b5b8-29fbded8e37c\",\"col\":1,\"row\":17},{\"size_x\":6,\"size_y\":5,\"panelIndex\":9,\"type\":\"visualization\",\"id\":\"7e9cb7e0-671a-11e7-b5b8-29fbded8e37c\",\"col\":7,\"row\":17}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/dashboard/10584050-6234-11e7-8236-19b4b4941e22.json b/modules/netflow/configuration/kibana/6.x/dashboard/10584050-6234-11e7-8236-19b4b4941e22.json
deleted file mode 100644
index f4f375179..000000000
--- a/modules/netflow/configuration/kibana/6.x/dashboard/10584050-6234-11e7-8236-19b4b4941e22.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Traffic Analysis", "uiStateJSON": "{\"P-15\":{\"vis\":{\"legendOpen\":true}},\"P-26\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-27\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-29\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-30\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-48\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-49\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-50\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-51\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-52\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-53\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}}", "panelsJSON": "[{\"col\":7,\"id\":\"6a597070-6233-11e7-aa4b-5f8c56ec33b8\",\"panelIndex\":1,\"row\":22,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":4,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":7,\"id\":\"6c67b990-628c-11e7-95ed-8966ac93bd5a\",\"panelIndex\":5,\"row\":28,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"52279a00-628c-11e7-95ed-8966ac93bd5a\",\"panelIndex\":6,\"row\":28,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"622844d0-6288-11e7-bcd8-a16ef1d32773\",\"panelIndex\":7,\"row\":10,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"2c9567c0-6289-11e7-bcd8-a16ef1d32773\",\"panelIndex\":9,\"row\":22,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"b61f84d0-6289-11e7-bcd8-a16ef1d32773\",\"panelIndex\":10,\"row\":16,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"6ad67290-6289-11e7-bcd8-a16ef1d32773\",\"panelIndex\":11,\"row\":16,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"91ae4100-6288-11e7-bcd8-a16ef1d32773\",\"panelIndex\":12,\"row\":10,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"735d6c70-628e-11e7-a842-b787fa3508ce\",\"panelIndex\":13,\"row\":4,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"56a23ac0-628e-11e7-a842-b787fa3508ce\",\"panelIndex\":14,\"row\":4,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"7c2cfd10-2fc7-11e7-8936-6f5fd5520124\",\"panelIndex\":15,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"a8b68cb0-2fc8-11e7-8d8b-45ec51795dad\",\"panelIndex\":16,\"row\":8,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"5fd2fe30-2fc7-11e7-8936-6f5fd5520124\",\"panelIndex\":17,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"47d426a0-2fc8-11e7-8b06-97426538fddd\",\"panelIndex\":18,\"row\":8,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"69f864d0-2fd7-11e7-97a8-85d8d5a99269\",\"panelIndex\":19,\"row\":14,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"b88a8790-2fd7-11e7-bd03-932d3e38a4ff\",\"panelIndex\":20,\"row\":14,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"97f430b0-622e-11e7-b0a5-e9bda2f6d168\",\"panelIndex\":21,\"row\":20,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"ac4cbc90-622d-11e7-b0a5-e9bda2f6d168\",\"panelIndex\":22,\"row\":20,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"324b0a00-2fc9-11e7-bd31-a722d271a9cc\",\"panelIndex\":23,\"row\":26,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"9b5d3b80-2fc9-11e7-bd31-a722d271a9cc\",\"panelIndex\":24,\"row\":26,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"65f3b500-6557-11e7-87c3-994b88f84501\",\"panelIndex\":25,\"row\":6,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":11,\"id\":\"55be8550-655e-11e7-9dda-9f993e2ba58b\",\"panelIndex\":26,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"3277ea90-6578-11e7-8471-e5432f50acbd\",\"panelIndex\":27,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"a3541940-6556-11e7-a807-e52f264c6cfd\",\"panelIndex\":28,\"row\":6,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":11,\"id\":\"8500a670-6579-11e7-8471-e5432f50acbd\",\"panelIndex\":29,\"row\":8,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"71272b10-6579-11e7-8471-e5432f50acbd\",\"panelIndex\":30,\"row\":8,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"8d2cb120-6233-11e7-aa4b-5f8c56ec33b8\",\"panelIndex\":31,\"row\":24,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"99382ab0-6555-11e7-8d48-19b0c51bbbbd\",\"panelIndex\":34,\"row\":30,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"f5f79b00-6555-11e7-b27e-8f8b3770f1df\",\"panelIndex\":35,\"row\":30,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"3ee07620-6556-11e7-995a-3584c2c6482c\",\"panelIndex\":38,\"row\":12,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"caf2c4b0-6556-11e7-be5f-c5cca8dd73b6\",\"panelIndex\":42,\"row\":12,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"a13402f0-6557-11e7-a3eb-4b30743c9370\",\"panelIndex\":44,\"row\":24,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"0de63e90-6558-11e7-8547-3d133170b50d\",\"panelIndex\":45,\"row\":18,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"39ecd800-6558-11e7-bea4-0f5fadb995cc\",\"panelIndex\":47,\"row\":18,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"9accd4a0-657a-11e7-8471-e5432f50acbd\",\"panelIndex\":48,\"row\":14,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":11,\"id\":\"b13956f0-657a-11e7-8471-e5432f50acbd\",\"panelIndex\":49,\"row\":14,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"size_x\":2,\"size_y\":2,\"panelIndex\":50,\"type\":\"visualization\",\"id\":\"a2099810-657b-11e7-8471-e5432f50acbd\",\"col\":11,\"row\":20},{\"size_x\":2,\"size_y\":2,\"panelIndex\":51,\"type\":\"visualization\",\"id\":\"c4987cc0-657b-11e7-8471-e5432f50acbd\",\"col\":11,\"row\":26},{\"size_x\":2,\"size_y\":2,\"panelIndex\":52,\"type\":\"visualization\",\"id\":\"b3e2af90-657b-11e7-8471-e5432f50acbd\",\"col\":5,\"row\":26},{\"size_x\":2,\"size_y\":2,\"panelIndex\":53,\"type\":\"visualization\",\"id\":\"82fcfc50-657b-11e7-8471-e5432f50acbd\",\"col\":5,\"row\":20}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/dashboard/310ae6e0-2fdf-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/6.x/dashboard/310ae6e0-2fdf-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 973bb0e48..000000000
--- a/modules/netflow/configuration/kibana/6.x/dashboard/310ae6e0-2fdf-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Conversation Partners", "uiStateJSON": "{\"P-1\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"}}}}}", "panelsJSON": "[{\"col\":1,\"id\":\"a7a47e70-2fde-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":1,\"row\":4,\"size_x\":12,\"size_y\":5,\"type\":\"visualization\"},{\"col\":9,\"id\":\"de9da770-2fcb-11e7-8df8-b363df28ab61\",\"panelIndex\":2,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"4440e130-2fdd-11e7-afd7-595689f3f18c\",\"panelIndex\":3,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"4898db90-2fdb-11e7-84e6-333bd21ad9fd\",\"panelIndex\":4,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":5,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/dashboard/653cf1e0-2fd2-11e7-99ed-49759aed30f5.json b/modules/netflow/configuration/kibana/6.x/dashboard/653cf1e0-2fd2-11e7-99ed-49759aed30f5.json
deleted file mode 100644
index 7421e03d0..000000000
--- a/modules/netflow/configuration/kibana/6.x/dashboard/653cf1e0-2fd2-11e7-99ed-49759aed30f5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Overview", "uiStateJSON": "{}", "panelsJSON": "[{\"col\":1,\"id\":\"de9da770-2fcb-11e7-8df8-b363df28ab61\",\"panelIndex\":12,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"23d6dc80-2fd6-11e7-bc99-41245d9394f2\",\"panelIndex\":13,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":9,\"id\":\"8dcbcce0-2fd6-11e7-a82c-3146dd695923\",\"panelIndex\":14,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"69f864d0-2fd7-11e7-97a8-85d8d5a99269\",\"panelIndex\":15,\"row\":4,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":17,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":9,\"id\":\"b88a8790-2fd7-11e7-bd03-932d3e38a4ff\",\"panelIndex\":21,\"row\":4,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"ac4cbc90-622d-11e7-b0a5-e9bda2f6d168\",\"panelIndex\":22,\"row\":6,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"97f430b0-622e-11e7-b0a5-e9bda2f6d168\",\"panelIndex\":23,\"row\":4,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"f6be96c0-622f-11e7-abbc-93bb293f5057\",\"panelIndex\":24,\"row\":6,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":9,\"id\":\"3fa5f6f0-2fca-11e7-ab32-99f279b941ef\",\"panelIndex\":25,\"row\":6,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"size_x\":4,\"size_y\":2,\"panelIndex\":26,\"type\":\"visualization\",\"id\":\"64b144f0-658e-11e7-bfc3-d74b7bb89482\",\"col\":1,\"row\":8},{\"size_x\":4,\"size_y\":2,\"panelIndex\":27,\"type\":\"visualization\",\"id\":\"a4ade270-658e-11e7-bfc3-d74b7bb89482\",\"col\":5,\"row\":8},{\"size_x\":4,\"size_y\":2,\"panelIndex\":29,\"type\":\"visualization\",\"id\":\"3026fe40-658f-11e7-bfc3-d74b7bb89482\",\"col\":9,\"row\":8}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/dashboard/a932b600-2fd2-11e7-99ed-49759aed30f5.json b/modules/netflow/configuration/kibana/6.x/dashboard/a932b600-2fd2-11e7-99ed-49759aed30f5.json
deleted file mode 100644
index 2afa15599..000000000
--- a/modules/netflow/configuration/kibana/6.x/dashboard/a932b600-2fd2-11e7-99ed-49759aed30f5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Geo Location", "uiStateJSON": "{\"P-16\":{\"mapCenter\":[20.632784250388028,16.69921875],\"mapZoom\":2}}", "panelsJSON": "[{\"col\":5,\"id\":\"99c1a4a0-2f60-11e7-8936-6f5fd5520124\",\"panelIndex\":16,\"row\":2,\"size_x\":8,\"size_y\":6,\"type\":\"visualization\"},{\"size_x\":4,\"size_y\":2,\"panelIndex\":17,\"type\":\"visualization\",\"id\":\"6702de70-2fca-11e7-8fcd-8dc6c60d4592\",\"col\":1,\"row\":2},{\"size_x\":4,\"size_y\":2,\"panelIndex\":18,\"type\":\"visualization\",\"id\":\"793a6f00-2fdd-11e7-afd7-595689f3f18c\",\"col\":1,\"row\":4},{\"size_x\":4,\"size_y\":2,\"panelIndex\":19,\"type\":\"visualization\",\"id\":\"264fb270-2fdb-11e7-84e6-333bd21ad9fd\",\"col\":1,\"row\":6},{\"size_x\":12,\"size_y\":1,\"panelIndex\":20,\"type\":\"visualization\",\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"col\":1,\"row\":1}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/dashboard/ca480720-2fdf-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/6.x/dashboard/ca480720-2fdf-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 5e0a41544..000000000
--- a/modules/netflow/configuration/kibana/6.x/dashboard/ca480720-2fdf-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Flow Records", "uiStateJSON": "{\"P-3\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}}", "panelsJSON": "[{\"col\":4,\"id\":\"6a7e4790-2fe0-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":2,\"row\":2,\"size_x\":9,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"bbac23d0-2fe0-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":3,\"row\":2,\"size_x\":3,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":4,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"size_x\":12,\"size_y\":4,\"panelIndex\":5,\"type\":\"search\",\"id\":\"0d0216f0-2fe0-11e7-9d02-3f49bde5c1d5\",\"col\":1,\"row\":4,\"columns\":[\"netflow.src_addr\",\"netflow.src_port_name\",\"netflow.dst_addr\",\"netflow.dst_port_name\",\"netflow.protocol_name\",\"netflow.bytes\",\"netflow.packets\"],\"sort\":[\"@timestamp\",\"desc\"]}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/dashboard/d7e31d40-6589-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/6.x/dashboard/d7e31d40-6589-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 9557f34a2..000000000
--- a/modules/netflow/configuration/kibana/6.x/dashboard/d7e31d40-6589-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Autonomous Systems", "uiStateJSON": "{}", "panelsJSON": "[{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":1,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":7,\"id\":\"8c6ce180-657e-11e7-bd38-dd04615e7f62\",\"panelIndex\":2,\"row\":4,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"836b2010-657e-11e7-9748-5d4091219eef\",\"panelIndex\":3,\"row\":6,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"399c9fe0-657e-11e7-bd38-dd04615e7f62\",\"panelIndex\":4,\"row\":4,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"4a548ff0-657e-11e7-9748-5d4091219eef\",\"panelIndex\":5,\"row\":6,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"size_x\":4,\"size_y\":2,\"panelIndex\":6,\"type\":\"visualization\",\"id\":\"7aaa68d0-658a-11e7-bfc3-d74b7bb89482\",\"col\":1,\"row\":2},{\"size_x\":4,\"size_y\":2,\"panelIndex\":7,\"type\":\"visualization\",\"id\":\"793a6f00-2fdd-11e7-afd7-595689f3f18c\",\"col\":5,\"row\":2},{\"size_x\":4,\"size_y\":2,\"panelIndex\":8,\"type\":\"visualization\",\"id\":\"264fb270-2fdb-11e7-84e6-333bd21ad9fd\",\"col\":9,\"row\":2}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/dashboard/netflow.json b/modules/netflow/configuration/kibana/6.x/dashboard/netflow.json
deleted file mode 100644
index 565cc92c2..000000000
--- a/modules/netflow/configuration/kibana/6.x/dashboard/netflow.json
+++ /dev/null
@@ -1,11 +0,0 @@
-[
-  "a932b600-2fd2-11e7-99ed-49759aed30f5", 
-  "10584050-6234-11e7-8236-19b4b4941e22",
-  "d7e31d40-6589-11e7-bfc3-d74b7bb89482",
-  "310ae6e0-2fdf-11e7-9d02-3f49bde5c1d5",
-  "653cf1e0-2fd2-11e7-99ed-49759aed30f5",
-  "04157d70-6591-11e7-bfc3-d74b7bb89482",
-  "ca480720-2fdf-11e7-9d02-3f49bde5c1d5",
-  "0809c1f0-6719-11e7-b5b8-29fbded8e37c"
-]
-
diff --git a/modules/netflow/configuration/kibana/6.x/index-pattern/netflow.json b/modules/netflow/configuration/kibana/6.x/index-pattern/netflow.json
deleted file mode 100644
index 714ccae0f..000000000
--- a/modules/netflow/configuration/kibana/6.x/index-pattern/netflow.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "title":"netflow-*",
-  "timeFieldName":"@timestamp",
-  "notExpandable":true,
-  "fields":"[{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"@version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"geoip.as_org\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.asn\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.autonomous_system\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.continent_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_code2\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_code3\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.dma_code\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.latitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.longitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.postal_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.region_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.timezone\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.as_org\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.asn\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.autonomous_system\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.continent_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.country_code2\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.country_code3\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.dma_code\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.latitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.longitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.postal_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.region_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.timezone\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.as_org\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.asn\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.autonomous_system\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.continent_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.country_code2\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.country_code3\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.dma_code\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.latitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.longitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.postal_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.region_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.timezone\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.direction\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_addr\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_as\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_locality\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_mac\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_mask_len\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_port\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_port_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_vlan\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.engine_id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.engine_type\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.first_switched\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.flow_locality\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.flow_records\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.flow_seq_num\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.flowset_id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.input_snmp\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.ip_protocol_version\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.ip_version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.last_switched\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.next_hop\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.output_snmp\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.packets\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.protocol\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.protocol_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.sampling_algorithm\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.sampling_interval\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_addr\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_as\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_locality\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_mac\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_mask_len\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_port\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_port_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.tcp_flag_tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.tcp_flags\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.tcp_flags_label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.tos\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.vlan\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]"
-}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/search/0d0216f0-2fe0-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/6.x/search/0d0216f0-2fe0-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 77c89dbcb..000000000
--- a/modules/netflow/configuration/kibana/6.x/search/0d0216f0-2fe0-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"sort": ["@timestamp", "desc"], "hits": 0, "description": "", "title": "Netflow: Flow Records", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"highlightAll\":true,\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[],\"version\":true}"}, "columns": ["netflow.src_addr", "netflow.src_port_name", "netflow.dst_addr", "netflow.dst_port_name", "netflow.protocol_name", "netflow.bytes", "netflow.packets"]}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/search/netflow.json b/modules/netflow/configuration/kibana/6.x/search/netflow.json
deleted file mode 100644
index 733ef3aa6..000000000
--- a/modules/netflow/configuration/kibana/6.x/search/netflow.json
+++ /dev/null
@@ -1 +0,0 @@
-["0d0216f0-2fe0-11e7-9d02-3f49bde5c1d5"]
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/00248240-6593-11e7-b8de-af19b696fa44.json b/modules/netflow/configuration/kibana/6.x/visualization/00248240-6593-11e7-b8de-af19b696fa44.json
deleted file mode 100644
index 287e7eead..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/00248240-6593-11e7-b8de-af19b696fa44.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Egress Interfaces (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.output_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.output_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Egress Interfaces (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/02e25f10-671a-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/6.x/visualization/02e25f10-671a-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index a29c7298e..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/02e25f10-671a-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Source Ports\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.src_port_name\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Source Ports", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/0de63e90-6558-11e7-8547-3d133170b50d.json b/modules/netflow/configuration/kibana/6.x/visualization/0de63e90-6558-11e7-8547-3d133170b50d.json
deleted file mode 100644
index 10bdcbf9f..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/0de63e90-6558-11e7-8547-3d133170b50d.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Types of Service (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.tos:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tos:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Types of Service (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/1fa2c100-6592-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/6.x/visualization/1fa2c100-6592-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 8e85e5b5c..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/1fa2c100-6592-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Egress Interfaces (flow records)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.output_snmp\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Egress Interface\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Egress Interfaces (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/206d6e90-6593-11e7-8b83-5b2419db46fa.json b/modules/netflow/configuration/kibana/6.x/visualization/206d6e90-6593-11e7-8b83-5b2419db46fa.json
deleted file mode 100644
index 780c8bfdd..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/206d6e90-6593-11e7-8b83-5b2419db46fa.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Egress Interfaces (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.output_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.output_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Egress Interfaces (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/23d6dc80-2fd6-11e7-bc99-41245d9394f2.json b/modules/netflow/configuration/kibana/6.x/visualization/23d6dc80-2fd6-11e7-bc99-41245d9394f2.json
deleted file mode 100644
index adc7f588e..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/23d6dc80-2fd6-11e7-bc99-41245d9394f2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destinations and Ports (bytes)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_addr\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destinations and Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/264fb270-2fdb-11e7-84e6-333bd21ad9fd.json b/modules/netflow/configuration/kibana/6.x/visualization/264fb270-2fdb-11e7-84e6-333bd21ad9fd.json
deleted file mode 100644
index d4c9cd130..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/264fb270-2fdb-11e7-84e6-333bd21ad9fd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination and Source Ports (flow records)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Flow Records\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination Port\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination and Source Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/26e166f0-2fe2-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/6.x/visualization/26e166f0-2fe2-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 824d78d96..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/26e166f0-2fe2-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Dashboard Navigation\",\"type\":\"markdown\",\"params\":{\"markdown\":\"[Overview](#/dashboard/653cf1e0-2fd2-11e7-99ed-49759aed30f5) | [Conversation Partners](#/dashboard/310ae6e0-2fdf-11e7-9d02-3f49bde5c1d5) | [Traffic Analysis](#/dashboard/10584050-6234-11e7-8236-19b4b4941e22) | [Top-N](#/dashboard/0809c1f0-6719-11e7-b5b8-29fbded8e37c) | [Geo Location](#/dashboard/a932b600-2fd2-11e7-99ed-49759aed30f5) | [Autonomous Systems](#/dashboard/d7e31d40-6589-11e7-bfc3-d74b7bb89482) | [Flow Exporters](#/dashboard/04157d70-6591-11e7-bfc3-d74b7bb89482) | [Raw Flow Records](#/dashboard/ca480720-2fdf-11e7-9d02-3f49bde5c1d5)\\n***\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Dashboard Navigation", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/2c9567c0-6289-11e7-bcd8-a16ef1d32773.json b/modules/netflow/configuration/kibana/6.x/visualization/2c9567c0-6289-11e7-bcd8-a16ef1d32773.json
deleted file mode 100644
index a90386061..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/2c9567c0-6289-11e7-bcd8-a16ef1d32773.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.tcp_flags_label:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tcp_flags_label:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/3026fe40-658f-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/6.x/visualization/3026fe40-658f-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 439a66ec7..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/3026fe40-658f-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Version (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Version (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/324b0a00-2fc9-11e7-bd31-a722d271a9cc.json b/modules/netflow/configuration/kibana/6.x/visualization/324b0a00-2fc9-11e7-bd31-a722d271a9cc.json
deleted file mode 100644
index 14aa3dc20..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/324b0a00-2fc9-11e7-bd31-a722d271a9cc.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.country_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Countries (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/326fae40-671a-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/6.x/visualization/326fae40-671a-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index dc7bc7990..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/326fae40-671a-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Protocols\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Protocols", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/3277ea90-6578-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/6.x/visualization/3277ea90-6578-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index 7e635a2eb..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/3277ea90-6578-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.src_addr\",\"customLabel\":\"Sources\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Source Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/399c9fe0-657e-11e7-bd38-dd04615e7f62.json b/modules/netflow/configuration/kibana/6.x/visualization/399c9fe0-657e-11e7-bd38-dd04615e7f62.json
deleted file mode 100644
index 8502a7159..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/399c9fe0-657e-11e7-bd38-dd04615e7f62.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Autonomous Systems (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"geoip_src.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_src.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Autonomous Systems (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/39ecd800-6558-11e7-bea4-0f5fadb995cc.json b/modules/netflow/configuration/kibana/6.x/visualization/39ecd800-6558-11e7-bea4-0f5fadb995cc.json
deleted file mode 100644
index 321546703..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/39ecd800-6558-11e7-bea4-0f5fadb995cc.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLANs (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.vlan:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.vlan:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: VLANs (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/3ee07620-6556-11e7-995a-3584c2c6482c.json b/modules/netflow/configuration/kibana/6.x/visualization/3ee07620-6556-11e7-995a-3584c2c6482c.json
deleted file mode 100644
index 9f31eb410..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/3ee07620-6556-11e7-995a-3584c2c6482c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Ports (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.dst_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/3fa5f6f0-2fca-11e7-ab32-99f279b941ef.json b/modules/netflow/configuration/kibana/6.x/visualization/3fa5f6f0-2fca-11e7-ab32-99f279b941ef.json
deleted file mode 100644
index 52ab78c12..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/3fa5f6f0-2fca-11e7-ab32-99f279b941ef.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries and Cities (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.country_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.city_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Countries and Cities (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/4440e130-2fdd-11e7-afd7-595689f3f18c.json b/modules/netflow/configuration/kibana/6.x/visualization/4440e130-2fdd-11e7-afd7-595689f3f18c.json
deleted file mode 100644
index 28d8290e5..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/4440e130-2fdd-11e7-afd7-595689f3f18c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations and Sources (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations and Sources (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/47d426a0-2fc8-11e7-8b06-97426538fddd.json b/modules/netflow/configuration/kibana/6.x/visualization/47d426a0-2fc8-11e7-8b06-97426538fddd.json
deleted file mode 100644
index 1ce79aace..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/47d426a0-2fc8-11e7-8b06-97426538fddd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination Ports (bytes)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/4898db90-2fdb-11e7-84e6-333bd21ad9fd.json b/modules/netflow/configuration/kibana/6.x/visualization/4898db90-2fdb-11e7-84e6-333bd21ad9fd.json
deleted file mode 100644
index d68f4c33d..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/4898db90-2fdb-11e7-84e6-333bd21ad9fd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination and Source Ports (bytes)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination Port\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination and Source Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/4a548ff0-657e-11e7-9748-5d4091219eef.json b/modules/netflow/configuration/kibana/6.x/visualization/4a548ff0-657e-11e7-9748-5d4091219eef.json
deleted file mode 100644
index d5deb3d27..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/4a548ff0-657e-11e7-9748-5d4091219eef.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Autonomous Systems (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"geoip_src.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_src.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Autonomous Systems (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/51006340-671a-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/6.x/visualization/51006340-671a-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 5cb7ec44c..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/51006340-671a-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Autonomous Systems\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"geoip.autonomous_system\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Autonomous System\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Autonomous Systems", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/52279a00-628c-11e7-95ed-8966ac93bd5a.json b/modules/netflow/configuration/kibana/6.x/visualization/52279a00-628c-11e7-95ed-8966ac93bd5a.json
deleted file mode 100644
index d9e1be23c..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/52279a00-628c-11e7-95ed-8966ac93bd5a.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"geoip.country_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.country_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Countries (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/55be8550-655e-11e7-9dda-9f993e2ba58b.json b/modules/netflow/configuration/kibana/6.x/visualization/55be8550-655e-11e7-9dda-9f993e2ba58b.json
deleted file mode 100644
index 65bdb5add..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/55be8550-655e-11e7-9dda-9f993e2ba58b.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Count\",\"type\":\"metric\",\"params\":{\"handleNoResults\":true,\"fontSize\":\"32\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.dst_addr\",\"customLabel\":\"Destinations\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Count", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/56a23ac0-628e-11e7-a842-b787fa3508ce.json b/modules/netflow/configuration/kibana/6.x/visualization/56a23ac0-628e-11e7-a842-b787fa3508ce.json
deleted file mode 100644
index ac903fd95..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/56a23ac0-628e-11e7-a842-b787fa3508ce.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.dst_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/5fd2fe30-2fc7-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/6.x/visualization/5fd2fe30-2fc7-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index 41433dc1d..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/5fd2fe30-2fc7-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/622844d0-6288-11e7-bcd8-a16ef1d32773.json b/modules/netflow/configuration/kibana/6.x/visualization/622844d0-6288-11e7-bcd8-a16ef1d32773.json
deleted file mode 100644
index d012edf9e..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/622844d0-6288-11e7-bcd8-a16ef1d32773.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Ports (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.dst_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/64b144f0-658e-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/6.x/visualization/64b144f0-658e-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index f5c588cf6..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/64b144f0-658e-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Flow Exporters (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"host\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Flow Exporter\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Flow Exporters (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/65f3b500-6557-11e7-87c3-994b88f84501.json b/modules/netflow/configuration/kibana/6.x/visualization/65f3b500-6557-11e7-87c3-994b88f84501.json
deleted file mode 100644
index f84a2a03f..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/65f3b500-6557-11e7-87c3-994b88f84501.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Sources (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.src_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Sources (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/6702de70-2fca-11e7-8fcd-8dc6c60d4592.json b/modules/netflow/configuration/kibana/6.x/visualization/6702de70-2fca-11e7-8fcd-8dc6c60d4592.json
deleted file mode 100644
index cf3908f9c..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/6702de70-2fca-11e7-8fcd-8dc6c60d4592.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries and Cities (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.country_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.city_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Countries and Cities (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/69f864d0-2fd7-11e7-97a8-85d8d5a99269.json b/modules/netflow/configuration/kibana/6.x/visualization/69f864d0-2fd7-11e7-97a8-85d8d5a99269.json
deleted file mode 100644
index 6eea98f5d..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/69f864d0-2fd7-11e7-97a8-85d8d5a99269.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Types of Service (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.tos\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Type of Service\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Types of Service (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/6a597070-6233-11e7-aa4b-5f8c56ec33b8.json b/modules/netflow/configuration/kibana/6.x/visualization/6a597070-6233-11e7-aa4b-5f8c56ec33b8.json
deleted file mode 100644
index 8831c4f8f..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/6a597070-6233-11e7-aa4b-5f8c56ec33b8.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous Systems (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"geoip.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous Systems (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/6a7e4790-2fe0-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/6.x/visualization/6a7e4790-2fe0-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index b66c1f49f..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/6a7e4790-2fe0-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Flow Records\",\"type\":\"histogram\",\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"category\"}],\"defaultYExtents\":false,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"legendPosition\":\"right\",\"mode\":\"stacked\",\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Flow Records\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Count\"},\"type\":\"value\"}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.last_switched\",\"interval\":\"s\",\"customInterval\":\"2h\",\"min_doc_count\":1,\"extended_bounds\":{},\"customLabel\":\"Timeline\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"netflow.version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Flow Records", "uiStateJSON": "{\"vis\":{\"legendOpen\":true}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/6ad67290-6289-11e7-bcd8-a16ef1d32773.json b/modules/netflow/configuration/kibana/6.x/visualization/6ad67290-6289-11e7-bcd8-a16ef1d32773.json
deleted file mode 100644
index b81b1fbd2..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/6ad67290-6289-11e7-bcd8-a16ef1d32773.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Types of Service (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.tos:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tos:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Types of Service (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/6c67b990-628c-11e7-95ed-8966ac93bd5a.json b/modules/netflow/configuration/kibana/6.x/visualization/6c67b990-628c-11e7-95ed-8966ac93bd5a.json
deleted file mode 100644
index fadc7dfca..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/6c67b990-628c-11e7-95ed-8966ac93bd5a.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Cities (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"geoip.city_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.city_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Cities (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/71272b10-6579-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/6.x/visualization/71272b10-6579-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index 92cecc9c6..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/71272b10-6579-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Source Port Count\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addLegend\": false,\n    \"addTooltip\": true,\n    \"fontSize\": \"32\",\n    \"gauge\": {\n      \"autoExtend\": false,\n      \"backStyle\": \"Full\",\n      \"colorSchema\": \"Green to Red\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 100\n        }\n      ],\n      \"gaugeColorMode\": \"None\",\n      \"gaugeStyle\": \"Full\",\n      \"gaugeType\": \"Metric\",\n      \"invertColors\": false,\n      \"labels\": {\n        \"color\": \"black\",\n        \"show\": true\n      },\n      \"orientation\": \"vertical\",\n      \"percentageMode\": false,\n      \"scale\": {\n        \"color\": \"#333\",\n        \"labels\": false,\n        \"show\": false,\n        \"width\": 2\n      },\n      \"style\": {\n        \"bgColor\": false,\n        \"bgFill\": \"#000\",\n        \"fontSize\": \"36\",\n        \"labelColor\": false,\n        \"subText\": \"\"\n      },\n      \"type\": \"simple\",\n      \"useRange\": false,\n      \"verticalSplit\": false\n    },\n    \"handleNoResults\": true,\n    \"type\": \"gauge\"\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"customLabel\": \"Source Ports\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Source Port Count", "uiStateJSON": "{\n  \"vis\": {\n    \"defaultColors\": {\n      \"0 - 100\": \"rgb(0,104,55)\"\n    }\n  }\n}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/735d6c70-628e-11e7-a842-b787fa3508ce.json b/modules/netflow/configuration/kibana/6.x/visualization/735d6c70-628e-11e7-a842-b787fa3508ce.json
deleted file mode 100644
index a36c13993..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/735d6c70-628e-11e7-a842-b787fa3508ce.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Sources (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.src_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Sources (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/793a6f00-2fdd-11e7-afd7-595689f3f18c.json b/modules/netflow/configuration/kibana/6.x/visualization/793a6f00-2fdd-11e7-afd7-595689f3f18c.json
deleted file mode 100644
index 50fb5a1ed..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/793a6f00-2fdd-11e7-afd7-595689f3f18c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations and Sources (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations and Sources (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/7aaa68d0-658a-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/6.x/visualization/7aaa68d0-658a-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index f59fe89db..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/7aaa68d0-658a-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination and Source ASs (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip_dst.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination AS\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip_src.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source AS\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destination and Source ASs (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/7c2cfd10-2fc7-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/6.x/visualization/7c2cfd10-2fc7-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index 0b476ff94..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/7c2cfd10-2fc7-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Sources (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Sources (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/7e9cb7e0-671a-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/6.x/visualization/7e9cb7e0-671a-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 6130531e3..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/7e9cb7e0-671a-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Flow Exporters\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"host\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Flow Exporter\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Flow Exporters", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/82fcfc50-657b-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/6.x/visualization/82fcfc50-657b-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index f818ef5ec..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/82fcfc50-657b-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.tcp_flags_label\",\"customLabel\":\"TCP Flag States\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/836b2010-657e-11e7-9748-5d4091219eef.json b/modules/netflow/configuration/kibana/6.x/visualization/836b2010-657e-11e7-9748-5d4091219eef.json
deleted file mode 100644
index 23c6fdcff..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/836b2010-657e-11e7-9748-5d4091219eef.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Autonomous Systems (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"geoip_dst.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_dst.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Autonomous Systems (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/8500a670-6579-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/6.x/visualization/8500a670-6579-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index c178c829e..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/8500a670-6579-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination Port Count\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addLegend\": false,\n    \"addTooltip\": true,\n    \"fontSize\": \"32\",\n    \"gauge\": {\n      \"autoExtend\": false,\n      \"backStyle\": \"Full\",\n      \"colorSchema\": \"Green to Red\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 100\n        }\n      ],\n      \"gaugeColorMode\": \"None\",\n      \"gaugeStyle\": \"Full\",\n      \"gaugeType\": \"Metric\",\n      \"invertColors\": false,\n      \"labels\": {\n        \"color\": \"black\",\n        \"show\": true\n      },\n      \"orientation\": \"vertical\",\n      \"percentageMode\": false,\n      \"scale\": {\n        \"color\": \"#333\",\n        \"labels\": false,\n        \"show\": false,\n        \"width\": 2\n      },\n      \"style\": {\n        \"bgColor\": false,\n        \"bgFill\": \"#000\",\n        \"fontSize\": \"36\",\n        \"labelColor\": false,\n        \"subText\": \"\"\n      },\n      \"type\": \"simple\",\n      \"useRange\": false,\n      \"verticalSplit\": false\n    },\n    \"handleNoResults\": true,\n    \"type\": \"gauge\"\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"customLabel\": \"Destination Ports\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination Port Count", "uiStateJSON": "{\n  \"vis\": {\n    \"defaultColors\": {\n      \"0 - 100\": \"rgb(0,104,55)\"\n    }\n  }\n}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/8c6ce180-657e-11e7-bd38-dd04615e7f62.json b/modules/netflow/configuration/kibana/6.x/visualization/8c6ce180-657e-11e7-bd38-dd04615e7f62.json
deleted file mode 100644
index e3fc1fd84..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/8c6ce180-657e-11e7-bd38-dd04615e7f62.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Autonomous Systems (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"geoip_dst.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_dst.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Autonomous Systems (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/8d2cb120-6233-11e7-aa4b-5f8c56ec33b8.json b/modules/netflow/configuration/kibana/6.x/visualization/8d2cb120-6233-11e7-aa4b-5f8c56ec33b8.json
deleted file mode 100644
index 4b0204c67..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/8d2cb120-6233-11e7-aa4b-5f8c56ec33b8.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous Systems (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"geoip.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous Systems (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/8dcbcce0-2fd6-11e7-a82c-3146dd695923.json b/modules/netflow/configuration/kibana/6.x/visualization/8dcbcce0-2fd6-11e7-a82c-3146dd695923.json
deleted file mode 100644
index d4303ca39..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/8dcbcce0-2fd6-11e7-a82c-3146dd695923.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Sources and Ports (bytes)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_addr\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Sources and Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/91ae4100-6288-11e7-bcd8-a16ef1d32773.json b/modules/netflow/configuration/kibana/6.x/visualization/91ae4100-6288-11e7-bcd8-a16ef1d32773.json
deleted file mode 100644
index 39e5c1963..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/91ae4100-6288-11e7-bcd8-a16ef1d32773.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Ports (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.src_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/97f430b0-622e-11e7-b0a5-e9bda2f6d168.json b/modules/netflow/configuration/kibana/6.x/visualization/97f430b0-622e-11e7-b0a5-e9bda2f6d168.json
deleted file mode 100644
index 8e684f027..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/97f430b0-622e-11e7-b0a5-e9bda2f6d168.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.tcp_flags_label\",\"size\":255,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"TCP Flags\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/99382ab0-6555-11e7-8d48-19b0c51bbbbd.json b/modules/netflow/configuration/kibana/6.x/visualization/99382ab0-6555-11e7-8d48-19b0c51bbbbd.json
deleted file mode 100644
index 42b758d7e..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/99382ab0-6555-11e7-8d48-19b0c51bbbbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Cities (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"geoip.city_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.city_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Cities (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/99c1a4a0-2f60-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/6.x/visualization/99c1a4a0-2f60-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index bc876cd22..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/99c1a4a0-2f60-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Geo Location Heatmap\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Heatmap\",\"isDesaturated\":true,\"addTooltip\":true,\"heatMaxZoom\":16,\"heatMinOpacity\":\"0.32\",\"heatRadius\":\"24\",\"heatBlur\":\"16\",\"heatNormalizeData\":true,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[15,5],\"wms\":{\"enabled\":false,\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\",\"options\":{\"version\":\"1.3.0\",\"layers\":\"0\",\"format\":\"image/png\",\"transparent\":true,\"attribution\":\"Maps provided by USGS\",\"styles\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.location\",\"autoPrecision\":true,\"precision\":2,\"customLabel\":\"Location\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Geo Location Heatmap", "uiStateJSON": "{\"mapCenter\":[8.407168163601076,9.4921875]}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/9a4938d0-6592-11e7-b8de-af19b696fa44.json b/modules/netflow/configuration/kibana/6.x/visualization/9a4938d0-6592-11e7-b8de-af19b696fa44.json
deleted file mode 100644
index 5bf13524a..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/9a4938d0-6592-11e7-b8de-af19b696fa44.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Ingress Interfaces (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.input_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.input_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Ingress Interfaces (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/9accd4a0-657a-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/6.x/visualization/9accd4a0-657a-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index 81e822cc4..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/9accd4a0-657a-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: ToS Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.tos\",\"customLabel\":\"Types of Service\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: ToS Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/9b5d3b80-2fc9-11e7-bd31-a722d271a9cc.json b/modules/netflow/configuration/kibana/6.x/visualization/9b5d3b80-2fc9-11e7-bd31-a722d271a9cc.json
deleted file mode 100644
index b090e4edc..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/9b5d3b80-2fc9-11e7-bd31-a722d271a9cc.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Cities (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.city_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Cities (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/9f113d80-6719-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/6.x/visualization/9f113d80-6719-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 335b17d0b..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/9f113d80-6719-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Destinations\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Destination\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Destinations", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/a13402f0-6557-11e7-a3eb-4b30743c9370.json b/modules/netflow/configuration/kibana/6.x/visualization/a13402f0-6557-11e7-a3eb-4b30743c9370.json
deleted file mode 100644
index 19fe02da6..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/a13402f0-6557-11e7-a3eb-4b30743c9370.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.tcp_flags_label:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tcp_flags_label:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/a2099810-657b-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/6.x/visualization/a2099810-657b-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index 2a0f7aa07..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/a2099810-657b-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous System Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"geoip.autonomous_system\",\"customLabel\":\"Autonomous Systems\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous System Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/a3541940-6556-11e7-a807-e52f264c6cfd.json b/modules/netflow/configuration/kibana/6.x/visualization/a3541940-6556-11e7-a807-e52f264c6cfd.json
deleted file mode 100644
index 8b15e7be6..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/a3541940-6556-11e7-a807-e52f264c6cfd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.dst_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/a4ade270-658e-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/6.x/visualization/a4ade270-658e-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 9f1db8814..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/a4ade270-658e-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Direction (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.direction\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Direction\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Direction (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/a7a47e70-2fde-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/6.x/visualization/a7a47e70-2fde-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 3ed157264..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/a7a47e70-2fde-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Conversation Partners\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Conversation Partners", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/a8b68cb0-2fc8-11e7-8d8b-45ec51795dad.json b/modules/netflow/configuration/kibana/6.x/visualization/a8b68cb0-2fc8-11e7-8d8b-45ec51795dad.json
deleted file mode 100644
index 31e9491f3..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/a8b68cb0-2fc8-11e7-8d8b-45ec51795dad.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Source Ports (bytes)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Source Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/ac4cbc90-622d-11e7-b0a5-e9bda2f6d168.json b/modules/netflow/configuration/kibana/6.x/visualization/ac4cbc90-622d-11e7-b0a5-e9bda2f6d168.json
deleted file mode 100644
index 7a5f6bd30..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/ac4cbc90-622d-11e7-b0a5-e9bda2f6d168.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous Systems (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Autonomous System\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous Systems (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/b13956f0-657a-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/6.x/visualization/b13956f0-657a-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index d0302eeda..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/b13956f0-657a-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLAN Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.vlan\",\"customLabel\":\"VLANs\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: VLAN Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/b3e2af90-657b-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/6.x/visualization/b3e2af90-657b-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index e2ed3b6e0..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/b3e2af90-657b-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Country Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"geoip.country_name\",\"customLabel\":\"Countries\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Country Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/b58e1380-6719-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/6.x/visualization/b58e1380-6719-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 79a84236c..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/b58e1380-6719-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Sources\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Sources", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/b61f84d0-6289-11e7-bcd8-a16ef1d32773.json b/modules/netflow/configuration/kibana/6.x/visualization/b61f84d0-6289-11e7-bcd8-a16ef1d32773.json
deleted file mode 100644
index 39cb5931b..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/b61f84d0-6289-11e7-bcd8-a16ef1d32773.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLANs (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.vlan:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.vlan:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: VLANs (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/b88a8790-2fd7-11e7-bd03-932d3e38a4ff.json b/modules/netflow/configuration/kibana/6.x/visualization/b88a8790-2fd7-11e7-bd03-932d3e38a4ff.json
deleted file mode 100644
index d69c6798d..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/b88a8790-2fd7-11e7-bd03-932d3e38a4ff.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLANs (bytes)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.vlan\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"VLAN\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: VLANs (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/bbac23d0-2fe0-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/6.x/visualization/bbac23d0-2fe0-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 6e50cf6d1..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/bbac23d0-2fe0-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Flow Records\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Flow Records", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/c4987cc0-657b-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/6.x/visualization/c4987cc0-657b-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index 721d37d97..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/c4987cc0-657b-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: City Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"geoip.city_name\",\"customLabel\":\"Cities\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: City Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/caea3760-6591-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/6.x/visualization/caea3760-6591-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index c614b431e..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/caea3760-6591-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Ingress Interfaces (flow records)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.input_snmp\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Ingress Interface\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Ingress Interfaces (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/caf2c4b0-6556-11e7-be5f-c5cca8dd73b6.json b/modules/netflow/configuration/kibana/6.x/visualization/caf2c4b0-6556-11e7-be5f-c5cca8dd73b6.json
deleted file mode 100644
index c41547f1f..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/caf2c4b0-6556-11e7-be5f-c5cca8dd73b6.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Ports (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.src_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/d4a408a0-671a-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/6.x/visualization/d4a408a0-671a-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 121ee308b..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/d4a408a0-671a-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Cities\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showMeticsAtAllLevels\":false,\"showPartialRows\":true,\"showTotal\":true,\"sort\":{\"columnIndex\":null,\"direction\":null},\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"geoip.country_name\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Country\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"geoip.city_name\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Cities", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/de9da770-2fcb-11e7-8df8-b363df28ab61.json b/modules/netflow/configuration/kibana/6.x/visualization/de9da770-2fcb-11e7-8df8-b363df28ab61.json
deleted file mode 100644
index e576bf57d..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/de9da770-2fcb-11e7-8df8-b363df28ab61.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: IP Version and Protocols (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.ip_version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"IP Version\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: IP Version and Protocols (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/e2a7fc60-6592-11e7-8b83-5b2419db46fa.json b/modules/netflow/configuration/kibana/6.x/visualization/e2a7fc60-6592-11e7-8b83-5b2419db46fa.json
deleted file mode 100644
index 21445a0ce..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/e2a7fc60-6592-11e7-8b83-5b2419db46fa.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Ingress Interfaces (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.input_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.input_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Ingress Interfaces (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/ef7699a0-6719-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/6.x/visualization/ef7699a0-6719-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index d2e84a449..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/ef7699a0-6719-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Destination Ports\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.dst_port_name\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Destination\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Destination Ports", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/f5f79b00-6555-11e7-b27e-8f8b3770f1df.json b/modules/netflow/configuration/kibana/6.x/visualization/f5f79b00-6555-11e7-b27e-8f8b3770f1df.json
deleted file mode 100644
index e0f66eec5..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/f5f79b00-6555-11e7-b27e-8f8b3770f1df.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"geoip.country_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.country_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Countries (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/f6be96c0-622f-11e7-abbc-93bb293f5057.json b/modules/netflow/configuration/kibana/6.x/visualization/f6be96c0-622f-11e7-abbc-93bb293f5057.json
deleted file mode 100644
index 8dcf4e344..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/f6be96c0-622f-11e7-abbc-93bb293f5057.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Locality (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.flow_locality\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Locality\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Locality (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/f8731d50-2fd6-11e7-97a8-85d8d5a99269.json b/modules/netflow/configuration/kibana/6.x/visualization/f8731d50-2fd6-11e7-97a8-85d8d5a99269.json
deleted file mode 100644
index 05d2e79dc..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/f8731d50-2fd6-11e7-97a8-85d8d5a99269.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Flow Exporter\",\"field\":\"host\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":50},\"schema\":\"segment\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"title\":\"Netflow: Flow Exporters (flow records)\",\"type\":\"pie\"}", "description": "", "title": "Netflow: Flow Exporters (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/6.x/visualization/netflow.json b/modules/netflow/configuration/kibana/6.x/visualization/netflow.json
deleted file mode 100644
index 2f65b14d6..000000000
--- a/modules/netflow/configuration/kibana/6.x/visualization/netflow.json
+++ /dev/null
@@ -1 +0,0 @@
-["99c1a4a0-2f60-11e7-8936-6f5fd5520124", "6702de70-2fca-11e7-8fcd-8dc6c60d4592", "793a6f00-2fdd-11e7-afd7-595689f3f18c", "264fb270-2fdb-11e7-84e6-333bd21ad9fd", "26e166f0-2fe2-11e7-9d02-3f49bde5c1d5", "6a597070-6233-11e7-aa4b-5f8c56ec33b8", "6c67b990-628c-11e7-95ed-8966ac93bd5a", "52279a00-628c-11e7-95ed-8966ac93bd5a", "622844d0-6288-11e7-bcd8-a16ef1d32773", "2c9567c0-6289-11e7-bcd8-a16ef1d32773", "b61f84d0-6289-11e7-bcd8-a16ef1d32773", "6ad67290-6289-11e7-bcd8-a16ef1d32773", "91ae4100-6288-11e7-bcd8-a16ef1d32773", "735d6c70-628e-11e7-a842-b787fa3508ce", "56a23ac0-628e-11e7-a842-b787fa3508ce", "7c2cfd10-2fc7-11e7-8936-6f5fd5520124", "a8b68cb0-2fc8-11e7-8d8b-45ec51795dad", "5fd2fe30-2fc7-11e7-8936-6f5fd5520124", "47d426a0-2fc8-11e7-8b06-97426538fddd", "69f864d0-2fd7-11e7-97a8-85d8d5a99269", "b88a8790-2fd7-11e7-bd03-932d3e38a4ff", "97f430b0-622e-11e7-b0a5-e9bda2f6d168", "ac4cbc90-622d-11e7-b0a5-e9bda2f6d168", "324b0a00-2fc9-11e7-bd31-a722d271a9cc", "9b5d3b80-2fc9-11e7-bd31-a722d271a9cc", "65f3b500-6557-11e7-87c3-994b88f84501", "55be8550-655e-11e7-9dda-9f993e2ba58b", "3277ea90-6578-11e7-8471-e5432f50acbd", "a3541940-6556-11e7-a807-e52f264c6cfd", "8500a670-6579-11e7-8471-e5432f50acbd", "71272b10-6579-11e7-8471-e5432f50acbd", "8d2cb120-6233-11e7-aa4b-5f8c56ec33b8", "99382ab0-6555-11e7-8d48-19b0c51bbbbd", "f5f79b00-6555-11e7-b27e-8f8b3770f1df", "3ee07620-6556-11e7-995a-3584c2c6482c", "caf2c4b0-6556-11e7-be5f-c5cca8dd73b6", "a13402f0-6557-11e7-a3eb-4b30743c9370", "0de63e90-6558-11e7-8547-3d133170b50d", "39ecd800-6558-11e7-bea4-0f5fadb995cc", "9accd4a0-657a-11e7-8471-e5432f50acbd", "b13956f0-657a-11e7-8471-e5432f50acbd", "a2099810-657b-11e7-8471-e5432f50acbd", "c4987cc0-657b-11e7-8471-e5432f50acbd", "b3e2af90-657b-11e7-8471-e5432f50acbd", "82fcfc50-657b-11e7-8471-e5432f50acbd", "8c6ce180-657e-11e7-bd38-dd04615e7f62", "836b2010-657e-11e7-9748-5d4091219eef", "399c9fe0-657e-11e7-bd38-dd04615e7f62", "4a548ff0-657e-11e7-9748-5d4091219eef", "7aaa68d0-658a-11e7-bfc3-d74b7bb89482", "a7a47e70-2fde-11e7-9d02-3f49bde5c1d5", "de9da770-2fcb-11e7-8df8-b363df28ab61", "4440e130-2fdd-11e7-afd7-595689f3f18c", "4898db90-2fdb-11e7-84e6-333bd21ad9fd", "23d6dc80-2fd6-11e7-bc99-41245d9394f2", "8dcbcce0-2fd6-11e7-a82c-3146dd695923", "f6be96c0-622f-11e7-abbc-93bb293f5057", "3fa5f6f0-2fca-11e7-ab32-99f279b941ef", "64b144f0-658e-11e7-bfc3-d74b7bb89482", "a4ade270-658e-11e7-bfc3-d74b7bb89482", "3026fe40-658f-11e7-bfc3-d74b7bb89482", "f8731d50-2fd6-11e7-97a8-85d8d5a99269", "caea3760-6591-11e7-bfc3-d74b7bb89482", "1fa2c100-6592-11e7-bfc3-d74b7bb89482", "00248240-6593-11e7-b8de-af19b696fa44", "206d6e90-6593-11e7-8b83-5b2419db46fa", "e2a7fc60-6592-11e7-8b83-5b2419db46fa", "9a4938d0-6592-11e7-b8de-af19b696fa44", "6a7e4790-2fe0-11e7-9d02-3f49bde5c1d5", "bbac23d0-2fe0-11e7-9d02-3f49bde5c1d5", "b58e1380-6719-11e7-b5b8-29fbded8e37c", "9f113d80-6719-11e7-b5b8-29fbded8e37c", "02e25f10-671a-11e7-b5b8-29fbded8e37c", "ef7699a0-6719-11e7-b5b8-29fbded8e37c", "326fae40-671a-11e7-b5b8-29fbded8e37c", "51006340-671a-11e7-b5b8-29fbded8e37c", "d4a408a0-671a-11e7-b5b8-29fbded8e37c", "7e9cb7e0-671a-11e7-b5b8-29fbded8e37c"]
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/dashboard/04157d70-6591-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/7.x/dashboard/04157d70-6591-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 713735210..000000000
--- a/modules/netflow/configuration/kibana/7.x/dashboard/04157d70-6591-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Flow Exporters", "uiStateJSON": "{}", "panelsJSON": "[{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":1,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":1,\"id\":\"f8731d50-2fd6-11e7-97a8-85d8d5a99269\",\"panelIndex\":2,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"size_x\":4,\"size_y\":2,\"panelIndex\":3,\"type\":\"visualization\",\"id\":\"caea3760-6591-11e7-bfc3-d74b7bb89482\",\"col\":5,\"row\":2},{\"size_x\":4,\"size_y\":2,\"panelIndex\":4,\"type\":\"visualization\",\"id\":\"1fa2c100-6592-11e7-bfc3-d74b7bb89482\",\"col\":9,\"row\":2},{\"size_x\":6,\"size_y\":2,\"panelIndex\":5,\"type\":\"visualization\",\"id\":\"00248240-6593-11e7-b8de-af19b696fa44\",\"col\":7,\"row\":4},{\"size_x\":6,\"size_y\":2,\"panelIndex\":6,\"type\":\"visualization\",\"id\":\"206d6e90-6593-11e7-8b83-5b2419db46fa\",\"col\":7,\"row\":6},{\"size_x\":6,\"size_y\":2,\"panelIndex\":8,\"type\":\"visualization\",\"id\":\"e2a7fc60-6592-11e7-8b83-5b2419db46fa\",\"col\":1,\"row\":6},{\"size_x\":6,\"size_y\":2,\"panelIndex\":10,\"type\":\"visualization\",\"id\":\"9a4938d0-6592-11e7-b8de-af19b696fa44\",\"col\":1,\"row\":4}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/dashboard/0809c1f0-6719-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/7.x/dashboard/0809c1f0-6719-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 9c796b400..000000000
--- a/modules/netflow/configuration/kibana/7.x/dashboard/0809c1f0-6719-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Top-N", "uiStateJSON": "{\"P-2\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-3\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-4\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-5\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-6\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-7\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-8\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"}}}},\"P-9\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}}", "panelsJSON": "[{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":1,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"size_x\":6,\"size_y\":5,\"panelIndex\":2,\"type\":\"visualization\",\"id\":\"b58e1380-6719-11e7-b5b8-29fbded8e37c\",\"col\":1,\"row\":2},{\"size_x\":6,\"size_y\":5,\"panelIndex\":3,\"type\":\"visualization\",\"id\":\"9f113d80-6719-11e7-b5b8-29fbded8e37c\",\"col\":7,\"row\":2},{\"size_x\":6,\"size_y\":5,\"panelIndex\":4,\"type\":\"visualization\",\"id\":\"02e25f10-671a-11e7-b5b8-29fbded8e37c\",\"col\":1,\"row\":7},{\"size_x\":6,\"size_y\":5,\"panelIndex\":5,\"type\":\"visualization\",\"id\":\"ef7699a0-6719-11e7-b5b8-29fbded8e37c\",\"col\":7,\"row\":7},{\"size_x\":6,\"size_y\":5,\"panelIndex\":6,\"type\":\"visualization\",\"id\":\"326fae40-671a-11e7-b5b8-29fbded8e37c\",\"col\":1,\"row\":12},{\"size_x\":6,\"size_y\":5,\"panelIndex\":7,\"type\":\"visualization\",\"id\":\"51006340-671a-11e7-b5b8-29fbded8e37c\",\"col\":7,\"row\":12},{\"size_x\":6,\"size_y\":5,\"panelIndex\":8,\"type\":\"visualization\",\"id\":\"d4a408a0-671a-11e7-b5b8-29fbded8e37c\",\"col\":1,\"row\":17},{\"size_x\":6,\"size_y\":5,\"panelIndex\":9,\"type\":\"visualization\",\"id\":\"7e9cb7e0-671a-11e7-b5b8-29fbded8e37c\",\"col\":7,\"row\":17}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/dashboard/10584050-6234-11e7-8236-19b4b4941e22.json b/modules/netflow/configuration/kibana/7.x/dashboard/10584050-6234-11e7-8236-19b4b4941e22.json
deleted file mode 100644
index f4f375179..000000000
--- a/modules/netflow/configuration/kibana/7.x/dashboard/10584050-6234-11e7-8236-19b4b4941e22.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Traffic Analysis", "uiStateJSON": "{\"P-15\":{\"vis\":{\"legendOpen\":true}},\"P-26\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-27\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-29\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-30\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-48\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-49\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-50\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-51\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-52\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-53\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}}", "panelsJSON": "[{\"col\":7,\"id\":\"6a597070-6233-11e7-aa4b-5f8c56ec33b8\",\"panelIndex\":1,\"row\":22,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":4,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":7,\"id\":\"6c67b990-628c-11e7-95ed-8966ac93bd5a\",\"panelIndex\":5,\"row\":28,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"52279a00-628c-11e7-95ed-8966ac93bd5a\",\"panelIndex\":6,\"row\":28,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"622844d0-6288-11e7-bcd8-a16ef1d32773\",\"panelIndex\":7,\"row\":10,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"2c9567c0-6289-11e7-bcd8-a16ef1d32773\",\"panelIndex\":9,\"row\":22,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"b61f84d0-6289-11e7-bcd8-a16ef1d32773\",\"panelIndex\":10,\"row\":16,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"6ad67290-6289-11e7-bcd8-a16ef1d32773\",\"panelIndex\":11,\"row\":16,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"91ae4100-6288-11e7-bcd8-a16ef1d32773\",\"panelIndex\":12,\"row\":10,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"735d6c70-628e-11e7-a842-b787fa3508ce\",\"panelIndex\":13,\"row\":4,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"56a23ac0-628e-11e7-a842-b787fa3508ce\",\"panelIndex\":14,\"row\":4,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"7c2cfd10-2fc7-11e7-8936-6f5fd5520124\",\"panelIndex\":15,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"a8b68cb0-2fc8-11e7-8d8b-45ec51795dad\",\"panelIndex\":16,\"row\":8,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"5fd2fe30-2fc7-11e7-8936-6f5fd5520124\",\"panelIndex\":17,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"47d426a0-2fc8-11e7-8b06-97426538fddd\",\"panelIndex\":18,\"row\":8,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"69f864d0-2fd7-11e7-97a8-85d8d5a99269\",\"panelIndex\":19,\"row\":14,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"b88a8790-2fd7-11e7-bd03-932d3e38a4ff\",\"panelIndex\":20,\"row\":14,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"97f430b0-622e-11e7-b0a5-e9bda2f6d168\",\"panelIndex\":21,\"row\":20,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"ac4cbc90-622d-11e7-b0a5-e9bda2f6d168\",\"panelIndex\":22,\"row\":20,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"324b0a00-2fc9-11e7-bd31-a722d271a9cc\",\"panelIndex\":23,\"row\":26,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"9b5d3b80-2fc9-11e7-bd31-a722d271a9cc\",\"panelIndex\":24,\"row\":26,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"65f3b500-6557-11e7-87c3-994b88f84501\",\"panelIndex\":25,\"row\":6,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":11,\"id\":\"55be8550-655e-11e7-9dda-9f993e2ba58b\",\"panelIndex\":26,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"3277ea90-6578-11e7-8471-e5432f50acbd\",\"panelIndex\":27,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"a3541940-6556-11e7-a807-e52f264c6cfd\",\"panelIndex\":28,\"row\":6,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":11,\"id\":\"8500a670-6579-11e7-8471-e5432f50acbd\",\"panelIndex\":29,\"row\":8,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"71272b10-6579-11e7-8471-e5432f50acbd\",\"panelIndex\":30,\"row\":8,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"8d2cb120-6233-11e7-aa4b-5f8c56ec33b8\",\"panelIndex\":31,\"row\":24,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"99382ab0-6555-11e7-8d48-19b0c51bbbbd\",\"panelIndex\":34,\"row\":30,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"f5f79b00-6555-11e7-b27e-8f8b3770f1df\",\"panelIndex\":35,\"row\":30,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"3ee07620-6556-11e7-995a-3584c2c6482c\",\"panelIndex\":38,\"row\":12,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"caf2c4b0-6556-11e7-be5f-c5cca8dd73b6\",\"panelIndex\":42,\"row\":12,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"a13402f0-6557-11e7-a3eb-4b30743c9370\",\"panelIndex\":44,\"row\":24,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"0de63e90-6558-11e7-8547-3d133170b50d\",\"panelIndex\":45,\"row\":18,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"39ecd800-6558-11e7-bea4-0f5fadb995cc\",\"panelIndex\":47,\"row\":18,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"9accd4a0-657a-11e7-8471-e5432f50acbd\",\"panelIndex\":48,\"row\":14,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":11,\"id\":\"b13956f0-657a-11e7-8471-e5432f50acbd\",\"panelIndex\":49,\"row\":14,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"size_x\":2,\"size_y\":2,\"panelIndex\":50,\"type\":\"visualization\",\"id\":\"a2099810-657b-11e7-8471-e5432f50acbd\",\"col\":11,\"row\":20},{\"size_x\":2,\"size_y\":2,\"panelIndex\":51,\"type\":\"visualization\",\"id\":\"c4987cc0-657b-11e7-8471-e5432f50acbd\",\"col\":11,\"row\":26},{\"size_x\":2,\"size_y\":2,\"panelIndex\":52,\"type\":\"visualization\",\"id\":\"b3e2af90-657b-11e7-8471-e5432f50acbd\",\"col\":5,\"row\":26},{\"size_x\":2,\"size_y\":2,\"panelIndex\":53,\"type\":\"visualization\",\"id\":\"82fcfc50-657b-11e7-8471-e5432f50acbd\",\"col\":5,\"row\":20}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/dashboard/310ae6e0-2fdf-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/7.x/dashboard/310ae6e0-2fdf-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 973bb0e48..000000000
--- a/modules/netflow/configuration/kibana/7.x/dashboard/310ae6e0-2fdf-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Conversation Partners", "uiStateJSON": "{\"P-1\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"}}}}}", "panelsJSON": "[{\"col\":1,\"id\":\"a7a47e70-2fde-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":1,\"row\":4,\"size_x\":12,\"size_y\":5,\"type\":\"visualization\"},{\"col\":9,\"id\":\"de9da770-2fcb-11e7-8df8-b363df28ab61\",\"panelIndex\":2,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"4440e130-2fdd-11e7-afd7-595689f3f18c\",\"panelIndex\":3,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"4898db90-2fdb-11e7-84e6-333bd21ad9fd\",\"panelIndex\":4,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":5,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/dashboard/653cf1e0-2fd2-11e7-99ed-49759aed30f5.json b/modules/netflow/configuration/kibana/7.x/dashboard/653cf1e0-2fd2-11e7-99ed-49759aed30f5.json
deleted file mode 100644
index 7421e03d0..000000000
--- a/modules/netflow/configuration/kibana/7.x/dashboard/653cf1e0-2fd2-11e7-99ed-49759aed30f5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Overview", "uiStateJSON": "{}", "panelsJSON": "[{\"col\":1,\"id\":\"de9da770-2fcb-11e7-8df8-b363df28ab61\",\"panelIndex\":12,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"23d6dc80-2fd6-11e7-bc99-41245d9394f2\",\"panelIndex\":13,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":9,\"id\":\"8dcbcce0-2fd6-11e7-a82c-3146dd695923\",\"panelIndex\":14,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"69f864d0-2fd7-11e7-97a8-85d8d5a99269\",\"panelIndex\":15,\"row\":4,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":17,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":9,\"id\":\"b88a8790-2fd7-11e7-bd03-932d3e38a4ff\",\"panelIndex\":21,\"row\":4,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"ac4cbc90-622d-11e7-b0a5-e9bda2f6d168\",\"panelIndex\":22,\"row\":6,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"97f430b0-622e-11e7-b0a5-e9bda2f6d168\",\"panelIndex\":23,\"row\":4,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"f6be96c0-622f-11e7-abbc-93bb293f5057\",\"panelIndex\":24,\"row\":6,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":9,\"id\":\"3fa5f6f0-2fca-11e7-ab32-99f279b941ef\",\"panelIndex\":25,\"row\":6,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"size_x\":4,\"size_y\":2,\"panelIndex\":26,\"type\":\"visualization\",\"id\":\"64b144f0-658e-11e7-bfc3-d74b7bb89482\",\"col\":1,\"row\":8},{\"size_x\":4,\"size_y\":2,\"panelIndex\":27,\"type\":\"visualization\",\"id\":\"a4ade270-658e-11e7-bfc3-d74b7bb89482\",\"col\":5,\"row\":8},{\"size_x\":4,\"size_y\":2,\"panelIndex\":29,\"type\":\"visualization\",\"id\":\"3026fe40-658f-11e7-bfc3-d74b7bb89482\",\"col\":9,\"row\":8}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/dashboard/a932b600-2fd2-11e7-99ed-49759aed30f5.json b/modules/netflow/configuration/kibana/7.x/dashboard/a932b600-2fd2-11e7-99ed-49759aed30f5.json
deleted file mode 100644
index 2afa15599..000000000
--- a/modules/netflow/configuration/kibana/7.x/dashboard/a932b600-2fd2-11e7-99ed-49759aed30f5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Geo Location", "uiStateJSON": "{\"P-16\":{\"mapCenter\":[20.632784250388028,16.69921875],\"mapZoom\":2}}", "panelsJSON": "[{\"col\":5,\"id\":\"99c1a4a0-2f60-11e7-8936-6f5fd5520124\",\"panelIndex\":16,\"row\":2,\"size_x\":8,\"size_y\":6,\"type\":\"visualization\"},{\"size_x\":4,\"size_y\":2,\"panelIndex\":17,\"type\":\"visualization\",\"id\":\"6702de70-2fca-11e7-8fcd-8dc6c60d4592\",\"col\":1,\"row\":2},{\"size_x\":4,\"size_y\":2,\"panelIndex\":18,\"type\":\"visualization\",\"id\":\"793a6f00-2fdd-11e7-afd7-595689f3f18c\",\"col\":1,\"row\":4},{\"size_x\":4,\"size_y\":2,\"panelIndex\":19,\"type\":\"visualization\",\"id\":\"264fb270-2fdb-11e7-84e6-333bd21ad9fd\",\"col\":1,\"row\":6},{\"size_x\":12,\"size_y\":1,\"panelIndex\":20,\"type\":\"visualization\",\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"col\":1,\"row\":1}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/dashboard/ca480720-2fdf-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/7.x/dashboard/ca480720-2fdf-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 5e0a41544..000000000
--- a/modules/netflow/configuration/kibana/7.x/dashboard/ca480720-2fdf-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Flow Records", "uiStateJSON": "{\"P-3\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}}", "panelsJSON": "[{\"col\":4,\"id\":\"6a7e4790-2fe0-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":2,\"row\":2,\"size_x\":9,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"bbac23d0-2fe0-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":3,\"row\":2,\"size_x\":3,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":4,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"size_x\":12,\"size_y\":4,\"panelIndex\":5,\"type\":\"search\",\"id\":\"0d0216f0-2fe0-11e7-9d02-3f49bde5c1d5\",\"col\":1,\"row\":4,\"columns\":[\"netflow.src_addr\",\"netflow.src_port_name\",\"netflow.dst_addr\",\"netflow.dst_port_name\",\"netflow.protocol_name\",\"netflow.bytes\",\"netflow.packets\"],\"sort\":[\"@timestamp\",\"desc\"]}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/dashboard/d7e31d40-6589-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/7.x/dashboard/d7e31d40-6589-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 9557f34a2..000000000
--- a/modules/netflow/configuration/kibana/7.x/dashboard/d7e31d40-6589-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Autonomous Systems", "uiStateJSON": "{}", "panelsJSON": "[{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":1,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":7,\"id\":\"8c6ce180-657e-11e7-bd38-dd04615e7f62\",\"panelIndex\":2,\"row\":4,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"836b2010-657e-11e7-9748-5d4091219eef\",\"panelIndex\":3,\"row\":6,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"399c9fe0-657e-11e7-bd38-dd04615e7f62\",\"panelIndex\":4,\"row\":4,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"4a548ff0-657e-11e7-9748-5d4091219eef\",\"panelIndex\":5,\"row\":6,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"size_x\":4,\"size_y\":2,\"panelIndex\":6,\"type\":\"visualization\",\"id\":\"7aaa68d0-658a-11e7-bfc3-d74b7bb89482\",\"col\":1,\"row\":2},{\"size_x\":4,\"size_y\":2,\"panelIndex\":7,\"type\":\"visualization\",\"id\":\"793a6f00-2fdd-11e7-afd7-595689f3f18c\",\"col\":5,\"row\":2},{\"size_x\":4,\"size_y\":2,\"panelIndex\":8,\"type\":\"visualization\",\"id\":\"264fb270-2fdb-11e7-84e6-333bd21ad9fd\",\"col\":9,\"row\":2}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/dashboard/netflow.json b/modules/netflow/configuration/kibana/7.x/dashboard/netflow.json
deleted file mode 100644
index 57fb3d414..000000000
--- a/modules/netflow/configuration/kibana/7.x/dashboard/netflow.json
+++ /dev/null
@@ -1 +0,0 @@
-["a932b600-2fd2-11e7-99ed-49759aed30f5", "10584050-6234-11e7-8236-19b4b4941e22", "d7e31d40-6589-11e7-bfc3-d74b7bb89482", "310ae6e0-2fdf-11e7-9d02-3f49bde5c1d5", "653cf1e0-2fd2-11e7-99ed-49759aed30f5", "04157d70-6591-11e7-bfc3-d74b7bb89482", "ca480720-2fdf-11e7-9d02-3f49bde5c1d5", "0809c1f0-6719-11e7-b5b8-29fbded8e37c"]
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/index-pattern/netflow.json b/modules/netflow/configuration/kibana/7.x/index-pattern/netflow.json
deleted file mode 100644
index 714ccae0f..000000000
--- a/modules/netflow/configuration/kibana/7.x/index-pattern/netflow.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "title":"netflow-*",
-  "timeFieldName":"@timestamp",
-  "notExpandable":true,
-  "fields":"[{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"@version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"geoip.as_org\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.asn\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.autonomous_system\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.continent_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_code2\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_code3\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.dma_code\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.latitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.longitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.postal_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.region_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.timezone\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.as_org\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.asn\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.autonomous_system\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.continent_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.country_code2\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.country_code3\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.dma_code\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.latitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.longitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.postal_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.region_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.timezone\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.as_org\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.asn\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.autonomous_system\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.continent_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.country_code2\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.country_code3\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.dma_code\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.latitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.longitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.postal_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.region_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.timezone\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.direction\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_addr\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_as\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_locality\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_mac\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_mask_len\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_port\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_port_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_vlan\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.engine_id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.engine_type\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.first_switched\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.flow_locality\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.flow_records\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.flow_seq_num\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.flowset_id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.input_snmp\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.ip_protocol_version\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.ip_version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.last_switched\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.next_hop\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.output_snmp\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.packets\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.protocol\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.protocol_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.sampling_algorithm\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.sampling_interval\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_addr\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_as\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_locality\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_mac\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_mask_len\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_port\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_port_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.tcp_flag_tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.tcp_flags\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.tcp_flags_label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.tos\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.vlan\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]"
-}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/search/0d0216f0-2fe0-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/7.x/search/0d0216f0-2fe0-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 77c89dbcb..000000000
--- a/modules/netflow/configuration/kibana/7.x/search/0d0216f0-2fe0-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"sort": ["@timestamp", "desc"], "hits": 0, "description": "", "title": "Netflow: Flow Records", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"highlightAll\":true,\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[],\"version\":true}"}, "columns": ["netflow.src_addr", "netflow.src_port_name", "netflow.dst_addr", "netflow.dst_port_name", "netflow.protocol_name", "netflow.bytes", "netflow.packets"]}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/search/netflow.json b/modules/netflow/configuration/kibana/7.x/search/netflow.json
deleted file mode 100644
index 733ef3aa6..000000000
--- a/modules/netflow/configuration/kibana/7.x/search/netflow.json
+++ /dev/null
@@ -1 +0,0 @@
-["0d0216f0-2fe0-11e7-9d02-3f49bde5c1d5"]
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/00248240-6593-11e7-b8de-af19b696fa44.json b/modules/netflow/configuration/kibana/7.x/visualization/00248240-6593-11e7-b8de-af19b696fa44.json
deleted file mode 100644
index 287e7eead..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/00248240-6593-11e7-b8de-af19b696fa44.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Egress Interfaces (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.output_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.output_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Egress Interfaces (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/02e25f10-671a-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/7.x/visualization/02e25f10-671a-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index a29c7298e..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/02e25f10-671a-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Source Ports\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.src_port_name\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Source Ports", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/04990fe0-6592-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/7.x/visualization/04990fe0-6592-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 9d5447463..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/04990fe0-6592-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Egress Interfaces (packets)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.output_snmp\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Egress Interface\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Egress Interfaces (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/0927de10-6556-11e7-b27e-8f8b3770f1df.json b/modules/netflow/configuration/kibana/7.x/visualization/0927de10-6556-11e7-b27e-8f8b3770f1df.json
deleted file mode 100644
index ffef433ab..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/0927de10-6556-11e7-b27e-8f8b3770f1df.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"geoip.country_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.country_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Countries (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/0de63e90-6558-11e7-8547-3d133170b50d.json b/modules/netflow/configuration/kibana/7.x/visualization/0de63e90-6558-11e7-8547-3d133170b50d.json
deleted file mode 100644
index 10bdcbf9f..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/0de63e90-6558-11e7-8547-3d133170b50d.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Types of Service (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.tos:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tos:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Types of Service (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/1026edb0-2fcc-11e7-842d-39925ea8ac40.json b/modules/netflow/configuration/kibana/7.x/visualization/1026edb0-2fcc-11e7-842d-39925ea8ac40.json
deleted file mode 100644
index 72a927e76..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/1026edb0-2fcc-11e7-842d-39925ea8ac40.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: IP Version (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.ip_version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"IP Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: IP Version (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/12ca1180-6593-11e7-9bf4-ed832088be20.json b/modules/netflow/configuration/kibana/7.x/visualization/12ca1180-6593-11e7-9bf4-ed832088be20.json
deleted file mode 100644
index c4d99f23e..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/12ca1180-6593-11e7-9bf4-ed832088be20.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Egress Interfaces (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.output_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.output_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Egress Interfaces (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/1418ce10-6592-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/7.x/visualization/1418ce10-6592-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 044779e36..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/1418ce10-6592-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Egress Interfaces (bytes)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.output_snmp\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Egress Interface\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Egress Interfaces (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/16438600-2fcb-11e7-befb-31e033c79e4e.json b/modules/netflow/configuration/kibana/7.x/visualization/16438600-2fcb-11e7-befb-31e033c79e4e.json
deleted file mode 100644
index edeaa0c0f..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/16438600-2fcb-11e7-befb-31e033c79e4e.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Direction (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.direction\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Direction\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Direction (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/178b0af0-6230-11e7-9a50-efc26ded795d.json b/modules/netflow/configuration/kibana/7.x/visualization/178b0af0-6230-11e7-9a50-efc26ded795d.json
deleted file mode 100644
index 0be4bd9ec..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/178b0af0-6230-11e7-9a50-efc26ded795d.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Locality (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.flow_locality\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Locality\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Locality (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/1e7d8770-2fc7-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/7.x/visualization/1e7d8770-2fc7-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index 651863dc9..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/1e7d8770-2fc7-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Sources (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Sources (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/1fa2c100-6592-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/7.x/visualization/1fa2c100-6592-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 8e85e5b5c..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/1fa2c100-6592-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Egress Interfaces (flow records)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.output_snmp\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Egress Interface\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Egress Interfaces (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/206d6e90-6593-11e7-8b83-5b2419db46fa.json b/modules/netflow/configuration/kibana/7.x/visualization/206d6e90-6593-11e7-8b83-5b2419db46fa.json
deleted file mode 100644
index 780c8bfdd..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/206d6e90-6593-11e7-8b83-5b2419db46fa.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Egress Interfaces (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.output_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.output_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Egress Interfaces (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/231fe630-6558-11e7-8547-3d133170b50d.json b/modules/netflow/configuration/kibana/7.x/visualization/231fe630-6558-11e7-8547-3d133170b50d.json
deleted file mode 100644
index 41a84a30a..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/231fe630-6558-11e7-8547-3d133170b50d.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Types of Service (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.tos:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tos:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Types of Service (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/23d6dc80-2fd6-11e7-bc99-41245d9394f2.json b/modules/netflow/configuration/kibana/7.x/visualization/23d6dc80-2fd6-11e7-bc99-41245d9394f2.json
deleted file mode 100644
index adc7f588e..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/23d6dc80-2fd6-11e7-bc99-41245d9394f2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destinations and Ports (bytes)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_addr\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destinations and Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/264fb270-2fdb-11e7-84e6-333bd21ad9fd.json b/modules/netflow/configuration/kibana/7.x/visualization/264fb270-2fdb-11e7-84e6-333bd21ad9fd.json
deleted file mode 100644
index d4c9cd130..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/264fb270-2fdb-11e7-84e6-333bd21ad9fd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination and Source Ports (flow records)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Flow Records\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination Port\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination and Source Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/26e166f0-2fe2-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/7.x/visualization/26e166f0-2fe2-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 824d78d96..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/26e166f0-2fe2-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Dashboard Navigation\",\"type\":\"markdown\",\"params\":{\"markdown\":\"[Overview](#/dashboard/653cf1e0-2fd2-11e7-99ed-49759aed30f5) | [Conversation Partners](#/dashboard/310ae6e0-2fdf-11e7-9d02-3f49bde5c1d5) | [Traffic Analysis](#/dashboard/10584050-6234-11e7-8236-19b4b4941e22) | [Top-N](#/dashboard/0809c1f0-6719-11e7-b5b8-29fbded8e37c) | [Geo Location](#/dashboard/a932b600-2fd2-11e7-99ed-49759aed30f5) | [Autonomous Systems](#/dashboard/d7e31d40-6589-11e7-bfc3-d74b7bb89482) | [Flow Exporters](#/dashboard/04157d70-6591-11e7-bfc3-d74b7bb89482) | [Raw Flow Records](#/dashboard/ca480720-2fdf-11e7-9d02-3f49bde5c1d5)\\n***\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Dashboard Navigation", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/2aeac270-6230-11e7-84f1-9728c106b1b6.json b/modules/netflow/configuration/kibana/7.x/visualization/2aeac270-6230-11e7-84f1-9728c106b1b6.json
deleted file mode 100644
index e0df55dfc..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/2aeac270-6230-11e7-84f1-9728c106b1b6.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Locality (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.flow_locality\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Locality\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Locality (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/2c9567c0-6289-11e7-bcd8-a16ef1d32773.json b/modules/netflow/configuration/kibana/7.x/visualization/2c9567c0-6289-11e7-bcd8-a16ef1d32773.json
deleted file mode 100644
index a90386061..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/2c9567c0-6289-11e7-bcd8-a16ef1d32773.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.tcp_flags_label:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tcp_flags_label:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/3026fe40-658f-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/7.x/visualization/3026fe40-658f-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 439a66ec7..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/3026fe40-658f-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Version (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Version (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/313a9880-2fd6-11e7-bc99-41245d9394f2.json b/modules/netflow/configuration/kibana/7.x/visualization/313a9880-2fd6-11e7-bc99-41245d9394f2.json
deleted file mode 100644
index ea92c668c..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/313a9880-2fd6-11e7-bc99-41245d9394f2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destinations and Ports (packets)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.packets\",\n        \"customLabel\": \"Packets\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_addr\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destinations and Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/324b0a00-2fc9-11e7-bd31-a722d271a9cc.json b/modules/netflow/configuration/kibana/7.x/visualization/324b0a00-2fc9-11e7-bd31-a722d271a9cc.json
deleted file mode 100644
index 14aa3dc20..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/324b0a00-2fc9-11e7-bd31-a722d271a9cc.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.country_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Countries (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/326fae40-671a-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/7.x/visualization/326fae40-671a-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index dc7bc7990..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/326fae40-671a-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Protocols\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Protocols", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/3277ea90-6578-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/7.x/visualization/3277ea90-6578-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index 7e635a2eb..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/3277ea90-6578-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.src_addr\",\"customLabel\":\"Sources\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Source Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/399c9fe0-657e-11e7-bd38-dd04615e7f62.json b/modules/netflow/configuration/kibana/7.x/visualization/399c9fe0-657e-11e7-bd38-dd04615e7f62.json
deleted file mode 100644
index 8502a7159..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/399c9fe0-657e-11e7-bd38-dd04615e7f62.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Autonomous Systems (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"geoip_src.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_src.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Autonomous Systems (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/39e3dab0-2fcb-11e7-befb-31e033c79e4e.json b/modules/netflow/configuration/kibana/7.x/visualization/39e3dab0-2fcb-11e7-befb-31e033c79e4e.json
deleted file mode 100644
index 4a175ff05..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/39e3dab0-2fcb-11e7-befb-31e033c79e4e.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Version\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Version", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/39ecd800-6558-11e7-bea4-0f5fadb995cc.json b/modules/netflow/configuration/kibana/7.x/visualization/39ecd800-6558-11e7-bea4-0f5fadb995cc.json
deleted file mode 100644
index 321546703..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/39ecd800-6558-11e7-bea4-0f5fadb995cc.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLANs (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.vlan:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.vlan:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: VLANs (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/3ee07620-6556-11e7-995a-3584c2c6482c.json b/modules/netflow/configuration/kibana/7.x/visualization/3ee07620-6556-11e7-995a-3584c2c6482c.json
deleted file mode 100644
index 9f31eb410..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/3ee07620-6556-11e7-995a-3584c2c6482c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Ports (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.dst_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/3fa5f6f0-2fca-11e7-ab32-99f279b941ef.json b/modules/netflow/configuration/kibana/7.x/visualization/3fa5f6f0-2fca-11e7-ab32-99f279b941ef.json
deleted file mode 100644
index 52ab78c12..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/3fa5f6f0-2fca-11e7-ab32-99f279b941ef.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries and Cities (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.country_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.city_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Countries and Cities (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/41a7e3a0-658f-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/7.x/visualization/41a7e3a0-658f-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index cd08fa420..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/41a7e3a0-658f-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Version (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Version (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/43e698c0-657e-11e7-99b6-af4533b21b46.json b/modules/netflow/configuration/kibana/7.x/visualization/43e698c0-657e-11e7-99b6-af4533b21b46.json
deleted file mode 100644
index aa96a138b..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/43e698c0-657e-11e7-99b6-af4533b21b46.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Autonomous Systems (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"geoip_src.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_src.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flows records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Autonomous Systems (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/4440e130-2fdd-11e7-afd7-595689f3f18c.json b/modules/netflow/configuration/kibana/7.x/visualization/4440e130-2fdd-11e7-afd7-595689f3f18c.json
deleted file mode 100644
index 28d8290e5..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/4440e130-2fdd-11e7-afd7-595689f3f18c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations and Sources (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations and Sources (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/44b3cb70-2fd6-11e7-bc99-41245d9394f2.json b/modules/netflow/configuration/kibana/7.x/visualization/44b3cb70-2fd6-11e7-bc99-41245d9394f2.json
deleted file mode 100644
index 55b294e2f..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/44b3cb70-2fd6-11e7-bc99-41245d9394f2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destinations and Ports (flow records)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Flow Records\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_addr\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destinations and Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/47d426a0-2fc8-11e7-8b06-97426538fddd.json b/modules/netflow/configuration/kibana/7.x/visualization/47d426a0-2fc8-11e7-8b06-97426538fddd.json
deleted file mode 100644
index 1ce79aace..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/47d426a0-2fc8-11e7-8b06-97426538fddd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination Ports (bytes)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/4898db90-2fdb-11e7-84e6-333bd21ad9fd.json b/modules/netflow/configuration/kibana/7.x/visualization/4898db90-2fdb-11e7-84e6-333bd21ad9fd.json
deleted file mode 100644
index d68f4c33d..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/4898db90-2fdb-11e7-84e6-333bd21ad9fd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination and Source Ports (bytes)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination Port\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination and Source Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/49a2d6b0-2fc9-11e7-8224-a900ea73fa5f.json b/modules/netflow/configuration/kibana/7.x/visualization/49a2d6b0-2fc9-11e7-8224-a900ea73fa5f.json
deleted file mode 100644
index 041d8adc8..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/49a2d6b0-2fc9-11e7-8224-a900ea73fa5f.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.country_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Countries (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/4a548ff0-657e-11e7-9748-5d4091219eef.json b/modules/netflow/configuration/kibana/7.x/visualization/4a548ff0-657e-11e7-9748-5d4091219eef.json
deleted file mode 100644
index d5deb3d27..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/4a548ff0-657e-11e7-9748-5d4091219eef.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Autonomous Systems (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"geoip_src.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_src.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Autonomous Systems (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/4a6f6030-6558-11e7-bea4-0f5fadb995cc.json b/modules/netflow/configuration/kibana/7.x/visualization/4a6f6030-6558-11e7-bea4-0f5fadb995cc.json
deleted file mode 100644
index d58a47e30..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/4a6f6030-6558-11e7-bea4-0f5fadb995cc.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLANs (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.vlan:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.vlan:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: VLANs (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/4dc994a0-2fd7-11e7-97a8-85d8d5a99269.json b/modules/netflow/configuration/kibana/7.x/visualization/4dc994a0-2fd7-11e7-97a8-85d8d5a99269.json
deleted file mode 100644
index dceaf28c9..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/4dc994a0-2fd7-11e7-97a8-85d8d5a99269.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Types of Service (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.tos\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Type of Service\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Types of Service (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/4ea0a8d0-658f-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/7.x/visualization/4ea0a8d0-658f-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 002986eeb..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/4ea0a8d0-658f-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Version (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Version (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/4f3525d0-2fc7-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/7.x/visualization/4f3525d0-2fc7-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index 72a9f6e4f..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/4f3525d0-2fc7-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/51006340-671a-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/7.x/visualization/51006340-671a-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 5cb7ec44c..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/51006340-671a-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Autonomous Systems\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"geoip.autonomous_system\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Autonomous System\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Autonomous Systems", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/52279a00-628c-11e7-95ed-8966ac93bd5a.json b/modules/netflow/configuration/kibana/7.x/visualization/52279a00-628c-11e7-95ed-8966ac93bd5a.json
deleted file mode 100644
index d9e1be23c..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/52279a00-628c-11e7-95ed-8966ac93bd5a.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"geoip.country_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.country_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Countries (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/55be8550-655e-11e7-9dda-9f993e2ba58b.json b/modules/netflow/configuration/kibana/7.x/visualization/55be8550-655e-11e7-9dda-9f993e2ba58b.json
deleted file mode 100644
index 65bdb5add..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/55be8550-655e-11e7-9dda-9f993e2ba58b.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Count\",\"type\":\"metric\",\"params\":{\"handleNoResults\":true,\"fontSize\":\"32\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.dst_addr\",\"customLabel\":\"Destinations\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Count", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/55f66b20-2fdd-11e7-afd7-595689f3f18c.json b/modules/netflow/configuration/kibana/7.x/visualization/55f66b20-2fdd-11e7-afd7-595689f3f18c.json
deleted file mode 100644
index 4e215a933..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/55f66b20-2fdd-11e7-afd7-595689f3f18c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations and Sources (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations and Sources (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/56a23ac0-628e-11e7-a842-b787fa3508ce.json b/modules/netflow/configuration/kibana/7.x/visualization/56a23ac0-628e-11e7-a842-b787fa3508ce.json
deleted file mode 100644
index ac903fd95..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/56a23ac0-628e-11e7-a842-b787fa3508ce.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.dst_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/5c5d6f60-2fdb-11e7-84e6-333bd21ad9fd.json b/modules/netflow/configuration/kibana/7.x/visualization/5c5d6f60-2fdb-11e7-84e6-333bd21ad9fd.json
deleted file mode 100644
index 203bd5538..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/5c5d6f60-2fdb-11e7-84e6-333bd21ad9fd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination and Source Ports (packets)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.packets\",\n        \"customLabel\": \"Packets\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination Port\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination and Source Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/5e58cc00-6556-11e7-995a-3584c2c6482c.json b/modules/netflow/configuration/kibana/7.x/visualization/5e58cc00-6556-11e7-995a-3584c2c6482c.json
deleted file mode 100644
index b05776a8c..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/5e58cc00-6556-11e7-995a-3584c2c6482c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Ports (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.dst_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/5fd2fe30-2fc7-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/7.x/visualization/5fd2fe30-2fc7-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index 41433dc1d..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/5fd2fe30-2fc7-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/622844d0-6288-11e7-bcd8-a16ef1d32773.json b/modules/netflow/configuration/kibana/7.x/visualization/622844d0-6288-11e7-bcd8-a16ef1d32773.json
deleted file mode 100644
index d012edf9e..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/622844d0-6288-11e7-bcd8-a16ef1d32773.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Ports (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.dst_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/64b144f0-658e-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/7.x/visualization/64b144f0-658e-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index f5c588cf6..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/64b144f0-658e-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Flow Exporters (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"host\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Flow Exporter\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Flow Exporters (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/65f3b500-6557-11e7-87c3-994b88f84501.json b/modules/netflow/configuration/kibana/7.x/visualization/65f3b500-6557-11e7-87c3-994b88f84501.json
deleted file mode 100644
index f84a2a03f..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/65f3b500-6557-11e7-87c3-994b88f84501.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Sources (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.src_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Sources (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/6702de70-2fca-11e7-8fcd-8dc6c60d4592.json b/modules/netflow/configuration/kibana/7.x/visualization/6702de70-2fca-11e7-8fcd-8dc6c60d4592.json
deleted file mode 100644
index cf3908f9c..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/6702de70-2fca-11e7-8fcd-8dc6c60d4592.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries and Cities (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.country_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.city_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Countries and Cities (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/691cda40-2fc9-11e7-823a-89e4bb55eaa1.json b/modules/netflow/configuration/kibana/7.x/visualization/691cda40-2fc9-11e7-823a-89e4bb55eaa1.json
deleted file mode 100644
index 3441317a1..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/691cda40-2fc9-11e7-823a-89e4bb55eaa1.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.country_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Countries (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/69f864d0-2fd7-11e7-97a8-85d8d5a99269.json b/modules/netflow/configuration/kibana/7.x/visualization/69f864d0-2fd7-11e7-97a8-85d8d5a99269.json
deleted file mode 100644
index 6eea98f5d..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/69f864d0-2fd7-11e7-97a8-85d8d5a99269.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Types of Service (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.tos\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Type of Service\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Types of Service (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/6a597070-6233-11e7-aa4b-5f8c56ec33b8.json b/modules/netflow/configuration/kibana/7.x/visualization/6a597070-6233-11e7-aa4b-5f8c56ec33b8.json
deleted file mode 100644
index 8831c4f8f..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/6a597070-6233-11e7-aa4b-5f8c56ec33b8.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous Systems (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"geoip.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous Systems (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/6a7e4790-2fe0-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/7.x/visualization/6a7e4790-2fe0-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index b66c1f49f..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/6a7e4790-2fe0-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Flow Records\",\"type\":\"histogram\",\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"category\"}],\"defaultYExtents\":false,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"legendPosition\":\"right\",\"mode\":\"stacked\",\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Flow Records\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Count\"},\"type\":\"value\"}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.last_switched\",\"interval\":\"s\",\"customInterval\":\"2h\",\"min_doc_count\":1,\"extended_bounds\":{},\"customLabel\":\"Timeline\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"netflow.version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Flow Records", "uiStateJSON": "{\"vis\":{\"legendOpen\":true}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/6ad67290-6289-11e7-bcd8-a16ef1d32773.json b/modules/netflow/configuration/kibana/7.x/visualization/6ad67290-6289-11e7-bcd8-a16ef1d32773.json
deleted file mode 100644
index b81b1fbd2..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/6ad67290-6289-11e7-bcd8-a16ef1d32773.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Types of Service (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.tos:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tos:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Types of Service (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/6c67b990-628c-11e7-95ed-8966ac93bd5a.json b/modules/netflow/configuration/kibana/7.x/visualization/6c67b990-628c-11e7-95ed-8966ac93bd5a.json
deleted file mode 100644
index fadc7dfca..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/6c67b990-628c-11e7-95ed-8966ac93bd5a.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Cities (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"geoip.city_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.city_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Cities (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/6f6d05b0-2fc8-11e7-bf24-57efade8fd83.json b/modules/netflow/configuration/kibana/7.x/visualization/6f6d05b0-2fc8-11e7-bf24-57efade8fd83.json
deleted file mode 100644
index 6ce6aea70..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/6f6d05b0-2fc8-11e7-bf24-57efade8fd83.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination Ports (flow records)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Flow Records\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/71272b10-6579-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/7.x/visualization/71272b10-6579-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index 92cecc9c6..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/71272b10-6579-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Source Port Count\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addLegend\": false,\n    \"addTooltip\": true,\n    \"fontSize\": \"32\",\n    \"gauge\": {\n      \"autoExtend\": false,\n      \"backStyle\": \"Full\",\n      \"colorSchema\": \"Green to Red\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 100\n        }\n      ],\n      \"gaugeColorMode\": \"None\",\n      \"gaugeStyle\": \"Full\",\n      \"gaugeType\": \"Metric\",\n      \"invertColors\": false,\n      \"labels\": {\n        \"color\": \"black\",\n        \"show\": true\n      },\n      \"orientation\": \"vertical\",\n      \"percentageMode\": false,\n      \"scale\": {\n        \"color\": \"#333\",\n        \"labels\": false,\n        \"show\": false,\n        \"width\": 2\n      },\n      \"style\": {\n        \"bgColor\": false,\n        \"bgFill\": \"#000\",\n        \"fontSize\": \"36\",\n        \"labelColor\": false,\n        \"subText\": \"\"\n      },\n      \"type\": \"simple\",\n      \"useRange\": false,\n      \"verticalSplit\": false\n    },\n    \"handleNoResults\": true,\n    \"type\": \"gauge\"\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"customLabel\": \"Source Ports\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Source Port Count", "uiStateJSON": "{\n  \"vis\": {\n    \"defaultColors\": {\n      \"0 - 100\": \"rgb(0,104,55)\"\n    }\n  }\n}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/735d6c70-628e-11e7-a842-b787fa3508ce.json b/modules/netflow/configuration/kibana/7.x/visualization/735d6c70-628e-11e7-a842-b787fa3508ce.json
deleted file mode 100644
index a36c13993..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/735d6c70-628e-11e7-a842-b787fa3508ce.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Sources (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.src_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Sources (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/73c37440-658e-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/7.x/visualization/73c37440-658e-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 4a690fc0b..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/73c37440-658e-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Flow Exporters (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"host\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Flow Exporter\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Flow Exporters (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/793a6f00-2fdd-11e7-afd7-595689f3f18c.json b/modules/netflow/configuration/kibana/7.x/visualization/793a6f00-2fdd-11e7-afd7-595689f3f18c.json
deleted file mode 100644
index 50fb5a1ed..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/793a6f00-2fdd-11e7-afd7-595689f3f18c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations and Sources (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations and Sources (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/7aaa68d0-658a-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/7.x/visualization/7aaa68d0-658a-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index f59fe89db..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/7aaa68d0-658a-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination and Source ASs (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip_dst.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination AS\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip_src.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source AS\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destination and Source ASs (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/7c2cfd10-2fc7-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/7.x/visualization/7c2cfd10-2fc7-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index 0b476ff94..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/7c2cfd10-2fc7-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Sources (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Sources (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/7e9a7980-622e-11e7-b0a5-e9bda2f6d168.json b/modules/netflow/configuration/kibana/7.x/visualization/7e9a7980-622e-11e7-b0a5-e9bda2f6d168.json
deleted file mode 100644
index 400104775..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/7e9a7980-622e-11e7-b0a5-e9bda2f6d168.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.tcp_flags_label\",\"size\":255,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"TCP Flags\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/7e9cb7e0-671a-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/7.x/visualization/7e9cb7e0-671a-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 6130531e3..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/7e9cb7e0-671a-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Flow Exporters\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"host\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Flow Exporter\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Flow Exporters", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/7f7aac00-2fc8-11e7-8bc1-177080983dbf.json b/modules/netflow/configuration/kibana/7.x/visualization/7f7aac00-2fc8-11e7-8bc1-177080983dbf.json
deleted file mode 100644
index 819ce3c20..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/7f7aac00-2fc8-11e7-8bc1-177080983dbf.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Ports (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_port_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Port\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/82fcfc50-657b-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/7.x/visualization/82fcfc50-657b-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index f818ef5ec..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/82fcfc50-657b-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.tcp_flags_label\",\"customLabel\":\"TCP Flag States\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/835e6090-6557-11e7-87c3-994b88f84501.json b/modules/netflow/configuration/kibana/7.x/visualization/835e6090-6557-11e7-87c3-994b88f84501.json
deleted file mode 100644
index 077d090bf..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/835e6090-6557-11e7-87c3-994b88f84501.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Sources (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.src_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Sources (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/836b2010-657e-11e7-9748-5d4091219eef.json b/modules/netflow/configuration/kibana/7.x/visualization/836b2010-657e-11e7-9748-5d4091219eef.json
deleted file mode 100644
index 23c6fdcff..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/836b2010-657e-11e7-9748-5d4091219eef.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Autonomous Systems (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"geoip_dst.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_dst.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Autonomous Systems (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/84e4c9f0-2fd7-11e7-97a8-85d8d5a99269.json b/modules/netflow/configuration/kibana/7.x/visualization/84e4c9f0-2fd7-11e7-97a8-85d8d5a99269.json
deleted file mode 100644
index eda88c1d6..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/84e4c9f0-2fd7-11e7-97a8-85d8d5a99269.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Types of Service (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.tos\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Type of Service\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Types of Service (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/8500a670-6579-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/7.x/visualization/8500a670-6579-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index c178c829e..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/8500a670-6579-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination Port Count\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addLegend\": false,\n    \"addTooltip\": true,\n    \"fontSize\": \"32\",\n    \"gauge\": {\n      \"autoExtend\": false,\n      \"backStyle\": \"Full\",\n      \"colorSchema\": \"Green to Red\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 100\n        }\n      ],\n      \"gaugeColorMode\": \"None\",\n      \"gaugeStyle\": \"Full\",\n      \"gaugeType\": \"Metric\",\n      \"invertColors\": false,\n      \"labels\": {\n        \"color\": \"black\",\n        \"show\": true\n      },\n      \"orientation\": \"vertical\",\n      \"percentageMode\": false,\n      \"scale\": {\n        \"color\": \"#333\",\n        \"labels\": false,\n        \"show\": false,\n        \"width\": 2\n      },\n      \"style\": {\n        \"bgColor\": false,\n        \"bgFill\": \"#000\",\n        \"fontSize\": \"36\",\n        \"labelColor\": false,\n        \"subText\": \"\"\n      },\n      \"type\": \"simple\",\n      \"useRange\": false,\n      \"verticalSplit\": false\n    },\n    \"handleNoResults\": true,\n    \"type\": \"gauge\"\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"customLabel\": \"Destination Ports\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination Port Count", "uiStateJSON": "{\n  \"vis\": {\n    \"defaultColors\": {\n      \"0 - 100\": \"rgb(0,104,55)\"\n    }\n  }\n}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/87dbc0a0-657e-11e7-99b6-af4533b21b46.json b/modules/netflow/configuration/kibana/7.x/visualization/87dbc0a0-657e-11e7-99b6-af4533b21b46.json
deleted file mode 100644
index 0870127bd..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/87dbc0a0-657e-11e7-99b6-af4533b21b46.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Autonomous Systems (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"geoip_dst.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_dst.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flows records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Autonomous Systems (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/8a52f7a0-2fc7-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/7.x/visualization/8a52f7a0-2fc7-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index 1834df905..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/8a52f7a0-2fc7-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Sources (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Sources (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/8c6ce180-657e-11e7-bd38-dd04615e7f62.json b/modules/netflow/configuration/kibana/7.x/visualization/8c6ce180-657e-11e7-bd38-dd04615e7f62.json
deleted file mode 100644
index e3fc1fd84..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/8c6ce180-657e-11e7-bd38-dd04615e7f62.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Autonomous Systems (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"geoip_dst.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_dst.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Autonomous Systems (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/8d2cb120-6233-11e7-aa4b-5f8c56ec33b8.json b/modules/netflow/configuration/kibana/7.x/visualization/8d2cb120-6233-11e7-aa4b-5f8c56ec33b8.json
deleted file mode 100644
index 4b0204c67..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/8d2cb120-6233-11e7-aa4b-5f8c56ec33b8.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous Systems (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"geoip.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous Systems (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/8dcbcce0-2fd6-11e7-a82c-3146dd695923.json b/modules/netflow/configuration/kibana/7.x/visualization/8dcbcce0-2fd6-11e7-a82c-3146dd695923.json
deleted file mode 100644
index d4303ca39..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/8dcbcce0-2fd6-11e7-a82c-3146dd695923.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Sources and Ports (bytes)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_addr\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Sources and Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/8f35efc0-2fcc-11e7-842d-39925ea8ac40.json b/modules/netflow/configuration/kibana/7.x/visualization/8f35efc0-2fcc-11e7-842d-39925ea8ac40.json
deleted file mode 100644
index c3818b58b..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/8f35efc0-2fcc-11e7-842d-39925ea8ac40.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: IP Version and Protocols (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.ip_version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"IP Version\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: IP Version and Protocols (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/91ae4100-6288-11e7-bcd8-a16ef1d32773.json b/modules/netflow/configuration/kibana/7.x/visualization/91ae4100-6288-11e7-bcd8-a16ef1d32773.json
deleted file mode 100644
index 39e5c1963..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/91ae4100-6288-11e7-bcd8-a16ef1d32773.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Ports (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.src_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/97f430b0-622e-11e7-b0a5-e9bda2f6d168.json b/modules/netflow/configuration/kibana/7.x/visualization/97f430b0-622e-11e7-b0a5-e9bda2f6d168.json
deleted file mode 100644
index 8e684f027..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/97f430b0-622e-11e7-b0a5-e9bda2f6d168.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.tcp_flags_label\",\"size\":255,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"TCP Flags\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/99382ab0-6555-11e7-8d48-19b0c51bbbbd.json b/modules/netflow/configuration/kibana/7.x/visualization/99382ab0-6555-11e7-8d48-19b0c51bbbbd.json
deleted file mode 100644
index 42b758d7e..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/99382ab0-6555-11e7-8d48-19b0c51bbbbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Cities (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"geoip.city_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.city_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Cities (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/99c1a4a0-2f60-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/7.x/visualization/99c1a4a0-2f60-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index bc876cd22..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/99c1a4a0-2f60-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Geo Location Heatmap\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Heatmap\",\"isDesaturated\":true,\"addTooltip\":true,\"heatMaxZoom\":16,\"heatMinOpacity\":\"0.32\",\"heatRadius\":\"24\",\"heatBlur\":\"16\",\"heatNormalizeData\":true,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[15,5],\"wms\":{\"enabled\":false,\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\",\"options\":{\"version\":\"1.3.0\",\"layers\":\"0\",\"format\":\"image/png\",\"transparent\":true,\"attribution\":\"Maps provided by USGS\",\"styles\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.location\",\"autoPrecision\":true,\"precision\":2,\"customLabel\":\"Location\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Geo Location Heatmap", "uiStateJSON": "{\"mapCenter\":[8.407168163601076,9.4921875]}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/99e49de0-2fcc-11e7-842d-39925ea8ac40.json b/modules/netflow/configuration/kibana/7.x/visualization/99e49de0-2fcc-11e7-842d-39925ea8ac40.json
deleted file mode 100644
index b33bf5844..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/99e49de0-2fcc-11e7-842d-39925ea8ac40.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Protocols (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Protocols (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/9a4938d0-6592-11e7-b8de-af19b696fa44.json b/modules/netflow/configuration/kibana/7.x/visualization/9a4938d0-6592-11e7-b8de-af19b696fa44.json
deleted file mode 100644
index 5bf13524a..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/9a4938d0-6592-11e7-b8de-af19b696fa44.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Ingress Interfaces (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.input_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.input_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Ingress Interfaces (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/9accd4a0-657a-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/7.x/visualization/9accd4a0-657a-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index 81e822cc4..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/9accd4a0-657a-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: ToS Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.tos\",\"customLabel\":\"Types of Service\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: ToS Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/9b5d3b80-2fc9-11e7-bd31-a722d271a9cc.json b/modules/netflow/configuration/kibana/7.x/visualization/9b5d3b80-2fc9-11e7-bd31-a722d271a9cc.json
deleted file mode 100644
index b090e4edc..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/9b5d3b80-2fc9-11e7-bd31-a722d271a9cc.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Cities (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.city_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Cities (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/9f113d80-6719-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/7.x/visualization/9f113d80-6719-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 335b17d0b..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/9f113d80-6719-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Destinations\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Destination\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Destinations", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/9f9e54b0-2fd6-11e7-a82c-3146dd695923.json b/modules/netflow/configuration/kibana/7.x/visualization/9f9e54b0-2fd6-11e7-a82c-3146dd695923.json
deleted file mode 100644
index 5958480c9..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/9f9e54b0-2fd6-11e7-a82c-3146dd695923.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Sources and Ports (packets)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.packets\",\n        \"customLabel\": \"Packets\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_addr\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Sources and Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/a13402f0-6557-11e7-a3eb-4b30743c9370.json b/modules/netflow/configuration/kibana/7.x/visualization/a13402f0-6557-11e7-a3eb-4b30743c9370.json
deleted file mode 100644
index 19fe02da6..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/a13402f0-6557-11e7-a3eb-4b30743c9370.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.tcp_flags_label:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tcp_flags_label:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/a2099810-657b-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/7.x/visualization/a2099810-657b-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index 2a0f7aa07..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/a2099810-657b-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous System Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"geoip.autonomous_system\",\"customLabel\":\"Autonomous Systems\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous System Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/a3541940-6556-11e7-a807-e52f264c6cfd.json b/modules/netflow/configuration/kibana/7.x/visualization/a3541940-6556-11e7-a807-e52f264c6cfd.json
deleted file mode 100644
index 8b15e7be6..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/a3541940-6556-11e7-a807-e52f264c6cfd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.dst_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/a4ade270-658e-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/7.x/visualization/a4ade270-658e-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 9f1db8814..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/a4ade270-658e-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Direction (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.direction\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Direction\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Direction (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/a7a47e70-2fde-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/7.x/visualization/a7a47e70-2fde-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 3ed157264..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/a7a47e70-2fde-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Conversation Partners\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Conversation Partners", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/a8b68cb0-2fc8-11e7-8d8b-45ec51795dad.json b/modules/netflow/configuration/kibana/7.x/visualization/a8b68cb0-2fc8-11e7-8d8b-45ec51795dad.json
deleted file mode 100644
index 31e9491f3..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/a8b68cb0-2fc8-11e7-8d8b-45ec51795dad.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Source Ports (bytes)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Source Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/a8eadac0-658c-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/7.x/visualization/a8eadac0-658c-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 78466c9b2..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/a8eadac0-658c-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Traffic Volume by Destination Port\",\n  \"type\": \"area\",\n  \"params\": {\n    \"grid\": {\n      \"categoryLines\": false,\n      \"style\": {\n        \"color\": \"#eee\"\n      }\n    },\n    \"categoryAxes\": [\n      {\n        \"id\": \"CategoryAxis-1\",\n        \"type\": \"category\",\n        \"position\": \"bottom\",\n        \"show\": true,\n        \"style\": {},\n        \"scale\": {\n          \"type\": \"linear\"\n        },\n        \"labels\": {\n          \"show\": true,\n          \"truncate\": 100\n        },\n        \"title\": {\n          \"text\": \"Time\"\n        }\n      }\n    ],\n    \"valueAxes\": [\n      {\n        \"id\": \"ValueAxis-1\",\n        \"name\": \"LeftAxis-1\",\n        \"type\": \"value\",\n        \"position\": \"left\",\n        \"show\": true,\n        \"style\": {},\n        \"scale\": {\n          \"type\": \"linear\",\n          \"mode\": \"normal\"\n        },\n        \"labels\": {\n          \"show\": true,\n          \"rotate\": 0,\n          \"filter\": false,\n          \"truncate\": 100\n        },\n        \"title\": {\n          \"text\": \"Bytes\"\n        }\n      }\n    ],\n    \"seriesParams\": [\n      {\n        \"show\": \"true\",\n        \"type\": \"area\",\n        \"mode\": \"stacked\",\n        \"data\": {\n          \"label\": \"Bytes\",\n          \"id\": \"1\"\n        },\n        \"valueAxis\": \"ValueAxis-1\",\n        \"drawLinesBetweenPoints\": true,\n        \"showCircles\": false,\n        \"interpolate\": \"cardinal\"\n      }\n    ],\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"times\": [],\n    \"addTimeMarker\": false\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"date_histogram\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.last_switched\",\n        \"interval\": \"auto\",\n        \"customInterval\": \"2h\",\n        \"min_doc_count\": 1,\n        \"extended_bounds\": {},\n        \"customLabel\": \"Time\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"group\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Traffic Volume by Destination Port", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/ac4cbc90-622d-11e7-b0a5-e9bda2f6d168.json b/modules/netflow/configuration/kibana/7.x/visualization/ac4cbc90-622d-11e7-b0a5-e9bda2f6d168.json
deleted file mode 100644
index 7a5f6bd30..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/ac4cbc90-622d-11e7-b0a5-e9bda2f6d168.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous Systems (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Autonomous System\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous Systems (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/ad5cb080-622e-11e7-b0a5-e9bda2f6d168.json b/modules/netflow/configuration/kibana/7.x/visualization/ad5cb080-622e-11e7-b0a5-e9bda2f6d168.json
deleted file mode 100644
index 46dcb5544..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/ad5cb080-622e-11e7-b0a5-e9bda2f6d168.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.tcp_flags_label\",\"size\":255,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"TCP Flags\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/af1425a0-2fc7-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/7.x/visualization/af1425a0-2fc7-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index 9a448e61a..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/af1425a0-2fc7-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/af23cb20-2fc9-11e7-8224-a900ea73fa5f.json b/modules/netflow/configuration/kibana/7.x/visualization/af23cb20-2fc9-11e7-8224-a900ea73fa5f.json
deleted file mode 100644
index 392445794..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/af23cb20-2fc9-11e7-8224-a900ea73fa5f.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Cities (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.city_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Cities (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/b02faaf0-2fcb-11e7-8df8-b363df28ab61.json b/modules/netflow/configuration/kibana/7.x/visualization/b02faaf0-2fcb-11e7-8df8-b363df28ab61.json
deleted file mode 100644
index 63c839f71..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/b02faaf0-2fcb-11e7-8df8-b363df28ab61.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: IP Version (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.ip_version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"IP Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: IP Version (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/b13956f0-657a-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/7.x/visualization/b13956f0-657a-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index d0302eeda..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/b13956f0-657a-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLAN Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.vlan\",\"customLabel\":\"VLANs\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: VLAN Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/b2c9a3d0-658e-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/7.x/visualization/b2c9a3d0-658e-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 6dbda475a..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/b2c9a3d0-658e-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Direction (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.direction\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Direction\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Direction (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/b2d02df0-6556-11e7-a807-e52f264c6cfd.json b/modules/netflow/configuration/kibana/7.x/visualization/b2d02df0-6556-11e7-a807-e52f264c6cfd.json
deleted file mode 100644
index 8c142fdb2..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/b2d02df0-6556-11e7-a807-e52f264c6cfd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.dst_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/b3e2af90-657b-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/7.x/visualization/b3e2af90-657b-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index e2ed3b6e0..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/b3e2af90-657b-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Country Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"geoip.country_name\",\"customLabel\":\"Countries\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Country Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/b58e1380-6719-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/7.x/visualization/b58e1380-6719-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 79a84236c..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/b58e1380-6719-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Sources\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Sources", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/b61f84d0-6289-11e7-bcd8-a16ef1d32773.json b/modules/netflow/configuration/kibana/7.x/visualization/b61f84d0-6289-11e7-bcd8-a16ef1d32773.json
deleted file mode 100644
index 39cb5931b..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/b61f84d0-6289-11e7-bcd8-a16ef1d32773.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLANs (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.vlan:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.vlan:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: VLANs (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/b6a092e0-2fcc-11e7-9bae-a35d2fe38fc2.json b/modules/netflow/configuration/kibana/7.x/visualization/b6a092e0-2fcc-11e7-9bae-a35d2fe38fc2.json
deleted file mode 100644
index 81a54099b..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/b6a092e0-2fcc-11e7-9bae-a35d2fe38fc2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: IP Version (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.ip_version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"IP Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: IP Version (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/b74bbb70-2fd6-11e7-a82c-3146dd695923.json b/modules/netflow/configuration/kibana/7.x/visualization/b74bbb70-2fd6-11e7-a82c-3146dd695923.json
deleted file mode 100644
index dc66b8395..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/b74bbb70-2fd6-11e7-a82c-3146dd695923.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Sources and Ports (flow records)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Flow Records\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_addr\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Sources and Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/b88a8790-2fd7-11e7-bd03-932d3e38a4ff.json b/modules/netflow/configuration/kibana/7.x/visualization/b88a8790-2fd7-11e7-bd03-932d3e38a4ff.json
deleted file mode 100644
index d69c6798d..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/b88a8790-2fd7-11e7-bd03-932d3e38a4ff.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLANs (bytes)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.vlan\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"VLAN\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: VLANs (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/bb8e3d90-2fca-11e7-9fcf-99b4b8159f98.json b/modules/netflow/configuration/kibana/7.x/visualization/bb8e3d90-2fca-11e7-9fcf-99b4b8159f98.json
deleted file mode 100644
index 18f82618e..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/bb8e3d90-2fca-11e7-9fcf-99b4b8159f98.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries and Cities (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.country_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.city_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Countries and Cities (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/bbac23d0-2fe0-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/7.x/visualization/bbac23d0-2fe0-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 6e50cf6d1..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/bbac23d0-2fe0-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Flow Records\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Flow Records", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/bfec6260-6592-11e7-9bf4-ed832088be20.json b/modules/netflow/configuration/kibana/7.x/visualization/bfec6260-6592-11e7-9bf4-ed832088be20.json
deleted file mode 100644
index c11358aed..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/bfec6260-6592-11e7-9bf4-ed832088be20.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Ingress Interfaces (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.input_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.input_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Ingress Interfaces (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/c4987cc0-657b-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/7.x/visualization/c4987cc0-657b-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index 721d37d97..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/c4987cc0-657b-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: City Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"geoip.city_name\",\"customLabel\":\"Cities\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: City Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/c61bd8b0-658c-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/7.x/visualization/c61bd8b0-658c-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 4896722ab..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/c61bd8b0-658c-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Traffic Volume by Source Port\",\n  \"type\": \"area\",\n  \"params\": {\n    \"grid\": {\n      \"categoryLines\": false,\n      \"style\": {\n        \"color\": \"#eee\"\n      }\n    },\n    \"categoryAxes\": [\n      {\n        \"id\": \"CategoryAxis-1\",\n        \"type\": \"category\",\n        \"position\": \"bottom\",\n        \"show\": true,\n        \"style\": {},\n        \"scale\": {\n          \"type\": \"linear\"\n        },\n        \"labels\": {\n          \"show\": true,\n          \"truncate\": 100\n        },\n        \"title\": {\n          \"text\": \"Time\"\n        }\n      }\n    ],\n    \"valueAxes\": [\n      {\n        \"id\": \"ValueAxis-1\",\n        \"name\": \"LeftAxis-1\",\n        \"type\": \"value\",\n        \"position\": \"left\",\n        \"show\": true,\n        \"style\": {},\n        \"scale\": {\n          \"type\": \"linear\",\n          \"mode\": \"normal\"\n        },\n        \"labels\": {\n          \"show\": true,\n          \"rotate\": 0,\n          \"filter\": false,\n          \"truncate\": 100\n        },\n        \"title\": {\n          \"text\": \"Bytes\"\n        }\n      }\n    ],\n    \"seriesParams\": [\n      {\n        \"show\": \"true\",\n        \"type\": \"area\",\n        \"mode\": \"stacked\",\n        \"data\": {\n          \"label\": \"Bytes\",\n          \"id\": \"1\"\n        },\n        \"valueAxis\": \"ValueAxis-1\",\n        \"drawLinesBetweenPoints\": true,\n        \"showCircles\": false,\n        \"interpolate\": \"cardinal\"\n      }\n    ],\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"times\": [],\n    \"addTimeMarker\": false\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"date_histogram\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.last_switched\",\n        \"interval\": \"auto\",\n        \"customInterval\": \"2h\",\n        \"min_doc_count\": 1,\n        \"extended_bounds\": {},\n        \"customLabel\": \"Time\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"group\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Traffic Volume by Source Port", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/c6319680-2fc9-11e7-823a-89e4bb55eaa1.json b/modules/netflow/configuration/kibana/7.x/visualization/c6319680-2fc9-11e7-823a-89e4bb55eaa1.json
deleted file mode 100644
index b72f29aaa..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/c6319680-2fc9-11e7-823a-89e4bb55eaa1.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Cities (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.city_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Cities (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/c6b36620-2fc8-11e7-87d6-cdce05879baf.json b/modules/netflow/configuration/kibana/7.x/visualization/c6b36620-2fc8-11e7-87d6-cdce05879baf.json
deleted file mode 100644
index 12569f797..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/c6b36620-2fc8-11e7-87d6-cdce05879baf.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Source Ports (flow records)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Flow Records\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Source Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/ca786e30-622d-11e7-b0a5-e9bda2f6d168.json b/modules/netflow/configuration/kibana/7.x/visualization/ca786e30-622d-11e7-b0a5-e9bda2f6d168.json
deleted file mode 100644
index 33dee4b2b..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/ca786e30-622d-11e7-b0a5-e9bda2f6d168.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous Systems (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Autonomous System\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous Systems (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/caea3760-6591-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/7.x/visualization/caea3760-6591-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index c614b431e..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/caea3760-6591-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Ingress Interfaces (flow records)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.input_snmp\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Ingress Interface\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Ingress Interfaces (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/caf2c4b0-6556-11e7-be5f-c5cca8dd73b6.json b/modules/netflow/configuration/kibana/7.x/visualization/caf2c4b0-6556-11e7-be5f-c5cca8dd73b6.json
deleted file mode 100644
index c41547f1f..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/caf2c4b0-6556-11e7-be5f-c5cca8dd73b6.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Ports (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.src_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/d07a2870-2fcc-11e7-9bae-a35d2fe38fc2.json b/modules/netflow/configuration/kibana/7.x/visualization/d07a2870-2fcc-11e7-9bae-a35d2fe38fc2.json
deleted file mode 100644
index bdf3d88ae..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/d07a2870-2fcc-11e7-9bae-a35d2fe38fc2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: IP Version and Protocols (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.ip_version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"IP Version\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: IP Version and Protocols (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/d297fe60-2fd7-11e7-af27-99e728e71e91.json b/modules/netflow/configuration/kibana/7.x/visualization/d297fe60-2fd7-11e7-af27-99e728e71e91.json
deleted file mode 100644
index 3c083014e..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/d297fe60-2fd7-11e7-af27-99e728e71e91.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLANs (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.vlan\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"VLAN\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: VLANs (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/d2a2db30-658a-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/7.x/visualization/d2a2db30-658a-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 2485949c8..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/d2a2db30-658a-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination and Source ASs (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip_dst.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination AS\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip_src.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source AS\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destination and Source ASs (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/d4a408a0-671a-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/7.x/visualization/d4a408a0-671a-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 121ee308b..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/d4a408a0-671a-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Cities\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showMeticsAtAllLevels\":false,\"showPartialRows\":true,\"showTotal\":true,\"sort\":{\"columnIndex\":null,\"direction\":null},\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"geoip.country_name\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Country\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"geoip.city_name\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Cities", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/d8f24780-2fcc-11e7-9bae-a35d2fe38fc2.json b/modules/netflow/configuration/kibana/7.x/visualization/d8f24780-2fcc-11e7-9bae-a35d2fe38fc2.json
deleted file mode 100644
index 5726f7273..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/d8f24780-2fcc-11e7-9bae-a35d2fe38fc2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Protocols (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Protocols (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/d9fdbd80-6555-11e7-8d48-19b0c51bbbbd.json b/modules/netflow/configuration/kibana/7.x/visualization/d9fdbd80-6555-11e7-8d48-19b0c51bbbbd.json
deleted file mode 100644
index 5140e74fc..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/d9fdbd80-6555-11e7-8d48-19b0c51bbbbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Cities (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"geoip.city_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.city_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Cities (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/daa62090-6557-11e7-a3eb-4b30743c9370.json b/modules/netflow/configuration/kibana/7.x/visualization/daa62090-6557-11e7-a3eb-4b30743c9370.json
deleted file mode 100644
index bc4d21c02..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/daa62090-6557-11e7-a3eb-4b30743c9370.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.tcp_flags_label:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tcp_flags_label:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/dcf88c60-6233-11e7-aa4b-5f8c56ec33b8.json b/modules/netflow/configuration/kibana/7.x/visualization/dcf88c60-6233-11e7-aa4b-5f8c56ec33b8.json
deleted file mode 100644
index b5c28766f..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/dcf88c60-6233-11e7-aa4b-5f8c56ec33b8.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous Systems (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"geoip.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flows records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous Systems (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/de9b3dd0-2fc8-11e7-844c-67b9b101127b.json b/modules/netflow/configuration/kibana/7.x/visualization/de9b3dd0-2fc8-11e7-844c-67b9b101127b.json
deleted file mode 100644
index 00f3c1814..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/de9b3dd0-2fc8-11e7-844c-67b9b101127b.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Source Ports (packets)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.packets\",\n        \"customLabel\": \"Packets\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Source Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/de9da770-2fcb-11e7-8df8-b363df28ab61.json b/modules/netflow/configuration/kibana/7.x/visualization/de9da770-2fcb-11e7-8df8-b363df28ab61.json
deleted file mode 100644
index e576bf57d..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/de9da770-2fcb-11e7-8df8-b363df28ab61.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: IP Version and Protocols (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.ip_version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"IP Version\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: IP Version and Protocols (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/e2a7fc60-6592-11e7-8b83-5b2419db46fa.json b/modules/netflow/configuration/kibana/7.x/visualization/e2a7fc60-6592-11e7-8b83-5b2419db46fa.json
deleted file mode 100644
index 21445a0ce..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/e2a7fc60-6592-11e7-8b83-5b2419db46fa.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Ingress Interfaces (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.input_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.input_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Ingress Interfaces (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/e2f43d10-6591-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/7.x/visualization/e2f43d10-6591-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 8caead0e1..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/e2f43d10-6591-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Ingress Interfaces (bytes)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.input_snmp\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Ingress Interface\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Ingress Interfaces (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/e3ef9130-658a-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/7.x/visualization/e3ef9130-658a-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 21b84b4db..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/e3ef9130-658a-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination and Source ASs (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip_dst.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination AS\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip_src.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source AS\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destination and Source ASs (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/e8251d30-2fd7-11e7-a4f6-dbb93cfb4a10.json b/modules/netflow/configuration/kibana/7.x/visualization/e8251d30-2fd7-11e7-a4f6-dbb93cfb4a10.json
deleted file mode 100644
index ce99c6763..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/e8251d30-2fd7-11e7-a4f6-dbb93cfb4a10.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLANs (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.vlan\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"VLAN\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: VLANs (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/ef7699a0-6719-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/7.x/visualization/ef7699a0-6719-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index d2e84a449..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/ef7699a0-6719-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Destination Ports\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.dst_port_name\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Destination\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Destination Ports", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/f11380e0-6591-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/7.x/visualization/f11380e0-6591-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 6988e1057..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/f11380e0-6591-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Ingress Interfaces (packets)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.input_snmp\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Ingress Interface\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Ingress Interfaces (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/f2fea250-2fcb-11e7-8df8-b363df28ab61.json b/modules/netflow/configuration/kibana/7.x/visualization/f2fea250-2fcb-11e7-8df8-b363df28ab61.json
deleted file mode 100644
index d11744ec2..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/f2fea250-2fcb-11e7-8df8-b363df28ab61.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Protocols (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Protocols (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/f5f79b00-6555-11e7-b27e-8f8b3770f1df.json b/modules/netflow/configuration/kibana/7.x/visualization/f5f79b00-6555-11e7-b27e-8f8b3770f1df.json
deleted file mode 100644
index e0f66eec5..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/f5f79b00-6555-11e7-b27e-8f8b3770f1df.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"geoip.country_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.country_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Countries (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/f687e140-622d-11e7-b0a5-e9bda2f6d168.json b/modules/netflow/configuration/kibana/7.x/visualization/f687e140-622d-11e7-b0a5-e9bda2f6d168.json
deleted file mode 100644
index dd617f198..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/f687e140-622d-11e7-b0a5-e9bda2f6d168.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous Systems (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Autonomous System\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous Systems (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/f6be96c0-622f-11e7-abbc-93bb293f5057.json b/modules/netflow/configuration/kibana/7.x/visualization/f6be96c0-622f-11e7-abbc-93bb293f5057.json
deleted file mode 100644
index 8dcf4e344..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/f6be96c0-622f-11e7-abbc-93bb293f5057.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Locality (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.flow_locality\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Locality\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Locality (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/f8731d50-2fd6-11e7-97a8-85d8d5a99269.json b/modules/netflow/configuration/kibana/7.x/visualization/f8731d50-2fd6-11e7-97a8-85d8d5a99269.json
deleted file mode 100644
index 05d2e79dc..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/f8731d50-2fd6-11e7-97a8-85d8d5a99269.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Flow Exporter\",\"field\":\"host\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":50},\"schema\":\"segment\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"title\":\"Netflow: Flow Exporters (flow records)\",\"type\":\"pie\"}", "description": "", "title": "Netflow: Flow Exporters (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/fd081e50-6556-11e7-be5f-c5cca8dd73b6.json b/modules/netflow/configuration/kibana/7.x/visualization/fd081e50-6556-11e7-be5f-c5cca8dd73b6.json
deleted file mode 100644
index 5a1e3199f..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/fd081e50-6556-11e7-be5f-c5cca8dd73b6.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Ports (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.src_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/7.x/visualization/netflow.json b/modules/netflow/configuration/kibana/7.x/visualization/netflow.json
deleted file mode 100644
index 3943af169..000000000
--- a/modules/netflow/configuration/kibana/7.x/visualization/netflow.json
+++ /dev/null
@@ -1 +0,0 @@
-["39e3dab0-2fcb-11e7-befb-31e033c79e4e", "1026edb0-2fcc-11e7-842d-39925ea8ac40", "b6a092e0-2fcc-11e7-9bae-a35d2fe38fc2", "99c1a4a0-2f60-11e7-8936-6f5fd5520124", "b02faaf0-2fcb-11e7-8df8-b363df28ab61", "d07a2870-2fcc-11e7-9bae-a35d2fe38fc2", "8f35efc0-2fcc-11e7-842d-39925ea8ac40", "de9da770-2fcb-11e7-8df8-b363df28ab61", "d8f24780-2fcc-11e7-9bae-a35d2fe38fc2", "99e49de0-2fcc-11e7-842d-39925ea8ac40", "f2fea250-2fcb-11e7-8df8-b363df28ab61", "ad5cb080-622e-11e7-b0a5-e9bda2f6d168", "7e9a7980-622e-11e7-b0a5-e9bda2f6d168", "97f430b0-622e-11e7-b0a5-e9bda2f6d168", "2aeac270-6230-11e7-84f1-9728c106b1b6", "178b0af0-6230-11e7-9a50-efc26ded795d", "f6be96c0-622f-11e7-abbc-93bb293f5057", "8d2cb120-6233-11e7-aa4b-5f8c56ec33b8", "6a597070-6233-11e7-aa4b-5f8c56ec33b8", "dcf88c60-6233-11e7-aa4b-5f8c56ec33b8", "6ad67290-6289-11e7-bcd8-a16ef1d32773", "2c9567c0-6289-11e7-bcd8-a16ef1d32773", "b61f84d0-6289-11e7-bcd8-a16ef1d32773", "52279a00-628c-11e7-95ed-8966ac93bd5a", "56a23ac0-628e-11e7-a842-b787fa3508ce", "735d6c70-628e-11e7-a842-b787fa3508ce", "a3541940-6556-11e7-a807-e52f264c6cfd", "f5f79b00-6555-11e7-b27e-8f8b3770f1df", "65f3b500-6557-11e7-87c3-994b88f84501", "b2d02df0-6556-11e7-a807-e52f264c6cfd", "0927de10-6556-11e7-b27e-8f8b3770f1df", "0de63e90-6558-11e7-8547-3d133170b50d", "a13402f0-6557-11e7-a3eb-4b30743c9370", "231fe630-6558-11e7-8547-3d133170b50d", "daa62090-6557-11e7-a3eb-4b30743c9370", "39ecd800-6558-11e7-bea4-0f5fadb995cc", "835e6090-6557-11e7-87c3-994b88f84501", "4a6f6030-6558-11e7-bea4-0f5fadb995cc", "a7a47e70-2fde-11e7-9d02-3f49bde5c1d5", "bb8e3d90-2fca-11e7-9fcf-99b4b8159f98", "6702de70-2fca-11e7-8fcd-8dc6c60d4592", "3fa5f6f0-2fca-11e7-ab32-99f279b941ef", "691cda40-2fc9-11e7-823a-89e4bb55eaa1", "49a2d6b0-2fc9-11e7-8224-a900ea73fa5f", "324b0a00-2fc9-11e7-bd31-a722d271a9cc", "c6319680-2fc9-11e7-823a-89e4bb55eaa1", "99382ab0-6555-11e7-8d48-19b0c51bbbbd", "6c67b990-628c-11e7-95ed-8966ac93bd5a", "ca786e30-622d-11e7-b0a5-e9bda2f6d168", "f687e140-622d-11e7-b0a5-e9bda2f6d168", "ac4cbc90-622d-11e7-b0a5-e9bda2f6d168", "d9fdbd80-6555-11e7-8d48-19b0c51bbbbd", "af23cb20-2fc9-11e7-8224-a900ea73fa5f", "9b5d3b80-2fc9-11e7-bd31-a722d271a9cc", "84e4c9f0-2fd7-11e7-97a8-85d8d5a99269", "69f864d0-2fd7-11e7-97a8-85d8d5a99269", "4dc994a0-2fd7-11e7-97a8-85d8d5a99269", "e8251d30-2fd7-11e7-a4f6-dbb93cfb4a10", "b88a8790-2fd7-11e7-bd03-932d3e38a4ff", "d297fe60-2fd7-11e7-af27-99e728e71e91", "793a6f00-2fdd-11e7-afd7-595689f3f18c", "4440e130-2fdd-11e7-afd7-595689f3f18c", "af1425a0-2fc7-11e7-8936-6f5fd5520124", "4f3525d0-2fc7-11e7-8936-6f5fd5520124", "5fd2fe30-2fc7-11e7-8936-6f5fd5520124", "55f66b20-2fdd-11e7-afd7-595689f3f18c", "8a52f7a0-2fc7-11e7-8936-6f5fd5520124", "1e7d8770-2fc7-11e7-8936-6f5fd5520124", "7c2cfd10-2fc7-11e7-8936-6f5fd5520124", "9accd4a0-657a-11e7-8471-e5432f50acbd", "3277ea90-6578-11e7-8471-e5432f50acbd", "b13956f0-657a-11e7-8471-e5432f50acbd", "55be8550-655e-11e7-9dda-9f993e2ba58b", "a2099810-657b-11e7-8471-e5432f50acbd", "82fcfc50-657b-11e7-8471-e5432f50acbd", "b3e2af90-657b-11e7-8471-e5432f50acbd", "c4987cc0-657b-11e7-8471-e5432f50acbd", "bbac23d0-2fe0-11e7-9d02-3f49bde5c1d5", "399c9fe0-657e-11e7-bd38-dd04615e7f62", "43e698c0-657e-11e7-99b6-af4533b21b46", "e3ef9130-658a-11e7-bfc3-d74b7bb89482", "836b2010-657e-11e7-9748-5d4091219eef", "7aaa68d0-658a-11e7-bfc3-d74b7bb89482", "d2a2db30-658a-11e7-bfc3-d74b7bb89482", "8c6ce180-657e-11e7-bd38-dd04615e7f62", "4a548ff0-657e-11e7-9748-5d4091219eef", "87dbc0a0-657e-11e7-99b6-af4533b21b46", "73c37440-658e-11e7-bfc3-d74b7bb89482", "64b144f0-658e-11e7-bfc3-d74b7bb89482", "f8731d50-2fd6-11e7-97a8-85d8d5a99269", "a4ade270-658e-11e7-bfc3-d74b7bb89482", "16438600-2fcb-11e7-befb-31e033c79e4e", "6a7e4790-2fe0-11e7-9d02-3f49bde5c1d5", "b2c9a3d0-658e-11e7-bfc3-d74b7bb89482", "41a7e3a0-658f-11e7-bfc3-d74b7bb89482", "4ea0a8d0-658f-11e7-bfc3-d74b7bb89482", "3026fe40-658f-11e7-bfc3-d74b7bb89482", "9a4938d0-6592-11e7-b8de-af19b696fa44", "bfec6260-6592-11e7-9bf4-ed832088be20", "f11380e0-6591-11e7-bfc3-d74b7bb89482", "04990fe0-6592-11e7-bfc3-d74b7bb89482", "1fa2c100-6592-11e7-bfc3-d74b7bb89482", "e2f43d10-6591-11e7-bfc3-d74b7bb89482", "1418ce10-6592-11e7-bfc3-d74b7bb89482", "caea3760-6591-11e7-bfc3-d74b7bb89482", "8500a670-6579-11e7-8471-e5432f50acbd", "e2a7fc60-6592-11e7-8b83-5b2419db46fa", "206d6e90-6593-11e7-8b83-5b2419db46fa", "00248240-6593-11e7-b8de-af19b696fa44", "47d426a0-2fc8-11e7-8b06-97426538fddd", "12ca1180-6593-11e7-9bf4-ed832088be20", "5c5d6f60-2fdb-11e7-84e6-333bd21ad9fd", "264fb270-2fdb-11e7-84e6-333bd21ad9fd", "4898db90-2fdb-11e7-84e6-333bd21ad9fd", "44b3cb70-2fd6-11e7-bc99-41245d9394f2", "23d6dc80-2fd6-11e7-bc99-41245d9394f2", "622844d0-6288-11e7-bcd8-a16ef1d32773", "6f6d05b0-2fc8-11e7-bf24-57efade8fd83", "5e58cc00-6556-11e7-995a-3584c2c6482c", "7f7aac00-2fc8-11e7-8bc1-177080983dbf", "71272b10-6579-11e7-8471-e5432f50acbd", "313a9880-2fd6-11e7-bc99-41245d9394f2", "8dcbcce0-2fd6-11e7-a82c-3146dd695923", "caf2c4b0-6556-11e7-be5f-c5cca8dd73b6", "91ae4100-6288-11e7-bcd8-a16ef1d32773", "de9b3dd0-2fc8-11e7-844c-67b9b101127b", "c6b36620-2fc8-11e7-87d6-cdce05879baf", "a8b68cb0-2fc8-11e7-8d8b-45ec51795dad", "fd081e50-6556-11e7-be5f-c5cca8dd73b6", "a8eadac0-658c-11e7-bfc3-d74b7bb89482", "c61bd8b0-658c-11e7-bfc3-d74b7bb89482", "9f9e54b0-2fd6-11e7-a82c-3146dd695923", "b74bbb70-2fd6-11e7-a82c-3146dd695923", "3ee07620-6556-11e7-995a-3584c2c6482c", "d4a408a0-671a-11e7-b5b8-29fbded8e37c", "51006340-671a-11e7-b5b8-29fbded8e37c", "ef7699a0-6719-11e7-b5b8-29fbded8e37c", "9f113d80-6719-11e7-b5b8-29fbded8e37c", "02e25f10-671a-11e7-b5b8-29fbded8e37c", "326fae40-671a-11e7-b5b8-29fbded8e37c", "7e9cb7e0-671a-11e7-b5b8-29fbded8e37c", "b58e1380-6719-11e7-b5b8-29fbded8e37c", "26e166f0-2fe2-11e7-9d02-3f49bde5c1d5"]
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/dashboard/04157d70-6591-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/dashboard/04157d70-6591-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 713735210..000000000
--- a/modules/netflow/configuration/kibana/dashboard/04157d70-6591-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Flow Exporters", "uiStateJSON": "{}", "panelsJSON": "[{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":1,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":1,\"id\":\"f8731d50-2fd6-11e7-97a8-85d8d5a99269\",\"panelIndex\":2,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"size_x\":4,\"size_y\":2,\"panelIndex\":3,\"type\":\"visualization\",\"id\":\"caea3760-6591-11e7-bfc3-d74b7bb89482\",\"col\":5,\"row\":2},{\"size_x\":4,\"size_y\":2,\"panelIndex\":4,\"type\":\"visualization\",\"id\":\"1fa2c100-6592-11e7-bfc3-d74b7bb89482\",\"col\":9,\"row\":2},{\"size_x\":6,\"size_y\":2,\"panelIndex\":5,\"type\":\"visualization\",\"id\":\"00248240-6593-11e7-b8de-af19b696fa44\",\"col\":7,\"row\":4},{\"size_x\":6,\"size_y\":2,\"panelIndex\":6,\"type\":\"visualization\",\"id\":\"206d6e90-6593-11e7-8b83-5b2419db46fa\",\"col\":7,\"row\":6},{\"size_x\":6,\"size_y\":2,\"panelIndex\":8,\"type\":\"visualization\",\"id\":\"e2a7fc60-6592-11e7-8b83-5b2419db46fa\",\"col\":1,\"row\":6},{\"size_x\":6,\"size_y\":2,\"panelIndex\":10,\"type\":\"visualization\",\"id\":\"9a4938d0-6592-11e7-b8de-af19b696fa44\",\"col\":1,\"row\":4}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/dashboard/0809c1f0-6719-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/dashboard/0809c1f0-6719-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 9c796b400..000000000
--- a/modules/netflow/configuration/kibana/dashboard/0809c1f0-6719-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Top-N", "uiStateJSON": "{\"P-2\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-3\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-4\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-5\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-6\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-7\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-8\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"}}}},\"P-9\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}}", "panelsJSON": "[{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":1,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"size_x\":6,\"size_y\":5,\"panelIndex\":2,\"type\":\"visualization\",\"id\":\"b58e1380-6719-11e7-b5b8-29fbded8e37c\",\"col\":1,\"row\":2},{\"size_x\":6,\"size_y\":5,\"panelIndex\":3,\"type\":\"visualization\",\"id\":\"9f113d80-6719-11e7-b5b8-29fbded8e37c\",\"col\":7,\"row\":2},{\"size_x\":6,\"size_y\":5,\"panelIndex\":4,\"type\":\"visualization\",\"id\":\"02e25f10-671a-11e7-b5b8-29fbded8e37c\",\"col\":1,\"row\":7},{\"size_x\":6,\"size_y\":5,\"panelIndex\":5,\"type\":\"visualization\",\"id\":\"ef7699a0-6719-11e7-b5b8-29fbded8e37c\",\"col\":7,\"row\":7},{\"size_x\":6,\"size_y\":5,\"panelIndex\":6,\"type\":\"visualization\",\"id\":\"326fae40-671a-11e7-b5b8-29fbded8e37c\",\"col\":1,\"row\":12},{\"size_x\":6,\"size_y\":5,\"panelIndex\":7,\"type\":\"visualization\",\"id\":\"51006340-671a-11e7-b5b8-29fbded8e37c\",\"col\":7,\"row\":12},{\"size_x\":6,\"size_y\":5,\"panelIndex\":8,\"type\":\"visualization\",\"id\":\"d4a408a0-671a-11e7-b5b8-29fbded8e37c\",\"col\":1,\"row\":17},{\"size_x\":6,\"size_y\":5,\"panelIndex\":9,\"type\":\"visualization\",\"id\":\"7e9cb7e0-671a-11e7-b5b8-29fbded8e37c\",\"col\":7,\"row\":17}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/dashboard/10584050-6234-11e7-8236-19b4b4941e22.json b/modules/netflow/configuration/kibana/dashboard/10584050-6234-11e7-8236-19b4b4941e22.json
deleted file mode 100644
index f4f375179..000000000
--- a/modules/netflow/configuration/kibana/dashboard/10584050-6234-11e7-8236-19b4b4941e22.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Traffic Analysis", "uiStateJSON": "{\"P-15\":{\"vis\":{\"legendOpen\":true}},\"P-26\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-27\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-29\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-30\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-48\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-49\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-50\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-51\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-52\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-53\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}}", "panelsJSON": "[{\"col\":7,\"id\":\"6a597070-6233-11e7-aa4b-5f8c56ec33b8\",\"panelIndex\":1,\"row\":22,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":4,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":7,\"id\":\"6c67b990-628c-11e7-95ed-8966ac93bd5a\",\"panelIndex\":5,\"row\":28,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"52279a00-628c-11e7-95ed-8966ac93bd5a\",\"panelIndex\":6,\"row\":28,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"622844d0-6288-11e7-bcd8-a16ef1d32773\",\"panelIndex\":7,\"row\":10,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"2c9567c0-6289-11e7-bcd8-a16ef1d32773\",\"panelIndex\":9,\"row\":22,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"b61f84d0-6289-11e7-bcd8-a16ef1d32773\",\"panelIndex\":10,\"row\":16,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"6ad67290-6289-11e7-bcd8-a16ef1d32773\",\"panelIndex\":11,\"row\":16,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"91ae4100-6288-11e7-bcd8-a16ef1d32773\",\"panelIndex\":12,\"row\":10,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"735d6c70-628e-11e7-a842-b787fa3508ce\",\"panelIndex\":13,\"row\":4,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"56a23ac0-628e-11e7-a842-b787fa3508ce\",\"panelIndex\":14,\"row\":4,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"7c2cfd10-2fc7-11e7-8936-6f5fd5520124\",\"panelIndex\":15,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"a8b68cb0-2fc8-11e7-8d8b-45ec51795dad\",\"panelIndex\":16,\"row\":8,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"5fd2fe30-2fc7-11e7-8936-6f5fd5520124\",\"panelIndex\":17,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"47d426a0-2fc8-11e7-8b06-97426538fddd\",\"panelIndex\":18,\"row\":8,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"69f864d0-2fd7-11e7-97a8-85d8d5a99269\",\"panelIndex\":19,\"row\":14,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"b88a8790-2fd7-11e7-bd03-932d3e38a4ff\",\"panelIndex\":20,\"row\":14,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"97f430b0-622e-11e7-b0a5-e9bda2f6d168\",\"panelIndex\":21,\"row\":20,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"ac4cbc90-622d-11e7-b0a5-e9bda2f6d168\",\"panelIndex\":22,\"row\":20,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"324b0a00-2fc9-11e7-bd31-a722d271a9cc\",\"panelIndex\":23,\"row\":26,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"9b5d3b80-2fc9-11e7-bd31-a722d271a9cc\",\"panelIndex\":24,\"row\":26,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"65f3b500-6557-11e7-87c3-994b88f84501\",\"panelIndex\":25,\"row\":6,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":11,\"id\":\"55be8550-655e-11e7-9dda-9f993e2ba58b\",\"panelIndex\":26,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"3277ea90-6578-11e7-8471-e5432f50acbd\",\"panelIndex\":27,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"a3541940-6556-11e7-a807-e52f264c6cfd\",\"panelIndex\":28,\"row\":6,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":11,\"id\":\"8500a670-6579-11e7-8471-e5432f50acbd\",\"panelIndex\":29,\"row\":8,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"71272b10-6579-11e7-8471-e5432f50acbd\",\"panelIndex\":30,\"row\":8,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"8d2cb120-6233-11e7-aa4b-5f8c56ec33b8\",\"panelIndex\":31,\"row\":24,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"99382ab0-6555-11e7-8d48-19b0c51bbbbd\",\"panelIndex\":34,\"row\":30,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"f5f79b00-6555-11e7-b27e-8f8b3770f1df\",\"panelIndex\":35,\"row\":30,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"3ee07620-6556-11e7-995a-3584c2c6482c\",\"panelIndex\":38,\"row\":12,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"caf2c4b0-6556-11e7-be5f-c5cca8dd73b6\",\"panelIndex\":42,\"row\":12,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"a13402f0-6557-11e7-a3eb-4b30743c9370\",\"panelIndex\":44,\"row\":24,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"0de63e90-6558-11e7-8547-3d133170b50d\",\"panelIndex\":45,\"row\":18,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"39ecd800-6558-11e7-bea4-0f5fadb995cc\",\"panelIndex\":47,\"row\":18,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"9accd4a0-657a-11e7-8471-e5432f50acbd\",\"panelIndex\":48,\"row\":14,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":11,\"id\":\"b13956f0-657a-11e7-8471-e5432f50acbd\",\"panelIndex\":49,\"row\":14,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"size_x\":2,\"size_y\":2,\"panelIndex\":50,\"type\":\"visualization\",\"id\":\"a2099810-657b-11e7-8471-e5432f50acbd\",\"col\":11,\"row\":20},{\"size_x\":2,\"size_y\":2,\"panelIndex\":51,\"type\":\"visualization\",\"id\":\"c4987cc0-657b-11e7-8471-e5432f50acbd\",\"col\":11,\"row\":26},{\"size_x\":2,\"size_y\":2,\"panelIndex\":52,\"type\":\"visualization\",\"id\":\"b3e2af90-657b-11e7-8471-e5432f50acbd\",\"col\":5,\"row\":26},{\"size_x\":2,\"size_y\":2,\"panelIndex\":53,\"type\":\"visualization\",\"id\":\"82fcfc50-657b-11e7-8471-e5432f50acbd\",\"col\":5,\"row\":20}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/dashboard/310ae6e0-2fdf-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/dashboard/310ae6e0-2fdf-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 973bb0e48..000000000
--- a/modules/netflow/configuration/kibana/dashboard/310ae6e0-2fdf-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Conversation Partners", "uiStateJSON": "{\"P-1\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"}}}}}", "panelsJSON": "[{\"col\":1,\"id\":\"a7a47e70-2fde-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":1,\"row\":4,\"size_x\":12,\"size_y\":5,\"type\":\"visualization\"},{\"col\":9,\"id\":\"de9da770-2fcb-11e7-8df8-b363df28ab61\",\"panelIndex\":2,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"4440e130-2fdd-11e7-afd7-595689f3f18c\",\"panelIndex\":3,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"4898db90-2fdb-11e7-84e6-333bd21ad9fd\",\"panelIndex\":4,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":5,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/dashboard/653cf1e0-2fd2-11e7-99ed-49759aed30f5.json b/modules/netflow/configuration/kibana/dashboard/653cf1e0-2fd2-11e7-99ed-49759aed30f5.json
deleted file mode 100644
index 7421e03d0..000000000
--- a/modules/netflow/configuration/kibana/dashboard/653cf1e0-2fd2-11e7-99ed-49759aed30f5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Overview", "uiStateJSON": "{}", "panelsJSON": "[{\"col\":1,\"id\":\"de9da770-2fcb-11e7-8df8-b363df28ab61\",\"panelIndex\":12,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"23d6dc80-2fd6-11e7-bc99-41245d9394f2\",\"panelIndex\":13,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":9,\"id\":\"8dcbcce0-2fd6-11e7-a82c-3146dd695923\",\"panelIndex\":14,\"row\":2,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"69f864d0-2fd7-11e7-97a8-85d8d5a99269\",\"panelIndex\":15,\"row\":4,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":17,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":9,\"id\":\"b88a8790-2fd7-11e7-bd03-932d3e38a4ff\",\"panelIndex\":21,\"row\":4,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":5,\"id\":\"ac4cbc90-622d-11e7-b0a5-e9bda2f6d168\",\"panelIndex\":22,\"row\":6,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"97f430b0-622e-11e7-b0a5-e9bda2f6d168\",\"panelIndex\":23,\"row\":4,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"f6be96c0-622f-11e7-abbc-93bb293f5057\",\"panelIndex\":24,\"row\":6,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"col\":9,\"id\":\"3fa5f6f0-2fca-11e7-ab32-99f279b941ef\",\"panelIndex\":25,\"row\":6,\"size_x\":4,\"size_y\":2,\"type\":\"visualization\"},{\"size_x\":4,\"size_y\":2,\"panelIndex\":26,\"type\":\"visualization\",\"id\":\"64b144f0-658e-11e7-bfc3-d74b7bb89482\",\"col\":1,\"row\":8},{\"size_x\":4,\"size_y\":2,\"panelIndex\":27,\"type\":\"visualization\",\"id\":\"a4ade270-658e-11e7-bfc3-d74b7bb89482\",\"col\":5,\"row\":8},{\"size_x\":4,\"size_y\":2,\"panelIndex\":29,\"type\":\"visualization\",\"id\":\"3026fe40-658f-11e7-bfc3-d74b7bb89482\",\"col\":9,\"row\":8}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/dashboard/a932b600-2fd2-11e7-99ed-49759aed30f5.json b/modules/netflow/configuration/kibana/dashboard/a932b600-2fd2-11e7-99ed-49759aed30f5.json
deleted file mode 100644
index 2afa15599..000000000
--- a/modules/netflow/configuration/kibana/dashboard/a932b600-2fd2-11e7-99ed-49759aed30f5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Geo Location", "uiStateJSON": "{\"P-16\":{\"mapCenter\":[20.632784250388028,16.69921875],\"mapZoom\":2}}", "panelsJSON": "[{\"col\":5,\"id\":\"99c1a4a0-2f60-11e7-8936-6f5fd5520124\",\"panelIndex\":16,\"row\":2,\"size_x\":8,\"size_y\":6,\"type\":\"visualization\"},{\"size_x\":4,\"size_y\":2,\"panelIndex\":17,\"type\":\"visualization\",\"id\":\"6702de70-2fca-11e7-8fcd-8dc6c60d4592\",\"col\":1,\"row\":2},{\"size_x\":4,\"size_y\":2,\"panelIndex\":18,\"type\":\"visualization\",\"id\":\"793a6f00-2fdd-11e7-afd7-595689f3f18c\",\"col\":1,\"row\":4},{\"size_x\":4,\"size_y\":2,\"panelIndex\":19,\"type\":\"visualization\",\"id\":\"264fb270-2fdb-11e7-84e6-333bd21ad9fd\",\"col\":1,\"row\":6},{\"size_x\":12,\"size_y\":1,\"panelIndex\":20,\"type\":\"visualization\",\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"col\":1,\"row\":1}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/dashboard/ca480720-2fdf-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/dashboard/ca480720-2fdf-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 5e0a41544..000000000
--- a/modules/netflow/configuration/kibana/dashboard/ca480720-2fdf-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Flow Records", "uiStateJSON": "{\"P-3\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}}", "panelsJSON": "[{\"col\":4,\"id\":\"6a7e4790-2fe0-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":2,\"row\":2,\"size_x\":9,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"bbac23d0-2fe0-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":3,\"row\":2,\"size_x\":3,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":4,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"size_x\":12,\"size_y\":4,\"panelIndex\":5,\"type\":\"search\",\"id\":\"0d0216f0-2fe0-11e7-9d02-3f49bde5c1d5\",\"col\":1,\"row\":4,\"columns\":[\"netflow.src_addr\",\"netflow.src_port_name\",\"netflow.dst_addr\",\"netflow.dst_port_name\",\"netflow.protocol_name\",\"netflow.bytes\",\"netflow.packets\"],\"sort\":[\"@timestamp\",\"desc\"]}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/dashboard/d7e31d40-6589-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/dashboard/d7e31d40-6589-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 9557f34a2..000000000
--- a/modules/netflow/configuration/kibana/dashboard/d7e31d40-6589-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"hits": 0, "timeRestore": false, "description": "", "title": "Netflow: Autonomous Systems", "uiStateJSON": "{}", "panelsJSON": "[{\"col\":1,\"id\":\"26e166f0-2fe2-11e7-9d02-3f49bde5c1d5\",\"panelIndex\":1,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":7,\"id\":\"8c6ce180-657e-11e7-bd38-dd04615e7f62\",\"panelIndex\":2,\"row\":4,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"836b2010-657e-11e7-9748-5d4091219eef\",\"panelIndex\":3,\"row\":6,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"399c9fe0-657e-11e7-bd38-dd04615e7f62\",\"panelIndex\":4,\"row\":4,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"4a548ff0-657e-11e7-9748-5d4091219eef\",\"panelIndex\":5,\"row\":6,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"size_x\":4,\"size_y\":2,\"panelIndex\":6,\"type\":\"visualization\",\"id\":\"7aaa68d0-658a-11e7-bfc3-d74b7bb89482\",\"col\":1,\"row\":2},{\"size_x\":4,\"size_y\":2,\"panelIndex\":7,\"type\":\"visualization\",\"id\":\"793a6f00-2fdd-11e7-afd7-595689f3f18c\",\"col\":5,\"row\":2},{\"size_x\":4,\"size_y\":2,\"panelIndex\":8,\"type\":\"visualization\",\"id\":\"264fb270-2fdb-11e7-84e6-333bd21ad9fd\",\"col\":9,\"row\":2}]", "optionsJSON": "{\"darkTheme\":false}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}}}],\"highlightAll\":true,\"version\":true}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/dashboard/netflow.json b/modules/netflow/configuration/kibana/dashboard/netflow.json
deleted file mode 100644
index 57fb3d414..000000000
--- a/modules/netflow/configuration/kibana/dashboard/netflow.json
+++ /dev/null
@@ -1 +0,0 @@
-["a932b600-2fd2-11e7-99ed-49759aed30f5", "10584050-6234-11e7-8236-19b4b4941e22", "d7e31d40-6589-11e7-bfc3-d74b7bb89482", "310ae6e0-2fdf-11e7-9d02-3f49bde5c1d5", "653cf1e0-2fd2-11e7-99ed-49759aed30f5", "04157d70-6591-11e7-bfc3-d74b7bb89482", "ca480720-2fdf-11e7-9d02-3f49bde5c1d5", "0809c1f0-6719-11e7-b5b8-29fbded8e37c"]
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/index-pattern/netflow.json b/modules/netflow/configuration/kibana/index-pattern/netflow.json
deleted file mode 100644
index 714ccae0f..000000000
--- a/modules/netflow/configuration/kibana/index-pattern/netflow.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "title":"netflow-*",
-  "timeFieldName":"@timestamp",
-  "notExpandable":true,
-  "fields":"[{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"@version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"geoip.as_org\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.asn\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.autonomous_system\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.continent_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_code2\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_code3\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.dma_code\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.latitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.longitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.postal_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.region_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.timezone\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.as_org\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.asn\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.autonomous_system\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.continent_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.country_code2\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.country_code3\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.dma_code\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.latitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.longitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.postal_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.region_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_dst.timezone\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.as_org\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.asn\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.autonomous_system\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.continent_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.country_code2\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.country_code3\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.dma_code\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.latitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.longitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.postal_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.region_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip_src.timezone\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.direction\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_addr\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_as\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_locality\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_mac\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_mask_len\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_port\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_port_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.dst_vlan\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.engine_id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.engine_type\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.first_switched\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.flow_locality\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.flow_records\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.flow_seq_num\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.flowset_id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.input_snmp\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.ip_protocol_version\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.ip_version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.last_switched\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.next_hop\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.output_snmp\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.packets\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.protocol\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.protocol_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.sampling_algorithm\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.sampling_interval\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_addr\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_as\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_locality\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_mac\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_mask_len\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_port\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.src_port_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.tcp_flag_tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.tcp_flags\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.tcp_flags_label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.tos\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"netflow.vlan\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]"
-}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/search/0d0216f0-2fe0-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/search/0d0216f0-2fe0-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 77c89dbcb..000000000
--- a/modules/netflow/configuration/kibana/search/0d0216f0-2fe0-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"sort": ["@timestamp", "desc"], "hits": 0, "description": "", "title": "Netflow: Flow Records", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"highlightAll\":true,\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[],\"version\":true}"}, "columns": ["netflow.src_addr", "netflow.src_port_name", "netflow.dst_addr", "netflow.dst_port_name", "netflow.protocol_name", "netflow.bytes", "netflow.packets"]}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/search/netflow.json b/modules/netflow/configuration/kibana/search/netflow.json
deleted file mode 100644
index 733ef3aa6..000000000
--- a/modules/netflow/configuration/kibana/search/netflow.json
+++ /dev/null
@@ -1 +0,0 @@
-["0d0216f0-2fe0-11e7-9d02-3f49bde5c1d5"]
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/00248240-6593-11e7-b8de-af19b696fa44.json b/modules/netflow/configuration/kibana/visualization/00248240-6593-11e7-b8de-af19b696fa44.json
deleted file mode 100644
index 287e7eead..000000000
--- a/modules/netflow/configuration/kibana/visualization/00248240-6593-11e7-b8de-af19b696fa44.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Egress Interfaces (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.output_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.output_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Egress Interfaces (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/02e25f10-671a-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/visualization/02e25f10-671a-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index a29c7298e..000000000
--- a/modules/netflow/configuration/kibana/visualization/02e25f10-671a-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Source Ports\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.src_port_name\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Source Ports", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/04990fe0-6592-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/visualization/04990fe0-6592-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 9d5447463..000000000
--- a/modules/netflow/configuration/kibana/visualization/04990fe0-6592-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Egress Interfaces (packets)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.output_snmp\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Egress Interface\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Egress Interfaces (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/0927de10-6556-11e7-b27e-8f8b3770f1df.json b/modules/netflow/configuration/kibana/visualization/0927de10-6556-11e7-b27e-8f8b3770f1df.json
deleted file mode 100644
index ffef433ab..000000000
--- a/modules/netflow/configuration/kibana/visualization/0927de10-6556-11e7-b27e-8f8b3770f1df.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"geoip.country_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.country_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Countries (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/0de63e90-6558-11e7-8547-3d133170b50d.json b/modules/netflow/configuration/kibana/visualization/0de63e90-6558-11e7-8547-3d133170b50d.json
deleted file mode 100644
index 10bdcbf9f..000000000
--- a/modules/netflow/configuration/kibana/visualization/0de63e90-6558-11e7-8547-3d133170b50d.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Types of Service (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.tos:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tos:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Types of Service (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/1026edb0-2fcc-11e7-842d-39925ea8ac40.json b/modules/netflow/configuration/kibana/visualization/1026edb0-2fcc-11e7-842d-39925ea8ac40.json
deleted file mode 100644
index 72a927e76..000000000
--- a/modules/netflow/configuration/kibana/visualization/1026edb0-2fcc-11e7-842d-39925ea8ac40.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: IP Version (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.ip_version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"IP Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: IP Version (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/12ca1180-6593-11e7-9bf4-ed832088be20.json b/modules/netflow/configuration/kibana/visualization/12ca1180-6593-11e7-9bf4-ed832088be20.json
deleted file mode 100644
index c4d99f23e..000000000
--- a/modules/netflow/configuration/kibana/visualization/12ca1180-6593-11e7-9bf4-ed832088be20.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Egress Interfaces (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.output_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.output_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Egress Interfaces (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/1418ce10-6592-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/visualization/1418ce10-6592-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 044779e36..000000000
--- a/modules/netflow/configuration/kibana/visualization/1418ce10-6592-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Egress Interfaces (bytes)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.output_snmp\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Egress Interface\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Egress Interfaces (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/16438600-2fcb-11e7-befb-31e033c79e4e.json b/modules/netflow/configuration/kibana/visualization/16438600-2fcb-11e7-befb-31e033c79e4e.json
deleted file mode 100644
index edeaa0c0f..000000000
--- a/modules/netflow/configuration/kibana/visualization/16438600-2fcb-11e7-befb-31e033c79e4e.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Direction (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.direction\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Direction\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Direction (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/178b0af0-6230-11e7-9a50-efc26ded795d.json b/modules/netflow/configuration/kibana/visualization/178b0af0-6230-11e7-9a50-efc26ded795d.json
deleted file mode 100644
index 0be4bd9ec..000000000
--- a/modules/netflow/configuration/kibana/visualization/178b0af0-6230-11e7-9a50-efc26ded795d.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Locality (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.flow_locality\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Locality\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Locality (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/1e7d8770-2fc7-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/visualization/1e7d8770-2fc7-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index 651863dc9..000000000
--- a/modules/netflow/configuration/kibana/visualization/1e7d8770-2fc7-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Sources (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Sources (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/1fa2c100-6592-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/visualization/1fa2c100-6592-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 8e85e5b5c..000000000
--- a/modules/netflow/configuration/kibana/visualization/1fa2c100-6592-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Egress Interfaces (flow records)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.output_snmp\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Egress Interface\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Egress Interfaces (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/206d6e90-6593-11e7-8b83-5b2419db46fa.json b/modules/netflow/configuration/kibana/visualization/206d6e90-6593-11e7-8b83-5b2419db46fa.json
deleted file mode 100644
index 780c8bfdd..000000000
--- a/modules/netflow/configuration/kibana/visualization/206d6e90-6593-11e7-8b83-5b2419db46fa.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Egress Interfaces (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.output_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.output_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Egress Interfaces (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/231fe630-6558-11e7-8547-3d133170b50d.json b/modules/netflow/configuration/kibana/visualization/231fe630-6558-11e7-8547-3d133170b50d.json
deleted file mode 100644
index 41a84a30a..000000000
--- a/modules/netflow/configuration/kibana/visualization/231fe630-6558-11e7-8547-3d133170b50d.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Types of Service (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.tos:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tos:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Types of Service (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/23d6dc80-2fd6-11e7-bc99-41245d9394f2.json b/modules/netflow/configuration/kibana/visualization/23d6dc80-2fd6-11e7-bc99-41245d9394f2.json
deleted file mode 100644
index adc7f588e..000000000
--- a/modules/netflow/configuration/kibana/visualization/23d6dc80-2fd6-11e7-bc99-41245d9394f2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destinations and Ports (bytes)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_addr\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destinations and Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/264fb270-2fdb-11e7-84e6-333bd21ad9fd.json b/modules/netflow/configuration/kibana/visualization/264fb270-2fdb-11e7-84e6-333bd21ad9fd.json
deleted file mode 100644
index d4c9cd130..000000000
--- a/modules/netflow/configuration/kibana/visualization/264fb270-2fdb-11e7-84e6-333bd21ad9fd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination and Source Ports (flow records)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Flow Records\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination Port\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination and Source Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/26e166f0-2fe2-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/visualization/26e166f0-2fe2-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 824d78d96..000000000
--- a/modules/netflow/configuration/kibana/visualization/26e166f0-2fe2-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Dashboard Navigation\",\"type\":\"markdown\",\"params\":{\"markdown\":\"[Overview](#/dashboard/653cf1e0-2fd2-11e7-99ed-49759aed30f5) | [Conversation Partners](#/dashboard/310ae6e0-2fdf-11e7-9d02-3f49bde5c1d5) | [Traffic Analysis](#/dashboard/10584050-6234-11e7-8236-19b4b4941e22) | [Top-N](#/dashboard/0809c1f0-6719-11e7-b5b8-29fbded8e37c) | [Geo Location](#/dashboard/a932b600-2fd2-11e7-99ed-49759aed30f5) | [Autonomous Systems](#/dashboard/d7e31d40-6589-11e7-bfc3-d74b7bb89482) | [Flow Exporters](#/dashboard/04157d70-6591-11e7-bfc3-d74b7bb89482) | [Raw Flow Records](#/dashboard/ca480720-2fdf-11e7-9d02-3f49bde5c1d5)\\n***\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Dashboard Navigation", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/2aeac270-6230-11e7-84f1-9728c106b1b6.json b/modules/netflow/configuration/kibana/visualization/2aeac270-6230-11e7-84f1-9728c106b1b6.json
deleted file mode 100644
index e0df55dfc..000000000
--- a/modules/netflow/configuration/kibana/visualization/2aeac270-6230-11e7-84f1-9728c106b1b6.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Locality (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.flow_locality\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Locality\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Locality (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/2c9567c0-6289-11e7-bcd8-a16ef1d32773.json b/modules/netflow/configuration/kibana/visualization/2c9567c0-6289-11e7-bcd8-a16ef1d32773.json
deleted file mode 100644
index a90386061..000000000
--- a/modules/netflow/configuration/kibana/visualization/2c9567c0-6289-11e7-bcd8-a16ef1d32773.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.tcp_flags_label:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tcp_flags_label:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/3026fe40-658f-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/visualization/3026fe40-658f-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 439a66ec7..000000000
--- a/modules/netflow/configuration/kibana/visualization/3026fe40-658f-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Version (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Version (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/313a9880-2fd6-11e7-bc99-41245d9394f2.json b/modules/netflow/configuration/kibana/visualization/313a9880-2fd6-11e7-bc99-41245d9394f2.json
deleted file mode 100644
index ea92c668c..000000000
--- a/modules/netflow/configuration/kibana/visualization/313a9880-2fd6-11e7-bc99-41245d9394f2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destinations and Ports (packets)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.packets\",\n        \"customLabel\": \"Packets\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_addr\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destinations and Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/324b0a00-2fc9-11e7-bd31-a722d271a9cc.json b/modules/netflow/configuration/kibana/visualization/324b0a00-2fc9-11e7-bd31-a722d271a9cc.json
deleted file mode 100644
index 14aa3dc20..000000000
--- a/modules/netflow/configuration/kibana/visualization/324b0a00-2fc9-11e7-bd31-a722d271a9cc.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.country_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Countries (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/326fae40-671a-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/visualization/326fae40-671a-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index dc7bc7990..000000000
--- a/modules/netflow/configuration/kibana/visualization/326fae40-671a-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Protocols\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Protocols", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/3277ea90-6578-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/visualization/3277ea90-6578-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index 7e635a2eb..000000000
--- a/modules/netflow/configuration/kibana/visualization/3277ea90-6578-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.src_addr\",\"customLabel\":\"Sources\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Source Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/399c9fe0-657e-11e7-bd38-dd04615e7f62.json b/modules/netflow/configuration/kibana/visualization/399c9fe0-657e-11e7-bd38-dd04615e7f62.json
deleted file mode 100644
index 8502a7159..000000000
--- a/modules/netflow/configuration/kibana/visualization/399c9fe0-657e-11e7-bd38-dd04615e7f62.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Autonomous Systems (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"geoip_src.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_src.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Autonomous Systems (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/39e3dab0-2fcb-11e7-befb-31e033c79e4e.json b/modules/netflow/configuration/kibana/visualization/39e3dab0-2fcb-11e7-befb-31e033c79e4e.json
deleted file mode 100644
index 4a175ff05..000000000
--- a/modules/netflow/configuration/kibana/visualization/39e3dab0-2fcb-11e7-befb-31e033c79e4e.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Version\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Version", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/39ecd800-6558-11e7-bea4-0f5fadb995cc.json b/modules/netflow/configuration/kibana/visualization/39ecd800-6558-11e7-bea4-0f5fadb995cc.json
deleted file mode 100644
index 321546703..000000000
--- a/modules/netflow/configuration/kibana/visualization/39ecd800-6558-11e7-bea4-0f5fadb995cc.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLANs (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.vlan:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.vlan:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: VLANs (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/3ee07620-6556-11e7-995a-3584c2c6482c.json b/modules/netflow/configuration/kibana/visualization/3ee07620-6556-11e7-995a-3584c2c6482c.json
deleted file mode 100644
index 9f31eb410..000000000
--- a/modules/netflow/configuration/kibana/visualization/3ee07620-6556-11e7-995a-3584c2c6482c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Ports (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.dst_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/3fa5f6f0-2fca-11e7-ab32-99f279b941ef.json b/modules/netflow/configuration/kibana/visualization/3fa5f6f0-2fca-11e7-ab32-99f279b941ef.json
deleted file mode 100644
index 52ab78c12..000000000
--- a/modules/netflow/configuration/kibana/visualization/3fa5f6f0-2fca-11e7-ab32-99f279b941ef.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries and Cities (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.country_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.city_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Countries and Cities (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/41a7e3a0-658f-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/visualization/41a7e3a0-658f-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index cd08fa420..000000000
--- a/modules/netflow/configuration/kibana/visualization/41a7e3a0-658f-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Version (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Version (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/43e698c0-657e-11e7-99b6-af4533b21b46.json b/modules/netflow/configuration/kibana/visualization/43e698c0-657e-11e7-99b6-af4533b21b46.json
deleted file mode 100644
index aa96a138b..000000000
--- a/modules/netflow/configuration/kibana/visualization/43e698c0-657e-11e7-99b6-af4533b21b46.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Autonomous Systems (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"geoip_src.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_src.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flows records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Autonomous Systems (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/4440e130-2fdd-11e7-afd7-595689f3f18c.json b/modules/netflow/configuration/kibana/visualization/4440e130-2fdd-11e7-afd7-595689f3f18c.json
deleted file mode 100644
index 28d8290e5..000000000
--- a/modules/netflow/configuration/kibana/visualization/4440e130-2fdd-11e7-afd7-595689f3f18c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations and Sources (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations and Sources (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/44b3cb70-2fd6-11e7-bc99-41245d9394f2.json b/modules/netflow/configuration/kibana/visualization/44b3cb70-2fd6-11e7-bc99-41245d9394f2.json
deleted file mode 100644
index 55b294e2f..000000000
--- a/modules/netflow/configuration/kibana/visualization/44b3cb70-2fd6-11e7-bc99-41245d9394f2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destinations and Ports (flow records)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Flow Records\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_addr\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destinations and Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/47d426a0-2fc8-11e7-8b06-97426538fddd.json b/modules/netflow/configuration/kibana/visualization/47d426a0-2fc8-11e7-8b06-97426538fddd.json
deleted file mode 100644
index 1ce79aace..000000000
--- a/modules/netflow/configuration/kibana/visualization/47d426a0-2fc8-11e7-8b06-97426538fddd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination Ports (bytes)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/4898db90-2fdb-11e7-84e6-333bd21ad9fd.json b/modules/netflow/configuration/kibana/visualization/4898db90-2fdb-11e7-84e6-333bd21ad9fd.json
deleted file mode 100644
index d68f4c33d..000000000
--- a/modules/netflow/configuration/kibana/visualization/4898db90-2fdb-11e7-84e6-333bd21ad9fd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination and Source Ports (bytes)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination Port\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination and Source Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/49a2d6b0-2fc9-11e7-8224-a900ea73fa5f.json b/modules/netflow/configuration/kibana/visualization/49a2d6b0-2fc9-11e7-8224-a900ea73fa5f.json
deleted file mode 100644
index 041d8adc8..000000000
--- a/modules/netflow/configuration/kibana/visualization/49a2d6b0-2fc9-11e7-8224-a900ea73fa5f.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.country_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Countries (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/4a548ff0-657e-11e7-9748-5d4091219eef.json b/modules/netflow/configuration/kibana/visualization/4a548ff0-657e-11e7-9748-5d4091219eef.json
deleted file mode 100644
index d5deb3d27..000000000
--- a/modules/netflow/configuration/kibana/visualization/4a548ff0-657e-11e7-9748-5d4091219eef.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Autonomous Systems (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"geoip_src.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_src.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Autonomous Systems (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/4a6f6030-6558-11e7-bea4-0f5fadb995cc.json b/modules/netflow/configuration/kibana/visualization/4a6f6030-6558-11e7-bea4-0f5fadb995cc.json
deleted file mode 100644
index d58a47e30..000000000
--- a/modules/netflow/configuration/kibana/visualization/4a6f6030-6558-11e7-bea4-0f5fadb995cc.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLANs (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.vlan:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.vlan:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: VLANs (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/4dc994a0-2fd7-11e7-97a8-85d8d5a99269.json b/modules/netflow/configuration/kibana/visualization/4dc994a0-2fd7-11e7-97a8-85d8d5a99269.json
deleted file mode 100644
index dceaf28c9..000000000
--- a/modules/netflow/configuration/kibana/visualization/4dc994a0-2fd7-11e7-97a8-85d8d5a99269.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Types of Service (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.tos\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Type of Service\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Types of Service (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/4ea0a8d0-658f-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/visualization/4ea0a8d0-658f-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 002986eeb..000000000
--- a/modules/netflow/configuration/kibana/visualization/4ea0a8d0-658f-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Version (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Version (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/4f3525d0-2fc7-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/visualization/4f3525d0-2fc7-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index 72a9f6e4f..000000000
--- a/modules/netflow/configuration/kibana/visualization/4f3525d0-2fc7-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/51006340-671a-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/visualization/51006340-671a-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 5cb7ec44c..000000000
--- a/modules/netflow/configuration/kibana/visualization/51006340-671a-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Autonomous Systems\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"geoip.autonomous_system\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Autonomous System\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Autonomous Systems", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/52279a00-628c-11e7-95ed-8966ac93bd5a.json b/modules/netflow/configuration/kibana/visualization/52279a00-628c-11e7-95ed-8966ac93bd5a.json
deleted file mode 100644
index d9e1be23c..000000000
--- a/modules/netflow/configuration/kibana/visualization/52279a00-628c-11e7-95ed-8966ac93bd5a.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"geoip.country_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.country_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Countries (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/55be8550-655e-11e7-9dda-9f993e2ba58b.json b/modules/netflow/configuration/kibana/visualization/55be8550-655e-11e7-9dda-9f993e2ba58b.json
deleted file mode 100644
index 65bdb5add..000000000
--- a/modules/netflow/configuration/kibana/visualization/55be8550-655e-11e7-9dda-9f993e2ba58b.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Count\",\"type\":\"metric\",\"params\":{\"handleNoResults\":true,\"fontSize\":\"32\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.dst_addr\",\"customLabel\":\"Destinations\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Count", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/55f66b20-2fdd-11e7-afd7-595689f3f18c.json b/modules/netflow/configuration/kibana/visualization/55f66b20-2fdd-11e7-afd7-595689f3f18c.json
deleted file mode 100644
index 4e215a933..000000000
--- a/modules/netflow/configuration/kibana/visualization/55f66b20-2fdd-11e7-afd7-595689f3f18c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations and Sources (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations and Sources (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/56a23ac0-628e-11e7-a842-b787fa3508ce.json b/modules/netflow/configuration/kibana/visualization/56a23ac0-628e-11e7-a842-b787fa3508ce.json
deleted file mode 100644
index ac903fd95..000000000
--- a/modules/netflow/configuration/kibana/visualization/56a23ac0-628e-11e7-a842-b787fa3508ce.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.dst_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/5c5d6f60-2fdb-11e7-84e6-333bd21ad9fd.json b/modules/netflow/configuration/kibana/visualization/5c5d6f60-2fdb-11e7-84e6-333bd21ad9fd.json
deleted file mode 100644
index 203bd5538..000000000
--- a/modules/netflow/configuration/kibana/visualization/5c5d6f60-2fdb-11e7-84e6-333bd21ad9fd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination and Source Ports (packets)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.packets\",\n        \"customLabel\": \"Packets\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination Port\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination and Source Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/5e58cc00-6556-11e7-995a-3584c2c6482c.json b/modules/netflow/configuration/kibana/visualization/5e58cc00-6556-11e7-995a-3584c2c6482c.json
deleted file mode 100644
index b05776a8c..000000000
--- a/modules/netflow/configuration/kibana/visualization/5e58cc00-6556-11e7-995a-3584c2c6482c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Ports (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.dst_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/5fd2fe30-2fc7-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/visualization/5fd2fe30-2fc7-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index 41433dc1d..000000000
--- a/modules/netflow/configuration/kibana/visualization/5fd2fe30-2fc7-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/622844d0-6288-11e7-bcd8-a16ef1d32773.json b/modules/netflow/configuration/kibana/visualization/622844d0-6288-11e7-bcd8-a16ef1d32773.json
deleted file mode 100644
index d012edf9e..000000000
--- a/modules/netflow/configuration/kibana/visualization/622844d0-6288-11e7-bcd8-a16ef1d32773.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Ports (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.dst_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/64b144f0-658e-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/visualization/64b144f0-658e-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index f5c588cf6..000000000
--- a/modules/netflow/configuration/kibana/visualization/64b144f0-658e-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Flow Exporters (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"host\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Flow Exporter\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Flow Exporters (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/65f3b500-6557-11e7-87c3-994b88f84501.json b/modules/netflow/configuration/kibana/visualization/65f3b500-6557-11e7-87c3-994b88f84501.json
deleted file mode 100644
index f84a2a03f..000000000
--- a/modules/netflow/configuration/kibana/visualization/65f3b500-6557-11e7-87c3-994b88f84501.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Sources (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.src_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Sources (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/6702de70-2fca-11e7-8fcd-8dc6c60d4592.json b/modules/netflow/configuration/kibana/visualization/6702de70-2fca-11e7-8fcd-8dc6c60d4592.json
deleted file mode 100644
index cf3908f9c..000000000
--- a/modules/netflow/configuration/kibana/visualization/6702de70-2fca-11e7-8fcd-8dc6c60d4592.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries and Cities (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.country_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.city_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Countries and Cities (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/691cda40-2fc9-11e7-823a-89e4bb55eaa1.json b/modules/netflow/configuration/kibana/visualization/691cda40-2fc9-11e7-823a-89e4bb55eaa1.json
deleted file mode 100644
index 3441317a1..000000000
--- a/modules/netflow/configuration/kibana/visualization/691cda40-2fc9-11e7-823a-89e4bb55eaa1.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.country_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Countries (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/69f864d0-2fd7-11e7-97a8-85d8d5a99269.json b/modules/netflow/configuration/kibana/visualization/69f864d0-2fd7-11e7-97a8-85d8d5a99269.json
deleted file mode 100644
index 6eea98f5d..000000000
--- a/modules/netflow/configuration/kibana/visualization/69f864d0-2fd7-11e7-97a8-85d8d5a99269.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Types of Service (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.tos\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Type of Service\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Types of Service (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/6a597070-6233-11e7-aa4b-5f8c56ec33b8.json b/modules/netflow/configuration/kibana/visualization/6a597070-6233-11e7-aa4b-5f8c56ec33b8.json
deleted file mode 100644
index 8831c4f8f..000000000
--- a/modules/netflow/configuration/kibana/visualization/6a597070-6233-11e7-aa4b-5f8c56ec33b8.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous Systems (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"geoip.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous Systems (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/6a7e4790-2fe0-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/visualization/6a7e4790-2fe0-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index b66c1f49f..000000000
--- a/modules/netflow/configuration/kibana/visualization/6a7e4790-2fe0-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Flow Records\",\"type\":\"histogram\",\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"category\"}],\"defaultYExtents\":false,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"legendPosition\":\"right\",\"mode\":\"stacked\",\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Flow Records\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Count\"},\"type\":\"value\"}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.last_switched\",\"interval\":\"s\",\"customInterval\":\"2h\",\"min_doc_count\":1,\"extended_bounds\":{},\"customLabel\":\"Timeline\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"netflow.version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Flow Records", "uiStateJSON": "{\"vis\":{\"legendOpen\":true}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/6ad67290-6289-11e7-bcd8-a16ef1d32773.json b/modules/netflow/configuration/kibana/visualization/6ad67290-6289-11e7-bcd8-a16ef1d32773.json
deleted file mode 100644
index b81b1fbd2..000000000
--- a/modules/netflow/configuration/kibana/visualization/6ad67290-6289-11e7-bcd8-a16ef1d32773.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Types of Service (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.tos:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tos:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Types of Service (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/6c67b990-628c-11e7-95ed-8966ac93bd5a.json b/modules/netflow/configuration/kibana/visualization/6c67b990-628c-11e7-95ed-8966ac93bd5a.json
deleted file mode 100644
index fadc7dfca..000000000
--- a/modules/netflow/configuration/kibana/visualization/6c67b990-628c-11e7-95ed-8966ac93bd5a.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Cities (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"geoip.city_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.city_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Cities (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/6f6d05b0-2fc8-11e7-bf24-57efade8fd83.json b/modules/netflow/configuration/kibana/visualization/6f6d05b0-2fc8-11e7-bf24-57efade8fd83.json
deleted file mode 100644
index 6ce6aea70..000000000
--- a/modules/netflow/configuration/kibana/visualization/6f6d05b0-2fc8-11e7-bf24-57efade8fd83.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination Ports (flow records)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Flow Records\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/71272b10-6579-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/visualization/71272b10-6579-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index 92cecc9c6..000000000
--- a/modules/netflow/configuration/kibana/visualization/71272b10-6579-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Source Port Count\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addLegend\": false,\n    \"addTooltip\": true,\n    \"fontSize\": \"32\",\n    \"gauge\": {\n      \"autoExtend\": false,\n      \"backStyle\": \"Full\",\n      \"colorSchema\": \"Green to Red\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 100\n        }\n      ],\n      \"gaugeColorMode\": \"None\",\n      \"gaugeStyle\": \"Full\",\n      \"gaugeType\": \"Metric\",\n      \"invertColors\": false,\n      \"labels\": {\n        \"color\": \"black\",\n        \"show\": true\n      },\n      \"orientation\": \"vertical\",\n      \"percentageMode\": false,\n      \"scale\": {\n        \"color\": \"#333\",\n        \"labels\": false,\n        \"show\": false,\n        \"width\": 2\n      },\n      \"style\": {\n        \"bgColor\": false,\n        \"bgFill\": \"#000\",\n        \"fontSize\": \"36\",\n        \"labelColor\": false,\n        \"subText\": \"\"\n      },\n      \"type\": \"simple\",\n      \"useRange\": false,\n      \"verticalSplit\": false\n    },\n    \"handleNoResults\": true,\n    \"type\": \"gauge\"\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"customLabel\": \"Source Ports\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Source Port Count", "uiStateJSON": "{\n  \"vis\": {\n    \"defaultColors\": {\n      \"0 - 100\": \"rgb(0,104,55)\"\n    }\n  }\n}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/735d6c70-628e-11e7-a842-b787fa3508ce.json b/modules/netflow/configuration/kibana/visualization/735d6c70-628e-11e7-a842-b787fa3508ce.json
deleted file mode 100644
index a36c13993..000000000
--- a/modules/netflow/configuration/kibana/visualization/735d6c70-628e-11e7-a842-b787fa3508ce.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Sources (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.src_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Sources (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/73c37440-658e-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/visualization/73c37440-658e-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 4a690fc0b..000000000
--- a/modules/netflow/configuration/kibana/visualization/73c37440-658e-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Flow Exporters (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"host\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Flow Exporter\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Flow Exporters (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/793a6f00-2fdd-11e7-afd7-595689f3f18c.json b/modules/netflow/configuration/kibana/visualization/793a6f00-2fdd-11e7-afd7-595689f3f18c.json
deleted file mode 100644
index 50fb5a1ed..000000000
--- a/modules/netflow/configuration/kibana/visualization/793a6f00-2fdd-11e7-afd7-595689f3f18c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations and Sources (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations and Sources (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/7aaa68d0-658a-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/visualization/7aaa68d0-658a-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index f59fe89db..000000000
--- a/modules/netflow/configuration/kibana/visualization/7aaa68d0-658a-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination and Source ASs (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip_dst.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination AS\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip_src.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source AS\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destination and Source ASs (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/7c2cfd10-2fc7-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/visualization/7c2cfd10-2fc7-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index 0b476ff94..000000000
--- a/modules/netflow/configuration/kibana/visualization/7c2cfd10-2fc7-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Sources (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Sources (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/7e9a7980-622e-11e7-b0a5-e9bda2f6d168.json b/modules/netflow/configuration/kibana/visualization/7e9a7980-622e-11e7-b0a5-e9bda2f6d168.json
deleted file mode 100644
index 400104775..000000000
--- a/modules/netflow/configuration/kibana/visualization/7e9a7980-622e-11e7-b0a5-e9bda2f6d168.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.tcp_flags_label\",\"size\":255,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"TCP Flags\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/7e9cb7e0-671a-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/visualization/7e9cb7e0-671a-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 6130531e3..000000000
--- a/modules/netflow/configuration/kibana/visualization/7e9cb7e0-671a-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Flow Exporters\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"host\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Flow Exporter\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Flow Exporters", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/7f7aac00-2fc8-11e7-8bc1-177080983dbf.json b/modules/netflow/configuration/kibana/visualization/7f7aac00-2fc8-11e7-8bc1-177080983dbf.json
deleted file mode 100644
index 819ce3c20..000000000
--- a/modules/netflow/configuration/kibana/visualization/7f7aac00-2fc8-11e7-8bc1-177080983dbf.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Ports (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_port_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Port\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/82fcfc50-657b-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/visualization/82fcfc50-657b-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index f818ef5ec..000000000
--- a/modules/netflow/configuration/kibana/visualization/82fcfc50-657b-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.tcp_flags_label\",\"customLabel\":\"TCP Flag States\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/835e6090-6557-11e7-87c3-994b88f84501.json b/modules/netflow/configuration/kibana/visualization/835e6090-6557-11e7-87c3-994b88f84501.json
deleted file mode 100644
index 077d090bf..000000000
--- a/modules/netflow/configuration/kibana/visualization/835e6090-6557-11e7-87c3-994b88f84501.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Sources (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.src_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Sources (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/836b2010-657e-11e7-9748-5d4091219eef.json b/modules/netflow/configuration/kibana/visualization/836b2010-657e-11e7-9748-5d4091219eef.json
deleted file mode 100644
index 23c6fdcff..000000000
--- a/modules/netflow/configuration/kibana/visualization/836b2010-657e-11e7-9748-5d4091219eef.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Autonomous Systems (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"geoip_dst.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_dst.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Autonomous Systems (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/84e4c9f0-2fd7-11e7-97a8-85d8d5a99269.json b/modules/netflow/configuration/kibana/visualization/84e4c9f0-2fd7-11e7-97a8-85d8d5a99269.json
deleted file mode 100644
index eda88c1d6..000000000
--- a/modules/netflow/configuration/kibana/visualization/84e4c9f0-2fd7-11e7-97a8-85d8d5a99269.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Types of Service (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.tos\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Type of Service\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Types of Service (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/8500a670-6579-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/visualization/8500a670-6579-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index c178c829e..000000000
--- a/modules/netflow/configuration/kibana/visualization/8500a670-6579-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Destination Port Count\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addLegend\": false,\n    \"addTooltip\": true,\n    \"fontSize\": \"32\",\n    \"gauge\": {\n      \"autoExtend\": false,\n      \"backStyle\": \"Full\",\n      \"colorSchema\": \"Green to Red\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 100\n        }\n      ],\n      \"gaugeColorMode\": \"None\",\n      \"gaugeStyle\": \"Full\",\n      \"gaugeType\": \"Metric\",\n      \"invertColors\": false,\n      \"labels\": {\n        \"color\": \"black\",\n        \"show\": true\n      },\n      \"orientation\": \"vertical\",\n      \"percentageMode\": false,\n      \"scale\": {\n        \"color\": \"#333\",\n        \"labels\": false,\n        \"show\": false,\n        \"width\": 2\n      },\n      \"style\": {\n        \"bgColor\": false,\n        \"bgFill\": \"#000\",\n        \"fontSize\": \"36\",\n        \"labelColor\": false,\n        \"subText\": \"\"\n      },\n      \"type\": \"simple\",\n      \"useRange\": false,\n      \"verticalSplit\": false\n    },\n    \"handleNoResults\": true,\n    \"type\": \"gauge\"\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"customLabel\": \"Destination Ports\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Destination Port Count", "uiStateJSON": "{\n  \"vis\": {\n    \"defaultColors\": {\n      \"0 - 100\": \"rgb(0,104,55)\"\n    }\n  }\n}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/87dbc0a0-657e-11e7-99b6-af4533b21b46.json b/modules/netflow/configuration/kibana/visualization/87dbc0a0-657e-11e7-99b6-af4533b21b46.json
deleted file mode 100644
index 0870127bd..000000000
--- a/modules/netflow/configuration/kibana/visualization/87dbc0a0-657e-11e7-99b6-af4533b21b46.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Autonomous Systems (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"geoip_dst.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_dst.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flows records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Autonomous Systems (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/8a52f7a0-2fc7-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/visualization/8a52f7a0-2fc7-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index 1834df905..000000000
--- a/modules/netflow/configuration/kibana/visualization/8a52f7a0-2fc7-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Sources (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Sources (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/8c6ce180-657e-11e7-bd38-dd04615e7f62.json b/modules/netflow/configuration/kibana/visualization/8c6ce180-657e-11e7-bd38-dd04615e7f62.json
deleted file mode 100644
index e3fc1fd84..000000000
--- a/modules/netflow/configuration/kibana/visualization/8c6ce180-657e-11e7-bd38-dd04615e7f62.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination Autonomous Systems (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"geoip_dst.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip_dst.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destination Autonomous Systems (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/8d2cb120-6233-11e7-aa4b-5f8c56ec33b8.json b/modules/netflow/configuration/kibana/visualization/8d2cb120-6233-11e7-aa4b-5f8c56ec33b8.json
deleted file mode 100644
index 4b0204c67..000000000
--- a/modules/netflow/configuration/kibana/visualization/8d2cb120-6233-11e7-aa4b-5f8c56ec33b8.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous Systems (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"geoip.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous Systems (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/8dcbcce0-2fd6-11e7-a82c-3146dd695923.json b/modules/netflow/configuration/kibana/visualization/8dcbcce0-2fd6-11e7-a82c-3146dd695923.json
deleted file mode 100644
index d4303ca39..000000000
--- a/modules/netflow/configuration/kibana/visualization/8dcbcce0-2fd6-11e7-a82c-3146dd695923.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Sources and Ports (bytes)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_addr\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Sources and Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/8f35efc0-2fcc-11e7-842d-39925ea8ac40.json b/modules/netflow/configuration/kibana/visualization/8f35efc0-2fcc-11e7-842d-39925ea8ac40.json
deleted file mode 100644
index c3818b58b..000000000
--- a/modules/netflow/configuration/kibana/visualization/8f35efc0-2fcc-11e7-842d-39925ea8ac40.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: IP Version and Protocols (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.ip_version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"IP Version\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: IP Version and Protocols (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/91ae4100-6288-11e7-bcd8-a16ef1d32773.json b/modules/netflow/configuration/kibana/visualization/91ae4100-6288-11e7-bcd8-a16ef1d32773.json
deleted file mode 100644
index 39e5c1963..000000000
--- a/modules/netflow/configuration/kibana/visualization/91ae4100-6288-11e7-bcd8-a16ef1d32773.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Ports (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.src_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/97f430b0-622e-11e7-b0a5-e9bda2f6d168.json b/modules/netflow/configuration/kibana/visualization/97f430b0-622e-11e7-b0a5-e9bda2f6d168.json
deleted file mode 100644
index 8e684f027..000000000
--- a/modules/netflow/configuration/kibana/visualization/97f430b0-622e-11e7-b0a5-e9bda2f6d168.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.tcp_flags_label\",\"size\":255,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"TCP Flags\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/99382ab0-6555-11e7-8d48-19b0c51bbbbd.json b/modules/netflow/configuration/kibana/visualization/99382ab0-6555-11e7-8d48-19b0c51bbbbd.json
deleted file mode 100644
index 42b758d7e..000000000
--- a/modules/netflow/configuration/kibana/visualization/99382ab0-6555-11e7-8d48-19b0c51bbbbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Cities (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"geoip.city_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.city_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Cities (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/99c1a4a0-2f60-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/visualization/99c1a4a0-2f60-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index bc876cd22..000000000
--- a/modules/netflow/configuration/kibana/visualization/99c1a4a0-2f60-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Geo Location Heatmap\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Heatmap\",\"isDesaturated\":true,\"addTooltip\":true,\"heatMaxZoom\":16,\"heatMinOpacity\":\"0.32\",\"heatRadius\":\"24\",\"heatBlur\":\"16\",\"heatNormalizeData\":true,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[15,5],\"wms\":{\"enabled\":false,\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\",\"options\":{\"version\":\"1.3.0\",\"layers\":\"0\",\"format\":\"image/png\",\"transparent\":true,\"attribution\":\"Maps provided by USGS\",\"styles\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.location\",\"autoPrecision\":true,\"precision\":2,\"customLabel\":\"Location\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Geo Location Heatmap", "uiStateJSON": "{\"mapCenter\":[8.407168163601076,9.4921875]}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/99e49de0-2fcc-11e7-842d-39925ea8ac40.json b/modules/netflow/configuration/kibana/visualization/99e49de0-2fcc-11e7-842d-39925ea8ac40.json
deleted file mode 100644
index b33bf5844..000000000
--- a/modules/netflow/configuration/kibana/visualization/99e49de0-2fcc-11e7-842d-39925ea8ac40.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Protocols (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Protocols (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/9a4938d0-6592-11e7-b8de-af19b696fa44.json b/modules/netflow/configuration/kibana/visualization/9a4938d0-6592-11e7-b8de-af19b696fa44.json
deleted file mode 100644
index 5bf13524a..000000000
--- a/modules/netflow/configuration/kibana/visualization/9a4938d0-6592-11e7-b8de-af19b696fa44.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Ingress Interfaces (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.input_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.input_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Ingress Interfaces (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/9accd4a0-657a-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/visualization/9accd4a0-657a-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index 81e822cc4..000000000
--- a/modules/netflow/configuration/kibana/visualization/9accd4a0-657a-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: ToS Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.tos\",\"customLabel\":\"Types of Service\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: ToS Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/9b5d3b80-2fc9-11e7-bd31-a722d271a9cc.json b/modules/netflow/configuration/kibana/visualization/9b5d3b80-2fc9-11e7-bd31-a722d271a9cc.json
deleted file mode 100644
index b090e4edc..000000000
--- a/modules/netflow/configuration/kibana/visualization/9b5d3b80-2fc9-11e7-bd31-a722d271a9cc.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Cities (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.city_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Cities (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/9f113d80-6719-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/visualization/9f113d80-6719-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 335b17d0b..000000000
--- a/modules/netflow/configuration/kibana/visualization/9f113d80-6719-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Destinations\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Destination\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Destinations", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/9f9e54b0-2fd6-11e7-a82c-3146dd695923.json b/modules/netflow/configuration/kibana/visualization/9f9e54b0-2fd6-11e7-a82c-3146dd695923.json
deleted file mode 100644
index 5958480c9..000000000
--- a/modules/netflow/configuration/kibana/visualization/9f9e54b0-2fd6-11e7-a82c-3146dd695923.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Sources and Ports (packets)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.packets\",\n        \"customLabel\": \"Packets\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_addr\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Sources and Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/a13402f0-6557-11e7-a3eb-4b30743c9370.json b/modules/netflow/configuration/kibana/visualization/a13402f0-6557-11e7-a3eb-4b30743c9370.json
deleted file mode 100644
index 19fe02da6..000000000
--- a/modules/netflow/configuration/kibana/visualization/a13402f0-6557-11e7-a3eb-4b30743c9370.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.tcp_flags_label:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tcp_flags_label:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/a2099810-657b-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/visualization/a2099810-657b-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index 2a0f7aa07..000000000
--- a/modules/netflow/configuration/kibana/visualization/a2099810-657b-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous System Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"geoip.autonomous_system\",\"customLabel\":\"Autonomous Systems\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous System Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/a3541940-6556-11e7-a807-e52f264c6cfd.json b/modules/netflow/configuration/kibana/visualization/a3541940-6556-11e7-a807-e52f264c6cfd.json
deleted file mode 100644
index 8b15e7be6..000000000
--- a/modules/netflow/configuration/kibana/visualization/a3541940-6556-11e7-a807-e52f264c6cfd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.dst_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/a4ade270-658e-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/visualization/a4ade270-658e-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 9f1db8814..000000000
--- a/modules/netflow/configuration/kibana/visualization/a4ade270-658e-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Direction (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.direction\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Direction\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Direction (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/a7a47e70-2fde-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/visualization/a7a47e70-2fde-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 3ed157264..000000000
--- a/modules/netflow/configuration/kibana/visualization/a7a47e70-2fde-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Conversation Partners\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Conversation Partners", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/a8b68cb0-2fc8-11e7-8d8b-45ec51795dad.json b/modules/netflow/configuration/kibana/visualization/a8b68cb0-2fc8-11e7-8d8b-45ec51795dad.json
deleted file mode 100644
index 31e9491f3..000000000
--- a/modules/netflow/configuration/kibana/visualization/a8b68cb0-2fc8-11e7-8d8b-45ec51795dad.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Source Ports (bytes)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Source Ports (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/a8eadac0-658c-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/visualization/a8eadac0-658c-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 78466c9b2..000000000
--- a/modules/netflow/configuration/kibana/visualization/a8eadac0-658c-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Traffic Volume by Destination Port\",\n  \"type\": \"area\",\n  \"params\": {\n    \"grid\": {\n      \"categoryLines\": false,\n      \"style\": {\n        \"color\": \"#eee\"\n      }\n    },\n    \"categoryAxes\": [\n      {\n        \"id\": \"CategoryAxis-1\",\n        \"type\": \"category\",\n        \"position\": \"bottom\",\n        \"show\": true,\n        \"style\": {},\n        \"scale\": {\n          \"type\": \"linear\"\n        },\n        \"labels\": {\n          \"show\": true,\n          \"truncate\": 100\n        },\n        \"title\": {\n          \"text\": \"Time\"\n        }\n      }\n    ],\n    \"valueAxes\": [\n      {\n        \"id\": \"ValueAxis-1\",\n        \"name\": \"LeftAxis-1\",\n        \"type\": \"value\",\n        \"position\": \"left\",\n        \"show\": true,\n        \"style\": {},\n        \"scale\": {\n          \"type\": \"linear\",\n          \"mode\": \"normal\"\n        },\n        \"labels\": {\n          \"show\": true,\n          \"rotate\": 0,\n          \"filter\": false,\n          \"truncate\": 100\n        },\n        \"title\": {\n          \"text\": \"Bytes\"\n        }\n      }\n    ],\n    \"seriesParams\": [\n      {\n        \"show\": \"true\",\n        \"type\": \"area\",\n        \"mode\": \"stacked\",\n        \"data\": {\n          \"label\": \"Bytes\",\n          \"id\": \"1\"\n        },\n        \"valueAxis\": \"ValueAxis-1\",\n        \"drawLinesBetweenPoints\": true,\n        \"showCircles\": false,\n        \"interpolate\": \"cardinal\"\n      }\n    ],\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"times\": [],\n    \"addTimeMarker\": false\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"date_histogram\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.last_switched\",\n        \"interval\": \"auto\",\n        \"customInterval\": \"2h\",\n        \"min_doc_count\": 1,\n        \"extended_bounds\": {},\n        \"customLabel\": \"Time\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"group\",\n      \"params\": {\n        \"field\": \"netflow.dst_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Destination Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Traffic Volume by Destination Port", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/ac4cbc90-622d-11e7-b0a5-e9bda2f6d168.json b/modules/netflow/configuration/kibana/visualization/ac4cbc90-622d-11e7-b0a5-e9bda2f6d168.json
deleted file mode 100644
index 7a5f6bd30..000000000
--- a/modules/netflow/configuration/kibana/visualization/ac4cbc90-622d-11e7-b0a5-e9bda2f6d168.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous Systems (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Autonomous System\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous Systems (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/ad5cb080-622e-11e7-b0a5-e9bda2f6d168.json b/modules/netflow/configuration/kibana/visualization/ad5cb080-622e-11e7-b0a5-e9bda2f6d168.json
deleted file mode 100644
index 46dcb5544..000000000
--- a/modules/netflow/configuration/kibana/visualization/ad5cb080-622e-11e7-b0a5-e9bda2f6d168.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.tcp_flags_label\",\"size\":255,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"TCP Flags\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/af1425a0-2fc7-11e7-8936-6f5fd5520124.json b/modules/netflow/configuration/kibana/visualization/af1425a0-2fc7-11e7-8936-6f5fd5520124.json
deleted file mode 100644
index 9a448e61a..000000000
--- a/modules/netflow/configuration/kibana/visualization/af1425a0-2fc7-11e7-8936-6f5fd5520124.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.dst_addr\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/af23cb20-2fc9-11e7-8224-a900ea73fa5f.json b/modules/netflow/configuration/kibana/visualization/af23cb20-2fc9-11e7-8224-a900ea73fa5f.json
deleted file mode 100644
index 392445794..000000000
--- a/modules/netflow/configuration/kibana/visualization/af23cb20-2fc9-11e7-8224-a900ea73fa5f.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Cities (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.city_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Cities (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/b02faaf0-2fcb-11e7-8df8-b363df28ab61.json b/modules/netflow/configuration/kibana/visualization/b02faaf0-2fcb-11e7-8df8-b363df28ab61.json
deleted file mode 100644
index 63c839f71..000000000
--- a/modules/netflow/configuration/kibana/visualization/b02faaf0-2fcb-11e7-8df8-b363df28ab61.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: IP Version (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.ip_version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"IP Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: IP Version (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/b13956f0-657a-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/visualization/b13956f0-657a-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index d0302eeda..000000000
--- a/modules/netflow/configuration/kibana/visualization/b13956f0-657a-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLAN Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.vlan\",\"customLabel\":\"VLANs\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: VLAN Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/b2c9a3d0-658e-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/visualization/b2c9a3d0-658e-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 6dbda475a..000000000
--- a/modules/netflow/configuration/kibana/visualization/b2c9a3d0-658e-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Direction (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.direction\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Direction\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Direction (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/b2d02df0-6556-11e7-a807-e52f264c6cfd.json b/modules/netflow/configuration/kibana/visualization/b2d02df0-6556-11e7-a807-e52f264c6cfd.json
deleted file mode 100644
index 8c142fdb2..000000000
--- a/modules/netflow/configuration/kibana/visualization/b2d02df0-6556-11e7-a807-e52f264c6cfd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destinations (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.dst_addr:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.dst_addr:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Destinations (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/b3e2af90-657b-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/visualization/b3e2af90-657b-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index e2ed3b6e0..000000000
--- a/modules/netflow/configuration/kibana/visualization/b3e2af90-657b-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Country Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"geoip.country_name\",\"customLabel\":\"Countries\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Country Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/b58e1380-6719-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/visualization/b58e1380-6719-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 79a84236c..000000000
--- a/modules/netflow/configuration/kibana/visualization/b58e1380-6719-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Sources\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.src_addr\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Source\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Sources", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/b61f84d0-6289-11e7-bcd8-a16ef1d32773.json b/modules/netflow/configuration/kibana/visualization/b61f84d0-6289-11e7-bcd8-a16ef1d32773.json
deleted file mode 100644
index 39cb5931b..000000000
--- a/modules/netflow/configuration/kibana/visualization/b61f84d0-6289-11e7-bcd8-a16ef1d32773.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLANs (bytes)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.bytes\\\", split=\\\"netflow.vlan:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.vlan:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"bytes / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: VLANs (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/b6a092e0-2fcc-11e7-9bae-a35d2fe38fc2.json b/modules/netflow/configuration/kibana/visualization/b6a092e0-2fcc-11e7-9bae-a35d2fe38fc2.json
deleted file mode 100644
index 81a54099b..000000000
--- a/modules/netflow/configuration/kibana/visualization/b6a092e0-2fcc-11e7-9bae-a35d2fe38fc2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: IP Version (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.ip_version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"IP Version\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: IP Version (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/b74bbb70-2fd6-11e7-a82c-3146dd695923.json b/modules/netflow/configuration/kibana/visualization/b74bbb70-2fd6-11e7-a82c-3146dd695923.json
deleted file mode 100644
index dc66b8395..000000000
--- a/modules/netflow/configuration/kibana/visualization/b74bbb70-2fd6-11e7-a82c-3146dd695923.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Sources and Ports (flow records)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Flow Records\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_addr\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Sources and Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/b88a8790-2fd7-11e7-bd03-932d3e38a4ff.json b/modules/netflow/configuration/kibana/visualization/b88a8790-2fd7-11e7-bd03-932d3e38a4ff.json
deleted file mode 100644
index d69c6798d..000000000
--- a/modules/netflow/configuration/kibana/visualization/b88a8790-2fd7-11e7-bd03-932d3e38a4ff.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLANs (bytes)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.vlan\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"VLAN\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: VLANs (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/bb8e3d90-2fca-11e7-9fcf-99b4b8159f98.json b/modules/netflow/configuration/kibana/visualization/bb8e3d90-2fca-11e7-9fcf-99b4b8159f98.json
deleted file mode 100644
index 18f82618e..000000000
--- a/modules/netflow/configuration/kibana/visualization/bb8e3d90-2fca-11e7-9fcf-99b4b8159f98.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries and Cities (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.country_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.city_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Countries and Cities (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/bbac23d0-2fe0-11e7-9d02-3f49bde5c1d5.json b/modules/netflow/configuration/kibana/visualization/bbac23d0-2fe0-11e7-9d02-3f49bde5c1d5.json
deleted file mode 100644
index 6e50cf6d1..000000000
--- a/modules/netflow/configuration/kibana/visualization/bbac23d0-2fe0-11e7-9d02-3f49bde5c1d5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Flow Records\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Flow Records", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/bfec6260-6592-11e7-9bf4-ed832088be20.json b/modules/netflow/configuration/kibana/visualization/bfec6260-6592-11e7-9bf4-ed832088be20.json
deleted file mode 100644
index c11358aed..000000000
--- a/modules/netflow/configuration/kibana/visualization/bfec6260-6592-11e7-9bf4-ed832088be20.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Ingress Interfaces (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.input_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.input_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Ingress Interfaces (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/c4987cc0-657b-11e7-8471-e5432f50acbd.json b/modules/netflow/configuration/kibana/visualization/c4987cc0-657b-11e7-8471-e5432f50acbd.json
deleted file mode 100644
index 721d37d97..000000000
--- a/modules/netflow/configuration/kibana/visualization/c4987cc0-657b-11e7-8471-e5432f50acbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: City Count\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"32\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"36\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"geoip.city_name\",\"customLabel\":\"Cities\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: City Count", "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/c61bd8b0-658c-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/visualization/c61bd8b0-658c-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 4896722ab..000000000
--- a/modules/netflow/configuration/kibana/visualization/c61bd8b0-658c-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Traffic Volume by Source Port\",\n  \"type\": \"area\",\n  \"params\": {\n    \"grid\": {\n      \"categoryLines\": false,\n      \"style\": {\n        \"color\": \"#eee\"\n      }\n    },\n    \"categoryAxes\": [\n      {\n        \"id\": \"CategoryAxis-1\",\n        \"type\": \"category\",\n        \"position\": \"bottom\",\n        \"show\": true,\n        \"style\": {},\n        \"scale\": {\n          \"type\": \"linear\"\n        },\n        \"labels\": {\n          \"show\": true,\n          \"truncate\": 100\n        },\n        \"title\": {\n          \"text\": \"Time\"\n        }\n      }\n    ],\n    \"valueAxes\": [\n      {\n        \"id\": \"ValueAxis-1\",\n        \"name\": \"LeftAxis-1\",\n        \"type\": \"value\",\n        \"position\": \"left\",\n        \"show\": true,\n        \"style\": {},\n        \"scale\": {\n          \"type\": \"linear\",\n          \"mode\": \"normal\"\n        },\n        \"labels\": {\n          \"show\": true,\n          \"rotate\": 0,\n          \"filter\": false,\n          \"truncate\": 100\n        },\n        \"title\": {\n          \"text\": \"Bytes\"\n        }\n      }\n    ],\n    \"seriesParams\": [\n      {\n        \"show\": \"true\",\n        \"type\": \"area\",\n        \"mode\": \"stacked\",\n        \"data\": {\n          \"label\": \"Bytes\",\n          \"id\": \"1\"\n        },\n        \"valueAxis\": \"ValueAxis-1\",\n        \"drawLinesBetweenPoints\": true,\n        \"showCircles\": false,\n        \"interpolate\": \"cardinal\"\n      }\n    ],\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"times\": [],\n    \"addTimeMarker\": false\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.bytes\",\n        \"customLabel\": \"Bytes\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"date_histogram\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.last_switched\",\n        \"interval\": \"auto\",\n        \"customInterval\": \"2h\",\n        \"min_doc_count\": 1,\n        \"extended_bounds\": {},\n        \"customLabel\": \"Time\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"group\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Traffic Volume by Source Port", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/c6319680-2fc9-11e7-823a-89e4bb55eaa1.json b/modules/netflow/configuration/kibana/visualization/c6319680-2fc9-11e7-823a-89e4bb55eaa1.json
deleted file mode 100644
index b72f29aaa..000000000
--- a/modules/netflow/configuration/kibana/visualization/c6319680-2fc9-11e7-823a-89e4bb55eaa1.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Cities (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.city_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Cities (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/c6b36620-2fc8-11e7-87d6-cdce05879baf.json b/modules/netflow/configuration/kibana/visualization/c6b36620-2fc8-11e7-87d6-cdce05879baf.json
deleted file mode 100644
index 12569f797..000000000
--- a/modules/netflow/configuration/kibana/visualization/c6b36620-2fc8-11e7-87d6-cdce05879baf.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Source Ports (flow records)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Flow Records\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Source Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/ca786e30-622d-11e7-b0a5-e9bda2f6d168.json b/modules/netflow/configuration/kibana/visualization/ca786e30-622d-11e7-b0a5-e9bda2f6d168.json
deleted file mode 100644
index 33dee4b2b..000000000
--- a/modules/netflow/configuration/kibana/visualization/ca786e30-622d-11e7-b0a5-e9bda2f6d168.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous Systems (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Autonomous System\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous Systems (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/caea3760-6591-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/visualization/caea3760-6591-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index c614b431e..000000000
--- a/modules/netflow/configuration/kibana/visualization/caea3760-6591-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Ingress Interfaces (flow records)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.input_snmp\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Ingress Interface\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Ingress Interfaces (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/caf2c4b0-6556-11e7-be5f-c5cca8dd73b6.json b/modules/netflow/configuration/kibana/visualization/caf2c4b0-6556-11e7-be5f-c5cca8dd73b6.json
deleted file mode 100644
index c41547f1f..000000000
--- a/modules/netflow/configuration/kibana/visualization/caf2c4b0-6556-11e7-be5f-c5cca8dd73b6.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Ports (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.src_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/d07a2870-2fcc-11e7-9bae-a35d2fe38fc2.json b/modules/netflow/configuration/kibana/visualization/d07a2870-2fcc-11e7-9bae-a35d2fe38fc2.json
deleted file mode 100644
index bdf3d88ae..000000000
--- a/modules/netflow/configuration/kibana/visualization/d07a2870-2fcc-11e7-9bae-a35d2fe38fc2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: IP Version and Protocols (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.ip_version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"IP Version\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: IP Version and Protocols (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/d297fe60-2fd7-11e7-af27-99e728e71e91.json b/modules/netflow/configuration/kibana/visualization/d297fe60-2fd7-11e7-af27-99e728e71e91.json
deleted file mode 100644
index 3c083014e..000000000
--- a/modules/netflow/configuration/kibana/visualization/d297fe60-2fd7-11e7-af27-99e728e71e91.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLANs (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.vlan\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"VLAN\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: VLANs (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/d2a2db30-658a-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/visualization/d2a2db30-658a-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 2485949c8..000000000
--- a/modules/netflow/configuration/kibana/visualization/d2a2db30-658a-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination and Source ASs (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip_dst.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination AS\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip_src.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source AS\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destination and Source ASs (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/d4a408a0-671a-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/visualization/d4a408a0-671a-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index 121ee308b..000000000
--- a/modules/netflow/configuration/kibana/visualization/d4a408a0-671a-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Cities\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showMeticsAtAllLevels\":false,\"showPartialRows\":true,\"showTotal\":true,\"sort\":{\"columnIndex\":null,\"direction\":null},\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"geoip.country_name\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Country\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"geoip.city_name\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"City\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Cities", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":2,\"direction\":\"desc\"}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/d8f24780-2fcc-11e7-9bae-a35d2fe38fc2.json b/modules/netflow/configuration/kibana/visualization/d8f24780-2fcc-11e7-9bae-a35d2fe38fc2.json
deleted file mode 100644
index 5726f7273..000000000
--- a/modules/netflow/configuration/kibana/visualization/d8f24780-2fcc-11e7-9bae-a35d2fe38fc2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Protocols (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Protocols (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/d9fdbd80-6555-11e7-8d48-19b0c51bbbbd.json b/modules/netflow/configuration/kibana/visualization/d9fdbd80-6555-11e7-8d48-19b0c51bbbbd.json
deleted file mode 100644
index 5140e74fc..000000000
--- a/modules/netflow/configuration/kibana/visualization/d9fdbd80-6555-11e7-8d48-19b0c51bbbbd.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Cities (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"geoip.city_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.city_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Cities (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/daa62090-6557-11e7-a3eb-4b30743c9370.json b/modules/netflow/configuration/kibana/visualization/daa62090-6557-11e7-a3eb-4b30743c9370.json
deleted file mode 100644
index bc4d21c02..000000000
--- a/modules/netflow/configuration/kibana/visualization/daa62090-6557-11e7-a3eb-4b30743c9370.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: TCP Flags (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.tcp_flags_label:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.tcp_flags_label:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: TCP Flags (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/dcf88c60-6233-11e7-aa4b-5f8c56ec33b8.json b/modules/netflow/configuration/kibana/visualization/dcf88c60-6233-11e7-aa4b-5f8c56ec33b8.json
deleted file mode 100644
index b5c28766f..000000000
--- a/modules/netflow/configuration/kibana/visualization/dcf88c60-6233-11e7-aa4b-5f8c56ec33b8.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous Systems (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"geoip.autonomous_system:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.autonomous_system:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flows records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous Systems (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/de9b3dd0-2fc8-11e7-844c-67b9b101127b.json b/modules/netflow/configuration/kibana/visualization/de9b3dd0-2fc8-11e7-844c-67b9b101127b.json
deleted file mode 100644
index 00f3c1814..000000000
--- a/modules/netflow/configuration/kibana/visualization/de9b3dd0-2fc8-11e7-844c-67b9b101127b.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\n  \"title\": \"Netflow: Source Ports (packets)\",\n  \"type\": \"pie\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"isDonut\": true\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"sum\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"netflow.packets\",\n        \"customLabel\": \"Packets\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"netflow.src_port_name\",\n        \"size\": 50,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Source Port\"\n      }\n    }\n  ],\n  \"listeners\": {}\n}", "description": "", "title": "Netflow: Source Ports (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\n  \"index\": \"netflow-*\",\n  \"query\": {\n    \"query_string\": {\n      \"query\": \"*\",\n      \"analyze_wildcard\": true\n    }\n  },\n  \"filter\": []\n}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/de9da770-2fcb-11e7-8df8-b363df28ab61.json b/modules/netflow/configuration/kibana/visualization/de9da770-2fcb-11e7-8df8-b363df28ab61.json
deleted file mode 100644
index e576bf57d..000000000
--- a/modules/netflow/configuration/kibana/visualization/de9da770-2fcb-11e7-8df8-b363df28ab61.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: IP Version and Protocols (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.ip_version\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"IP Version\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: IP Version and Protocols (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/e2a7fc60-6592-11e7-8b83-5b2419db46fa.json b/modules/netflow/configuration/kibana/visualization/e2a7fc60-6592-11e7-8b83-5b2419db46fa.json
deleted file mode 100644
index 21445a0ce..000000000
--- a/modules/netflow/configuration/kibana/visualization/e2a7fc60-6592-11e7-8b83-5b2419db46fa.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Ingress Interfaces (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"netflow.input_snmp:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.input_snmp:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Ingress Interfaces (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/e2f43d10-6591-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/visualization/e2f43d10-6591-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 8caead0e1..000000000
--- a/modules/netflow/configuration/kibana/visualization/e2f43d10-6591-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Ingress Interfaces (bytes)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.input_snmp\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Ingress Interface\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Ingress Interfaces (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/e3ef9130-658a-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/visualization/e3ef9130-658a-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 21b84b4db..000000000
--- a/modules/netflow/configuration/kibana/visualization/e3ef9130-658a-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Destination and Source ASs (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip_dst.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination AS\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip_src.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source AS\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Destination and Source ASs (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/e8251d30-2fd7-11e7-a4f6-dbb93cfb4a10.json b/modules/netflow/configuration/kibana/visualization/e8251d30-2fd7-11e7-a4f6-dbb93cfb4a10.json
deleted file mode 100644
index ce99c6763..000000000
--- a/modules/netflow/configuration/kibana/visualization/e8251d30-2fd7-11e7-a4f6-dbb93cfb4a10.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: VLANs (packets)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.vlan\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"VLAN\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: VLANs (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/ef7699a0-6719-11e7-b5b8-29fbded8e37c.json b/modules/netflow/configuration/kibana/visualization/ef7699a0-6719-11e7-b5b8-29fbded8e37c.json
deleted file mode 100644
index d2e84a449..000000000
--- a/modules/netflow/configuration/kibana/visualization/ef7699a0-6719-11e7-b5b8-29fbded8e37c.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Top Destination Ports\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":true,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"netflow.dst_port_name\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Destination\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Top Destination Ports", "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/f11380e0-6591-11e7-bfc3-d74b7bb89482.json b/modules/netflow/configuration/kibana/visualization/f11380e0-6591-11e7-bfc3-d74b7bb89482.json
deleted file mode 100644
index 6988e1057..000000000
--- a/modules/netflow/configuration/kibana/visualization/f11380e0-6591-11e7-bfc3-d74b7bb89482.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Ingress Interfaces (packets)\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.packets\",\"customLabel\":\"Packets\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.input_snmp\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Ingress Interface\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Ingress Interfaces (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/f2fea250-2fcb-11e7-8df8-b363df28ab61.json b/modules/netflow/configuration/kibana/visualization/f2fea250-2fcb-11e7-8df8-b363df28ab61.json
deleted file mode 100644
index d11744ec2..000000000
--- a/modules/netflow/configuration/kibana/visualization/f2fea250-2fcb-11e7-8df8-b363df28ab61.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Protocols (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.protocol_name\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Protocol\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Protocols (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/f5f79b00-6555-11e7-b27e-8f8b3770f1df.json b/modules/netflow/configuration/kibana/visualization/f5f79b00-6555-11e7-b27e-8f8b3770f1df.json
deleted file mode 100644
index e0f66eec5..000000000
--- a/modules/netflow/configuration/kibana/visualization/f5f79b00-6555-11e7-b27e-8f8b3770f1df.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Countries (packets)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", metric=\\\"sum:netflow.packets\\\", split=\\\"geoip.country_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* geoip.country_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"packets / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Countries (packets)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/f687e140-622d-11e7-b0a5-e9bda2f6d168.json b/modules/netflow/configuration/kibana/visualization/f687e140-622d-11e7-b0a5-e9bda2f6d168.json
deleted file mode 100644
index dd617f198..000000000
--- a/modules/netflow/configuration/kibana/visualization/f687e140-622d-11e7-b0a5-e9bda2f6d168.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Autonomous Systems (flow records)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Flow Records\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.autonomous_system\",\"size\":50,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Autonomous System\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Autonomous Systems (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/f6be96c0-622f-11e7-abbc-93bb293f5057.json b/modules/netflow/configuration/kibana/visualization/f6be96c0-622f-11e7-abbc-93bb293f5057.json
deleted file mode 100644
index 8dcf4e344..000000000
--- a/modules/netflow/configuration/kibana/visualization/f6be96c0-622f-11e7-abbc-93bb293f5057.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Locality (bytes)\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"netflow.bytes\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"netflow.flow_locality\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Locality\"}}],\"listeners\":{}}", "description": "", "title": "Netflow: Locality (bytes)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/f8731d50-2fd6-11e7-97a8-85d8d5a99269.json b/modules/netflow/configuration/kibana/visualization/f8731d50-2fd6-11e7-97a8-85d8d5a99269.json
deleted file mode 100644
index 05d2e79dc..000000000
--- a/modules/netflow/configuration/kibana/visualization/f8731d50-2fd6-11e7-97a8-85d8d5a99269.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Flow Exporter\",\"field\":\"host\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":50},\"schema\":\"segment\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":true,\"legendPosition\":\"right\"},\"title\":\"Netflow: Flow Exporters (flow records)\",\"type\":\"pie\"}", "description": "", "title": "Netflow: Flow Exporters (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"index\":\"netflow-*\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/fd081e50-6556-11e7-be5f-c5cca8dd73b6.json b/modules/netflow/configuration/kibana/visualization/fd081e50-6556-11e7-be5f-c5cca8dd73b6.json
deleted file mode 100644
index 5a1e3199f..000000000
--- a/modules/netflow/configuration/kibana/visualization/fd081e50-6556-11e7-be5f-c5cca8dd73b6.json
+++ /dev/null
@@ -1 +0,0 @@
-{"visState": "{\"title\":\"Netflow: Source Ports (flow records)\",\"type\":\"timelion\",\"params\":{\"expression\":\".es(index=\\\"netflow-*\\\", split=\\\"netflow.src_port_name:10\\\", kibana=true).scale_interval(1s).fit(mode=scale).if(operator=\\\"lt\\\", if=0, then=0).trim(start=2,end=1).label(regex=\\\"^.* netflow.src_port_name:(.+) > .*$\\\", label=\\\"$1\\\").lines(width=1, stack=true, fill=1).yaxis(label=\\\"flow records / sec\\\", min=0)\",\"interval\":\"auto\"},\"aggs\":[],\"listeners\":{}}", "description": "", "title": "Netflow: Source Ports (flow records)", "uiStateJSON": "{}", "version": 1, "kibanaSavedObjectMeta": {"searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"}}
\ No newline at end of file
diff --git a/modules/netflow/configuration/kibana/visualization/netflow.json b/modules/netflow/configuration/kibana/visualization/netflow.json
deleted file mode 100644
index 3943af169..000000000
--- a/modules/netflow/configuration/kibana/visualization/netflow.json
+++ /dev/null
@@ -1 +0,0 @@
-["39e3dab0-2fcb-11e7-befb-31e033c79e4e", "1026edb0-2fcc-11e7-842d-39925ea8ac40", "b6a092e0-2fcc-11e7-9bae-a35d2fe38fc2", "99c1a4a0-2f60-11e7-8936-6f5fd5520124", "b02faaf0-2fcb-11e7-8df8-b363df28ab61", "d07a2870-2fcc-11e7-9bae-a35d2fe38fc2", "8f35efc0-2fcc-11e7-842d-39925ea8ac40", "de9da770-2fcb-11e7-8df8-b363df28ab61", "d8f24780-2fcc-11e7-9bae-a35d2fe38fc2", "99e49de0-2fcc-11e7-842d-39925ea8ac40", "f2fea250-2fcb-11e7-8df8-b363df28ab61", "ad5cb080-622e-11e7-b0a5-e9bda2f6d168", "7e9a7980-622e-11e7-b0a5-e9bda2f6d168", "97f430b0-622e-11e7-b0a5-e9bda2f6d168", "2aeac270-6230-11e7-84f1-9728c106b1b6", "178b0af0-6230-11e7-9a50-efc26ded795d", "f6be96c0-622f-11e7-abbc-93bb293f5057", "8d2cb120-6233-11e7-aa4b-5f8c56ec33b8", "6a597070-6233-11e7-aa4b-5f8c56ec33b8", "dcf88c60-6233-11e7-aa4b-5f8c56ec33b8", "6ad67290-6289-11e7-bcd8-a16ef1d32773", "2c9567c0-6289-11e7-bcd8-a16ef1d32773", "b61f84d0-6289-11e7-bcd8-a16ef1d32773", "52279a00-628c-11e7-95ed-8966ac93bd5a", "56a23ac0-628e-11e7-a842-b787fa3508ce", "735d6c70-628e-11e7-a842-b787fa3508ce", "a3541940-6556-11e7-a807-e52f264c6cfd", "f5f79b00-6555-11e7-b27e-8f8b3770f1df", "65f3b500-6557-11e7-87c3-994b88f84501", "b2d02df0-6556-11e7-a807-e52f264c6cfd", "0927de10-6556-11e7-b27e-8f8b3770f1df", "0de63e90-6558-11e7-8547-3d133170b50d", "a13402f0-6557-11e7-a3eb-4b30743c9370", "231fe630-6558-11e7-8547-3d133170b50d", "daa62090-6557-11e7-a3eb-4b30743c9370", "39ecd800-6558-11e7-bea4-0f5fadb995cc", "835e6090-6557-11e7-87c3-994b88f84501", "4a6f6030-6558-11e7-bea4-0f5fadb995cc", "a7a47e70-2fde-11e7-9d02-3f49bde5c1d5", "bb8e3d90-2fca-11e7-9fcf-99b4b8159f98", "6702de70-2fca-11e7-8fcd-8dc6c60d4592", "3fa5f6f0-2fca-11e7-ab32-99f279b941ef", "691cda40-2fc9-11e7-823a-89e4bb55eaa1", "49a2d6b0-2fc9-11e7-8224-a900ea73fa5f", "324b0a00-2fc9-11e7-bd31-a722d271a9cc", "c6319680-2fc9-11e7-823a-89e4bb55eaa1", "99382ab0-6555-11e7-8d48-19b0c51bbbbd", "6c67b990-628c-11e7-95ed-8966ac93bd5a", "ca786e30-622d-11e7-b0a5-e9bda2f6d168", "f687e140-622d-11e7-b0a5-e9bda2f6d168", "ac4cbc90-622d-11e7-b0a5-e9bda2f6d168", "d9fdbd80-6555-11e7-8d48-19b0c51bbbbd", "af23cb20-2fc9-11e7-8224-a900ea73fa5f", "9b5d3b80-2fc9-11e7-bd31-a722d271a9cc", "84e4c9f0-2fd7-11e7-97a8-85d8d5a99269", "69f864d0-2fd7-11e7-97a8-85d8d5a99269", "4dc994a0-2fd7-11e7-97a8-85d8d5a99269", "e8251d30-2fd7-11e7-a4f6-dbb93cfb4a10", "b88a8790-2fd7-11e7-bd03-932d3e38a4ff", "d297fe60-2fd7-11e7-af27-99e728e71e91", "793a6f00-2fdd-11e7-afd7-595689f3f18c", "4440e130-2fdd-11e7-afd7-595689f3f18c", "af1425a0-2fc7-11e7-8936-6f5fd5520124", "4f3525d0-2fc7-11e7-8936-6f5fd5520124", "5fd2fe30-2fc7-11e7-8936-6f5fd5520124", "55f66b20-2fdd-11e7-afd7-595689f3f18c", "8a52f7a0-2fc7-11e7-8936-6f5fd5520124", "1e7d8770-2fc7-11e7-8936-6f5fd5520124", "7c2cfd10-2fc7-11e7-8936-6f5fd5520124", "9accd4a0-657a-11e7-8471-e5432f50acbd", "3277ea90-6578-11e7-8471-e5432f50acbd", "b13956f0-657a-11e7-8471-e5432f50acbd", "55be8550-655e-11e7-9dda-9f993e2ba58b", "a2099810-657b-11e7-8471-e5432f50acbd", "82fcfc50-657b-11e7-8471-e5432f50acbd", "b3e2af90-657b-11e7-8471-e5432f50acbd", "c4987cc0-657b-11e7-8471-e5432f50acbd", "bbac23d0-2fe0-11e7-9d02-3f49bde5c1d5", "399c9fe0-657e-11e7-bd38-dd04615e7f62", "43e698c0-657e-11e7-99b6-af4533b21b46", "e3ef9130-658a-11e7-bfc3-d74b7bb89482", "836b2010-657e-11e7-9748-5d4091219eef", "7aaa68d0-658a-11e7-bfc3-d74b7bb89482", "d2a2db30-658a-11e7-bfc3-d74b7bb89482", "8c6ce180-657e-11e7-bd38-dd04615e7f62", "4a548ff0-657e-11e7-9748-5d4091219eef", "87dbc0a0-657e-11e7-99b6-af4533b21b46", "73c37440-658e-11e7-bfc3-d74b7bb89482", "64b144f0-658e-11e7-bfc3-d74b7bb89482", "f8731d50-2fd6-11e7-97a8-85d8d5a99269", "a4ade270-658e-11e7-bfc3-d74b7bb89482", "16438600-2fcb-11e7-befb-31e033c79e4e", "6a7e4790-2fe0-11e7-9d02-3f49bde5c1d5", "b2c9a3d0-658e-11e7-bfc3-d74b7bb89482", "41a7e3a0-658f-11e7-bfc3-d74b7bb89482", "4ea0a8d0-658f-11e7-bfc3-d74b7bb89482", "3026fe40-658f-11e7-bfc3-d74b7bb89482", "9a4938d0-6592-11e7-b8de-af19b696fa44", "bfec6260-6592-11e7-9bf4-ed832088be20", "f11380e0-6591-11e7-bfc3-d74b7bb89482", "04990fe0-6592-11e7-bfc3-d74b7bb89482", "1fa2c100-6592-11e7-bfc3-d74b7bb89482", "e2f43d10-6591-11e7-bfc3-d74b7bb89482", "1418ce10-6592-11e7-bfc3-d74b7bb89482", "caea3760-6591-11e7-bfc3-d74b7bb89482", "8500a670-6579-11e7-8471-e5432f50acbd", "e2a7fc60-6592-11e7-8b83-5b2419db46fa", "206d6e90-6593-11e7-8b83-5b2419db46fa", "00248240-6593-11e7-b8de-af19b696fa44", "47d426a0-2fc8-11e7-8b06-97426538fddd", "12ca1180-6593-11e7-9bf4-ed832088be20", "5c5d6f60-2fdb-11e7-84e6-333bd21ad9fd", "264fb270-2fdb-11e7-84e6-333bd21ad9fd", "4898db90-2fdb-11e7-84e6-333bd21ad9fd", "44b3cb70-2fd6-11e7-bc99-41245d9394f2", "23d6dc80-2fd6-11e7-bc99-41245d9394f2", "622844d0-6288-11e7-bcd8-a16ef1d32773", "6f6d05b0-2fc8-11e7-bf24-57efade8fd83", "5e58cc00-6556-11e7-995a-3584c2c6482c", "7f7aac00-2fc8-11e7-8bc1-177080983dbf", "71272b10-6579-11e7-8471-e5432f50acbd", "313a9880-2fd6-11e7-bc99-41245d9394f2", "8dcbcce0-2fd6-11e7-a82c-3146dd695923", "caf2c4b0-6556-11e7-be5f-c5cca8dd73b6", "91ae4100-6288-11e7-bcd8-a16ef1d32773", "de9b3dd0-2fc8-11e7-844c-67b9b101127b", "c6b36620-2fc8-11e7-87d6-cdce05879baf", "a8b68cb0-2fc8-11e7-8d8b-45ec51795dad", "fd081e50-6556-11e7-be5f-c5cca8dd73b6", "a8eadac0-658c-11e7-bfc3-d74b7bb89482", "c61bd8b0-658c-11e7-bfc3-d74b7bb89482", "9f9e54b0-2fd6-11e7-a82c-3146dd695923", "b74bbb70-2fd6-11e7-a82c-3146dd695923", "3ee07620-6556-11e7-995a-3584c2c6482c", "d4a408a0-671a-11e7-b5b8-29fbded8e37c", "51006340-671a-11e7-b5b8-29fbded8e37c", "ef7699a0-6719-11e7-b5b8-29fbded8e37c", "9f113d80-6719-11e7-b5b8-29fbded8e37c", "02e25f10-671a-11e7-b5b8-29fbded8e37c", "326fae40-671a-11e7-b5b8-29fbded8e37c", "7e9cb7e0-671a-11e7-b5b8-29fbded8e37c", "b58e1380-6719-11e7-b5b8-29fbded8e37c", "26e166f0-2fe2-11e7-9d02-3f49bde5c1d5"]
\ No newline at end of file
diff --git a/modules/netflow/configuration/logstash/dictionaries/iana_protocol_numbers.yml b/modules/netflow/configuration/logstash/dictionaries/iana_protocol_numbers.yml
deleted file mode 100644
index c0a5f986f..000000000
--- a/modules/netflow/configuration/logstash/dictionaries/iana_protocol_numbers.yml
+++ /dev/null
@@ -1,138 +0,0 @@
-"0": HOPOPT
-"1": ICMP
-"2": IGMP
-"3": GGP
-"4": IPv4
-"5": ST
-"6": TCP
-"7": CBT
-"8": EGP
-"9": IGP
-"10": BBN-RCC-MON
-"11": NVP-II
-"12": PUP
-"13": ARGUS
-"14": EMCON
-"15": XNET
-"16": CHAOS
-"17": UDP
-"18": MUX
-"19": DCN-MEAS
-"20": HMP
-"21": PRM
-"22": XNS-IDP
-"23": TRUNK-1
-"24": TRUNK-2
-"25": LEAF-1
-"26": LEAF-2
-"27": RDP
-"28": IRTP
-"29": ISO-TP4
-"30": NETBLT
-"31": MFE-NSP
-"32": MERIT-INP
-"33": DCCP
-"34": 3PC
-"35": IDPR
-"36": XTP
-"37": DDP
-"38": IDPR-CMTP
-"39": TP++
-"40": IL
-"41": IPv6
-"42": SDRP
-"43": IPv6-Route
-"44": IPv6-Frag
-"45": IDRP
-"46": RSVP
-"47": GRE
-"48": DSR
-"49": BNA
-"50": ESP
-"51": AH
-"52": I-NLSP
-"53": SWIPE
-"54": NARP
-"55": MOBILE
-"56": TLSP
-"57": SKIP
-"58": IPv6-ICMP
-"59": IPv6-NoNxt
-"60": IPv6-Opts
-"62": CFTP
-"64": SAT-EXPAK
-"65": KRYPTOLAN
-"66": RVD
-"67": IPPC
-"69": SAT-MON
-"70": VISA
-"71": IPCV
-"72": CPNX
-"73": CPHB
-"74": WSN
-"75": PVP
-"76": BR-SAT-MON
-"77": SUN-ND
-"78": WB-MON
-"79": WB-EXPAK
-"80": ISO-IP
-"81": VMTP
-"82": SECURE-VMTP
-"83": VINES
-"84": TTP
-"85": NSFNET-IGP
-"86": DGP
-"87": TCF
-"88": EIGRP
-"89": OSPFIGP
-"90": Sprite-RPC
-"91": LARP
-"92": MTP
-"93": AX.25
-"94": IPIP
-"95": MICP
-"96": SCC-SP
-"97": ETHERIP
-"98": ENCAP
-"100": GMTP
-"101": IFMP
-"102": PNNI
-"103": PIM
-"104": ARIS
-"105": SCPS
-"106": QNX
-"107": A/N
-"108": IPComp
-"109": SNP
-"110": Compaq-Peer
-"111": IPX-in-IP
-"112": VRRP
-"113": PGM
-"115": L2TP
-"116": DDX
-"117": IATP
-"118": STP
-"119": SRP
-"120": UTI
-"121": SMP
-"122": SM
-"123": PTP
-"124": ISIS over IPv4
-"125": FIRE
-"126": CRTP
-"127": CRUDP
-"128": SSCOPMCE
-"129": IPLT
-"130": SPS
-"131": PIPE
-"132": SCTP
-"133": FC
-"134": RSVP-E2E-IGNORE
-"136": UDPLite
-"137": MPLS-in-IP
-"138": manet
-"139": HIP
-"140": Shim6
-"141": WESP
-"142": ROHC
-"255": Reserved
diff --git a/modules/netflow/configuration/logstash/dictionaries/iana_service_names_dccp.yml b/modules/netflow/configuration/logstash/dictionaries/iana_service_names_dccp.yml
deleted file mode 100644
index f2cfdb63c..000000000
--- a/modules/netflow/configuration/logstash/dictionaries/iana_service_names_dccp.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-"9": discard
-"1021": exp1
-"1022": exp2
-"1113": ltp-deepspace
-"4556": dtn-bundle
-"5004": avt-profile-1
-"5005": avt-profile-2
-"6514": syslog-tls
diff --git a/modules/netflow/configuration/logstash/dictionaries/iana_service_names_sctp.yml b/modules/netflow/configuration/logstash/dictionaries/iana_service_names_sctp.yml
deleted file mode 100644
index f3024c53f..000000000
--- a/modules/netflow/configuration/logstash/dictionaries/iana_service_names_sctp.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-"9": discard
-"20": ftp-data
-"21": ftp
-"22": ssh
-"80": http
-"179": bgp
-"443": https
-"1021": exp1
-"1022": exp2
-"1167": cisco-ipsla
-"1720": h323hostcall
-"2049": nfs
-"2225": rcip-itu
-"2904": m2ua
-"2905": m3ua
-"2944": megaco-h248
-"2945": h248-binary
-"3097": itu-bicc-stc
-"3565": m2pa
-"3863": asap-sctp
-"3864": asap-sctp-tls
-"3868": diameter
-"4333": ahsp
-"4502": a25-fap-fgw
-"4739": ipfix
-"4740": ipfixs
-"5060": sip
-"5061": sips
-"5090": car
-"5091": cxtp
-"5215": noteza
-"5445": smbdirect
-"5672": amqp
-"5675": v5ua
-"5868": diameters
-"5910": cm
-"5911": cpdlc
-"5912": fis
-"5913": ads-c
-"6704": frc-hp
-"6705": frc-mp
-"6706": frc-lp
-"6970": conductor-mpx
-"7626": simco
-"7728": osvr
-"8471": pim-port
-"9082": lcs-ap
-"9084": aurora
-"9900": iua
-"9901": enrp-sctp
-"9902": enrp-sctp-tls
-"11997": wmereceiving
-"11998": wmedistribution
-"11999": wmereporting
-"14001": sua
-"20049": nfsrdma
-"25471": rna
-"29118": sgsap
-"29168": sbcap
-"29169": iuhsctpassoc
-"30100": rwp
-"36412": s1-control
-"36422": x2-control
-"36423": slmap
-"36424": nq-ap
-"36443": m2ap
-"36444": m3ap
-"36462": xw-control
diff --git a/modules/netflow/configuration/logstash/dictionaries/iana_service_names_tcp.yml b/modules/netflow/configuration/logstash/dictionaries/iana_service_names_tcp.yml
deleted file mode 100644
index 0c7068745..000000000
--- a/modules/netflow/configuration/logstash/dictionaries/iana_service_names_tcp.yml
+++ /dev/null
@@ -1,5842 +0,0 @@
-"1": tcpmux
-"2": compressnet
-"3": compressnet
-"5": rje
-"7": echo
-"9": discard
-"11": systat
-"13": daytime
-"17": qotd
-"18": msp
-"19": chargen
-"20": ftp-data
-"21": ftp
-"22": ssh
-"23": telnet
-"25": smtp
-"27": nsw-fe
-"29": msg-icp
-"31": msg-auth
-"33": dsp
-"37": time
-"38": rap
-"39": rlp
-"41": graphics
-"42": nameserver
-"43": nicname
-"44": mpm-flags
-"45": mpm
-"46": mpm-snd
-"47": ni-ftp
-"48": auditd
-"49": tacacs
-"50": re-mail-ck
-"52": xns-time
-"53": dns
-"54": xns-ch
-"55": isi-gl
-"56": xns-auth
-"58": xns-mail
-"61": ni-mail
-"62": acas
-"63": whoispp
-"64": covia
-"65": tacacs-ds
-"66": sql-net
-"67": bootps
-"68": bootpc
-"69": tftp
-"70": gopher
-"71": netrjs-1
-"72": netrjs-2
-"73": netrjs-3
-"74": netrjs-4
-"76": deos
-"78": vettcp
-"79": finger
-"80": http
-"82": xfer
-"83": mit-ml-dev
-"84": ctf
-"85": mit-ml-dev
-"86": mfcobol
-"88": kerberos
-"89": su-mit-tg
-"90": dnsix
-"91": mit-dov
-"92": npp
-"93": dcp
-"94": objcall
-"95": supdup
-"96": dixie
-"97": swift-rvf
-"98": tacnews
-"99": metagram
-"101": hostname
-"102": iso-tsap
-"103": gppitnp
-"104": acr-nema
-"105": csnet-ns
-"105": cso
-"106": 3com-tsmux
-"107": rtelnet
-"108": snagas
-"109": pop2
-"110": pop3
-"111": sunrpc
-"112": mcidas
-"113": auth
-"115": sftp
-"116": ansanotify
-"117": uucp-path
-"118": sqlserv
-"119": nntp
-"120": cfdptkt
-"121": erpc
-"122": smakynet
-"123": ntp
-"124": ansatrader
-"125": locus-map
-"126": nxedit
-"127": locus-con
-"128": gss-xlicen
-"129": pwdgen
-"130": cisco-fna
-"131": cisco-tna
-"132": cisco-sys
-"133": statsrv
-"134": ingres-net
-"135": epmap
-"136": profile
-"137": netbios-ns
-"138": netbios-dgm
-"139": netbios-ssn
-"140": emfis-data
-"141": emfis-cntl
-"142": bl-idm
-"143": imap
-"144": uma
-"145": uaac
-"146": iso-tp0
-"147": iso-ip
-"148": jargon
-"149": aed-512
-"150": sql-net
-"151": hems
-"152": bftp
-"153": sgmp
-"154": netsc-prod
-"155": netsc-dev
-"156": sqlsrv
-"157": knet-cmp
-"158": pcmail-srv
-"159": nss-routing
-"160": sgmp-traps
-"161": snmp
-"162": snmptrap
-"163": cmip-man
-"164": cmip-agent
-"165": xns-courier
-"166": s-net
-"167": namp
-"168": rsvd
-"169": send
-"170": print-srv
-"171": multiplex
-"172": cl-1
-"173": xyplex-mux
-"174": mailq
-"175": vmnet
-"176": genrad-mux
-"177": xdmcp
-"178": nextstep
-"179": bgp
-"180": ris
-"181": unify
-"182": audit
-"183": ocbinder
-"184": ocserver
-"185": remote-kis
-"186": kis
-"187": aci
-"188": mumps
-"189": qft
-"190": gacp
-"191": prospero
-"192": osu-nms
-"193": srmp
-"194": irc
-"195": dn6-nlm-aud
-"196": dn6-smm-red
-"197": dls
-"198": dls-mon
-"199": smux
-"200": src
-"201": at-rtmp
-"202": at-nbp
-"203": at-3
-"204": at-echo
-"205": at-5
-"206": at-zis
-"207": at-7
-"208": at-8
-"209": qmtp
-"210": z39-50
-"211": 914c-g
-"212": anet
-"213": ipx
-"214": vmpwscs
-"215": softpc
-"216": CAIlic
-"217": dbase
-"218": mpp
-"219": uarps
-"220": imap3
-"221": fln-spx
-"222": rsh-spx
-"223": cdc
-"224": masqdialer
-"242": direct
-"243": sur-meas
-"244": inbusiness
-"245": link
-"246": dsp3270
-"247": subntbcst-tftp
-"248": bhfhs
-"256": rap
-"257": set
-"259": esro-gen
-"260": openport
-"261": nsiiops
-"262": arcisdms
-"263": hdap
-"264": bgmp
-"265": x-bone-ctl
-"266": sst
-"267": td-service
-"268": td-replica
-"269": manet
-"271": pt-tls
-"280": http-mgmt
-"281": personal-link
-"282": cableport-ax
-"283": rescap
-"284": corerjd
-"286": fxp
-"287": k-block
-"308": novastorbakcup
-"309": entrusttime
-"310": bhmds
-"311": asip-webadmin
-"312": vslmp
-"313": magenta-logic
-"314": opalis-robot
-"315": dpsi
-"316": decauth
-"317": zannet
-"318": pkix-timestamp
-"319": ptp-event
-"320": ptp-general
-"321": pip
-"322": rtsps
-"323": rpki-rtr
-"324": rpki-rtr-tls
-"333": texar
-"344": pdap
-"345": pawserv
-"346": zserv
-"347": fatserv
-"348": csi-sgwp
-"349": mftp
-"350": matip-type-a
-"351": matip-type-b
-"352": dtag-ste-sb
-"353": ndsauth
-"354": bh611
-"355": datex-asn
-"356": cloanto-net-1
-"357": bhevent
-"358": shrinkwrap
-"359": nsrmp
-"360": scoi2odialog
-"361": semantix
-"362": srssend
-"363": rsvp-tunnel
-"364": aurora-cmgr
-"365": dtk
-"366": odmr
-"367": mortgageware
-"368": qbikgdp
-"369": rpc2portmap
-"370": codaauth2
-"371": clearcase
-"372": ulistproc
-"373": legent-1
-"374": legent-2
-"375": hassle
-"376": nip
-"377": tnETOS
-"378": dsETOS
-"379": is99c
-"380": is99s
-"381": hp-collector
-"382": hp-managed-node
-"383": hp-alarm-mgr
-"384": arns
-"385": ibm-app
-"386": asa
-"387": aurp
-"388": unidata-ldm
-"389": ldap
-"390": uis
-"391": synotics-relay
-"392": synotics-broker
-"393": meta5
-"394": embl-ndt
-"395": netcp
-"396": netware-ip
-"397": mptn
-"398": kryptolan
-"399": iso-tsap-c2
-"400": osb-sd
-"401": ups
-"402": genie
-"403": decap
-"404": nced
-"405": ncld
-"406": imsp
-"407": timbuktu
-"408": prm-sm
-"409": prm-nm
-"410": decladebug
-"411": rmt
-"412": synoptics-trap
-"413": smsp
-"414": infoseek
-"415": bnet
-"416": silverplatter
-"417": onmux
-"418": hyper-g
-"419": ariel1
-"420": smpte
-"421": ariel2
-"422": ariel3
-"423": opc-job-start
-"424": opc-job-track
-"425": icad-el
-"426": smartsdp
-"427": svrloc
-"428": ocs-cmu
-"429": ocs-amu
-"430": utmpsd
-"431": utmpcd
-"432": iasd
-"433": nnsp
-"434": mobileip-agent
-"435": mobilip-mn
-"436": dna-cml
-"437": comscm
-"438": dsfgw
-"439": dasp
-"440": sgcp
-"441": decvms-sysmgt
-"442": cvc-hostd
-"443": https
-"444": snpp
-"445": microsoft-ds
-"446": ddm-rdb
-"447": ddm-dfm
-"448": ddm-ssl
-"449": as-servermap
-"450": tserver
-"451": sfs-smp-net
-"452": sfs-config
-"453": creativeserver
-"454": contentserver
-"455": creativepartnr
-"456": macon-tcp
-"457": scohelp
-"458": appleqtc
-"459": ampr-rcmd
-"460": skronk
-"461": datasurfsrv
-"462": datasurfsrvsec
-"463": alpes
-"464": kpasswd
-"465": urd
-"466": digital-vrc
-"467": mylex-mapd
-"468": photuris
-"469": rcp
-"470": scx-proxy
-"471": mondex
-"472": ljk-login
-"473": hybrid-pop
-"474": tn-tl-w1
-"475": tcpnethaspsrv
-"476": tn-tl-fd1
-"477": ss7ns
-"478": spsc
-"479": iafserver
-"480": iafdbase
-"481": ph
-"482": bgs-nsi
-"483": ulpnet
-"484": integra-sme
-"485": powerburst
-"486": avian
-"487": saft
-"488": gss-http
-"489": nest-protocol
-"490": micom-pfs
-"491": go-login
-"492": ticf-1
-"493": ticf-2
-"494": pov-ray
-"495": intecourier
-"496": pim-rp-disc
-"497": retrospect
-"498": siam
-"499": iso-ill
-"500": isakmp
-"501": stmf
-"502": mbap
-"503": intrinsa
-"504": citadel
-"505": mailbox-lm
-"506": ohimsrv
-"507": crs
-"508": xvttp
-"509": snare
-"510": fcp
-"511": passgo
-"512": exec
-"513": login
-"514": shell
-"515": printer
-"516": videotex
-"517": talk
-"518": ntalk
-"519": utime
-"520": efs
-"521": ripng
-"522": ulp
-"523": ibm-db2
-"524": ncp
-"525": timed
-"526": tempo
-"527": stx
-"528": custix
-"529": irc-serv
-"530": courier
-"531": conference
-"532": netnews
-"533": netwall
-"534": windream
-"535": iiop
-"536": opalis-rdv
-"537": nmsp
-"538": gdomap
-"539": apertus-ldp
-"540": uucp
-"541": uucp-rlogin
-"542": commerce
-"543": klogin
-"544": kshell
-"545": appleqtcsrvr
-"546": dhcpv6-client
-"547": dhcpv6-server
-"548": afpovertcp
-"549": idfp
-"550": new-rwho
-"551": cybercash
-"552": devshr-nts
-"553": pirp
-"554": rtsp
-"555": dsf
-"556": remotefs
-"557": openvms-sysipc
-"558": sdnskmp
-"559": teedtap
-"560": rmonitor
-"561": monitor
-"562": chshell
-"563": nntps
-"564": 9pfs
-"565": whoami
-"566": streettalk
-"567": banyan-rpc
-"568": ms-shuttle
-"569": ms-rome
-"570": meter
-"571": meter
-"572": sonar
-"573": banyan-vip
-"574": ftp-agent
-"575": vemmi
-"576": ipcd
-"577": vnas
-"578": ipdd
-"579": decbsrv
-"580": sntp-heartbeat
-"581": bdp
-"582": scc-security
-"583": philips-vc
-"584": keyserver
-"586": password-chg
-"587": submission
-"588": cal
-"589": eyelink
-"590": tns-cml
-"591": http-alt
-"592": eudora-set
-"593": http-rpc-epmap
-"594": tpip
-"595": cab-protocol
-"596": smsd
-"597": ptcnameservice
-"598": sco-websrvrmg3
-"599": acp
-"600": ipcserver
-"601": syslog-conn
-"602": xmlrpc-beep
-"603": idxp
-"604": tunnel
-"605": soap-beep
-"606": urm
-"607": nqs
-"608": sift-uft
-"609": npmp-trap
-"610": npmp-local
-"611": npmp-gui
-"612": hmmp-ind
-"613": hmmp-op
-"614": sshell
-"615": sco-inetmgr
-"616": sco-sysmgr
-"617": sco-dtmgr
-"618": dei-icda
-"619": compaq-evm
-"620": sco-websrvrmgr
-"621": escp-ip
-"622": collaborator
-"623": oob-ws-http
-"624": cryptoadmin
-"625": dec-dlm
-"626": asia
-"627": passgo-tivoli
-"628": qmqp
-"629": 3com-amp3
-"630": rda
-"631": ipp
-"632": bmpp
-"633": servstat
-"634": ginad
-"635": rlzdbase
-"636": ldaps
-"637": lanserver
-"638": mcns-sec
-"639": msdp
-"640": entrust-sps
-"641": repcmd
-"642": esro-emsdp
-"643": sanity
-"644": dwr
-"645": pssc
-"646": ldp
-"647": dhcp-failover
-"648": rrp
-"649": cadview-3d
-"650": obex
-"651": ieee-mms
-"652": hello-port
-"653": repscmd
-"654": aodv
-"655": tinc
-"656": spmp
-"657": rmc
-"658": tenfold
-"660": mac-srvr-admin
-"661": hap
-"662": pftp
-"663": purenoise
-"664": oob-ws-https
-"665": sun-dr
-"666": doom
-"667": disclose
-"668": mecomm
-"669": meregister
-"670": vacdsm-sws
-"671": vacdsm-app
-"672": vpps-qua
-"673": cimplex
-"674": acap
-"675": dctp
-"676": vpps-via
-"677": vpp
-"678": ggf-ncp
-"679": mrm
-"680": entrust-aaas
-"681": entrust-aams
-"682": xfr
-"683": corba-iiop
-"684": corba-iiop-ssl
-"685": mdc-portmapper
-"686": hcp-wismar
-"687": asipregistry
-"688": realm-rusd
-"689": nmap
-"690": vatp
-"691": msexch-routing
-"692": hyperwave-isp
-"693": connendp
-"694": ha-cluster
-"695": ieee-mms-ssl
-"696": rushd
-"697": uuidgen
-"698": olsr
-"699": accessnetwork
-"700": epp
-"701": lmp
-"702": iris-beep
-"704": elcsd
-"705": agentx
-"706": silc
-"707": borland-dsj
-"709": entrust-kmsh
-"710": entrust-ash
-"711": cisco-tdp
-"712": tbrpf
-"713": iris-xpc
-"714": iris-xpcs
-"715": iris-lwz
-"729": netviewdm1
-"730": netviewdm2
-"731": netviewdm3
-"741": netgw
-"742": netrcs
-"744": flexlm
-"747": fujitsu-dev
-"748": ris-cm
-"749": kerberos-adm
-"750": rfile
-"751": pump
-"752": qrh
-"753": rrh
-"754": tell
-"758": nlogin
-"759": con
-"760": ns
-"761": rxe
-"762": quotad
-"763": cycleserv
-"764": omserv
-"765": webster
-"767": phonebook
-"769": vid
-"770": cadlock
-"771": rtip
-"772": cycleserv2
-"773": submit
-"774": rpasswd
-"775": entomb
-"776": wpages
-"777": multiling-http
-"780": wpgs
-"800": mdbs-daemon
-"801": device
-"802": mbap-s
-"810": fcp-udp
-"828": itm-mcell-s
-"829": pkix-3-ca-ra
-"830": netconf-ssh
-"831": netconf-beep
-"832": netconfsoaphttp
-"833": netconfsoapbeep
-"847": dhcp-failover2
-"848": gdoi
-"853": domain-s
-"860": iscsi
-"861": owamp-control
-"862": twamp-control
-"873": rsync
-"886": iclcnet-locate
-"887": iclcnet-svinfo
-"888": accessbuilder
-"900": omginitialrefs
-"901": smpnameres
-"902": ideafarm-door
-"903": ideafarm-panic
-"910": kink
-"911": xact-backup
-"912": apex-mesh
-"913": apex-edge
-"989": ftps-data
-"990": ftps
-"991": nas
-"992": telnets
-"993": imaps
-"995": pop3s
-"996": vsinet
-"997": maitrd
-"998": busboy
-"999": puprouter
-"1000": cadlock2
-"1001": webpush
-"1010": surf
-"1021": exp1
-"1022": exp2
-"1025": blackjack
-"1026": cap
-"1029": solid-mux
-"1033": netinfo-local
-"1034": activesync
-"1035": mxxrlogin
-"1036": nsstp
-"1037": ams
-"1038": mtqp
-"1039": sbl
-"1040": netarx
-"1041": danf-ak2
-"1042": afrog
-"1043": boinc-client
-"1044": dcutility
-"1045": fpitp
-"1046": wfremotertm
-"1047": neod1
-"1048": neod2
-"1049": td-postman
-"1050": cma
-"1051": optima-vnet
-"1052": ddt
-"1053": remote-as
-"1054": brvread
-"1055": ansyslmd
-"1056": vfo
-"1057": startron
-"1058": nim
-"1059": nimreg
-"1060": polestar
-"1061": kiosk
-"1062": veracity
-"1063": kyoceranetdev
-"1064": jstel
-"1065": syscomlan
-"1066": fpo-fns
-"1067": instl-boots
-"1068": instl-bootc
-"1069": cognex-insight
-"1070": gmrupdateserv
-"1071": bsquare-voip
-"1072": cardax
-"1073": bridgecontrol
-"1074": warmspotMgmt
-"1075": rdrmshc
-"1076": dab-sti-c
-"1077": imgames
-"1078": avocent-proxy
-"1079": asprovatalk
-"1080": socks
-"1081": pvuniwien
-"1082": amt-esd-prot
-"1083": ansoft-lm-1
-"1084": ansoft-lm-2
-"1085": webobjects
-"1086": cplscrambler-lg
-"1087": cplscrambler-in
-"1088": cplscrambler-al
-"1089": ff-annunc
-"1090": ff-fms
-"1091": ff-sm
-"1092": obrpd
-"1093": proofd
-"1094": rootd
-"1095": nicelink
-"1096": cnrprotocol
-"1097": sunclustermgr
-"1098": rmiactivation
-"1099": rmiregistry
-"1100": mctp
-"1101": pt2-discover
-"1102": adobeserver-1
-"1103": adobeserver-2
-"1104": xrl
-"1105": ftranhc
-"1106": isoipsigport-1
-"1107": isoipsigport-2
-"1108": ratio-adp
-"1110": webadmstart
-"1111": lmsocialserver
-"1112": icp
-"1113": ltp-deepspace
-"1114": mini-sql
-"1115": ardus-trns
-"1116": ardus-cntl
-"1117": ardus-mtrns
-"1118": sacred
-"1119": bnetgame
-"1120": bnetfile
-"1121": rmpp
-"1122": availant-mgr
-"1123": murray
-"1124": hpvmmcontrol
-"1125": hpvmmagent
-"1126": hpvmmdata
-"1127": kwdb-commn
-"1128": saphostctrl
-"1129": saphostctrls
-"1130": casp
-"1131": caspssl
-"1132": kvm-via-ip
-"1133": dfn
-"1134": aplx
-"1135": omnivision
-"1136": hhb-gateway
-"1137": trim
-"1138": encrypted-admin
-"1139": evm
-"1140": autonoc
-"1141": mxomss
-"1142": edtools
-"1143": imyx
-"1144": fuscript
-"1145": x9-icue
-"1146": audit-transfer
-"1147": capioverlan
-"1148": elfiq-repl
-"1149": bvtsonar
-"1150": blaze
-"1151": unizensus
-"1152": winpoplanmess
-"1153": c1222-acse
-"1154": resacommunity
-"1155": nfa
-"1156": iascontrol-oms
-"1157": iascontrol
-"1158": dbcontrol-oms
-"1159": oracle-oms
-"1160": olsv
-"1161": health-polling
-"1162": health-trap
-"1163": sddp
-"1164": qsm-proxy
-"1165": qsm-gui
-"1166": qsm-remote
-"1167": cisco-ipsla
-"1168": vchat
-"1169": tripwire
-"1170": atc-lm
-"1171": atc-appserver
-"1172": dnap
-"1173": d-cinema-rrp
-"1174": fnet-remote-ui
-"1175": dossier
-"1176": indigo-server
-"1177": dkmessenger
-"1178": sgi-storman
-"1179": b2n
-"1180": mc-client
-"1181": 3comnetman
-"1182": accelenet
-"1183": llsurfup-http
-"1184": llsurfup-https
-"1185": catchpole
-"1186": mysql-cluster
-"1187": alias
-"1188": hp-webadmin
-"1189": unet
-"1190": commlinx-avl
-"1191": gpfs
-"1192": caids-sensor
-"1193": fiveacross
-"1194": openvpn
-"1195": rsf-1
-"1196": netmagic
-"1197": carrius-rshell
-"1198": cajo-discovery
-"1199": dmidi
-"1200": scol
-"1201": nucleus-sand
-"1202": caiccipc
-"1203": ssslic-mgr
-"1204": ssslog-mgr
-"1205": accord-mgc
-"1206": anthony-data
-"1207": metasage
-"1208": seagull-ais
-"1209": ipcd3
-"1210": eoss
-"1211": groove-dpp
-"1212": lupa
-"1213": mpc-lifenet
-"1214": kazaa
-"1215": scanstat-1
-"1216": etebac5
-"1217": hpss-ndapi
-"1218": aeroflight-ads
-"1219": aeroflight-ret
-"1220": qt-serveradmin
-"1221": sweetware-apps
-"1222": nerv
-"1223": tgp
-"1224": vpnz
-"1225": slinkysearch
-"1226": stgxfws
-"1227": dns2go
-"1228": florence
-"1229": zented
-"1230": periscope
-"1231": menandmice-lpm
-"1232": first-defense
-"1233": univ-appserver
-"1234": search-agent
-"1235": mosaicsyssvc1
-"1236": bvcontrol
-"1237": tsdos390
-"1238": hacl-qs
-"1239": nmsd
-"1240": instantia
-"1241": nessus
-"1242": nmasoverip
-"1243": serialgateway
-"1244": isbconference1
-"1245": isbconference2
-"1246": payrouter
-"1247": visionpyramid
-"1248": hermes
-"1249": mesavistaco
-"1250": swldy-sias
-"1251": servergraph
-"1252": bspne-pcc
-"1253": q55-pcc
-"1254": de-noc
-"1255": de-cache-query
-"1256": de-server
-"1257": shockwave2
-"1258": opennl
-"1259": opennl-voice
-"1260": ibm-ssd
-"1261": mpshrsv
-"1262": qnts-orb
-"1263": dka
-"1264": prat
-"1265": dssiapi
-"1266": dellpwrappks
-"1267": epc
-"1268": propel-msgsys
-"1269": watilapp
-"1270": opsmgr
-"1271": excw
-"1272": cspmlockmgr
-"1273": emc-gateway
-"1274": t1distproc
-"1275": ivcollector
-"1277": miva-mqs
-"1278": dellwebadmin-1
-"1279": dellwebadmin-2
-"1280": pictrography
-"1281": healthd
-"1282": emperion
-"1283": productinfo
-"1284": iee-qfx
-"1285": neoiface
-"1286": netuitive
-"1287": routematch
-"1288": navbuddy
-"1289": jwalkserver
-"1290": winjaserver
-"1291": seagulllms
-"1292": dsdn
-"1293": pkt-krb-ipsec
-"1294": cmmdriver
-"1295": ehtp
-"1296": dproxy
-"1297": sdproxy
-"1298": lpcp
-"1299": hp-sci
-"1300": h323hostcallsc
-"1301": ci3-software-1
-"1302": ci3-software-2
-"1303": sftsrv
-"1304": boomerang
-"1305": pe-mike
-"1306": re-conn-proto
-"1307": pacmand
-"1308": odsi
-"1309": jtag-server
-"1310": husky
-"1311": rxmon
-"1312": sti-envision
-"1313": bmc-patroldb
-"1314": pdps
-"1315": els
-"1316": exbit-escp
-"1317": vrts-ipcserver
-"1318": krb5gatekeeper
-"1319": amx-icsp
-"1320": amx-axbnet
-"1321": pip
-"1322": novation
-"1323": brcd
-"1324": delta-mcp
-"1325": dx-instrument
-"1326": wimsic
-"1327": ultrex
-"1328": ewall
-"1329": netdb-export
-"1330": streetperfect
-"1331": intersan
-"1332": pcia-rxp-b
-"1333": passwrd-policy
-"1334": writesrv
-"1335": digital-notary
-"1336": ischat
-"1337": menandmice-dns
-"1338": wmc-log-svc
-"1339": kjtsiteserver
-"1340": naap
-"1341": qubes
-"1342": esbroker
-"1343": re101
-"1344": icap
-"1345": vpjp
-"1346": alta-ana-lm
-"1347": bbn-mmc
-"1348": bbn-mmx
-"1349": sbook
-"1350": editbench
-"1351": equationbuilder
-"1352": lotusnote
-"1353": relief
-"1354": XSIP-network
-"1355": intuitive-edge
-"1356": cuillamartin
-"1357": pegboard
-"1358": connlcli
-"1359": ftsrv
-"1360": mimer
-"1361": linx
-"1362": timeflies
-"1363": ndm-requester
-"1364": ndm-server
-"1365": adapt-sna
-"1366": netware-csp
-"1367": dcs
-"1368": screencast
-"1369": gv-us
-"1370": us-gv
-"1371": fc-cli
-"1372": fc-ser
-"1373": chromagrafx
-"1374": molly
-"1375": bytex
-"1376": ibm-pps
-"1377": cichlid
-"1378": elan
-"1379": dbreporter
-"1380": telesis-licman
-"1381": apple-licman
-"1382": udt-os
-"1383": gwha
-"1384": os-licman
-"1385": atex-elmd
-"1386": checksum
-"1387": cadsi-lm
-"1388": objective-dbc
-"1389": iclpv-dm
-"1390": iclpv-sc
-"1391": iclpv-sas
-"1392": iclpv-pm
-"1393": iclpv-nls
-"1394": iclpv-nlc
-"1395": iclpv-wsm
-"1396": dvl-activemail
-"1397": audio-activmail
-"1398": video-activmail
-"1399": cadkey-licman
-"1400": cadkey-tablet
-"1401": goldleaf-licman
-"1402": prm-sm-np
-"1403": prm-nm-np
-"1404": igi-lm
-"1405": ibm-res
-"1406": netlabs-lm
-"1407": tibet-server
-"1408": sophia-lm
-"1409": here-lm
-"1410": hiq
-"1411": af
-"1412": innosys
-"1413": innosys-acl
-"1414": ibm-mqseries
-"1415": dbstar
-"1416": novell-lu6-2
-"1417": timbuktu-srv1
-"1418": timbuktu-srv2
-"1419": timbuktu-srv3
-"1420": timbuktu-srv4
-"1421": gandalf-lm
-"1422": autodesk-lm
-"1423": essbase
-"1424": hybrid
-"1425": zion-lm
-"1426": sais
-"1427": mloadd
-"1428": informatik-lm
-"1429": nms
-"1430": tpdu
-"1431": rgtp
-"1432": blueberry-lm
-"1433": ms-sql-s
-"1434": ms-sql-m
-"1435": ibm-cics
-"1436": saism
-"1437": tabula
-"1438": eicon-server
-"1439": eicon-x25
-"1440": eicon-slp
-"1441": cadis-1
-"1442": cadis-2
-"1443": ies-lm
-"1444": marcam-lm
-"1445": proxima-lm
-"1446": ora-lm
-"1447": apri-lm
-"1448": oc-lm
-"1449": peport
-"1450": dwf
-"1451": infoman
-"1452": gtegsc-lm
-"1453": genie-lm
-"1454": interhdl-elmd
-"1455": esl-lm
-"1456": dca
-"1457": valisys-lm
-"1458": nrcabq-lm
-"1459": proshare1
-"1460": proshare2
-"1461": ibm-wrless-lan
-"1462": world-lm
-"1463": nucleus
-"1464": msl-lmd
-"1465": pipes
-"1466": oceansoft-lm
-"1467": csdmbase
-"1468": csdm
-"1469": aal-lm
-"1470": uaiact
-"1471": csdmbase
-"1472": csdm
-"1473": openmath
-"1474": telefinder
-"1475": taligent-lm
-"1476": clvm-cfg
-"1477": ms-sna-server
-"1478": ms-sna-base
-"1479": dberegister
-"1480": pacerforum
-"1481": airs
-"1482": miteksys-lm
-"1483": afs
-"1484": confluent
-"1485": lansource
-"1486": nms-topo-serv
-"1487": localinfosrvr
-"1488": docstor
-"1489": dmdocbroker
-"1490": insitu-conf
-"1492": stone-design-1
-"1493": netmap-lm
-"1494": ica
-"1495": cvc
-"1496": liberty-lm
-"1497": rfx-lm
-"1498": sybase-sqlany
-"1499": fhc
-"1500": vlsi-lm
-"1501": saiscm
-"1502": shivadiscovery
-"1503": imtc-mcs
-"1504": evb-elm
-"1505": funkproxy
-"1506": utcd
-"1507": symplex
-"1508": diagmond
-"1509": robcad-lm
-"1510": mvx-lm
-"1511": 3l-l1
-"1512": wins
-"1513": fujitsu-dtc
-"1514": fujitsu-dtcns
-"1515": ifor-protocol
-"1516": vpad
-"1517": vpac
-"1518": vpvd
-"1519": vpvc
-"1520": atm-zip-office
-"1521": ncube-lm
-"1522": ricardo-lm
-"1523": cichild-lm
-"1524": ingreslock
-"1525": orasrv
-"1526": pdap-np
-"1527": tlisrv
-"1529": coauthor
-"1530": rap-service
-"1531": rap-listen
-"1532": miroconnect
-"1533": virtual-places
-"1534": micromuse-lm
-"1535": ampr-info
-"1536": ampr-inter
-"1537": sdsc-lm
-"1538": 3ds-lm
-"1539": intellistor-lm
-"1540": rds
-"1541": rds2
-"1542": gridgen-elmd
-"1543": simba-cs
-"1544": aspeclmd
-"1545": vistium-share
-"1546": abbaccuray
-"1547": laplink
-"1548": axon-lm
-"1549": shivahose
-"1550": 3m-image-lm
-"1551": hecmtl-db
-"1552": pciarray
-"1553": sna-cs
-"1554": caci-lm
-"1555": livelan
-"1556": veritas-pbx
-"1557": arbortext-lm
-"1558": xingmpeg
-"1559": web2host
-"1560": asci-val
-"1561": facilityview
-"1562": pconnectmgr
-"1563": cadabra-lm
-"1564": pay-per-view
-"1565": winddlb
-"1566": corelvideo
-"1567": jlicelmd
-"1568": tsspmap
-"1569": ets
-"1570": orbixd
-"1571": rdb-dbs-disp
-"1572": chip-lm
-"1573": itscomm-ns
-"1574": mvel-lm
-"1575": oraclenames
-"1576": moldflow-lm
-"1577": hypercube-lm
-"1578": jacobus-lm
-"1579": ioc-sea-lm
-"1580": tn-tl-r1
-"1581": mil-2045-47001
-"1582": msims
-"1583": simbaexpress
-"1584": tn-tl-fd2
-"1585": intv
-"1586": ibm-abtact
-"1587": pra-elmd
-"1588": triquest-lm
-"1589": vqp
-"1590": gemini-lm
-"1591": ncpm-pm
-"1592": commonspace
-"1593": mainsoft-lm
-"1594": sixtrak
-"1595": radio
-"1596": radio-sm
-"1597": orbplus-iiop
-"1598": picknfs
-"1599": simbaservices
-"1600": issd
-"1601": aas
-"1602": inspect
-"1603": picodbc
-"1604": icabrowser
-"1605": slp
-"1606": slm-api
-"1607": stt
-"1608": smart-lm
-"1609": isysg-lm
-"1610": taurus-wh
-"1611": ill
-"1612": netbill-trans
-"1613": netbill-keyrep
-"1614": netbill-cred
-"1615": netbill-auth
-"1616": netbill-prod
-"1617": nimrod-agent
-"1618": skytelnet
-"1619": xs-openstorage
-"1620": faxportwinport
-"1621": softdataphone
-"1622": ontime
-"1623": jaleosnd
-"1624": udp-sr-port
-"1625": svs-omagent
-"1626": shockwave
-"1627": t128-gateway
-"1628": lontalk-norm
-"1629": lontalk-urgnt
-"1630": oraclenet8cman
-"1631": visitview
-"1632": pammratc
-"1633": pammrpc
-"1634": loaprobe
-"1635": edb-server1
-"1636": isdc
-"1637": islc
-"1638": ismc
-"1639": cert-initiator
-"1640": cert-responder
-"1641": invision
-"1642": isis-am
-"1643": isis-ambc
-"1644": saiseh
-"1645": sightline
-"1646": sa-msg-port
-"1647": rsap
-"1648": concurrent-lm
-"1649": kermit
-"1650": nkd
-"1651": shiva-confsrvr
-"1652": xnmp
-"1653": alphatech-lm
-"1654": stargatealerts
-"1655": dec-mbadmin
-"1656": dec-mbadmin-h
-"1657": fujitsu-mmpdc
-"1658": sixnetudr
-"1659": sg-lm
-"1660": skip-mc-gikreq
-"1661": netview-aix-1
-"1662": netview-aix-2
-"1663": netview-aix-3
-"1664": netview-aix-4
-"1665": netview-aix-5
-"1666": netview-aix-6
-"1667": netview-aix-7
-"1668": netview-aix-8
-"1669": netview-aix-9
-"1670": netview-aix-10
-"1671": netview-aix-11
-"1672": netview-aix-12
-"1673": proshare-mc-1
-"1674": proshare-mc-2
-"1675": pdp
-"1676": netcomm1
-"1677": groupwise
-"1678": prolink
-"1679": darcorp-lm
-"1680": microcom-sbp
-"1681": sd-elmd
-"1682": lanyon-lantern
-"1683": ncpm-hip
-"1684": snaresecure
-"1685": n2nremote
-"1686": cvmon
-"1687": nsjtp-ctrl
-"1688": nsjtp-data
-"1689": firefox
-"1690": ng-umds
-"1691": empire-empuma
-"1692": sstsys-lm
-"1693": rrirtr
-"1694": rrimwm
-"1695": rrilwm
-"1696": rrifmm
-"1697": rrisat
-"1698": rsvp-encap-1
-"1699": rsvp-encap-2
-"1700": mps-raft
-"1701": l2tp
-"1702": deskshare
-"1703": hb-engine
-"1704": bcs-broker
-"1705": slingshot
-"1706": jetform
-"1707": vdmplay
-"1708": gat-lmd
-"1709": centra
-"1710": impera
-"1711": pptconference
-"1712": registrar
-"1713": conferencetalk
-"1714": sesi-lm
-"1715": houdini-lm
-"1716": xmsg
-"1717": fj-hdnet
-"1718": h323gatedisc
-"1719": h323gatestat
-"1720": h323hostcall
-"1721": caicci
-"1722": hks-lm
-"1723": pptp
-"1724": csbphonemaster
-"1725": iden-ralp
-"1726": iberiagames
-"1727": winddx
-"1728": telindus
-"1729": citynl
-"1730": roketz
-"1731": msiccp
-"1732": proxim
-"1733": siipat
-"1734": cambertx-lm
-"1735": privatechat
-"1736": street-stream
-"1737": ultimad
-"1738": gamegen1
-"1739": webaccess
-"1740": encore
-"1741": cisco-net-mgmt
-"1742": 3Com-nsd
-"1743": cinegrfx-lm
-"1744": ncpm-ft
-"1745": remote-winsock
-"1746": ftrapid-1
-"1747": ftrapid-2
-"1748": oracle-em1
-"1749": aspen-services
-"1750": sslp
-"1751": swiftnet
-"1752": lofr-lm
-"1753": predatar-comms
-"1754": oracle-em2
-"1755": ms-streaming
-"1756": capfast-lmd
-"1757": cnhrp
-"1758": tftp-mcast
-"1759": spss-lm
-"1760": www-ldap-gw
-"1761": cft-0
-"1762": cft-1
-"1763": cft-2
-"1764": cft-3
-"1765": cft-4
-"1766": cft-5
-"1767": cft-6
-"1768": cft-7
-"1769": bmc-net-adm
-"1770": bmc-net-svc
-"1771": vaultbase
-"1772": essweb-gw
-"1773": kmscontrol
-"1774": global-dtserv
-"1775": vdab
-"1776": femis
-"1777": powerguardian
-"1778": prodigy-intrnet
-"1779": pharmasoft
-"1780": dpkeyserv
-"1781": answersoft-lm
-"1782": hp-hcip
-"1784": finle-lm
-"1785": windlm
-"1786": funk-logger
-"1787": funk-license
-"1788": psmond
-"1789": hello
-"1790": nmsp
-"1791": ea1
-"1792": ibm-dt-2
-"1793": rsc-robot
-"1794": cera-bcm
-"1795": dpi-proxy
-"1796": vocaltec-admin
-"1797": uma
-"1798": etp
-"1799": netrisk
-"1800": ansys-lm
-"1801": msmq
-"1802": concomp1
-"1803": hp-hcip-gwy
-"1804": enl
-"1805": enl-name
-"1806": musiconline
-"1807": fhsp
-"1808": oracle-vp2
-"1809": oracle-vp1
-"1810": jerand-lm
-"1811": scientia-sdb
-"1812": radius
-"1813": radius-acct
-"1814": tdp-suite
-"1815": mmpft
-"1816": harp
-"1817": rkb-oscs
-"1818": etftp
-"1819": plato-lm
-"1820": mcagent
-"1821": donnyworld
-"1822": es-elmd
-"1823": unisys-lm
-"1824": metrics-pas
-"1825": direcpc-video
-"1826": ardt
-"1827": asi
-"1828": itm-mcell-u
-"1829": optika-emedia
-"1830": net8-cman
-"1831": myrtle
-"1832": tht-treasure
-"1833": udpradio
-"1834": ardusuni
-"1835": ardusmul
-"1836": ste-smsc
-"1837": csoft1
-"1838": talnet
-"1839": netopia-vo1
-"1840": netopia-vo2
-"1841": netopia-vo3
-"1842": netopia-vo4
-"1843": netopia-vo5
-"1844": direcpc-dll
-"1845": altalink
-"1846": tunstall-pnc
-"1847": slp-notify
-"1848": fjdocdist
-"1849": alpha-sms
-"1850": gsi
-"1851": ctcd
-"1852": virtual-time
-"1853": vids-avtp
-"1854": buddy-draw
-"1855": fiorano-rtrsvc
-"1856": fiorano-msgsvc
-"1857": datacaptor
-"1858": privateark
-"1859": gammafetchsvr
-"1860": sunscalar-svc
-"1861": lecroy-vicp
-"1862": mysql-cm-agent
-"1863": msnp
-"1864": paradym-31port
-"1865": entp
-"1866": swrmi
-"1867": udrive
-"1868": viziblebrowser
-"1869": transact
-"1870": sunscalar-dns
-"1871": canocentral0
-"1872": canocentral1
-"1873": fjmpjps
-"1874": fjswapsnp
-"1875": westell-stats
-"1876": ewcappsrv
-"1877": hp-webqosdb
-"1878": drmsmc
-"1879": nettgain-nms
-"1880": vsat-control
-"1881": ibm-mqseries2
-"1882": ecsqdmn
-"1883": mqtt
-"1884": idmaps
-"1885": vrtstrapserver
-"1886": leoip
-"1887": filex-lport
-"1888": ncconfig
-"1889": unify-adapter
-"1890": wilkenlistener
-"1891": childkey-notif
-"1892": childkey-ctrl
-"1893": elad
-"1894": o2server-port
-"1896": b-novative-ls
-"1897": metaagent
-"1898": cymtec-port
-"1899": mc2studios
-"1900": ssdp
-"1901": fjicl-tep-a
-"1902": fjicl-tep-b
-"1903": linkname
-"1904": fjicl-tep-c
-"1905": sugp
-"1906": tpmd
-"1907": intrastar
-"1908": dawn
-"1909": global-wlink
-"1910": ultrabac
-"1911": mtp
-"1912": rhp-iibp
-"1913": armadp
-"1914": elm-momentum
-"1915": facelink
-"1916": persona
-"1917": noagent
-"1918": can-nds
-"1919": can-dch
-"1920": can-ferret
-"1921": noadmin
-"1922": tapestry
-"1923": spice
-"1924": xiip
-"1925": discovery-port
-"1926": egs
-"1927": videte-cipc
-"1928": emsd-port
-"1929": bandwiz-system
-"1930": driveappserver
-"1931": amdsched
-"1932": ctt-broker
-"1933": xmapi
-"1934": xaapi
-"1935": macromedia-fcs
-"1936": jetcmeserver
-"1937": jwserver
-"1938": jwclient
-"1939": jvserver
-"1940": jvclient
-"1941": dic-aida
-"1942": res
-"1943": beeyond-media
-"1944": close-combat
-"1945": dialogic-elmd
-"1946": tekpls
-"1947": sentinelsrm
-"1948": eye2eye
-"1949": ismaeasdaqlive
-"1950": ismaeasdaqtest
-"1951": bcs-lmserver
-"1952": mpnjsc
-"1953": rapidbase
-"1954": abr-api
-"1955": abr-secure
-"1956": vrtl-vmf-ds
-"1957": unix-status
-"1958": dxadmind
-"1959": simp-all
-"1960": nasmanager
-"1961": bts-appserver
-"1962": biap-mp
-"1963": webmachine
-"1964": solid-e-engine
-"1965": tivoli-npm
-"1966": slush
-"1967": sns-quote
-"1968": lipsinc
-"1969": lipsinc1
-"1970": netop-rc
-"1971": netop-school
-"1972": intersys-cache
-"1973": dlsrap
-"1974": drp
-"1975": tcoflashagent
-"1976": tcoregagent
-"1977": tcoaddressbook
-"1978": unisql
-"1979": unisql-java
-"1980": pearldoc-xact
-"1981": p2pq
-"1982": estamp
-"1983": lhtp
-"1984": bb
-"1985": hsrp
-"1986": licensedaemon
-"1987": tr-rsrb-p1
-"1988": tr-rsrb-p2
-"1989": tr-rsrb-p3
-"1990": stun-p1
-"1991": stun-p2
-"1992": ipsendmsg
-"1992": stun-p3
-"1993": snmp-tcp-port
-"1994": stun-port
-"1995": perf-port
-"1996": tr-rsrb-port
-"1997": gdp-port
-"1998": x25-svc-port
-"1999": tcp-id-port
-"2000": cisco-sccp
-"2001": dc
-"2002": globe
-"2003": brutus
-"2004": mailbox
-"2005": berknet
-"2006": invokator
-"2007": dectalk
-"2008": conf
-"2009": news
-"2010": search
-"2011": raid-cc
-"2012": ttyinfo
-"2013": raid-am
-"2014": troff
-"2015": cypress
-"2016": bootserver
-"2017": cypress-stat
-"2018": terminaldb
-"2019": whosockami
-"2020": xinupageserver
-"2021": servexec
-"2022": down
-"2023": xinuexpansion3
-"2024": xinuexpansion4
-"2025": ellpack
-"2026": scrabble
-"2027": shadowserver
-"2028": submitserver
-"2029": hsrpv6
-"2030": device2
-"2031": mobrien-chat
-"2032": blackboard
-"2033": glogger
-"2034": scoremgr
-"2035": imsldoc
-"2036": e-dpnet
-"2037": applus
-"2038": objectmanager
-"2039": prizma
-"2040": lam
-"2041": interbase
-"2042": isis
-"2043": isis-bcast
-"2044": rimsl
-"2045": cdfunc
-"2046": sdfunc
-"2047": dls
-"2048": dls-monitor
-"2049": nfs
-"2050": av-emb-config
-"2051": epnsdp
-"2052": clearvisn
-"2053": lot105-ds-upd
-"2054": weblogin
-"2055": iop
-"2056": omnisky
-"2057": rich-cp
-"2058": newwavesearch
-"2059": bmc-messaging
-"2060": teleniumdaemon
-"2061": netmount
-"2062": icg-swp
-"2063": icg-bridge
-"2064": icg-iprelay
-"2065": dlsrpn
-"2066": aura
-"2067": dlswpn
-"2068": avauthsrvprtcl
-"2069": event-port
-"2070": ah-esp-encap
-"2071": acp-port
-"2072": msync
-"2073": gxs-data-port
-"2074": vrtl-vmf-sa
-"2075": newlixengine
-"2076": newlixconfig
-"2077": tsrmagt
-"2078": tpcsrvr
-"2079": idware-router
-"2080": autodesk-nlm
-"2081": kme-trap-port
-"2082": infowave
-"2083": radsec
-"2084": sunclustergeo
-"2085": ada-cip
-"2086": gnunet
-"2087": eli
-"2088": ip-blf
-"2089": sep
-"2090": lrp
-"2091": prp
-"2092": descent3
-"2093": nbx-cc
-"2094": nbx-au
-"2095": nbx-ser
-"2096": nbx-dir
-"2097": jetformpreview
-"2098": dialog-port
-"2099": h2250-annex-g
-"2100": amiganetfs
-"2101": rtcm-sc104
-"2102": zephyr-srv
-"2103": zephyr-clt
-"2104": zephyr-hm
-"2105": minipay
-"2106": mzap
-"2107": bintec-admin
-"2108": comcam
-"2109": ergolight
-"2110": umsp
-"2111": dsatp
-"2112": idonix-metanet
-"2113": hsl-storm
-"2114": newheights
-"2115": kdm
-"2116": ccowcmr
-"2117": mentaclient
-"2118": mentaserver
-"2119": gsigatekeeper
-"2120": qencp
-"2121": scientia-ssdb
-"2122": caupc-remote
-"2123": gtp-control
-"2124": elatelink
-"2125": lockstep
-"2126": pktcable-cops
-"2127": index-pc-wb
-"2128": net-steward
-"2129": cs-live
-"2130": xds
-"2131": avantageb2b
-"2132": solera-epmap
-"2133": zymed-zpp
-"2134": avenue
-"2135": gris
-"2136": appworxsrv
-"2137": connect
-"2138": unbind-cluster
-"2139": ias-auth
-"2140": ias-reg
-"2141": ias-admind
-"2142": tdmoip
-"2143": lv-jc
-"2144": lv-ffx
-"2145": lv-pici
-"2146": lv-not
-"2147": lv-auth
-"2148": veritas-ucl
-"2149": acptsys
-"2150": dynamic3d
-"2151": docent
-"2152": gtp-user
-"2153": ctlptc
-"2154": stdptc
-"2155": brdptc
-"2156": trp
-"2157": xnds
-"2158": touchnetplus
-"2159": gdbremote
-"2160": apc-2160
-"2161": apc-2161
-"2162": navisphere
-"2163": navisphere-sec
-"2164": ddns-v3
-"2165": x-bone-api
-"2166": iwserver
-"2167": raw-serial
-"2168": easy-soft-mux
-"2169": brain
-"2170": eyetv
-"2171": msfw-storage
-"2172": msfw-s-storage
-"2173": msfw-replica
-"2174": msfw-array
-"2175": airsync
-"2176": rapi
-"2177": qwave
-"2178": bitspeer
-"2179": vmrdp
-"2180": mc-gt-srv
-"2181": eforward
-"2182": cgn-stat
-"2183": cgn-config
-"2184": nvd
-"2185": onbase-dds
-"2186": gtaua
-"2187": ssmc
-"2188": radware-rpm
-"2189": radware-rpm-s
-"2190": tivoconnect
-"2191": tvbus
-"2192": asdis
-"2193": drwcs
-"2197": mnp-exchange
-"2198": onehome-remote
-"2199": onehome-help
-"2200": ici
-"2201": ats
-"2202": imtc-map
-"2203": b2-runtime
-"2204": b2-license
-"2205": jps
-"2206": hpocbus
-"2207": hpssd
-"2208": hpiod
-"2209": rimf-ps
-"2210": noaaport
-"2211": emwin
-"2212": leecoposserver
-"2213": kali
-"2214": rpi
-"2215": ipcore
-"2216": vtu-comms
-"2217": gotodevice
-"2218": bounzza
-"2219": netiq-ncap
-"2220": netiq
-"2221": ethernet-ip-s
-"2222": EtherNet-IP-1
-"2223": rockwell-csp2
-"2224": efi-mg
-"2225": rcip-itu
-"2226": di-drm
-"2227": di-msg
-"2228": ehome-ms
-"2229": datalens
-"2230": queueadm
-"2231": wimaxasncp
-"2232": ivs-video
-"2233": infocrypt
-"2234": directplay
-"2235": sercomm-wlink
-"2236": nani
-"2237": optech-port1-lm
-"2238": aviva-sna
-"2239": imagequery
-"2240": recipe
-"2241": ivsd
-"2242": foliocorp
-"2243": magicom
-"2244": nmsserver
-"2245": hao
-"2246": pc-mta-addrmap
-"2247": antidotemgrsvr
-"2248": ums
-"2249": rfmp
-"2250": remote-collab
-"2251": dif-port
-"2252": njenet-ssl
-"2253": dtv-chan-req
-"2254": seispoc
-"2255": vrtp
-"2256": pcc-mfp
-"2257": simple-tx-rx
-"2258": rcts
-"2260": apc-2260
-"2261": comotionmaster
-"2262": comotionback
-"2263": ecwcfg
-"2264": apx500api-1
-"2265": apx500api-2
-"2266": mfserver
-"2267": ontobroker
-"2268": amt
-"2269": mikey
-"2270": starschool
-"2271": mmcals
-"2272": mmcal
-"2273": mysql-im
-"2274": pcttunnell
-"2275": ibridge-data
-"2276": ibridge-mgmt
-"2277": bluectrlproxy
-"2278": s3db
-"2279": xmquery
-"2280": lnvpoller
-"2281": lnvconsole
-"2282": lnvalarm
-"2283": lnvstatus
-"2284": lnvmaps
-"2285": lnvmailmon
-"2286": nas-metering
-"2287": dna
-"2288": netml
-"2289": dict-lookup
-"2290": sonus-logging
-"2291": eapsp
-"2292": mib-streaming
-"2293": npdbgmngr
-"2294": konshus-lm
-"2295": advant-lm
-"2296": theta-lm
-"2297": d2k-datamover1
-"2298": d2k-datamover2
-"2299": pc-telecommute
-"2300": cvmmon
-"2301": cpq-wbem
-"2302": binderysupport
-"2303": proxy-gateway
-"2304": attachmate-uts
-"2305": mt-scaleserver
-"2306": tappi-boxnet
-"2307": pehelp
-"2308": sdhelp
-"2309": sdserver
-"2310": sdclient
-"2311": messageservice
-"2312": wanscaler
-"2313": iapp
-"2314": cr-websystems
-"2315": precise-sft
-"2316": sent-lm
-"2317": attachmate-g32
-"2318": cadencecontrol
-"2319": infolibria
-"2320": siebel-ns
-"2321": rdlap
-"2322": ofsd
-"2323": 3d-nfsd
-"2324": cosmocall
-"2325": ansysli
-"2326": idcp
-"2327": xingcsm
-"2328": netrix-sftm
-"2329": nvd
-"2330": tscchat
-"2331": agentview
-"2332": rcc-host
-"2333": snapp
-"2334": ace-client
-"2335": ace-proxy
-"2336": appleugcontrol
-"2337": ideesrv
-"2338": norton-lambert
-"2339": 3com-webview
-"2340": wrs-registry
-"2341": xiostatus
-"2342": manage-exec
-"2343": nati-logos
-"2344": fcmsys
-"2345": dbm
-"2346": redstorm-join
-"2347": redstorm-find
-"2348": redstorm-info
-"2349": redstorm-diag
-"2350": psbserver
-"2351": psrserver
-"2352": pslserver
-"2353": pspserver
-"2354": psprserver
-"2355": psdbserver
-"2356": gxtelmd
-"2357": unihub-server
-"2358": futrix
-"2359": flukeserver
-"2360": nexstorindltd
-"2361": tl1
-"2362": digiman
-"2363": mediacntrlnfsd
-"2364": oi-2000
-"2365": dbref
-"2366": qip-login
-"2367": service-ctrl
-"2368": opentable
-"2370": l3-hbmon
-"2371": hp-rda
-"2372": lanmessenger
-"2373": remographlm
-"2374": hydra
-"2375": docker
-"2376": docker-s
-"2379": etcd-client
-"2380": etcd-server
-"2381": compaq-https
-"2382": ms-olap3
-"2383": ms-olap4
-"2384": sd-request
-"2385": sd-data
-"2386": virtualtape
-"2387": vsamredirector
-"2388": mynahautostart
-"2389": ovsessionmgr
-"2390": rsmtp
-"2391": 3com-net-mgmt
-"2392": tacticalauth
-"2393": ms-olap1
-"2394": ms-olap2
-"2395": lan900-remote
-"2396": wusage
-"2397": ncl
-"2398": orbiter
-"2399": fmpro-fdal
-"2400": opequus-server
-"2401": cvspserver
-"2402": taskmaster2000
-"2403": taskmaster2000
-"2404": iec-104
-"2405": trc-netpoll
-"2406": jediserver
-"2407": orion
-"2408": railgun-webaccl
-"2409": sns-protocol
-"2410": vrts-registry
-"2411": netwave-ap-mgmt
-"2412": cdn
-"2413": orion-rmi-reg
-"2414": beeyond
-"2415": codima-rtp
-"2416": rmtserver
-"2417": composit-server
-"2418": cas
-"2419": attachmate-s2s
-"2420": dslremote-mgmt
-"2421": g-talk
-"2422": crmsbits
-"2423": rnrp
-"2424": kofax-svr
-"2425": fjitsuappmgr
-"2426": vcmp
-"2427": mgcp-gateway
-"2428": ott
-"2429": ft-role
-"2430": venus
-"2431": venus-se
-"2432": codasrv
-"2433": codasrv-se
-"2434": pxc-epmap
-"2435": optilogic
-"2436": topx
-"2437": unicontrol
-"2438": msp
-"2439": sybasedbsynch
-"2440": spearway
-"2441": pvsw-inet
-"2442": netangel
-"2443": powerclientcsf
-"2444": btpp2sectrans
-"2445": dtn1
-"2446": bues-service
-"2447": ovwdb
-"2448": hpppssvr
-"2449": ratl
-"2450": netadmin
-"2451": netchat
-"2452": snifferclient
-"2453": madge-ltd
-"2454": indx-dds
-"2455": wago-io-system
-"2456": altav-remmgt
-"2457": rapido-ip
-"2458": griffin
-"2459": community
-"2460": ms-theater
-"2461": qadmifoper
-"2462": qadmifevent
-"2463": lsi-raid-mgmt
-"2464": direcpc-si
-"2465": lbm
-"2466": lbf
-"2467": high-criteria
-"2468": qip-msgd
-"2469": mti-tcs-comm
-"2470": taskman-port
-"2471": seaodbc
-"2472": c3
-"2473": aker-cdp
-"2474": vitalanalysis
-"2475": ace-server
-"2476": ace-svr-prop
-"2477": ssm-cvs
-"2478": ssm-cssps
-"2479": ssm-els
-"2480": powerexchange
-"2481": giop
-"2482": giop-ssl
-"2483": ttc
-"2484": ttc-ssl
-"2485": netobjects1
-"2486": netobjects2
-"2487": pns
-"2488": moy-corp
-"2489": tsilb
-"2490": qip-qdhcp
-"2491": conclave-cpp
-"2492": groove
-"2493": talarian-mqs
-"2494": bmc-ar
-"2495": fast-rem-serv
-"2496": dirgis
-"2497": quaddb
-"2498": odn-castraq
-"2499": unicontrol
-"2500": rtsserv
-"2501": rtsclient
-"2502": kentrox-prot
-"2503": nms-dpnss
-"2504": wlbs
-"2505": ppcontrol
-"2506": jbroker
-"2507": spock
-"2508": jdatastore
-"2509": fjmpss
-"2510": fjappmgrbulk
-"2511": metastorm
-"2512": citrixima
-"2513": citrixadmin
-"2514": facsys-ntp
-"2515": facsys-router
-"2516": maincontrol
-"2517": call-sig-trans
-"2518": willy
-"2519": globmsgsvc
-"2520": pvsw
-"2521": adaptecmgr
-"2522": windb
-"2523": qke-llc-v3
-"2524": optiwave-lm
-"2525": ms-v-worlds
-"2526": ema-sent-lm
-"2527": iqserver
-"2528": ncr-ccl
-"2529": utsftp
-"2530": vrcommerce
-"2531": ito-e-gui
-"2532": ovtopmd
-"2533": snifferserver
-"2534": combox-web-acc
-"2535": madcap
-"2536": btpp2audctr1
-"2537": upgrade
-"2538": vnwk-prapi
-"2539": vsiadmin
-"2540": lonworks
-"2541": lonworks2
-"2542": udrawgraph
-"2543": reftek
-"2544": novell-zen
-"2545": sis-emt
-"2546": vytalvaultbrtp
-"2547": vytalvaultvsmp
-"2548": vytalvaultpipe
-"2549": ipass
-"2550": ads
-"2551": isg-uda-server
-"2552": call-logging
-"2553": efidiningport
-"2554": vcnet-link-v10
-"2555": compaq-wcp
-"2556": nicetec-nmsvc
-"2557": nicetec-mgmt
-"2558": pclemultimedia
-"2559": lstp
-"2560": labrat
-"2561": mosaixcc
-"2562": delibo
-"2563": cti-redwood
-"2564": hp-3000-telnet
-"2565": coord-svr
-"2566": pcs-pcw
-"2567": clp
-"2568": spamtrap
-"2569": sonuscallsig
-"2570": hs-port
-"2571": cecsvc
-"2572": ibp
-"2573": trustestablish
-"2574": blockade-bpsp
-"2575": hl7
-"2576": tclprodebugger
-"2577": scipticslsrvr
-"2578": rvs-isdn-dcp
-"2579": mpfoncl
-"2580": tributary
-"2581": argis-te
-"2582": argis-ds
-"2583": mon
-"2584": cyaserv
-"2585": netx-server
-"2586": netx-agent
-"2587": masc
-"2588": privilege
-"2589": quartus-tcl
-"2590": idotdist
-"2591": maytagshuffle
-"2592": netrek
-"2593": mns-mail
-"2594": dts
-"2595": worldfusion1
-"2596": worldfusion2
-"2597": homesteadglory
-"2598": citriximaclient
-"2599": snapd
-"2600": hpstgmgr
-"2601": discp-client
-"2602": discp-server
-"2603": servicemeter
-"2604": nsc-ccs
-"2605": nsc-posa
-"2606": netmon
-"2607": connection
-"2608": wag-service
-"2609": system-monitor
-"2610": versa-tek
-"2611": lionhead
-"2612": qpasa-agent
-"2613": smntubootstrap
-"2614": neveroffline
-"2615": firepower
-"2616": appswitch-emp
-"2617": cmadmin
-"2618": priority-e-com
-"2619": bruce
-"2620": lpsrecommender
-"2621": miles-apart
-"2622": metricadbc
-"2623": lmdp
-"2624": aria
-"2625": blwnkl-port
-"2626": gbjd816
-"2627": moshebeeri
-"2628": dict
-"2629": sitaraserver
-"2630": sitaramgmt
-"2631": sitaradir
-"2632": irdg-post
-"2633": interintelli
-"2634": pk-electronics
-"2635": backburner
-"2636": solve
-"2637": imdocsvc
-"2638": sybaseanywhere
-"2639": aminet
-"2640": ami-control
-"2641": hdl-srv
-"2642": tragic
-"2643": gte-samp
-"2644": travsoft-ipx-t
-"2645": novell-ipx-cmd
-"2646": and-lm
-"2647": syncserver
-"2648": upsnotifyprot
-"2649": vpsipport
-"2650": eristwoguns
-"2651": ebinsite
-"2652": interpathpanel
-"2653": sonus
-"2654": corel-vncadmin
-"2655": unglue
-"2656": kana
-"2657": sns-dispatcher
-"2658": sns-admin
-"2659": sns-query
-"2660": gcmonitor
-"2661": olhost
-"2662": bintec-capi
-"2663": bintec-tapi
-"2664": patrol-mq-gm
-"2665": patrol-mq-nm
-"2666": extensis
-"2667": alarm-clock-s
-"2668": alarm-clock-c
-"2669": toad
-"2670": tve-announce
-"2671": newlixreg
-"2672": nhserver
-"2673": firstcall42
-"2674": ewnn
-"2675": ttc-etap
-"2676": simslink
-"2677": gadgetgate1way
-"2678": gadgetgate2way
-"2679": syncserverssl
-"2680": pxc-sapxom
-"2681": mpnjsomb
-"2683": ncdloadbalance
-"2684": mpnjsosv
-"2685": mpnjsocl
-"2686": mpnjsomg
-"2687": pq-lic-mgmt
-"2688": md-cg-http
-"2689": fastlynx
-"2690": hp-nnm-data
-"2691": itinternet
-"2692": admins-lms
-"2694": pwrsevent
-"2695": vspread
-"2696": unifyadmin
-"2697": oce-snmp-trap
-"2698": mck-ivpip
-"2699": csoft-plusclnt
-"2700": tqdata
-"2701": sms-rcinfo
-"2702": sms-xfer
-"2703": sms-chat
-"2704": sms-remctrl
-"2705": sds-admin
-"2706": ncdmirroring
-"2707": emcsymapiport
-"2708": banyan-net
-"2709": supermon
-"2710": sso-service
-"2711": sso-control
-"2712": aocp
-"2713": raventbs
-"2714": raventdm
-"2715": hpstgmgr2
-"2716": inova-ip-disco
-"2717": pn-requester
-"2718": pn-requester2
-"2719": scan-change
-"2720": wkars
-"2721": smart-diagnose
-"2722": proactivesrvr
-"2723": watchdog-nt
-"2724": qotps
-"2725": msolap-ptp2
-"2726": tams
-"2727": mgcp-callagent
-"2728": sqdr
-"2729": tcim-control
-"2730": nec-raidplus
-"2731": fyre-messanger
-"2732": g5m
-"2733": signet-ctf
-"2734": ccs-software
-"2735": netiq-mc
-"2736": radwiz-nms-srv
-"2737": srp-feedback
-"2738": ndl-tcp-ois-gw
-"2739": tn-timing
-"2740": alarm
-"2741": tsb
-"2742": tsb2
-"2743": murx
-"2744": honyaku
-"2745": urbisnet
-"2746": cpudpencap
-"2747": fjippol-swrly
-"2748": fjippol-polsvr
-"2749": fjippol-cnsl
-"2750": fjippol-port1
-"2751": fjippol-port2
-"2752": rsisysaccess
-"2753": de-spot
-"2754": apollo-cc
-"2755": expresspay
-"2756": simplement-tie
-"2757": cnrp
-"2758": apollo-status
-"2759": apollo-gms
-"2760": sabams
-"2761": dicom-iscl
-"2762": dicom-tls
-"2763": desktop-dna
-"2764": data-insurance
-"2765": qip-audup
-"2766": compaq-scp
-"2767": uadtc
-"2768": uacs
-"2769": exce
-"2770": veronica
-"2771": vergencecm
-"2772": auris
-"2773": rbakcup1
-"2774": rbakcup2
-"2775": smpp
-"2776": ridgeway1
-"2777": ridgeway2
-"2778": gwen-sonya
-"2779": lbc-sync
-"2780": lbc-control
-"2781": whosells
-"2782": everydayrc
-"2783": aises
-"2784": www-dev
-"2785": aic-np
-"2786": aic-oncrpc
-"2787": piccolo
-"2788": fryeserv
-"2789": media-agent
-"2790": plgproxy
-"2791": mtport-regist
-"2792": f5-globalsite
-"2793": initlsmsad
-"2795": livestats
-"2796": ac-tech
-"2797": esp-encap
-"2798": tmesis-upshot
-"2799": icon-discover
-"2800": acc-raid
-"2801": igcp
-"2802": veritas-tcp1
-"2803": btprjctrl
-"2804": dvr-esm
-"2805": wta-wsp-s
-"2806": cspuni
-"2807": cspmulti
-"2808": j-lan-p
-"2809": corbaloc
-"2810": netsteward
-"2811": gsiftp
-"2812": atmtcp
-"2813": llm-pass
-"2814": llm-csv
-"2815": lbc-measure
-"2816": lbc-watchdog
-"2817": nmsigport
-"2818": rmlnk
-"2819": fc-faultnotify
-"2820": univision
-"2821": vrts-at-port
-"2822": ka0wuc
-"2823": cqg-netlan
-"2824": cqg-netlan-1
-"2826": slc-systemlog
-"2827": slc-ctrlrloops
-"2828": itm-lm
-"2829": silkp1
-"2830": silkp2
-"2831": silkp3
-"2832": silkp4
-"2833": glishd
-"2834": evtp
-"2835": evtp-data
-"2836": catalyst
-"2837": repliweb
-"2838": starbot
-"2839": nmsigport
-"2840": l3-exprt
-"2841": l3-ranger
-"2842": l3-hawk
-"2843": pdnet
-"2844": bpcp-poll
-"2845": bpcp-trap
-"2846": aimpp-hello
-"2847": aimpp-port-req
-"2848": amt-blc-port
-"2849": fxp
-"2850": metaconsole
-"2851": webemshttp
-"2852": bears-01
-"2853": ispipes
-"2854": infomover
-"2855": msrp
-"2856": cesdinv
-"2857": simctlp
-"2858": ecnp
-"2859": activememory
-"2860": dialpad-voice1
-"2861": dialpad-voice2
-"2862": ttg-protocol
-"2863": sonardata
-"2864": astromed-main
-"2865": pit-vpn
-"2866": iwlistener
-"2867": esps-portal
-"2868": npep-messaging
-"2869": icslap
-"2870": daishi
-"2871": msi-selectplay
-"2872": radix
-"2874": dxmessagebase1
-"2875": dxmessagebase2
-"2876": sps-tunnel
-"2877": bluelance
-"2878": aap
-"2879": ucentric-ds
-"2880": synapse
-"2881": ndsp
-"2882": ndtp
-"2883": ndnp
-"2884": flashmsg
-"2885": topflow
-"2886": responselogic
-"2887": aironetddp
-"2888": spcsdlobby
-"2889": rsom
-"2890": cspclmulti
-"2891": cinegrfx-elmd
-"2892": snifferdata
-"2893": vseconnector
-"2894": abacus-remote
-"2895": natuslink
-"2896": ecovisiong6-1
-"2897": citrix-rtmp
-"2898": appliance-cfg
-"2899": powergemplus
-"2900": quicksuite
-"2901": allstorcns
-"2902": netaspi
-"2903": suitcase
-"2904": m2ua
-"2905": m3ua
-"2906": caller9
-"2907": webmethods-b2b
-"2908": mao
-"2909": funk-dialout
-"2910": tdaccess
-"2911": blockade
-"2912": epicon
-"2913": boosterware
-"2914": gamelobby
-"2915": tksocket
-"2916": elvin-server
-"2917": elvin-client
-"2918": kastenchasepad
-"2919": roboer
-"2920": roboeda
-"2921": cesdcdman
-"2922": cesdcdtrn
-"2923": wta-wsp-wtp-s
-"2924": precise-vip
-"2926": mobile-file-dl
-"2927": unimobilectrl
-"2928": redstone-cpss
-"2929": amx-webadmin
-"2930": amx-weblinx
-"2931": circle-x
-"2932": incp
-"2933": 4-tieropmgw
-"2934": 4-tieropmcli
-"2935": qtp
-"2936": otpatch
-"2937": pnaconsult-lm
-"2938": sm-pas-1
-"2939": sm-pas-2
-"2940": sm-pas-3
-"2941": sm-pas-4
-"2942": sm-pas-5
-"2943": ttnrepository
-"2944": megaco-h248
-"2945": h248-binary
-"2946": fjsvmpor
-"2947": gpsd
-"2948": wap-push
-"2949": wap-pushsecure
-"2950": esip
-"2951": ottp
-"2952": mpfwsas
-"2953": ovalarmsrv
-"2954": ovalarmsrv-cmd
-"2955": csnotify
-"2956": ovrimosdbman
-"2957": jmact5
-"2958": jmact6
-"2959": rmopagt
-"2960": dfoxserver
-"2961": boldsoft-lm
-"2962": iph-policy-cli
-"2963": iph-policy-adm
-"2964": bullant-srap
-"2965": bullant-rap
-"2966": idp-infotrieve
-"2967": ssc-agent
-"2968": enpp
-"2969": essp
-"2970": index-net
-"2971": netclip
-"2972": pmsm-webrctl
-"2973": svnetworks
-"2974": signal
-"2975": fjmpcm
-"2976": cns-srv-port
-"2977": ttc-etap-ns
-"2978": ttc-etap-ds
-"2979": h263-video
-"2980": wimd
-"2981": mylxamport
-"2982": iwb-whiteboard
-"2983": netplan
-"2984": hpidsadmin
-"2985": hpidsagent
-"2986": stonefalls
-"2987": identify
-"2988": hippad
-"2989": zarkov
-"2990": boscap
-"2991": wkstn-mon
-"2992": avenyo
-"2993": veritas-vis1
-"2994": veritas-vis2
-"2995": idrs
-"2996": vsixml
-"2997": rebol
-"2998": realsecure
-"2999": remoteware-un
-"3000": hbci
-"3001": origo-native
-"3002": exlm-agent
-"3003": cgms
-"3004": csoftragent
-"3005": geniuslm
-"3006": ii-admin
-"3007": lotusmtap
-"3008": midnight-tech
-"3009": pxc-ntfy
-"3010": gw
-"3011": trusted-web
-"3012": twsdss
-"3013": gilatskysurfer
-"3014": broker-service
-"3015": nati-dstp
-"3016": notify-srvr
-"3017": event-listener
-"3018": srvc-registry
-"3019": resource-mgr
-"3020": cifs
-"3021": agriserver
-"3022": csregagent
-"3023": magicnotes
-"3024": nds-sso
-"3025": arepa-raft
-"3026": agri-gateway
-"3027": LiebDevMgmt-C
-"3028": LiebDevMgmt-DM
-"3029": LiebDevMgmt-A
-"3030": arepa-cas
-"3031": eppc
-"3032": redwood-chat
-"3033": pdb
-"3034": osmosis-aeea
-"3035": fjsv-gssagt
-"3036": hagel-dump
-"3037": hp-san-mgmt
-"3038": santak-ups
-"3039": cogitate
-"3040": tomato-springs
-"3041": di-traceware
-"3042": journee
-"3043": brp
-"3044": epp
-"3045": responsenet
-"3046": di-ase
-"3047": hlserver
-"3048": pctrader
-"3049": nsws
-"3050": gds-db
-"3051": galaxy-server
-"3052": apc-3052
-"3053": dsom-server
-"3054": amt-cnf-prot
-"3055": policyserver
-"3056": cdl-server
-"3057": goahead-fldup
-"3058": videobeans
-"3059": qsoft
-"3060": interserver
-"3061": cautcpd
-"3062": ncacn-ip-tcp
-"3063": ncadg-ip-udp
-"3064": rprt
-"3065": slinterbase
-"3066": netattachsdmp
-"3067": fjhpjp
-"3068": ls3bcast
-"3069": ls3
-"3070": mgxswitch
-"3071": csd-mgmt-port
-"3072": csd-monitor
-"3073": vcrp
-"3074": xbox
-"3075": orbix-locator
-"3076": orbix-config
-"3077": orbix-loc-ssl
-"3078": orbix-cfg-ssl
-"3079": lv-frontpanel
-"3080": stm-pproc
-"3081": tl1-lv
-"3082": tl1-raw
-"3083": tl1-telnet
-"3084": itm-mccs
-"3085": pcihreq
-"3086": jdl-dbkitchen
-"3087": asoki-sma
-"3088": xdtp
-"3089": ptk-alink
-"3090": stss
-"3091": 1ci-smcs
-"3093": rapidmq-center
-"3094": rapidmq-reg
-"3095": panasas
-"3096": ndl-aps
-"3098": umm-port
-"3099": chmd
-"3100": opcon-xps
-"3101": hp-pxpib
-"3102": slslavemon
-"3103": autocuesmi
-"3104": autocuelog
-"3105": cardbox
-"3106": cardbox-http
-"3107": business
-"3108": geolocate
-"3109": personnel
-"3110": sim-control
-"3111": wsynch
-"3112": ksysguard
-"3113": cs-auth-svr
-"3114": ccmad
-"3115": mctet-master
-"3116": mctet-gateway
-"3117": mctet-jserv
-"3118": pkagent
-"3119": d2000kernel
-"3120": d2000webserver
-"3121": pcmk-remote
-"3122": vtr-emulator
-"3123": edix
-"3124": beacon-port
-"3125": a13-an
-"3127": ctx-bridge
-"3128": ndl-aas
-"3129": netport-id
-"3130": icpv2
-"3131": netbookmark
-"3132": ms-rule-engine
-"3133": prism-deploy
-"3134": ecp
-"3135": peerbook-port
-"3136": grubd
-"3137": rtnt-1
-"3138": rtnt-2
-"3139": incognitorv
-"3140": ariliamulti
-"3141": vmodem
-"3142": rdc-wh-eos
-"3143": seaview
-"3144": tarantella
-"3145": csi-lfap
-"3146": bears-02
-"3147": rfio
-"3148": nm-game-admin
-"3149": nm-game-server
-"3150": nm-asses-admin
-"3151": nm-assessor
-"3152": feitianrockey
-"3153": s8-client-port
-"3154": ccmrmi
-"3155": jpegmpeg
-"3156": indura
-"3157": e3consultants
-"3158": stvp
-"3159": navegaweb-port
-"3160": tip-app-server
-"3161": doc1lm
-"3162": sflm
-"3163": res-sap
-"3164": imprs
-"3165": newgenpay
-"3166": sossecollector
-"3167": nowcontact
-"3168": poweronnud
-"3169": serverview-as
-"3170": serverview-asn
-"3171": serverview-gf
-"3172": serverview-rm
-"3173": serverview-icc
-"3174": armi-server
-"3175": t1-e1-over-ip
-"3176": ars-master
-"3177": phonex-port
-"3178": radclientport
-"3179": h2gf-w-2m
-"3180": mc-brk-srv
-"3181": bmcpatrolagent
-"3182": bmcpatrolrnvu
-"3183": cops-tls
-"3184": apogeex-port
-"3185": smpppd
-"3186": iiw-port
-"3187": odi-port
-"3188": brcm-comm-port
-"3189": pcle-infex
-"3190": csvr-proxy
-"3191": csvr-sslproxy
-"3192": firemonrcc
-"3193": spandataport
-"3194": magbind
-"3195": ncu-1
-"3196": ncu-2
-"3197": embrace-dp-s
-"3198": embrace-dp-c
-"3199": dmod-workspace
-"3200": tick-port
-"3201": cpq-tasksmart
-"3202": intraintra
-"3203": netwatcher-mon
-"3204": netwatcher-db
-"3205": isns
-"3206": ironmail
-"3207": vx-auth-port
-"3208": pfu-prcallback
-"3209": netwkpathengine
-"3210": flamenco-proxy
-"3211": avsecuremgmt
-"3212": surveyinst
-"3213": neon24x7
-"3214": jmq-daemon-1
-"3215": jmq-daemon-2
-"3216": ferrari-foam
-"3217": unite
-"3218": smartpackets
-"3219": wms-messenger
-"3220": xnm-ssl
-"3221": xnm-clear-text
-"3222": glbp
-"3223": digivote
-"3224": aes-discovery
-"3225": fcip-port
-"3226": isi-irp
-"3227": dwnmshttp
-"3228": dwmsgserver
-"3229": global-cd-port
-"3230": sftdst-port
-"3231": vidigo
-"3232": mdtp
-"3233": whisker
-"3234": alchemy
-"3235": mdap-port
-"3236": apparenet-ts
-"3237": apparenet-tps
-"3238": apparenet-as
-"3239": apparenet-ui
-"3240": triomotion
-"3241": sysorb
-"3242": sdp-id-port
-"3243": timelot
-"3244": onesaf
-"3245": vieo-fe
-"3246": dvt-system
-"3247": dvt-data
-"3248": procos-lm
-"3249": ssp
-"3250": hicp
-"3251": sysscanner
-"3252": dhe
-"3253": pda-data
-"3254": pda-sys
-"3255": semaphore
-"3256": cpqrpm-agent
-"3257": cpqrpm-server
-"3258": ivecon-port
-"3259": epncdp2
-"3260": iscsi-target
-"3261": winshadow
-"3262": necp
-"3263": ecolor-imager
-"3264": ccmail
-"3265": altav-tunnel
-"3266": ns-cfg-server
-"3267": ibm-dial-out
-"3268": msft-gc
-"3269": msft-gc-ssl
-"3270": verismart
-"3271": csoft-prev
-"3272": user-manager
-"3273": sxmp
-"3274": ordinox-server
-"3275": samd
-"3276": maxim-asics
-"3277": awg-proxy
-"3278": lkcmserver
-"3279": admind
-"3280": vs-server
-"3281": sysopt
-"3282": datusorb
-"3283": apple-remote-desktop
-"3284": 4talk
-"3285": plato
-"3286": e-net
-"3287": directvdata
-"3288": cops
-"3289": enpc
-"3290": caps-lm
-"3291": sah-lm
-"3292": cart-o-rama
-"3293": fg-fps
-"3294": fg-gip
-"3295": dyniplookup
-"3296": rib-slm
-"3297": cytel-lm
-"3298": deskview
-"3299": pdrncs
-"3300": ceph
-"3302": mcs-fastmail
-"3303": opsession-clnt
-"3304": opsession-srvr
-"3305": odette-ftp
-"3306": mysql
-"3307": opsession-prxy
-"3308": tns-server
-"3309": tns-adv
-"3310": dyna-access
-"3311": mcns-tel-ret
-"3312": appman-server
-"3313": uorb
-"3314": uohost
-"3315": cdid
-"3316": aicc-cmi
-"3317": vsaiport
-"3318": ssrip
-"3319": sdt-lmd
-"3320": officelink2000
-"3321": vnsstr
-"3326": sftu
-"3327": bbars
-"3328": egptlm
-"3329": hp-device-disc
-"3330": mcs-calypsoicf
-"3331": mcs-messaging
-"3332": mcs-mailsvr
-"3333": dec-notes
-"3334": directv-web
-"3335": directv-soft
-"3336": directv-tick
-"3337": directv-catlg
-"3338": anet-b
-"3339": anet-l
-"3340": anet-m
-"3341": anet-h
-"3342": webtie
-"3343": ms-cluster-net
-"3344": bnt-manager
-"3345": influence
-"3346": trnsprntproxy
-"3347": phoenix-rpc
-"3348": pangolin-laser
-"3349": chevinservices
-"3350": findviatv
-"3351": btrieve
-"3352": ssql
-"3353": fatpipe
-"3354": suitjd
-"3355": ordinox-dbase
-"3356": upnotifyps
-"3357": adtech-test
-"3358": mpsysrmsvr
-"3359": wg-netforce
-"3360": kv-server
-"3361": kv-agent
-"3362": dj-ilm
-"3363": nati-vi-server
-"3364": creativeserver
-"3365": contentserver
-"3366": creativepartnr
-"3372": tip2
-"3373": lavenir-lm
-"3374": cluster-disc
-"3375": vsnm-agent
-"3376": cdbroker
-"3377": cogsys-lm
-"3378": wsicopy
-"3379": socorfs
-"3380": sns-channels
-"3381": geneous
-"3382": fujitsu-neat
-"3383": esp-lm
-"3384": hp-clic
-"3385": qnxnetman
-"3386": gprs-data
-"3387": backroomnet
-"3388": cbserver
-"3389": ms-wbt-server
-"3390": dsc
-"3391": savant
-"3392": efi-lm
-"3393": d2k-tapestry1
-"3394": d2k-tapestry2
-"3395": dyna-lm
-"3396": printer-agent
-"3397": cloanto-lm
-"3398": mercantile
-"3399": csms
-"3400": csms2
-"3401": filecast
-"3402": fxaengine-net
-"3405": nokia-ann-ch1
-"3406": nokia-ann-ch2
-"3407": ldap-admin
-"3408": BESApi
-"3409": networklens
-"3410": networklenss
-"3411": biolink-auth
-"3412": xmlblaster
-"3413": svnet
-"3414": wip-port
-"3415": bcinameservice
-"3416": commandport
-"3417": csvr
-"3418": rnmap
-"3419": softaudit
-"3420": ifcp-port
-"3421": bmap
-"3422": rusb-sys-port
-"3423": xtrm
-"3424": xtrms
-"3425": agps-port
-"3426": arkivio
-"3427": websphere-snmp
-"3428": twcss
-"3429": gcsp
-"3430": ssdispatch
-"3431": ndl-als
-"3432": osdcp
-"3433": opnet-smp
-"3434": opencm
-"3435": pacom
-"3436": gc-config
-"3437": autocueds
-"3438": spiral-admin
-"3439": hri-port
-"3440": ans-console
-"3441": connect-client
-"3442": connect-server
-"3443": ov-nnm-websrv
-"3444": denali-server
-"3445": monp
-"3446": 3comfaxrpc
-"3447": directnet
-"3448": dnc-port
-"3449": hotu-chat
-"3450": castorproxy
-"3451": asam
-"3452": sabp-signal
-"3453": pscupd
-"3454": mira
-"3455": prsvp
-"3456": vat
-"3457": vat-control
-"3458": d3winosfi
-"3459": integral
-"3460": edm-manager
-"3461": edm-stager
-"3462": edm-std-notify
-"3463": edm-adm-notify
-"3464": edm-mgr-sync
-"3465": edm-mgr-cntrl
-"3466": workflow
-"3467": rcst
-"3468": ttcmremotectrl
-"3469": pluribus
-"3470": jt400
-"3471": jt400-ssl
-"3472": jaugsremotec-1
-"3473": jaugsremotec-2
-"3474": ttntspauto
-"3475": genisar-port
-"3476": nppmp
-"3477": ecomm
-"3478": stun
-"3479": twrpc
-"3480": plethora
-"3481": cleanerliverc
-"3482": vulture
-"3483": slim-devices
-"3484": gbs-stp
-"3485": celatalk
-"3486": ifsf-hb-port
-"3487": ltctcp
-"3488": fs-rh-srv
-"3489": dtp-dia
-"3490": colubris
-"3491": swr-port
-"3492": tvdumtray-port
-"3493": nut
-"3494": ibm3494
-"3495": seclayer-tcp
-"3496": seclayer-tls
-"3497": ipether232port
-"3498": dashpas-port
-"3499": sccip-media
-"3500": rtmp-port
-"3501": isoft-p2p
-"3502": avinstalldisc
-"3503": lsp-ping
-"3504": ironstorm
-"3505": ccmcomm
-"3506": apc-3506
-"3507": nesh-broker
-"3508": interactionweb
-"3509": vt-ssl
-"3510": xss-port
-"3511": webmail-2
-"3512": aztec
-"3513": arcpd
-"3514": must-p2p
-"3515": must-backplane
-"3516": smartcard-port
-"3517": 802-11-iapp
-"3518": artifact-msg
-"3519": nvmsgd
-"3520": galileolog
-"3521": mc3ss
-"3522": nssocketport
-"3523": odeumservlink
-"3524": ecmport
-"3525": eisport
-"3526": starquiz-port
-"3527": beserver-msg-q
-"3528": jboss-iiop
-"3529": jboss-iiop-ssl
-"3530": gf
-"3531": joltid
-"3532": raven-rmp
-"3533": raven-rdp
-"3534": urld-port
-"3535": ms-la
-"3536": snac
-"3537": ni-visa-remote
-"3538": ibm-diradm
-"3539": ibm-diradm-ssl
-"3540": pnrp-port
-"3541": voispeed-port
-"3542": hacl-monitor
-"3543": qftest-lookup
-"3544": teredo
-"3545": camac
-"3547": symantec-sim
-"3548": interworld
-"3549": tellumat-nms
-"3550": ssmpp
-"3551": apcupsd
-"3552": taserver
-"3553": rbr-discovery
-"3554": questnotify
-"3555": razor
-"3556": sky-transport
-"3557": personalos-001
-"3558": mcp-port
-"3559": cctv-port
-"3560": iniserve-port
-"3561": bmc-onekey
-"3562": sdbproxy
-"3563": watcomdebug
-"3564": esimport
-"3565": m2pa
-"3566": quest-data-hub
-"3567": dof-eps
-"3568": dof-tunnel-sec
-"3569": mbg-ctrl
-"3570": mccwebsvr-port
-"3571": megardsvr-port
-"3572": megaregsvrport
-"3573": tag-ups-1
-"3574": dmaf-server
-"3575": ccm-port
-"3576": cmc-port
-"3577": config-port
-"3578": data-port
-"3579": ttat3lb
-"3580": nati-svrloc
-"3581": kfxaclicensing
-"3582": press
-"3583": canex-watch
-"3584": u-dbap
-"3585": emprise-lls
-"3586": emprise-lsc
-"3587": p2pgroup
-"3588": sentinel
-"3589": isomair
-"3590": wv-csp-sms
-"3591": gtrack-server
-"3592": gtrack-ne
-"3593": bpmd
-"3594": mediaspace
-"3595": shareapp
-"3596": iw-mmogame
-"3597": a14
-"3598": a15
-"3599": quasar-server
-"3600": trap-daemon
-"3601": visinet-gui
-"3602": infiniswitchcl
-"3603": int-rcv-cntrl
-"3604": bmc-jmx-port
-"3605": comcam-io
-"3606": splitlock
-"3607": precise-i3
-"3608": trendchip-dcp
-"3609": cpdi-pidas-cm
-"3610": echonet
-"3611": six-degrees
-"3612": hp-dataprotect
-"3613": alaris-disc
-"3614": sigma-port
-"3615": start-network
-"3616": cd3o-protocol
-"3617": sharp-server
-"3618": aairnet-1
-"3619": aairnet-2
-"3620": ep-pcp
-"3621": ep-nsp
-"3622": ff-lr-port
-"3623": haipe-discover
-"3624": dist-upgrade
-"3625": volley
-"3626": bvcdaemon-port
-"3627": jamserverport
-"3628": ept-machine
-"3629": escvpnet
-"3630": cs-remote-db
-"3631": cs-services
-"3632": distcc
-"3633": wacp
-"3634": hlibmgr
-"3635": sdo
-"3636": servistaitsm
-"3637": scservp
-"3638": ehp-backup
-"3639": xap-ha
-"3640": netplay-port1
-"3641": netplay-port2
-"3642": juxml-port
-"3643": audiojuggler
-"3644": ssowatch
-"3645": cyc
-"3646": xss-srv-port
-"3647": splitlock-gw
-"3648": fjcp
-"3649": nmmp
-"3650": prismiq-plugin
-"3651": xrpc-registry
-"3652": vxcrnbuport
-"3653": tsp
-"3654": vaprtm
-"3655": abatemgr
-"3656": abatjss
-"3657": immedianet-bcn
-"3658": ps-ams
-"3659": apple-sasl
-"3660": can-nds-ssl
-"3661": can-ferret-ssl
-"3662": pserver
-"3663": dtp
-"3664": ups-engine
-"3665": ent-engine
-"3666": eserver-pap
-"3667": infoexch
-"3668": dell-rm-port
-"3669": casanswmgmt
-"3670": smile
-"3671": efcp
-"3672": lispworks-orb
-"3673": mediavault-gui
-"3674": wininstall-ipc
-"3675": calltrax
-"3676": va-pacbase
-"3677": roverlog
-"3678": ipr-dglt
-"3679": escale
-"3680": npds-tracker
-"3681": bts-x73
-"3682": cas-mapi
-"3683": bmc-ea
-"3684": faxstfx-port
-"3685": dsx-agent
-"3686": tnmpv2
-"3687": simple-push
-"3688": simple-push-s
-"3689": daap
-"3690": svn
-"3691": magaya-network
-"3692": intelsync
-"3693": easl
-"3695": bmc-data-coll
-"3696": telnetcpcd
-"3697": nw-license
-"3698": sagectlpanel
-"3699": kpn-icw
-"3700": lrs-paging
-"3701": netcelera
-"3702": ws-discovery
-"3703": adobeserver-3
-"3704": adobeserver-4
-"3705": adobeserver-5
-"3706": rt-event
-"3707": rt-event-s
-"3708": sun-as-iiops
-"3709": ca-idms
-"3710": portgate-auth
-"3711": edb-server2
-"3712": sentinel-ent
-"3713": tftps
-"3714": delos-dms
-"3715": anoto-rendezv
-"3716": wv-csp-sms-cir
-"3717": wv-csp-udp-cir
-"3718": opus-services
-"3719": itelserverport
-"3720": ufastro-instr
-"3721": xsync
-"3722": xserveraid
-"3723": sychrond
-"3724": blizwow
-"3725": na-er-tip
-"3726": array-manager
-"3727": e-mdu
-"3728": e-woa
-"3729": fksp-audit
-"3730": client-ctrl
-"3731": smap
-"3732": m-wnn
-"3733": multip-msg
-"3734": synel-data
-"3735": pwdis
-"3736": rs-rmi
-"3737": xpanel
-"3738": versatalk
-"3739": launchbird-lm
-"3740": heartbeat
-"3741": wysdma
-"3742": cst-port
-"3743": ipcs-command
-"3744": sasg
-"3745": gw-call-port
-"3746": linktest
-"3747": linktest-s
-"3748": webdata
-"3749": cimtrak
-"3750": cbos-ip-port
-"3751": gprs-cube
-"3752": vipremoteagent
-"3753": nattyserver
-"3754": timestenbroker
-"3755": sas-remote-hlp
-"3756": canon-capt
-"3757": grf-port
-"3758": apw-registry
-"3759": exapt-lmgr
-"3760": adtempusclient
-"3761": gsakmp
-"3762": gbs-smp
-"3763": xo-wave
-"3764": mni-prot-rout
-"3765": rtraceroute
-"3766": sitewatch-s
-"3767": listmgr-port
-"3768": rblcheckd
-"3769": haipe-otnk
-"3770": cindycollab
-"3771": paging-port
-"3772": ctp
-"3773": ctdhercules
-"3774": zicom
-"3775": ispmmgr
-"3776": dvcprov-port
-"3777": jibe-eb
-"3778": c-h-it-port
-"3779": cognima
-"3780": nnp
-"3781": abcvoice-port
-"3782": iso-tp0s
-"3783": bim-pem
-"3784": bfd-control
-"3785": bfd-echo
-"3786": upstriggervsw
-"3787": fintrx
-"3788": isrp-port
-"3789": remotedeploy
-"3790": quickbooksrds
-"3791": tvnetworkvideo
-"3792": sitewatch
-"3793": dcsoftware
-"3794": jaus
-"3795": myblast
-"3796": spw-dialer
-"3797": idps
-"3798": minilock
-"3799": radius-dynauth
-"3800": pwgpsi
-"3801": ibm-mgr
-"3802": vhd
-"3803": soniqsync
-"3804": iqnet-port
-"3805": tcpdataserver
-"3806": wsmlb
-"3807": spugna
-"3808": sun-as-iiops-ca
-"3809": apocd
-"3810": wlanauth
-"3811": amp
-"3812": neto-wol-server
-"3813": rap-ip
-"3814": neto-dcs
-"3815": lansurveyorxml
-"3816": sunlps-http
-"3817": tapeware
-"3818": crinis-hb
-"3819": epl-slp
-"3820": scp
-"3821": pmcp
-"3822": acp-discovery
-"3823": acp-conduit
-"3824": acp-policy
-"3825": ffserver
-"3826": warmux
-"3827": netmpi
-"3828": neteh
-"3829": neteh-ext
-"3830": cernsysmgmtagt
-"3831": dvapps
-"3832": xxnetserver
-"3833": aipn-auth
-"3834": spectardata
-"3835": spectardb
-"3836": markem-dcp
-"3837": mkm-discovery
-"3838": sos
-"3839": amx-rms
-"3840": flirtmitmir
-"3841": shiprush-db-svr
-"3842": nhci
-"3843": quest-agent
-"3844": rnm
-"3845": v-one-spp
-"3846": an-pcp
-"3847": msfw-control
-"3848": item
-"3849": spw-dnspreload
-"3850": qtms-bootstrap
-"3851": spectraport
-"3852": sse-app-config
-"3853": sscan
-"3854": stryker-com
-"3855": opentrac
-"3856": informer
-"3857": trap-port
-"3858": trap-port-mom
-"3859": nav-port
-"3860": sasp
-"3861": winshadow-hd
-"3862": giga-pocket
-"3863": asap-tcp
-"3864": asap-tcp-tls
-"3865": xpl
-"3866": dzdaemon
-"3867": dzoglserver
-"3868": diameter
-"3869": ovsam-mgmt
-"3870": ovsam-d-agent
-"3871": avocent-adsap
-"3872": oem-agent
-"3873": fagordnc
-"3874": sixxsconfig
-"3875": pnbscada
-"3876": dl-agent
-"3877": xmpcr-interface
-"3878": fotogcad
-"3879": appss-lm
-"3880": igrs
-"3881": idac
-"3882": msdts1
-"3883": vrpn
-"3884": softrack-meter
-"3885": topflow-ssl
-"3886": nei-management
-"3887": ciphire-data
-"3888": ciphire-serv
-"3889": dandv-tester
-"3890": ndsconnect
-"3891": rtc-pm-port
-"3892": pcc-image-port
-"3893": cgi-starapi
-"3894": syam-agent
-"3895": syam-smc
-"3896": sdo-tls
-"3897": sdo-ssh
-"3898": senip
-"3899": itv-control
-"3900": udt-os
-"3901": nimsh
-"3902": nimaux
-"3903": charsetmgr
-"3904": omnilink-port
-"3905": mupdate
-"3906": topovista-data
-"3907": imoguia-port
-"3908": hppronetman
-"3909": surfcontrolcpa
-"3910": prnrequest
-"3911": prnstatus
-"3912": gbmt-stars
-"3913": listcrt-port
-"3914": listcrt-port-2
-"3915": agcat
-"3916": wysdmc
-"3917": aftmux
-"3918": pktcablemmcops
-"3919": hyperip
-"3920": exasoftport1
-"3921": herodotus-net
-"3922": sor-update
-"3923": symb-sb-port
-"3924": mpl-gprs-port
-"3925": zmp
-"3926": winport
-"3927": natdataservice
-"3928": netboot-pxe
-"3929": smauth-port
-"3930": syam-webserver
-"3931": msr-plugin-port
-"3932": dyn-site
-"3933": plbserve-port
-"3934": sunfm-port
-"3935": sdp-portmapper
-"3936": mailprox
-"3937": dvbservdsc
-"3938": dbcontrol-agent
-"3939": aamp
-"3940": xecp-node
-"3941": homeportal-web
-"3942": srdp
-"3943": tig
-"3944": sops
-"3945": emcads
-"3946": backupedge
-"3947": ccp
-"3948": apdap
-"3949": drip
-"3950": namemunge
-"3951": pwgippfax
-"3952": i3-sessionmgr
-"3953": xmlink-connect
-"3954": adrep
-"3955": p2pcommunity
-"3956": gvcp
-"3957": mqe-broker
-"3958": mqe-agent
-"3959": treehopper
-"3960": bess
-"3961": proaxess
-"3962": sbi-agent
-"3963": thrp
-"3964": sasggprs
-"3965": ati-ip-to-ncpe
-"3966": bflckmgr
-"3967": ppsms
-"3968": ianywhere-dbns
-"3969": landmarks
-"3970": lanrevagent
-"3971": lanrevserver
-"3972": iconp
-"3973": progistics
-"3974": citysearch
-"3975": airshot
-"3976": opswagent
-"3977": opswmanager
-"3978": secure-cfg-svr
-"3979": smwan
-"3980": acms
-"3981": starfish
-"3982": eis
-"3983": eisp
-"3984": mapper-nodemgr
-"3985": mapper-mapethd
-"3986": mapper-ws-ethd
-"3987": centerline
-"3988": dcs-config
-"3989": bv-queryengine
-"3990": bv-is
-"3991": bv-smcsrv
-"3992": bv-ds
-"3993": bv-agent
-"3995": iss-mgmt-ssl
-"3996": abcsoftware
-"3997": agentsease-db
-"3998": dnx
-"3999": nvcnet
-"4000": terabase
-"4001": newoak
-"4002": pxc-spvr-ft
-"4003": pxc-splr-ft
-"4004": pxc-roid
-"4005": pxc-pin
-"4006": pxc-spvr
-"4007": pxc-splr
-"4008": netcheque
-"4009": chimera-hwm
-"4010": samsung-unidex
-"4011": altserviceboot
-"4012": pda-gate
-"4013": acl-manager
-"4014": taiclock
-"4015": talarian-mcast1
-"4016": talarian-mcast2
-"4017": talarian-mcast3
-"4018": talarian-mcast4
-"4019": talarian-mcast5
-"4020": trap
-"4021": nexus-portal
-"4022": dnox
-"4023": esnm-zoning
-"4024": tnp1-port
-"4025": partimage
-"4026": as-debug
-"4027": bxp
-"4028": dtserver-port
-"4029": ip-qsig
-"4030": jdmn-port
-"4031": suucp
-"4032": vrts-auth-port
-"4033": sanavigator
-"4034": ubxd
-"4035": wap-push-http
-"4036": wap-push-https
-"4037": ravehd
-"4038": fazzt-ptp
-"4039": fazzt-admin
-"4040": yo-main
-"4041": houston
-"4042": ldxp
-"4043": nirp
-"4044": ltp
-"4045": npp
-"4046": acp-proto
-"4047": ctp-state
-"4049": wafs
-"4050": cisco-wafs
-"4051": cppdp
-"4052": interact
-"4053": ccu-comm-1
-"4054": ccu-comm-2
-"4055": ccu-comm-3
-"4056": lms
-"4057": wfm
-"4058": kingfisher
-"4059": dlms-cosem
-"4060": dsmeter-iatc
-"4061": ice-location
-"4062": ice-slocation
-"4063": ice-router
-"4064": ice-srouter
-"4065": avanti-cdp
-"4066": pmas
-"4067": idp
-"4068": ipfltbcst
-"4069": minger
-"4070": tripe
-"4071": aibkup
-"4072": zieto-sock
-"4073": iRAPP
-"4074": cequint-cityid
-"4075": perimlan
-"4076": seraph
-"4078": cssp
-"4079": santools
-"4080": lorica-in
-"4081": lorica-in-sec
-"4082": lorica-out
-"4083": lorica-out-sec
-"4085": ezmessagesrv
-"4087": applusservice
-"4088": npsp
-"4089": opencore
-"4090": omasgport
-"4091": ewinstaller
-"4092": ewdgs
-"4093": pvxpluscs
-"4094": sysrqd
-"4095": xtgui
-"4096": bre
-"4097": patrolview
-"4098": drmsfsd
-"4099": dpcp
-"4100": igo-incognito
-"4101": brlp-0
-"4102": brlp-1
-"4103": brlp-2
-"4104": brlp-3
-"4105": shofar
-"4106": synchronite
-"4107": j-ac
-"4108": accel
-"4109": izm
-"4110": g2tag
-"4111": xgrid
-"4112": apple-vpns-rp
-"4113": aipn-reg
-"4114": jomamqmonitor
-"4115": cds
-"4116": smartcard-tls
-"4117": hillrserv
-"4118": netscript
-"4119": assuria-slm
-"4121": e-builder
-"4122": fprams
-"4123": z-wave
-"4124": tigv2
-"4125": opsview-envoy
-"4126": ddrepl
-"4127": unikeypro
-"4128": nufw
-"4129": nuauth
-"4130": fronet
-"4131": stars
-"4132": nuts-dem
-"4133": nuts-bootp
-"4134": nifty-hmi
-"4135": cl-db-attach
-"4136": cl-db-request
-"4137": cl-db-remote
-"4138": nettest
-"4139": thrtx
-"4140": cedros-fds
-"4141": oirtgsvc
-"4142": oidocsvc
-"4143": oidsr
-"4145": vvr-control
-"4146": tgcconnect
-"4147": vrxpservman
-"4148": hhb-handheld
-"4149": agslb
-"4150": PowerAlert-nsa
-"4151": menandmice-noh
-"4152": idig-mux
-"4153": mbl-battd
-"4154": atlinks
-"4155": bzr
-"4156": stat-results
-"4157": stat-scanner
-"4158": stat-cc
-"4159": nss
-"4160": jini-discovery
-"4161": omscontact
-"4162": omstopology
-"4163": silverpeakpeer
-"4164": silverpeakcomm
-"4165": altcp
-"4166": joost
-"4167": ddgn
-"4168": pslicser
-"4169": iadt
-"4170": d-cinema-csp
-"4171": ml-svnet
-"4172": pcoip
-"4174": smcluster
-"4175": bccp
-"4176": tl-ipcproxy
-"4177": wello
-"4178": storman
-"4179": MaxumSP
-"4180": httpx
-"4181": macbak
-"4182": pcptcpservice
-"4183": cyborgnet
-"4184": universe-suite
-"4185": wcpp
-"4186": boxbackupstore
-"4187": csc-proxy
-"4188": vatata
-"4189": pcep
-"4190": sieve
-"4192": azeti
-"4193": pvxplusio
-"4199": eims-admin
-"4300": corelccam
-"4301": d-data
-"4302": d-data-control
-"4303": srcp
-"4304": owserver
-"4305": batman
-"4306": pinghgl
-"4307": visicron-vs
-"4308": compx-lockview
-"4309": dserver
-"4310": mirrtex
-"4311": p6ssmc
-"4312": pscl-mgt
-"4313": perrla
-"4314": choiceview-agt
-"4316": choiceview-clt
-"4320": fdt-rcatp
-"4321": rwhois
-"4322": trim-event
-"4323": trim-ice
-"4325": geognosisman
-"4326": geognosis
-"4327": jaxer-web
-"4328": jaxer-manager
-"4329": publiqare-sync
-"4330": dey-sapi
-"4331": ktickets-rest
-"4333": ahsp
-"4334": netconf-ch-ssh
-"4335": netconf-ch-tls
-"4336": restconf-ch-tls
-"4340": gaia
-"4341": lisp-data
-"4342": lisp-cons
-"4343": unicall
-"4344": vinainstall
-"4345": m4-network-as
-"4346": elanlm
-"4347": lansurveyor
-"4348": itose
-"4349": fsportmap
-"4350": net-device
-"4351": plcy-net-svcs
-"4352": pjlink
-"4353": f5-iquery
-"4354": qsnet-trans
-"4355": qsnet-workst
-"4356": qsnet-assist
-"4357": qsnet-cond
-"4358": qsnet-nucl
-"4359": omabcastltkm
-"4360": matrix-vnet
-"4368": wxbrief
-"4369": epmd
-"4370": elpro-tunnel
-"4371": l2c-control
-"4372": l2c-data
-"4373": remctl
-"4374": psi-ptt
-"4375": tolteces
-"4376": bip
-"4377": cp-spxsvr
-"4378": cp-spxdpy
-"4379": ctdb
-"4389": xandros-cms
-"4390": wiegand
-"4391": apwi-imserver
-"4392": apwi-rxserver
-"4393": apwi-rxspooler
-"4395": omnivisionesx
-"4396": fly
-"4400": ds-srv
-"4401": ds-srvr
-"4402": ds-clnt
-"4403": ds-user
-"4404": ds-admin
-"4405": ds-mail
-"4406": ds-slp
-"4407": nacagent
-"4408": slscc
-"4409": netcabinet-com
-"4410": itwo-server
-"4411": found
-"4413": avi-nms
-"4414": updog
-"4415": brcd-vr-req
-"4416": pjj-player
-"4417": workflowdir
-"4419": cbp
-"4420": nvm-express
-"4421": scaleft
-"4422": tsepisp
-"4423": thingkit
-"4425": netrockey6
-"4426": beacon-port-2
-"4427": drizzle
-"4428": omviserver
-"4429": omviagent
-"4430": rsqlserver
-"4431": wspipe
-"4432": l-acoustics
-"4433": vop
-"4442": saris
-"4443": pharos
-"4444": krb524
-"4445": upnotifyp
-"4446": n1-fwp
-"4447": n1-rmgmt
-"4448": asc-slmd
-"4449": privatewire
-"4450": camp
-"4451": ctisystemmsg
-"4452": ctiprogramload
-"4453": nssalertmgr
-"4454": nssagentmgr
-"4455": prchat-user
-"4456": prchat-server
-"4457": prRegister
-"4458": mcp
-"4484": hpssmgmt
-"4485": assyst-dr
-"4486": icms
-"4487": prex-tcp
-"4488": awacs-ice
-"4500": ipsec-nat-t
-"4535": ehs
-"4536": ehs-ssl
-"4537": wssauthsvc
-"4538": swx-gate
-"4545": worldscores
-"4546": sf-lm
-"4547": lanner-lm
-"4548": synchromesh
-"4549": aegate
-"4550": gds-adppiw-db
-"4551": ieee-mih
-"4552": menandmice-mon
-"4553": icshostsvc
-"4554": msfrs
-"4555": rsip
-"4556": dtn-bundle
-"4559": hylafax
-"4563": amahi-anywhere
-"4566": kwtc
-"4567": tram
-"4568": bmc-reporting
-"4569": iax
-"4570": deploymentmap
-"4573": cardifftec-back
-"4590": rid
-"4591": l3t-at-an
-"4593": ipt-anri-anri
-"4594": ias-session
-"4595": ias-paging
-"4596": ias-neighbor
-"4597": a21-an-1xbs
-"4598": a16-an-an
-"4599": a17-an-an
-"4600": piranha1
-"4601": piranha2
-"4602": mtsserver
-"4603": menandmice-upg
-"4604": irp
-"4605": sixchat
-"4658": playsta2-app
-"4659": playsta2-lob
-"4660": smaclmgr
-"4661": kar2ouche
-"4662": oms
-"4663": noteit
-"4664": ems
-"4665": contclientms
-"4666": eportcomm
-"4667": mmacomm
-"4668": mmaeds
-"4669": eportcommdata
-"4670": light
-"4671": acter
-"4672": rfa
-"4673": cxws
-"4674": appiq-mgmt
-"4675": dhct-status
-"4676": dhct-alerts
-"4677": bcs
-"4678": traversal
-"4679": mgesupervision
-"4680": mgemanagement
-"4681": parliant
-"4682": finisar
-"4683": spike
-"4684": rfid-rp1
-"4685": autopac
-"4686": msp-os
-"4687": nst
-"4688": mobile-p2p
-"4689": altovacentral
-"4690": prelude
-"4691": mtn
-"4692": conspiracy
-"4700": netxms-agent
-"4701": netxms-mgmt
-"4702": netxms-sync
-"4703": npqes-test
-"4704": assuria-ins
-"4725": truckstar
-"4727": fcis
-"4728": capmux
-"4730": gearman
-"4731": remcap
-"4733": resorcs
-"4737": ipdr-sp
-"4738": solera-lpn
-"4739": ipfix
-"4740": ipfixs
-"4741": lumimgrd
-"4742": sicct
-"4743": openhpid
-"4744": ifsp
-"4745": fmp
-"4749": profilemac
-"4750": ssad
-"4751": spocp
-"4752": snap
-"4753": simon
-"4756": RDCenter
-"4774": converge
-"4784": bfd-multi-ctl
-"4786": smart-install
-"4787": sia-ctrl-plane
-"4788": xmcp
-"4800": iims
-"4801": iwec
-"4802": ilss
-"4803": notateit
-"4827": htcp
-"4837": varadero-0
-"4838": varadero-1
-"4839": varadero-2
-"4840": opcua-tcp
-"4841": quosa
-"4842": gw-asv
-"4843": opcua-tls
-"4844": gw-log
-"4845": wcr-remlib
-"4846": contamac-icm
-"4847": wfc
-"4848": appserv-http
-"4849": appserv-https
-"4850": sun-as-nodeagt
-"4851": derby-repli
-"4867": unify-debug
-"4868": phrelay
-"4869": phrelaydbg
-"4870": cc-tracking
-"4871": wired
-"4876": tritium-can
-"4877": lmcs
-"4879": wsdl-event
-"4880": hislip
-"4883": wmlserver
-"4884": hivestor
-"4885": abbs
-"4894": lyskom
-"4899": radmin-port
-"4900": hfcs
-"4901": flr-agent
-"4902": magiccontrol
-"4912": lutap
-"4913": lutcp
-"4914": bones
-"4915": frcs
-"4940": eq-office-4940
-"4941": eq-office-4941
-"4942": eq-office-4942
-"4949": munin
-"4950": sybasesrvmon
-"4951": pwgwims
-"4952": sagxtsds
-"4953": dbsyncarbiter
-"4969": ccss-qmm
-"4970": ccss-qsm
-"4984": webyast
-"4985": gerhcs
-"4986": mrip
-"4987": smar-se-port1
-"4988": smar-se-port2
-"4989": parallel
-"4990": busycal
-"4991": vrt
-"4999": hfcs-manager
-"5000": commplex-main
-"5001": commplex-link
-"5002": rfe
-"5003": fmpro-internal
-"5004": avt-profile-1
-"5005": avt-profile-2
-"5006": wsm-server
-"5007": wsm-server-ssl
-"5008": synapsis-edge
-"5009": winfs
-"5010": telelpathstart
-"5011": telelpathattack
-"5012": nsp
-"5013": fmpro-v6
-"5015": fmwp
-"5020": zenginkyo-1
-"5021": zenginkyo-2
-"5022": mice
-"5023": htuilsrv
-"5024": scpi-telnet
-"5025": scpi-raw
-"5026": strexec-d
-"5027": strexec-s
-"5028": qvr
-"5029": infobright
-"5030": surfpass
-"5032": signacert-agent
-"5033": jtnetd-server
-"5034": jtnetd-status
-"5042": asnaacceler8db
-"5043": swxadmin
-"5044": lxi-evntsvc
-"5045": osp
-"5048": texai
-"5049": ivocalize
-"5050": mmcc
-"5051": ita-agent
-"5052": ita-manager
-"5053": rlm
-"5054": rlm-admin
-"5055": unot
-"5056": intecom-ps1
-"5057": intecom-ps2
-"5059": sds
-"5060": sip
-"5061": sips
-"5062": na-localise
-"5063": csrpc
-"5064": ca-1
-"5065": ca-2
-"5066": stanag-5066
-"5067": authentx
-"5068": bitforestsrv
-"5069": i-net-2000-npr
-"5070": vtsas
-"5071": powerschool
-"5072": ayiya
-"5073": tag-pm
-"5074": alesquery
-"5075": pvaccess
-"5080": onscreen
-"5081": sdl-ets
-"5082": qcp
-"5083": qfp
-"5084": llrp
-"5085": encrypted-llrp
-"5086": aprigo-cs
-"5087": biotic
-"5093": sentinel-lm
-"5094": hart-ip
-"5099": sentlm-srv2srv
-"5100": socalia
-"5101": talarian-tcp
-"5102": oms-nonsecure
-"5103": actifio-c2c
-"5106": actifioudsagent
-"5107": actifioreplic
-"5111": taep-as-svc
-"5112": pm-cmdsvr
-"5114": ev-services
-"5115": autobuild
-"5117": gradecam
-"5120": barracuda-bbs
-"5133": nbt-pc
-"5134": ppactivation
-"5135": erp-scale
-"5137": ctsd
-"5145": rmonitor-secure
-"5146": social-alarm
-"5150": atmp
-"5151": esri-sde
-"5152": sde-discovery
-"5153": toruxserver
-"5154": bzflag
-"5155": asctrl-agent
-"5156": rugameonline
-"5157": mediat
-"5161": snmpssh
-"5162": snmpssh-trap
-"5163": sbackup
-"5164": vpa
-"5165": ife-icorp
-"5166": winpcs
-"5167": scte104
-"5168": scte30
-"5172": pcoip-mgmt
-"5190": aol
-"5191": aol-1
-"5192": aol-2
-"5193": aol-3
-"5194": cpscomm
-"5195": ampl-lic
-"5196": ampl-tableproxy
-"5197": tunstall-lwp
-"5200": targus-getdata
-"5201": targus-getdata1
-"5202": targus-getdata2
-"5203": targus-getdata3
-"5209": nomad
-"5215": noteza
-"5221": 3exmp
-"5222": xmpp-client
-"5223": hpvirtgrp
-"5224": hpvirtctrl
-"5225": hp-server
-"5226": hp-status
-"5227": perfd
-"5228": hpvroom
-"5229": jaxflow
-"5230": jaxflow-data
-"5231": crusecontrol
-"5232": csedaemon
-"5233": enfs
-"5234": eenet
-"5235": galaxy-network
-"5236": padl2sim
-"5237": mnet-discovery
-"5245": downtools
-"5248": caacws
-"5249": caaclang2
-"5250": soagateway
-"5251": caevms
-"5252": movaz-ssc
-"5253": kpdp
-"5254": logcabin
-"5264": 3com-njack-1
-"5265": 3com-njack-2
-"5269": xmpp-server
-"5270": cartographerxmp
-"5271": cuelink
-"5272": pk
-"5280": xmpp-bosh
-"5281": undo-lm
-"5282": transmit-port
-"5298": presence
-"5299": nlg-data
-"5300": hacl-hb
-"5301": hacl-gs
-"5302": hacl-cfg
-"5303": hacl-probe
-"5304": hacl-local
-"5305": hacl-test
-"5306": sun-mc-grp
-"5307": sco-aip
-"5308": cfengine
-"5309": jprinter
-"5310": outlaws
-"5312": permabit-cs
-"5313": rrdp
-"5314": opalis-rbt-ipc
-"5315": hacl-poll
-"5316": hpbladems
-"5317": hpdevms
-"5318": pkix-cmc
-"5320": bsfserver-zn
-"5321": bsfsvr-zn-ssl
-"5343": kfserver
-"5344": xkotodrcp
-"5349": stuns
-"5352": dns-llq
-"5353": mdns
-"5354": mdnsresponder
-"5355": llmnr
-"5356": ms-smlbiz
-"5357": wsdapi
-"5358": wsdapi-s
-"5359": ms-alerter
-"5360": ms-sideshow
-"5361": ms-s-sideshow
-"5362": serverwsd2
-"5363": net-projection
-"5397": stresstester
-"5398": elektron-admin
-"5399": securitychase
-"5400": excerpt
-"5401": excerpts
-"5402": mftp
-"5403": hpoms-ci-lstn
-"5404": hpoms-dps-lstn
-"5405": netsupport
-"5406": systemics-sox
-"5407": foresyte-clear
-"5408": foresyte-sec
-"5409": salient-dtasrv
-"5410": salient-usrmgr
-"5411": actnet
-"5412": continuus
-"5413": wwiotalk
-"5414": statusd
-"5415": ns-server
-"5416": sns-gateway
-"5417": sns-agent
-"5418": mcntp
-"5419": dj-ice
-"5420": cylink-c
-"5421": netsupport2
-"5422": salient-mux
-"5423": virtualuser
-"5424": beyond-remote
-"5425": br-channel
-"5426": devbasic
-"5427": sco-peer-tta
-"5428": telaconsole
-"5429": base
-"5430": radec-corp
-"5431": park-agent
-"5432": postgresql
-"5433": pyrrho
-"5434": sgi-arrayd
-"5435": sceanics
-"5443": spss
-"5445": smbdirect
-"5450": tiepie
-"5453": surebox
-"5454": apc-5454
-"5455": apc-5455
-"5456": apc-5456
-"5461": silkmeter
-"5462": ttl-publisher
-"5463": ttlpriceproxy
-"5464": quailnet
-"5465": netops-broker
-"5470": apsolab-col
-"5471": apsolab-cols
-"5472": apsolab-tag
-"5473": apsolab-tags
-"5475": apsolab-data
-"5500": fcp-addr-srvr1
-"5501": fcp-addr-srvr2
-"5502": fcp-srvr-inst1
-"5503": fcp-srvr-inst2
-"5504": fcp-cics-gw1
-"5505": checkoutdb
-"5506": amc
-"5507": psl-management
-"5553": sgi-eventmond
-"5554": sgi-esphttp
-"5555": personal-agent
-"5556": freeciv
-"5557": farenet
-"5565": hpe-dp-bura
-"5566": westec-connect
-"5567": dof-dps-mc-sec
-"5568": sdt
-"5569": rdmnet-ctrl
-"5573": sdmmp
-"5574": lsi-bobcat
-"5575": ora-oap
-"5579": fdtracks
-"5580": tmosms0
-"5581": tmosms1
-"5582": fac-restore
-"5583": tmo-icon-sync
-"5584": bis-web
-"5585": bis-sync
-"5586": att-mt-sms
-"5597": ininmessaging
-"5598": mctfeed
-"5599": esinstall
-"5600": esmmanager
-"5601": esmagent
-"5602": a1-msc
-"5603": a1-bs
-"5604": a3-sdunode
-"5605": a4-sdunode
-"5618": efr
-"5627": ninaf
-"5628": htrust
-"5629": symantec-sfdb
-"5630": precise-comm
-"5631": pcanywheredata
-"5632": pcanywherestat
-"5633": beorl
-"5634": xprtld
-"5635": sfmsso
-"5636": sfm-db-server
-"5637": cssc
-"5638": flcrs
-"5639": ics
-"5646": vfmobile
-"5670": filemq
-"5671": amqps
-"5672": amqp
-"5673": jms
-"5674": hyperscsi-port
-"5675": v5ua
-"5676": raadmin
-"5677": questdb2-lnchr
-"5678": rrac
-"5679": dccm
-"5680": auriga-router
-"5681": ncxcp
-"5688": ggz
-"5689": qmvideo
-"5693": rbsystem
-"5696": kmip
-"5700": supportassist
-"5713": proshareaudio
-"5714": prosharevideo
-"5715": prosharedata
-"5716": prosharerequest
-"5717": prosharenotify
-"5718": dpm
-"5719": dpm-agent
-"5720": ms-licensing
-"5721": dtpt
-"5722": msdfsr
-"5723": omhs
-"5724": omsdk
-"5725": ms-ilm
-"5726": ms-ilm-sts
-"5727": asgenf
-"5728": io-dist-data
-"5729": openmail
-"5730": unieng
-"5741": ida-discover1
-"5742": ida-discover2
-"5743": watchdoc-pod
-"5744": watchdoc
-"5745": fcopy-server
-"5746": fcopys-server
-"5747": tunatic
-"5748": tunalyzer
-"5750": rscd
-"5755": openmailg
-"5757": x500ms
-"5766": openmailns
-"5767": s-openmail
-"5768": openmailpxy
-"5769": spramsca
-"5770": spramsd
-"5771": netagent
-"5777": dali-port
-"5780": vts-rpc
-"5781": 3par-evts
-"5782": 3par-mgmt
-"5783": 3par-mgmt-ssl
-"5785": 3par-rcopy
-"5793": xtreamx
-"5813": icmpd
-"5814": spt-automation
-"5841": shiprush-d-ch
-"5842": reversion
-"5859": wherehoo
-"5863": ppsuitemsg
-"5868": diameters
-"5883": jute
-"5900": rfb
-"5910": cm
-"5911": cpdlc
-"5912": fis
-"5913": ads-c
-"5963": indy
-"5968": mppolicy-v5
-"5969": mppolicy-mgr
-"5984": couchdb
-"5985": wsman
-"5986": wsmans
-"5987": wbem-rmi
-"5988": wbem-http
-"5989": wbem-https
-"5990": wbem-exp-https
-"5991": nuxsl
-"5992": consul-insight
-"5993": cim-rs
-"5999": cvsup
-"6000": x11
-"6001": x11
-"6002": x11
-"6003": x11
-"6004": x11
-"6005": x11
-"6006": x11
-"6007": x11
-"6008": x11
-"6009": x11
-"6010": x11
-"6011": x11
-"6012": x11
-"6013": x11
-"6014": x11
-"6015": x11
-"6016": x11
-"6017": x11
-"6018": x11
-"6019": x11
-"6020": x11
-"6021": x11
-"6022": x11
-"6023": x11
-"6024": x11
-"6025": x11
-"6026": x11
-"6027": x11
-"6028": x11
-"6029": x11
-"6030": x11
-"6031": x11
-"6032": x11
-"6033": x11
-"6034": x11
-"6035": x11
-"6036": x11
-"6037": x11
-"6038": x11
-"6039": x11
-"6040": x11
-"6041": x11
-"6042": x11
-"6043": x11
-"6044": x11
-"6045": x11
-"6046": x11
-"6047": x11
-"6048": x11
-"6049": x11
-"6050": x11
-"6051": x11
-"6052": x11
-"6053": x11
-"6054": x11
-"6055": x11
-"6056": x11
-"6057": x11
-"6058": x11
-"6059": x11
-"6060": x11
-"6061": x11
-"6062": x11
-"6063": x11
-"6064": ndl-ahp-svc
-"6065": winpharaoh
-"6066": ewctsp
-"6068": gsmp-ancp
-"6069": trip
-"6070": messageasap
-"6071": ssdtp
-"6072": diagnose-proc
-"6073": directplay8
-"6074": max
-"6075": dpm-acm
-"6076": msft-dpm-cert
-"6077": iconstructsrv
-"6084": reload-config
-"6085": konspire2b
-"6086": pdtp
-"6087": ldss
-"6088": doglms
-"6099": raxa-mgmt
-"6100": synchronet-db
-"6101": synchronet-rtc
-"6102": synchronet-upd
-"6103": rets
-"6104": dbdb
-"6105": primaserver
-"6106": mpsserver
-"6107": etc-control
-"6108": sercomm-scadmin
-"6109": globecast-id
-"6110": softcm
-"6111": spc
-"6112": dtspcd
-"6113": dayliteserver
-"6114": wrspice
-"6115": xic
-"6116": xtlserv
-"6117": daylitetouch
-"6121": spdy
-"6122": bex-webadmin
-"6123": backup-express
-"6124": pnbs
-"6130": damewaremobgtwy
-"6133": nbt-wol
-"6140": pulsonixnls
-"6141": meta-corp
-"6142": aspentec-lm
-"6143": watershed-lm
-"6144": statsci1-lm
-"6145": statsci2-lm
-"6146": lonewolf-lm
-"6147": montage-lm
-"6148": ricardo-lm
-"6149": tal-pod
-"6159": efb-aci
-"6160": ecmp
-"6161": patrol-ism
-"6162": patrol-coll
-"6163": pscribe
-"6200": lm-x
-"6209": qmtps
-"6222": radmind
-"6241": jeol-nsdtp-1
-"6242": jeol-nsdtp-2
-"6243": jeol-nsdtp-3
-"6244": jeol-nsdtp-4
-"6251": tl1-raw-ssl
-"6252": tl1-ssh
-"6253": crip
-"6267": gld
-"6268": grid
-"6269": grid-alt
-"6300": bmc-grx
-"6301": bmc-ctd-ldap
-"6306": ufmp
-"6315": scup
-"6316": abb-escp
-"6317": nav-data-cmd
-"6320": repsvc
-"6321": emp-server1
-"6322": emp-server2
-"6324": hrd-ncs
-"6325": dt-mgmtsvc
-"6326": dt-vra
-"6343": sflow
-"6344": streletz
-"6346": gnutella-svc
-"6347": gnutella-rtr
-"6350": adap
-"6355": pmcs
-"6360": metaedit-mu
-"6370": metaedit-se
-"6379": redis
-"6382": metatude-mds
-"6389": clariion-evr01
-"6390": metaedit-ws
-"6417": faxcomservice
-"6418": syserverremote
-"6419": svdrp
-"6420": nim-vdrshell
-"6421": nim-wan
-"6432": pgbouncer
-"6442": tarp
-"6443": sun-sr-https
-"6444": sge-qmaster
-"6445": sge-execd
-"6446": mysql-proxy
-"6455": skip-cert-recv
-"6456": skip-cert-send
-"6471": lvision-lm
-"6480": sun-sr-http
-"6481": servicetags
-"6482": ldoms-mgmt
-"6483": SunVTS-RMI
-"6484": sun-sr-jms
-"6485": sun-sr-iiop
-"6486": sun-sr-iiops
-"6487": sun-sr-iiop-aut
-"6488": sun-sr-jmx
-"6489": sun-sr-admin
-"6500": boks
-"6501": boks-servc
-"6502": boks-servm
-"6503": boks-clntd
-"6505": badm-priv
-"6506": badm-pub
-"6507": bdir-priv
-"6508": bdir-pub
-"6509": mgcs-mfp-port
-"6510": mcer-port
-"6513": netconf-tls
-"6514": syslog-tls
-"6515": elipse-rec
-"6543": lds-distrib
-"6544": lds-dump
-"6547": apc-6547
-"6548": apc-6548
-"6549": apc-6549
-"6550": fg-sysupdate
-"6551": sum
-"6558": xdsxdm
-"6566": sane-port
-"6568": canit-store
-"6579": affiliate
-"6580": parsec-master
-"6581": parsec-peer
-"6582": parsec-game
-"6583": joaJewelSuite
-"6600": mshvlm
-"6601": mstmg-sstp
-"6602": wsscomfrmwk
-"6619": odette-ftps
-"6620": kftp-data
-"6621": kftp
-"6622": mcftp
-"6623": ktelnet
-"6624": datascaler-db
-"6625": datascaler-ctl
-"6626": wago-service
-"6627": nexgen
-"6628": afesc-mc
-"6629": nexgen-aux
-"6632": mxodbc-connect
-"6640": ovsdb
-"6653": openflow
-"6655": pcs-sf-ui-man
-"6656": emgmsg
-"6665": ircu
-"6667": ircu
-"6668": ircu
-"6669": ircu
-"6669": ircu
-"6670": vocaltec-gold
-"6671": p4p-portal
-"6672": vision-server
-"6673": vision-elmd
-"6678": vfbp
-"6679": osaut
-"6687": clever-ctrace
-"6688": clever-tcpip
-"6689": tsa
-"6690": cleverdetect
-"6697": ircs-u
-"6701": kti-icad-srvr
-"6702": e-design-net
-"6703": e-design-web
-"6714": ibprotocol
-"6715": fibotrader-com
-"6716": princity-agent
-"6767": bmc-perf-agent
-"6768": bmc-perf-mgrd
-"6769": adi-gxp-srvprt
-"6770": plysrv-http
-"6771": plysrv-https
-"6777": ntz-tracker
-"6778": ntz-p2p-storage
-"6785": dgpf-exchg
-"6786": smc-jmx
-"6787": smc-admin
-"6788": smc-http
-"6789": radg
-"6790": hnmp
-"6791": hnm
-"6801": acnet
-"6817": pentbox-sim
-"6831": ambit-lm
-"6841": netmo-default
-"6842": netmo-http
-"6850": iccrushmore
-"6868": acctopus-cc
-"6888": muse
-"6900": rtimeviewer
-"6901": jetstream
-"6935": ethoscan
-"6936": xsmsvc
-"6946": bioserver
-"6951": otlp
-"6961": jmact3
-"6962": jmevt2
-"6963": swismgr1
-"6964": swismgr2
-"6965": swistrap
-"6966": swispol
-"6969": acmsoda
-"6970": conductor
-"6997": MobilitySrv
-"6998": iatp-highpri
-"6999": iatp-normalpri
-"7000": afs3-fileserver
-"7001": afs3-callback
-"7002": afs3-prserver
-"7003": afs3-vlserver
-"7004": afs3-kaserver
-"7005": afs3-volser
-"7006": afs3-errors
-"7007": afs3-bos
-"7008": afs3-update
-"7009": afs3-rmtsys
-"7010": ups-onlinet
-"7011": talon-disc
-"7012": talon-engine
-"7013": microtalon-dis
-"7014": microtalon-com
-"7015": talon-webserver
-"7018": fisa-svc
-"7019": doceri-ctl
-"7020": dpserve
-"7021": dpserveadmin
-"7022": ctdp
-"7023": ct2nmcs
-"7024": vmsvc
-"7025": vmsvc-2
-"7030": op-probe
-"7031": iposplanet
-"7070": arcp
-"7071": iwg1
-"7073": martalk
-"7080": empowerid
-"7099": lazy-ptop
-"7100": font-service
-"7101": elcn
-"7117": rothaga
-"7121": virprot-lm
-"7128": scenidm
-"7129": scenccs
-"7161": cabsm-comm
-"7162": caistoragemgr
-"7163": cacsambroker
-"7164": fsr
-"7165": doc-server
-"7166": aruba-server
-"7167": casrmagent
-"7168": cnckadserver
-"7169": ccag-pib
-"7170": nsrp
-"7171": drm-production
-"7172": metalbend
-"7173": zsecure
-"7174": clutild
-"7200": fodms
-"7201": dlip
-"7215": PS-Server
-"7216": PS-Capture-Pro
-"7227": ramp
-"7228": citrixupp
-"7229": citrixuppg
-"7236": display
-"7237": pads
-"7244": frc-hicp
-"7262": cnap
-"7272": watchme-7272
-"7273": oma-rlp
-"7274": oma-rlp-s
-"7275": oma-ulp
-"7276": oma-ilp
-"7277": oma-ilp-s
-"7278": oma-dcdocbs
-"7279": ctxlic
-"7280": itactionserver1
-"7281": itactionserver2
-"7282": mzca-action
-"7283": genstat
-"7365": lcm-server
-"7391": mindfilesys
-"7392": mrssrendezvous
-"7393": nfoldman
-"7394": fse
-"7395": winqedit
-"7397": hexarc
-"7400": rtps-discovery
-"7401": rtps-dd-ut
-"7402": rtps-dd-mt
-"7410": ionixnetmon
-"7411": daqstream
-"7421": mtportmon
-"7426": pmdmgr
-"7427": oveadmgr
-"7428": ovladmgr
-"7429": opi-sock
-"7430": xmpv7
-"7431": pmd
-"7437": faximum
-"7443": oracleas-https
-"7471": sttunnel
-"7473": rise
-"7474": neo4j
-"7478": openit
-"7491": telops-lmd
-"7500": silhouette
-"7501": ovbus
-"7508": adcp
-"7509": acplt
-"7510": ovhpas
-"7511": pafec-lm
-"7542": saratoga
-"7543": atul
-"7544": nta-ds
-"7545": nta-us
-"7546": cfs
-"7547": cwmp
-"7548": tidp
-"7549": nls-tl
-"7551": controlone-con
-"7560": sncp
-"7563": cfw
-"7566": vsi-omega
-"7569": dell-eql-asm
-"7570": aries-kfinder
-"7574": coherence
-"7588": sun-lm
-"7606": mipi-debug
-"7624": indi
-"7626": simco
-"7627": soap-http
-"7628": zen-pawn
-"7629": xdas
-"7630": hawk
-"7631": tesla-sys-msg
-"7633": pmdfmgt
-"7648": cuseeme
-"7672": imqstomp
-"7673": imqstomps
-"7674": imqtunnels
-"7675": imqtunnel
-"7676": imqbrokerd
-"7677": sun-user-https
-"7680": pando-pub
-"7683": dmt
-"7687": bolt
-"7689": collaber
-"7697": klio
-"7700": em7-secom
-"7707": sync-em7
-"7708": scinet
-"7720": medimageportal
-"7724": nsdeepfreezectl
-"7725": nitrogen
-"7726": freezexservice
-"7727": trident-data
-"7728": osvr
-"7734": smip
-"7738": aiagent
-"7741": scriptview
-"7742": msss
-"7743": sstp-1
-"7744": raqmon-pdu
-"7747": prgp
-"7775": inetfs
-"7777": cbt
-"7778": interwise
-"7779": vstat
-"7781": accu-lmgr
-"7786": minivend
-"7787": popup-reminders
-"7789": office-tools
-"7794": q3ade
-"7797": pnet-conn
-"7798": pnet-enc
-"7799": altbsdp
-"7800": asr
-"7801": ssp-client
-"7810": rbt-wanopt
-"7845": apc-7845
-"7846": apc-7846
-"7847": csoauth
-"7869": mobileanalyzer
-"7870": rbt-smc
-"7871": mdm
-"7878": owms
-"7880": pss
-"7887": ubroker
-"7900": mevent
-"7901": tnos-sp
-"7902": tnos-dp
-"7903": tnos-dps
-"7913": qo-secure
-"7932": t2-drm
-"7933": t2-brm
-"7962": generalsync
-"7967": supercell
-"7979": micromuse-ncps
-"7980": quest-vista
-"7981": sossd-collect
-"7982": sossd-agent
-"7997": pushns
-"7999": irdmi2
-"8000": irdmi
-"8001": vcom-tunnel
-"8002": teradataordbms
-"8003": mcreport
-"8005": mxi
-"8008": http-alt
-"8019": qbdb
-"8020": intu-ec-svcdisc
-"8021": intu-ec-client
-"8022": oa-system
-"8025": ca-audit-da
-"8026": ca-audit-ds
-"8032": pro-ed
-"8033": mindprint
-"8034": vantronix-mgmt
-"8040": ampify
-"8042": fs-agent
-"8043": fs-server
-"8044": fs-mgmt
-"8051": rocrail
-"8052": senomix01
-"8053": senomix02
-"8054": senomix03
-"8055": senomix04
-"8056": senomix05
-"8057": senomix06
-"8058": senomix07
-"8059": senomix08
-"8066": toad-bi-appsrvr
-"8067": infi-async
-"8074": gadugadu
-"8080": http-alt
-"8081": sunproxyadmin
-"8082": us-cli
-"8083": us-srv
-"8086": d-s-n
-"8087": simplifymedia
-"8088": radan-http
-"8091": jamlink
-"8097": sac
-"8100": xprint-server
-"8101": ldoms-migr
-"8102": kz-migr
-"8115": mtl8000-matrix
-"8116": cp-cluster
-"8117": purityrpc
-"8118": privoxy
-"8121": apollo-data
-"8122": apollo-admin
-"8128": paycash-online
-"8129": paycash-wbp
-"8130": indigo-vrmi
-"8131": indigo-vbcp
-"8132": dbabble
-"8140": puppet
-"8148": isdd
-"8153": quantastor
-"8160": patrol
-"8161": patrol-snmp
-"8162": lpar2rrd
-"8181": intermapper
-"8182": vmware-fdm
-"8183": proremote
-"8184": itach
-"8190": gcp-rphy
-"8191": limnerpressure
-"8192": spytechphone
-"8194": blp1
-"8195": blp2
-"8199": vvr-data
-"8200": trivnet1
-"8201": trivnet2
-"8204": lm-perfworks
-"8205": lm-instmgr
-"8206": lm-dta
-"8207": lm-sserver
-"8208": lm-webwatcher
-"8230": rexecj
-"8243": synapse-nhttps
-"8276": pando-sec
-"8280": synapse-nhttp
-"8282": libelle
-"8292": blp3
-"8293": hiperscan-id
-"8294": blp4
-"8300": tmi
-"8301": amberon
-"8313": hub-open-net
-"8320": tnp-discover
-"8321": tnp
-"8322": garmin-marine
-"8351": server-find
-"8376": cruise-enum
-"8377": cruise-swroute
-"8378": cruise-config
-"8379": cruise-diags
-"8380": cruise-update
-"8383": m2mservices
-"8400": cvd
-"8401": sabarsd
-"8402": abarsd
-"8403": admind
-"8404": svcloud
-"8405": svbackup
-"8415": dlpx-sp
-"8416": espeech
-"8417": espeech-rtp
-"8442": cybro-a-bus
-"8443": pcsync-https
-"8444": pcsync-http
-"8445": copy
-"8450": npmp
-"8457": nexentamv
-"8470": cisco-avp
-"8471": pim-port
-"8472": otv
-"8473": vp2p
-"8474": noteshare
-"8500": fmtp
-"8501": cmtp-mgt
-"8502": ftnmtp
-"8554": rtsp-alt
-"8555": d-fence
-"8567": dof-tunnel
-"8600": asterix
-"8610": canon-mfnp
-"8611": canon-bjnp1
-"8612": canon-bjnp2
-"8613": canon-bjnp3
-"8614": canon-bjnp4
-"8615": imink
-"8665": monetra
-"8666": monetra-admin
-"8675": msi-cps-rm
-"8686": sun-as-jmxrmi
-"8688": openremote-ctrl
-"8699": vnyx
-"8711": nvc
-"8733": ibus
-"8750": dey-keyneg
-"8763": mc-appserver
-"8764": openqueue
-"8765": ultraseek-http
-"8766": amcs
-"8770": dpap
-"8778": uec
-"8786": msgclnt
-"8787": msgsrvr
-"8793": acd-pm
-"8800": sunwebadmin
-"8804": truecm
-"8873": dxspider
-"8880": cddbp-alt
-"8881": galaxy4d
-"8883": secure-mqtt
-"8888": ddi-tcp-1
-"8889": ddi-tcp-2
-"8890": ddi-tcp-3
-"8891": ddi-tcp-4
-"8892": ddi-tcp-5
-"8893": ddi-tcp-6
-"8894": ddi-tcp-7
-"8899": ospf-lite
-"8900": jmb-cds1
-"8901": jmb-cds2
-"8910": manyone-http
-"8911": manyone-xml
-"8912": wcbackup
-"8913": dragonfly
-"8937": twds
-"8953": ub-dns-control
-"8954": cumulus-admin
-"8980": nod-provider
-"8989": sunwebadmins
-"8990": http-wmap
-"8991": https-wmap
-"8997": oracle-ms-ens
-"8998": canto-roboflow
-"8999": bctp
-"9000": cslistener
-"9001": etlservicemgr
-"9002": dynamid
-"9005": golem
-"9008": ogs-server
-"9009": pichat
-"9010": sdr
-"9020": tambora
-"9021": panagolin-ident
-"9022": paragent
-"9023": swa-1
-"9024": swa-2
-"9025": swa-3
-"9026": swa-4
-"9050": versiera
-"9051": fio-cmgmt
-"9060": CardWeb-IO
-"9080": glrpc
-"9083": emc-pp-mgmtsvc
-"9084": aurora
-"9085": ibm-rsyscon
-"9086": net2display
-"9087": classic
-"9088": sqlexec
-"9089": sqlexec-ssl
-"9090": websm
-"9091": xmltec-xmlmail
-"9092": XmlIpcRegSvc
-"9093": copycat
-"9100": pdl-datastream
-"9101": bacula-dir
-"9102": bacula-fd
-"9103": bacula-sd
-"9104": peerwire
-"9105": xadmin
-"9106": astergate
-"9107": astergatefax
-"9119": mxit
-"9122": grcmp
-"9123": grcp
-"9131": dddp
-"9160": apani1
-"9161": apani2
-"9162": apani3
-"9163": apani4
-"9164": apani5
-"9191": sun-as-jpda
-"9200": wap-wsp
-"9201": wap-wsp-wtp
-"9202": wap-wsp-s
-"9203": wap-wsp-wtp-s
-"9204": wap-vcard
-"9205": wap-vcal
-"9206": wap-vcard-s
-"9207": wap-vcal-s
-"9208": rjcdb-vcards
-"9209": almobile-system
-"9210": oma-mlp
-"9211": oma-mlp-s
-"9212": serverviewdbms
-"9213": serverstart
-"9214": ipdcesgbs
-"9215": insis
-"9216": acme
-"9217": fsc-port
-"9222": teamcoherence
-"9255": mon
-"9278": pegasus
-"9279": pegasus-ctl
-"9280": pgps
-"9281": swtp-port1
-"9282": swtp-port2
-"9283": callwaveiam
-"9284": visd
-"9285": n2h2server
-"9287": cumulus
-"9292": armtechdaemon
-"9293": storview
-"9294": armcenterhttp
-"9295": armcenterhttps
-"9300": vrace
-"9306": sphinxql
-"9312": sphinxapi
-"9318": secure-ts
-"9321": guibase
-"9343": mpidcmgr
-"9344": mphlpdmc
-"9345": rancher
-"9346": ctechlicensing
-"9374": fjdmimgr
-"9380": boxp
-"9387": d2dconfig
-"9388": d2ddatatrans
-"9389": adws
-"9390": otp
-"9396": fjinvmgr
-"9397": mpidcagt
-"9400": sec-t4net-srv
-"9401": sec-t4net-clt
-"9402": sec-pc2fax-srv
-"9418": git
-"9443": tungsten-https
-"9444": wso2esb-console
-"9445": mindarray-ca
-"9450": sntlkeyssrvr
-"9500": ismserver
-"9535": mngsuite
-"9536": laes-bf
-"9555": trispen-sra
-"9592": ldgateway
-"9593": cba8
-"9594": msgsys
-"9595": pds
-"9596": mercury-disc
-"9597": pd-admin
-"9598": vscp
-"9599": robix
-"9600": micromuse-ncpw
-"9612": streamcomm-ds
-"9614": iadt-tls
-"9616": erunbook-agent
-"9617": erunbook-server
-"9618": condor
-"9628": odbcpathway
-"9629": uniport
-"9630": peoctlr
-"9631": peocoll
-"9640": pqsflows
-"9666": zoomcp
-"9667": xmms2
-"9668": tec5-sdctp
-"9694": client-wakeup
-"9695": ccnx
-"9700": board-roar
-"9747": l5nas-parchan
-"9750": board-voip
-"9753": rasadv
-"9762": tungsten-http
-"9800": davsrc
-"9801": sstp-2
-"9802": davsrcs
-"9875": sapv1
-"9876": sd
-"9888": cyborg-systems
-"9889": gt-proxy
-"9898": monkeycom
-"9900": iua
-"9909": domaintime
-"9911": sype-transport
-"9925": xybrid-cloud
-"9950": apc-9950
-"9951": apc-9951
-"9952": apc-9952
-"9953": acis
-"9954": hinp
-"9955": alljoyn-stm
-"9966": odnsp
-"9978": xybrid-rt
-"9987": dsm-scm-target
-"9988": nsesrvr
-"9990": osm-appsrvr
-"9991": osm-oev
-"9992": palace-1
-"9993": palace-2
-"9994": palace-3
-"9995": palace-4
-"9996": palace-5
-"9997": palace-6
-"9998": distinct32
-"9999": distinct
-"10000": ndmp
-"10001": scp-config
-"10002": documentum
-"10003": documentum-s
-"10004": emcrmirccd
-"10005": emcrmird
-"10006": netapp-sync
-"10007": mvs-capacity
-"10008": octopus
-"10009": swdtp-sv
-"10010": rxapi
-"10050": zabbix-agent
-"10051": zabbix-trapper
-"10055": qptlmd
-"10080": amanda
-"10081": famdc
-"10100": itap-ddtp
-"10101": ezmeeting-2
-"10102": ezproxy-2
-"10103": ezrelay
-"10104": swdtp
-"10107": bctp-server
-"10110": nmea-0183
-"10113": netiq-endpoint
-"10114": netiq-qcheck
-"10115": netiq-endpt
-"10116": netiq-voipa
-"10117": iqrm
-"10125": cimple
-"10128": bmc-perf-sd
-"10129": bmc-gms
-"10160": qb-db-server
-"10161": snmptls
-"10162": snmptls-trap
-"10200": trisoap
-"10201": rsms
-"10252": apollo-relay
-"10260": axis-wimp-port
-"10261": tile-ml
-"10288": blocks
-"10321": cosir
-"10540": MOS-lower
-"10541": MOS-upper
-"10542": MOS-aux
-"10543": MOS-soap
-"10544": MOS-soap-opt
-"10548": serverdocs
-"10631": printopia
-"10800": gap
-"10805": lpdg
-"10809": nbd
-"10860": helix
-"10880": bveapi
-"10933": octopustentacle
-"10990": rmiaux
-"11000": irisa
-"11001": metasys
-"11095": weave
-"11103": origo-sync
-"11104": netapp-icmgmt
-"11105": netapp-icdata
-"11106": sgi-lk
-"11109": sgi-dmfmgr
-"11110": sgi-soap
-"11111": vce
-"11112": dicom
-"11161": suncacao-snmp
-"11162": suncacao-jmxmp
-"11163": suncacao-rmi
-"11164": suncacao-csa
-"11165": suncacao-websvc
-"11172": oemcacao-jmxmp
-"11173": t5-straton
-"11174": oemcacao-rmi
-"11175": oemcacao-websvc
-"11201": smsqp
-"11202": dcsl-backup
-"11208": wifree
-"11211": memcache
-"11319": imip
-"11320": imip-channels
-"11321": arena-server
-"11367": atm-uhas
-"11371": hkp
-"11489": asgcypresstcps
-"11600": tempest-port
-"11623": emc-xsw-dconfig
-"11720": h323callsigalt
-"11723": emc-xsw-dcache
-"11751": intrepid-ssl
-"11796": lanschool
-"11876": xoraya
-"11967": sysinfo-sp
-"12000": entextxid
-"12001": entextnetwk
-"12002": entexthigh
-"12003": entextmed
-"12004": entextlow
-"12005": dbisamserver1
-"12006": dbisamserver2
-"12007": accuracer
-"12008": accuracer-dbms
-"12010": edbsrvr
-"12012": vipera
-"12013": vipera-ssl
-"12109": rets-ssl
-"12121": nupaper-ss
-"12168": cawas
-"12172": hivep
-"12300": linogridengine
-"12302": rads
-"12321": warehouse-sss
-"12322": warehouse
-"12345": italk
-"12753": tsaf
-"12865": netperf
-"13160": i-zipqd
-"13216": bcslogc
-"13217": rs-pias
-"13218": emc-vcas-tcp
-"13223": powwow-client
-"13224": powwow-server
-"13400": doip-data
-"13720": bprd
-"13721": bpdbm
-"13722": bpjava-msvc
-"13724": vnetd
-"13782": bpcd
-"13783": vopied
-"13785": nbdb
-"13786": nomdb
-"13818": dsmcc-config
-"13819": dsmcc-session
-"13820": dsmcc-passthru
-"13821": dsmcc-download
-"13822": dsmcc-ccp
-"13823": bmdss
-"13894": ucontrol
-"13929": dta-systems
-"13930": medevolve
-"14000": scotty-ft
-"14001": sua
-"14033": sage-best-com1
-"14034": sage-best-com2
-"14141": vcs-app
-"14142": icpp
-"14143": icpps
-"14145": gcm-app
-"14149": vrts-tdd
-"14150": vcscmd
-"14154": vad
-"14250": cps
-"14414": ca-web-update
-"14500": xpra
-"14936": hde-lcesrvr-1
-"14937": hde-lcesrvr-2
-"15000": hydap
-"15002": onep-tls
-"15345": xpilot
-"15363": 3link
-"15555": cisco-snat
-"15660": bex-xr
-"15740": ptp
-"15999": programmar
-"16000": fmsas
-"16001": fmsascon
-"16002": gsms
-"16020": jwpc
-"16021": jwpc-bin
-"16161": sun-sea-port
-"16162": solaris-audit
-"16309": etb4j
-"16310": pduncs
-"16311": pdefmns
-"16360": netserialext1
-"16361": netserialext2
-"16367": netserialext3
-"16368": netserialext4
-"16384": connected
-"16385": rdgs
-"16619": xoms
-"16665": axon-tunnel
-"16789": cadsisvr
-"16900": newbay-snc-mc
-"16950": sgcip
-"16991": intel-rci-mp
-"16992": amt-soap-http
-"16993": amt-soap-https
-"16994": amt-redir-tcp
-"16995": amt-redir-tls
-"17007": isode-dua
-"17184": vestasdlp
-"17185": soundsvirtual
-"17219": chipper
-"17220": avtp
-"17221": avdecc
-"17223": isa100-gci
-"17225": trdp-md
-"17234": integrius-stp
-"17235": ssh-mgmt
-"17500": db-lsp
-"17555": ailith
-"17729": ea
-"17754": zep
-"17755": zigbee-ip
-"17756": zigbee-ips
-"17777": sw-orion
-"18000": biimenu
-"18104": radpdf
-"18136": racf
-"18181": opsec-cvp
-"18182": opsec-ufp
-"18183": opsec-sam
-"18184": opsec-lea
-"18185": opsec-omi
-"18186": ohsc
-"18187": opsec-ela
-"18241": checkpoint-rtm
-"18242": iclid
-"18243": clusterxl
-"18262": gv-pf
-"18463": ac-cluster
-"18634": rds-ib
-"18635": rds-ip
-"18668": vdmmesh
-"18769": ique
-"18881": infotos
-"18888": apc-necmp
-"19000": igrid
-"19007": scintilla
-"19020": j-link
-"19191": opsec-uaa
-"19194": ua-secureagent
-"19220": cora
-"19283": keysrvr
-"19315": keyshadow
-"19398": mtrgtrans
-"19410": hp-sco
-"19411": hp-sca
-"19412": hp-sessmon
-"19539": fxuptp
-"19540": sxuptp
-"19541": jcp
-"19998": iec-104-sec
-"19999": dnp-sec
-"20000": dnp
-"20001": microsan
-"20002": commtact-http
-"20003": commtact-https
-"20005": openwebnet
-"20013": ss-idi
-"20014": opendeploy
-"20034": nburn-id
-"20046": tmophl7mts
-"20048": mountd
-"20049": nfsrdma
-"20057": avesterra
-"20167": tolfab
-"20202": ipdtp-port
-"20222": ipulse-ics
-"20480": emwavemsg
-"20670": track
-"20999": athand-mmp
-"21000": irtrans
-"21010": notezilla-lan
-"21553": rdm-tfs
-"21554": dfserver
-"21590": vofr-gateway
-"21800": tvpm
-"21845": webphone
-"21846": netspeak-is
-"21847": netspeak-cs
-"21848": netspeak-acd
-"21849": netspeak-cps
-"22000": snapenetio
-"22001": optocontrol
-"22002": optohost002
-"22003": optohost003
-"22004": optohost004
-"22005": optohost004
-"22125": dcap
-"22128": gsidcap
-"22222": easyengine
-"22273": wnn6
-"22305": cis
-"22335": shrewd-control
-"22343": cis-secure
-"22347": wibukey
-"22350": codemeter
-"22351": codemeter-cmwan
-"22537": caldsoft-backup
-"22555": vocaltec-wconf
-"22763": talikaserver
-"22800": aws-brf
-"22951": brf-gw
-"23000": inovaport1
-"23001": inovaport2
-"23002": inovaport3
-"23003": inovaport4
-"23004": inovaport5
-"23005": inovaport6
-"23053": gntp
-"23294": 5afe-dir
-"23333": elxmgmt
-"23400": novar-dbase
-"23401": novar-alarm
-"23402": novar-global
-"23456": aequus
-"23457": aequus-alt
-"23546": areaguard-neo
-"24000": med-ltp
-"24001": med-fsp-rx
-"24002": med-fsp-tx
-"24003": med-supp
-"24004": med-ovw
-"24005": med-ci
-"24006": med-net-svc
-"24242": filesphere
-"24249": vista-4gl
-"24321": ild
-"24386": intel-rci
-"24465": tonidods
-"24554": binkp
-"24577": bilobit
-"24666": sdtvwcam
-"24676": canditv
-"24677": flashfiler
-"24678": proactivate
-"24680": tcc-http
-"24754": cslg
-"24922": find
-"25000": icl-twobase1
-"25001": icl-twobase2
-"25002": icl-twobase3
-"25003": icl-twobase4
-"25004": icl-twobase5
-"25005": icl-twobase6
-"25006": icl-twobase7
-"25007": icl-twobase8
-"25008": icl-twobase9
-"25009": icl-twobase10
-"25576": sauterdongle
-"25604": idtp
-"25793": vocaltec-hos
-"25900": tasp-net
-"25901": niobserver
-"25902": nilinkanalyst
-"25903": niprobe
-"26000": quake
-"26133": scscp
-"26208": wnn6-ds
-"26257": cockroach
-"26260": ezproxy
-"26261": ezmeeting
-"26262": k3software-svr
-"26263": k3software-cli
-"26486": exoline-tcp
-"26487": exoconfig
-"26489": exonet
-"27345": imagepump
-"27442": jesmsjc
-"27504": kopek-httphead
-"27782": ars-vista
-"27876": astrolink
-"27999": tw-auth-key
-"28000": nxlmd
-"28001": pqsp
-"28200": voxelstorm
-"28240": siemensgsm
-"28589": bosswave
-"29167": otmp
-"29999": bingbang
-"30000": ndmps
-"30001": pago-services1
-"30002": pago-services2
-"30003": amicon-fpsu-ra
-"30100": rwp
-"30260": kingdomsonline
-"30999": ovobs
-"31016": ka-sddp
-"31020": autotrac-acp
-"31400": pace-licensed
-"31416": xqosd
-"31457": tetrinet
-"31620": lm-mon
-"31685": dsx-monitor
-"31765": gamesmith-port
-"31948": iceedcp-tx
-"31949": iceedcp-rx
-"32034": iracinghelper
-"32249": t1distproc60
-"32400": plex
-"32483": apm-link
-"32635": sec-ntb-clnt
-"32636": DMExpress
-"32767": filenet-powsrm
-"32768": filenet-tms
-"32769": filenet-rpc
-"32770": filenet-nch
-"32771": filenet-rmi
-"32772": filenet-pa
-"32773": filenet-cm
-"32774": filenet-re
-"32775": filenet-pch
-"32776": filenet-peior
-"32777": filenet-obrok
-"32801": mlsn
-"32811": retp
-"32896": idmgratm
-"33060": mysqlx
-"33123": aurora-balaena
-"33331": diamondport
-"33333": dgi-serv
-"33334": speedtrace
-"33434": traceroute
-"33656": snip-slave
-"34249": turbonote-2
-"34378": p-net-local
-"34379": p-net-remote
-"34567": dhanalakshmi
-"34962": profinet-rt
-"34963": profinet-rtm
-"34964": profinet-cm
-"34980": ethercat
-"35000": heathview
-"35001": rt-viewer
-"35002": rt-sound
-"35003": rt-devicemapper
-"35004": rt-classmanager
-"35005": rt-labtracker
-"35006": rt-helper
-"35100": axio-disc
-"35354": kitim
-"35355": altova-lm
-"35356": guttersnex
-"35357": openstack-id
-"36001": allpeers
-"36524": febooti-aw
-"36602": observium-agent
-"36700": mapx
-"36865": kastenxpipe
-"37475": neckar
-"37483": gdrive-sync
-"37601": eftp
-"37654": unisys-eportal
-"38000": ivs-database
-"38001": ivs-insertion
-"38002": cresco-control
-"38201": galaxy7-data
-"38202": fairview
-"38203": agpolicy
-"38800": sruth
-"38865": secrmmsafecopya
-"39681": turbonote-1
-"40000": safetynetp
-"40404": sptx
-"40841": cscp
-"40842": csccredir
-"40843": csccfirewall
-"41111": fs-qos
-"41121": tentacle
-"41230": z-wave-s
-"41794": crestron-cip
-"41795": crestron-ctp
-"41796": crestron-cips
-"41797": crestron-ctps
-"42508": candp
-"42509": candrp
-"42510": caerpc
-"43000": recvr-rc
-"43188": reachout
-"43189": ndm-agent-port
-"43190": ip-provision
-"43191": noit-transport
-"43210": shaperai
-"43439": eq3-update
-"43440": ew-mgmt
-"43441": ciscocsdb
-"44123": z-wave-tunnel
-"44321": pmcd
-"44322": pmcdproxy
-"44323": pmwebapi
-"44444": cognex-dataman
-"44553": rbr-debug
-"44818": EtherNet-IP-2
-"44900": m3da
-"45000": asmp
-"45001": asmps
-"45002": rs-status
-"45045": synctest
-"45054": invision-ag
-"45514": cloudcheck
-"45678": eba
-"45824": dai-shell
-"45825": qdb2service
-"45966": ssr-servermgr
-"46336": inedo
-"46998": spremotetablet
-"46999": mediabox
-"47000": mbus
-"47001": winrm
-"47557": dbbrowse
-"47624": directplaysrvr
-"47806": ap
-"47808": bacnet
-"48000": nimcontroller
-"48001": nimspooler
-"48002": nimhub
-"48003": nimgtw
-"48004": nimbusdb
-"48005": nimbusdbctrl
-"48049": 3gpp-cbsp
-"48050": weandsf
-"48128": isnetserv
-"48129": blp5
-"48556": com-bardac-dw
-"48619": iqobject
-"48653": robotraconteur
-"49000": matahari
diff --git a/modules/netflow/configuration/logstash/dictionaries/iana_service_names_udp.yml b/modules/netflow/configuration/logstash/dictionaries/iana_service_names_udp.yml
deleted file mode 100644
index 49623c6f5..000000000
--- a/modules/netflow/configuration/logstash/dictionaries/iana_service_names_udp.yml
+++ /dev/null
@@ -1,5515 +0,0 @@
-"1": tcpmux
-"2": compressnet
-"3": compressnet
-"5": rje
-"7": echo
-"9": discard
-"11": systat
-"13": daytime
-"17": qotd
-"18": msp
-"19": chargen
-"20": ftp-data
-"21": ftp
-"22": ssh
-"23": telnet
-"25": smtp
-"27": nsw-fe
-"29": msg-icp
-"31": msg-auth
-"33": dsp
-"37": time
-"38": rap
-"39": rlp
-"41": graphics
-"42": nameserver
-"43": nicname
-"44": mpm-flags
-"45": mpm
-"46": mpm-snd
-"47": ni-ftp
-"48": auditd
-"49": tacacs
-"50": re-mail-ck
-"52": xns-time
-"53": dns
-"54": xns-ch
-"55": isi-gl
-"56": xns-auth
-"58": xns-mail
-"61": ni-mail
-"62": acas
-"63": whoispp
-"64": covia
-"65": tacacs-ds
-"66": sql-net
-"67": bootps
-"68": bootpc
-"69": tftp
-"70": gopher
-"71": netrjs-1
-"72": netrjs-2
-"73": netrjs-3
-"74": netrjs-4
-"76": deos
-"78": vettcp
-"79": finger
-"80": http
-"82": xfer
-"83": mit-ml-dev
-"84": ctf
-"85": mit-ml-dev
-"86": mfcobol
-"88": kerberos
-"89": su-mit-tg
-"90": dnsix
-"91": mit-dov
-"92": npp
-"93": dcp
-"94": objcall
-"95": supdup
-"96": dixie
-"97": swift-rvf
-"98": tacnews
-"99": metagram
-"101": hostname
-"102": iso-tsap
-"103": gppitnp
-"104": acr-nema
-"105": csnet-ns
-"105": cso
-"106": 3com-tsmux
-"107": rtelnet
-"108": snagas
-"109": pop2
-"110": pop3
-"111": sunrpc
-"112": mcidas
-"113": auth
-"115": sftp
-"116": ansanotify
-"117": uucp-path
-"118": sqlserv
-"119": nntp
-"120": cfdptkt
-"121": erpc
-"122": smakynet
-"123": ntp
-"124": ansatrader
-"125": locus-map
-"126": nxedit
-"127": locus-con
-"128": gss-xlicen
-"129": pwdgen
-"130": cisco-fna
-"131": cisco-tna
-"132": cisco-sys
-"133": statsrv
-"134": ingres-net
-"135": epmap
-"136": profile
-"137": netbios-ns
-"138": netbios-dgm
-"139": netbios-ssn
-"140": emfis-data
-"141": emfis-cntl
-"142": bl-idm
-"143": imap
-"144": uma
-"145": uaac
-"146": iso-tp0
-"147": iso-ip
-"148": jargon
-"149": aed-512
-"150": sql-net
-"151": hems
-"152": bftp
-"153": sgmp
-"154": netsc-prod
-"155": netsc-dev
-"156": sqlsrv
-"157": knet-cmp
-"158": pcmail-srv
-"159": nss-routing
-"160": sgmp-traps
-"161": snmp
-"162": snmptrap
-"163": cmip-man
-"164": cmip-agent
-"165": xns-courier
-"166": s-net
-"167": namp
-"168": rsvd
-"169": send
-"170": print-srv
-"171": multiplex
-"172": cl-1
-"173": xyplex-mux
-"174": mailq
-"175": vmnet
-"176": genrad-mux
-"177": xdmcp
-"178": nextstep
-"179": bgp
-"180": ris
-"181": unify
-"182": audit
-"183": ocbinder
-"184": ocserver
-"185": remote-kis
-"186": kis
-"187": aci
-"188": mumps
-"189": qft
-"190": gacp
-"191": prospero
-"192": osu-nms
-"193": srmp
-"194": irc
-"195": dn6-nlm-aud
-"196": dn6-smm-red
-"197": dls
-"198": dls-mon
-"199": smux
-"200": src
-"201": at-rtmp
-"202": at-nbp
-"203": at-3
-"204": at-echo
-"205": at-5
-"206": at-zis
-"207": at-7
-"208": at-8
-"209": qmtp
-"210": z39-50
-"211": 914c-g
-"212": anet
-"213": ipx
-"214": vmpwscs
-"215": softpc
-"216": CAIlic
-"217": dbase
-"218": mpp
-"219": uarps
-"220": imap3
-"221": fln-spx
-"222": rsh-spx
-"223": cdc
-"224": masqdialer
-"242": direct
-"243": sur-meas
-"244": inbusiness
-"245": link
-"246": dsp3270
-"247": subntbcst-tftp
-"248": bhfhs
-"256": rap
-"257": set
-"259": esro-gen
-"260": openport
-"261": nsiiops
-"262": arcisdms
-"263": hdap
-"264": bgmp
-"265": x-bone-ctl
-"266": sst
-"267": td-service
-"268": td-replica
-"269": manet
-"270": gist
-"280": http-mgmt
-"281": personal-link
-"282": cableport-ax
-"283": rescap
-"284": corerjd
-"286": fxp
-"287": k-block
-"308": novastorbakcup
-"309": entrusttime
-"310": bhmds
-"311": asip-webadmin
-"312": vslmp
-"313": magenta-logic
-"314": opalis-robot
-"315": dpsi
-"316": decauth
-"317": zannet
-"318": pkix-timestamp
-"319": ptp-event
-"320": ptp-general
-"321": pip
-"322": rtsps
-"333": texar
-"344": pdap
-"345": pawserv
-"346": zserv
-"347": fatserv
-"348": csi-sgwp
-"349": mftp
-"350": matip-type-a
-"351": matip-type-b
-"352": dtag-ste-sb
-"353": ndsauth
-"354": bh611
-"355": datex-asn
-"356": cloanto-net-1
-"357": bhevent
-"358": shrinkwrap
-"359": nsrmp
-"360": scoi2odialog
-"361": semantix
-"362": srssend
-"363": rsvp-tunnel
-"364": aurora-cmgr
-"365": dtk
-"366": odmr
-"367": mortgageware
-"368": qbikgdp
-"369": rpc2portmap
-"370": codaauth2
-"371": clearcase
-"372": ulistproc
-"373": legent-1
-"374": legent-2
-"375": hassle
-"376": nip
-"377": tnETOS
-"378": dsETOS
-"379": is99c
-"380": is99s
-"381": hp-collector
-"382": hp-managed-node
-"383": hp-alarm-mgr
-"384": arns
-"385": ibm-app
-"386": asa
-"387": aurp
-"388": unidata-ldm
-"389": ldap
-"390": uis
-"391": synotics-relay
-"392": synotics-broker
-"393": meta5
-"394": embl-ndt
-"395": netcp
-"396": netware-ip
-"397": mptn
-"398": kryptolan
-"399": iso-tsap-c2
-"400": osb-sd
-"401": ups
-"402": genie
-"403": decap
-"404": nced
-"405": ncld
-"406": imsp
-"407": timbuktu
-"408": prm-sm
-"409": prm-nm
-"410": decladebug
-"411": rmt
-"412": synoptics-trap
-"413": smsp
-"414": infoseek
-"415": bnet
-"416": silverplatter
-"417": onmux
-"418": hyper-g
-"419": ariel1
-"420": smpte
-"421": ariel2
-"422": ariel3
-"423": opc-job-start
-"424": opc-job-track
-"425": icad-el
-"426": smartsdp
-"427": svrloc
-"428": ocs-cmu
-"429": ocs-amu
-"430": utmpsd
-"431": utmpcd
-"432": iasd
-"433": nnsp
-"434": mobileip-agent
-"435": mobilip-mn
-"436": dna-cml
-"437": comscm
-"438": dsfgw
-"439": dasp
-"440": sgcp
-"441": decvms-sysmgt
-"442": cvc-hostd
-"443": https
-"444": snpp
-"445": microsoft-ds
-"446": ddm-rdb
-"447": ddm-dfm
-"448": ddm-ssl
-"449": as-servermap
-"450": tserver
-"451": sfs-smp-net
-"452": sfs-config
-"453": creativeserver
-"454": contentserver
-"455": creativepartnr
-"456": macon-udp
-"457": scohelp
-"458": appleqtc
-"459": ampr-rcmd
-"460": skronk
-"461": datasurfsrv
-"462": datasurfsrvsec
-"463": alpes
-"464": kpasswd
-"465": igmpv3lite
-"466": digital-vrc
-"467": mylex-mapd
-"468": photuris
-"469": rcp
-"470": scx-proxy
-"471": mondex
-"472": ljk-login
-"473": hybrid-pop
-"474": tn-tl-w2
-"475": tcpnethaspsrv
-"476": tn-tl-fd1
-"477": ss7ns
-"478": spsc
-"479": iafserver
-"480": iafdbase
-"481": ph
-"482": bgs-nsi
-"483": ulpnet
-"484": integra-sme
-"485": powerburst
-"486": avian
-"487": saft
-"488": gss-http
-"489": nest-protocol
-"490": micom-pfs
-"491": go-login
-"492": ticf-1
-"493": ticf-2
-"494": pov-ray
-"495": intecourier
-"496": pim-rp-disc
-"497": retrospect
-"498": siam
-"499": iso-ill
-"500": isakmp
-"501": stmf
-"502": mbap
-"503": intrinsa
-"504": citadel
-"505": mailbox-lm
-"506": ohimsrv
-"507": crs
-"508": xvttp
-"509": snare
-"510": fcp
-"511": passgo
-"512": comsat
-"513": who
-"514": syslog
-"515": printer
-"516": videotex
-"517": talk
-"518": ntalk
-"519": utime
-"520": router
-"521": ripng
-"522": ulp
-"523": ibm-db2
-"524": ncp
-"525": timed
-"526": tempo
-"527": stx
-"528": custix
-"529": irc-serv
-"530": courier
-"531": conference
-"532": netnews
-"533": netwall
-"534": windream
-"535": iiop
-"536": opalis-rdv
-"537": nmsp
-"538": gdomap
-"539": apertus-ldp
-"540": uucp
-"541": uucp-rlogin
-"542": commerce
-"543": klogin
-"544": kshell
-"545": appleqtcsrvr
-"546": dhcpv6-client
-"547": dhcpv6-server
-"548": afpovertcp
-"549": idfp
-"550": new-rwho
-"551": cybercash
-"552": devshr-nts
-"553": pirp
-"554": rtsp
-"555": dsf
-"556": remotefs
-"557": openvms-sysipc
-"558": sdnskmp
-"559": teedtap
-"560": rmonitor
-"561": monitor
-"562": chshell
-"563": nntps
-"564": 9pfs
-"565": whoami
-"566": streettalk
-"567": banyan-rpc
-"568": ms-shuttle
-"569": ms-rome
-"570": meter
-"571": meter
-"572": sonar
-"573": banyan-vip
-"574": ftp-agent
-"575": vemmi
-"576": ipcd
-"577": vnas
-"578": ipdd
-"579": decbsrv
-"580": sntp-heartbeat
-"581": bdp
-"582": scc-security
-"583": philips-vc
-"584": keyserver
-"586": password-chg
-"587": submission
-"588": cal
-"589": eyelink
-"590": tns-cml
-"591": http-alt
-"592": eudora-set
-"593": http-rpc-epmap
-"594": tpip
-"595": cab-protocol
-"596": smsd
-"597": ptcnameservice
-"598": sco-websrvrmg3
-"599": acp
-"600": ipcserver
-"601": syslog-conn
-"602": xmlrpc-beep
-"603": idxp
-"604": tunnel
-"605": soap-beep
-"606": urm
-"607": nqs
-"608": sift-uft
-"609": npmp-trap
-"610": npmp-local
-"611": npmp-gui
-"612": hmmp-ind
-"613": hmmp-op
-"614": sshell
-"615": sco-inetmgr
-"616": sco-sysmgr
-"617": sco-dtmgr
-"618": dei-icda
-"619": compaq-evm
-"620": sco-websrvrmgr
-"621": escp-ip
-"622": collaborator
-"623": asf-rmcp
-"624": cryptoadmin
-"625": dec-dlm
-"626": asia
-"627": passgo-tivoli
-"628": qmqp
-"629": 3com-amp3
-"630": rda
-"631": ipp
-"632": bmpp
-"633": servstat
-"634": ginad
-"635": rlzdbase
-"636": ldaps
-"637": lanserver
-"638": mcns-sec
-"639": msdp
-"640": entrust-sps
-"641": repcmd
-"642": esro-emsdp
-"643": sanity
-"644": dwr
-"645": pssc
-"646": ldp
-"647": dhcp-failover
-"648": rrp
-"649": cadview-3d
-"650": obex
-"651": ieee-mms
-"652": hello-port
-"653": repscmd
-"654": aodv
-"655": tinc
-"656": spmp
-"657": rmc
-"658": tenfold
-"660": mac-srvr-admin
-"661": hap
-"662": pftp
-"663": purenoise
-"664": asf-secure-rmcp
-"665": sun-dr
-"666": doom
-"667": disclose
-"668": mecomm
-"669": meregister
-"670": vacdsm-sws
-"671": vacdsm-app
-"672": vpps-qua
-"673": cimplex
-"674": acap
-"675": dctp
-"676": vpps-via
-"677": vpp
-"678": ggf-ncp
-"679": mrm
-"680": entrust-aaas
-"681": entrust-aams
-"682": xfr
-"683": corba-iiop
-"684": corba-iiop-ssl
-"685": mdc-portmapper
-"686": hcp-wismar
-"687": asipregistry
-"688": realm-rusd
-"689": nmap
-"690": vatp
-"691": msexch-routing
-"692": hyperwave-isp
-"693": connendp
-"694": ha-cluster
-"695": ieee-mms-ssl
-"696": rushd
-"697": uuidgen
-"698": olsr
-"699": accessnetwork
-"700": epp
-"701": lmp
-"702": iris-beep
-"704": elcsd
-"705": agentx
-"706": silc
-"707": borland-dsj
-"709": entrust-kmsh
-"710": entrust-ash
-"711": cisco-tdp
-"712": tbrpf
-"713": iris-xpc
-"714": iris-xpcs
-"715": iris-lwz
-"716": pana
-"729": netviewdm1
-"730": netviewdm2
-"731": netviewdm3
-"741": netgw
-"742": netrcs
-"744": flexlm
-"747": fujitsu-dev
-"748": ris-cm
-"749": kerberos-adm
-"750": kerberos-iv
-"751": pump
-"752": qrh
-"753": rrh
-"754": tell
-"758": nlogin
-"759": con
-"760": ns
-"761": rxe
-"762": quotad
-"763": cycleserv
-"764": omserv
-"765": webster
-"767": phonebook
-"769": vid
-"770": cadlock
-"771": rtip
-"772": cycleserv2
-"773": notify
-"774": acmaint-dbd
-"775": acmaint-transd
-"776": wpages
-"777": multiling-http
-"780": wpgs
-"800": mdbs-daemon
-"801": device
-"802": mbap-s
-"810": fcp-udp
-"828": itm-mcell-s
-"829": pkix-3-ca-ra
-"830": netconf-ssh
-"831": netconf-beep
-"832": netconfsoaphttp
-"833": netconfsoapbeep
-"847": dhcp-failover2
-"848": gdoi
-"853": domain-s
-"860": iscsi
-"861": owamp-control
-"862": twamp-control
-"873": rsync
-"886": iclcnet-locate
-"887": iclcnet-svinfo
-"888": accessbuilder
-"900": omginitialrefs
-"901": smpnameres
-"902": ideafarm-door
-"903": ideafarm-panic
-"910": kink
-"911": xact-backup
-"912": apex-mesh
-"913": apex-edge
-"989": ftps-data
-"990": ftps
-"991": nas
-"992": telnets
-"993": imaps
-"995": pop3s
-"996": vsinet
-"997": maitrd
-"998": puparp
-"999": puprouter
-"1000": cadlock2
-"1010": surf
-"1021": exp1
-"1022": exp2
-"1025": blackjack
-"1026": cap
-"1027": 6a44
-"1029": solid-mux
-"1033": netinfo-local
-"1034": activesync
-"1035": mxxrlogin
-"1036": nsstp
-"1037": ams
-"1038": mtqp
-"1039": sbl
-"1040": netarx
-"1041": danf-ak2
-"1042": afrog
-"1043": boinc-client
-"1044": dcutility
-"1045": fpitp
-"1046": wfremotertm
-"1047": neod1
-"1048": neod2
-"1049": td-postman
-"1050": cma
-"1051": optima-vnet
-"1052": ddt
-"1053": remote-as
-"1054": brvread
-"1055": ansyslmd
-"1056": vfo
-"1057": startron
-"1058": nim
-"1059": nimreg
-"1060": polestar
-"1061": kiosk
-"1062": veracity
-"1063": kyoceranetdev
-"1064": jstel
-"1065": syscomlan
-"1066": fpo-fns
-"1067": instl-boots
-"1068": instl-bootc
-"1069": cognex-insight
-"1070": gmrupdateserv
-"1071": bsquare-voip
-"1072": cardax
-"1073": bridgecontrol
-"1074": warmspotMgmt
-"1075": rdrmshc
-"1076": dab-sti-c
-"1077": imgames
-"1078": avocent-proxy
-"1079": asprovatalk
-"1080": socks
-"1081": pvuniwien
-"1082": amt-esd-prot
-"1083": ansoft-lm-1
-"1084": ansoft-lm-2
-"1085": webobjects
-"1086": cplscrambler-lg
-"1087": cplscrambler-in
-"1088": cplscrambler-al
-"1089": ff-annunc
-"1090": ff-fms
-"1091": ff-sm
-"1092": obrpd
-"1093": proofd
-"1094": rootd
-"1095": nicelink
-"1096": cnrprotocol
-"1097": sunclustermgr
-"1098": rmiactivation
-"1099": rmiregistry
-"1100": mctp
-"1101": pt2-discover
-"1102": adobeserver-1
-"1103": adobeserver-2
-"1104": xrl
-"1105": ftranhc
-"1106": isoipsigport-1
-"1107": isoipsigport-2
-"1108": ratio-adp
-"1110": nfsd-keepalive
-"1111": lmsocialserver
-"1112": icp
-"1113": ltp-deepspace
-"1114": mini-sql
-"1115": ardus-trns
-"1116": ardus-cntl
-"1117": ardus-mtrns
-"1118": sacred
-"1119": bnetgame
-"1120": bnetfile
-"1121": rmpp
-"1122": availant-mgr
-"1123": murray
-"1124": hpvmmcontrol
-"1125": hpvmmagent
-"1126": hpvmmdata
-"1127": kwdb-commn
-"1128": saphostctrl
-"1129": saphostctrls
-"1130": casp
-"1131": caspssl
-"1132": kvm-via-ip
-"1133": dfn
-"1134": aplx
-"1135": omnivision
-"1136": hhb-gateway
-"1137": trim
-"1138": encrypted-admin
-"1139": evm
-"1140": autonoc
-"1141": mxomss
-"1142": edtools
-"1143": imyx
-"1144": fuscript
-"1145": x9-icue
-"1146": audit-transfer
-"1147": capioverlan
-"1148": elfiq-repl
-"1149": bvtsonar
-"1150": blaze
-"1151": unizensus
-"1152": winpoplanmess
-"1153": c1222-acse
-"1154": resacommunity
-"1155": nfa
-"1156": iascontrol-oms
-"1157": iascontrol
-"1158": dbcontrol-oms
-"1159": oracle-oms
-"1160": olsv
-"1161": health-polling
-"1162": health-trap
-"1163": sddp
-"1164": qsm-proxy
-"1165": qsm-gui
-"1166": qsm-remote
-"1167": cisco-ipsla
-"1168": vchat
-"1169": tripwire
-"1170": atc-lm
-"1171": atc-appserver
-"1172": dnap
-"1173": d-cinema-rrp
-"1174": fnet-remote-ui
-"1175": dossier
-"1176": indigo-server
-"1177": dkmessenger
-"1178": sgi-storman
-"1179": b2n
-"1180": mc-client
-"1181": 3comnetman
-"1182": accelenet-data
-"1183": llsurfup-http
-"1184": llsurfup-https
-"1185": catchpole
-"1186": mysql-cluster
-"1187": alias
-"1188": hp-webadmin
-"1189": unet
-"1190": commlinx-avl
-"1191": gpfs
-"1192": caids-sensor
-"1193": fiveacross
-"1194": openvpn
-"1195": rsf-1
-"1196": netmagic
-"1197": carrius-rshell
-"1198": cajo-discovery
-"1199": dmidi
-"1200": scol
-"1201": nucleus-sand
-"1202": caiccipc
-"1203": ssslic-mgr
-"1204": ssslog-mgr
-"1205": accord-mgc
-"1206": anthony-data
-"1207": metasage
-"1208": seagull-ais
-"1209": ipcd3
-"1210": eoss
-"1211": groove-dpp
-"1212": lupa
-"1213": mpc-lifenet
-"1214": kazaa
-"1215": scanstat-1
-"1216": etebac5
-"1217": hpss-ndapi
-"1218": aeroflight-ads
-"1219": aeroflight-ret
-"1220": qt-serveradmin
-"1221": sweetware-apps
-"1222": nerv
-"1223": tgp
-"1224": vpnz
-"1225": slinkysearch
-"1226": stgxfws
-"1227": dns2go
-"1228": florence
-"1229": zented
-"1230": periscope
-"1231": menandmice-lpm
-"1232": first-defense
-"1233": univ-appserver
-"1234": search-agent
-"1235": mosaicsyssvc1
-"1236": bvcontrol
-"1237": tsdos390
-"1238": hacl-qs
-"1239": nmsd
-"1240": instantia
-"1241": nessus
-"1242": nmasoverip
-"1243": serialgateway
-"1244": isbconference1
-"1245": isbconference2
-"1246": payrouter
-"1247": visionpyramid
-"1248": hermes
-"1249": mesavistaco
-"1250": swldy-sias
-"1251": servergraph
-"1252": bspne-pcc
-"1253": q55-pcc
-"1254": de-noc
-"1255": de-cache-query
-"1256": de-server
-"1257": shockwave2
-"1258": opennl
-"1259": opennl-voice
-"1260": ibm-ssd
-"1261": mpshrsv
-"1262": qnts-orb
-"1263": dka
-"1264": prat
-"1265": dssiapi
-"1266": dellpwrappks
-"1267": epc
-"1268": propel-msgsys
-"1269": watilapp
-"1270": opsmgr
-"1271": excw
-"1272": cspmlockmgr
-"1273": emc-gateway
-"1274": t1distproc
-"1275": ivcollector
-"1277": miva-mqs
-"1278": dellwebadmin-1
-"1279": dellwebadmin-2
-"1280": pictrography
-"1281": healthd
-"1282": emperion
-"1283": productinfo
-"1284": iee-qfx
-"1285": neoiface
-"1286": netuitive
-"1287": routematch
-"1288": navbuddy
-"1289": jwalkserver
-"1290": winjaserver
-"1291": seagulllms
-"1292": dsdn
-"1293": pkt-krb-ipsec
-"1294": cmmdriver
-"1295": ehtp
-"1296": dproxy
-"1297": sdproxy
-"1298": lpcp
-"1299": hp-sci
-"1300": h323hostcallsc
-"1301": ci3-software-1
-"1302": ci3-software-2
-"1303": sftsrv
-"1304": boomerang
-"1305": pe-mike
-"1306": re-conn-proto
-"1307": pacmand
-"1308": odsi
-"1309": jtag-server
-"1310": husky
-"1311": rxmon
-"1312": sti-envision
-"1313": bmc-patroldb
-"1314": pdps
-"1315": els
-"1316": exbit-escp
-"1317": vrts-ipcserver
-"1318": krb5gatekeeper
-"1319": amx-icsp
-"1320": amx-axbnet
-"1321": pip
-"1322": novation
-"1323": brcd
-"1324": delta-mcp
-"1325": dx-instrument
-"1326": wimsic
-"1327": ultrex
-"1328": ewall
-"1329": netdb-export
-"1330": streetperfect
-"1331": intersan
-"1332": pcia-rxp-b
-"1333": passwrd-policy
-"1334": writesrv
-"1335": digital-notary
-"1336": ischat
-"1337": menandmice-dns
-"1338": wmc-log-svc
-"1339": kjtsiteserver
-"1340": naap
-"1341": qubes
-"1342": esbroker
-"1343": re101
-"1344": icap
-"1345": vpjp
-"1346": alta-ana-lm
-"1347": bbn-mmc
-"1348": bbn-mmx
-"1349": sbook
-"1350": editbench
-"1351": equationbuilder
-"1352": lotusnote
-"1353": relief
-"1354": XSIP-network
-"1355": intuitive-edge
-"1356": cuillamartin
-"1357": pegboard
-"1358": connlcli
-"1359": ftsrv
-"1360": mimer
-"1361": linx
-"1362": timeflies
-"1363": ndm-requester
-"1364": ndm-server
-"1365": adapt-sna
-"1366": netware-csp
-"1367": dcs
-"1368": screencast
-"1369": gv-us
-"1370": us-gv
-"1371": fc-cli
-"1372": fc-ser
-"1373": chromagrafx
-"1374": molly
-"1375": bytex
-"1376": ibm-pps
-"1377": cichlid
-"1378": elan
-"1379": dbreporter
-"1380": telesis-licman
-"1381": apple-licman
-"1382": udt-os
-"1383": gwha
-"1384": os-licman
-"1385": atex-elmd
-"1386": checksum
-"1387": cadsi-lm
-"1388": objective-dbc
-"1389": iclpv-dm
-"1390": iclpv-sc
-"1391": iclpv-sas
-"1392": iclpv-pm
-"1393": iclpv-nls
-"1394": iclpv-nlc
-"1395": iclpv-wsm
-"1396": dvl-activemail
-"1397": audio-activmail
-"1398": video-activmail
-"1399": cadkey-licman
-"1400": cadkey-tablet
-"1401": goldleaf-licman
-"1402": prm-sm-np
-"1403": prm-nm-np
-"1404": igi-lm
-"1405": ibm-res
-"1406": netlabs-lm
-"1408": sophia-lm
-"1409": here-lm
-"1410": hiq
-"1411": af
-"1412": innosys
-"1413": innosys-acl
-"1414": ibm-mqseries
-"1415": dbstar
-"1416": novell-lu6-2
-"1417": timbuktu-srv1
-"1418": timbuktu-srv2
-"1419": timbuktu-srv3
-"1420": timbuktu-srv4
-"1421": gandalf-lm
-"1422": autodesk-lm
-"1423": essbase
-"1424": hybrid
-"1425": zion-lm
-"1426": sais
-"1427": mloadd
-"1428": informatik-lm
-"1429": nms
-"1430": tpdu
-"1431": rgtp
-"1432": blueberry-lm
-"1433": ms-sql-s
-"1434": ms-sql-m
-"1435": ibm-cics
-"1436": saism
-"1437": tabula
-"1438": eicon-server
-"1439": eicon-x25
-"1440": eicon-slp
-"1441": cadis-1
-"1442": cadis-2
-"1443": ies-lm
-"1444": marcam-lm
-"1445": proxima-lm
-"1446": ora-lm
-"1447": apri-lm
-"1448": oc-lm
-"1449": peport
-"1450": dwf
-"1451": infoman
-"1452": gtegsc-lm
-"1453": genie-lm
-"1454": interhdl-elmd
-"1455": esl-lm
-"1456": dca
-"1457": valisys-lm
-"1458": nrcabq-lm
-"1459": proshare1
-"1460": proshare2
-"1461": ibm-wrless-lan
-"1462": world-lm
-"1463": nucleus
-"1464": msl-lmd
-"1465": pipes
-"1466": oceansoft-lm
-"1467": csdmbase
-"1468": csdm
-"1469": aal-lm
-"1470": uaiact
-"1471": csdmbase
-"1472": csdm
-"1473": openmath
-"1474": telefinder
-"1475": taligent-lm
-"1476": clvm-cfg
-"1477": ms-sna-server
-"1478": ms-sna-base
-"1479": dberegister
-"1480": pacerforum
-"1481": airs
-"1482": miteksys-lm
-"1483": afs
-"1484": confluent
-"1485": lansource
-"1486": nms-topo-serv
-"1487": localinfosrvr
-"1488": docstor
-"1489": dmdocbroker
-"1490": insitu-conf
-"1492": stone-design-1
-"1493": netmap-lm
-"1494": ica
-"1495": cvc
-"1496": liberty-lm
-"1497": rfx-lm
-"1498": sybase-sqlany
-"1499": fhc
-"1500": vlsi-lm
-"1501": saiscm
-"1502": shivadiscovery
-"1503": imtc-mcs
-"1504": evb-elm
-"1505": funkproxy
-"1506": utcd
-"1507": symplex
-"1508": diagmond
-"1509": robcad-lm
-"1510": mvx-lm
-"1511": 3l-l1
-"1512": wins
-"1513": fujitsu-dtc
-"1514": fujitsu-dtcns
-"1515": ifor-protocol
-"1516": vpad
-"1517": vpac
-"1518": vpvd
-"1519": vpvc
-"1520": atm-zip-office
-"1521": ncube-lm
-"1522": ricardo-lm
-"1523": cichild-lm
-"1524": ingreslock
-"1525": orasrv
-"1526": pdap-np
-"1527": tlisrv
-"1528": ngr-t
-"1529": coauthor
-"1530": rap-service
-"1531": rap-listen
-"1532": miroconnect
-"1533": virtual-places
-"1534": micromuse-lm
-"1535": ampr-info
-"1536": ampr-inter
-"1537": sdsc-lm
-"1538": 3ds-lm
-"1539": intellistor-lm
-"1540": rds
-"1541": rds2
-"1542": gridgen-elmd
-"1543": simba-cs
-"1544": aspeclmd
-"1545": vistium-share
-"1546": abbaccuray
-"1547": laplink
-"1548": axon-lm
-"1549": shivasound
-"1550": 3m-image-lm
-"1551": hecmtl-db
-"1552": pciarray
-"1553": sna-cs
-"1554": caci-lm
-"1555": livelan
-"1556": veritas-pbx
-"1557": arbortext-lm
-"1558": xingmpeg
-"1559": web2host
-"1560": asci-val
-"1561": facilityview
-"1562": pconnectmgr
-"1563": cadabra-lm
-"1564": pay-per-view
-"1565": winddlb
-"1566": corelvideo
-"1567": jlicelmd
-"1568": tsspmap
-"1569": ets
-"1570": orbixd
-"1571": rdb-dbs-disp
-"1572": chip-lm
-"1573": itscomm-ns
-"1574": mvel-lm
-"1575": oraclenames
-"1576": moldflow-lm
-"1577": hypercube-lm
-"1578": jacobus-lm
-"1579": ioc-sea-lm
-"1580": tn-tl-r2
-"1581": mil-2045-47001
-"1582": msims
-"1583": simbaexpress
-"1584": tn-tl-fd2
-"1585": intv
-"1586": ibm-abtact
-"1587": pra-elmd
-"1588": triquest-lm
-"1589": vqp
-"1590": gemini-lm
-"1591": ncpm-pm
-"1592": commonspace
-"1593": mainsoft-lm
-"1594": sixtrak
-"1595": radio
-"1596": radio-bc
-"1597": orbplus-iiop
-"1598": picknfs
-"1599": simbaservices
-"1600": issd
-"1601": aas
-"1602": inspect
-"1603": picodbc
-"1604": icabrowser
-"1605": slp
-"1606": slm-api
-"1607": stt
-"1608": smart-lm
-"1609": isysg-lm
-"1610": taurus-wh
-"1611": ill
-"1612": netbill-trans
-"1613": netbill-keyrep
-"1614": netbill-cred
-"1615": netbill-auth
-"1616": netbill-prod
-"1617": nimrod-agent
-"1618": skytelnet
-"1619": xs-openstorage
-"1620": faxportwinport
-"1621": softdataphone
-"1622": ontime
-"1623": jaleosnd
-"1624": udp-sr-port
-"1625": svs-omagent
-"1626": shockwave
-"1627": t128-gateway
-"1628": lontalk-norm
-"1629": lontalk-urgnt
-"1630": oraclenet8cman
-"1631": visitview
-"1632": pammratc
-"1633": pammrpc
-"1634": loaprobe
-"1635": edb-server1
-"1636": isdc
-"1637": islc
-"1638": ismc
-"1639": cert-initiator
-"1640": cert-responder
-"1641": invision
-"1642": isis-am
-"1643": isis-ambc
-"1644": saiseh
-"1645": sightline
-"1646": sa-msg-port
-"1647": rsap
-"1648": concurrent-lm
-"1649": kermit
-"1650": nkd
-"1651": shiva-confsrvr
-"1652": xnmp
-"1653": alphatech-lm
-"1654": stargatealerts
-"1655": dec-mbadmin
-"1656": dec-mbadmin-h
-"1657": fujitsu-mmpdc
-"1658": sixnetudr
-"1659": sg-lm
-"1660": skip-mc-gikreq
-"1661": netview-aix-1
-"1662": netview-aix-2
-"1663": netview-aix-3
-"1664": netview-aix-4
-"1665": netview-aix-5
-"1666": netview-aix-6
-"1667": netview-aix-7
-"1668": netview-aix-8
-"1669": netview-aix-9
-"1670": netview-aix-10
-"1671": netview-aix-11
-"1672": netview-aix-12
-"1673": proshare-mc-1
-"1674": proshare-mc-2
-"1675": pdp
-"1676": netcomm2
-"1677": groupwise
-"1678": prolink
-"1679": darcorp-lm
-"1680": microcom-sbp
-"1681": sd-elmd
-"1682": lanyon-lantern
-"1683": ncpm-hip
-"1684": snaresecure
-"1685": n2nremote
-"1686": cvmon
-"1687": nsjtp-ctrl
-"1688": nsjtp-data
-"1689": firefox
-"1690": ng-umds
-"1691": empire-empuma
-"1692": sstsys-lm
-"1693": rrirtr
-"1694": rrimwm
-"1695": rrilwm
-"1696": rrifmm
-"1697": rrisat
-"1698": rsvp-encap-1
-"1699": rsvp-encap-2
-"1700": mps-raft
-"1701": l2tp
-"1702": deskshare
-"1703": hb-engine
-"1704": bcs-broker
-"1705": slingshot
-"1706": jetform
-"1707": vdmplay
-"1708": gat-lmd
-"1709": centra
-"1710": impera
-"1711": pptconference
-"1712": registrar
-"1713": conferencetalk
-"1714": sesi-lm
-"1715": houdini-lm
-"1716": xmsg
-"1717": fj-hdnet
-"1718": h323gatedisc
-"1719": h323gatestat
-"1720": h323hostcall
-"1721": caicci
-"1722": hks-lm
-"1723": pptp
-"1724": csbphonemaster
-"1725": iden-ralp
-"1726": iberiagames
-"1727": winddx
-"1728": telindus
-"1729": citynl
-"1730": roketz
-"1731": msiccp
-"1732": proxim
-"1733": siipat
-"1734": cambertx-lm
-"1735": privatechat
-"1736": street-stream
-"1737": ultimad
-"1738": gamegen1
-"1739": webaccess
-"1740": encore
-"1741": cisco-net-mgmt
-"1742": 3Com-nsd
-"1743": cinegrfx-lm
-"1744": ncpm-ft
-"1745": remote-winsock
-"1746": ftrapid-1
-"1747": ftrapid-2
-"1748": oracle-em1
-"1749": aspen-services
-"1750": sslp
-"1751": swiftnet
-"1752": lofr-lm
-"1754": oracle-em2
-"1755": ms-streaming
-"1756": capfast-lmd
-"1757": cnhrp
-"1758": tftp-mcast
-"1759": spss-lm
-"1760": www-ldap-gw
-"1761": cft-0
-"1762": cft-1
-"1763": cft-2
-"1764": cft-3
-"1765": cft-4
-"1766": cft-5
-"1767": cft-6
-"1768": cft-7
-"1769": bmc-net-adm
-"1770": bmc-net-svc
-"1771": vaultbase
-"1772": essweb-gw
-"1773": kmscontrol
-"1774": global-dtserv
-"1776": femis
-"1777": powerguardian
-"1778": prodigy-intrnet
-"1779": pharmasoft
-"1780": dpkeyserv
-"1781": answersoft-lm
-"1782": hp-hcip
-"1784": finle-lm
-"1785": windlm
-"1786": funk-logger
-"1787": funk-license
-"1788": psmond
-"1789": hello
-"1790": nmsp
-"1791": ea1
-"1792": ibm-dt-2
-"1793": rsc-robot
-"1794": cera-bcm
-"1795": dpi-proxy
-"1796": vocaltec-admin
-"1797": uma
-"1798": etp
-"1799": netrisk
-"1800": ansys-lm
-"1801": msmq
-"1802": concomp1
-"1803": hp-hcip-gwy
-"1804": enl
-"1805": enl-name
-"1806": musiconline
-"1807": fhsp
-"1808": oracle-vp2
-"1809": oracle-vp1
-"1810": jerand-lm
-"1811": scientia-sdb
-"1812": radius
-"1813": radius-acct
-"1814": tdp-suite
-"1815": mmpft
-"1816": harp
-"1817": rkb-oscs
-"1818": etftp
-"1819": plato-lm
-"1820": mcagent
-"1821": donnyworld
-"1822": es-elmd
-"1823": unisys-lm
-"1824": metrics-pas
-"1825": direcpc-video
-"1826": ardt
-"1827": asi
-"1828": itm-mcell-u
-"1829": optika-emedia
-"1830": net8-cman
-"1831": myrtle
-"1832": tht-treasure
-"1833": udpradio
-"1834": ardusuni
-"1835": ardusmul
-"1836": ste-smsc
-"1837": csoft1
-"1838": talnet
-"1839": netopia-vo1
-"1840": netopia-vo2
-"1841": netopia-vo3
-"1842": netopia-vo4
-"1843": netopia-vo5
-"1844": direcpc-dll
-"1845": altalink
-"1846": tunstall-pnc
-"1847": slp-notify
-"1848": fjdocdist
-"1849": alpha-sms
-"1850": gsi
-"1851": ctcd
-"1852": virtual-time
-"1853": vids-avtp
-"1854": buddy-draw
-"1855": fiorano-rtrsvc
-"1856": fiorano-msgsvc
-"1857": datacaptor
-"1858": privateark
-"1859": gammafetchsvr
-"1860": sunscalar-svc
-"1861": lecroy-vicp
-"1862": mysql-cm-agent
-"1863": msnp
-"1864": paradym-31port
-"1865": entp
-"1866": swrmi
-"1867": udrive
-"1868": viziblebrowser
-"1869": transact
-"1870": sunscalar-dns
-"1871": canocentral0
-"1872": canocentral1
-"1873": fjmpjps
-"1874": fjswapsnp
-"1875": westell-stats
-"1876": ewcappsrv
-"1877": hp-webqosdb
-"1878": drmsmc
-"1879": nettgain-nms
-"1880": vsat-control
-"1881": ibm-mqseries2
-"1882": ecsqdmn
-"1883": mqtt
-"1884": idmaps
-"1885": vrtstrapserver
-"1886": leoip
-"1887": filex-lport
-"1888": ncconfig
-"1889": unify-adapter
-"1890": wilkenlistener
-"1891": childkey-notif
-"1892": childkey-ctrl
-"1893": elad
-"1894": o2server-port
-"1896": b-novative-ls
-"1897": metaagent
-"1898": cymtec-port
-"1899": mc2studios
-"1900": ssdp
-"1901": fjicl-tep-a
-"1902": fjicl-tep-b
-"1903": linkname
-"1904": fjicl-tep-c
-"1905": sugp
-"1906": tpmd
-"1907": intrastar
-"1908": dawn
-"1909": global-wlink
-"1910": ultrabac
-"1911": mtp
-"1912": rhp-iibp
-"1913": armadp
-"1914": elm-momentum
-"1915": facelink
-"1916": persona
-"1917": noagent
-"1918": can-nds
-"1919": can-dch
-"1920": can-ferret
-"1921": noadmin
-"1922": tapestry
-"1923": spice
-"1924": xiip
-"1925": discovery-port
-"1926": egs
-"1927": videte-cipc
-"1928": emsd-port
-"1929": bandwiz-system
-"1930": driveappserver
-"1931": amdsched
-"1932": ctt-broker
-"1933": xmapi
-"1934": xaapi
-"1935": macromedia-fcs
-"1936": jetcmeserver
-"1937": jwserver
-"1938": jwclient
-"1939": jvserver
-"1940": jvclient
-"1941": dic-aida
-"1942": res
-"1943": beeyond-media
-"1944": close-combat
-"1945": dialogic-elmd
-"1946": tekpls
-"1947": sentinelsrm
-"1948": eye2eye
-"1949": ismaeasdaqlive
-"1950": ismaeasdaqtest
-"1951": bcs-lmserver
-"1952": mpnjsc
-"1953": rapidbase
-"1954": abr-api
-"1955": abr-secure
-"1956": vrtl-vmf-ds
-"1957": unix-status
-"1958": dxadmind
-"1959": simp-all
-"1960": nasmanager
-"1961": bts-appserver
-"1962": biap-mp
-"1963": webmachine
-"1964": solid-e-engine
-"1965": tivoli-npm
-"1966": slush
-"1967": sns-quote
-"1968": lipsinc
-"1969": lipsinc1
-"1970": netop-rc
-"1971": netop-school
-"1972": intersys-cache
-"1973": dlsrap
-"1974": drp
-"1975": tcoflashagent
-"1976": tcoregagent
-"1977": tcoaddressbook
-"1978": unisql
-"1979": unisql-java
-"1980": pearldoc-xact
-"1981": p2pq
-"1982": estamp
-"1983": lhtp
-"1984": bb
-"1985": hsrp
-"1986": licensedaemon
-"1987": tr-rsrb-p1
-"1988": tr-rsrb-p2
-"1989": tr-rsrb-p3
-"1990": stun-p1
-"1991": stun-p2
-"1992": ipsendmsg
-"1992": stun-p3
-"1993": snmp-tcp-port
-"1994": stun-port
-"1995": perf-port
-"1996": tr-rsrb-port
-"1997": gdp-port
-"1998": x25-svc-port
-"1999": tcp-id-port
-"2000": cisco-sccp
-"2001": wizard
-"2002": globe
-"2003": brutus
-"2004": emce
-"2005": oracle
-"2006": raid-cd
-"2007": raid-am
-"2008": terminaldb
-"2009": whosockami
-"2010": pipe-server
-"2011": servserv
-"2012": raid-ac
-"2013": raid-cd
-"2014": raid-sf
-"2015": raid-cs
-"2016": bootserver
-"2017": bootclient
-"2018": rellpack
-"2019": about
-"2020": xinupageserver
-"2021": xinuexpansion1
-"2022": xinuexpansion2
-"2023": xinuexpansion3
-"2024": xinuexpansion4
-"2025": xribs
-"2026": scrabble
-"2027": shadowserver
-"2028": submitserver
-"2029": hsrpv6
-"2030": device2
-"2031": mobrien-chat
-"2032": blackboard
-"2033": glogger
-"2034": scoremgr
-"2035": imsldoc
-"2036": e-dpnet
-"2037": applus
-"2038": objectmanager
-"2039": prizma
-"2040": lam
-"2041": interbase
-"2042": isis
-"2043": isis-bcast
-"2044": rimsl
-"2045": cdfunc
-"2046": sdfunc
-"2047": dls
-"2048": dls-monitor
-"2049": nfs
-"2050": av-emb-config
-"2051": epnsdp
-"2052": clearvisn
-"2053": lot105-ds-upd
-"2054": weblogin
-"2055": iop
-"2056": omnisky
-"2057": rich-cp
-"2058": newwavesearch
-"2059": bmc-messaging
-"2060": teleniumdaemon
-"2061": netmount
-"2062": icg-swp
-"2063": icg-bridge
-"2064": icg-iprelay
-"2065": dlsrpn
-"2066": aura
-"2067": dlswpn
-"2068": avauthsrvprtcl
-"2069": event-port
-"2070": ah-esp-encap
-"2071": acp-port
-"2072": msync
-"2073": gxs-data-port
-"2074": vrtl-vmf-sa
-"2075": newlixengine
-"2076": newlixconfig
-"2077": tsrmagt
-"2078": tpcsrvr
-"2079": idware-router
-"2080": autodesk-nlm
-"2081": kme-trap-port
-"2082": infowave
-"2083": radsec
-"2084": sunclustergeo
-"2085": ada-cip
-"2086": gnunet
-"2087": eli
-"2088": ip-blf
-"2089": sep
-"2090": lrp
-"2091": prp
-"2092": descent3
-"2093": nbx-cc
-"2094": nbx-au
-"2095": nbx-ser
-"2096": nbx-dir
-"2097": jetformpreview
-"2098": dialog-port
-"2099": h2250-annex-g
-"2100": amiganetfs
-"2101": rtcm-sc104
-"2102": zephyr-srv
-"2103": zephyr-clt
-"2104": zephyr-hm
-"2105": minipay
-"2106": mzap
-"2107": bintec-admin
-"2108": comcam
-"2109": ergolight
-"2110": umsp
-"2111": dsatp
-"2112": idonix-metanet
-"2113": hsl-storm
-"2114": newheights
-"2115": kdm
-"2116": ccowcmr
-"2117": mentaclient
-"2118": mentaserver
-"2119": gsigatekeeper
-"2120": qencp
-"2121": scientia-ssdb
-"2122": caupc-remote
-"2123": gtp-control
-"2124": elatelink
-"2125": lockstep
-"2126": pktcable-cops
-"2127": index-pc-wb
-"2128": net-steward
-"2129": cs-live
-"2130": xds
-"2131": avantageb2b
-"2132": solera-epmap
-"2133": zymed-zpp
-"2134": avenue
-"2135": gris
-"2136": appworxsrv
-"2137": connect
-"2138": unbind-cluster
-"2139": ias-auth
-"2140": ias-reg
-"2141": ias-admind
-"2142": tdmoip
-"2143": lv-jc
-"2144": lv-ffx
-"2145": lv-pici
-"2146": lv-not
-"2147": lv-auth
-"2148": veritas-ucl
-"2149": acptsys
-"2150": dynamic3d
-"2151": docent
-"2152": gtp-user
-"2153": ctlptc
-"2154": stdptc
-"2155": brdptc
-"2156": trp
-"2157": xnds
-"2158": touchnetplus
-"2159": gdbremote
-"2160": apc-2160
-"2161": apc-2161
-"2162": navisphere
-"2163": navisphere-sec
-"2164": ddns-v3
-"2165": x-bone-api
-"2166": iwserver
-"2167": raw-serial
-"2168": easy-soft-mux
-"2169": brain
-"2170": eyetv
-"2171": msfw-storage
-"2172": msfw-s-storage
-"2173": msfw-replica
-"2174": msfw-array
-"2175": airsync
-"2176": rapi
-"2177": qwave
-"2178": bitspeer
-"2179": vmrdp
-"2180": mc-gt-srv
-"2181": eforward
-"2182": cgn-stat
-"2183": cgn-config
-"2184": nvd
-"2185": onbase-dds
-"2186": gtaua
-"2187": ssmd
-"2190": tivoconnect
-"2191": tvbus
-"2192": asdis
-"2193": drwcs
-"2197": mnp-exchange
-"2198": onehome-remote
-"2199": onehome-help
-"2200": ici
-"2201": ats
-"2202": imtc-map
-"2203": b2-runtime
-"2204": b2-license
-"2205": jps
-"2206": hpocbus
-"2207": hpssd
-"2208": hpiod
-"2209": rimf-ps
-"2210": noaaport
-"2211": emwin
-"2212": leecoposserver
-"2213": kali
-"2214": rpi
-"2215": ipcore
-"2216": vtu-comms
-"2217": gotodevice
-"2218": bounzza
-"2219": netiq-ncap
-"2220": netiq
-"2221": ethernet-ip-s
-"2222": EtherNet-IP-1
-"2223": rockwell-csp2
-"2224": efi-mg
-"2226": di-drm
-"2227": di-msg
-"2228": ehome-ms
-"2229": datalens
-"2230": queueadm
-"2231": wimaxasncp
-"2232": ivs-video
-"2233": infocrypt
-"2234": directplay
-"2235": sercomm-wlink
-"2236": nani
-"2237": optech-port1-lm
-"2238": aviva-sna
-"2239": imagequery
-"2240": recipe
-"2241": ivsd
-"2242": foliocorp
-"2243": magicom
-"2244": nmsserver
-"2245": hao
-"2246": pc-mta-addrmap
-"2247": antidotemgrsvr
-"2248": ums
-"2249": rfmp
-"2250": remote-collab
-"2251": dif-port
-"2252": njenet-ssl
-"2253": dtv-chan-req
-"2254": seispoc
-"2255": vrtp
-"2256": pcc-mfp
-"2257": simple-tx-rx
-"2258": rcts
-"2260": apc-2260
-"2261": comotionmaster
-"2262": comotionback
-"2263": ecwcfg
-"2264": apx500api-1
-"2265": apx500api-2
-"2266": mfserver
-"2267": ontobroker
-"2268": amt
-"2269": mikey
-"2270": starschool
-"2271": mmcals
-"2272": mmcal
-"2273": mysql-im
-"2274": pcttunnell
-"2275": ibridge-data
-"2276": ibridge-mgmt
-"2277": bluectrlproxy
-"2278": s3db
-"2279": xmquery
-"2280": lnvpoller
-"2281": lnvconsole
-"2282": lnvalarm
-"2283": lnvstatus
-"2284": lnvmaps
-"2285": lnvmailmon
-"2286": nas-metering
-"2287": dna
-"2288": netml
-"2289": dict-lookup
-"2290": sonus-logging
-"2291": eapsp
-"2292": mib-streaming
-"2293": npdbgmngr
-"2294": konshus-lm
-"2295": advant-lm
-"2296": theta-lm
-"2297": d2k-datamover1
-"2298": d2k-datamover2
-"2299": pc-telecommute
-"2300": cvmmon
-"2301": cpq-wbem
-"2302": binderysupport
-"2303": proxy-gateway
-"2304": attachmate-uts
-"2305": mt-scaleserver
-"2306": tappi-boxnet
-"2307": pehelp
-"2308": sdhelp
-"2309": sdserver
-"2310": sdclient
-"2311": messageservice
-"2312": wanscaler
-"2313": iapp
-"2314": cr-websystems
-"2315": precise-sft
-"2316": sent-lm
-"2317": attachmate-g32
-"2318": cadencecontrol
-"2319": infolibria
-"2320": siebel-ns
-"2321": rdlap
-"2322": ofsd
-"2323": 3d-nfsd
-"2324": cosmocall
-"2325": ansysli
-"2326": idcp
-"2327": xingcsm
-"2328": netrix-sftm
-"2329": nvd
-"2330": tscchat
-"2331": agentview
-"2332": rcc-host
-"2333": snapp
-"2334": ace-client
-"2335": ace-proxy
-"2336": appleugcontrol
-"2337": ideesrv
-"2338": norton-lambert
-"2339": 3com-webview
-"2340": wrs-registry
-"2341": xiostatus
-"2342": manage-exec
-"2343": nati-logos
-"2344": fcmsys
-"2345": dbm
-"2346": redstorm-join
-"2347": redstorm-find
-"2348": redstorm-info
-"2349": redstorm-diag
-"2350": psbserver
-"2351": psrserver
-"2352": pslserver
-"2353": pspserver
-"2354": psprserver
-"2355": psdbserver
-"2356": gxtelmd
-"2357": unihub-server
-"2358": futrix
-"2359": flukeserver
-"2360": nexstorindltd
-"2361": tl1
-"2362": digiman
-"2363": mediacntrlnfsd
-"2364": oi-2000
-"2365": dbref
-"2366": qip-login
-"2367": service-ctrl
-"2368": opentable
-"2370": l3-hbmon
-"2372": lanmessenger
-"2381": compaq-https
-"2382": ms-olap3
-"2383": ms-olap4
-"2384": sd-capacity
-"2385": sd-data
-"2386": virtualtape
-"2387": vsamredirector
-"2388": mynahautostart
-"2389": ovsessionmgr
-"2390": rsmtp
-"2391": 3com-net-mgmt
-"2392": tacticalauth
-"2393": ms-olap1
-"2394": ms-olap2
-"2395": lan900-remote
-"2396": wusage
-"2397": ncl
-"2398": orbiter
-"2399": fmpro-fdal
-"2400": opequus-server
-"2401": cvspserver
-"2402": taskmaster2000
-"2403": taskmaster2000
-"2404": iec-104
-"2405": trc-netpoll
-"2406": jediserver
-"2407": orion
-"2409": sns-protocol
-"2410": vrts-registry
-"2411": netwave-ap-mgmt
-"2412": cdn
-"2413": orion-rmi-reg
-"2414": beeyond
-"2415": codima-rtp
-"2416": rmtserver
-"2417": composit-server
-"2418": cas
-"2419": attachmate-s2s
-"2420": dslremote-mgmt
-"2421": g-talk
-"2422": crmsbits
-"2423": rnrp
-"2424": kofax-svr
-"2425": fjitsuappmgr
-"2426": vcmp
-"2427": mgcp-gateway
-"2428": ott
-"2429": ft-role
-"2430": venus
-"2431": venus-se
-"2432": codasrv
-"2433": codasrv-se
-"2434": pxc-epmap
-"2435": optilogic
-"2436": topx
-"2437": unicontrol
-"2438": msp
-"2439": sybasedbsynch
-"2440": spearway
-"2441": pvsw-inet
-"2442": netangel
-"2443": powerclientcsf
-"2444": btpp2sectrans
-"2445": dtn1
-"2446": bues-service
-"2447": ovwdb
-"2448": hpppssvr
-"2449": ratl
-"2450": netadmin
-"2451": netchat
-"2452": snifferclient
-"2453": madge-ltd
-"2454": indx-dds
-"2455": wago-io-system
-"2456": altav-remmgt
-"2457": rapido-ip
-"2458": griffin
-"2459": community
-"2460": ms-theater
-"2461": qadmifoper
-"2462": qadmifevent
-"2463": lsi-raid-mgmt
-"2464": direcpc-si
-"2465": lbm
-"2466": lbf
-"2467": high-criteria
-"2468": qip-msgd
-"2469": mti-tcs-comm
-"2470": taskman-port
-"2471": seaodbc
-"2472": c3
-"2473": aker-cdp
-"2474": vitalanalysis
-"2475": ace-server
-"2476": ace-svr-prop
-"2477": ssm-cvs
-"2478": ssm-cssps
-"2479": ssm-els
-"2480": powerexchange
-"2481": giop
-"2482": giop-ssl
-"2483": ttc
-"2484": ttc-ssl
-"2485": netobjects1
-"2486": netobjects2
-"2487": pns
-"2488": moy-corp
-"2489": tsilb
-"2490": qip-qdhcp
-"2491": conclave-cpp
-"2492": groove
-"2493": talarian-mqs
-"2494": bmc-ar
-"2495": fast-rem-serv
-"2496": dirgis
-"2497": quaddb
-"2498": odn-castraq
-"2499": unicontrol
-"2500": rtsserv
-"2501": rtsclient
-"2502": kentrox-prot
-"2503": nms-dpnss
-"2504": wlbs
-"2505": ppcontrol
-"2506": jbroker
-"2507": spock
-"2508": jdatastore
-"2509": fjmpss
-"2510": fjappmgrbulk
-"2511": metastorm
-"2512": citrixima
-"2513": citrixadmin
-"2514": facsys-ntp
-"2515": facsys-router
-"2516": maincontrol
-"2517": call-sig-trans
-"2518": willy
-"2519": globmsgsvc
-"2520": pvsw
-"2521": adaptecmgr
-"2522": windb
-"2523": qke-llc-v3
-"2524": optiwave-lm
-"2525": ms-v-worlds
-"2526": ema-sent-lm
-"2527": iqserver
-"2528": ncr-ccl
-"2529": utsftp
-"2530": vrcommerce
-"2531": ito-e-gui
-"2532": ovtopmd
-"2533": snifferserver
-"2534": combox-web-acc
-"2535": madcap
-"2536": btpp2audctr1
-"2537": upgrade
-"2538": vnwk-prapi
-"2539": vsiadmin
-"2540": lonworks
-"2541": lonworks2
-"2542": udrawgraph
-"2543": reftek
-"2544": novell-zen
-"2545": sis-emt
-"2546": vytalvaultbrtp
-"2547": vytalvaultvsmp
-"2548": vytalvaultpipe
-"2549": ipass
-"2550": ads
-"2551": isg-uda-server
-"2552": call-logging
-"2553": efidiningport
-"2554": vcnet-link-v10
-"2555": compaq-wcp
-"2556": nicetec-nmsvc
-"2557": nicetec-mgmt
-"2558": pclemultimedia
-"2559": lstp
-"2560": labrat
-"2561": mosaixcc
-"2562": delibo
-"2563": cti-redwood
-"2564": hp-3000-telnet
-"2565": coord-svr
-"2566": pcs-pcw
-"2567": clp
-"2568": spamtrap
-"2569": sonuscallsig
-"2570": hs-port
-"2571": cecsvc
-"2572": ibp
-"2573": trustestablish
-"2574": blockade-bpsp
-"2575": hl7
-"2576": tclprodebugger
-"2577": scipticslsrvr
-"2578": rvs-isdn-dcp
-"2579": mpfoncl
-"2580": tributary
-"2581": argis-te
-"2582": argis-ds
-"2583": mon
-"2584": cyaserv
-"2585": netx-server
-"2586": netx-agent
-"2587": masc
-"2588": privilege
-"2589": quartus-tcl
-"2590": idotdist
-"2591": maytagshuffle
-"2592": netrek
-"2593": mns-mail
-"2594": dts
-"2595": worldfusion1
-"2596": worldfusion2
-"2597": homesteadglory
-"2598": citriximaclient
-"2599": snapd
-"2600": hpstgmgr
-"2601": discp-client
-"2602": discp-server
-"2603": servicemeter
-"2604": nsc-ccs
-"2605": nsc-posa
-"2606": netmon
-"2607": connection
-"2608": wag-service
-"2609": system-monitor
-"2610": versa-tek
-"2611": lionhead
-"2612": qpasa-agent
-"2613": smntubootstrap
-"2614": neveroffline
-"2615": firepower
-"2616": appswitch-emp
-"2617": cmadmin
-"2618": priority-e-com
-"2619": bruce
-"2620": lpsrecommender
-"2621": miles-apart
-"2622": metricadbc
-"2623": lmdp
-"2624": aria
-"2625": blwnkl-port
-"2626": gbjd816
-"2627": moshebeeri
-"2628": dict
-"2629": sitaraserver
-"2630": sitaramgmt
-"2631": sitaradir
-"2632": irdg-post
-"2633": interintelli
-"2634": pk-electronics
-"2635": backburner
-"2636": solve
-"2637": imdocsvc
-"2638": sybaseanywhere
-"2639": aminet
-"2640": ami-control
-"2641": hdl-srv
-"2642": tragic
-"2643": gte-samp
-"2644": travsoft-ipx-t
-"2645": novell-ipx-cmd
-"2646": and-lm
-"2647": syncserver
-"2648": upsnotifyprot
-"2649": vpsipport
-"2650": eristwoguns
-"2651": ebinsite
-"2652": interpathpanel
-"2653": sonus
-"2654": corel-vncadmin
-"2655": unglue
-"2656": kana
-"2657": sns-dispatcher
-"2658": sns-admin
-"2659": sns-query
-"2660": gcmonitor
-"2661": olhost
-"2662": bintec-capi
-"2663": bintec-tapi
-"2664": patrol-mq-gm
-"2665": patrol-mq-nm
-"2666": extensis
-"2667": alarm-clock-s
-"2668": alarm-clock-c
-"2669": toad
-"2670": tve-announce
-"2671": newlixreg
-"2672": nhserver
-"2673": firstcall42
-"2674": ewnn
-"2675": ttc-etap
-"2676": simslink
-"2677": gadgetgate1way
-"2678": gadgetgate2way
-"2679": syncserverssl
-"2680": pxc-sapxom
-"2681": mpnjsomb
-"2683": ncdloadbalance
-"2684": mpnjsosv
-"2685": mpnjsocl
-"2686": mpnjsomg
-"2687": pq-lic-mgmt
-"2688": md-cg-http
-"2689": fastlynx
-"2690": hp-nnm-data
-"2691": itinternet
-"2692": admins-lms
-"2694": pwrsevent
-"2695": vspread
-"2696": unifyadmin
-"2697": oce-snmp-trap
-"2698": mck-ivpip
-"2699": csoft-plusclnt
-"2700": tqdata
-"2701": sms-rcinfo
-"2702": sms-xfer
-"2703": sms-chat
-"2704": sms-remctrl
-"2705": sds-admin
-"2706": ncdmirroring
-"2707": emcsymapiport
-"2708": banyan-net
-"2709": supermon
-"2710": sso-service
-"2711": sso-control
-"2712": aocp
-"2713": raventbs
-"2714": raventdm
-"2715": hpstgmgr2
-"2716": inova-ip-disco
-"2717": pn-requester
-"2718": pn-requester2
-"2719": scan-change
-"2720": wkars
-"2721": smart-diagnose
-"2722": proactivesrvr
-"2723": watchdog-nt
-"2724": qotps
-"2725": msolap-ptp2
-"2726": tams
-"2727": mgcp-callagent
-"2728": sqdr
-"2729": tcim-control
-"2730": nec-raidplus
-"2731": fyre-messanger
-"2732": g5m
-"2733": signet-ctf
-"2734": ccs-software
-"2735": netiq-mc
-"2736": radwiz-nms-srv
-"2737": srp-feedback
-"2738": ndl-tcp-ois-gw
-"2739": tn-timing
-"2740": alarm
-"2741": tsb
-"2742": tsb2
-"2743": murx
-"2744": honyaku
-"2745": urbisnet
-"2746": cpudpencap
-"2747": fjippol-swrly
-"2748": fjippol-polsvr
-"2749": fjippol-cnsl
-"2750": fjippol-port1
-"2751": fjippol-port2
-"2752": rsisysaccess
-"2753": de-spot
-"2754": apollo-cc
-"2755": expresspay
-"2756": simplement-tie
-"2757": cnrp
-"2758": apollo-status
-"2759": apollo-gms
-"2760": sabams
-"2761": dicom-iscl
-"2762": dicom-tls
-"2763": desktop-dna
-"2764": data-insurance
-"2765": qip-audup
-"2766": compaq-scp
-"2767": uadtc
-"2768": uacs
-"2769": exce
-"2770": veronica
-"2771": vergencecm
-"2772": auris
-"2773": rbakcup1
-"2774": rbakcup2
-"2775": smpp
-"2776": ridgeway1
-"2777": ridgeway2
-"2778": gwen-sonya
-"2779": lbc-sync
-"2780": lbc-control
-"2781": whosells
-"2782": everydayrc
-"2783": aises
-"2784": www-dev
-"2785": aic-np
-"2786": aic-oncrpc
-"2787": piccolo
-"2788": fryeserv
-"2789": media-agent
-"2790": plgproxy
-"2791": mtport-regist
-"2792": f5-globalsite
-"2793": initlsmsad
-"2795": livestats
-"2796": ac-tech
-"2797": esp-encap
-"2798": tmesis-upshot
-"2799": icon-discover
-"2800": acc-raid
-"2801": igcp
-"2802": veritas-udp1
-"2803": btprjctrl
-"2804": dvr-esm
-"2805": wta-wsp-s
-"2806": cspuni
-"2807": cspmulti
-"2808": j-lan-p
-"2809": corbaloc
-"2810": netsteward
-"2811": gsiftp
-"2812": atmtcp
-"2813": llm-pass
-"2814": llm-csv
-"2815": lbc-measure
-"2816": lbc-watchdog
-"2817": nmsigport
-"2818": rmlnk
-"2819": fc-faultnotify
-"2820": univision
-"2821": vrts-at-port
-"2822": ka0wuc
-"2823": cqg-netlan
-"2824": cqg-netlan-1
-"2826": slc-systemlog
-"2827": slc-ctrlrloops
-"2828": itm-lm
-"2829": silkp1
-"2830": silkp2
-"2831": silkp3
-"2832": silkp4
-"2833": glishd
-"2834": evtp
-"2835": evtp-data
-"2836": catalyst
-"2837": repliweb
-"2838": starbot
-"2839": nmsigport
-"2840": l3-exprt
-"2841": l3-ranger
-"2842": l3-hawk
-"2843": pdnet
-"2844": bpcp-poll
-"2845": bpcp-trap
-"2846": aimpp-hello
-"2847": aimpp-port-req
-"2848": amt-blc-port
-"2849": fxp
-"2850": metaconsole
-"2851": webemshttp
-"2852": bears-01
-"2853": ispipes
-"2854": infomover
-"2856": cesdinv
-"2857": simctlp
-"2858": ecnp
-"2859": activememory
-"2860": dialpad-voice1
-"2861": dialpad-voice2
-"2862": ttg-protocol
-"2863": sonardata
-"2864": astromed-main
-"2865": pit-vpn
-"2866": iwlistener
-"2867": esps-portal
-"2868": npep-messaging
-"2869": icslap
-"2870": daishi
-"2871": msi-selectplay
-"2872": radix
-"2874": dxmessagebase1
-"2875": dxmessagebase2
-"2876": sps-tunnel
-"2877": bluelance
-"2878": aap
-"2879": ucentric-ds
-"2880": synapse
-"2881": ndsp
-"2882": ndtp
-"2883": ndnp
-"2884": flashmsg
-"2885": topflow
-"2886": responselogic
-"2887": aironetddp
-"2888": spcsdlobby
-"2889": rsom
-"2890": cspclmulti
-"2891": cinegrfx-elmd
-"2892": snifferdata
-"2893": vseconnector
-"2894": abacus-remote
-"2895": natuslink
-"2896": ecovisiong6-1
-"2897": citrix-rtmp
-"2898": appliance-cfg
-"2899": powergemplus
-"2900": quicksuite
-"2901": allstorcns
-"2902": netaspi
-"2903": suitcase
-"2904": m2ua
-"2906": caller9
-"2907": webmethods-b2b
-"2908": mao
-"2909": funk-dialout
-"2910": tdaccess
-"2911": blockade
-"2912": epicon
-"2913": boosterware
-"2914": gamelobby
-"2915": tksocket
-"2916": elvin-server
-"2917": elvin-client
-"2918": kastenchasepad
-"2919": roboer
-"2920": roboeda
-"2921": cesdcdman
-"2922": cesdcdtrn
-"2923": wta-wsp-wtp-s
-"2924": precise-vip
-"2926": mobile-file-dl
-"2927": unimobilectrl
-"2928": redstone-cpss
-"2929": amx-webadmin
-"2930": amx-weblinx
-"2931": circle-x
-"2932": incp
-"2933": 4-tieropmgw
-"2934": 4-tieropmcli
-"2935": qtp
-"2936": otpatch
-"2937": pnaconsult-lm
-"2938": sm-pas-1
-"2939": sm-pas-2
-"2940": sm-pas-3
-"2941": sm-pas-4
-"2942": sm-pas-5
-"2943": ttnrepository
-"2944": megaco-h248
-"2945": h248-binary
-"2946": fjsvmpor
-"2947": gpsd
-"2948": wap-push
-"2949": wap-pushsecure
-"2950": esip
-"2951": ottp
-"2952": mpfwsas
-"2953": ovalarmsrv
-"2954": ovalarmsrv-cmd
-"2955": csnotify
-"2956": ovrimosdbman
-"2957": jmact5
-"2958": jmact6
-"2959": rmopagt
-"2960": dfoxserver
-"2961": boldsoft-lm
-"2962": iph-policy-cli
-"2963": iph-policy-adm
-"2964": bullant-srap
-"2965": bullant-rap
-"2966": idp-infotrieve
-"2967": ssc-agent
-"2968": enpp
-"2969": essp
-"2970": index-net
-"2971": netclip
-"2972": pmsm-webrctl
-"2973": svnetworks
-"2974": signal
-"2975": fjmpcm
-"2976": cns-srv-port
-"2977": ttc-etap-ns
-"2978": ttc-etap-ds
-"2979": h263-video
-"2980": wimd
-"2981": mylxamport
-"2982": iwb-whiteboard
-"2983": netplan
-"2984": hpidsadmin
-"2985": hpidsagent
-"2986": stonefalls
-"2987": identify
-"2988": hippad
-"2989": zarkov
-"2990": boscap
-"2991": wkstn-mon
-"2992": avenyo
-"2993": veritas-vis1
-"2994": veritas-vis2
-"2995": idrs
-"2996": vsixml
-"2997": rebol
-"2998": realsecure
-"2999": remoteware-un
-"3000": hbci
-"3002": exlm-agent
-"3003": cgms
-"3004": csoftragent
-"3005": geniuslm
-"3006": ii-admin
-"3007": lotusmtap
-"3008": midnight-tech
-"3009": pxc-ntfy
-"3010": ping-pong
-"3011": trusted-web
-"3012": twsdss
-"3013": gilatskysurfer
-"3014": broker-service
-"3015": nati-dstp
-"3016": notify-srvr
-"3017": event-listener
-"3018": srvc-registry
-"3019": resource-mgr
-"3020": cifs
-"3021": agriserver
-"3022": csregagent
-"3023": magicnotes
-"3024": nds-sso
-"3025": arepa-raft
-"3026": agri-gateway
-"3027": LiebDevMgmt-C
-"3028": LiebDevMgmt-DM
-"3029": LiebDevMgmt-A
-"3030": arepa-cas
-"3031": eppc
-"3032": redwood-chat
-"3033": pdb
-"3034": osmosis-aeea
-"3035": fjsv-gssagt
-"3036": hagel-dump
-"3037": hp-san-mgmt
-"3038": santak-ups
-"3039": cogitate
-"3040": tomato-springs
-"3041": di-traceware
-"3042": journee
-"3043": brp
-"3044": epp
-"3045": responsenet
-"3046": di-ase
-"3047": hlserver
-"3048": pctrader
-"3049": nsws
-"3050": gds-db
-"3051": galaxy-server
-"3052": apc-3052
-"3053": dsom-server
-"3054": amt-cnf-prot
-"3055": policyserver
-"3056": cdl-server
-"3057": goahead-fldup
-"3058": videobeans
-"3059": qsoft
-"3060": interserver
-"3061": cautcpd
-"3062": ncacn-ip-tcp
-"3063": ncadg-ip-udp
-"3064": rprt
-"3065": slinterbase
-"3066": netattachsdmp
-"3067": fjhpjp
-"3068": ls3bcast
-"3069": ls3
-"3070": mgxswitch
-"3071": csd-mgmt-port
-"3072": csd-monitor
-"3073": vcrp
-"3074": xbox
-"3075": orbix-locator
-"3076": orbix-config
-"3077": orbix-loc-ssl
-"3078": orbix-cfg-ssl
-"3079": lv-frontpanel
-"3080": stm-pproc
-"3081": tl1-lv
-"3082": tl1-raw
-"3083": tl1-telnet
-"3084": itm-mccs
-"3085": pcihreq
-"3086": jdl-dbkitchen
-"3087": asoki-sma
-"3088": xdtp
-"3089": ptk-alink
-"3090": stss
-"3091": 1ci-smcs
-"3093": rapidmq-center
-"3094": rapidmq-reg
-"3095": panasas
-"3096": ndl-aps
-"3098": umm-port
-"3099": chmd
-"3100": opcon-xps
-"3101": hp-pxpib
-"3102": slslavemon
-"3103": autocuesmi
-"3104": autocuetime
-"3105": cardbox
-"3106": cardbox-http
-"3107": business
-"3108": geolocate
-"3109": personnel
-"3110": sim-control
-"3111": wsynch
-"3112": ksysguard
-"3113": cs-auth-svr
-"3114": ccmad
-"3115": mctet-master
-"3116": mctet-gateway
-"3117": mctet-jserv
-"3118": pkagent
-"3119": d2000kernel
-"3120": d2000webserver
-"3122": vtr-emulator
-"3123": edix
-"3124": beacon-port
-"3125": a13-an
-"3127": ctx-bridge
-"3128": ndl-aas
-"3129": netport-id
-"3130": icpv2
-"3131": netbookmark
-"3132": ms-rule-engine
-"3133": prism-deploy
-"3134": ecp
-"3135": peerbook-port
-"3136": grubd
-"3137": rtnt-1
-"3138": rtnt-2
-"3139": incognitorv
-"3140": ariliamulti
-"3141": vmodem
-"3142": rdc-wh-eos
-"3143": seaview
-"3144": tarantella
-"3145": csi-lfap
-"3146": bears-02
-"3147": rfio
-"3148": nm-game-admin
-"3149": nm-game-server
-"3150": nm-asses-admin
-"3151": nm-assessor
-"3152": feitianrockey
-"3153": s8-client-port
-"3154": ccmrmi
-"3155": jpegmpeg
-"3156": indura
-"3157": e3consultants
-"3158": stvp
-"3159": navegaweb-port
-"3160": tip-app-server
-"3161": doc1lm
-"3162": sflm
-"3163": res-sap
-"3164": imprs
-"3165": newgenpay
-"3166": sossecollector
-"3167": nowcontact
-"3168": poweronnud
-"3169": serverview-as
-"3170": serverview-asn
-"3171": serverview-gf
-"3172": serverview-rm
-"3173": serverview-icc
-"3174": armi-server
-"3175": t1-e1-over-ip
-"3176": ars-master
-"3177": phonex-port
-"3178": radclientport
-"3179": h2gf-w-2m
-"3180": mc-brk-srv
-"3181": bmcpatrolagent
-"3182": bmcpatrolrnvu
-"3183": cops-tls
-"3184": apogeex-port
-"3185": smpppd
-"3186": iiw-port
-"3187": odi-port
-"3188": brcm-comm-port
-"3189": pcle-infex
-"3190": csvr-proxy
-"3191": csvr-sslproxy
-"3192": firemonrcc
-"3193": spandataport
-"3194": magbind
-"3195": ncu-1
-"3196": ncu-2
-"3197": embrace-dp-s
-"3198": embrace-dp-c
-"3199": dmod-workspace
-"3200": tick-port
-"3201": cpq-tasksmart
-"3202": intraintra
-"3203": netwatcher-mon
-"3204": netwatcher-db
-"3205": isns
-"3206": ironmail
-"3207": vx-auth-port
-"3208": pfu-prcallback
-"3209": netwkpathengine
-"3210": flamenco-proxy
-"3211": avsecuremgmt
-"3212": surveyinst
-"3213": neon24x7
-"3214": jmq-daemon-1
-"3215": jmq-daemon-2
-"3216": ferrari-foam
-"3217": unite
-"3218": smartpackets
-"3219": wms-messenger
-"3220": xnm-ssl
-"3221": xnm-clear-text
-"3222": glbp
-"3223": digivote
-"3224": aes-discovery
-"3225": fcip-port
-"3226": isi-irp
-"3227": dwnmshttp
-"3228": dwmsgserver
-"3229": global-cd-port
-"3230": sftdst-port
-"3231": vidigo
-"3232": mdtp
-"3233": whisker
-"3234": alchemy
-"3235": mdap-port
-"3236": apparenet-ts
-"3237": apparenet-tps
-"3238": apparenet-as
-"3239": apparenet-ui
-"3240": triomotion
-"3241": sysorb
-"3242": sdp-id-port
-"3243": timelot
-"3244": onesaf
-"3245": vieo-fe
-"3246": dvt-system
-"3247": dvt-data
-"3248": procos-lm
-"3249": ssp
-"3250": hicp
-"3251": sysscanner
-"3252": dhe
-"3253": pda-data
-"3254": pda-sys
-"3255": semaphore
-"3256": cpqrpm-agent
-"3257": cpqrpm-server
-"3258": ivecon-port
-"3259": epncdp2
-"3260": iscsi-target
-"3261": winshadow
-"3262": necp
-"3263": ecolor-imager
-"3264": ccmail
-"3265": altav-tunnel
-"3266": ns-cfg-server
-"3267": ibm-dial-out
-"3268": msft-gc
-"3269": msft-gc-ssl
-"3270": verismart
-"3271": csoft-prev
-"3272": user-manager
-"3273": sxmp
-"3274": ordinox-server
-"3275": samd
-"3276": maxim-asics
-"3277": awg-proxy
-"3278": lkcmserver
-"3279": admind
-"3280": vs-server
-"3281": sysopt
-"3282": datusorb
-"3283": Apple Remote Desktop (Net Assistant)
-"3284": 4talk
-"3285": plato
-"3286": e-net
-"3287": directvdata
-"3288": cops
-"3289": enpc
-"3290": caps-lm
-"3291": sah-lm
-"3292": cart-o-rama
-"3293": fg-fps
-"3294": fg-gip
-"3295": dyniplookup
-"3296": rib-slm
-"3297": cytel-lm
-"3298": deskview
-"3299": pdrncs
-"3302": mcs-fastmail
-"3303": opsession-clnt
-"3304": opsession-srvr
-"3305": odette-ftp
-"3306": mysql
-"3307": opsession-prxy
-"3308": tns-server
-"3309": tns-adv
-"3310": dyna-access
-"3311": mcns-tel-ret
-"3312": appman-server
-"3313": uorb
-"3314": uohost
-"3315": cdid
-"3316": aicc-cmi
-"3317": vsaiport
-"3318": ssrip
-"3319": sdt-lmd
-"3320": officelink2000
-"3321": vnsstr
-"3326": sftu
-"3327": bbars
-"3328": egptlm
-"3329": hp-device-disc
-"3330": mcs-calypsoicf
-"3331": mcs-messaging
-"3332": mcs-mailsvr
-"3333": dec-notes
-"3334": directv-web
-"3335": directv-soft
-"3336": directv-tick
-"3337": directv-catlg
-"3338": anet-b
-"3339": anet-l
-"3340": anet-m
-"3341": anet-h
-"3342": webtie
-"3343": ms-cluster-net
-"3344": bnt-manager
-"3345": influence
-"3346": trnsprntproxy
-"3347": phoenix-rpc
-"3348": pangolin-laser
-"3349": chevinservices
-"3350": findviatv
-"3351": btrieve
-"3352": ssql
-"3353": fatpipe
-"3354": suitjd
-"3355": ordinox-dbase
-"3356": upnotifyps
-"3357": adtech-test
-"3358": mpsysrmsvr
-"3359": wg-netforce
-"3360": kv-server
-"3361": kv-agent
-"3362": dj-ilm
-"3363": nati-vi-server
-"3364": creativeserver
-"3365": contentserver
-"3366": creativepartnr
-"3372": tip2
-"3373": lavenir-lm
-"3374": cluster-disc
-"3375": vsnm-agent
-"3376": cdbroker
-"3377": cogsys-lm
-"3378": wsicopy
-"3379": socorfs
-"3380": sns-channels
-"3381": geneous
-"3382": fujitsu-neat
-"3383": esp-lm
-"3384": hp-clic
-"3385": qnxnetman
-"3386": gprs-sig
-"3387": backroomnet
-"3388": cbserver
-"3389": ms-wbt-server
-"3390": dsc
-"3391": savant
-"3392": efi-lm
-"3393": d2k-tapestry1
-"3394": d2k-tapestry2
-"3395": dyna-lm
-"3396": printer-agent
-"3397": cloanto-lm
-"3398": mercantile
-"3399": csms
-"3400": csms2
-"3401": filecast
-"3402": fxaengine-net
-"3405": nokia-ann-ch1
-"3406": nokia-ann-ch2
-"3407": ldap-admin
-"3408": BESApi
-"3409": networklens
-"3410": networklenss
-"3411": biolink-auth
-"3412": xmlblaster
-"3413": svnet
-"3414": wip-port
-"3415": bcinameservice
-"3416": commandport
-"3417": csvr
-"3418": rnmap
-"3419": softaudit
-"3420": ifcp-port
-"3421": bmap
-"3422": rusb-sys-port
-"3423": xtrm
-"3424": xtrms
-"3425": agps-port
-"3426": arkivio
-"3427": websphere-snmp
-"3428": twcss
-"3429": gcsp
-"3430": ssdispatch
-"3431": ndl-als
-"3432": osdcp
-"3433": opnet-smp
-"3434": opencm
-"3435": pacom
-"3436": gc-config
-"3437": autocueds
-"3438": spiral-admin
-"3439": hri-port
-"3440": ans-console
-"3441": connect-client
-"3442": connect-server
-"3443": ov-nnm-websrv
-"3444": denali-server
-"3445": monp
-"3446": 3comfaxrpc
-"3447": directnet
-"3448": dnc-port
-"3449": hotu-chat
-"3450": castorproxy
-"3451": asam
-"3452": sabp-signal
-"3453": pscupd
-"3454": mira
-"3455": prsvp
-"3456": vat
-"3457": vat-control
-"3458": d3winosfi
-"3459": integral
-"3460": edm-manager
-"3461": edm-stager
-"3462": edm-std-notify
-"3463": edm-adm-notify
-"3464": edm-mgr-sync
-"3465": edm-mgr-cntrl
-"3466": workflow
-"3467": rcst
-"3468": ttcmremotectrl
-"3469": pluribus
-"3470": jt400
-"3471": jt400-ssl
-"3472": jaugsremotec-1
-"3473": jaugsremotec-2
-"3474": ttntspauto
-"3475": genisar-port
-"3476": nppmp
-"3477": ecomm
-"3478": stun
-"3479": twrpc
-"3480": plethora
-"3481": cleanerliverc
-"3482": vulture
-"3483": slim-devices
-"3484": gbs-stp
-"3485": celatalk
-"3486": ifsf-hb-port
-"3487": ltcudp
-"3488": fs-rh-srv
-"3489": dtp-dia
-"3490": colubris
-"3491": swr-port
-"3492": tvdumtray-port
-"3493": nut
-"3494": ibm3494
-"3495": seclayer-tcp
-"3496": seclayer-tls
-"3497": ipether232port
-"3498": dashpas-port
-"3499": sccip-media
-"3500": rtmp-port
-"3501": isoft-p2p
-"3502": avinstalldisc
-"3503": lsp-ping
-"3504": ironstorm
-"3505": ccmcomm
-"3506": apc-3506
-"3507": nesh-broker
-"3508": interactionweb
-"3509": vt-ssl
-"3510": xss-port
-"3511": webmail-2
-"3512": aztec
-"3513": arcpd
-"3514": must-p2p
-"3515": must-backplane
-"3516": smartcard-port
-"3517": 802-11-iapp
-"3518": artifact-msg
-"3519": galileo
-"3520": galileolog
-"3521": mc3ss
-"3522": nssocketport
-"3523": odeumservlink
-"3524": ecmport
-"3525": eisport
-"3526": starquiz-port
-"3527": beserver-msg-q
-"3528": jboss-iiop
-"3529": jboss-iiop-ssl
-"3530": gf
-"3531": joltid
-"3532": raven-rmp
-"3533": raven-rdp
-"3534": urld-port
-"3535": ms-la
-"3536": snac
-"3537": ni-visa-remote
-"3538": ibm-diradm
-"3539": ibm-diradm-ssl
-"3540": pnrp-port
-"3541": voispeed-port
-"3542": hacl-monitor
-"3543": qftest-lookup
-"3544": teredo
-"3545": camac
-"3547": symantec-sim
-"3548": interworld
-"3549": tellumat-nms
-"3550": ssmpp
-"3551": apcupsd
-"3552": taserver
-"3553": rbr-discovery
-"3554": questnotify
-"3555": razor
-"3556": sky-transport
-"3557": personalos-001
-"3558": mcp-port
-"3559": cctv-port
-"3560": iniserve-port
-"3561": bmc-onekey
-"3562": sdbproxy
-"3563": watcomdebug
-"3564": esimport
-"3567": dof-eps
-"3568": dof-tunnel-sec
-"3569": mbg-ctrl
-"3570": mccwebsvr-port
-"3571": megardsvr-port
-"3572": megaregsvrport
-"3573": tag-ups-1
-"3574": dmaf-caster
-"3575": ccm-port
-"3576": cmc-port
-"3577": config-port
-"3578": data-port
-"3579": ttat3lb
-"3580": nati-svrloc
-"3581": kfxaclicensing
-"3582": press
-"3583": canex-watch
-"3584": u-dbap
-"3585": emprise-lls
-"3586": emprise-lsc
-"3587": p2pgroup
-"3588": sentinel
-"3589": isomair
-"3590": wv-csp-sms
-"3591": gtrack-server
-"3592": gtrack-ne
-"3593": bpmd
-"3594": mediaspace
-"3595": shareapp
-"3596": iw-mmogame
-"3597": a14
-"3598": a15
-"3599": quasar-server
-"3600": trap-daemon
-"3601": visinet-gui
-"3602": infiniswitchcl
-"3603": int-rcv-cntrl
-"3604": bmc-jmx-port
-"3605": comcam-io
-"3606": splitlock
-"3607": precise-i3
-"3608": trendchip-dcp
-"3609": cpdi-pidas-cm
-"3610": echonet
-"3611": six-degrees
-"3612": hp-dataprotect
-"3613": alaris-disc
-"3614": sigma-port
-"3615": start-network
-"3616": cd3o-protocol
-"3617": sharp-server
-"3618": aairnet-1
-"3619": aairnet-2
-"3620": ep-pcp
-"3621": ep-nsp
-"3622": ff-lr-port
-"3623": haipe-discover
-"3624": dist-upgrade
-"3625": volley
-"3626": bvcdaemon-port
-"3627": jamserverport
-"3628": ept-machine
-"3629": escvpnet
-"3630": cs-remote-db
-"3631": cs-services
-"3632": distcc
-"3633": wacp
-"3634": hlibmgr
-"3635": sdo
-"3636": servistaitsm
-"3637": scservp
-"3638": ehp-backup
-"3639": xap-ha
-"3640": netplay-port1
-"3641": netplay-port2
-"3642": juxml-port
-"3643": audiojuggler
-"3644": ssowatch
-"3645": cyc
-"3646": xss-srv-port
-"3647": splitlock-gw
-"3648": fjcp
-"3649": nmmp
-"3650": prismiq-plugin
-"3651": xrpc-registry
-"3652": vxcrnbuport
-"3653": tsp
-"3654": vaprtm
-"3655": abatemgr
-"3656": abatjss
-"3657": immedianet-bcn
-"3658": ps-ams
-"3659": apple-sasl
-"3660": can-nds-ssl
-"3661": can-ferret-ssl
-"3662": pserver
-"3663": dtp
-"3664": ups-engine
-"3665": ent-engine
-"3666": eserver-pap
-"3667": infoexch
-"3668": dell-rm-port
-"3669": casanswmgmt
-"3670": smile
-"3671": efcp
-"3672": lispworks-orb
-"3673": mediavault-gui
-"3674": wininstall-ipc
-"3675": calltrax
-"3676": va-pacbase
-"3677": roverlog
-"3678": ipr-dglt
-"3679": Escale (Newton Dock)
-"3680": npds-tracker
-"3681": bts-x73
-"3682": cas-mapi
-"3683": bmc-ea
-"3684": faxstfx-port
-"3685": dsx-agent
-"3686": tnmpv2
-"3687": simple-push
-"3688": simple-push-s
-"3689": daap
-"3690": svn
-"3691": magaya-network
-"3692": intelsync
-"3695": bmc-data-coll
-"3696": telnetcpcd
-"3697": nw-license
-"3698": sagectlpanel
-"3699": kpn-icw
-"3700": lrs-paging
-"3701": netcelera
-"3702": ws-discovery
-"3703": adobeserver-3
-"3704": adobeserver-4
-"3705": adobeserver-5
-"3706": rt-event
-"3707": rt-event-s
-"3708": sun-as-iiops
-"3709": ca-idms
-"3710": portgate-auth
-"3711": edb-server2
-"3712": sentinel-ent
-"3713": tftps
-"3714": delos-dms
-"3715": anoto-rendezv
-"3716": wv-csp-sms-cir
-"3717": wv-csp-udp-cir
-"3718": opus-services
-"3719": itelserverport
-"3720": ufastro-instr
-"3721": xsync
-"3722": xserveraid
-"3723": sychrond
-"3724": blizwow
-"3725": na-er-tip
-"3726": array-manager
-"3727": e-mdu
-"3728": e-woa
-"3729": fksp-audit
-"3730": client-ctrl
-"3731": smap
-"3732": m-wnn
-"3733": multip-msg
-"3734": synel-data
-"3735": pwdis
-"3736": rs-rmi
-"3738": versatalk
-"3739": launchbird-lm
-"3740": heartbeat
-"3741": wysdma
-"3742": cst-port
-"3743": ipcs-command
-"3744": sasg
-"3745": gw-call-port
-"3746": linktest
-"3747": linktest-s
-"3748": webdata
-"3749": cimtrak
-"3750": cbos-ip-port
-"3751": gprs-cube
-"3752": vipremoteagent
-"3753": nattyserver
-"3754": timestenbroker
-"3755": sas-remote-hlp
-"3756": canon-capt
-"3757": grf-port
-"3758": apw-registry
-"3759": exapt-lmgr
-"3760": adtempusclient
-"3761": gsakmp
-"3762": gbs-smp
-"3763": xo-wave
-"3764": mni-prot-rout
-"3765": rtraceroute
-"3767": listmgr-port
-"3768": rblcheckd
-"3769": haipe-otnk
-"3770": cindycollab
-"3771": paging-port
-"3772": ctp
-"3773": ctdhercules
-"3774": zicom
-"3775": ispmmgr
-"3776": dvcprov-port
-"3777": jibe-eb
-"3778": c-h-it-port
-"3779": cognima
-"3780": nnp
-"3781": abcvoice-port
-"3782": iso-tp0s
-"3783": bim-pem
-"3784": bfd-control
-"3785": bfd-echo
-"3786": upstriggervsw
-"3787": fintrx
-"3788": isrp-port
-"3789": remotedeploy
-"3790": quickbooksrds
-"3791": tvnetworkvideo
-"3792": sitewatch
-"3793": dcsoftware
-"3794": jaus
-"3795": myblast
-"3796": spw-dialer
-"3797": idps
-"3798": minilock
-"3799": radius-dynauth
-"3800": pwgpsi
-"3801": ibm-mgr
-"3802": vhd
-"3803": soniqsync
-"3804": iqnet-port
-"3805": tcpdataserver
-"3806": wsmlb
-"3807": spugna
-"3808": sun-as-iiops-ca
-"3809": apocd
-"3810": wlanauth
-"3811": amp
-"3812": neto-wol-server
-"3813": rap-ip
-"3814": neto-dcs
-"3815": lansurveyorxml
-"3816": sunlps-http
-"3817": tapeware
-"3818": crinis-hb
-"3819": epl-slp
-"3820": scp
-"3821": pmcp
-"3822": acp-discovery
-"3823": acp-conduit
-"3824": acp-policy
-"3825": ffserver
-"3826": warmux
-"3827": netmpi
-"3828": neteh
-"3829": neteh-ext
-"3830": cernsysmgmtagt
-"3831": dvapps
-"3832": xxnetserver
-"3833": aipn-auth
-"3834": spectardata
-"3835": spectardb
-"3836": markem-dcp
-"3837": mkm-discovery
-"3838": sos
-"3839": amx-rms
-"3840": flirtmitmir
-"3842": nhci
-"3843": quest-agent
-"3844": rnm
-"3845": v-one-spp
-"3846": an-pcp
-"3847": msfw-control
-"3848": item
-"3849": spw-dnspreload
-"3850": qtms-bootstrap
-"3851": spectraport
-"3852": sse-app-config
-"3853": sscan
-"3854": stryker-com
-"3855": opentrac
-"3856": informer
-"3857": trap-port
-"3858": trap-port-mom
-"3859": nav-port
-"3860": sasp
-"3861": winshadow-hd
-"3862": giga-pocket
-"3863": asap-udp
-"3865": xpl
-"3866": dzdaemon
-"3867": dzoglserver
-"3869": ovsam-mgmt
-"3870": ovsam-d-agent
-"3871": avocent-adsap
-"3872": oem-agent
-"3873": fagordnc
-"3874": sixxsconfig
-"3875": pnbscada
-"3876": dl-agent
-"3877": xmpcr-interface
-"3878": fotogcad
-"3879": appss-lm
-"3880": igrs
-"3881": idac
-"3882": msdts1
-"3883": vrpn
-"3884": softrack-meter
-"3885": topflow-ssl
-"3886": nei-management
-"3887": ciphire-data
-"3888": ciphire-serv
-"3889": dandv-tester
-"3890": ndsconnect
-"3891": rtc-pm-port
-"3892": pcc-image-port
-"3893": cgi-starapi
-"3894": syam-agent
-"3895": syam-smc
-"3896": sdo-tls
-"3897": sdo-ssh
-"3898": senip
-"3899": itv-control
-"3900": udt-os
-"3901": nimsh
-"3902": nimaux
-"3903": charsetmgr
-"3904": omnilink-port
-"3905": mupdate
-"3906": topovista-data
-"3907": imoguia-port
-"3908": hppronetman
-"3909": surfcontrolcpa
-"3910": prnrequest
-"3911": prnstatus
-"3912": gbmt-stars
-"3913": listcrt-port
-"3914": listcrt-port-2
-"3915": agcat
-"3916": wysdmc
-"3917": aftmux
-"3918": pktcablemmcops
-"3919": hyperip
-"3920": exasoftport1
-"3921": herodotus-net
-"3922": sor-update
-"3923": symb-sb-port
-"3924": mpl-gprs-port
-"3925": zmp
-"3926": winport
-"3927": natdataservice
-"3928": netboot-pxe
-"3929": smauth-port
-"3930": syam-webserver
-"3931": msr-plugin-port
-"3932": dyn-site
-"3933": plbserve-port
-"3934": sunfm-port
-"3935": sdp-portmapper
-"3936": mailprox
-"3937": dvbservdsc
-"3938": dbcontrol-agent
-"3939": aamp
-"3940": xecp-node
-"3941": homeportal-web
-"3942": srdp
-"3943": tig
-"3944": sops
-"3945": emcads
-"3946": backupedge
-"3947": ccp
-"3948": apdap
-"3949": drip
-"3950": namemunge
-"3951": pwgippfax
-"3952": i3-sessionmgr
-"3953": xmlink-connect
-"3954": adrep
-"3955": p2pcommunity
-"3956": gvcp
-"3957": mqe-broker
-"3958": mqe-agent
-"3959": treehopper
-"3960": bess
-"3961": proaxess
-"3962": sbi-agent
-"3963": thrp
-"3964": sasggprs
-"3965": ati-ip-to-ncpe
-"3966": bflckmgr
-"3967": ppsms
-"3968": ianywhere-dbns
-"3969": landmarks
-"3970": lanrevagent
-"3971": lanrevserver
-"3972": iconp
-"3973": progistics
-"3974": citysearch
-"3975": airshot
-"3976": opswagent
-"3977": opswmanager
-"3978": secure-cfg-svr
-"3979": smwan
-"3980": acms
-"3981": starfish
-"3982": eis
-"3983": eisp
-"3984": mapper-nodemgr
-"3985": mapper-mapethd
-"3986": mapper-ws-ethd
-"3987": centerline
-"3988": dcs-config
-"3989": bv-queryengine
-"3990": bv-is
-"3991": bv-smcsrv
-"3992": bv-ds
-"3993": bv-agent
-"3995": iss-mgmt-ssl
-"3996": abcsoftware
-"3997": agentsease-db
-"3998": dnx
-"3999": nvcnet
-"4000": terabase
-"4001": newoak
-"4002": pxc-spvr-ft
-"4003": pxc-splr-ft
-"4004": pxc-roid
-"4005": pxc-pin
-"4006": pxc-spvr
-"4007": pxc-splr
-"4008": netcheque
-"4009": chimera-hwm
-"4010": samsung-unidex
-"4011": altserviceboot
-"4012": pda-gate
-"4013": acl-manager
-"4014": taiclock
-"4015": talarian-mcast1
-"4016": talarian-mcast2
-"4017": talarian-mcast3
-"4018": talarian-mcast4
-"4019": talarian-mcast5
-"4020": trap
-"4021": nexus-portal
-"4022": dnox
-"4023": esnm-zoning
-"4024": tnp1-port
-"4025": partimage
-"4026": as-debug
-"4027": bxp
-"4028": dtserver-port
-"4029": ip-qsig
-"4030": jdmn-port
-"4031": suucp
-"4032": vrts-auth-port
-"4033": sanavigator
-"4034": ubxd
-"4035": wap-push-http
-"4036": wap-push-https
-"4037": ravehd
-"4038": fazzt-ptp
-"4039": fazzt-admin
-"4040": yo-main
-"4041": houston
-"4042": ldxp
-"4043": nirp
-"4044": ltp
-"4045": npp
-"4046": acp-proto
-"4047": ctp-state
-"4049": wafs
-"4050": cisco-wafs
-"4051": cppdp
-"4052": interact
-"4053": ccu-comm-1
-"4054": ccu-comm-2
-"4055": ccu-comm-3
-"4056": lms
-"4057": wfm
-"4058": kingfisher
-"4059": dlms-cosem
-"4060": dsmeter-iatc
-"4061": ice-location
-"4062": ice-slocation
-"4063": ice-router
-"4064": ice-srouter
-"4065": avanti-cdp
-"4066": pmas
-"4067": idp
-"4068": ipfltbcst
-"4069": minger
-"4070": tripe
-"4071": aibkup
-"4072": zieto-sock
-"4073": iRAPP
-"4074": cequint-cityid
-"4075": perimlan
-"4076": seraph
-"4077": ascomalarm
-"4079": santools
-"4080": lorica-in
-"4081": lorica-in-sec
-"4082": lorica-out
-"4083": lorica-out-sec
-"4084": fortisphere-vm
-"4086": ftsync
-"4089": opencore
-"4090": omasgport
-"4091": ewinstaller
-"4092": ewdgs
-"4093": pvxpluscs
-"4094": sysrqd
-"4095": xtgui
-"4096": bre
-"4097": patrolview
-"4098": drmsfsd
-"4099": dpcp
-"4100": igo-incognito
-"4101": brlp-0
-"4102": brlp-1
-"4103": brlp-2
-"4104": brlp-3
-"4105": shofar
-"4106": synchronite
-"4107": j-ac
-"4108": accel
-"4109": izm
-"4110": g2tag
-"4111": xgrid
-"4112": apple-vpns-rp
-"4113": aipn-reg
-"4114": jomamqmonitor
-"4115": cds
-"4116": smartcard-tls
-"4117": hillrserv
-"4118": netscript
-"4119": assuria-slm
-"4121": e-builder
-"4122": fprams
-"4123": z-wave
-"4124": tigv2
-"4125": opsview-envoy
-"4126": ddrepl
-"4127": unikeypro
-"4128": nufw
-"4129": nuauth
-"4130": fronet
-"4131": stars
-"4132": nuts-dem
-"4133": nuts-bootp
-"4134": nifty-hmi
-"4135": cl-db-attach
-"4136": cl-db-request
-"4137": cl-db-remote
-"4138": nettest
-"4139": thrtx
-"4140": cedros-fds
-"4141": oirtgsvc
-"4142": oidocsvc
-"4143": oidsr
-"4145": vvr-control
-"4146": tgcconnect
-"4147": vrxpservman
-"4148": hhb-handheld
-"4149": agslb
-"4150": PowerAlert-nsa
-"4151": menandmice-noh
-"4152": idig-mux
-"4153": mbl-battd
-"4154": atlinks
-"4155": bzr
-"4156": stat-results
-"4157": stat-scanner
-"4158": stat-cc
-"4159": nss
-"4160": jini-discovery
-"4161": omscontact
-"4162": omstopology
-"4163": silverpeakpeer
-"4164": silverpeakcomm
-"4165": altcp
-"4166": joost
-"4167": ddgn
-"4168": pslicser
-"4169": iadt-disc
-"4172": pcoip
-"4173": mma-discovery
-"4174": sm-disc
-"4177": wello
-"4178": storman
-"4179": MaxumSP
-"4180": httpx
-"4181": macbak
-"4182": pcptcpservice
-"4183": cyborgnet
-"4184": universe-suite
-"4185": wcpp
-"4188": vatata
-"4191": dsmipv6
-"4192": azeti-bd
-"4199": eims-admin
-"4300": corelccam
-"4301": d-data
-"4302": d-data-control
-"4303": srcp
-"4304": owserver
-"4305": batman
-"4306": pinghgl
-"4307": visicron-vs
-"4308": compx-lockview
-"4309": dserver
-"4310": mirrtex
-"4320": fdt-rcatp
-"4321": rwhois
-"4322": trim-event
-"4323": trim-ice
-"4325": geognosisman
-"4326": geognosis
-"4327": jaxer-web
-"4328": jaxer-manager
-"4333": ahsp
-"4340": gaia
-"4341": lisp-data
-"4342": lisp-control
-"4343": unicall
-"4344": vinainstall
-"4345": m4-network-as
-"4346": elanlm
-"4347": lansurveyor
-"4348": itose
-"4349": fsportmap
-"4350": net-device
-"4351": plcy-net-svcs
-"4352": pjlink
-"4353": f5-iquery
-"4354": qsnet-trans
-"4355": qsnet-workst
-"4356": qsnet-assist
-"4357": qsnet-cond
-"4358": qsnet-nucl
-"4359": omabcastltkm
-"4361": nacnl
-"4362": afore-vdp-disc
-"4366": shadowstream
-"4368": wxbrief
-"4369": epmd
-"4370": elpro-tunnel
-"4371": l2c-disc
-"4372": l2c-data
-"4373": remctl
-"4375": tolteces
-"4376": bip
-"4377": cp-spxsvr
-"4378": cp-spxdpy
-"4379": ctdb
-"4389": xandros-cms
-"4390": wiegand
-"4394": apwi-disc
-"4395": omnivisionesx
-"4400": ds-srv
-"4401": ds-srvr
-"4402": ds-clnt
-"4403": ds-user
-"4404": ds-admin
-"4405": ds-mail
-"4406": ds-slp
-"4412": smallchat
-"4413": avi-nms-disc
-"4416": pjj-player-disc
-"4418": axysbridge
-"4420": nvm-express
-"4425": netrockey6
-"4426": beacon-port-2
-"4430": rsqlserver
-"4432": l-acoustics
-"4441": netblox
-"4442": saris
-"4443": pharos
-"4444": krb524
-"4445": upnotifyp
-"4446": n1-fwp
-"4447": n1-rmgmt
-"4448": asc-slmd
-"4449": privatewire
-"4450": camp
-"4451": ctisystemmsg
-"4452": ctiprogramload
-"4453": nssalertmgr
-"4454": nssagentmgr
-"4455": prchat-user
-"4456": prchat-server
-"4457": prRegister
-"4458": mcp
-"4484": hpssmgmt
-"4486": icms
-"4488": awacs-ice
-"4500": ipsec-nat-t
-"4534": armagetronad
-"4535": ehs
-"4536": ehs-ssl
-"4537": wssauthsvc
-"4538": swx-gate
-"4545": worldscores
-"4546": sf-lm
-"4547": lanner-lm
-"4548": synchromesh
-"4549": aegate
-"4550": gds-adppiw-db
-"4551": ieee-mih
-"4552": menandmice-mon
-"4554": msfrs
-"4555": rsip
-"4556": dtn-bundle
-"4557": mtcevrunqss
-"4558": mtcevrunqman
-"4559": hylafax
-"4566": kwtc
-"4567": tram
-"4568": bmc-reporting
-"4569": iax
-"4591": l3t-at-an
-"4592": hrpd-ith-at-an
-"4593": ipt-anri-anri
-"4594": ias-session
-"4595": ias-paging
-"4596": ias-neighbor
-"4597": a21-an-1xbs
-"4598": a16-an-an
-"4599": a17-an-an
-"4600": piranha1
-"4601": piranha2
-"4621": ventoso
-"4658": playsta2-app
-"4659": playsta2-lob
-"4660": smaclmgr
-"4661": kar2ouche
-"4662": oms
-"4663": noteit
-"4664": ems
-"4665": contclientms
-"4666": eportcomm
-"4667": mmacomm
-"4668": mmaeds
-"4669": eportcommdata
-"4670": light
-"4671": acter
-"4672": rfa
-"4673": cxws
-"4674": appiq-mgmt
-"4675": dhct-status
-"4676": dhct-alerts
-"4677": bcs
-"4678": traversal
-"4679": mgesupervision
-"4680": mgemanagement
-"4681": parliant
-"4682": finisar
-"4683": spike
-"4684": rfid-rp1
-"4685": autopac
-"4686": msp-os
-"4687": nst
-"4688": mobile-p2p
-"4689": altovacentral
-"4690": prelude
-"4691": mtn
-"4692": conspiracy
-"4700": netxms-agent
-"4701": netxms-mgmt
-"4702": netxms-sync
-"4725": truckstar
-"4726": a26-fap-fgw
-"4727": fcis-disc
-"4728": capmux
-"4729": gsmtap
-"4730": gearman
-"4732": ohmtrigger
-"4737": ipdr-sp
-"4738": solera-lpn
-"4739": ipfix
-"4740": ipfixs
-"4741": lumimgrd
-"4742": sicct-sdp
-"4743": openhpid
-"4744": ifsp
-"4745": fmp
-"4746": intelliadm-disc
-"4747": buschtrommel
-"4749": profilemac
-"4750": ssad
-"4751": spocp
-"4752": snap
-"4753": simon-disc
-"4754": gre-in-udp
-"4755": gre-udp-dtls
-"4784": bfd-multi-ctl
-"4785": cncp
-"4789": vxlan
-"4790": vxlan-gpe
-"4791": roce
-"4800": iims
-"4801": iwec
-"4802": ilss
-"4803": notateit-disc
-"4804": aja-ntv4-disc
-"4827": htcp
-"4837": varadero-0
-"4838": varadero-1
-"4839": varadero-2
-"4840": opcua-udp
-"4841": quosa
-"4842": gw-asv
-"4843": opcua-tls
-"4844": gw-log
-"4845": wcr-remlib
-"4846": contamac-icm
-"4847": wfc
-"4848": appserv-http
-"4849": appserv-https
-"4850": sun-as-nodeagt
-"4851": derby-repli
-"4867": unify-debug
-"4868": phrelay
-"4869": phrelaydbg
-"4870": cc-tracking
-"4871": wired
-"4876": tritium-can
-"4877": lmcs
-"4878": inst-discovery
-"4881": socp-t
-"4882": socp-c
-"4884": hivestor
-"4885": abbs
-"4894": lyskom
-"4899": radmin-port
-"4900": hfcs
-"4914": bones
-"4936": an-signaling
-"4937": atsc-mh-ssc
-"4940": eq-office-4940
-"4941": eq-office-4941
-"4942": eq-office-4942
-"4949": munin
-"4950": sybasesrvmon
-"4951": pwgwims
-"4952": sagxtsds
-"4969": ccss-qmm
-"4970": ccss-qsm
-"4980": ctxs-vpp
-"4986": mrip
-"4987": smar-se-port1
-"4988": smar-se-port2
-"4989": parallel
-"4990": busycal
-"4991": vrt
-"4999": hfcs-manager
-"5000": commplex-main
-"5001": commplex-link
-"5002": rfe
-"5003": fmpro-internal
-"5004": avt-profile-1
-"5005": avt-profile-2
-"5006": wsm-server
-"5007": wsm-server-ssl
-"5008": synapsis-edge
-"5009": winfs
-"5010": telelpathstart
-"5011": telelpathattack
-"5012": nsp
-"5013": fmpro-v6
-"5014": onpsocket
-"5020": zenginkyo-1
-"5021": zenginkyo-2
-"5022": mice
-"5023": htuilsrv
-"5024": scpi-telnet
-"5025": scpi-raw
-"5026": strexec-d
-"5027": strexec-s
-"5029": infobright
-"5030": surfpass
-"5031": dmp
-"5042": asnaacceler8db
-"5043": swxadmin
-"5044": lxi-evntsvc
-"5046": vpm-udp
-"5047": iscape
-"5049": ivocalize
-"5050": mmcc
-"5051": ita-agent
-"5052": ita-manager
-"5053": rlm-disc
-"5055": unot
-"5056": intecom-ps1
-"5057": intecom-ps2
-"5058": locus-disc
-"5059": sds
-"5060": sip
-"5061": sips
-"5062": na-localise
-"5064": ca-1
-"5065": ca-2
-"5066": stanag-5066
-"5067": authentx
-"5069": i-net-2000-npr
-"5070": vtsas
-"5071": powerschool
-"5072": ayiya
-"5073": tag-pm
-"5074": alesquery
-"5078": pixelpusher
-"5079": cp-spxrpts
-"5080": onscreen
-"5081": sdl-ets
-"5082": qcp
-"5083": qfp
-"5084": llrp
-"5085": encrypted-llrp
-"5092": magpie
-"5093": sentinel-lm
-"5094": hart-ip
-"5099": sentlm-srv2srv
-"5100": socalia
-"5101": talarian-udp
-"5102": oms-nonsecure
-"5104": tinymessage
-"5105": hughes-ap
-"5111": taep-as-svc
-"5112": pm-cmdsvr
-"5116": emb-proj-cmd
-"5120": barracuda-bbs
-"5133": nbt-pc
-"5136": minotaur-sa
-"5137": ctsd
-"5145": rmonitor-secure
-"5150": atmp
-"5151": esri-sde
-"5152": sde-discovery
-"5154": bzflag
-"5155": asctrl-agent
-"5164": vpa-disc
-"5165": ife-icorp
-"5166": winpcs
-"5167": scte104
-"5168": scte30
-"5190": aol
-"5191": aol-1
-"5192": aol-2
-"5193": aol-3
-"5200": targus-getdata
-"5201": targus-getdata1
-"5202": targus-getdata2
-"5203": targus-getdata3
-"5223": hpvirtgrp
-"5224": hpvirtctrl
-"5225": hp-server
-"5226": hp-status
-"5227": perfd
-"5234": eenet
-"5235": galaxy-network
-"5236": padl2sim
-"5237": mnet-discovery
-"5245": downtools-disc
-"5246": capwap-control
-"5247": capwap-data
-"5248": caacws
-"5249": caaclang2
-"5250": soagateway
-"5251": caevms
-"5252": movaz-ssc
-"5264": 3com-njack-1
-"5265": 3com-njack-2
-"5270": cartographerxmp
-"5271": cuelink-disc
-"5272": pk
-"5282": transmit-port
-"5298": presence
-"5299": nlg-data
-"5300": hacl-hb
-"5301": hacl-gs
-"5302": hacl-cfg
-"5303": hacl-probe
-"5304": hacl-local
-"5305": hacl-test
-"5306": sun-mc-grp
-"5307": sco-aip
-"5308": cfengine
-"5309": jprinter
-"5310": outlaws
-"5312": permabit-cs
-"5313": rrdp
-"5314": opalis-rbt-ipc
-"5315": hacl-poll
-"5343": kfserver
-"5344": xkotodrcp
-"5349": stuns
-"5350": pcp-multicast
-"5351": pcp
-"5352": dns-llq
-"5353": mdns
-"5354": mdnsresponder
-"5355": llmnr
-"5356": ms-smlbiz
-"5357": wsdapi
-"5358": wsdapi-s
-"5359": ms-alerter
-"5360": ms-sideshow
-"5361": ms-s-sideshow
-"5362": serverwsd2
-"5363": net-projection
-"5364": kdnet
-"5397": stresstester
-"5398": elektron-admin
-"5399": securitychase
-"5400": excerpt
-"5401": excerpts
-"5402": mftp
-"5403": hpoms-ci-lstn
-"5404": hpoms-dps-lstn
-"5405": netsupport
-"5406": systemics-sox
-"5407": foresyte-clear
-"5408": foresyte-sec
-"5409": salient-dtasrv
-"5410": salient-usrmgr
-"5411": actnet
-"5412": continuus
-"5413": wwiotalk
-"5414": statusd
-"5415": ns-server
-"5416": sns-gateway
-"5417": sns-agent
-"5418": mcntp
-"5419": dj-ice
-"5420": cylink-c
-"5421": netsupport2
-"5422": salient-mux
-"5423": virtualuser
-"5424": beyond-remote
-"5425": br-channel
-"5426": devbasic
-"5427": sco-peer-tta
-"5428": telaconsole
-"5429": base
-"5430": radec-corp
-"5431": park-agent
-"5432": postgresql
-"5433": pyrrho
-"5434": sgi-arrayd
-"5435": sceanics
-"5436": pmip6-cntl
-"5437": pmip6-data
-"5443": spss
-"5450": tiepie-disc
-"5453": surebox
-"5454": apc-5454
-"5455": apc-5455
-"5456": apc-5456
-"5461": silkmeter
-"5462": ttl-publisher
-"5463": ttlpriceproxy
-"5464": quailnet
-"5465": netops-broker
-"5474": apsolab-rpc
-"5500": fcp-addr-srvr1
-"5501": fcp-addr-srvr2
-"5502": fcp-srvr-inst1
-"5503": fcp-srvr-inst2
-"5504": fcp-cics-gw1
-"5505": checkoutdb
-"5506": amc
-"5553": sgi-eventmond
-"5554": sgi-esphttp
-"5555": personal-agent
-"5556": freeciv
-"5567": dof-dps-mc-sec
-"5568": sdt
-"5569": rdmnet-device
-"5573": sdmmp
-"5580": tmosms0
-"5581": tmosms1
-"5582": fac-restore
-"5583": tmo-icon-sync
-"5584": bis-web
-"5585": bis-sync
-"5597": ininmessaging
-"5598": mctfeed
-"5599": esinstall
-"5600": esmmanager
-"5601": esmagent
-"5602": a1-msc
-"5603": a1-bs
-"5604": a3-sdunode
-"5605": a4-sdunode
-"5627": ninaf
-"5628": htrust
-"5629": symantec-sfdb
-"5630": precise-comm
-"5631": pcanywheredata
-"5632": pcanywherestat
-"5633": beorl
-"5634": xprtld
-"5670": zre-disc
-"5671": amqps
-"5672": amqp
-"5673": jms
-"5674": hyperscsi-port
-"5675": v5ua
-"5676": raadmin
-"5677": questdb2-lnchr
-"5678": rrac
-"5679": dccm
-"5680": auriga-router
-"5681": ncxcp
-"5682": brightcore
-"5683": coap
-"5684": coaps
-"5687": gog-multiplayer
-"5688": ggz
-"5689": qmvideo
-"5713": proshareaudio
-"5714": prosharevideo
-"5715": prosharedata
-"5716": prosharerequest
-"5717": prosharenotify
-"5718": dpm
-"5719": dpm-agent
-"5720": ms-licensing
-"5721": dtpt
-"5722": msdfsr
-"5723": omhs
-"5724": omsdk
-"5728": io-dist-group
-"5729": openmail
-"5730": unieng
-"5741": ida-discover1
-"5742": ida-discover2
-"5743": watchdoc-pod
-"5744": watchdoc
-"5745": fcopy-server
-"5746": fcopys-server
-"5747": tunatic
-"5748": tunalyzer
-"5750": rscd
-"5755": openmailg
-"5757": x500ms
-"5766": openmailns
-"5767": s-openmail
-"5768": openmailpxy
-"5769": spramsca
-"5770": spramsd
-"5771": netagent
-"5777": dali-port
-"5781": 3par-evts
-"5782": 3par-mgmt
-"5783": 3par-mgmt-ssl
-"5784": ibar
-"5785": 3par-rcopy
-"5786": cisco-redu
-"5787": waascluster
-"5793": xtreamx
-"5794": spdp
-"5813": icmpd
-"5814": spt-automation
-"5859": wherehoo
-"5863": ppsuitemsg
-"5900": rfb
-"5910": cm
-"5911": cpdlc
-"5912": fis
-"5913": ads-c
-"5963": indy
-"5968": mppolicy-v5
-"5969": mppolicy-mgr
-"5984": couchdb
-"5985": wsman
-"5986": wsmans
-"5987": wbem-rmi
-"5988": wbem-http
-"5989": wbem-https
-"5990": wbem-exp-https
-"5991": nuxsl
-"5992": consul-insight
-"5999": cvsup
-"6000": x11
-"6001": x11
-"6002": x11
-"6003": x11
-"6004": x11
-"6005": x11
-"6006": x11
-"6007": x11
-"6008": x11
-"6009": x11
-"6010": x11
-"6011": x11
-"6012": x11
-"6013": x11
-"6014": x11
-"6015": x11
-"6016": x11
-"6017": x11
-"6018": x11
-"6019": x11
-"6020": x11
-"6021": x11
-"6022": x11
-"6023": x11
-"6024": x11
-"6025": x11
-"6026": x11
-"6027": x11
-"6028": x11
-"6029": x11
-"6030": x11
-"6031": x11
-"6032": x11
-"6033": x11
-"6034": x11
-"6035": x11
-"6036": x11
-"6037": x11
-"6038": x11
-"6039": x11
-"6040": x11
-"6041": x11
-"6042": x11
-"6043": x11
-"6044": x11
-"6045": x11
-"6046": x11
-"6047": x11
-"6048": x11
-"6049": x11
-"6050": x11
-"6051": x11
-"6052": x11
-"6053": x11
-"6054": x11
-"6055": x11
-"6056": x11
-"6057": x11
-"6058": x11
-"6059": x11
-"6060": x11
-"6061": x11
-"6062": x11
-"6063": x11
-"6064": ndl-ahp-svc
-"6065": winpharaoh
-"6066": ewctsp
-"6069": trip
-"6070": messageasap
-"6071": ssdtp
-"6072": diagnose-proc
-"6073": directplay8
-"6074": max
-"6080": gue
-"6081": geneve
-"6082": p25cai
-"6083": miami-bcast
-"6085": konspire2b
-"6086": pdtp
-"6087": ldss
-"6088": doglms-notify
-"6100": synchronet-db
-"6101": synchronet-rtc
-"6102": synchronet-upd
-"6103": rets
-"6104": dbdb
-"6105": primaserver
-"6106": mpsserver
-"6107": etc-control
-"6108": sercomm-scadmin
-"6109": globecast-id
-"6110": softcm
-"6111": spc
-"6112": dtspcd
-"6118": tipc
-"6122": bex-webadmin
-"6123": backup-express
-"6124": pnbs
-"6133": nbt-wol
-"6140": pulsonixnls
-"6141": meta-corp
-"6142": aspentec-lm
-"6143": watershed-lm
-"6144": statsci1-lm
-"6145": statsci2-lm
-"6146": lonewolf-lm
-"6147": montage-lm
-"6148": ricardo-lm
-"6149": tal-pod
-"6160": ecmp-data
-"6161": patrol-ism
-"6162": patrol-coll
-"6163": pscribe
-"6200": lm-x
-"6201": thermo-calc
-"6209": qmtps
-"6222": radmind
-"6241": jeol-nsddp-1
-"6242": jeol-nsddp-2
-"6243": jeol-nsddp-3
-"6244": jeol-nsddp-4
-"6251": tl1-raw-ssl
-"6252": tl1-ssh
-"6253": crip
-"6268": grid
-"6269": grid-alt
-"6300": bmc-grx
-"6301": bmc-ctd-ldap
-"6306": ufmp
-"6315": scup-disc
-"6316": abb-escp
-"6317": nav-data
-"6320": repsvc
-"6321": emp-server1
-"6322": emp-server2
-"6324": hrd-ns-disc
-"6343": sflow
-"6346": gnutella-svc
-"6347": gnutella-rtr
-"6350": adap
-"6355": pmcs
-"6360": metaedit-mu
-"6363": ndn
-"6370": metaedit-se
-"6382": metatude-mds
-"6389": clariion-evr01
-"6390": metaedit-ws
-"6417": faxcomservice
-"6419": svdrp-disc
-"6420": nim-vdrshell
-"6421": nim-wan
-"6443": sun-sr-https
-"6444": sge-qmaster
-"6445": sge-execd
-"6446": mysql-proxy
-"6455": skip-cert-recv
-"6456": skip-cert-send
-"6471": lvision-lm
-"6480": sun-sr-http
-"6481": servicetags
-"6482": ldoms-mgmt
-"6483": SunVTS-RMI
-"6484": sun-sr-jms
-"6485": sun-sr-iiop
-"6486": sun-sr-iiops
-"6487": sun-sr-iiop-aut
-"6488": sun-sr-jmx
-"6489": sun-sr-admin
-"6500": boks
-"6501": boks-servc
-"6502": boks-servm
-"6503": boks-clntd
-"6505": badm-priv
-"6506": badm-pub
-"6507": bdir-priv
-"6508": bdir-pub
-"6509": mgcs-mfp-port
-"6510": mcer-port
-"6511": dccp-udp
-"6514": syslog-tls
-"6515": elipse-rec
-"6543": lds-distrib
-"6544": lds-dump
-"6547": apc-6547
-"6548": apc-6548
-"6549": apc-6549
-"6550": fg-sysupdate
-"6551": sum
-"6558": xdsxdm
-"6566": sane-port
-"6568": rp-reputation
-"6579": affiliate
-"6580": parsec-master
-"6581": parsec-peer
-"6582": parsec-game
-"6583": joaJewelSuite
-"6619": odette-ftps
-"6620": kftp-data
-"6621": kftp
-"6622": mcftp
-"6623": ktelnet
-"6626": wago-service
-"6627": nexgen
-"6628": afesc-mc
-"6629": nexgen-aux
-"6633": cisco-vpath-tun
-"6634": mpls-pm
-"6635": mpls-udp
-"6636": mpls-udp-dtls
-"6653": openflow
-"6657": palcom-disc
-"6670": vocaltec-gold
-"6671": p4p-portal
-"6672": vision-server
-"6673": vision-elmd
-"6678": vfbp-disc
-"6679": osaut
-"6689": tsa
-"6696": babel
-"6701": kti-icad-srvr
-"6702": e-design-net
-"6703": e-design-web
-"6714": ibprotocol
-"6715": fibotrader-com
-"6767": bmc-perf-agent
-"6768": bmc-perf-mgrd
-"6769": adi-gxp-srvprt
-"6770": plysrv-http
-"6771": plysrv-https
-"6784": bfd-lag
-"6785": dgpf-exchg
-"6786": smc-jmx
-"6787": smc-admin
-"6788": smc-http
-"6790": hnmp
-"6791": hnm
-"6801": acnet
-"6831": ambit-lm
-"6841": netmo-default
-"6842": netmo-http
-"6850": iccrushmore
-"6868": acctopus-st
-"6888": muse
-"6935": ethoscan
-"6936": xsmsvc
-"6946": bioserver
-"6951": otlp
-"6961": jmact3
-"6962": jmevt2
-"6963": swismgr1
-"6964": swismgr2
-"6965": swistrap
-"6966": swispol
-"6969": acmsoda
-"6997": MobilitySrv
-"6998": iatp-highpri
-"6999": iatp-normalpri
-"7000": afs3-fileserver
-"7001": afs3-callback
-"7002": afs3-prserver
-"7003": afs3-vlserver
-"7004": afs3-kaserver
-"7005": afs3-volser
-"7006": afs3-errors
-"7007": afs3-bos
-"7008": afs3-update
-"7009": afs3-rmtsys
-"7010": ups-onlinet
-"7011": talon-disc
-"7012": talon-engine
-"7013": microtalon-dis
-"7014": microtalon-com
-"7015": talon-webserver
-"7019": doceri-view
-"7020": dpserve
-"7021": dpserveadmin
-"7022": ctdp
-"7023": ct2nmcs
-"7024": vmsvc
-"7025": vmsvc-2
-"7030": op-probe
-"7040": quest-disc
-"7070": arcp
-"7071": iwg1
-"7080": empowerid
-"7088": zixi-transport
-"7095": jdp-disc
-"7099": lazy-ptop
-"7100": font-service
-"7101": elcn
-"7107": aes-x170
-"7121": virprot-lm
-"7128": scenidm
-"7129": scenccs
-"7161": cabsm-comm
-"7162": caistoragemgr
-"7163": cacsambroker
-"7164": fsr
-"7165": doc-server
-"7166": aruba-server
-"7169": ccag-pib
-"7170": nsrp
-"7171": drm-production
-"7174": clutild
-"7181": janus-disc
-"7200": fodms
-"7201": dlip
-"7227": ramp
-"7235": aspcoordination
-"7244": frc-hicp-disc
-"7262": cnap
-"7272": watchme-7272
-"7273": oma-rlp
-"7274": oma-rlp-s
-"7275": oma-ulp
-"7276": oma-ilp
-"7277": oma-ilp-s
-"7278": oma-dcdocbs
-"7279": ctxlic
-"7280": itactionserver1
-"7281": itactionserver2
-"7282": mzca-alert
-"7365": lcm-server
-"7391": mindfilesys
-"7392": mrssrendezvous
-"7393": nfoldman
-"7394": fse
-"7395": winqedit
-"7397": hexarc
-"7400": rtps-discovery
-"7401": rtps-dd-ut
-"7402": rtps-dd-mt
-"7410": ionixnetmon
-"7411": daqstream
-"7421": mtportmon
-"7426": pmdmgr
-"7427": oveadmgr
-"7428": ovladmgr
-"7429": opi-sock
-"7430": xmpv7
-"7431": pmd
-"7437": faximum
-"7443": oracleas-https
-"7473": rise
-"7491": telops-lmd
-"7500": silhouette
-"7501": ovbus
-"7510": ovhpas
-"7511": pafec-lm
-"7542": saratoga
-"7543": atul
-"7544": nta-ds
-"7545": nta-us
-"7546": cfs
-"7547": cwmp
-"7548": tidp
-"7549": nls-tl
-"7550": cloudsignaling
-"7560": sncp
-"7566": vsi-omega
-"7570": aries-kfinder
-"7574": coherence-disc
-"7588": sun-lm
-"7606": mipi-debug
-"7624": indi
-"7627": soap-http
-"7628": zen-pawn
-"7629": xdas
-"7633": pmdfmgt
-"7648": cuseeme
-"7674": imqtunnels
-"7675": imqtunnel
-"7676": imqbrokerd
-"7677": sun-user-https
-"7680": pando-pub
-"7689": collaber
-"7697": klio
-"7707": sync-em7
-"7708": scinet
-"7720": medimageportal
-"7724": nsdeepfreezectl
-"7725": nitrogen
-"7726": freezexservice
-"7727": trident-data
-"7728": osvr
-"7734": smip
-"7738": aiagent
-"7741": scriptview
-"7743": sstp-1
-"7744": raqmon-pdu
-"7747": prgp
-"7777": cbt
-"7778": interwise
-"7779": vstat
-"7781": accu-lmgr
-"7784": s-bfd
-"7786": minivend
-"7787": popup-reminders
-"7789": office-tools
-"7794": q3ade
-"7797": pnet-conn
-"7798": pnet-enc
-"7799": altbsdp
-"7800": asr
-"7801": ssp-client
-"7802": vns-tp
-"7810": rbt-wanopt
-"7845": apc-7845
-"7846": apc-7846
-"7872": mipv6tls
-"7880": pss
-"7887": ubroker
-"7900": mevent
-"7901": tnos-sp
-"7902": tnos-dp
-"7903": tnos-dps
-"7913": qo-secure
-"7932": t2-drm
-"7933": t2-brm
-"7962": generalsync
-"7967": supercell
-"7979": micromuse-ncps
-"7980": quest-vista
-"7982": sossd-disc
-"7998": usicontentpush
-"7999": irdmi2
-"8000": irdmi
-"8001": vcom-tunnel
-"8002": teradataordbms
-"8003": mcreport
-"8005": mxi
-"8008": http-alt
-"8019": qbdb
-"8020": intu-ec-svcdisc
-"8021": intu-ec-client
-"8022": oa-system
-"8025": ca-audit-da
-"8026": ca-audit-ds
-"8032": pro-ed
-"8033": mindprint
-"8034": vantronix-mgmt
-"8040": ampify
-"8052": senomix01
-"8053": senomix02
-"8054": senomix03
-"8055": senomix04
-"8056": senomix05
-"8057": senomix06
-"8058": senomix07
-"8059": senomix08
-"8060": aero
-"8074": gadugadu
-"8080": http-alt
-"8081": sunproxyadmin
-"8082": us-cli
-"8083": us-srv
-"8086": d-s-n
-"8087": simplifymedia
-"8088": radan-http
-"8097": sac
-"8100": xprint-server
-"8115": mtl8000-matrix
-"8116": cp-cluster
-"8118": privoxy
-"8121": apollo-data
-"8122": apollo-admin
-"8128": paycash-online
-"8129": paycash-wbp
-"8130": indigo-vrmi
-"8131": indigo-vbcp
-"8132": dbabble
-"8148": isdd
-"8149": eor-game
-"8160": patrol
-"8161": patrol-snmp
-"8182": vmware-fdm
-"8184": itach
-"8192": spytechphone
-"8194": blp1
-"8195": blp2
-"8199": vvr-data
-"8200": trivnet1
-"8201": trivnet2
-"8202": aesop
-"8204": lm-perfworks
-"8205": lm-instmgr
-"8206": lm-dta
-"8207": lm-sserver
-"8208": lm-webwatcher
-"8230": rexecj
-"8231": hncp-udp-port
-"8232": hncp-dtls-port
-"8243": synapse-nhttps
-"8276": pando-sec
-"8280": synapse-nhttp
-"8282": libelle-disc
-"8292": blp3
-"8294": blp4
-"8300": tmi
-"8301": amberon
-"8320": tnp-discover
-"8321": tnp
-"8322": garmin-marine
-"8351": server-find
-"8376": cruise-enum
-"8377": cruise-swroute
-"8378": cruise-config
-"8379": cruise-diags
-"8380": cruise-update
-"8383": m2mservices
-"8384": marathontp
-"8400": cvd
-"8401": sabarsd
-"8402": abarsd
-"8403": admind
-"8416": espeech
-"8417": espeech-rtp
-"8442": cybro-a-bus
-"8443": pcsync-https
-"8444": pcsync-http
-"8445": copy-disc
-"8450": npmp
-"8472": otv
-"8473": vp2p
-"8474": noteshare
-"8500": fmtp
-"8501": cmtp-av
-"8503": lsp-self-ping
-"8554": rtsp-alt
-"8555": d-fence
-"8567": dof-tunnel
-"8600": asterix
-"8609": canon-cpp-disc
-"8610": canon-mfnp
-"8611": canon-bjnp1
-"8612": canon-bjnp2
-"8613": canon-bjnp3
-"8614": canon-bjnp4
-"8675": msi-cps-rm-disc
-"8686": sun-as-jmxrmi
-"8732": dtp-net
-"8733": ibus
-"8763": mc-appserver
-"8764": openqueue
-"8765": ultraseek-http
-"8766": amcs
-"8770": dpap
-"8786": msgclnt
-"8787": msgsrvr
-"8793": acd-pm
-"8800": sunwebadmin
-"8804": truecm
-"8873": dxspider
-"8880": cddbp-alt
-"8883": secure-mqtt
-"8888": ddi-udp-1
-"8889": ddi-udp-2
-"8890": ddi-udp-3
-"8891": ddi-udp-4
-"8892": ddi-udp-5
-"8893": ddi-udp-6
-"8894": ddi-udp-7
-"8899": ospf-lite
-"8900": jmb-cds1
-"8901": jmb-cds2
-"8910": manyone-http
-"8911": manyone-xml
-"8912": wcbackup
-"8913": dragonfly
-"8954": cumulus-admin
-"8980": nod-provider
-"8981": nod-client
-"8989": sunwebadmins
-"8990": http-wmap
-"8991": https-wmap
-"8999": bctp
-"9000": cslistener
-"9001": etlservicemgr
-"9002": dynamid
-"9007": ogs-client
-"9009": pichat
-"9020": tambora
-"9021": panagolin-ident
-"9022": paragent
-"9023": swa-1
-"9024": swa-2
-"9025": swa-3
-"9026": swa-4
-"9060": CardWeb-RT
-"9080": glrpc
-"9084": aurora
-"9085": ibm-rsyscon
-"9086": net2display
-"9087": classic
-"9088": sqlexec
-"9089": sqlexec-ssl
-"9090": websm
-"9091": xmltec-xmlmail
-"9092": XmlIpcRegSvc
-"9100": pdl-datastream
-"9101": bacula-dir
-"9102": bacula-fd
-"9103": bacula-sd
-"9104": peerwire
-"9105": xadmin
-"9106": astergate-disc
-"9119": mxit
-"9131": dddp
-"9160": apani1
-"9161": apani2
-"9162": apani3
-"9163": apani4
-"9164": apani5
-"9191": sun-as-jpda
-"9200": wap-wsp
-"9201": wap-wsp-wtp
-"9202": wap-wsp-s
-"9203": wap-wsp-wtp-s
-"9204": wap-vcard
-"9205": wap-vcal
-"9206": wap-vcard-s
-"9207": wap-vcal-s
-"9208": rjcdb-vcards
-"9209": almobile-system
-"9210": oma-mlp
-"9211": oma-mlp-s
-"9212": serverviewdbms
-"9213": serverstart
-"9214": ipdcesgbs
-"9215": insis
-"9216": acme
-"9217": fsc-port
-"9222": teamcoherence
-"9255": mon
-"9277": traingpsdata
-"9278": pegasus
-"9279": pegasus-ctl
-"9280": pgps
-"9281": swtp-port1
-"9282": swtp-port2
-"9283": callwaveiam
-"9284": visd
-"9285": n2h2server
-"9286": n2receive
-"9287": cumulus
-"9292": armtechdaemon
-"9293": storview
-"9294": armcenterhttp
-"9295": armcenterhttps
-"9300": vrace
-"9318": secure-ts
-"9321": guibase
-"9343": mpidcmgr
-"9344": mphlpdmc
-"9346": ctechlicensing
-"9374": fjdmimgr
-"9380": boxp
-"9396": fjinvmgr
-"9397": mpidcagt
-"9400": sec-t4net-srv
-"9401": sec-t4net-clt
-"9402": sec-pc2fax-srv
-"9418": git
-"9443": tungsten-https
-"9444": wso2esb-console
-"9450": sntlkeyssrvr
-"9500": ismserver
-"9522": sma-spw
-"9535": mngsuite
-"9536": laes-bf
-"9555": trispen-sra
-"9592": ldgateway
-"9593": cba8
-"9594": msgsys
-"9595": pds
-"9596": mercury-disc
-"9597": pd-admin
-"9598": vscp
-"9599": robix
-"9600": micromuse-ncpw
-"9612": streamcomm-ds
-"9618": condor
-"9628": odbcpathway
-"9629": uniport
-"9632": mc-comm
-"9667": xmms2
-"9668": tec5-sdctp
-"9694": client-wakeup
-"9695": ccnx
-"9700": board-roar
-"9747": l5nas-parchan
-"9750": board-voip
-"9753": rasadv
-"9762": tungsten-http
-"9800": davsrc
-"9801": sstp-2
-"9802": davsrcs
-"9875": sapv1
-"9878": kca-service
-"9888": cyborg-systems
-"9889": gt-proxy
-"9898": monkeycom
-"9899": sctp-tunneling
-"9900": iua
-"9901": enrp
-"9903": multicast-ping
-"9909": domaintime
-"9911": sype-transport
-"9950": apc-9950
-"9951": apc-9951
-"9952": apc-9952
-"9953": acis
-"9955": alljoyn-mcm
-"9956": alljoyn
-"9966": odnsp
-"9987": dsm-scm-target
-"9990": osm-appsrvr
-"9991": osm-oev
-"9992": palace-1
-"9993": palace-2
-"9994": palace-3
-"9995": palace-4
-"9996": palace-5
-"9997": palace-6
-"9998": distinct32
-"9999": distinct
-"10000": ndmp
-"10001": scp-config
-"10002": documentum
-"10003": documentum-s
-"10007": mvs-capacity
-"10008": octopus
-"10009": swdtp-sv
-"10023": cefd-vmp
-"10050": zabbix-agent
-"10051": zabbix-trapper
-"10080": amanda
-"10081": famdc
-"10100": itap-ddtp
-"10101": ezmeeting-2
-"10102": ezproxy-2
-"10103": ezrelay
-"10104": swdtp
-"10107": bctp-server
-"10110": nmea-0183
-"10111": nmea-onenet
-"10113": netiq-endpoint
-"10114": netiq-qcheck
-"10115": netiq-endpt
-"10116": netiq-voipa
-"10117": iqrm
-"10128": bmc-perf-sd
-"10160": qb-db-server
-"10161": snmpdtls
-"10162": snmpdtls-trap
-"10200": trisoap
-"10201": rscs
-"10252": apollo-relay
-"10253": eapol-relay
-"10260": axis-wimp-port
-"10288": blocks
-"10439": bngsync
-"10500": hip-nat-t
-"10540": MOS-lower
-"10541": MOS-upper
-"10542": MOS-aux
-"10543": MOS-soap
-"10544": MOS-soap-opt
-"10800": gap
-"10805": lpdg
-"10810": nmc-disc
-"10860": helix
-"10880": bveapi
-"10990": rmiaux
-"11000": irisa
-"11001": metasys
-"11095": weave
-"11106": sgi-lk
-"11108": myq-termlink
-"11111": vce
-"11112": dicom
-"11161": suncacao-snmp
-"11162": suncacao-jmxmp
-"11163": suncacao-rmi
-"11164": suncacao-csa
-"11165": suncacao-websvc
-"11171": snss
-"11201": smsqp
-"11208": wifree
-"11211": memcache
-"11319": imip
-"11320": imip-channels
-"11321": arena-server
-"11367": atm-uhas
-"11371": hkp
-"11430": lsdp
-"11600": tempest-port
-"11720": h323callsigalt
-"11723": emc-xsw-dcache
-"11751": intrepid-ssl
-"11796": lanschool-mpt
-"11876": xoraya
-"11877": x2e-disc
-"11967": sysinfo-sp
-"12000": entextxid
-"12001": entextnetwk
-"12002": entexthigh
-"12003": entextmed
-"12004": entextlow
-"12005": dbisamserver1
-"12006": dbisamserver2
-"12007": accuracer
-"12008": accuracer-dbms
-"12009": ghvpn
-"12012": vipera
-"12013": vipera-ssl
-"12109": rets-ssl
-"12121": nupaper-ss
-"12168": cawas
-"12172": hivep
-"12300": linogridengine
-"12321": warehouse-sss
-"12322": warehouse
-"12345": italk
-"12753": tsaf
-"13160": i-zipqd
-"13216": bcslogc
-"13217": rs-pias
-"13218": emc-vcas-udp
-"13223": powwow-client
-"13224": powwow-server
-"13400": doip-disc
-"13720": bprd
-"13721": bpdbm
-"13722": bpjava-msvc
-"13724": vnetd
-"13782": bpcd
-"13783": vopied
-"13785": nbdb
-"13786": nomdb
-"13818": dsmcc-config
-"13819": dsmcc-session
-"13820": dsmcc-passthru
-"13821": dsmcc-download
-"13822": dsmcc-ccp
-"13894": ucontrol
-"13929": dta-systems
-"14000": scotty-ft
-"14001": sua
-"14002": scotty-disc
-"14033": sage-best-com1
-"14034": sage-best-com2
-"14141": vcs-app
-"14142": icpp
-"14145": gcm-app
-"14149": vrts-tdd
-"14154": vad
-"14250": cps
-"14414": ca-web-update
-"14936": hde-lcesrvr-1
-"14937": hde-lcesrvr-2
-"15000": hydap
-"15118": v2g-secc
-"15345": xpilot
-"15363": 3link
-"15555": cisco-snat
-"15660": bex-xr
-"15740": ptp
-"15998": 2ping
-"16003": alfin
-"16161": sun-sea-port
-"16309": etb4j
-"16310": pduncs
-"16311": pdefmns
-"16360": netserialext1
-"16361": netserialext2
-"16367": netserialext3
-"16368": netserialext4
-"16384": connected
-"16666": vtp
-"16900": newbay-snc-mc
-"16950": sgcip
-"16991": intel-rci-mp
-"16992": amt-soap-http
-"16993": amt-soap-https
-"16994": amt-redir-tcp
-"16995": amt-redir-tls
-"17007": isode-dua
-"17185": soundsvirtual
-"17219": chipper
-"17220": avtp
-"17221": avdecc
-"17222": cpsp
-"17224": trdp-pd
-"17225": trdp-md
-"17234": integrius-stp
-"17235": ssh-mgmt
-"17500": db-lsp-disc
-"17729": ea
-"17754": zep
-"17755": zigbee-ip
-"17756": zigbee-ips
-"18000": biimenu
-"18181": opsec-cvp
-"18182": opsec-ufp
-"18183": opsec-sam
-"18184": opsec-lea
-"18185": opsec-omi
-"18186": ohsc
-"18187": opsec-ela
-"18241": checkpoint-rtm
-"18262": gv-pf
-"18463": ac-cluster
-"18634": rds-ib
-"18635": rds-ip
-"18668": vdmmesh-disc
-"18769": ique
-"18881": infotos
-"18888": apc-necmp
-"19000": igrid
-"19007": scintilla
-"19191": opsec-uaa
-"19194": ua-secureagent
-"19220": cora-disc
-"19283": keysrvr
-"19315": keyshadow
-"19398": mtrgtrans
-"19410": hp-sco
-"19411": hp-sca
-"19412": hp-sessmon
-"19539": fxuptp
-"19540": sxuptp
-"19541": jcp
-"19788": mle
-"19999": dnp-sec
-"20000": dnp
-"20001": microsan
-"20002": commtact-http
-"20003": commtact-https
-"20005": openwebnet
-"20012": ss-idi-disc
-"20014": opendeploy
-"20034": nburn-id
-"20046": tmophl7mts
-"20048": mountd
-"20049": nfsrdma
-"20167": tolfab
-"20202": ipdtp-port
-"20222": ipulse-ics
-"20480": emwavemsg
-"20670": track
-"20999": athand-mmp
-"21000": irtrans
-"21554": dfserver
-"21590": vofr-gateway
-"21800": tvpm
-"21845": webphone
-"21846": netspeak-is
-"21847": netspeak-cs
-"21848": netspeak-acd
-"21849": netspeak-cps
-"22000": snapenetio
-"22001": optocontrol
-"22002": optohost002
-"22003": optohost003
-"22004": optohost004
-"22005": optohost004
-"22273": wnn6
-"22305": cis
-"22335": shrewd-stream
-"22343": cis-secure
-"22347": wibukey
-"22350": codemeter
-"22555": vocaltec-phone
-"22763": talikaserver
-"22800": aws-brf
-"22951": brf-gw
-"23000": inovaport1
-"23001": inovaport2
-"23002": inovaport3
-"23003": inovaport4
-"23004": inovaport5
-"23005": inovaport6
-"23272": s102
-"23294": 5afe-disc
-"23333": elxmgmt
-"23400": novar-dbase
-"23401": novar-alarm
-"23402": novar-global
-"24000": med-ltp
-"24001": med-fsp-rx
-"24002": med-fsp-tx
-"24003": med-supp
-"24004": med-ovw
-"24005": med-ci
-"24006": med-net-svc
-"24242": filesphere
-"24249": vista-4gl
-"24321": ild
-"24322": hid
-"24386": intel-rci
-"24465": tonidods
-"24554": binkp
-"24577": bilobit-update
-"24676": canditv
-"24677": flashfiler
-"24678": proactivate
-"24680": tcc-http
-"24850": assoc-disc
-"24922": find
-"25000": icl-twobase1
-"25001": icl-twobase2
-"25002": icl-twobase3
-"25003": icl-twobase4
-"25004": icl-twobase5
-"25005": icl-twobase6
-"25006": icl-twobase7
-"25007": icl-twobase8
-"25008": icl-twobase9
-"25009": icl-twobase10
-"25793": vocaltec-hos
-"25900": tasp-net
-"25901": niobserver
-"25902": nilinkanalyst
-"25903": niprobe
-"25954": bf-game
-"25955": bf-master
-"26000": quake
-"26133": scscp
-"26208": wnn6-ds
-"26260": ezproxy
-"26261": ezmeeting
-"26262": k3software-svr
-"26263": k3software-cli
-"26486": exoline-udp
-"26487": exoconfig
-"26489": exonet
-"27345": imagepump
-"27442": jesmsjc
-"27504": kopek-httphead
-"27782": ars-vista
-"27999": tw-auth-key
-"28000": nxlmd
-"28119": a27-ran-ran
-"28200": voxelstorm
-"28240": siemensgsm
-"29167": otmp
-"30001": pago-services1
-"30002": pago-services2
-"30003": amicon-fpsu-ra
-"30004": amicon-fpsu-s
-"30260": kingdomsonline
-"30832": samsung-disc
-"30999": ovobs
-"31016": ka-kdp
-"31029": yawn
-"31416": xqosd
-"31457": tetrinet
-"31620": lm-mon
-"31765": gamesmith-port
-"31948": iceedcp-tx
-"31949": iceedcp-rx
-"32034": iracinghelper
-"32249": t1distproc60
-"32483": apm-link
-"32635": sec-ntb-clnt
-"32636": DMExpress
-"32767": filenet-powsrm
-"32768": filenet-tms
-"32769": filenet-rpc
-"32770": filenet-nch
-"32771": filenet-rmi
-"32772": filenet-pa
-"32773": filenet-cm
-"32774": filenet-re
-"32775": filenet-pch
-"32776": filenet-peior
-"32777": filenet-obrok
-"32801": mlsn
-"32896": idmgratm
-"33123": aurora-balaena
-"33331": diamondport
-"33334": speedtrace-disc
-"33434": traceroute
-"33656": snip-slave
-"34249": turbonote-2
-"34378": p-net-local
-"34379": p-net-remote
-"34567": edi_service
-"34962": profinet-rt
-"34963": profinet-rtm
-"34964": profinet-cm
-"34980": ethercat
-"35001": rt-viewer
-"35004": rt-classmanager
-"35100": axio-disc
-"35355": altova-lm-disc
-"36001": allpeers
-"36411": wlcp
-"36865": kastenxpipe
-"37475": neckar
-"37654": unisys-eportal
-"38002": crescoctrl-disc
-"38201": galaxy7-data
-"38202": fairview
-"38203": agpolicy
-"39681": turbonote-1
-"40000": safetynetp
-"40023": k-patentssensor
-"40841": cscp
-"40842": csccredir
-"40843": csccfirewall
-"40853": ortec-disc
-"41111": fs-qos
-"41230": z-wave-s
-"41794": crestron-cip
-"41795": crestron-ctp
-"42508": candp
-"42509": candrp
-"42510": caerpc
-"43000": recvr-rc-disc
-"43188": reachout
-"43189": ndm-agent-port
-"43190": ip-provision
-"43210": shaperai-disc
-"43439": eq3-config
-"43440": ew-disc-cmd
-"43441": ciscocsdb
-"44321": pmcd
-"44322": pmcdproxy
-"44544": domiq
-"44553": rbr-debug
-"44600": asihpi
-"44818": EtherNet-IP-2
-"44900": m3da-disc
-"45000": asmp-mon
-"45054": invision-ag
-"45514": cloudcheck-ping
-"45678": eba
-"45825": qdb2service
-"45966": ssr-servermgr
-"46999": mediabox
-"47000": mbus
-"47100": jvl-mactalk
-"47557": dbbrowse
-"47624": directplaysrvr
-"47806": ap
-"47808": bacnet
-"47809": presonus-ucnet
-"48000": nimcontroller
-"48001": nimspooler
-"48002": nimhub
-"48003": nimgtw
-"48128": isnetserv
-"48129": blp5
-"48556": com-bardac-dw
-"48619": iqobject
-"48653": robotraconteur
diff --git a/modules/netflow/configuration/logstash/dictionaries/tcp_flags.yml b/modules/netflow/configuration/logstash/dictionaries/tcp_flags.yml
deleted file mode 100644
index 5538c98df..000000000
--- a/modules/netflow/configuration/logstash/dictionaries/tcp_flags.yml
+++ /dev/null
@@ -1,256 +0,0 @@
-"0": none
-"1": FIN
-"2": SYN
-"3": FIN-SYN
-"4": RST
-"5": FIN-RST
-"6": SYN-RST
-"7": FIN-SYN-RST
-"8": PSH
-"9": FIN-PSH
-"10": SYN-PSH
-"11": FIN-SYN-PSH
-"12": RST-PSH
-"13": FIN-RST-PSH
-"14": SYN-RST-PSH
-"15": FIN-SYN-RST-PSH
-"16": ACK
-"17": FIN-ACK
-"18": SYN-ACK
-"19": FIN-SYN-ACK
-"20": RST-ACK
-"21": FIN-RST-ACK
-"22": SYN-RST-ACK
-"23": FIN-SYN-RST-ACK
-"24": PSH-ACK
-"25": FIN-PSH-ACK
-"26": SYN-PSH-ACK
-"27": FIN-SYN-PSH-ACK
-"28": RST-PSH-ACK
-"29": FIN-RST-PSH-ACK
-"30": SYN-RST-PSH-ACK
-"31": FIN-SYN-RST-PSH-ACK
-"32": URG
-"33": FIN-URG
-"34": SYN-URG
-"35": FIN-SYN-URG
-"36": RST-URG
-"37": FIN-RST-URG
-"38": SYN-RST-URG
-"39": FIN-SYN-RST-URG
-"40": PSH-URG
-"41": FIN-PSH-URG
-"42": SYN-PSH-URG
-"43": FIN-SYN-PSH-URG
-"44": RST-PSH-URG
-"45": FIN-RST-PSH-URG
-"46": SYN-RST-PSH-URG
-"47": FIN-SYN-RST-PSH-URG
-"48": ACK-URG
-"49": FIN-ACK-URG
-"50": SYN-ACK-URG
-"51": FIN-SYN-ACK-URG
-"52": RST-ACK-URG
-"53": FIN-RST-ACK-URG
-"54": SYN-RST-ACK-URG
-"55": FIN-SYN-RST-ACK-URG
-"56": PSH-ACK-URG
-"57": FIN-PSH-ACK-URG
-"58": SYN-PSH-ACK-URG
-"59": FIN-SYN-PSH-ACK-URG
-"60": RST-PSH-ACK-URG
-"61": FIN-RST-PSH-ACK-URG
-"62": SYN-RST-PSH-ACK-URG
-"63": FIN-SYN-RST-PSH-ACK-URG
-"64": ECE
-"65": FIN-ECE
-"66": SYN-ECE
-"67": FIN-SYN-ECE
-"68": RST-ECE
-"69": FIN-RST-ECE
-"70": SYN-RST-ECE
-"71": FIN-SYN-RST-ECE
-"72": PSH-ECE
-"73": FIN-PSH-ECE
-"74": SYN-PSH-ECE
-"75": FIN-SYN-PSH-ECE
-"76": RST-PSH-ECE
-"77": FIN-RST-PSH-ECE
-"78": SYN-RST-PSH-ECE
-"79": FIN-SYN-RST-PSH-ECE
-"80": ACK-ECE
-"81": FIN-ACK-ECE
-"82": SYN-ACK-ECE
-"83": FIN-SYN-ACK-ECE
-"84": RST-ACK-ECE
-"85": FIN-RST-ACK-ECE
-"86": SYN-RST-ACK-ECE
-"87": FIN-SYN-RST-ACK-ECE
-"88": PSH-ACK-ECE
-"89": FIN-PSH-ACK-ECE
-"90": SYN-PSH-ACK-ECE
-"91": FIN-SYN-PSH-ACK-ECE
-"92": RST-PSH-ACK-ECE
-"93": FIN-RST-PSH-ACK-ECE
-"94": SYN-RST-PSH-ACK-ECE
-"95": FIN-SYN-RST-PSH-ACK-ECE
-"96": URG-ECE
-"97": FIN-URG-ECE
-"98": SYN-URG-ECE
-"99": FIN-SYN-URG-ECE
-"100": RST-URG-ECE
-"101": FIN-RST-URG-ECE
-"102": SYN-RST-URG-ECE
-"103": FIN-SYN-RST-URG-ECE
-"104": PSH-URG-ECE
-"105": FIN-PSH-URG-ECE
-"106": SYN-PSH-URG-ECE
-"107": FIN-SYN-PSH-URG-ECE
-"108": RST-PSH-URG-ECE
-"109": FIN-RST-PSH-URG-ECE
-"110": SYN-RST-PSH-URG-ECE
-"111": FIN-SYN-RST-PSH-URG-ECE
-"112": ACK-URG-ECE
-"113": FIN-ACK-URG-ECE
-"114": SYN-ACK-URG-ECE
-"115": FIN-SYN-ACK-URG-ECE
-"116": RST-ACK-URG-ECE
-"117": FIN-RST-ACK-URG-ECE
-"118": SYN-RST-ACK-URG-ECE
-"119": FIN-SYN-RST-ACK-URG-ECE
-"120": PSH-ACK-URG-ECE
-"121": FIN-PSH-ACK-URG-ECE
-"122": SYN-PSH-ACK-URG-ECE
-"123": FIN-SYN-PSH-ACK-URG-ECE
-"124": RST-PSH-ACK-URG-ECE
-"125": FIN-RST-PSH-ACK-URG-ECE
-"126": SYN-RST-PSH-ACK-URG-ECE
-"127": FIN-SYN-RST-PSH-ACK-URG-ECE
-"128": CWR
-"129": FIN-CWR
-"130": SYN-CWR
-"131": FIN-SYN-CWR
-"132": RST-CWR
-"133": FIN-RST-CWR
-"134": SYN-RST-CWR
-"135": FIN-SYN-RST-CWR
-"136": PSH-CWR
-"137": FIN-PSH-CWR
-"138": SYN-PSH-CWR
-"139": FIN-SYN-PSH-CWR
-"140": RST-PSH-CWR
-"141": FIN-RST-PSH-CWR
-"142": SYN-RST-PSH-CWR
-"143": FIN-SYN-RST-PSH-CWR
-"144": ACK-CWR
-"145": FIN-ACK-CWR
-"146": SYN-ACK-CWR
-"147": FIN-SYN-ACK-CWR
-"148": RST-ACK-CWR
-"149": FIN-RST-ACK-CWR
-"150": SYN-RST-ACK-CWR
-"151": FIN-SYN-RST-ACK-CWR
-"152": PSH-ACK-CWR
-"153": FIN-PSH-ACK-CWR
-"154": SYN-PSH-ACK-CWR
-"155": FIN-SYN-PSH-ACK-CWR
-"156": RST-PSH-ACK-CWR
-"157": FIN-RST-PSH-ACK-CWR
-"158": SYN-RST-PSH-ACK-CWR
-"159": FIN-SYN-RST-PSH-ACK-CWR
-"160": URG-CWR
-"161": FIN-URG-CWR
-"162": SYN-URG-CWR
-"163": FIN-SYN-URG-CWR
-"164": RST-URG-CWR
-"165": FIN-RST-URG-CWR
-"166": SYN-RST-URG-CWR
-"167": FIN-SYN-RST-URG-CWR
-"168": PSH-URG-CWR
-"169": FIN-PSH-URG-CWR
-"170": SYN-PSH-URG-CWR
-"171": FIN-SYN-PSH-URG-CWR
-"172": RST-PSH-URG-CWR
-"173": FIN-RST-PSH-URG-CWR
-"174": SYN-RST-PSH-URG-CWR
-"175": FIN-SYN-RST-PSH-URG-CWR
-"176": ACK-URG-CWR
-"177": FIN-ACK-URG-CWR
-"178": SYN-ACK-URG-CWR
-"179": FIN-SYN-ACK-URG-CWR
-"180": RST-ACK-URG-CWR
-"181": FIN-RST-ACK-URG-CWR
-"182": SYN-RST-ACK-URG-CWR
-"183": FIN-SYN-RST-ACK-URG-CWR
-"184": PSH-ACK-URG-CWR
-"185": FIN-PSH-ACK-URG-CWR
-"186": SYN-PSH-ACK-URG-CWR
-"187": FIN-SYN-PSH-ACK-URG-CWR
-"188": RST-PSH-ACK-URG-CWR
-"189": FIN-RST-PSH-ACK-URG-CWR
-"190": SYN-RST-PSH-ACK-URG-CWR
-"191": FIN-SYN-RST-PSH-ACK-URG-CWR
-"192": ECE-CWR
-"193": FIN-ECE-CWR
-"194": SYN-ECE-CWR
-"195": FIN-SYN-ECE-CWR
-"196": RST-ECE-CWR
-"197": FIN-RST-ECE-CWR
-"198": SYN-RST-ECE-CWR
-"199": FIN-SYN-RST-ECE-CWR
-"200": PSH-ECE-CWR
-"201": FIN-PSH-ECE-CWR
-"202": SYN-PSH-ECE-CWR
-"203": FIN-SYN-PSH-ECE-CWR
-"204": RST-PSH-ECE-CWR
-"205": FIN-RST-PSH-ECE-CWR
-"206": SYN-RST-PSH-ECE-CWR
-"207": FIN-SYN-RST-PSH-ECE-CWR
-"208": ACK-ECE-CWR
-"209": FIN-ACK-ECE-CWR
-"210": SYN-ACK-ECE-CWR
-"211": FIN-SYN-ACK-ECE-CWR
-"212": RST-ACK-ECE-CWR
-"213": FIN-RST-ACK-ECE-CWR
-"214": SYN-RST-ACK-ECE-CWR
-"215": FIN-SYN-RST-ACK-ECE-CWR
-"216": PSH-ACK-ECE-CWR
-"217": FIN-PSH-ACK-ECE-CWR
-"218": SYN-PSH-ACK-ECE-CWR
-"219": FIN-SYN-PSH-ACK-ECE-CWR
-"220": RST-PSH-ACK-ECE-CWR
-"221": FIN-RST-PSH-ACK-ECE-CWR
-"222": SYN-RST-PSH-ACK-ECE-CWR
-"223": FIN-SYN-RST-PSH-ACK-ECE-CWR
-"224": URG-ECE-CWR
-"225": FIN-URG-ECE-CWR
-"226": SYN-URG-ECE-CWR
-"227": FIN-SYN-URG-ECE-CWR
-"228": RST-URG-ECE-CWR
-"229": FIN-RST-URG-ECE-CWR
-"230": SYN-RST-URG-ECE-CWR
-"231": FIN-SYN-RST-URG-ECE-CWR
-"232": PSH-URG-ECE-CWR
-"233": FIN-PSH-URG-ECE-CWR
-"234": SYN-PSH-URG-ECE-CWR
-"235": FIN-SYN-PSH-URG-ECE-CWR
-"236": RST-PSH-URG-ECE-CWR
-"237": FIN-RST-PSH-URG-ECE-CWR
-"238": SYN-RST-PSH-URG-ECE-CWR
-"239": FIN-SYN-RST-PSH-URG-ECE-CWR
-"240": ACK-URG-ECE-CWR
-"241": FIN-ACK-URG-ECE-CWR
-"242": SYN-ACK-URG-ECE-CWR
-"243": FIN-SYN-ACK-URG-ECE-CWR
-"244": RST-ACK-URG-ECE-CWR
-"245": FIN-RST-ACK-URG-ECE-CWR
-"246": SYN-RST-ACK-URG-ECE-CWR
-"247": FIN-SYN-RST-ACK-URG-ECE-CWR
-"248": PSH-ACK-URG-ECE-CWR
-"249": FIN-PSH-ACK-URG-ECE-CWR
-"250": SYN-PSH-ACK-URG-ECE-CWR
-"251": FIN-SYN-PSH-ACK-URG-ECE-CWR
-"252": RST-PSH-ACK-URG-ECE-CWR
-"253": FIN-RST-PSH-ACK-URG-ECE-CWR
-"254": SYN-RST-PSH-ACK-URG-ECE-CWR
-"255": FIN-SYN-RST-PSH-ACK-URG-ECE-CWR
diff --git a/modules/netflow/configuration/logstash/netflow.conf.erb b/modules/netflow/configuration/logstash/netflow.conf.erb
deleted file mode 100644
index 0af3c4f52..000000000
--- a/modules/netflow/configuration/logstash/netflow.conf.erb
+++ /dev/null
@@ -1,609 +0,0 @@
-input {
-    udp {
-        type => "netflow"
-        port => <%= setting("var.input.udp.port", 2055) %>
-        codec => netflow {
-            versions => [5,9]
-        }
-        workers => <%= setting("var.input.udp.workers", 2) %>
-        receive_buffer_bytes => <%= setting("var.input.udp.receive_buffer_bytes", 212992) %>
-        queue_size => <%= setting("var.input.udp.queue_size", 2000) %>
-    }
-}
-
-filter {
-    #--------------------
-    # The field names for Netflow v5 and v9 differ. We need to normalize to a
-    # common data model so that we can work with the resulting events in a common manner.
-    #--------------------
-
-    # Process Netflow v5 events.
-    if [netflow][version] == 5 {
-        mutate {
-            id => "netflow-v5-normalize"
-            add_field => {
-                "[netflow][direction]" => "ingress"
-                "[netflow][ip_version]" => "IPv4"
-            }
-            rename => {
-                "[netflow][ipv4_src_addr]" => "[netflow][src_addr]"
-                "[netflow][src_mask]" => "[netflow][src_mask_len]"
-                "[netflow][l4_src_port]" => "[netflow][src_port]"
-                "[netflow][ipv4_dst_addr]" => "[netflow][dst_addr]"
-                "[netflow][dst_mask]" => "[netflow][dst_mask_len]"
-                "[netflow][l4_dst_port]" => "[netflow][dst_port]"
-                "[netflow][in_bytes]" => "[netflow][bytes]"
-                "[netflow][in_pkts]" => "[netflow][packets]"
-                "[netflow][ipv4_next_hop]" => "[netflow][next_hop]"
-                "[netflow][src_tos]" => "[netflow][tos]"
-            }
-            replace => {
-                "[netflow][version]" => "Netflow v5"
-            }
-        }
-    }
-    # Process Netflow v9 events.
-    else if [netflow][version] == 9 {
-        mutate {
-            id => "netflow-v9-normalize-version"
-            replace => { "[netflow][version]" => "Netflow v9" }
-        }
-
-        if [netflow][ip_protocol_version] {
-            mutate {
-                id => "netflow-v9-normalize-ip_version"
-                add_field => { "[netflow][ip_version]" => "IPv%{[netflow][ip_protocol_version]}" }
-            }
-        }
-        
-        # Populate fields with IPv4 or IPv6 specific fields.
-        if [netflow][ipv4_src_addr] or [netflow][ipv4_dst_addr] or [netflow][ip_protocol_version] == 4 {
-            if [netflow][ipv4_src_addr] {
-                mutate {
-                    id => "netflow-v9-normalize-src_addr-from-ipv4_src_addr"
-                    rename => { "[netflow][ipv4_src_addr]" => "[netflow][src_addr]" }
-                }
-            }
-            if [netflow][src_mask] {
-                mutate {
-                    id => "netflow-v9-normalize-src_mask_len-from-src_mask"
-                    rename => { "[netflow][src_mask]" => "[netflow][src_mask_len]" }
-                }
-            }
-            if [netflow][ipv4_dst_addr] {
-                mutate {
-                    id => "netflow-v9-normalize-dst_addr-from-ipv4_dst_addr"
-                    rename => { "[netflow][ipv4_dst_addr]" => "[netflow][dst_addr]" }
-                }
-            }
-            if [netflow][dst_mask] {
-                mutate {
-                    id => "netflow-v9-normalize-dst_mask_len-from-dst_mask"
-                    rename => { "[netflow][dst_mask]" => "[netflow][dst_mask_len]" }
-                }
-            }
-            if [netflow][ipv4_next_hop] {
-                mutate {
-                    id => "netflow-v9-normalize-next_hop-from-ipv4_next_hop"
-                    rename => { "[netflow][ipv4_next_hop]" => "[netflow][next_hop]" }
-                }
-            }
-        } else if [netflow][ipv6_src_addr] or [netflow][ipv6_dst_addr] or [netflow][ip_protocol_version] == 6 {
-            if [netflow][ipv6_src_addr] {
-                mutate {
-                    id => "netflow-v9-normalize-src_addr-from-ipv6_src_addr"
-                    rename => { "[netflow][ipv6_src_addr]" => "[netflow][src_addr]" }
-                }
-            }
-            if [netflow][ipv6_src_mask] {
-                mutate {
-                    id => "netflow-v9-normalize-src_mask_len-from-ipv6_src_mask"
-                    rename => { "[netflow][ipv6_src_mask]" => "[netflow][src_mask_len]" }
-                }
-            }
-            if [netflow][ipv6_dst_addr] {
-                mutate {
-                    id => "netflow-v9-normalize-dst_addr-from-ipv6_dst_addr"
-                    rename => { "[netflow][ipv6_dst_addr]" => "[netflow][dst_addr]" }
-                }
-            }
-            if [netflow][ipv6_dst_mask] {
-                mutate {
-                    id => "netflow-v9-normalize-dst_mask_len-from-ipv6_dst_mask"
-                    rename => { "[netflow][ipv6_dst_mask]" => "[netflow][dst_mask_len]" }
-                }
-            }
-            if [netflow][ipv6_next_hop] {
-                mutate {
-                    id => "netflow-v9-normalize-next_hop-from-ipv6_next_hop"
-                    rename => { "[netflow][ipv6_next_hop]" => "[netflow][next_hop]" }
-                }
-            }
-        } else {
-            # Did not recognize IP version.
-            mutate {
-                id => "netflow-ip-version-not-recognized"
-                add_tag => [ "__netflow_ip_version_not_recognized" ]
-            }
-        }
-        
-        # Populate flow direction (ingress/egress).
-        if [netflow][direction] == 0 {
-            mutate {
-                id => "netflow-v9-normalize-direction-ingress"
-                replace => { "[netflow][direction]" => "ingress" }
-            }
-        } else if [netflow][direction] == 1 {
-            mutate {
-                id => "netflow-v9-normalize-direction-egress"
-                replace => { "[netflow][direction]" => "egress" }
-            }
-        } else {
-            mutate {
-                id => "netflow-v9-normalize-direction-not-recognized"
-                add_tag => [ "__netflow_direction_not_recognized" ]
-            }
-        }
-
-        # Populate source port.
-        if [netflow][l4_src_port] {
-            mutate {
-                id => "netflow-v9-normalize-src_port_from_l4_src_port"
-                rename => { "[netflow][l4_src_port]" => "[netflow][src_port]" }
-            }
-        } else if [netflow][tcp_src_port] {
-            mutate {
-                id => "netflow-v9-normalize-src_port_from_tcp_src_port"
-                rename => { "[netflow][tcp_src_port]" => "[netflow][src_port]" }
-            }
-        } else if [netflow][udp_src_port] {
-            mutate {
-                id => "netflow-v9-normalize-src_port_from_udp_src_port"
-                rename => { "[netflow][udp_src_port]" => "[netflow][src_port]" }
-            }
-        }
-
-        # Populate destination port.
-        if [netflow][l4_dst_port] {
-            mutate {
-                id => "netflow-v9-normalize-dst_port_from_l4_dst_port"
-                rename => { "[netflow][l4_dst_port]" => "[netflow][dst_port]" }
-            }
-        } else if [netflow][tcp_dst_port] {
-            mutate {
-                id => "netflow-v9-normalize-dst_port_from_tcp_dst_port"
-                rename => { "[netflow][tcp_dst_port]" => "[netflow][dst_port]" }
-            }
-        } else if [netflow][udp_src_port] {
-            mutate {
-                id => "netflow-v9-normalize-dst_port_from_udp_src_port"
-                rename => { "[netflow][udp_dst_port]" => "[netflow][dst_port]" }
-            }
-        }
-
-        # Populate bytes transferred in the flow.
-        if [netflow][in_bytes] {
-            mutate {
-                id => "netflow-v9-normalize-bytes-from-in_bytes"
-                rename => { "[netflow][in_bytes]" => "[netflow][bytes]" }
-            }
-        } else if [netflow][out_bytes] {
-            mutate {
-                id => "netflow-v9-normalize-bytes-from-out_bytes"
-                rename => { "[netflow][out_bytes]" => "[netflow][bytes]" }
-            }
-        } else if [netflow][in_permanent_bytes] {
-            mutate {
-                id => "netflow-v9-normalize-bytes-from-in_permanent_bytes"
-                rename => { "[netflow][in_permanent_bytes]" => "[netflow][bytes]" }
-            }
-        }
-        if [netflow][bytes] {
-            mutate {
-                id => "netflow-v9-normalize-convert-bytes"
-                convert => { "[netflow][bytes]" => "integer" }
-            }
-        }
-        
-        # Populate packets transferred in the flow.
-        if [netflow][in_pkts] {
-            mutate {
-                id => "netflow-v9-normalize-packets-from-in_pkts"
-                rename => { "[netflow][in_pkts]" => "[netflow][packets]" }
-            }
-        } else if [netflow][out_pkts] {
-            mutate {
-                id => "netflow-v9-normalize-packets-from-out_pkts"
-                rename => { "[netflow][out_pkts]" => "[netflow][packets]" }
-            }
-        } else if [netflow][in_permanent_pkts] {
-            mutate {
-                id => "netflow-v9-normalize-packets-from-in_permanent_pkts"
-                rename => { "[netflow][in_permanent_pkts]" => "[netflow][packets]" }
-            }
-        }
-        if [netflow][packets] {
-            mutate {
-                id => "netflow-v9-normalize-convert-packets"
-                convert => { "[netflow][packets]" => "integer" }
-            }
-        }
-
-        # Populate source and destination MAC addresses if available.
-        if [netflow][in_src_mac] {
-            mutate {
-                id => "netflow-v9-normalize-src_mac-from-in_src_mac"
-                rename => { "[netflow][in_src_mac]" => "[netflow][src_mac]" }
-            }
-        } else if [netflow][out_src_mac] {
-            mutate {
-                id => "netflow-v9-normalize-src_mac-from-out_src_mac"
-                rename => { "[netflow][out_src_mac]" => "[netflow][src_mac]" }
-            }
-        }
-        if [netflow][in_dst_mac] {
-            mutate {
-                id => "netflow-v9-normalize-dst_mac-from-in_dst_mac"
-                rename => { "[netflow][in_dst_mac]" => "[netflow][dst_mac]" }
-            }
-        } else if [netflow][out_dst_mac] {
-            mutate {
-                id => "netflow-v9-normalize-dst_mac-from-out_dst_mac"
-                rename => { "[netflow][out_dst_mac]" => "[netflow][dst_mac]" }
-            }
-        }
-
-        # Populate VLAN if available.
-        if [netflow][src_vlan] {
-            mutate {
-                id => "netflow-v9-normalize-vlan-from-src_vlan"
-                rename => { "[netflow][src_vlan]" => "[netflow][vlan]" }
-            }
-        } else if [netflow][dst_vlan] {
-            mutate {
-                id => "netflow-v9-normalize-vlan-from-dst_vlan"
-                rename => { "[netflow][dst_vlan]" => "[netflow][vlan]" }
-            }
-        }
-
-        # Populate TOS if available.
-        if [netflow][src_tos] {
-            mutate {
-                id => "netflow-v9-normalize-tos-from-src_tos"
-                rename => { "[netflow][src_tos]" => "[netflow][tos]" }
-            }
-        }
-    }
-
-    #--------------------
-    # We now have a normalized flow record. The rest of the logic works
-    # regardless of the Netflow version.
-    #--------------------
-
-    # Replace protocol ID with well-known name.
-    if [netflow][protocol] {
-        translate {
-            id => "netflow-postproc-translate-protocol_name"
-            dictionary_path => "<%= ::File.join(LogStash::Environment::LOGSTASH_HOME, "/modules/netflow/configuration/logstash/dictionaries/iana_protocol_numbers.yml") %>"
-            field => "[netflow][protocol]"
-            destination => "[netflow][protocol_name]"
-            fallback => "UNKNOWN"
-        }
-        
-        # lookup IANA service name for source and destination ports.
-        if [netflow][protocol] == 6 { # TCP
-            if [netflow][src_port] {
-                translate {
-                    id => "netflow-postproc-translate-src_port_name_tcp"
-                    dictionary_path => "<%= ::File.join(LogStash::Environment::LOGSTASH_HOME, "/modules/netflow/configuration/logstash/dictionaries/iana_service_names_tcp.yml") %>"
-                    field => "[netflow][src_port]"
-                    destination => "[netflow][src_port_name]"
-                    fallback => "__UNKNOWN"
-                }
-            }
-            if [netflow][dst_port] {
-                translate {
-                    id => "netflow-postproc-translate-dst_port_name_tcp"
-                    dictionary_path => "<%= ::File.join(LogStash::Environment::LOGSTASH_HOME, "/modules/netflow/configuration/logstash/dictionaries/iana_service_names_tcp.yml") %>"
-                    field => "[netflow][dst_port]"
-                    destination => "[netflow][dst_port_name]"
-                    fallback => "__UNKNOWN"
-                }
-            }
-        } else if [netflow][protocol] == 17 { # UDP
-            if [netflow][src_port] {
-                translate {
-                    id => "netflow-postproc-translate-src_port_name_udp"
-                    dictionary_path => "<%= ::File.join(LogStash::Environment::LOGSTASH_HOME, "/modules/netflow/configuration/logstash/dictionaries/iana_service_names_udp.yml") %>"
-                    field => "[netflow][src_port]"
-                    destination => "[netflow][src_port_name]"
-                    fallback => "__UNKNOWN"
-                }
-            }
-            if [netflow][dst_port] {
-                translate {
-                    id => "netflow-postproc-translate-dst_port_name_udp"
-                    dictionary_path => "<%= ::File.join(LogStash::Environment::LOGSTASH_HOME, "/modules/netflow/configuration/logstash/dictionaries/iana_service_names_udp.yml") %>"
-                    field => "[netflow][dst_port]"
-                    destination => "[netflow][dst_port_name]"
-                    fallback => "__UNKNOWN"
-                }
-            }
-        } else if [netflow][protocol] == 132 { # SCTP
-            if [netflow][src_port] {
-                translate {
-                    id => "netflow-postproc-translate-src_port_name_sctp"
-                    dictionary_path => "<%= ::File.join(LogStash::Environment::LOGSTASH_HOME, "/modules/netflow/configuration/logstash/dictionaries/iana_service_names_sctp.yml") %>"
-                    field => "[netflow][src_port]"
-                    destination => "[netflow][src_port_name]"
-                    fallback => "__UNKNOWN"
-                }
-            }
-            if [netflow][dst_port] {
-                translate {
-                    id => "netflow-postproc-translate-dst_port_name_sctp"
-                    dictionary_path => "<%= ::File.join(LogStash::Environment::LOGSTASH_HOME, "/modules/netflow/configuration/logstash/dictionaries/iana_service_names_sctp.yml") %>"
-                    field => "[netflow][dst_port]"
-                    destination => "[netflow][dst_port_name]"
-                    fallback => "__UNKNOWN"
-                }
-            }
-        } else if [netflow][protocol] == 33 { # DCCP
-            if [netflow][src_port] {
-                translate {
-                    id => "netflow-postproc-translate-src_port_name_dccp"
-                    dictionary_path => "<%= ::File.join(LogStash::Environment::LOGSTASH_HOME, "/modules/netflow/configuration/logstash/dictionaries/iana_service_names_dccp.yml") %>"
-                    field => "[netflow][src_port]"
-                    destination => "[netflow][src_port_name]"
-                    fallback => "__UNKNOWN"
-                }
-            }
-            if [netflow][dst_port] {
-                translate {
-                    id => "netflow-postproc-translate-dst_port_name_dccp"
-                    dictionary_path => "<%= ::File.join(LogStash::Environment::LOGSTASH_HOME, "/modules/netflow/configuration/logstash/dictionaries/iana_service_names_dccp.yml") %>"
-                    field => "[netflow][dst_port]"
-                    destination => "[netflow][dst_port_name]"
-                    fallback => "__UNKNOWN"
-                }
-            }
-        }
-
-        if [netflow][src_port_name] {
-            if [netflow][src_port_name] == "__UNKNOWN" {
-                mutate {
-                    id => "netflow-postproc-src_port_name_unknown"
-                    replace => { "[netflow][src_port_name]" => "%{[netflow][protocol_name]}/%{[netflow][src_port]}" }
-                }
-            } else {
-                mutate {
-                    id => "netflow-postproc-src_port_name-prepend-src_port"
-                    replace => { "[netflow][src_port_name]" => "%{[netflow][protocol_name]}/%{[netflow][src_port]} (%{[netflow][src_port_name]})" }
-                }
-            }
-        }
-        if [netflow][dst_port_name] {
-            if [netflow][dst_port_name] == "__UNKNOWN" {
-                mutate {
-                    id => "netflow-postproc-dst_port_name_unknown"
-                    replace => { "[netflow][dst_port_name]" => "%{[netflow][protocol_name]}/%{[netflow][dst_port]}" }
-                }
-            } else {
-                mutate {
-                    id => "netflow-postproc-dest_port_name-prepend-dst_port"
-                    replace => { "[netflow][dst_port_name]" => "%{[netflow][protocol_name]}/%{[netflow][dst_port]} (%{[netflow][dst_port_name]})" }
-                }
-            }
-        }
-    }
-    
-    # Source and Destination IP address processing.
-    if [netflow][dst_addr] or [netflow][src_addr] {
-        # Initialize flow_locality to private. This maybe changed to public based on analysis of the source and destination IP addresses below.
-        mutate {
-            id => "netflow-postproc-flow_locality-default"
-            add_field => { "[netflow][flow_locality]" => "private" }
-        }
-
-        if [netflow][dst_addr] {
-            # Check if destination IP address is private.
-            cidr {
-                id => "netflow-postproc-cidr-dst_addr"
-                address => [ "%{[netflow][dst_addr]}" ]
-                network => [ "0.0.0.0/32", "10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "fc00::/7", "127.0.0.0/8", "::1/128","169.254.0.0/16", "fe80::/10","224.0.0.0/4", "ff00::/8","255.255.255.255/32" ]
-                add_field => { "[netflow][dst_locality]" => "private" }
-            }
-            # Check to see if dst_locality exists. If it doesn't the dst_addr didn't match a private address space and locality must be public.
-            if ![netflow][dst_locality] {
-                mutate {
-                    id => "netflow-postproc-dst_addr-public"
-                    add_field => { "[netflow][dst_locality]" => "public" }
-                    replace => { "[netflow][flow_locality]" => "public" }
-                }
-                geoip {
-                    id => "netflow-postproc-geoip_dst-city"
-                    source => "[netflow][dst_addr]"
-                    default_database_type => "City"
-                    target => "[geoip_dst]"
-                }
-                geoip {
-                    id => "netflow-postproc-geoip_dst-asn"
-                    source => "[netflow][dst_addr]"
-                    default_database_type => "ASN"
-                    target => "[geoip_dst]"
-                }
-                # Populate geoip_dst.autonomous_system.
-                if [geoip_dst][as_org] {
-                    if [geoip_dst][asn] {
-                        mutate {
-                            id => "netflow-postproc-dst-as-from-as_org-asn"
-                            add_field => { "[geoip_dst][autonomous_system]" => "%{[geoip_dst][as_org]} (%{[geoip_dst][asn]})" }
-                        }
-                    } else {
-                        mutate {
-                            id => "netflow-postproc-dst-as-from-as_org"
-                            add_field => { "[geoip_dst][autonomous_system]" => "%{[geoip_dst][as_org]}" }
-                        }
-                    }
-                } else if [geoip_dst][asn] {
-                    mutate {
-                        id => "netflow-postproc-dst-as-from-asn"
-                        add_field => { "[geoip_dst][autonomous_system]" => "%{[geoip_dst][asn]}" }
-                    }
-                }
-            } else {
-                mutate {
-                    id => "netflow-postproc-dst-as-private"
-                    add_field => { "[geoip_dst][autonomous_system]" => "PRIVATE" }
-                }
-            }
-        }
-
-        if [netflow][src_addr] {
-            # Check if source IP address is private.
-            cidr {
-                id => "netflow-postproc-cidr-src_addr"
-                address => [ "%{[netflow][src_addr]}" ]
-                network => [ "0.0.0.0/32", "10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "fc00::/7", "127.0.0.0/8", "::1/128", "169.254.0.0/16", "fe80::/10", "224.0.0.0/4", "ff00::/8", "255.255.255.255/32", "::" ]
-                add_field => { "[netflow][src_locality]" => "private" }
-            }
-            # Check to see if src_locality exists. If it doesn't the src_addr didn't match a private address space and locality must be public.
-            if ![netflow][src_locality] {
-                mutate {
-                    id => "netflow-postproc-src_addr-public"
-                    add_field => { "[netflow][src_locality]" => "public" }
-                    replace => { "[netflow][flow_locality]" => "public" }
-                }
-                geoip {
-                    id => "netflow-postproc-geoip_src-city"
-                    source => "[netflow][src_addr]"
-                    default_database_type => "City"
-                    target => "[geoip_src]"
-                }
-                geoip {
-                    id => "netflow-postproc-geoip_src-asn"
-                    source => "[netflow][src_addr]"
-                    default_database_type => "ASN"
-                    target => "[geoip_src]"
-                }
-                # Populate geoip_src.autonomous_system.
-                if [geoip_src][as_org] {
-                    if [geoip_src][asn] {
-                        mutate {
-                            id => "netflow-postproc-src-as-from-as_org-asn"
-                            add_field => { "[geoip_src][autonomous_system]" => "%{[geoip_src][as_org]} (%{[geoip_src][asn]})" }
-                        }
-                    } else {
-                        mutate {
-                            id => "netflow-postproc-src-as-from-as_org"
-                            add_field => { "[geoip_src][autonomous_system]" => "%{[geoip_src][as_org]}" }
-                        }
-                    }
-                } else if [geoip_src][asn] {
-                    mutate {
-                        id => "netflow-postproc-src-as-from-asn"
-                        add_field => { "[geoip_src][autonomous_system]" => "%{[geoip_src][asn]}" }
-                    }
-                }
-            } else {
-                mutate {
-                    id => "netflow-postproc-src-as-private"
-                    add_field => { "[geoip_src][autonomous_system]" => "PRIVATE" }
-                }
-            }
-        }
-
-        # Lookup geolocation of external traffic. Source IP has priority over destination IP.
-        if [netflow][src_locality] == "public" {
-            geoip {
-                id => "netflow-postproc-geoip-city-src"
-                source => "[netflow][src_addr]"
-                default_database_type => "City"
-            }
-            geoip {
-                id => "netflow-postproc-geoip-asn-src"
-                source => "[netflow][src_addr]"
-                default_database_type => "ASN"
-            }
-        } else if [netflow][dst_locality] == "public" {
-            geoip {
-                id => "netflow-postproc-geoip-city-dst"
-                source => "[netflow][dst_addr]"
-                default_database_type => "City"
-            }
-            geoip {
-                id => "netflow-postproc-geoip-asn-dst"
-                source => "[netflow][dst_addr]"
-                default_database_type => "ASN"
-            }
-        }
-        # Populate geoip.autonomous_system.
-        if [geoip][as_org] {
-            if [geoip][asn] {
-                mutate {
-                    id => "netflow-postproc-as-from-as_org-asn"
-                    add_field => { "[geoip][autonomous_system]" => "%{[geoip][as_org]} (%{[geoip][asn]})" }
-                }
-            } else {
-                mutate {
-                    id => "netflow-postproc-as-from-as_org"
-                    add_field => { "[geoip][autonomous_system]" => "%{[geoip][as_org]}" }
-                }
-            }
-        } else if [geoip][asn] {
-            mutate {
-                id => "netflow-postproc-as-from-asn"
-                add_field => { "[geoip][autonomous_system]" => "%{[geoip][asn]}" }
-            }
-        }
-    }
-
-    # Process TCP flags.
-    if [netflow][tcp_flags] {
-        # Add TCP flags label.
-        translate {
-            id => "netflow-postproc-translate-tcp_flags_label"
-            dictionary_path => "<%= ::File.join(LogStash::Environment::LOGSTASH_HOME, "/modules/netflow/configuration/logstash/dictionaries/tcp_flags.yml") %>"
-            field => "[netflow][tcp_flags]"
-            destination => "[netflow][tcp_flags_label]"
-            fallback => "%{[netflow][tcp_flags]}"
-        }
-
-        # Create array of TCP flag tags.
-        ruby {
-            id => "netflow-postproc-ruby-tcp_flags_tags"
-            code => "
-                flags =[]
-                if event.get('[netflow][tcp_flags]').to_i & 1 > 0
-                    flags.push('FIN')
-                end
-                if event.get('[netflow][tcp_flags]').to_i & 2 > 0
-                    flags.push('SYN')
-                end
-                if event.get('[netflow][tcp_flags]').to_i & 4 > 0
-                    flags.push('RST')
-                end
-                if event.get('[netflow][tcp_flags]').to_i & 8 > 0
-                    flags.push('PSH')
-                end
-                if event.get('[netflow][tcp_flags]').to_i & 16 > 0
-                    flags.push('ACK')
-                end
-                if event.get('[netflow][tcp_flags]').to_i & 32 > 0
-                    flags.push('URG')
-                end
-                if event.get('[netflow][tcp_flags]').to_i & 64 > 0
-                    flags.push('ECE')
-                end
-                if event.get('[netflow][tcp_flags]').to_i & 128 > 0
-                    flags.push('CWR')
-                end
-                event.set('[netflow][tcp_flag_tags]', flags)
-            "
-        }
-    }
-}
-
-output {
-<%= elasticsearch_output_config() %>
-}
diff --git a/modules/netflow/lib/logstash_registry.rb b/modules/netflow/lib/logstash_registry.rb
deleted file mode 100644
index 94cd8da7c..000000000
--- a/modules/netflow/lib/logstash_registry.rb
+++ /dev/null
@@ -1 +0,0 @@
-LogStash::PLUGIN_REGISTRY.add(:modules, "netflow", LogStash::Modules::Scaffold.new("netflow", File.join(File.dirname(__FILE__), "..", "configuration")))
diff --git a/pkg/centos/after-install.sh b/pkg/centos/after-install.sh
index def3b326d..dbfe1c00f 100644
--- a/pkg/centos/after-install.sh
+++ b/pkg/centos/after-install.sh
@@ -1,11 +1,29 @@
-chown -R logstash:logstash /usr/share/logstash
+chown -R root:root /usr/share/logstash
 chown -R logstash /var/log/logstash
 chown logstash:logstash /var/lib/logstash
 sed -i \
   -e 's|# path.logs:|path.logs: /var/log/logstash|' \
   -e 's|# path.data:|path.data: /var/lib/logstash|' \
   /etc/logstash/logstash.yml
-/usr/share/logstash/bin/system-install /etc/logstash/startup.options
 chmod 600 /etc/logstash/startup.options
 chmod 600 /etc/default/logstash
 
+# Starting from systemd 229, TimeouStopSec supports using
+# 'infinity' to disable not send a SIG Kill.
+#
+# Older versions need to use 0 instead.
+systemd_version=$(rpm -q systemd 2> /dev/null | cut -d '-' -f2)
+if  [ -n $systemd_version ] && [ $systemd_version -lt 229 ]; then
+    sed -i \
+      -e "s/^TimeoutStopSec=infinity/TimeoutStopSec=0/" \
+      /lib/systemd/system/logstash.service || true
+else
+    # Ensure's an upgraded system has the right setting, if it
+    # wasn't automatically replaced by the OS.
+    sed -i \
+      -e "s/^TimeoutStopSec=0/TimeoutStopSec=infinity/" \
+      /lib/systemd/system/logstash.service || true
+fi
+
+# Ensure the init script is picked up by systemd
+systemctl daemon-reload 2> /dev/null || true
diff --git a/pkg/centos/before-install.sh b/pkg/centos/before-install.sh
index 78fc0b77d..a86f2e685 100644
--- a/pkg/centos/before-install.sh
+++ b/pkg/centos/before-install.sh
@@ -8,3 +8,11 @@ if ! getent passwd logstash >/dev/null; then
   useradd -r -g logstash -d /usr/share/logstash \
     -s /sbin/nologin -c "logstash" logstash
 fi
+
+# Handle upgrade: Check if old service unit exists and remove it
+# if the new one is not installed in the system. Otherwise, assume
+# the old one is user-created.
+if [ -f /etc/systemd/system/logstash.service ] && \
+   [ ! -f /lib/systemd/system/logstash.service ]; then
+  rm -rf /etc/systemd/system/logstash.service || true
+fi
diff --git a/pkg/debian/after-install.sh b/pkg/debian/after-install.sh
index d42568057..c0a1c37bb 100644
--- a/pkg/debian/after-install.sh
+++ b/pkg/debian/after-install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-chown -R logstash:logstash /usr/share/logstash
+chown -R root:root /usr/share/logstash
 chown -R logstash /var/log/logstash
 chown logstash:logstash /var/lib/logstash
 chmod 755 /etc/logstash
@@ -8,7 +8,22 @@ sed -i \
   -e 's|# path.logs:|path.logs: /var/log/logstash|' \
   -e 's|# path.data:|path.data: /var/lib/logstash|' \
   /etc/logstash/logstash.yml
-/usr/share/logstash/bin/system-install /etc/logstash/startup.options
 chmod 600 /etc/logstash/startup.options
 chmod 600 /etc/default/logstash
 
+# Starting from systemd 229, TimeouStopSec supports using
+# 'infinity' to disable not send a SIG Kill.
+#
+# Older versions need to use 0 instead.
+systemd_version=$(dpkg-query --showformat='${Version}' --show systemd 2> /dev/null)
+if  [ -n $systemd_version ] && dpkg --compare-versions "$systemd_version" lt 229 ; then
+    sed -i \
+      -e "s/^TimeoutStopSec=infinity/TimeoutStopSec=0/" \
+      /lib/systemd/system/logstash.service || true
+else
+    # Ensure's an upgraded system has the right setting, if it
+    # wasn't automatically replaced by the OS.
+    sed -i \
+      -e "s/^TimeoutStopSec=0/TimeoutStopSec=infinity/" \
+      /lib/systemd/system/logstash.service || true
+fi
diff --git a/pkg/debian/before-install.sh b/pkg/debian/before-install.sh
index 03cf86125..0c0cbedaf 100644
--- a/pkg/debian/before-install.sh
+++ b/pkg/debian/before-install.sh
@@ -10,3 +10,11 @@ if ! getent passwd logstash >/dev/null; then
   useradd -M -r -g logstash -d /usr/share/logstash \
     -s /usr/sbin/nologin -c "LogStash Service User" logstash
 fi
+
+# Handle upgrade: Check if old service unit exists and remove it
+# if the new one is not installed in the system. Otherwise, assume
+# the old one is user-created.
+if [ -f /etc/systemd/system/logstash.service ] && \
+   [ ! -f /lib/systemd/system/logstash.service ]; then
+  rm -rf /etc/systemd/system/logstash.service || true
+fi
diff --git a/pkg/service_templates/systemd/lib/systemd/system/logstash.service b/pkg/service_templates/systemd/lib/systemd/system/logstash.service
new file mode 100644
index 000000000..68ff3c4e7
--- /dev/null
+++ b/pkg/service_templates/systemd/lib/systemd/system/logstash.service
@@ -0,0 +1,24 @@
+[Unit]
+Description=logstash
+
+[Service]
+Type=simple
+User=logstash
+Group=logstash
+# Load env vars from /etc/default/ and /etc/sysconfig/ if they exist.
+# Prefixing the path with '-' makes it try to load, but if the file doesn't
+# exist, it continues onward.
+EnvironmentFile=-/etc/default/logstash
+EnvironmentFile=-/etc/sysconfig/logstash
+ExecStart=/usr/share/logstash/bin/logstash "--path.settings" "/etc/logstash"
+Restart=always
+WorkingDirectory=/
+Nice=19
+LimitNOFILE=16384
+
+# When stopping, how long to wait before giving up and sending SIGKILL?
+# Keep in mind that SIGKILL on a process can cause data loss.
+TimeoutStopSec=infinity
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pkg/service_templates/sysv/etc/default/logstash b/pkg/service_templates/sysv/etc/default/logstash
new file mode 100644
index 000000000..325a8a1e5
--- /dev/null
+++ b/pkg/service_templates/sysv/etc/default/logstash
@@ -0,0 +1,10 @@
+LS_HOME="/usr/share/logstash"
+LS_SETTINGS_DIR="/etc/logstash"
+LS_PIDFILE="/var/run/logstash.pid"
+LS_USER="logstash"
+LS_GROUP="logstash"
+LS_GC_LOG_FILE="/var/log/logstash/gc.log"
+LS_OPEN_FILES="16384"
+LS_NICE="19"
+SERVICE_NAME="logstash"
+SERVICE_DESCRIPTION="logstash"
diff --git a/pkg/service_templates/sysv/etc/init.d/logstash b/pkg/service_templates/sysv/etc/init.d/logstash
new file mode 100755
index 000000000..932ccab48
--- /dev/null
+++ b/pkg/service_templates/sysv/etc/init.d/logstash
@@ -0,0 +1,167 @@
+#!/bin/sh
+# Init script for logstash
+# Maintained by 
+# Generated by pleaserun.
+# Implemented based on LSB Core 3.1:
+#   * Sections: 20.2, 20.3
+#
+### BEGIN INIT INFO
+# Provides:          logstash
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: 
+# Description:       logstash
+### END INIT INFO
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+export PATH
+
+name=logstash
+program=/usr/share/logstash/bin/logstash
+args=--path.settings\ /etc/logstash
+pidfile="/var/run/$name.pid"
+user="logstash"
+group="logstash"
+chroot="/"
+chdir="/"
+nice="19"
+limit_open_files="16384"
+
+
+# If this is set to 1, then when `stop` is called, if the process has
+# not exited within a reasonable time, SIGKILL will be sent next.
+# The default behavior is to simply log a message "program stop failed; still running"
+KILL_ON_STOP_TIMEOUT=0
+
+# When loading default and sysconfig files, we use `set -a` to make
+# all variables automatically into environment variables.
+set -a
+[ -r /etc/default/logstash ] && . /etc/default/logstash
+[ -r /etc/sysconfig/logstash ] && . /etc/sysconfig/logstash
+set +a
+
+[ -z "$nice" ] && nice=0
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+pidopts="-p $pidfile"
+
+trace() {
+  logger -t "/etc/init.d/logstash" "$@"
+}
+
+emit() {
+  trace "$@"
+  echo "$@"
+}
+
+rh_status() {
+  status $pidopts $program
+  RETVAL=$?
+  return $RETVAL
+}
+
+start() {
+
+  # Ensure the log directory is setup correctly.
+  if [ ! -d "/var/log" ]; then 
+    mkdir "/var/log"
+    chown "$user":"$group" "/var/log"
+    chmod 755 "/var/log"
+  fi
+
+
+  # Setup any environmental stuff beforehand
+  ulimit -n ${limit_open_files}
+
+  # Run the program!
+  # TODO: Port this to use 'daemon'
+  nice -n "$nice" \
+  chroot --userspec "$user":"$group" "$chroot" sh -c "
+    ulimit -n ${limit_open_files}
+    cd \"$chdir\"
+    exec \"$program\" $args
+  " >> /var/log/logstash-stdout.log 2>> /var/log/logstash-stderr.log &
+
+  # Generate the pidfile from here. If we instead made the forked process
+  # generate it there will be a race condition between the pidfile writing
+  # and a process possibly asking for status.
+  echo $! > $pidfile
+
+  emit "$name started"
+  return 0
+}
+
+stop() {
+  # Try a few times to kill TERM the program
+  if rh_status ; then
+    pid=$(cat "$pidfile")
+    trace "Killing $name (pid $pid) with SIGTERM"
+    killproc $pidopts $program
+    # Wait for it to exit.
+    for i in 1 2 3 4 5 ; do
+      trace "Waiting $name (pid $pid) to die..."
+      rh_status || break
+      sleep 1
+    done
+    if rh_status ; then
+      if [ "$KILL_ON_STOP_TIMEOUT" -eq 1 ] ; then
+        trace "Timeout reached. Killing $name (pid $pid) with SIGKILL.  This may result in data loss."
+        kill -KILL $pid
+        emit "$name killed with SIGKILL."
+      else
+        emit "$name stop failed; still running."
+      fi
+    fi
+  fi
+}
+
+force_stop() {
+  if rh_status ; then
+    stop
+    rh_status && kill -KILL $(cat "$pidfile")
+  fi
+}
+
+
+case "$1" in
+  force-start|start|stop|force-stop|restart)
+    trace "Attempting '$1' on logstash"
+    ;;
+esac
+
+case "$1" in
+  force-start)
+    PRESTART=no
+    exec "$0" start
+    ;;
+  start)
+    rh_status
+    code=$?
+    if [ $code -eq 0 ]; then
+      exit $code
+    else
+      start
+      exit $?
+    fi
+    ;;
+  stop) stop ;;
+  force-stop) force_stop ;;
+  status)
+    rh_status
+    code=$?
+    exit $code
+    ;;
+  restart)
+    
+    stop && start
+    ;;
+  *)
+    echo "Usage: $SCRIPTNAME {start|force-start|stop|force-start|force-stop|status|restart}" >&2
+    exit 3
+  ;;
+esac
+
+exit $?
diff --git a/pkg/ubuntu/after-install.sh b/pkg/ubuntu/after-install.sh
index 8a7bd7751..bf26677d1 100644
--- a/pkg/ubuntu/after-install.sh
+++ b/pkg/ubuntu/after-install.sh
@@ -1,12 +1,28 @@
 #!/bin/sh
 
-chown -R logstash:logstash /usr/share/logstash
+chown -R root:root /usr/share/logstash
 chown -R logstash /var/log/logstash
 chown logstash:logstash /var/lib/logstash
 sed -i \
   -e 's|# path.logs:|path.logs: /var/log/logstash|' \
   -e 's|# path.data:|path.data: /var/lib/logstash|' \
   /etc/logstash/logstash.yml
-/usr/share/logstash/bin/system-install /etc/logstash/startup.options
 chmod 600 /etc/logstash/startup.options
 chmod 600 /etc/default/logstash
+
+# Starting from systemd 229, TimeouStopSec supports using
+# 'infinity' to disable not send a SIG Kill.
+#
+# Older versions need to use 0 instead.
+systemd_version=$(dpkg-query --showformat='${Version}' --show systemd 2> /dev/null)
+if  [ -n $systemd_version ] && dpkg --compare-versions "$systemd_version" lt 229 ; then
+    sed -i \
+      -e "s/^TimeoutStopSec=infinity/TimeoutStopSec=0/" \
+      /lib/systemd/system/logstash.service || true
+else
+    # Ensure's an upgraded system has the right setting, if it
+    # wasn't automatically replaced by the OS.
+    sed -i \
+      -e "s/^TimeoutStopSec=0/TimeoutStopSec=infinity/" \
+      /lib/systemd/system/logstash.service || true
+fi
diff --git a/pkg/ubuntu/before-install.sh b/pkg/ubuntu/before-install.sh
index 03cf86125..0c0cbedaf 100644
--- a/pkg/ubuntu/before-install.sh
+++ b/pkg/ubuntu/before-install.sh
@@ -10,3 +10,11 @@ if ! getent passwd logstash >/dev/null; then
   useradd -M -r -g logstash -d /usr/share/logstash \
     -s /usr/sbin/nologin -c "LogStash Service User" logstash
 fi
+
+# Handle upgrade: Check if old service unit exists and remove it
+# if the new one is not installed in the system. Otherwise, assume
+# the old one is user-created.
+if [ -f /etc/systemd/system/logstash.service ] && \
+   [ ! -f /lib/systemd/system/logstash.service ]; then
+  rm -rf /etc/systemd/system/logstash.service || true
+fi
diff --git a/qa/Gemfile b/qa/Gemfile
index 02247c0ca..05b792e79 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
-gem "runner-tool", :git => "https://github.com/purbon/runner-tool.git"
-gem "rspec", "~> 3.1.0"
+gem "rspec", "~> 3.13"
 gem "rake"
 gem "stud"
 gem "pry", :group => :test
+gem 'docker-api'
diff --git a/qa/README.md b/qa/README.md
index c9ae01300..3063e1362 100644
--- a/qa/README.md
+++ b/qa/README.md
@@ -1,130 +1,44 @@
 ## Acceptance test Framework
 
-Welcome to the acceptance test framework for logstash, in this small
-README we're going to describe it's features and the necessary steps you will need to
-follow to setup your environment.
+The acceptance test framework for Logstash is intended to test the functionality of packages (`.deb`, `.rpm`)
+on various supported platforms.
 
-### Setup your environment
+In this small README we describe its features and the steps necessary for executing it and adding new tests.
+
+### Description
 
 In summary this test framework is composed of:
 
-* A collection of rspec helpers and matchers that make creating tests
-  easy.
-* This rspecs helpers execute commands over SSH to a set of machines.
-* The tests are run, for now, as vagrant (virtualbox provided) machines.
+* A collection of rspec helpers and matchers that make creating tests easy.
+* Rspecs helpers that execute commands.
 
-As of this, you need to have installed:
+The tests are expected to be executed on the target environment e.g. an Ubuntu 22.04 vm.
 
-* The latest version vagrant (=> 1.8.1)
-* Virtualbox as VM provider (=> 5.0)
+### Running tests/Prerequisites
 
-Is important to notice that the first time you set everything up, or when a
-new VM is added, there is the need to download the box (this will
-take a while depending on your internet speed).
+To run the tests from a fresh Logstash checkout, you need to:
 
-### Running Tests
+1. `./gradlew clean boostrap`
+2a. Build the necessary package artifacts e.g. `rake artifact:deb`
+  **OR**
+2b. Supply a directory where pregenerated package artifacts exit via the `LS_ARTIFACTS_PATH` environment variable (relative and absolute paths are supported).
+3. `cd qa`
+4. `bundle install`
 
-It is possible to run the full suite of the acceptance test with the codebase by 
-running the command `ci/acceptance_tests.sh`, this command will generate the artifacts, bootstrap
-the VM and run the tests.
+Now you are ready to kick off the tests:
 
-This test are based on a collection of Vagrant defined VM's where the
-different test are going to be executed, so first setup necessary is to
-have vagrant properly available, see https://www.vagrantup.com/ for
-details on how to install it.
+5. `rake qa:acceptance:all`.
 
-_Inside the `qa` directory_
-
-First of all execute the command `bundle` this will pull the necessary
-dependencies in your environment, after this is done, this is the collection of task available for you:
-
-```
-skywalker% rake -T
-rake qa:acceptance:all              # Run all acceptance
-rake qa:acceptance:debian           # Run acceptance test in debian machines
-rake qa:acceptance:redhat           # Run acceptance test in redhat machines
-rake qa:acceptance:single[machine]  # Run one single machine acceptance test
-rake qa:acceptance:suse             # Run acceptance test in suse machines
-rake qa:vm:halt[platform]           # Halt all VM's involved in the acceptance test round
-rake qa:vm:setup[platform]          # Bootstrap all the VM's used for this tests
-rake qa:vm:ssh_config               # Generate a valid ssh-config
-```
-
-Important to be aware that using any of this commands:
-
-```
-rake qa:acceptance:all              # Run all acceptance
-rake qa:acceptance:debian           # Run acceptance test in debian machines
-rake qa:acceptance:redhat           # Run acceptance test in redhat machines
-rake qa:acceptance:suse             # Run acceptance test in suse machines
-```
-
-before you *will have to bootstrap* all selected machines, you can do
-that using the `rake qa:vm:setup[platform]` task. This is done like this
-as bootstrap imply setting up the VM'S and this might take some time and
-you might only want to this once.
-
-In the future we might add new rake tasks to do all at once, but for now you can use the script under
-`ci/ci_acceptance.sh` to do all at once.
-
-For local testing purposes, is recommended to not run all together, pick your target and run with the single machine command, If you're willing to run on single one, you should use:
-
-```
-rake qa:acceptance:single[machine]  # Run one single machine acceptance test
-```
-
-### How to run tests
-
-If you are *running this test for first time*, you will need to setup
-your VM's first, you can do that using either `vagrant up` or `rake qa:vm:setup[platform]`. 
-
-In this framework we're using ssh to connect to a collection of Vagrant
-machines, so first and most important is to generate a valid ssh config
-file, this could be done running `rake qa:vm:ssh_config`. When this task
-is finished a file named `.vm_ssh_config` will be generated with all the
-necessary information to connect with the different machines.
-
-Now is time to run your test and to do that we have different options:
-
-* rake qa:acceptance:all              # Run all acceptance
-* rake qa:acceptance:debian           # Run acceptance test in debian machines
-* rake qa:acceptance:redhat           # Run acceptance test in redhat machines
-* rake qa:acceptance:suse             # Run acceptance test in suse machines
-* rake qa:acceptance:single[machine]  # Run one single machine acceptance test
-
-Generally speaking this are complex tests so they take a long time to
-finish completely, if you look for faster feedback see at the end of this
-README how to run fewer tests.
+Steps 1, 2b, 3, 4, 5 are executed by the `ci/acceptance_tests.sh` script.
 
 ## Architecture of the Framework
 
-If you wanna know more about how this framework works, here is your
-section of information.
-
 ### Directory structure
 
-* ```acceptance/``` here it goes all the specs definitions.
-* ```config```  inside you can find all config files, for now only the
-  platform definition.
-* ```rspec``` here stay all framework parts necessary to get the test
-  running, you will find the commands, the rspec matchers and a
-collection of useful helpers for your test.
-* ```sys``` a collection of bash scripts used to bootstrap the machines.
-* ```vagrant``` classes and modules used to help us running vagrant.
-
-### The platform configuration file
-
-Located inside the config directory there is the platforms.json which is used to define the different platforms we test with.
-Important bits here are:
-
-* `latest` key defines the latest published version of LS release which is used to test the package upgrade scenario.
-* inside the `platforms` key you will find the list of current available
-  OS we tests with, this include the box name, their type and if they
-have to go under specific bootstrap scripts (see ```specific: true ```
-in the platform definition).
-
-This file is the one that you will use to know about different OS's
-testes, add new ones, etc..
+* ```acceptance/```: all the specs definitions.
+* ```rspec```: all framework parts necessary to get the test
+  running. Includes the commands, the rspec matchers and a
+collection of useful helpers.
 
 ### I want to add a test, what should I do?
 
@@ -143,45 +57,35 @@ including the different moving parts we encounter in the framework.
 
 
 ```
-  config = ServiceTester.configuration
-  config.servers.each do |address|
-    ##
-    # ServiceTester::Artifact is the component used to interact with the
-    # destination machineri and the one that keep the necessary logic
-    # for it.
-    ##
-
-    logstash = ServiceTester::Artifact.new(address, config.lookup[address])
+    logstash = ServiceTester::Artifact.new()
 
     ## your test code goes here.
-  end
+
+    # example:
+    it_behaves_like "installable_with_jdk", logstash
+    it_behaves_like "updated", logstash, from_release_branch="7.17"
 ```
 
-this is important because as you know we test with different machines,
-so the build out artifact will be the component necessary to run the
-actions with the destination machine.
+Inside the `rspec` directory you will find a
+collection of commands, organized per operating system, which
+will let you operate and get your tests done.
 
-but this is the main parts, to run your test you need the framework
-located inside the ```rspec``` directory. Here you will find a
-collection of commands, properly organized per operating system, that
-will let you operate and get your tests done. But don't freak out, we
-got all logic necessary to select the right one for your test.
 
-You'll probably find enough supporting classes for different platforms, but if not, feel free to add it.
+You'll probably find enough supporting classes for different platforms, but if not, feel free to add more.
 
-FYI, this is how a command looks like:
+An example of an install command on debian looks like:
 
 ```
-    def installed?(hosts, package)
+    def installed?(package)
       stdout = ""
-      at(hosts, {in: :serial}) do |host|
-        cmd = sudo_exec!("dpkg -s  #{package}")
-        stdout = cmd.stdout
-      end
+      cmd = sudo_exec!("dpkg -s #{package}")
+      stdout = cmd.stdout
       stdout.match(/^Package: #{package}$/)
       stdout.match(/^Status: install ok installed$/)
+    end
   end
   ```
+
 this is how we run operations and wrap them as ruby code.
 
 ### Running a test (detailed level)
@@ -192,10 +96,10 @@ tests, a collection of them using filtering, etc.
 
 Check https://relishapp.com/rspec/rspec-core/v/3-4/docs/command-line for more details, but here is a quick cheat sheet to run them:
 
-# Run the examples that get "is installed" in their description
+#### Run the examples that get "is installed" in their description
 
 *  bundle exec rspec acceptance/spec -e "is installed" 
 
-# Run the example defined at line 11
+#### Run the example defined at line 11
 
 *  bundle exec rspec acceptance/spec/lib/artifact_operation_spec.rb:11
diff --git a/qa/Rakefile b/qa/Rakefile
index b1e241732..6af05e9a6 100644
--- a/qa/Rakefile
+++ b/qa/Rakefile
@@ -1,83 +1,33 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "rspec"
 require "rspec/core/runner"
 require "rspec/core/rake_task"
 require "stud/try"
-require_relative "vagrant/helpers"
-require_relative "platform_config"
-
-platforms = PlatformConfig.new
 
 task :spec    => 'spec:all'
 task :default => :spec
 
 namespace :qa do
-
-  namespace :vm do
-
-    def user_feedback_string_for(action, platform, machines, options={})
-      experimental_string = options["experimental"] ? "experimental" : "non experimental"
-      message  = "#{action} all #{experimental_string} VM's defined in acceptance/Vagrantfile"
-      "#{message} for #{platform}: #{machines}" if !platform.nil?
-    end
-
-    desc "Generate a valid ssh-config"
-    task :ssh_config do
-      require "json"
-      # Loop until the Vagrant box finishes SSH bootstrap
-      raw_ssh_config = Stud.try(50.times, LogStash::CommandExecutor::CommandError) do
-          LogStash::VagrantHelpers.fetch_config.stdout.split("\n");
-      end
-      parsed_ssh_config = LogStash::VagrantHelpers.parse(raw_ssh_config)
-      File.write(".vm_ssh_config", parsed_ssh_config.to_json)
-    end
-
-    desc "Bootstrap all the VM's used for this tests"
-    task :setup, :platform do |t, args|
-      config   = PlatformConfig.new
-      experimental = (ENV['LS_QA_EXPERIMENTAL_OS'].to_s.downcase || "false") == "true"
-      machines = config.select_names_for(args[:platform], {"experimental" => experimental})
-
-      puts user_feedback_string_for("bootstrapping", args[:platform], machines, {"experimental" => experimental})
-
-      options = {:debug => ENV['LS_QA_DEBUG']}
-      puts "Destroying #{machines}"
-      LogStash::VagrantHelpers.destroy(machines, options)
-      puts "Bootstrapping #{machines}"
-      LogStash::VagrantHelpers.bootstrap(machines, options)
-    end
-
-    desc "Halt all VM's involved in the acceptance test round"
-    task :halt, :platform do |t, args|
-      config   = PlatformConfig.new
-      experimental = (ENV['LS_QA_EXPERIMENTAL_OS'].to_s.downcase || "false") == "true"
-      machines = config.select_names_for(args[:platform], {"experimental" => experimental})
-
-      puts user_feedback_string_for("halting", args[:platform], machines, {"experimental" => experimental})
-      options = {:debug => ENV['LS_QA_DEBUG']}
-
-      puts "Halting #{machines}"
-      LogStash::VagrantHelpers.halt(machines, options)
-    end
-  end
-
   namespace :acceptance do
-    desc "Run all acceptance"
+    desc "Run all acceptance tests"
     task :all do
       exit(RSpec::Core::Runner.run([Rake::FileList["acceptance/spec/lib/**/*_spec.rb"]]))
     end
-
-    platforms.types.each do |type|
-      desc "Run acceptance test in #{type} machines"
-      task type do
-        ENV['LS_TEST_PLATFORM']=type
-        exit(RSpec::Core::Runner.run([Rake::FileList["acceptance/spec/lib/*_spec.rb"]]))
-      end
-    end
-
-    desc "Run one single machine acceptance test"
-    task :single, :machine do |t, args|
-      ENV['LS_VAGRANT_HOST']  = args[:machine]
-      exit(RSpec::Core::Runner.run([Rake::FileList["acceptance/spec/lib/**/**/*_spec.rb"]]))
-    end
   end
 end
diff --git a/qa/Vagrantfile b/qa/Vagrantfile
deleted file mode 100644
index 457b89cf4..000000000
--- a/qa/Vagrantfile
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-require_relative "./platform_config.rb"
-
-Vagrant.configure(2) do |config|
-  platforms = PlatformConfig.new
-
-  platforms.each do |platform|
-    config.vm.define platform.name do |machine|
-      machine.vm.box = platform.box
-      machine.vm.provider "virtualbox" do |v|
-        v.memory = 4096
-        v.cpus = 4
-      end
-      machine.vm.synced_folder "../build", "/logstash-build", create: true
-
-      machine.vm.provision :shell do |sh|
-        sh.path = platform.bootstrap.privileged
-        sh.privileged = true
-      end
-
-      machine.vm.provision :shell do |sh|
-        sh.path = platform.bootstrap.non_privileged
-        sh.privileged = false
-      end
-    end
-  end
-end
diff --git a/qa/acceptance/helpers.rb b/qa/acceptance/helpers.rb
new file mode 100644
index 000000000..ce7179a13
--- /dev/null
+++ b/qa/acceptance/helpers.rb
@@ -0,0 +1,52 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'net/http'
+
+ARTIFACT_VERSIONS_API = "https://storage.googleapis.com/artifacts-api/releases.properties"
+
+def logstash_download_metadata(version, arch, artifact_type)
+  filename = "logstash-#{version}-#{arch}.#{artifact_type}"
+  { url: "https://artifacts.elastic.co/downloads/logstash/#{filename}", dest: File.join(ROOT, 'qa', filename) }
+end
+
+def fetch_latest_logstash_release_version(branch)
+  uri = URI(ARTIFACT_VERSIONS_API)
+  major = branch.split('.').first
+
+  response = retryable_http_get(uri)
+
+  response.match(/current_#{major}=(\S+)/)&.captures&.first
+end
+
+def retryable_http_get(uri, max_retries=5, retry_wait=10)
+  count = 0
+
+  begin
+    response = Net::HTTP.get(uri)
+  rescue StandardError => e
+    count += 1
+    if count < max_retries
+      puts "Retry attempt #{count}/#{max_retries}: #{e.message}"
+      sleep(retry_wait)
+      retry
+    else
+      puts "Exhausted all attempts trying to get from #{uri}."
+      raise e
+    end
+  end
+end
diff --git a/qa/acceptance/spec/config_helper.rb b/qa/acceptance/spec/config_helper.rb
deleted file mode 100644
index 3d9730c2d..000000000
--- a/qa/acceptance/spec/config_helper.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# encoding: utf-8
-require "json"
-
-module SpecsHelper
-
-  def self.configure(vagrant_boxes)
-    setup_config = JSON.parse(File.read(File.join(File.dirname(__FILE__), "..", "..", ".vm_ssh_config")))
-    boxes        = vagrant_boxes.inject({}) do |acc, v|
-      acc[v.name] = v.type
-      acc
-    end
-    ServiceTester.configure do |config|
-      config.servers = []
-      config.lookup  = {}
-      setup_config.each do |host_info|
-        next unless boxes.keys.include?(host_info["host"])
-        url = "#{host_info["hostname"]}:#{host_info["port"]}"
-        config.servers << url
-        config.lookup[url] = {"host" => host_info["host"], "type" => boxes[host_info["host"]] }
-      end
-    end
-  end
-end
diff --git a/qa/acceptance/spec/lib/artifact_composition_spec.rb b/qa/acceptance/spec/lib/artifact_composition_spec.rb
new file mode 100644
index 000000000..f388ac68a
--- /dev/null
+++ b/qa/acceptance/spec/lib/artifact_composition_spec.rb
@@ -0,0 +1,43 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative '../../../rspec/commands'
+
+describe "artifacts composition" do
+  logstash = ServiceTester::Artifact.new()
+
+  before(:each) do
+    logstash.install({:version => LOGSTASH_VERSION})
+    logstash.write_default_pipeline
+  end
+
+  after(:each) do
+    logstash.uninstall
+  end
+
+  context 'prohibited gem dependencies' do
+    it 'does not vendor any version of kramdown' do
+      expect(logstash.gem_vendored?('kramdown')).to be false
+    end
+  end
+
+  context 'necessary gem dependencies (sanity check)' do
+    it 'vendors concurrent-ruby' do
+      expect(logstash.gem_vendored?('concurrent-ruby')).to be true
+    end
+  end
+end
diff --git a/qa/acceptance/spec/lib/artifact_operation_spec.rb b/qa/acceptance/spec/lib/artifact_operation_spec.rb
index f541f3a9f..710d3a592 100644
--- a/qa/acceptance/spec/lib/artifact_operation_spec.rb
+++ b/qa/acceptance/spec/lib/artifact_operation_spec.rb
@@ -1,15 +1,27 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative '../spec_helper'
-require_relative '../shared_examples/installed'
-require_relative '../shared_examples/running'
+require_relative '../shared_examples/installed_with_jdk'
 require_relative '../shared_examples/updated'
 
 # This tests verify that the generated artifacts could be used properly in a release, implements https://github.com/elastic/logstash/issues/5070
 describe "artifacts operation" do
-  config = ServiceTester.configuration
-  config.servers.each do |address|
-    logstash = ServiceTester::Artifact.new(address, config.lookup[address])
-    it_behaves_like "installable", logstash
-    it_behaves_like "updated", logstash
-  end
+  logstash = ServiceTester::Artifact.new()
+  it_behaves_like "installable_with_jdk", logstash
+  it_behaves_like "updated", logstash, from_release_branch="7.17"
 end
diff --git a/qa/acceptance/spec/lib/cli_operation_spec.rb b/qa/acceptance/spec/lib/cli_operation_spec.rb
index 134a5a4d7..645bb857a 100644
--- a/qa/acceptance/spec/lib/cli_operation_spec.rb
+++ b/qa/acceptance/spec/lib/cli_operation_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "../spec_helper"
 require_relative "../shared_examples/cli/logstash/version"
 require_relative "../shared_examples/cli/logstash-plugin/install"
@@ -9,19 +25,18 @@ require_relative "../shared_examples/cli/logstash-plugin/update"
 require_relative "../shared_examples/cli/logstash-plugin/generate"
 require_relative "../shared_examples/cli/logstash-plugin/integration_plugin"
 
-# This is the collection of test for the CLI interface, this include the plugin manager behaviour, 
+# This is the collection of test for the CLI interface, this include the plugin manager behaviour,
 # it also include the checks for other CLI options.
 describe "CLI operation" do
-  config = ServiceTester.configuration
-  config.servers.each do |address|
-    logstash = ServiceTester::Artifact.new(address, config.lookup[address])
-    it_behaves_like "logstash version", logstash
-    it_behaves_like "logstash install", logstash
-    it_behaves_like "logstash list", logstash
-    it_behaves_like "logstash uninstall", logstash
-    it_behaves_like "logstash remove", logstash
-    it_behaves_like "logstash update", logstash
-    it_behaves_like "integration plugins compatible", logstash
+  logstash = ServiceTester::Artifact.new()
+  # Force tests to use bundled JDK
+  logstash.run_command("unset LS_JAVA_HOME")
+  it_behaves_like "logstash version", logstash
+  it_behaves_like "logstash install", logstash
+  it_behaves_like "logstash list", logstash
+  it_behaves_like "logstash uninstall", logstash
+  it_behaves_like "logstash remove", logstash
+  it_behaves_like "logstash update", logstash
+  it_behaves_like "integration plugins compatible", logstash
 #    it_behaves_like "logstash generate", logstash
-  end
 end
diff --git a/qa/acceptance/spec/shared_examples/cli/logstash-plugin/generate.rb b/qa/acceptance/spec/shared_examples/cli/logstash-plugin/generate.rb
index 8c1968dff..d5f1202c5 100644
--- a/qa/acceptance/spec/shared_examples/cli/logstash-plugin/generate.rb
+++ b/qa/acceptance/spec/shared_examples/cli/logstash-plugin/generate.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "../../../spec_helper"
 require "logstash/version"
 require "fileutils"
@@ -6,25 +22,25 @@ require "fileutils"
 shared_examples "logstash generate" do |logstash|
   before(:each) do
     logstash.install({:version => LOGSTASH_VERSION})
+    logstash.write_default_pipeline
   end
 
   after(:each) do
     logstash.uninstall
   end
 
-  describe "on #{logstash.hostname}" do
-
+  describe "on [#{logstash.human_name}]" do
     GENERATE_TYPES = ["input", "filter", "codec", "output"]
     GENERATE_TYPES.each do |type|
       context "with type #{type}" do
         it "successfully generate the plugin skeleton" do
-          command = logstash.run_command_in_path("bin/logstash-plugin generate --type #{type} --name qatest-generated")
+          command = logstash.run_sudo_command_in_path("bin/logstash-plugin generate --type #{type} --name qatest-generated")
           expect(logstash).to File.directory?("logstash-#{type}-qatest-generated")
         end
         it "successfully install the plugin" do
-            command = logstash.run_command_in_path("bin/logstash-plugin install logstash-#{type}-qatest-generated")
-            expect(command).to install_successfully
-            expect(logstash).to have_installed?("logstash-#{type}-qatest-generated")
+          command = logstash.run_sudo_command_in_path("bin/logstash-plugin install logstash-#{type}-qatest-generated")
+          expect(command).to install_successfully
+          expect(logstash).to have_installed?("logstash-#{type}-qatest-generated")
         end
       end
     end
diff --git a/qa/acceptance/spec/shared_examples/cli/logstash-plugin/install.rb b/qa/acceptance/spec/shared_examples/cli/logstash-plugin/install.rb
index 1ef1e8aa9..b13d04289 100644
--- a/qa/acceptance/spec/shared_examples/cli/logstash-plugin/install.rb
+++ b/qa/acceptance/spec/shared_examples/cli/logstash-plugin/install.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "../../../spec_helper"
 require "logstash/version"
 require "fileutils"
@@ -6,62 +22,84 @@ require "fileutils"
 shared_examples "logstash install" do |logstash|
   before(:each) do
     logstash.install({:version => LOGSTASH_VERSION})
+    logstash.write_default_pipeline
   end
 
   after(:each) do
     logstash.uninstall
   end
 
-  describe "on #{logstash.hostname}" do
+  describe "on [#{logstash.human_name}]" do
     context "with a direct internet connection" do
       context "when the plugin exist" do
         context "from a local `.GEM` file" do
           let(:gem_name) { "logstash-filter-qatest-0.1.1.gem" }
-          let(:gem_path_on_vagrant) { "/tmp/#{gem_name}" }
+          let(:gem_tmp_path) { "/tmp/#{gem_name}" }
           before(:each) do
-            logstash.download("https://rubygems.org/gems/#{gem_name}", gem_path_on_vagrant)
+            logstash.download("https://rubygems.org/gems/#{gem_name}", gem_tmp_path)
           end
 
-          after(:each) { logstash.delete_file(gem_path_on_vagrant) }
+          after(:each) { logstash.delete_file(gem_tmp_path) }
 
           it "successfully install the plugin" do
-            command = logstash.run_command_in_path("bin/logstash-plugin install #{gem_path_on_vagrant}")
+            command = logstash.run_sudo_command_in_path("bin/logstash-plugin install #{gem_tmp_path}")
             expect(command).to install_successfully
             expect(logstash).to have_installed?("logstash-filter-dns")
+            expect(logstash).not_to be_running
+            with_running_logstash_service(logstash) do
+              expect(logstash).to be_running
+            end
           end
         end
 
         context "when fetching a gem from rubygems" do
-
           it "successfully install the plugin" do
-            command = logstash.run_command_in_path("bin/logstash-plugin install logstash-filter-qatest")
+            command = logstash.run_sudo_command_in_path("bin/logstash-plugin install logstash-filter-qatest")
             expect(command).to install_successfully
             expect(logstash).to have_installed?("logstash-filter-qatest")
+            expect(logstash).not_to be_running
+            with_running_logstash_service(logstash) do
+              expect(logstash).to be_running
+            end
           end
 
           it "successfully install the plugin when verification is disabled" do
-            command = logstash.run_command_in_path("bin/logstash-plugin install --no-verify logstash-filter-qatest")
+            command = logstash.run_sudo_command_in_path("bin/logstash-plugin install --no-verify logstash-filter-qatest")
             expect(command).to install_successfully
             expect(logstash).to have_installed?("logstash-filter-qatest")
+            expect(logstash).not_to be_running
+            with_running_logstash_service(logstash) do
+              expect(logstash).to be_running
+            end
           end
 
           it "fails when installing a non logstash plugin" do
-            command = logstash.run_command_in_path("bin/logstash-plugin install  bundler")
+            command = logstash.run_sudo_command_in_path("bin/logstash-plugin install  bundler")
             expect(command).not_to install_successfully
+            expect(logstash).not_to be_running
+            with_running_logstash_service(logstash) do
+              expect(logstash).to be_running
+            end
           end
 
           it "allow to install a specific version" do
-            command = logstash.run_command_in_path("bin/logstash-plugin install --no-verify --version 0.1.0 logstash-filter-qatest")
+            command = logstash.run_sudo_command_in_path("bin/logstash-plugin install --no-verify --version 0.1.0 logstash-filter-qatest")
             expect(command).to install_successfully
             expect(logstash).to have_installed?("logstash-filter-qatest", "0.1.0")
+            with_running_logstash_service(logstash) do
+              expect(logstash).to be_running
+            end
           end
         end
       end
 
       context "when the plugin doesnt exist" do
         it "fails to install and report an error" do
-          command = logstash.run_command_in_path("bin/logstash-plugin install --no-verify logstash-output-impossible-plugin")
+          command = logstash.run_sudo_command_in_path("bin/logstash-plugin install --no-verify logstash-output-impossible-plugin")
           expect(command.stderr).to match(/Plugin not found, aborting/)
+          with_running_logstash_service(logstash) do
+            expect(logstash).to be_running
+          end
         end
       end
     end
diff --git a/qa/acceptance/spec/shared_examples/cli/logstash-plugin/integration_plugin.rb b/qa/acceptance/spec/shared_examples/cli/logstash-plugin/integration_plugin.rb
index 7ebfe6c11..02afb1e3e 100644
--- a/qa/acceptance/spec/shared_examples/cli/logstash-plugin/integration_plugin.rb
+++ b/qa/acceptance/spec/shared_examples/cli/logstash-plugin/integration_plugin.rb
@@ -1,13 +1,30 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "../../../spec_helper"
 require "logstash/version"
 require "fileutils"
 
 shared_examples "integration plugins compatible" do |logstash|
-  describe "logstash-plugin install on #{logstash.hostname}" do
+  describe "logstash-plugin install on [#{logstash.human_name}]" do
     let(:plugin) { "logstash-integration-rabbitmq" }
     before :each do
       logstash.install({:version => LOGSTASH_VERSION})
+      logstash.write_default_pipeline
     end
 
     after :each do
@@ -16,33 +33,35 @@ shared_examples "integration plugins compatible" do |logstash|
 
     context "when the integration is installed" do
       before(:each) do
-        logstash.run_command_in_path("bin/logstash-plugin install logstash-integration-rabbitmq")
+        logstash.run_sudo_command_in_path("bin/logstash-plugin install logstash-integration-rabbitmq")
       end
       context "trying to install an inner plugin separately" do
         it "fails to install" do
-          result = logstash.run_command_in_path("bin/logstash-plugin install logstash-input-rabbitmq")
+          result = logstash.run_sudo_command_in_path("bin/logstash-plugin install logstash-input-rabbitmq")
           expect(result.stderr).to match(/is already provided by/)
         end
       end
     end
     context "when the integration is not installed" do
-      context "if an inner plugin is installed" do
+      # Muting test. Tracked in https://github.com/elastic/logstash/issues/10459
+      xcontext "if an inner plugin is installed" do
         before(:each) do
-          logstash.run_command_in_path("bin/logstash-plugin install logstash-input-rabbitmq")
+          logstash.run_sudo_command_in_path("bin/logstash-plugin install logstash-input-rabbitmq")
         end
         it "installing the integrations uninstalls the inner plugin" do
-          logstash.run_command_in_path("bin/logstash-plugin install logstash-integration-rabbitmq")
-          result = logstash.run_command_in_path("bin/logstash-plugin list logstash-input-rabbitmq")
+          logstash.run_sudo_command_in_path("bin/logstash-plugin install logstash-integration-rabbitmq")
+          result = logstash.run_sudo_command_in_path("bin/logstash-plugin list logstash-input-rabbitmq")
           expect(result.stdout).to_not match(/^logstash-input-rabbitmq/)
         end
       end
     end
   end
 
-  describe "logstash-plugin uninstall on #{logstash.hostname}" do
+  describe "logstash-plugin uninstall on [#{logstash.human_name}]" do
     let(:plugin) { "logstash-integration-rabbitmq" }
     before :each do
       logstash.install({:version => LOGSTASH_VERSION})
+      logstash.write_default_pipeline
     end
 
     after :each do
@@ -51,21 +70,22 @@ shared_examples "integration plugins compatible" do |logstash|
 
     context "when the integration is installed" do
       before(:each) do
-        logstash.run_command_in_path("bin/logstash-plugin install logstash-integration-rabbitmq")
+        logstash.run_sudo_command_in_path("bin/logstash-plugin install logstash-integration-rabbitmq")
       end
       context "trying to uninstall an inner plugin" do
         it "fails to uninstall it" do
-          result = logstash.run_command_in_path("bin/logstash-plugin uninstall logstash-input-rabbitmq")
-          expect(result.stderr).to match(/is already provided by/)
+          result = logstash.run_sudo_command_in_path("bin/logstash-plugin uninstall logstash-input-rabbitmq")
+          expect(result.stderr).to include("The plugin `logstash-input-rabbitmq` is provided by 'logstash-integration-rabbitmq' so it can't be removed individually")
         end
       end
     end
   end
 
-  describe "logstash-plugin list on #{logstash.hostname}" do
+  describe "logstash-plugin list on [#{logstash.human_name}]" do
     let(:plugin) { "logstash-integration-rabbitmq" }
     before :each do
       logstash.install({:version => LOGSTASH_VERSION})
+      logstash.write_default_pipeline
     end
 
     after :each do
@@ -74,16 +94,16 @@ shared_examples "integration plugins compatible" do |logstash|
 
     context "when the integration is installed" do
       before(:each) do
-        logstash.run_command_in_path("bin/logstash-plugin install logstash-integration-rabbitmq")
+        logstash.run_sudo_command_in_path("bin/logstash-plugin install logstash-integration-rabbitmq")
       end
       context "listing an integration" do
-        let(:result) { logstash.run_command_in_path("bin/logstash-plugin list logstash-integration-rabbitmq") }
+        let(:result) { logstash.run_sudo_command_in_path("bin/logstash-plugin list logstash-integration-rabbitmq") }
         it "shows its inner plugin" do
           expect(result.stdout).to match(/logstash-input-rabbitmq/m)
         end
       end
       context "listing an inner plugin" do
-        let(:result) { logstash.run_command_in_path("bin/logstash-plugin list logstash-input-rabbitmq") }
+        let(:result) { logstash.run_sudo_command_in_path("bin/logstash-plugin list logstash-input-rabbitmq") }
         it "matches the integration that contains it" do
           expect(result.stdout).to match(/logstash-integration-rabbitmq/m)
         end
diff --git a/qa/acceptance/spec/shared_examples/cli/logstash-plugin/list.rb b/qa/acceptance/spec/shared_examples/cli/logstash-plugin/list.rb
index 5f1e00fd2..3ddeabce7 100644
--- a/qa/acceptance/spec/shared_examples/cli/logstash-plugin/list.rb
+++ b/qa/acceptance/spec/shared_examples/cli/logstash-plugin/list.rb
@@ -1,33 +1,72 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "../../../spec_helper"
 require "logstash/version"
 require "fileutils"
 
 shared_examples "logstash list" do |logstash|
-  describe "logstash-plugin list on #{logstash.hostname}" do
+  describe "logstash-plugin list on [#{logstash.human_name}]" do
     before(:all) do
       logstash.install({:version => LOGSTASH_VERSION})
+      logstash.write_default_pipeline
     end
 
     after(:all) do
       logstash.uninstall
     end
 
+    let(:plugin_name) { /logstash-(?<type>\w+)-(?<name>\w+)/ }
+    let(:plugin_name_with_version) { /(\s*[├└]──\s*)?#{plugin_name}\s(\(\d+\.\d+.\d+(.\w+)?\)|\(alias\))/ }
+
     context "without a specific plugin" do
       it "display a list of plugins" do
-        result = logstash.run_command_in_path("bin/logstash-plugin list")
+        result = logstash.run_sudo_command_in_path("bin/logstash-plugin list")
         expect(result.stdout.split("\n").size).to be > 1
       end
 
       it "display a list of installed plugins" do
-        result = logstash.run_command_in_path("bin/logstash-plugin list --installed")
+        result = logstash.run_sudo_command_in_path("bin/logstash-plugin list --installed")
         expect(result.stdout.split("\n").size).to be > 1
       end
 
       it "list the plugins with their versions" do
-        result = logstash.run_command_in_path("bin/logstash-plugin list --verbose")
-        result.stdout.split("\n").each do |plugin|
-          expect(plugin).to match(/^logstash-\w+-\w+\s\(\d+\.\d+.\d+(.\w+)?\)/)
+        result = logstash.run_sudo_command_in_path("bin/logstash-plugin list --verbose")
+
+        stdout = StringIO.new(result.stdout)
+        stdout.set_encoding(Encoding::UTF_8)
+        while line = stdout.gets
+          next if line.match(/^Using system java:.*$/) || line.match(/^Using bundled JDK:.*$/)
+          match = line.match(/^#{plugin_name_with_version}$/)
+          expect(match).to_not be_nil
+
+          # Integration Plugins list their sub-plugins, e.g.,
+          # ~~~
+          # logstash-integration-kafka (10.0.0)
+          # ├── logstash-input-kafka
+          # └── logstash-output-kafka
+          # ~~~
+          if match[:type] == 'integration'
+            while line = stdout.gets
+              match = line.match(/^(?: [├└]──\s+)#{plugin_name}$/)
+              expect(match).to_not be_nil
+              break if line.start_with?(' └')
+            end
+          end
         end
       end
     end
@@ -35,12 +74,12 @@ shared_examples "logstash list" do |logstash|
     context "with a specific plugin" do
       let(:plugin_name) { "logstash-input-stdin" }
       it "list the plugin and display the plugin name" do
-        result = logstash.run_command_in_path("bin/logstash-plugin list #{plugin_name}")
+        result = logstash.run_sudo_command_in_path("bin/logstash-plugin list #{plugin_name}")
         expect(result).to run_successfully_and_output(/^#{plugin_name}$/)
       end
 
       it "list the plugin with his version" do
-        result = logstash.run_command_in_path("bin/logstash-plugin list --verbose #{plugin_name}")
+        result = logstash.run_sudo_command_in_path("bin/logstash-plugin list --verbose #{plugin_name}")
         expect(result).to run_successfully_and_output(/^#{plugin_name} \(\d+\.\d+.\d+\)/)
       end
     end
diff --git a/qa/acceptance/spec/shared_examples/cli/logstash-plugin/remove.rb b/qa/acceptance/spec/shared_examples/cli/logstash-plugin/remove.rb
index 2423ded08..ac3c6bd1b 100644
--- a/qa/acceptance/spec/shared_examples/cli/logstash-plugin/remove.rb
+++ b/qa/acceptance/spec/shared_examples/cli/logstash-plugin/remove.rb
@@ -1,12 +1,29 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "../../../spec_helper"
 require "logstash/version"
 require "fileutils"
 
 shared_examples "logstash remove" do |logstash|
-  describe "logstash-plugin remove on #{logstash.hostname}" do
+  describe "logstash-plugin remove on [#{logstash.human_name}]" do
     before :each do
       logstash.install({:version => LOGSTASH_VERSION})
+      logstash.write_default_pipeline
     end
 
     after :each do
@@ -15,20 +32,22 @@ shared_examples "logstash remove" do |logstash|
 
     context "when the plugin isn't installed" do
       it "fails to remove it" do
-        result = logstash.run_command_in_path("bin/logstash-plugin remove logstash-filter-qatest")
-        expect(result.stderr).to match(/This plugin has not been previously installed/)
+        result = logstash.run_sudo_command_in_path("bin/logstash-plugin remove logstash-filter-qatest")
+        expect(result.stderr).to include("The plugin `logstash-filter-qatest` has not been previously installed")
       end
     end
 
-    # Disabled because of this bug https://github.com/elastic/logstash/issues/5286
-    xcontext "when the plugin is installed" do
+    context "when the plugin is installed" do
       it "successfully removes it" do
-        result = logstash.run_command_in_path("bin/logstash-plugin install logstash-filter-qatest")
+        result = logstash.run_sudo_command_in_path("bin/logstash-plugin install logstash-filter-qatest")
         expect(logstash).to have_installed?("logstash-filter-qatest")
 
-        result = logstash.run_command_in_path("bin/logstash-plugin remove logstash-filter-qatest")
-        expect(result.stdout).to match(/^Removing logstash-filter-qatest/)
+        result = logstash.run_sudo_command_in_path("bin/logstash-plugin remove logstash-filter-qatest")
         expect(logstash).not_to have_installed?("logstash-filter-qatest")
+        expect(logstash).not_to be_running
+        with_running_logstash_service(logstash) do
+          expect(logstash).to be_running
+        end
       end
     end
   end
diff --git a/qa/acceptance/spec/shared_examples/cli/logstash-plugin/uninstall.rb b/qa/acceptance/spec/shared_examples/cli/logstash-plugin/uninstall.rb
index 54ec8a6a7..d485c03ca 100644
--- a/qa/acceptance/spec/shared_examples/cli/logstash-plugin/uninstall.rb
+++ b/qa/acceptance/spec/shared_examples/cli/logstash-plugin/uninstall.rb
@@ -1,12 +1,29 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "../../../spec_helper"
 require "logstash/version"
 require "fileutils"
 
 shared_examples "logstash uninstall" do |logstash|
-  describe "logstash-plugin uninstall on #{logstash.hostname}" do
+  describe "logstash-plugin uninstall on [#{logstash.human_name}]" do
     before :each do
       logstash.install({:version => LOGSTASH_VERSION})
+      logstash.write_default_pipeline
     end
 
     after :each do
@@ -15,20 +32,22 @@ shared_examples "logstash uninstall" do |logstash|
 
     context "when the plugin isn't installed" do
       it "fails to uninstall it" do
-        result = logstash.run_command_in_path("bin/logstash-plugin uninstall logstash-filter-qatest")
-        expect(result.stderr).to match(/This plugin has not been previously installed/)
+        result = logstash.run_sudo_command_in_path("bin/logstash-plugin uninstall logstash-filter-qatest")
+        expect(result.stderr).to include("The plugin `logstash-filter-qatest` has not been previously installed")
       end
     end
 
-    # Disabled because of this bug https://github.com/elastic/logstash/issues/5286
-    xcontext "when the plugin is installed" do
+    context "when the plugin is installed" do
       it "successfully uninstall it" do
-        result = logstash.run_command_in_path("bin/logstash-plugin install logstash-filter-qatest")
+        result = logstash.run_sudo_command_in_path("bin/logstash-plugin install logstash-filter-qatest")
         expect(logstash).to have_installed?("logstash-filter-qatest")
 
-        result = logstash.run_command_in_path("bin/logstash-plugin uninstall logstash-filter-qatest")
-        expect(result.stdout).to match(/^Uninstalling logstash-filter-qatest/)
+        result = logstash.run_sudo_command_in_path("bin/logstash-plugin uninstall logstash-filter-qatest")
         expect(logstash).not_to have_installed?("logstash-filter-qatest")
+        expect(logstash).not_to be_running
+        with_running_logstash_service(logstash) do
+          expect(logstash).to be_running
+        end
       end
     end
   end
diff --git a/qa/acceptance/spec/shared_examples/cli/logstash-plugin/update.rb b/qa/acceptance/spec/shared_examples/cli/logstash-plugin/update.rb
index 7b9f4880c..0e00d6d47 100644
--- a/qa/acceptance/spec/shared_examples/cli/logstash-plugin/update.rb
+++ b/qa/acceptance/spec/shared_examples/cli/logstash-plugin/update.rb
@@ -1,11 +1,28 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "../../../spec_helper"
 require "logstash/version"
 
 shared_examples "logstash update" do |logstash|
-  describe "logstash-plugin update on #{logstash.hostname}" do
+  describe "logstash-plugin update on [#{logstash.human_name}]" do
     before :each do
       logstash.install({:version => LOGSTASH_VERSION})
+      logstash.write_default_pipeline
     end
 
     after :each do
@@ -16,24 +33,34 @@ shared_examples "logstash update" do |logstash|
     let(:previous_version) { "0.1.0" }
 
     before do
-      logstash.run_command_in_path("bin/logstash-plugin install --no-verify --version #{previous_version} #{plugin_name}")
+      logstash.run_sudo_command_in_path("bin/logstash-plugin install --no-verify --version #{previous_version} #{plugin_name}")
+      logstash.run_sudo_command_in_path("bin/logstash-plugin list")
+      expect(logstash).to have_installed?(plugin_name, previous_version)
       # Logstash won't update when we have a pinned version in the gemfile so we remove them
       logstash.replace_in_gemfile(',[[:space:]]"0.1.0"', "")
-      expect(logstash).to have_installed?(plugin_name, previous_version)
     end
 
     context "update a specific plugin" do
       it "has executed successfully" do
-        cmd = logstash.run_command_in_path("bin/logstash-plugin update --no-verify #{plugin_name}")
+        cmd = logstash.run_sudo_command_in_path("bin/logstash-plugin update --no-verify #{plugin_name}")
         expect(cmd.stdout).to match(/Updating #{plugin_name}/)
+        expect(logstash).to have_installed?(plugin_name, "0.1.1")
         expect(logstash).not_to have_installed?(plugin_name, previous_version)
+        expect(logstash).not_to be_running
+        with_running_logstash_service(logstash) do
+          expect(logstash).to be_running
+        end
       end
     end
 
     context "update all the plugins" do
       it "has executed successfully" do
-        logstash.run_command_in_path("bin/logstash-plugin update --no-verify")
+        logstash.run_sudo_command_in_path("bin/logstash-plugin update --no-verify")
         expect(logstash).to have_installed?(plugin_name, "0.1.1")
+        expect(logstash).not_to be_running
+        with_running_logstash_service(logstash) do
+          expect(logstash).to be_running
+        end
       end
     end
   end
diff --git a/qa/acceptance/spec/shared_examples/cli/logstash/version.rb b/qa/acceptance/spec/shared_examples/cli/logstash/version.rb
index ae6843313..00ca1c6e2 100644
--- a/qa/acceptance/spec/shared_examples/cli/logstash/version.rb
+++ b/qa/acceptance/spec/shared_examples/cli/logstash/version.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "../../../spec_helper"
 require "logstash/version"
 
@@ -6,13 +22,14 @@ shared_examples "logstash version" do |logstash|
   describe "logstash --version" do
     before :all do
       logstash.install({:version => LOGSTASH_VERSION})
+      logstash.write_default_pipeline
     end
 
     after :all do
       logstash.uninstall
     end
 
-    context "on #{logstash.hostname}" do
+    context "on [#{logstash.human_name}]" do
       it "returns the right logstash version" do
         result = logstash.run_command_in_path("bin/logstash --version")
         expect(result).to run_successfully_and_output(/#{LOGSTASH_VERSION}/)
diff --git a/qa/acceptance/spec/shared_examples/installed.rb b/qa/acceptance/spec/shared_examples/installed.rb
index 3d058134f..72dab9426 100644
--- a/qa/acceptance/spec/shared_examples/installed.rb
+++ b/qa/acceptance/spec/shared_examples/installed.rb
@@ -1,25 +1,42 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative '../spec_helper'
 require          'logstash/version'
 
 # This test checks if a package is possible to be installed without errors.
 RSpec.shared_examples "installable" do |logstash|
-
   before(:each) do
     logstash.uninstall
     logstash.install({:version => LOGSTASH_VERSION})
+    logstash.write_default_pipeline
   end
 
-  it "is installed on #{logstash.hostname}" do
+  it "is installed on [#{logstash.human_name}]" do
     expect(logstash).to be_installed
   end
 
-  it "is running on #{logstash.hostname}" do
-    logstash.start_service
-    expect(logstash).to be_running
-    logstash.stop_service
+  it "is running on [#{logstash.human_name}]" do
+    with_running_logstash_service(logstash) do
+      expect(logstash).to be_running
+    end
   end
 
-  it "is removable on #{logstash.hostname}" do
+  it "is removable on [#{logstash.human_name}]" do
     logstash.uninstall
     expect(logstash).to be_removed
   end
diff --git a/qa/acceptance/spec/shared_examples/installed_with_jdk.rb b/qa/acceptance/spec/shared_examples/installed_with_jdk.rb
new file mode 100644
index 000000000..bb93afb57
--- /dev/null
+++ b/qa/acceptance/spec/shared_examples/installed_with_jdk.rb
@@ -0,0 +1,52 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative '../spec_helper'
+require          'logstash/version'
+
+# This test checks if a package can be installed without errors.
+RSpec.shared_examples "installable_with_jdk" do |logstash|
+  before(:all) do
+    #unset to force it using bundled JDK to run LS
+    logstash.run_command("unset LS_JAVA_HOME")
+  end
+
+  before(:each) do
+    logstash.uninstall
+    logstash.install({:bundled_jdk => true, :version => LOGSTASH_VERSION})
+    logstash.write_default_pipeline
+  end
+
+  after(:each) do
+    logstash.uninstall
+  end
+
+  it "is installed on [#{logstash.human_name}]" do
+    expect(logstash).to be_installed
+  end
+
+  it "is running on [#{logstash.human_name}]" do
+    with_running_logstash_service(logstash) do
+      expect(logstash).to be_running
+    end
+  end
+
+  it "is removable on [#{logstash.human_name}]" do
+    logstash.uninstall
+    expect(logstash).to be_removed
+  end
+end
diff --git a/qa/acceptance/spec/shared_examples/running.rb b/qa/acceptance/spec/shared_examples/running.rb
index 55d18507c..9bb8951a2 100644
--- a/qa/acceptance/spec/shared_examples/running.rb
+++ b/qa/acceptance/spec/shared_examples/running.rb
@@ -1,17 +1,33 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative '../spec_helper'
 require          'logstash/version'
 
 # Test if an installed package can actually be started and runs OK.
 RSpec.shared_examples "runnable" do |logstash|
-
   before(:each) do
     logstash.install({:version => LOGSTASH_VERSION})
+    logstash.write_default_pipeline
   end
 
-  it "is running on #{logstash.hostname}" do
-    logstash.start_service
-    expect(logstash).to be_running
-    logstash.stop_service
+  it "is running on [#{logstash.human_name}]" do
+    with_running_logstash_service(logstash) do
+      expect(logstash).to be_running
+    end
   end
-
 end
diff --git a/qa/acceptance/spec/shared_examples/updated.rb b/qa/acceptance/spec/shared_examples/updated.rb
index f6c9e8131..92b36affc 100644
--- a/qa/acceptance/spec/shared_examples/updated.rb
+++ b/qa/acceptance/spec/shared_examples/updated.rb
@@ -1,27 +1,54 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative '../spec_helper'
+require_relative '../../helpers'
 require          'logstash/version'
 
 # This test checks if the current package could used to update from the latest version released.
-RSpec.shared_examples "updated" do |logstash|
-
-  before(:all) { logstash.uninstall }
+RSpec.shared_examples "updated" do |logstash, from_release_branch|
+  before(:all) {
+    #unset to force it using bundled JDK to run LS
+    logstash.run_command("unset LS_JAVA_HOME")
+    logstash.uninstall
+  }
   after(:all)  do
     logstash.stop_service # make sure the service is stopped
     logstash.uninstall #remove the package to keep uniform state
   end
 
   before(:each) do
-    options={:version => LOGSTASH_LATEST_VERSION, :snapshot => false, :base => "./" }
-    logstash.install(options) # make sure latest version is installed
+    latest_logstash_release_version = fetch_latest_logstash_release_version(from_release_branch)
+    url, dest = logstash_download_metadata(latest_logstash_release_version, logstash.client.architecture_extension, logstash.client.package_extension).values_at(:url, :dest)
+    logstash.download(url, dest)
+    options = {:version => latest_logstash_release_version, :snapshot => false, :base => "./", :skip_jdk_infix => false }
+    logstash.install(options)
+    logstash.write_default_pipeline
   end
 
-  it "can be updated an run on #{logstash.hostname}" do
+  it "can be updated and run on [#{logstash.human_name}]" do
     expect(logstash).to be_installed
     # Performing the update
     logstash.install({:version => LOGSTASH_VERSION})
+    logstash.write_default_pipeline
     expect(logstash).to be_installed
     # starts the service to be sure it runs after the upgrade
-    logstash.start_service
-    expect(logstash).to be_running
+    with_running_logstash_service(logstash) do
+      expect(logstash).to be_running
+    end
   end
 end
diff --git a/qa/acceptance/spec/spec_helper.rb b/qa/acceptance/spec/spec_helper.rb
index 6f6b463b1..5e41ad4b7 100644
--- a/qa/acceptance/spec/spec_helper.rb
+++ b/qa/acceptance/spec/spec_helper.rb
@@ -1,42 +1,33 @@
-# encoding: utf-8
-require 'runner-tool'
-require_relative '../../rspec/helpers'
-require_relative '../../rspec/matchers'
-require_relative 'config_helper'
-require_relative "../../platform_config"
-
-
-# This is a non obvious hack,
-# EllipticalCurve are not completely implemented in JRuby 9k and the new version of SSH from the standard library
-# use them.
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# Details: https://github.com/jruby/jruby-openssl/issues/105
-Net::SSH::Transport::Algorithms::ALGORITHMS.values.each { |algs| algs.reject! { |a| a =~ /^ecd(sa|h)-sha2/ } }
-Net::SSH::KnownHosts::SUPPORTED_TYPE.reject! { |t| t =~ /^ecd(sa|h)-sha2/ }
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..'))
 $LOAD_PATH.unshift File.join(ROOT, 'logstash-core/lib')
 
-RunnerTool.configure
+require_relative '../../rspec/matchers'
 
-RSpec.configure do |c|
-  c.include ServiceTester
+def with_running_logstash_service(logstash)
+  begin
+    logstash.start_service
+    Stud.try(40.times, RSpec::Expectations::ExpectationNotMetError) do
+      expect(logstash).to be_running
+    end
+    yield
+  ensure
+    logstash.stop_service
+  end
 end
-
-platform = ENV['LS_TEST_PLATFORM'] || 'all'
-experimental = (ENV['LS_QA_EXPERIMENTAL_OS'].to_s.downcase || "false") == "true"
-
-config                  = PlatformConfig.new
-LOGSTASH_LATEST_VERSION = config.latest
-
-default_vagrant_boxes = ( platform == 'all' ? config.platforms : config.filter_type(platform, {"experimental" => experimental}) )
-
-selected_boxes = if ENV.include?('LS_VAGRANT_HOST') then
-                   config.platforms.select { |p| p.name  == ENV['LS_VAGRANT_HOST'] }
-                 else
-                   default_vagrant_boxes
-                 end
-
-SpecsHelper.configure(selected_boxes)
-
-puts "[Acceptance specs] running on #{ServiceTester.configuration.hosts}" if !selected_boxes.empty?
diff --git a/qa/config/platforms.json b/qa/config/platforms.json
deleted file mode 100644
index 52f822364..000000000
--- a/qa/config/platforms.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{ 
-  "latest": "5.0.0-alpha3",
-  "platforms" : {
-    "ubuntu-1204": { "box": "elastic/ubuntu-12.04-x86_64", "type": "debian" },
-    "ubuntu-1404": { "box": "elastic/ubuntu-14.04-x86_64", "type": "debian", "specific": true },
-    "ubuntu-1604": { "box": "elastic/ubuntu-16.04-x86_64", "type": "debian", "experimental": true },
-    "centos-6": { "box": "elastic/centos-6-x86_64", "type": "redhat" },
-    "centos-7": { "box": "elastic/centos-7-x86_64", "type": "redhat" },
-    "oel-6": { "box": "elastic/oraclelinux-6-x86_64", "type": "redhat" },
-    "oel-7": { "box": "elastic/oraclelinux-7-x86_64", "type": "redhat" },
-    "fedora-22": { "box": "elastic/fedora-22-x86_64", "type": "redhat", "experimental": true },
-    "fedora-23": { "box": "elastic/fedora-23-x86_64", "type": "redhat", "experimental": true },
-    "debian-8": { "box": "elastic/debian-8-x86_64", "type": "debian", "specific":  true },
-    "opensuse-13": { "box": "elastic/opensuse-13-x86_64", "type": "suse" },
-    "sles-11": { "box": "elastic/sles-11-x86_64", "type": "suse", "specific": true },
-    "sles-12": { "box": "elastic/sles-12-x86_64", "type": "suse", "specific": true }
-  }
-}
diff --git a/qa/docker/fixtures/custom_logstash_yml/logstash.yml b/qa/docker/fixtures/custom_logstash_yml/logstash.yml
new file mode 100644
index 000000000..41f0994c3
--- /dev/null
+++ b/qa/docker/fixtures/custom_logstash_yml/logstash.yml
@@ -0,0 +1 @@
+pipeline.batch.size: 200
\ No newline at end of file
diff --git a/qa/docker/fixtures/multiple_pipelines/config/pipelines.yml b/qa/docker/fixtures/multiple_pipelines/config/pipelines.yml
new file mode 100644
index 000000000..12cc49864
--- /dev/null
+++ b/qa/docker/fixtures/multiple_pipelines/config/pipelines.yml
@@ -0,0 +1,4 @@
+- pipeline.id: pipeline_one
+  path.config: "/usr/share/logstash/pipeline/basic1.cfg"
+- pipeline.id: pipeline_two
+  path.config: "/usr/share/logstash/pipeline/basic2.cfg"
\ No newline at end of file
diff --git a/qa/docker/fixtures/multiple_pipelines/pipelines/basic1.cfg b/qa/docker/fixtures/multiple_pipelines/pipelines/basic1.cfg
new file mode 100644
index 000000000..055a40405
--- /dev/null
+++ b/qa/docker/fixtures/multiple_pipelines/pipelines/basic1.cfg
@@ -0,0 +1,7 @@
+input {
+beats {
+id => 'multi_pipeline1'
+port => 5044
+}
+}
+output { stdout {} }
\ No newline at end of file
diff --git a/qa/docker/fixtures/multiple_pipelines/pipelines/basic2.cfg b/qa/docker/fixtures/multiple_pipelines/pipelines/basic2.cfg
new file mode 100644
index 000000000..c3cebe865
--- /dev/null
+++ b/qa/docker/fixtures/multiple_pipelines/pipelines/basic2.cfg
@@ -0,0 +1,6 @@
+input {
+  stdin {
+    id => 'multi_pipeline2'
+  }
+}
+output { stdout {} }
\ No newline at end of file
diff --git a/qa/docker/fixtures/simple_pipeline/basic.cfg b/qa/docker/fixtures/simple_pipeline/basic.cfg
new file mode 100644
index 000000000..eba040fd1
--- /dev/null
+++ b/qa/docker/fixtures/simple_pipeline/basic.cfg
@@ -0,0 +1,7 @@
+input {
+beats {
+id => 'simple_pipeline'
+port => 5044
+}
+}
+output { stdout {} }
\ No newline at end of file
diff --git a/qa/docker/patches/excon/unix_socket.rb b/qa/docker/patches/excon/unix_socket.rb
new file mode 100644
index 000000000..a666033dd
--- /dev/null
+++ b/qa/docker/patches/excon/unix_socket.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Excon
+  class UnixSocket < Excon::Socket
+    private
+    def connect
+      @socket = ::UNIXSocket.new(@data[:socket])
+    end
+  end
+end
diff --git a/qa/docker/shared_examples/container.rb b/qa/docker/shared_examples/container.rb
new file mode 100644
index 000000000..a6290e6ec
--- /dev/null
+++ b/qa/docker/shared_examples/container.rb
@@ -0,0 +1,94 @@
+shared_examples_for 'the container is configured correctly' do |flavor|
+  before do
+    @image = find_image(flavor)
+    @container = create_container(@image, {})
+  end
+
+  after do
+    cleanup_container(@container)
+  end
+
+  context 'logstash' do
+    it 'does not warn cannot change locale' do
+      expect(@container.logs(stderr: true)).not_to match /cannot change locale/
+    end
+
+    it 'should run with the correct version' do
+      console_out = exec_in_container(@container, 'logstash --version')
+      expect(console_out).to match /#{version}/
+    end
+
+    it 'should run with the bundled JDK' do
+      full_command = exec_in_container_full(@container, 'logstash --version')
+      std_err = full_command[:stderr].join.chomp.strip
+      expect(std_err).to match /Using bundled JDK: \/usr\/share\/logstash\/jdk/
+    end
+
+    it 'should be running an API server on port 9600' do
+      wait_for_logstash(@container)
+      expect(get_logstash_status(@container)).not_to be_nil
+    end
+  end
+
+  context 'container files' do
+    it 'should have the correct license agreement' do
+      expect(exec_in_container(@container, 'cat /licenses/LICENSE.txt')).to have_correct_license_agreement(flavor)
+    end
+
+    it 'should have the license notices file' do
+      expect(exec_in_container(@container, 'cat /licenses/NOTICE.TXT')).to match /Notice for/
+    end
+
+    it 'should have the correct user' do
+      expect(exec_in_container(@container, 'whoami')).to eql 'logstash'
+    end
+
+    it 'should have the correct home directory' do
+      expect(exec_in_container(@container, 'printenv HOME')).to eql '/usr/share/logstash'
+    end
+
+    it 'should link /opt/logstash to /usr/share/logstash' do
+      expect(exec_in_container(@container, 'readlink /opt/logstash')).to eql '/usr/share/logstash'
+    end
+
+    it 'should have all files owned by the logstash user' do
+      expect(exec_in_container(@container, 'find /usr/share/logstash ! -user logstash')).to be_empty
+      expect(exec_in_container(@container, 'find /usr/share/logstash -user logstash')).not_to be_empty
+    end
+
+    it 'should have a logstash user with uid 1000' do
+      expect(exec_in_container(@container, 'id -u logstash')).to eql '1000'
+    end
+
+    it 'should have a logstash user with gid 1000' do
+      expect(exec_in_container(@container, 'id -g logstash')).to eql '1000'
+    end
+
+    it 'should not have a RollingFile appender' do
+      expect(exec_in_container(@container, 'cat /usr/share/logstash/config/log4j2.properties')).not_to match /RollingFile/
+    end
+  end
+
+  context 'the java process' do
+    before do
+      wait_for_logstash(@container)
+    end
+
+    it 'should be running under the logstash user' do
+      expect(java_process(@container)["user"]).to eql 'logstash'
+    end
+
+    it 'should be running under the logstash group' do
+      expect(java_process(@container)["group"]).to eql 'logstash'
+    end
+
+    it 'should have cgroup overrides set' do
+      expect(java_process(@container)["args"]).to match /-Dls.cgroup.cpu.path.override=/
+      expect(java_process(@container)["args"]).to match /-Dls.cgroup.cpuacct.path.override=/
+    end
+
+    it 'should have a pid of 1' do
+      expect(java_process(@container)["pid"]).to eql '1'
+    end
+  end
+end
diff --git a/qa/docker/shared_examples/container_config.rb b/qa/docker/shared_examples/container_config.rb
new file mode 100644
index 000000000..08108e5bb
--- /dev/null
+++ b/qa/docker/shared_examples/container_config.rb
@@ -0,0 +1,40 @@
+shared_examples_for 'it runs with different configurations' do |flavor|
+  before do
+    @image = find_image(flavor)
+    @container = start_container(@image, options)
+  end
+
+  after do
+    cleanup_container(@container)
+  end
+
+  context 'when a single pipeline is configured via volume bind' do
+    let(:options) { {"HostConfig" => { "Binds" => ["#{FIXTURES_DIR}/simple_pipeline/:/usr/share/logstash/pipeline/"] } } }
+
+    it 'should show the stats for that pipeline' do
+      wait_for_pipeline(@container)
+      expect(get_plugin_info(@container, 'inputs', 'simple_pipeline')).not_to be nil
+    end
+  end
+
+  context 'when multiple pipelines are configured via volume bind' do
+    let(:options) { {"HostConfig" => { "Binds" => ["#{FIXTURES_DIR}/multiple_pipelines/pipelines/:/usr/share/logstash/pipeline/",
+                                                   "#{FIXTURES_DIR}/multiple_pipelines/config/pipelines.yml:/usr/share/logstash/config/pipelines.yml"] } } }
+
+    it "should show stats for both pipelines" do
+      wait_for_pipeline(@container, 'pipeline_one')
+      wait_for_pipeline(@container, 'pipeline_two')
+      expect(get_plugin_info(@container, 'inputs', 'multi_pipeline1', 'pipeline_one')).not_to be nil
+      expect(get_plugin_info(@container, 'inputs', 'multi_pipeline2', 'pipeline_two')).not_to be nil
+    end
+  end
+
+  context 'when a custom `logstash.yml` is configured via volume bind' do
+    let(:options) { {"HostConfig" => { "Binds" => ["#{FIXTURES_DIR}/custom_logstash_yml/logstash.yml:/usr/share/logstash/config/logstash.yml"] } } }
+
+    it 'should change the value of pipeline.batch.size' do
+      wait_for_pipeline(@container)
+      expect(get_pipeline_setting(@container, 'batch_size')).to eq 200
+    end
+  end
+end
diff --git a/qa/docker/shared_examples/container_options.rb b/qa/docker/shared_examples/container_options.rb
new file mode 100644
index 000000000..48c51d382
--- /dev/null
+++ b/qa/docker/shared_examples/container_options.rb
@@ -0,0 +1,95 @@
+shared_examples_for 'it applies settings correctly' do |flavor|
+  before do
+    @image = find_image(flavor)
+    @container = start_container(@image, options)
+    wait_for_pipeline(@container)
+  end
+
+  after do
+    cleanup_container(@container)
+  end
+
+  context 'when setting pipeline workers shell style' do
+    let(:options) { { 'ENV' => ['PIPELINE_WORKERS=32'] } }
+
+    it "should correctly set the number of pipeline workers" do
+      expect(get_pipeline_setting(@container, 'workers')).to eql 32
+    end
+  end
+
+  context 'when setting pipeline workers dot style' do
+    let(:options) { { 'ENV' => ['pipeline.workers=64'] } }
+
+    it "should correctly set the number of pipeline workers" do
+      expect(get_pipeline_setting(@container, 'workers')).to eql 64
+    end
+  end
+
+  context 'when setting pipeline batch size' do
+    let(:options) { { 'ENV' => ['pipeline.batch.size=123'] } }
+
+    it "should correctly set the batch size" do
+      expect(get_pipeline_setting(@container, 'batch_size')).to eql 123
+    end
+  end
+
+  context 'when setting pipeline batch delay' do
+    let(:options) { { 'ENV' => ['pipeline.batch.delay=36'] } }
+
+    it 'should correctly set batch delay' do
+      expect(get_pipeline_setting(@container, 'batch_delay')).to eql 36
+    end
+  end
+
+  context 'when setting unsafe shutdown to true shell style' do
+    let(:options) { { 'ENV' => ['pipeline.unsafe_shutdown=true'] } }
+
+    it 'should set unsafe shutdown to true' do
+      expect(get_settings(@container)['pipeline.unsafe_shutdown']).to be_truthy
+    end
+  end
+
+  context 'when setting unsafe shutdown to true dot style' do
+    let(:options) { { 'ENV' => ['pipeline.unsafe_shutdown=true'] } }
+
+    it 'should set unsafe shutdown to true' do
+      expect(get_settings(@container)['pipeline.unsafe_shutdown']).to be_truthy
+    end
+  end
+
+  context 'when setting config.string' do
+    let(:options) {
+      {
+        'ENV' => [
+          'USER=kimchy',
+          'CONFIG_STRING=input {
+              beats { port => 5040 }
+            }
+            output {
+              elasticsearch {
+                hosts => ["https://es:9200"]
+                user => "${USER}"
+                password => \'changeme\'
+              }
+            }'
+        ]
+      }
+    }
+
+    it "persists ${CONFIG_STRING} key in logstash.yml, resolves when running and spins up without issue" do
+      settings = get_settings(@container)
+      expect(settings['config.string']).to eq("${CONFIG_STRING}")
+
+      pipeline_config = get_pipeline_stats(@container)
+      input_plugins = pipeline_config.dig('plugins', 'inputs')
+      expect(input_plugins[0].dig('name')).to eql('beats')
+
+      output_plugins = pipeline_config.dig('plugins', 'outputs')
+      expect(output_plugins[0].dig('name')).to eql('elasticsearch')
+
+      # check if logs contain the ES request with the resolved ${USER}
+      container_logs = @container.logs(stdout: true)
+      expect(container_logs.include?('https://kimchy:xxxxxx@es:9200')).to be true
+    end
+  end
+end
diff --git a/qa/docker/shared_examples/image_metadata.rb b/qa/docker/shared_examples/image_metadata.rb
new file mode 100644
index 000000000..1750cd0ee
--- /dev/null
+++ b/qa/docker/shared_examples/image_metadata.rb
@@ -0,0 +1,50 @@
+shared_examples_for 'the metadata is set correctly' do |flavor|
+  before do
+    @image = find_image(flavor)
+    @image_config = @image.json['Config']
+    @labels = @image_config['Labels']
+  end
+
+  it 'should have the correct working directory' do
+    expect(@image_config['WorkingDir']).to eql '/usr/share/logstash'
+  end
+
+  it "should have an architecture of #{running_architecture}" do
+    expect(@image.json['Architecture']).to have_correct_architecture
+  end
+
+  %w(license org.label-schema.license org.opencontainers.image.licenses).each do |label|
+    it "should set the license label #{label} correctly" do
+      expect(@labels[label]).to have_correct_license_label(flavor)
+    end
+  end
+
+  %w(name org.label-schema.name org.opencontainers.image.title).each do |label|
+    it "should set the name label #{label} correctly" do
+      expect(@labels[label]).to eql "logstash"
+    end
+  end
+
+  %w(vendor org.opencontainers.image.vendor).each do |label|
+    it 'should set the vendor label correctly' do
+      expect(@labels["vendor"]).to eql "Elastic"
+    end
+  end
+
+  %w(description summary org.opencontainers.image.description).each do |label|
+    it "should set the description label #{label} correctly" do
+      expect(@labels[label]).to eql "Logstash is a free and open server-side data processing pipeline that ingests data from a multitude of sources, transforms it, and then sends it to your favorite 'stash.'"
+    end
+  end
+
+  %w(org.label-schema.version org.opencontainers.image.version).each do |label|
+    it "should set the version label #{label} correctly" do
+      expect(@labels[label]).to eql qualified_version
+    end
+  end
+
+  it 'should set the maintainer label correctly' do
+    expect(@labels["maintainer"]).to eql "info@elastic.co"
+  end
+
+end
diff --git a/qa/docker/shared_examples/xpack.rb b/qa/docker/shared_examples/xpack.rb
new file mode 100644
index 000000000..254e0354c
--- /dev/null
+++ b/qa/docker/shared_examples/xpack.rb
@@ -0,0 +1,62 @@
+shared_examples_for 'a container with xpack features' do |flavor|
+
+  before do
+    @image = find_image(flavor)
+  end
+
+  after do
+    cleanup_container(@container)
+  end
+
+  describe 'when configuring xpack settings' do
+
+    context 'when persists env var keys into logstash.yml' do
+      let(:env) { %w(XPACK_MONITORING_ENABLED=false XPACK_MONITORING_ELASTICSEARCH_HOSTS=["http://node1:9200","http://node2:9200"]) }
+
+      before do
+        @container = start_container(@image, {'ENV' => env})
+      end
+
+      it 'saves keys instead actual value which will be resolved from keystore | env later' do
+        settings = get_settings(@container)
+        expect(settings['xpack.monitoring.enabled']).to eq("${XPACK_MONITORING_ENABLED}")
+        expect(settings['xpack.monitoring.elasticsearch.hosts']).to eq("${XPACK_MONITORING_ELASTICSEARCH_HOSTS}")
+      end
+    end
+
+    context 'with running with env vars' do
+      let(:env) {
+        [
+          'XPACK_MONITORING_ENABLED=true',
+          'XPACK_MONITORING_ELASTICSEARCH_HOSTS="http://node1:9200"',
+          'XPACK_MANAGEMENT_ENABLED=true',
+          'XPACK_MANAGEMENT_PIPELINE_ID=["*"]', # double quotes intentionally placed
+          'XPACK_MANAGEMENT_ELASTICSEARCH_HOSTS=["http://node3:9200", "http://node4:9200"]'
+        ]
+      }
+
+      it 'persists var keys into logstash.yml and uses their resolved actual values' do
+        container = create_container(@image, {'ENV' => env})
+
+        sleep(15) # wait for container run
+
+        settings = get_settings(container)
+
+        expect(settings['xpack.monitoring.enabled']).to eq("${XPACK_MONITORING_ENABLED}")
+        expect(settings['xpack.monitoring.elasticsearch.hosts']).to eq("${XPACK_MONITORING_ELASTICSEARCH_HOSTS}")
+        expect(settings['xpack.management.enabled']).to eq("${XPACK_MANAGEMENT_ENABLED}")
+        expect(settings['xpack.management.pipeline.id']).to eq("${XPACK_MANAGEMENT_PIPELINE_ID}")
+        expect(settings['xpack.management.elasticsearch.hosts']).to eq("${XPACK_MANAGEMENT_ELASTICSEARCH_HOSTS}")
+
+        # get container logs
+        container_logs = container.logs(stdout: true)
+
+        # check if logs contain node3 & node4 values actually resolved and used
+        expect(container_logs.include?('pipeline_id=>["*"]')).to be true
+        # note that, we are not spinning up ES nodes, so values can be in errors or in pool update logs
+        expect(container_logs.include?('http://node3:9200')).to be true
+        expect(container_logs.include?('http://node4:9200')).to be true
+      end
+    end
+  end
+end
diff --git a/qa/docker/spec/full/container_spec.rb b/qa/docker/spec/full/container_spec.rb
new file mode 100644
index 000000000..d7f8ae64b
--- /dev/null
+++ b/qa/docker/spec/full/container_spec.rb
@@ -0,0 +1,27 @@
+require_relative '../spec_helper'
+require_relative '../../shared_examples/container_config'
+require_relative '../../shared_examples/container_options'
+require_relative '../../shared_examples/container'
+require_relative '../../shared_examples/xpack'
+
+describe 'A container running the full image' do
+  it_behaves_like 'the container is configured correctly', 'full'
+  it_behaves_like 'it runs with different configurations', 'full'
+  it_behaves_like 'it applies settings correctly', 'full'
+  it_behaves_like 'a container with xpack features', 'full'
+
+  context 'The running container' do
+    before do
+      @image = find_image('full')
+      @container = start_container(@image, {})
+    end
+
+    after do
+      cleanup_container(@container)
+    end
+
+    it 'should be based on Red Hat Enterprise Linux' do
+      expect(exec_in_container(@container, 'cat /etc/redhat-release')).to match /Red Hat Enterprise Linux/
+    end
+  end
+end
diff --git a/qa/docker/spec/full/image_spec.rb b/qa/docker/spec/full/image_spec.rb
new file mode 100644
index 000000000..ca07971ad
--- /dev/null
+++ b/qa/docker/spec/full/image_spec.rb
@@ -0,0 +1,6 @@
+require_relative '../spec_helper'
+require_relative '../../shared_examples/image_metadata'
+
+describe 'An image with the full distribution' do
+  it_behaves_like 'the metadata is set correctly', 'full'
+end
diff --git a/qa/docker/spec/oss/container_spec.rb b/qa/docker/spec/oss/container_spec.rb
new file mode 100644
index 000000000..cc824fdb3
--- /dev/null
+++ b/qa/docker/spec/oss/container_spec.rb
@@ -0,0 +1,25 @@
+require_relative '../spec_helper'
+require_relative '../../shared_examples/container_config'
+require_relative '../../shared_examples/container_options'
+require_relative '../../shared_examples/container'
+
+describe 'A container running the oss image' do
+  it_behaves_like 'the container is configured correctly', 'oss'
+  it_behaves_like 'it applies settings correctly', 'oss'
+  it_behaves_like 'it runs with different configurations', 'oss'
+
+  context 'The running container' do
+    before do
+      @image = find_image('oss')
+      @container = start_container(@image, {})
+    end
+
+    after do
+      cleanup_container(@container)
+    end
+
+    it 'should be based on Red Hat Enterprise Linux' do
+      expect(exec_in_container(@container, 'cat /etc/redhat-release')).to match /Red Hat Enterprise Linux/
+    end
+  end
+end
diff --git a/qa/docker/spec/oss/image_spec.rb b/qa/docker/spec/oss/image_spec.rb
new file mode 100644
index 000000000..52b71cca9
--- /dev/null
+++ b/qa/docker/spec/oss/image_spec.rb
@@ -0,0 +1,6 @@
+require_relative '../spec_helper'
+require_relative '../../shared_examples/image_metadata'
+
+describe 'An image with the oss distribution' do
+  it_behaves_like 'the metadata is set correctly', 'oss'
+end
diff --git a/qa/docker/spec/spec_helper.rb b/qa/docker/spec/spec_helper.rb
new file mode 100644
index 000000000..f79514d5a
--- /dev/null
+++ b/qa/docker/spec/spec_helper.rb
@@ -0,0 +1,197 @@
+ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..'))
+$LOAD_PATH.unshift File.join(ROOT, 'logstash-core/lib')
+FIXTURES_DIR = File.expand_path(File.join("..", "..", "fixtures"), __FILE__)
+
+require 'logstash/version'
+require 'json'
+require 'stud/try'
+require 'docker-api'
+require_relative '../patches/excon/unix_socket'
+
+def version
+  @version ||= LOGSTASH_VERSION
+end
+
+def qualified_version
+  qualifier = ENV['VERSION_QUALIFIER'].to_s.strip.empty? ? nil : ENV['VERSION_QUALIFIER']
+  qualified_version = qualifier ? [version, qualifier].join("-") : version
+  ENV["RELEASE"] == "1" ? qualified_version : [qualified_version, "SNAPSHOT"].join("-")
+end
+
+def find_image(flavor)
+  Docker::Image.all.detect {
+      |image| image.info['RepoTags'].detect {
+        |tag| tag == "docker.elastic.co/logstash/logstash-#{flavor}:#{qualified_version}"
+    }}
+end
+
+def create_container(image, options = {})
+  image.run(nil, options)
+end
+
+def start_container(image, options = {})
+  container = create_container(image, options)
+  wait_for_logstash(container)
+  container
+end
+
+def wait_for_logstash(container)
+  Stud.try(40.times, [NoMethodError, Docker::Error::ConflictError, RSpec::Expectations::ExpectationNotMetError, TypeError]) do
+    expect(logstash_available?(container)).to be true
+    # unknown or red status may be also meaningful while testing
+    expect(%w(unknown green yellow red).include?(get_logstash_status(container))).to be true
+  end
+end
+
+def wait_for_pipeline(container, pipeline = 'main')
+  Stud.try(40.times, [NoMethodError, Docker::Error::ConflictError, RSpec::Expectations::ExpectationNotMetError, TypeError]) do
+    expect(pipeline_stats_available?(container, pipeline)).to be true
+  end
+end
+
+def cleanup_container(container)
+  unless container.nil?
+    begin
+      container.stop
+    ensure
+      container.delete(:force => true)
+    end
+  end
+end
+
+def license_label_for_flavor(flavor)
+  flavor.match(/oss/) ? 'Apache 2.0' : 'Elastic License'
+end
+
+def license_agreement_for_flavor(flavor)
+  flavor.match(/oss/) ? 'Apache License' : 'ELASTIC LICENSE AGREEMENT!'
+end
+
+def get_logstash_status(container)
+  make_request(container, 'curl -s http://localhost:9600/')['status']
+end
+
+def get_node_info(container)
+  make_request(container, 'curl -s http://localhost:9600/_node/')
+end
+
+def get_node_stats(container)
+  make_request(container, 'curl -s http://localhost:9600/_node/stats')
+end
+
+def get_pipeline_setting(container, property, pipeline = 'main')
+  make_request(container, "curl -s http://localhost:9600/_node/pipelines/#{pipeline}")
+          .dig('pipelines', pipeline, property)
+end
+
+def get_pipeline_stats(container, pipeline = 'main')
+  make_request(container, "curl -s http://localhost:9600/_node/stats/pipelines").dig('pipelines', pipeline)
+end
+
+def get_plugin_info(container, type, id, pipeline = 'main')
+  pipeline_info = make_request(container, "curl -s http://localhost:9600/_node/stats/pipelines")
+  all_plugins = pipeline_info.dig('pipelines', pipeline, 'plugins', type)
+  if all_plugins.nil?
+    # This shouldn't happen, so if it does, let's figure out why
+    puts container.logs(stdout: true)
+    puts "Unable to find plugins from #{pipeline_info}, when looking for #{type} plugins in #{pipeline}"
+    return nil
+  end
+  all_plugins.find {|plugin| plugin['id'] == id}
+end
+
+def logstash_available?(container)
+  response = exec_in_container_full(container, 'curl -s http://localhost:9600')
+  return false if response[:exitcode] != 0
+  !(response[:stdout].nil? || response[:stdout].empty?)
+end
+
+def pipeline_stats_available?(container, pipeline)
+  response = make_request(container, "curl -s http://localhost:9600/_node/stats/pipelines")
+  plugins = response.dig('pipelines', pipeline, 'plugins')
+  !(plugins.nil? || plugins.empty?)
+end
+
+def make_request(container, url)
+  JSON.parse(exec_in_container(container, url))
+end
+
+def get_settings(container)
+  YAML.load(container.read_file('/usr/share/logstash/config/logstash.yml'))
+end
+
+def java_process(container)
+  ps_output = exec_in_container(container, "ps -o pid,user,group,args")
+  java_ps = ps_output.split("\n").find {|process| process.match(/java/) } || ""
+  java_ps.match(/^\s+(?<pid>\d+)\s+(?<user>.+?)\s+(?<group>.+?)\s+(?<args>.+?)$/)
+end
+
+# Runs the given command in the given container. This method returns
+# a hash including the `stdout` and `stderr` outputs and the exit code
+def exec_in_container_full(container, command)
+  response = container.exec(command.split)
+  {
+      :stdout => response[0],
+      :stderr => response[1],
+      :exitcode => response[2]
+  }
+end
+
+# Runs the given command in the given container. This method returns
+# only the stripped/chomped `stdout` output.
+def exec_in_container(container, command)
+  exec_in_container_full(container, command)[:stdout].join.chomp.strip
+end
+
+def running_architecture
+    architecture = ENV['DOCKER_ARCHITECTURE']
+    architecture = normalized_architecture(`uname -m`.strip) if architecture.nil?
+    architecture
+end
+
+def normalized_architecture(cpu)
+  case cpu
+  when 'x86_64'
+    'amd64'
+  when 'aarch64'
+    'arm64'
+  else
+    cpu
+  end
+end
+
+RSpec::Matchers.define :have_correct_license_label do |expected|
+  match do |actual|
+    values_match? license_label_for_flavor(expected), actual
+  end
+  failure_message do |actual|
+    "expected License:#{actual} to eq #{license_label_for_flavor(expected)}"
+  end
+end
+
+RSpec::Matchers.define :have_correct_license_agreement do |expected|
+  match do |actual|
+    values_match? /#{license_agreement_for_flavor(expected)}/, actual
+    true
+  end
+  failure_message do |actual|
+    "expected License Agreement:#{actual} to contain #{license_agreement_for_flavor(expected)}"
+  end
+end
+
+RSpec::Matchers.define :have_correct_architecture do
+  match do |actual|
+    values_match? running_architecture, actual
+  end
+  failure_message do |actual|
+    "expected Architecture: #{actual} to be #{running_architecture}"
+  end
+end
+
+shared_context 'image_context' do |flavor|
+  before do
+    @image = find_image(flavor)
+    @image_config = @image.json['Config']
+    @labels = @image_config['Labels']
+  end
+end
diff --git a/qa/docker/spec/wolfi/container_spec.rb b/qa/docker/spec/wolfi/container_spec.rb
new file mode 100644
index 000000000..e722f8df8
--- /dev/null
+++ b/qa/docker/spec/wolfi/container_spec.rb
@@ -0,0 +1,27 @@
+require_relative '../spec_helper'
+require_relative '../../shared_examples/container_config'
+require_relative '../../shared_examples/container_options'
+require_relative '../../shared_examples/container'
+require_relative '../../shared_examples/xpack'
+
+describe 'A container running the wolfi image' do
+  it_behaves_like 'the container is configured correctly', 'wolfi'
+  it_behaves_like 'it runs with different configurations', 'wolfi'
+  it_behaves_like 'it applies settings correctly', 'wolfi'
+  it_behaves_like 'a container with xpack features', 'wolfi'
+
+  context 'The running container' do
+    before do
+      @image = find_image('wolfi')
+      @container = start_container(@image, {})
+    end
+
+    after do
+      cleanup_container(@container)
+    end
+
+    it 'should be based on Wolfi' do
+      expect(exec_in_container(@container, 'cat /etc/os-release')).to match /Wolfi|Chainguard/
+    end
+  end
+end
diff --git a/qa/docker/spec/wolfi/image_spec.rb b/qa/docker/spec/wolfi/image_spec.rb
new file mode 100644
index 000000000..be455fe33
--- /dev/null
+++ b/qa/docker/spec/wolfi/image_spec.rb
@@ -0,0 +1,6 @@
+require_relative '../spec_helper'
+require_relative '../../shared_examples/image_metadata'
+
+describe 'An image with the full distribution' do
+  it_behaves_like 'the metadata is set correctly', 'wolfi'
+end
diff --git a/qa/integration/README.md b/qa/integration/README.md
index 0993c1086..7f2e931d0 100644
--- a/qa/integration/README.md
+++ b/qa/integration/README.md
@@ -1,10 +1,29 @@
 ## Logstash Integration Tests aka RATS
 
-These set of tests are full integration tests as in: they can start LS from a binary, run configs using `-e` and can use any external services like Kafka, ES and S3. This framework is hybrid -- a combination of bash scripts (to mainly setup services), Ruby service files, and RSpec. All test assertions are done in RSpec.
+These test sets are full integration tests. They can: 
 
+* start Logstash from a binary, 
+* run configs using `-e`, and 
+* use external services such as Kafka, Elasticsearch, and Beats.
 
+This framework is hybrid -- a combination of bash scripts (to mainly setup services), Ruby service files, and RSpec. All test assertions are done in RSpec.
 
-## Running integration tests locally (Mac/Linux)
+## Environment setup
+
+### Directory Layout
+
+* `fixtures`: Specify services to run, Logstash config, and test specific scripts ala `.travis.yml`. You test settings in form of `test_name.yml`. 
+* `services`: This directory has bash scripts that download and bootstrap binaries for services. This is where services like Elasticsearch will be downloaded and run. Service can have 3 files: `<service>_setup.sh`, `<service>_teardown.sh` and `<service>`.rb. The bash scripts deal with downloading and bootstrapping, but the ruby source will trigger them from the test as a shell out (using backticks). The tests are blocked until the setup/teardown completes. For example, Elasticsearch service has `elasticsearch_setup.sh`, `elasticsearch_teardown.sh` and `elasticsearch.rb`. The service name in yml is "elasticsearch".
+* `framework`: Test framework source code.
+* `specs`: Rspec tests that use services and validates stuff
+
+### Setup Java
+
+The integration test scripts use `gradle` to run the tests.
+Gradle requires a valid version of Java either on the system path, or specified using the `JAVA_HOME` environment variable pointing to the location of a valid JDK.
+
+To run integration tests using a different version of Java, set the `BUILD_JAVA_HOME` environment variable to the location of the JDK that you wish to test with.
+## Testing on Mac/Linux
 
 ### Dependencies 
 * `JRuby`
@@ -12,34 +31,47 @@ These set of tests are full integration tests as in: they can start LS from a bi
 * `rake`
 * `bundler`
 
-From the Logstash root directory:
+### Running integration tests locally (Mac/Linux) 
+Run tests from the Logstash root directory.
 
-* Run all tests: `ci/integration_tests.sh`
-* Run a single test: `ci/integration_tests.sh specs/es_output_how_spec.rb`
+* Run all tests: 
+
+  `ci/integration_tests.sh`
+  
+* Run a single test: 
+
+  `ci/integration_tests.sh specs/es_output_how_spec.rb`
+  
 * Debug tests: 
-```
-ci/integration_tests.sh setup 
-cd qa/integration
-bundle exec rspec specs/es_output_how_spec.rb (single test)
-bundle exec rspec specs/*  (all tests)
-```
-## Running integration tests locally via Docker 
+  ```
+  ci/integration_tests.sh setup 
+  cd qa/integration
+  bundle exec rspec specs/es_output_how_spec.rb (single test)
+  bundle exec rspec specs/*  (all tests)
+  ```
+  
+## Testing with Docker 
 
 ### Dependencies 
 * `Docker`
 
-From the Logstash root directory:
+### Running integration tests locally using Docker 
+
+Run tests from the Logstash root directory.
 
 * Run all tests:
-```
-docker build  -t logstash-integration-tests .
-docker run -it --rm logstash-integration-tests ci/integration_tests.sh 
-```
+
+  ```
+  docker build  -t logstash-integration-tests .
+  docker run -it --rm logstash-integration-tests ci/integration_tests.sh 
+  ```
+  
 * Run a single test: 
 ```
 docker build  -t logstash-integration-tests .
 docker run -it --rm logstash-integration-tests ci/integration_tests.sh specs/es_output_how_spec.rb
 ``` 
+
 * Debug tests:
 ```
 (Mac/Linux) docker ps --all -q -f status=exited | xargs docker rm  
@@ -54,24 +86,19 @@ exit
 docker kill debug
 docker rm debug
 ```
-## Running integration tests locally from Windows
 
-The integration tests need to be run from MacOS or Linux.  However, the tests may be run locally within Docker.   
+### Docker clean up (Mac/Linux)
 
-## Docker clean up (Mac/Linux)
-
-! Warning this will remove all images and containers except for the `logstash-base` container !
+WARNING: Docker cleanup removes all images and containers except for the `logstash-base` container!
 
 * `ci/docker_prune.sh`
 
-### Directory Layout
+## Testing on Windows
 
-* `fixtures`: In this dir you will test settings in form of `test_name.yml`. Here you specify services to run, LS config, test specific scripts ala `.travis.yml`
-* `services`: This dir has bash scripts that download and bootstrap binaries for services. This is where services like ES will be downloaded and run from. Service can have 3 files: `<service>_setup.sh`, `<service>_teardown.sh` and `<service>`.rb. The bash scripts deal with downloading and bootstrapping, but the ruby source will trigger them from the test as a shell out (using backticks). The tests are blocked until the setup/teardown completes. For example, Elasticsearch service has `elasticsearch_setup.sh`, `elasticsearch_teardown.sh` and `elasticsearch.rb`. The service name in yml is "elasticsearch".
-* `framework`: Test framework source code.
-* `specs`: Rspec tests that use services and validates stuff
+The integration tests should be run from MacOS or Linux.  However, the tests can be run locally within Docker on Windows.
 
-### Adding a new test
+
+## Adding a new test
 
 1. Creating a new test -- lets use as example. Call it "test_file_input" which brings up LS to read from a file and assert file contents (file output) were as expected.
 2. You'll have to create a yml file in `fixtures` called `test_file_input_spec.yml`. Here you define any external services you need and any LS config.
diff --git a/qa/integration/build.gradle b/qa/integration/build.gradle
index dfc39b9b6..f54d1abfa 100644
--- a/qa/integration/build.gradle
+++ b/qa/integration/build.gradle
@@ -1,3 +1,22 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 description = """Logstash Integration Tests"""
 
 repositories {
@@ -11,20 +30,69 @@ buildscript {
 }
 
 dependencies {
-  testCompile project(':logstash-core')
-  testCompile 'org.assertj:assertj-core:3.8.0'
-  testCompile 'junit:junit:4.12'
+  testImplementation project(':logstash-core')
+  testImplementation 'org.assertj:assertj-core:3.8.0'
+  testImplementation 'junit:junit:4.13.2'
 }
 
 test {
   exclude '/**'
 }
 
-task integrationTests(type: Test) {
+tasks.register("copyProductionLog4jConfiguration", Copy) {
+  description "Copy the production log4j config to be tested in QA (qa/integration/fixtures/logs_rollover)"
+
+  from "${projectDir}/../../config/log4j2.properties"
+  into "${projectDir}/fixtures/logs_rollover/"
+  filter {
+    // modify rollover policy to make it happen in integration test without need to generate tons of log lines
+    line -> line
+            .replace('appender.rolling.policies.size.size = 100MB',
+                    'appender.rolling.policies.size.size = 1KB')
+            .replace('appender.rolling.filePattern = ${sys:ls.logs}/logstash-plain-%d{yyyy-MM-dd}-%i.log.gz',
+                    'appender.rolling.filePattern = ${sys:ls.logs}/logstash-plain-%d{yyyy-MM-dd}.log')
+            .replace('appender.routing.pipeline.policy.size = 100MB',
+                    'appender.routing.pipeline.policy.size = 1KB')
+  }
+}
+
+clean {
+  delete "${projectDir}/fixtures/logs_rollover/log4j2.properties"
+}
+
+tasks.register("preparePluginTestFixtures", Exec) {
+
+  def fixtureDir = layout.projectDirectory.dir("fixtures/plugins")
+  def scriptPath = fixtureDir.file("generate-gems.sh")
+
+  inputs.file scriptPath
+  inputs.files fileTree(fixtureDir) { include("*.gemspec") }
+  outputs.files fileTree(fixtureDir) { include("*.gem") }
+
+  commandLine = scriptPath.toString()
+}
+
+tasks.register("integrationTests", Test) {
+  if ((JavaVersion.current().getMajorVersion() as int) >= 17) {
+    jvmArgs = ['--add-opens', 'java.base/sun.nio.ch=ALL-UNNAMED', '--add-opens', 'java.base/java.io=ALL-UNNAMED']
+  }
+  dependsOn copyProductionLog4jConfiguration
+  dependsOn preparePluginTestFixtures
+
   inputs.files fileTree("${projectDir}/services")
   inputs.files fileTree("${projectDir}/framework")
   inputs.files fileTree("${projectDir}/fixtures")
   inputs.files fileTree("${projectDir}/specs")
-  systemProperty 'logstash.core.root.dir', projectDir.absolutePath
+
+  systemProperty 'logstash.root.dir', projectDir.toPath().getParent().getParent().toString()
   include '/org/logstash/integration/RSpecTests.class'
+
+  outputs.upToDateWhen {
+    if (project.hasProperty('integrationTests.rerun')) {
+      println "Rerunning Integration Tests"
+      return false
+    } else {
+      return true
+    }
+  }
 }
diff --git a/qa/integration/fixtures/beats_input_spec.yml b/qa/integration/fixtures/beats_input_spec.yml
index 9fc49dd3d..abc431558 100644
--- a/qa/integration/fixtures/beats_input_spec.yml
+++ b/qa/integration/fixtures/beats_input_spec.yml
@@ -13,7 +13,7 @@ config:
   tls_server_auth: |-
     input {
       beats {
-        ssl => true
+        ssl_enabled => true
         port => 5044
         ssl_certificate => '<%=options[:ssl_certificate]%>'
         ssl_key => '<%=options[:ssl_key]%>'
@@ -23,11 +23,11 @@ config:
   tls_mutual_auth: |-
     input {
       beats {
-        ssl => true
+        ssl_enabled => true
         port => 5044
         ssl_certificate => '<%=options[:ssl_certificate]%>'
         ssl_key => '<%=options[:ssl_key]%>'
-        ssl_verify_mode => "force_peer"
+        ssl_client_authentication => "required"
         ssl_certificate_authorities => '<%=options[:ssl_certificate]%>'
       }
     }
diff --git a/qa/integration/fixtures/command_line_spec.yml b/qa/integration/fixtures/command_line_spec.yml
new file mode 100644
index 000000000..cbfc784af
--- /dev/null
+++ b/qa/integration/fixtures/command_line_spec.yml
@@ -0,0 +1,3 @@
+---
+services:
+  - logstash
diff --git a/qa/integration/fixtures/deprecation_log_spec.yml b/qa/integration/fixtures/deprecation_log_spec.yml
new file mode 100644
index 000000000..93e3bc94a
--- /dev/null
+++ b/qa/integration/fixtures/deprecation_log_spec.yml
@@ -0,0 +1,17 @@
+---
+services:
+  - logstash
+config: |-
+ input {
+    generator {
+      count => 4
+    }
+ }
+ filter {
+  ruby {
+    code => '@deprecation_logger.deprecated "Teleport"'
+  }
+ }
+ output {
+   null {}
+ }
diff --git a/qa/integration/fixtures/direct_heap_allocator_flag_spec.yml b/qa/integration/fixtures/direct_heap_allocator_flag_spec.yml
new file mode 100644
index 000000000..6010a5f31
--- /dev/null
+++ b/qa/integration/fixtures/direct_heap_allocator_flag_spec.yml
@@ -0,0 +1,23 @@
+---
+services:
+  - logstash
+config: |-
+ input {
+   http {
+     host => "localhost"
+     port => 8080
+     response_headers => {"Content-Type" => "application/json"}
+     ecs_compatibility => disabled
+   }
+ }
+  
+ filter {
+   ruby {
+     init => "Thread.new { loop { logger.info 'Direct pinned: ' + Java::io.netty.buffer.ByteBufAllocator::DEFAULT.pinned_direct_memory.to_s + ' - Heap pinned: ' + Java::io.netty.buffer.ByteBufAllocator::DEFAULT.pinned_heap_memory.to_s; sleep 5 } }"
+     code => "start = Time.now; while Time.now - start < 10; Java::io.netty.buffer.ByteBufAllocator::DEFAULT.buffer(1024); sleep 0.5 end"
+   }
+ }
+ 
+ output {
+   sink {}
+ }
diff --git a/qa/integration/fixtures/dlq_spec.yml b/qa/integration/fixtures/dlq_spec.yml
index 8ca9e6d08..6bf2953ac 100644
--- a/qa/integration/fixtures/dlq_spec.yml
+++ b/qa/integration/fixtures/dlq_spec.yml
@@ -5,7 +5,7 @@ services:
 config:
   input {
     generator{
-      message => '{"test":"one"}'
+      message => '{"ip":1}'
       codec => "json"
       count => 1000
     }
@@ -17,22 +17,16 @@ config:
   }
 
   filter {
-    if ([geoip]) {
+    if ([ip]) {
         mutate {
-            remove_field => ["geoip"]
+            remove_field => ["ip"]
             add_field => {
               "mutated" => "true"
             }
         }
-    }else{
-      mutate {
-        add_field => {
-          "geoip" => "somewhere"
-        }
-      }
     }
   }
   output {
-    elasticsearch {}
+    elasticsearch { index => "test-index" }
   }
 teardown_script:
diff --git a/qa/integration/fixtures/env_variables_condition_spec.yml b/qa/integration/fixtures/env_variables_condition_spec.yml
new file mode 100644
index 000000000..c27999437
--- /dev/null
+++ b/qa/integration/fixtures/env_variables_condition_spec.yml
@@ -0,0 +1,77 @@
+---
+services:
+  - logstash
+config: |-
+ input {
+    generator {
+      lines => ['{"app": "foobar", "amount": "100", "version": 1, "tag1": "mytag1"}']
+      count => 1
+    }
+  }
+  filter {
+    json {
+       source => "message"
+    }
+
+    if ("${APP}") {
+       mutate { add_tag => ["Truthy"] }
+    }
+    if !([version] == "${BIG}") {
+       mutate { add_tag => ["Not"] }
+    }
+    if "${BIG}" > "${SMALL}" {
+       mutate { add_tag => [">"] }
+    }
+    if "${BIG}" >= "100" {
+       mutate { add_tag => [">="] }
+    }
+    if "${SMALL}" < "${BIG}" {
+       mutate { add_tag => ["<"] }
+    }
+    if "${SMALL}" <= "1" {
+       mutate { add_tag => ["<="] }
+    }
+    if [app] == "${APP}" {
+       mutate { add_tag => ["=="] }
+    }
+    if "${SMALL}" != "${BIG}" {
+       mutate { add_tag => ["!="] }
+    }
+    if [amount] in ["${SMALL}", "${BIG}"] {
+       mutate { add_tag => ["in"] }
+    }
+    if [amount] not in ["${SMALL}", "2", "3"] {
+       mutate { add_tag => ["not in"] }
+    }
+    if [amount] =~ /\d+/ {
+       mutate { add_tag => ["=~"] }
+    }
+    if [amount] =~ /${BIG}/ {
+       mutate { add_tag => ["wrong_regex_substitution"] }
+    }
+    if [amount] !~ /[a-z]+/ {
+       mutate { add_tag => ["!~"] }
+    }
+    if ([app] == "${APP}") and ([app] == "foobar") {
+       mutate { add_tag => ["and"] }
+    }
+    if ([app] == "${APP}") and ([amount] == "${BIG}") and ([version] == 1) and [tag1] == "${TAG1}" {
+       mutate { add_tag => ["more_and"] }
+    }
+    if (1 > 2) or ([app] == "${APP}") {
+       mutate { add_tag => ["or"] }
+    }
+    if ([app] == "${APP}") nand (1 > 2) {
+       mutate { add_tag => ["nand"] }
+    }
+    if (1 > 2) xor ([app] == "${APP}") {
+       mutate { add_tag => ["xor"] }
+    }
+  }
+  output {
+    file {
+      path => "${TEST_ENV_PATH}/env_variables_condition_output.log"
+      flush_interval => 0
+      codec => line { format => "%{message} %{tags}" }
+    }
+  }
\ No newline at end of file
diff --git a/qa/integration/fixtures/es_output_how_spec.yml b/qa/integration/fixtures/es_output_how_spec.yml
index cf2c436b6..2302b21e3 100644
--- a/qa/integration/fixtures/es_output_how_spec.yml
+++ b/qa/integration/fixtures/es_output_how_spec.yml
@@ -2,33 +2,70 @@
 services:
   - logstash
   - elasticsearch
-config: |-
-  input {
-    stdin { }
-  }
+config:
+  default: |-
+    input {
+      stdin { }
+    }
 
-  filter {
-    grok {
-      match => {
-        "message" => "%{IPORHOST:clientip} %{USER:ident} %{USER:auth} \[%{HTTPDATE:timestamp}\] \"%{WORD:verb} %{DATA:request} HTTP/%{NUMBER:httpversion}\" %{NUMBER:response:int} (?:-|%{NUMBER:bytes:int}) %{QS:referrer} %{QS:agent}"
+    filter {
+      grok {
+        match => {
+          "message" => "%{IPORHOST:clientip} %{USER:ident} %{USER:auth} \[%{HTTPDATE:timestamp}\] \"%{WORD:verb} %{DATA:request} HTTP/%{NUMBER:httpversion}\" %{NUMBER:response:int} (?:-|%{NUMBER:bytes:int}) %{QS:referrer} %{QS:agent}"
+        }
+      }
+
+      date {
+        match => [ "timestamp", "dd/MMM/YYYY:HH:mm:ss Z" ]
+        locale => en
+      }
+      geoip {
+        ecs_compatibility => disabled
+        source => "clientip"
+      }
+      useragent {
+        ecs_compatibility => disabled
+        source => "agent"
+        target => "useragent"
       }
     }
 
-    date {
-      match => [ "timestamp", "dd/MMM/YYYY:HH:mm:ss Z" ]
-      locale => en
+    output {
+      elasticsearch {}
     }
-    geoip {
-      source => "clientip"
+  ds_ecs_off: |-
+    input {
+      stdin { ecs_compatibility => disabled }
     }
-    useragent {
-      source => "agent"
-      target => "useragent"
+
+    filter {
+      grok {
+        match => {
+          "message" => "%{IPORHOST:clientip} %{USER:ident} %{USER:auth} \[%{HTTPDATE:timestamp}\] \"%{WORD:verb} %{DATA:request} HTTP/%{NUMBER:httpversion}\" %{NUMBER:response:int} (?:-|%{NUMBER:bytes:int}) %{QS:referrer} %{QS:agent}"
+        }
+      }
+
+      date {
+        match => [ "timestamp", "dd/MMM/YYYY:HH:mm:ss Z" ]
+        locale => en
+      }
+      geoip {
+        ecs_compatibility => disabled
+        source => "clientip"
+      }
+      useragent {
+        ecs_compatibility => disabled
+        source => "agent"
+        target => "useragent"
+      }
+    }
+    output {
+      elasticsearch {
+        data_stream => "false"
+        ecs_compatibility => disabled
+        index => "logstash-integration-test"
+      }
     }
-  }
-  output {
-    elasticsearch {}
-  }
 
 input: how_sample.input
 teardown_script:
diff --git a/qa/integration/fixtures/fatal_error_spec.yml b/qa/integration/fixtures/fatal_error_spec.yml
new file mode 100644
index 000000000..cbfc784af
--- /dev/null
+++ b/qa/integration/fixtures/fatal_error_spec.yml
@@ -0,0 +1,3 @@
+---
+services:
+  - logstash
diff --git a/qa/integration/fixtures/install_java_plugin_spec.yml b/qa/integration/fixtures/install_java_plugin_spec.yml
new file mode 100644
index 000000000..c4cc7f4fe
--- /dev/null
+++ b/qa/integration/fixtures/install_java_plugin_spec.yml
@@ -0,0 +1,13 @@
+---
+services:
+  - logstash
+config: |-
+ input {
+    java_input_example {
+      count => 4
+    }
+    stdin{}
+ }
+ output {
+   null {}
+ }
diff --git a/qa/integration/fixtures/java_api_spec.yml b/qa/integration/fixtures/java_api_spec.yml
new file mode 100644
index 000000000..72a2ce9d3
--- /dev/null
+++ b/qa/integration/fixtures/java_api_spec.yml
@@ -0,0 +1,20 @@
+---
+services:
+- logstash
+config: |-
+  input {
+    java_generator {
+      count => 1
+    }
+  }
+  filter {
+    java_uuid {
+      target => "uuid"
+    }
+    sleep {
+      time => 10
+    }
+  }
+  output {
+    java_stdout { }
+  }
diff --git a/qa/integration/fixtures/keystore_spec.yml b/qa/integration/fixtures/keystore_spec.yml
new file mode 100644
index 000000000..cbfc784af
--- /dev/null
+++ b/qa/integration/fixtures/keystore_spec.yml
@@ -0,0 +1,3 @@
+---
+services:
+  - logstash
diff --git a/qa/integration/fixtures/list_spec.yml b/qa/integration/fixtures/list_spec.yml
new file mode 100644
index 000000000..cbfc784af
--- /dev/null
+++ b/qa/integration/fixtures/list_spec.yml
@@ -0,0 +1,3 @@
+---
+services:
+  - logstash
diff --git a/qa/integration/fixtures/logstash-dummy-pack/Rakefile b/qa/integration/fixtures/logstash-dummy-pack/Rakefile
index bb55078e6..4c7570078 100644
--- a/qa/integration/fixtures/logstash-dummy-pack/Rakefile
+++ b/qa/integration/fixtures/logstash-dummy-pack/Rakefile
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "paquet"
 
 TARGET_DIRECTORY = File.join(File.dirname(__FILE__), "dependencies")
diff --git a/qa/integration/fixtures/logstash-dummy-pack/lib/logstash/outputs/secret.rb b/qa/integration/fixtures/logstash-dummy-pack/lib/logstash/outputs/secret.rb
index 63b97c9cc..787d6c2a2 100644
--- a/qa/integration/fixtures/logstash-dummy-pack/lib/logstash/outputs/secret.rb
+++ b/qa/integration/fixtures/logstash-dummy-pack/lib/logstash/outputs/secret.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/outputs/base"
 
 # An secret output that does nothing.
diff --git a/qa/integration/fixtures/logstash-dummy-pack/logstash-dummy-pack.zip b/qa/integration/fixtures/logstash-dummy-pack/logstash-dummy-pack.zip
index 4d66ebe85..6409f1b90 100644
Binary files a/qa/integration/fixtures/logstash-dummy-pack/logstash-dummy-pack.zip and b/qa/integration/fixtures/logstash-dummy-pack/logstash-dummy-pack.zip differ
diff --git a/qa/integration/fixtures/logstash-dummy-pack/logstash-output-secret.gemspec b/qa/integration/fixtures/logstash-dummy-pack/logstash-output-secret.gemspec
index af9a1e2b1..1b305acc8 100644
--- a/qa/integration/fixtures/logstash-dummy-pack/logstash-output-secret.gemspec
+++ b/qa/integration/fixtures/logstash-dummy-pack/logstash-output-secret.gemspec
@@ -10,24 +10,22 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   # Files
-  s.files = Dir['lib/**/*','spec/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
+  s.files = Dir['lib/**/*', 'spec/**/*', '*.gemspec', '*.md', 'CONTRIBUTORS', 'Gemfile', 'LICENSE', 'NOTICE.TXT']
    # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
   # Special flag to let us know this is actually a logstash plugin
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
-  s.post_install_message =<<eos
+  s.post_install_message = <<eos
 This plugins will require the configuration of XXXXX in the logstash.yml
 
 Make sure you double check your configuration
 eos
 
-
   # Gem dependencies
   s.add_runtime_dependency "manticore"
   s.add_runtime_dependency "gemoji", "< 2.0"
 
-
   s.add_development_dependency "paquet"
   s.add_development_dependency "rake"
 end
diff --git a/qa/integration/fixtures/logstash-dummy-pack/spec/outputs/secret_spec.rb b/qa/integration/fixtures/logstash-dummy-pack/spec/outputs/secret_spec.rb
index 341b7a250..0997fb6ed 100644
--- a/qa/integration/fixtures/logstash-dummy-pack/spec/outputs/secret_spec.rb
+++ b/qa/integration/fixtures/logstash-dummy-pack/spec/outputs/secret_spec.rb
@@ -1,8 +1,23 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/outputs/secret"
 require "logstash/codecs/plain"
-require "logstash/event"
 
 describe LogStash::Outputs::Secret do
   let(:sample_event) { LogStash::Event.new }
diff --git a/qa/integration/fixtures/logstash.keystore b/qa/integration/fixtures/logstash.keystore
new file mode 100644
index 000000000..694f62f19
Binary files /dev/null and b/qa/integration/fixtures/logstash.keystore differ
diff --git a/qa/integration/fixtures/logstash_to_logstash_spec.yml b/qa/integration/fixtures/logstash_to_logstash_spec.yml
new file mode 100644
index 000000000..89401a298
--- /dev/null
+++ b/qa/integration/fixtures/logstash_to_logstash_spec.yml
@@ -0,0 +1,35 @@
+---
+services:
+  - logstash
+config:
+  basic_ls_input: |-
+    input {
+      logstash {
+        ssl_enabled => false
+        username => "logstash"
+        password => "$e0re!"
+      }
+    }
+    output {
+      file {
+        path => '<%=options[:output_file_path]%>'
+        flush_interval => 0
+        codec => line { format => "%{[event][sequence]}:%{message}" }
+      }
+    }
+  basic_ls_output: |-
+    input {
+      generator {
+        count => '<%=options[:generator_count]%>'
+      }
+    }
+    output {
+      logstash {
+        ssl_enabled => false
+        hosts => ["127.0.0.1:9800"]
+        username => "logstash"
+        password => "$e0re!"
+      }
+    }
+
+teardown_script:
\ No newline at end of file
diff --git a/qa/integration/fixtures/mixed_codec_spec.yml b/qa/integration/fixtures/mixed_codec_spec.yml
new file mode 100644
index 000000000..3d105d782
--- /dev/null
+++ b/qa/integration/fixtures/mixed_codec_spec.yml
@@ -0,0 +1,43 @@
+
+---
+services:
+  - logstash
+
+config:
+  input_decode: |-
+    input {
+      java_stdin {
+          codec => json
+      }
+    }
+    output {
+      file {
+        path => "${PATH_TO_OUT}"
+      }
+    }
+
+  input_decode_configured: |-
+    input {
+      java_stdin {
+          codec => plain {
+            charset => "ASCII-8BIT"
+          }
+      }
+    }
+    output {
+      file {
+        path => "${PATH_TO_OUT}"
+      }
+    }    
+
+  output_encode: |-
+    input {
+      generator {
+        count => 4
+      }
+    }
+    output {
+      java_stdout {
+        codec => json
+      }
+    }
\ No newline at end of file
diff --git a/qa/integration/fixtures/monitoring_api_spec.yml b/qa/integration/fixtures/monitoring_api_spec.yml
index 52bff4e9e..ead13e856 100644
--- a/qa/integration/fixtures/monitoring_api_spec.yml
+++ b/qa/integration/fixtures/monitoring_api_spec.yml
@@ -2,3 +2,50 @@
 name: Metrics test
 services:
   - logstash
+config:
+  dropping_events: |-
+    input {
+      tcp {
+        port => '<%=options[:port]%>'
+        type => 'type1'
+      }
+    }
+
+    filter {
+      drop { }
+    }
+
+    output {
+      stdout { }
+    }
+  cloning_events: |-
+    input {
+      tcp {
+        port => '<%=options[:port]%>'
+        type => 'type1'
+      }
+    }
+
+    filter {
+      clone {
+        clones => ["sun", "moon"]
+      }
+    }
+
+    output {
+      stdout { }
+    }
+  draining_events: |-
+    input {
+      tcp {
+        port => '<%=options[:port]%>'
+      }
+      generator { count => 3000 }
+    }
+    filter {
+      sleep { 
+       time => "1" 
+        every => 10
+      }
+      drop { }
+    }
diff --git a/qa/integration/fixtures/persistent_queues/log4j2.properties b/qa/integration/fixtures/persistent_queues/log4j2.properties
index ac9273b64..3bc313e03 100644
--- a/qa/integration/fixtures/persistent_queues/log4j2.properties
+++ b/qa/integration/fixtures/persistent_queues/log4j2.properties
@@ -4,7 +4,7 @@ name = LogstashPropertiesConfig
 appender.console.type = Console
 appender.console.name = plain_console
 appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n
+appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n
 
 appender.json_console.type = Console
 appender.json_console.name = json_console
@@ -14,19 +14,24 @@ appender.json_console.layout.eventEol = true
 
 appender.rolling.type = RollingFile
 appender.rolling.name = plain_rolling
-appender.rolling.fileName = ${sys:ls.logs}/logstash-${sys:ls.log.format}.log
-appender.rolling.filePattern = ${sys:ls.logs}/logstash-${sys:ls.log.format}-%d{yyyy-MM-dd}.log
+appender.rolling.fileName = ${sys:ls.logs}/logstash-plain.log
+appender.rolling.filePattern = ${sys:ls.logs}/logstash-plain-%d{yyyy-MM-dd}.log
 appender.rolling.policies.type = Policies
 appender.rolling.policies.time.type = TimeBasedTriggeringPolicy
 appender.rolling.policies.time.interval = 1
 appender.rolling.policies.time.modulate = true
 appender.rolling.layout.type = PatternLayout
-appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %-.10000m%n
+appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n
+appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.rolling.policies.size.size = 100MB
+appender.rolling.strategy.type = DefaultRolloverStrategy
+appender.rolling.strategy.max = 30
+appender.rolling.avoid_pipelined_filter.type = PipelineRoutingFilter
 
 appender.json_rolling.type = RollingFile
 appender.json_rolling.name = json_rolling
-appender.json_rolling.fileName = ${sys:ls.logs}/logstash-${sys:ls.log.format}.log
-appender.json_rolling.filePattern = ${sys:ls.logs}/logstash-${sys:ls.log.format}-%d{yyyy-MM-dd}.log
+appender.json_rolling.fileName = ${sys:ls.logs}/logstash-json.log
+appender.json_rolling.filePattern = ${sys:ls.logs}/logstash-json-%d{yyyy-MM-dd}.log
 appender.json_rolling.policies.type = Policies
 appender.json_rolling.policies.time.type = TimeBasedTriggeringPolicy
 appender.json_rolling.policies.time.interval = 1
@@ -34,11 +39,29 @@ appender.json_rolling.policies.time.modulate = true
 appender.json_rolling.layout.type = JSONLayout
 appender.json_rolling.layout.compact = true
 appender.json_rolling.layout.eventEol = true
+appender.json_rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.json_rolling.policies.size.size = 100MB
+appender.json_rolling.strategy.type = DefaultRolloverStrategy
+appender.json_rolling.strategy.max = 30
+appender.json_rolling.avoid_pipelined_filter.type = PipelineRoutingFilter
 
+appender.routing.type = PipelineRouting
+appender.routing.name = pipeline_routing_appender
+appender.routing.pipeline.type = RollingFile
+appender.routing.pipeline.name = appender-${ctx:pipeline.id}
+appender.routing.pipeline.fileName = ${sys:ls.logs}/pipeline_${ctx:pipeline.id}.log
+appender.routing.pipeline.filePattern = ${sys:ls.logs}/pipeline_${ctx:pipeline.id}.%i.log.gz
+appender.routing.pipeline.layout.type = PatternLayout
+appender.routing.pipeline.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n
+appender.routing.pipeline.policy.type = SizeBasedTriggeringPolicy
+appender.routing.pipeline.policy.size = 100MB
+appender.routing.pipeline.strategy.type = DefaultRolloverStrategy
+appender.routing.pipeline.strategy.max = 30
 
 rootLogger.level = ${sys:ls.log.level}
 rootLogger.appenderRef.console.ref = ${sys:ls.log.format}_console
 rootLogger.appenderRef.rolling.ref = ${sys:ls.log.format}_rolling
+rootLogger.appenderRef.routing.ref = pipeline_routing_appender
 
 # Slowlog
 
@@ -55,19 +78,19 @@ appender.json_console_slowlog.layout.eventEol = true
 
 appender.rolling_slowlog.type = RollingFile
 appender.rolling_slowlog.name = plain_rolling_slowlog
-appender.rolling_slowlog.fileName = ${sys:ls.logs}/logstash-slowlog-${sys:ls.log.format}.log
-appender.rolling_slowlog.filePattern = ${sys:ls.logs}/logstash-slowlog-${sys:ls.log.format}-%d{yyyy-MM-dd}.log
+appender.rolling_slowlog.fileName = ${sys:ls.logs}/logstash-slowlog-plain.log
+appender.rolling_slowlog.filePattern = ${sys:ls.logs}/logstash-slowlog-plain-%d{yyyy-MM-dd}.log
 appender.rolling_slowlog.policies.type = Policies
 appender.rolling_slowlog.policies.time.type = TimeBasedTriggeringPolicy
 appender.rolling_slowlog.policies.time.interval = 1
 appender.rolling_slowlog.policies.time.modulate = true
 appender.rolling_slowlog.layout.type = PatternLayout
-appender.rolling_slowlog.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %.10000m%n
+appender.rolling_slowlog.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %m%n
 
 appender.json_rolling_slowlog.type = RollingFile
 appender.json_rolling_slowlog.name = json_rolling_slowlog
-appender.json_rolling_slowlog.fileName = ${sys:ls.logs}/logstash-slowlog-${sys:ls.log.format}.log
-appender.json_rolling_slowlog.filePattern = ${sys:ls.logs}/logstash-slowlog-${sys:ls.log.format}-%d{yyyy-MM-dd}.log
+appender.json_rolling_slowlog.fileName = ${sys:ls.logs}/logstash-slowlog-json.log
+appender.json_rolling_slowlog.filePattern = ${sys:ls.logs}/logstash-slowlog-json-%d{yyyy-MM-dd}.log
 appender.json_rolling_slowlog.policies.type = Policies
 appender.json_rolling_slowlog.policies.time.type = TimeBasedTriggeringPolicy
 appender.json_rolling_slowlog.policies.time.interval = 1
@@ -81,3 +104,29 @@ logger.slowlog.level = trace
 logger.slowlog.appenderRef.console_slowlog.ref = ${sys:ls.log.format}_console_slowlog
 logger.slowlog.appenderRef.rolling_slowlog.ref = ${sys:ls.log.format}_rolling_slowlog
 logger.slowlog.additivity = false
+
+# Deprecation log
+appender.deprecation_rolling.type = RollingFile
+appender.deprecation_rolling.name = deprecation_plain_rolling
+appender.deprecation_rolling.fileName = ${sys:ls.logs}/logstash-deprecation.log
+appender.deprecation_rolling.filePattern = ${sys:ls.logs}/logstash-deprecation-%d{yyyy-MM-dd}.log.gz
+appender.deprecation_rolling.policies.type = Policies
+appender.deprecation_rolling.policies.time.type = TimeBasedTriggeringPolicy
+appender.deprecation_rolling.policies.time.interval = 1
+appender.deprecation_rolling.policies.time.modulate = true
+appender.deprecation_rolling.layout.type = PatternLayout
+appender.deprecation_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c]%notEmpty{[%X{pipeline.id}]}%notEmpty{[%X{plugin.id}]} %m%n
+appender.deprecation_rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.deprecation_rolling.policies.size.size = 100MB
+appender.deprecation_rolling.strategy.type = DefaultRolloverStrategy
+appender.deprecation_rolling.strategy.max = 30
+
+logger.deprecation.name = org.logstash.deprecation, deprecation
+logger.deprecation.level = WARN
+logger.deprecation.appenderRef.deprecation_rolling.ref = deprecation_plain_rolling
+logger.deprecation.additivity = false
+
+logger.deprecation_root.name = deprecation
+logger.deprecation_root.level = WARN
+logger.deprecation_root.appenderRef.deprecation_rolling.ref = deprecation_plain_rolling
+logger.deprecation_root.additivity = false
diff --git a/qa/integration/fixtures/persistent_queues/logstash.yml b/qa/integration/fixtures/persistent_queues/logstash.yml
index 1ee962bd8..028c3129c 100644
--- a/qa/integration/fixtures/persistent_queues/logstash.yml
+++ b/qa/integration/fixtures/persistent_queues/logstash.yml
@@ -1 +1,2 @@
 queue.type: persisted
+queue.drain: true
diff --git a/qa/integration/fixtures/pipeline_log_spec.yml b/qa/integration/fixtures/pipeline_log_spec.yml
new file mode 100644
index 000000000..661138bdf
--- /dev/null
+++ b/qa/integration/fixtures/pipeline_log_spec.yml
@@ -0,0 +1,12 @@
+---
+services:
+  - logstash
+config: |-
+ input {
+    generator {
+      count => 4
+    }
+ }
+ output {
+   null {}
+ }
diff --git a/qa/integration/fixtures/plugin_name_log_spec.yml b/qa/integration/fixtures/plugin_name_log_spec.yml
new file mode 100644
index 000000000..f21a5d8e0
--- /dev/null
+++ b/qa/integration/fixtures/plugin_name_log_spec.yml
@@ -0,0 +1,18 @@
+---
+services:
+  - logstash
+config: |-
+ input {
+    generator {
+      count => 4
+    }
+ }
+ filter {
+      sleep {
+        id => "sleep_filter_123"
+        time => 1
+      }
+ }
+ output {
+   null {}
+ }
diff --git a/qa/integration/fixtures/plugins/.gitignore b/qa/integration/fixtures/plugins/.gitignore
new file mode 100644
index 000000000..c111b3313
--- /dev/null
+++ b/qa/integration/fixtures/plugins/.gitignore
@@ -0,0 +1 @@
+*.gem
diff --git a/qa/integration/fixtures/plugins/generate-gems.sh b/qa/integration/fixtures/plugins/generate-gems.sh
new file mode 100755
index 000000000..2871367b2
--- /dev/null
+++ b/qa/integration/fixtures/plugins/generate-gems.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+
+cd "$( dirname "$0" )"
+find . -name '*.gemspec' | xargs -n1 gem build
\ No newline at end of file
diff --git a/qa/integration/fixtures/plugins/logstash-filter-four_depends_on_one_and_three.gemspec b/qa/integration/fixtures/plugins/logstash-filter-four_depends_on_one_and_three.gemspec
new file mode 100644
index 000000000..a2b36dfb7
--- /dev/null
+++ b/qa/integration/fixtures/plugins/logstash-filter-four_depends_on_one_and_three.gemspec
@@ -0,0 +1,26 @@
+Gem::Specification.new do |s|
+  s.name            = File.basename(__FILE__, ".gemspec")
+  s.version         = '0.1.1'
+  s.licenses        = ['Apache-2.0']
+  s.summary         = "A dummy plugin with two plugin dependencies"
+  s.description     = "This plugin is only used in the acceptance test"
+  s.authors         = ["Elasticsearch"]
+  s.email           = 'info@elasticsearch.com'
+  s.homepage        = "http://www.elasticsearch.org/guide/en/logstash/current/index.html"
+  s.require_paths = ["lib"]
+
+  # Files
+  s.files = [__FILE__]
+
+  # Tests
+  s.test_files = []
+
+  # Special flag to let us know this is actually a logstash plugin
+  s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
+
+  # Gem dependencies
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
+
+  s.add_runtime_dependency "logstash-filter-one_no_dependencies", "~> 0.1"
+  s.add_runtime_dependency "logstash-filter-three_no_dependencies", "~> 0.1"
+end
diff --git a/qa/integration/fixtures/plugins/logstash-filter-one_no_dependencies.gemspec b/qa/integration/fixtures/plugins/logstash-filter-one_no_dependencies.gemspec
new file mode 100644
index 000000000..edc854a29
--- /dev/null
+++ b/qa/integration/fixtures/plugins/logstash-filter-one_no_dependencies.gemspec
@@ -0,0 +1,23 @@
+Gem::Specification.new do |s|
+  s.name            = File.basename(__FILE__, ".gemspec")
+  s.version         = '0.1.1'
+  s.licenses        = ['Apache-2.0']
+  s.summary         = "A dummy plugin with no dependencies"
+  s.description     = "This plugin is only used in the acceptance test"
+  s.authors         = ["Elasticsearch"]
+  s.email           = 'info@elasticsearch.com'
+  s.homepage        = "http://www.elasticsearch.org/guide/en/logstash/current/index.html"
+  s.require_paths = ["lib"]
+
+  # Files
+  s.files = [__FILE__]
+
+  # Tests
+  s.test_files = []
+
+  # Special flag to let us know this is actually a logstash plugin
+  s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
+
+  # Gem dependencies
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
+end
diff --git a/qa/integration/fixtures/plugins/logstash-filter-three_no_dependencies.gemspec b/qa/integration/fixtures/plugins/logstash-filter-three_no_dependencies.gemspec
new file mode 100644
index 000000000..edc854a29
--- /dev/null
+++ b/qa/integration/fixtures/plugins/logstash-filter-three_no_dependencies.gemspec
@@ -0,0 +1,23 @@
+Gem::Specification.new do |s|
+  s.name            = File.basename(__FILE__, ".gemspec")
+  s.version         = '0.1.1'
+  s.licenses        = ['Apache-2.0']
+  s.summary         = "A dummy plugin with no dependencies"
+  s.description     = "This plugin is only used in the acceptance test"
+  s.authors         = ["Elasticsearch"]
+  s.email           = 'info@elasticsearch.com'
+  s.homepage        = "http://www.elasticsearch.org/guide/en/logstash/current/index.html"
+  s.require_paths = ["lib"]
+
+  # Files
+  s.files = [__FILE__]
+
+  # Tests
+  s.test_files = []
+
+  # Special flag to let us know this is actually a logstash plugin
+  s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
+
+  # Gem dependencies
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
+end
diff --git a/qa/integration/fixtures/plugins/logstash-filter-two_depends_on_one.gemspec b/qa/integration/fixtures/plugins/logstash-filter-two_depends_on_one.gemspec
new file mode 100644
index 000000000..e0c724ede
--- /dev/null
+++ b/qa/integration/fixtures/plugins/logstash-filter-two_depends_on_one.gemspec
@@ -0,0 +1,25 @@
+Gem::Specification.new do |s|
+  s.name            = File.basename(__FILE__, ".gemspec")
+  s.version         = '0.1.1'
+  s.licenses        = ['Apache-2.0']
+  s.summary         = "A dummy plugin with one plugin dependency"
+  s.description     = "This plugin is only used in the acceptance test"
+  s.authors         = ["Elasticsearch"]
+  s.email           = 'info@elasticsearch.com'
+  s.homepage        = "http://www.elasticsearch.org/guide/en/logstash/current/index.html"
+  s.require_paths = ["lib"]
+
+  # Files
+  s.files = [__FILE__]
+
+  # Tests
+  s.test_files = []
+
+  # Special flag to let us know this is actually a logstash plugin
+  s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
+
+  # Gem dependencies
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
+
+  s.add_runtime_dependency "logstash-filter-one_no_dependencies", "~> 0.1"
+end
diff --git a/qa/integration/fixtures/plugins/logstash-filter-zero_no_dependencies.gemspec b/qa/integration/fixtures/plugins/logstash-filter-zero_no_dependencies.gemspec
new file mode 100644
index 000000000..edc854a29
--- /dev/null
+++ b/qa/integration/fixtures/plugins/logstash-filter-zero_no_dependencies.gemspec
@@ -0,0 +1,23 @@
+Gem::Specification.new do |s|
+  s.name            = File.basename(__FILE__, ".gemspec")
+  s.version         = '0.1.1'
+  s.licenses        = ['Apache-2.0']
+  s.summary         = "A dummy plugin with no dependencies"
+  s.description     = "This plugin is only used in the acceptance test"
+  s.authors         = ["Elasticsearch"]
+  s.email           = 'info@elasticsearch.com'
+  s.homepage        = "http://www.elasticsearch.org/guide/en/logstash/current/index.html"
+  s.require_paths = ["lib"]
+
+  # Files
+  s.files = [__FILE__]
+
+  # Tests
+  s.test_files = []
+
+  # Special flag to let us know this is actually a logstash plugin
+  s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
+
+  # Gem dependencies
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
+end
diff --git a/qa/integration/fixtures/reserved_tags_field_spec.yml b/qa/integration/fixtures/reserved_tags_field_spec.yml
new file mode 100644
index 000000000..02348fe41
--- /dev/null
+++ b/qa/integration/fixtures/reserved_tags_field_spec.yml
@@ -0,0 +1,54 @@
+---
+services:
+  - logstash
+config:
+  create_tags_map: |-
+    input {
+      generator {
+        message => '{"tags": {"poison":true} }'
+        codec => json
+        count => 1
+      }
+    }
+    output {
+      file {
+        path => "${TEMP_PATH}/create_tags_map.log"
+        flush_interval => 0
+        codec => json
+      }
+    }
+  create_tags_number: |-
+    input {
+      generator {
+        message => '{"tags": [1,2,3] }'
+        codec => json
+        count => 1
+      }
+    }
+    output {
+      file {
+        path => "${TEMP_PATH}/create_tags_number.log"
+        flush_interval => 0
+        codec => json
+      }
+    }
+  set_illegal_tags: |-
+    input {
+      generator {
+        message => '{"greeting": "hello"}'
+        codec => json
+        count => 1
+      }
+    }
+    filter {
+      ruby { code => "event.set('[tags]' , 123);" }
+      ruby { code => "event.set('[tags][poison]' , 'true');" }
+    }
+    output {
+      file {
+        path => "${TEMP_PATH}/set_illegal_tags.log"
+        flush_interval => 0
+        codec => json
+      }
+    }
+teardown_script:
diff --git a/qa/integration/fixtures/update_spec.yml b/qa/integration/fixtures/update_spec.yml
new file mode 100644
index 000000000..cbfc784af
--- /dev/null
+++ b/qa/integration/fixtures/update_spec.yml
@@ -0,0 +1,3 @@
+---
+services:
+  - logstash
diff --git a/qa/integration/fixtures/webserver_certs/generate.sh b/qa/integration/fixtures/webserver_certs/generate.sh
new file mode 100755
index 000000000..544165cf2
--- /dev/null
+++ b/qa/integration/fixtures/webserver_certs/generate.sh
@@ -0,0 +1,70 @@
+# warning: do not use the certificates produced by this tool in production. This is for testing purposes only
+set -e
+
+rm -rf generated
+mkdir generated
+cd generated
+
+echo "GENERATED CERTIFICATES FOR TESTING ONLY." >> ./README.txt
+echo "DO NOT USE THESE CERTIFICATES IN PRODUCTION" >> ./README.txt
+
+# certificate authority
+openssl genrsa -out root.key 4096
+openssl req -new -x509 -days 1826 -extensions ca -key root.key -out root.crt -subj "/C=PT/ST=NA/L=Lisbon/O=MyLab/CN=root" -config ../openssl.cnf
+
+
+# intermediate CA
+openssl genrsa -out intermediate-ca.key 4096
+openssl req -new -key intermediate-ca.key -out intermediate-ca.csr -subj "/C=PT/ST=NA/L=Lisbon/O=MyLab/CN=intermediate-ca" -config ../openssl.cnf
+openssl x509 -req -days 1000 -extfile ../openssl.cnf -extensions intermediate_ca -in intermediate-ca.csr -CA root.crt -CAkey root.key -out intermediate-ca.crt -set_serial 01
+
+# server certificate from intermediate CA
+openssl genrsa -out server_from_intermediate.key 4096
+openssl req -new -key server_from_intermediate.key -out server_from_intermediate.csr -subj "/C=PT/ST=NA/L=Lisbon/O=MyLab/CN=server" -config ../openssl.cnf
+openssl x509 -req -extensions server_cert -extfile ../openssl.cnf -days 1000 -in server_from_intermediate.csr -CA intermediate-ca.crt -CAkey intermediate-ca.key -set_serial 02 -out server_from_intermediate.crt
+
+# server certificate from root
+openssl genrsa -out server_from_root.key 4096
+openssl req -new -key server_from_root.key -out server_from_root.csr -subj "/C=PT/ST=NA/L=Lisbon/O=MyLab/CN=server" -config ../openssl.cnf
+openssl x509 -req -extensions server_cert -extfile ../openssl.cnf -days 1000 -in server_from_root.csr -CA root.crt -CAkey root.key -set_serial 03 -out server_from_root.crt
+
+
+# Client certificates - We don't need them now
+
+# client certificate from intermediate CA
+# openssl genrsa -out client_from_intermediate.key 4096
+# openssl req -new -key client_from_intermediate.key -out client_from_intermediate.csr -subj "/C=PT/ST=NA/L=Lisbon/O=MyLab/CN=client" -config ../openssl.cnf
+# openssl x509 -req -extensions client_cert -extfile ../openssl.cnf -days 1000 -in client_from_intermediate.csr -CA intermediate-ca.crt -CAkey intermediate-ca.key -set_serial 04 -out client_from_intermediate.crt
+
+# client certificate from root
+# openssl genrsa -out client_from_root.key 4096
+# openssl req -new -key client_from_root.key -out client_from_root.csr -subj "/C=PT/ST=NA/L=Lisbon/O=MyLab/CN=client" -config ../openssl.cnf
+# openssl x509 -req -extensions client_cert -extfile ../openssl.cnf -days 1000 -in client_from_root.csr -CA root.crt -CAkey root.key -set_serial 04 -out client_from_root.crt
+
+# create server chain pems.
+cat intermediate-ca.crt server_from_intermediate.crt > server_from_intermediate.chain.crt
+cat server_from_root.crt > server_from_root.chain.crt
+
+# verify :allthethings
+openssl verify -CAfile root.crt intermediate-ca.crt
+openssl verify -CAfile root.crt server_from_root.crt
+openssl verify -CAfile root.crt -untrusted intermediate-ca.crt server_from_intermediate.crt
+openssl verify -CAfile root.crt server_from_root.chain.crt
+openssl verify -CAfile root.crt server_from_intermediate.chain.crt
+
+# create pkcs8 versions of all keys..they may be handy but we don't need them now
+# openssl pkcs8 -topk8 -inform PEM -outform PEM -nocrypt -in root.key -out root.key.pkcs8
+# openssl pkcs8 -topk8 -inform PEM -outform PEM -nocrypt -in intermediate-ca.key -out intermediate-ca.key.pkcs8
+# openssl pkcs8 -topk8 -inform PEM -outform PEM -nocrypt -in server_from_intermediate.key -out server_from_intermediate.key.pkcs8
+# openssl pkcs8 -topk8 -inform PEM -outform PEM -nocrypt -in server_from_root.key -out server_from_root.key.pkcs8
+
+# create pkcs12 keystores (pass:12345678)
+openssl pkcs12 -export -in server_from_intermediate.chain.crt -inkey server_from_intermediate.key -out server_from_intermediate.p12 -name "server_from_intermediate" -passout 'pass:12345678'
+openssl pkcs12 -export -in server_from_root.chain.crt -inkey server_from_root.key -out server_from_root.p12 -name "server_from_root" -passout 'pass:12345678'
+
+# use java keytool to convert all pkcs12 keystores to jks-format keystores (pass:12345678)
+keytool -importkeystore -srckeystore server_from_intermediate.p12 -srcstoretype pkcs12 -srcstorepass 12345678 -destkeystore server_from_intermediate.jks -deststorepass 12345678 -alias server_from_intermediate
+keytool -importkeystore -srckeystore server_from_root.p12 -srcstoretype pkcs12 -srcstorepass 12345678 -destkeystore server_from_root.jks -deststorepass 12345678 -alias server_from_root
+
+# cleanup csr, we don't need them
+rm -rf *.csr
diff --git a/qa/integration/fixtures/webserver_certs/generated/README.txt b/qa/integration/fixtures/webserver_certs/generated/README.txt
new file mode 100644
index 000000000..e4fa8b79f
--- /dev/null
+++ b/qa/integration/fixtures/webserver_certs/generated/README.txt
@@ -0,0 +1,2 @@
+GENERATED CERTIFICATES FOR TESTING ONLY.
+DO NOT USE THESE CERTIFICATES IN PRODUCTION
diff --git a/qa/integration/fixtures/webserver_certs/generated/intermediate-ca.crt b/qa/integration/fixtures/webserver_certs/generated/intermediate-ca.crt
new file mode 100644
index 000000000..ca9ed7cba
--- /dev/null
+++ b/qa/integration/fixtures/webserver_certs/generated/intermediate-ca.crt
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFgDCCA2igAwIBAgIBATANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQGEwJQVDEL
+MAkGA1UECAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UECgwFTXlMYWIxDTAL
+BgNVBAMMBHJvb3QwHhcNMjQwNzE2MTUzNTAzWhcNMjcwNDEyMTUzNTAzWjBVMQsw
+CQYDVQQGEwJQVDELMAkGA1UECAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UE
+CgwFTXlMYWIxGDAWBgNVBAMMD2ludGVybWVkaWF0ZS1jYTCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBALUBL8nGcBsOrfv/uI555eOiBgFYD+V3etaiFDi6
+MtZynj9oazrssevjNwP045j8a2L9apjeq9U5REs2MrYoHTEPoIeOiFPNQfiBtJt/
+DjBiXYQbrSfpkjPmRREPKkTX9lFNSlEmG3y+kNMyASvR3K4IM6Bqd+FYt/GUyhZP
+LFx9ZhRAiq5uulLqVaAdAp+wdjAXeSedtCTs+20aW+NKA32+Pb8vzJp6HOmh+ZXl
+orlEyKKfUYI3ODu9IoXTu6ZN8XZ4LfrDu47wswgQU4n2TOn+Qm7nwE9GIjQBjYOz
+s3eUYyzE/z5oyrC6t2Z2ZEq2pCwMwf7iPXRFrgSvgLJCCSdwrB/bTxghM0vmFeoV
+V2vfTp3VC/WbSW59tV++iMyMQTPw+grg0NEJCrwNnFJ1DL9iT0f902z2mknxuCM+
+2HGpt2EG+FnU4kR2gHQKt4BNGIuscchp8J85CGjheoNvuHaUktVWwqUaHUL8b9MV
+dav10Obfr0+bWNIY2xsufM8sX/QP3VsfJ/nFkoImYNW5SI5g7/5DTIxIE/z8Ab1a
+4JT2JCzPO8wDFyle4RVOG+2WfDBUkkjIjXlfxBwLneTPzqv5jmpPIwcpdF0c9bWw
+Jwb/e4hB/bAFwZvLFr0aypJ0Zqbc/67n5HDsKx8+/XUKar1qPP6AzrfecOmBwwOH
+AsE7AgMBAAGjZjBkMB0GA1UdDgQWBBT5X+u4LkGBED9seTSNYgA40tXJUTAfBgNV
+HSMEGDAWgBQB2VzO86glAf1wb5+bjW8YPxZlpTASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAGb6iGwxKXTSgxP96
+4UMtpKYFGykBuajxr105jFSjXArhjj5/U21nIHQ3vrmAGAMY6iaaeKJ78gYSfm+O
+zC5o8f4PLxtPfRJGymGUISrtIpBUTz+CVNAwQw0yrAeROizoUBhpDmUVrzlSfwgm
+uH3H94jvi/IpoxUezsr1tS48G8ayaVlrPLflBhgX1NXzonA0KqGNdm5AwOx3jgZi
+v5PYtz6xR1NtINnGm42A078gL9XHXmZowacGPNf7flwU9UzU1LDb1snGCxOgNq0e
+ABZmd4TbEqMs1mAmn6ymzAIU2wBOStcC0is1MJ1j/NVVixETrx65UY1BTMlIojDT
+bV4fbYy7jo8rtoLdnwFd+DdXna2LJ8qq+7CE35f9c+ZxLkdSfqADISwkhR+J/6TB
+plRVyBc4eiPdSV27qPbjMOEHKy43+rHTsBILqIOQ0sBlMe8DgD8ZXo+PUM1Ptadn
+PsuHwSflCrIz6AHgG/nORSDQf+7U79mejzi3fIjwYyYpSlBemTuW+z3x1xizN6PY
+CK9zuZu8K9Z/F7GQmr3xBEtWqH2rd7TcN7fQP+zmG/v++vPlE38cQFWv5vVISxJe
+U6AOJmXKNvDB4QR5CPsd6UWn/Nb1K3/MlDu5ymLq9JXm/GeokaGqHuaLLR20yN7w
+/kNCmGr6r+cWAxpEZkmSBUg8/ps=
+-----END CERTIFICATE-----
diff --git a/qa/integration/fixtures/webserver_certs/generated/intermediate-ca.key b/qa/integration/fixtures/webserver_certs/generated/intermediate-ca.key
new file mode 100644
index 000000000..924a05073
--- /dev/null
+++ b/qa/integration/fixtures/webserver_certs/generated/intermediate-ca.key
@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQC1AS/JxnAbDq37
+/7iOeeXjogYBWA/ld3rWohQ4ujLWcp4/aGs67LHr4zcD9OOY/Gti/WqY3qvVOURL
+NjK2KB0xD6CHjohTzUH4gbSbfw4wYl2EG60n6ZIz5kURDypE1/ZRTUpRJht8vpDT
+MgEr0dyuCDOganfhWLfxlMoWTyxcfWYUQIqubrpS6lWgHQKfsHYwF3knnbQk7Ptt
+GlvjSgN9vj2/L8yaehzpofmV5aK5RMiin1GCNzg7vSKF07umTfF2eC36w7uO8LMI
+EFOJ9kzp/kJu58BPRiI0AY2Ds7N3lGMsxP8+aMqwurdmdmRKtqQsDMH+4j10Ra4E
+r4CyQgkncKwf208YITNL5hXqFVdr306d1Qv1m0lufbVfvojMjEEz8PoK4NDRCQq8
+DZxSdQy/Yk9H/dNs9ppJ8bgjPthxqbdhBvhZ1OJEdoB0CreATRiLrHHIafCfOQho
+4XqDb7h2lJLVVsKlGh1C/G/TFXWr9dDm369Pm1jSGNsbLnzPLF/0D91bHyf5xZKC
+JmDVuUiOYO/+Q0yMSBP8/AG9WuCU9iQszzvMAxcpXuEVThvtlnwwVJJIyI15X8Qc
+C53kz86r+Y5qTyMHKXRdHPW1sCcG/3uIQf2wBcGbyxa9GsqSdGam3P+u5+Rw7Csf
+Pv11Cmq9ajz+gM633nDpgcMDhwLBOwIDAQABAoICACWvipCbNUoc41KdaoKXlKqx
+WEi9Wgnvt26qrkUlV2JY2OPgzLqm/2BanWDAgwaeP4mLs78CVYp+ct6p+SL99R36
+3/R5U58HFF42OzFI4d5nDItt675snhkaL3Ue0DEnOcyxp/B/W6e8UZD3T1EdT7IY
+WQ9kO3N6skmlLfI5J8ZWAYPj8DvjJ/4NdihxAdPXvLPEn2AFMLWjdbHAlDMdfN6Y
+VmjQ/euH0y89nyZ7ekbSsGdTfnf7IUUm2uI8NEyq28RLv17/k7RuHwhlxc7qrhbl
+7lUDAYI/2u0zCZDLQGl8Rq3SkkYfMVxcc8Tsj3MS1dmqClYUKrFjtJibJdN3dkoa
+/I8OUSG+OO8X1H6nd0Ht63RqBXYgR7y1+P8aGVuJYnNAdnj2iMmGulQmaXthlX/O
+2lpoFJmhSZT1Ih00m29yIY8XhbKXddZvjg8zhVYmgk5KEZhN2+tF1EYTsBCtxvWh
+jJ3O6TXSP+WQFByeAMl07hG/1NGa9hvgOktNCT3QjSosJWGRNj3oaZL3RwtUYOnJ
+UOBzbPY00jF19/KGUMy/R8t1fOS3Z8e3qD9CLeMkr9TN0VBXFGYaMSrq+AvqTgco
+uA16/ctdZcj80bwOYU6JqNqycW5S4V8t2KX4MhMf5bZ5dL13OVPhVY0ltKBEdOC3
+YBO5WvQ7l6pH5QEjWoPBAoIBAQDo1p8GDY62MMqxTUtrB/Bqz/Vsa7SgCGmSmRBB
+PBfkxxARI28jTX4v528au1J5h3GZNs0gzWtbQW0yUN3hvf7KaERfBOAupg3nUO8D
+731JL8jcX86UjS77PxzALlvNNONItFWZcH2VIMKJCeFRp79cVaHZtqHMqOcq4Lrc
+BYjZyIcNVSMEMIO9E1ZJB0t6Gesa69OPenC0v9ywBF2h0YP9XGbCN370JfR6rJwZ
+yvB29et91/agCorZBlctnRhRXYjQVqBMetpsC6tet3H/B9BfUSrQ81zeEJes/roz
+aAYym89Vvav3Gi/P/NP96aEefcyG19cnTTXskeSkIkpIEG+bAoIBAQDHApYSxXKK
+iPsakBno9OUA747YvyuBI2Uh7+HKGbM7sVyl7UhwduI2qpxG6xjz5+NOxJe12XQI
+91+KAciuKNZ3WguxtgKy5CFLlC3syV5nuvfTWwt19qg2I+EiXT1YQ09LmhG7M1WW
+xwj/QI770YlbVW8NA9pB40ojPRUB6a9QynGBvj0fTdr1IDs23Eb11s/1f5pPAfmf
+ENehdZG8aTuPDKbdL++yHrg2n+v/aAWS453eUvE/evk1kv2n0hqNwJomn/e7MH0h
+DFfdTHNOaT9jS8W/6TvnXTnwqCPofbVdJkwIpsyqFP99JpLv2DkjWBpnER6K2sN3
+4tlFutH3fZ7hAoIBAHhQluHg1ZLNiZ+uyj7nXlNDXJWG3lInpq4LC/w5mjsspd/F
+SKOcYo1McPwGOer0kz3RtJOzsjr4hv2ODemdbPCYimPzOAjC48JY7vlAoqPT3l4J
+38yhW9qWVTv1eJiEMMIb9XORTkNmJz/67ARuwxJqaXT/y4He8X0VnVkePwYSeb7o
+9GwwyZJFULvx2g2hIPzLSYoFggHUdqw5xUxd4G9mdO79EEwG5NsTIKKvXCyMjQB9
+PUKbz/2vKhM27x70T0Mg0DpU7VMRgJ8z+eMH3aOzZIWOi7lwJ4BMLFlt8m3qV2v9
+08OfM3+tLLozJH+GD87J77KuUiQJi3VJBstQOusCggEAbPNOg9JS5eMeTamMdcv0
+v3FnK+RlBdsB1/WDEGjHhiuQhEqGeQOszq7SxcSZsZZHDG12fRkifHIpfN2DJ022
+NDs44b66dYONctoZ1mNb6sAiQzS57ofuCU3VSEHxfqvC8qnTgUAWYGhw1YVbgiNx
+5m28UUzFpYKwqOAc6yIrV7itMZGb1tKBx+cwY9Vuh9JloYqNSSnUpi/LTVqXQaX+
+9E7B36AJwuMsiMM+qWIigwtX90pDRzSk0J67fa/515cVDYZQUsu2BWzDgaUED25x
+RIRMK8edgwm32bfDiNmhe/CmeaoPrCG4yaRfly0yAtaOBdUKeoxPrQelWZZwsuS0
+IQKCAQEA1bzyZGNAf39eJ8munj703lTgANCjSqKMoHb8T9Y42ikOvrM0tH/0gOTs
+43CHNI8gxeJXrjv1HpUr7kfkIX5aBvRGoG4kxS4uodQUWB80KW66esbbU2XzpuGO
+uB9jjmY42EhT7wXNde9PWdu288YhVHqqIXHQMbdjfp2HjQGUnKuwWVxNSDtFSeC2
+yTM4cqkUH5tkpH/2KpGgZzEUN2MtHSt0+kojkVei/RJqRqm0/YnN9h0j8wAr2DRx
+6tEQIBg6JR3dqYLmOTrTJl/6Quov65hbAR5gKDCaxw+jBp68hxs+SxOCBLIKgzSz
+UhU2dLCAXnNdC7uFxDlGq9G5/e6SHw==
+-----END PRIVATE KEY-----
diff --git a/qa/integration/fixtures/webserver_certs/generated/root.crt b/qa/integration/fixtures/webserver_certs/generated/root.crt
new file mode 100644
index 000000000..23c26078b
--- /dev/null
+++ b/qa/integration/fixtures/webserver_certs/generated/root.crt
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFhTCCA22gAwIBAgIUM0vS1bRQQCJzcfsSQBT78uhQ7lUwDQYJKoZIhvcNAQEL
+BQAwSjELMAkGA1UEBhMCUFQxCzAJBgNVBAgMAk5BMQ8wDQYDVQQHDAZMaXNib24x
+DjAMBgNVBAoMBU15TGFiMQ0wCwYDVQQDDARyb290MB4XDTI0MDcxNjE1MzUwM1oX
+DTI5MDcxNjE1MzUwM1owSjELMAkGA1UEBhMCUFQxCzAJBgNVBAgMAk5BMQ8wDQYD
+VQQHDAZMaXNib24xDjAMBgNVBAoMBU15TGFiMQ0wCwYDVQQDDARyb290MIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqtMGs9xm1Z6/B0FrYwxALZmzXk9E
+HwS9mfmPbPUW+ZceZ8LcF9deWU+gtBwEZpV13ILhwHdlMacsnW0iriQtZKmX5/wU
+Eg14tRj/vvDz3uOXv7dQ+h2VghlFvQD7iTxRt39a1NnbrKMmWQ+vzAwGOcuWthY/
+Ec9JZdYbvsBCS+RMCcQrd1E9xHjV+HYIdS18Hr5TVxnfW/Flm931i6tDsTFXvMwk
+dqgCuajMvEKR3yhDx6rFxxRN9vIezbyMuVBjNhYsRVvv8FNQOKOMIadjb/vRrkMK
+VgUL4WYi/liqjSCIV1rC+7v/DnvXPOCSaJgNBvB0zMJNPxSgTe8iH/LVnEHuCEu2
+MSnUVL+AApKOjiYK1Wr4h9ymllnRgq5XlsUwGnFkcaEkGO1UaHNFs4z89dr32hye
+RO3T7B5ChQVvjbYK7piDDto69OW397i+yHVLxD681+KrZuKOeMZr9iFFZaFLeh0V
+7l/hahhIlnZGdK5hGWIHZu+c+kfP1Q79drspE7Rr4AoMxVInxce7qV3lNMUp2v1a
+0EjyFJ+iJquIBQdJTtX1rYWdFA5BBA00DGGRbIYiOheKOEnTcCsUevx4T8+2G0PM
+pyCDTy7rj4pnXLr5ziSsfSww8JnxsU1IOijJ4L4b/qGCJ9JfQpslfgLBfwOJ94ZJ
+mv7qjgAcR1HrV6cCAwEAAaNjMGEwHQYDVR0OBBYEFAHZXM7zqCUB/XBvn5uNbxg/
+FmWlMB8GA1UdIwQYMBaAFAHZXM7zqCUB/XBvn5uNbxg/FmWlMA8GA1UdEwEB/wQF
+MAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBslT8qF4mm
+B6nKUPREE/YP8Q6nTXgZ5XhhHsBAHNTP+U2/lNjfQdFUva9mHwJRts5w59phfMpw
+5gTiXJqdTzZEIEN7cdKX2aNL7id6on9j7OoJsQ81MzhUu8rOGqeCYFJFlCMXeby6
+VgInIxhIoe2RrM2bJYw8turWd/+VAa34ehvS3knvGGUTEr/8sqJ14hwifpRl+YB9
+iC1CTL0k00YXJ1IFC6sUaVya0KCRzd/J3I9XnUKOvHxSavA5QosUoWjQde+lJM+J
+8sJHudaM1I2bn+8M9jqSO06/SNMdoNhbapKyvRV2DUwpMbe4WT8Ufnvbxwvw7vnA
++0E7X10KcaLn4+0tKhmNLHb1hjbaGryHO9ESSFGa7uMeiQYo0OQeuLWgRb6mOsZr
+x/VEuytnK+YwR0+vXBCC7PSxuZ7G/MPv374w/+6b+rsrqz6o5JdgjTu27OISbNv9
+5IxA9+DfNvqyLvSQ72M3W6BHAE5BT9/JsTppcJ0KXc1Hkb9dJEIScO05FdsDC+SH
+XvTmuXCf6G5XkrLldshntu1M2MI2Usw5ZK2RP3H25F/AOPxQDim5awMp7Feo0JYC
+EXJedqqTtc1M7ub8XVvIHTaT2jNoa5uuV8ujyiaLXZqZty+UUkXUFHx4UDDWnOrz
+mHyg8QosOZgiGREyjq0FJNDr9337zIfNkA==
+-----END CERTIFICATE-----
diff --git a/qa/integration/fixtures/webserver_certs/generated/root.key b/qa/integration/fixtures/webserver_certs/generated/root.key
new file mode 100644
index 000000000..29cef4f92
--- /dev/null
+++ b/qa/integration/fixtures/webserver_certs/generated/root.key
@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQCq0waz3GbVnr8H
+QWtjDEAtmbNeT0QfBL2Z+Y9s9Rb5lx5nwtwX115ZT6C0HARmlXXcguHAd2Uxpyyd
+bSKuJC1kqZfn/BQSDXi1GP++8PPe45e/t1D6HZWCGUW9APuJPFG3f1rU2dusoyZZ
+D6/MDAY5y5a2Fj8Rz0ll1hu+wEJL5EwJxCt3UT3EeNX4dgh1LXwevlNXGd9b8WWb
+3fWLq0OxMVe8zCR2qAK5qMy8QpHfKEPHqsXHFE328h7NvIy5UGM2FixFW+/wU1A4
+o4whp2Nv+9GuQwpWBQvhZiL+WKqNIIhXWsL7u/8Oe9c84JJomA0G8HTMwk0/FKBN
+7yIf8tWcQe4IS7YxKdRUv4ACko6OJgrVaviH3KaWWdGCrleWxTAacWRxoSQY7VRo
+c0WzjPz12vfaHJ5E7dPsHkKFBW+NtgrumIMO2jr05bf3uL7IdUvEPrzX4qtm4o54
+xmv2IUVloUt6HRXuX+FqGEiWdkZ0rmEZYgdm75z6R8/VDv12uykTtGvgCgzFUifF
+x7upXeU0xSna/VrQSPIUn6Imq4gFB0lO1fWthZ0UDkEEDTQMYZFshiI6F4o4SdNw
+KxR6/HhPz7YbQ8ynIINPLuuPimdcuvnOJKx9LDDwmfGxTUg6KMngvhv+oYIn0l9C
+myV+AsF/A4n3hkma/uqOABxHUetXpwIDAQABAoICADul3B1JxI6rE8EQ0tKPIInL
+tZoky4CZQytUvQQqwI7+eZt5qyiYB1XgPBkn/1Fitvj8qp9uEWO5IBcIWKe98ivI
+HEbg+pEjKxbxV7vwnvchOYe0Fw5+7gmzkWphwXM2IMKWMb1JJS+u+GD43UW+nR3p
+PQLv2a36V4K7tIxyzbN6UCLI4PSU5aCJIQ3VCTcBXunNQ4SSgC+2pug6JNdUQhrJ
+Q/2kusbD+8+gZX0HMbBeeuxpcQ4GxQKJoL/uKqU6sKneLC873xhnvwdH9FJ8BHjB
+0YGr3xwSPwfBhk6R31vQFEuMYbFM/86q54lWUUk8brARnncxEZAJP8B208+cF4IZ
+KqHPP45r1GwWQ1G8i8IPFmLhmiSZU47NiPiYglOlBsSGuG2zPLHJUWZnetEmJgFP
+5h1sBL8v6OA79Y6dMWXgs/Wdu6jOrcv9ZBEPZskqnYqZ/AQknqgIKggkvegksjFG
+OoGu6slQ9QRDm09bjIEvqaVKNS5aDhmGPmOvaCpmE571KsIdWFMOIBIvJjmJ34hL
+6qoLJ2XoTM5QRY7ZyA0a17uEiXZCDnd4vggbEt51CCwKHkY0+WnjzT0MgU9C4Bzo
+B0a2idW8UT/yGxPz1uGFY4z/RJ8kW83MwpGX5dNPYFEq/1egZVehK56saowetPlJ
+LFkoJNSA7ZetxIUZvD1BAoIBAQDuPIc9WPhT1Z17R0g/uYnQ94H8ZbpPz5sqzzGw
+gXTcYDIuEVixUlDE98KDh7BswGoh9O/PSGKYAWt4FhEzmUUPGSOV8U4vnPNB/tud
+quVICCaVA0qYF5RfDBZkMxawaP+0wjhiReqKMZZstEEe3RBiy2uEnkHfDXmXlTER
+plF5wFTc+luS7fGx6Sl5B4rSWrhdmHAZC2Qep9SOBjNPg/BwvlKthXlDUElE/eP/
+hOOO4upQBBENKM9iRZfmNW3JU3NMRZB/SFVi4nfAcKD/k8wlp3Jf3US4E7WJxhzN
+WIWfYpfEHFgxxCLBrpS2axlRe9rm8h7uWLnDspVgXl5WdnEZAoIBAQC3j7s069A5
+Kw+/MbPWMZ1tGZGKnl4uBKq3LZAz/i3/mzjhleaOEHYoam76ELLLIulblc5mjHwf
+8he1An7L+ZmTo0ezwT72WHBmBAjH5Nn86BgB+3DqEhed7pSDtwz28VzV5XtwH7Ug
+enloX6HqxDiHyHTyo1rcERiOq2HsHURUcu+yawl/jOadv50qln0j2WVpGeAQo4kq
+NwY+OUrZGOaCtd8RshX4afNKnDU05Pk2e9eytqfoa+S0/86VhkZ5cv4pc1SaW9Hf
+juUWNFeTnCb58lk7PN6W+/WQaYdn6don5yrHm3ne+ThoOXlQmbjCQ4m7P81EVJ1U
+bsetbqzRBWa/AoIBAQCXkE6Byv6BZ19/NIRUdlelaDF8P8PeTrfq7lIwdsvAADss
+b8C7XyEfjnhjcYneRjO/UrLWbri69/xFM9TRvOrghh/Lnu8c/38LN3bEwhqITxcs
+qiFkzWuJZIlCSfZfWQ2FFCMG8nAaZx3KHotndUCdecj3YC+MFmiK9VF4ZxVineff
+hi+INHUVuL63zwKUfT7Z3MdER6j0j9V8XZl7Nvda4tp6pnXVS1ix2cyZnROgreBf
+85Zdht8ZKClRPiCQetTZa1BYic440NdayMzEjGTOd88eCglUCsXt1uowAedQ1Uq0
+a0v4rU1nZwgZXd2Hp4JGdzcSb8QPKqg53Q+rdkLRAoIBAEwgxBdSpWzQOxukVV1D
+/nI85GuE+rJDJToLH38wr4sOqSyFqrTIhviEC7qSKlStCfL90jgdk2z8TnC3tDaM
+MfFVCmu2fZJVY2grzCh69R06dJp92Xp6Pmk1hUqLJElWGJZtMiByRgBOSwPKhbCD
+6J4HuNjYfto+DN0+nsH58VjEwjxQwAOyQAK0cU40U3oGs1Q/cvnzmPN1FpW/1Rbs
+iM00+GqyXQJFjq0m07o4LFM4UWDA+CogdR3L6bWBlsDPvDEcr73EzunUrZXj515E
+qLWImRFEUVx06ocV/R5PkjZyXP+jr4uV+JrhGzseRc3rjLen4k2wef+GYjG/cNTP
+VKkCggEBALOgG98jJQlbW5GD/jBkizeDiNy99H+Cl7MzmzY2PAtpfugeMbBYceL1
+2weWpWbVpbCp/Zkksqh0kYgI45phx+eZo6tLZd2IOM3A3AbnkgVDK+1gNSb6s7fq
+g0Llaz6wAHrLjTf5N5vbGJNbzez2UWCJR8boxM4+Q3pcOSFQbPv8rx09zMNa1xaL
+KuvHT6xTab5q+qz4BiVtrx7ZWqakOlxO3J5chYZUsxqoH3jvE5GzY4yi52ZPyt7v
+rHZbCHclS/MS5pBUUCTj0Q0qCfiT03m6nP6YgN9w1rQROe5EzqPCMfQlVKo8ayQB
+tiYXTiDTadKNODupVYUpbHSfZcFvRhE=
+-----END PRIVATE KEY-----
diff --git a/qa/integration/fixtures/webserver_certs/generated/server_from_intermediate.chain.crt b/qa/integration/fixtures/webserver_certs/generated/server_from_intermediate.chain.crt
new file mode 100644
index 000000000..c2360f241
--- /dev/null
+++ b/qa/integration/fixtures/webserver_certs/generated/server_from_intermediate.chain.crt
@@ -0,0 +1,68 @@
+-----BEGIN CERTIFICATE-----
+MIIFgDCCA2igAwIBAgIBATANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQGEwJQVDEL
+MAkGA1UECAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UECgwFTXlMYWIxDTAL
+BgNVBAMMBHJvb3QwHhcNMjQwNzE2MTUzNTAzWhcNMjcwNDEyMTUzNTAzWjBVMQsw
+CQYDVQQGEwJQVDELMAkGA1UECAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UE
+CgwFTXlMYWIxGDAWBgNVBAMMD2ludGVybWVkaWF0ZS1jYTCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBALUBL8nGcBsOrfv/uI555eOiBgFYD+V3etaiFDi6
+MtZynj9oazrssevjNwP045j8a2L9apjeq9U5REs2MrYoHTEPoIeOiFPNQfiBtJt/
+DjBiXYQbrSfpkjPmRREPKkTX9lFNSlEmG3y+kNMyASvR3K4IM6Bqd+FYt/GUyhZP
+LFx9ZhRAiq5uulLqVaAdAp+wdjAXeSedtCTs+20aW+NKA32+Pb8vzJp6HOmh+ZXl
+orlEyKKfUYI3ODu9IoXTu6ZN8XZ4LfrDu47wswgQU4n2TOn+Qm7nwE9GIjQBjYOz
+s3eUYyzE/z5oyrC6t2Z2ZEq2pCwMwf7iPXRFrgSvgLJCCSdwrB/bTxghM0vmFeoV
+V2vfTp3VC/WbSW59tV++iMyMQTPw+grg0NEJCrwNnFJ1DL9iT0f902z2mknxuCM+
+2HGpt2EG+FnU4kR2gHQKt4BNGIuscchp8J85CGjheoNvuHaUktVWwqUaHUL8b9MV
+dav10Obfr0+bWNIY2xsufM8sX/QP3VsfJ/nFkoImYNW5SI5g7/5DTIxIE/z8Ab1a
+4JT2JCzPO8wDFyle4RVOG+2WfDBUkkjIjXlfxBwLneTPzqv5jmpPIwcpdF0c9bWw
+Jwb/e4hB/bAFwZvLFr0aypJ0Zqbc/67n5HDsKx8+/XUKar1qPP6AzrfecOmBwwOH
+AsE7AgMBAAGjZjBkMB0GA1UdDgQWBBT5X+u4LkGBED9seTSNYgA40tXJUTAfBgNV
+HSMEGDAWgBQB2VzO86glAf1wb5+bjW8YPxZlpTASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAGb6iGwxKXTSgxP96
+4UMtpKYFGykBuajxr105jFSjXArhjj5/U21nIHQ3vrmAGAMY6iaaeKJ78gYSfm+O
+zC5o8f4PLxtPfRJGymGUISrtIpBUTz+CVNAwQw0yrAeROizoUBhpDmUVrzlSfwgm
+uH3H94jvi/IpoxUezsr1tS48G8ayaVlrPLflBhgX1NXzonA0KqGNdm5AwOx3jgZi
+v5PYtz6xR1NtINnGm42A078gL9XHXmZowacGPNf7flwU9UzU1LDb1snGCxOgNq0e
+ABZmd4TbEqMs1mAmn6ymzAIU2wBOStcC0is1MJ1j/NVVixETrx65UY1BTMlIojDT
+bV4fbYy7jo8rtoLdnwFd+DdXna2LJ8qq+7CE35f9c+ZxLkdSfqADISwkhR+J/6TB
+plRVyBc4eiPdSV27qPbjMOEHKy43+rHTsBILqIOQ0sBlMe8DgD8ZXo+PUM1Ptadn
+PsuHwSflCrIz6AHgG/nORSDQf+7U79mejzi3fIjwYyYpSlBemTuW+z3x1xizN6PY
+CK9zuZu8K9Z/F7GQmr3xBEtWqH2rd7TcN7fQP+zmG/v++vPlE38cQFWv5vVISxJe
+U6AOJmXKNvDB4QR5CPsd6UWn/Nb1K3/MlDu5ymLq9JXm/GeokaGqHuaLLR20yN7w
+/kNCmGr6r+cWAxpEZkmSBUg8/ps=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIGSTCCBDGgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJQVDEL
+MAkGA1UECAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UECgwFTXlMYWIxGDAW
+BgNVBAMMD2ludGVybWVkaWF0ZS1jYTAeFw0yNDA3MTYxNTM1MDRaFw0yNzA0MTIx
+NTM1MDRaMEwxCzAJBgNVBAYTAlBUMQswCQYDVQQIDAJOQTEPMA0GA1UEBwwGTGlz
+Ym9uMQ4wDAYDVQQKDAVNeUxhYjEPMA0GA1UEAwwGc2VydmVyMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAsPeBqLtAWvBZmAtNciN1enkIgE7ffPe/8Qkz
+ZK1so6LdrkQsE7v0HG8j86AdEaBTSiBfwG1+Rr5ZGpHwrPlf7Zl4GHb+v+gE3gkT
+wponMN3wC8XAVExu0L7JnQBK50YEEI6/EfayQ9b80E6j2/FiyVj3rxt8MTwCAGdh
+Fjb8Z8WSxLDelk9/2njOj3Swojar2QR+Yxs0mr7obOxB+ZonDSBJ21HK5xI5rOwa
+wMSzyoHmW8Og7Z7TrGLei3ejvVy1RZ+pF6whQB823/JEdAGQnjIm7D01qf3WVgAP
+a78IciejVm9hCRxUq18i7UQcmey0FcuQ4+ziFw6UOEILHN/NzR/3jiyRqOeNYDev
+PfomSpT9YFF5kP2FRgjaoV4LrVUHPf066yTjztmqULSZClRKzdW4r96Tj6qiL2Ib
+ZVigRwQ2mWf8RMKC9mS64eCIf4VgI1elYgW9/BRCYpV01ERTNRoIFfwm48MH7ARR
+MKG92dAS70U8uV0x9jaaKYNhheLk+QLEbeJSdKF4NVY2Bd5qOX/ooZJA2wj1qvqB
+tWbeXCjUSJy89FPJNCZygyyIGZT8LTwyqCNmVOrEGDjv+rzY2D8w357R9OyJydT0
+QUwd34K+tMTnlh017If8XoCaznPdruazpMCTaDi0EWjATGircWg0QiAeOVwW8VMe
+BmtjGKMCAwEAAaOCASswggEnMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZA
+MDMGCWCGSAGG+EIBDQQmFiRPcGVuU1NMIEdlbmVyYXRlZCBTZXJ2ZXIgQ2VydGlm
+aWNhdGUwHQYDVR0OBBYEFEnxgc3u39FUWRrVmLdS1+fhF4BXMHIGA1UdIwRrMGmA
+FPlf67guQYEQP2x5NI1iADjS1clRoU6kTDBKMQswCQYDVQQGEwJQVDELMAkGA1UE
+CAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UECgwFTXlMYWIxDTALBgNVBAMM
+BHJvb3SCAQEwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMBoG
+A1UdEQQTMBGCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQsFAAOCAgEAQ3yk
+Hll/c8HGGi4EeA0bvIUAFRfgfBkiAyvCmm/jxarC3V4WjeXaK6qYyG7ljktT3ie6
+J+qr6WnhOveaPWJ0pvBemnn4WiiUkSRKk/jEocpbksPoA1kuaPJQxwzGl7IknkhR
+tNpfgCr4XrADf7s/eYv0yqZA1ZDGrAbkJ08kfpj4HnC7Xxj00G49csFhVQq/VFAk
+Y5AEiUELYNmCyq2S4yvtmsfiW6dBoxZKkZDYtfmYBM55Wmsm/vRwXW6cj+B87GY0
+w2L3CL0/496IgCRRwnDQSVANLhTJ5XhSUKcNEhEWDyXM6AIrlsJEGYYzdENqzWFh
+PJDoBKnv/AKQ0nOxBOo7aOZC7WwQ3Yh/dCxDsspovUnUZRC0hD7B+kZLfggIBuK7
+F1k/SXzSKw6PNvtSAbl1V6b0LMC41TzcqoHOQuxoYYiuPoR4EwA1uOzuay6ouDSL
+HHPvu1irNMtiz0PsTRHvY8G3kNujLM3MfJrxEYvE0CZvqCMVfBlxFMNexE90g11s
+xdIH8Fwe5hc2DuWTrYDVcB8ZVoM7VUqgrp1KHoKfI+TbIIg6mLIthMgwpoFFbBAD
+YBP0hk4bOVoRnfpi77vm+1Sc9q49JGmV7h1Zrp8b0RqmE5cgLAf+mr4YxN72Av21
+MhHKbNERB8rHVaOToLOXfE5M5Vli9ffoa6Q+E0s=
+-----END CERTIFICATE-----
diff --git a/qa/integration/fixtures/webserver_certs/generated/server_from_intermediate.crt b/qa/integration/fixtures/webserver_certs/generated/server_from_intermediate.crt
new file mode 100644
index 000000000..c541934cc
--- /dev/null
+++ b/qa/integration/fixtures/webserver_certs/generated/server_from_intermediate.crt
@@ -0,0 +1,36 @@
+-----BEGIN CERTIFICATE-----
+MIIGSTCCBDGgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJQVDEL
+MAkGA1UECAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UECgwFTXlMYWIxGDAW
+BgNVBAMMD2ludGVybWVkaWF0ZS1jYTAeFw0yNDA3MTYxNTM1MDRaFw0yNzA0MTIx
+NTM1MDRaMEwxCzAJBgNVBAYTAlBUMQswCQYDVQQIDAJOQTEPMA0GA1UEBwwGTGlz
+Ym9uMQ4wDAYDVQQKDAVNeUxhYjEPMA0GA1UEAwwGc2VydmVyMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAsPeBqLtAWvBZmAtNciN1enkIgE7ffPe/8Qkz
+ZK1so6LdrkQsE7v0HG8j86AdEaBTSiBfwG1+Rr5ZGpHwrPlf7Zl4GHb+v+gE3gkT
+wponMN3wC8XAVExu0L7JnQBK50YEEI6/EfayQ9b80E6j2/FiyVj3rxt8MTwCAGdh
+Fjb8Z8WSxLDelk9/2njOj3Swojar2QR+Yxs0mr7obOxB+ZonDSBJ21HK5xI5rOwa
+wMSzyoHmW8Og7Z7TrGLei3ejvVy1RZ+pF6whQB823/JEdAGQnjIm7D01qf3WVgAP
+a78IciejVm9hCRxUq18i7UQcmey0FcuQ4+ziFw6UOEILHN/NzR/3jiyRqOeNYDev
+PfomSpT9YFF5kP2FRgjaoV4LrVUHPf066yTjztmqULSZClRKzdW4r96Tj6qiL2Ib
+ZVigRwQ2mWf8RMKC9mS64eCIf4VgI1elYgW9/BRCYpV01ERTNRoIFfwm48MH7ARR
+MKG92dAS70U8uV0x9jaaKYNhheLk+QLEbeJSdKF4NVY2Bd5qOX/ooZJA2wj1qvqB
+tWbeXCjUSJy89FPJNCZygyyIGZT8LTwyqCNmVOrEGDjv+rzY2D8w357R9OyJydT0
+QUwd34K+tMTnlh017If8XoCaznPdruazpMCTaDi0EWjATGircWg0QiAeOVwW8VMe
+BmtjGKMCAwEAAaOCASswggEnMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZA
+MDMGCWCGSAGG+EIBDQQmFiRPcGVuU1NMIEdlbmVyYXRlZCBTZXJ2ZXIgQ2VydGlm
+aWNhdGUwHQYDVR0OBBYEFEnxgc3u39FUWRrVmLdS1+fhF4BXMHIGA1UdIwRrMGmA
+FPlf67guQYEQP2x5NI1iADjS1clRoU6kTDBKMQswCQYDVQQGEwJQVDELMAkGA1UE
+CAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UECgwFTXlMYWIxDTALBgNVBAMM
+BHJvb3SCAQEwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMBoG
+A1UdEQQTMBGCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQsFAAOCAgEAQ3yk
+Hll/c8HGGi4EeA0bvIUAFRfgfBkiAyvCmm/jxarC3V4WjeXaK6qYyG7ljktT3ie6
+J+qr6WnhOveaPWJ0pvBemnn4WiiUkSRKk/jEocpbksPoA1kuaPJQxwzGl7IknkhR
+tNpfgCr4XrADf7s/eYv0yqZA1ZDGrAbkJ08kfpj4HnC7Xxj00G49csFhVQq/VFAk
+Y5AEiUELYNmCyq2S4yvtmsfiW6dBoxZKkZDYtfmYBM55Wmsm/vRwXW6cj+B87GY0
+w2L3CL0/496IgCRRwnDQSVANLhTJ5XhSUKcNEhEWDyXM6AIrlsJEGYYzdENqzWFh
+PJDoBKnv/AKQ0nOxBOo7aOZC7WwQ3Yh/dCxDsspovUnUZRC0hD7B+kZLfggIBuK7
+F1k/SXzSKw6PNvtSAbl1V6b0LMC41TzcqoHOQuxoYYiuPoR4EwA1uOzuay6ouDSL
+HHPvu1irNMtiz0PsTRHvY8G3kNujLM3MfJrxEYvE0CZvqCMVfBlxFMNexE90g11s
+xdIH8Fwe5hc2DuWTrYDVcB8ZVoM7VUqgrp1KHoKfI+TbIIg6mLIthMgwpoFFbBAD
+YBP0hk4bOVoRnfpi77vm+1Sc9q49JGmV7h1Zrp8b0RqmE5cgLAf+mr4YxN72Av21
+MhHKbNERB8rHVaOToLOXfE5M5Vli9ffoa6Q+E0s=
+-----END CERTIFICATE-----
diff --git a/qa/integration/fixtures/webserver_certs/generated/server_from_intermediate.jks b/qa/integration/fixtures/webserver_certs/generated/server_from_intermediate.jks
new file mode 100644
index 000000000..bbf256203
Binary files /dev/null and b/qa/integration/fixtures/webserver_certs/generated/server_from_intermediate.jks differ
diff --git a/qa/integration/fixtures/webserver_certs/generated/server_from_intermediate.key b/qa/integration/fixtures/webserver_certs/generated/server_from_intermediate.key
new file mode 100644
index 000000000..2ca229ca2
--- /dev/null
+++ b/qa/integration/fixtures/webserver_certs/generated/server_from_intermediate.key
@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCw94Gou0Ba8FmY
+C01yI3V6eQiATt9897/xCTNkrWyjot2uRCwTu/QcbyPzoB0RoFNKIF/AbX5Gvlka
+kfCs+V/tmXgYdv6/6ATeCRPCmicw3fALxcBUTG7QvsmdAErnRgQQjr8R9rJD1vzQ
+TqPb8WLJWPevG3wxPAIAZ2EWNvxnxZLEsN6WT3/aeM6PdLCiNqvZBH5jGzSavuhs
+7EH5micNIEnbUcrnEjms7BrAxLPKgeZbw6DtntOsYt6Ld6O9XLVFn6kXrCFAHzbf
+8kR0AZCeMibsPTWp/dZWAA9rvwhyJ6NWb2EJHFSrXyLtRByZ7LQVy5Dj7OIXDpQ4
+Qgsc383NH/eOLJGo541gN689+iZKlP1gUXmQ/YVGCNqhXgutVQc9/TrrJOPO2apQ
+tJkKVErN1biv3pOPqqIvYhtlWKBHBDaZZ/xEwoL2ZLrh4Ih/hWAjV6ViBb38FEJi
+lXTURFM1GggV/CbjwwfsBFEwob3Z0BLvRTy5XTH2Npopg2GF4uT5AsRt4lJ0oXg1
+VjYF3mo5f+ihkkDbCPWq+oG1Zt5cKNRInLz0U8k0JnKDLIgZlPwtPDKoI2ZU6sQY
+OO/6vNjYPzDfntH07InJ1PRBTB3fgr60xOeWHTXsh/xegJrOc92u5rOkwJNoOLQR
+aMBMaKtxaDRCIB45XBbxUx4Ga2MYowIDAQABAoICADoBFk2g+qoUB7nPUpYryzDW
+hRPRRm2moxI1StQgB/DmzDR3gd8CBzRetXEANSb23vX4AIqJGQ/FCl2sIjAAGRI+
+8F9MeZmbSiUg4ooxjtD0nd6t9alr2BKxxlGgq+x8RY7LyxLvQmT8DaeVbx4DU7bd
+Y2nQ33cfzSQmvmrSoQ6+cqnnsz2fVy/b0xCwVckFlHQwheCkJSznkDVLhyByB4TE
+5ZBukcwFbEQiq24tyySASWogiBn6qjThv0IFd/T0czIb8AejUs66rHjg5tEDRkyj
+8aATPAi4+8z6fhN57SHFnkMRhMPAtnvpVgBhB+Ln8+sE6zvaBA08qRZ7hzrynHin
+UtGC1hs1VA2WksgSVmG4IAD2TOJlUb0X3UANOZCuKlBSJmQqjw8kWX1eGoxQVpE3
+zUu4UnsZxo/vfm9bfxm06j7jKohnoY/P6mfuiV8oVuZZrJXQ7QsubYH1VT7+YtGD
+xDe619hfN+kMGgkOJnc5ppE5XqUEd8C5DVkvpOy6ij8tLnQ3hVhryCWTvbay/i+3
+yLXhvAPIOy6lD7VeHKqGUrYS18MnAxFnEKQiGmVEEL6sKy1TWcZdDu+ONdCtnCEj
++RoxflPVXCGrFM/JjJfk4GkbpJ21M4i5DgCWQhZmva/SApXNhEKSOhpVQSx0WeRv
+AfW+kEATT8NFpS7GnIKBAoIBAQD5J33FfqMH5IQlKZ0fz13Bd8O0DiB+ywQ+EQp3
+/p6MtZTAGI6uFfnudjMvhPlHqrVu2DsiFOQF1XUnyytm45FD/6fyXkjBCIZYh4nF
+T5t2bhxhsgM0RAR9KDqfJNY6ictgq2ON2VTcTg2k4JiCTBUk8nmRpZWRtXCqB/ny
+H7KdBtnQUGURGKFATTFWpZ2wpe3tFKv3P13EXheci7tStC4aPMlz69GaBvlie7ei
+Y1bJ+WxGWi0c+fJo9Fi0jlc26FxsnAg3uUCdyz52oCvJnC1C7H9oHh3Gmu8EVVvm
+p+r/7BAjBSMjSZ/kGApjAfRhUhheFx34E1VNKvGI9zzb1bbjAoIBAQC11ELRW/Ui
+5SOwaaNp6pIIWwR/CCiF1CwzzOpZ7fRE7bQBt4pxQnvdw9gFku93liAq7POE8eVV
+Vnk0h2sIh6aafwvmRLEN+upBim1eK9Isc9YdrzVTy8qer3dJeGyvTKNKY7LV2OtC
+3m2rNdnYfkbzBAOgvQt4SwOaWMnKvvFY4FqTsU889yLR9eISC3Akprgqjnv7ZVcI
+nJgquSgeRTmd+v3Dsuam80Phe7JfdfBG0lYGizmy7ZkLKECL1lw0KerJCFgLjUoX
+L3BKEyvBZxdT+FIhc/g9OuyVmnoqp7Fs3SCV3a2TrpRsiCRxR/Vz5saD0pmlF9BQ
+8mFILHqZCQNBAoIBAA6ziNVNaps9nZp/wRiuaK7QvUhziPFSU1bCNKbt7DcLQ9Kt
+4EVfYJb0fIKySu8yoHAA7ERPjUDW3onRkCcLCHhFrog7jflt4ld47+UnlFnBl4Ug
+NtYvqUAlTogzaTydAtYaZs5o43v4Uw/GfNk7WggLEqdIaPHnDdXKkLH7stNXIyUK
+iVwf4uvjYiTlss9IiyhxDtCQ+ZxrnOMMz6nKnenIam6fnIeFH9PyztwTFnzmbcAc
+9AqAqRAOUumceILx5Po3nriDAtAMvQvM2aiUwYrwX3gqRsGARNgxnTGX+OLO8AjQ
+9cjQQFH6JSrAY8YWTP/IR2lq4p6iCQx24i1qh9cCggEAQhiBnXcO+ftPaN5Nr7+8
+C9uCG+dMS7Gfy8iuW7ha9f9uUr10Ts17F1cMnKIX+GGTGed+chI4ajf/4S9kofol
+fr22BqNrtQhDxUVbkkLdqJkG+U1qViabZemktAlZgLOcG/t307KBepI+TWFK6h6l
+DcukwfZWSAkEq0OhPtkABG2xn0Rx6FhxyN7XqfWMc1ZDVfzrZqwk4hWCXu1lfvNt
+CVdmjY/ntkJxp3J+maLWj/f/m2taswcZfevI4swuQiwGk8M7th9LEniFGfg0DJ67
+5SM8P7rXPvK/c3Zu+DhzD36mTLQDV867V2R50s/0kogOG3cfsNqiN/qTkFfSzPRw
+wQKCAQEAkQ1UGWeJmn8Ed9xQ1GV+NI33UIXkccBzXPxebA667zpeLcu9aXIeb4hd
+8/JZedRi/C+zSoAFlIhRLtZ1vWxLq9aoJlGzuYhk2cLOz0v4edOcNwl/VWXnr8+D
+g/pRq23nj8YgAj85HmOazm0cGBE8+udteNSMpVgru7Qwdk1EUPVT8OiLSk9SnOJv
+V4SOjhCCA1U/luwPcDQZaGCu2cVQDQjtkAiZ9siIyy+I5QS03tgScWEPdHnJyFDW
+vnq+q86pztSZtPOmbb6rQ0hM/XOkr5cu3Lncvh/2Tdko5Np7/JDBuuPVbEvzu8rt
+yaeC+CDFhS18hgKDHCFUa3T5+zFfpg==
+-----END PRIVATE KEY-----
diff --git a/qa/integration/fixtures/webserver_certs/generated/server_from_intermediate.p12 b/qa/integration/fixtures/webserver_certs/generated/server_from_intermediate.p12
new file mode 100644
index 000000000..34c6c9901
Binary files /dev/null and b/qa/integration/fixtures/webserver_certs/generated/server_from_intermediate.p12 differ
diff --git a/qa/integration/fixtures/webserver_certs/generated/server_from_root.chain.crt b/qa/integration/fixtures/webserver_certs/generated/server_from_root.chain.crt
new file mode 100644
index 000000000..c2094a7b3
--- /dev/null
+++ b/qa/integration/fixtures/webserver_certs/generated/server_from_root.chain.crt
@@ -0,0 +1,36 @@
+-----BEGIN CERTIFICATE-----
+MIIGUjCCBDqgAwIBAgIBAzANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQGEwJQVDEL
+MAkGA1UECAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UECgwFTXlMYWIxDTAL
+BgNVBAMMBHJvb3QwHhcNMjQwNzE2MTUzNTA0WhcNMjcwNDEyMTUzNTA0WjBMMQsw
+CQYDVQQGEwJQVDELMAkGA1UECAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UE
+CgwFTXlMYWIxDzANBgNVBAMMBnNlcnZlcjCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAJT0RJKyh+dR+joDaEKF++Rd8YPKmo1HllITKIak0gmgPkWb+si6
+yfi7UrnmgIeSj2CESOaPcnMzbPSajBPCtitS1YlYgB8N4OKht80ib/Bc2fYblmED
++Z9+ySnVlPVFiAglS2DsVz3QUtRmpyOYUeqvBNpSZnfnxF/InIRxVAjQ/7FZ87NP
+Xa42K8J1d5WXrkE/X8j7BfZUUxbKyGDB9ys8jMoHxmnH2P/P/LcvwZPaQQkxMzqk
+tHY/p+tMOdkARFmAqJ1GC+zRQExRo+ppPBMeLWvQXxtW/57giqvwFoYXdFw+GHzU
+0LSK810WsBDqIJfZXcd2q/EuW5mwWt6F5c5rFGI+tzYsuE+2C3sYWK7BF+BiHs1H
+mZREG6+NCCTgfXaNakLFf/alouJyfj6irZXMVnFZvFmTLwJVai86l7cUYnV1A22a
+O6pweBov7od5p1UmFDbD1etVa0u0HiYbdOE5rKxM0p4CDbO7FlbUoLdlE4li12sj
+iCTR3psD3TG85cOiTSv1lQGpaa1MJU8a/jH3Ms24v3uFR3U/TAy++c3p2mBqfNyI
+sDyIUCBEWAY/Y9YJxiS8VlN1A5WcKSkmiou2SbCX0EUIkaDoDaOiWFJY0QmVv8nM
+/Keh2tPWS+NFoBLyU0iEr+kYhRloSJ3uD1opSYURtWYd3wEU9ZJVyDEvAgMBAAGj
+ggE/MIIBOzAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGQDAzBglghkgBhvhC
+AQ0EJhYkT3BlblNTTCBHZW5lcmF0ZWQgU2VydmVyIENlcnRpZmljYXRlMB0GA1Ud
+DgQWBBRFf07E369WKOuyKog6EyuNDDWDnDCBhQYDVR0jBH4wfIAUAdlczvOoJQH9
+cG+fm41vGD8WZaWhTqRMMEoxCzAJBgNVBAYTAlBUMQswCQYDVQQIDAJOQTEPMA0G
+A1UEBwwGTGlzYm9uMQ4wDAYDVQQKDAVNeUxhYjENMAsGA1UEAwwEcm9vdIIUM0vS
+1bRQQCJzcfsSQBT78uhQ7lUwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsG
+AQUFBwMBMBoGA1UdEQQTMBGCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQsF
+AAOCAgEAPW9KkG+G/oRmCiB23nxOJz7R6w0S2eM938RaKkRhtXdXBmVIusr1vdFm
+QvjMA3RgoQVTyFwD2PIvpFmFAYThZrxu8a9TIXqVrgHLvHgRuWVlXbkq/fsi/AEH
+BNbJS7WoO1t+QxvOVXota/hUYMhes8QvRTDqql6iXdV6/mzLMxJ7vpRmnV6zaRmo
+cMegAH82IEeXz61N++Cn+Tzasy2mkH/eZ+pXaPrCKhwWD08zEDSm9ury2LJzPWCT
+GbHkwgJy8TwIRLCpORlccIoZED0wyeQNAuMRS3vh5w2UpHz1CAot0dF2XzPwkJaW
+eJTHmU9iRmPnn9VgCSMYLadjANT1SGFeLJlYxAHmbheMKepkFddiqyCUVjIOyN79
+7Uzgl4iPSFrHSyNgeXuIEEmNb9jQlcxPzNcyjz+XPYAeh9RihvZgi0TalPJqFc57
+HKqDoUnHfb2iyN2wmMca9xKhBgQycFxsoDr+GlWehkPMf0ZIqR757v65/0JRGQuf
+2VMyTYm3CsRgIuhrI2KMCeDrOeHrRAz/A9Sa+PI7Arvu0lPaTcVCAz7Nw9DnAOhR
+kfC1mK+wqPYHKZduYGyBmZsGylAOaiO9KGWyzk11qI9Bk4nmkJ8KS/0rmXYAwZB3
+dbEceSt9xvY3oY0R+qZFUEF5ztHaBiggScS9duCD60iZqwScAPY=
+-----END CERTIFICATE-----
diff --git a/qa/integration/fixtures/webserver_certs/generated/server_from_root.crt b/qa/integration/fixtures/webserver_certs/generated/server_from_root.crt
new file mode 100644
index 000000000..c2094a7b3
--- /dev/null
+++ b/qa/integration/fixtures/webserver_certs/generated/server_from_root.crt
@@ -0,0 +1,36 @@
+-----BEGIN CERTIFICATE-----
+MIIGUjCCBDqgAwIBAgIBAzANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQGEwJQVDEL
+MAkGA1UECAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UECgwFTXlMYWIxDTAL
+BgNVBAMMBHJvb3QwHhcNMjQwNzE2MTUzNTA0WhcNMjcwNDEyMTUzNTA0WjBMMQsw
+CQYDVQQGEwJQVDELMAkGA1UECAwCTkExDzANBgNVBAcMBkxpc2JvbjEOMAwGA1UE
+CgwFTXlMYWIxDzANBgNVBAMMBnNlcnZlcjCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAJT0RJKyh+dR+joDaEKF++Rd8YPKmo1HllITKIak0gmgPkWb+si6
+yfi7UrnmgIeSj2CESOaPcnMzbPSajBPCtitS1YlYgB8N4OKht80ib/Bc2fYblmED
++Z9+ySnVlPVFiAglS2DsVz3QUtRmpyOYUeqvBNpSZnfnxF/InIRxVAjQ/7FZ87NP
+Xa42K8J1d5WXrkE/X8j7BfZUUxbKyGDB9ys8jMoHxmnH2P/P/LcvwZPaQQkxMzqk
+tHY/p+tMOdkARFmAqJ1GC+zRQExRo+ppPBMeLWvQXxtW/57giqvwFoYXdFw+GHzU
+0LSK810WsBDqIJfZXcd2q/EuW5mwWt6F5c5rFGI+tzYsuE+2C3sYWK7BF+BiHs1H
+mZREG6+NCCTgfXaNakLFf/alouJyfj6irZXMVnFZvFmTLwJVai86l7cUYnV1A22a
+O6pweBov7od5p1UmFDbD1etVa0u0HiYbdOE5rKxM0p4CDbO7FlbUoLdlE4li12sj
+iCTR3psD3TG85cOiTSv1lQGpaa1MJU8a/jH3Ms24v3uFR3U/TAy++c3p2mBqfNyI
+sDyIUCBEWAY/Y9YJxiS8VlN1A5WcKSkmiou2SbCX0EUIkaDoDaOiWFJY0QmVv8nM
+/Keh2tPWS+NFoBLyU0iEr+kYhRloSJ3uD1opSYURtWYd3wEU9ZJVyDEvAgMBAAGj
+ggE/MIIBOzAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGQDAzBglghkgBhvhC
+AQ0EJhYkT3BlblNTTCBHZW5lcmF0ZWQgU2VydmVyIENlcnRpZmljYXRlMB0GA1Ud
+DgQWBBRFf07E369WKOuyKog6EyuNDDWDnDCBhQYDVR0jBH4wfIAUAdlczvOoJQH9
+cG+fm41vGD8WZaWhTqRMMEoxCzAJBgNVBAYTAlBUMQswCQYDVQQIDAJOQTEPMA0G
+A1UEBwwGTGlzYm9uMQ4wDAYDVQQKDAVNeUxhYjENMAsGA1UEAwwEcm9vdIIUM0vS
+1bRQQCJzcfsSQBT78uhQ7lUwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsG
+AQUFBwMBMBoGA1UdEQQTMBGCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQsF
+AAOCAgEAPW9KkG+G/oRmCiB23nxOJz7R6w0S2eM938RaKkRhtXdXBmVIusr1vdFm
+QvjMA3RgoQVTyFwD2PIvpFmFAYThZrxu8a9TIXqVrgHLvHgRuWVlXbkq/fsi/AEH
+BNbJS7WoO1t+QxvOVXota/hUYMhes8QvRTDqql6iXdV6/mzLMxJ7vpRmnV6zaRmo
+cMegAH82IEeXz61N++Cn+Tzasy2mkH/eZ+pXaPrCKhwWD08zEDSm9ury2LJzPWCT
+GbHkwgJy8TwIRLCpORlccIoZED0wyeQNAuMRS3vh5w2UpHz1CAot0dF2XzPwkJaW
+eJTHmU9iRmPnn9VgCSMYLadjANT1SGFeLJlYxAHmbheMKepkFddiqyCUVjIOyN79
+7Uzgl4iPSFrHSyNgeXuIEEmNb9jQlcxPzNcyjz+XPYAeh9RihvZgi0TalPJqFc57
+HKqDoUnHfb2iyN2wmMca9xKhBgQycFxsoDr+GlWehkPMf0ZIqR757v65/0JRGQuf
+2VMyTYm3CsRgIuhrI2KMCeDrOeHrRAz/A9Sa+PI7Arvu0lPaTcVCAz7Nw9DnAOhR
+kfC1mK+wqPYHKZduYGyBmZsGylAOaiO9KGWyzk11qI9Bk4nmkJ8KS/0rmXYAwZB3
+dbEceSt9xvY3oY0R+qZFUEF5ztHaBiggScS9duCD60iZqwScAPY=
+-----END CERTIFICATE-----
diff --git a/qa/integration/fixtures/webserver_certs/generated/server_from_root.jks b/qa/integration/fixtures/webserver_certs/generated/server_from_root.jks
new file mode 100644
index 000000000..11414c8e6
Binary files /dev/null and b/qa/integration/fixtures/webserver_certs/generated/server_from_root.jks differ
diff --git a/qa/integration/fixtures/webserver_certs/generated/server_from_root.key b/qa/integration/fixtures/webserver_certs/generated/server_from_root.key
new file mode 100644
index 000000000..b8bf4c8af
--- /dev/null
+++ b/qa/integration/fixtures/webserver_certs/generated/server_from_root.key
@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQCU9ESSsofnUfo6
+A2hChfvkXfGDypqNR5ZSEyiGpNIJoD5Fm/rIusn4u1K55oCHko9ghEjmj3JzM2z0
+mowTwrYrUtWJWIAfDeDiobfNIm/wXNn2G5ZhA/mffskp1ZT1RYgIJUtg7Fc90FLU
+ZqcjmFHqrwTaUmZ358RfyJyEcVQI0P+xWfOzT12uNivCdXeVl65BP1/I+wX2VFMW
+yshgwfcrPIzKB8Zpx9j/z/y3L8GT2kEJMTM6pLR2P6frTDnZAERZgKidRgvs0UBM
+UaPqaTwTHi1r0F8bVv+e4Iqr8BaGF3RcPhh81NC0ivNdFrAQ6iCX2V3HdqvxLluZ
+sFreheXOaxRiPrc2LLhPtgt7GFiuwRfgYh7NR5mURBuvjQgk4H12jWpCxX/2paLi
+cn4+oq2VzFZxWbxZky8CVWovOpe3FGJ1dQNtmjuqcHgaL+6HeadVJhQ2w9XrVWtL
+tB4mG3ThOaysTNKeAg2zuxZW1KC3ZROJYtdrI4gk0d6bA90xvOXDok0r9ZUBqWmt
+TCVPGv4x9zLNuL97hUd1P0wMvvnN6dpganzciLA8iFAgRFgGP2PWCcYkvFZTdQOV
+nCkpJoqLtkmwl9BFCJGg6A2jolhSWNEJlb/JzPynodrT1kvjRaAS8lNIhK/pGIUZ
+aEid7g9aKUmFEbVmHd8BFPWSVcgxLwIDAQABAoICACE+Cne6xD3Ju9BqpkACat7i
+YF4LP0a8bT3P7MFv0zg2vO8ICoX1udF67NF0MccP3FOr8iESbnZrSaulOhHG6KTu
+jZ1jVOSZUlEBymVLhDPeZP5Z1cu8+V6xCu/9LIs4g01eFV6CIE45SeMBLdfxzIZV
+nP2kWh30aYz+1n9wU1LMYeQQsSSZV8zjZgy17oRCH6+MFzJhY0lANHLnuqRtZV4O
+21TTO2KsKS+eGUZAsDDxCoakpkw2KdgiCLWog1h8iMR4xCilU0/8ux7NMYnFBpU1
+rOlczXzqg43PiuMoZ75xSZS0fv6M+C7yu7FQuOZteeyppBY509G1iNfZ1c3HkCuT
+2WXN8ihYwNCuJggZFhgpEua54pNrnpseQOmFDKfhsbZ503axkb/Fra7gIXRgNdpU
+/MyUjIuF3SdNdlZxba/MFROulPGPTkSe/NRhS51YO0FGVzhw8y8XarOzliBChGOZ
+P7MOTTBBdeVDgKhZtuVTeGlbOtgBbnBQigEmupqvP51k/AD48P/UqdEq+f+6xs+t
+NwBRBXSOU75Fe0h77AHtgQhFf5dMN3UCqsdP3ZHLGjplbuBUwGKhRVZ2OlAsY8M1
+HkiuKYVS6BZIC2ZcJnid372q8DHc5lpd0uTt33S1SptoQ4efWgdGYUQ5qqkCH9rG
+C7SznflFtdRpINUOVB1BAoIBAQDLoQho8FpGh0OG7hIUKLr9/bntVUMrLuzHeaeE
+XPMIcZou2ouQfl8yJllwwTBHIrls1Zb4cv+TeP3wSjDaAUpEJjvhrtzUZUTe6HbR
+ypWaAKtP1dBC9ViNyeMs9AcfqV/UebE8Fs+ggsejxaMSVkWBLbYwCyfePFqtRveT
+RA5KswDC5/EMHFesCBc2yijSDrpIKykznwef5iwPxnwHOfccb5cDzuY7/au4sEwH
+PgKb2cSargb752ByGPQbW170u1KX2BeydQlPdxIgvUdLwLnbxoi+1SkJeAmOi8r7
+4pi3+7Y2qwK1+xaZJ9QgkIkoU4gjPfXKglbQXco8VS26U/HfAoIBAQC7Q279gmq1
+VnGvXW6h/d8ff/OdDnqQmgExTJXYLqBjIgRI0tkuETdDpICkwaIN7gYV74PbMXnh
+37ldtcBrpbOHpvZ5hRThtJUD1K5tcC1RGHErQ9kBbShH059gqSk6p5ZM4dTExBfH
+DtAPylDuGMDAr6fv5cuvUmkEzRknFu0Dm82t1lX0iKX4T7xvr78/i1eML9aCJ73M
+PYi8QRgHzMJMH2MsgHCvOgSb9X1On9BO2+vX4V7nl74EoeSMKtRDl/2O236QQL4d
+Dn6sZlZlI+MLplvTfQJ7VOHGM/8knhr3gzvzuIR88CWPWkjVnlb9hLR67BxvTf+7
+BQuYyd8/nMqxAoIBABGd/wJFOSo87aSw2DOSSotK9lkINWV5C9c+OTYEbKpgWbyP
+/98ib84A72AH9stQv8YgvI0GNgJmR2IQqSVTUz+OJ0QhQs3FbS3z4sPHySWnxSqF
+Dx2b6Gtr+hGbkzo0Byx00tamCpSSe/85TCB8AktozwhdDrf1dMrlBupgyvO/hONX
++czYbuVdVdTRrLJvv8IaqdfjfF9jJJDA1V4yr6RwKxqTPewWyFKUPh+qR8OAFbhk
+Mgp9PCTi78umHhMCWeT1NyejZIjRfmoCtjZhmDLhfFc2TfSZxAnnIkqkkh3o0xzr
+srJX5N6fSYT/vD4W7AJQjAFXQXeJhcOuguRJ+vUCggEBAKa2lRQ6TBeemt1dl8W9
+xys69T4IitM7V/50yR5J/F3lBd1zYQgjKYkd5a1H+abfFinnLwMwW+rcCyHDUkhD
+n74PxXRQJ1P9OYDMknE5og6FbRLwdzxO2sJ/Q2+BigP++M7/ajW2wdhkdpToL/6Y
+qNmiSCdJ9HjkLDyq/06OmXlR9t1haOqn0OJs0jy4QNIokktqt1TuXol66sV2Shd/
+kibE9rzCqA9H3pyeA+3AV2otXhy2NpCFxhRHsLmc05ZNtN2+yUFRci9aHSoMfbPT
+LCnN9AgnTdNQsSOMXQRTgXyDKBeFWOYFwdqKrTcInTdcMnUQyQvKa/YqurVOW2M9
+ijECggEBAIPUZtCdVZEWR+D/vxhaMBJEemf7Dylqfw0zYOERUURZIrBTuPgCf7RO
+EL6AK+Ca3cnrhwf1hVm4MUAiTIrz8J0JYD4mrGjaOfSrEsDh47ftnCJ5klANjvxp
+pTUENU8bru/jo2Og+ET/novW5UbeFgFt3BTgN2NXP6p3vRtvpclH5qo7TViFCHLN
+nIx8m5/YMXe6wRAghexJTOLZkOZ0aqwJ3cm4IFtK1U4je6ikEOAByNldupWSgM4o
+9dlF1xSydwxj4qIO5wlgrzpTjdNMsz8OL7jFzTkv6HbBY5h4OZ41kmjunTbmDt6A
+rnPB2MB9LPFWnVBTU5c1QVVZkxwc7KQ=
+-----END PRIVATE KEY-----
diff --git a/qa/integration/fixtures/webserver_certs/generated/server_from_root.p12 b/qa/integration/fixtures/webserver_certs/generated/server_from_root.p12
new file mode 100644
index 000000000..b30db573f
Binary files /dev/null and b/qa/integration/fixtures/webserver_certs/generated/server_from_root.p12 differ
diff --git a/qa/integration/fixtures/webserver_certs/openssl.cnf b/qa/integration/fixtures/webserver_certs/openssl.cnf
new file mode 100644
index 000000000..83bd0699e
--- /dev/null
+++ b/qa/integration/fixtures/webserver_certs/openssl.cnf
@@ -0,0 +1,53 @@
+[ req ]
+distinguished_name= req_distinguished_name
+attributes= req_attributes
+
+[ req_distinguished_name ]
+countryName= Country Name (2 letter code)
+countryName_min= 2
+countryName_max= 2
+stateOrProvinceName= State or Province Name (full name)
+localityName= Locality Name (eg, city)
+0.organizationName= Organization Name (eg, company)
+organizationalUnitName= Organizational Unit Name (eg, section)
+commonName= Common Name (eg, fully qualified host name)
+commonName_max= 64
+emailAddress= Email Address
+emailAddress_max= 64
+
+[ req_attributes ]
+challengePassword= A challenge password
+challengePassword_min= 4
+challengePassword_max= 20
+
+[ ca ]
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer
+basicConstraints = critical, CA:true
+keyUsage = critical, digitalSignature, cRLSign, keyCertSign
+
+[ intermediate_ca ]
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer
+basicConstraints = critical, CA:true, pathlen:0
+keyUsage = critical, digitalSignature, cRLSign, keyCertSign
+
+[ client_cert ]
+basicConstraints = CA:FALSE
+nsCertType = client, email
+nsComment = "OpenSSL Generated Client Certificate"
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid,issuer
+keyUsage = critical, nonRepudiation, digitalSignature, keyEncipherment
+extendedKeyUsage = clientAuth, emailProtection
+subjectAltName = "DNS:localhost, IP:127.0.0.1"
+
+[ server_cert ]
+basicConstraints = CA:FALSE
+nsCertType = server
+nsComment = "OpenSSL Generated Server Certificate"
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid,issuer:always
+keyUsage = critical, digitalSignature, keyEncipherment
+extendedKeyUsage = serverAuth
+subjectAltName = "DNS:localhost, IP:127.0.0.1"
diff --git a/qa/integration/framework/fixture.rb b/qa/integration/framework/fixture.rb
index ba5120e3a..b6873ad05 100644
--- a/qa/integration/framework/fixture.rb
+++ b/qa/integration/framework/fixture.rb
@@ -1,4 +1,22 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "../services/service_locator"
+require_relative '../specs/spec_helper'
 
 # A class that holds all fixtures for a given test file. This deals with
 # bootstrapping services, dealing with config files, inputs etc
@@ -26,7 +44,7 @@ class Fixture
     @test_file_location = test_file_location
     @settings = TestSettings.new(@test_file_location)
     @service_locator = ServiceLocator.new(@settings)
-    setup_services
+    setup_services unless serverless?
     @input = File.join(FIXTURES_DIR, @settings.get("input")) if @settings.is_set?("input")
     @actual_output = @settings.get("actual_output")
   end
@@ -39,7 +57,7 @@ class Fixture
     end
 
     if options != nil
-       ERB.new(config, nil, "-").result(TemplateContext.new(options).get_binding)
+      ERB.new(config, trim_mode: "-").result(TemplateContext.new(options).get_binding)
     else
       config
     end
@@ -49,16 +67,7 @@ class Fixture
     @service_locator.get_service(name)
   end
 
-  def output_equals_expected?
-    FileUtils.identical?(@actual_output, @input)
-  end
-
-  def output_exists?
-    File.exists?(@actual_output)
-  end
-
   def teardown
-    File.delete(@actual_output) if @settings.is_set?("actual_output") && output_exists?
     puts "Tearing down services"
     services = @settings.get("services")
     services.each do |name|
@@ -70,7 +79,7 @@ class Fixture
     puts "Setting up services"
     services = @settings.get("services")
     services.each do |name|
-     @service_locator.get_service(name).setup
+      @service_locator.get_service(name).setup
     end
     if @settings.is_set?("setup_script")
       puts "Setting up test specific fixtures"
diff --git a/qa/integration/framework/helpers.rb b/qa/integration/framework/helpers.rb
index 51604f163..32ea1b514 100644
--- a/qa/integration/framework/helpers.rb
+++ b/qa/integration/framework/helpers.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Helper module for all tests
 require "flores/random"
 require "fileutils"
diff --git a/qa/integration/framework/settings.rb b/qa/integration/framework/settings.rb
index b5c567a04..40adc9117 100644
--- a/qa/integration/framework/settings.rb
+++ b/qa/integration/framework/settings.rb
@@ -1,4 +1,22 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'yaml'
+require 'delegate'
 
 # All settings for a test, global and per test
 class TestSettings
@@ -9,27 +27,27 @@ class TestSettings
   FIXTURES_DIR = File.join(INTEG_TESTS_DIR, "fixtures")
 
   def initialize(test_file_path)
-    test_name = File.basename(test_file_path, ".*" )
+    test_name = File.basename(test_file_path, ".*")
     @tests_settings_file = File.join(FIXTURES_DIR, "#{test_name}.yml")
     # Global suite settings
     @suite_settings = YAML.load(ERB.new(File.new(SUITE_SETTINGS_FILE).read).result)
     # Per test settings, where one can override stuff and define test specific config
     @test_settings = YAML.load_file(@tests_settings_file)
-    
+
     if verbose_mode?
       puts "Test settings file: #{@tests_settings_file}"
       puts "Suite settings file: #{SUITE_SETTINGS_FILE}"
-    end  
+    end
 
     if is_set?("config")
       if get("config").is_a?(Hash)
         tmp = {}
         get("config").each do |k, v|
-          tmp[k] = get("config")[k].gsub('\n','').split.join(" ")
+          tmp[k] = get("config")[k].gsub('\n', '').split.join(" ")
         end
         @test_settings["config"] = tmp
       else
-        config_string = get("config").gsub('\n','').split.join(" ")
+        config_string = get("config").gsub('\n', '').split.join(" ")
         @test_settings["config"] = config_string
       end
     end
@@ -42,10 +60,10 @@ class TestSettings
       @suite_settings[key]
     end
   end
-  
+
   def verbose_mode?
     @suite_settings["verbose_mode"]
-  end  
+  end
 
   def is_set?(key)
     @suite_settings.key?(key) || @test_settings.key?(key)
@@ -57,6 +75,25 @@ class TestSettings
 
   def feature_config_dir
     feature = feature_flag
-    feature.empty? ? nil: File.join(FIXTURES_DIR, feature)
+    feature.empty? ? nil : File.join(FIXTURES_DIR, feature)
+  end
+
+  def override(kv_map)
+    Override.new(self, kv_map)
+  end
+
+  class Override < SimpleDelegator# quacks like TestSettings
+    def initialize(test_settings, overrides)
+      super(test_settings)
+      @overrides = overrides
+    end
+
+    def is_set?(key)
+      @overrides.include?(key) || super
+    end
+
+    def get(key)
+      @overrides.fetch(key) { super }
+    end
   end
 end
diff --git a/qa/integration/integration_tests.gemspec b/qa/integration/integration_tests.gemspec
index 039a53111..8b3a241bd 100644
--- a/qa/integration/integration_tests.gemspec
+++ b/qa/integration/integration_tests.gemspec
@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.licenses    = ['Apache License (2.0)']
   s.summary     = "Tests LS binary"
   s.description = "This is a Logstash integration test helper gem"
-  s.authors     = [ "Elastic"]
+  s.authors     = ["Elastic"]
   s.email       = 'info@elastic.co'
   s.homepage    = "http://www.elastic.co/guide/en/logstash/current/index.html"
 
@@ -13,13 +13,13 @@ Gem::Specification.new do |s|
 
   # Gem dependencies
   s.add_development_dependency 'elasticsearch'
-  s.add_development_dependency 'childprocess'
+  s.add_development_dependency 'childprocess', '~> 4' # https://github.com/enkessler/childprocess/pull/175 landed in 5.0.0 and seems to have broken JRuby support for spawning processes. sticking to 4.x.
   s.add_development_dependency 'rspec-wait'
   s.add_development_dependency 'manticore'
   s.add_development_dependency 'stud', '~> 0.0.22'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rspec', '~> 3.5'
-  s.add_development_dependency 'logstash-devutils', '= 1.3.5'
-  s.add_development_dependency 'flores'
+  s.add_development_dependency 'logstash-devutils'
+  s.add_development_dependency 'flores', '~> 0.0.8'
   s.add_development_dependency 'rubyzip'
 end
diff --git a/qa/integration/patch/childprocess-modern-java.rb b/qa/integration/patch/childprocess-modern-java.rb
deleted file mode 100644
index 7a2125d37..000000000
--- a/qa/integration/patch/childprocess-modern-java.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# encoding: utf-8
-
-# Implementation of ChildProcess::JRuby::Process#pid depends heavily on
-# what Java SDK is being used; here, we look it up once at load, then
-# override that method with an implementation that works on modern Javas
-# if necessary.
-#
-# This patch can be removed when the upstream childprocess gem supports Java 9+
-# https://github.com/enkessler/childprocess/pull/141
-normalised_java_version_major = java.lang.System.get_property("java.version")
-                                    .slice(/^(1\.)?([0-9]+)/, 2)
-                                    .to_i
-
-if normalised_java_version_major >= 9
-  $stderr.puts("patching childprocess for Java9+ support...")
-  ChildProcess::JRuby::Process.class_exec do
-    def pid
-      @process.pid
-    rescue java.lang.UnsupportedOperationException => e
-      raise NotImplementedError, "pid is not supported on this platform: #{e.message}"
-    end
-  end
-end
\ No newline at end of file
diff --git a/qa/integration/rspec.rb b/qa/integration/rspec.rb
index e4f350c01..247ef9b4c 100644
--- a/qa/integration/rspec.rb
+++ b/qa/integration/rspec.rb
@@ -1,17 +1,36 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 require 'rubygems'
 
 ::Gem.clear_paths
 
 ENV['GEM_HOME'] = ENV['GEM_PATH'] = ::File.expand_path(
-    ::File.join(__FILE__, "..", "..", "..", "build", "qa", "integration", "vendor", "jruby", "2.5.0")
+    ::File.join(__FILE__, "..", "..", "..", "build", "qa", "integration", "vendor", "jruby", "3.1.0")
 )
 
+::Gem.paths = ENV
+
 require "bundler"
 ::Bundler.setup
 
-require "rspec/core"
 require "rspec"
+require "rspec/core"
+
+RSpec.clear_examples
 
 return RSpec::Core::Runner.run($JUNIT_ARGV).to_i
diff --git a/qa/integration/services/elasticsearch_service.rb b/qa/integration/services/elasticsearch_service.rb
index 66963aca5..56642cfc3 100644
--- a/qa/integration/services/elasticsearch_service.rb
+++ b/qa/integration/services/elasticsearch_service.rb
@@ -1,4 +1,22 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'elasticsearch'
+require_relative '../specs/spec_helper'
 
 class ElasticsearchService < Service
   def initialize(settings)
@@ -6,7 +24,10 @@ class ElasticsearchService < Service
   end
 
   def get_client
-    Elasticsearch::Client.new(:hosts => "localhost:9200")
-  end
+    @client ||= Elasticsearch::Client.new(
+      :hosts => ENV["ES_ENDPOINT"],
+      :user => ENV["ES_USER"], :password => ENV["ES_PW"]) if serverless?
 
-end
\ No newline at end of file
+    @client ||= Elasticsearch::Client.new(:hosts => "localhost:9200")
+  end
+end
diff --git a/qa/integration/services/elasticsearch_setup.sh b/qa/integration/services/elasticsearch_setup.sh
index b0bbc1637..7acd564da 100755
--- a/qa/integration/services/elasticsearch_setup.sh
+++ b/qa/integration/services/elasticsearch_setup.sh
@@ -4,29 +4,14 @@ current_dir="$(dirname "$0")"
 
 source "$current_dir/helpers.sh"
 
-if [ -n "${ES_VERSION+1}" ]; then
-  echo "Elasticsearch version is $ES_VERSION"
-  version=$ES_VERSION
-else
-   version=6.5.4
-fi
-
-ES_HOME=$INSTALL_DIR/elasticsearch
-
-setup_es() {
-  if [ ! -d $ES_HOME ]; then
-      local version=$1
-      download_url=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$version.tar.gz
-      curl -sL $download_url > $INSTALL_DIR/elasticsearch.tar.gz
-      mkdir $ES_HOME
-      tar -xzf $INSTALL_DIR/elasticsearch.tar.gz --strip-components=1 -C $ES_HOME/.
-      rm $INSTALL_DIR/elasticsearch.tar.gz
-  fi
-}
+ES_HOME="$current_dir/../../../build/elasticsearch"
+ES_DATA_PATH="/tmp/ls_integration/es-data"
+ES_LOGS_PATH="/tmp/ls_integration/es-logs"
 
 start_es() {
   es_args=$@
-  $ES_HOME/bin/elasticsearch -Epath.data=/tmp/ls_integration/es-data -Epath.logs=/tmp/ls_integration/es-logs $es_args -p $ES_HOME/elasticsearch.pid > /tmp/elasticsearch.log 2>/dev/null &
+  mkdir -p $ES_DATA_PATH $ES_LOGS_PATH
+  JAVA_HOME= $ES_HOME/bin/elasticsearch -Expack.security.enabled=false -Epath.data=$ES_DATA_PATH -Ediscovery.type=single-node -Epath.logs=$ES_LOGS_PATH $es_args -p $ES_HOME/elasticsearch.pid > /tmp/elasticsearch.log 2>/dev/null &
   count=120
   echo "Waiting for elasticsearch to respond..."
   while ! curl --silent localhost:9200 && [[ $count -ne 0 ]]; do
@@ -38,7 +23,5 @@ start_es() {
   return 0
 }
 
-setup_install_dir
-setup_es $version
 export ES_JAVA_OPTS="-Xms512m -Xmx512m"
 start_es
diff --git a/qa/integration/services/elasticsearch_teardown.sh b/qa/integration/services/elasticsearch_teardown.sh
index e0531a3e7..f14f44f18 100755
--- a/qa/integration/services/elasticsearch_teardown.sh
+++ b/qa/integration/services/elasticsearch_teardown.sh
@@ -4,12 +4,21 @@ current_dir="$(dirname "$0")"
 
 source "$current_dir/helpers.sh"
 
-ES_HOME=$INSTALL_DIR/elasticsearch
+ES_HOME="$current_dir/../../../build/elasticsearch"
 
 stop_es() {
-    pid=$(cat $ES_HOME/elasticsearch.pid)
-    [ "x$pid" != "x" ] && [ "$pid" -gt 0 ]
-    kill -SIGTERM $pid
+    local count=10
+    [ ! -f $ES_HOME/elasticsearch.pid ] && return 0
+    pid=$(cat $ES_HOME/elasticsearch.pid) 2>/dev/null
+    if [ "x$pid" != "x" ] && [ "$pid" -gt 0 ]
+    then
+      while kill -SIGTERM "$pid" 2>/dev/null && [ $count -ne 0 ]; do
+         echo "waiting for elasticsearch to stop"
+         count=$(( $count - 1 ))
+         [[ $count -eq 0 ]] && echo "killing elasticsearch" && kill -9 $pid 2>/dev/null || true
+         sleep 0.5
+      done
+    fi
 }
 
 stop_es
diff --git a/qa/integration/services/filebeat_service.rb b/qa/integration/services/filebeat_service.rb
index fab124076..04decf8c3 100644
--- a/qa/integration/services/filebeat_service.rb
+++ b/qa/integration/services/filebeat_service.rb
@@ -1,6 +1,22 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 class FilebeatService < Service
-  FILEBEAT_CMD = [File.join(File.dirname(__FILE__), "installed", "filebeat", "filebeat"), "-c"]
+  FILEBEAT_CMD = [File.join(File.dirname(__FILE__), "../../../build", "filebeat", "filebeat"), "--strict.perms=false", "-c"]
 
   class BackgroundProcess
     def initialize(cmd)
diff --git a/qa/integration/services/filebeat_setup.sh b/qa/integration/services/filebeat_setup.sh
index 3bd73b3a7..bbe995e76 100755
--- a/qa/integration/services/filebeat_setup.sh
+++ b/qa/integration/services/filebeat_setup.sh
@@ -4,35 +4,10 @@ current_dir="$(dirname "$0")"
 
 source "$current_dir/helpers.sh"
 
-if [ -n "${FILEBEAT_VERSION}" ]; then
-  echo "Filebeat version is $FILEBEAT_VERSION"
-  version=$FILEBEAT_VERSION
-else
-  version=6.5.4
-fi
-
-FB_HOME=$INSTALL_DIR/filebeat
-
-setup_fb() {
-    local version=$1
-    platform=`uname -s | tr '[:upper:]' '[:lower:]'`
-    architecture=`uname -m | tr '[:upper:]' '[:lower:]'`
-    download_url=https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-$version-$platform-$architecture.tar.gz
-    curl -sL $download_url > $INSTALL_DIR/filebeat.tar.gz
-    mkdir $FB_HOME
-    tar -xzf $INSTALL_DIR/filebeat.tar.gz --strip-components=1 -C $FB_HOME/.
-    rm $INSTALL_DIR/filebeat.tar.gz
-}
-
 generate_certificate() {
     target_directory=$current_dir/../fixtures/certificates
     mkdir -p $target_directory
     openssl req -subj '/CN=localhost/' -x509 -days $((100 * 365)) -batch -nodes -newkey rsa:2048 -keyout $target_directory/certificate.key -out $target_directory/certificate.crt
 }
 
-setup_install_dir
-
-if [ ! -d $FB_HOME ]; then
-    generate_certificate
-    setup_fb $version
-fi
+generate_certificate
diff --git a/qa/integration/services/helpers.sh b/qa/integration/services/helpers.sh
index dbf970a3e..987ec3403 100644
--- a/qa/integration/services/helpers.sh
+++ b/qa/integration/services/helpers.sh
@@ -13,14 +13,17 @@ setup_install_dir() {
 
 wait_for_port() {
     count=$PORT_WAIT_COUNT
-    port=$1
-    while ! nc -z localhost $port && [[ $count -ne 0 ]]; do
+    while ! test_port "$1"  && [[ $count -ne 0 ]]; do
         count=$(( $count - 1 ))
         [[ $count -eq 0 ]] && return 1
         sleep 0.5
     done
     # just in case, one more time
-    nc -z localhost $port
+    test_port "$1"
+}
+
+test_port(){
+  /bin/bash -c "(echo >/dev/tcp/localhost/$1) >/dev/null 2>&1"
 }
 
 clean_install_dir() {
diff --git a/qa/integration/services/http_proxy_service.rb b/qa/integration/services/http_proxy_service.rb
index 66c51b248..10dfd615e 100644
--- a/qa/integration/services/http_proxy_service.rb
+++ b/qa/integration/services/http_proxy_service.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 class Http_proxyService < Service
   def initialize(settings)
     super("http_proxy", settings)
diff --git a/qa/integration/services/kafka_service.rb b/qa/integration/services/kafka_service.rb
index 71908f9ac..f2f1f58a9 100644
--- a/qa/integration/services/kafka_service.rb
+++ b/qa/integration/services/kafka_service.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "service"
 
 class KafkaService < Service
diff --git a/qa/integration/services/kafka_setup.sh b/qa/integration/services/kafka_setup.sh
index 9e96527e5..0375f4442 100755
--- a/qa/integration/services/kafka_setup.sh
+++ b/qa/integration/services/kafka_setup.sh
@@ -10,32 +10,35 @@ if [ -n "${KAFKA_VERSION+1}" ]; then
     echo "KAFKA_VERSION is $KAFKA_VERSION"
     version=$KAFKA_VERSION
 else
-    version=2.0.1
+    version=2.7.0
 fi
 
 KAFKA_HOME=$INSTALL_DIR/kafka
 KAFKA_TOPIC=logstash_topic_plain
 KAFKA_MESSAGES=37
 KAFKA_LOGS_DIR=/tmp/ls_integration/kafka-logs
+ZOOKEEPER_DATA_DIR=/tmp/ls_integration/zookeeper
 
 setup_kafka() {
     local version=$1
     if [ ! -d $KAFKA_HOME ]; then
         echo "Downloading Kafka version $version"
-        curl -s -o $INSTALL_DIR/kafka.tgz "http://ftp.wayne.edu/apache/kafka/$version/kafka_2.11-$version.tgz"
+        curl -s -o $INSTALL_DIR/kafka.tgz "https://archive.apache.org/dist/kafka/$version/kafka_2.13-$version.tgz"
         mkdir $KAFKA_HOME && tar xzf $INSTALL_DIR/kafka.tgz -C $KAFKA_HOME --strip-components 1
         rm $INSTALL_DIR/kafka.tgz
+        echo "dataDir=$ZOOKEEPER_DATA_DIR" >> $KAFKA_HOME/config/zookeeper.properties
     fi
 }
 
 start_kafka() {
     echo "Starting ZooKeeper"
-    $KAFKA_HOME/bin/zookeeper-server-start.sh -daemon $KAFKA_HOME/config/zookeeper.properties
-    wait_for_port 2181
-    echo "Starting Kafka broker"
     rm -rf ${KAFKA_LOGS_DIR}
     mkdir -p ${KAFKA_LOGS_DIR}
-    $KAFKA_HOME/bin/kafka-server-start.sh -daemon $KAFKA_HOME/config/server.properties --override delete.topic.enable=true --override advertised.host.name=127.0.0.1 --override log.dir=${KAFKA_LOGS_DIR} --override log.flush.interval.ms=200
+    rm -rf ${ZOOKEEPER_DATA_DIR}
+    mkdir -p ${ZOOKEEPER_DATA_DIR} 
+    $KAFKA_HOME/bin/zookeeper-server-start.sh -daemon $KAFKA_HOME/config/zookeeper.properties
+    wait_for_port 2181
+    $KAFKA_HOME/bin/kafka-server-start.sh -daemon $KAFKA_HOME/config/server.properties --override delete.topic.enable=true --override advertised.host.name=127.0.0.1 --override log.dir=${KAFKA_LOGS_DIR} --override log.dirs=${KAFKA_LOGS_DIR} --override log.flush.interval.ms=200 
     wait_for_port 9092
 }
 
diff --git a/qa/integration/services/kafka_teardown.sh b/qa/integration/services/kafka_teardown.sh
index 0d10cffe8..10c1806ca 100755
--- a/qa/integration/services/kafka_teardown.sh
+++ b/qa/integration/services/kafka_teardown.sh
@@ -8,14 +8,17 @@ KAFKA_HOME=$INSTALL_DIR/kafka
 
 stop_kafka() {
     echo "Stopping Kafka broker"
-    $KAFKA_HOME/bin/kafka-server-stop.sh
+    $KAFKA_HOME/bin/kafka-server-stop.sh || EXIT=$?
+    echo "Kafka broker stopped with exit code $EXIT"
     echo "Stopping zookeeper"
-    $KAFKA_HOME/bin/zookeeper-server-stop.sh
+    $KAFKA_HOME/bin/zookeeper-server-stop.sh || EXIT=$?
+    echo "Zookeeper stopped with exit code $EXIT"
 }
 
 # delete test topic
 echo "Deleting test topic in Kafka"
-$KAFKA_HOME/bin/kafka-topics.sh --delete --topic logstash_topic_plain --zookeeper localhost:2181 --if-exists
+$KAFKA_HOME/bin/kafka-topics.sh --delete --topic logstash_topic_plain --zookeeper localhost:2181 --if-exists || EXIT=$?
+echo "Deleted test topic in Kafka with exit code $EXIT"
 stop_kafka
 rm -rf /tmp/ls_integration/kafka-logs
 rm -rf /tmp/zookeeper
diff --git a/qa/integration/services/logstash_service.rb b/qa/integration/services/logstash_service.rb
index ca1729787..d8750571e 100644
--- a/qa/integration/services/logstash_service.rb
+++ b/qa/integration/services/logstash_service.rb
@@ -1,9 +1,26 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "monitoring_api"
 
 require "childprocess"
-require_relative "../patch/childprocess-modern-java"
 require "bundler"
 require "socket"
+require "shellwords"
 require "tempfile"
 require 'yaml'
 
@@ -20,35 +37,75 @@ class LogstashService < Service
   STDIN_CONFIG = "input {stdin {}} output { }"
   RETRY_ATTEMPTS = 60
 
+  TIMEOUT_MAXIMUM = 60 * 10 # 10mins.
+
+  class ProcessStatus < Struct.new(:exit_code, :stderr_and_stdout); end
+
   @process = nil
 
   attr_reader :logstash_home
   attr_reader :default_settings_file
   attr_writer :env_variables
 
-  def initialize(settings)
+  def initialize(settings, api_port = 9600)
     super("logstash", settings)
 
     # if you need to point to a LS in different path
     if @settings.is_set?("ls_home_abs_path")
       @logstash_home = @settings.get("ls_home_abs_path")
     else
-      # use the LS which was just built in source repo
-      ls_version_file = YAML.load_file(LS_VERSION_FILE)
-      ls_file = "logstash-" + ls_version_file["logstash"]
-      # First try without the snapshot if it's there
-      @logstash_home = File.expand_path(File.join(LS_BUILD_DIR, ls_file), __FILE__)
-      @logstash_home += "-SNAPSHOT" unless Dir.exist?(@logstash_home)
-
-      puts "Using #{@logstash_home} as LS_HOME"
-      @logstash_bin = File.join("#{@logstash_home}", LS_BIN)
-      raise "Logstash binary not found in path #{@logstash_home}" unless File.file? @logstash_bin
+      @logstash_home = clean_expand_built_tarball
     end
 
+    puts "Using #{@logstash_home} as LS_HOME"
+    @logstash_bin = File.join("#{@logstash_home}", LS_BIN)
+    raise "Logstash binary not found in path #{@logstash_home}" unless File.file? @logstash_bin
+
     @default_settings_file = File.join(@logstash_home, LS_CONFIG_FILE)
-    @monitoring_api = MonitoringAPI.new
+    @monitoring_api = MonitoringAPI.new(api_port)
   end
 
+  ##
+  # @return [String] the path to a CLEAN expansion of the locally-built tarball
+  def clean_expand_built_tarball
+    build_dir = File.expand_path(LS_BUILD_DIR, __FILE__) # source of tarball
+    target_dir = File.join(build_dir, "qa-fixture")
+
+    # find the built tarball matching the current version, preferring non-SNAPSHOT
+    ls_version = YAML.load_file(LS_VERSION_FILE).fetch("logstash")
+    candidates = %W(
+          logstash-#{ls_version}.tar.gz
+          logstash-#{ls_version}-SNAPSHOT.tar.gz
+    )
+
+    candidates.each do |tarball_candidate|
+      tarball_candidate_path = File.join(build_dir, tarball_candidate)
+      if File.exist?(tarball_candidate_path)
+        expected_untar_directory = File.basename(tarball_candidate, ".tar.gz")
+        result_logstash_home = File.join(target_dir, expected_untar_directory)
+
+        if Dir.exist?(result_logstash_home)
+          puts "expunging(#{result_logstash_home})"
+          # FileUtils#rm_rf cannot be used here because it silently fails to remove the bundled jdk on MacOS
+          expunge_result = `rm -rf #{Shellwords.escape(result_logstash_home)} 2>&1`
+          fail("ERROR EXPUNGING: #{expunge_result}") unless $?.success?
+        end
+
+        puts "expanding(#{tarball_candidate_path})"
+        FileUtils.mkdir_p(target_dir) unless Dir.exist?(target_dir)
+        FileUtils.chdir(target_dir) do
+          expand_result = `tar -xzf #{Shellwords.escape(tarball_candidate_path)} 2>&1`
+          fail("ERROR EXPANDING: #{expand_result}") unless $?.success?
+        end
+
+        return result_logstash_home
+      end
+    end
+
+    fail("failed to find any matching build tarballs (looked for `#{candidates}` in `#{build_dir}`)")
+  end
+  private :clean_expand_built_tarball
+
   def alive?
     if @process.nil? || @process.exited?
       raise "Logstash process is not up because of an error, or it stopped"
@@ -65,6 +122,10 @@ class LogstashService < Service
     @process.exit_code
   end
 
+  def pid
+    @process.pid
+  end
+
   # Starts a LS process in background with a given config file
   # and shuts it down after input is completely processed
   def start_background(config_file)
@@ -73,8 +134,8 @@ class LogstashService < Service
 
   # Given an input this pipes it to LS. Expects a stdin input in LS
   def start_with_input(config, input)
-    Bundler.with_clean_env do
-      `cat #{input} | #{@logstash_bin} -e \'#{config}\'`
+    Bundler.with_unbundled_env do
+      `cat #{Shellwords.escape(input)} | LS_JAVA_HOME=#{java.lang.System.getProperty('java.home')} #{Shellwords.escape(@logstash_bin)} -e \'#{config}\'`
     end
   end
 
@@ -88,19 +149,9 @@ class LogstashService < Service
 
   # Can start LS in stdin and can send messages to stdin
   # Useful to test metrics and such
-  def start_with_stdin
-    puts "Starting Logstash #{@logstash_bin} -e #{STDIN_CONFIG}"
-    Bundler.with_clean_env do
-      out = Tempfile.new("duplex")
-      out.sync = true
-      @process = build_child_process("-e", STDIN_CONFIG)
-      # pipe STDOUT and STDERR to a file
-      @process.io.stdout = @process.io.stderr = out
-      @process.duplex = true
-      @process.start
-      wait_for_logstash
-      puts "Logstash started with PID #{@process.pid}" if alive?
-    end
+  def start_with_stdin(pipeline_config = STDIN_CONFIG)
+    spawn_logstash("-e", pipeline_config)
+    wait_for_logstash
   end
 
   def write_to_stdin(input)
@@ -111,12 +162,24 @@ class LogstashService < Service
 
   # Spawn LS as a child process
   def spawn_logstash(*args)
-    Bundler.with_clean_env do
+    $stderr.puts "Starting Logstash #{Shellwords.escape(@logstash_bin)} #{Shellwords.join(args)}"
+    Bundler.with_unbundled_env do
+      out = Tempfile.new("duplex")
+      out.sync = true
       @process = build_child_process(*args)
+      # pipe STDOUT and STDERR to a file
+      @process.io.stdout = @process.io.stderr = out
+      @process.duplex = true # enable stdin to be written
       @env_variables.map { |k, v|  @process.environment[k] = v} unless @env_variables.nil?
+      if ENV['RUNTIME_JAVA_HOME']
+        logstash_java = @process.environment['LS_JAVA_HOME'] = ENV['RUNTIME_JAVA_HOME']
+      else
+        ENV.delete('LS_JAVA_HOME') if ENV['LS_JAVA_HOME']
+        logstash_java = 'bundled java'
+      end
       @process.io.inherit!
       @process.start
-      puts "Logstash started with PID #{@process.pid}" if @process.alive?
+      puts "Logstash started with PID #{@process.pid}, using java: #{logstash_java}" if @process.alive?
     end
   end
 
@@ -130,7 +193,7 @@ class LogstashService < Service
       args << feature_config_dir
       puts "Found feature flag. Starting LS using --path.settings #{feature_config_dir}"
     end
-    puts "Starting Logstash: #{@logstash_bin} #{args}"
+    puts "Starting Logstash: #{@logstash_bin} #{args} (pwd: #{Dir.pwd})"
     ChildProcess.build(@logstash_bin, *args)
   end
 
@@ -154,6 +217,14 @@ class LogstashService < Service
     end
   end
 
+  # check REST API is responsive
+  def rest_active?
+    result = monitoring_api.node_info
+    !result.nil?
+  rescue
+    return false
+  end
+
   def monitoring_api
     raise "Logstash is not up, but you asked for monitoring API" unless alive?
     @monitoring_api
@@ -173,6 +244,20 @@ class LogstashService < Service
     raise "Logstash REST API did not come up after #{RETRY_ATTEMPTS}s."
   end
 
+  # wait until LS respond to REST HTTP API request
+  def wait_for_rest_api
+    tries = RETRY_ATTEMPTS
+    while tries > 0
+      if rest_active?
+        return
+      else
+        sleep 1
+      end
+      tries -= 1
+    end
+    raise "Logstash REST API did not come up after #{RETRY_ATTEMPTS}s."
+  end
+
   # this method only overwrites existing config with new config
   # it does not assume that LS pipeline is fully reloaded after a
   # config change. It is up to the caller to validate that.
@@ -181,7 +266,7 @@ class LogstashService < Service
   end
 
   def get_version
-    `#{@logstash_bin} --version`.split("\n").last
+    `LS_JAVA_HOME=#{java.lang.System.getProperty('java.home')} #{Shellwords.escape(@logstash_bin)} --version`.split("\n").last
   end
 
   def get_version_yml
@@ -202,28 +287,87 @@ class LogstashService < Service
   end
 
   def plugin_cli
-    PluginCli.new(@logstash_home)
+    PluginCli.new(self)
   end
 
   def lock_file
     File.join(@logstash_home, "Gemfile.lock")
   end
 
-  class PluginCli
-    class ProcessStatus < Struct.new(:exit_code, :stderr_and_stdout); end
+  def run_cmd(cmd_args, change_dir = true, environment = {})
+    out = Tempfile.new("content")
+    out.sync = true
+
+    cmd, *args = cmd_args
+    process = ChildProcess.build(cmd, *args)
+    environment.each do |k, v|
+      process.environment[k] = v
+    end
+    # JDK matrix tests value BUILD_JAVA_HOME to select the JDK to use to run the test code
+    # forward this selection also in spawned Logstash
+    if ENV.key?("BUILD_JAVA_HOME") && !process.environment.key?("LS_JAVA_HOME")
+      process.environment["LS_JAVA_HOME"] = ENV["BUILD_JAVA_HOME"]
+    end
+    process.io.stdout = process.io.stderr = SynchronizedDelegate.new(out)
+
+    Bundler.with_unbundled_env do
+      if change_dir
+        Dir.chdir(@logstash_home) do
+          process.start
+        end
+      else
+        process.start
+      end
+    end
+
+    process.poll_for_exit(TIMEOUT_MAXIMUM)
+    out.rewind
+    ProcessStatus.new(process.exit_code, out.read)
+  end
+
+  def run(*args)
+    run_cmd [@logstash_bin, *args]
+  end
+
+  ##
+  # A `SynchronizedDelegate` wraps any object and ensures that exactly one
+  # calling thread is invoking methods on it at a time. This is useful for our
+  # clumsy setting of process io STDOUT and STDERR to the same IO object, which
+  # can cause interleaved writes.
+  class SynchronizedDelegate
+    def initialize(obj)
+      require "monitor"
+      @mon = Monitor.new
+      @obj = obj
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      @obj.respond_to?(method_name, include_private) || super
+    end
+
+    def method_missing(method_name, *args, &block)
+      return super unless @obj.respond_to?(method_name)
+
+      @mon.synchronize do
+        @obj.public_send(method_name, *args, &block)
+      end
+    end
+  end
+
+  class PluginCli
 
-    TIMEOUT_MAXIMUM = 60 * 10 # 10mins.
     LOGSTASH_PLUGIN = File.join("bin", "logstash-plugin")
 
     attr_reader :logstash_plugin
 
-    def initialize(logstash_home)
-      @logstash_plugin = File.join(logstash_home, LOGSTASH_PLUGIN)
-      @logstash_home = logstash_home
+    def initialize(logstash_service)
+      @logstash = logstash_service
+      @logstash_plugin = File.join(@logstash.logstash_home, LOGSTASH_PLUGIN)
     end
 
-    def remove(plugin_name)
-      run("remove #{plugin_name}")
+    def remove(plugin_name, *additional_plugins)
+      plugin_list = Shellwords.shelljoin([plugin_name]+additional_plugins)
+      run("remove #{plugin_list}")
     end
 
     def prepare_offline_pack(plugins, output_zip = nil)
@@ -236,44 +380,41 @@ class LogstashService < Service
       end
     end
 
-    def list(plugin_name, verbose = false)
-      run("list #{plugin_name} #{verbose ? "--verbose" : ""}")
+    def list(*plugins, verbose: false)
+      command = "list"
+      command << " --verbose" if verbose
+      command << " #{Shellwords.shelljoin(plugins)}" if plugins.any?
+      run(command)
     end
 
-    def install(plugin_name)
-      run("install #{plugin_name}")
+    def install(plugin_name, *additional_plugins, version: nil, verify: true, preserve: false, local: false)
+      args = []
+      args << "--no-verify" unless verify
+      args << "--preserve" if preserve
+      args << "--local" if local
+      args << "--version" << version unless version.nil?
+      args.concat(([plugin_name]+additional_plugins).flatten)
+
+      run("install #{Shellwords.shelljoin(args)}")
     end
 
-    def run_raw(cmd_parameters, change_dir = true, environment = {})
-      out = Tempfile.new("content")
-      out.sync = true
+    def update(*plugin_list, level: nil, local: nil, verify: nil, conservative: nil)
+      args = []
+      args << (verify ? "--verify" : "--no-verify") unless verify.nil?
+      args << "--level" << "#{level}" unless level.nil?
+      args << "--local" if local
+      args << (conservative ? "--conservative" : "--no-conservative") unless conservative.nil?
+      args.concat(plugin_list)
 
-      parts = cmd_parameters.split(" ")
-      cmd = parts.shift
-
-      process = ChildProcess.build(cmd, *parts)
-      environment.each do |k, v|
-        process.environment[k] = v
-      end
-      process.io.stdout = process.io.stderr = out
-
-      Bundler.with_clean_env do
-        if change_dir
-          Dir.chdir(@logstash_home) do
-            process.start
-          end
-        else
-          process.start
-        end
-      end
-
-      process.poll_for_exit(TIMEOUT_MAXIMUM)
-      out.rewind
-      ProcessStatus.new(process.exit_code, out.read)
+      run("update #{Shellwords.shelljoin(args)}")
     end
 
     def run(command)
       run_raw("#{logstash_plugin} #{command}")
     end
+
+    def run_raw(cmd, change_dir = true, environment = {})
+      @logstash.run_cmd(Shellwords.shellsplit(cmd), change_dir, environment)
+    end
   end
 end
diff --git a/qa/integration/services/monitoring_api.rb b/qa/integration/services/monitoring_api.rb
index 99e64792d..34b52634f 100644
--- a/qa/integration/services/monitoring_api.rb
+++ b/qa/integration/services/monitoring_api.rb
@@ -1,50 +1,77 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "manticore"
 require "json"
 
 # Convenience class to interact with the HTTP monitoring APIs
 class MonitoringAPI
 
+  def initialize(port = 9600)
+    @port = port
+  end
+
   def pipeline_stats(pipeline_id)
-    resp = Manticore.get("http://localhost:9600/_node/stats/pipelines/#{pipeline_id}").body
+    resp = Manticore.get("http://localhost:#{@port}/_node/stats/pipelines/#{pipeline_id}").body
     stats_response = JSON.parse(resp)
     stats_response.fetch("pipelines").fetch(pipeline_id)
   end
 
+  def pipelines_stats
+    resp = Manticore.get("http://localhost:#{@port}/_node/stats/pipelines").body
+    stats_response = JSON.parse(resp)
+    stats_response.fetch("pipelines")
+  end
+
   def event_stats
-    resp = Manticore.get("http://localhost:9600/_node/stats").body
+    resp = Manticore.get("http://localhost:#{@port}/_node/stats").body
     stats_response = JSON.parse(resp)
     stats_response["events"]
   end
 
   def version
-    request = @agent.get("http://localhost:9600/")
+    request = @agent.get("http://localhost:#{@port}/")
     response = request.execute
     r = JSON.parse(response.body.read)
     r["version"]
   end
-  
+
   def node_info
-    resp = Manticore.get("http://localhost:9600/_node").body
+    resp = Manticore.get("http://localhost:#{@port}/_node").body
     JSON.parse(resp)
   end
 
   def node_stats
-    resp = Manticore.get("http://localhost:9600/_node/stats").body
+    resp = Manticore.get("http://localhost:#{@port}/_node/stats").body
     JSON.parse(resp)
   end
 
   def logging_get
-    resp = Manticore.get("http://localhost:9600/_node/logging").body
+    resp = Manticore.get("http://localhost:#{@port}/_node/logging").body
     JSON.parse(resp)
   end
 
   def logging_put(body)
-    resp = Manticore.put("http://localhost:9600/_node/logging", {headers: {"Content-Type" => "application/json"}, body: body.to_json }).body
+    resp = Manticore.put("http://localhost:#{@port}/_node/logging", {headers: {"Content-Type" => "application/json"}, body: body.to_json }).body
     JSON.parse(resp)
   end
 
   def logging_reset
-    resp = Manticore.put("http://localhost:9600/_node/logging/reset", {headers: {"Content-Type" => "application/json"}}).body
+    resp = Manticore.put("http://localhost:#{@port}/_node/logging/reset", {headers: {"Content-Type" => "application/json"}}).body
     JSON.parse(resp)
   end
 end
diff --git a/qa/integration/services/service.rb b/qa/integration/services/service.rb
index 8a11a81bf..f3853adda 100644
--- a/qa/integration/services/service.rb
+++ b/qa/integration/services/service.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative '../../../logstash-core/lib/logstash-core.rb'
 
 # Base class for a service like Kafka, ES, Logstash
@@ -14,8 +31,9 @@ class Service
 
   def setup
     puts "Setting up #{@name} service"
-    if File.exists?(@setup_script)
-      `#{@setup_script}`
+    if File.exist?(@setup_script)
+      `#{Shellwords.escape(@setup_script)}`
+      raise "#{@setup_script} FAILED with exit status #{$?}" unless $?.success?
     else
       puts "Setup script not found for #{@name}"
     end
@@ -24,8 +42,9 @@ class Service
 
   def teardown
     puts "Tearing down #{@name} service"
-    if File.exists?(@teardown_script)
-      `#{@teardown_script}`
+    if File.exist?(@teardown_script)
+      `#{Shellwords.escape(@teardown_script)}`
+      raise "#{@teardown_script} FAILED with exit status #{$?}" unless $?.success?
     else
       puts "Teardown script not found for #{@name}"
     end
diff --git a/qa/integration/services/service_locator.rb b/qa/integration/services/service_locator.rb
index ff537ebcd..035cbad4a 100644
--- a/qa/integration/services/service_locator.rb
+++ b/qa/integration/services/service_locator.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "service"
 
 # This is a registry used in Fixtures so a test can get back any service class
diff --git a/qa/integration/specs/01_logstash_bin_smoke_spec.rb b/qa/integration/specs/01_logstash_bin_smoke_spec.rb
index 5ac15b648..ba75c6923 100644
--- a/qa/integration/specs/01_logstash_bin_smoke_spec.rb
+++ b/qa/integration/specs/01_logstash_bin_smoke_spec.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative '../framework/fixture'
 
 require_relative '../framework/settings'
@@ -31,7 +48,7 @@ describe "Test Logstash instance" do
 
   let(:num_retries) { 50 }
   let(:config1) { config_to_temp_file(@fixture.config("root", { :port => port1, :random_file => file_config1 })) }
-  let(:config2) { config_to_temp_file(@fixture.config("root", { :port => port2 , :random_file => file_config2 })) }
+  let(:config2) { config_to_temp_file(@fixture.config("root", { :port => port2, :random_file => file_config2 })) }
   let(:config3) { config_to_temp_file(@fixture.config("root", { :port => port3, :random_file => file_config3 })) }
   let(:port1) { random_port }
   let(:port2) { random_port }
@@ -143,7 +160,7 @@ describe "Test Logstash instance" do
 
   def get_id
     # make sure logstash is up and running when calling this
-    JSON.parse(open("http://localhost:9600/").read)["id"]
+    JSON.parse(::URI.open("http://localhost:9600/").read)["id"]
   end
 
   it "should keep the same id between restarts" do
@@ -155,10 +172,10 @@ describe "Test Logstash instance" do
     }
     start_ls.call()
     # we use a try since logstash may have started but the webserver may not yet
-    first_id = Stud.try(num_retries.times, Errno::ECONNREFUSED) { get_id }
+    first_id = Stud.try(num_retries.times, Errno::EBADF) { get_id }
     @ls1.teardown
     start_ls.call()
-    second_id = Stud.try(num_retries.times, Errno::ECONNREFUSED) { get_id }
+    second_id = Stud.try(num_retries.times, Errno::EBADF) { get_id }
     expect(first_id).to eq(second_id)
   end
 end
diff --git a/qa/integration/specs/beats_input_spec.rb b/qa/integration/specs/beats_input_spec.rb
index 1ecfaed6c..920c59b50 100644
--- a/qa/integration/specs/beats_input_spec.rb
+++ b/qa/integration/specs/beats_input_spec.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative '../framework/fixture'
 require_relative '../framework/settings'
 require "stud/temporary"
@@ -42,7 +59,6 @@ describe "Beat Input" do
       file.path
     end
 
-
     it "successfully send events" do
       logstash_service.start_background(logstash_config)
       process = filebeat_service.run(filebeat_config_path)
@@ -52,6 +68,7 @@ describe "Beat Input" do
       begin
         sleep(1) while (result = logstash_service.monitoring_api.event_stats).nil?
       rescue
+        sleep(1)
         retry
       end
 
@@ -67,8 +84,8 @@ describe "Beat Input" do
     let(:filebeat_config) do
       {
         "filebeat" => {
-          "prospectors" => [{ "paths" => [log_path], "input_type" => "log" }],
-          "registry_file" => registry_file,
+          "inputs" => [{ "paths" => [log_path], "type" => "filestream" }],
+          "registry.path" => registry_file,
           "scan_frequency" => "1s"
         },
         "output" => {
@@ -92,8 +109,8 @@ describe "Beat Input" do
       let(:filebeat_config) do
         {
           "filebeat" => {
-            "prospectors" => [{ "paths" => [log_path], "input_type" => "log" }],
-            "registry_file" => registry_file,
+            "inputs" => [{ "paths" => [log_path], "type" => "filestream" }],
+            "registry.path" => registry_file,
             "scan_frequency" => "1s"
           },
           "output" => {
@@ -119,8 +136,8 @@ describe "Beat Input" do
       let(:filebeat_config) do
         {
           "filebeat" => {
-            "prospectors" => [{ "paths" => [log_path], "input_type" => "log" }],
-            "registry_file" => registry_file,
+            "inputs" => [{ "paths" => [log_path], "type" => "filestream" }],
+            "registry.path" => registry_file,
             "scan_frequency" => "1s"
           },
           "output" => {
diff --git a/qa/integration/specs/cli/http_proxy_install_spec.rb b/qa/integration/specs/cli/http_proxy_install_spec.rb
index 9ffcef5cd..37665234b 100644
--- a/qa/integration/specs/cli/http_proxy_install_spec.rb
+++ b/qa/integration/specs/cli/http_proxy_install_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "../../framework/fixture"
 require_relative "../../framework/settings"
 require_relative "../../services/logstash_service"
diff --git a/qa/integration/specs/cli/install_spec.rb b/qa/integration/specs/cli/install_spec.rb
index d1c02037c..0463fc57d 100644
--- a/qa/integration/specs/cli/install_spec.rb
+++ b/qa/integration/specs/cli/install_spec.rb
@@ -1,24 +1,50 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "../../framework/fixture"
 require_relative "../../framework/settings"
 require_relative "../../services/logstash_service"
 require_relative "../../framework/helpers"
+require_relative "pluginmanager_spec_helper"
 require "logstash/devutils/rspec/spec_helper"
 require "stud/temporary"
 require "fileutils"
+require "open3"
 
 def gem_in_lock_file?(pattern, lock_file)
-  content =  File.read(lock_file)
+  content = File.read(lock_file)
   content.match(pattern)
 end
 
-describe "CLI > logstash-plugin install" do
+def plugin_filename_re(name, version)
+  %Q(\b#{Regexp.escape name}-#{Regexp.escape version}(-java)?\b)
+end
 
-  before(:all) do
+# Bundler can mess up installation successful output: https://github.com/elastic/logstash/issues/15801
+INSTALL_SUCCESS_RE = /IB?nstall successful/
+INSTALLATION_SUCCESS_RE = /IB?nstallation successful/
+
+INSTALLATION_ABORTED_RE = /Installation aborted/
+
+describe "CLI > logstash-plugin install" do
+  before(:each) do
     @fixture = Fixture.new(__FILE__)
     @logstash = @fixture.get_service("logstash")
     @logstash_plugin = @logstash.plugin_cli
-    @pack_directory =  File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "fixtures", "logstash-dummy-pack"))
   end
 
   shared_examples "install from a pack" do
@@ -26,16 +52,25 @@ describe "CLI > logstash-plugin install" do
     let(:install_command) { "bin/logstash-plugin install" }
     let(:change_dir) { true }
 
+    before(:all) do
+      @pack_directory =  File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "fixtures", "logstash-dummy-pack"))
+    end
+
     # When you are on anything by linux we won't disable the internet with seccomp
     if RbConfig::CONFIG["host_os"] == "linux"
       context "without internet connection (linux seccomp wrapper)" do
-
         let(:offline_wrapper_path) { File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "fixtures", "offline_wrapper")) }
 
         before do
           Dir.chdir(offline_wrapper_path) do
             system("make clean")
-            system("make")
+            stdout_str, stderr_str, status = Open3.capture3("make")
+            unless status.success?
+              puts "ERROR in compiling 'offline' tool"
+              puts "STDOUT: #{stdout_str}"
+              puts "STDERR: #{stderr_str}"
+            end
+            expect(status.success?).to be(true)
           end
         end
 
@@ -44,7 +79,7 @@ describe "CLI > logstash-plugin install" do
         it "successfully install the pack" do
           execute = @logstash_plugin.run_raw("#{offline_wrapper_cmd} #{install_command} #{pack}", change_dir)
 
-          expect(execute.stderr_and_stdout).to match(/Install successful/)
+          expect(execute.stderr_and_stdout).to match(INSTALL_SUCCESS_RE)
           expect(execute.exit_code).to eq(0)
 
           installed = @logstash_plugin.list("logstash-output-secret")
@@ -53,20 +88,19 @@ describe "CLI > logstash-plugin install" do
           expect(gem_in_lock_file?(/gemoji/, @logstash.lock_file)).to be_truthy
         end
       end
-    else
+    end
 
-      context "with internet connection" do
-        it "successfully install the pack" do
-          execute = @logstash_plugin.run_raw("#{install_command} #{pack}", change_dir)
+    context "with internet connection" do
+      it "successfully install the pack" do
+        execute = @logstash_plugin.run_raw("#{install_command} #{pack}", change_dir)
 
-          expect(execute.stderr_and_stdout).to match(/Install successful/)
-          expect(execute.exit_code).to eq(0)
+        expect(execute.stderr_and_stdout).to match(INSTALL_SUCCESS_RE)
+        expect(execute.exit_code).to eq(0)
 
-          installed = @logstash_plugin.list("logstash-output-secret")
-          expect(installed.stderr_and_stdout).to match(/logstash-output-secret/)
+        installed = @logstash_plugin.list("logstash-output-secret")
+        expect(installed.stderr_and_stdout).to match(/logstash-output-secret/)
 
-          expect(gem_in_lock_file?(/gemoji/, @logstash.lock_file)).to be_truthy
-        end
+        expect(gem_in_lock_file?(/gemoji/, @logstash.lock_file)).to be_truthy
       end
     end
   end
@@ -93,5 +127,182 @@ describe "CLI > logstash-plugin install" do
         end
       end
     end
+
+    context "install non bundle plugin" do
+      let(:plugin_name) { "logstash-input-github" }
+      let(:install_command) { "bin/logstash-plugin install" }
+
+      after(:each) do
+         # cleanly remove the installed plugin to don't pollute
+         # the environment for other subsequent tests
+         removal = @logstash_plugin.run_raw("bin/logstash-plugin uninstall #{plugin_name}")
+
+         expect(removal.stderr_and_stdout).to match(/Successfully removed #{plugin_name}/)
+         expect(removal.exit_code).to eq(0)
+      end
+
+      it "successfully install the plugin" do
+        execute = @logstash_plugin.run_raw("#{install_command} #{plugin_name}")
+
+        expect(execute.stderr_and_stdout).to match(INSTALLATION_SUCCESS_RE)
+        expect(execute.exit_code).to eq(0)
+
+        installed = @logstash_plugin.list(plugin_name)
+        expect(installed.stderr_and_stdout).to match(/#{plugin_name}/)
+      end
+
+      it "successfully installs the plugin with debug enabled" do
+        execute = @logstash_plugin.run_raw("#{install_command} #{plugin_name}", true, {"DEBUG" => "1"})
+
+        expect(execute.stderr_and_stdout).to match(INSTALLATION_SUCCESS_RE)
+        expect(execute.exit_code).to eq(0)
+
+        installed = @logstash_plugin.list(plugin_name)
+        expect(installed.stderr_and_stdout).to match(/#{plugin_name}/)
+      end
+    end
+  end
+
+  context "rubygems hosted plugin" do
+    include_context "pluginmanager validation helpers"
+    shared_context("install over existing") do
+      before(:each) do
+        aggregate_failures("precheck") do
+          expect("#{plugin_name}-#{existing_plugin_version}").to_not be_installed_gem
+          expect("#{plugin_name}").to_not be_installed_gem
+        end
+        aggregate_failures("setup") do
+          execute = @logstash_plugin.install(plugin_name, version: existing_plugin_version)
+
+          expect(execute.stderr_and_stdout).to match(INSTALLATION_SUCCESS_RE)
+          expect(execute.exit_code).to eq(0)
+
+          expect("#{plugin_name}-#{existing_plugin_version}").to be_installed_gem
+          expect(plugin_name).to be_in_gemfile.with_requirements(existing_plugin_version)
+        end
+      end
+    end
+    shared_examples("overwriting existing with explicit version") do
+      include_context "install over existing"
+      it "installs the specified version and removes the pre-existing one" do
+        execute = @logstash_plugin.install(plugin_name, version: specified_plugin_version)
+
+        aggregate_failures("command execution") do
+          expect(execute.stderr_and_stdout).to match(INSTALLATION_SUCCESS_RE)
+          expect(execute.exit_code).to eq(0)
+        end
+
+        installed = @logstash_plugin.list(plugin_name, verbose: true)
+        expect(installed.stderr_and_stdout).to match(/#{Regexp.escape plugin_name} [(]#{Regexp.escape(specified_plugin_version)}[)]/)
+
+        expect("#{plugin_name}-#{existing_plugin_version}").to_not be_installed_gem
+        expect("#{plugin_name}-#{specified_plugin_version}").to be_installed_gem
+      end
+    end
+
+    context "when installing over an older version using --version" do
+      let(:plugin_name) { "logstash-filter-qatest" }
+      let(:existing_plugin_version) { "0.1.0" }
+      let(:specified_plugin_version) { "0.1.1" }
+
+      include_examples "overwriting existing with explicit version"
+    end
+
+    context "when installing over a newer version using --version" do
+      let(:plugin_name) { "logstash-filter-qatest" }
+      let(:existing_plugin_version) { "0.1.0" }
+      let(:specified_plugin_version) { "0.1.1" }
+
+      include_examples "overwriting existing with explicit version"
+    end
+
+    context "when installing over existing without --version" do
+      let(:plugin_name) { "logstash-filter-qatest" }
+      let(:existing_plugin_version) { "0.1.0" }
+
+      include_context "install over existing"
+
+      context "with --preserve" do
+        it "succeeds without changing the requirements in the Gemfile" do
+          execute = @logstash_plugin.install(plugin_name, preserve: true)
+
+          aggregate_failures("command execution") do
+            expect(execute.stderr_and_stdout).to match(INSTALLATION_SUCCESS_RE)
+            expect(execute.exit_code).to eq(0)
+          end
+
+          installed = @logstash_plugin.list(verbose: true)
+          expect(installed.stderr_and_stdout).to match(/#{Regexp.escape plugin_name}/)
+
+          # we want to ensure that the act of installing an already-installed plugin
+          # does not change its requirements in the gemfile, and leaves the previously-installed
+          # version in-tact.
+          expect(plugin_name).to be_in_gemfile.with_requirements(existing_plugin_version)
+          expect("#{plugin_name}-#{existing_plugin_version}").to be_installed_gem
+        end
+      end
+
+      context "without --preserve" do
+        # this spec is OBSERVED behaviour, which I believe to be undesirable.
+        it "succeeds and removes the version requirement from the Gemfile" do
+          execute = @logstash_plugin.install(plugin_name)
+
+          aggregate_failures("command execution") do
+            expect(execute.stderr_and_stdout).to match(INSTALLATION_SUCCESS_RE)
+            expect(execute.exit_code).to eq(0)
+          end
+
+          installed = @logstash_plugin.list(plugin_name, verbose: true)
+          expect(installed.stderr_and_stdout).to match(/#{Regexp.escape plugin_name}/)
+
+          # This is the potentially-undesirable surprising behaviour, specified here
+          # as a means of documentation, not a promise of future behavior.
+          expect(plugin_name).to be_in_gemfile.without_requirements
+
+          # we expect _a_ version of the plugin to be installed, but cannot be opinionated
+          # about which version was installed because bundler won't necessarily re-resolve
+          # the dependency graph to get us an upgrade since the no-requirements dependency
+          # is still met (but it MAY do so if also installing plugins that are not present).
+          expect("#{plugin_name}").to be_installed_gem
+        end
+      end
+    end
+
+    context "installing plugin that isn't present" do
+      it "installs the plugin" do
+        aggregate_failures("prevalidation") do
+          expect("logstash-filter-qatest").to_not be_installed_gem
+        end
+
+        execute = @logstash_plugin.install("logstash-filter-qatest")
+
+        expect(execute.stderr_and_stdout).to match(INSTALLATION_SUCCESS_RE)
+        expect(execute.exit_code).to eq(0)
+
+        installed = @logstash_plugin.list("logstash-filter-qatest")
+        expect(installed.stderr_and_stdout).to match(/logstash-filter-qatest/)
+        expect(installed.exit_code).to eq(0)
+
+        expect(gem_in_lock_file?(/logstash-filter-qatest/, @logstash.lock_file)).to be_truthy
+
+        expect("logstash-filter-qatest").to be_installed_gem
+      end
+    end
+    context "installing plugin that doesn't exist on rubygems" do
+      it "doesn't install anything" do
+        execute = @logstash_plugin.install("logstash-filter-404-no-exist")
+
+        expect(execute.stderr_and_stdout).to match(INSTALLATION_ABORTED_RE)
+        expect(execute.exit_code).to eq(1)
+      end
+    end
+    context "installing gem that isn't a plugin" do
+      it "doesn't install anything" do
+        execute = @logstash_plugin.install("dummy_gem")
+
+        expect(execute.stderr_and_stdout).to match(INSTALLATION_ABORTED_RE)
+        expect(execute.exit_code).to eq(1)
+      end
+    end
   end
 end
diff --git a/qa/integration/specs/cli/keystore_spec.rb b/qa/integration/specs/cli/keystore_spec.rb
new file mode 100644
index 000000000..aca64285e
--- /dev/null
+++ b/qa/integration/specs/cli/keystore_spec.rb
@@ -0,0 +1,69 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative "../../framework/fixture"
+require_relative "../../framework/settings"
+require_relative "../../services/logstash_service"
+# require_relative "../../framework/helpers"
+require "logstash/devutils/rspec/spec_helper"
+require "stud/temporary"
+require "fileutils"
+require "open3"
+
+describe "CLI > logstash-keystore" do
+  before(:all) do
+    @fixture = Fixture.new(__FILE__)
+    @logstash = @fixture.get_service("logstash")
+  end
+
+  after do
+    FileUtils.rm_f File.join(@logstash.logstash_home, 'config', 'logstash.keystore')
+  end
+
+  context 'create' do
+    before do
+      FileUtils.rm_f File.join(@logstash.logstash_home, 'config', 'logstash.keystore')
+    end
+
+    it "works" do
+      env = {'LOGSTASH_KEYSTORE_PASS' => 'PaSSWD'}
+      if ENV['BUILD_JAVA_HOME']
+        env['LS_JAVA_HOME'] = ENV['BUILD_JAVA_HOME']
+      end
+      keystore_list = @logstash.run_cmd(['bin/logstash-keystore', 'create'], true, env)
+      expect(keystore_list.stderr_and_stdout).to_not match(/ERROR/)
+      expect(keystore_list.stderr_and_stdout).to include('Created Logstash keystore')
+    end
+  end
+
+  context 'list' do
+    before do
+      keystore = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "fixtures", "logstash.keystore"))
+      FileUtils.cp keystore, File.join(@logstash.logstash_home, 'config')
+    end
+
+    it "works" do
+      env = {'LOGSTASH_KEYSTORE_PASS' => 'PaSSWD'}
+      if ENV['BUILD_JAVA_HOME']
+        env['LS_JAVA_HOME'] = ENV['BUILD_JAVA_HOME']
+      end
+      keystore_list = @logstash.run_cmd(['bin/logstash-keystore', 'list'], true, env)
+      expect(keystore_list.stderr_and_stdout).to_not match(/ERROR/)
+      expect(keystore_list.stderr_and_stdout).to include('foo') # contains foo: bar
+    end
+  end
+end
diff --git a/qa/integration/specs/cli/list_spec.rb b/qa/integration/specs/cli/list_spec.rb
new file mode 100644
index 000000000..0e35f5ca9
--- /dev/null
+++ b/qa/integration/specs/cli/list_spec.rb
@@ -0,0 +1,94 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative '../../framework/fixture'
+require_relative '../../framework/settings'
+require_relative '../../services/logstash_service'
+require_relative '../../framework/helpers'
+require "logstash/devutils/rspec/spec_helper"
+
+describe "CLI > logstash-plugin remove" do
+  before(:all) do
+    @fixture = Fixture.new(__FILE__)
+    @logstash_plugin = @fixture.get_service("logstash").plugin_cli
+  end
+
+  context "listing plugins" do
+
+    let(:sub_heading_pattern) do
+      Regexp.union(" ├──"," └──")
+    end
+
+    let(:version_pattern) do
+      /[0-9]+[.][0-9][0-9a-z.]+/
+    end
+
+    def parse_output(output)
+      output.split(/\n(?! )/)
+    end
+
+    context "--verbose" do
+      it "successfully lists a single plugin" do
+        list_command = @logstash_plugin.run("list --verbose logstash-integration-jdbc")
+        expect(list_command.exit_code).to eq(0)
+        expect(list_command.stderr_and_stdout).to match(/^logstash-integration-jdbc [(]#{version_pattern}[)]/)
+      end
+      it "successfully lists all plugins" do
+        list_command = @logstash_plugin.run("list --verbose")
+        expect(list_command.exit_code).to eq(0)
+        expect(list_command.stderr_and_stdout).to match(/^logstash-integration-jdbc [(]#{version_pattern}[)]/)
+        expect(list_command.stderr_and_stdout).to match(/^logstash-input-beats [(]#{version_pattern}[)]/)
+        expect(list_command.stderr_and_stdout).to match(/^logstash-output-elasticsearch [(]#{version_pattern}[)]/)
+      end
+    end
+
+    it "expands integration plugins" do
+      list_command = @logstash_plugin.run("list logstash-integration-jdbc")
+      expect(list_command.exit_code).to eq(0)
+      plugins = list_command.stderr_and_stdout.split(/\n(?! )/)
+
+      integration_plugin = plugins.find { |plugin_output| plugin_output.match(/^logstash-integration-jdbc\b/) }
+      expect(integration_plugin).to match(/^#{sub_heading_pattern} #{Regexp.escape("logstash-input-jdbc")}$/)
+      expect(integration_plugin).to match(/^#{sub_heading_pattern} #{Regexp.escape("logstash-filter-jdbc_static")}$/)
+    end
+
+    it "expands plugin aliases" do
+      list_command = @logstash_plugin.run("list logstash-input-beats")
+      expect(list_command.exit_code).to eq(0)
+      plugins = list_command.stderr_and_stdout.split(/\n(?! )/)
+
+      alias_plugin = plugins.find { |plugin_output| plugin_output.match(/^logstash-input-beats\b/) }
+      expect(alias_plugin).to match(/^#{sub_heading_pattern} #{Regexp.escape("logstash-input-elastic_agent (alias)")}$/)
+    end
+
+    context "--no-expand" do
+      it "does not expand integration plugins" do
+        list_command = @logstash_plugin.run("list --no-expand")
+        expect(list_command.exit_code).to eq(0)
+        expect(list_command.stderr_and_stdout).to match(/^logstash-integration-jdbc\b/)
+        expect(list_command.stderr_and_stdout).to_not include("logstash-input-jdbc") # known integrated plugin
+        expect(list_command.stderr_and_stdout).to_not include("logstash-filter-jdbc") # known integrated plugin
+      end
+      it "does not expand plugin aliases" do
+        list_command = @logstash_plugin.run("list --no-expand")
+        expect(list_command.exit_code).to eq(0)
+        expect(list_command.stderr_and_stdout).to match(/^logstash-input-beats\b/)
+        expect(list_command.stderr_and_stdout).to_not include("logstash-input-elastic_agent") # known alias
+      end
+    end
+  end
+end
diff --git a/qa/integration/specs/cli/pluginmanager_spec_helper.rb b/qa/integration/specs/cli/pluginmanager_spec_helper.rb
new file mode 100644
index 000000000..4a1b99982
--- /dev/null
+++ b/qa/integration/specs/cli/pluginmanager_spec_helper.rb
@@ -0,0 +1,92 @@
+require 'pathname'
+require 'bundler/definition'
+
+shared_context "pluginmanager validation helpers" do
+
+  matcher :be_installed_gem do
+    match do |actual|
+      common(actual)
+      @gemspec_present && @gem_installed
+    end
+
+    match_when_negated do |actual|
+      common(actual)
+      !@gemspec_present && !@gem_installed
+    end
+
+    define_method :common do |actual|
+      version_suffix = /-[0-9.]+(-java)?$/
+      filename_matcher = actual.match?(version_suffix) ? actual : /^#{Regexp.escape(actual)}#{version_suffix}/
+
+      @gems = (logstash_gemdir / "gems").glob("*-*")
+      @gemspecs = (logstash_gemdir / "specifications").glob("*-*.gemspec")
+
+      @gem_installed = @gems.find { |gem| gem.basename.to_s.match?(filename_matcher) }
+      @gemspec_present = @gemspecs.find { |gemspec| gemspec.basename(".gemspec").to_s.match?(filename_matcher) }
+    end
+
+    failure_message do |actual|
+      reasons = []
+      reasons << "the gem dir could not be found (#{@gems})" unless @gem_installed
+      reasons << "the gemspec could not be found (#{@gemspecs})" unless @gemspec_present
+
+      "expected that #{actual} would be installed, but #{reasons.join(' and ')}"
+    end
+    failure_message_when_negated do |actual|
+      reasons = []
+      reasons << "the gem dir is present (#{@gem_installed})" if @gem_installed
+      reasons << "the gemspec is present (#{@gemspec_present})" if @gemspec_present
+
+      "expected that #{actual} would not be installed, but #{reasons.join(' and ')}"
+    end
+  end
+
+  matcher :be_in_gemfile do
+    match do |actual|
+      common(actual)
+      @dep && (@version_requirements.nil? || @version_requirements == @dep.requirement)
+    end
+    define_method :common do |actual|
+      @definition = Bundler::Definition.build(logstash_gemfile, logstash_gemfile_lock, false)
+      @dep = @definition.dependencies.find { |s| s.name == actual }
+    end
+    chain :with_requirements do |version_requirements|
+      @version_requirements = Gem::Requirement.create(version_requirements)
+    end
+    chain :without_requirements do
+      @version_requirements = Gem::Requirement.default
+    end
+    failure_message do |actual|
+      if @dep.nil?
+        "expected the gem to be in the gemspec, but it wasn't (#{@definition.dependencies.map(&:name)})"
+      else
+        "expected the `#{actual}` gem to have requirements `#{@version_requirements}`, but they were `#{@dep.requirement}`"
+      end
+    end
+  end
+
+  def logstash_home
+    return super() if defined?(super)
+    return @logstash.logstash_home if @logstash
+    fail("no @logstash, so we can't get logstash_home")
+  end
+
+  def logstash_gemfile
+    Pathname.new(logstash_home) / "Gemfile"
+  end
+
+  def logstash_gemfile_lock
+    Pathname.new(logstash_home) / "Gemfile.lock"
+  end
+
+  def logstash_gemdir
+    pathname_base = (Pathname.new(logstash_home) / "vendor" / "bundle" / "jruby")
+    candidate_dirs = pathname_base.glob("[0-9]*")
+    case candidate_dirs.size
+    when 0 then fail("no version dir found in #{pathname_base}")
+    when 1 then candidate_dirs.first
+    else
+      fail("multiple version dirs found in #{pathname_base} (#{candidate_dirs.map(&:basename)}")
+    end
+  end
+end
\ No newline at end of file
diff --git a/qa/integration/specs/cli/prepare_offline_pack_spec.rb b/qa/integration/specs/cli/prepare_offline_pack_spec.rb
index babdb0393..22e5b4232 100644
--- a/qa/integration/specs/cli/prepare_offline_pack_spec.rb
+++ b/qa/integration/specs/cli/prepare_offline_pack_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "../../framework/fixture"
 require_relative "../../framework/settings"
 require_relative "../../services/logstash_service"
@@ -35,6 +51,24 @@ describe "CLI > logstash-plugin prepare-offline-pack" do
     end
   end
 
+  context "creating a pack for integration plugins" do
+    let(:plugin_to_pack) { "logstash-integration-jdbc" }
+
+    it "successfully create a pack" do
+      execute = @logstash_plugin.prepare_offline_pack(plugin_to_pack, temporary_zip_file)
+
+      expect(execute.exit_code).to eq(0)
+      expect(execute.stderr_and_stdout).to match(/Offline package created at/)
+      expect(execute.stderr_and_stdout).to match(/#{temporary_zip_file}/)
+
+      unpacked = unpack(temporary_zip_file)
+      expect(unpacked.plugins.collect(&:name)).to include(plugin_to_pack)
+      expect(unpacked.plugins.size).to eq(1)
+
+      expect(unpacked.dependencies.size).to be > 0
+    end
+  end
+
   context "create a pack from a wildcard" do
     let(:plugins_to_pack) { %w(logstash-filter-*) }
 
@@ -50,7 +84,7 @@ describe "CLI > logstash-plugin prepare-offline-pack" do
       filters = @logstash_plugin.list(plugins_to_pack.first)
                                 .stderr_and_stdout.split("\n")
                                 .delete_if do |line|
-                                  line =~ /cext|JAVA_OPT|fatal|^WARNING|Option \w+ was deprecated/
+                                  line !~ /^logstash-(codec|filter|input|output)-\w*$/
                                 end
 
       expect(unpacked.plugins.collect(&:name)).to include(*filters)
diff --git a/qa/integration/specs/cli/remove_spec.rb b/qa/integration/specs/cli/remove_spec.rb
index 2bce464ce..bf168aafc 100644
--- a/qa/integration/specs/cli/remove_spec.rb
+++ b/qa/integration/specs/cli/remove_spec.rb
@@ -1,84 +1,77 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative '../../framework/fixture'
 require_relative '../../framework/settings'
 require_relative '../../services/logstash_service'
 require_relative '../../framework/helpers'
+require_relative "pluginmanager_spec_helper"
 require "logstash/devutils/rspec/spec_helper"
 
 describe "CLI > logstash-plugin remove" do
-  before(:all) do
+
+  include_context "pluginmanager validation helpers"
+
+  before(:each) do
     @fixture = Fixture.new(__FILE__)
-    @logstash_plugin = @fixture.get_service("logstash").plugin_cli
+    @logstash = @fixture.get_service("logstash")
+    @logstash_plugin = @logstash.plugin_cli
   end
 
-    if RbConfig::CONFIG["host_os"] == "linux"
-      context "without internet connection (linux seccomp wrapper)" do
+  if RbConfig::CONFIG["host_os"] == "linux"
+    context "without internet connection (linux seccomp wrapper)" do
+      let(:offline_wrapper_path) { File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "fixtures", "offline_wrapper")) }
+      let(:offline_wrapper_cmd) { File.join(offline_wrapper_path, "offline") }
 
-        let(:offline_wrapper_path) { File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "fixtures", "offline_wrapper")) }
-        let(:offline_wrapper_cmd) { File.join(offline_wrapper_path, "offline") }
-
-        before do
-          Dir.chdir(offline_wrapper_path) do
-            system("make clean")
-            system("make")
-          end
+      before do
+        Dir.chdir(offline_wrapper_path) do
+          system("make clean")
+          system("make")
         end
-
-        context "when no other plugins depends on this plugin" do
-          it "successfully remove the plugin" do
-            execute = @logstash_plugin.run_raw("#{offline_wrapper_cmd} bin/logstash-plugin remove logstash-input-twitter")
-
-            expect(execute.exit_code).to eq(0)
-            expect(execute.stderr_and_stdout).to match(/Successfully removed logstash-input-twitter/)
-
-            presence_check = @logstash_plugin.list("logstash-input-twitter")
-            expect(presence_check.exit_code).to eq(1)
-            expect(presence_check.stderr_and_stdout).to match(/ERROR: No plugins found/)
-
-            @logstash_plugin.install("logstash-input-twitter")
-          end
-        end
-
-        context "when other plugins depends on this plugin" do
-          it "refuses to remove the plugin and display the plugin that depends on it." do
-            execute = @logstash_plugin.run_raw("#{offline_wrapper_cmd} bin/logstash-plugin remove logstash-codec-json")
-
-            expect(execute.exit_code).to eq(1)
-            expect(execute.stderr_and_stdout).to match(/Failed to remove "logstash-codec-json"/)
-            expect(execute.stderr_and_stdout).to match(/logstash-input-kafka/) # one of the dependency
-            expect(execute.stderr_and_stdout).to match(/logstash-output-udp/) # one of the dependency
-
-            presence_check = @logstash_plugin.list("logstash-codec-json")
-
-            expect(presence_check.exit_code).to eq(0)
-            expect(presence_check.stderr_and_stdout).to match(/logstash-codec-json/)
-          end
-        end
-
       end
-    else
+
       context "when no other plugins depends on this plugin" do
+        let(:test_plugin) { "logstash-filter-qatest" }
+
+        before :each do
+          @logstash_plugin.install(File.join(File.dirname(__FILE__), "..", "..", "fixtures", "logstash-filter-qatest-0.1.1.gem"))
+        end
+
         it "successfully remove the plugin" do
-          execute = @logstash_plugin.remove("logstash-input-twitter")
+          execute = @logstash_plugin.run_raw("#{offline_wrapper_cmd} bin/logstash-plugin remove #{test_plugin}")
 
           expect(execute.exit_code).to eq(0)
-          expect(execute.stderr_and_stdout).to match(/Successfully removed logstash-input-twitter/)
+          expect(execute.stderr_and_stdout).to match(/Successfully removed #{test_plugin}/)
 
-          presence_check = @logstash_plugin.list("logstash-input-twitter")
+          presence_check = @logstash_plugin.list(test_plugin)
           expect(presence_check.exit_code).to eq(1)
           expect(presence_check.stderr_and_stdout).to match(/ERROR: No plugins found/)
 
-          @logstash_plugin.install("logstash-input-twitter")
+          expect("logstash-filter-qatest").to_not be_installed_gem
         end
       end
 
       context "when other plugins depends on this plugin" do
         it "refuses to remove the plugin and display the plugin that depends on it." do
-          execute = @logstash_plugin.remove("logstash-codec-json")
+          execute = @logstash_plugin.run_raw("#{offline_wrapper_cmd} bin/logstash-plugin remove logstash-codec-json")
 
           expect(execute.exit_code).to eq(1)
           expect(execute.stderr_and_stdout).to match(/Failed to remove "logstash-codec-json"/)
-          expect(execute.stderr_and_stdout).to match(/logstash-input-kafka/) # one of the dependency
+          expect(execute.stderr_and_stdout).to match(/logstash-integration-kafka/) # one of the dependency
           expect(execute.stderr_and_stdout).to match(/logstash-output-udp/) # one of the dependency
 
           presence_check = @logstash_plugin.list("logstash-codec-json")
@@ -88,4 +81,200 @@ describe "CLI > logstash-plugin remove" do
         end
       end
     end
+  end
+
+  context "when no other plugins depends on this plugin" do
+    let(:test_plugin) { "logstash-filter-qatest" }
+
+    before :each do
+      @logstash_plugin.install(File.join(File.dirname(__FILE__), "..", "..", "fixtures", "logstash-filter-qatest-0.1.1.gem"))
+    end
+
+    it "successfully remove the plugin" do
+      execute = @logstash_plugin.remove(test_plugin)
+
+      expect(execute.exit_code).to eq(0)
+      expect(execute.stderr_and_stdout).to match(/Successfully removed #{test_plugin}/)
+
+      presence_check = @logstash_plugin.list(test_plugin)
+      expect(presence_check.exit_code).to eq(1)
+      expect(presence_check.stderr_and_stdout).to match(/ERROR: No plugins found/)
+
+      expect("logstash-filter-qatest").to_not be_installed_gem
+    end
+  end
+
+  context "plugins with unshared dependencies" do
+    let(:plugin_to_remove) {  }
+
+    it "successfully removes the plugin and its unshared dependencies" do
+      execute = @logstash_plugin.remove("logstash-integration-aws")
+
+      expect(execute.exit_code).to eq(0)
+      expect(execute.stderr_and_stdout).to match(/Successfully removed logstash-integration-aws/)
+
+      expect("logstash-integration-aws").to_not be_installed_gem
+
+      # known unshared dependencies, including transitive dependencies
+      aggregate_failures("known unshared dependencies") do
+        expect("aws-sdk-core").to_not be_installed_gem
+        expect("aws-sdk-s3").to_not be_installed_gem
+        expect("aws-sdk-kms").to_not be_installed_gem
+        expect("aws-sdk-cloudfront").to_not be_installed_gem
+        expect("aws-sdk-cloudwatch").to_not be_installed_gem
+        expect("aws-eventstream").to_not be_installed_gem
+        expect("aws-partitions").to_not be_installed_gem
+      end
+
+      # known shared dependencies
+      aggregate_failures("known shared dependencies") do
+        expect("concurrent-ruby").to be_installed_gem
+        expect("logstash-codec-json").to be_installed_gem
+      end
+    end
+  end
+
+  context "when other plugins depends on this plugin" do
+    it "refuses to remove the plugin and display the plugin that depends on it." do
+      execute = @logstash_plugin.remove("logstash-codec-json")
+
+      expect(execute.exit_code).to eq(1)
+      expect(execute.stderr_and_stdout).to match(/Failed to remove "logstash-codec-json"/)
+      expect(execute.stderr_and_stdout).to match(/logstash-integration-kafka/) # one of the dependency
+      expect(execute.stderr_and_stdout).to match(/logstash-output-udp/) # one of the dependency
+
+      presence_check = @logstash_plugin.list("logstash-codec-json")
+
+      expect(presence_check.exit_code).to eq(0)
+      expect(presence_check.stderr_and_stdout).to match(/logstash-codec-json/)
+
+      expect("logstash-codec-json").to be_installed_gem
+    end
+  end
+
+  context "multiple plugins" do
+
+    let(:setup_plugin_list) do
+      fail("spec must override `setup_plugin_list`")
+    end
+
+    before(:each) do
+      if setup_plugin_list.any?
+        search_dir = File.expand_path(File.join(__dir__, "..", "..", "fixtures", "plugins"))
+        plugin_paths = []
+
+        aggregate_failures('setup: resolve plugin paths') do
+          setup_plugin_list.each do |requested_plugin|
+            found = Dir.glob(File.join(search_dir, "#{requested_plugin}-*.gem"))
+            expect(found).to have_attributes(:size => 1), lambda { "expected exactly one `#{requested_plugin}` in `#{search_dir}`, got #{found.inspect}" }
+            plugin_paths << found.first
+          end
+        end
+
+        aggregate_failures('setup: installing plugins') do
+          puts "installing plugins #{plugin_paths.inspect}"
+          outcome = @logstash_plugin.install(*plugin_paths)
+
+          expect(outcome.exit_code).to eq(0)
+          expect(outcome.stderr_and_stdout).to match(/Installation successful/)
+        end
+      end
+    end
+
+    context "when a remaining plugin has a dependency on a removed plugin" do
+      let(:setup_plugin_list) do
+        %w(
+          logstash-filter-zero_no_dependencies
+          logstash-filter-one_no_dependencies
+          logstash-filter-two_depends_on_one
+          logstash-filter-three_no_dependencies
+          logstash-filter-four_depends_on_one_and_three
+        )
+      end
+      it "errors helpfully without removing any of the plugins" do
+        execute = @logstash_plugin.remove("logstash-filter-three_no_dependencies", "logstash-filter-zero_no_dependencies")
+
+        expect(execute.exit_code).to eq(1)
+        expect(execute.stderr_and_stdout).to include('Failed to remove "logstash-filter-three_no_dependencies"')
+        expect(execute.stderr_and_stdout).to include("* logstash-filter-four_depends_on_one_and_three") # one of the dependency
+        expect(execute.stderr_and_stdout).to include("No plugins were removed.")
+
+        aggregate_failures("list plugins") do
+          presence_check = @logstash_plugin.list
+          expect(presence_check.exit_code).to eq(0)
+          expect(presence_check.stderr_and_stdout).to include('logstash-filter-three_no_dependencies')
+          expect(presence_check.stderr_and_stdout).to include('logstash-filter-zero_no_dependencies')
+        end
+      end
+    end
+    context "when multiple remaining plugins have a dependency on a removed plugin" do
+      let(:setup_plugin_list) do
+        %w(
+          logstash-filter-zero_no_dependencies
+          logstash-filter-one_no_dependencies
+          logstash-filter-two_depends_on_one
+          logstash-filter-three_no_dependencies
+          logstash-filter-four_depends_on_one_and_three
+        )
+      end
+      it "errors helpfully without removing any of the plugins" do
+        execute = @logstash_plugin.remove("logstash-filter-one_no_dependencies", "logstash-filter-zero_no_dependencies")
+
+        expect(execute.exit_code).to eq(1)
+        expect(execute.stderr_and_stdout).to include('Failed to remove "logstash-filter-one_no_dependencies"')
+        expect(execute.stderr_and_stdout).to include("* logstash-filter-four_depends_on_one_and_three") # one of the dependency
+        expect(execute.stderr_and_stdout).to include("* logstash-filter-two_depends_on_one") # one of the dependency
+        expect(execute.stderr_and_stdout).to include("No plugins were removed.")
+
+        aggregate_failures("list plugins") do
+          presence_check = @logstash_plugin.list
+          expect(presence_check.exit_code).to eq(0)
+          expect(presence_check.stderr_and_stdout).to include('logstash-filter-one_no_dependencies')
+          expect(presence_check.stderr_and_stdout).to include('logstash-filter-zero_no_dependencies')
+        end
+      end
+    end
+    context "when removing plugins and all plugins that depend on them" do
+      let(:setup_plugin_list) do
+        %w(
+          logstash-filter-zero_no_dependencies
+          logstash-filter-one_no_dependencies
+          logstash-filter-two_depends_on_one
+          logstash-filter-three_no_dependencies
+          logstash-filter-four_depends_on_one_and_three
+        )
+      end
+      it "removes the plugins" do
+        plugins_to_remove = %w(
+          logstash-filter-one_no_dependencies
+          logstash-filter-two_depends_on_one
+          logstash-filter-three_no_dependencies
+          logstash-filter-four_depends_on_one_and_three
+        ).shuffle #random order
+        execute = @logstash_plugin.remove(*plugins_to_remove)
+
+        aggregate_failures("removal action") do
+          expect(execute).to have_attributes(:exit_code => 0, :stderr_and_stdout => include("Success"))
+          plugins_to_remove.each do |gem_name|
+            expect(execute.stderr_and_stdout).to include("Successfully removed #{gem_name}")
+          end
+        end
+
+        aggregate_failures("list plugins") do
+          presence_check = @logstash_plugin.list
+          expect(presence_check.exit_code).to eq(0)
+          aggregate_failures("removed plugins") do
+            plugins_to_remove.each do |expected_removed_plugin|
+              expect(presence_check.stderr_and_stdout).to_not include(expected_removed_plugin)
+            end
+          end
+          aggregate_failures("non-removed plugins") do
+            (setup_plugin_list - plugins_to_remove).each do |expected_remaining_plugin|
+              expect(presence_check.stderr_and_stdout).to include(expected_remaining_plugin)
+            end
+          end
+        end
+      end
+    end
+  end
 end
diff --git a/qa/integration/specs/cli/update_spec.rb b/qa/integration/specs/cli/update_spec.rb
new file mode 100644
index 000000000..56ad75ec7
--- /dev/null
+++ b/qa/integration/specs/cli/update_spec.rb
@@ -0,0 +1,65 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative "../../framework/fixture"
+require_relative "../../framework/settings"
+require_relative "../../services/logstash_service"
+require_relative "../../framework/helpers"
+require_relative "pluginmanager_spec_helper"
+require "logstash/devutils/rspec/spec_helper"
+
+describe "CLI > logstash-plugin update" do
+
+  include_context "pluginmanager validation helpers"
+
+  before(:each) do
+    @fixture = Fixture.new(__FILE__)
+    @logstash = @fixture.get_service("logstash")
+    @logstash_plugin = @logstash.plugin_cli
+  end
+
+  context "upgrading a plugin" do
+    before(:each) do
+      aggregate_failures("precheck") do
+        expect("logstash-filter-qatest").to_not be_installed_gem
+      end
+      aggregate_failures("setup") do
+        execute = @logstash_plugin.install("logstash-filter-qatest", version: "0.1.0")
+
+        expect(execute.stderr_and_stdout).to match(/Installation successful/)
+        expect(execute.exit_code).to eq(0)
+
+        expect("logstash-filter-qatest-0.1.0").to be_installed_gem
+      end
+    end
+    it "upgrades the plugin and cleans the old one" do
+      execute = @logstash_plugin.update("logstash-filter-qatest")
+
+      aggregate_failures("command execution") do
+        expect(execute.stderr_and_stdout).to include("Updated logstash-filter-qatest 0.1.0 to 0.1.1")
+        expect(execute.exit_code).to eq(0)
+      end
+
+      installed = @logstash_plugin.list("logstash-filter-qatest", verbose: true)
+      expect(execute.exit_code).to eq(0)
+      expect(installed.stderr_and_stdout).to include("logstash-filter-qatest")
+
+      expect("logstash-filter-qatest-0.1.1").to be_installed_gem
+      expect("logstash-filter-qatest-0.1.0").to_not be_installed_gem
+    end
+  end
+end
\ No newline at end of file
diff --git a/qa/integration/specs/command_line_spec.rb b/qa/integration/specs/command_line_spec.rb
new file mode 100644
index 000000000..4ccfaea0a
--- /dev/null
+++ b/qa/integration/specs/command_line_spec.rb
@@ -0,0 +1,45 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative "../framework/fixture"
+require_relative "../framework/settings"
+require_relative "../framework/helpers"
+
+describe "CLI >" do
+  before(:all) do
+    @fixture = Fixture.new(__FILE__)
+    @logstash = @fixture.get_service("logstash")
+  end
+
+  after(:each) { @logstash.teardown }
+
+  it "shows --help" do
+    execute = @logstash.run('--help')
+
+    expect(execute.exit_code).to eq(0)
+    expect(execute.stderr_and_stdout).to include('bin/logstash [OPTIONS]')
+    expect(execute.stderr_and_stdout).to include('--pipeline.id ID')
+  end
+
+  it "starts without unexected warnings" do
+    execute = @logstash.run
+    lines = execute.stderr_and_stdout.split("\n")
+    expect(lines.shift).to match(/^(Using system java)|(Using bundled JDK)|(Using LS_JAVA_HOME defined java):/)
+    while (up_line = lines.shift).match(/OpenJDK 64-Bit Server VM warning: Option UseConcMarkSweepGC was deprecated|warning: ignoring JAVA_TOOL_OPTIONS|warning: already initialized constant Socket::Constants|.*warning: method redefined; discarding old to_int$|.*warning: method redefined; discarding old to_f$|^WARNING: Logstash comes bundled with the recommended JDK.*/) do end
+    expect(up_line).to match(/^Sending Logstash logs to/)
+  end
+end
diff --git a/qa/integration/specs/deprecation_log_spec.rb b/qa/integration/specs/deprecation_log_spec.rb
new file mode 100644
index 000000000..034ee8c48
--- /dev/null
+++ b/qa/integration/specs/deprecation_log_spec.rb
@@ -0,0 +1,76 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative '../framework/fixture'
+require_relative '../framework/settings'
+require_relative '../services/logstash_service'
+require_relative '../framework/helpers'
+require "logstash/devutils/rspec/spec_helper"
+require "yaml"
+
+describe "Test Logstash Pipeline id" do
+  before(:all) {
+    @fixture = Fixture.new(__FILE__)
+    # used in multiple LS tests
+    @ls = @fixture.get_service("logstash")
+  }
+
+  after(:all) {
+    @fixture.teardown
+  }
+
+  before(:each) {
+    # backup the application settings file -- logstash.yml
+    FileUtils.cp(@ls.application_settings_file, "#{@ls.application_settings_file}.original")
+  }
+
+  after(:each) {
+    @ls.teardown
+    # restore the application settings file -- logstash.yml
+    FileUtils.mv("#{@ls.application_settings_file}.original", @ls.application_settings_file)
+  }
+
+  let(:temp_dir) { Stud::Temporary.directory("logstash-pipelinelog-test") }
+  let(:config) { @fixture.config("root") }
+  let(:initial_config_file) { config_to_temp_file(@fixture.config("root")) }
+
+  it "should not create separate pipelines log files if not enabled" do
+    pipeline_name = "custom_pipeline"
+    settings = {
+      "path.logs" => temp_dir,
+      "pipeline.id" => pipeline_name,
+      "pipeline.separate_logs" => false
+    }
+    IO.write(@ls.application_settings_file, settings.to_yaml)
+    @ls.spawn_logstash("-w", "1", "-e", config)
+    wait_logstash_process_terminate
+
+    deprecation_log_file = "#{temp_dir}/logstash-deprecation.log"
+    expect(File.exist?(deprecation_log_file)).to be true
+    deprecation_log_content = IO.read(deprecation_log_file)
+    expect(deprecation_log_content =~ /\[deprecation.logstash.filters.ruby\].*Teleport/).to be > 0
+  end
+
+  @private
+  def wait_logstash_process_terminate
+    num_retries = 100
+    try(num_retries) do
+      expect(@ls.exited?).to be(true)
+    end
+    expect(@ls.exit_code).to be >= 0
+  end
+end
diff --git a/qa/integration/specs/direct_heap_allocator_flag_spec.rb b/qa/integration/specs/direct_heap_allocator_flag_spec.rb
new file mode 100644
index 000000000..973518a72
--- /dev/null
+++ b/qa/integration/specs/direct_heap_allocator_flag_spec.rb
@@ -0,0 +1,128 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative '../framework/fixture'
+require_relative '../framework/settings'
+require_relative '../services/logstash_service'
+require_relative '../framework/helpers'
+require "logstash/devutils/rspec/spec_helper"
+require "yaml"
+require "manticore"
+
+describe "Test Logstash buffer allocation setting" do
+  before(:all) {
+    @fixture = Fixture.new(__FILE__)
+    # used in multiple LS tests
+    @ls = @fixture.get_service("logstash")
+  }
+
+  after(:all) {
+    @fixture.teardown
+  }
+
+  before(:each) {
+    # backup the application settings file -- logstash.yml
+    FileUtils.cp(@ls.application_settings_file, "#{@ls.application_settings_file}.original")
+  }
+
+  after(:each) {
+    @ls.teardown
+    # restore the application settings file -- logstash.yml
+    FileUtils.mv("#{@ls.application_settings_file}.original", @ls.application_settings_file)
+  }
+
+  let(:temp_dir) { Stud::Temporary.directory("logstash-pipelinelog-test") }
+  let(:config) { @fixture.config("root") }
+  let(:initial_config_file) { config_to_temp_file(@fixture.config("root")) }
+  let(:settings) do
+    {
+      "path.logs" => temp_dir,
+      "pipeline.buffer.type" => buffer_type
+    }
+  end
+
+  context "running a pipeline that dump memory status" do
+    before(:each) { start_logstash_and_process_some_events }
+
+    context "when 'direct' is configured as pipeline.buffer.type" do
+      let(:buffer_type) { "direct" }
+
+      it "should use Netty direct memory" do
+        last_dump_line = find_last_mem_dump_log_line("#{temp_dir}/logstash-plain.log")
+
+        # verify direct buffer are used while heap buffers remains at 0
+        direct_mem, heap_mem = last_dump_line.match(/\[logstash.filters.ruby\s*\]\[main\].*Direct pinned: (\d*) .*Heap pinned: (\d*)/).captures
+        expect(direct_mem.to_i).to be > 0
+        expect(heap_mem.to_i).to eq 0
+      end
+    end
+
+    context "when 'heap' is configured as pipeline.buffer.type" do
+      let(:buffer_type) { "heap" }
+
+      it "should use only Java heap memory" do
+        last_dump_line = find_last_mem_dump_log_line("#{temp_dir}/logstash-plain.log")
+
+        # verify java heap  buffer are used while direct buffers remains at 0
+        direct_mem, heap_mem = last_dump_line.match(/\[logstash.filters.ruby\s*\]\[main\].*Direct pinned: (\d*) .*Heap pinned: (\d*)/).captures
+        expect(direct_mem.to_i).to eq 0
+        expect(heap_mem.to_i).to be > 0
+      end
+    end
+  end
+
+  def start_logstash_and_process_some_events
+    IO.write(@ls.application_settings_file, settings.to_yaml)
+    @ls.spawn_logstash("-w", "1", "-e", config)
+
+    Stud.try(120.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
+      # poll Logstash HTTP api to become active
+      expect(@ls.rest_active?).to be true
+    end
+
+    # wait main pipeline becomes active
+    Stud.try(120.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
+      post_some_json_data
+    end
+
+    # wait some time to that the pipeline's Ruby filter allocate something with Netty allocator,
+    # in the mean time some dumps should appear in the logs
+    #(> 5 seconds because the JRuby filter in test pipeline dumps Netty memory status every 5 seconds)
+    sleep 5
+  end
+
+  def find_last_mem_dump_log_line(log_file)
+    log_content = load_log_file_content(log_file)
+
+        # select just the log lines with memory dump
+    return log_content.split(/\n/).select { |line| line =~ /\[logstash.filters.ruby\s*\]\[main\].*Direct pinned/ }.last
+  end
+
+  def load_log_file_content(log_file)
+    expect(File.exist?(log_file)).to be true
+    log_content = IO.read(log_file)
+    return log_content
+  end
+
+  def post_some_json_data
+    body = '{"firstKey": "somedata", "secondKey": "somedata"}'
+    default_headers = {"Content-Type" => "application/json"}
+    resp = Manticore.post("http://localhost:8080", {:body => body, :headers => default_headers})
+    expect(resp.code).to eq 200
+  end
+
+end
diff --git a/qa/integration/specs/dlq_spec.rb b/qa/integration/specs/dlq_spec.rb
index 6ef2d59f5..db1879d5f 100644
--- a/qa/integration/specs/dlq_spec.rb
+++ b/qa/integration/specs/dlq_spec.rb
@@ -1,26 +1,54 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative '../framework/fixture'
 require_relative '../framework/settings'
 require_relative '../services/logstash_service'
 require_relative '../framework/helpers'
+require_relative 'spec_helper.rb'
+
 require "logstash/devutils/rspec/spec_helper"
 
 describe "Test Dead Letter Queue" do
+  # template with an ip field
+  let(:template) { serverless? ? { "index_patterns": ["te*"], "template": {"mappings": { "properties": { "ip": { "type": "ip" }}}} } :
+                     { "index_patterns": ["te*"], "mappings": { "properties": { "ip": { "type": "ip" }}}} }
+  let(:template_api) { serverless? ? "_index_template" : "_template" }
+  # a message that is incompatible with the template
+  let(:message) { {"message": "hello", "ip": 1}.to_json }
 
   before(:all) {
     @fixture = Fixture.new(__FILE__)
+    es_allow_wildcard_deletes(@fixture.get_service("elasticsearch").get_client)
   }
 
   after(:all) {
-      @fixture.teardown
+    clean_es(@fixture.get_service("elasticsearch").get_client)
+    @fixture.teardown
   }
 
   before(:each) {
     IO.write(config_yaml_file, config_yaml)
+    es_client = @fixture.get_service("elasticsearch").get_client
+    clean_es(es_client)
+    es_client.perform_request("PUT", "#{template_api}/ip-template", {}, template)
   }
 
   after(:each) do
-    es_client = @fixture.get_service("elasticsearch").get_client
-    es_client.indices.delete(index: 'logstash-*') unless es_client.nil?
     logstash_service.teardown
   end
 
@@ -30,13 +58,19 @@ describe "Test Dead Letter Queue" do
       {
           "dead_letter_queue.enable" => true,
           "path.dead_letter_queue" => dlq_dir,
-          "log.level" => "debug"
       }
   }
   let!(:config_yaml) { dlq_config.to_yaml }
   let!(:config_yaml_file) { ::File.join(settings_dir, "logstash.yml") }
 
   let!(:settings_dir) { Stud::Temporary.directory }
+  let(:serverless_es_config) do
+    if serverless?
+      " hosts => '${ES_ENDPOINT}' api_key => '${PLUGIN_API_KEY}'"
+    else
+      ""
+    end
+  end
 
   shared_examples_for "it can send 1000 documents to and index from the dlq" do
     it 'should index all documents' do
@@ -48,16 +82,18 @@ describe "Test Dead Letter Queue" do
       logstash_service.wait_for_logstash
       try(60) do
         begin
-          result = es_client.search(index: 'logstash-*', size: 0, q: '*')
-          hits = result["hits"]["total"]
-        rescue Elasticsearch::Transport::Transport::Errors::ServiceUnavailable => e
+          result = es_client.search(index: 'test-index', size: 0, q: '*')
+        rescue Elastic::Transport::Transport::Errors::ServiceUnavailable => e
           puts "Elasticsearch unavailable #{e.inspect}"
           hits = 0
+        rescue Elastic::Transport::Transport::Errors::NotFound => e
+          puts "Index not found"
+          hits = 0
         end
-        expect(hits).to eq(1000)
+        expect(result).to have_hits(1000)
       end
 
-      result = es_client.search(index: 'logstash-*', size: 1, q: '*')
+      result = es_client.search(index: 'test-index', size: 1, q: '*')
       s = result["hits"]["hits"][0]["_source"]
       expect(s["mutated"]).to eq("true")
     end
@@ -69,7 +105,7 @@ describe "Test Dead Letter Queue" do
 
     before :each do
       IO.write(pipelines_yaml_file, pipelines_yaml)
-      logstash_service.spawn_logstash("--path.settings", settings_dir, "--log.level=debug")
+      logstash_service.spawn_logstash("--path.settings", settings_dir)
     end
 
     context 'with multiple pipelines' do
@@ -78,15 +114,15 @@ describe "Test Dead Letter Queue" do
               "pipeline.id" => "test",
               "pipeline.workers" => 1,
               "dead_letter_queue.enable" => true,
-              "pipeline.batch.size" => 1,
-              "config.string" => "input { generator { message => '{\"test\":\"one\"}' codec => \"json\" count => 1000 } } filter { mutate { add_field => { \"geoip\" => \"somewhere\" } } } output { elasticsearch {} }"
+              "pipeline.batch.size" => 100,
+              "config.string" => "input { generator { message => '#{message}' codec => \"json\" count => 1000 } } output { elasticsearch { index => \"test-index\" #{serverless_es_config} } }"
           },
           {
               "pipeline.id" => "test2",
               "pipeline.workers" => 1,
               "dead_letter_queue.enable" => false,
-              "pipeline.batch.size" => 1,
-              "config.string" => "input { dead_letter_queue { pipeline_id => 'test' path => \"#{dlq_dir}\" commit_offsets => true } } filter { mutate { remove_field => [\"geoip\"] add_field => {\"mutated\" => \"true\" } } } output { elasticsearch {} }"
+              "pipeline.batch.size" => 100,
+              "config.string" => "input { dead_letter_queue { pipeline_id => 'test' path => \"#{dlq_dir}\" commit_offsets => true } } filter { mutate { remove_field => [\"ip\"] add_field => {\"mutated\" => \"true\" } } } output { elasticsearch { index => \"test-index\" #{serverless_es_config} } }"
           }
       ]}
 
@@ -99,16 +135,15 @@ describe "Test Dead Letter Queue" do
             "pipeline.id" => "main",
             "pipeline.workers" => 1,
             "dead_letter_queue.enable" => true,
-            "pipeline.batch.size" => 1,
+            "pipeline.batch.size" => 100,
             "config.string" => "
-                input { generator{ message => '{\"test\":\"one\"}' codec => \"json\" count => 1000 }
+                input { generator{ message => '#{message}' codec => \"json\" count => 1000 }
                         dead_letter_queue { path => \"#{dlq_dir}\" commit_offsets => true }
                 }
                 filter {
-                  if ([geoip]) { mutate { remove_field => [\"geoip\"] add_field => { \"mutated\" => \"true\" } } }
-                  else{ mutate { add_field => { \"geoip\" => \"somewhere\" } } }
+                  if ([ip]) { mutate { remove_field => [\"ip\"] add_field => { \"mutated\" => \"true\" } } }
                 }
-                output { elasticsearch {} }"
+                output { elasticsearch { index => \"test-index\" #{serverless_es_config} } }"
         }
       ]}
 
@@ -117,7 +152,7 @@ describe "Test Dead Letter Queue" do
   end
 
   context 'using logstash.yml and separate config file' do
-    let(:generator_config_file) { config_to_temp_file(@fixture.config("root",{ :dlq_dir => dlq_dir })) }
+    let(:generator_config_file) { config_to_temp_file(@fixture.config("root", { :dlq_dir => dlq_dir })) }
 
     before :each do
       logstash_service.start_background_with_config_settings(generator_config_file, settings_dir)
diff --git a/qa/integration/specs/env_variables_condition_spec.rb b/qa/integration/specs/env_variables_condition_spec.rb
new file mode 100644
index 000000000..a12b2acb1
--- /dev/null
+++ b/qa/integration/specs/env_variables_condition_spec.rb
@@ -0,0 +1,98 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative '../framework/fixture'
+require_relative '../framework/settings'
+require_relative '../services/logstash_service'
+require_relative '../framework/helpers'
+require "logstash/devutils/rspec/spec_helper"
+
+### Logstash Keystore notes #############
+# The logstash.keystore password is `keystore_pa9454w3rd` and contains the following entries:
+# input.count = 10
+# output.path = mypath
+# pipeline.id = mypipeline
+# tag1 = mytag1
+# tag2 = mytag2
+# tag3 = mytag3
+####################################
+describe "Support environment variable in condition" do
+  before(:all) {
+    @fixture = Fixture.new(__FILE__)
+  }
+
+  before(:each) {
+    @logstash = @fixture.get_service("logstash")
+    IO.write(File.join(settings_dir, "logstash.yml"), YAML.dump(settings))
+    FileUtils.cp(File.expand_path("../../logstash.keystore", __FILE__), settings_dir)
+  }
+
+  after(:all) {
+    @fixture.teardown
+  }
+
+  after(:each) {
+    @logstash.teardown
+  }
+
+  let(:num_retries) { 50 }
+  let(:test_path) { Stud::Temporary.directory }
+  let(:test_env) {
+    env = Hash.new
+    env["BIG"] = "100"
+    env["SMALL"] = "1"
+    env["APP"] = 'foobar'
+    env
+  }
+  let(:settings_dir) { Stud::Temporary.directory }
+  let(:settings) {{"pipeline.id" => "${pipeline.id}"}}
+  let(:logstash_keystore_password) { "keystore_pa9454w3rd" }
+
+  it "expands variables and evaluate expression successfully" do
+    test_env["TEST_ENV_PATH"] = test_path
+    test_env["LOGSTASH_KEYSTORE_PASS"] = logstash_keystore_password
+
+    @logstash.env_variables = test_env
+    @logstash.start_background_with_config_settings(config_to_temp_file(@fixture.config), settings_dir)
+
+    Stud.try(num_retries.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
+      output = IO.read(File.join(test_path, "env_variables_condition_output.log")).gsub("\n", "")
+      expect(output).to match /Truthy,Not,>,>=,<,<=,==,!=,in,not in,=~,!~,and,more_and,or,nand,xor/
+    end
+  end
+
+  it "expands variables in secret store" do
+    test_env["LOGSTASH_KEYSTORE_PASS"] = logstash_keystore_password
+    test_env['TAG1'] = "wrong_env" # secret store should take precedence
+    logstash = @logstash.run_cmd(["bin/logstash", "-e",
+                                  "input { generator { count => 1 } }
+                                    filter { if (\"${APP}\") { mutate { add_tag => \"${TAG1}\"} } }
+                                    output { stdout{} }",
+                                  "--path.settings", settings_dir],
+                                 true, test_env)
+    expect(logstash.stderr_and_stdout).to match(/mytag1/)
+    expect(logstash.stderr_and_stdout).not_to match(/wrong_env/)
+    expect(logstash.exit_code).to be(0)
+  end
+
+  it "exits with error when env variable is undefined" do
+    test_env["LOGSTASH_KEYSTORE_PASS"] = logstash_keystore_password
+    logstash = @logstash.run_cmd(["bin/logstash", "-e", "filter { if \"${NOT_EXIST}\" { mutate {add_tag => \"oh no\"} } }", "--path.settings", settings_dir], true, test_env)
+    expect(logstash.stderr_and_stdout).to match(/Cannot evaluate `\$\{NOT_EXIST\}`/)
+    expect(logstash.exit_code).to be(1)
+  end
+end
diff --git a/qa/integration/specs/env_variables_config_spec.rb b/qa/integration/specs/env_variables_config_spec.rb
index d7594c901..b529128e8 100644
--- a/qa/integration/specs/env_variables_config_spec.rb
+++ b/qa/integration/specs/env_variables_config_spec.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative '../framework/fixture'
 require_relative '../framework/settings'
 require_relative '../services/logstash_service'
@@ -12,7 +29,7 @@ describe "Test Logstash configuration" do
   after(:all) {
     @fixture.teardown
   }
-  
+
   let(:num_retries) { 50 }
   let(:test_tcp_port) { random_port }
   let(:test_tag) { "environment_variables_are_evil" }
@@ -25,7 +42,7 @@ describe "Test Logstash configuration" do
     test_env["TEST_ENV_TCP_PORT"] = "#{test_tcp_port}"
     test_env["TEST_ENV_TAG"] = test_tag
     test_env["TEST_ENV_PATH"] = test_path
-    
+
     logstash_service = @fixture.get_service("logstash")
     logstash_service.env_variables = test_env
     logstash_service.start_background(@fixture.config)
@@ -33,16 +50,16 @@ describe "Test Logstash configuration" do
     try(num_retries) do
       expect(is_port_open?(test_tcp_port)).to be true
     end
-    
+
     #send data and make sure all env variables are expanded by checking each stage
     send_data(test_tcp_port, sample_data)
     output_file = File.join(test_path, "logstash_env_test.log")
     try(num_retries) do
-      expect(File.exists?(output_file)).to be true
+      expect(File.exist?(output_file)).to be true
     end
     # should have created the file using env variable with filters adding a tag based on env variable
     try(num_retries) do
       expect(IO.read(output_file).gsub("\n", "")).to eq("#{sample_data} blah,environment_variables_are_evil")
     end
   end
-end  
\ No newline at end of file
+end
diff --git a/qa/integration/specs/es_output_how_spec.rb b/qa/integration/specs/es_output_how_spec.rb
index b0f9d56ae..8b42ce0b6 100644
--- a/qa/integration/specs/es_output_how_spec.rb
+++ b/qa/integration/specs/es_output_how_spec.rb
@@ -1,32 +1,68 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative '../framework/fixture'
 require_relative '../framework/settings'
 require_relative '../services/logstash_service'
+require_relative 'spec_helper.rb'
 
 describe "Test Elasticsearch output" do
-
   before(:all) {
     @fixture = Fixture.new(__FILE__)
+    es_allow_wildcard_deletes(@fixture.get_service("elasticsearch").get_client)
   }
 
   after(:all) {
-    es_client = @fixture.get_service("elasticsearch").get_client
-    es_client.indices.delete(index: 'logstash-*')
+    clean_es(@fixture.get_service("elasticsearch").get_client)
     @fixture.teardown
   }
 
-  it "can ingest 37K log lines of sample apache logs" do
+  it "can ingest 37K log lines of sample apache logs with default settings" do
     logstash_service = @fixture.get_service("logstash")
     es_service = @fixture.get_service("elasticsearch")
-    logstash_service.start_with_input(@fixture.config, @fixture.input)
+    logstash_service.start_with_input(@fixture.config("default"), @fixture.input)
+    es_client = es_service.get_client
+    # now we test if all data was indexed by ES, but first refresh manually
+    es_client.indices.refresh
+    result = es_client.search(index: '.ds-logs-*', size: 0, q: '*')
+    expect(result).to have_hits(37)
+
+    # randomly checked for results and structured fields
+    result = es_client.search(index: '.ds-logs-*', size: 1, q: 'dynamic')
+    expect(result).to have_hits(1)
+    s = result["hits"]["hits"][0]["_source"]
+    expect(s["bytes"]).to eq(18848)
+    expect(s["response"]).to eq(200)
+    expect(s["clientip"]).to eq("213.113.233.227")
+  end
+
+  it "can ingest 37K log lines of sample apache logs with ecs and data streams off" do
+    logstash_service = @fixture.get_service("logstash")
+    es_service = @fixture.get_service("elasticsearch")
+    logstash_service.start_with_input(@fixture.config("ds_ecs_off"), @fixture.input)
     es_client = es_service.get_client
     # now we test if all data was indexed by ES, but first refresh manually
     es_client.indices.refresh
     result = es_client.search(index: 'logstash-*', size: 0, q: '*')
-    expect(result["hits"]["total"]).to eq(37)
-    
+    expect(result).to have_hits(37)
+
     # randomly checked for results and structured fields
     result = es_client.search(index: 'logstash-*', size: 1, q: 'dynamic')
-    expect(result["hits"]["total"]).to eq(1)
+    expect(result).to have_hits(1)
     s = result["hits"]["hits"][0]["_source"]
     expect(s["bytes"]).to eq(18848)
     expect(s["response"]).to eq(200)
diff --git a/qa/integration/specs/fatal_error_spec.rb b/qa/integration/specs/fatal_error_spec.rb
new file mode 100644
index 000000000..94f1586c6
--- /dev/null
+++ b/qa/integration/specs/fatal_error_spec.rb
@@ -0,0 +1,84 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative '../framework/fixture'
+require_relative '../framework/helpers'
+require_relative '../framework/settings'
+require_relative '../services/logstash_service'
+require "logstash/devutils/rspec/spec_helper"
+
+describe "uncaught exception" do
+  before(:all) do
+    @fixture = Fixture.new(__FILE__)
+    @logstash = @fixture.get_service("logstash")
+  end
+
+  after(:each) do
+    @logstash.teardown
+    FileUtils.rm_rf(temp_dir)
+  end
+
+  let(:timeout) { 90 } # seconds
+  let(:temp_dir) { Stud::Temporary.directory("logstash-error-test") }
+  let(:logs_dir) { File.join(temp_dir, "logs") }
+
+  # ensure PQ data is isolated.
+  # We crash before ACK-ing events, so we need to make sure we don't
+  # leave those un-ACK'd events in the queue to poison a subsequent test.
+  let(:data_dir) { File.join(temp_dir, "data") }
+
+  it "halts LS on fatal error" do
+    config = "input { generator { count => 1 message => 'a fatal error' } } "
+    # inline Ruby filter seems to catch everything (including java.lang.Error) so we exercise a thread throwing
+    config += "filter { ruby { code => 'Thread.start { raise java.lang.AssertionError.new event.get(\"message\") }' } }"
+
+    spawn_logstash_and_wait_for_exit! config, timeout
+
+    expect(@logstash.exit_code).to be 120
+
+    log_file = "#{logs_dir}/logstash-plain.log"
+    expect(File.exist?(log_file)).to be true
+    expect(File.read(log_file)).to match /\[FATAL\]\[org.logstash.Logstash.*?java.lang.AssertionError: a fatal error/m
+  end
+
+  it "logs unexpected exception (from Java thread)" do
+    config = "input { generator { count => 1 message => 'unexpected' } } "
+    config += "filter { ruby { code => 'java.lang.Thread.new { raise java.io.EOFException.new event.get(\"message\") }.start; sleep(1.5)' } }"
+
+    spawn_logstash_and_wait_for_exit! config, timeout
+
+    expect(@logstash.exit_code).to be 0 # normal exit
+
+    log_file = "#{logs_dir}/logstash-plain.log"
+    expect(File.exist?(log_file)).to be true
+    expect(File.read(log_file)).to match /\[ERROR\]\[org.logstash.Logstash.*?uncaught exception \(in thread .*?java.io.EOFException: unexpected/m
+  end
+
+  def spawn_logstash_and_wait_for_exit!(config, timeout)
+    @logstash.spawn_logstash('--pipeline.workers=1',
+                             '--path.logs', logs_dir,
+                             '--path.data', data_dir,
+                             '--config.string', config)
+
+    time = Time.now
+    while (Time.now - time) < timeout
+      sleep(0.1)
+      break if @logstash.exited?
+    end
+    raise 'LS process did not exit!' unless @logstash.exited?
+  end
+end
diff --git a/qa/integration/specs/install_java_plugin_spec.rb b/qa/integration/specs/install_java_plugin_spec.rb
new file mode 100644
index 000000000..144728093
--- /dev/null
+++ b/qa/integration/specs/install_java_plugin_spec.rb
@@ -0,0 +1,78 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative '../framework/fixture'
+require_relative '../framework/settings'
+require_relative '../framework/helpers'
+require "logstash/devutils/rspec/spec_helper"
+require "stud/temporary"
+
+describe "Install and run java plugin" do
+  before(:all) do
+    @fixture = Fixture.new(__FILE__)
+    @logstash = @fixture.get_service("logstash")
+    @logstash_plugin = @logstash.plugin_cli
+  end
+
+  after(:all) {
+    @logstash.teardown
+    @fixture.teardown
+  }
+
+  after(:each) {
+    # cleanly remove the installed plugin to don't pollute
+    # the environment for other subsequent tests
+    removal = @logstash_plugin.run_raw("bin/logstash-plugin uninstall #{plugin_name}")
+
+    expect(removal.stderr_and_stdout).to match(/Successfully removed #{plugin_name}/)
+    expect(removal.exit_code).to eq(0)
+  }
+
+  let(:max_retry) { 120 }
+  let!(:settings_dir) { Stud::Temporary.directory }
+  let(:plugin_name) { "logstash-input-java_input_example" }
+  let(:install_command) { "bin/logstash-plugin install" }
+
+  it "successfully runs a pipeline with an installed Java plugins" do
+    execute = @logstash_plugin.run_raw("#{install_command} #{plugin_name}")
+
+    expect(execute.stderr_and_stdout).to match(/Installation successful/)
+    expect(execute.exit_code).to eq(0)
+
+    installed = @logstash_plugin.list(plugin_name)
+    expect(installed.stderr_and_stdout).to match(/#{plugin_name}/)
+
+    @logstash.start_background_with_config_settings(config_to_temp_file(@fixture.config), settings_dir)
+
+    # wait for Logstash to start
+    started = false
+    while !started
+      begin
+        sleep(1)
+        result = @logstash.monitoring_api.event_stats
+        started = !result.nil?
+      rescue
+        retry
+      end
+    end
+
+    Stud.try(max_retry.times, RSpec::Expectations::ExpectationNotMetError) do
+      result = @logstash.monitoring_api.event_stats
+      expect(result["in"]).to eq(4)
+    end
+  end
+end
diff --git a/qa/integration/specs/java_api_spec.rb b/qa/integration/specs/java_api_spec.rb
new file mode 100644
index 000000000..8152e8959
--- /dev/null
+++ b/qa/integration/specs/java_api_spec.rb
@@ -0,0 +1,67 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative '../framework/fixture'
+require_relative '../framework/settings'
+require_relative '../framework/helpers'
+require "stud/temporary"
+require "stud/try"
+require "rspec/wait"
+require "yaml"
+require "fileutils"
+
+describe "Java plugin API" do
+  before(:all) do
+    @fixture = Fixture.new(__FILE__)
+  end
+
+  before(:each) {
+    @logstash = @fixture.get_service("logstash")
+  }
+
+  after(:all) {
+    @fixture.teardown
+  }
+
+  after(:each) {
+    @logstash.teardown
+  }
+
+  let(:max_retry) { 120 }
+  let!(:settings_dir) { Stud::Temporary.directory }
+
+  it "successfully sends events through Java plugins" do
+    @logstash.start_background_with_config_settings(config_to_temp_file(@fixture.config), settings_dir)
+
+    # wait for Logstash to start
+    started = false
+    while !started
+      begin
+        sleep(1)
+        result = @logstash.monitoring_api.event_stats
+        started = !result.nil?
+      rescue
+        retry
+      end
+    end
+
+    Stud.try(max_retry.times, RSpec::Expectations::ExpectationNotMetError) do
+      result = @logstash.monitoring_api.event_stats
+      expect(result["in"]).to eq(1)
+    end
+  end
+end
diff --git a/qa/integration/specs/kafka_input_spec.rb b/qa/integration/specs/kafka_input_spec.rb
index bcd26fad0..fc42fd092 100644
--- a/qa/integration/specs/kafka_input_spec.rb
+++ b/qa/integration/specs/kafka_input_spec.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative '../framework/fixture'
 require_relative '../framework/settings'
 require_relative '../services/logstash_service'
@@ -8,26 +25,40 @@ describe "Test Kafka Input" do
   let(:num_retries) { 60 }
   let(:num_events) { 37 }
 
-  before(:all) {
+  before(:all) do
     @fixture = Fixture.new(__FILE__)
-  }
+  end
 
-  after(:all) {
-    @fixture.teardown
-  }
+  after(:all) do
+    @fixture.teardown unless @fixture.nil?
+  end
+
+  let(:logstash_service) do
+    @fixture.get_service("logstash")
+  end
+
+  let(:file_output_path) do
+    # output { file { path => "..." } } is LS_HOME relative
+    File.join(logstash_service.logstash_home, @fixture.actual_output)
+  end
+
+  before do
+    logstash_service.start_background(@fixture.config)
+    sleep(0.5)
+  end
+
+  after do
+    File.delete(file_output_path) if File.exist?(file_output_path)
+  end
 
   it "can ingest 37 apache log lines from Kafka broker" do
-    logstash_service = @fixture.get_service("logstash")
-    logstash_service.start_background(@fixture.config)
-
     try(num_retries) do
-      expect(@fixture.output_exists?).to be true
+      expect(File).to exist(file_output_path), "output file: #{file_output_path} does not exist"
     end
 
     try(num_retries) do
-      count = File.foreach(@fixture.actual_output).inject(0) {|c, _| c+1}
+      count = File.foreach(file_output_path).inject(0) {|c, _| c + 1}
       expect(count).to eq(num_events)
     end
   end
-
 end
diff --git a/qa/integration/specs/logstash_to_logstash_spec.rb b/qa/integration/specs/logstash_to_logstash_spec.rb
new file mode 100644
index 000000000..4d0e1e1ae
--- /dev/null
+++ b/qa/integration/specs/logstash_to_logstash_spec.rb
@@ -0,0 +1,107 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative '../framework/fixture'
+require_relative '../framework/settings'
+require_relative '../framework/helpers'
+require_relative '../services/logstash_service'
+
+require 'stud/temporary'
+require 'logstash/devutils/rspec/spec_helper'
+
+describe "Logstash to Logstash communication Integration test" do
+
+  before(:all) {
+    @fixture = Fixture.new(__FILE__)
+  }
+
+  after(:all) {
+    @fixture.teardown
+  }
+
+  def get_temp_path_dir
+    tmp_path = Stud::Temporary.pathname
+    tmp_data_path = File.join(tmp_path, "data")
+    FileUtils.mkdir_p(tmp_data_path)
+    tmp_data_path
+  end
+
+  def run_logstash_instance(config_name, options = {}, &block)
+    @next_api_port_offset = (@next_api_port_offset||100).next.modulo(1000) # cycle through 1000 possibles
+    api_port = 9600 + @next_api_port_offset
+
+    # to avoid LogstashService's clean-from-tarball default behaviour, we need
+    # to tell it where our LOGSTASH_HOME is in the existing service
+    existing_fixture_logstash_home = @fixture.get_service("logstash").logstash_home
+    logstash_service = LogstashService.new(@fixture.settings.override("ls_home_abs_path" => existing_fixture_logstash_home), api_port)
+
+    logstash_service.spawn_logstash("--node.name", config_name,
+                                    "--pipeline.id", config_name,
+                                    "--path.config", config_to_temp_file(@fixture.config(config_name, options)),
+                                    "--path.data", get_temp_path_dir,
+                                    "--api.http.port", api_port.to_s,
+                                    "--config.reload.automatic")
+    logstash_service.wait_for_rest_api
+    yield logstash_service
+  ensure
+    logstash_service.teardown
+  end
+
+  let(:num_retries) { 60 }
+  let(:num_events) { 1003 }
+  let(:config_options) {
+    { :generator_count => num_events }
+  }
+
+  shared_examples "send events" do
+    let(:output_file_path_with_datetime) { "#{output_file_path}_#{DateTime.now.new_offset(0).strftime('%Y_%m_%d_%H_%M_%S')}" }
+    let(:all_config_options) {
+      config_options.merge({ :output_file_path => output_file_path_with_datetime })
+    }
+
+    it "successfully send events" do
+      run_logstash_instance(input_config_name, all_config_options) do |downstream_logstash_service|
+        run_logstash_instance(output_config_name, all_config_options) do |upstream_logstash_service|
+
+          try(num_retries) do
+            downstream_event_stats = downstream_logstash_service.monitoring_api.event_stats
+            expect(downstream_event_stats).to include({"in" => num_events}), lambda { "expected #{num_events} events to have been received by downstream" }
+            expect(downstream_event_stats).to include({"out" => num_events}), lambda { "expected #{num_events} events to have been processed by downstream" }
+          end
+
+          # make sure received events are in the file
+          file_output_path = File.join(downstream_logstash_service.logstash_home, output_file_path_with_datetime)
+          expect(File).to exist(file_output_path), "Logstash to Logstash output file: #{file_output_path} does not exist"
+          actual_lines = File.read(file_output_path).lines.to_a
+          expected_lines = (0...num_events).map { |sequence| "#{sequence}:Hello world!\n" }
+          expect(actual_lines).to match_array(expected_lines)
+
+          File.delete(file_output_path)
+        end
+      end
+    end
+  end
+
+  context "with baseline configs" do
+    let(:input_config_name) { "basic_ls_input" }
+    let(:output_config_name) { "basic_ls_output" }
+    let(:output_file_path) { "basic_ls_to_ls.output" }
+
+    include_examples "send events"
+  end
+
+end
diff --git a/qa/integration/specs/mixed_codec_spec.rb b/qa/integration/specs/mixed_codec_spec.rb
new file mode 100644
index 000000000..f0d4d3f25
--- /dev/null
+++ b/qa/integration/specs/mixed_codec_spec.rb
@@ -0,0 +1,120 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative '../framework/fixture'
+require_relative '../framework/settings'
+require "stud/temporary"
+require "stud/try"
+require "rspec/wait"
+require "yaml"
+require "fileutils"
+require "logstash/devutils/rspec/spec_helper"
+
+describe "Ruby codec when used in" do
+  before(:all) {
+    @fixture = Fixture.new(__FILE__)
+  }
+
+  after(:all) {
+    @fixture.teardown
+  }
+
+  before(:each) {
+    # backup the application settings file -- logstash.yml
+    FileUtils.cp(logstash_service.application_settings_file, "#{logstash_service.application_settings_file}.original")
+    IO.write(logstash_service.application_settings_file, settings.to_yaml)
+  }
+
+  after(:each) {
+    logstash_service.teardown
+    # restore the application settings file -- logstash.yml
+    FileUtils.mv("#{logstash_service.application_settings_file}.original", logstash_service.application_settings_file)
+  }
+
+  let(:temp_dir) { Stud::Temporary.directory("logstash-pipelinelog-test") }
+  let(:logstash_service) { @fixture.get_service("logstash") }
+  let(:out_capture) { Tempfile.new("file_out") }
+  let(:settings) do
+    {"path.logs" => temp_dir }
+  end
+
+  context "input Java plugin" do
+    let(:config) { @fixture.config("input_decode") }
+
+    it "should encode correctly to file and don't log any ERROR" do
+      logstash_service.env_variables = {'PATH_TO_OUT' => out_capture.path}
+      logstash_service.start_with_stdin(config)
+
+      # wait for Logstash to fully start
+      logstash_service.wait_for_rest_api
+
+      logstash_service.write_to_stdin('{"project": "Teleport"}')
+      sleep(2)
+
+      logstash_service.teardown
+
+      plainlog_file = "#{temp_dir}/logstash-plain.log"
+      expect(File.exist?(plainlog_file)).to be true
+      logs = IO.read(plainlog_file)
+      expect(logs).to_not include("ERROR")
+
+      out_capture.rewind
+      expect(out_capture.read).to include("\"project\":\"Teleport\"")
+    end
+  end
+
+  context "input Java plugin with configured codec" do
+    let(:config) { @fixture.config("input_decode_configured") }
+
+    it "should encode correctly to file and don't log any ERROR" do
+      logstash_service.env_variables = {'PATH_TO_OUT' => out_capture.path}
+      logstash_service.spawn_logstash("-w", "1", "-e", config)
+      logstash_service.wait_for_logstash
+      logstash_service.wait_for_rest_api
+
+      logstash_service.write_to_stdin('Teleport ray')
+      sleep(2)
+
+      logstash_service.teardown
+
+      plainlog_file = "#{temp_dir}/logstash-plain.log"
+      expect(File.exist?(plainlog_file)).to be true
+      logs = IO.read(plainlog_file)
+      expect(logs).to_not include("ERROR")
+
+      out_capture.rewind
+      expect(out_capture.read).to include("Teleport ray")
+    end
+  end
+
+  context "output Java plugin" do
+    let(:config) { @fixture.config("output_encode") }
+
+    it "should encode correctly without any ERROR log" do
+      logstash_service.spawn_logstash("-w", "1", "-e", config)
+      logstash_service.wait_for_logstash
+      logstash_service.wait_for_rest_api
+
+      logstash_service.teardown
+
+      plainlog_file = "#{temp_dir}/logstash-plain.log"
+      expect(File.exist?(plainlog_file)).to be true
+      logs = IO.read(plainlog_file)
+      expect(logs).to_not include("ERROR")
+    end
+  end
+end
diff --git a/qa/integration/specs/monitoring_api_spec.rb b/qa/integration/specs/monitoring_api_spec.rb
index a82af0520..19dabc16f 100644
--- a/qa/integration/specs/monitoring_api_spec.rb
+++ b/qa/integration/specs/monitoring_api_spec.rb
@@ -1,27 +1,84 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative '../framework/fixture'
 require_relative '../framework/settings'
+require_relative '../framework/helpers'
 require_relative '../services/logstash_service'
 require "logstash/devutils/rspec/spec_helper"
 require "stud/try"
 
 describe "Test Monitoring API" do
+  before(:each) do |example|
+    $stderr.puts("STARTING: #{example.full_description} (#{example.location})")
+  end
+
   before(:all) {
     @fixture = Fixture.new(__FILE__)
+    ruby_encoding_info = %w(external internal locale filesystem).map do |type|
+      Encoding.find(type)&.name&.then { |name| "#{type}:#{name}" }
+    end.compact.join(", ")
+
+    $stderr.puts <<~ENCODINGINFO.tr("\n", ' ')
+      INFO(spec runner process)
+      Ruby.Encoding=(#{ruby_encoding_info})
+      Java.Locale=`#{java.util.Locale::getDefault().toLanguageTag()}`
+      Java.Charset=`#{java.nio.charset.Charset::defaultCharset().displayName()}`
+    ENCODINGINFO
   }
 
+  let(:settings_overrides) do
+    {}
+  end
+
+  let(:logstash_service) { @fixture.get_service("logstash") }
+
+  before(:each) do
+    # some settings values cannot be reliably passed on the command line
+    # because we are not guaranteed that the shell's encoding supports UTF-8.
+    # Merge our settings into the active settings file, to accommodate feature flags
+    unless settings_overrides.empty?
+      settings_file = logstash_service.application_settings_file
+      FileUtils.cp(settings_file, "#{settings_file}.original")
+
+      base_settings = YAML.load(File.read(settings_file)) || {}
+      effective_settings = base_settings.merge(settings_overrides) do |key, old_val, new_val|
+        warn "Overriding setting `#{key}` with `#{new_val}` (was `#{old_val}`)"
+        new_val
+      end
+
+      IO.write(settings_file, effective_settings.to_yaml)
+    end
+  end
+
   after(:all) {
     @fixture.teardown
   }
-  
-  after(:each) {
-    @fixture.get_service("logstash").teardown
-  }
-  
+
+  after(:each) do
+    settings_file = logstash_service.application_settings_file
+    logstash_service.teardown
+    FileUtils.mv("#{settings_file}.original", settings_file) if File.exist?("#{settings_file}.original")
+  end
+
   let(:number_of_events) { 5 }
   let(:max_retry) { 120 }
 
   it "can retrieve event stats" do
-    logstash_service = @fixture.get_service("logstash")
     logstash_service.start_with_stdin
     logstash_service.wait_for_logstash
     number_of_events.times { logstash_service.write_to_stdin("Hello world") }
@@ -34,12 +91,93 @@ describe "Test Monitoring API" do
     end
   end
 
+  context "queue draining" do
+    let(:tcp_port) { random_port }
+    let(:settings_dir) { Stud::Temporary.directory }
+    let(:queue_config) {
+      {
+        "queue.type" => "persisted",
+        "queue.drain" => true
+      }
+    }
+    let(:config_yaml) { queue_config.to_yaml }
+    let(:config_yaml_file) { ::File.join(settings_dir, "logstash.yml") }
+    let(:logstash_service) { @fixture.get_service("logstash") }
+    let(:config) { @fixture.config("draining_events", { :port => tcp_port }) }
+
+    before(:each) do
+      if logstash_service.settings.feature_flag == "persistent_queues"
+        IO.write(config_yaml_file, config_yaml)
+        logstash_service.spawn_logstash("-e", config, "--path.settings", settings_dir)
+      else
+        logstash_service.spawn_logstash("-e", config)
+      end
+      logstash_service.wait_for_logstash
+      wait_for_port(tcp_port, 60)
+    end
+
+    it "can update metrics" do
+      first = logstash_service.monitoring_api.event_stats
+      Process.kill("TERM", logstash_service.pid)
+      try(max_retry) do
+        second = logstash_service.monitoring_api.event_stats
+        expect(second["filtered"].to_i > first["filtered"].to_i).to be_truthy
+      end
+    end
+  end
+
+  context "verify global event counters" do
+    let(:tcp_port) { random_port }
+    let(:sample_data) { 'Hello World!' }
+    let(:logstash_service) { @fixture.get_service("logstash") }
+
+    before(:each) do
+      logstash_service.spawn_logstash("-w", "1", "-e", config)
+      logstash_service.wait_for_logstash
+      wait_for_port(tcp_port, 60)
+
+      send_data(tcp_port, sample_data)
+    end
+
+    context "when a drop filter is in the pipeline" do
+      let(:config) { @fixture.config("dropping_events", { :port => tcp_port }) }
+
+      it 'expose the correct output counter' do
+        try(max_retry) do
+          # node_stats can fail if the stats subsystem isn't ready
+          result = logstash_service.monitoring_api.node_stats rescue nil
+          expect(result).not_to be_nil
+          expect(result["events"]).not_to be_nil
+          expect(result["events"]["in"]).to eq(1)
+          expect(result["events"]["filtered"]).to eq(1)
+          expect(result["events"]["out"]).to eq(0)
+        end
+      end
+    end
+
+    context "when a clone filter is in the pipeline" do
+      let(:config) { @fixture.config("cloning_events", { :port => tcp_port }) }
+
+      it 'expose the correct output counter' do
+        try(max_retry) do
+          # node_stats can fail if the stats subsystem isn't ready
+          result = logstash_service.monitoring_api.node_stats rescue nil
+          expect(result).not_to be_nil
+          expect(result["events"]).not_to be_nil
+          expect(result["events"]["in"]).to eq(1)
+          expect(result["events"]["filtered"]).to eq(1)
+          expect(result["events"]["out"]).to eq(3)
+        end
+      end
+    end
+  end
+
   it "can retrieve JVM stats" do
     logstash_service = @fixture.get_service("logstash")
     logstash_service.start_with_stdin
     logstash_service.wait_for_logstash
 
-    Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
+    try(max_retry) do
       # node_stats can fail if the stats subsystem isn't ready
       result = logstash_service.monitoring_api.node_stats rescue nil
       expect(result).not_to be_nil
@@ -67,96 +205,250 @@ describe "Test Monitoring API" do
     end
   end
 
-  it "can retrieve queue stats" do
-    logstash_service = @fixture.get_service("logstash")
-    logstash_service.start_with_stdin
-    logstash_service.wait_for_logstash
+  shared_examples "pipeline metrics" do
+    # let(:pipeline_id) { defined?(super()) or fail NotImplementedError }
+    let(:settings_overrides) do
+      super().merge({'pipeline.id' => pipeline_id})
+    end
 
-    Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
-      # node_stats can fail if the stats subsystem isn't ready
-      result = logstash_service.monitoring_api.node_stats rescue nil
-      expect(result).not_to be_nil
-      # we use fetch here since we want failed fetches to raise an exception
-      # and trigger the retry block
-      queue_stats = result.fetch("pipelines").fetch("main").fetch("queue")
-      expect(queue_stats).not_to be_nil
-      if logstash_service.settings.feature_flag == "persistent_queues"
-        expect(queue_stats["type"]).to eq "persisted"
-        queue_data_stats = queue_stats.fetch("data")
-        expect(queue_data_stats["free_space_in_bytes"]).not_to be_nil
-        expect(queue_data_stats["storage_type"]).not_to be_nil
-        expect(queue_data_stats["path"]).not_to be_nil
-        expect(queue_stats["events"]).not_to be_nil
-        queue_capacity_stats = queue_stats.fetch("capacity")
-        expect(queue_capacity_stats["page_capacity_in_bytes"]).not_to be_nil
-        expect(queue_capacity_stats["max_queue_size_in_bytes"]).not_to be_nil
-        expect(queue_capacity_stats["max_unread_events"]).not_to be_nil
-      else
-        expect(queue_stats["type"]).to eq("memory")
+    it "can retrieve queue stats" do
+      logstash_service.start_with_stdin
+      logstash_service.wait_for_logstash
+
+      Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
+        # node_stats can fail if the stats subsystem isn't ready
+        result = logstash_service.monitoring_api.node_stats rescue nil
+        expect(result).not_to be_nil
+        # we use fetch here since we want failed fetches to raise an exception
+        # and trigger the retry block
+        queue_stats = result.fetch("pipelines").fetch(pipeline_id).fetch("queue")
+        expect(queue_stats).not_to be_nil
+        if logstash_service.settings.feature_flag == "persistent_queues"
+          expect(queue_stats["type"]).to eq "persisted"
+          queue_data_stats = queue_stats.fetch("data")
+          expect(queue_data_stats["free_space_in_bytes"]).not_to be_nil
+          expect(queue_data_stats["storage_type"]).not_to be_nil
+          expect(queue_data_stats["path"]).not_to be_nil
+          expect(queue_stats["events"]).not_to be_nil
+          queue_capacity_stats = queue_stats.fetch("capacity")
+          expect(queue_capacity_stats["page_capacity_in_bytes"]).not_to be_nil
+          expect(queue_capacity_stats["max_queue_size_in_bytes"]).not_to be_nil
+          expect(queue_capacity_stats["max_unread_events"]).not_to be_nil
+        else
+          expect(queue_stats["type"]).to eq("memory")
+        end
       end
     end
+
+    it "retrieves the pipeline flow statuses" do
+      logstash_service = @fixture.get_service("logstash")
+      logstash_service.start_with_stdin
+      logstash_service.wait_for_logstash
+      number_of_events.times {
+        logstash_service.write_to_stdin("Testing flow metrics")
+        sleep(1)
+      }
+
+      Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
+        # node_stats can fail if the stats subsystem isn't ready
+        result = logstash_service.monitoring_api.node_stats rescue nil
+        expect(result).not_to be_nil
+        # we use fetch here since we want failed fetches to raise an exception
+        # and trigger the retry block
+        expect(result).to include('pipelines' => hash_including(pipeline_id => hash_including('flow')))
+        flow_status = result.dig("pipelines", pipeline_id, "flow")
+        expect(flow_status).to_not be_nil
+        expect(flow_status).to include(
+                                 # due to three-decimal-place rounding, it is easy for our worker_concurrency and queue_backpressure
+                                 # to be zero, so we are just looking for these to be _populated_
+                                 'worker_concurrency' => hash_including('current' => a_value >= 0, 'lifetime' => a_value >= 0),
+                                 'worker_utilization' => hash_including('current' => a_value >= 0, 'lifetime' => a_value >= 0),
+                                 'queue_backpressure' => hash_including('current' => a_value >= 0, 'lifetime' => a_value >= 0),
+                                 # depending on flow capture interval, our current rate can easily be zero, but our lifetime rates
+                                 # should be non-zero so long as pipeline uptime is less than ~10 minutes.
+                                 'input_throughput'   => hash_including('current' => a_value >= 0, 'lifetime' => a_value >  0),
+                                 'filter_throughput'  => hash_including('current' => a_value >= 0, 'lifetime' => a_value >  0),
+                                 'output_throughput'  => hash_including('current' => a_value >= 0, 'lifetime' => a_value >  0)
+                               )
+        if logstash_service.settings.feature_flag == "persistent_queues"
+          expect(flow_status).to include(
+                                   'queue_persisted_growth_bytes'  => hash_including('current' => a_kind_of(Numeric), 'lifetime' => a_kind_of(Numeric)),
+                                   'queue_persisted_growth_events' => hash_including('current' => a_kind_of(Numeric), 'lifetime' => a_kind_of(Numeric))
+                                 )
+        else
+          expect(flow_status).to_not include('queue_persisted_growth_bytes')
+          expect(flow_status).to_not include('queue_persisted_growth_events')
+        end
+      end
+    end
+
+    shared_examples "plugin-level flow metrics" do
+      let(:settings_overrides) do
+        super().merge({'config.string' => config_string})
+      end
+
+      let(:config_string) do
+        <<~EOPIPELINE
+          input { stdin { id => '#{plugin_id_input}' } }
+          filter { mutate { id => '#{plugin_id_filter}' add_tag => 'integration test adding tag' } }
+          output { stdout { id => '#{plugin_id_output}' } }
+        EOPIPELINE
+      end
+
+      it "retrieves plugin level flow metrics" do
+        logstash_service.spawn_logstash
+        logstash_service.wait_for_logstash
+        number_of_events.times {
+          logstash_service.write_to_stdin("Testing plugin-level flow metrics")
+          sleep(1)
+        }
+
+        Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
+          # node_stats can fail if the stats subsystem isn't ready
+          result = logstash_service.monitoring_api.node_stats rescue nil
+          # if the result is nil, we probably aren't ready yet
+          # our assertion failure will cause Stud to retry
+          expect(result).not_to be_nil
+
+          expect(result).to include('pipelines' => hash_including(pipeline_id => hash_including('plugins' => hash_including('inputs', 'filters', 'outputs'))))
+
+          input_plugins = result.dig("pipelines", pipeline_id, "plugins", "inputs")
+          filter_plugins = result.dig("pipelines", pipeline_id, "plugins", "filters")
+          output_plugins = result.dig("pipelines", pipeline_id, "plugins", "outputs")
+          expect(input_plugins[0]).to_not be_nil # not ready...
+
+          expect(input_plugins).to include(a_hash_including(
+                                             'id' => plugin_id_input,
+                                             'flow' => a_hash_including(
+                                               'throughput' => hash_including('current' => a_value >= 0, 'lifetime' => a_value > 0)
+                                             )
+                                           ))
+
+          expect(filter_plugins).to include(a_hash_including(
+                                              'id' => plugin_id_filter,
+                                              'flow' => a_hash_including(
+                                                'worker_utilization' => hash_including('current' => a_value >= 0, 'lifetime' => a_value >= 0),
+                                                'worker_millis_per_event' => hash_including('current' => a_value >= 0, 'lifetime' => a_value >= 0),
+                                                )
+                                            ))
+
+          expect(output_plugins).to include(a_hash_including(
+                                              'id' => plugin_id_output,
+                                              'flow' => a_hash_including(
+                                                'worker_utilization' => hash_including('current' => a_value >= 0, 'lifetime' => a_value >= 0),
+                                                'worker_millis_per_event' => hash_including('current' => a_value >= 0, 'lifetime' => a_value >= 0),
+                                                )
+                                            ))
+        end
+      end
+    end
+
+    context "with lower-ASCII plugin id's" do
+      let(:plugin_id_input) { "standard-input" }
+      let(:plugin_id_filter) { "Mutations" }
+      let(:plugin_id_output) { "StandardOutput" }
+      include_examples "plugin-level flow metrics"
+    end
+
+    context "with unicode plugin id's" do
+      let(:plugin_id_input) { "입력" }
+      let(:plugin_id_filter) { "変じる" }
+      let(:plugin_id_output) { "le-résultat" }
+      include_examples "plugin-level flow metrics"
+    end
+
+  end
+
+  context "with lower-ASCII pipeline id" do
+    let(:pipeline_id) { "main" }
+    include_examples "pipeline metrics"
+  end
+
+  context "with unicode pipeline id" do
+    before(:each) do
+      if @fixture.settings.feature_flag == "persistent_queues"
+        skip('behaviour for unicode pipeline ids is unspecified when PQ is enabled')
+        # NOTE: pipeline ids are used verbatim as a part of the queue path, so the subset
+        #       of unicode characters that are supported depend on the OS and Filesystem.
+        #       The pipeline will fail to start, rendering these monitoring specs useless.
+      end
+    end
+    let(:pipeline_id) { "변환-verändern-変ずる" }
+    include_examples "pipeline metrics"
   end
 
   it "can configure logging" do
-    logstash_service = @fixture.get_service("logstash")
     logstash_service.start_with_stdin
     logstash_service.wait_for_logstash
 
     Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
       # monitoring api can fail if the subsystem isn't ready
       result = logstash_service.monitoring_api.logging_get rescue nil
-      expect(result).not_to be_nil
-      expect(result["loggers"].size).to be > 0
-      #default
-      logging_get_assert logstash_service, "INFO", "TRACE"
-
-      #root logger - does not apply to logger.slowlog
-      logging_put_assert logstash_service.monitoring_api.logging_put({"logger." => "WARN"})
-      logging_get_assert logstash_service, "WARN", "TRACE"
-      logging_put_assert logstash_service.monitoring_api.logging_put({"logger." => "INFO"})
-      logging_get_assert logstash_service, "INFO", "TRACE"
-
-      #package logger
-      logging_put_assert logstash_service.monitoring_api.logging_put({"logger.logstash.agent" => "DEBUG"})
-      expect(logstash_service.monitoring_api.logging_get["loggers"]["logstash.agent"]).to eq ("DEBUG")
-      logging_put_assert logstash_service.monitoring_api.logging_put({"logger.logstash.agent" => "INFO"})
-      logging_get_assert logstash_service, "INFO", "TRACE"
-
-      #parent package loggers
-      logging_put_assert logstash_service.monitoring_api.logging_put({"logger.logstash" => "ERROR"})
-      logging_put_assert logstash_service.monitoring_api.logging_put({"logger.slowlog" => "ERROR"})
-
-      result = logstash_service.monitoring_api.logging_get
-      result["loggers"].each do | k, v |
-        #since we explicitly set the logstash.agent logger above, the logger.logstash parent logger will not take precedence
-        if k.eql?("logstash.agent") || k.start_with?("org.logstash")
-          expect(v).to eq("INFO")
-        else
-          expect(v).to eq("ERROR")
-        end
-      end
-
-      # all log levels should be reset to original values
-      logging_put_assert logstash_service.monitoring_api.logging_reset
-      logging_get_assert logstash_service, "INFO", "TRACE"
+      expect(result).to_not be_nil
+      expect(result).to include("loggers" => an_object_having_attributes(:size => a_value > 0))
     end
+
+    #default
+    logging_get_assert logstash_service, ["WARN", "INFO"], "TRACE",
+                       skip: 'logstash.licensechecker.licensereader' #custom (ERROR) level to start with
+
+    #root logger - does not apply to logger.slowlog
+    logging_put_assert logstash_service.monitoring_api.logging_put({"logger." => "WARN"})
+    logging_get_assert logstash_service, "WARN", "TRACE"
+    logging_put_assert logstash_service.monitoring_api.logging_put({"logger." => "INFO"})
+    logging_get_assert logstash_service, ["WARN", "INFO"], "TRACE"
+
+    #package logger
+    logging_put_assert logstash_service.monitoring_api.logging_put({"logger.logstash.agent" => "DEBUG"})
+    expect(logstash_service.monitoring_api.logging_get["loggers"]["logstash.agent"]).to eq ("DEBUG")
+    logging_put_assert logstash_service.monitoring_api.logging_put({"logger.logstash.agent" => "INFO"})
+    expect(logstash_service.monitoring_api.logging_get["loggers"]["logstash.agent"]).to eq ("INFO")
+
+    #parent package loggers
+    logging_put_assert logstash_service.monitoring_api.logging_put({"logger.logstash" => "ERROR"})
+    logging_put_assert logstash_service.monitoring_api.logging_put({"logger.slowlog" => "ERROR"})
+
+    #deprecation package loggers
+    logging_put_assert logstash_service.monitoring_api.logging_put({"logger.deprecation.logstash" => "ERROR"})
+
+    result = logstash_service.monitoring_api.logging_get
+    result["loggers"].each do |k, v|
+      next if k.eql?("logstash.agent")
+      #since we explicitly set the logstash.agent logger above, the logger.logstash parent logger will not take precedence
+      if k.start_with?("logstash") || k.start_with?("slowlog") || k.start_with?("deprecation")
+        expect(v).to eq("ERROR")
+      end
+    end
+
+    # all log levels should be reset to original values
+    logging_put_assert logstash_service.monitoring_api.logging_reset
+    logging_get_assert logstash_service, ["WARN", "INFO"], "TRACE"
   end
 
+
   private
 
-  def logging_get_assert(logstash_service, logstash_level, slowlog_level)
+  def logging_get_assert(logstash_service, logstash_level, slowlog_level, skip: '')
     result = logstash_service.monitoring_api.logging_get
-    result["loggers"].each do | k, v |
+    result["loggers"].each do |k, v|
+      next if !k.empty? && k.eql?(skip)
       if k.start_with? "logstash", "org.logstash" #logstash is the ruby namespace, and org.logstash for java
-        expect(v).to eq(logstash_level)
+        if logstash_level.is_a?(Array)
+          if logstash_level.size == 1
+            expect(v).to eq(logstash_level[0]), "logstash logger '#{k}' has logging level: #{v} expected: #{logstash_level[0]}"
+          else
+            expect(logstash_level).to include(v), "logstash logger '#{k}' has logging level: #{v} expected to be one of: #{logstash_level}"
+          end
+        else
+          expect(v).to eq(logstash_level), "logstash logger '#{k}' has logging level: #{v} expected: #{logstash_level}"
+        end
       elsif k.start_with? "slowlog"
-        expect(v).to eq(slowlog_level)
+        expect(v).to eq(slowlog_level), "slowlog logger '#{k}' has logging level: #{v} expected: #{slowlog_level}"
       end
     end
   end
 
   def logging_put_assert(result)
-    expect(result["acknowledged"]).to be(true)
+    expect(result['acknowledged']).to be(true), "result not acknowledged, got: #{result.inspect}"
   end
-
 end
diff --git a/qa/integration/specs/multiple_pipeline_spec.rb b/qa/integration/specs/multiple_pipeline_spec.rb
index 2eda19f12..cb01e56fe 100644
--- a/qa/integration/specs/multiple_pipeline_spec.rb
+++ b/qa/integration/specs/multiple_pipeline_spec.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative '../framework/fixture'
 require_relative '../framework/settings'
 require_relative '../services/logstash_service'
@@ -17,6 +34,7 @@ describe "Test Logstash service when multiple pipelines are used" do
 
   let(:temporary_out_file_1) { Stud::Temporary.pathname }
   let(:temporary_out_file_2) { Stud::Temporary.pathname }
+  let(:temporary_out_file_3) { Stud::Temporary.pathname }
 
   let(:pipelines) {[
     {
@@ -30,6 +48,12 @@ describe "Test Logstash service when multiple pipelines are used" do
       "pipeline.workers" => 1,
       "pipeline.batch.size" => 1,
       "config.string" => "input { generator { count => 1 } } output { file { path => \"#{temporary_out_file_2}\" } }"
+    },
+    {
+      "pipeline.id" => "config-string-with-env-var-pipeline",
+      "pipeline.workers" => 1,
+      "pipeline.batch.size" => 1,
+      "config.string" => "input { generator { count => 1 } } output { file { path => \"${TEMP_FILE_PATH}\" } }"
     }
   ]}
 
@@ -39,12 +63,16 @@ describe "Test Logstash service when multiple pipelines are used" do
 
   let(:retry_attempts) { 40 }
 
+  let(:pipelines_yaml_file_permissions) { 0644 }
+
   before(:each) do
     IO.write(pipelines_yaml_file, pipelines_yaml)
+    File.chmod(pipelines_yaml_file_permissions, pipelines_yaml_file)
   end
 
   it "executes the multiple pipelines" do
     logstash_service = @fixture.get_service("logstash")
+    logstash_service.env_variables = {'TEMP_FILE_PATH' => temporary_out_file_3}
     logstash_service.spawn_logstash("--path.settings", settings_dir, "--log.level=debug")
     try(retry_attempts) do
       expect(logstash_service.exited?).to be(true)
@@ -54,21 +82,66 @@ describe "Test Logstash service when multiple pipelines are used" do
     expect(IO.readlines(temporary_out_file_1).size).to eq(1)
     expect(File.exist?(temporary_out_file_2)).to be(true)
     expect(IO.readlines(temporary_out_file_2).size).to eq(1)
+    expect(File.exist?(temporary_out_file_3)).to be(true)
+    expect(IO.readlines(temporary_out_file_3).size).to eq(1)
+  end
+
+  context 'effectively-empty pipelines.yml file' do
+    let!(:pipelines_yaml) do
+      <<~EOYAML
+        # this yaml file contains
+        # only comments and
+        # is effectively empty
+      EOYAML
+    end
+
+    it 'exits with helpful guidance' do
+      logstash_service = @fixture.get_service("logstash")
+      status = logstash_service.run('--path.settings', settings_dir, '--log.level=debug')
+      expect(status.exit_code).to_not be_zero
+      expect(status.stderr_and_stdout).to include('Pipelines YAML file is empty')
+    end
+  end
+
+  context 'unreadable pipelines.yml file' do
+    let(:pipelines_yaml_file_permissions) { 000 }
+
+    it 'exits with helpful guidance' do
+      logstash_service = @fixture.get_service("logstash")
+      status = logstash_service.run('--path.settings', settings_dir, '--log.level=debug')
+      expect(status.exit_code).to_not be_zero
+      expect(status.stderr_and_stdout).to include('Failed to read pipelines yaml file', 'Permission denied')
+    end
+  end
+
+  context 'readable pipelines.yml with invalid YAML contents' do
+    let!(:pipelines_yaml) do
+      <<~EOYAML
+         - pipeline.id: my_id
+           pipeline.workers: 1
+         # note: indentation not aligned will cause YAML parse error
+         pipeline.ordered: true
+      EOYAML
+    end
+
+    it 'exits with helpful guidance' do
+      logstash_service = @fixture.get_service("logstash")
+      status = logstash_service.run('--path.settings', settings_dir, '--log.level=debug')
+      expect(status.exit_code).to_not be_zero
+      expect(status.stderr_and_stdout).to include('Failed to parse contents of pipelines yaml file', 'SyntaxError:')
+    end
   end
 
   describe "inter-pipeline communication" do
-    let(:pipelines) do 
+    let(:count) { 2 }
+    let(:pipelines) do
       [
         {
           "pipeline.id" => "test",
-          "pipeline.workers" => 1,
-          "pipeline.batch.size" => 1,
-          "config.string" => "input { generator { count => 1 } } output { pipeline { send_to => testaddr } }"
+          "config.string" => "input { generator { count => #{count} } } output { pipeline { send_to => testaddr } }"
         },
         {
           "pipeline.id" => "test2",
-          "pipeline.workers" => 1,
-          "pipeline.batch.size" => 1,
           "config.string" => "input { pipeline { address => testaddr } } output { file { path => \"#{temporary_out_file_1}\" flush_interval => 0} }"
         }
       ]
@@ -80,12 +153,12 @@ describe "Test Logstash service when multiple pipelines are used" do
 
       # Wait for LS to come up
       i = 0
-      until File.exist?(temporary_out_file_1) && IO.readlines(temporary_out_file_1).size >= 1
+      until File.exist?(temporary_out_file_1) && IO.readlines(temporary_out_file_1).size >= count
         i += 1
         sleep 1
         break if i > 30
       end
-      expect(IO.readlines(temporary_out_file_1).size).to eq(1)
+      expect(IO.readlines(temporary_out_file_1).size).to eq(count)
 
       puts "Done"
     end
diff --git a/qa/integration/specs/pipeline_log_spec.rb b/qa/integration/specs/pipeline_log_spec.rb
new file mode 100644
index 000000000..6f21464ad
--- /dev/null
+++ b/qa/integration/specs/pipeline_log_spec.rb
@@ -0,0 +1,195 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative '../framework/fixture'
+require_relative '../framework/settings'
+require_relative '../services/logstash_service'
+require_relative '../framework/helpers'
+require "logstash/devutils/rspec/spec_helper"
+require "yaml"
+require "fileutils"
+
+describe "Test Logstash Pipeline id" do
+  before(:all) {
+    @fixture = Fixture.new(__FILE__)
+    # used in multiple LS tests
+    @ls = @fixture.get_service("logstash")
+  }
+
+  after(:all) {
+    @fixture.teardown
+  }
+
+  before(:each) {
+    # backup the application settings file -- logstash.yml
+    FileUtils.cp(@ls.application_settings_file, "#{@ls.application_settings_file}.original")
+  }
+
+  after(:each) {
+    @ls.teardown
+    # restore the application settings file -- logstash.yml
+    FileUtils.mv("#{@ls.application_settings_file}.original", @ls.application_settings_file)
+  }
+
+  let(:temp_dir) { Stud::Temporary.directory("logstash-pipelinelog-test") }
+  let(:config) { @fixture.config("root") }
+  let(:initial_config_file) { config_to_temp_file(@fixture.config("root")) }
+
+  it "should write logs with pipeline.id" do
+    pipeline_name = "custom_pipeline"
+    settings = {
+      "path.logs" => temp_dir,
+      "pipeline.id" => pipeline_name
+    }
+    IO.write(@ls.application_settings_file, settings.to_yaml)
+    @ls.spawn_logstash("-w", "1", "-e", config)
+    wait_logstash_process_terminate(@ls)
+    plainlog_file = "#{temp_dir}/logstash-plain.log"
+    expect(File.exist?(plainlog_file)).to be true
+    expect(IO.read(plainlog_file) =~ /\[logstash.javapipeline\s*\]\[#{pipeline_name}\]/).to be > 0
+  end
+
+  it "write pipeline config in logs - source:config string" do
+    pipeline_name = "custom_pipeline"
+    settings = {
+      "path.logs" => temp_dir,
+      "pipeline.id" => pipeline_name
+    }
+    IO.write(@ls.application_settings_file, settings.to_yaml)
+    @ls.spawn_logstash("-w", "1", "-e", config)
+    wait_logstash_process_terminate(@ls)
+    plainlog_file = "#{temp_dir}/logstash-plain.log"
+    expect(File.exist?(plainlog_file)).to be true
+    expect(IO.read(plainlog_file) =~ /Starting pipeline.*"pipeline.sources"=>\["config string"\]/).to be > 0
+  end
+
+  it "write pipeline config in logs - source:config file" do
+    pipeline_name = "custom_pipeline"
+    settings = {
+      "path.logs" => temp_dir,
+      "pipeline.id" => pipeline_name
+    }
+    IO.write(@ls.application_settings_file, settings.to_yaml)
+    @ls.spawn_logstash("-w", "1", "-f", "#{initial_config_file}")
+    wait_logstash_process_terminate(@ls)
+    plainlog_file = "#{temp_dir}/logstash-plain.log"
+    expect(File.exist?(plainlog_file)).to be true
+    expect(IO.read(plainlog_file) =~ /Starting pipeline.*"pipeline.sources"=>\["#{initial_config_file}"\]/).to be > 0
+  end
+
+  it "should separate pipeline output in its own log file" do
+    pipeline_name = "custom_pipeline"
+    settings = {
+      "path.logs" => temp_dir,
+      "pipeline.id" => pipeline_name,
+      "pipeline.separate_logs" => true
+    }
+    IO.write(@ls.application_settings_file, settings.to_yaml)
+    @ls.spawn_logstash("-w", "1", "-e", config)
+    wait_logstash_process_terminate(@ls)
+
+    pipeline_log_file = "#{temp_dir}/pipeline_#{pipeline_name}.log"
+    expect(File.exist?(pipeline_log_file)).to be true
+    content = IO.read(pipeline_log_file)
+    expect(content =~ /Pipeline started {"pipeline.id"=>"#{pipeline_name}"}/).to be > 0
+
+    plainlog_file = "#{temp_dir}/logstash-plain.log"
+    expect(File.exist?(plainlog_file)).to be true
+    plainlog_content = IO.read(plainlog_file)
+    expect(plainlog_content =~ /Pipeline started {"pipeline.id"=>"#{pipeline_name}"}/).to be_nil
+  end
+
+  it "should rollover main log file when pipeline.separate_logs is enabled" do
+    pipeline_name = "custom_pipeline"
+    settings = {
+      "path.logs" => temp_dir,
+      "pipeline.id" => pipeline_name,
+      "pipeline.separate_logs" => true
+    }
+    FileUtils.mkdir_p(File.join(temp_dir, "data"))
+    data = File.join(temp_dir, "data")
+    settings = settings.merge({ "path.data" => data })
+    IO.write(File.join(temp_dir, "logstash.yml"), YAML.dump(settings))
+
+    log_definition = File.read('fixtures/logs_rollover/log4j2.properties')
+    expect(log_definition).to match(/appender\.rolling\.policies\.size\.size\s*=\s*1KB/)
+    expect(log_definition).to match(/appender\.rolling\.filePattern\s*=\s*.*\/logstash-plain-%d{yyyy-MM-dd}\.log/)
+    FileUtils.cp("fixtures/logs_rollover/log4j2.properties", temp_dir)
+
+    @ls.spawn_logstash("--path.settings", temp_dir, "-w", "1", "-e", config)
+    wait_logstash_process_terminate(@ls)
+
+    logstash_logs = Dir.glob("logstash-plain*.log", base: temp_dir)
+    expect(logstash_logs.size).to eq(2)
+    logstash_logs.each do |filename|
+      file_size = File.size(File.join(temp_dir, filename))
+      # should be 1KB = 1024 but due to end of line rounding the rollover goes a little bit over
+      expect(file_size).to be < 1300
+    end
+  end
+
+  it "rollover of pipeline log file when pipeline.separate_logs is enabled shouldn't create spurious file " do
+      pipeline_name = "custom_pipeline"
+      settings = {
+        "path.logs" => temp_dir,
+        "pipeline.id" => pipeline_name,
+        "pipeline.separate_logs" => true
+      }
+      FileUtils.mkdir_p(File.join(temp_dir, "data"))
+      data = File.join(temp_dir, "data")
+      settings = settings.merge({ "path.data" => data })
+      IO.write(File.join(temp_dir, "logstash.yml"), YAML.dump(settings))
+
+      log_definition = File.read('fixtures/logs_rollover/log4j2.properties')
+      expect(log_definition).to match(/appender\.routing\.pipeline\.policy\.size\s*=\s*1KB/)
+      FileUtils.cp("fixtures/logs_rollover/log4j2.properties", temp_dir)
+
+      @ls.spawn_logstash("--path.settings", temp_dir, "-w", "1", "-e", config)
+      wait_logstash_process_terminate(@ls)
+
+      pipeline_logs = Dir.glob("pipeline*.log", base: temp_dir)
+      expect(pipeline_logs).not_to include("pipeline_${ctx:pipeline.id}.log")
+    end
+
+  it "should not create separate pipelines log files if not enabled" do
+    pipeline_name = "custom_pipeline"
+    settings = {
+      "path.logs" => temp_dir,
+      "pipeline.id" => pipeline_name,
+      "pipeline.separate_logs" => false
+    }
+    IO.write(@ls.application_settings_file, settings.to_yaml)
+    @ls.spawn_logstash("-w", "1", "-e", config)
+    wait_logstash_process_terminate(@ls)
+
+    pipeline_log_file = "#{temp_dir}/pipeline_#{pipeline_name}.log"
+    expect(File.exist?(pipeline_log_file)).to be false
+
+    plainlog_file = "#{temp_dir}/logstash-plain.log"
+    expect(File.exist?(plainlog_file)).to be true
+    plaing_log_content = IO.read(plainlog_file)
+    expect(plaing_log_content =~ /Pipeline started {"pipeline.id"=>"#{pipeline_name}"}/).to be > 0
+  end
+
+  def wait_logstash_process_terminate(service)
+    num_retries = 100
+    try(num_retries) do
+      expect(service.exited?).to be(true)
+    end
+    expect(service.exit_code).to be >= 0
+  end
+end
diff --git a/qa/integration/specs/plugin_name_log_spec.rb b/qa/integration/specs/plugin_name_log_spec.rb
new file mode 100644
index 000000000..87803571c
--- /dev/null
+++ b/qa/integration/specs/plugin_name_log_spec.rb
@@ -0,0 +1,72 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative '../framework/fixture'
+require_relative '../framework/settings'
+require_relative '../services/logstash_service'
+require_relative '../framework/helpers'
+require "logstash/devutils/rspec/spec_helper"
+require "yaml"
+
+describe "Test Logstash Pipeline id" do
+  before(:all) {
+    @fixture = Fixture.new(__FILE__)
+    # used in multiple LS tests
+    @ls = @fixture.get_service("logstash")
+  }
+
+  after(:all) {
+    @fixture.teardown
+  }
+
+  before(:each) {
+    # backup the application settings file -- logstash.yml
+    FileUtils.cp(@ls.application_settings_file, "#{@ls.application_settings_file}.original")
+  }
+
+  after(:each) {
+    @ls.teardown
+    # restore the application settings file -- logstash.yml
+    FileUtils.mv("#{@ls.application_settings_file}.original", @ls.application_settings_file)
+  }
+
+  let(:temp_dir) { Stud::Temporary.directory("logstash-pipelinelog-test") }
+  let(:config) { @fixture.config("root") }
+
+  it "should write logs with plugin name" do
+    settings = {
+      "path.logs" => temp_dir,
+      "log.level" => "debug"
+    }
+    IO.write(@ls.application_settings_file, settings.to_yaml)
+    @ls.spawn_logstash("-w", "1", "-e", config)
+    wait_logstash_process_terminate()
+    plainlog_file = "#{temp_dir}/logstash-plain.log"
+    expect(File.exist?(plainlog_file)).to be true
+    #We know taht sleep plugin log debug lines
+    expect(IO.read(plainlog_file) =~ /\[sleep_filter_123\] Sleeping {:delay=>1}/).to be > 0
+  end
+
+  @private
+  def wait_logstash_process_terminate
+    num_retries = 100
+    try(num_retries) do
+      expect(@ls.exited?).to be(true)
+    end
+    expect(@ls.exit_code).to be(0)
+  end
+end
diff --git a/qa/integration/specs/reload_config_spec.rb b/qa/integration/specs/reload_config_spec.rb
index 3c88a5ee7..9be6b46e3 100644
--- a/qa/integration/specs/reload_config_spec.rb
+++ b/qa/integration/specs/reload_config_spec.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative '../framework/fixture'
 require_relative '../framework/settings'
 require_relative '../services/logstash_service'
@@ -5,8 +22,11 @@ require_relative '../framework/helpers'
 require "logstash/devutils/rspec/spec_helper"
 require "socket"
 require "json"
+require "logstash/util"
 
 describe "Test Logstash service when config reload is enabled" do
+  define_negated_matcher :exclude, :include
+
   before(:all) {
     @fixture = Fixture.new(__FILE__)
   }
@@ -14,7 +34,7 @@ describe "Test Logstash service when config reload is enabled" do
   after(:all) {
     @fixture.teardown
   }
-  
+
   let(:timeout_seconds) { 5 }
   let(:initial_port) { random_port }
   let(:reload_port) { random_port }
@@ -22,41 +42,62 @@ describe "Test Logstash service when config reload is enabled" do
   let(:output_file1) { Stud::Temporary.file.path }
   let(:output_file2) { Stud::Temporary.file.path }
   let(:sample_data) { '74.125.176.147 - - [11/Sep/2014:21:50:37 +0000] "GET /?flav=rss20 HTTP/1.1" 200 29941 "-" "FeedBurner/1.0 (http://www.FeedBurner.com)"' }
-  
+
   let(:initial_config_file) { config_to_temp_file(@fixture.config("initial", { :port => initial_port, :file => output_file1 })) }
   let(:reload_config_file) { config_to_temp_file(@fixture.config("reload", { :port => reload_port, :file => output_file2 })) }
 
+  let(:max_retry) { 30 }
+
   it "can reload when changes are made to TCP port and grok pattern" do
     logstash_service = @fixture.get_service("logstash")
     logstash_service.spawn_logstash("-f", "#{initial_config_file}", "--config.reload.automatic", "true")
     logstash_service.wait_for_logstash
     wait_for_port(initial_port, retry_attempts)
-    
+
     # try sending events with this
     send_data(initial_port, sample_data)
     Stud.try(retry_attempts.times, RSpec::Expectations::ExpectationNotMetError) do
       expect(IO.read(output_file1).gsub("\n", "")).to eq(sample_data)
     end
-    
+
     # check metrics
     result = logstash_service.monitoring_api.event_stats
     expect(result["in"]).to eq(1)
     expect(result["out"]).to eq(1)
-    
+
+    # make sure the pipeline flow has non-zero input throughput after receiving data
+    Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
+      pipeline_flow_stats = logstash_service.monitoring_api.pipeline_stats("main")["flow"]
+      expect(pipeline_flow_stats['input_throughput']).to include('lifetime' => (a_value > 0))
+    end
+
     # do a reload
     logstash_service.reload_config(initial_config_file, reload_config_file)
 
     logstash_service.wait_for_logstash
     wait_for_port(reload_port, retry_attempts)
-    
+
     # make sure old socket is closed
     expect(is_port_open?(initial_port)).to be false
-    
+
+    # check pipeline flow metrics. They should be both present and reset.
+    # since we have processed zero events since the reload, we expect their rates to be either unavailable or zero.
+    pipeline_flow_stats = logstash_service.monitoring_api.pipeline_stats("main")["flow"]
+    expect(pipeline_flow_stats).to_not be_nil
+    expect(pipeline_flow_stats).to include('input_throughput', 'queue_backpressure')
+    aggregate_failures do
+      expect(pipeline_flow_stats['input_throughput']).to exclude('lifetime').or(include('lifetime' => 0))
+      expect(pipeline_flow_stats['input_throughput']).to exclude('current').or(include('current' => 0))
+      expect(pipeline_flow_stats['queue_backpressure']).to exclude('lifetime').or(include('lifetime' => 0))
+      expect(pipeline_flow_stats['queue_backpressure']).to exclude('current').or(include('current' => 0))
+    end
+
+    # send data, and wait for at least some of the events to make it through the output.
     send_data(reload_port, sample_data)
     Stud.try(retry_attempts.times, RSpec::Expectations::ExpectationNotMetError) do
-      expect(IO.read(output_file2).blank?).to be false
+      expect(LogStash::Util.blank?(IO.read(output_file2))).to be false
     end
-    
+
     # check instance metrics. It should not be reset
     instance_event_stats = logstash_service.monitoring_api.event_stats
     expect(instance_event_stats["in"]).to eq(2)
@@ -66,19 +107,47 @@ describe "Test Logstash service when config reload is enabled" do
     pipeline_event_stats = logstash_service.monitoring_api.pipeline_stats("main")["events"]
     expect(pipeline_event_stats["in"]).to eq(1)
     expect(pipeline_event_stats["out"]).to eq(1)
-    
+
+    # make sure the pipeline flow has non-zero input/output throughput after receiving data
+    Stud.try(max_retry.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
+      pipeline_flow_stats = logstash_service.monitoring_api.pipeline_stats("main")["flow"]
+      expect(pipeline_flow_stats).to_not be_nil
+      expect(pipeline_flow_stats).to include(
+        # due to three-decimal-place rounding, it is easy for our worker_concurrency and queue_backpressure
+        # to be zero, so we are just looking for these to be _populated_
+        'worker_concurrency' => hash_including('current' => a_value >= 0, 'lifetime' => a_value >= 0),
+        'worker_utilization' => hash_including('current' => a_value >= 0, 'lifetime' => a_value >= 0),
+        'queue_backpressure' => hash_including('current' => a_value >= 0, 'lifetime' => a_value >= 0),
+        # depending on flow capture interval, our current rate can easily be zero, but our lifetime rates
+        # should be non-zero so long as pipeline uptime is less than ~10 minutes.
+        'input_throughput'   => hash_including('current' => a_value >= 0, 'lifetime' => a_value >  0),
+        'filter_throughput'  => hash_including('current' => a_value >= 0, 'lifetime' => a_value >  0),
+        'output_throughput'  => hash_including('current' => a_value >= 0, 'lifetime' => a_value >  0)
+      )
+
+      if logstash_service.settings.feature_flag == "persistent_queues"
+        expect(pipeline_flow_stats).to include(
+                                 'queue_persisted_growth_bytes'  => hash_including('current' => a_kind_of(Numeric), 'lifetime' => a_kind_of(Numeric)),
+                                 'queue_persisted_growth_events' => hash_including('current' => a_kind_of(Numeric), 'lifetime' => a_kind_of(Numeric))
+                               )
+      else
+        expect(pipeline_flow_stats).to_not include('queue_persisted_growth_bytes')
+        expect(pipeline_flow_stats).to_not include('queue_persisted_growth_events')
+      end
+    end
+
     # check reload stats
     pipeline_reload_stats = logstash_service.monitoring_api.pipeline_stats("main")["reloads"]
     instance_reload_stats = logstash_service.monitoring_api.node_stats["reloads"]
     expect(pipeline_reload_stats["successes"]).to eq(1)
     expect(pipeline_reload_stats["failures"]).to eq(0)
-    expect(pipeline_reload_stats["last_success_timestamp"].blank?).to be false
+    expect(LogStash::Util.blank?(pipeline_reload_stats["last_success_timestamp"])).to be false
     expect(pipeline_reload_stats["last_error"]).to eq(nil)
-    
+
     expect(instance_reload_stats["successes"]).to eq(1)
     expect(instance_reload_stats["failures"]).to eq(0)
     # parse the results and validate
-    re = JSON.load(File.new(output_file2))
+    re = JSON.parse(IO.read(output_file2))
     expect(re["clientip"]).to eq("74.125.176.147")
     expect(re["response"]).to eq(200)
   end
diff --git a/qa/integration/specs/reserved_tags_field_spec.rb b/qa/integration/specs/reserved_tags_field_spec.rb
new file mode 100644
index 000000000..00854eba4
--- /dev/null
+++ b/qa/integration/specs/reserved_tags_field_spec.rb
@@ -0,0 +1,78 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative '../framework/fixture'
+require_relative '../framework/settings'
+require_relative '../services/logstash_service'
+require_relative '../framework/helpers'
+require "logstash/devutils/rspec/spec_helper"
+
+# reserved tags should accept string and array of string only
+describe "Guard reserved tags field against incorrect use" do
+  before(:all) {
+    @fixture = Fixture.new(__FILE__)
+  }
+
+  before(:each) {
+    @logstash = @fixture.get_service("logstash")
+  }
+
+  after(:all) {
+    @fixture.teardown
+  }
+
+  after(:each) {
+    @logstash.teardown
+  }
+
+  let(:num_retries) { 50 }
+  let(:test_path) { Stud::Temporary.directory }
+  let(:test_env) {
+    env = Hash.new
+    env["TEMP_PATH"] = test_path
+    env
+  }
+  let(:settings_dir) { Stud::Temporary.directory }
+
+  shared_examples_for 'assign illegal value to tags' do |pipeline_fixture, tags_match, fail_tags_match|
+    it "update tags and _tags successfully" do
+      @logstash.env_variables = test_env
+      @logstash.spawn_logstash("-f", config_to_temp_file(@fixture.config(pipeline_fixture)),
+                               "--path.settings", settings_dir)
+
+      Stud.try(num_retries.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
+        output = IO.read(File.join(test_path, "#{pipeline_fixture}.log"))
+        puts output
+        expect(output).to match tags_match
+        expect(output).to match fail_tags_match
+      end
+    end
+  end
+
+  describe 'create event' do
+    it_behaves_like 'assign illegal value to tags', 'create_tags_map', /"tags":\["_tagsparsefailure"\]/, /"_tags":\[{"poison":true}\]/
+    it_behaves_like 'assign illegal value to tags', 'create_tags_number', /"tags":\["_tagsparsefailure"\]/, /"_tags":\[\[1,2,3\]\]/
+  end
+
+  it "should throw exception when assigning two illegal values" do
+    logstash = @logstash.run_cmd(["bin/logstash", "-e", @fixture.config('set_illegal_tags').gsub("\n", ""),
+                                  "--path.settings", settings_dir],
+                                 true, test_env)
+    expect(logstash.stderr_and_stdout).to match(/Ruby exception occurred/)
+  end
+
+end
diff --git a/qa/integration/specs/secret_store_spec.rb b/qa/integration/specs/secret_store_spec.rb
index 5f2d154c5..2c677bdcb 100644
--- a/qa/integration/specs/secret_store_spec.rb
+++ b/qa/integration/specs/secret_store_spec.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative '../framework/fixture'
 require_relative '../framework/settings'
 require_relative '../services/logstash_service'
@@ -37,10 +54,11 @@ describe "Test that Logstash" do
   let(:test_env) {Hash.new}
   let(:settings_dir) {Stud::Temporary.directory}
   let(:settings) {{"pipeline.id" => "${pipeline.id}"}}
+  let(:logstash_keystore_passowrd) { "keystore_pa9454w3rd" }
 
   it "expands secret store variables from config" do
     test_env["TEST_ENV_PATH"] = test_path
-    test_env["LOGSTASH_KEYSTORE_PASS"] = "keystore_pa9454w3rd"
+    test_env["LOGSTASH_KEYSTORE_PASS"] = logstash_keystore_passowrd
     @logstash.env_variables = test_env
     @logstash.start_background_with_config_settings(config_to_temp_file(@fixture.config), settings_dir)
     Stud.try(num_retries.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
@@ -50,7 +68,7 @@ describe "Test that Logstash" do
   end
 
   it "expands secret store variables from settings" do
-    test_env["LOGSTASH_KEYSTORE_PASS"] = "keystore_pa9454w3rd"
+    test_env["LOGSTASH_KEYSTORE_PASS"] = logstash_keystore_passowrd
     @logstash.env_variables = test_env
     @logstash.spawn_logstash("-e", "input {heartbeat {}} output { }", "--path.settings", settings_dir)
     Stud.try(num_retries.times, [StandardError, RSpec::Expectations::ExpectationNotMetError]) do
@@ -62,6 +80,27 @@ describe "Test that Logstash" do
     end
   end
 
+  it "won't show secret value when pipeline definition is wrong" do
+    test_env["LOGSTASH_KEYSTORE_PASS"] = logstash_keystore_passowrd
+    logstash = @logstash.run_cmd(["bin/logstash", "-e", "input { http { user => test password => \"${tag1}\" port = \"3333\" }}", "--path.settings", settings_dir], true, test_env)
+    expect(logstash.stderr_and_stdout).to match(/\[ERROR\]/)
+    expect(logstash.stderr_and_stdout).to match(/\\"\$\{tag1\}\\"/)
+  end
+
+  it "add value that contains a space" do
+    # add two key value pairs to keystore
+    # hello => hello world
+    # bye => bye
+    key = "hello"
+    value = "hello world"
+    @logstash.run_cmd(["bash", "-c", "echo -e '#{value}\\nbye' | LOGSTASH_KEYSTORE_PASS=#{logstash_keystore_passowrd} #{@logstash.logstash_home}/bin/logstash-keystore --path.settings #{settings_dir} add #{key} bye"])
+
+    test_env["LOGSTASH_KEYSTORE_PASS"] = logstash_keystore_passowrd
+    logstash = @logstash.run_cmd(["bin/logstash", "-e", "input{ generator{ count => 1 tags => ['${#{key}}', '${bye}'] }}", "--path.settings", settings_dir], true, test_env)
+    expect(logstash.stderr_and_stdout).to match(/#{value}/)
+    expect(logstash.stderr_and_stdout).to match(/bye/)
+  end
+
   context "won't start" do
     it "with the wrong password when variables are in settings" do
       test_env["LOGSTASH_KEYSTORE_PASS"] = "WRONG_PASSWRD"
@@ -74,23 +113,10 @@ describe "Test that Logstash" do
     end
   end
 
-  context "will start" do
-    let(:settings) {{"pipeline.id" => "main"}}
-    it "with the wrong password and variables are NOT in settings" do
-      test_env["LOGSTASH_KEYSTORE_PASS"] = "WRONG_PASSWRD"
-      @logstash.env_variables = test_env
-      @logstash.spawn_logstash("-e", "input {generator { count => 1 }} output { }", "--path.settings", settings_dir)
-      try(num_retries) do
-        expect(@logstash.exited?).to be(true)
-      end
-      expect(@logstash.exit_code).to be(0)
-    end
-  end
-
   context "won't start " do
     let(:settings) {{"pipeline.id" => "${missing}"}}
     it "with correct password, but invalid variable " do
-      test_env["LOGSTASH_KEYSTORE_PASS"] = "keystore_pa9454w3rd"
+      test_env["LOGSTASH_KEYSTORE_PASS"] = logstash_keystore_passowrd
       @logstash.env_variables = test_env
       @logstash.spawn_logstash("-e", "input {stdin {}} output { }", "--path.settings", settings_dir)
       try(num_retries) do
diff --git a/qa/integration/specs/settings_spec.rb b/qa/integration/specs/settings_spec.rb
index 238284cce..bba2bf50f 100644
--- a/qa/integration/specs/settings_spec.rb
+++ b/qa/integration/specs/settings_spec.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative '../framework/fixture'
 require_relative '../framework/settings'
 require_relative '../services/logstash_service'
@@ -17,7 +34,7 @@ describe "Test Logstash instance whose default settings are overridden" do
   }
 
   before(:each) {
-    FileUtils.rm(@logstash_default_logs) if File.exists?(@logstash_default_logs)
+    FileUtils.rm(@logstash_default_logs) if File.exist?(@logstash_default_logs)
     # backup the application settings file -- logstash.yml
     FileUtils.cp(@logstash_service.application_settings_file, "#{@logstash_service.application_settings_file}.original")
   }
@@ -61,14 +78,14 @@ describe "Test Logstash instance whose default settings are overridden" do
     try(num_retries) do
       expect(is_port_open?(test_port)).to be true
     end
-    expect(File.exists?("#{temp_dir}/logstash-plain.log")).to be true
+    expect(File.exist?("#{temp_dir}/logstash-plain.log")).to be true
   end
 
   it "should read config from the specified dir in logstash.yml" do
     change_setting("path.config", temp_dir)
     test_config_path = File.join(temp_dir, "test.config")
     IO.write(test_config_path, tcp_config)
-    expect(File.exists?(test_config_path)).to be true
+    expect(File.exist?(test_config_path)).to be true
     @logstash_service.spawn_logstash
     @logstash_service.wait_for_logstash
     # check LS is up and running with new data path
@@ -80,7 +97,7 @@ describe "Test Logstash instance whose default settings are overridden" do
   it "should exit when config test_and_exit is set" do
     test_config_path = File.join(temp_dir, "test.config")
     IO.write(test_config_path, "#{tcp_config}")
-    expect(File.exists?(test_config_path)).to be true
+    expect(File.exist?(test_config_path)).to be true
     s = {}
     s["path.config"] = test_config_path
     s["config.test_and_exit"] = true
@@ -94,7 +111,7 @@ describe "Test Logstash instance whose default settings are overridden" do
 
     # now with bad config
     IO.write(test_config_path, "#{tcp_config} filters {} ")
-    expect(File.exists?(test_config_path)).to be true
+    expect(File.exist?(test_config_path)).to be true
     @logstash_service.spawn_logstash
     try(num_retries) do
       expect(@logstash_service.exited?).to be true
@@ -125,7 +142,7 @@ describe "Test Logstash instance whose default settings are overridden" do
   it "start on a different HTTP port" do
     # default in 9600
     http_port = random_port
-    change_setting("http.port", http_port)
+    change_setting("api.http.port", http_port)
     @logstash_service.spawn_logstash("-e", tcp_config)
     wait_for_port(http_port, 60)
     expect(is_port_open?(http_port)).to be true
@@ -134,7 +151,7 @@ describe "Test Logstash instance whose default settings are overridden" do
       expect(is_port_open?(test_port)).to be true
     end
 
-    expect(File.exists?(@logstash_default_logs)).to be true
+    expect(File.exist?(@logstash_default_logs)).to be true
 
     resp = Manticore.get("http://localhost:#{http_port}/_node").body
     node_info = JSON.parse(resp)
@@ -159,6 +176,6 @@ describe "Test Logstash instance whose default settings are overridden" do
     expect(node_info["http_address"]).to eq("127.0.0.1:#{http_port}")
 
     # make sure we log to console and not to any file
-    expect(File.exists?(@logstash_default_logs)).to be false
+    expect(File.exist?(@logstash_default_logs)).to be false
   end
 end
diff --git a/qa/integration/specs/slowlog_spec.rb b/qa/integration/specs/slowlog_spec.rb
index 10c3f0466..fdad68ac1 100644
--- a/qa/integration/specs/slowlog_spec.rb
+++ b/qa/integration/specs/slowlog_spec.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative '../framework/fixture'
 require_relative '../framework/settings'
 require_relative '../services/logstash_service'
@@ -36,11 +53,11 @@ describe "Test Logstash Slowlog" do
       "slowlog.threshold.warn" => "500ms"
     }
     IO.write(@ls.application_settings_file, settings.to_yaml)
-    @ls.spawn_logstash("-w", "1" , "-e", config)
+    @ls.spawn_logstash("-w", "1", "-e", config)
     @ls.wait_for_logstash
     sleep 2 until @ls.exited?
     slowlog_file = "#{temp_dir}/logstash-slowlog-plain.log"
-    expect(File.exists?(slowlog_file)).to be true
+    expect(File.exist?(slowlog_file)).to be true
     expect(IO.read(slowlog_file).split("\n").size).to be >= 1
   end
 end
diff --git a/qa/integration/specs/spec_helper.rb b/qa/integration/specs/spec_helper.rb
index 138524561..7b51fb292 100644
--- a/qa/integration/specs/spec_helper.rb
+++ b/qa/integration/specs/spec_helper.rb
@@ -1,4 +1,35 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+def es_allow_wildcard_deletes(es_client)
+  es_client.cluster.put_settings body: { transient: { 'action.destructive_requires_name' => false } }
+end
+
+def clean_es(es_client)
+  es_client.indices.delete_template(:name => "*") rescue nil
+  es_client.indices.delete_index_template(:name => "*") rescue nil
+  es_client.indices.delete(:index => "*")
+  es_client.indices.refresh
+end
+
+def serverless?
+  ENV["SERVERLESS"] == "true"
+end
+
 RSpec.configure do |config|
   if RbConfig::CONFIG["host_os"] != "linux"
     exclude_tags = { :linux => true }
@@ -6,3 +37,15 @@ RSpec.configure do |config|
 
   config.filter_run_excluding exclude_tags
 end
+
+RSpec::Matchers.define :have_hits do |expected|
+  match do |actual|
+    return false if actual.nil? || actual['hits'].nil?
+    # For Elasticsearch versions 7+, the result is in a value field, just in total for > 6
+    if actual['hits']['total'].is_a?(Hash)
+      expected == actual['hits']['total']['value']
+    else
+      expected == actual['hits']['total']
+    end
+  end
+end
diff --git a/qa/integration/specs/webserver_spec.rb b/qa/integration/specs/webserver_spec.rb
new file mode 100644
index 000000000..d3440d289
--- /dev/null
+++ b/qa/integration/specs/webserver_spec.rb
@@ -0,0 +1,144 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'openssl'
+
+require 'logstash/util'
+require 'logstash/webserver'
+require "stud/try"
+require "manticore"
+
+describe 'api webserver' do
+  let!(:logger) { double("Logger").as_null_object }
+  let!(:agent) { double("Agent").as_null_object }
+  subject(:webserver) { LogStash::WebServer.new(logger, agent, webserver_options) }
+
+  let(:webserver_options) { Hash.new }
+
+  # provide a shared context to take care of ensuring that the webserver
+  # is running during the spec runs of examples in the including context
+  shared_context 'running webserver' do
+    let(:webserver) { defined?(super()) ? super() : fail("included context requires `webserver` to be present") }
+
+    # since we are running the webserver on another
+    # thread, ensure that a crash doesn't go unnoticed.
+    around(:each) do |example|
+      abort = Thread.abort_on_exception
+      example.call
+      Thread.abort_on_exception = abort
+    end
+
+    # If webmock is active, allow real network connections
+    before(:each) { WebMock.allow_net_connect! if defined?(WebMock) }
+
+    # ensure our API webserver is running with the provided config
+    # before running our specs that validate responses
+    let!(:webserver_thread) { Thread.new(webserver, &:run) }
+    before(:each) do
+      Stud.try(10.times) { fail('API WebServer not running yet...') unless webserver.port }
+    end
+    after(:each) do
+      webserver.stop
+      webserver_thread.join
+    end
+  end
+
+  context "when configured with api.ssl.supported_protocols" do
+    let(:ca_file) { File.join(certs_path, "root.crt") }
+    let(:certs_path) { File.expand_path("../../fixtures/webserver_certs/generated", __FILE__) }
+    let(:keystore_path) { File.join(certs_path,  "server_from_root.p12") }
+    let(:keystore_password) { "12345678" }
+    let(:supported_protocols) { %w[TLSv1.3] }
+    let(:ssl_params) { {:supported_protocols => supported_protocols, :keystore_path => keystore_path, :keystore_password => LogStash::Util::Password.new(keystore_password)} }
+    let(:webserver_options) { super().merge(:ssl_params => ssl_params) }
+    let(:client_protocols) { nil }
+    let(:client) { Manticore::Client.new(ssl: { ca_file: ca_file, protocols: client_protocols }) }
+    let(:response) { client.get("https://127.0.0.1:#{webserver.port}") }
+
+    include_context 'running webserver'
+
+    context 'an HTTPS request using TLSv1.3' do
+      let(:client_protocols) { %w[TLSv1.3] }
+      it 'succeeds' do
+        expect(response.code).to eq(200)
+      end
+    end
+
+    context 'an HTTPS request using TLSv1.2' do
+      let(:client_protocols) { %w[TLSv1.2] }
+      it 'fails' do
+        expect { response.code }.to raise_error(Manticore::ClientProtocolException, a_string_including("handshake"))
+      end
+    end
+  end
+
+  %w(
+      server_from_root.p12
+      server_from_intermediate.p12
+      server_from_root.jks
+      server_from_intermediate.jks
+    ).each do |keystore_name|
+    context "when configured with keystore #{keystore_name}" do
+      let(:ca_file) { File.join(certs_path, "root.crt") }
+      let(:certs_path) { File.expand_path("../../fixtures/webserver_certs/generated", __FILE__) }
+      let(:keystore_path) { File.join(certs_path, "#{keystore_name}") }
+      let(:keystore_password) { "12345678" }
+
+      let(:ssl_params) { {:keystore_path => keystore_path, :keystore_password => LogStash::Util::Password.new(keystore_password)} }
+      let(:webserver_options) { super().merge(:ssl_params => ssl_params) }
+
+      context 'and invalid credentials' do
+        let(:keystore_password) { "wrong" }
+        it 'raises a helpful error' do
+          expect { webserver }.to raise_error(ArgumentError, a_string_including("keystore password was incorrect"))
+        end
+      end
+
+      context "when started" do
+        include_context 'running webserver'
+
+        context 'an HTTPS request' do
+          it 'succeeds' do
+            client = Manticore::Client.new(ssl: { ca_file: ca_file })
+            response = client.get("https://127.0.0.1:#{webserver.port}")
+            expect(response.code).to eq(200)
+          end
+
+          # this is mostly a sanity check for our testing methodology
+          # If this fails, we cannot trust success from the other specs
+          context 'without providing CA' do
+            it 'fails' do
+              client = Manticore::Client.new(ssl: { })
+              expect do
+                client.get("https://127.0.0.1:#{webserver.port}").code
+              end.to raise_error(Manticore::ClientProtocolException, a_string_including("unable to find valid certification path to requested target"))
+            end
+          end
+        end
+
+        context 'an HTTP request' do
+          it 'fails' do
+            client = Manticore::Client.new
+            expect do
+              client.get("http://127.0.0.1:#{webserver.port}").code
+            end.to raise_error(Manticore::ClientProtocolException, a_string_including("failed to respond"))
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/integration/src/test/java/org/logstash/integration/RSpecTests.java b/qa/integration/src/test/java/org/logstash/integration/RSpecTests.java
index 2167abdf3..05a9671f7 100644
--- a/qa/integration/src/test/java/org/logstash/integration/RSpecTests.java
+++ b/qa/integration/src/test/java/org/logstash/integration/RSpecTests.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.integration;
 
 import java.nio.charset.StandardCharsets;
@@ -5,9 +25,12 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
+
+import org.jruby.Ruby;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.junit.Assert;
 import org.junit.Test;
+import org.logstash.Logstash;
 import org.logstash.RubyUtil;
 import org.logstash.Rubyfier;
 
@@ -16,6 +39,30 @@ import org.logstash.Rubyfier;
  */
 public final class RSpecTests {
 
+    static {
+        Path root;
+        if (System.getProperty("logstash.root.dir") == null) {
+            // make sure we work from IDE as well as when run with Gradle
+            root = Paths.get("").toAbsolutePath(); // LS_HOME/qa/integration
+            if (root.endsWith("integration")) root = root.getParent().getParent();
+        } else {
+            root = Paths.get(System.getProperty("logstash.root.dir")).toAbsolutePath();
+        }
+
+        if (!root.resolve("versions.yml").toFile().exists()) {
+            throw new AssertionError("versions.yml not found is logstash root dir: " + root);
+        }
+
+        initializeGlobalRuntime(root);
+    }
+
+    private static Ruby initializeGlobalRuntime(final Path root) {
+        String[] args = new String[] { "--disable-did_you_mean" };
+        Ruby runtime = Ruby.newInstance(Logstash.initRubyConfig(root, null /* qa/integration */, args));
+        if (runtime != RubyUtil.RUBY) throw new AssertionError("runtime already initialized");
+        return runtime;
+    }
+
     @Test
     public void rspecTests() throws Exception {
         RubyUtil.RUBY.getGlobalVariables().set(
@@ -23,7 +70,7 @@ public final class RSpecTests {
                 "-fd", "--pattern", System.getProperty("org.logstash.integration.specs", "specs/**/*_spec.rb")
             ))
         );
-        final Path rspec = Paths.get("rspec.rb");
+        final Path rspec = Paths.get("rspec.rb"); // qa/integration/rspec.rb
         final IRubyObject result = RubyUtil.RUBY.executeScript(
             new String(Files.readAllBytes(rspec), StandardCharsets.UTF_8),
             rspec.toFile().getAbsolutePath()
diff --git a/qa/platform_config.rb b/qa/platform_config.rb
deleted file mode 100644
index 097b7ef6a..000000000
--- a/qa/platform_config.rb
+++ /dev/null
@@ -1,83 +0,0 @@
-# encoding: utf-8
-require "json"
-require "ostruct"
-
-# This is a wrapper to encapsulate the logic behind the different platforms we test with, 
-# this is done here in order to simplify the necessary configuration for bootstrap and interactions
-# necessary later on in the tests phases.
-#
-class PlatformConfig
-
-  # Abstract the idea of a platform, aka an OS
-  class Platform
-
-    attr_reader :name, :box, :type, :bootstrap, :experimental
-
-    def initialize(name, data)
-      @name = name
-      @box  = data["box"]
-      @type = data["type"]
-      @experimental = data["experimental"] || false
-      configure_bootstrap_scripts(data)
-    end
-
-    private
-
-    def configure_bootstrap_scripts(data)
-      @bootstrap = OpenStruct.new(:privileged     => "sys/#{type}/bootstrap.sh",
-                                  :non_privileged => "sys/#{type}/user_bootstrap.sh")
-      ##
-      # for now the only specific bootstrap scripts are ones need
-      # with privileged access level, whenever others are also
-      # required we can update this section as well with the same pattern.
-      ##
-      @bootstrap.privileged = "sys/#{type}/#{name}/bootstrap.sh" if data["specific"]
-    end
-  end
-
-  DEFAULT_CONFIG_LOCATION = File.join(File.dirname(__FILE__), "config", "platforms.json").freeze
-
-  attr_reader :platforms, :latest
-
-  def initialize(config_path = DEFAULT_CONFIG_LOCATION)
-    @config_path = config_path
-    @platforms = []
-
-    data = JSON.parse(File.read(@config_path))
-    data["platforms"].each do |k, v|
-      @platforms << Platform.new(k, v)
-    end
-    @platforms.sort! { |a, b| a.name <=> b.name }
-    @latest = data["latest"]
-  end
-
-  def find!(platform_name)
-    result = @platforms.find { |platform| platform.name == platform_name }.first
-    if result.nil?
-      raise "Cannot find platform named: #{platform_name} in @config_path"
-    else
-      return result
-    end
-  end
-
-  def each(&block)
-    @platforms.each(&block)
-  end
-
-  def filter_type(type_name, options={})
-    experimental = options.fetch("experimental", false)
-    @platforms.select do |platform|
-      (type_name.nil? ? true : platform.type == type_name) &&
-          platform.experimental == experimental
-    end
-  end
-
-  def select_names_for(platform, options={})
-    filter_options = { "experimental" => options.fetch("experimental", false) }
-    filter_type(platform, filter_options).map{ |p| p.name }
-  end
-
-  def types
-    @platforms.collect(&:type).uniq.sort
-  end
-end
diff --git a/qa/rspec/commands.rb b/qa/rspec/commands.rb
index f90bc74cc..eff0df907 100644
--- a/qa/rspec/commands.rb
+++ b/qa/rspec/commands.rb
@@ -1,93 +1,183 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "./commands/debian"
 require_relative "./commands/ubuntu"
 require_relative "./commands/redhat"
 require_relative "./commands/suse"
+require_relative "./commands/opensuse"
 require_relative "./commands/centos/centos-6"
 require_relative "./commands/oel/oel-6"
-require_relative "./commands/ubuntu/ubuntu-1604"
 require_relative "./commands/suse/sles-11"
 
 require "forwardable"
+require "open3"
+
+OS_RELEASE_PATH = "/etc/os-release"
+
+class HostFacts
+  def initialize()
+    @os_release = {}
+    begin
+      os_release_hash = File.foreach(OS_RELEASE_PATH).each_with_object({}) do |line, hash|
+        next if line.strip.empty?
+        key, value = line.strip.split("=")
+        @os_release[key] = value.tr('"', "")
+      end
+    rescue Errno::ENOENT
+      puts "File not found: #{OS_RELEASE_PATH}"
+    rescue Errno::EACCES
+      puts "Permission denied to read file: #{OS_RELEASE_PATH}"
+    rescue StandardError => e
+      puts "Error parsing content of #{OS_RELEASE_PATH}: #{e.message}"
+    end
+  end
+
+  def orig_name
+    # e.g. openSUSE Leap
+    @os_release["NAME"]
+  end
+
+  def name
+    # e.g. opensuse leap
+    @os_release["NAME"].downcase
+  end
+
+  def id
+    # e.g. ubuntu for Ubuntu 22.04, or debian for Debian 11, or centos for centos-7
+    @os_release["ID"].downcase
+  end
+
+  def id_like
+    # e.g. "rhel fedora" for centos-7
+    @os_release["ID_LIKE"].downcase
+  end
+
+  def version_codename
+    # e.g. jammy for Ubuntu 22.04, or bullseye for Debian 11, unset for RHEL
+    @os_release["VERSION_CODENAME"].downcase
+  end
+
+  def version_id
+    # e.g. 22.04 for Ubuntu jammy, 11 for Debian Bullseye, 8.x for RHEL 8 distros
+    @os_release["VERSION_ID"].downcase
+  end
+
+  def human_name
+    if self.version_id
+      "#{self.orig_name} #{self.version_id}"
+    else
+      orig_name
+    end
+  end
+end
 
 module ServiceTester
-
   # An artifact is the component being tested, it's able to interact with
-  # a destination machine by holding a client and is basically provides all 
+  # a destination machine by holding a client and is basically provides all
   # necessary abstractions to make the test simple.
   class Artifact
-
     extend Forwardable
     def_delegators :@client, :installed?, :removed?, :running?
 
-    attr_reader :host, :client
+    attr_reader :client
 
-    def initialize(host, options={})
-      @host    = host
+    def initialize(options = {})
       @options = options
-      @client  = CommandsFactory.fetch(options["type"], options["host"])
+      @hostfacts = HostFacts.new()
+      @client = CommandsFactory.fetch(@hostfacts)
+      @skip_jdk_infix = false
     end
 
     def hostname
-      @options["host"]
+      `hostname`.chomp
+    end
+
+    def human_name
+      @hostfacts.human_name
+    end
+
+    def hosts
+      [@hostname]
     end
 
     def name
       "logstash"
     end
 
-    def hosts
-      [@host]
-    end
-
-    def snapshot
-      client.snapshot(@options["host"])
-    end
-
-    def restore
-      client.restore(@options["host"])
-    end
-
     def start_service
-      client.start_service(name, host)
+      client.start_service(name)
     end
 
     def stop_service
-      client.stop_service(name, host)
+      client.stop_service(name)
     end
 
-    def install(options={})
-      base      = options.fetch(:base, ServiceTester::Base::LOCATION)
-      package   = client.package_for(filename(options), base)
-      client.install(package, host)
+    def install(options = {})
+      base = options.fetch(:base, ServiceTester::Base::LOCATION)
+      @skip_jdk_infix = options.fetch(:skip_jdk_infix, false)
+      filename = filename(options)
+      package = client.package_for(filename, @skip_jdk_infix, base)
+      client.install(package)
+    end
+
+    def write_default_pipeline()
+      # defines a minimal pipeline so that the service is able to start
+      client.write_pipeline("input { heartbeat {} } output { null {} }")
     end
 
     def uninstall
-      client.uninstall(name, host)
+      client.uninstall(name)
+    end
+
+    def run_sudo_command_in_path(cmd)
+      client.run_sudo_command_in_path(cmd)
+    end
+
+    def run_sudo_command(cmd)
+      client.run_sudo_command(cmd)
     end
 
     def run_command_in_path(cmd)
-      client.run_command_in_path(cmd, host)
+      client.run_command_in_path(cmd)
     end
 
     def run_command(cmd)
-      client.run_command(cmd, host)
+      client.run_command(cmd)
     end
 
     def plugin_installed?(name, version = nil)
-      client.plugin_installed?(host, name, version)
+      client.plugin_installed?(name, version)
+    end
+
+    def gem_vendored?(gem_name)
+      client.gem_vendored?(gem_name)
     end
 
     def download(from, to)
-      client.download(from, to , host)
+      client.download(from, to)
     end
-    
+
     def replace_in_gemfile(pattern, replace)
-      client.replace_in_gemfile(pattern, replace, host)
+      client.replace_in_gemfile(pattern, replace)
     end
 
     def delete_file(path)
-      client.delete_file(path, host)
+      client.delete_file(path)
     end
 
     def to_s
@@ -96,44 +186,28 @@ module ServiceTester
 
     private
 
-    def filename(options={})
-      snapshot  = options.fetch(:snapshot, true)
-      "logstash-#{options[:version]}#{(snapshot ?  "-SNAPSHOT" : "")}"
+    def filename(options = {})
+      snapshot = options.fetch(:snapshot, true)
+      "logstash-#{options[:version]}#{(snapshot ? "-SNAPSHOT" : "")}"
     end
   end
 
-  # Factory of commands used to select the right clients for a given type of OS and host name,
-  # this give you as much granularity as required.
+  # Factory of commands used to select the right clients for a given type of OS
   class CommandsFactory
-
-    def self.fetch(type, host)
-      case type
-      when "debian"
-        if host.start_with?("ubuntu")
-          if host == "ubuntu-1604"
-            return Ubuntu1604Commands.new
-          else
-            return UbuntuCommands.new
-          end
-        else
-          return DebianCommands.new
-        end
-      when "suse"
-        if host == "sles-11"
-          return Sles11Commands.new
-        else
-          return SuseCommands.new
-        end
-      when "redhat"
-        if host == "centos-6"
-          return Centos6Commands.new
-        elsif host == "oel-6"
-          return Oel6Commands.new
-        else
-          return RedhatCommands.new
-        end
-      else
-        return
+    def self.fetch(hostfacts)
+      case
+      when hostfacts.name.include?("ubuntu")
+        return UbuntuCommands.new
+      when hostfacts.name.include?("debian")
+        return DebianCommands.new
+      when hostfacts.name.include?("opensuse")
+        return OpenSuseCommands.new
+      when hostfacts.name.include?("red hat")
+        return RedhatCommands.new
+      when hostfacts.id_like.include?("rhel"), hostfacts.id_like.include?("fedora")
+        # covers Oracle Linux, CentOS, Rocky Linux, Amazon Linux
+        # TODO add specific commands (e.g. to use dnf instead of yum where applicable)
+        return RedhatCommands.new
       end
     end
   end
diff --git a/qa/rspec/commands/base.rb b/qa/rspec/commands/base.rb
index 3f06c2a02..c2af5cced 100644
--- a/qa/rspec/commands/base.rb
+++ b/qa/rspec/commands/base.rb
@@ -1,70 +1,158 @@
-# encoding: utf-8
-require_relative "../../vagrant/helpers"
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'tempfile'
+require 'open3'
 require_relative "system_helpers"
 
-module ServiceTester
+LS_BUILD_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'build'))
 
+class Command
+  def initialize()
+    @stdout, @stderr, @exit_status = nil
+  end
+
+  def stdout
+    @stdout
+  end
+
+  def stderr
+    @stderr
+  end
+
+  def exit_status
+    @exit_status
+  end
+
+  def execute(cmdline)
+    Open3.popen3(cmdline) do |stdin, stdout, stderr, wait_thr|
+      @stdout = stdout.read.chomp
+      @stderr = stderr.read.chomp
+      @exit_status = wait_thr.value.exitstatus
+    end
+  end
+end
+
+def exec!(cmd)
+  command = Command.new()
+  command.execute("#{cmd}")
+  return command
+end
+
+def sudo_exec!(cmd)
+  exec!("sudo #{cmd}")
+end
+
+module ServiceTester
   class InstallException < Exception; end
 
   class Base
-    LOCATION="/logstash-build".freeze
-    LOGSTASH_PATH="/usr/share/logstash/".freeze
+    LOCATION = ENV.fetch('LS_ARTIFACTS_PATH', LS_BUILD_PATH.freeze)
+    LOGSTASH_PATH = "/usr/share/logstash/".freeze
 
-    def snapshot(host)
-      LogStash::VagrantHelpers.save_snapshot(host)
+    def start_service(service)
+      service_manager(service, "start")
     end
 
-    def restore(host)
-      LogStash::VagrantHelpers.restore_snapshot(host)
+    def stop_service(service)
+      service_manager(service, "stop")
     end
 
-    def start_service(service, host=nil)
-      service_manager(service, "start", host)
+    def run_sudo_command(cmd)
+      sudo_exec!("JARS_SKIP='true' #{cmd}")
     end
 
-    def stop_service(service, host=nil)
-      service_manager(service, "stop", host)
+    def run_command(cmd)
+      exec!("JARS_SKIP='true' #{cmd}")
     end
 
-    def run_command(cmd, host)
-      hosts = (host.nil? ? servers : Array(host))
-
-      response = nil
-      at(hosts, {in: :serial}) do |_host|
-        response = sudo_exec!("JARS_SKIP='true' #{cmd}")
-      end
-      response
-    end
-
-    def replace_in_gemfile(pattern, replace, host)
+    def replace_in_gemfile(pattern, replace)
       gemfile = File.join(LOGSTASH_PATH, "Gemfile")
       cmd = "sed -i.sedbak 's/#{pattern}/#{replace}/' #{gemfile}"
-      run_command(cmd, host)
+      run_sudo_command(cmd)
     end
 
-    def run_command_in_path(cmd, host)
-      run_command("#{File.join(LOGSTASH_PATH, cmd)}", host)
+    def run_sudo_command_in_path(cmd)
+      run_sudo_command("#{File.join(LOGSTASH_PATH, cmd)}")
     end
 
-    def plugin_installed?(host, plugin_name, version = nil)
+    def run_command_in_path(cmd)
+      run_command("#{File.join(LOGSTASH_PATH, cmd)}")
+    end
+
+    def plugin_installed?(plugin_name, version = nil)
       if version.nil?
-        cmd = run_command_in_path("bin/logstash-plugin list", host)
+        cmd = run_sudo_command_in_path("bin/logstash-plugin list")
         search_token = plugin_name
       else
-        cmd = run_command_in_path("bin/logstash-plugin list --verbose", host)
-        search_token ="#{plugin_name} (#{version})"
+        cmd = run_sudo_command_in_path("bin/logstash-plugin list --verbose")
+        search_token = "#{plugin_name} (#{version})"
       end
 
       plugins_list = cmd.stdout.split("\n")
       plugins_list.include?(search_token)
     end
 
-    def download(from, to, host)
-      run_command("wget #{from} -O #{to}", host)
+    ##
+    # Determines whether a specific gem is included in the vendored distribution.
+    #
+    # Returns `true` if _any version_ of the gem is vendored.
+    #
+    # @param gem_name [String]
+    # @return [Boolean]
+    #   - the block should emit `true` iff the yielded gemspec meets the requirement, and `false` otherwise
+    def gem_vendored?(gem_name)
+      cmd = run_command("find /usr/share/logstash/vendor/bundle/jruby/*/specifications -name '#{gem_name}-*.gemspec'")
+      matches = cmd.stdout.lines
+      matches.map do |path_to_gemspec|
+        filename = path_to_gemspec.split('/').last
+        gemspec_contents = run_command("cat #{path_to_gemspec}").stdout
+        Tempfile.create(filename) do |tempfile|
+          tempfile.write(gemspec_contents)
+          tempfile.flush
+          Gem::Specification::load(tempfile.path)
+        end
+      end.select { |gemspec| gemspec.name == gem_name }.any?
     end
 
-    def delete_file(path, host)
-      run_command("rm -rf #{path}", host)
+    def download(from, to)
+      run_command("curl -fsSL --retry 5 --retry-delay 5 #{from} -o #{to}")
+    end
+
+    def write_pipeline(pipeline_string)
+      run_command("bash -c \"echo '#{pipeline_string}' >/etc/logstash/conf.d/pipeline.conf\"")
+    end
+
+    def delete_file(path)
+      run_command("rm -rf #{path}")
+    end
+
+    def package_for(filename, skip_jdk_infix, base = ServiceTester::Base::LOCATION)
+      jdk_arch_ext = jdk_architecture_extension(skip_jdk_infix)
+      File.join(base, "#{filename}#{jdk_arch_ext}.#{package_extension}")
+    end
+
+    private
+    def jdk_architecture_extension(skip_jdk_infix)
+      if skip_jdk_infix
+        ""
+      else
+        "-" + architecture_extension
+      end
     end
   end
 end
diff --git a/qa/rspec/commands/centos/centos-6.rb b/qa/rspec/commands/centos/centos-6.rb
index 371590490..011f89287 100644
--- a/qa/rspec/commands/centos/centos-6.rb
+++ b/qa/rspec/commands/centos/centos-6.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "../base"
 require_relative "../redhat"
 
diff --git a/qa/rspec/commands/debian.rb b/qa/rspec/commands/debian.rb
index 30fa8c8da..a800bd9c6 100644
--- a/qa/rspec/commands/debian.rb
+++ b/qa/rspec/commands/debian.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "base"
 
 module ServiceTester
@@ -6,46 +22,42 @@ module ServiceTester
 
     include ::ServiceTester::SystemD
 
-    def installed?(hosts, package)
+    def installed?(package)
       stdout = ""
-      at(hosts, {in: :serial}) do |host|
-        cmd = sudo_exec!("dpkg -s  #{package}")
-        stdout = cmd.stdout
-      end
+      cmd = sudo_exec!("dpkg -s #{package}")
+      stdout = cmd.stdout
       stdout.match(/^Package: #{package}$/)
       stdout.match(/^Status: install ok installed$/)
     end
 
-    def package_for(filename, base=ServiceTester::Base::LOCATION)
-      File.join(base, "#{filename}.deb")
+    def package_extension
+      "deb"
     end
 
-    def install(package, host=nil)
-      hosts = (host.nil? ? servers : Array(host))
-      errors = []
-      at(hosts, {in: :serial}) do |_|
-        cmd = sudo_exec!("dpkg -i --force-confnew #{package}")
-        if cmd.exit_status != 0
-          errors << cmd.stderr.to_s
-        end
-      end
-      raise InstallException.new(errors.join("\n")) unless errors.empty?
-    end
-
-    def uninstall(package, host=nil)
-      hosts = (host.nil? ? servers : Array(host))
-      at(hosts, {in: :serial}) do |_|
-        sudo_exec!("dpkg -r #{package}")
-        sudo_exec!("dpkg --purge #{package}")
+    def architecture_extension
+      if java.lang.System.getProperty("os.arch") == "amd64"
+        "amd64"
+      else
+        "arm64"
       end
     end
 
-    def removed?(hosts, package)
+    def install(package)
+      cmd = sudo_exec!("dpkg -i --force-confnew #{package}")
+      if cmd.exit_status != 0
+        raise InstallException.new(cmd.stderr.to_s)
+      end
+    end
+
+    def uninstall(package)
+      sudo_exec!("dpkg -r #{package}")
+      sudo_exec!("dpkg --purge #{package}")
+    end
+
+    def removed?(package)
       stdout = ""
-      at(hosts, {in: :serial}) do |host|
-        cmd = sudo_exec!("dpkg -s #{package}")
-        stdout = cmd.stderr
-      end
+      cmd = sudo_exec!("dpkg -s #{package}")
+      stdout = cmd.stderr
       (
         stdout.match(/^Package `#{package}' is not installed and no info is available.$/) ||
         stdout.match(/^dpkg-query: package '#{package}' is not installed and no information is available$/)
diff --git a/qa/rspec/commands/oel/oel-6.rb b/qa/rspec/commands/oel/oel-6.rb
index ed92a8ce1..9033cd8b9 100644
--- a/qa/rspec/commands/oel/oel-6.rb
+++ b/qa/rspec/commands/oel/oel-6.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "../base"
 require_relative "../redhat"
 
diff --git a/qa/rspec/commands/opensuse.rb b/qa/rspec/commands/opensuse.rb
new file mode 100644
index 000000000..2f6b8d1ef
--- /dev/null
+++ b/qa/rspec/commands/opensuse.rb
@@ -0,0 +1,67 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative "base"
+
+module ServiceTester
+  class OpenSuseCommands < Base
+
+    def installed?(package)
+      stdout = ""
+      cmd = sudo_exec!("zypper --no-refresh search #{package}")
+      stdout = cmd.stdout
+      stdout.match(/^i | logstash | An extensible logging pipeline | package$/)
+    end
+
+    def package_extension()
+      "rpm"
+    end
+
+    def architecture_extension()
+      "x86_64"
+    end
+
+    def install(package)
+      cmd = sudo_exec!("zypper --no-gpg-checks --non-interactive install  #{package}")
+      if cmd.exit_status != 0
+        raise InstallException.new(cmd.stderr.to_s)
+      end
+    end
+
+    def uninstall(package)
+      cmd = sudo_exec!("zypper --no-gpg-checks --non-interactive remove #{package}")
+    end
+
+    def removed?(package)
+      stdout = ""
+      cmd    = sudo_exec!("zypper --no-refresh info #{package}")
+      stdout = cmd.stdout
+      stdout.match(/package \'#{package}\' not found/)
+    end
+
+    def running?(package)
+      stdout = ""
+      cmd = sudo_exec!("service #{package} status")
+      stdout = cmd.stdout
+      stdout.match(/Active: active \(running\)/)
+    end
+
+    def service_manager(service, action)
+      sudo_exec!("service #{service} #{action}")
+    end
+  end
+end
diff --git a/qa/rspec/commands/redhat.rb b/qa/rspec/commands/redhat.rb
index b7dce8048..cd2d17817 100644
--- a/qa/rspec/commands/redhat.rb
+++ b/qa/rspec/commands/redhat.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "base"
 
 module ServiceTester
@@ -6,47 +22,42 @@ module ServiceTester
 
     include ::ServiceTester::SystemD
 
-    def installed?(hosts, package)
+    def installed?(package)
       stdout = ""
-      at(hosts, {in: :serial}) do |host|
-        cmd = exec!("yum list installed  #{package}")
-        stdout = cmd.stdout
-      end
+      cmd = sudo_exec!("yum list installed #{package}")
+      stdout = cmd.stdout
       stdout.match(/^Installed Packages$/)
-      stdout.match(/^logstash.noarch/)
+      stdout.match(/^logstash.noarch/) || stdout.match(/^logstash.#{architecture_extension}/)
     end
 
-    def package_for(filename, base=ServiceTester::Base::LOCATION)
-      File.join(base, "#{filename}.rpm")
+    def package_extension
+      "rpm"
     end
 
-    def install(package, host=nil)
-      hosts  = (host.nil? ? servers : Array(host))
-      errors = []
-      exit_status = 0
-      at(hosts, {in: :serial}) do |_host|
-        cmd = sudo_exec!("yum install -y  #{package}")
-        exit_status += cmd.exit_status
-        errors << cmd.stderr unless cmd.stderr.empty?
-      end
-      if exit_status > 0 
-        raise InstallException.new(errors.join("\n"))
+    def architecture_extension
+      if java.lang.System.getProperty("os.arch") == "amd64"
+        "x86_64"
+      else
+        "aarch64"
       end
     end
 
-    def uninstall(package, host=nil)
-      hosts = (host.nil? ? servers : Array(host))
-      at(hosts, {in: :serial}) do |_|
-        sudo_exec!("yum remove -y #{package}")
+    def install(package)
+      cmd = sudo_exec!("yum install -y  #{package}")
+      if cmd.exit_status != 0
+        raise InstallException.new(cmd.stderr.to_s)
       end
+
     end
 
-    def removed?(hosts, package)
+    def uninstall(package)
+      sudo_exec!("yum remove -y #{package}")
+    end
+
+    def removed?(package)
       stdout = ""
-      at(hosts, {in: :serial}) do |host|
-        cmd = sudo_exec!("yum list installed #{package}")
-        stdout = cmd.stderr
-      end
+      cmd = sudo_exec!("yum list installed #{package}")
+      stdout = cmd.stderr
       stdout.match(/^Error: No matching Packages to list$/)
     end
   end
diff --git a/qa/rspec/commands/suse.rb b/qa/rspec/commands/suse.rb
index 9b1e6eee9..c2db2e038 100644
--- a/qa/rspec/commands/suse.rb
+++ b/qa/rspec/commands/suse.rb
@@ -1,63 +1,67 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "base"
 
 module ServiceTester
   class SuseCommands < Base
 
-    def installed?(hosts, package)
+    def installed?(package)
       stdout = ""
-      at(hosts, {in: :serial}) do |host|
-        cmd = exec!("zypper search #{package}")
-        stdout = cmd.stdout
-      end
+      cmd = sudo_exec!("zypper search #{package}")
+      stdout = cmd.stdout
       stdout.match(/^i | logstash | An extensible logging pipeline | package$/)
     end
 
-    def package_for(filename, base=ServiceTester::Base::LOCATION)
-      File.join(base, "#{filename}.rpm")
+    def package_extension()
+      "rpm"
     end
 
-    def install(package, host=nil)
-      hosts  = (host.nil? ? servers : Array(host))
-      errors = []
-      at(hosts, {in: :serial}) do |_host|
-        cmd = sudo_exec!("zypper --no-gpg-checks --non-interactive install  #{package}")
-        errors << cmd.stderr unless cmd.stderr.empty?
-      end
-      raise InstallException.new(errors.join("\n")) unless errors.empty?
+    def architecture_extension()
+      "x86_64"
     end
 
-    def uninstall(package, host=nil)
-      hosts = (host.nil? ? servers : Array(host))
-      at(hosts, {in: :serial}) do |_|
-        cmd = sudo_exec!("zypper --no-gpg-checks --non-interactive remove #{package}")
+    def install(package)
+      cmd = sudo_exec!("zypper --no-gpg-checks --non-interactive install  #{package}")
+      if cmd.exit_status != 0
+        raise InstallException.new(cmd.stderr.to_s)
       end
     end
 
-    def removed?(hosts, package)
+    def uninstall(package)
+      cmd = sudo_exec!("zypper --no-gpg-checks --non-interactive remove #{package}")
+    end
+
+    def removed?(package)
       stdout = ""
-      at(hosts, {in: :serial}) do |host|
-        cmd    = exec!("zypper search #{package}")
-        stdout = cmd.stdout
-      end
+      cmd    = sudo_exec!("zypper search #{package}")
+      stdout = cmd.stdout
       stdout.match(/No packages found/)
     end
 
-    def running?(hosts, package)
+    def running?(package)
       stdout = ""
-      at(hosts, {in: :serial}) do |host|
-        cmd = sudo_exec!("service #{package} status")
-        stdout = cmd.stdout
-      end
+      cmd = sudo_exec!("service #{package} status")
+      stdout = cmd.stdout
       stdout.match(/Active: active \(running\)/)
     end
 
-    def service_manager(service, action, host=nil)
-      hosts = (host.nil? ? servers : Array(host))
-      at(hosts, {in: :serial}) do |_|
-        sudo_exec!("service #{service} #{action}")
-      end
+    def service_manager(service, action)
+      sudo_exec!("service #{service} #{action}")
     end
-
   end
 end
diff --git a/qa/rspec/commands/suse/sles-11.rb b/qa/rspec/commands/suse/sles-11.rb
index 80dd94dd7..af2c41845 100644
--- a/qa/rspec/commands/suse/sles-11.rb
+++ b/qa/rspec/commands/suse/sles-11.rb
@@ -1,25 +1,35 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "../base"
 require_relative "../suse"
 
 module ServiceTester
   class Sles11Commands < SuseCommands
 
-    def running?(hosts, package)
+    def running?(package)
       stdout = ""
-      at(hosts, {in: :serial}) do |host|
-        cmd = sudo_exec!("/etc/init.d/#{package} status")
-        stdout = cmd.stdout
-      end
+      cmd = sudo_exec!("/etc/init.d/#{package} status")
+      stdout = cmd.stdout
       stdout.match(/#{package} is running$/)
     end
 
-    def service_manager(service, action, host=nil)
-      hosts = (host.nil? ? servers : Array(host))
-      at(hosts, {in: :serial}) do |_|
-        sudo_exec!("/etc/init.d/#{service} #{action}")
-      end
+    def service_manager(service, action)
+      sudo_exec!("/etc/init.d/#{service} #{action}")
     end
-
   end
 end
diff --git a/qa/rspec/commands/system_helpers.rb b/qa/rspec/commands/system_helpers.rb
index 8cb892294..b2c0a78a5 100644
--- a/qa/rspec/commands/system_helpers.rb
+++ b/qa/rspec/commands/system_helpers.rb
@@ -1,42 +1,58 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "base"
 
 module ServiceTester
   module SystemD
-    def running?(hosts, package)
+    def running?(package, jdk_path = '/usr/share/logstash/jdk/bin/java')
       stdout = ""
-      at(hosts, {in: :serial}) do |host|
-        cmd = sudo_exec!("service #{package} status")
-        stdout = cmd.stdout
-      end
+      cmd = sudo_exec!("service #{package} status")
+      stdout = cmd.stdout
+      stdout.force_encoding(Encoding::UTF_8)
       (
         stdout.match(/Active: active \(running\)/) &&
+        stdout.match(/^\s*(└─|`-)\d*\s.*#{jdk_path}.*org\.logstash\.Logstash/) &&
         stdout.match(/#{package}.service - #{package}/)
       )
     end
 
-    def service_manager(service, action, host=nil)
-      hosts = (host.nil? ? servers : Array(host))
-      at(hosts, {in: :serial}) do |_|
-        sudo_exec!("service #{service} #{action}")
-      end
+    def service_manager(service, action)
+      sudo_exec!("service #{service} #{action}")
     end
   end
 
   module InitD
-    def running?(hosts, package)
+    def running?(package, jdk_path = '/usr/share/logstash/jdk/bin/java')
       stdout = ""
-      at(hosts, {in: :serial}) do |host|
-        cmd = sudo_exec!("initctl status #{package}")
+      cmd = sudo_exec!("initctl status #{package}")
+      stdout = cmd.stdout
+      running = stdout.match(/#{package} start\/running/)
+      if running
+        pid = stdout.match(/#{package} start\/running, process (\d*)/).captures[0]
+        cmd = sudo_exec!("ps ax | grep #{pid}")
         stdout = cmd.stdout
+        running = (running && stdout.match(/#{jdk_path}/))
       end
-      stdout.match(/#{package} start\/running/)
+      running
     end
 
-    def service_manager(service, action, host=nil)
-      hosts = (host.nil? ? servers : Array(host))
-      at(hosts, {in: :serial}) do |_|
-        sudo_exec!("initctl #{action} #{service}")
-      end
-    end 
+    def service_manager(service, action)
+      sudo_exec!("initctl #{action} #{service}")
+    end
   end
 end
diff --git a/qa/rspec/commands/ubuntu.rb b/qa/rspec/commands/ubuntu.rb
index 1d1ae75f9..22952af09 100644
--- a/qa/rspec/commands/ubuntu.rb
+++ b/qa/rspec/commands/ubuntu.rb
@@ -1,17 +1,24 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "debian"
 
 module ServiceTester
   class UbuntuCommands < DebianCommands
-
-    def running?(hosts, package)
-      stdout = ""
-      at(hosts, {in: :serial}) do |host|
-        cmd = sudo_exec!("service #{package} status")
-        stdout = cmd.stdout
-      end
-      stdout.match(/^#{package} start\/running/)
-    end
-
+    include ::ServiceTester::SystemD
   end
 end
diff --git a/qa/rspec/commands/ubuntu/ubuntu-1604.rb b/qa/rspec/commands/ubuntu/ubuntu-1604.rb
deleted file mode 100644
index ae26bc09f..000000000
--- a/qa/rspec/commands/ubuntu/ubuntu-1604.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# encoding: utf-8
-require_relative "../base"
-require_relative "../ubuntu"
-
-module ServiceTester
-  class Ubuntu1604Commands < UbuntuCommands
-      include ::ServiceTester::SystemD
-  end
-end
diff --git a/qa/rspec/helpers.rb b/qa/rspec/helpers.rb
deleted file mode 100644
index a939fa7df..000000000
--- a/qa/rspec/helpers.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# encoding: utf-8
-require_relative "commands"
-
-module ServiceTester
-
-  class Configuration
-    attr_accessor :servers, :lookup
-    def initialize
-      @servers  = []
-      @lookup   = {}
-    end
-
-    def hosts
-      lookup.values.map { |val| val["host"] }
-    end
-  end
-
-  class << self
-    attr_accessor :configuration
-  end
-
-  def self.configure
-    self.configuration ||= Configuration.new
-    yield(configuration) if block_given?
-  end
-
-  def servers
-    ServiceTester.configuration.servers
-  end
-
-  def select_client
-    CommandsFactory.fetch(current_example.metadata[:platform])
-  end
-
-  def current_example
-    RSpec.respond_to?(:current_example) ? RSpec.current_example : self.example
-  end
-end
diff --git a/qa/rspec/matchers.rb b/qa/rspec/matchers.rb
index 4da583262..b5bd3c753 100644
--- a/qa/rspec/matchers.rb
+++ b/qa/rspec/matchers.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "./matchers/be_installed"
 require_relative "./matchers/be_running"
 require_relative "./matchers/cli_matchers"
diff --git a/qa/rspec/matchers/be_installed.rb b/qa/rspec/matchers/be_installed.rb
index 4de70ae21..2829c55aa 100644
--- a/qa/rspec/matchers/be_installed.rb
+++ b/qa/rspec/matchers/be_installed.rb
@@ -1,15 +1,30 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'rspec/expectations'
-require_relative '../helpers'
 
 RSpec::Matchers.define :be_installed do
   match do |subject|
-    subject.installed?(subject.hosts, subject.name)
+    subject.installed?(subject.name)
   end
 end
 
 RSpec::Matchers.define :be_removed do
   match do |subject|
-    subject.removed?(subject.hosts, subject.name)
+    subject.removed?(subject.name)
   end
 end
diff --git a/qa/rspec/matchers/be_running.rb b/qa/rspec/matchers/be_running.rb
index dc687e1b1..6347419b1 100644
--- a/qa/rspec/matchers/be_running.rb
+++ b/qa/rspec/matchers/be_running.rb
@@ -1,9 +1,24 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'rspec/expectations'
-require_relative '../helpers'
 
 RSpec::Matchers.define :be_running do
   match do |subject|
-    subject.running?(subject.hosts, subject.name)
+    subject.running?(subject.name)
   end
 end
diff --git a/qa/rspec/matchers/cli_matchers.rb b/qa/rspec/matchers/cli_matchers.rb
index e31aa050a..f9a22fec6 100644
--- a/qa/rspec/matchers/cli_matchers.rb
+++ b/qa/rspec/matchers/cli_matchers.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 RSpec::Matchers.define :be_successful do
   match do |actual|
     actual.exit_status == 0
@@ -17,7 +33,7 @@ RSpec::Matchers.define :run_successfully_and_output do |expected_output|
   end
 end
 
-RSpec::Matchers.define :have_installed? do |name,*args|
+RSpec::Matchers.define :have_installed? do |name, *args|
   match do |actual|
     version = args.first
     actual.plugin_installed?(name, version)
diff --git a/qa/support/logstash-filter-qatest/logstash-filter-qatest-newer.gemspec b/qa/support/logstash-filter-qatest/logstash-filter-qatest-newer.gemspec
index 1e9fe168a..0baa11df7 100644
--- a/qa/support/logstash-filter-qatest/logstash-filter-qatest-newer.gemspec
+++ b/qa/support/logstash-filter-qatest/logstash-filter-qatest-newer.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)+::Dir.glob('vendor/*')
+  s.files = `git ls-files`.split($\) + ::Dir.glob('vendor/*')
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -22,4 +22,3 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'logstash-devutils'
   s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
 end
-
diff --git a/qa/support/logstash-filter-qatest/logstash-filter-qatest-old.gemspec b/qa/support/logstash-filter-qatest/logstash-filter-qatest-old.gemspec
index 82e3be79b..aa163c4f6 100644
--- a/qa/support/logstash-filter-qatest/logstash-filter-qatest-old.gemspec
+++ b/qa/support/logstash-filter-qatest/logstash-filter-qatest-old.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)+::Dir.glob('vendor/*')
+  s.files = `git ls-files`.split($\) + ::Dir.glob('vendor/*')
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
diff --git a/qa/support/logstash-integration-failure_injector/README.md b/qa/support/logstash-integration-failure_injector/README.md
new file mode 100644
index 000000000..bfa4a0197
--- /dev/null
+++ b/qa/support/logstash-integration-failure_injector/README.md
@@ -0,0 +1,10 @@
+# About the plugin
+
+This plugin is for Logstash pipelines test purpose _only_.
+
+# How to apply changes
+
+When you change the source code, make sure to build a gem file.
+```shell
+gem build logstash-integration-failure_injector.gemspec
+```
diff --git a/qa/support/logstash-integration-failure_injector/lib/logstash/filters/failure_injector.rb b/qa/support/logstash-integration-failure_injector/lib/logstash/filters/failure_injector.rb
new file mode 100644
index 000000000..919118a0f
--- /dev/null
+++ b/qa/support/logstash-integration-failure_injector/lib/logstash/filters/failure_injector.rb
@@ -0,0 +1,91 @@
+# encoding: utf-8
+
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'logstash/inputs/base'
+require 'logstash/namespace'
+
+require_relative '../utils/failure_injector_util'
+
+class LogStash::Filters::FailureInjector < LogStash::Filters::Base
+
+  config_name "failure_injector"
+
+  # Defines the phases where plugin needs to make a pipeline degraded state.
+  # Accepts one or any of [register, filter, close]
+  # Note that, order of the phases doesn't matter as it obeys on plugin phase
+  # Example config to degrade the pipeline status at register and receive phase:
+  # failure_injector {
+  #    degrade_at => ['register', 'filter']
+  # }
+  config :degrade_at, :validate => :array, :default => []
+
+  # Defines the phases where plugin needs to be crashed, causes pipeline terminated.
+  # Accepts one of [register, filter, close]
+  # Example config to degrade the pipeline status at register and receive phase:
+  # failure_injector {
+  #    crash_at => 'register'
+  # }
+  #
+  # Note that, order of the phases doesn't matter as it obeys on plugin phase
+  #   Plugin doesn't validate the order, if `crash_at` is combined with `degrade_at`, and plugin cannot simulate degraded state after crash phase
+  #   Example,
+  #     failure_injector {
+  #       crash_at => 'register'
+  #        degrade_at => ['filter']
+  #     }
+  config :crash_at, :validate => :string
+
+  def initialize(params)
+    FailureInjectorUtils.validate_config('filter', params)
+    super
+  end
+
+  def register
+    @logger.debug("Registering plugin")
+    degrade_or_crash_if_required('register')
+  end
+
+  def filter(event)
+    @logger.trace("Received the event to filter: #{event}")
+    degrade_or_crash_if_required('filter')
+  end
+
+  def close
+    @logger.debug("Plugin is closing")
+    degrade_or_crash_if_required('close')
+  end
+
+  def degrade_or_crash_if_required(phase)
+    degrade(phase) if @degrade_at.include?(phase)
+    crash(phase) if @crash_at && @crash_at == phase
+  end
+
+  def degrade(phase)
+    @logger.debug("Degraded at #{phase} phase")
+    (1..100).each { |i|
+      sleep(i * 0.005)
+    }
+  end
+
+  def crash(phase)
+    @logger.debug("Crashing at #{phase} phase")
+    raise "`logstash-filter-failure_injector` is crashing at #{phase} phase"
+  end
+
+end
diff --git a/qa/support/logstash-integration-failure_injector/lib/logstash/outputs/failure_injector.rb b/qa/support/logstash-integration-failure_injector/lib/logstash/outputs/failure_injector.rb
new file mode 100644
index 000000000..5e836a93f
--- /dev/null
+++ b/qa/support/logstash-integration-failure_injector/lib/logstash/outputs/failure_injector.rb
@@ -0,0 +1,91 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# encoding: utf-8
+
+require 'logstash/inputs/base'
+require 'logstash/namespace'
+
+require_relative '../utils/failure_injector_util'
+
+class LogStash::Outputs::FailureInjector < LogStash::Outputs::Base
+
+  config_name "failure_injector"
+
+  # Defines the phases where plugin needs to make a pipeline degraded state.
+  # Accepts one or any of [register, receive, close]
+  # Note that, order of the phases doesn't matter as it obeys on plugin phase
+  # Example config to degrade the pipeline status at register and receive phase:
+  # failure_injector {
+  #    degrade_at => ['register', 'receive']
+  # }
+  config :degrade_at, :validate => :array, :default => []
+
+  # Defines the phases where plugin needs to be crashed, causes pipeline terminated.
+  # Accepts one of [register, receive, close]
+  # Example config to degrade the pipeline status at register and receive phase:
+  # failure_injector {
+  #    crash_at => 'register'
+  # }
+  #
+  # Note that, order of the phases doesn't matter as it obeys on plugin phase
+  #   Plugin doesn't validate the order, if `crash_at` is combined with `degrade_at`, and plugin cannot simulate degraded state after crash phase
+  #   Example,
+  #     failure_injector {
+  #       crash_at => 'register'
+  #        degrade_at => ['receive']
+  #     }
+  config :crash_at, :validate => :string
+
+  def initialize(params)
+    FailureInjectorUtils.validate_config('output', params)
+    super
+  end
+
+  def register
+    @logger.debug("Registering plugin")
+    degrade_or_crash_if_required('register')
+  end
+
+  def multi_receive(events)
+    @logger.trace("Received #{events.size} size of events")
+    degrade_or_crash_if_required('receive')
+  end
+
+  def close
+    @logger.debug("Plugin is closing")
+    degrade_or_crash_if_required('close')
+  end
+
+  def degrade_or_crash_if_required(phase)
+    degrade(phase) if @degrade_at.include?(phase)
+    crash(phase) if @crash_at && @crash_at == phase
+  end
+
+  def degrade(phase)
+    @logger.debug("Degraded at #{phase} phase")
+    (1..100).each { |i|
+      sleep(i * 0.01)
+    }
+  end
+
+  def crash(phase)
+    @logger.debug("Crashing at #{phase} phase")
+    raise "`logstash-output-failure_injector` is crashing at #{phase} phase"
+  end
+
+end
diff --git a/qa/support/logstash-integration-failure_injector/lib/logstash/utils/failure_injector_util.rb b/qa/support/logstash-integration-failure_injector/lib/logstash/utils/failure_injector_util.rb
new file mode 100644
index 000000000..7a2f0af9c
--- /dev/null
+++ b/qa/support/logstash-integration-failure_injector/lib/logstash/utils/failure_injector_util.rb
@@ -0,0 +1,37 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# encoding: utf-8
+
+class FailureInjectorUtils
+
+  def self.validate_config(type, params)
+    type_error_message = "`logstash-integration-failure_injector` accepts 'filter' or 'output' type."
+    raise type_error_message unless type
+    raise type_error_message unless %w(filter output).include?(type)
+
+    plugin_phase = type == 'output' ? 'receive' : 'filter'
+    accepted_configs = ['register', "#{plugin_phase}", 'close']
+    config_error_message = "failure_injector #{type} plugin accepts #{accepted_configs} configs but received"
+    params['degrade_at']&.each do | degrade_phase |
+      raise "#{config_error_message} #{degrade_phase}" unless accepted_configs.include?(degrade_phase)
+    end
+
+    crash_at = params['crash_at']
+    raise "#{config_error_message} #{crash_at}" if crash_at && !accepted_configs.include?(crash_at)
+  end
+end
\ No newline at end of file
diff --git a/qa/support/logstash-integration-failure_injector/logstash-integration-failure_injector-0.0.1.gem b/qa/support/logstash-integration-failure_injector/logstash-integration-failure_injector-0.0.1.gem
new file mode 100644
index 000000000..e241aaf94
Binary files /dev/null and b/qa/support/logstash-integration-failure_injector/logstash-integration-failure_injector-0.0.1.gem differ
diff --git a/qa/support/logstash-integration-failure_injector/logstash-integration-failure_injector.gemspec b/qa/support/logstash-integration-failure_injector/logstash-integration-failure_injector.gemspec
new file mode 100644
index 000000000..5525dcf4f
--- /dev/null
+++ b/qa/support/logstash-integration-failure_injector/logstash-integration-failure_injector.gemspec
@@ -0,0 +1,26 @@
+
+Gem::Specification.new do |s|
+  s.name            = "logstash-integration-failure_injector"
+  s.version         = "0.0.1"
+  s.licenses        = ["Apache-2.0"]
+  s.summary         = "A collection of Logstash plugins that halp simulating abnormal cases during the tests."
+  s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname."
+  s.authors         = ["Elastic"]
+  s.email           = "info@elastic.co"
+  s.homepage        = "https://www.elastic.co/logstash"
+  s.metadata        = {
+    "logstash_plugin" => "true",
+    "logstash_group" => "integration",
+    "integration_plugins" => %w(
+      logstash-filter-failure_injector
+      logstash-output-failure_injector
+    ).join(",")
+  }
+
+  s.files           = Dir["lib/**/*","spec/**/*","*.gemspec"]
+  s.test_files      = s.files.grep(%r{^(test|spec|features)/})
+
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 2.1.12", "<= 2.99"
+
+  s.add_development_dependency "logstash-devutils"
+end
diff --git a/qa/support/logstash-integration-failure_injector/spec/unit/failure_injector_spec.rb b/qa/support/logstash-integration-failure_injector/spec/unit/failure_injector_spec.rb
new file mode 100644
index 000000000..d455d8b66
--- /dev/null
+++ b/qa/support/logstash-integration-failure_injector/spec/unit/failure_injector_spec.rb
@@ -0,0 +1,129 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# encoding: utf-8
+
+require "logstash/devutils/rspec/spec_helper"
+require "logstash/filters/failure_injector"
+require "logstash/outputs/failure_injector"
+
+%w(filter output).each do | plugin_type |
+  instance = plugin_type == 'filter' ? LogStash::Filters::FailureInjector : LogStash::Outputs::FailureInjector
+  phase = plugin_type == 'filter' ? 'filter' : 'receive'
+  describe instance do
+    let(:params) { { 'degrade_at' => [], 'crash_at' => nil } }
+    let(:event) { LogStash::Event.new }
+    let(:plugin) { described_class.new(params) }
+
+    before do
+      allow(plugin).to receive(:@logger).and_return(double('logger', :debug => nil, :trace => nil))
+    end
+
+    describe 'plugin base' do
+      subject { described_class }
+      it { is_expected.to be_a_kind_of Class }
+      it { is_expected.to be <= (plugin_type == 'filter' ? LogStash::Filters::Base : LogStash::Outputs::Base) }
+      it { is_expected.to have_attributes(:config_name => "failure_injector") }
+    end
+
+    shared_examples 'a phase that can degrade or crash' do |phase|
+      context "when degrades at #{phase}" do
+        let(:params) { { 'degrade_at' => [phase] } }
+
+        it 'calls the degrade method' do
+          expect(plugin).to receive(:degrade).with(phase)
+          case phase
+          when 'filter'
+            plugin.filter(event)
+          when 'receive'
+            plugin.multi_receive([event])
+          else
+            plugin.send(phase)
+          end
+        end
+      end
+
+      context "when crashes at #{phase}" do
+        let(:params) { { 'crash_at' => phase } }
+
+        it 'raises a crash error' do
+          case phase
+          when 'filter'
+            expect { plugin.filter(event) }.to raise_error(RuntimeError, /crashing at #{phase}/)
+          when 'receive'
+            expect { plugin.multi_receive([event]) }.to raise_error(RuntimeError, /crashing at #{phase}/)
+          else
+            expect { plugin.send(phase) }.to raise_error(RuntimeError, /crashing at #{phase}/)
+          end
+        end
+      end
+    end
+
+    describe '#initialize' do
+      context 'when valid params are passed' do
+        let(:params) { { 'degrade_at' => [], 'crash_at' => nil } }
+
+        it 'does not raise any error' do
+          expect { described_class.new(params) }.not_to raise_error
+        end
+      end
+
+      context 'when invalid params are passed' do
+        it 'raises an error on invalid config' do
+          configs = ["register", plugin_type == 'filter' ? "filter" : "receive", "close"]
+          expect {
+            described_class.new('degrade_at' => ['invalid'], 'crash_at' => 'invalid')
+          }.to raise_error("failure_injector #{plugin_type} plugin accepts #{configs} configs but received invalid")
+        end
+      end
+    end
+
+    describe '#register' do
+      it_behaves_like 'a phase that can degrade or crash', 'register'
+    end
+
+    if plugin_type == 'filter'
+      describe '#filter' do
+        it_behaves_like 'a phase that can degrade or crash', 'filter'
+      end
+    end
+
+    if plugin_type == 'output'
+      describe '#receive' do
+        it_behaves_like 'a phase that can degrade or crash', 'receive'
+      end
+    end
+
+    describe '#close' do
+      it_behaves_like 'a phase that can degrade or crash', 'close'
+    end
+
+    describe '#degrade' do
+      it 'sleeps for a certain period of time' do
+        expect(plugin).to receive(:sleep).at_least(:once)
+        plugin.degrade('filter')
+      end
+    end
+
+    describe '#crash' do
+      it 'raises an error with the phase' do
+        expect { plugin.crash(phase) }.to raise_error(RuntimeError, /crashing at #{phase}/)
+      end
+    end
+  end
+end
+
diff --git a/qa/sys/debian/bootstrap.sh b/qa/sys/debian/bootstrap.sh
deleted file mode 100644
index 29c2c8403..000000000
--- a/qa/sys/debian/bootstrap.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-add-apt-repository ppa:openjdk-r/ppa
-apt-get update
-apt-get install -y openjdk-8-jdk
-update-alternatives --config java
-update-alternatives --config javac
diff --git a/qa/sys/debian/debian-8/bootstrap.sh b/qa/sys/debian/debian-8/bootstrap.sh
deleted file mode 100644
index da56514aa..000000000
--- a/qa/sys/debian/debian-8/bootstrap.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-echo "deb http://http.debian.net/debian jessie-backports main" >> /etc/apt/sources.list
-puts "installing jdk8"
-apt-get update
-apt-get install -y ca-certificates-java openjdk-8-jdk-headless
diff --git a/qa/sys/debian/ubuntu-1404/bootstrap.sh b/qa/sys/debian/ubuntu-1404/bootstrap.sh
deleted file mode 100644
index 728b0c3d1..000000000
--- a/qa/sys/debian/ubuntu-1404/bootstrap.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-add-apt-repository ppa:openjdk-r/ppa
-apt-get update
-apt-get install -y openjdk-8-jdk
-update-alternatives --config java
-update-alternatives --config javac
-update-ca-certificates -f
diff --git a/qa/sys/debian/user_bootstrap.sh b/qa/sys/debian/user_bootstrap.sh
deleted file mode 100644
index a99d4ff05..000000000
--- a/qa/sys/debian/user_bootstrap.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-VERSION=`cat /vagrant/config/platforms.json | grep  latest | cut -d":" -f2 | sed 's/["\|,| ]//g'`
-LOGSTASH_FILENAME="logstash-${VERSION}.deb"
-wget -q https://download.elastic.co/logstash/logstash/packages/debian/$LOGSTASH_FILENAME
diff --git a/qa/sys/redhat/bootstrap.sh b/qa/sys/redhat/bootstrap.sh
deleted file mode 100644
index 5976f4772..000000000
--- a/qa/sys/redhat/bootstrap.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-yum update
-yum install -y java-1.8.0-openjdk-devel.x86_64
diff --git a/qa/sys/redhat/user_bootstrap.sh b/qa/sys/redhat/user_bootstrap.sh
deleted file mode 100644
index 4713b3f5c..000000000
--- a/qa/sys/redhat/user_bootstrap.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-VERSION=`cat /vagrant/config/platforms.json | grep  latest | cut -d":" -f2 | sed 's/["\|,| ]//g'`
-LOGSTASH_FILENAME="logstash-${VERSION}.rpm"
-wget -q https://download.elastic.co/logstash/logstash/packages/centos/$LOGSTASH_FILENAME
diff --git a/qa/sys/suse/bootstrap.sh b/qa/sys/suse/bootstrap.sh
deleted file mode 100644
index 4dba83eb9..000000000
--- a/qa/sys/suse/bootstrap.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-zypper --non-interactive list-updates
-zypper --non-interactive --no-gpg-checks --quiet install --no-recommends java-1_8_0-openjdk-devel
diff --git a/qa/sys/suse/sles-11/bootstrap.sh b/qa/sys/suse/sles-11/bootstrap.sh
deleted file mode 100644
index 654be5d7e..000000000
--- a/qa/sys/suse/sles-11/bootstrap.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-zypper rr systemsmanagement_puppet
-zypper addrepo -t yast2 http://demeter.uni-regensburg.de/SLES12-x64/DVD1/ dvd1 || true
-zypper addrepo -t yast2 http://demeter.uni-regensburg.de/SLES12-x64/DVD2/ dvd2 || true
-ln -s /usr/sbin/update-alternatives /usr/sbin/alternatives
-curl -L 'https://edelivery.oracle.com/otn-pub/java/jdk/8u77-b03/jdk-8u77-linux-x64.rpm' -H 'Accept-Encoding: gzip, deflate, sdch' -H 'Accept-Language: en-US,en;q=0.8' -H 'Upgrade-Insecure-Requests: 1' -H 'User-Agent: Mozilla/5.0' -H 'Cookie: oraclelicense=accept-securebackup-cookie;' -H 'Connection: keep-alive' --compressed -o oracle_jdk_1.8.rpm
-zypper -q -n --non-interactive install oracle_jdk_1.8.rpm
diff --git a/qa/sys/suse/sles-12/bootstrap.sh b/qa/sys/suse/sles-12/bootstrap.sh
deleted file mode 100644
index 56b4d0fd7..000000000
--- a/qa/sys/suse/sles-12/bootstrap.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-zypper rr systemsmanagement_puppet
-zypper addrepo -t yast2 http://demeter.uni-regensburg.de/SLES12-x64/DVD1/ dvd1 || true
-zypper addrepo -t yast2 http://demeter.uni-regensburg.de/SLES12-x64/DVD2/ dvd2 || true
-zypper addrepo http://download.opensuse.org/repositories/Java:Factory/SLE_12/Java:Factory.repo || true
-zypper --no-gpg-checks --non-interactive refresh
-zypper --non-interactive list-updates
-ln -s /usr/sbin/update-alternatives /usr/sbin/alternatives
-curl -L 'https://edelivery.oracle.com/otn-pub/java/jdk/8u77-b03/jdk-8u77-linux-x64.rpm' -H 'Accept-Encoding: gzip, deflate, sdch' -H 'Accept-Language: en-US,en;q=0.8' -H 'Upgrade-Insecure-Requests: 1' -H 'User-Agent: Mozilla/5.0' -H 'Cookie: oraclelicense=accept-securebackup-cookie;' -H 'Connection: keep-alive' --compressed -o oracle_jdk_1.8.rpm
-zypper -q -n --non-interactive install oracle_jdk_1.8.rpm
diff --git a/qa/sys/suse/user_bootstrap.sh b/qa/sys/suse/user_bootstrap.sh
deleted file mode 100644
index be22af8b0..000000000
--- a/qa/sys/suse/user_bootstrap.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-VERSION=`cat /vagrant/config/platforms.json | grep  latest | cut -d":" -f2 | sed 's/["\|,| ]//g'`
-LOGSTASH_FILENAME="logstash-${VERSION}.rpm"
-wget -q https://download.elastic.co/logstash/logstash/packages/centos/$LOGSTASH_FILENAME
diff --git a/qa/vagrant/command.rb b/qa/vagrant/command.rb
deleted file mode 100644
index a07b71f81..000000000
--- a/qa/vagrant/command.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-# encoding: utf-8
-require "open3"
-require "bundler"
-
-module LogStash
-  class CommandExecutor
-    class CommandError < StandardError; end
-
-    class CommandResponse
-      attr_reader :stdin, :stdout, :stderr, :exitstatus
-
-      def initialize(stdin, stdout, stderr, exitstatus)
-        @stdin = stdin
-        @stdout = stdout
-        @stderr = stderr
-        @exitstatus = exitstatus
-      end
-
-      def success?
-        exitstatus == 0
-      end
-    end
-
-    def self.run(cmd, debug=false)
-      # This block is require to be able to launch a ruby subprocess
-      # that use bundler.
-      Bundler.with_clean_env do
-        stdin, stdout, stderr, wait_thr = Open3.popen3(cmd)
-        stdout_acc, stderr_acc = "", ""
-        stdout_reporter = reporter(stdout, wait_thr) do |c|
-          stdout_acc << c
-          print c if debug
-        end
-        reporter(stderr, wait_thr) do |c|
-          stderr_acc << c;
-          print c if debug
-        end
-        stdout_reporter.join
-        CommandResponse.new(stdin, stdout_acc, stderr_acc, wait_thr.value.exitstatus)
-      end
-    end
-
-    # This method will raise an exception if the `CMD`
-    # was not run successfully and will display the content of STDERR
-    def self.run!(cmd, debug=false)
-      response = run(cmd, debug)
-
-      unless response.success?
-        raise CommandError, "CMD: #{cmd} STDERR: #{response.stderr}"
-      end
-      response
-    end
-
-    private
-
-    def self.reporter(io, wait_thr, &block)
-      Thread.new(io, wait_thr) do |_io, _wait_thr|
-        while (_wait_thr.status == "run")
-          begin
-            c = _io.read(1)
-            block.call(c) if c
-          rescue IO::WaitReadable
-            IO.select([_io])
-            retry
-          end
-        end
-      end
-    end
-
-  end
-end
diff --git a/qa/vagrant/helpers.rb b/qa/vagrant/helpers.rb
deleted file mode 100644
index 9c65f714f..000000000
--- a/qa/vagrant/helpers.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-# encoding: utf-8
-require "open3"
-require "bundler"
-require_relative "command"
-
-module LogStash
-  class VagrantHelpers
-
-    def self.halt(machines=[], options={})
-      debug = options.fetch(:debug, false)
-      CommandExecutor.run!("vagrant halt #{machines.join(' ')}", debug)
-    end
-
-    def self.destroy(machines=[], options={})
-      debug = options.fetch(:debug, false)
-      CommandExecutor.run!("vagrant destroy --force #{machines.join(' ')}", debug) 
-    end
-
-    def self.bootstrap(machines=[], options={})
-      debug = options.fetch(:debug, false)
-      CommandExecutor.run!("vagrant up #{machines.join(' ')}", debug)
-    end
-
-    def self.save_snapshot(machine="")
-      CommandExecutor.run!("vagrant snapshot save #{machine} #{machine}-snapshot")
-    end
-
-    def self.restore_snapshot(machine="")
-      CommandExecutor.run!("vagrant snapshot restore #{machine} #{machine}-snapshot")
-    end
-
-    def self.fetch_config
-      machines = CommandExecutor.run!("vagrant status").stdout.split("\n").select { |l| l.include?("running") }.map { |r| r.split(' ')[0]}
-      CommandExecutor.run!("vagrant ssh-config #{machines.join(' ')}")
-    end
-
-    def self.parse(lines)
-      hosts, host = [], {}
-      lines.each do |line|
-        if line.match(/Host\s(.*)$/)
-          host = { :host => line.gsub("Host","").strip }
-        elsif line.match(/HostName\s(.*)$/)
-          host[:hostname] = line.gsub("HostName","").strip
-        elsif line.match(/Port\s(.*)$/)
-          host[:port]     = line.gsub("Port","").strip
-        elsif line.empty?
-          hosts << host
-          host = {}
-        end
-      end
-      hosts << host
-      hosts
-    end
-  end
-end
diff --git a/rakelib/artifacts.rake b/rakelib/artifacts.rake
index dd5792b29..262a7935f 100644
--- a/rakelib/artifacts.rake
+++ b/rakelib/artifacts.rake
@@ -1,22 +1,36 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'shellwords'
+
 namespace "artifact" do
-  gem 'json', '~> 1'
-
   SNAPSHOT_BUILD = ENV["RELEASE"] != "1"
-  VERSION_QUALIFIER = ENV["VERSION_QUALIFIER"]
-  if VERSION_QUALIFIER
-    PACKAGE_SUFFIX = SNAPSHOT_BUILD ? "-#{VERSION_QUALIFIER}-SNAPSHOT" : "-#{VERSION_QUALIFIER}"
-  else
-    PACKAGE_SUFFIX = SNAPSHOT_BUILD ? "-SNAPSHOT" : ""
-  end
+  VERSION_QUALIFIER = ENV["VERSION_QUALIFIER"].to_s.strip.empty? ? nil : ENV["VERSION_QUALIFIER"]
+  LOCAL_ARTIFACTS = ENV["LOCAL_ARTIFACTS"] || "true"
+  PACKAGE_SUFFIX = SNAPSHOT_BUILD ? "-SNAPSHOT" : ""
 
+  ## TODO: Install new service files
   def package_files
-    [
+    res = [
       "NOTICE.TXT",
       "CONTRIBUTORS",
       "bin/**/*",
       "config/**/*",
       "data",
-      "modules/**/*",
 
       "lib/bootstrap/**/*",
       "lib/pluginmanager/**/*",
@@ -34,7 +48,6 @@ namespace "artifact" do
       "logstash-core-plugin-api/*.gemspec",
 
       "patterns/**/*",
-      "tools/ingest-converter/build/libs/ingest-converter.jar",
       "vendor/??*/**/*",
       # To include ruby-maven's hidden ".mvn" directory, we need to
       # do add the line below. This directory contains a file called
@@ -43,13 +56,27 @@ namespace "artifact" do
       # plugins which use jar-dependencies.
       # See more in https://github.com/elastic/logstash/issues/4818
       "vendor/??*/**/.mvn/**/*",
+
+      # Without this when JRuby runs 'pleaserun' gem using the AdoptOpenJDK, during the post install script
+      # it claims that modules are not open for private introspection and suggest it's missing --add-opens
+      # so including these files JRuby run with modules opened to private introspection.
+      "vendor/jruby/bin/.jruby.java_opts",
+      "vendor/jruby/bin/.jruby.module_opts",
       "Gemfile",
       "Gemfile.lock",
       "x-pack/**/*",
     ]
+    if @bundles_jdk
+      res += [
+        "JDK_VERSION",
+        "jdk/**/*",
+        "jdk.app/**/*",
+      ]
+    end
+    res
   end
 
-  def exclude_paths
+  def default_exclude_paths
     return @exclude_paths if @exclude_paths
 
     @exclude_paths = []
@@ -60,89 +87,232 @@ namespace "artifact" do
     @exclude_paths << "bin/rspec"
     @exclude_paths << "bin/rspec.bat"
 
+    # vendored test/spec artifacts from upstream
+    @exclude_paths << 'vendor/**/gems/*/test/**/*'
+    @exclude_paths << 'vendor/**/gems/*/spec/**/*'
+
+    # vulnerability scanners shouldn't pick dependency Gemfile(s)
+    @exclude_paths << 'vendor/**/gems/**/Gemfile.lock'
+    @exclude_paths << 'vendor/**/gems/**/Gemfile'
+
+    @exclude_paths << 'vendor/jruby/lib/ruby/gems/shared/gems/rake-*'
+    # exclude ruby-maven-libs 3.3.9 jars until JRuby ships with >= 3.8.9
+    @exclude_paths << 'vendor/bundle/jruby/**/gems/ruby-maven-libs-3.3.9/**/*'
+
+    # remove this after JRuby includes rexml 3.3.x
+    @exclude_paths << 'vendor/jruby/lib/ruby/gems/shared/gems/rexml-3.2.5/**/*'
+    @exclude_paths << 'vendor/jruby/lib/ruby/gems/shared/specifications/rexml-3.2.5.gemspec'
+
     @exclude_paths
   end
 
-  def excludes
-    return @excludes if @excludes
-    @excludes = exclude_paths.collect { |g| Rake::FileList[g] }.flatten
+  def oss_exclude_paths
+    return @oss_excludes if @oss_excludes
+    @oss_excludes = default_exclude_paths + ["x-pack/**/*"]
   end
 
-  def exclude?(path)
-    excludes.any? { |ex| path_matches_exclude?(path, ex) }
+  def files(exclude_paths = default_exclude_paths)
+    Rake::FileList.new(*package_files).exclude(*exclude_paths)
   end
 
-  def exclude_oss?(path)
-    path_matches_exclude?(path, "x-pack" ) || exclude?(path)
+  def source_modified_since?(time, exclude_paths = default_exclude_paths)
+    skip_list = ["logstash-core-plugin-api/versions-gem-copy.yml", "logstash-core/versions-gem-copy.yml"]
+    result = false
+    files(exclude_paths).each do |file|
+      next if File.mtime(file) < time || skip_list.include?(file)
+      puts "file modified #{file}"
+      result = true
+      break
+    end
+    result
   end
 
-  def oss_excluder
-    @oss_excluder ||= self.method(:exclude_oss?)
-  end
+  ##
+  # @override safe_system([env,] command... [,options])
+  # execute Kernel#system call,checking the exit status of the executed command and eventually reporting as exception
+  def safe_system(*args)
+    command = args.dup # avoid mutating input for reporting
+    env = command.size > 1 && command.first.kind_of?(Hash) ? command.shift : {}
+    options = command.size > 1 && command.last.kind_of?(Hash) ? command.pop : {}
+    fail("unsupported options #{options}") unless options.empty?
 
-  def path_matches_exclude?(path, ex)
-    path == ex || (File.directory?(ex) && path =~ /^#{ex}\//)
-  end
+    # Normalize command to a single string from either a multi-word string
+    # or an array of individual words
+    command = command.size > 1 ? Shellwords.join(command.map(&:to_s)) : command.first.to_s
 
-  def files(excluder=nil)
-    excluder ||= self.method(:exclude?)
+    # prepend the environment
+    env.each do |k,v|
+      command.prepend("#{Shellwords.escape(k.to_s)}=#{Shellwords.escape(v.to_s)} ")
+    end
 
-    package_files.collect do |glob|
-      Rake::FileList[glob].reject(&excluder)
-    end.flatten.uniq
+    output = `#{command} 2>&1`
+    status = $?
+
+    if !status.success?
+      puts "Command failed: #{args.inspect}"
+      puts "Output: #{output}"
+      raise "Got exit status #{status.exitstatus} attempting to execute #{args.inspect}!"
+    end
+
+    true
   end
 
   desc "Generate rpm, deb, tar and zip artifacts"
   task "all" => ["prepare", "build"]
+  task "docker_only" => ["prepare", "build_docker_full", "build_docker_oss", "build_docker_wolfi"]
 
-  desc "Build a tar.gz of default logstash plugins with all dependencies"
-  task "tar" => ["prepare", "generate_build_metadata"] do
-    puts("[artifact:tar] Building tar.gz of default plugins")
+  desc "Build all (jdk bundled and not) tar.gz and zip of default logstash plugins with all dependencies"
+  task "archives" => ["prepare", "generate_build_metadata"] do
+    #with bundled JDKs
+    license_details = ['ELASTIC-LICENSE']
+    @bundles_jdk = true
+    create_archive_pack(license_details, "x86_64", "linux", "windows", "darwin")
+    create_archive_pack(license_details, "arm64", "linux", "darwin")
+
+    #without JDK
+    safe_system("./gradlew bootstrap") #force the build of Logstash jars
+    @bundles_jdk = false
+    build_tar(*license_details, platform: '-no-jdk')
+    build_zip(*license_details, platform: '-no-jdk')
+  end
+
+  desc "Build jdk bundled tar.gz of default logstash plugins with all dependencies for docker"
+  task "archives_docker" => ["prepare", "generate_build_metadata"] do
+    license_details = ['ELASTIC-LICENSE']
+    @bundles_jdk = true
+    create_archive_pack(license_details, "x86_64", "linux")
+    create_archive_pack(license_details, "arm64", "linux")
+    safe_system("./gradlew bootstrap") # force the build of Logstash jars
+  end
+
+  def create_archive_pack(license_details, arch, *oses)
+    oses.each do |os_name|
+      puts("[artifact:archives] Building tar.gz/zip of default plugins for OS: #{os_name}, arch: #{arch}")
+      create_single_archive_pack(os_name, arch, license_details)
+    end
+  end
+
+  def create_single_archive_pack(os_name, arch, license_details)
+    safe_system("./gradlew copyJdk -Pjdk_bundle_os=#{os_name} -Pjdk_arch=#{arch}")
+    if arch == 'arm64'
+      arch = 'aarch64'
+    end
+    case os_name
+    when "linux"
+      build_tar(*license_details, platform: "-linux-#{arch}")
+    when "windows"
+      build_zip(*license_details, platform: "-windows-#{arch}")
+    when "darwin"
+      build_tar(*license_details, platform: "-darwin-#{arch}")
+    end
+    safe_system("./gradlew deleteLocalJdk -Pjdk_bundle_os=#{os_name}")
+  end
+
+  # Create an archive pack using settings appropriate for the running machine
+  def create_local_archive_pack(bundle_jdk)
+    @bundles_jdk = bundle_jdk
+    safe_system("./gradlew copyJdk") if bundle_jdk
     build_tar('ELASTIC-LICENSE')
+    safe_system("./gradlew deleteLocalJdk") if bundle_jdk
   end
 
-  desc "Build an OSS tar.gz of default logstash plugins with all dependencies"
-  task "tar_oss" => ["prepare", "generate_build_metadata"] do
-    puts("[artifact:tar] Building tar.gz of default plugins")
-    build_tar('APACHE-LICENSE-2.0', "-oss", oss_excluder)
+  desc "Build a not JDK bundled tar.gz of default logstash plugins with all dependencies"
+  task "no_bundle_jdk_tar" => ["prepare", "generate_build_metadata"] do
+    create_local_archive_pack(false)
   end
 
-  desc "Build a zip of default logstash plugins with all dependencies"
-  task "zip" => ["prepare", "generate_build_metadata"] do
-    puts("[artifact:zip] Building zip of default plugins")
-    build_zip('ELASTIC-LICENSE')
+  desc "Build a JDK bundled tar.gz of default logstash plugins with all dependencies"
+  task "bundle_jdk_tar" => ["prepare", "generate_build_metadata"] do
+    create_local_archive_pack(true)
   end
 
-  desc "Build a zip of default logstash plugins with all dependencies"
-  task "zip_oss" => ["prepare", "generate_build_metadata"] do
-    puts("[artifact:zip] Building zip of default plugins")
-    build_zip('APACHE-LICENSE-2.0',"-oss", oss_excluder)
+  desc "Build all (jdk bundled and not) OSS tar.gz and zip of default logstash plugins with all dependencies"
+  task "archives_oss" => ["prepare-oss", "generate_build_metadata"] do
+    #with bundled JDKs
+    @bundles_jdk = true
+    license_details = ['APACHE-LICENSE-2.0', "-oss", oss_exclude_paths]
+    create_archive_pack(license_details, "x86_64", "linux", "windows", "darwin")
+    create_archive_pack(license_details, "arm64", "linux", "darwin")
+
+    #without JDK
+    @bundles_jdk = false
+    safe_system("./gradlew bootstrap") #force the build of Logstash jars
+    build_tar(*license_details, platform: '-no-jdk')
+    build_zip(*license_details, platform: '-no-jdk')
   end
 
+  desc "Build jdk bundled OSS tar.gz of default logstash plugins with all dependencies for docker"
+  task "archives_docker_oss" => ["prepare-oss", "generate_build_metadata"] do
+    #with bundled JDKs
+    @bundles_jdk = true
+    license_details = ['APACHE-LICENSE-2.0', "-oss", oss_exclude_paths]
+    create_archive_pack(license_details, "x86_64", "linux")
+    create_archive_pack(license_details, "arm64", "linux")
+    safe_system("./gradlew bootstrap") # force the build of Logstash jars
+  end
 
   desc "Build an RPM of logstash with all dependencies"
   task "rpm" => ["prepare", "generate_build_metadata"] do
-    puts("[artifact:rpm] building rpm package")
-    package("centos", "5")
+    #with bundled JDKs
+    @bundles_jdk = true
+    puts("[artifact:rpm] building rpm package x86_64")
+    package_with_jdk("centos", "x86_64")
+
+    puts("[artifact:rpm] building rpm package arm64")
+    package_with_jdk("centos", "arm64")
+
+    #without JDKs
+    @bundles_jdk = false
+    safe_system("./gradlew bootstrap") #force the build of Logstash jars
+    package("centos")
   end
 
   desc "Build an RPM of logstash with all dependencies"
-  task "rpm_oss" => ["prepare", "generate_build_metadata"] do
-    puts("[artifact:rpm] building rpm package")
-    package("centos", "5", :oss)
-  end
+  task "rpm_oss" => ["prepare-oss", "generate_build_metadata"] do
+    #with bundled JDKs
+    @bundles_jdk = true
+    puts("[artifact:rpm] building rpm OSS package x86_64")
+    package_with_jdk("centos", "x86_64", :oss)
 
+    puts("[artifact:rpm] building rpm OSS package arm64")
+    package_with_jdk("centos", "arm64", :oss)
+
+    #without JDKs
+    @bundles_jdk = false
+    safe_system("./gradlew bootstrap") #force the build of Logstash jars
+    package("centos", :oss)
+  end
 
   desc "Build a DEB of logstash with all dependencies"
   task "deb" => ["prepare", "generate_build_metadata"] do
-    puts("[artifact:deb] building deb package")
-    package("ubuntu", "12.04")
+    #with bundled JDKs
+    @bundles_jdk = true
+    puts("[artifact:deb] building deb package for x86_64")
+    package_with_jdk("ubuntu", "x86_64")
+
+    puts("[artifact:deb] building deb package for OS: linux arm64")
+    package_with_jdk("ubuntu", "arm64")
+
+    #without JDKs
+    @bundles_jdk = false
+    safe_system("./gradlew bootstrap") #force the build of Logstash jars
+    package("ubuntu")
   end
 
   desc "Build a DEB of logstash with all dependencies"
-  task "deb_oss" => ["prepare", "generate_build_metadata"] do
-    puts("[artifact:deb] building deb package")
-    package("ubuntu", "12.04", :oss)
+  task "deb_oss" => ["prepare-oss", "generate_build_metadata"] do
+    #with bundled JDKs
+    @bundles_jdk = true
+    puts("[artifact:deb_oss] building deb OSS package x86_64")
+    package_with_jdk("ubuntu", "x86_64", :oss)
+
+    puts("[artifact:deb_oss] building deb OSS package arm64")
+    package_with_jdk("ubuntu", "arm64", :oss)
+
+    #without JDKs
+    @bundles_jdk = false
+    safe_system("./gradlew bootstrap") #force the build of Logstash jars
+    package("ubuntu", :oss)
   end
 
   desc "Generate logstash core gems"
@@ -167,28 +337,129 @@ namespace "artifact" do
     build_tar('ELASTIC-LICENSE', "-all-plugins")
   end
 
+  desc "Build docker image"
+  task "docker" => ["prepare", "generate_build_metadata", "archives_docker"] do
+    puts("[docker] Building docker image")
+    build_docker('full')
+  end
+
+  desc "Build OSS docker image"
+  task "docker_oss" => ["prepare-oss", "generate_build_metadata", "archives_docker_oss"] do
+    puts("[docker_oss] Building OSS docker image")
+    build_docker('oss')
+  end
+
+  desc "Build wolfi docker image"
+  task "docker_wolfi" => %w(prepare generate_build_metadata archives_docker) do
+    puts("[docker_wolfi] Building Wolfi docker image")
+    build_docker('wolfi')
+  end
+
+  desc "Generate Dockerfiles for full and oss images"
+  task "dockerfiles" => ["prepare", "generate_build_metadata"] do
+    puts("[dockerfiles] Building Dockerfiles")
+    build_dockerfile('oss')
+    build_dockerfile('full')
+    build_dockerfile('wolfi')
+    build_dockerfile('ironbank')
+  end
+
+  desc "Generate Dockerfile for oss images"
+  task "dockerfile_oss" => ["prepare-oss", "generate_build_metadata"] do
+    puts("[dockerfiles] Building oss Dockerfile")
+    build_dockerfile('oss')
+  end
+
+  namespace "dockerfile_oss" do
+    desc "Build Oss Docker image from Dockerfile context files"
+    task "docker" => ["archives_docker", "dockerfile_oss"]  do
+      build_docker_from_dockerfiles('oss')
+    end
+  end
+
+  desc "Generate Dockerfile for full images"
+  task "dockerfile_full" => ["prepare", "generate_build_metadata"] do
+    puts("[dockerfiles] Building full Dockerfiles")
+    build_dockerfile('full')
+  end
+
+  namespace "dockerfile_full" do
+    desc "Build Full Docker image from Dockerfile context files"
+    task "docker" => ["archives_docker", "dockerfile_full"]  do
+      build_docker_from_dockerfiles('full')
+    end
+  end
+
+  desc "Generate Dockerfile for wolfi images"
+  task "dockerfile_wolfi" => ["prepare", "generate_build_metadata"] do
+    puts("[dockerfiles] Building wolfi Dockerfiles")
+    build_dockerfile('wolfi')
+  end
+
+  namespace "dockerfile_wolfi" do
+    desc "Build Wolfi Docker image from Dockerfile context files"
+    task "docker" => ["archives_docker", "dockerfile_wolfi"]  do
+      build_docker_from_dockerfiles('wolfi')
+    end
+  end
+
+  desc "Generate build context for ironbank"
+  task "dockerfile_ironbank" => ["prepare", "generate_build_metadata"] do
+    puts("[dockerfiles] Building ironbank Dockerfiles")
+    build_dockerfile('ironbank')
+  end
+
   # Auxiliary tasks
   task "build" => [:generate_build_metadata] do
     Rake::Task["artifact:gems"].invoke unless SNAPSHOT_BUILD
     Rake::Task["artifact:deb"].invoke
-    Rake::Task["artifact:deb_oss"].invoke
     Rake::Task["artifact:rpm"].invoke
+    Rake::Task["artifact:archives"].invoke
+
+    unless ENV['SKIP_DOCKER'] == "1"
+      Rake::Task["artifact:docker"].invoke
+      Rake::Task["artifact:docker_wolfi"].invoke
+      Rake::Task["artifact:dockerfiles"].invoke
+      Rake::Task["artifact:docker_oss"].invoke
+    end
+
+    Rake::Task["artifact:deb_oss"].invoke
     Rake::Task["artifact:rpm_oss"].invoke
-    Rake::Task["artifact:zip"].invoke
-    Rake::Task["artifact:zip_oss"].invoke
-    Rake::Task["artifact:tar"].invoke
-    Rake::Task["artifact:tar_oss"].invoke
+    Rake::Task["artifact:archives_oss"].invoke
+  end
+
+  task "build_docker_full" => [:generate_build_metadata] do
+    Rake::Task["artifact:docker"].invoke
+    Rake::Task["artifact:dockerfile_full"].invoke
+    Rake::Task["artifact:dockerfile_full:docker"].invoke
+  end
+
+  task "build_docker_oss" => [:generate_build_metadata] do
+    Rake::Task["artifact:docker_oss"].invoke
+    Rake::Task["artifact:dockerfile_oss"].invoke
+    Rake::Task["artifact:dockerfile_oss:docker"].invoke
+  end
+
+  task "build_docker_wolfi" => [:generate_build_metadata] do
+    Rake::Task["artifact:docker_wolfi"].invoke
+    Rake::Task["artifact:dockerfile_wolfi"].invoke
+    Rake::Task["artifact:dockerfile_wolfi:docker"].invoke
   end
 
   task "generate_build_metadata" do
+    require 'time'
+    require 'tempfile'
+
     return if defined?(BUILD_METADATA_FILE)
     BUILD_METADATA_FILE = Tempfile.new('build.rb')
+    BUILD_DATE = Time.now.iso8601
     build_info = {
-      "build_date" => Time.now.iso8601,
+      "build_date" => BUILD_DATE,
       "build_sha" => `git rev-parse HEAD`.chomp,
       "build_snapshot" => SNAPSHOT_BUILD
     }
-    metadata = [ "# encoding: utf-8", "BUILD_INFO = #{build_info}" ]
+
+    metadata = ["# encoding: utf-8", "BUILD_INFO = #{build_info}"]
     IO.write(BUILD_METADATA_FILE.path, metadata.join("\n"))
   end
 
@@ -207,7 +478,7 @@ namespace "artifact" do
     gem_line_regex = /^\s*gem\s+["']logstash-core["'](?:\s*,\s*["'][^"^']+["'])?(?:\s*,\s*:path\s*=>\s*["']([^"^']+)["'])?/i
 
     lines = File.readlines("Gemfile")
-    matches = lines.select{|line| line[gem_line_regex]}
+    matches = lines.select {|line| line[gem_line_regex]}
     abort("ERROR: Gemfile format error, need a single logstash-core gem specification") if matches.size != 1
 
     path = matches.first[gem_line_regex, 1]
@@ -227,7 +498,7 @@ namespace "artifact" do
     gem_line_regex = /^\s*gem\s+["']logstash-core-plugin-api["'](?:\s*,\s*["'][^"^']+["'])?(?:\s*,\s*:path\s*=>\s*["']([^"^']+)["'])?/i
 
     lines = File.readlines("Gemfile")
-    matches = lines.select{|line| line[gem_line_regex]}
+    matches = lines.select {|line| line[gem_line_regex]}
     abort("ERROR: Gemfile format error, need a single logstash-core-plugin-api gem specification") if matches.size != 1
 
     path = matches.first[gem_line_regex, 1]
@@ -246,6 +517,12 @@ namespace "artifact" do
     end
   end
 
+  task "prepare-oss" do
+    if ENV['SKIP_PREPARE'] != "1"
+      %w[bootstrap plugin:install-default plugin:remove-non-oss-plugins artifact:clean-bundle-config].each {|task| Rake::Task[task].invoke }
+    end
+  end
+
   def ensure_logstash_version_constant_defined
     # we do not want this file required when rake (ruby) parses this file
     # only when there is a task executing, not at the very top of this file
@@ -254,44 +531,45 @@ namespace "artifact" do
     end
   end
 
-  def build_tar(license, tar_suffix = nil, excluder=nil)
+  def build_tar(license, tar_suffix = nil, exclude_paths = default_exclude_paths, platform: '')
     require "zlib"
-    require "archive/tar/minitar"
+    require 'rubygems'
+    require 'rubygems/package'
+    require 'minitar'
     ensure_logstash_version_constant_defined
-    tarpath = "build/logstash#{tar_suffix}-#{LOGSTASH_VERSION}#{PACKAGE_SUFFIX}.tar.gz"
+    tarpath = "build/logstash#{tar_suffix}-#{LOGSTASH_VERSION}#{PACKAGE_SUFFIX}#{platform}.tar.gz"
+    if File.exist?(tarpath) && ENV['SKIP_PREPARE'] == "1" && !source_modified_since?(File.mtime(tarpath))
+      puts("[artifact:tar] Source code not modified. Skipping build of #{tarpath}")
+      return
+    end
     puts("[artifact:tar] building #{tarpath}")
     gz = Zlib::GzipWriter.new(File.new(tarpath, "wb"), Zlib::BEST_COMPRESSION)
-    tar = Archive::Tar::Minitar::Output.new(gz)
-    files(excluder).each do |path|
-      write_to_tar(tar, path, "logstash-#{LOGSTASH_VERSION}#{PACKAGE_SUFFIX}/#{path}")
+    Minitar::Writer.open(gz) do |tar|
+      files(exclude_paths).each do |path|
+        write_to_tar(tar, path, "logstash-#{LOGSTASH_VERSION}#{PACKAGE_SUFFIX}/#{path}")
+      end
+
+      source_license_path = "licenses/#{license}.txt"
+      fail("Missing source license: #{source_license_path}") unless File.exist?(source_license_path)
+      write_to_tar(tar, source_license_path, "logstash-#{LOGSTASH_VERSION}#{PACKAGE_SUFFIX}/LICENSE.txt")
+
+      # add build.rb to tar
+      metadata_file_path_in_tar = File.join("logstash-core", "lib", "logstash", "build.rb")
+      path_in_tar = File.join("logstash-#{LOGSTASH_VERSION}#{PACKAGE_SUFFIX}", metadata_file_path_in_tar)
+      write_to_tar(tar, BUILD_METADATA_FILE.path, path_in_tar)
     end
-
-    source_license_path = "licenses/#{license}.txt"
-    fail("Missing source license: #{source_license_path}") unless File.exists?(source_license_path)
-    write_to_tar(tar, source_license_path, "logstash-#{LOGSTASH_VERSION}#{PACKAGE_SUFFIX}/LICENSE.txt")
-
-    # add build.rb to tar
-    metadata_file_path_in_tar = File.join("logstash-core", "lib", "logstash", "build.rb")
-    path_in_tar = File.join("logstash-#{LOGSTASH_VERSION}#{PACKAGE_SUFFIX}", metadata_file_path_in_tar)
-    write_to_tar(tar, BUILD_METADATA_FILE.path, path_in_tar)
-
-    tar.close
     gz.close
-    puts "Complete: #{tarpath}"
   end
 
   def write_to_tar(tar, path, path_in_tar)
     stat = File.lstat(path)
-    opts = {
-      :size => stat.size,
-      :mode => stat.mode,
-      :mtime => stat.mtime
-    }
     if stat.directory?
-      tar.tar.mkdir(path_in_tar, opts)
+      tar.mkdir(path_in_tar, :mode => stat.mode)
+    elsif stat.symlink?
+      tar.symlink(path_in_tar, File.readlink(path), :mode => stat.mode)
     else
-      tar.tar.add_file_simple(path_in_tar, opts) do |io|
-        File.open(path,'rb') do |fd|
+      tar.add_file_simple(path_in_tar, :mode => stat.mode, :size => stat.size) do |io|
+        File.open(path, 'rb') do |fd|
           chunk = nil
           size = 0
           size += io.write(chunk) while chunk = fd.read(16384)
@@ -303,20 +581,20 @@ namespace "artifact" do
     end
   end
 
-  def build_zip(license, zip_suffix = "", excluder=nil)
+  def build_zip(license, zip_suffix = "", exclude_paths = default_exclude_paths, platform: '')
     require 'zip'
     ensure_logstash_version_constant_defined
-    zippath = "build/logstash#{zip_suffix}-#{LOGSTASH_VERSION}#{PACKAGE_SUFFIX}.zip"
+    zippath = "build/logstash#{zip_suffix}-#{LOGSTASH_VERSION}#{PACKAGE_SUFFIX}#{platform}.zip"
     puts("[artifact:zip] building #{zippath}")
-    File.unlink(zippath) if File.exists?(zippath)
+    File.unlink(zippath) if File.exist?(zippath)
     Zip::File.open(zippath, Zip::File::CREATE) do |zipfile|
-      files(excluder).each do |path|
+      files(exclude_paths).each do |path|
         path_in_zip = "logstash-#{LOGSTASH_VERSION}#{PACKAGE_SUFFIX}/#{path}"
         zipfile.add(path_in_zip, path)
       end
 
       source_license_path = "licenses/#{license}.txt"
-      fail("Missing source license: #{source_license_path}") unless File.exists?(source_license_path)
+      fail("Missing source license: #{source_license_path}") unless File.exist?(source_license_path)
       zipfile.add("logstash-#{LOGSTASH_VERSION}#{PACKAGE_SUFFIX}/LICENSE.txt", source_license_path)
 
       # add build.rb to zip
@@ -329,17 +607,19 @@ namespace "artifact" do
     puts "Complete: #{zippath}"
   end
 
-  def package(platform, version, variant=:standard)
+  def package_with_jdk(platform, jdk_arch, variant = :standard)
+    safe_system("./gradlew copyJdk -Pjdk_bundle_os=linux -Pjdk_arch=#{jdk_arch}")
+    package(platform, variant, true, jdk_arch)
+    safe_system('./gradlew deleteLocalJdk -Pjdk_bundle_os=linux')
+  end
+
+  def package(platform, variant = :standard, bundle_jdk = false, jdk_arch = 'x86_64')
     oss = variant == :oss
 
     require "stud/temporary"
     require "fpm/errors" # TODO(sissel): fix this in fpm
     require "fpm/package/dir"
     require "fpm/package/gem" # TODO(sissel): fix this in fpm; rpm needs it.
-    require "childprocess/jruby/pump"
-    # TODO(ph): Cabin is closing the fd when it reach EOF, childprocess will attempt to write to it and hit an IOError.
-    # This will make a the thread dies, in 1.7.25 we had a Thread Death
-    require_relative "childprocess_patch"
 
     basedir = File.join(File.dirname(__FILE__), "..")
     dir = FPM::Package::Dir.new
@@ -349,15 +629,15 @@ namespace "artifact" do
     metadata_source_file_path = BUILD_METADATA_FILE.path
     dir.input("#{metadata_source_file_path}=/usr/share/logstash/#{metadata_file_path}")
 
-
     suffix = ""
-    excluder = nil
     if oss
-      suffix= "-oss"
-      excluder = oss_excluder
+      suffix = "-oss"
+      exclude_paths = oss_exclude_paths
+    else
+      exclude_paths = default_exclude_paths
     end
 
-    files(excluder).each do |path|
+    files(exclude_paths).each do |path|
       next if File.directory?(path)
       # Omit any config dir from /usr/share/logstash for packages, since we're
       # using /etc/logstash below
@@ -383,14 +663,18 @@ namespace "artifact" do
       dir.input("#{empty}/=/var/log/logstash")
       dir.input("#{empty}/=/var/lib/logstash")
       dir.input("#{empty}/=/etc/logstash/conf.d")
+      dir.input("#{empty}/=/lib/systemd/system")
+      dir.input("#{empty}/=/etc/default")
     end
 
     File.join(basedir, "config", "log4j2.properties").tap do |path|
       dir.input("#{path}=/etc/logstash")
     end
 
+    arch_suffix = bundle_jdk ? map_architecture_for_package_type(platform, jdk_arch) : "no-jdk"
+
     ensure_logstash_version_constant_defined
-    package_filename = "logstash#{suffix}-#{LOGSTASH_VERSION}#{PACKAGE_SUFFIX}.TYPE"
+    package_filename = "logstash#{suffix}-#{LOGSTASH_VERSION}#{PACKAGE_SUFFIX}-#{arch_suffix}.TYPE"
 
     File.join(basedir, "config", "startup.options").tap do |path|
       dir.input("#{path}=/etc/logstash")
@@ -407,6 +691,12 @@ namespace "artifact" do
     File.join(basedir, "pkg", "pipelines.yml").tap do |path|
       dir.input("#{path}=/etc/logstash")
     end
+    File.join(basedir, "pkg", "service_templates", "systemd", "lib", "systemd", "system", "logstash.service").tap do |path|
+      dir.input("#{path}=/lib/systemd/system")
+    end
+    File.join(basedir, "pkg", "service_templates", "sysv", "etc", "default", "logstash").tap do |path|
+      dir.input("#{path}=/etc/default")
+    end
 
     case platform
       when "redhat", "centos"
@@ -421,12 +711,16 @@ namespace "artifact" do
         out.attributes[:rpm_user] = "root"
         out.attributes[:rpm_group] = "root"
         out.attributes[:rpm_os] = "linux"
+        out.attributes[:rpm_digest] = "sha256"
         out.config_files << "/etc/logstash/startup.options"
         out.config_files << "/etc/logstash/jvm.options"
         out.config_files << "/etc/logstash/log4j2.properties"
         out.config_files << "/etc/logstash/logstash.yml"
         out.config_files << "/etc/logstash/logstash-sample.conf"
         out.config_files << "/etc/logstash/pipelines.yml"
+        out.config_files << "/lib/systemd/system/logstash.service"
+        out.config_files << "/etc/default/logstash"
+        out.replaces << "logstash < 7.10.0"
       when "debian", "ubuntu"
         require "fpm/package/deb"
 
@@ -436,13 +730,17 @@ namespace "artifact" do
         out.license = license
         out.attributes[:deb_user] = "root"
         out.attributes[:deb_group] = "root"
-        out.attributes[:deb_suggests] = "java8-runtime-headless"
+        out.attributes[:deb_suggests] = ["java11-runtime-headless"] unless bundle_jdk
         out.config_files << "/etc/logstash/startup.options"
         out.config_files << "/etc/logstash/jvm.options"
         out.config_files << "/etc/logstash/log4j2.properties"
         out.config_files << "/etc/logstash/logstash.yml"
         out.config_files << "/etc/logstash/logstash-sample.conf"
         out.config_files << "/etc/logstash/pipelines.yml"
+        out.config_files << "/lib/systemd/system/logstash.service"
+        out.config_files << "/etc/default/logstash"
+        out.conflicts << "logstash (<< 7.10.0)"
+        out.replaces << "logstash (<< 7.10.0)"
     end
 
     # Packaging install/removal scripts
@@ -451,7 +749,7 @@ namespace "artifact" do
         script = "#{stage}-#{action}" # like, "before-install"
         script_sym = script.gsub("-", "_").to_sym
         script_path = File.join(File.dirname(__FILE__), "..", "pkg", platform, "#{script}.sh")
-        next unless File.exists?(script_path)
+        next unless File.exist?(script_path)
 
         out.scripts[script_sym] = File.read(script_path)
       end
@@ -459,14 +757,14 @@ namespace "artifact" do
 
     # TODO(sissel): Invoke Pleaserun to generate the init scripts/whatever
 
-    out.name = "logstash"
+    out.name = oss ? "logstash-oss" : "logstash"
+    out.architecture = bundle_jdk ? map_architecture_for_package_type(platform, jdk_arch) : "all"
     out.version = "#{LOGSTASH_VERSION}#{PACKAGE_SUFFIX}".gsub(/[.-]([[:alpha:]])/, '~\1')
-    out.architecture = "all"
     # TODO(sissel): Include the git commit hash?
     out.iteration = "1" # what revision?
-    out.url = "http://www.elasticsearch.org/overview/logstash/"
+    out.url = "https://www.elastic.co/logstash"
     out.description = "An extensible logging pipeline"
-    out.vendor = "Elasticsearch"
+    out.vendor = "Elastic"
 
     # Because we made a mistake in naming the RC version numbers, both rpm and deb view
     # "1.5.0.rc1" higher than "1.5.0". Setting the epoch to 1 ensures that we get a kind
@@ -499,4 +797,64 @@ namespace "artifact" do
       out.cleanup
     end
   end # def package
+
+  def map_architecture_for_package_type(platform, jdk_arch)
+    if jdk_arch == 'x86_64'
+      case platform
+        when "debian", "ubuntu"
+          return "amd64"
+        else
+          return "x86_64"
+      end
+    elsif jdk_arch == 'arm64'
+      case platform
+        when "debian", "ubuntu"
+          return "arm64"
+        else
+          return "aarch64"
+      end
+    else
+      raise "CPU architecture not recognized: #{jdk_arch}"
+    end
+  end
+
+  def build_docker(flavor)
+    env = {
+      "ARTIFACTS_DIR" => ::File.join(Dir.pwd, "build"),
+      "RELEASE" => ENV["RELEASE"],
+      "VERSION_QUALIFIER" => VERSION_QUALIFIER,
+      "BUILD_DATE" => BUILD_DATE,
+      "LOCAL_ARTIFACTS" => LOCAL_ARTIFACTS
+    }
+    Dir.chdir("docker") do |dir|
+      safe_system(env, "make build-from-local-#{flavor}-artifacts")
+    end
+  end
+
+  def build_docker_from_dockerfiles(flavor)
+    env = {
+      "ARTIFACTS_DIR" => ::File.join(Dir.pwd, "build"),
+      "RELEASE" => ENV["RELEASE"],
+      "VERSION_QUALIFIER" => VERSION_QUALIFIER,
+      "BUILD_DATE" => BUILD_DATE,
+      "LOCAL_ARTIFACTS" => LOCAL_ARTIFACTS
+    }
+    Dir.chdir("docker") do |dir|
+      safe_system(env, "make build-from-dockerfiles_#{flavor}")
+    end
+  end
+
+  def build_dockerfile(flavor)
+    env = {
+      "ARTIFACTS_DIR" => ::File.join(Dir.pwd, "build"),
+      "RELEASE" => ENV["RELEASE"],
+      "VERSION_QUALIFIER" => VERSION_QUALIFIER,
+      "BUILD_DATE" => BUILD_DATE,
+      "LOCAL_ARTIFACTS" => LOCAL_ARTIFACTS
+    }
+    Dir.chdir("docker") do |dir|
+      safe_system(env, "make public-dockerfiles_#{flavor}")
+      puts "Dockerfiles created in #{env['ARTIFACTS_DIR']}"
+    end
+  end
 end
diff --git a/rakelib/bootstrap.rake b/rakelib/bootstrap.rake
index 7d9c2e688..a79200283 100644
--- a/rakelib/bootstrap.rake
+++ b/rakelib/bootstrap.rake
@@ -1 +1,18 @@
-task "bootstrap" => [ "vendor:all", "compile:all" ]
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+task "bootstrap" => ["vendor:all", "compile:all"]
diff --git a/rakelib/build.rake b/rakelib/build.rake
index 45aec1f9b..79f412538 100644
--- a/rakelib/build.rake
+++ b/rakelib/build.rake
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 directory "build" do |task, args|
   mkdir_p task.name unless File.directory?(task.name)
 end
diff --git a/rakelib/childprocess_patch.rb b/rakelib/childprocess_patch.rb
deleted file mode 100644
index a62bdbc46..000000000
--- a/rakelib/childprocess_patch.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# This is a patch for childprocess and this is due to ruby-cabin/fpm interaction.
-# When we use the logger.pipe construct and the IO reach EOF we close the IO.
-# The problem Childprocess will try to flush to it and hit an IOError making the software crash in JRuby 9k.
-#
-# In JRuby 1.7.25 we hit a thread death.
-#
-module ChildProcess
-  module JRuby
-    class Pump
-      alias_method :old_pump, :pump
-
-      def ignore_close_io
-        old_pump
-      rescue IOError
-      end
-
-      alias_method :pump, :ignore_close_io
-    end
-  end
-end
diff --git a/rakelib/compile.rake b/rakelib/compile.rake
index 1935f2cba..72ec52c3c 100644
--- a/rakelib/compile.rake
+++ b/rakelib/compile.rake
@@ -1,5 +1,22 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 rule ".rb" => ".treetop" do |task, args|
+  require 'logstash/patches/polyglot'
   require "treetop"
   compiler = Treetop::Compiler::GrammarCompiler.new
   compiler.compile(task.source, task.name)
@@ -8,20 +25,15 @@ end
 
 namespace "compile" do
   desc "Compile the config grammar"
-  task "grammar" => "logstash-core/lib/logstash/config/grammar.rb"
-
-  def safe_system(*args)
-    if !system(*args)
-      status = $?
-      raise "Got exit status #{status.exitstatus} attempting to execute #{args.inspect}!"
-    end
-  end
+  task "grammar" => %w(
+    logstash-core/lib/logstash/config/grammar.rb
+    logstash-core/lib/logstash/compiler/lscl/lscl_grammar.rb
+  )
 
   task "logstash-core-java" do
-    unless File.exists?(File.join("logstash-core", "lib", "jars", "logstash-core.jar"))
-      puts("Building logstash-core using gradle")
-      safe_system("./gradlew", "assemble")
-    end
+    puts("Building logstash-core using gradle")
+    # this expansion is necessary to use the path separators of the hosting OS
+    sh(File.join(".", "gradlew"), "assemble")
   end
 
   desc "Build everything"
diff --git a/rakelib/default_plugins.rb b/rakelib/default_plugins.rb
index 433acedd4..e118545b8 100644
--- a/rakelib/default_plugins.rb
+++ b/rakelib/default_plugins.rb
@@ -1,6 +1,22 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module LogStash
   module RakeLib
-
     # @return [Array<String>] list of all plugin names as defined in the logstash-plugins github organization, minus names that matches the ALL_PLUGINS_SKIP_LIST
     def self.fetch_all_plugins
       require 'octokit'
@@ -14,13 +30,16 @@ module LogStash
     def self.is_released?(plugin)
       require 'gems'
       Gems.info(plugin) != "This rubygem could not be found."
+    rescue Gems::NotFound => e
+      puts "Could not find gem #{plugin}"
+      false
     end
 
     def self.fetch_plugins_for(type)
       # Lets use the standard library here, in the context of the bootstrap the
       # logstash-core could have failed to be installed.
       require "json"
-      JSON.load(::File.read("rakelib/plugins-metadata.json")).select do |_, metadata|
+      JSON.parse(::File.read("rakelib/plugins-metadata.json")).select do |_, metadata|
         metadata[type]
       end.keys
     end
@@ -31,11 +50,9 @@ module LogStash
     # plugins required to run the logstash core specs
     CORE_SPECS_PLUGINS = self.fetch_plugins_for("core-specs").freeze
 
-    TEST_JAR_DEPENDENCIES_PLUGINS = self.fetch_plugins_for("test-jar-dependencies").freeze
-
-    TEST_VENDOR_PLUGINS = self.fetch_plugins_for("test-vendor-plugin").freeze
-
     ALL_PLUGINS_SKIP_LIST = Regexp.union(self.fetch_plugins_for("skip-list")).freeze
 
+    # default plugins will be installed and we exclude only installed plugins from OSS
+    OSS_EXCLUDED_PLUGINS = DEFAULT_PLUGINS & self.fetch_plugins_for("skip-oss")
   end
 end
diff --git a/rakelib/dependency.rake b/rakelib/dependency.rake
deleted file mode 100644
index f58617456..000000000
--- a/rakelib/dependency.rake
+++ /dev/null
@@ -1,39 +0,0 @@
-
-namespace "dependency" do
-  task "bundler" do
-    Rake::Task["gem:require"].invoke("bundler", "~> 1.17.1")
-  end
-
-  task "clamp" do
-    Rake::Task["gem:require"].invoke("clamp", "~> 0.6")
-  end
-
-  task "rbx-stdlib" do
-    Rake::Task["gem:require"].invoke("rubysl", ">= 0")
-  end # task rbx-stdlib
-
-  task "archive-tar-minitar" do
-    Rake::Task["gem:require"].invoke("minitar", "0.6.1")
-  end # task archive-minitar
-
-  task "stud" do
-    Rake::Task["gem:require"].invoke("stud", ">= 0")
-  end # task stud
-
-  task "fpm" do
-    Rake::Task["gem:require"].invoke("fpm", "~> 1.3.3")
-  end # task stud
-
-  task "rubyzip" do
-    Rake::Task["gem:require"].invoke("rubyzip", ">= 0")
-  end # task stud
-
-  task "octokit" do
-    Rake::Task["gem:require"].invoke("octokit", ">= 0")
-  end # task octokit
-
-  task "gems" do
-    Rake::Task["gem:require"].invoke("gems", ">= 0")
-  end # task gems
-
-end # namespace dependency
diff --git a/rakelib/docs.rake b/rakelib/docs.rake
index 6bd37d402..8971f30c2 100644
--- a/rakelib/docs.rake
+++ b/rakelib/docs.rake
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "fileutils"
 
 DEFAULT_DOC_DIRECTORY = ::File.join(::File.dirname(__FILE__), "..", "build", "docs")
diff --git a/rakelib/gems.rake b/rakelib/gems.rake
index b5761f0db..0edf097ed 100644
--- a/rakelib/gems.rake
+++ b/rakelib/gems.rake
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "rubygems/specification"
 require "rubygems/commands/install_command"
 
@@ -18,7 +35,7 @@ namespace "gem" do
     task.reenable # Allow this task to be run again
   end
 
-  task "install", [:name, :requirement, :target] =>  ["build/bootstrap"] do |task, args|
+  task "install", [:name, :requirement, :target] => ["build/bootstrap"] do |task, args|
     name, requirement, target = args[:name], args[:requirement], args[:target]
 
     ENV["GEM_HOME"] = ENV["GEM_PATH"] = target
diff --git a/rakelib/lint.rake b/rakelib/lint.rake
new file mode 100644
index 000000000..f8d5eea08
--- /dev/null
+++ b/rakelib/lint.rake
@@ -0,0 +1,67 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+namespace "lint" do
+  module RuboCLI
+    def self.run!(*args)
+      require "rubocop"
+      cli = RuboCop::CLI.new
+      result = cli.run(["--force-exclusion", *args])
+      raise "Linting failed." if result.nonzero?
+    end
+  end
+
+  desc "Report all Lint Cops. Optional: Specify one or more files"
+  task :report, [:file] do |t, args|
+    files = [args[:file], *args.extras].compact
+
+    if files.empty?
+      RuboCLI.run!("--lint")
+    else
+      puts "Running lint report on specific files: #{files.join(', ')}"
+      RuboCLI.run!("--lint", *files)
+    end
+  end
+
+  # Tasks automatically fixes a Cop passed as a parameter
+  desc "Automatically fix all instances of a Cop passed as a parameter. Optional: Specify one or more files"
+  task :correct, [:cop] do |t, args|
+    if args[:cop].to_s.empty?
+      puts "No Cop has been provided, aborting..."
+      exit(0)
+    else
+      files = args.extras
+      if files.empty?
+        puts "Attempting to correct Lint issues for: #{args[:cop]}"
+        RuboCLI.run!("--autocorrect-all", "--only", args[:cop])
+      else
+        puts "Attempting to correct Lint issues for #{args[:cop]} in files: #{files.join(', ')}"
+        RuboCLI.run!("--autocorrect-all", "--only", args[:cop], *files)
+      end
+    end
+  end
+
+  desc "Automatically fix Layout Cops. Optional: Specify one or more files"
+  task :format, [:file] do |t, args|
+    files = [args[:file], *args.extras].compact
+    if files.empty?
+      RuboCLI.run!("--fix-layout")
+    else
+      puts "Running format fixes on specific files: #{files.join(', ')}"
+      RuboCLI.run!("--fix-layout", *files)
+    end
+  end
+end
\ No newline at end of file
diff --git a/rakelib/modules.rake b/rakelib/modules.rake
deleted file mode 100644
index e90818524..000000000
--- a/rakelib/modules.rake
+++ /dev/null
@@ -1,81 +0,0 @@
-namespace "modules" do
-
-  def unpacker(src_file, dest_dir)
-    puts "Reading #{src_file}"
-    array = JSON.load(IO.read(src_file))
-
-    if !array.is_a?(Array)
-      raise "#{src_file} does not contain a JSON array as the first object"
-    end
-
-    array.each do |hash|
-      values = hash.values_at("_id", "_type", "_source")
-      if values.any?(&:nil?)
-        puts "#{src_file} contains a JSON object that does not have _id, _type and _source fields"
-        next
-      end
-      id, subfolder, source = values
-      filename = "#{id}.json"
-
-      partial_path = ::File.join(dest_dir, subfolder)
-      FileUtils.mkdir_p(partial_path)
-
-      full_path = ::File.join(partial_path, filename)
-      FileUtils.rm_f(full_path)
-
-      content = JSON.pretty_generate(source) + "\n"
-      puts "Writing #{full_path}"
-      IO.write(full_path, content)
-    end
-  end
-
-  def collector(dashboard_dir, module_name)
-    file_paths = Dir.glob(::File.join(dashboard_dir, "*.json"))
-
-    filenames = file_paths.map do |file_path|
-      filename = File.basename(file_path, ".json")
-      next if filename == module_name
-      puts "Adding #{filename}"
-      filename
-    end.compact
-
-    full_path = ::File.join(dashboard_dir, "#{module_name}.json")
-    FileUtils.rm_f(full_path)
-
-    content = JSON.pretty_generate(filenames) + "\n"
-    puts "Writing #{full_path}"
-    IO.write(full_path, content)
-  end
-
-  desc "Unpack kibana resources in a JSON array to individual files"
-  task "unpack", :src_file, :dest_dir do |task, args|
-    unpacker(args[:src_file], args[:dest_dir])
-    puts "Done"
-  end
-
-  desc "Collect all dashboards filenames into the module dashboard structure e.g. dashboard/cef.json"
-  task "make_dashboard_json", :dashboard_dir, :module_name do |task, args|
-    collector(args[:dashboard_dir], args[:module_name])
-    puts "Done"
-  end
-
-  desc "Unpack all kibana resources from a folder of JSON files."
-  # from Kibana / saved objects -> export all
-  # rake modules:unpack_all[my_module,/User/me/Downloads/my_module,/User/me/workspace/logstash/modules/my_module/6.x/configuration/kibana]
-  # Note - you can not currently export index-patterns from the UI, see: https://github.com/elastic/kibana/issues/4288
-  # To get the index-pattern, you need to pull from the .kibana index and manually update
-  # curl -XGET 'https://<user>:<password>@<es-host>:<es-port>/.kibana/_search?q=type:index-pattern&size=100&pretty' -o idx-patterns.json
-  task "unpack_all", :module_name, :kibana_source_dir, :dest_dir do |task, args|
-    module_name = args[:module_name]
-    kibana_source_dir = args[:kibana_source_dir]
-    dest_dir = args[:dest_dir]
-
-    Dir.glob(::File.join(kibana_source_dir, "*.json")).each do |file_path|
-      unpacker(file_path, dest_dir)
-    end
-    dashboard_dir = ::File.join(dest_dir, "dashboard")
-    collector(dashboard_dir, module_name)
-
-    puts "Done"
-  end
-end
diff --git a/rakelib/package.rake b/rakelib/package.rake
deleted file mode 100644
index 531a160fd..000000000
--- a/rakelib/package.rake
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace "package" do
-
-  task "bundle" do
-    system("bin/logstash-plugin", "pack")
-    raise(RuntimeError, $!.to_s) unless $?.success?
-  end
-
-  desc "Build a package with the default plugins, including dependencies, to be installed offline"
-  task "plugins-default" => ["test:install-default", "bundle"]
-end
diff --git a/rakelib/plugin.rake b/rakelib/plugin.rake
index f860dff27..a41c8fa1e 100644
--- a/rakelib/plugin.rake
+++ b/rakelib/plugin.rake
@@ -1,16 +1,50 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "default_plugins"
 require 'rubygems'
 
 namespace "plugin" do
-
   def install_plugins(*args)
     require_relative "../lib/pluginmanager/main"
     LogStash::PluginManager::Main.run("bin/logstash-plugin", ["install"] + args)
   end
 
-  task "install-development-dependencies" => "bootstrap" do
-    puts("[plugin:install-development-dependencies] Installing development dependencies of all installed plugins")
+  def remove_plugin(plugin, *more_plugins)
+    require_relative "../lib/pluginmanager/main"
+    LogStash::PluginManager::Main.run("bin/logstash-plugin", ["remove", plugin] + more_plugins)
+  end
+
+  task "install-base" => "bootstrap" do
+    puts("[plugin:install-base] Installing base dependencies")
     install_plugins("--development",  "--preserve")
+    task.reenable # Allow this task to be run again
+  end
+
+  def remove_lockfile
+    if ::File.exist?(LogStash::Environment::LOCKFILE)
+      ::File.delete(LogStash::Environment::LOCKFILE)
+    end
+  end
+
+  task "install-development-dependencies" => "bootstrap" do
+    puts("[plugin:install-development-dependencies] Installing development dependencies")
+    install_plugins("--development",  "--preserve")
+    install_plugins("--preserve", *LogStash::RakeLib::CORE_SPECS_PLUGINS)
 
     task.reenable # Allow this task to be run again
   end
@@ -25,22 +59,22 @@ namespace "plugin" do
 
   task "install-default" => "bootstrap" do
     puts("[plugin:install-default] Installing default plugins")
+
+    remove_lockfile # because we want to use the release lockfile
     install_plugins("--no-verify", "--preserve", *LogStash::RakeLib::DEFAULT_PLUGINS)
 
     task.reenable # Allow this task to be run again
   end
 
-  task "install-core" => "bootstrap" do
-    puts("[plugin:install-core] Installing core plugins")
-    install_plugins("--no-verify", "--preserve", *LogStash::RakeLib::CORE_SPECS_PLUGINS)
-
-    task.reenable # Allow this task to be run again
-  end
-
-  task "install-jar-dependencies" => "bootstrap" do
-    puts("[plugin:install-jar-dependencies] Installing jar_dependencies plugins for testing")
-    install_plugins("--no-verify", "--preserve", *LogStash::RakeLib::TEST_JAR_DEPENDENCIES_PLUGINS)
+  task "remove-non-oss-plugins" do |task, _|
+    puts("[plugin:remove-non-oss-plugins] Removing non-OSS plugins")
 
+    LogStash::RakeLib::OSS_EXCLUDED_PLUGINS.each do |plugin|
+      remove_plugin(plugin)
+      # gem folder and spec file still stay after removing the plugin
+      FileUtils.rm_r(Dir.glob("#{LogStash::Environment::BUNDLE_DIR}/**/gems/#{plugin}*"))
+      FileUtils.rm_r(Dir.glob("#{LogStash::Environment::BUNDLE_DIR}/**/specifications/#{plugin}*.gemspec"))
+    end
     task.reenable # Allow this task to be run again
   end
 
@@ -87,5 +121,4 @@ namespace "plugin" do
 
     task.reenable # Allow this task to be run again
   end
-
 end # namespace "plugin"
diff --git a/rakelib/plugins-metadata.json b/rakelib/plugins-metadata.json
index 467481c57..4684f3996 100644
--- a/rakelib/plugins-metadata.json
+++ b/rakelib/plugins-metadata.json
@@ -1,849 +1,580 @@
 {
-	"logstash-input-heartbeat": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-dead_letter_queue": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-codec-collectd": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": true,
-		"skip-list": false
-	},
-	"logstash-codec-dots": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-codec-edn": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-codec-edn_lines": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-codec-fluent": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-codec-es_bulk": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-codec-graphite": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-codec-json": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-codec-json_lines": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-codec-line": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-codec-msgpack": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-codec-multiline": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-codec-netflow": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-codec-plain": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-codec-rubydebug": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-clone": {
-		"default-plugins": true,
-		"core-specs": true,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-cidr": {
-		"default-plugins": true,
-		"core-specs": true,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-csv": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-date": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-dissect": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-dns": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-drop": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-fingerprint": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-geoip": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-grok": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-http": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-json": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-kv": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-memcached": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-metrics": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-mutate": {
-		"default-plugins": true,
-		"core-specs": true,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-ruby": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-sleep": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-split": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-syslog_pri": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-throttle": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-translate": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-urldecode": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-useragent": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-xml": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-azure_event_hubs": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-elasticsearch": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-exec": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-file": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-ganglia": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-gelf": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-generator": {
-		"default-plugins": true,
-		"core-specs": true,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-graphite": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-http": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-http_poller": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-imap": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-jdbc": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-input-pipe": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-rabbitmq": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-redis": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-s3": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-snmp": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-snmptrap": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-sqs": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-stdin": {
-		"default-plugins": true,
-		"core-specs": true,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-syslog": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-tcp": {
-		"default-plugins": true,
-		"core-specs": true,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-twitter": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-udp": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-unix": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-kafka": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": true,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-input-beats": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-elastic_app_search": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-cloudwatch": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-csv": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-elasticsearch": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-file": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-graphite": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-http": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-kafka": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-nagios": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-null": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-pagerduty": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-pipe": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-rabbitmq": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-redis": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-s3": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-sns": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-sqs": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-stdout": {
-		"default-plugins": true,
-		"core-specs": true,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-tcp": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-udp": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-webhdfs": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-filter-multiline": {
-		"default-plugins": false,
-		"core-specs": true,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-yaml": {
-		"default-plugins": false,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-input-example": {
-		"default-plugins": false,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-codec-example": {
-		"default-plugins": false,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-filter-example": {
-		"default-plugins": false,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-output-example": {
-		"default-plugins": false,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-input-drupal_dblog": {
-		"default-plugins": false,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-output-logentries": {
-		"default-plugins": false,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-output-newrelic": {
-		"default-plugins": false,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-output-slack": {
-		"default-plugins": false,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-input-neo4j": {
-		"default-plugins": false,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-output-neo4j": {
-		"default-plugins": false,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-input-perfmon": {
-		"default-plugins": false,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-input-rackspace": {
-		"default-plugins": false,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-output-rackspace": {
-		"default-plugins": false,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-input-dynamodb": {
-		"default-plugins": false,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-filter-language": {
-		"default-plugins": false,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-input-heroku": {
-		"default-plugins": false,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-output-google_cloud_storage": {
-		"default-plugins": false,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-input-journald": {
-		"default-plugins": false,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-input-log4j2": {
-		"default-plugins": false,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": true
-	},
-	"logstash-codec-cloudtrail": {
-		"default-plugins": false,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-aggregate": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-anonymize": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-de_dot": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-elasticsearch": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-jdbc_static": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-jdbc_streaming": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-filter-truncate": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-email": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	},
-	"logstash-output-lumberjack": {
-		"default-plugins": true,
-		"core-specs": false,
-		"test-jar-dependencies": false,
-		"test-vendor-plugins": false,
-		"skip-list": false
-	}
+  "logstash-codec-avro": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-codec-cef": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-codec-collectd": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-codec-dots": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-codec-edn": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-codec-edn_lines": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-codec-es_bulk": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-codec-example": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-codec-fluent": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-codec-graphite": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-codec-java_codec_example": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-codec-json": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-codec-json_lines": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-codec-line": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-codec-msgpack": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-codec-multiline": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-codec-netflow": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-codec-plain": {
+    "default-plugins": true,
+    "core-specs": true,
+    "skip-list": false
+  },
+  "logstash-codec-rubydebug": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-aggregate": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-anonymize": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-cidr": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-clone": {
+    "default-plugins": true,
+    "core-specs": true,
+    "skip-list": false
+  },
+  "logstash-filter-csv": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-date": {
+    "default-plugins": true,
+    "core-specs": true,
+    "skip-list": false
+  },
+  "logstash-filter-de_dot": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-dissect": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-dns": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-drop": {
+    "default-plugins": true,
+    "core-specs": true,
+    "skip-list": false
+  },
+  "logstash-filter-elastic_integration": {
+    "default-plugins": true,
+    "skip-list": false,
+    "skip-oss": true
+  },
+  "logstash-filter-elasticsearch": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-example": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-filter-fingerprint": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-geoip": {
+    "default-plugins": true,
+    "core-specs": true,
+    "skip-list": false
+  },
+  "logstash-filter-grok": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-http": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-java_filter_example": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-filter-jdbc_static": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-filter-jdbc_streaming": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-filter-json": {
+    "default-plugins": true,
+    "core-specs": true,
+    "skip-list": false
+  },
+  "logstash-filter-kv": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-language": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-filter-memcached": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-metrics": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-mutate": {
+    "default-plugins": true,
+    "core-specs": true,
+    "skip-list": false
+  },
+  "logstash-filter-prune": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-ruby": {
+    "default-plugins": true,
+    "core-specs": true,
+    "skip-list": false
+  },
+  "logstash-filter-sleep": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-split": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-syslog_pri": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-throttle": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-translate": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-truncate": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-urldecode": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-useragent": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-uuid": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-filter-xml": {
+    "default-plugins": true,
+    "core-specs": true,
+    "skip-list": false
+  },
+  "logstash-filter-yaml": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-input-azure_event_hubs": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-input-beats": {
+    "default-plugins": true,
+    "core-specs": true,
+    "skip-list": false
+  },
+  "logstash-input-couchdb_changes": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-input-dead_letter_queue": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-input-drupal_dblog": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-input-dynamodb": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-input-elasticsearch": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-input-example": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-input-exec": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-input-file": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-input-ganglia": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-input-gelf": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-input-generator": {
+    "default-plugins": true,
+    "core-specs": true,
+    "skip-list": false
+  },
+  "logstash-input-graphite": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-input-heartbeat": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-input-heroku": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-input-http": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-input-http_poller": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-input-imap": {
+    "default-plugins": false,
+    "skip-list": false
+  },
+  "logstash-input-java_input_example": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-input-jdbc": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-input-jms": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-input-journald": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-input-kafka": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-input-log4j2": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-input-neo4j": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-input-perfmon": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-input-pipe": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-input-rabbitmq": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-input-rackspace": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-input-redis": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-input-s3": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-input-snmp": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-input-snmptrap": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-input-sqs": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-input-stdin": {
+    "default-plugins": true,
+    "core-specs": true,
+    "skip-list": false
+  },
+  "logstash-input-syslog": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-input-tcp": {
+    "default-plugins": true,
+    "core-specs": true,
+    "skip-list": false
+  },
+  "logstash-input-twitter": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-input-udp": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-input-unix": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-integration-elastic_enterprise_search": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-input-elastic_serverless_forwarder": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-integration-jdbc": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-integration-kafka": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-integration-logstash": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-integration-rabbitmq": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-integration-snmp": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-integration-aws": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-integration-internal": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-integration-zeromq": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-input-cloudwatch": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-output-cloudwatch": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-output-csv": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-output-elastic_app_search": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-output-elasticsearch": {
+    "default-plugins": true,
+    "core-specs": true,
+    "skip-list": false
+  },
+  "logstash-output-email": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-output-example": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-output-file": {
+    "default-plugins": true,
+    "core-specs": true,
+    "skip-list": false
+  },
+  "logstash-output-google_cloud_storage": {
+    "default-plugins": false,
+    "skip-list": false
+  },
+  "logstash-output-graphite": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-output-http": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-output-java_output_example": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-output-kafka": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-output-logentries": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-output-lumberjack": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-output-nagios": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-output-neo4j": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-output-newrelic": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-output-null": {
+    "default-plugins": true,
+    "core-specs": true,
+    "skip-list": false
+  },
+  "logstash-output-pipe": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-output-rabbitmq": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-output-rackspace": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-output-redis": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-output-s3": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-output-slack": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-output-sns": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-output-sqs": {
+    "default-plugins": false,
+    "skip-list": true
+  },
+  "logstash-output-stdout": {
+    "default-plugins": true,
+    "core-specs": true,
+    "skip-list": false
+  },
+  "logstash-output-tcp": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-output-udp": {
+    "default-plugins": true,
+    "skip-list": false
+  },
+  "logstash-output-webhdfs": {
+    "default-plugins": true,
+    "skip-list": false
+  }
 }
diff --git a/rakelib/plugins_docs_dependencies.rake b/rakelib/plugins_docs_dependencies.rake
index 03db3ed8c..1e766dcdd 100644
--- a/rakelib/plugins_docs_dependencies.rake
+++ b/rakelib/plugins_docs_dependencies.rake
@@ -1,6 +1,35 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'json'
+
 class PluginVersionWorking
   EXPORT_FILE = ::File.expand_path(::File.join(::File.dirname(__FILE__), "..", "plugins_version_docs.json"))
+  PLUGIN_METADATA = JSON.parse(IO.read(::File.expand_path(::File.join(::File.dirname(__FILE__), "plugins-metadata.json"))))
+
+  PLUGIN_PACKAGE_TYPES = %w(
+    input
+    output
+    codec
+    filter
+    integration
+  ).freeze
+
+  PLUGIN_PACKAGE_NAME_PATTERN = %r{^logstash-#{Regexp::union(PLUGIN_PACKAGE_TYPES)}-}
 
   # Simple class to make sure we get the right version for the document
   # since we will record multiple versions for one plugin
@@ -50,7 +79,6 @@ class PluginVersionWorking
     end
   end
 
-
   # We us a brute force strategy to get the highest version possible for all the community plugins.
   # We take each plugin and we add it to the current dependencies and we try to resolve the tree, if it work we
   # record the version installed.
@@ -80,14 +108,7 @@ class PluginVersionWorking
 
     plugins_to_install.each do |plugin|
       begin
-        builder = Bundler::Dsl.new
-        gemfile = LogStash::Gemfile.new(File.new(LogStash::Environment::GEMFILE_PATH, "r+")).load
-        gemfile.update(plugin)
-
-        builder.eval_gemfile("bundler file", gemfile.generate())
-        definition = builder.to_definition(LogStash::Environment::LOCKFILE, {})
-        definition.resolve_remotely!
-        extract_versions(definition, successful_dependencies, :missing)
+        try_plugin(plugin, successful_dependencies)
         puts "Successfully installed: #{plugin}"
       rescue => e
         puts "Failed to install: #{plugin}"
@@ -103,13 +124,25 @@ class PluginVersionWorking
     puts "Failures: #{failures.size}/#{total}"
   end
 
+  def try_plugin(plugin, successful_dependencies)
+    builder = Bundler::Dsl.new
+    gemfile = LogStash::Gemfile.new(File.new(LogStash::Environment::GEMFILE_PATH, "r+")).load
+    gemfile.update(plugin)
+
+    builder.eval_gemfile("bundler file", gemfile.generate())
+    definition = builder.to_definition(LogStash::Environment::LOCKFILE, {})
+    definition.resolve_remotely!
+    from = PLUGIN_METADATA.fetch(plugin, {}).fetch("default-plugins", false) ? :default : :missing
+    extract_versions(definition, successful_dependencies, from)
+  end
+
   def extract_versions(definition, dependencies, from)
     #definition.specs.select { |spec| spec.metadata && spec.metadata["logstash_plugin"] == "true" }.each do |spec|
     #
     # Bundler doesn't seem to provide us with `spec.metadata` for remotely
     # discovered plugins (via rubygems.org api), so we have to choose by
     # a name pattern instead of by checking spec.metadata["logstash_plugin"]
-    definition.specs.select { |spec| spec.name =~ /^logstash-(input|filter|output|codec)-/ }.each do |spec|
+    definition.resolve.select { |spec| spec.name =~ PLUGIN_PACKAGE_NAME_PATTERN }.each do |spec|
       dependencies[spec.name] ||= []
       dependencies[spec.name] << VersionDependencies.new(spec.version, from)
     end
@@ -131,5 +164,60 @@ task :generate_plugins_version do
   require "pluginmanager/gemfile"
   require "bootstrap/environment"
 
+  # This patch comes after an investigation of `generate_plugins_version`
+  # causing OOM during `./gradlew generatePluginsVersion`.
+  # Why does this patch fix the issue? Hang on, this is going to be wild ride:
+  # In this rake task we compute a manifest that tells us, for each logstash plugin,
+  # what is the latest version that can be installed.
+  # We do this by (again for each plugin):
+  # * adding the plugin to the current Gemfile
+  # * instantiate a `Bundler::Dsl` instance with said Gemfile
+  # * retrieve a Bundler::Definition by passing in the Gemfile.lock
+  # * call `definition.resolve_remotely!
+  #
+  # Now, these repeated calls to `resolve_remotely!` on new instances of Definitions
+  # cause the out of memory. Resolving remote dependencies uses Bundler::Worker instances
+  # who trap the SIGINT signal in their `initializer` [1]. This shared helper method creates a closure that is
+  # passed to `Signal.trap`, and capture the return [2], which is the previous proc (signal handler).
+  # Since the variable that stores the return from `Signal.trap` is present in the binding, multiple calls
+  # to this helper cause each new closures to reference the previous one. The size of each binding
+  # accumulates and OOM occurs after 70-100 iterations.
+  # This is easy to replicate by looping over `Bundler::SharedHelpers.trap("INT") { 1 }`.
+  #
+  # This workaround removes the capture of the previous binding. Not calling all the previous handlers
+  # may cause some threads to not be cleaned up, but this rake task has a short life so everything
+  # ends up being cleaned up on exit anyway.
+  # We're confining this patch to this task only as this is the only place where we need to resolve
+  # dependencies many many times.
+  #
+  # You're still here? You're awesome :) Thanks for reading!
+  #
+  # [1] https://github.com/bundler/bundler/blob/d9d75807196b91f454de48d5afd0c43b395243a3/lib/bundler/worker.rb#L29
+  # [2] https://github.com/bundler/bundler/blob/d9d75807196b91f454de48d5afd0c43b395243a3/lib/bundler/shared_helpers.rb#L173
+  module ::Bundler
+    module SharedHelpers
+      def trap(signal, override = false, &block)
+        Signal.trap(signal) do
+          block.call
+        end
+      end
+    end
+
+    Fetcher::CompactIndex.class_eval do
+      alias_method :__bundle_worker, :bundle_worker
+      # The compact index is built using multiple threads and this is hard-coded atm to 25 threads:
+      #   `Bundler::Worker.new(Bundler.current_ruby.rbx? ? 1 : 25, worker_name, func)`
+      # each thread might built up a Bundler::Source::Rubygems object which retains more than 100MB.
+      # By limiting the worker thread count we make sure not to produce too many of these objects.
+      def bundle_worker(func = nil)
+        __bundle_worker(func).tap do |worker|
+          size = worker.instance_variable_get(:@size)
+          fail("@size = #{size.inspect} is no longer an integer") unless size.is_a?(Integer)
+          worker.instance_variable_set(:@size, 2)
+        end
+      end
+    end
+  end
+
   PluginVersionWorking.new.generate
-end
\ No newline at end of file
+end
diff --git a/rakelib/test.rake b/rakelib/test.rake
index a3260fb65..7fe666fb3 100644
--- a/rakelib/test.rake
+++ b/rakelib/test.rake
@@ -1,11 +1,26 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # we need to call exit explicitly  in order to set the proper exit code, otherwise
 # most common CI systems can not know whats up with this tests.
 
-require "pluginmanager/util"
 require 'pathname'
 
 namespace "test" do
-
   desc "run the java unit tests"
   task "core-java" do
     exit(1) unless system('./gradlew clean javaTests')
@@ -23,7 +38,7 @@ namespace "test" do
 
   desc "run all core specs"
   task "core" => ["core-slow"]
-  
+
   def default_spec_command
     ["bin/rspec", "-fd", "--pattern", "spec/unit/**/*_spec.rb,logstash-core/spec/**/*_spec.rb"]
   end
@@ -39,8 +54,12 @@ namespace "test" do
   end
 
   desc "run all installed plugins specs"
-  task "plugins"  => "bootstrap" do
+  task "plugins" => "bootstrap" do
     plugins_to_exclude = ENV.fetch("EXCLUDE_PLUGIN", "").split(",")
+    # the module LogStash::PluginManager requires the file `lib/pluginmanager/plugin_aliases.yml`,
+    # that file is created during the bootstrap task
+    require "pluginmanager/util"
+
     # grab all spec files using the live plugins gem specs. this allows correctly also running the specs
     # of a local plugin dir added using the Gemfile :path option. before this, any local plugin spec would
     # not be run because they were not under the vendor/bundle/jruby/2.0/gems path
@@ -58,17 +77,11 @@ namespace "test" do
     exit 1 unless system(*(["bin/rspec", "-fd", "--order", "rand"].concat(test_files)))
   end
 
-  desc "install core plugins and dev dependencies"
-  task "install-core" => ["bootstrap", "plugin:install-core", "plugin:install-development-dependencies"]
+  desc "install dev dependencies"
+  task "install-core" => ["bootstrap", "plugin:install-development-dependencies"]
 
   desc "install default plugins and dev dependencies"
   task "install-default" => ["bootstrap", "plugin:install-default", "plugin:install-development-dependencies"]
-
-  desc "install vendor plugins and dev dependencies"
-  task "install-vendor-plugins" => ["bootstrap", "plugin:install-vendor", "plugin:install-development-dependencies"]
-
-  desc "install jar dependencies and dev dependencies"
-  task "install-jar-dependencies-plugins" => ["bootstrap", "plugin:install-jar-dependencies", "plugin:install-development-dependencies"]
 end
 
-task "test" => [ "test:core" ]
+task "test" => ["test:core"]
diff --git a/rakelib/vendor.rake b/rakelib/vendor.rake
index 842640b70..d111ec4ed 100644
--- a/rakelib/vendor.rake
+++ b/rakelib/vendor.rake
@@ -1,10 +1,23 @@
-namespace "vendor" do
-  def vendor(*args)
-    return File.join("vendor", *args)
-  end
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
+namespace "vendor" do
   task "jruby" do |task, args|
-    system('./gradlew downloadAndInstallJRuby') unless File.exists?(File.join("vendor", "jruby"))
+    system('./gradlew bootstrap') unless File.exist?(File.join("vendor", "jruby"))
   end # jruby
 
   namespace "force" do
@@ -14,18 +27,19 @@ namespace "vendor" do
   task "gems", [:bundle] do |task, args|
     require "bootstrap/environment"
 
-    Rake::Task["dependency:clamp"].invoke
-    Rake::Task["dependency:bundler"].invoke
-
-    puts("Invoking bundler install...")
-    output, exception = LogStash::Bundler.invoke!(:install => true)
-    puts(output)
-    raise(exception) if exception
+    if File.exist?(LogStash::Environment::LOCKFILE) # gradlew already bootstrap-ed
+      puts("Skipping bundler install...")
+    else
+      puts("Invoking bundler install...")
+      output, exception = LogStash::Bundler.invoke!(:install => true)
+      puts(output)
+      raise(exception) if exception
+    end
   end # task gems
   task "all" => "gems"
 
   desc "Clean the vendored files"
   task :clean do
-    rm_rf(vendor)
+    rm_rf('vendor')
   end
 end
diff --git a/rakelib/version.rake b/rakelib/version.rake
index 6a5396d0f..72de1af05 100644
--- a/rakelib/version.rake
+++ b/rakelib/version.rake
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'yaml'
 
 VERSION_FILE = "versions.yml"
@@ -22,6 +39,22 @@ def update_version_file(old_version, new_version)
   IO.write(VERSION_FILE, versions_as_text)
 end
 
+def update_lock_release_file(old_version, new_version)
+  lock_file = Dir.glob('Gemfile*.lock.release').first
+  unless lock_file
+    warn "Gemfile*.lock.release missing - skipping version update"
+    return
+  end
+  old_version = old_version['logstash-core']
+  new_version = new_version['logstash-core']
+  versions_as_text = IO.read(lock_file)
+  #      logstash-core (= 7.16.0)
+  versions_as_text.sub!(/logstash-core \(=\s?(#{old_version})\)/) { |m| m.sub(old_version, new_version) }
+  #    logstash-core (7.16.0-java)
+  versions_as_text.sub!(/logstash-core \((#{old_version})-java\)/) { |m| m.sub(old_version, new_version) }
+  IO.write(lock_file, versions_as_text)
+end
+
 def update_index_shared1(new_version)
   index_shared1 = IO.read(INDEX_SHARED1_FILE)
   old_version = index_shared1.match(':logstash_version:\s+(?<logstash_version>\d[.]\d[.]\d.*)')[:logstash_version]
@@ -61,6 +94,7 @@ namespace :version do
     old_version = YAML.safe_load(File.read(VERSION_FILE))
     update_readme(old_version, new_version)
     update_version_file(old_version, new_version)
+    update_lock_release_file(old_version, new_version)
   end
 
   desc "set stack version referenced in docs"
@@ -87,5 +121,4 @@ namespace :version do
       abort("Invalid version argument: \"#{args[:version]}\". Aborting...")
     end
   end
-
 end
diff --git a/rakelib/z_rubycheck.rake b/rakelib/z_rubycheck.rake
index be782fde6..b8c7f03d1 100644
--- a/rakelib/z_rubycheck.rake
+++ b/rakelib/z_rubycheck.rake
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 if ENV['USE_RUBY'] != '1'
   if RUBY_ENGINE != "jruby" or Gem.ruby !~ /vendor\/jruby\/bin\/jruby/
     puts "Restarting myself under Vendored JRuby (currently #{RUBY_ENGINE} #{RUBY_VERSION})" if ENV['DEBUG']
@@ -12,7 +29,7 @@ if ENV['USE_RUBY'] != '1'
 
     # Ignore Environment JAVA_OPTS
     ENV["JAVA_OPTS"] = ""
-    exec(jruby, "-J-Xmx1g", "-S", rake, *ARGV)
+    exec(jruby, "-S", rake, *ARGV)
   end
 end
 
diff --git a/rubyUtils.gradle b/rubyUtils.gradle
new file mode 100644
index 000000000..38633390f
--- /dev/null
+++ b/rubyUtils.gradle
@@ -0,0 +1,434 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.yaml:snakeyaml:${snakeYamlVersion}"
+        classpath "de.undercouch:gradle-download-task:4.0.4"
+        classpath "org.jruby:jruby-core:9.4.9.0"
+    }
+}
+
+import de.undercouch.gradle.tasks.download.Download
+import de.undercouch.gradle.tasks.download.Verify
+import org.yaml.snakeyaml.Yaml
+
+
+import org.jruby.Ruby
+import org.jruby.embed.PathType
+import org.jruby.embed.ScriptingContainer
+
+import java.lang.annotation.Annotation
+import java.nio.file.Files
+import java.nio.file.Paths
+
+
+ext {
+    bundle = this.&bundle
+    bundleWithEnv = this.&bundleWithEnv
+    bundleQAGems = this.&bundleQAGems
+    gem = this.&gem
+    buildGem = this.&buildGem
+    rake = this.&rake
+    setupJruby = this.&setupJruby
+    generateRubySupportFilesForPlugin = this.&generateRubySupportFilesForPlugin
+    validatePluginJar = this.&validatePluginJar
+    versionMap = new HashMap()
+    pluginInfo = new PluginInfo()
+}
+
+
+/**
+ * Executes a bundler bin script with given parameters.
+ * @param projectDir Gradle projectDir
+ * @param buildDir Gradle buildDir
+ * @param pwd Current worker directory to execute in
+ * @param bundleBin Bundler Bin Script
+ * @param args CLI Args to Use with Bundler
+ */
+void bundle(File projectDir, File buildDir, String pwd, String bundleBin, Iterable<String> args) {
+    bundleWithEnv(projectDir, buildDir, pwd, bundleBin, args, Collections.emptyMap())
+}
+
+/**
+ * Executes a bundler bin script with given parameters.
+ * @param projectDir Gradle projectDir
+ * @param buildDir Gradle buildDir
+ * @param pwd Current worker directory to execute in
+ * @param bundleBin Bundler Bin Script
+ * @param args CLI Args to Use with Bundler
+ * @param env Environment Variables to Set
+ */
+void bundleWithEnv(File projectDir, File buildDir, String pwd, String bundleBin, Iterable<String> args, Map<String, String> env) {
+    executeJruby projectDir, buildDir, { ScriptingContainer jruby ->
+        jruby.environment.putAll(env)
+        jruby.currentDirectory = pwd
+        jruby.argv = args.toList().toArray()
+        jruby.runScriptlet(PathType.ABSOLUTE, bundleBin)
+    }
+}
+
+void bundleQAGems(File projectDir, String qaBuildPath) {
+    def jruby = new ScriptingContainer()
+    jruby.setLoadPaths(["${projectDir}/vendor/jruby/lib/ruby/stdlib".toString()])
+    try {
+        jruby.currentDirectory = qaBuildPath
+        jruby.runScriptlet("""
+                require "bundler"
+                require "bundler/cli"
+                Bundler::CLI.start(['install', '--path', "${qaBuildPath}/vendor", '--gemfile', "${projectDir}/qa/integration/Gemfile"])
+                """)
+    } finally {
+        jruby.terminate()
+        Ruby.clearGlobalRuntime()
+    }
+}
+
+/**
+ * Installs a Gem with the given version to the given path.
+ * @param projectDir Gradle projectDir
+ * @param buildDir Gradle buildDir
+ * @param gem Gem Name
+ * @param version Version to Install
+ * @param path Path to Install to
+ */
+void gem(File projectDir, File buildDir, String gem, String version, String path) {
+    executeJruby projectDir, buildDir, { ScriptingContainer jruby ->
+        jruby.currentDirectory = projectDir
+        jruby.runScriptlet("""
+                require 'rubygems/commands/install_command'
+                cmd = Gem::Commands::InstallCommand.new
+                cmd.handle_options ['--no-document', '${gem}', '-v', '${version}', '-i', '${path}']
+                begin
+                    cmd.execute
+                rescue Gem::SystemExitException => e
+                    raise e unless e.exit_code == 0
+                end
+                """
+        )
+    }
+}
+
+void buildGem(File projectDir, File buildDir, String gemspec) {
+    executeJruby projectDir, buildDir, { ScriptingContainer jruby ->
+        jruby.currentDirectory = projectDir
+        jruby.runScriptlet("""
+                require 'rubygems/commands/build_command'
+                cmd = Gem::Commands::BuildCommand.new
+                cmd.handle_options ['${gemspec}']
+                begin
+                    cmd.execute
+                rescue Gem::SystemExitException => e
+                    raise e unless e.exit_code == 0
+                end
+                """
+        )
+    }
+}
+
+/**
+ * Executes RSpec for a given plugin.
+ * @param projectDir Gradle projectDir
+ * @param buildDir Gradle buildDir
+ * @param plugin Plugin to run specs for
+ * @param args Optional arguments to pass to the rake task
+ */
+void rake(File projectDir, File buildDir, String task, String... args) {
+    executeJruby projectDir, buildDir, { ScriptingContainer jruby ->
+        jruby.currentDirectory = projectDir
+        jruby.runScriptlet("require 'rake'; require 'time'")
+        def rakeArgs = args ? "'${args.join("','")}'" : ""
+        jruby.runScriptlet("""
+                begin
+                    rake = Rake.application
+                    rake.init
+                    rake.load_rakefile
+                    rake['${task}'].invoke(${rakeArgs})
+                rescue => e
+                    puts "Rake task error: #{e.class}: #{e.message}"
+                    puts "Backtrace: #{e.backtrace.join("\\n")}"
+                    raise e
+                end
+                """
+        )
+    }
+}
+
+void setupJruby(File projectDir, File buildDir) {
+    executeJruby projectDir, buildDir, { ScriptingContainer jruby ->
+        jruby.currentDirectory = projectDir
+        jruby.runScriptlet("require '${projectDir}/lib/bootstrap/environment'")
+        jruby.runScriptlet("LogStash::Bundler.invoke!")
+        jruby.runScriptlet("LogStash::Bundler.genericize_platform")
+    }
+}
+
+/**
+ * Executes Closure using a fresh JRuby environment, safely tearing it down afterwards.
+ * @param projectDir Gradle projectDir
+ * @param buildDir Gradle buildDir
+ * @param block Closure to run
+ */
+Object executeJruby(File projectDir, File buildDir, Closure<?> /* Object*/ block) {
+    def jruby = new ScriptingContainer()
+    def env = jruby.environment
+    def gemDir = "${projectDir}/vendor/bundle/jruby/3.1.0".toString()
+    jruby.setLoadPaths(["${projectDir}/vendor/jruby/lib/ruby/stdlib".toString()])
+    env.put "USE_RUBY", "1"
+    env.put "GEM_HOME", gemDir
+    env.put "GEM_SPEC_CACHE", "${buildDir}/cache".toString()
+    env.put "GEM_PATH", gemDir
+    try {
+        block(jruby)
+    } finally {
+        jruby.terminate()
+        Ruby.clearGlobalRuntime()
+    }
+}
+
+//===============================================================================
+// Ruby variables
+//===============================================================================
+
+def versionsPath = project.hasProperty("LOGSTASH_CORE_PATH") ? LOGSTASH_CORE_PATH + "/../versions.yml" : "${projectDir}/versions.yml"
+versionMap = (Map) (new Yaml()).load(new File("${versionsPath}").text)
+
+String jRubyURL
+String jRubyVersion
+String jRubySha1
+Boolean doChecksum
+
+if (versionMap["jruby-runtime-override"]) {
+    jRubyVersion = versionMap["jruby-runtime-override"]["version"]
+    jRubyURL = versionMap["jruby-runtime-override"]["url"]
+    doChecksum = false
+} else {
+    jRubyVersion = versionMap["jruby"]["version"]
+    jRubySha1 = versionMap["jruby"]["sha1"]
+    jRubyURL = "https://repo1.maven.org/maven2/org/jruby/jruby-dist/${jRubyVersion}/jruby-dist-${jRubyVersion}-bin.tar.gz"
+    doChecksum = true
+}
+def jrubyTarPath = "${projectDir}/vendor/_/jruby-dist-${jRubyVersion}-bin.tar.gz"
+
+def customJRubyDir = project.hasProperty("custom.jruby.path") ? project.property("custom.jruby.path") : ""
+def customJRubyVersion = customJRubyDir == "" ? "" : Files.readAllLines(Paths.get(customJRubyDir, "VERSION")).get(0).trim()
+def customJRubyTar = customJRubyDir == "" ? "" : (customJRubyDir + "/maven/jruby-dist/target/jruby-dist-${customJRubyVersion}-bin.tar.gz")
+
+tasks.register("downloadJRuby", Download) {
+    description "Download JRuby artifact from this specific URL: ${jRubyURL}"
+    src jRubyURL
+    onlyIfNewer true
+    inputs.file(versionsPath)
+    outputs.file(jrubyTarPath)
+    dest new File("${projectDir}/vendor/_", "jruby-dist-${jRubyVersion}-bin.tar.gz")
+}
+
+downloadJRuby.onlyIf { customJRubyDir == "" }
+
+tasks.register("verifyFile", Verify) {
+    dependsOn downloadJRuby
+    description "Verify the SHA1 of the download JRuby artifact"
+    inputs.file(jrubyTarPath)
+    outputs.file(jrubyTarPath)
+    src new File(jrubyTarPath)
+    algorithm 'SHA-1'
+    checksum jRubySha1
+}
+
+verifyFile.onlyIf { customJRubyDir == "" }
+verifyFile.onlyIf { doChecksum }
+
+tasks.register("buildCustomJRuby", Exec) {
+    description "Build tar.gz and .jar artifacts from JRuby source directory"
+    workingDir (customJRubyDir == "" ? "./" : customJRubyDir)
+    commandLine './mvnw', 'clean', 'install', '-Pdist', '-Pcomplete'
+    standardOutput = new ByteArrayOutputStream()
+    errorOutput = new ByteArrayOutputStream()
+    ext.output = {
+        standardOutput.toString() + errorOutput.toString()
+    }
+}
+
+buildCustomJRuby.onlyIf { customJRubyDir != "" }
+
+tasks.register("installCustomJRuby", Copy) {
+    dependsOn buildCustomJRuby
+    description "Install custom built JRuby in the vendor directory"
+    inputs.file(customJRubyTar)
+    outputs.dir("${projectDir}/vendor/jruby")
+    from tarTree(customJRubyTar == "" ? jrubyTarPath : customJRubyTar)
+    eachFile { f ->
+        f.path = f.path.replaceFirst("^jruby-${customJRubyVersion}", '')
+    }
+    includeEmptyDirs = false
+    into "${projectDir}/vendor/jruby"
+}
+
+installCustomJRuby.onlyIf { customJRubyDir != "" }
+
+tasks.register("downloadAndInstallJRuby", Copy) {
+    dependsOn=[verifyFile, installCustomJRuby]
+    description "Install JRuby in the vendor directory"
+    inputs.file(jrubyTarPath)
+    outputs.dir("${projectDir}/vendor/jruby")
+    from tarTree(downloadJRuby.dest)
+    eachFile { f ->
+        f.path = f.path.replaceFirst("^jruby-${jRubyVersion}", '')
+    }
+    exclude "**/did_you_mean-*/evaluation/**" // licensing issue https://github.com/jruby/jruby/issues/6471
+    exclude "vendor/bundle/jruby/**/gems/ruby-maven-libs-3.3.9/**/*"
+    exclude "**/lib/jni/**/**"
+
+    includeEmptyDirs = false
+    into "${projectDir}/vendor/jruby"
+}
+
+downloadAndInstallJRuby.onlyIf { customJRubyDir == "" }
+
+//===============================================================================
+// Ruby auto-gen utilities for Java plugins
+//===============================================================================
+
+class PluginInfo {
+    public String[] licenses
+    public String longDescription
+    public String[] authors
+    public String[] email
+    public String homepage
+    public String pluginType
+    public String pluginClass
+    public String pluginName
+
+    String pluginFullName() {
+        return "logstash-" + pluginType + "-" + pluginName
+    }
+}
+
+void generateRubySupportFilesForPlugin(String projectDescription, String projectGroup, String version) {
+    File gemFile = file("Gemfile")
+    gemFile.write("# AUTOGENERATED BY THE GRADLE SCRIPT. EDITS WILL BE OVERWRITTEN.\n")
+    gemFile.append("source 'https://rubygems.org'\n")
+    gemFile.append("\n")
+    gemFile.append("gemspec\n")
+    gemFile.append("\n")
+    gemFile.append("logstash_path = ENV[\"LOGSTASH_PATH\"] || \"../../logstash\"\n")
+    gemFile.append("use_logstash_source = ENV[\"LOGSTASH_SOURCE\"] && ENV[\"LOGSTASH_SOURCE\"].to_s == \"1\"\n")
+    gemFile.append("\n")
+    gemFile.append("if Dir.exist?(logstash_path) && use_logstash_source\n")
+    gemFile.append("  gem 'logstash-core', :path => \"#{logstash_path}/logstash-core\"\n")
+    gemFile.append("  gem 'logstash-core-plugin-api', :path => \"#{logstash_path}/logstash-core-plugin-api\"\n")
+    gemFile.append("end\n")
+
+    File gemspecFile = file(pluginInfo.pluginFullName() + ".gemspec")
+    gemspecFile.write("# AUTOGENERATED BY THE GRADLE SCRIPT. EDITS WILL BE OVERWRITTEN.\n")
+    gemspecFile.append("Gem::Specification.new do |s|\n")
+    gemspecFile.append("  s.name            = '" + pluginInfo.pluginFullName() + "'\n")
+    gemspecFile.append("  s.version         = ::File.read('VERSION').split('\\n').first\n")
+    gemspecFile.append("  s.licenses        = ['" + String.join("', '", pluginInfo.licenses) + "']\n")
+    gemspecFile.append("  s.summary         = '" + projectDescription + "'\n")
+    gemspecFile.append("  s.description     = '" + pluginInfo.longDescription + "'\n")
+    gemspecFile.append("  s.authors         = ['" + String.join("', '", pluginInfo.authors) + "']\n")
+    gemspecFile.append("  s.email           = ['" + String.join("', '", pluginInfo.email) + "']\n")
+    gemspecFile.append("  s.homepage        = '" + pluginInfo.homepage + "'\n")
+    gemspecFile.append("  s.platform        = 'java'\n")
+    gemspecFile.append("  s.require_paths   = ['lib', 'vendor/jar-dependencies']\n")
+    gemspecFile.append("\n")
+    gemspecFile.append("  s.files = Dir[\"lib/**/*\",\"*.gemspec\",\"*.md\",\"CONTRIBUTORS\",\"Gemfile\",\"LICENSE\",\"NOTICE.TXT\", \"vendor/jar-dependencies/**/*.jar\", \"vendor/jar-dependencies/**/*.rb\", \"VERSION\", \"docs/**/*\"]\n")
+    gemspecFile.append("\n")
+    gemspecFile.append("  # Special flag to let us know this is actually a logstash plugin\n")
+    gemspecFile.append("  s.metadata = { 'logstash_plugin' => 'true', 'logstash_group' => '" + pluginInfo.pluginType + "', 'java_plugin' => 'true'}\n")
+    gemspecFile.append("\n")
+    gemspecFile.append("  # Gem dependencies\n")
+    gemspecFile.append("  s.add_runtime_dependency \"logstash-core-plugin-api\", \">= 1.60\", \"<= 2.99\"\n")
+    gemspecFile.append("  s.add_runtime_dependency 'jar-dependencies'\n")
+    gemspecFile.append("  s.add_development_dependency 'logstash-devutils'\n")
+    gemspecFile.append("end\n")
+
+    String moduleName = pluginInfo.pluginType.substring(0, 1).toUpperCase() + pluginInfo.pluginType.substring(1) + "s"
+    File pluginRb = file("lib/logstash/" + pluginInfo.pluginType + "s/" + pluginInfo.pluginName + ".rb")
+    Files.createDirectories(pluginRb.toPath().getParent())
+    pluginRb.write("# AUTOGENERATED BY THE GRADLE SCRIPT. EDITS WILL BE OVERWRITTEN.\n")
+    pluginRb.append("# encoding: utf-8\n")
+    pluginRb.append("require \"logstash/" + pluginInfo.pluginType + "s/base\"\n")
+    pluginRb.append("require \"logstash/namespace\"\n")
+    pluginRb.append("require \"" + pluginInfo.pluginFullName() + "_jars\"\n")
+    pluginRb.append("require \"java\"\n")
+    pluginRb.append("\n")
+    pluginRb.append("class LogStash::" + moduleName + "::" + pluginInfo.pluginClass + " < LogStash::" + moduleName + "::Base\n")
+    pluginRb.append("  config_name \"" + pluginInfo.pluginName + "\"\n")
+    pluginRb.append("\n")
+    pluginRb.append("  def self.javaClass() Java::" + projectGroup + "." + pluginInfo.pluginClass + ".java_class; end\n")
+    pluginRb.append("end\n")
+
+    File pluginJarsRb = file("lib/" + pluginInfo.pluginFullName() + "_jars.rb")
+    pluginJarsRb.write("# AUTOGENERATED BY THE GRADLE SCRIPT. EDITS WILL BE OVERWRITTEN.\n")
+    pluginJarsRb.append("# encoding: utf-8\n")
+    pluginJarsRb.append("\n")
+    pluginJarsRb.append("require 'jar_dependencies'\n")
+    pluginJarsRb.append("require_jar('" + projectGroup + "', '" + pluginInfo.pluginFullName() + "', '" + version +"')\n")
+}
+
+void validatePluginJar(File pluginJar, String group) {
+    List<String> validationErrors = new ArrayList<>()
+
+    if (group.equals('org.logstash') || group.startsWith('org.logstash.') || group.equals('co.elastic.logstash') || group.startsWith('co.elastic.logstash.')) {
+        validationErrors.add("The plugin should not be placed in the 'org.logstash' or 'co.elastic.logstash' packages")
+        throw new GradleScriptException("Plugin validation errors:" + System.lineSeparator() +
+                String.join(System.lineSeparator(), validationErrors), null)
+    }
+
+    URLClassLoader cl = URLClassLoader.newInstance([pluginJar.toURI().toURL()] as URL[])
+    String pluginClassName = group + "." + pluginInfo.pluginClass
+
+    Class<?> pluginClass = null
+    try {
+        pluginClass = cl.loadClass(pluginClassName)
+    } catch (ClassNotFoundException ex) {
+        validationErrors.add(String.format("Unable to locate plugin class defined in build.gradle as '%s' in jar '%s'", pluginClassName, pluginJar))
+        throw new GradleScriptException("Plugin validation errors:" + System.lineSeparator() +
+                String.join(System.lineSeparator(), validationErrors), null)
+    }
+
+    if (pluginClass != null) {
+
+        Annotation[] logstashPlugin = pluginClass.getAnnotations().findAll({ x -> x.annotationType().toString().equals("interface co.elastic.logstash.api.LogstashPlugin") })
+        if (logstashPlugin.length != 1) {
+            validationErrors.add("There must be a single @LogstashPlugin annotation on the plugin class")
+        } else {
+            String pluginAnnotation = logstashPlugin[0].name()
+
+            if (pluginAnnotation != pluginInfo.pluginName) {
+                validationErrors.add("The 'name' property on the @LogstashPlugin (which is '" + pluginAnnotation + "') must match the 'pluginName' property which is defined as '" + pluginInfo.pluginName + "' in the build.gradle file")
+            }
+
+            if (pluginAnnotation.replace("_", "").toLowerCase() != pluginInfo.pluginClass.toLowerCase()) {
+                validationErrors.add("The 'name' property on the @LogstashPlugin (which is '" + pluginAnnotation + "') must match the plugin class name '" + pluginInfo.pluginClass + "' excluding casing and underscores")
+            }
+        }
+    }
+
+    if (validationErrors.size() > 0) {
+        throw new GradleScriptException("Plugin validation errors:" + System.lineSeparator() +
+                String.join(System.lineSeparator(), validationErrors), null)
+    }
+}
diff --git a/settings.gradle b/settings.gradle
index e01a199ed..aa27de379 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,10 +1,12 @@
-include ':logstash-core', 'logstash-core-benchmarks', 'ingest-converter', 'benchmark-cli', 'logstash-integration-tests', 'dependencies-report'
+rootProject.name = "logstash"
+
+include ':logstash-core', 'logstash-core-benchmarks', 'benchmark-cli', 'jvm-options-parser', 'logstash-integration-tests', 'dependencies-report'
 project(':logstash-core').projectDir = new File('./logstash-core')
 project(':logstash-core-benchmarks').projectDir = new File('./logstash-core/benchmarks')
 project(':logstash-integration-tests').projectDir = new File('./qa/integration')
-project(':ingest-converter').projectDir = new File('./tools/ingest-converter')
 project(':benchmark-cli').projectDir = new File('./tools/benchmark-cli')
 project(':dependencies-report').projectDir = new File('./tools/dependencies-report')
+project(':jvm-options-parser').projectDir = new File('./tools/jvm-options-parser')
 
 Boolean oss = System.getenv('OSS').equals('true')
 
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 000000000..d95e9fcc1
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,12 @@
+sonar.projectKey=elastic_logstash_AYm_nEbQaV3I-igkX1q9
+sonar.host.url=https://sonar.elastic.dev
+
+sonar.exclusions=vendor/**, gradle/**, rakelib/**, logstash-core-plugin-api/**, licenses/**, qa/**, **/spec/**
+sonar.tests=logstash-core/src/test, x-pack/src/test, buildSrc/src/test 
+
+# Ruby
+sonar.ruby.coverage.reportPaths=coverage/coverage.json
+
+# Java
+sonar.coverage.jacoco.xmlReportPaths=**/jacocoTestReport.xml
+sonar.java.binaries=**/build/classes
\ No newline at end of file
diff --git a/spec/bootstrap/environment_spec.rb b/spec/bootstrap/environment_spec.rb
index f31cfcd38..95d432bc5 100644
--- a/spec/bootstrap/environment_spec.rb
+++ b/spec/bootstrap/environment_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "bootstrap/environment"
 
diff --git a/spec/compliance/license_spec.rb b/spec/compliance/license_spec.rb
index d42b1cd44..91f1f660b 100644
--- a/spec/compliance/license_spec.rb
+++ b/spec/compliance/license_spec.rb
@@ -1,24 +1,38 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 require 'spec_helper'
 require_relative '../../rakelib/default_plugins'
 
 describe "Project licenses" do
-
   let(:expected_licenses) {
     ##
     # Expected licenses are Apache License 2.0, BSD license, MIT license and the ruby one,
     # this not exclude that this list change in the feature.
     ##
-    Regexp.union([ /mit/,
+    Regexp.union([/mit/,
                    /apache*/,
                    /bsd/,
                    /artistic 2.*/,
                    /ruby/,
                    /lgpl/,
                    /epl/,
-                   /elastic/i
-  ])
+                   /elastic|elv2/i
+])
   }
 
   ##
@@ -39,7 +53,6 @@ describe "Project licenses" do
   end
 
   shared_examples "runtime license test" do
-
     subject(:gem_name) do |example|
       example.metadata[:example_group][:parent_example_group][:description]
     end
@@ -74,5 +87,4 @@ describe "Project licenses" do
       it_behaves_like "runtime license test"
     end
   end
-
 end
diff --git a/spec/fixtures/dummy.gemspec b/spec/fixtures/dummy.gemspec
index c32bbafe6..fa3c98bbc 100644
--- a/spec/fixtures/dummy.gemspec
+++ b/spec/fixtures/dummy.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = Dir["lib/**/*","spec/**/*","*.gemspec","*.md","CONTRIBUTORS","Gemfile","LICENSE","NOTICE.TXT", "vendor/jar-dependencies/**/*.jar", "vendor/jar-dependencies/**/*.rb", "VERSION"]
+  s.files = Dir["lib/**/*", "spec/**/*", "*.gemspec", "*.md", "CONTRIBUTORS", "Gemfile", "LICENSE", "NOTICE.TXT", "vendor/jar-dependencies/**/*.jar", "vendor/jar-dependencies/**/*.rb", "VERSION"]
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 674f7823b..0c736aea0 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,19 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 require "logstash/devutils/rspec/spec_helper"
 
@@ -6,7 +21,6 @@ require "flores/rspec"
 require "flores/random"
 require "pathname"
 require "stud/task"
-require "logstash/devutils/rspec/spec_helper"
 require "support/resource_dsl_methods"
 require "support/mocks_classes"
 require "support/helpers"
@@ -19,6 +33,19 @@ require 'rspec'
 require "json"
 require 'logstash/runner'
 
+# Code coverage setup
+if ENV['COVERAGE']
+  require 'simplecov'
+  require 'simplecov-json'
+
+  SimpleCov.formatter = SimpleCov::Formatter::JSONFormatter
+
+  SimpleCov.start do
+    add_filter 'spec/'
+    add_filter 'vendor/'
+  end
+end
+
 class JSONIOThingy < IO
   def initialize; end
   def flush; end
@@ -37,6 +64,12 @@ RSpec.configure do |c|
   c.include LogStashHelper
   c.extend LogStashHelper
 
+  if ENV['COVERAGE']
+    c.after(:suite) do
+      SimpleCov.result.format!
+    end
+  end
+
   # Some tests mess with LogStash::SETTINGS, and data on the filesystem can leak state
   # from one spec to another; run each spec with its own temporary data directory for `path.data`
   c.around(:each) do |example|
@@ -58,3 +91,19 @@ def installed_plugins
   Gem::Specification.find_all.select { |spec| spec.metadata["logstash_plugin"] }.map { |plugin| plugin.name }
 end
 
+java_import org.apache.logging.log4j.core.appender.AbstractAppender
+
+class CustomAppender < AbstractAppender
+
+  attr_reader :events_collector
+
+  def initialize(events)
+    super("CustomCaptorAppender", nil, nil, true, org.apache.logging.log4j.core.config.Property::EMPTY_ARRAY)
+    @events_collector = events
+  end
+
+  # override the append to catch all the calls and collect the events
+  def append(log_event)
+    @events_collector << log_event.message.formatted_message
+  end
+end
\ No newline at end of file
diff --git a/spec/support/pack/valid-pack/logstash/valid-pack/dependencies/logstash-input-packtestdep.gemspec b/spec/support/pack/valid-pack/logstash/valid-pack/dependencies/logstash-input-packtestdep.gemspec
index c0d175e51..ea563bd0b 100644
--- a/spec/support/pack/valid-pack/logstash/valid-pack/dependencies/logstash-input-packtestdep.gemspec
+++ b/spec/support/pack/valid-pack/logstash/valid-pack/dependencies/logstash-input-packtestdep.gemspec
@@ -1,4 +1,5 @@
 # coding: utf-8
+
 Gem::Specification.new do |spec|
   spec.name          = "logstash-input-packtestdep"
   spec.version       = "0.0.1"
diff --git a/spec/support/pack/valid-pack/logstash/valid-pack/logstash-input-packtest.gemspec b/spec/support/pack/valid-pack/logstash/valid-pack/logstash-input-packtest.gemspec
index 78a7a1d48..4a9ab0b4d 100644
--- a/spec/support/pack/valid-pack/logstash/valid-pack/logstash-input-packtest.gemspec
+++ b/spec/support/pack/valid-pack/logstash/valid-pack/logstash-input-packtest.gemspec
@@ -1,10 +1,10 @@
 # coding: utf-8
+
 Gem::Specification.new do |spec|
   spec.name          = "logstash-input-packtest"
   spec.version       = "0.0.1"
   spec.authors       = ["Elastic"]
   spec.email         = ["info@elastic.co"]
-
   spec.summary       = "a summary"
   spec.description   = "a description"
   spec.homepage      = "https://elastic.co"
diff --git a/spec/support/pack/valid-pack/logstash/valid-pack/logstash-input-packtest_pim-0.0.1.gem b/spec/support/pack/valid-pack/logstash/valid-pack/logstash-input-packtest_pim-0.0.1.gem
new file mode 100644
index 000000000..a7ecc37be
Binary files /dev/null and b/spec/support/pack/valid-pack/logstash/valid-pack/logstash-input-packtest_pim-0.0.1.gem differ
diff --git a/spec/support/pack/valid-pack/logstash/valid-pack/logstash-input-packtest_pim.gemspec b/spec/support/pack/valid-pack/logstash/valid-pack/logstash-input-packtest_pim.gemspec
new file mode 100644
index 000000000..dd65d8831
--- /dev/null
+++ b/spec/support/pack/valid-pack/logstash/valid-pack/logstash-input-packtest_pim.gemspec
@@ -0,0 +1,13 @@
+# coding: utf-8
+
+Gem::Specification.new do |spec|
+  spec.name                 = "logstash-input-packtest_pim"
+  spec.version              = "0.0.1"
+  spec.authors              = ["Elastic"]
+  spec.email                = ["info@elastic.co"]
+  spec.post_install_message = "Hello from the friendly pack"
+  spec.summary              = "a summary"
+  spec.description          = "a description"
+  spec.homepage             = "https://elastic.co"
+  spec.add_runtime_dependency "logstash-input-packtestdep"
+end
diff --git a/spec/support/resource_dsl_methods.rb b/spec/support/resource_dsl_methods.rb
index 9d9b72755..f327329c9 100644
--- a/spec/support/resource_dsl_methods.rb
+++ b/spec/support/resource_dsl_methods.rb
@@ -1,17 +1,36 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Ruby doesn't have common class for boolean,
 # And to simplify the ResourceDSLMethods check it make sense to have it.
 module Boolean; end
+
 class TrueClass
   include Boolean
 end
+
 class FalseClass
   include Boolean
 end
 
 module ResourceDSLMethods
   # Convert a nested hash to a mapping of key paths to expected classes
-  def hash_to_mapping(h, path=[], mapping={})
-    h.each do |k,v|
+  def hash_to_mapping(h, path = [], mapping = {})
+    h.each do |k, v|
       if v.is_a?(Hash)
         hash_to_mapping(v, path + [k], mapping)
       else
@@ -34,7 +53,6 @@ module ResourceDSLMethods
         expect(last_response).to be_ok
       end
 
-
       describe "the default metadata" do
         it "should include the host" do
           expect(payload["host"]).to eql(Socket.gethostname)
@@ -45,6 +63,7 @@ module ResourceDSLMethods
         end
 
         it "should include the http address" do
+          skip("flaky test tracked in https://github.com/elastic/logstash/issues/11385")
           expect(payload["http_address"]).to eql("127.0.0.1:#{::LogStash::WebServer::DEFAULT_PORTS.first}")
         end
 
@@ -57,12 +76,12 @@ module ResourceDSLMethods
         end
       end
 
-      hash_to_mapping(expected).each do |resource_path,klass|
+      hash_to_mapping(expected).each do |resource_path, klass|
         dotted = resource_path.join(".")
 
         it "should set '#{dotted}' at '#{path}' to be a '#{klass}'" do
           expect(last_response).to be_ok # fail early if need be
-          resource_path_value = resource_path.reduce(payload) do |acc,v|
+          resource_path_value = resource_path.reduce(payload) do |acc, v|
             expect(acc).to be_a(Hash), "Got a nil looking for #{resource_path} in #{payload}"
             expect(acc.has_key?(v)).to eql(true), "Expected to find value '#{v}' in structure '#{acc}', but could not. Payload was '#{payload}'"
             acc[v]
@@ -75,7 +94,7 @@ module ResourceDSLMethods
     yield if block_given? # Add custom expectations
   end
 
-  def test_api_and_resources(expected, xopts={})
+  def test_api_and_resources(expected, xopts = {})
     xopts[:exclude_from_root] ||= []
     root_expectation = expected.clone
     xopts[:exclude_from_root].each {|k| root_expectation.delete(k)}
diff --git a/spec/unit/bootstrap/bundler_spec.rb b/spec/unit/bootstrap/bundler_spec.rb
index 1216ddbe7..5571f1f73 100644
--- a/spec/unit/bootstrap/bundler_spec.rb
+++ b/spec/unit/bootstrap/bundler_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "bundler/cli"
 
@@ -52,7 +68,21 @@ describe LogStash::Bundler do
     end
 
     it 'should call Bundler::CLI.start with the correct arguments' do
+      allow(ENV).to receive(:replace)
       expect(::Bundler::CLI).to receive(:start).with(bundler_args)
+      expect(ENV).to receive(:replace) do |args|
+        expect(args).to include("BUNDLE_PATH" => LogStash::Environment::BUNDLE_DIR,
+                                                            "BUNDLE_GEMFILE" => LogStash::Environment::GEMFILE_PATH,
+                                                            "BUNDLE_SILENCE_ROOT_WARNING" => "true",
+                                                            "BUNDLE_WITHOUT" => "development")
+      end
+      expect(ENV).to receive(:replace) do |args|
+        expect(args).not_to include(
+                                "BUNDLE_PATH" => LogStash::Environment::BUNDLE_DIR,
+                                "BUNDLE_SILENCE_ROOT_WARNING" => "true",
+                                "BUNDLE_WITHOUT" => "development")
+      end
+
       LogStash::Bundler.invoke!(options)
     end
 
@@ -76,20 +106,20 @@ describe LogStash::Bundler do
   end
 
   context 'when generating bundler arguments' do
-    subject { LogStash::Bundler.bundler_arguments(options) }
+    subject(:bundler_arguments) { LogStash::Bundler.bundler_arguments(options) }
     let(:options) { {} }
 
     context 'when installing' do
       let(:options) { { :install => true } }
 
       it 'should call bundler install' do
-        expect(subject).to include('install')
+        expect(bundler_arguments).to include('install')
       end
 
       context 'with the cleaning option' do
         it 'should add the --clean arguments' do
           options.merge!(:clean => true)
-          expect(subject).to include('install','--clean')
+          expect(bundler_arguments).to include('install', '--clean')
         end
       end
     end
@@ -99,14 +129,66 @@ describe LogStash::Bundler do
 
       context 'with a specific plugin' do
         it 'should call `bundle update plugin-name`' do
-          expect(subject).to include('update', 'logstash-input-stdin')
+          expect(bundler_arguments).to include('update', 'logstash-input-stdin')
         end
       end
 
       context 'with the cleaning option' do
         it 'should ignore the clean option' do
           options.merge!(:clean => true)
-          expect(subject).not_to include('--clean')
+          expect(bundler_arguments).not_to include('--clean')
+        end
+      end
+
+      context "level: major" do
+        let(:options) { super().merge(:level => "major") }
+        it "invokes bundler with --minor" do
+          expect(bundler_arguments).to include("--major")
+        end
+      end
+
+      context "level: minor" do
+        let(:options) { super().merge(:level => "minor") }
+        it "invokes bundler with --minor" do
+          expect(bundler_arguments).to include("--minor")
+        end
+      end
+
+      context "level: patch" do
+        let(:options) { super().merge(:level => "patch") }
+        it "invokes bundler with --minor" do
+          expect(bundler_arguments).to include("--patch")
+        end
+      end
+
+      context "level: unspecified" do
+        it "invokes bundler with --minor" do
+          expect(bundler_arguments).to include("--minor")
+        end
+      end
+
+      context 'with ecs_compatibility' do
+        let(:plugin_name) { 'logstash-output-elasticsearch' }
+        let(:options) { { :update => plugin_name } }
+
+        it "also update dependencies" do
+          expect(bundler_arguments).to include('logstash-mixin-ecs_compatibility_support', plugin_name)
+
+          mixin_libs = bundler_arguments - ["update", "--minor", plugin_name]
+          mixin_libs.each do |gem_name|
+            dep = ::Gem::Dependency.new(gem_name)
+            expect(dep.type).to eq(:runtime)
+            expect(gem_name).to start_with('logstash-mixin-')
+          end
+        end
+
+        it "do not include core lib" do
+          expect(bundler_arguments).not_to include('logstash-core', 'logstash-core-plugin-api')
+        end
+
+        it "raise error when fetcher failed" do
+          allow(::Gem::SpecFetcher.fetcher).to receive("spec_for_dependency").with(anything).and_return([nil, [StandardError.new("boom")]])
+          expect { bundler_arguments }.to raise_error(StandardError, /boom/)
         end
       end
     end
@@ -114,7 +196,7 @@ describe LogStash::Bundler do
     context "when only specifying clean" do
       let(:options) { { :clean => true } }
       it 'should call the `bundle clean`' do
-        expect(subject).to include('clean')
+        expect(bundler_arguments).to include('clean')
       end
     end
   end
diff --git a/spec/unit/plugin_manager/gem_installer_spec.rb b/spec/unit/plugin_manager/gem_installer_spec.rb
index ce593b4b3..dd85009df 100644
--- a/spec/unit/plugin_manager/gem_installer_spec.rb
+++ b/spec/unit/plugin_manager/gem_installer_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/gem_installer"
 require "pluginmanager/ui"
 require "stud/temporary"
@@ -30,9 +46,7 @@ describe LogStash::PluginManager::GemInstaller do
     let(:message) { "Hello from the friendly pack" }
 
     context "when present" do
-      before do
-        allow_any_instance_of(::Gem::Specification).to receive(:post_install_message).and_return(message)
-      end
+      let(:plugin_name) { 'logstash-input-packtest_pim-0.0.1' }
 
       context "when we want the message" do
         it "display the message" do
@@ -48,7 +62,7 @@ describe LogStash::PluginManager::GemInstaller do
     end
 
     context "when not present" do
-      context "when we want the message" do
+      context "when we don't want the message" do
         it "doesn't display the message" do
           expect(LogStash::PluginManager.ui).not_to receive(:info).with(message)
           subject.install(simple_gem, true, temporary_gem_home)
diff --git a/spec/unit/plugin_manager/gemfile_spec.rb b/spec/unit/plugin_manager/gemfile_spec.rb
index f4909c5bb..1399e69c6 100644
--- a/spec/unit/plugin_manager/gemfile_spec.rb
+++ b/spec/unit/plugin_manager/gemfile_spec.rb
@@ -1,13 +1,26 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "pluginmanager/gemfile"
 
 describe "logstash Gemfile Manager" do
-
   context LogStash::Gemfile do
-
     context "load" do
-
       it "should load and return self" do
         file = <<-END
           source "https://rubygems.org"
@@ -45,7 +58,7 @@ describe "logstash Gemfile Manager" do
           gemspec "boom"
         END
 
-        expect{LogStash::Gemfile.new(StringIO.new(file)).load}.to raise_error(LogStash::GemfileError)
+        expect {LogStash::Gemfile.new(StringIO.new(file)).load}.to raise_error(LogStash::GemfileError)
       end
 
       it "should add gems" do
@@ -66,7 +79,7 @@ describe "logstash Gemfile Manager" do
           gem "foo"
         END
 
-        expect{LogStash::Gemfile.new(StringIO.new(file)).load}.to raise_error(LogStash::GemfileError)
+        expect {LogStash::Gemfile.new(StringIO.new(file)).load}.to raise_error(LogStash::GemfileError)
       end
 
       it "should add gems with only name" do
@@ -168,7 +181,6 @@ describe "logstash Gemfile Manager" do
       end
 
       context "keep a backup of the original file" do
-
       end
     end
 
diff --git a/spec/unit/plugin_manager/install_spec.rb b/spec/unit/plugin_manager/install_spec.rb
index e6f44337b..23acae1ce 100644
--- a/spec/unit/plugin_manager/install_spec.rb
+++ b/spec/unit/plugin_manager/install_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'spec_helper'
 require 'pluginmanager/main'
 require "pluginmanager/pack_fetch_strategy/repository"
@@ -10,8 +26,9 @@ describe LogStash::PluginManager::Install do
     let(:sources) { ["https://rubygems.org", "http://localhost:9292"] }
 
     before(:each) do
-      expect(cmd).to receive(:validate_cli_options!).and_return(nil)
+      expect(cmd).to receive(:validate_cli_options!).at_least(:once).and_return(nil)
       expect(cmd).to receive(:plugins_gems).and_return([["dummy", nil]])
+      expect(cmd).to receive(:update_logstash_mixin_dependencies).and_return(nil)
       expect(cmd).to receive(:install_gems_list!).and_return(nil)
       expect(cmd).to receive(:remove_unused_locally_installed_gems!).and_return(nil)
       cmd.verify = true
@@ -24,10 +41,40 @@ describe LogStash::PluginManager::Install do
     end
   end
 
+  context "when installs alias plugin" do
+    before(:each) do
+      # mocked to avoid validation of options
+      expect(cmd).to receive(:validate_cli_options!).and_return(nil)
+      # used to pass indirect input to the command under test
+      expect(cmd).to receive(:plugins_gems).and_return([["logstash-input-elastic_agent", nil]])
+      expect(cmd).to receive(:update_logstash_mixin_dependencies).and_return(nil)
+      # used to skip Bundler interaction
+      expect(cmd).to receive(:install_gems_list!).and_return(nil)
+      # avoid to clean gemfile folder
+      expect(cmd).to receive(:remove_unused_locally_installed_gems!).and_return(nil)
+      cmd.verify = true
+    end
+
+    it "should not consider as valid plugin a gem with an alias name" do
+      expect(LogStash::PluginManager).to receive(:logstash_plugin?).with("logstash-input-elastic_agent", nil, {:rubygems_source => ["https://rubygems.org"]})
+      expect(LogStash::PluginManager).to receive(:logstash_plugin?).with("logstash-input-beats", nil, {:rubygems_source => ["https://rubygems.org"]}).and_return(true)
+
+      cmd.execute
+    end
+
+    it "should consider as valid plugin a plugin gem with an alias name" do
+      expect(LogStash::PluginManager).to receive(:logstash_plugin?).with("logstash-input-elastic_agent", nil, {:rubygems_source => ["https://rubygems.org"]}).and_return(true)
+      expect(LogStash::PluginManager).not_to receive(:logstash_plugin?).with("logstash-input-beats", nil, {:rubygems_source => ["https://rubygems.org"]})
+
+      cmd.execute
+    end
+  end
+
   context "pack" do
     let(:cmd) { LogStash::PluginManager::Install.new("install my-super-pack") }
     before do
       expect(cmd).to receive(:plugins_arg).and_return(["my-super-pack"]).at_least(:once)
+      allow(cmd).to receive(:update_logstash_mixin_dependencies).and_return(nil)
     end
 
     it "reports `FileNotFoundError` exception" do
diff --git a/spec/unit/plugin_manager/install_strategy_factory_spec.rb b/spec/unit/plugin_manager/install_strategy_factory_spec.rb
index 00bdcd2b4..5c7957d73 100644
--- a/spec/unit/plugin_manager/install_strategy_factory_spec.rb
+++ b/spec/unit/plugin_manager/install_strategy_factory_spec.rb
@@ -1,11 +1,27 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/install_strategy_factory"
 
 describe LogStash::PluginManager::InstallStrategyFactory do
   subject { described_class }
 
   context "when the plugins args is valid" do
-    let(:plugins_args) { [ "logstash-pack-mega" ] }
+    let(:plugins_args) { ["logstash-pack-mega"] }
 
     it "returns the first matched strategy" do
       success = double("urifetch success")
diff --git a/spec/unit/plugin_manager/offline_plugin_packager_spec.rb b/spec/unit/plugin_manager/offline_plugin_packager_spec.rb
index 367dece5d..c66e7d66d 100644
--- a/spec/unit/plugin_manager/offline_plugin_packager_spec.rb
+++ b/spec/unit/plugin_manager/offline_plugin_packager_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/offline_plugin_packager"
 require "stud/temporary"
 require "stud/try"
diff --git a/spec/unit/plugin_manager/pack_fetch_strategy/repository_spec.rb b/spec/unit/plugin_manager/pack_fetch_strategy/repository_spec.rb
index 4a6ad7b6f..ca5554e00 100644
--- a/spec/unit/plugin_manager/pack_fetch_strategy/repository_spec.rb
+++ b/spec/unit/plugin_manager/pack_fetch_strategy/repository_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/pack_fetch_strategy/repository"
 require "uri"
 require "webmock/rspec"
@@ -33,7 +49,7 @@ describe LogStash::PluginManager::PackFetchStrategy::Repository do
   context "when the remote host is unreachable" do
     it "returns false and yield a debug message" do
       # To make sure we really try to connect to a failing host we have to let it through webmock
-      host ="#{Time.now.to_i.to_s}-do-not-exist"
+      host = "#{Time.now.to_i.to_s}-do-not-exist"
       WebMock.disable_net_connect!(:allow => host)
       ENV["LOGSTASH_PACK_URL"] = "http://#{host}"
       expect(subject.get_installer_for(plugin_name)).to be_falsey
diff --git a/spec/unit/plugin_manager/pack_fetch_strategy/uri_spec.rb b/spec/unit/plugin_manager/pack_fetch_strategy/uri_spec.rb
index 210b32d5b..5aa1c19d9 100644
--- a/spec/unit/plugin_manager/pack_fetch_strategy/uri_spec.rb
+++ b/spec/unit/plugin_manager/pack_fetch_strategy/uri_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/pack_fetch_strategy/uri"
 require "stud/temporary"
 
diff --git a/spec/unit/plugin_manager/pack_installer/local_spec.rb b/spec/unit/plugin_manager/pack_installer/local_spec.rb
index ffc165bb2..ac88d12ff 100644
--- a/spec/unit/plugin_manager/pack_installer/local_spec.rb
+++ b/spec/unit/plugin_manager/pack_installer/local_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/pack_installer/local"
 require "stud/temporary"
 require "fileutils"
@@ -51,8 +67,8 @@ describe LogStash::PluginManager::PackInstaller::Local do
       it "install the gems" do
         expect(::Bundler::LogstashInjector).to receive(:inject!).with(be_kind_of(LogStash::PluginManager::PackInstaller::Pack)).and_return([])
 
-        expect(::LogStash::PluginManager::GemInstaller).to receive(:install).with(/logstash-input-packtest/, anything)
-        expect(::LogStash::PluginManager::GemInstaller).to receive(:install).with(/logstash-input-packtestdep/, anything)
+        expect(::LogStash::PluginManager::GemInstaller).to receive(:install).with(/logstash-input-packtest-/, anything)
+        expect(::LogStash::PluginManager::GemInstaller).to receive(:install).with(/logstash-input-packtestdep-/, anything)
 
         expect { subject.execute }.not_to raise_error
       end
diff --git a/spec/unit/plugin_manager/pack_installer/pack_spec.rb b/spec/unit/plugin_manager/pack_installer/pack_spec.rb
index 845f4278f..de73a8cf1 100644
--- a/spec/unit/plugin_manager/pack_installer/pack_spec.rb
+++ b/spec/unit/plugin_manager/pack_installer/pack_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/pack_installer/pack"
 require "stud/temporary"
 
@@ -13,8 +29,8 @@ describe LogStash::PluginManager::PackInstaller::Pack do
     end
 
     it "returns the plugins" do
-      expect(subject.plugins.size).to eq(1)
-      expect(subject.plugins.collect(&:name)).to include("logstash-input-packtest")
+      expect(subject.plugins.size).to eq(2)
+      expect(subject.plugins.collect(&:name)).to include("logstash-input-packtest_pim", "logstash-input-packtest")
     end
 
     it "returns the dependencies" do
@@ -23,8 +39,8 @@ describe LogStash::PluginManager::PackInstaller::Pack do
     end
 
     it "returns all the gems" do
-      expect(subject.gems.size).to eq(2)
-      expect(subject.gems.collect(&:name)).to include("logstash-input-packtest", "logstash-input-packtestdep")
+      expect(subject.gems.size).to eq(3)
+      expect(subject.gems.collect(&:name)).to include("logstash-input-packtest", "logstash-input-packtest_pim", "logstash-input-packtestdep")
     end
   end
 
@@ -97,4 +113,24 @@ describe LogStash::PluginManager::PackInstaller::Pack::GemInformation do
       expect(subject.plugin?).to be_falsey
     end
   end
+
+  context "when it is Java plugin example from an offline zip file" do
+    let(:gem) { "/tmp/randomValue/randomValue2/logstash/logstash-filter-java_filter_example-1.0.5.gem"}
+
+    it "#dependency? return false" do
+      expect(subject.dependency?).to be_falsey
+    end
+
+    it "#plugin? return true" do
+      expect(subject.plugin?).to be_truthy
+    end
+
+    it "returns the version" do
+      expect(subject.version).to eq("1.0.5")
+    end
+
+    it "returns the name" do
+      expect(subject.name).to eq("logstash-filter-java_filter_example")
+    end
+  end
 end
diff --git a/spec/unit/plugin_manager/pack_installer/remote_spec.rb b/spec/unit/plugin_manager/pack_installer/remote_spec.rb
index c6daf9ba1..97463487b 100644
--- a/spec/unit/plugin_manager/pack_installer/remote_spec.rb
+++ b/spec/unit/plugin_manager/pack_installer/remote_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/pack_installer/remote"
 require "webmock/rspec"
 
diff --git a/spec/unit/plugin_manager/prepare_offline_pack_spec.rb b/spec/unit/plugin_manager/prepare_offline_pack_spec.rb
index 9c55457d0..a26bc30f0 100644
--- a/spec/unit/plugin_manager/prepare_offline_pack_spec.rb
+++ b/spec/unit/plugin_manager/prepare_offline_pack_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require "pluginmanager/main"
 require "pluginmanager/prepare_offline_pack"
@@ -70,7 +86,6 @@ describe LogStash::PluginManager::PrepareOfflinePack do
       end
     end
 
-
     context "if the output is directory" do
       let(:tmp_zip_file) { f = Stud::Temporary.pathname; FileUtils.mkdir_p(f); f }
       let(:cmd) { "prepare-offline-pack" }
@@ -115,7 +130,7 @@ describe LogStash::PluginManager::PrepareOfflinePack do
         end
 
         it "should fails" do
-          # ignore the first path part of tmp_zip_file because on Windows the long path is shrinked in the exception message 
+          # ignore the first path part of tmp_zip_file because on Windows the long path is shrinked in the exception message
           expect { subject.run(cmd_args) }.to raise_error Clamp::ExecutionError, /output file destination .+#{::File.basename(tmp_zip_file)} already exist/
         end
       end
diff --git a/spec/unit/plugin_manager/proxy_support_spec.rb b/spec/unit/plugin_manager/proxy_support_spec.rb
index 4e7df213a..df69ec917 100644
--- a/spec/unit/plugin_manager/proxy_support_spec.rb
+++ b/spec/unit/plugin_manager/proxy_support_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/proxy_support"
 require "rexml/document"
 require "fileutils"
@@ -55,8 +71,22 @@ describe "Proxy support" do
       schemes.each do |scheme|
         expect(java.lang.System.getProperty("#{scheme}.proxyHost")).to eq(send("#{scheme}_proxy_uri").host)
         expect(java.lang.System.getProperty("#{scheme}.proxyPort")).to eq(send("#{scheme}_proxy_uri").port.to_s)
-        expect(java.lang.System.getProperty("#{scheme}.proxyUsername")).to eq(send("#{scheme}_proxy_uri").user)
-        expect(java.lang.System.getProperty("#{scheme}.proxyPassword")).to eq(send("#{scheme}_proxy_uri").password)
+        expect(java.lang.System.getProperty("#{scheme}.proxyUser")).to eq(send("#{scheme}_proxy_uri").user)
+        expect(java.lang.System.getProperty("#{scheme}.proxyPass")).to eq(send("#{scheme}_proxy_uri").password)
+      end
+    end
+
+    context "URI's use of proxy" do
+      it "applies the settings from environment" do
+        schemes.each do |scheme|
+          configure_proxy
+          uri = URI.parse("#{scheme}://rubygems.org")
+          proxy = uri.find_proxy
+          expect(proxy.host).to eq(send("#{scheme}_proxy_uri").host)
+          expect(proxy.port).to eq(send("#{scheme}_proxy_uri").port)
+          expect(proxy.user).to eq(send("#{scheme}_proxy_uri").user)
+          expect(proxy.password).to eq(send("#{scheme}_proxy_uri").password)
+        end
       end
     end
 
@@ -123,7 +153,6 @@ describe "Proxy support" do
       }
     }
 
-
     it "doesn't raise an exception" do
       expect { configure_proxy }.not_to raise_exception
     end
@@ -137,7 +166,6 @@ describe "Proxy support" do
       }
     }
 
-
     it "raises an exception" do
       expect { configure_proxy }.to raise_error(RuntimeError)
     end
diff --git a/spec/unit/plugin_manager/ui_spec.rb b/spec/unit/plugin_manager/ui_spec.rb
index faca7b3a6..c1f242576 100644
--- a/spec/unit/plugin_manager/ui_spec.rb
+++ b/spec/unit/plugin_manager/ui_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/ui"
 describe LogStash::PluginManager do
   it "set the a default ui" do
diff --git a/spec/unit/plugin_manager/update_spec.rb b/spec/unit/plugin_manager/update_spec.rb
index 3fc4d1d62..ac6abeefb 100644
--- a/spec/unit/plugin_manager/update_spec.rb
+++ b/spec/unit/plugin_manager/update_spec.rb
@@ -1,38 +1,103 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'spec_helper'
 require 'pluginmanager/main'
 
 describe LogStash::PluginManager::Update do
   let(:cmd)     { LogStash::PluginManager::Update.new("update") }
   let(:sources) { cmd.gemfile.gemset.sources }
+  let(:expect_preflight_error) { false } # hack to bypass before-hook expectations
 
   before(:each) do
-    expect(cmd).to receive(:find_latest_gem_specs).and_return({})
-    allow(cmd).to receive(:warn_local_gems).and_return(nil)
-    expect(cmd).to receive(:display_updated_plugins).and_return(nil)
+    unless expect_preflight_error
+      expect(cmd).to receive(:find_latest_gem_specs).and_return({})
+      allow(cmd).to receive(:warn_local_gems).and_return(nil)
+      expect(cmd).to receive(:display_updated_plugins).and_return(nil)
+    end
   end
 
   it "pass all gem sources to the bundle update command" do
     sources = cmd.gemfile.gemset.sources
-    expect_any_instance_of(LogStash::Bundler).to receive(:invoke!).with(:update => [], :rubygems_source => sources)
+    expect_any_instance_of(LogStash::Bundler).to receive(:invoke!).with(
+        :update => [],
+        :rubygems_source => sources,
+        :conservative => true,
+        :local => false,
+        :level => "minor" # default
+    )
     cmd.execute
   end
 
   context "when skipping validation" do
     let(:cmd)    { LogStash::PluginManager::Update.new("update") }
-    let(:plugin) { OpenStruct.new(:name => "dummy", :options => {} ) }
+    let(:plugin) { OpenStruct.new(:name => "dummy", :options => {}) }
 
     before(:each) do
       expect(cmd.gemfile).to receive(:find).with(plugin).and_return(plugin)
       expect(cmd.gemfile).to receive(:save).and_return(nil)
       expect(cmd).to receive(:plugins_to_update).and_return([plugin])
-      expect_any_instance_of(LogStash::Bundler).to receive(:invoke!).with(:update => [plugin], :rubygems_source => sources).and_return(nil)
+      expect_any_instance_of(LogStash::Bundler).to receive(:invoke!).with(
+        hash_including(:update => [plugin], :rubygems_source => sources, :level => "minor")
+      ).and_return(nil)
     end
 
     it "skips version verification when ask for it" do
-      cmd.verify = false
       expect(cmd).to_not receive(:validates_version)
-      cmd.execute
+      cmd.run(["--no-verify"])
+    end
+  end
+
+  context "with explicit `--level` flag" do
+    LogStash::PluginManager::Update::SUPPORTED_LEVELS.each do |level|
+      context "with --level=#{level} (valid)" do
+        let(:requested_level) { level }
+
+        let(:cmd)    { LogStash::PluginManager::Update.new("update") }
+        let(:plugin) { OpenStruct.new(:name => "dummy", :options => {}) }
+
+        before(:each) do
+          cmd.verify = false
+        end
+
+        it "propagates the level flag as an option to Bundler#invoke!" do
+          expect(cmd.gemfile).to receive(:find).with(plugin).and_return(plugin)
+          expect(cmd.gemfile).to receive(:save).and_return(nil)
+          expect(cmd).to receive(:plugins_to_update).and_return([plugin])
+          expect_any_instance_of(LogStash::Bundler).to receive(:invoke!).with(
+            hash_including(:update => [plugin], :rubygems_source => sources, :level => requested_level)
+          ).and_return(nil)
+
+          cmd.run(["--level=#{requested_level}"])
+        end
+      end
+    end
+
+    context "with --level=eVeRyThInG (invalid)" do
+      let(:requested_level) { "eVeRyThInG" }
+      let(:expect_preflight_error) { true }
+
+      let(:cmd)    { LogStash::PluginManager::Update.new("update") }
+      let(:plugin) { OpenStruct.new(:name => "dummy", :options => {}) }
+
+      it "errors helpfully" do
+        expect { cmd.run(["--level=#{requested_level}"]) }
+          .to raise_error.with_message(including("unsupported level `#{requested_level}`"))
+      end
     end
   end
 end
diff --git a/spec/unit/plugin_manager/util_spec.rb b/spec/unit/plugin_manager/util_spec.rb
index 669a18688..4240c1be4 100644
--- a/spec/unit/plugin_manager/util_spec.rb
+++ b/spec/unit/plugin_manager/util_spec.rb
@@ -1,26 +1,41 @@
-#encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'spec_helper'
 require 'pluginmanager/util'
 require 'gems'
 
 describe LogStash::PluginManager do
-
   describe "fetching plugin information" do
     let(:plugin_name) { "logstash-output-elasticsearch" }
 
     let(:version_data) do
-      [ { "authors"=>"Elastic", "built_at"=>"2015-08-11T00:00:00.000Z", "description"=>"Output events to elasticsearch",
-          "downloads_count"=>1638, "metadata"=>{"logstash_group"=>"output", "logstash_plugin"=>"true"}, "number"=>"2.0.0.pre",
-          "summary"=>"Logstash Output to Elasticsearch", "platform"=>"java", "ruby_version"=>">= 0", "prerelease"=>true,
-          "licenses"=>["apache-2.0"], "requirements"=>[], "sha"=>"194b27099c13605a882a3669e2363fdecccaab1de48dd44b0cda648dd5516799"},
-      { "authors"=>"Elastic", "built_at"=>"2015-08-10T00:00:00.000Z", "description"=>"Output events to elasticsearch",
-        "downloads_count"=>1638, "metadata"=>{"logstash_group"=>"output", "logstash_plugin"=>"true"}, "number"=>"1.0.7",
-        "summary"=>"Logstash Output to Elasticsearch", "platform"=>"java", "ruby_version"=>">= 0", "prerelease"=>false,
-        "licenses"=>["apache-2.0"], "requirements"=>[], "sha"=>"194b27099c13605a882a3669e2363fdecccaab1de48dd44b0cda648dd5516799"},
-      { "authors"=>"Elastic", "built_at"=>"2015-08-09T00:00:00.000Z", "description"=>"Output events to elasticsearch",
-        "downloads_count"=>1638, "metadata"=>{"logstash_group"=>"output", "logstash_plugin"=>"true"}, "number"=>"1.0.4",
-        "summary"=>"Logstash Output to Elasticsearch", "platform"=>"java", "ruby_version"=>">= 0", "prerelease"=>false,
-        "licenses"=>["apache-2.0"], "requirements"=>[], "sha"=>"194b27099c13605a882a3669e2363fdecccaab1de48dd44b0cda648dd5516799"} ]
+      [{ "authors" => "Elastic", "built_at" => "2015-08-11T00:00:00.000Z", "description" => "Output events to elasticsearch",
+          "downloads_count" => 1638, "metadata" => {"logstash_group" => "output", "logstash_plugin" => "true"}, "number" => "2.0.0.pre",
+          "summary" => "Logstash Output to Elasticsearch", "platform" => "java", "ruby_version" => ">= 0", "prerelease" => true,
+          "licenses" => ["apache-2.0"], "requirements" => [], "sha" => "194b27099c13605a882a3669e2363fdecccaab1de48dd44b0cda648dd5516799"},
+      { "authors" => "Elastic", "built_at" => "2015-08-10T00:00:00.000Z", "description" => "Output events to elasticsearch",
+        "downloads_count" => 1638, "metadata" => {"logstash_group" => "output", "logstash_plugin" => "true"}, "number" => "1.0.7",
+        "summary" => "Logstash Output to Elasticsearch", "platform" => "java", "ruby_version" => ">= 0", "prerelease" => false,
+        "licenses" => ["apache-2.0"], "requirements" => [], "sha" => "194b27099c13605a882a3669e2363fdecccaab1de48dd44b0cda648dd5516799"},
+      { "authors" => "Elastic", "built_at" => "2015-08-09T00:00:00.000Z", "description" => "Output events to elasticsearch",
+        "downloads_count" => 1638, "metadata" => {"logstash_group" => "output", "logstash_plugin" => "true"}, "number" => "1.0.4",
+        "summary" => "Logstash Output to Elasticsearch", "platform" => "java", "ruby_version" => ">= 0", "prerelease" => false,
+        "licenses" => ["apache-2.0"], "requirements" => [], "sha" => "194b27099c13605a882a3669e2363fdecccaab1de48dd44b0cda648dd5516799"}]
     end
 
     before(:each) do
@@ -33,7 +48,6 @@ describe LogStash::PluginManager do
         expect(version_info["number"]).to eq("1.0.7")
       end
 
-
       it "should search for the last version information with prerelease" do
         version_info = LogStash::PluginManager.fetch_latest_version_info(plugin_name, :pre => true)
         expect(version_info["number"]).to eq("2.0.0.pre")
@@ -45,7 +59,7 @@ describe LogStash::PluginManager do
     let(:plugin)  { "foo" }
     let(:version) { "9.0.0.0" }
 
-    let(:sources) { ["http://source.01", "http://source.02"] }
+    let(:sources) { ["https://rubygems.org"] }
     let(:options) { {:rubygems_source => sources} }
 
     let(:gemset)  { double("gemset") }
@@ -56,16 +70,27 @@ describe LogStash::PluginManager do
     before(:each) do
       allow(gemfile).to  receive(:gemset).and_return(gemset)
       allow(gemset).to   receive(:sources).and_return(sources)
-      expect(fetcher).to receive(:spec_for_dependency).and_return([[],[]])
+      expect(fetcher).to receive(:spec_for_dependency).and_return([[], []])
     end
 
     it "should load all available sources" do
       expect(subject).to receive(:plugin_file?).and_return(false)
-      expect(Gem::Dependency).to receive(:new).and_return(dep)
+      expect(subject).to receive(:_gem_dependency).with(plugin, version).and_return(dep).once
       expect(Gem::SpecFetcher).to receive(:fetcher).and_return(fetcher)
 
       subject.logstash_plugin?(plugin, version, options)
       expect(Gem.sources.map { |source| source }).to eq(sources)
     end
   end
+
+  describe "process alias yaml definition" do
+    let(:path) { File.expand_path('plugin_aliases.yml', __dir__) }
+
+    it "decodes correctly" do
+      aliases = subject.load_aliases_definitions(path)
+      expect(aliases['logstash-input-aliased_input1']).to eq('logstash-input-beats')
+      expect(aliases['logstash-input-aliased_input2']).to eq('logstash-input-tcp')
+      expect(aliases['logstash-filter-aliased_filter']).to eq('logstash-filter-json')
+    end
+  end
 end
diff --git a/spec/unit/plugin_manager/utils/downloader_spec.rb b/spec/unit/plugin_manager/utils/downloader_spec.rb
index 2f7a105eb..aed0e07c0 100644
--- a/spec/unit/plugin_manager/utils/downloader_spec.rb
+++ b/spec/unit/plugin_manager/utils/downloader_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/utils/downloader"
 require "spec_helper"
 require "webmock/rspec"
diff --git a/spec/unit/plugin_manager/utils/http_client_spec.rb b/spec/unit/plugin_manager/utils/http_client_spec.rb
index e0d6510bd..e56d8220b 100644
--- a/spec/unit/plugin_manager/utils/http_client_spec.rb
+++ b/spec/unit/plugin_manager/utils/http_client_spec.rb
@@ -1,5 +1,22 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "pluginmanager/utils/http_client"
+require "net/http"
 require "uri"
 
 describe LogStash::PluginManager::Utils::HttpClient do
@@ -88,9 +105,13 @@ describe LogStash::PluginManager::Utils::HttpClient do
       end
 
       context "with redirects" do
-        let(:redirect_response) { instance_double("Net::HTTP::Response", :code => "302", :headers => { "location" => "https://localhost:8888/new_path" }) }
+        let(:location) { "https://localhost:8888/new_path" }
+        let(:redirect_response) { instance_double("Net::HTTP::Response", :code => "302", :headers => { "location" => location }) }
         let(:response_ok) { instance_double("Net::HTTP::Response", :code => "200") }
 
+        before(:each) do
+          allow(redirect_response).to receive(:[]).with("location").and_return(location)
+        end
         it "follow 1 level redirect" do
           expect(mock_http).to receive(:request).with(kind_of(Net::HTTP::Head)).and_return(redirect_response)
           expect(mock_http).to receive(:request).with(kind_of(Net::HTTP::Head)).and_return(response_ok)
diff --git a/spec/unit/util/compress_spec.rb b/spec/unit/util/compress_spec.rb
index 33133c093..9958f2492 100644
--- a/spec/unit/util/compress_spec.rb
+++ b/spec/unit/util/compress_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "spec_helper"
 require 'ostruct'
 require "bootstrap/util/compress"
@@ -38,11 +54,9 @@ def list_files(target)
 end
 
 describe LogStash::Util::Zip do
-
   subject { Class.new { extend LogStash::Util::Zip } }
 
   context "#extraction" do
-
     let(:source) { File.join(File.expand_path("."), "source_file.zip") }
     let(:target) { File.expand_path("target_dir") }
 
@@ -52,7 +66,7 @@ describe LogStash::Util::Zip do
     end
 
     let(:zip_file) do
-      [ "foo", "bar", "zoo" ].inject([]) do |acc, name|
+      ["foo", "bar", "zoo"].inject([]) do |acc, name|
         acc << OpenStruct.new(:name => name)
         acc
       end
@@ -120,7 +134,7 @@ describe LogStash::Util::Zip do
     end
 
     let(:dir_files) do
-      [ "foo", "bar", "zoo" ]
+      ["foo", "bar", "zoo"]
     end
 
     let(:zip_file) { Class.new }
@@ -135,7 +149,6 @@ describe LogStash::Util::Zip do
 end
 
 describe LogStash::Util::Tar do
-
   subject { Class.new { extend LogStash::Util::Tar } }
 
   context "#extraction" do
@@ -150,7 +163,7 @@ describe LogStash::Util::Tar do
     let(:gzip_file) { Class.new }
 
     let(:tar_file) do
-      [ "foo", "bar", "zoo" ].inject([]) do |acc, name|
+      ["foo", "bar", "zoo"].inject([]) do |acc, name|
         acc << OpenStruct.new(:full_name => name)
         acc
       end
@@ -167,7 +180,6 @@ describe LogStash::Util::Tar do
   end
 
   context "#compression" do
-
     let(:target) { File.join(File.expand_path("."), "target_file.tar.gz") }
     let(:source) { File.expand_path("source_dir") }
 
@@ -177,7 +189,7 @@ describe LogStash::Util::Tar do
     end
 
     let(:dir_files) do
-      [ "foo", "bar", "zoo" ]
+      ["foo", "bar", "zoo"]
     end
 
     let(:tar_file) { Class.new }
diff --git a/tools/benchmark-cli/README.md b/tools/benchmark-cli/README.md
index d9d012e0a..18f6e88c7 100644
--- a/tools/benchmark-cli/README.md
+++ b/tools/benchmark-cli/README.md
@@ -14,33 +14,38 @@ which will create the output jar under `build/libs/benchmark-cli.jar`.
 
 ```bash
 $ java -cp 'benchmark-cli.jar:*' org.logstash.benchmark.cli.Main --help
-Option                           Description                                    
-------                           -----------                                    
---distribution-version <String>  The version of a Logstash build to download    
-                                   from elastic.co.                             
---elasticsearch-export <String>  Optional Elasticsearch host URL to store       
-                                   detailed results at. (default: )                       
---git-hash <String>              Either a git tree (tag/branch or commit hash), 
-                                   optionally prefixed by a Github username,    
-                                 if ran against forks.                          
-                                 E.g.                                           
-                                   'ab1cfe8cf7e20114df58bcc6c996abcb2b0650d7',  
-                                 'user-                                         
+Option                           Description
+------                           -----------
+--config <File>                  Path to custom logstash config. Required if
+                                   testcase is set to 'custom'
+--data <File>                    Path to custom logstash data. Only if testcase
+                                   is set to 'custom'
+--distribution-version <String>  The version of a Logstash build to download
+                                   from elastic.co.
+--elasticsearch-export <String>  Optional Elasticsearch host URL to store
+                                   detailed results at. (default: )
+--git-hash <String>              Either a git tree (tag/branch or commit hash),
+                                   optionally prefixed by a Github username,
+                                 if ran against forks.
+                                 E.g.
+                                   'ab1cfe8cf7e20114df58bcc6c996abcb2b0650d7',
+                                 'user-
                                    name#ab1cfe8cf7e20114df58bcc6c996abcb2b0650d7'
-                                   or 'master'                                  
---local-path <String>            Path to the root of a local Logstash           
-                                   distribution.                                
-                                  E.g. `/opt/logstash`                          
---ls-batch-size <Integer>        Logstash batch size (-b argument) to           
-                                   configure. (default: 128)                    
---ls-workers <Integer>           Number of Logstash worker threads (-w          
-                                   argument) to configure. (default: 2)         
---repeat-data <Integer>          Sets how often the test's dataset should be    
-                                   run. (default: 1)                            
---testcase <String>              Currently available test cases are 'baseline'  
-                                   and 'apache'. (default: baseline)            
---workdir <File>                 Working directory to store cached files in.    
-                                   (default: ~/.logstash-benchmarks)  
+                                   or 'main'
+--local-path <String>            Path to the root of a local Logstash
+                                   distribution.
+                                  E.g. `/opt/logstash`
+--ls-batch-size <Integer>        Logstash batch size (-b argument) to
+                                   configure. (default: 128)
+--ls-workers <Integer>           Number of Logstash worker threads (-w
+                                   argument) to configure. (default: 2)
+--repeat-data <Integer>          Sets how often the test's dataset should be
+                                   run. (default: 1)
+--testcase <String>              Currently available test cases are 'baseline',
+                                   'apache' and 'custom'. (default: baseline)
+--workdir <File>                 Working directory to store cached files in.
+                                   (default: /Users/d059176/.logstash-
+                                   benchmarks) 
 ```
 
 ##### Example
diff --git a/tools/benchmark-cli/build.gradle b/tools/benchmark-cli/build.gradle
index 9668d7ba2..df9990250 100644
--- a/tools/benchmark-cli/build.gradle
+++ b/tools/benchmark-cli/build.gradle
@@ -1,44 +1,66 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 import org.yaml.snakeyaml.Yaml
 
-// fetch version from Logstash's master versions.yml file
+// fetch version from Logstash's main versions.yml file
 def versionMap = (Map) (new Yaml()).load(new File("$projectDir/../../versions.yml").text)
 
 description = """Logstash End to End Benchmarking Utility"""
 version = versionMap['logstash-core']
+String jacksonVersion = versionMap['jackson']
+String jacksonDatabindVersion = versionMap['jackson-databind']
 
 repositories {
   mavenCentral()
-  jcenter()
 }
 
 buildscript {
   repositories {
     mavenCentral()
-    jcenter()
+    gradlePluginPortal()
   }
   dependencies {
-    classpath 'org.yaml:snakeyaml:1.17'
-    classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'
+    classpath group: 'org.yaml', name: 'snakeyaml', version: "${snakeYamlVersion}"
+    classpath "com.github.johnrengelman:shadow:${shadowGradlePluginVersion}"
   }
 }
 
 ext {
-  jmh = '1.18'
-  elasticsearch = '5.5.0'
+  jmh = '1.37'
+  elasticsearch = '5.6.16'
 }
 
 dependencies {
-  compile 'net.sf.jopt-simple:jopt-simple:5.0.3'
-  compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3'
-  compile group: 'org.apache.commons', name: 'commons-compress', version: '1.14'
-  compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.6'
-  compile group: 'commons-io', name: 'commons-io', version: '2.5'
-  compile 'com.fasterxml.jackson.core:jackson-core:2.7.4'
-  compile 'com.fasterxml.jackson.core:jackson-databind:2.7.4'
-  compile group: 'org.elasticsearch.client', name: 'rest', version: elasticsearch
-  compile "org.openjdk.jmh:jmh-core:$jmh"
-  testCompile group: 'com.github.tomakehurst', name: 'wiremock-standalone', version: '2.6.0'
-  testCompile "junit:junit:4.12"
+  implementation 'net.sf.jopt-simple:jopt-simple:5.0.4'
+  implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.14'
+  implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.26.1'
+  implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0'
+  implementation group: 'commons-codec', name: 'commons-codec', version: '1.17.0' // transitively required by httpclient
+
+  implementation group: 'commons-io', name: 'commons-io', version: '2.16.1'
+  implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
+  api "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"
+  implementation group: 'org.elasticsearch.client', name: 'elasticsearch-rest-client', version: elasticsearch
+  implementation "org.openjdk.jmh:jmh-core:$jmh"
+  testImplementation group: 'org.wiremock', name: 'wiremock-standalone', version: '3.0.4'
+
+  testImplementation "junit:junit:4.13.2"
 }
 
 javadoc {
@@ -54,11 +76,12 @@ test {
 }
 
 apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: 'java'
 
 shadowJar {
-  baseName = 'benchmark-cli'
-  classifier = null
-  version = null
+  archiveBaseName = 'benchmark-cli'
+  archiveClassifier = null
+  archiveVersion = ''
 }
 
 assemble.dependsOn shadowJar
diff --git a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/BenchmarkMeta.java b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/BenchmarkMeta.java
index fb20c4ffe..edc8886d1 100644
--- a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/BenchmarkMeta.java
+++ b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/BenchmarkMeta.java
@@ -1,7 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.nio.file.Path;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -12,6 +33,10 @@ public final class BenchmarkMeta {
 
     private final String testcase;
 
+    private final Path configpath;
+
+    private final Path datapath;
+
     private final String version;
 
     private final LsVersionType vtype;
@@ -20,15 +45,18 @@ public final class BenchmarkMeta {
 
     private final int batchsize;
 
-    BenchmarkMeta(final String testcase, final String version, final LsVersionType vtype,
-        final int workers, final int batchsize) {
+    BenchmarkMeta(final String testcase, final Path configpath, final Path datapath, final String version, final LsVersionType vtype,
+                  final int workers, final int batchsize) {
         this.testcase = testcase;
+        this.configpath = configpath;
+        this.datapath = datapath;
         this.version = version;
         this.vtype = vtype;
         this.workers = workers;
         this.batchsize = batchsize;
     }
 
+
     public String getVersion() {
         return version;
     }
@@ -37,6 +65,14 @@ public final class BenchmarkMeta {
         return testcase;
     }
 
+    public Path getConfigPath() { 
+        return configpath; 
+    }
+
+    public Path getDataPath() { 
+        return datapath; 
+    }
+
     public LsVersionType getVtype() {
         return vtype;
     }
@@ -52,6 +88,7 @@ public final class BenchmarkMeta {
     public Map<String, Object> asMap() {
         final Map<String, Object> result = new HashMap<>();
         result.put("test_name", testcase);
+        result.put("test_config_path", configpath);
         result.put("os_name", SystemUtils.OS_NAME);
         result.put("os_version", SystemUtils.OS_VERSION);
         try {
diff --git a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/DataStore.java b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/DataStore.java
index 872993fbf..04d463046 100644
--- a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/DataStore.java
+++ b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/DataStore.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli;
 
 import java.io.Closeable;
diff --git a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/JRubyInstallation.java b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/JRubyInstallation.java
index 044dc312f..5d28cb8a0 100644
--- a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/JRubyInstallation.java
+++ b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/JRubyInstallation.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli;
 
 import java.io.IOException;
diff --git a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/LogstashInstallation.java b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/LogstashInstallation.java
index 189faca0c..aefe713f3 100644
--- a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/LogstashInstallation.java
+++ b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/LogstashInstallation.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli;
 
 import java.io.File;
@@ -94,12 +114,73 @@ public interface LogstashInstallation {
 
         private static void download(final File pwd, final String version)
             throws IOException, NoSuchAlgorithmException {
-            LsBenchDownloader.downloadDecompress(
-                pwd,
-                String.format(
-                    "https://artifacts.elastic.co/downloads/logstash/logstash-%s.zip", version
-                )
-            );
+
+            final String arch = retrieveCPUArchitecture();
+            final String os = retrieveOS();
+            final String extension = "windows".equals(os) ? "zip" : "tar.gz";
+
+            final String downloadUrl;
+            if (compareVersions(version, "7.10.0") >= 0) {
+                // version >= 7.10.0 url format
+                downloadUrl = String.format(
+                        "https://artifacts.elastic.co/downloads/logstash/logstash-%s-%s-%s.%s", version, os, arch, extension
+                );
+            } else {
+                // version < 7.10.0 url format
+                downloadUrl = String.format(
+                        "https://artifacts.elastic.co/downloads/logstash/logstash-%s.%s", version, extension
+                );
+            }
+
+            LsBenchDownloader.downloadDecompress(pwd, downloadUrl);
+        }
+
+        private static int compareVersions(String s, String t) {
+            final String[] sSplits = s.split("\\.");
+            final int sMajor = Integer.parseInt(sSplits[0]);
+            final int sMinor = Integer.parseInt(sSplits[1]);
+            final int sPatch = Integer.parseInt(sSplits[2]);
+
+            final String[] tSplits = t.split("\\.");
+            final int tMajor = Integer.parseInt(tSplits[0]);
+            final int tMinor = Integer.parseInt(tSplits[1]);
+            final int tPatch = Integer.parseInt(tSplits[2]);
+
+            if (sMajor == tMajor) {
+                if (sMinor == tMinor) {
+                    return Integer.compare(sPatch, tPatch);
+                } else {
+                    return Integer.compare(sMinor, tMinor);
+                }
+            } else {
+                return Integer.compare(sMajor, tMajor);
+            }
+        }
+
+        private static String retrieveOS() {
+            String osName = System.getProperty("os.name");
+            if (osName.matches("Mac OS X")) {
+                return "darwin";
+            }
+            if (osName.matches("[Ll]inux")) {
+                return "linux";
+            }
+            if (osName.matches("Windows")) {
+                return "windows";
+            }
+            throw new IllegalArgumentException("Unrecognized OS: " + osName);
+        }
+
+        private static String retrieveCPUArchitecture() {
+            final String arch = System.getProperty("os.arch");
+            switch (arch) {
+                case "aarch64":
+                    return "aarch64";
+                case "amd64":
+                    return "x86_64";
+                default:
+                    return arch;
+            }
         }
 
         private static LogstashInstallation setup(final Path location) {
diff --git a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/LsBenchSettings.java b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/LsBenchSettings.java
index e793284d4..a80980456 100644
--- a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/LsBenchSettings.java
+++ b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/LsBenchSettings.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli;
 
 /**
diff --git a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/LsMetricsMonitor.java b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/LsMetricsMonitor.java
index 3bf842282..4b05ea236 100644
--- a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/LsMetricsMonitor.java
+++ b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/LsMetricsMonitor.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli;
 
 import java.io.ByteArrayOutputStream;
@@ -40,6 +60,7 @@ public final class LsMetricsMonitor implements Callable<EnumMap<LsMetricStats, L
         long count = 0L;
         final ListStatistics counts = new ListStatistics();
         final ListStatistics cpu = new ListStatistics();
+        final ListStatistics mem = new ListStatistics();
         long start = System.nanoTime();
         while (running) {
             try {
@@ -53,12 +74,13 @@ public final class LsMetricsMonitor implements Callable<EnumMap<LsMetricStats, L
                 final long newstrt = System.nanoTime();
                 stats.addValue(
                     (double) (newcount - count) /
-                        (double) TimeUnit.SECONDS.convert(newstrt - start, TimeUnit.NANOSECONDS)
+                        (double) TimeUnit.SECONDS.convert(Math.max(newstrt - start, 1_000_000_000), TimeUnit.NANOSECONDS)
                 );
                 start = newstrt;
                 count = newcount;
                 counts.addValue((double) count);
                 cpu.addValue(newcounts[1]);
+                mem.addValue(newcounts[2]);
             } catch (final InterruptedException ex) {
                 throw new IllegalStateException(ex);
             }
@@ -67,6 +89,7 @@ public final class LsMetricsMonitor implements Callable<EnumMap<LsMetricStats, L
         result.put(LsMetricStats.THROUGHPUT, stats);
         result.put(LsMetricStats.COUNT, counts);
         result.put(LsMetricStats.CPU_USAGE, cpu);
+        result.put(LsMetricStats.HEAP_USAGE, mem);
         store.store(result);
         return result;
     }
@@ -85,22 +108,20 @@ public final class LsMetricsMonitor implements Callable<EnumMap<LsMetricStats, L
                 return new long[]{-1L, -1L};
             }
             final Map<String, Object> data = LsBenchJsonUtil.deserializeMetrics(baos.toByteArray());
-            final long count;
-            if (data.containsKey("pipeline")) {
-                count = readNestedLong(data, "pipeline", "events", "filtered");
-
-            } else if (data.containsKey("events")) {
-                count = readNestedLong(data, "events", "filtered");
-            } else {
-                count = -1L;
-            }
+            final long count = getEventCount(data);
             final long cpu;
             if (count == -1L) {
                 cpu = -1L;
             } else {
                 cpu = readNestedLong(data, "process", "cpu", "percent");
             }
-            return new long[]{count, cpu};
+            final long heapUsed;
+            if(count == -1L) {
+                heapUsed = -1L;
+            } else {
+                heapUsed = readNestedLong(data, "jvm", "mem", "heap_used_percent");
+            }
+            return new long[]{count, cpu, heapUsed};
         } catch (final IOException ex) {
             throw new IllegalStateException(ex);
         }
@@ -115,6 +136,19 @@ public final class LsMetricsMonitor implements Callable<EnumMap<LsMetricStats, L
         return ((Number) nested.get(path[path.length - 1])).longValue();
     }
 
+    @SuppressWarnings("unchecked")
+    private long getEventCount(Map<String, Object> data) {
+        final long count;
+        if (data.containsKey("pipeline") && ((Map<String, Object>) data.get("pipeline")).containsKey("events")) {
+            count = readNestedLong(data, "pipeline", "events", "filtered");
+        } else if (data.containsKey("events")) {
+            count = readNestedLong(data, "events", "filtered");
+        } else {
+            count = -1L;
+        }
+        return count;
+    }
+
     /**
      * Runs a {@link LsMetricsMonitor} instance in a background thread.
      */
diff --git a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/Main.java b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/Main.java
index 94a822b79..63f961ee2 100644
--- a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/Main.java
+++ b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/Main.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli;
 
 import java.io.File;
@@ -17,6 +37,7 @@ import joptsimple.OptionSpec;
 import joptsimple.OptionSpecBuilder;
 import org.logstash.benchmark.cli.cases.ApacheLogsComplex;
 import org.logstash.benchmark.cli.cases.Case;
+import org.logstash.benchmark.cli.cases.CustomTestCase;
 import org.logstash.benchmark.cli.cases.GeneratorToStdout;
 import org.logstash.benchmark.cli.ui.LsMetricStats;
 import org.logstash.benchmark.cli.ui.LsVersionType;
@@ -67,6 +88,12 @@ public final class Main {
         final OptionSpec<String> testcase = parser.accepts(
             UserInput.TEST_CASE_PARAM, UserInput.TEST_CASE_HELP
         ).withRequiredArg().ofType(String.class).defaultsTo(GeneratorToStdout.IDENTIFIER).forHelp();
+        final OptionSpec<File> testcaseconfig = parser.accepts(
+                UserInput.TEST_CASE_CONFIG_PARAM, UserInput.TEST_CASE_CONFIG_HELP
+        ).withRequiredArg().ofType(File.class).forHelp();
+        final OptionSpec<File> testcasedata = parser.accepts(
+            UserInput.TEST_CASE_DATA_PARAM, UserInput.TEST_CASE_DATA_HELP
+            ).withRequiredArg().ofType(File.class).forHelp();
         final OptionSpec<File> pwd = parser.accepts(
             UserInput.WORKING_DIRECTORY_PARAM, UserInput.WORKING_DIRECTORY_HELP
         ).withRequiredArg().ofType(File.class).defaultsTo(UserInput.WORKING_DIRECTORY_DEFAULT)
@@ -108,8 +135,27 @@ public final class Main {
         settings.setProperty(
             LsBenchSettings.INPUT_DATA_REPEAT, String.valueOf(options.valueOf(repeats))
         );
+
+        Path testCaseConfigPath = null;
+        Path testCaseDataPath = null;
+        if (options.valueOf(testcase).equals("custom")) {
+            if (options.has(testcaseconfig)) {
+                testCaseConfigPath = options.valueOf(testcaseconfig).toPath();
+            }
+            else {
+                throw new IllegalArgumentException("Path to Test Case Config must be provided");
+            }
+            if (options.has(testcasedata)) {
+                testCaseDataPath = options.valueOf(testcasedata).toPath();
+            }
+        } else {
+            if (options.has(testcaseconfig) || options.has(testcasedata)) {
+                throw new IllegalArgumentException("Path to Test Case Config or Data can only be used with Custom Test Case");
+        }
+    }
+
         final BenchmarkMeta runConfig = new BenchmarkMeta(
-            options.valueOf(testcase), version, type, options.valueOf(workers),
+            options.valueOf(testcase), testCaseConfigPath, testCaseDataPath, version, type, options.valueOf(workers),
             options.valueOf(batchsize)
         );
         execute(
@@ -148,6 +194,12 @@ public final class Main {
                 Integer.parseInt(settings.getProperty(LsBenchSettings.INPUT_DATA_REPEAT))
             )
         );
+        if (runConfig.getTestcase().equals("custom")) {
+            output.green(
+                    String.format("Test Case Config: %s", runConfig.getConfigPath())
+            );
+        }
+
         output.printLine();
         Files.createDirectories(cwd);
         final LogstashInstallation logstash;
@@ -185,7 +237,10 @@ public final class Main {
             testcase = new GeneratorToStdout(store, logstash, settings, runConfig);
         } else if (ApacheLogsComplex.IDENTIFIER.equalsIgnoreCase(test)) {
             testcase = new ApacheLogsComplex(store, logstash, cwd, settings, output, runConfig);
-        } else {
+        } else if (CustomTestCase.IDENTIFIER.equalsIgnoreCase(test)) {
+            testcase = new CustomTestCase(store, logstash, cwd, settings, output, runConfig);
+        }
+        else {
             throw new IllegalArgumentException(String.format("Unknown test case %s", test));
         }
         return testcase;
diff --git a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/cases/ApacheLogsComplex.java b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/cases/ApacheLogsComplex.java
index d10aad2aa..7247f37c2 100644
--- a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/cases/ApacheLogsComplex.java
+++ b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/cases/ApacheLogsComplex.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli.cases;
 
 import java.io.ByteArrayOutputStream;
diff --git a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/cases/Case.java b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/cases/Case.java
index c88e3aca4..d5054580c 100644
--- a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/cases/Case.java
+++ b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/cases/Case.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli.cases;
 
 import java.util.AbstractMap;
diff --git a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/cases/CustomTestCase.java b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/cases/CustomTestCase.java
new file mode 100644
index 000000000..ce713831b
--- /dev/null
+++ b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/cases/CustomTestCase.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.benchmark.cli.cases;
+
+import org.apache.commons.io.IOUtils;
+import org.logstash.benchmark.cli.*;
+import org.logstash.benchmark.cli.ui.LsMetricStats;
+import org.logstash.benchmark.cli.ui.UserOutput;
+import org.openjdk.jmh.util.ListStatistics;
+
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.AbstractMap;
+import java.util.Properties;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
+
+public class CustomTestCase implements Case {
+    public static final String IDENTIFIER = "custom";
+
+    private final LogstashInstallation logstash;
+    private final DataStore store;
+    private final Path configpath;
+    private final File data;
+    private final int repeats;
+
+    public CustomTestCase(DataStore store, LogstashInstallation logstash, Path cwd, Properties settings,
+            UserOutput output, BenchmarkMeta runConfig) {
+        this.logstash = logstash;
+        logstash.configure(runConfig);
+        if (runConfig.getDataPath() != null) {
+            data = runConfig.getDataPath().toFile();
+        } else {
+            data = null;
+        }
+        this.store = store;
+        this.configpath = runConfig.getConfigPath();
+        this.repeats = Integer.parseInt(settings.getProperty(LsBenchSettings.INPUT_DATA_REPEAT));
+    }
+
+    @Override
+    public AbstractMap<LsMetricStats, ListStatistics> run() {
+        try (final LsMetricsMonitor.MonitorExecution monitor = new LsMetricsMonitor.MonitorExecution(logstash.metrics(),
+                store)) {
+            final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+            try (final InputStream cfg = Files.newInputStream(configpath)) {
+                IOUtils.copy(cfg, baos);
+            }
+            if (data != null) {
+                logstash.execute(baos.toString(), data, repeats);
+            } else {
+                logstash.execute(baos.toString());
+            }
+            return monitor.stopAndGet();
+        } catch (final IOException | InterruptedException | ExecutionException | TimeoutException ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
+}
diff --git a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/cases/GeneratorToStdout.java b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/cases/GeneratorToStdout.java
index 18858fc78..6538ff73e 100644
--- a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/cases/GeneratorToStdout.java
+++ b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/cases/GeneratorToStdout.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli.cases;
 
 import java.io.IOException;
diff --git a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/ui/LsMetricStats.java b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/ui/LsMetricStats.java
index 90cb7d798..86f560724 100644
--- a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/ui/LsMetricStats.java
+++ b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/ui/LsMetricStats.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli.ui;
 
 /**
@@ -15,5 +35,7 @@ public enum LsMetricStats {
     /**
      * Statistics on CPU usage.
      */
-    CPU_USAGE
+    CPU_USAGE,
+
+    HEAP_USAGE
 }
diff --git a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/ui/LsVersionType.java b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/ui/LsVersionType.java
index 1f0787663..b4da85f5a 100644
--- a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/ui/LsVersionType.java
+++ b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/ui/LsVersionType.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli.ui;
 
 /**
diff --git a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/ui/UserInput.java b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/ui/UserInput.java
index 7347ac462..d51ea0f94 100644
--- a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/ui/UserInput.java
+++ b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/ui/UserInput.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli.ui;
 
 import java.io.File;
@@ -32,7 +52,7 @@ public final class UserInput {
     public static final String TEST_CASE_PARAM = "testcase";
 
     public static final String TEST_CASE_HELP =
-        "Currently available test cases are 'baseline' and 'apache'.";
+        "Currently available test cases are 'baseline', 'apache' and 'custom'.";
 
     public static final String LS_WORKER_THREADS = "ls-workers";
 
@@ -66,7 +86,7 @@ public final class UserInput {
         "Either a git tree (tag/branch or commit hash), optionally prefixed by a Github username,",
         "if ran against forks.",
         "E.g. 'ab1cfe8cf7e20114df58bcc6c996abcb2b0650d7',",
-        "'user-name#ab1cfe8cf7e20114df58bcc6c996abcb2b0650d7' or 'master'"
+        "'user-name#ab1cfe8cf7e20114df58bcc6c996abcb2b0650d7' or 'main'"
     );
 
     public static final String LOCAL_VERSION_PARAM = "local-path";
@@ -79,6 +99,14 @@ public final class UserInput {
     public static final String WORKING_DIRECTORY_HELP =
             "Working directory to store cached files in.";
 
+    public static final String TEST_CASE_CONFIG_PARAM = "config";
+    public static final String TEST_CASE_CONFIG_HELP =
+            "Path to custom logstash config. Required if testcase is set to 'custom'";
+
+    public static final String TEST_CASE_DATA_PARAM = "data";
+    public static final String TEST_CASE_DATA_HELP =
+            "Path to custom logstash data. Only if testcase is set to 'custom'";
+
     /**
      * Constructor.
      */
diff --git a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/ui/UserOutput.java b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/ui/UserOutput.java
index a67a3ff89..98bfa9301 100644
--- a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/ui/UserOutput.java
+++ b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/ui/UserOutput.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli.ui;
 
 import java.io.PrintStream;
@@ -80,6 +100,11 @@ public final class UserOutput {
                 "Mean CPU Usage: %.2f%%", stats.get(LsMetricStats.CPU_USAGE).getMean()
             )
         );
+        green(
+                String.format(
+                        "Mean Heap Usage: %.2f%%", stats.get(LsMetricStats.HEAP_USAGE).getMean()
+                )
+        );
     }
     
     private static String colorize(final String line, final String prefix) {
diff --git a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/util/LsBenchCompressUtil.java b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/util/LsBenchCompressUtil.java
index cfaeee4ab..6adf0c35e 100644
--- a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/util/LsBenchCompressUtil.java
+++ b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/util/LsBenchCompressUtil.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli.util;
 
 import java.io.BufferedInputStream;
@@ -13,7 +33,7 @@ import org.apache.commons.compress.archivers.ArchiveInputStream;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
 import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
-import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.io.IOUtils;
 
 /**
  * Utility class for decompressing archives.
@@ -28,7 +48,7 @@ final class LsBenchCompressUtil {
         if (!folder.exists() && !folder.mkdir()) {
             throw new IllegalStateException("unzip failed");
         }
-        try (ArchiveInputStream zis = new ZipArchiveInputStream(new FileInputStream(zipFile))) {
+        try (ArchiveInputStream<?> zis = new ZipArchiveInputStream(new FileInputStream(zipFile))) {
             unpackDir(folder, zis);
         }
     }
@@ -44,7 +64,7 @@ final class LsBenchCompressUtil {
         LsBenchFileUtil.ensureDeleted(ball);
     }
 
-    private static void unpackDir(final File destination, final ArchiveInputStream archive)
+    private static void unpackDir(final File destination, final ArchiveInputStream<?> archive)
         throws IOException {
         ArchiveEntry entry = archive.getNextEntry();
         while (entry != null) {
diff --git a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/util/LsBenchDownloader.java b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/util/LsBenchDownloader.java
index 30feda67a..c7fb59983 100644
--- a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/util/LsBenchDownloader.java
+++ b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/util/LsBenchDownloader.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli.util;
 
 import java.io.BufferedOutputStream;
@@ -37,7 +57,7 @@ public final class LsBenchDownloader {
                     target.flush();
                 }
             }
-            if (GzipUtils.isCompressedFilename(url)) {
+            if (GzipUtils.isCompressedFileName(url)) {
                 LsBenchCompressUtil.gunzipDir(temp, file);
             }
             if (url.endsWith(".zip")) {
diff --git a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/util/LsBenchFileUtil.java b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/util/LsBenchFileUtil.java
index 66e5696c1..a772af3dd 100644
--- a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/util/LsBenchFileUtil.java
+++ b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/util/LsBenchFileUtil.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli.util;
 
 import java.io.File;
diff --git a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/util/LsBenchJsonUtil.java b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/util/LsBenchJsonUtil.java
index 6e4c34711..0f9fac079 100644
--- a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/util/LsBenchJsonUtil.java
+++ b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/util/LsBenchJsonUtil.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli.util;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/util/LsBenchLsSetup.java b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/util/LsBenchLsSetup.java
index 3064f42d6..6688cc4bb 100644
--- a/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/util/LsBenchLsSetup.java
+++ b/tools/benchmark-cli/src/main/java/org/logstash/benchmark/cli/util/LsBenchLsSetup.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli.util;
 
 import java.io.File;
diff --git a/tools/benchmark-cli/src/test/java/org/logstash/benchmark/cli/LsMetricsMonitorTest.java b/tools/benchmark-cli/src/test/java/org/logstash/benchmark/cli/LsMetricsMonitorTest.java
index cd7b03808..14f35c4ee 100644
--- a/tools/benchmark-cli/src/test/java/org/logstash/benchmark/cli/LsMetricsMonitorTest.java
+++ b/tools/benchmark-cli/src/test/java/org/logstash/benchmark/cli/LsMetricsMonitorTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli;
 
 import com.github.tomakehurst.wiremock.client.WireMock;
@@ -37,7 +57,7 @@ public final class LsMetricsMonitorTest {
         ) {
             TimeUnit.SECONDS.sleep(5L);
             final Statistics stats = monitor.stopAndGet().get(LsMetricStats.THROUGHPUT);
-            MatcherAssert.assertThat(stats.getMax(), CoreMatchers.is(21052.0D));
+            MatcherAssert.assertThat(stats.getMax(), CoreMatchers.is(170250.0D));
         }
     }
 
@@ -55,7 +75,7 @@ public final class LsMetricsMonitorTest {
         ) {
             TimeUnit.SECONDS.sleep(5L);
             final Statistics stats = monitor.stopAndGet().get(LsMetricStats.CPU_USAGE);
-            MatcherAssert.assertThat(stats.getMax(), CoreMatchers.is(63.0D));
+            MatcherAssert.assertThat(stats.getMax(), CoreMatchers.is(33.0D));
         }
     }
 
diff --git a/tools/benchmark-cli/src/test/java/org/logstash/benchmark/cli/MainEsStorageTest.java b/tools/benchmark-cli/src/test/java/org/logstash/benchmark/cli/MainEsStorageTest.java
index 9b48a2c98..276cdb54d 100644
--- a/tools/benchmark-cli/src/test/java/org/logstash/benchmark/cli/MainEsStorageTest.java
+++ b/tools/benchmark-cli/src/test/java/org/logstash/benchmark/cli/MainEsStorageTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli;
 
 import java.io.File;
diff --git a/tools/benchmark-cli/src/test/java/org/logstash/benchmark/cli/MainTest.java b/tools/benchmark-cli/src/test/java/org/logstash/benchmark/cli/MainTest.java
index 217d9daaa..49e6a48f7 100644
--- a/tools/benchmark-cli/src/test/java/org/logstash/benchmark/cli/MainTest.java
+++ b/tools/benchmark-cli/src/test/java/org/logstash/benchmark/cli/MainTest.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.benchmark.cli;
 
 import java.io.File;
@@ -25,7 +45,7 @@ public final class MainTest {
     public void downloadsDependenciesForGithub() throws Exception {
         final File pwd = temp.newFolder();
         Main.main(String.format("--workdir=%s", pwd.getAbsolutePath()));
-        final Path logstash = pwd.toPath().resolve("logstash").resolve("logstash-master");
+        final Path logstash = pwd.toPath().resolve("logstash").resolve("logstash-main");
         assertThat(logstash.toFile().exists(), is(true));
         final File jruby = pwd.toPath().resolve("jruby").toFile();
         assertThat(jruby.exists(), is(true));
@@ -97,4 +117,16 @@ public final class MainTest {
             String.format("--%s=%d", UserInput.REPEAT_PARAM, 2)
         );
     }
+
+    /**
+     * @throws Exception On Failure
+     */
+    @Test
+    public void runsCustomAgainstLocal() throws Exception {
+        Main.main(
+                String.format("--%s=custom", UserInput.TEST_CASE_PARAM),
+                String.format("--%s=%s", UserInput.TEST_CASE_CONFIG_PARAM, System.getProperty("logstash.benchmark.test.config.path") ),
+                String.format("--%s=%s", UserInput.LOCAL_VERSION_PARAM, System.getProperty("logstash.benchmark.test.local.path"))
+        );
+    }
 }
diff --git a/tools/benchmark-cli/src/test/resources/org/logstash/benchmark/cli/metrics.json b/tools/benchmark-cli/src/test/resources/org/logstash/benchmark/cli/metrics.json
index 261c8b5b0..8d423fa17 100644
--- a/tools/benchmark-cli/src/test/resources/org/logstash/benchmark/cli/metrics.json
+++ b/tools/benchmark-cli/src/test/resources/org/logstash/benchmark/cli/metrics.json
@@ -1,171 +1,225 @@
 {
-  "host": "localhost",
-  "version": "7.0.0-alpha1",
-  "http_address": "127.0.0.1:9600",
-  "id": "8bbabc13-ea58-4dcd-b94e-90ae5f692c17",
-  "name": "localhost",
-  "jvm": {
-    "threads": {
-      "count": 28,
-      "peak_count": 28
+  "host" : "robbaveys-MacBook-Pro.local",
+  "version" : "7.11.1",
+  "http_address" : "127.0.0.1:9600",
+  "id" : "175b5465-79f0-4224-ae62-87541308d55d",
+  "name" : "robbaveys-MacBook-Pro.local",
+  "ephemeral_id" : "4174f3c2-7bee-4d15-954e-8f891efd2f88",
+  "status" : "green",
+  "snapshot" : false,
+  "pipeline" : {
+    "workers" : 16,
+    "batch_size" : 125,
+    "batch_delay" : 50
+  },
+  "jvm" : {
+    "threads" : {
+      "count" : 67,
+      "peak_count" : 67
     },
-    "mem": {
-      "heap_used_percent": 16,
-      "heap_committed_in_bytes": 259522560,
-      "heap_max_in_bytes": 1037959168,
-      "heap_used_in_bytes": 168360000,
-      "non_heap_used_in_bytes": 113241032,
-      "non_heap_committed_in_bytes": 124989440,
-      "pools": {
-        "survivor": {
-          "peak_used_in_bytes": 8912896,
-          "used_in_bytes": 6872400,
-          "peak_max_in_bytes": 35782656,
-          "max_in_bytes": 35782656,
-          "committed_in_bytes": 8912896
+    "mem" : {
+      "heap_used_percent" : 17,
+      "heap_committed_in_bytes" : 1037959168,
+      "heap_max_in_bytes" : 1037959168,
+      "heap_used_in_bytes" : 185643752,
+      "non_heap_used_in_bytes" : 166507696,
+      "non_heap_committed_in_bytes" : 190033920,
+      "pools" : {
+        "old" : {
+          "used_in_bytes" : 126148912,
+          "peak_max_in_bytes" : 715849728,
+          "committed_in_bytes" : 715849728,
+          "max_in_bytes" : 715849728,
+          "peak_used_in_bytes" : 126148912
         },
-        "old": {
-          "peak_used_in_bytes": 141395984,
-          "used_in_bytes": 119128832,
-          "peak_max_in_bytes": 715849728,
-          "max_in_bytes": 715849728,
-          "committed_in_bytes": 178978816
+        "young" : {
+          "used_in_bytes" : 47101496,
+          "peak_max_in_bytes" : 286326784,
+          "committed_in_bytes" : 286326784,
+          "max_in_bytes" : 286326784,
+          "peak_used_in_bytes" : 286326784
         },
-        "young": {
-          "peak_used_in_bytes": 71630848,
-          "used_in_bytes": 42358768,
-          "peak_max_in_bytes": 286326784,
-          "max_in_bytes": 286326784,
-          "committed_in_bytes": 71630848
+        "survivor" : {
+          "used_in_bytes" : 12393344,
+          "peak_max_in_bytes" : 35782656,
+          "committed_in_bytes" : 35782656,
+          "max_in_bytes" : 35782656,
+          "peak_used_in_bytes" : 35782656
         }
       }
     },
-    "gc": {
-      "collectors": {
-        "old": {
-          "collection_time_in_millis": 89,
-          "collection_count": 3
+    "gc" : {
+      "collectors" : {
+        "old" : {
+          "collection_time_in_millis" : 487,
+          "collection_count" : 2
         },
-        "young": {
-          "collection_time_in_millis": 516,
-          "collection_count": 36
+        "young" : {
+          "collection_time_in_millis" : 226,
+          "collection_count" : 14
         }
       }
     },
-    "uptime_in_millis": 15055
+    "uptime_in_millis" : 37263
   },
-  "process": {
-    "open_file_descriptors": 63,
-    "peak_open_file_descriptors": 63,
-    "max_file_descriptors": 10240,
-    "mem": {
-      "total_virtual_in_bytes": 5335916544
+  "process" : {
+    "open_file_descriptors" : 98,
+    "peak_open_file_descriptors" : 98,
+    "max_file_descriptors" : 10240,
+    "mem" : {
+      "total_virtual_in_bytes" : 9687109632
     },
-    "cpu": {
-      "total_in_millis": 67919,
-      "percent": 63,
-      "load_average": {
-        "1m": 2.6826171875
+    "cpu" : {
+      "total_in_millis" : 97109,
+      "percent" : 33,
+      "load_average" : {
+        "1m" : 11.35986328125
       }
     }
   },
-  "events": {
-    "in": 23101,
-    "filtered": 21052,
-    "out": 21052,
-    "duration_in_millis": 8939,
-    "queue_push_duration_in_millis": 3978
+  "events" : {
+    "in" : 174126,
+    "filtered" : 170250,
+    "out" : 170250,
+    "duration_in_millis" : 85711,
+    "queue_push_duration_in_millis" : 3101
   },
-  "pipelines": {
-    "main": {
-      "events": {
-        "duration_in_millis": 9250,
-        "in": 24125,
-        "filtered": 22076,
-        "out": 22076,
-        "queue_push_duration_in_millis": 4236
+  "pipelines" : {
+    "main" : {
+      "events" : {
+        "queue_push_duration_in_millis" : 6472,
+        "in" : 361126,
+        "filtered" : 357125,
+        "out" : 357125,
+        "duration_in_millis" : 168492
       },
-      "plugins": {
-        "inputs": [
-          {
-            "id": "1db6e3e8163d4cf302e5b5ee12f6fc3dcfe783ba-1",
-            "events": {
-              "out": 24125,
-              "queue_push_duration_in_millis": 4236
-            },
-            "name": "stdin"
-          }
-        ],
-        "filters": [
-          {
-            "id": "1db6e3e8163d4cf302e5b5ee12f6fc3dcfe783ba-4",
-            "events": {
-              "duration_in_millis": 374,
-              "in": 23045,
-              "out": 23044
-            },
-            "name": "geoip"
-          },
-          {
-            "id": "1db6e3e8163d4cf302e5b5ee12f6fc3dcfe783ba-3",
-            "events": {
-              "duration_in_millis": 24,
-              "in": 23045,
-              "out": 23045
-            },
-            "matches": 23045,
-            "name": "date"
-          },
-          {
-            "id": "1db6e3e8163d4cf302e5b5ee12f6fc3dcfe783ba-5",
-            "events": {
-              "duration_in_millis": 1373,
-              "in": 23045,
-              "out": 23045
-            },
-            "name": "useragent"
-          },
-          {
-            "id": "1db6e3e8163d4cf302e5b5ee12f6fc3dcfe783ba-2",
-            "events": {
-              "duration_in_millis": 295,
-              "in": 23047,
-              "out": 23045
-            },
-            "matches": 23045,
-            "patterns_per_field": {
-              "message": 1
-            },
-            "name": "grok"
-          }
-        ],
-        "outputs": [
-          {
-            "id": "1db6e3e8163d4cf302e5b5ee12f6fc3dcfe783ba-6",
-            "events": {
-              "duration_in_millis": 89,
-              "in": 22076,
-              "out": 22076
-            },
-            "name": "stdout"
-          }
-        ]
+      "flow": {
+        "output_throughput": {
+          "lifetime": 0.231,
+          "current": 4.0
+        },
+        "filter_throughput": {
+          "lifetime": 0.231,
+          "current": 4.0
+        },
+        "queue_backpressure": {
+          "lifetime": 0.0,
+          "current": 0.0
+        },
+        "worker_concurrency": {
+          "lifetime": 0.018,
+          "current": 0.288
+        },
+        "input_throughput": {
+          "lifetime": 0.25,
+          "current": 4.4
+        }
       },
-      "reloads": {
-        "last_error": null,
-        "successes": 0,
-        "last_success_timestamp": null,
-        "last_failure_timestamp": null,
-        "failures": 0
+      "plugins" : {
+        "inputs" : [ {
+          "id" : "3ca119230f5eaf03a261b674ee2f2dfe1491894c1b2b8f21e1d9a02b656b36f1",
+          "name" : "stdin",
+          "events" : {
+            "queue_push_duration_in_millis" : 6472,
+            "out" : 361126
+          }
+        } ],
+        "codecs" : [ {
+          "id" : "line_df501bfb-7029-4ca9-8813-c1faa3a5e411",
+          "encode" : {
+            "writes_in" : 0,
+            "duration_in_millis" : 0
+          },
+          "name" : "line",
+          "decode" : {
+            "out" : 361126,
+            "writes_in" : 2089,
+            "duration_in_millis" : 9834
+          }
+        }, {
+          "id" : "dots_cf83cfb3-4287-46e7-8dff-bfc2e05e5cec",
+          "encode" : {
+            "writes_in" : 357250,
+            "duration_in_millis" : 56
+          },
+          "name" : "dots",
+          "decode" : {
+            "out" : 0,
+            "writes_in" : 0,
+            "duration_in_millis" : 0
+          }
+        } ],
+        "filters" : [ {
+          "id" : "05d0ca4972f7cfce1a48f17a2071f190a28d54dee12e39b7366d5bae5ee7884b",
+          "name" : "geoip",
+          "events" : {
+            "in" : 357500,
+            "out" : 357500,
+            "duration_in_millis" : 901
+          }
+        }, {
+          "id" : "9154f96858a72fbecca679432908567a48417ff1a9f9da4dc4326bc389272e4a",
+          "name" : "useragent",
+          "events" : {
+            "in" : 357500,
+            "out" : 357500,
+            "duration_in_millis" : 404
+          }
+        }, {
+          "id" : "19362b6b7a7dd6389cc31c3a8e37bafd8756eb766586e084bd2d31b16fc36501",
+          "name" : "date",
+          "events" : {
+            "in" : 357500,
+            "out" : 357500,
+            "duration_in_millis" : 44
+          }
+        }, {
+          "id" : "eae2fb96747a6c8905f52f83b75725a0193cd4c27c3aef8fb7f08e87876ec8c9",
+          "matches" : 0,
+          "name" : "grok",
+          "patterns_per_field" : {
+            "message" : 1
+          },
+          "failures" : 358375,
+          "events" : {
+            "in" : 359375,
+            "out" : 357500,
+            "duration_in_millis" : 160788
+          }
+        } ],
+        "outputs" : [ {
+          "id" : "f237aaa8c79a31b99a64cafa155d9224e1c461c422da4a8b32ad07aa97707ac7",
+          "name" : "stdout",
+          "events" : {
+            "in" : 357500,
+            "out" : 357375,
+            "duration_in_millis" : 3429
+          }
+        } ]
       },
-      "queue": {
-        "type": "memory"
-      }
+      "reloads" : {
+        "successes" : 0,
+        "last_failure_timestamp" : null,
+        "failures" : 0,
+        "last_success_timestamp" : null,
+        "last_error" : null
+      },
+      "queue" : {
+        "type" : "memory",
+        "events_count" : 0,
+        "queue_size_in_bytes" : 0,
+        "max_queue_size_in_bytes" : 0
+      },
+      "hash" : "be04391ccfb5ad461c7fbc4ff8263ea6857ffdfeb1fe5779fef415010777861c",
+      "ephemeral_id" : "bedbad35-5d50-40cf-8b75-325bfd819382"
     }
   },
-  "reloads": {
-    "successes": 0,
-    "failures": 0
+  "reloads" : {
+    "successes" : 0,
+    "failures" : 0
   },
-  "os": {}
+  "os" : { },
+  "queue" : {
+    "events_count" : 0
+  }
 }
diff --git a/tools/ca/Class3PublicPrimaryCertificationAuthority.pem b/tools/ca/Class3PublicPrimaryCertificationAuthority.pem
deleted file mode 100644
index 87676acf5..000000000
--- a/tools/ca/Class3PublicPrimaryCertificationAuthority.pem
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG
-A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
-cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
-MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
-BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
-YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
-ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
-BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
-I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
-CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do
-lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc
-AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k
------END CERTIFICATE-----
diff --git a/tools/ca/Entrust_net-Secure-Server-Certification-Authority.pem b/tools/ca/Entrust_net-Secure-Server-Certification-Authority.pem
deleted file mode 100644
index b48d9cd70..000000000
--- a/tools/ca/Entrust_net-Secure-Server-Certification-Authority.pem
+++ /dev/null
@@ -1,90 +0,0 @@
-This CA certificate is for verifying HTTPS connection to;
-  - https://d2chzxaqi4y7f8.cloudfront.net/ (prepared by AWS)
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 927650371 (0x374ad243)
-    Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, O=Entrust.net, OU=www.entrust.net/CPS incorp. by ref. (limits liab.), OU=(c) 1999 Entrust.net Limited, CN=Entrust.net Secure Server Certification Authority
-        Validity
-            Not Before: May 25 16:09:40 1999 GMT
-            Not After : May 25 16:39:40 2019 GMT
-        Subject: C=US, O=Entrust.net, OU=www.entrust.net/CPS incorp. by ref. (limits liab.), OU=(c) 1999 Entrust.net Limited, CN=Entrust.net Secure Server Certification Authority
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
-                Modulus:
-                    00:cd:28:83:34:54:1b:89:f3:0f:af:37:91:31:ff:
-                    af:31:60:c9:a8:e8:b2:10:68:ed:9f:e7:93:36:f1:
-                    0a:64:bb:47:f5:04:17:3f:23:47:4d:c5:27:19:81:
-                    26:0c:54:72:0d:88:2d:d9:1f:9a:12:9f:bc:b3:71:
-                    d3:80:19:3f:47:66:7b:8c:35:28:d2:b9:0a:df:24:
-                    da:9c:d6:50:79:81:7a:5a:d3:37:f7:c2:4a:d8:29:
-                    92:26:64:d1:e4:98:6c:3a:00:8a:f5:34:9b:65:f8:
-                    ed:e3:10:ff:fd:b8:49:58:dc:a0:de:82:39:6b:81:
-                    b1:16:19:61:b9:54:b6:e6:43
-                Exponent: 3 (0x3)
-        X509v3 extensions:
-            Netscape Cert Type: 
-                SSL CA, S/MIME CA, Object Signing CA
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  DirName: C = US, O = Entrust.net, OU = www.entrust.net/CPS incorp. by ref. (limits liab.), OU = (c) 1999 Entrust.net Limited, CN = Entrust.net Secure Server Certification Authority, CN = CRL1
-
-                Full Name:
-                  URI:http://www.entrust.net/CRL/net1.crl
-
-            X509v3 Private Key Usage Period: 
-                Not Before: May 25 16:09:40 1999 GMT, Not After: May 25 16:09:40 2019 GMT
-            X509v3 Key Usage: 
-                Certificate Sign, CRL Sign
-            X509v3 Authority Key Identifier: 
-                keyid:F0:17:62:13:55:3D:B3:FF:0A:00:6B:FB:50:84:97:F3:ED:62:D0:1A
-
-            X509v3 Subject Key Identifier: 
-                F0:17:62:13:55:3D:B3:FF:0A:00:6B:FB:50:84:97:F3:ED:62:D0:1A
-            X509v3 Basic Constraints: 
-                CA:TRUE
-            1.2.840.113533.7.65.0: 
-                0
-..V4.0....
-    Signature Algorithm: sha1WithRSAEncryption
-         90:dc:30:02:fa:64:74:c2:a7:0a:a5:7c:21:8d:34:17:a8:fb:
-         47:0e:ff:25:7c:8d:13:0a:fb:e4:98:b5:ef:8c:f8:c5:10:0d:
-         f7:92:be:f1:c3:d5:d5:95:6a:04:bb:2c:ce:26:36:65:c8:31:
-         c6:e7:ee:3f:e3:57:75:84:7a:11:ef:46:4f:18:f4:d3:98:bb:
-         a8:87:32:ba:72:f6:3c:e2:3d:9f:d7:1d:d9:c3:60:43:8c:58:
-         0e:22:96:2f:62:a3:2c:1f:ba:ad:05:ef:ab:32:78:87:a0:54:
-         73:19:b5:5c:05:f9:52:3e:6d:2d:45:0b:f7:0a:93:ea:ed:06:
-         f9:b2
-
------BEGIN CERTIFICATE-----
-MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
-VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u
-ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc
-KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u
-ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05OTA1
-MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIGA1UE
-ChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5j
-b3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
-bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUg
-U2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUA
-A4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQaO2f55M28Qpku0f1BBc/
-I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5gXpa0zf3
-wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OC
-AdcwggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHb
-oIHYpIHVMIHSMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5
-BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p
-dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1pdGVk
-MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp
-b24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
-dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0
-MFqBDzIwMTkwNTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8Bdi
-E1U9s/8KAGv7UISX8+1i0BowHQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAa
-MAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI
-hvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyNEwr75Ji174z4xRAN
-95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9n9cd
-2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
------END CERTIFICATE-----
diff --git a/tools/ca/EntrustnetSecureServerCertificationAuthority.pem b/tools/ca/EntrustnetSecureServerCertificationAuthority.pem
deleted file mode 100644
index 4b8939ccb..000000000
--- a/tools/ca/EntrustnetSecureServerCertificationAuthority.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
-VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u
-ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc
-KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u
-ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05OTA1
-MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIGA1UE
-ChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5j
-b3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
-bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUg
-U2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUA
-A4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQaO2f55M28Qpku0f1BBc/
-I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5gXpa0zf3
-wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OC
-AdcwggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHb
-oIHYpIHVMIHSMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5
-BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p
-dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1pdGVk
-MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp
-b24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
-dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0
-MFqBDzIwMTkwNTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8Bdi
-E1U9s/8KAGv7UISX8+1i0BowHQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAa
-MAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI
-hvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyNEwr75Ji174z4xRAN
-95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9n9cd
-2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
------END CERTIFICATE-----
diff --git a/tools/ca/GeoTrustGlobalCA.pem b/tools/ca/GeoTrustGlobalCA.pem
deleted file mode 100644
index bcb252976..000000000
--- a/tools/ca/GeoTrustGlobalCA.pem
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
-MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
-YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
-EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
-R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
-9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
-fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
-iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
-1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
-bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
-MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
-ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
-uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
-Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
-tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
-PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
-hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
-5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
------END CERTIFICATE-----
diff --git a/tools/ca/GeoTrust_Global_CA.pem b/tools/ca/GeoTrust_Global_CA.pem
deleted file mode 100644
index e87e95dbb..000000000
--- a/tools/ca/GeoTrust_Global_CA.pem
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
-MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
-YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
-EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
-R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
-9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
-fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
-iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
-1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
-bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
-MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
-ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
-uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
-Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
-tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
-PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
-hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
-5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/tools/ca/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem b/tools/ca/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem
deleted file mode 100644
index 43bad3ebd..000000000
--- a/tools/ca/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem
+++ /dev/null
@@ -1,57 +0,0 @@
-This CA certificate is for verifying HTTPS connection to;
-  - https://s3.amazon.com/ (prepared by AWS)
-
-Certificate:
-    Data:
-        Version: 1 (0x0)
-        Serial Number:
-            7d:d9:fe:07:cf:a8:1e:b7:10:79:67:fb:a7:89:34:c6
-    Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, O=VeriSign, Inc., OU=Class 3 Public Primary Certification Authority - G2, OU=(c) 1998 VeriSign, Inc. - For authorized use only, OU=VeriSign Trust Network
-        Validity
-            Not Before: May 18 00:00:00 1998 GMT
-            Not After : Aug  1 23:59:59 2028 GMT
-        Subject: C=US, O=VeriSign, Inc., OU=Class 3 Public Primary Certification Authority - G2, OU=(c) 1998 VeriSign, Inc. - For authorized use only, OU=VeriSign Trust Network
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
-                Modulus:
-                    00:cc:5e:d1:11:5d:5c:69:d0:ab:d3:b9:6a:4c:99:
-                    1f:59:98:30:8e:16:85:20:46:6d:47:3f:d4:85:20:
-                    84:e1:6d:b3:f8:a4:ed:0c:f1:17:0f:3b:f9:a7:f9:
-                    25:d7:c1:cf:84:63:f2:7c:63:cf:a2:47:f2:c6:5b:
-                    33:8e:64:40:04:68:c1:80:b9:64:1c:45:77:c7:d8:
-                    6e:f5:95:29:3c:50:e8:34:d7:78:1f:a8:ba:6d:43:
-                    91:95:8f:45:57:5e:7e:c5:fb:ca:a4:04:eb:ea:97:
-                    37:54:30:6f:bb:01:47:32:33:cd:dc:57:9b:64:69:
-                    61:f8:9b:1d:1c:89:4f:5c:67
-                Exponent: 65537 (0x10001)
-    Signature Algorithm: sha1WithRSAEncryption
-         51:4d:cd:be:5c:cb:98:19:9c:15:b2:01:39:78:2e:4d:0f:67:
-         70:70:99:c6:10:5a:94:a4:53:4d:54:6d:2b:af:0d:5d:40:8b:
-         64:d3:d7:ee:de:56:61:92:5f:a6:c4:1d:10:61:36:d3:2c:27:
-         3c:e8:29:09:b9:11:64:74:cc:b5:73:9f:1c:48:a9:bc:61:01:
-         ee:e2:17:a6:0c:e3:40:08:3b:0e:e7:eb:44:73:2a:9a:f1:69:
-         92:ef:71:14:c3:39:ac:71:a7:91:09:6f:e4:71:06:b3:ba:59:
-         57:26:79:00:f6:f8:0d:a2:33:30:28:d4:aa:58:a0:9d:9d:69:
-         91:fd
-
------BEGIN CERTIFICATE-----
-MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
-BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
-c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
-MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
-emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
-DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
-FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg
-UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
-YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
-MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4
-pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0
-13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID
-AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk
-U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i
-F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY
-oJ2daZH9
------END CERTIFICATE-----
diff --git a/tools/ca/cacert.pem b/tools/ca/cacert.pem
deleted file mode 100644
index fa9df81f7..000000000
--- a/tools/ca/cacert.pem
+++ /dev/null
@@ -1,3894 +0,0 @@
-##
-## Bundle of CA Root Certificates
-##
-## Certificate data from Mozilla downloaded on: Wed Sep  3 03:12:03 2014
-##
-## This is a bundle of X.509 certificates of public Certificate Authorities
-## (CA). These were automatically extracted from Mozilla's root certificates
-## file (certdata.txt).  This file can be found in the mozilla source tree:
-## http://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
-##
-## It contains the certificates in PEM format and therefore
-## can be directly used with curl / libcurl / php_curl, or with
-## an Apache+mod_ssl webserver for SSL client authentication.
-## Just configure this file as the SSLCACertificateFile.
-##
-## Conversion done with mk-ca-bundle.pl verison 1.22.
-## SHA1: c4540021427a6fa29e5f50db9f12d48c97d33889
-##
-
-
-GTE CyberTrust Global Root
-==========================
------BEGIN CERTIFICATE-----
-MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9HVEUg
-Q29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNvbHV0aW9ucywgSW5jLjEjMCEG
-A1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJvb3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEz
-MjM1OTAwWjB1MQswCQYDVQQGEwJVUzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQL
-Ex5HVEUgQ3liZXJUcnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0
-IEdsb2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrHiM3dFw4u
-sJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTSr41tiGeA5u2ylc9yMcql
-HHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X404Wqk2kmhXBIgD8SFcd5tB8FLztimQID
-AQABMA0GCSqGSIb3DQEBBAUAA4GBAG3rGwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMW
-M4ETCJ57NE7fQMh017l93PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OF
-NMQkpw0PlZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
------END CERTIFICATE-----
-
-Thawte Server CA
-================
------BEGIN CERTIFICATE-----
-MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT
-DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3Vs
-dGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UE
-AxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5j
-b20wHhcNOTYwODAxMDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNV
-BAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29u
-c3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcG
-A1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0
-ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl
-/Kj0R1HahbUgdJSGHg91yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg7
-1CcEJRCXL+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGjEzAR
-MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG7oWDTSEwjsrZqG9J
-GubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6eQNuozDJ0uW8NxuOzRAvZim+aKZuZ
-GCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZqdq5snUb9kLy78fyGPmJvKP/iiMucEc=
------END CERTIFICATE-----
-
-Thawte Premium Server CA
-========================
------BEGIN CERTIFICATE-----
-MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkExFTATBgNVBAgT
-DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3Vs
-dGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UE
-AxMYVGhhd3RlIFByZW1pdW0gU2VydmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZl
-ckB0aGF3dGUuY29tMB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYT
-AlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsGA1UEChMU
-VGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2
-aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNlcnZlciBDQTEoMCYGCSqGSIb3DQEJARYZ
-cHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2
-aovXwlue2oFBYo847kkEVdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIh
-Udib0GfQug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMRuHM/
-qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQAm
-SCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUIhfzJATj/Tb7yFkJD57taRvvBxhEf
-8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JMpAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7t
-UCemDaYj+bvLpgcUQg==
------END CERTIFICATE-----
-
-Equifax Secure CA
-=================
------BEGIN CERTIFICATE-----
-MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEQMA4GA1UE
-ChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5
-MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoT
-B0VxdWlmYXgxLTArBgNVBAsTJEVxdWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPR
-fM6fBeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+AcJkVV5MW
-8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kCAwEAAaOCAQkwggEFMHAG
-A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UE
-CxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoG
-A1UdEAQTMBGBDzIwMTgwODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvS
-spXXR9gjIBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQFMAMB
-Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAFjOKer89961
-zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y7qj/WsjTVbJmcVfewCHrPSqnI0kB
-BIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee95
-70+sB3c4
------END CERTIFICATE-----
-
-Verisign Class 3 Public Primary Certification Authority - G2
-============================================================
------BEGIN CERTIFICATE-----
-MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
-dCBOZXR3b3JrMB4XDTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
-dCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCO
-FoUgRm1HP9SFIIThbbP4pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71
-lSk8UOg013gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSkU01UbSuvDV1Ai2TT
-1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7iF6YM40AIOw7n60RzKprxaZLvcRTD
-Oaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpYoJ2daZH9
------END CERTIFICATE-----
-
-GlobalSign Root CA
-==================
------BEGIN CERTIFICATE-----
-MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
-GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
-b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
-BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
-VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
-DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
-THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
-Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
-c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
-gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
-AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
-Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
-j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
-hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
-X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
------END CERTIFICATE-----
-
-GlobalSign Root CA - R2
-=======================
------BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
-YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
-bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
-aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
-bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
-ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
-s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
-S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
-TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
-ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
-FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
-YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
-BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
-9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
-01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
-9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
-TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
------END CERTIFICATE-----
-
-Verisign Class 3 Public Primary Certification Authority - G3
-============================================================
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
-dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1
-EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc
-cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw
-EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj
-055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f
-j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
-/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0
-xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa
-t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
------END CERTIFICATE-----
-
-Verisign Class 4 Public Primary Certification Authority - G3
-============================================================
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
-dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAK3LpRFpxlmr8Y+1GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaS
-tBO3IFsJ+mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0GbdU6LM
-8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLmNxdLMEYH5IBtptiW
-Lugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XYufTsgsbSPZUd5cBPhMnZo0QoBmrX
-Razwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-j/ola09b5KROJ1WrIhVZPMq1CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXtt
-mhwwjIDLk5Mqg6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm
-fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c2NU8Qh0XwRJd
-RTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/bLvSHgCwIe34QWKCudiyxLtG
-UPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg==
------END CERTIFICATE-----
-
-Entrust.net Premium 2048 Secure Server CA
-=========================================
------BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
-ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp
-bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
-BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx
-NzUwNTFaFw0yOTA3MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
-d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
-MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
-ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
-Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr
-hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW
-nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi
-VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo0IwQDAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJ
-KoZIhvcNAQEFBQADggEBADubj1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPy
-T/4xmf3IDExoU8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
-zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5bu/8j72gZyxKT
-J1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+bYQLCIt+jerXmCHG8+c8eS9e
-nNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/ErfF6adulZkMV8gzURZVE=
------END CERTIFICATE-----
-
-Baltimore CyberTrust Root
-=========================
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE
-ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li
-ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC
-SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs
-dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME
-uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB
-UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C
-G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9
-XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr
-l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI
-VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
-BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh
-cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5
-hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa
-Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
-RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
------END CERTIFICATE-----
-
-Equifax Secure Global eBusiness CA
-==================================
------BEGIN CERTIFICATE-----
-MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-RXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBTZWN1cmUgR2xvYmFsIGVCdXNp
-bmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIwMDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMx
-HDAaBgNVBAoTE0VxdWlmYXggU2VjdXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEds
-b2JhbCBlQnVzaW5lc3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRV
-PEnCUdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc58O/gGzN
-qfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/o5brhTMhHD4ePmBudpxn
-hcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAHMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0j
-BBgwFoAUvqigdHJQa0S3ySPY+6j/s1draGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hs
-MA0GCSqGSIb3DQEBBAUAA4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okEN
-I7SS+RkAZ70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv8qIY
-NMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV
------END CERTIFICATE-----
-
-Equifax Secure eBusiness CA 1
-=============================
------BEGIN CERTIFICATE-----
-MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-RXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENB
-LTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQwMDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UE
-ChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNz
-IENBLTEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ
-1MRoRvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBuWqDZQu4a
-IZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKwEnv+j6YDAgMBAAGjZjBk
-MBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFEp4MlIR21kW
-Nl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRKeDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQF
-AAOBgQB1W6ibAxHm6VZMzfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5
-lSE/9dR+WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN/Bf+
-KpYrtWKmpj29f5JZzVoqgrI3eQ==
------END CERTIFICATE-----
-
-AddTrust Low-Value Services Root
-================================
------BEGIN CERTIFICATE-----
-MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRU
-cnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMwMTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQsw
-CQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBO
-ZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ulCDtbKRY6
-54eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6ntGO0/7Gcrjyvd7ZWxbWr
-oulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyldI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1
-Zmne3yzxbrww2ywkEtvrNTVokMsAsJchPXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJui
-GMx1I4S+6+JNM3GOGvDC+Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8w
-HQYDVR0OBBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8EBTAD
-AQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBlMQswCQYDVQQGEwJT
-RTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEw
-HwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxt
-ZBsfzQ3duQH6lmM0MkhHma6X7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0Ph
-iVYrqW9yTkkz43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
-eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJlpz/+0WatC7xr
-mYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOAWiFeIc9TVPC6b4nbqKqVz4vj
-ccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
------END CERTIFICATE-----
-
-AddTrust External Root
-======================
------BEGIN CERTIFICATE-----
-MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD
-VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw
-NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU
-cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg
-Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821
-+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw
-Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo
-aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy
-2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7
-7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P
-BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL
-VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk
-VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
-IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl
-j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
-6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355
-e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u
-G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
------END CERTIFICATE-----
-
-AddTrust Public Services Root
-=============================
------BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSAwHgYDVQQDExdBZGRU
-cnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAxMDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJ
-BgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5l
-dHdvcmsxIDAeBgNVBAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV6tsfSlbu
-nyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nXGCwwfQ56HmIexkvA/X1i
-d9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnPdzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSG
-Aa2Il+tmzV7R/9x98oTaunet3IAIx6eH1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAw
-HM+A+WD+eeSI8t0A65RF62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0G
-A1UdDgQWBBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
-/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDELMAkGA1UEBhMCU0Ux
-FDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29yazEgMB4G
-A1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4
-JNojVhaTdt02KLmuG7jD8WS6IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL
-+YPoRNWyQSW/iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao
-GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh4SINhwBk/ox9
-Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQmXiLsks3/QppEIW1cxeMiHV9H
-EufOX1362KqxMy3ZdvJOOjMMK7MtkAY=
------END CERTIFICATE-----
-
-AddTrust Qualified Certificates Root
-====================================
------BEGIN CERTIFICATE-----
-MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSMwIQYDVQQDExpBZGRU
-cnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcx
-CzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQ
-IE5ldHdvcmsxIzAhBgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwqxBb/4Oxx
-64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G87B4pfYOQnrjfxvM0PC3
-KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i2O+tCBGaKZnhqkRFmhJePp1tUvznoD1o
-L/BLcHwTOK28FSXx1s6rosAx1i+f4P8UWfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GR
-wVY18BTcZTYJbqukB8c10cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HU
-MIHRMB0GA1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/
-BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6FrpGkwZzELMAkGA1UE
-BhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29y
-azEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlmaWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQAD
-ggEBABmrder4i2VhlRO6aQTvhsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxG
-GuoYQ992zPlmhpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
-dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3P6CxB9bpT9ze
-RXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9YiQBCYz95OdBEsIJuQRno3eDB
-iFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5noxqE=
------END CERTIFICATE-----
-
-Entrust Root Certification Authority
-====================================
------BEGIN CERTIFICATE-----
-MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV
-BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw
-b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG
-A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0
-MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu
-MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu
-Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v
-dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz
-A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww
-Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68
-j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN
-rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw
-DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1
-MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH
-hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
-A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM
-Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa
-v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS
-W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
-tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
------END CERTIFICATE-----
-
-RSA Security 2048 v3
-====================
------BEGIN CERTIFICATE-----
-MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6MRkwFwYDVQQK
-ExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJpdHkgMjA0OCBWMzAeFw0wMTAy
-MjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAXBgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAb
-BgNVBAsTFFJTQSBTZWN1cml0eSAyMDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAt49VcdKA3XtpeafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7
-Jylg/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGlwSMiuLgb
-WhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnhAMFRD0xS+ARaqn1y07iH
-KrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP
-+Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpuAWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/
-MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4E
-FgQUB8NRMKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYcHnmY
-v/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/Zb5gEydxiKRz44Rj
-0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+f00/FGj1EVDVwfSQpQgdMWD/YIwj
-VAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVOrSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395
-nzIlQnQFgCi/vcEkllgVsRch6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kA
-pKnXwiJPZ9d37CAFYd4=
------END CERTIFICATE-----
-
-GeoTrust Global CA
-==================
------BEGIN CERTIFICATE-----
-MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
-Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw
-MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
-LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo
-BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet
-8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc
-T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU
-vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD
-AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk
-DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q
-zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4
-d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2
-mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p
-XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm
-Mw==
------END CERTIFICATE-----
-
-GeoTrust Global CA 2
-====================
------BEGIN CERTIFICATE-----
-MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
-R2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwHhcNMDQwMzA0MDUw
-MDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
-LjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDvPE1APRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/
-NTL8Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hLTytCOb1k
-LUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL5mkWRxHCJ1kDs6ZgwiFA
-Vvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7S4wMcoKK+xfNAGw6EzywhIdLFnopsk/b
-HdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQF
-MAMBAf8wHQYDVR0OBBYEFHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNH
-K266ZUapEBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6tdEPx7
-srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv/NgdRN3ggX+d6Yvh
-ZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywNA0ZF66D0f0hExghAzN4bcLUprbqL
-OzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkC
-x1YAzUm5s2x7UwQa4qjJqhIFI8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqF
-H4z1Ir+rzoPz4iIprn2DQKi6bA==
------END CERTIFICATE-----
-
-GeoTrust Universal CA
-=====================
------BEGIN CERTIFICATE-----
-MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
-R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1
-MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu
-Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t
-JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e
-RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs
-7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d
-8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V
-qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga
-Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB
-Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu
-KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08
-ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0
-XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB
-hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
-aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2
-qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL
-oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK
-xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF
-KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2
-DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK
-xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU
-p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI
-P/rmMuGNG2+k5o7Y+SlIis5z/iw=
------END CERTIFICATE-----
-
-GeoTrust Universal CA 2
-=======================
------BEGIN CERTIFICATE-----
-MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
-R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0
-MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg
-SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0
-DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17
-j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q
-JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a
-QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2
-WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP
-20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn
-ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC
-SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG
-8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2
-+/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E
-BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
-dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ
-4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+
-mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq
-A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg
-Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP
-pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d
-FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp
-gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm
-X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
------END CERTIFICATE-----
-
-America Online Root Certification Authority 1
-=============================================
------BEGIN CERTIFICATE-----
-MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-QW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBPbmxpbmUgUm9vdCBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyODA2MDAwMFoXDTM3MTExOTIwNDMwMFowYzELMAkG
-A1UEBhMCVVMxHDAaBgNVBAoTE0FtZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2Eg
-T25saW5lIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKgv6KRpBgNHw+kqmP8ZonCaxlCyfqXfaE0bfA+2l2h9LaaLl+lkhsmj76CG
-v2BlnEtUiMJIxUo5vxTjWVXlGbR0yLQFOVwWpeKVBeASrlmLojNoWBym1BW32J/X3HGrfpq/m44z
-DyL9Hy7nBzbvYjnF3cu6JRQj3gzGPTzOggjmZj7aUTsWOqMFf6Dch9Wc/HKpoH145LcxVR5lu9Rh
-sCFg7RAycsWSJR74kEoYeEfffjA3PlAb2xzTa5qGUwew76wGePiEmf4hjUyAtgyC9mZweRrTT6PP
-8c9GsEsPPt2IYriMqQkoO3rHl+Ee5fSfwMCuJKDIodkP1nsmgmkyPacCAwEAAaNjMGEwDwYDVR0T
-AQH/BAUwAwEB/zAdBgNVHQ4EFgQUAK3Zo/Z59m50qX8zPYEX10zPM94wHwYDVR0jBBgwFoAUAK3Z
-o/Z59m50qX8zPYEX10zPM94wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBBQUAA4IBAQB8itEf
-GDeC4Liwo+1WlchiYZwFos3CYiZhzRAW18y0ZTTQEYqtqKkFZu90821fnZmv9ov761KyBZiibyrF
-VL0lvV+uyIbqRizBs73B6UlwGBaXCBOMIOAbLjpHyx7kADCVW/RFo8AasAFOq73AI25jP4BKxQft
-3OJvx8Fi8eNy1gTIdGcL+oiroQHIb/AUr9KZzVGTfu0uOMe9zkZQPXLjeSWdm4grECDdpbgyn43g
-Kd8hdIaC2y+CMMbHNYaz+ZZfRtsMRf3zUMNvxsNIrUam4SdHCh0Om7bCd39j8uB9Gr784N/Xx6ds
-sPmuujz9dLQR6FgNgLzTqIA6me11zEZ7
------END CERTIFICATE-----
-
-America Online Root Certification Authority 2
-=============================================
------BEGIN CERTIFICATE-----
-MIIFpDCCA4ygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-QW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBPbmxpbmUgUm9vdCBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyODA2MDAwMFoXDTM3MDkyOTE0MDgwMFowYzELMAkG
-A1UEBhMCVVMxHDAaBgNVBAoTE0FtZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2Eg
-T25saW5lIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAMxBRR3pPU0Q9oyxQcngXssNt79Hc9PwVU3dxgz6sWYFas14tNwC206B89en
-fHG8dWOgXeMHDEjsJcQDIPT/DjsS/5uN4cbVG7RtIuOx238hZK+GvFciKtZHgVdEglZTvYYUAQv8
-f3SkWq7xuhG1m1hagLQ3eAkzfDJHA1zEpYNI9FdWboE2JxhP7JsowtS013wMPgwr38oE18aO6lhO
-qKSlGBxsRZijQdEt0sdtjRnxrXm3gT+9BoInLRBYBbV4Bbkv2wxrkJB+FFk4u5QkE+XRnRTf04JN
-RvCAOVIyD+OEsnpD8l7eXz8d3eOyG6ChKiMDbi4BFYdcpnV1x5dhvt6G3NRI270qv0pV2uh9UPu0
-gBe4lL8BPeraunzgWGcXuVjgiIZGZ2ydEEdYMtA1fHkqkKJaEBEjNa0vzORKW6fIJ/KD3l67Xnfn
-6KVuY8INXWHQjNJsWiEOyiijzirplcdIz5ZvHZIlyMbGwcEMBawmxNJ10uEqZ8A9W6Wa6897Gqid
-FEXlD6CaZd4vKL3Ob5Rmg0gp2OpljK+T2WSfVVcmv2/LNzGZo2C7HK2JNDJiuEMhBnIMoVxtRsX6
-Kc8w3onccVvdtjc+31D1uAclJuW8tf48ArO3+L5DwYcRlJ4jbBeKuIonDFRH8KmzwICMoCfrHRnj
-B453cMor9H124HhnAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE1FwWg4u3Op
-aaEg5+31IqEjFNeeMB8GA1UdIwQYMBaAFE1FwWg4u3OpaaEg5+31IqEjFNeeMA4GA1UdDwEB/wQE
-AwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAZ2sGuV9FOypLM7PmG2tZTiLMubekJcmnxPBUlgtk87FY
-T15R/LKXeydlwuXK5w0MJXti4/qftIe3RUavg6WXSIylvfEWK5t2LHo1YGwRgJfMqZJS5ivmae2p
-+DYtLHe/YUjRYwu5W1LtGLBDQiKmsXeu3mnFzcccobGlHBD7GL4acN3Bkku+KVqdPzW+5X1R+FXg
-JXUjhx5c3LqdsKyzadsXg8n33gy8CNyRnqjQ1xU3c6U1uPx+xURABsPr+CKAXEfOAuMRn0T//Zoy
-zH1kUQ7rVyZ2OuMeIjzCpjbdGe+n/BLzJsBZMYVMnNjP36TMzCmT/5RtdlwTCJfy7aULTd3oyWgO
-ZtMADjMSW7yV5TKQqLPGbIOtd+6Lfn6xqavT4fG2wLHqiMDn05DpKJKUe2h7lyoKZy2FAjgQ5ANh
-1NolNscIWC2hp1GvMApJ9aZphwctREZ2jirlmjvXGKL8nDgQzMY70rUXOm/9riW99XJZZLF0Kjhf
-GEzfz3EEWjbUvy+ZnOjZurGV5gJLIaFb1cFPj65pbVPbAZO1XB4Y3WRayhgoPmMEEf0cjQAPuDff
-Z4qdZqkCapH/E8ovXYO8h5Ns3CRRFgQlZvqz2cK6Kb6aSDiCmfS/O0oxGfm/jiEzFMpPVF/7zvuP
-cX/9XhmgD0uRuMRUvAawRY8mkaKO/qk=
------END CERTIFICATE-----
-
-Visa eCommerce Root
-===================
------BEGIN CERTIFICATE-----
-MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQG
-EwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2Ug
-QXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2
-WhcNMjIwNjI0MDAxNjEyWjBrMQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMm
-VmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
-bW1lcmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h2mCxlCfL
-F9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4ElpF7sDPwsRROEW+1QK8b
-RaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdVZqW1LS7YgFmypw23RuwhY/81q6UCzyr0
-TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI
-/k4+oKsGGelT84ATB+0tvz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzs
-GHxBvfaLdXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEG
-MB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUFAAOCAQEAX/FBfXxc
-CLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcRzCSs00Rsca4BIGsDoo8Ytyk6feUW
-YFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pz
-zkWKsKZJ/0x9nXGIxHYdkFsd7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBu
-YQa7FkKMcPcw++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
-398znM/jra6O1I7mT1GvFpLgXPYHDw==
------END CERTIFICATE-----
-
-Certum Root CA
-==============
------BEGIN CERTIFICATE-----
-MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQK
-ExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA2MTExMDQ2Mzla
-Fw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8u
-by4xEjAQBgNVBAMTCUNlcnR1bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6x
-wS7TT3zNJc4YPk/EjG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdL
-kKWoePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GIULdtlkIJ
-89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapuOb7kky/ZR6By6/qmW6/K
-Uz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUgAKpoC6EahQGcxEZjgoi2IrHu/qpGWX7P
-NSzVttpd90gzFFS269lvzs2I1qsb2pY7HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkq
-hkiG9w0BAQUFAAOCAQEAuI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+
-GXYkHAQaTOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTgxSvg
-GrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1qCjqTE5s7FCMTY5w/
-0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5xO/fIR/RpbxXyEV6DHpx8Uq79AtoS
-qFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs6GAqm4VKQPNriiTsBhYscw==
------END CERTIFICATE-----
-
-Comodo AAA Services root
-========================
------BEGIN CERTIFICATE-----
-MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
-R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
-TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw
-MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl
-c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
-BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG
-C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs
-i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW
-Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH
-Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK
-Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f
-BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl
-cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz
-LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm
-7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
-Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
-8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C
-12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
------END CERTIFICATE-----
-
-Comodo Secure Services root
-===========================
------BEGIN CERTIFICATE-----
-MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
-R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
-TGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAw
-MDAwMFoXDTI4MTIzMTIzNTk1OVowfjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFu
-Y2hlc3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAi
-BgNVBAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPMcm3ye5drswfxdySRXyWP
-9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3SHpR7LZQdqnXXs5jLrLxkU0C8j6ysNstc
-rbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rC
-oznl2yY4rYsK7hljxxwk3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3V
-p6ea5EQz6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNVHQ4E
-FgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
-gYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL1NlY3VyZUNlcnRpZmlj
-YXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRwOi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlm
-aWNhdGVTZXJ2aWNlcy5jcmwwDQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm
-4J4oqF7Tt/Q05qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj
-Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtIgKvcnDe4IRRL
-DXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJaD61JlfutuC23bkpgHl9j6Pw
-pCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDlizeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1H
-RR3B7Hzs/Sk=
------END CERTIFICATE-----
-
-Comodo Trusted Services root
-============================
------BEGIN CERTIFICATE-----
-MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
-R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
-TGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEw
-MDAwMDBaFw0yODEyMzEyMzU5NTlaMH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1h
-bmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUw
-IwYDVQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWWfnJSoBVC21ndZHoa0Lh7
-3TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMtTGo87IvDktJTdyR0nAducPy9C1t2ul/y
-/9c3S0pgePfw+spwtOpZqqPOSC+pw7ILfhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6
-juljatEPmsbS9Is6FARW1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsS
-ivnkBbA7kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0GA1Ud
-DgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
-/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21vZG9jYS5jb20vVHJ1c3RlZENlcnRp
-ZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRodHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENl
-cnRpZmljYXRlU2VydmljZXMuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8Ntw
-uleGFTQQuS9/HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32
-pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxISjBc/lDb+XbDA
-BHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+xqFx7D+gIIxmOom0jtTYsU0l
-R+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/AtyjcndBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O
-9y5Xt5hwXsjEeLBi
------END CERTIFICATE-----
-
-QuoVadis Root CA
-================
------BEGIN CERTIFICATE-----
-MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
-ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
-MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
-cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
-EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
-J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
-F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
-YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
-AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
-PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
-ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
-MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
-YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
-ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
-Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
-Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
-BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
-FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
-tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
-fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
-LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
-gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
-5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
-5nrQNiOKSnQ2+Q==
------END CERTIFICATE-----
-
-QuoVadis Root CA 2
-==================
------BEGIN CERTIFICATE-----
-MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
-EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMjAeFw0wNjExMjQx
-ODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQCaGMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6
-XJxgFyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55JWpzmM+Yk
-lvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bBrrcCaoF6qUWD4gXmuVbB
-lDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp+ARz8un+XJiM9XOva7R+zdRcAitMOeGy
-lZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt
-66/3FsvbzSUr5R/7mp/iUcw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1Jdxn
-wQ5hYIizPtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og/zOh
-D7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UHoycR7hYQe7xFSkyy
-BNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuIyV77zGHcizN300QyNQliBJIWENie
-J0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1Ud
-DgQWBBQahGK8SEwzJQTU7tD2A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGU
-a6FJpEcwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
-ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2fBluornFdLwUv
-Z+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzng/iN/Ae42l9NLmeyhP3ZRPx3
-UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2BlfF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodm
-VjB3pjd4M1IQWK4/YY7yarHvGH5KWWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK
-+JDSV6IZUaUtl0HaB0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrW
-IozchLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPRTUIZ3Ph1
-WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWDmbA4CD/pXvk1B+TJYm5X
-f6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0ZohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II
-4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8
-VCLAAVBpQ570su9t+Oza8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
------END CERTIFICATE-----
-
-QuoVadis Root CA 3
-==================
------BEGIN CERTIFICATE-----
-MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
-EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMzAeFw0wNjExMjQx
-OTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQDMV0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNgg
-DhoB4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUrH556VOij
-KTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd8lyyBTNvijbO0BNO/79K
-DDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9CabwvvWhDFlaJKjdhkf2mrk7AyxRllDdLkgbv
-BNDInIjbC3uBr7E9KsRlOni27tyAsdLTmZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwp
-p5ijJUMv7/FfJuGITfhebtfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8
-nT8KKdjcT5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDtWAEX
-MJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZc6tsgLjoC2SToJyM
-Gf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A4iLItLRkT9a6fUg+qGkM17uGcclz
-uD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYDVR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHT
-BgkrBgEEAb5YAAMwgcUwgZMGCCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmlj
-YXRlIGNvbnN0aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
-aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVudC4wLQYIKwYB
-BQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2NwczALBgNVHQ8EBAMCAQYwHQYD
-VR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4GA1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4
-ywLQoUmkRzBFMQswCQYDVQQGEwJCTTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UE
-AxMSUXVvVmFkaXMgUm9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZV
-qyM07ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSemd1o417+s
-hvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd+LJ2w/w4E6oM3kJpK27z
-POuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2
-Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadNt54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp
-8kokUvd0/bpO5qgdAm6xDYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBC
-bjPsMZ57k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6szHXu
-g/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0jWy10QJLZYxkNc91p
-vGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeTmJlglFwjz1onl14LBQaTNx47aTbr
-qZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK4SVhM7JZG+Ju1zdXtg2pEto=
------END CERTIFICATE-----
-
-Security Communication Root CA
-==============================
------BEGIN CERTIFICATE-----
-MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
-U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
-HhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
-U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw
-8yl89f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJDKaVv0uM
-DPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9Ms+k2Y7CI9eNqPPYJayX
-5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/NQV3Is00qVUarH9oe4kA92819uZKAnDfd
-DJZkndwi92SL32HeFZRSFaB9UslLqCHJxrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2
-JChzAgMBAAGjPzA9MB0GA1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYw
-DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vGkl3g
-0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfrUj94nK9NrvjVT8+a
-mCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5Bw+SUEmK3TGXX8npN6o7WWWXlDLJ
-s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
-6rBK+1YWc26sTfcioU+tHXotRSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAi
-FL39vmwLAw==
------END CERTIFICATE-----
-
-Sonera Class 2 Root CA
-======================
------BEGIN CERTIFICATE-----
-MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
-U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
-NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
-IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
-/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
-dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
-f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
-tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
-nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
-XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
-0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
-cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
-Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
-EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
-llpwrN9M
------END CERTIFICATE-----
-
-Staat der Nederlanden Root CA
-=============================
------BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJOTDEeMBwGA1UE
-ChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-Um9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEyMTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4w
-HAYDVQQKExVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxh
-bmRlbiBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFt
-vsznExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw719tV2U02P
-jLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MOhXeiD+EwR+4A5zN9RGca
-C1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+UtFE5A3+y3qcym7RHjm+0Sq7lr7HcsBth
-vJly3uSJt3omXdozSVtSnA71iq3DuD3oBmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn6
-22r+I/q85Ej0ZytqERAhSQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRV
-HSAAMDwwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMvcm9v
-dC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA7Jbg0zTBLL9s+DAN
-BgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k/rvuFbQvBgwp8qiSpGEN/KtcCFtR
-EytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzmeafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbw
-MVcoEoJz6TMvplW0C5GUR5z6u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3y
-nGQI0DvDKcWy7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
-iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
------END CERTIFICATE-----
-
-UTN DATACorp SGC Root CA
-========================
------BEGIN CERTIFICATE-----
-MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
-IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZ
-BgNVBAMTElVUTiAtIERBVEFDb3JwIFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBa
-MIGTMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4w
-HAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRy
-dXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ys
-raP6LnD43m77VkIVni5c7yPeIbkFdicZD0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlo
-wHDyUwDAXlCCpVZvNvlK4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA
-9P4yPykqlXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulWbfXv
-33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQABo4GrMIGoMAsGA1Ud
-DwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRTMtGzz3/64PGgXYVOktKeRR20TzA9
-BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dD
-LmNybDAqBgNVHSUEIzAhBggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3
-DQEBBQUAA4IBAQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft
-Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyjj98C5OBxOvG0
-I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVHKWss5nbZqSl9Mt3JNjy9rjXx
-EZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwP
-DPafepE39peC4N1xaf92P2BNPM/3mfnGV/TJVTl4uix5yaaIK/QI
------END CERTIFICATE-----
-
-UTN USERFirst Hardware Root CA
-==============================
------BEGIN CERTIFICATE-----
-MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
-IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAd
-BgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgx
-OTIyWjCBlzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0
-eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVz
-ZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlI
-wrthdBKWHTxqctU8EGc6Oe0rE81m65UJM6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFd
-tqdt++BxF2uiiPsA3/4aMXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8
-i4fDidNdoI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqIDsjf
-Pe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9KsyoUhbAgMBAAGjgbkw
-gbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFKFyXyYbKJhDlV0HN9WF
-lp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNF
-UkZpcnN0LUhhcmR3YXJlLmNybDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUF
-BwMGBggrBgEFBQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
-//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28GpgoiskliCE7/yMgUsogW
-XecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gECJChicsZUN/KHAG8HQQZexB2
-lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kn
-iCrVWFCVH/A7HFe7fRQ5YiuayZSSKqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67
-nfhmqA==
------END CERTIFICATE-----
-
-Camerfirma Chambers of Commerce Root
-====================================
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
-QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
-ZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAx
-NjEzNDNaFw0zNzA5MzAxNjEzNDRaMH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZp
-cm1hIFNBIENJRiBBODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3Jn
-MSIwIAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0BAQEFAAOC
-AQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtbunXF/KGIJPov7coISjlU
-xFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0dBmpAPrMMhe5cG3nCYsS4No41XQEMIwRH
-NaqbYE6gZj3LJgqcQKH0XZi/caulAGgq7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jW
-DA+wWFjbw2Y3npuRVDM30pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFV
-d9oKDMyXroDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIGA1Ud
-EwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5jaGFtYmVyc2lnbi5v
-cmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p26EpW1eLTXYGduHRooowDgYDVR0P
-AQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hh
-bWJlcnNpZ24ub3JnMCcGA1UdEgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYD
-VR0gBFEwTzBNBgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
-aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEBAAxBl8IahsAi
-fJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZdp0AJPaxJRUXcLo0waLIJuvvD
-L8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wN
-UPf6s+xCX6ndbcj0dc97wXImsQEcXCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/n
-ADydb47kMgkdTXg0eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1
-erfutGWaIZDgqtCYvDi1czyL+Nw=
------END CERTIFICATE-----
-
-Camerfirma Global Chambersign Root
-==================================
------BEGIN CERTIFICATE-----
-MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
-QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
-ZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYx
-NDE4WhcNMzcwOTMwMTYxNDE4WjB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJt
-YSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEg
-MB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUAA4IBDQAw
-ggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0Mi+ITaFgCPS3CU6gSS9J
-1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/sQJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8O
-by4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpVeAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl
-6DJWk0aJqCWKZQbua795B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c
-8lCrEqWhz0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0TAQH/
-BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1iZXJzaWduLm9yZy9j
-aGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4wTcbOX60Qq+UDpfqpFDAOBgNVHQ8B
-Af8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAHMCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBj
-aGFtYmVyc2lnbi5vcmcwKgYDVR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9y
-ZzBbBgNVHSAEVDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
-bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0BAQUFAAOCAQEA
-PDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUMbKGKfKX0j//U2K0X1S0E0T9Y
-gOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXiryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJ
-PJ7oKXqJ1/6v/2j1pReQvayZzKWGVwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4
-IBHNfTIzSJRUTN3cecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREes
-t2d/AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
------END CERTIFICATE-----
-
-NetLock Notary (Class A) Root
-=============================
------BEGIN CERTIFICATE-----
-MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQI
-EwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6
-dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9j
-ayBLb3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oX
-DTE5MDIxOTIzMTQ0N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQH
-EwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYD
-VQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFz
-cyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSM
-D7tM9DceqQWC2ObhbHDqeLVu0ThEDaiDzl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZ
-z+qMkjvN9wfcZnSX9EUi3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC
-/tmwqcm8WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LYOph7
-tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2EsiNCubMvJIH5+hCoR6
-4sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCCApswDgYDVR0PAQH/BAQDAgAGMBIG
-A1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaC
-Ak1GSUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pv
-bGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
-IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2Vn
-LWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0
-ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFz
-IGxlaXJhc2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBh
-IGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVu
-b3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBh
-bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sg
-Q1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFp
-bCBhdCBjcHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5
-ayZrU3/b39/zcT0mwBQOxmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjP
-ytoUMaFP0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQQeJB
-CWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxkf1qbFFgBJ34TUMdr
-KuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK8CtmdWOMovsEPoMOmzbwGOQmIMOM
-8CgHrTwXZoi1/baI
------END CERTIFICATE-----
-
-XRamp Global CA Root
-====================
------BEGIN CERTIFICATE-----
-MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
-BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj
-dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx
-HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg
-U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu
-IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx
-foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE
-zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs
-AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry
-xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap
-oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC
-AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc
-/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
-qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n
-nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz
-8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw=
------END CERTIFICATE-----
-
-Go Daddy Class 2 CA
-===================
------BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY
-VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG
-A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
-RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD
-ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv
-2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32
-qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j
-YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY
-vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O
-BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o
-atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu
-MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim
-PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
-I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
-HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI
-Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b
-vZ8=
------END CERTIFICATE-----
-
-Starfield Class 2 CA
-====================
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc
-U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo
-MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG
-A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG
-SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY
-bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ
-JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm
-epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN
-F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF
-MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f
-hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo
-bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g
-QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs
-afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM
-PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
-xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD
-KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
-QBFGmh95DmK/D5fs4C8fF5Q=
------END CERTIFICATE-----
-
-StartCom Certification Authority
-================================
------BEGIN CERTIFICATE-----
-MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
-U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu
-ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0
-NjM2WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk
-LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg
-U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y
-o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/
-Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d
-eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt
-2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z
-6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ
-osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/
-untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc
-UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT
-37uMdBNSSwIDAQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
-FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9jZXJ0LnN0YXJ0
-Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3JsLnN0YXJ0Y29tLm9yZy9zZnNj
-YS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFMBgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUH
-AgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRw
-Oi8vY2VydC5zdGFydGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYg
-U3RhcnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlhYmlsaXR5
-LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2YgdGhlIFN0YXJ0Q29tIENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFpbGFibGUgYXQgaHR0cDovL2NlcnQuc3Rh
-cnRjb20ub3JnL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilT
-dGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOC
-AgEAFmyZ9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8jhvh
-3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUWFjgKXlf2Ysd6AgXm
-vB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJzewT4F+irsfMuXGRuczE6Eri8sxHk
-fY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3
-fsNrarnDy0RLrHiQi+fHLB5LEUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZ
-EoalHmdkrQYuL6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
-yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuCO3NJo2pXh5Tl
-1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6Vum0ABj6y6koQOdjQK/W/7HW/
-lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkyShNOsF/5oirpt9P/FlUQqmMGqz9IgcgA38coro
-g14=
------END CERTIFICATE-----
-
-Taiwan GRCA
-===========
------BEGIN CERTIFICATE-----
-MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG
-EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
-DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv
-dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN
-w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5
-BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O
-1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO
-htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov
-J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7
-Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t
-B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB
-O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8
-lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV
-HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2
-09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
-TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj
-Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2
-Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU
-D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz
-DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk
-Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk
-7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ
-CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy
-+fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS
------END CERTIFICATE-----
-
-Swisscom Root CA 1
-==================
------BEGIN CERTIFICATE-----
-MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQG
-EwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2VydGlmaWNhdGUgU2Vy
-dmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3QgQ0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4
-MTgyMjA2MjBaMGQxCzAJBgNVBAYTAmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGln
-aXRhbCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIIC
-IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9m2BtRsiM
-MW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdihFvkcxC7mlSpnzNApbjyF
-NDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/TilftKaNXXsLmREDA/7n29uj/x2lzZAe
-AR81sH8A25Bvxn570e56eqeqDFdvpG3FEzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkC
-b6dJtDZd0KTeByy2dbcokdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn
-7uHbHaBuHYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNFvJbN
-cA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo19AOeCMgkckkKmUp
-WyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjCL3UcPX7ape8eYIVpQtPM+GP+HkM5
-haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJWbjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNY
-MUJDLXT5xp6mig/p/r+D5kNXJLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYw
-HQYDVR0hBBYwFDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j
-BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzcK6FptWfUjNP9
-MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzfky9NfEBWMXrrpA9gzXrzvsMn
-jgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7IkVh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQ
-MbFamIp1TpBcahQq4FJHgmDmHtqBsfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4H
-VtA4oJVwIHaM190e3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtl
-vrsRls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ipmXeascCl
-OS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HHb6D0jqTsNFFbjCYDcKF3
-1QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksfrK/7DZBaZmBwXarNeNQk7shBoJMBkpxq
-nvy5JMWzFYJ+vq6VK+uxwNrjAWALXmmshFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCy
-x/yP2FS1k2Kdzs9Z+z0YzirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMW
-NY6E0F/6MBr1mmz0DlP5OlvRHA==
------END CERTIFICATE-----
-
-DigiCert Assured ID Root CA
-===========================
------BEGIN CERTIFICATE-----
-MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
-IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx
-MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
-ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO
-9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy
-UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW
-/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy
-oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf
-GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF
-66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq
-hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc
-EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn
-SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i
-8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
-+o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
------END CERTIFICATE-----
-
-DigiCert Global Root CA
-=======================
------BEGIN CERTIFICATE-----
-MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
-HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw
-MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
-dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn
-TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5
-BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H
-4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y
-7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB
-o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm
-8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF
-BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr
-EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt
-tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886
-UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
-CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
------END CERTIFICATE-----
-
-DigiCert High Assurance EV Root CA
-==================================
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
-KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw
-MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
-MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu
-Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t
-Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS
-OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3
-MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ
-NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe
-h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB
-Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY
-JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ
-V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp
-myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK
-mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
-vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
------END CERTIFICATE-----
-
-Certplus Class 2 Primary CA
-===========================
------BEGIN CERTIFICATE-----
-MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAwPTELMAkGA1UE
-BhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFzcyAyIFByaW1hcnkgQ0EwHhcN
-OTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2Vy
-dHBsdXMxGzAZBgNVBAMTEkNsYXNzIDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANxQltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR
-5aiRVhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyLkcAbmXuZ
-Vg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCdEgETjdyAYveVqUSISnFO
-YFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yasH7WLO7dDWWuwJKZtkIvEcupdM5i3y95e
-e++U8Rs+yskhwcWYAqqi9lt3m/V+llU0HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRME
-CDAGAQH/AgEKMAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJ
-YIZIAYb4QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMuY29t
-L0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/AN9WM2K191EBkOvD
-P9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8yfFC82x/xXp8HVGIutIKPidd3i1R
-TtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMRFcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+
-7UCmnYR0ObncHoUW2ikbhiMAybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW
-//1IMwrh3KWBkJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
-l7+ijrRU
------END CERTIFICATE-----
-
-DST Root CA X3
-==============
------BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
-ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
-DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
-cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
-rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
-UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
-xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
-utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
-AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
-MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
-dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
-GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
-RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
-fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
------END CERTIFICATE-----
-
-DST ACES CA X6
-==============
------BEGIN CERTIFICATE-----
-MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBbMQswCQYDVQQG
-EwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QxETAPBgNVBAsTCERTVCBBQ0VT
-MRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0wMzExMjAyMTE5NThaFw0xNzExMjAyMTE5NTha
-MFsxCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UE
-CxMIRFNUIEFDRVMxFzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPuktKe1jzI
-DZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7gLFViYsx+tC3dr5BPTCa
-pCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZHfAjIgrrep4c9oW24MFbCswKBXy314pow
-GCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4aahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPy
-MjwmR/onJALJfh1biEITajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1Ud
-EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rkc3Qu
-Y29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjtodHRwOi8vd3d3LnRy
-dXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMtaW5kZXguaHRtbDAdBgNVHQ4EFgQU
-CXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZIhvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V2
-5FYrnJmQ6AgwbN99Pe7lv7UkQIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6t
-Fr8hlxCBPeP/h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
-nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpRrscL9yuwNwXs
-vFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf29w4LTJxoeHtxMcfrHuBnQfO3
-oKfN5XozNmr6mis=
------END CERTIFICATE-----
-
-TURKTRUST Certificate Services Provider Root 1
-==============================================
------BEGIN CERTIFICATE-----
-MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOcUktUUlVTVCBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGDAJUUjEP
-MA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykgMjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0
-acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMx
-MDI3MTdaFw0xNTAzMjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsg
-U2VydGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYDVQQHDAZB
-TktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBC
-aWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEuxZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GX
-yGl8hMW0kWxsE2qkVa2kheiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8i
-Si9BB35JYbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5CurKZ
-8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1JuTm5Rh8i27fbMx4
-W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51b0dewQIDAQABoxAwDjAMBgNVHRME
-BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46
-sWrv7/hg0Uw2ZkUd82YCdAR7kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxE
-q8Sn5RTOPEFhfEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy
-B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdAaLX/7KfS0zgY
-nNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKSRGQDJereW26fyfJOrN3H
------END CERTIFICATE-----
-
-TURKTRUST Certificate Services Provider Root 2
-==============================================
------BEGIN CERTIFICATE-----
-MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEP
-MA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUg
-QmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcN
-MDUxMTA3MTAwNzU3WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVr
-dHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEPMA0G
-A1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls
-acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqe
-LCDe2JAOCtFp0if7qnefJ1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKI
-x+XlZEdhR3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJQv2g
-QrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGXJHpsmxcPbe9TmJEr
-5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1pzpwACPI2/z7woQ8arBT9pmAPAgMB
-AAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58SFq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8G
-A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/ntt
-Rbj2hWyfIvwqECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4
-Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFzgw2lGh1uEpJ+
-hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotHuFEJjOp9zYhys2AzsfAKRO8P
-9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LSy3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5
-UrbnBEI=
------END CERTIFICATE-----
-
-SwissSign Gold CA - G2
-======================
------BEGIN CERTIFICATE-----
-MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUw
-EwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcN
-MDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dp
-c3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUq
-t2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5C
-jCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpg
-vd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDF
-ylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvR
-AiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuend
-jIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkO
-peUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR
-7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGi
-GqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64
-OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
-L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm
-5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr
-44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOf
-Mke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6m
-Gu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxp
-mo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJk
-vC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid392qgQmwLOM7XdVAyksLf
-KzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2Br
-NU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6Lqj
-viOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
------END CERTIFICATE-----
-
-SwissSign Silver CA - G2
-========================
------BEGIN CERTIFICATE-----
-MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCQ0gxFTAT
-BgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMB4X
-DTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0NlowRzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3
-aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644
-N0MvFz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7brYT7QbNHm
-+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieFnbAVlDLaYQ1HTWBCrpJH
-6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH6ATK72oxh9TAtvmUcXtnZLi2kUpCe2Uu
-MGoM9ZDulebyzYLs2aFK7PayS+VFheZteJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5h
-qAaEuSh6XzjZG6k4sIN/c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5
-FZGkECwJMoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRHHTBs
-ROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTfjNFusB3hB48IHpmc
-celM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb65i/4z3GcRm25xBWNOHkDRUjvxF3X
-CO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQUF6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRB
-tjpbO8tFnb0cwpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
-cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBAHPGgeAn0i0P
-4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShpWJHckRE1qTodvBqlYJ7YH39F
-kWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L
-3XWgwF15kIwb4FDm3jH+mHtwX6WQ2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx
-/uNncqCxv1yL5PqZIseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFa
-DGi8aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2Xem1ZqSqP
-e97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQRdAtq/gsD/KNVV4n+Ssuu
-WxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJ
-DIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ub
-DgEj8Z+7fNzcbBGXJbLytGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
------END CERTIFICATE-----
-
-GeoTrust Primary Certification Authority
-========================================
------BEGIN CERTIFICATE-----
-MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
-EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx
-CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ
-cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN
-b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9
-nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge
-RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt
-tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI
-hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K
-Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN
-NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa
-Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG
-1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
------END CERTIFICATE-----
-
-thawte Primary Root CA
-======================
------BEGIN CERTIFICATE-----
-MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE
-BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
-aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3
-MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg
-SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv
-KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT
-FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs
-oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ
-1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc
-q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K
-aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p
-afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF
-AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE
-uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
-xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89
-jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH
-z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA==
------END CERTIFICATE-----
-
-VeriSign Class 3 Public Primary Certification Authority - G5
-============================================================
------BEGIN CERTIFICATE-----
-MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
-BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
-ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
-IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln
-biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh
-dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt
-YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz
-j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD
-Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/
-Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r
-fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/
-BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv
-Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
-aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG
-SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+
-X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE
-KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC
-Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE
-ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
------END CERTIFICATE-----
-
-SecureTrust CA
-==============
------BEGIN CERTIFICATE-----
-MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG
-EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy
-dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe
-BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX
-OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t
-DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH
-GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b
-01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH
-ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj
-aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
-KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu
-SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf
-mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ
-nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
-3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
------END CERTIFICATE-----
-
-Secure Global CA
-================
------BEGIN CERTIFICATE-----
-MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG
-EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH
-bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg
-MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg
-Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx
-YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ
-bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g
-8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV
-HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi
-0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn
-oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA
-MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+
-OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn
-CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5
-3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
-f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
------END CERTIFICATE-----
-
-COMODO Certification Authority
-==============================
------BEGIN CERTIFICATE-----
-MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE
-BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
-A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb
-MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD
-T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH
-+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww
-xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV
-4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA
-1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI
-rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k
-b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC
-AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP
-OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
-RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc
-IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
-+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
------END CERTIFICATE-----
-
-Network Solutions Certificate Authority
-=======================================
------BEGIN CERTIFICATE-----
-MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG
-EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr
-IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx
-MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
-MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx
-jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT
-aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT
-crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc
-/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB
-AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv
-bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA
-A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q
-4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/
-GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
-wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD
-ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
------END CERTIFICATE-----
-
-WellsSecure Public Root Certificate Authority
-=============================================
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoM
-F1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYw
-NAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN
-MDcxMjEzMTcwNzU0WhcNMjIxMjE0MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dl
-bGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYD
-VQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+rWxxTkqxtnt3CxC5FlAM1
-iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjUDk/41itMpBb570OYj7OeUt9tkTmPOL13
-i0Nj67eT/DBMHAGTthP796EfvyXhdDcsHqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8
-bJVhHlfXBIEyg1J55oNjz7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiB
-K0HmOFafSZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/SlwxlAgMB
-AAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwu
-cGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0PAQH/BAQDAgHGMB0GA1UdDgQWBBQm
-lRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0jBIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGB
-i6SBiDCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRww
-GgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg
-Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEBALkVsUSRzCPI
-K0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd/ZDJPHV3V3p9+N701NX3leZ0
-bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pBA4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSlj
-qHyita04pO2t/caaH/+Xc/77szWnk4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+es
-E2fDbbFwRnzVlhE9iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJ
-tylv2G0xffX8oRAHh84vWdw+WNs=
------END CERTIFICATE-----
-
-COMODO ECC Certification Authority
-==================================
------BEGIN CERTIFICATE-----
-MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC
-R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
-ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix
-GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
-Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo
-b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X
-4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni
-wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG
-FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
-U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
------END CERTIFICATE-----
-
-IGC/A
-=====
------BEGIN CERTIFICATE-----
-MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkZSMQ8wDQYD
-VQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVE
-Q1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZy
-MB4XDTAyMTIxMzE0MjkyM1oXDTIwMTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQI
-EwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NT
-STEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaIs9z4iPf930Pfeo2aSVz2
-TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCW
-So7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYy
-HF2fYPepraX/z9E0+X1bF8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNd
-frGoRpAxVs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGdPDPQ
-tQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNVHSAEDjAMMAoGCCqB
-egF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAxNjAfBgNVHSMEGDAWgBSjBS8YYFDC
-iQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUFAAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RK
-q89toB9RlPhJy3Q2FLwV3duJL92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3Q
-MZsyK10XZZOYYLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg
-Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2aNjSaTFR+FwNI
-lQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R0982gaEbeC9xs/FZTEYYKKuF
-0mBWWg==
------END CERTIFICATE-----
-
-Security Communication EV RootCA1
-=================================
------BEGIN CERTIFICATE-----
-MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
-U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU2VjdXJpdHkgQ29tbXVuaWNh
-dGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIzMloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UE
-BhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNl
-Y3VyaXR5IENvbW11bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSERMqm4miO
-/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gOzXppFodEtZDkBp2uoQSX
-WHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4z
-ZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDFMxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4
-bepJz11sS6/vmsJWXMY1VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK
-9U2vP9eCOKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
-SIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HWtWS3irO4G8za+6xm
-iEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZq51ihPZRwSzJIxXYKLerJRO1RuGG
-Av8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDbEJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnW
-mHyojf6GPgcWkuF75x3sM3Z+Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEW
-T1MKZPlO9L9OVL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490
------END CERTIFICATE-----
-
-OISTE WISeKey Global Root GA CA
-===============================
------BEGIN CERTIFICATE-----
-MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE
-BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG
-A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH
-bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD
-VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw
-IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5
-IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9
-Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg
-Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD
-d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ
-/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R
-LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
-KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm
-MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4
-+vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
-hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY
-okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0=
------END CERTIFICATE-----
-
-Microsec e-Szigno Root CA
-=========================
------BEGIN CERTIFICATE-----
-MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAwcjELMAkGA1UE
-BhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNyb3NlYyBMdGQuMRQwEgYDVQQL
-EwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9zZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0
-MDYxMjI4NDRaFw0xNzA0MDYxMjI4NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVz
-dDEWMBQGA1UEChMNTWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMT
-GU1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2uuO/TEdyB5s87lozWbxXG
-d36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/N
-oqdNAoI/gqyFxuEPkEeZlApxcpMqyabAvjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjc
-QR/Ji3HWVBTji1R4P770Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJ
-PqW+jqpx62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcBAQRb
-MFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3AwLQYIKwYBBQUHMAKG
-IWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAPBgNVHRMBAf8EBTADAQH/MIIBcwYD
-VR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIBAQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3
-LmUtc3ppZ25vLmh1L1NaU1ovMIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0A
-dAB2AOEAbgB5ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn
-AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABTAHoAbwBsAGcA
-4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABhACAAcwB6AGUAcgBpAG4AdAAg
-AGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABoAHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMA
-egBpAGcAbgBvAC4AaAB1AC8AUwBaAFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6
-Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NO
-PU1pY3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxPPU1pY3Jv
-c2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDtiaW5h
-cnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuBEGluZm9AZS1zemlnbm8uaHWkdzB1MSMw
-IQYDVQQDDBpNaWNyb3NlYyBlLVN6aWduw7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhT
-WjEWMBQGA1UEChMNTWljcm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhV
-MIGsBgNVHSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJIVTER
-MA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDASBgNVBAsTC2UtU3pp
-Z25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBSb290IENBghEAzLjnv04pGv2i3Gal
-HCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMT
-nGZjWS7KXHAM/IO8VbH0jgdsZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FE
-aGAHQzAxQmHl7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a
-86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfRhUZLphK3dehK
-yVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/MPMMNz7UwiiAc7EBt51alhQB
-S6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU=
------END CERTIFICATE-----
-
-Certigna
-========
------BEGIN CERTIFICATE-----
-MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw
-EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3
-MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI
-Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q
-XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH
-GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p
-ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg
-DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf
-Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ
-tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ
-BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J
-SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA
-hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+
-ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu
-PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
-1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
-WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
------END CERTIFICATE-----
-
-TC TrustCenter Class 2 CA II
-============================
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy
-IENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYw
-MTEyMTQzODQzWhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1
-c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UE
-AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jftMjWQ+nEdVl//OEd+DFw
-IxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKguNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2
-xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2JXjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQ
-Xa7pIXSSTYtZgo+U4+lK8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7u
-SNQZu+995OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3kUrL84J6E1wIqzCB
-7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90
-Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU
-cnVzdENlbnRlciUyMENsYXNzJTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i
-SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iSGNn3Bzn1LL4G
-dXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprtZjluS5TmVfwLG4t3wVMTZonZ
-KNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8au0WOB9/WIFaGusyiC2y8zl3gK9etmF1Kdsj
-TYjKUCjLhdLTEKJZbtOTVAB6okaVhgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kP
-JOzHdiEoZa5X6AeIdUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfk
-vQ==
------END CERTIFICATE-----
-
-TC TrustCenter Class 3 CA II
-============================
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy
-IENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYw
-MTEyMTQ0MTU3WhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1
-c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UE
-AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJWHt4bNwcwIi9v8Qbxq63W
-yKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+QVl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo
-6SI7dYnWRBpl8huXJh0obazovVkdKyT21oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZ
-uV3bOx4a+9P/FRQI2AlqukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk
-2ZyqBwi1Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NXXAek0CSnwPIA1DCB
-7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90
-Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU
-cnVzdENlbnRlciUyMENsYXNzJTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i
-SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlNirTzwppVMXzE
-O2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8TtXqluJucsG7Kv5sbviRmEb8
-yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9
-IJqDnxrcOfHFcqMRA/07QlIp2+gB95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal
-092Y+tTmBvTwtiBjS+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc
-5A==
------END CERTIFICATE-----
-
-TC TrustCenter Universal CA I
-=============================
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy
-IFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcN
-MDYwMzIyMTU1NDI4WhcNMjUxMjMxMjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMg
-VHJ1c3RDZW50ZXIgR21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYw
-JAYDVQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSRJJZ4Hgmgm5qVSkr1YnwC
-qMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3TfCZdzHd55yx4Oagmcw6iXSVphU9VDprv
-xrlE4Vc93x9UIuVvZaozhDrzznq+VZeujRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtw
-ag+1m7Z3W0hZneTvWq3zwZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9O
-gdwZu5GQfezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYDVR0j
-BBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0GCSqGSIb3DQEBBQUAA4IBAQAo0uCG
-1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X17caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/Cy
-vwbZ71q+s2IhtNerNXxTPqYn8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3
-ghUJGooWMNjsydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT
-ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/2TYcuiUaUj0a
-7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY
------END CERTIFICATE-----
-
-Deutsche Telekom Root CA 2
-==========================
------BEGIN CERTIFICATE-----
-MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMT
-RGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEG
-A1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5
-MjM1OTAwWjBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0G
-A1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBS
-b290IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEUha88EOQ5
-bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhCQN/Po7qCWWqSG6wcmtoI
-KyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1MjwrrFDa1sPeg5TKqAyZMg4ISFZbavva4VhY
-AUlfckE8FQYBjl2tqriTtM2e66foai1SNNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aK
-Se5TBY8ZTNXeWHmb0mocQqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTV
-jlsB9WoHtxa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAPBgNV
-HRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAlGRZrTlk5ynr
-E/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756AbrsptJh6sTtU6zkXR34ajgv8HzFZMQSy
-zhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpaIzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8
-rZ7/gFnkm0W09juwzTkZmDLl6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4G
-dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
-Cm26OWMohpLzGITY+9HPBVZkVw==
------END CERTIFICATE-----
-
-ComSign Secured CA
-==================
------BEGIN CERTIFICATE-----
-MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAwPDEbMBkGA1UE
-AxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQGEwJJTDAeFw0w
-NDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwxGzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBD
-QTEQMA4GA1UEChMHQ29tU2lnbjELMAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDGtWhfHZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs
-49ohgHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sWv+bznkqH
-7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ueMv5WJDmyVIRD9YTC2LxB
-kMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d1
-9guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUw
-AwEB/zBEBgNVHR8EPTA7MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29t
-U2lnblNlY3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58ADsA
-j8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkqhkiG9w0BAQUFAAOC
-AQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7piL1DRYHjZiM/EoZNGeQFsOY3wo3a
-BijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtCdsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtp
-FhpFfTMDZflScZAmlaxMDPWLkz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP
-51qJThRv4zdLhfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz
-OjRXUDpvgV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw==
------END CERTIFICATE-----
-
-Cybertrust Global Root
-======================
------BEGIN CERTIFICATE-----
-MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
-ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
-MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
-ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-+Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
-0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
-AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
-89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
-8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
-MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
-A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
-lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
-5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
-hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
-X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
-WL1WMRJOEcgh4LMRkWXbtKaIOM5V
------END CERTIFICATE-----
-
-ePKI Root Certification Authority
-=================================
------BEGIN CERTIFICATE-----
-MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
-Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
-MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
-MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
-IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
-lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
-qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
-12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
-WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
-ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
-lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
-vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
-Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
-MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
-ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
-1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
-KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
-xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
-NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
-GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
-xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
-gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
-sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
-BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
------END CERTIFICATE-----
-
-T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3
-=============================================================================================================================
------BEGIN CERTIFICATE-----
-MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRSMRgwFgYDVQQH
-DA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJpbGltc2VsIHZlIFRla25vbG9q
-aWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSwVEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ry
-b25payB2ZSBLcmlwdG9sb2ppIEFyYcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNV
-BAsMGkthbXUgU2VydGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUg
-S8O2ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAeFw0wNzA4
-MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIxGDAWBgNVBAcMD0dlYnpl
-IC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmlsaW1zZWwgdmUgVGVrbm9sb2ppayBBcmHF
-n3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBUQUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZl
-IEtyaXB0b2xvamkgQXJhxZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2Ft
-dSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7ZrIFNl
-cnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4hgb46ezzb8R1Sf1n68yJMlaCQvEhO
-Eav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yKO7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1
-xnnRFDDtG1hba+818qEhTsXOfJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR
-6Oqeyjh1jmKwlZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
-hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQIDAQABo0IwQDAd
-BgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
-MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmPNOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4
-N5EY3ATIZJkrGG2AA1nJrvhY0D7twyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLT
-y9LQQfMmNkqblWwM7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYh
-LBOhgLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5noN+J1q2M
-dqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUsyZyQ2uypQjyttgI=
------END CERTIFICATE-----
-
-Buypass Class 2 CA 1
-====================
------BEGIN CERTIFICATE-----
-MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMiBDQSAxMB4XDTA2
-MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
-c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7M
-cXA0ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLXl18xoS83
-0r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVBHfCuuCkslFJgNJQ72uA4
-0Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/R
-uFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0P
-AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLPgcIV
-1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+DKhQ7SLHrQVMdvvt
-7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKuBctN518fV4bVIJwo+28TOPX2EZL2
-fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHsh7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5w
-wDX3OaJdZtB7WZ+oRxKaJyOkLY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
------END CERTIFICATE-----
-
-Buypass Class 3 CA 1
-====================
------BEGIN CERTIFICATE-----
-MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMyBDQSAxMB4XDTA1
-MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
-c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKx
-ifZgisRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//zNIqeKNc0
-n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI+MkcVyzwPX6UvCWThOia
-AJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2RhzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c
-1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0P
-AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFPBdy7
-pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27sEzNxZy5p+qksP2bA
-EllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2mSlf56oBzKwzqBwKu5HEA6BvtjT5
-htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yCe/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQj
-el/wroQk5PMr+4okoyeYZdowdXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
------END CERTIFICATE-----
-
-EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1
-==========================================================================
------BEGIN CERTIFICATE-----
-MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNVBAMML0VCRyBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMTcwNQYDVQQKDC5FQkcg
-QmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAe
-Fw0wNjA4MTcwMDIxMDlaFw0xNjA4MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25p
-ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2lt
-IFRla25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h4fuXd7hxlugTlkaDT7by
-X3JWbhNgpQGR4lvFzVcfd2NR/y8927k/qqk153nQ9dAktiHq6yOU/im/+4mRDGSaBUorzAzu8T2b
-gmmkTPiab+ci2hC6X5L8GCcKqKpE+i4stPtGmggDg3KriORqcsnlZR9uKg+ds+g75AxuetpX/dfr
-eYteIAbTdgtsApWjluTLdlHRKJ2hGvxEok3MenaoDT2/F08iiFD9rrbskFBKW5+VQarKD7JK/oCZ
-TqNGFav4c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s/OsNA/+mgxKb8amTD8UmTDGy
-Y5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z+kI2sSXFCjEmN1Zn
-uqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0OLna9XvNRiYuoP1Vzv9s6xiQFlpJI
-qkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMWOeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vm
-ExH8nYQKE3vwO9D8owrXieqWfo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0
-Nokb+Clsi7n2l9GkLqq+CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
-/wQEAwIBBjAdBgNVHQ4EFgQU587GT/wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgwFoAU587GT/wW
-Z5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2+8ygjdsZs93/mQJ7ANtyVDR2t
-FcU22NU57/IeIl6zgrRdu0waypIN30ckHrMk2pGI6YNw3ZPX6bqz3xZaPt7gyPvT/Wwp+BVGoGgm
-zJNSroIBk5DKd8pNSe/iWtkqvTDOTLKBtjDOWU/aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64k
-XPBfrAowzIpAoHMEwfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ/XvCgKqT
-bCmYIai7FvOpEl90tYeY8pUm3zTvilORiF0alKM/fCL414i6poyWqD1SNGKfAB5UVUJnxk1Gj7sU
-RT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq+u2lrDgv+R4QDgZxGhBM/nV+/x5XOULK
-1+EVoVZVWRvRo68R2E7DpSvvkL/A7IITW43WciyTTo9qKd+FPNMN4KIYEsxVL0e3p5sC/kH2iExt
-2qkBR4NkJ2IQgtYSe14DHzSpyZH+r11thie3I6p1GMog57AP14kOpmciY/SDQSsGS7tY1dHXt7kQ
-Y9iJSrSq3RZj9W6+YKH47ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK+lvm9
-AahH3eU7QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT
------END CERTIFICATE-----
-
-certSIGN ROOT CA
-================
------BEGIN CERTIFICATE-----
-MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
-VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
-Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
-CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
-JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
-rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
-ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
-0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
-AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
-Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
-AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
-SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
-x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
-vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
-TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
------END CERTIFICATE-----
-
-CNNIC ROOT
-==========
------BEGIN CERTIFICATE-----
-MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJDTjEOMAwGA1UE
-ChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2MDcwOTE0WhcNMjcwNDE2MDcw
-OTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1Qw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzD
-o+/hn7E7SIX1mlwhIhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tiz
-VHa6dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZOV/kbZKKT
-VrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrCGHn2emU1z5DrvTOTn1Or
-czvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gNv7Sg2Ca+I19zN38m5pIEo3/PIKe38zrK
-y5nLAgMBAAGjczBxMBEGCWCGSAGG+EIBAQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscC
-wQ7vptU7ETAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991S
-lgrHAsEO76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnKOOK5
-Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvHugDnuL8BV8F3RTIM
-O/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7HgviyJA/qIYM/PmLXoXLT1tLYhFHxUV8
-BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fLbuXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2
-G8kS1sHNzYDzAgE8yGnLRUhj2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5m
-mxE=
------END CERTIFICATE-----
-
-ApplicationCA - Japanese Government
-===================================
------BEGIN CERTIFICATE-----
-MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEcMBoGA1UEChMT
-SmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRpb25DQTAeFw0wNzEyMTIxNTAw
-MDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zl
-cm5tZW50MRYwFAYDVQQLEw1BcHBsaWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAp23gdE6Hj6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4
-fl+Kf5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55IrmTwcrN
-wVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cwFO5cjFW6WY2H/CPek9AE
-jP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDihtQWEjdnjDuGWk81quzMKq2edY3rZ+nYVu
-nyoKb58DKTCXKB28t89UKU5RMfkntigm/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRU
-WssmP3HMlEYNllPqa0jQk/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNV
-BAYTAkpQMRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOCseOD
-vOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADlqRHZ3ODrs
-o2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJhyzjVOGjprIIC8CFqMjSnHH2HZ9g
-/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYD
-io+nEhEMy/0/ecGc/WLuo89UDNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmW
-dupwX3kSa+SjB1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
-rosot4LKGAfmt1t06SAZf7IbiVQ=
------END CERTIFICATE-----
-
-GeoTrust Primary Certification Authority - G3
-=============================================
------BEGIN CERTIFICATE-----
-MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
-BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0
-IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy
-eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz
-NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo
-YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT
-LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j
-K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE
-c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C
-IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu
-dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr
-2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9
-cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE
-Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
-AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s
-t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt
------END CERTIFICATE-----
-
-thawte Primary Root CA - G2
-===========================
------BEGIN CERTIFICATE-----
-MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC
-VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu
-IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg
-Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV
-MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG
-b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt
-IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS
-LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5
-8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
-mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN
-G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K
-rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
------END CERTIFICATE-----
-
-thawte Primary Root CA - G3
-===========================
------BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
-BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
-aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w
-ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
-d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD
-VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG
-A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At
-P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC
-+BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY
-7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW
-vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ
-KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK
-A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
-t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC
-8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm
-er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A=
------END CERTIFICATE-----
-
-GeoTrust Primary Certification Authority - G2
-=============================================
------BEGIN CERTIFICATE-----
-MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
-VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
-Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
-OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
-MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
-b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
-BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
-KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
-VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
-EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
-ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
-npaqBA+K
------END CERTIFICATE-----
-
-VeriSign Universal Root Certification Authority
-===============================================
------BEGIN CERTIFICATE-----
-MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
-BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
-ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
-IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
-1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
-MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
-9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
-AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
-tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
-CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
-a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
-DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
-Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
-Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
-P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
-wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
-mJO37M2CYfE45k+XmCpajQ==
------END CERTIFICATE-----
-
-VeriSign Class 3 Public Primary Certification Authority - G4
-============================================================
------BEGIN CERTIFICATE-----
-MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC
-VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3
-b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz
-ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU
-cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo
-b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8
-Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz
-rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB
-/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw
-HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u
-Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD
-A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx
-AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
------END CERTIFICATE-----
-
-NetLock Arany (Class Gold) Főtanúsítvány
-============================================
------BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
-A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
-dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
-cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
-MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
-ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
-biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
-c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
-0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
-/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
-H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
-fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
-neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
-BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
-qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
-YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
-bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
-NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
-dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
------END CERTIFICATE-----
-
-Staat der Nederlanden Root CA - G2
-==================================
------BEGIN CERTIFICATE-----
-MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
-CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-Um9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oXDTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMC
-TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
-ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ
-5291qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8SpuOUfiUtn
-vWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPUZ5uW6M7XxgpT0GtJlvOj
-CwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvEpMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiil
-e7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCR
-OME4HYYEhLoaJXhena/MUGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpI
-CT0ugpTNGmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy5V65
-48r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv6q012iDTiIJh8BIi
-trzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEKeN5KzlW/HdXZt1bv8Hb/C3m1r737
-qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMB
-AAGjgZcwgZQwDwYDVR0TAQH/BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcC
-ARYxaHR0cDovL3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqGSIb3DQEBCwUA
-A4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLySCZa59sCrI2AGeYwRTlHSeYAz
-+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwj
-f/ST7ZwaUb7dRUG/kSS0H4zpX897IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaN
-kqbG9AclVMwWVxJKgnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfk
-CpYL+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxLvJxxcypF
-URmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkmbEgeqmiSBeGCc1qb3Adb
-CG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvkN1trSt8sV4pAWja63XVECDdCcAz+3F4h
-oKOKwJCcaNpQ5kUQR3i2TtJlycM33+FCY7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoV
-IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm
-66+KAQ==
------END CERTIFICATE-----
-
-CA Disig
-========
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMK
-QnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwHhcNMDYw
-MzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlz
-bGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgm
-GErENx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnXmjxUizkD
-Pw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYDXcDtab86wYqg6I7ZuUUo
-hwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhWS8+2rT+MitcE5eN4TPWGqvWP+j1scaMt
-ymfraHtuM6kMgiioTGohQBUgDCZbg8KpFhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8w
-gfwwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0P
-AQH/BAQDAgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cuZGlz
-aWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5zay9jYS9jcmwvY2Ff
-ZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2svY2EvY3JsL2NhX2Rpc2lnLmNybDAa
-BgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEwDQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59t
-WDYcPQuBDRIrRhCA/ec8J9B6yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3
-mkkp7M5+cTxqEEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
-CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeBEicTXxChds6K
-ezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFNPGO+I++MzVpQuGhU+QqZMxEA
-4Z7CRneC9VkGjCFMhwnN5ag=
------END CERTIFICATE-----
-
-Juur-SK
-=======
------BEGIN CERTIFICATE-----
-MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lA
-c2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAw
-DgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMwMVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqG
-SIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVy
-aW1pc2tlc2t1czEQMA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOBSvZiF3tf
-TQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkzABpTpyHhOEvWgxutr2TC
-+Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvHLCu3GFH+4Hv2qEivbDtPL+/40UceJlfw
-UR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMPPbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDa
-Tpxt4brNj3pssAki14sL2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQF
-MAMBAf8wggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwICMIHD
-HoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDkAGwAagBhAHMAdABh
-AHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0AHMAZQBlAHIAaQBtAGkAcwBrAGUA
-cwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABzAGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABr
-AGkAbgBuAGkAdABhAG0AaQBzAGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nw
-cy8wKwYDVR0fBCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
-FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcYP2/v6X2+MA4G
-A1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOiCfP+JmeaUOTDBS8rNXiRTHyo
-ERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+gkcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyL
-abVAyJRld/JXIWY7zoVAtjNjGr95HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678
-IIbsSt4beDI3poHSna9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkh
-Mp6qqIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0ZTbvGRNs2
-yyqcjg==
------END CERTIFICATE-----
-
-Hongkong Post Root CA 1
-=======================
------BEGIN CERTIFICATE-----
-MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
-DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
-NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
-IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
-ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
-auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
-qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
-V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
-HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
-h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
-l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
-IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
-T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
-c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
------END CERTIFICATE-----
-
-SecureSign RootCA11
-===================
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
-SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
-b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
-KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
-cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
-TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
-wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
-g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
-O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
-bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
-t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
-OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
-bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
-Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
-y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
-lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
------END CERTIFICATE-----
-
-ACEDICOM Root
-=============
------BEGIN CERTIFICATE-----
-MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UEAwwNQUNFRElD
-T00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMB4XDTA4
-MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEWMBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoG
-A1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEF
-AAOCAg8AMIICCgKCAgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHk
-WLn709gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7XBZXehuD
-YAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5PGrjm6gSSrj0RuVFCPYew
-MYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAKt0SdE3QrwqXrIhWYENiLxQSfHY9g5QYb
-m8+5eaA9oiM/Qj9r+hwDezCNzmzAv+YbX79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbk
-HQl/Sog4P75n/TSW9R28MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTT
-xKJxqvQUfecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI2Sf2
-3EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyHK9caUPgn6C9D4zq9
-2Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEaeZAwUswdbxcJzbPEHXEUkFDWug/Fq
-TYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz
-4SsrSbbXc6GqlPUB53NlTKxQMA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU
-9QHnc2VMrFAwRAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv
-bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWImfQwng4/F9tqg
-aHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3gvoFNTPhNahXwOf9jU8/kzJP
-eGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKeI6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1Pwk
-zQSulgUV1qzOMPPKC8W64iLgpq0i5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1
-ThCojz2GuHURwCRiipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oI
-KiMnMCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZo5NjEFIq
-nxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6zqylfDJKZ0DcMDQj3dcE
-I2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacNGHk0vFQYXlPKNFHtRQrmjseCNj6nOGOp
-MCwXEGCSn1WHElkQwg9naRHMTh5+Spqtr0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3o
-tkYNbn5XOmeUwssfnHdKZ05phkOTOPu220+DkdRgfks+KzgHVZhepA==
------END CERTIFICATE-----
-
-Microsec e-Szigno Root CA 2009
-==============================
------BEGIN CERTIFICATE-----
-MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
-MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
-c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
-dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
-BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
-U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
-fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
-0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
-pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
-1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
-AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
-QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
-FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
-lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
-I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
-tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
-yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
-LXpUq3DDfSJlgnCW
------END CERTIFICATE-----
-
-E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi
-===================================================
------BEGIN CERTIFICATE-----
-MIIDtjCCAp6gAwIBAgIQRJmNPMADJ72cdpW56tustTANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
-EwJUUjEoMCYGA1UEChMfRWxla3Ryb25payBCaWxnaSBHdXZlbmxpZ2kgQS5TLjE8MDoGA1UEAxMz
-ZS1HdXZlbiBLb2sgRWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhZ2xheWljaXNpMB4XDTA3
-MDEwNDExMzI0OFoXDTE3MDEwNDExMzI0OFowdTELMAkGA1UEBhMCVFIxKDAmBgNVBAoTH0VsZWt0
-cm9uaWsgQmlsZ2kgR3V2ZW5saWdpIEEuUy4xPDA6BgNVBAMTM2UtR3V2ZW4gS29rIEVsZWt0cm9u
-aWsgU2VydGlmaWthIEhpem1ldCBTYWdsYXlpY2lzaTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMMSIJ6wXgBljU5Gu4Bc6SwGl9XzcslwuedLZYDBS75+PNdUMZTe1RK6UxYC6lhj71vY
-8+0qGqpxSKPcEC1fX+tcS5yWCEIlKBHMilpiAVDV6wlTL/jDj/6z/P2douNffb7tC+Bg62nsM+3Y
-jfsSSYMAyYuXjDtzKjKzEve5TfL0TW3H5tYmNwjy2f1rXKPlSFxYvEK+A1qBuhw1DADT9SN+cTAI
-JjjcJRFHLfO6IxClv7wC90Nex/6wN1CZew+TzuZDLMN+DfIcQ2Zgy2ExR4ejT669VmxMvLz4Bcpk
-9Ok0oSy1c+HCPujIyTQlCFzz7abHlJ+tiEMl1+E5YP6sOVkCAwEAAaNCMEAwDgYDVR0PAQH/BAQD
-AgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ/uRLOU1fqRTy7ZVZoEVtstxNulMA0GCSqG
-SIb3DQEBBQUAA4IBAQB/X7lTW2M9dTLn+sR0GstG30ZpHFLPqk/CaOv/gKlR6D1id4k9CnU58W5d
-F4dvaAXBlGzZXd/aslnLpRCKysw5zZ/rTt5S/wzw9JKp8mxTq5vSR6AfdPebmvEvFZ96ZDAYBzwq
-D2fK/A+JYZ1lpTzlvBNbCNvj/+27BrtqBrF6T2XGgv0enIu1De5Iu7i9qgi0+6N8y5/NkHZchpZ4
-Vwpm+Vganf2XKWDeEaaQHBkc7gGWIjQ0LpH5t8Qn0Xvmv/uARFoW5evg1Ao4vOSR49XrXMGs3xtq
-fJ7lddK2l4fbzIcrQzqECK+rPNv3PGYxhrCdU3nt+CPeQuMtgvEP5fqX
------END CERTIFICATE-----
-
-GlobalSign Root CA - R3
-=======================
------BEGIN CERTIFICATE-----
-MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
-YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
-bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
-aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
-bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
-iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
-0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
-rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
-OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
-xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
-FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
-lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
-EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
-bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
-YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
-kpeDMdmztcpHWD9f
------END CERTIFICATE-----
-
-Autoridad de Certificacion Firmaprofesional CIF A62634068
-=========================================================
------BEGIN CERTIFICATE-----
-MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA
-BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
-MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw
-QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
-NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
-Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
-B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
-7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
-ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
-plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
-MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
-LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
-bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
-vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud
-EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH
-DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
-cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA
-bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx
-ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx
-51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk
-R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP
-T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f
-Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl
-osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR
-crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR
-saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD
-KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi
-6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
------END CERTIFICATE-----
-
-Izenpe.com
-==========
------BEGIN CERTIFICATE-----
-MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4MQswCQYDVQQG
-EwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wHhcNMDcxMjEz
-MTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMu
-QS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ
-03rKDx6sp4boFmVqscIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAK
-ClaOxdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6HLmYRY2xU
-+zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFXuaOKmMPsOzTFlUFpfnXC
-PCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQDyCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxT
-OTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbK
-F7jJeodWLBoBHmy+E60QrLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK
-0GqfvEyNBjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8Lhij+
-0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIBQFqNeb+Lz0vPqhbB
-leStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+HMh3/1uaD7euBUbl8agW7EekFwID
-AQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2luZm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+
-SVpFTlBFIFMuQS4gLSBDSUYgQTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBG
-NjIgUzgxQzBBBgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
-MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
-BBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUAA4ICAQB4pgwWSp9MiDrAyw6l
-Fn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWblaQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbga
-kEyrkgPH7UIBzg/YsfqikuFgba56awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8q
-hT/AQKM6WfxZSzwoJNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Cs
-g1lwLDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCTVyvehQP5
-aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGkLhObNA5me0mrZJfQRsN5
-nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJbUjWumDqtujWTI6cfSN01RpiyEGjkpTHC
-ClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZo
-Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z
-WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
------END CERTIFICATE-----
-
-Chambers of Commerce Root - 2008
-================================
------BEGIN CERTIFICATE-----
-MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
-MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
-bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
-QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
-Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
-ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
-EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
-cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
-AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
-XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
-h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
-ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
-NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
-D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
-lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
-0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
-ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
-EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
-G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
-BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
-bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
-bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
-CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
-AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
-wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
-3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
-RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
-M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
-YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
-9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
-zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
-nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
-OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
------END CERTIFICATE-----
-
-Global Chambersign Root - 2008
-==============================
------BEGIN CERTIFICATE-----
-MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
-MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
-bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
-QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
-NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
-Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
-QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
-aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
-VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
-XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
-ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
-/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
-TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
-H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
-Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
-HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
-wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
-AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
-BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
-BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
-aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
-aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
-1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
-dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
-/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
-ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
-dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
-9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
-foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
-qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
-P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
-c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
-09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
------END CERTIFICATE-----
-
-Go Daddy Root Certificate Authority - G2
-========================================
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
-MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
-MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
-b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
-A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
-9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
-+qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
-fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
-NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
-BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
-vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
-5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
-N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
-LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
------END CERTIFICATE-----
-
-Starfield Root Certificate Authority - G2
-=========================================
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
-b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
-eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
-DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
-VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
-dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
-W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
-bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
-N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
-ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
-JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
-TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
-4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
-F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
-pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
-c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
------END CERTIFICATE-----
-
-Starfield Services Root Certificate Authority - G2
-==================================================
------BEGIN CERTIFICATE-----
-MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
-b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
-IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
-BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
-dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
-Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
-h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
-hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
-LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
-rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
-AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
-SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
-E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
-xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
-iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
-YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
------END CERTIFICATE-----
-
-AffirmTrust Commercial
-======================
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw
-MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
-bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb
-DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV
-C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6
-BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww
-MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV
-HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG
-hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi
-qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv
-0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh
-sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
------END CERTIFICATE-----
-
-AffirmTrust Networking
-======================
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw
-MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
-bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE
-Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI
-dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24
-/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb
-h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV
-HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu
-UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6
-12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23
-WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9
-/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
------END CERTIFICATE-----
-
-AffirmTrust Premium
-===================
------BEGIN CERTIFICATE-----
-MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS
-BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy
-OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy
-dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn
-BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV
-5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs
-+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd
-GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R
-p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI
-S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04
-6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5
-/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo
-+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv
-MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
-Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC
-6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S
-L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK
-+4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV
-BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg
-IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60
-g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb
-zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw==
------END CERTIFICATE-----
-
-AffirmTrust Premium ECC
-=======================
------BEGIN CERTIFICATE-----
-MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV
-BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx
-MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U
-cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA
-IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ
-N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW
-BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK
-BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X
-57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM
-eQ==
------END CERTIFICATE-----
-
-Certum Trusted Network CA
-=========================
------BEGIN CERTIFICATE-----
-MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
-ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
-MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
-ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
-l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
-J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
-fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
-cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
-Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
-DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
-jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
-mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
-Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
-03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
------END CERTIFICATE-----
-
-Certinomis - Autorité Racine
-=============================
------BEGIN CERTIFICATE-----
-MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
-Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAkBgNVBAMMHUNlcnRpbm9taXMg
-LSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkG
-A1UEBhMCRlIxEzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYw
-JAYDVQQDDB1DZXJ0aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jYF1AMnmHa
-wE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N8y4oH3DfVS9O7cdxbwly
-Lu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWerP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw
-2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92N
-jMD2AR5vpTESOH2VwnHu7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9q
-c1pkIuVC28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6lSTC
-lrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1Enn1So2+WLhl+HPNb
-xxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB0iSVL1N6aaLwD4ZFjliCK0wi1F6g
-530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql095gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna
-4NH4+ej9Uji29YnfAgMBAAGjWzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
-A1UdDgQWBBQNjLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
-KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9sov3/4gbIOZ/x
-WqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZMOH8oMDX/nyNTt7buFHAAQCva
-R6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40
-nJ+U8/aGH88bc62UeYdocMMzpXDn2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1B
-CxMjidPJC+iKunqjo3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjv
-JL1vnxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG5ERQL1TE
-qkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWqpdEdnV1j6CTmNhTih60b
-WfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZbdsLLO7XSAPCjDuGtbkD326C00EauFddE
-wk01+dIL8hf2rGbVJLJP0RyZwG71fet0BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/
-vgt2Fl43N+bYdJeimUV5
------END CERTIFICATE-----
-
-Root CA Generalitat Valenciana
-==============================
------BEGIN CERTIFICATE-----
-MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJFUzEfMB0GA1UE
-ChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290
-IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcNMDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3
-WjBoMQswCQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UE
-CxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+WmmmO3I2
-F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKjSgbwJ/BXufjpTjJ3Cj9B
-ZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGlu6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQ
-D0EbtFpKd71ng+CT516nDOeB0/RSrFOyA8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXte
-JajCq+TA81yc477OMUxkHl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMB
-AAGjggM7MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBraS5n
-dmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIICIwYKKwYBBAG/VQIB
-ADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBl
-AHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIAYQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIA
-YQBsAGkAdABhAHQAIABWAGEAbABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQBy
-AGEAYwBpAPMAbgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA
-aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMAaQBvAG4AYQBt
-AGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQAZQAgAEEAdQB0AG8AcgBpAGQA
-YQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBu
-AHQAcgBhACAAZQBuACAAbABhACAAZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAA
-OgAvAC8AdwB3AHcALgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0
-dHA6Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+yeAT8MIGV
-BgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQswCQYDVQQGEwJFUzEfMB0G
-A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5S
-b290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRh
-TvW1yEICKrNcda3FbcrnlD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdz
-Ckj+IHLtb8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg9J63
-NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XFducTZnV+ZfsBn5OH
-iJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmCIoaZM3Fa6hlXPZHNqcCjbgcTpsnt
-+GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
------END CERTIFICATE-----
-
-A-Trust-nQual-03
-================
------BEGIN CERTIFICATE-----
-MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJBVDFIMEYGA1UE
-Cgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBlbGVrdHIuIERhdGVudmVy
-a2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5RdWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5R
-dWFsLTAzMB4XDTA1MDgxNzIyMDAwMFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJBgNVBAYTAkFUMUgw
-RgYDVQQKDD9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0
-ZW52ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMMEEEtVHJ1
-c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtPWFuA/OQO8BBC4SA
-zewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUjlUC5B3ilJfYKvUWG6Nm9wASOhURh73+n
-yfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZznF/QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPE
-SU7l0+m0iKsMrmKS1GWH2WrX9IWf5DMiJaXlyDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4
-iHQF63n1k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs2e3V
-cuy+VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0OBAoECERqlWdV
-eRFPMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAVdRU0VlIXLOThaq/Yy/kgM40
-ozRiPvbY7meIMQQDbwvUB/tOdQ/TLtPAF8fGKOwGDREkDg6lXb+MshOWcdzUzg4NCmgybLlBMRmr
-sQd7TZjTXLDR8KdCoLXEjq/+8T/0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR/TeIGgUUw3tKZd
-JXDRZslo+S4RFGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9+GS
-mYHovjrHF1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD/GMBWsm2vLV7eJUYs66MmEDNuxUCAKGkq6
-ahq97BvIxYSazQ==
------END CERTIFICATE-----
-
-TWCA Root Certification Authority
-=================================
------BEGIN CERTIFICATE-----
-MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
-VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
-EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
-IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
-QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
-oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
-4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
-y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
-BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
-9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
-mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
-QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
-T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
-Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
------END CERTIFICATE-----
-
-Security Communication RootCA2
-==============================
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
-U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
-dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
-SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
-aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
-+T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
-3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
-spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
-EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
-QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
-CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
-u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
-3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
-tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
-mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
------END CERTIFICATE-----
-
-EC-ACC
-======
------BEGIN CERTIFICATE-----
-MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
-BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
-ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
-VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
-CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
-BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
-MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
-SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
-Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
-cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
-w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
-ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
-HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
-E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
-0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
-VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
-Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
-dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
-lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
-Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
-l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
-E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
-5EI=
------END CERTIFICATE-----
-
-Hellenic Academic and Research Institutions RootCA 2011
-=======================================================
------BEGIN CERTIFICATE-----
-MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1IxRDBCBgNVBAoT
-O0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9y
-aXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
-IFJvb3RDQSAyMDExMB4XDTExMTIwNjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYT
-AkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
-IENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNo
-IEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPzdYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI
-1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJfel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa
-71HFK9+WXesyHgLacEnsbgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u
-8yBRQlqD75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSPFEDH
-3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTADAQH/
-MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp5dgTBCPuQSUwRwYDVR0eBEAwPqA8
-MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQub3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQu
-b3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVt
-XdMiKahsog2p6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
-TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7dIsXRSZMFpGD
-/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8AcysNnq/onN694/BtZqhFLKPM58N
-7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXIl7WdmplNsDz4SgCbZN2fOUvRJ9e4
------END CERTIFICATE-----
-
-Actalis Authentication Root CA
-==============================
------BEGIN CERTIFICATE-----
-MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UEBhMCSVQxDjAM
-BgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UE
-AwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDky
-MjExMjIwMlowazELMAkGA1UEBhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlz
-IFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
-IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNvUTufClrJ
-wkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX4ay8IMKx4INRimlNAJZa
-by/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9KK3giq0itFZljoZUj5NDKd45RnijMCO6
-zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1f
-YVEiVRvjRuPjPdA1YprbrxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2
-oxgkg4YQ51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2Fbe8l
-EfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxeKF+w6D9Fz8+vm2/7
-hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4Fv6MGn8i1zeQf1xcGDXqVdFUNaBr8
-EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbnfpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5
-jF66CyCU3nuDuP/jVo23Eek7jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLY
-iDrIn3hm7YnzezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
-ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQALe3KHwGCmSUyI
-WOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70jsNjLiNmsGe+b7bAEzlgqqI0
-JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDzWochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKx
-K3JCaKygvU5a2hi/a5iB0P2avl4VSM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+
-Xlff1ANATIGk0k9jpwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC
-4yyXX04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+OkfcvHlXHo
-2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7RK4X9p2jIugErsWx0Hbhz
-lefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btUZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXem
-OR/qnuOf0GZvBeyqdn6/axag67XH/JJULysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9
-vwGYT7JZVEc+NHt4bVaTLnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
------END CERTIFICATE-----
-
-Trustis FPS Root CA
-===================
------BEGIN CERTIFICATE-----
-MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQG
-EwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQLExNUcnVzdGlzIEZQUyBSb290
-IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTExMzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNV
-BAoTD1RydXN0aXMgTGltaXRlZDEcMBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQ
-RUN+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihHiTHcDnlk
-H5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjjvSkCqPoc4Vu5g6hBSLwa
-cY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zt
-o3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlBOrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEA
-AaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAd
-BgNVHQ4EFgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01GX2c
-GE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmWzaD+vkAMXBJV+JOC
-yinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP41BIy+Q7DsdwyhEQsb8tGD+pmQQ9P
-8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZEf1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHV
-l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl
-iB6XzCGcKQENZetX2fNXlrtIzYE=
------END CERTIFICATE-----
-
-StartCom Certification Authority
-================================
------BEGIN CERTIFICATE-----
-MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
-U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu
-ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0
-NjM3WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk
-LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg
-U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y
-o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/
-Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d
-eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt
-2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z
-6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ
-osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/
-untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc
-UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT
-37uMdBNSSwIDAQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
-VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFulF2mHMMo0aEPQ
-Qa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCCATgwLgYIKwYBBQUHAgEWImh0
-dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cu
-c3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENv
-bW1lcmNpYWwgKFN0YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0
-aGUgc2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0aWZpY2F0
-aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuc3RhcnRzc2wuY29t
-L3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBG
-cmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5
-fPGFf59Jb2vKXfuM/gTFwWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWm
-N3PH/UvSTa0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst0OcN
-Org+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNcpRJvkrKTlMeIFw6T
-tn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKlCcWw0bdT82AUuoVpaiF8H3VhFyAX
-e2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVFP0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA
-2MFrLH9ZXF2RsXAiV+uKa0hK1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBs
-HvUwyKMQ5bLmKhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE
-JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ8dCAWZvLMdib
-D4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnmfyWl8kgAwKQB2j8=
------END CERTIFICATE-----
-
-StartCom Certification Authority G2
-===================================
------BEGIN CERTIFICATE-----
-MIIFYzCCA0ugAwIBAgIBOzANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
-U3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
-RzIwHhcNMTAwMTAxMDEwMDAxWhcNMzkxMjMxMjM1OTAxWjBTMQswCQYDVQQGEwJJTDEWMBQGA1UE
-ChMNU3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkgRzIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2iTZbB7cgNr2Cu+EWIAOVeq8O
-o1XJJZlKxdBWQYeQTSFgpBSHO839sj60ZwNq7eEPS8CRhXBF4EKe3ikj1AENoBB5uNsDvfOpL9HG
-4A/LnooUCri99lZi8cVytjIl2bLzvWXFDSxu1ZJvGIsAQRSCb0AgJnooD/Uefyf3lLE3PbfHkffi
-Aez9lInhzG7TNtYKGXmu1zSCZf98Qru23QumNK9LYP5/Q0kGi4xDuFby2X8hQxfqp0iVAXV16iul
-Q5XqFYSdCI0mblWbq9zSOdIxHWDirMxWRST1HFSr7obdljKF+ExP6JV2tgXdNiNnvP8V4so75qbs
-O+wmETRIjfaAKxojAuuKHDp2KntWFhxyKrOq42ClAJ8Em+JvHhRYW6Vsi1g8w7pOOlz34ZYrPu8H
-vKTlXcxNnw3h3Kq74W4a7I/htkxNeXJdFzULHdfBR9qWJODQcqhaX2YtENwvKhOuJv4KHBnM0D4L
-nMgJLvlblnpHnOl68wVQdJVznjAJ85eCXuaPOQgeWeU1FEIT/wCc976qUM/iUUjXuG+v+E5+M5iS
-FGI6dWPPe/regjupuznixL0sAA7IF6wT700ljtizkC+p2il9Ha90OrInwMEePnWjFqmveiJdnxMa
-z6eg6+OGCtP95paV1yPIN93EfKo2rJgaErHgTuixO/XWb/Ew1wIDAQABo0IwQDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUS8W0QGutHLOlHGVuRjaJhwUMDrYwDQYJ
-KoZIhvcNAQELBQADggIBAHNXPyzVlTJ+N9uWkusZXn5T50HsEbZH77Xe7XRcxfGOSeD8bpkTzZ+K
-2s06Ctg6Wgk/XzTQLwPSZh0avZyQN8gMjgdalEVGKua+etqhqaRpEpKwfTbURIfXUfEpY9Z1zRbk
-J4kd+MIySP3bmdCPX1R0zKxnNBFi2QwKN4fRoxdIjtIXHfbX/dtl6/2o1PXWT6RbdejF0mCy2wl+
-JYt7ulKSnj7oxXehPOBKc2thz4bcQ///If4jXSRK9dNtD2IEBVeC2m6kMyV5Sy5UGYvMLD0w6dEG
-/+gyRr61M3Z3qAFdlsHB1b6uJcDJHgoJIIihDsnzb02CVAAgp9KP5DlUFy6NHrgbuxu9mk47EDTc
-nIhT76IxW1hPkWLIwpqazRVdOKnWvvgTtZ8SafJQYqz7Fzf07rh1Z2AQ+4NQ+US1dZxAF7L+/Xld
-blhYXzD8AK6vM8EOTmy6p6ahfzLbOOCxchcKK5HsamMm7YnUeMx0HgX4a/6ManY5Ka5lIxKVCCIc
-l85bBu4M4ru8H0ST9tg4RQUh7eStqxK2A6RCLi3ECToDZ2mEmuFZkIoohdVddLHRDiBYmxOlsGOm
-7XtH/UVVMKTumtTm4ofvmMkyghEpIrwACjFeLQ/Ajulrso8uBtjRkcfGEvRM/TAXw8HaOFvjqerm
-obp573PYtlNXLfbQ4ddI
------END CERTIFICATE-----
-
-Buypass Class 2 Root CA
-=======================
------BEGIN CERTIFICATE-----
-MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMiBSb290IENBMB4X
-DTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1owTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
-eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1
-g1Lr6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPVL4O2fuPn
-9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC911K2GScuVr1QGbNgGE41b
-/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHxMlAQTn/0hpPshNOOvEu/XAFOBz3cFIqU
-CqTqc/sLUegTBxj6DvEr0VQVfTzh97QZQmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeff
-awrbD02TTqigzXsu8lkBarcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgI
-zRFo1clrUs3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLiFRhn
-Bkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRSP/TizPJhk9H9Z2vX
-Uq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN9SG9dKpN6nIDSdvHXx1iY8f93ZHs
-M+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxPAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
-VR0OBBYEFMmAd+BikoL1RpzzuvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
-AAOCAgEAU18h9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
-A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3tOluwlN5E40EI
-osHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo+fsicdl9sz1Gv7SEr5AcD48S
-aq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYd
-DnkM/crqJIByw5c/8nerQyIKx+u2DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWD
-LfJ6v9r9jv6ly0UsH8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0
-oyLQI+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK75t98biGC
-wWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h3PFaTWwyI0PurKju7koS
-CTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPzY11aWOIv4x3kqdbQCtCev9eBCfHJxyYN
-rJgWVqA=
------END CERTIFICATE-----
-
-Buypass Class 3 Root CA
-=======================
------BEGIN CERTIFICATE-----
-MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMyBSb290IENBMB4X
-DTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFowTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
-eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRH
-sJ8YZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3EN3coTRiR
-5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9tznDDgFHmV0ST9tD+leh
-7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX0DJq1l1sDPGzbjniazEuOQAnFN44wOwZ
-ZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH
-2xc519woe2v1n/MuwU8XKhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV
-/afmiSTYzIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvSO1UQ
-RwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D34xFMFbG02SrZvPA
-Xpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgPK9Dx2hzLabjKSWJtyNBjYt1gD1iq
-j6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
-VR0OBBYEFEe4zf/lb+74suwvTg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
-AAOCAgEAACAjQTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
-cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXSIGrs/CIBKM+G
-uIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2HJLw5QY33KbmkJs4j1xrG0aG
-Q0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsaO5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8
-ZORK15FTAaggiG6cX0S5y2CBNOxv033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2
-KSb12tjE8nVhz36udmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz
-6MkEkbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg413OEMXbug
-UZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvDu79leNKGef9JOxqDDPDe
-eOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq4/g7u9xN12TyUb7mqqta6THuBrxzvxNi
-Cp/HuZc=
------END CERTIFICATE-----
-
-T-TeleSec GlobalRoot Class 3
-============================
------BEGIN CERTIFICATE-----
-MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
-IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
-cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgx
-MDAxMTAyOTU2WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
-dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
-ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN8ELg63iIVl6bmlQdTQyK
-9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/RLyTPWGrTs0NvvAgJ1gORH8EGoel15YU
-NpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZF
-iP0Zf3WHHx+xGwpzJFu5ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W
-0eDrXltMEnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGjQjBA
-MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1A/d2O2GCahKqGFPr
-AyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOyWL6ukK2YJ5f+AbGwUgC4TeQbIXQb
-fsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzT
-ucpH9sry9uetuUg/vBa3wW306gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7h
-P0HHRwA11fXT91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
-e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4pTpPDpFQUWw==
------END CERTIFICATE-----
-
-EE Certification Centre Root CA
-===============================
------BEGIN CERTIFICATE-----
-MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
-EwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2Vy
-dGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIw
-MTAxMDMwMTAxMDMwWhgPMjAzMDEyMTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlB
-UyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRy
-ZSBSb290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUyeuuOF0+W2Ap7kaJjbMeM
-TC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvObntl8jixwKIy72KyaOBhU8E2lf/slLo2
-rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIwWFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw
-93X2PaRka9ZP585ArQ/dMtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtN
-P2MbRMNE1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYDVR0T
-AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/zQas8fElyalL1BSZ
-MEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEF
-BQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEFBQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+Rj
-xY6hUFaTlrg4wCQiZrxTFGGVv9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqM
-lIpPnTX/dqQGE5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
-uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU
-3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/vGVCJYMzpJJUPwssd8m92kMfM
-dcGWxZ0=
------END CERTIFICATE-----
-
-TURKTRUST Certificate Services Provider Root 2007
-=================================================
------BEGIN CERTIFICATE-----
-MIIEPTCCAyWgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvzE/MD0GA1UEAww2VMOcUktUUlVTVCBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEP
-MA0GA1UEBwwGQW5rYXJhMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUg
-QmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgQXJhbMSxayAyMDA3MB4X
-DTA3MTIyNTE4MzcxOVoXDTE3MTIyMjE4MzcxOVowgb8xPzA9BgNVBAMMNlTDnFJLVFJVU1QgRWxl
-a3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTELMAkGA1UEBhMCVFIxDzAN
-BgNVBAcMBkFua2FyYTFeMFwGA1UECgxVVMOcUktUUlVTVCBCaWxnaSDEsGxldGnFn2ltIHZlIEJp
-bGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7Fni4gKGMpIEFyYWzEsWsgMjAwNzCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKu3PgqMyKVYFeaK7yc9SrToJdPNM8Ig3BnuiD9N
-YvDdE3ePYakqtdTyuTFYKTsvP2qcb3N2Je40IIDu6rfwxArNK4aUyeNgsURSsloptJGXg9i3phQv
-KUmi8wUG+7RP2qFsmmaf8EMJyupyj+sA1zU511YXRxcw9L6/P8JorzZAwan0qafoEGsIiveGHtya
-KhUG9qPw9ODHFNRRf8+0222vR5YXm3dx2KdxnSQM9pQ/hTEST7ruToK4uT6PIzdezKKqdfcYbwnT
-rqdUKDT74eA7YH2gvnmJhsifLfkKS8RQouf9eRbHegsYz85M733WB2+Y8a+xwXrXgTW4qhe04MsC
-AwEAAaNCMEAwHQYDVR0OBBYEFCnFkKslrxHkYb+j/4hhkeYO/pyBMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQDdr4Ouwo0RSVgrESLFF6QSU2TJ/s
-Px+EnWVUXKgWAkD6bho3hO9ynYYKVZ1WKKxmLNA6VpM0ByWtCLCPyA8JWcqdmBzlVPi5RX9ql2+I
-aE1KBiY3iAIOtsbWcpnOa3faYjGkVh+uX4132l32iPwa2Z61gfAyuOOI0JzzaqC5mxRZNTZPz/OO
-Xl0XrRWV2N2y1RVuAE6zS89mlOTgzbUF2mNXi+WzqtvALhyQRNsaXRik7r4EW5nVcV9VZWRi1aKb
-BFmGyGJ353yCRWo9F7/snXUMrqNvWtMvmDb08PUZqxFdyKbjKlhqQgnDvZImZjINXQhVdP+MmNAK
-poRq0Tl9
------END CERTIFICATE-----
-
-D-TRUST Root Class 3 CA 2 2009
-==============================
------BEGIN CERTIFICATE-----
-MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQK
-DAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTAe
-Fw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NThaME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxE
-LVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOAD
-ER03UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42tSHKXzlA
-BF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9RySPocq60vFYJfxLLHLGv
-KZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsMlFqVlNpQmvH/pStmMaTJOKDfHR+4CS7z
-p+hnUquVH+BGPtikw8paxTGA6Eian5Rp/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUC
-AwEAAaOCARowggEWMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ
-4PGEMA4GA1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVjdG9y
-eS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUyMENBJTIwMiUyMDIw
-MDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3QwQ6BBoD+G
-PWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAw
-OS5jcmwwDQYJKoZIhvcNAQELBQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm
-2H6NMLVwMeniacfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
-o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4KzCUqNQT4YJEV
-dT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8PIWmawomDeCTmGCufsYkl4ph
-X5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3YJohw1+qRzT65ysCQblrGXnRl11z+o+I=
------END CERTIFICATE-----
-
-D-TRUST Root Class 3 CA 2 EV 2009
-=================================
------BEGIN CERTIFICATE-----
-MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
-DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
-OTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUwNDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
-DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
-OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfS
-egpnljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM03TP1YtHh
-zRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6ZqQTMFexgaDbtCHu39b+T
-7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lRp75mpoo6Kr3HGrHhFPC+Oh25z1uxav60
-sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure35
-11H3a6UCAwEAAaOCASQwggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyv
-cop9NteaHNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFwOi8v
-ZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xhc3MlMjAzJTIwQ0El
-MjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1ERT9jZXJ0aWZpY2F0ZXJldm9jYXRp
-b25saXN0MEagRKBChkBodHRwOi8vd3d3LmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xh
-c3NfM19jYV8yX2V2XzIwMDkuY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+
-PPoeUSbrh/Yp3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
-nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNFCSuGdXzfX2lX
-ANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7naxpeG0ILD5EJt/rDiZE4OJudA
-NCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqXKVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVv
-w9y4AyHqnxbxLFS1
------END CERTIFICATE-----
-
-PSCProcert
-==========
------BEGIN CERTIFICATE-----
-MIIJhjCCB26gAwIBAgIBCzANBgkqhkiG9w0BAQsFADCCAR4xPjA8BgNVBAMTNUF1dG9yaWRhZCBk
-ZSBDZXJ0aWZpY2FjaW9uIFJhaXogZGVsIEVzdGFkbyBWZW5lem9sYW5vMQswCQYDVQQGEwJWRTEQ
-MA4GA1UEBxMHQ2FyYWNhczEZMBcGA1UECBMQRGlzdHJpdG8gQ2FwaXRhbDE2MDQGA1UEChMtU2lz
-dGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMUMwQQYDVQQLEzpTdXBl
-cmludGVuZGVuY2lhIGRlIFNlcnZpY2lvcyBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMSUw
-IwYJKoZIhvcNAQkBFhZhY3JhaXpAc3VzY2VydGUuZ29iLnZlMB4XDTEwMTIyODE2NTEwMFoXDTIw
-MTIyNTIzNTk1OVowgdExJjAkBgkqhkiG9w0BCQEWF2NvbnRhY3RvQHByb2NlcnQubmV0LnZlMQ8w
-DQYDVQQHEwZDaGFjYW8xEDAOBgNVBAgTB01pcmFuZGExKjAoBgNVBAsTIVByb3ZlZWRvciBkZSBD
-ZXJ0aWZpY2Fkb3MgUFJPQ0VSVDE2MDQGA1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZp
-Y2FjaW9uIEVsZWN0cm9uaWNhMQswCQYDVQQGEwJWRTETMBEGA1UEAxMKUFNDUHJvY2VydDCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANW39KOUM6FGqVVhSQ2oh3NekS1wwQYalNo97BVC
-wfWMrmoX8Yqt/ICV6oNEolt6Vc5Pp6XVurgfoCfAUFM+jbnADrgV3NZs+J74BCXfgI8Qhd19L3uA
-3VcAZCP4bsm+lU/hdezgfl6VzbHvvnpC2Mks0+saGiKLt38GieU89RLAu9MLmV+QfI4tL3czkkoh
-RqipCKzx9hEC2ZUWno0vluYC3XXCFCpa1sl9JcLB/KpnheLsvtF8PPqv1W7/U0HU9TI4seJfxPmO
-EO8GqQKJ/+MMbpfg353bIdD0PghpbNjU5Db4g7ayNo+c7zo3Fn2/omnXO1ty0K+qP1xmk6wKImG2
-0qCZyFSTXai20b1dCl53lKItwIKOvMoDKjSuc/HUtQy9vmebVOvh+qBa7Dh+PsHMosdEMXXqP+UH
-0quhJZb25uSgXTcYOWEAM11G1ADEtMo88aKjPvM6/2kwLkDd9p+cJsmWN63nOaK/6mnbVSKVUyqU
-td+tFjiBdWbjxywbk5yqjKPK2Ww8F22c3HxT4CAnQzb5EuE8XL1mv6JpIzi4mWCZDlZTOpx+FIyw
-Bm/xhnaQr/2v/pDGj59/i5IjnOcVdo/Vi5QTcmn7K2FjiO/mpF7moxdqWEfLcU8UC17IAggmosvp
-r2uKGcfLFFb14dq12fy/czja+eevbqQ34gcnAgMBAAGjggMXMIIDEzASBgNVHRMBAf8ECDAGAQH/
-AgEBMDcGA1UdEgQwMC6CD3N1c2NlcnRlLmdvYi52ZaAbBgVghl4CAqASDBBSSUYtRy0yMDAwNDAz
-Ni0wMB0GA1UdDgQWBBRBDxk4qpl/Qguk1yeYVKIXTC1RVDCCAVAGA1UdIwSCAUcwggFDgBStuyId
-xuDSAaj9dlBSk+2YwU2u06GCASakggEiMIIBHjE+MDwGA1UEAxM1QXV0b3JpZGFkIGRlIENlcnRp
-ZmljYWNpb24gUmFpeiBkZWwgRXN0YWRvIFZlbmV6b2xhbm8xCzAJBgNVBAYTAlZFMRAwDgYDVQQH
-EwdDYXJhY2FzMRkwFwYDVQQIExBEaXN0cml0byBDYXBpdGFsMTYwNAYDVQQKEy1TaXN0ZW1hIE5h
-Y2lvbmFsIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExQzBBBgNVBAsTOlN1cGVyaW50ZW5k
-ZW5jaWEgZGUgU2VydmljaW9zIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExJTAjBgkqhkiG
-9w0BCQEWFmFjcmFpekBzdXNjZXJ0ZS5nb2IudmWCAQowDgYDVR0PAQH/BAQDAgEGME0GA1UdEQRG
-MESCDnByb2NlcnQubmV0LnZloBUGBWCGXgIBoAwMClBTQy0wMDAwMDKgGwYFYIZeAgKgEgwQUklG
-LUotMzE2MzUzNzMtNzB2BgNVHR8EbzBtMEagRKBChkBodHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52
-ZS9sY3IvQ0VSVElGSUNBRE8tUkFJWi1TSEEzODRDUkxERVIuY3JsMCOgIaAfhh1sZGFwOi8vYWNy
-YWl6LnN1c2NlcnRlLmdvYi52ZTA3BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly9v
-Y3NwLnN1c2NlcnRlLmdvYi52ZTBBBgNVHSAEOjA4MDYGBmCGXgMBAjAsMCoGCCsGAQUFBwIBFh5o
-dHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9kcGMwDQYJKoZIhvcNAQELBQADggIBACtZ6yKZu4Sq
-T96QxtGGcSOeSwORR3C7wJJg7ODU523G0+1ng3dS1fLld6c2suNUvtm7CpsR72H0xpkzmfWvADmN
-g7+mvTV+LFwxNG9s2/NkAZiqlCxB3RWGymspThbASfzXg0gTB1GEMVKIu4YXx2sviiCtxQuPcD4q
-uxtxj7mkoP3YldmvWb8lK5jpY5MvYB7Eqvh39YtsL+1+LrVPQA3uvFd359m21D+VJzog1eWuq2w1
-n8GhHVnchIHuTQfiSLaeS5UtQbHh6N5+LwUeaO6/u5BlOsju6rEYNxxik6SgMexxbJHmpHmJWhSn
-FFAFTKQAVzAswbVhltw+HoSvOULP5dAssSS830DD7X9jSr3hTxJkhpXzsOfIt+FTvZLm8wyWuevo
-5pLtp4EJFAv8lXrPj9Y0TzYS3F7RNHXGRoAvlQSMx4bEqCaJqD8Zm4G7UaRKhqsLEQ+xrmNTbSjq
-3TNWOByyrYDT13K9mmyZY+gAu0F2BbdbmRiKw7gSXFbPVgx96OLP7bx0R/vu0xdOIk9W/1DzLuY5
-poLWccret9W6aAjtmcz9opLLabid+Qqkpj5PkygqYWwHJgD/ll9ohri4zspV4KuxPX+Y1zMOWj3Y
-eMLEYC/HYvBhkdI4sPaeVdtAgAUSM84dkpvRabP/v/GSCmE1P93+hvS84Bpxs2Km
------END CERTIFICATE-----
-
-China Internet Network Information Center EV Certificates Root
-==============================================================
------BEGIN CERTIFICATE-----
-MIID9zCCAt+gAwIBAgIESJ8AATANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMCQ04xMjAwBgNV
-BAoMKUNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyMUcwRQYDVQQDDD5D
-aGluYSBJbnRlcm5ldCBOZXR3b3JrIEluZm9ybWF0aW9uIENlbnRlciBFViBDZXJ0aWZpY2F0ZXMg
-Um9vdDAeFw0xMDA4MzEwNzExMjVaFw0zMDA4MzEwNzExMjVaMIGKMQswCQYDVQQGEwJDTjEyMDAG
-A1UECgwpQ2hpbmEgSW50ZXJuZXQgTmV0d29yayBJbmZvcm1hdGlvbiBDZW50ZXIxRzBFBgNVBAMM
-PkNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyIEVWIENlcnRpZmljYXRl
-cyBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm35z7r07eKpkQ0H1UN+U8i6y
-jUqORlTSIRLIOTJCBumD1Z9S7eVnAztUwYyZmczpwA//DdmEEbK40ctb3B75aDFk4Zv6dOtouSCV
-98YPjUesWgbdYavi7NifFy2cyjw1l1VxzUOFsUcW9SxTgHbP0wBkvUCZ3czY28Sf1hNfQYOL+Q2H
-klY0bBoQCxfVWhyXWIQ8hBouXJE0bhlffxdpxWXvayHG1VA6v2G5BY3vbzQ6sm8UY78WO5upKv23
-KzhmBsUs4qpnHkWnjQRmQvaPK++IIGmPMowUc9orhpFjIpryp9vOiYurXccUwVswah+xt54ugQEC
-7c+WXmPbqOY4twIDAQABo2MwYTAfBgNVHSMEGDAWgBR8cks5x8DbYqVPm6oYNJKiyoOCWTAPBgNV
-HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUfHJLOcfA22KlT5uqGDSSosqD
-glkwDQYJKoZIhvcNAQEFBQADggEBACrDx0M3j92tpLIM7twUbY8opJhJywyA6vPtI2Z1fcXTIWd5
-0XPFtQO3WKwMVC/GVhMPMdoG52U7HW8228gd+f2ABsqjPWYWqJ1MFn3AlUa1UeTiH9fqBk1jjZaM
-7+czV0I664zBechNdn3e9rG3geCg+aF4RhcaVpjwTj2rHO3sOdwHSPdj/gauwqRcalsyiMXHM4Ws
-ZkJHwlgkmeHlPuV1LI5D1l08eB6olYIpUNHRFrrvwb562bTYzB5MRuF3sTGrvSrIzo9uoV1/A3U0
-5K2JRVRevq4opbs/eHnrc7MKDf2+yfdWrPa37S+bISnHOLaVxATywy39FCqQmbkHzJ8=
------END CERTIFICATE-----
-
-Swisscom Root CA 2
-==================
------BEGIN CERTIFICATE-----
-MIIF2TCCA8GgAwIBAgIQHp4o6Ejy5e/DfEoeWhhntjANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQG
-EwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2VydGlmaWNhdGUgU2Vy
-dmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3QgQ0EgMjAeFw0xMTA2MjQwODM4MTRaFw0zMTA2
-MjUwNzM4MTRaMGQxCzAJBgNVBAYTAmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGln
-aXRhbCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAyMIIC
-IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlUJOhJ1R5tMJ6HJaI2nbeHCOFvErjw0DzpPM
-LgAIe6szjPTpQOYXTKueuEcUMncy3SgM3hhLX3af+Dk7/E6J2HzFZ++r0rk0X2s682Q2zsKwzxNo
-ysjL67XiPS4h3+os1OD5cJZM/2pYmLcX5BtS5X4HAB1f2uY+lQS3aYg5oUFgJWFLlTloYhyxCwWJ
-wDaCFCE/rtuh/bxvHGCGtlOUSbkrRsVPACu/obvLP+DHVxxX6NZp+MEkUp2IVd3Chy50I9AU/SpH
-Wrumnf2U5NGKpV+GY3aFy6//SSj8gO1MedK75MDvAe5QQQg1I3ArqRa0jG6F6bYRzzHdUyYb3y1a
-SgJA/MTAtukxGggo5WDDH8SQjhBiYEQN7Aq+VRhxLKX0srwVYv8c474d2h5Xszx+zYIdkeNL6yxS
-NLCK/RJOlrDrcH+eOfdmQrGrrFLadkBXeyq96G4DsguAhYidDMfCd7Camlf0uPoTXGiTOmekl9Ab
-mbeGMktg2M7v0Ax/lZ9vh0+Hio5fCHyqW/xavqGRn1V9TrALacywlKinh/LTSlDcX3KwFnUey7QY
-Ypqwpzmqm59m2I2mbJYV4+by+PGDYmy7Velhk6M99bFXi08jsJvllGov34zflVEpYKELKeRcVVi3
-qPyZ7iVNTA6z00yPhOgpD/0QVAKFyPnlw4vP5w8CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYw
-HQYDVR0hBBYwFDASBgdghXQBUwIBBgdghXQBUwIBMBIGA1UdEwEB/wQIMAYBAf8CAQcwHQYDVR0O
-BBYEFE0mICKJS9PVpAqhb97iEoHF8TwuMB8GA1UdIwQYMBaAFE0mICKJS9PVpAqhb97iEoHF8Twu
-MA0GCSqGSIb3DQEBCwUAA4ICAQAyCrKkG8t9voJXiblqf/P0wS4RfbgZPnm3qKhyN2abGu2sEzsO
-v2LwnN+ee6FTSA5BesogpxcbtnjsQJHzQq0Qw1zv/2BZf82Fo4s9SBwlAjxnffUy6S8w5X2lejjQ
-82YqZh6NM4OKb3xuqFp1mrjX2lhIREeoTPpMSQpKwhI3qEAMw8jh0FcNlzKVxzqfl9NX+Ave5XLz
-o9v/tdhZsnPdTSpxsrpJ9csc1fV5yJmz/MFMdOO0vSk3FQQoHt5FRnDsr7p4DooqzgB53MBfGWcs
-a0vvaGgLQ+OswWIJ76bdZWGgr4RVSJFSHMYlkSrQwSIjYVmvRRGFHQEkNI/Ps/8XciATwoCqISxx
-OQ7Qj1zB09GOInJGTB2Wrk9xseEFKZZZ9LuedT3PDTcNYtsmjGOpI99nBjx8Oto0QuFmtEYE3saW
-mA9LSHokMnWRn6z3aOkquVVlzl1h0ydw2Df+n7mvoC5Wt6NlUe07qxS/TFED6F+KBZvuim6c779o
-+sjaC+NCydAXFJy3SuCvkychVSa1ZC+N8f+mQAWFBVzKBxlcCxMoTFh/wqXvRdpg065lYZ1Tg3TC
-rvJcwhbtkj6EPnNgiLx29CzP0H1907he0ZESEOnN3col49XtmS++dYFLJPlFRpTJKSFTnCZFqhMX
-5OfNeOI5wSsSnqaeG8XmDtkx2Q==
------END CERTIFICATE-----
-
-Swisscom Root EV CA 2
-=====================
------BEGIN CERTIFICATE-----
-MIIF4DCCA8igAwIBAgIRAPL6ZOJ0Y9ON/RAdBB92ylgwDQYJKoZIhvcNAQELBQAwZzELMAkGA1UE
-BhMCY2gxETAPBgNVBAoTCFN3aXNzY29tMSUwIwYDVQQLExxEaWdpdGFsIENlcnRpZmljYXRlIFNl
-cnZpY2VzMR4wHAYDVQQDExVTd2lzc2NvbSBSb290IEVWIENBIDIwHhcNMTEwNjI0MDk0NTA4WhcN
-MzEwNjI1MDg0NTA4WjBnMQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsT
-HERpZ2l0YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxHjAcBgNVBAMTFVN3aXNzY29tIFJvb3QgRVYg
-Q0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMT3HS9X6lds93BdY7BxUglgRCgz
-o3pOCvrY6myLURYaVa5UJsTMRQdBTxB5f3HSek4/OE6zAMaVylvNwSqD1ycfMQ4jFrclyxy0uYAy
-Xhqdk/HoPGAsp15XGVhRXrwsVgu42O+LgrQ8uMIkqBPHoCE2G3pXKSinLr9xJZDzRINpUKTk4Rti
-GZQJo/PDvO/0vezbE53PnUgJUmfANykRHvvSEaeFGHR55E+FFOtSN+KxRdjMDUN/rhPSays/p8Li
-qG12W0OfvrSdsyaGOx9/5fLoZigWJdBLlzin5M8J0TbDC77aO0RYjb7xnglrPvMyxyuHxuxenPaH
-Za0zKcQvidm5y8kDnftslFGXEBuGCxobP/YCfnvUxVFkKJ3106yDgYjTdLRZncHrYTNaRdHLOdAG
-alNgHa/2+2m8atwBz735j9m9W8E6X47aD0upm50qKGsaCnw8qyIL5XctcfaCNYGu+HuB5ur+rPQa
-m3Rc6I8k9l2dRsQs0h4rIWqDJ2dVSqTjyDKXZpBy2uPUZC5f46Fq9mDU5zXNysRojddxyNMkM3Ox
-bPlq4SjbX8Y96L5V5jcb7STZDxmPX2MYWFCBUWVv8p9+agTnNCRxunZLWB4ZvRVgRaoMEkABnRDi
-xzgHcgplwLa7JSnaFp6LNYth7eVxV4O1PHGf40+/fh6Bn0GXAgMBAAGjgYYwgYMwDgYDVR0PAQH/
-BAQDAgGGMB0GA1UdIQQWMBQwEgYHYIV0AVMCAgYHYIV0AVMCAjASBgNVHRMBAf8ECDAGAQH/AgED
-MB0GA1UdDgQWBBRF2aWBbj2ITY1x0kbBbkUe88SAnTAfBgNVHSMEGDAWgBRF2aWBbj2ITY1x0kbB
-bkUe88SAnTANBgkqhkiG9w0BAQsFAAOCAgEAlDpzBp9SSzBc1P6xXCX5145v9Ydkn+0UjrgEjihL
-j6p7jjm02Vj2e6E1CqGdivdj5eu9OYLU43otb98TPLr+flaYC/NUn81ETm484T4VvwYmneTwkLbU
-wp4wLh/vx3rEUMfqe9pQy3omywC0Wqu1kx+AiYQElY2NfwmTv9SoqORjbdlk5LgpWgi/UOGED1V7
-XwgiG/W9mR4U9s70WBCCswo9GcG/W6uqmdjyMb3lOGbcWAXH7WMaLgqXfIeTK7KK4/HsGOV1timH
-59yLGn602MnTihdsfSlEvoqq9X46Lmgxk7lq2prg2+kupYTNHAq4Sgj5nPFhJpiTt3tm7JFe3VE/
-23MPrQRYCd0EApUKPtN236YQHoA96M2kZNEzx5LH4k5E4wnJTsJdhw4Snr8PyQUQ3nqjsTzyP6Wq
-J3mtMX0f/fwZacXduT98zca0wjAefm6S139hdlqP65VNvBFuIXxZN5nQBrz5Bm0yFqXZaajh3DyA
-HmBR3NdUIR7KYndP+tiPsys6DXhyyWhBWkdKwqPrGtcKqzwyVcgKEZzfdNbwQBUdyLmPtTbFr/gi
-uMod89a2GQ+fYWVq6nTIfI/DT11lgh/ZDYnadXL77/FHZxOzyNEZiCcmmpl5fx7kLD977vHeTYuW
-l8PVP3wbI+2ksx0WckNLIOFZfsLorSa/ovc=
------END CERTIFICATE-----
-
-CA Disig Root R1
-================
------BEGIN CERTIFICATE-----
-MIIFaTCCA1GgAwIBAgIJAMMDmu5QkG4oMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNVBAYTAlNLMRMw
-EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
-ZyBSb290IFIxMB4XDTEyMDcxOTA5MDY1NloXDTQyMDcxOTA5MDY1NlowUjELMAkGA1UEBhMCU0sx
-EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
-c2lnIFJvb3QgUjEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCqw3j33Jijp1pedxiy
-3QRkD2P9m5YJgNXoqqXinCaUOuiZc4yd39ffg/N4T0Dhf9Kn0uXKE5Pn7cZ3Xza1lK/oOI7bm+V8
-u8yN63Vz4STN5qctGS7Y1oprFOsIYgrY3LMATcMjfF9DCCMyEtztDK3AfQ+lekLZWnDZv6fXARz2
-m6uOt0qGeKAeVjGu74IKgEH3G8muqzIm1Cxr7X1r5OJeIgpFy4QxTaz+29FHuvlglzmxZcfe+5nk
-CiKxLU3lSCZpq+Kq8/v8kiky6bM+TR8noc2OuRf7JT7JbvN32g0S9l3HuzYQ1VTW8+DiR0jm3hTa
-YVKvJrT1cU/J19IG32PK/yHoWQbgCNWEFVP3Q+V8xaCJmGtzxmjOZd69fwX3se72V6FglcXM6pM6
-vpmumwKjrckWtc7dXpl4fho5frLABaTAgqWjR56M6ly2vGfb5ipN0gTco65F97yLnByn1tUD3AjL
-LhbKXEAz6GfDLuemROoRRRw1ZS0eRWEkG4IupZ0zXWX4Qfkuy5Q/H6MMMSRE7cderVC6xkGbrPAX
-ZcD4XW9boAo0PO7X6oifmPmvTiT6l7Jkdtqr9O3jw2Dv1fkCyC2fg69naQanMVXVz0tv/wQFx1is
-XxYb5dKj6zHbHzMVTdDypVP1y+E9Tmgt2BLdqvLmTZtJ5cUoobqwWsagtQIDAQABo0IwQDAPBgNV
-HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUiQq0OJMa5qvum5EY+fU8PjXQ
-04IwDQYJKoZIhvcNAQEFBQADggIBADKL9p1Kyb4U5YysOMo6CdQbzoaz3evUuii+Eq5FLAR0rBNR
-xVgYZk2C2tXck8An4b58n1KeElb21Zyp9HWc+jcSjxyT7Ff+Bw+r1RL3D65hXlaASfX8MPWbTx9B
-LxyE04nH4toCdu0Jz2zBuByDHBb6lM19oMgY0sidbvW9adRtPTXoHqJPYNcHKfyyo6SdbhWSVhlM
-CrDpfNIZTUJG7L399ldb3Zh+pE3McgODWF3vkzpBemOqfDqo9ayk0d2iLbYq/J8BjuIQscTK5Gfb
-VSUZP/3oNn6z4eGBrxEWi1CXYBmCAMBrTXO40RMHPuq2MU/wQppt4hF05ZSsjYSVPCGvxdpHyN85
-YmLLW1AL14FABZyb7bq2ix4Eb5YgOe2kfSnbSM6C3NQCjR0EMVrHS/BsYVLXtFHCgWzN4funodKS
-ds+xDzdYpPJScWc/DIh4gInByLUfkmO+p3qKViwaqKactV2zY9ATIKHrkWzQjX2v3wvkF7mGnjix
-lAxYjOBVqjtjbZqJYLhkKpLGN/R+Q0O3c+gB53+XD9fyexn9GtePyfqFa3qdnom2piiZk4hA9z7N
-UaPK6u95RyG1/jLix8NRb76AdPCkwzryT+lf3xkK8jsTQ6wxpLPn6/wY1gGp8yqPNg7rtLG8t0zJ
-a7+h89n07eLw4+1knj0vllJPgFOL
------END CERTIFICATE-----
-
-CA Disig Root R2
-================
------BEGIN CERTIFICATE-----
-MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAlNLMRMw
-EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
-ZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQyMDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sx
-EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
-c2lnIFJvb3QgUjIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbC
-w3OeNcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNHPWSb6Wia
-xswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3Ix2ymrdMxp7zo5eFm1tL7
-A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbeQTg06ov80egEFGEtQX6sx3dOy1FU+16S
-GBsEWmjGycT6txOgmLcRK7fWV8x8nhfRyyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqV
-g8NTEQxzHQuyRpDRQjrOQG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa
-5Beny912H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJQfYE
-koopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUDi/ZnWejBBhG93c+A
-Ak9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORsnLMOPReisjQS1n6yqEm70XooQL6i
-Fh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNV
-HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5u
-Qu0wDQYJKoZIhvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
-tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqfGopTpti72TVV
-sRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkblvdhuDvEK7Z4bLQjb/D907Je
-dR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka+elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W8
-1k/BfDxujRNt+3vrMNDcTa/F1balTFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjx
-mHHEt38OFdAlab0inSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01
-utI3gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18DrG5gPcFw0
-sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3OszMOl6W8KjptlwlCFtaOg
-UxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8xL4ysEr3vQCj8KWefshNPZiTEUxnpHikV
-7+ZtsH8tZ/3zbBt1RqPlShfppNcL
------END CERTIFICATE-----
-
-ACCVRAIZ1
-=========
------BEGIN CERTIFICATE-----
-MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UEAwwJQUNDVlJB
-SVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQswCQYDVQQGEwJFUzAeFw0xMTA1
-MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQBgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwH
-UEtJQUNDVjENMAsGA1UECgwEQUNDVjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQCbqau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gM
-jmoYHtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWoG2ioPej0
-RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpAlHPrzg5XPAOBOp0KoVdD
-aaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhrIA8wKFSVf+DuzgpmndFALW4ir50awQUZ
-0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDG
-WuzndN9wrqODJerWx5eHk6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs7
-8yM2x/474KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMOm3WR
-5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpacXpkatcnYGMN285J
-9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPluUsXQA+xtrn13k/c4LOsOxFwYIRK
-Q26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYIKwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRw
-Oi8vd3d3LmFjY3YuZXMvZmlsZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEu
-Y3J0MB8GCCsGAQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
-VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeTVfZW6oHlNsyM
-Hj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIGCCsGAQUFBwICMIIBFB6CARAA
-QQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUAcgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBh
-AO0AegAgAGQAZQAgAGwAYQAgAEEAQwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUA
-YwBuAG8AbABvAGcA7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBj
-AHQAcgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAAQwBQAFMA
-IABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUAczAwBggrBgEFBQcCARYk
-aHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2MuaHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0
-dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRtaW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2
-MV9kZXIuY3JsMA4GA1UdDwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZI
-hvcNAQEFBQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdpD70E
-R9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gUJyCpZET/LtZ1qmxN
-YEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+mAM/EKXMRNt6GGT6d7hmKG9Ww7Y49
-nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepDvV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJ
-TS+xJlsndQAJxGJ3KQhfnlmstn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3
-sCPdK6jT2iWH7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
-I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szAh1xA2syVP1Xg
-Nce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xFd3+YJ5oyXSrjhO7FmGYvliAd
-3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2HpPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3p
-EfbRD0tVNEYqi4Y7
------END CERTIFICATE-----
-
-TWCA Global Root CA
-===================
------BEGIN CERTIFICATE-----
-MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcxEjAQBgNVBAoT
-CVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMTVFdDQSBHbG9iYWwgUm9vdCBD
-QTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQK
-EwlUQUlXQU4tQ0ExEDAOBgNVBAsTB1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3Qg
-Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2C
-nJfF10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz0ALfUPZV
-r2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfChMBwqoJimFb3u/Rk28OKR
-Q4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbHzIh1HrtsBv+baz4X7GGqcXzGHaL3SekV
-tTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1W
-KKD+u4ZqyPpcC1jcxkt2yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99
-sy2sbZCilaLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYPoA/p
-yJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQABDzfuBSO6N+pjWxn
-kjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcEqYSjMq+u7msXi7Kx/mzhkIyIqJdI
-zshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMC
-AQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6g
-cFGn90xHNcgL1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
-LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WFH6vPNOw/KP4M
-8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNoRI2T9GRwoD2dKAXDOXC4Ynsg
-/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlg
-lPx4mI88k1HtQJAH32RjJMtOcQWh15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryP
-A9gK8kxkRr05YuWW6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3m
-i4TWnsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5jwa19hAM8
-EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWzaGHQRiapIVJpLesux+t3
-zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmyKwbQBM0=
------END CERTIFICATE-----
-
-TeliaSonera Root CA v1
-======================
------BEGIN CERTIFICATE-----
-MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAwNzEUMBIGA1UE
-CgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJvb3QgQ0EgdjEwHhcNMDcxMDE4
-MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwW
-VGVsaWFTb25lcmEgUm9vdCBDQSB2MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+
-6yfwIaPzaSZVfp3FVRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA
-3GV17CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+XZ75Ljo1k
-B1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+/jXh7VB7qTCNGdMJjmhn
-Xb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxH
-oLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkmdtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3
-F0fUTPHSiXk+TT2YqGHeOh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJ
-oWjiUIMusDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4pgd7
-gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fsslESl1MpWtTwEhDc
-TwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQarMCpgKIv7NHfirZ1fpoeDVNAgMB
-AAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qW
-DNXr+nuqF+gTEjANBgkqhkiG9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNm
-zqjMDfz1mgbldxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx
-0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1TjTQpgcmLNkQfW
-pb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBedY2gea+zDTYa4EzAvXUYNR0PV
-G6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpc
-c41teyWRyu5FrgZLAMzTsVlQ2jqIOylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOT
-JsjrDNYmiLbAJM+7vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2
-qReWt88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcnHL/EVlP6
-Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVxSK236thZiNSQvxaz2ems
-WWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY=
------END CERTIFICATE-----
-
-E-Tugra Certification Authority
-===============================
------BEGIN CERTIFICATE-----
-MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNVBAYTAlRSMQ8w
-DQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamls
-ZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN
-ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMw
-NTEyMDk0OFoXDTIzMDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmEx
-QDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxl
-cmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQD
-DB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEA4vU/kwVRHoViVF56C/UYB4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vd
-hQd2h8y/L5VMzH2nPbxHD5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5K
-CKpbknSFQ9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEoq1+g
-ElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3Dk14opz8n8Y4e0ypQ
-BaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcHfC425lAcP9tDJMW/hkd5s3kc91r0
-E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsutdEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gz
-rt48Ue7LE3wBf4QOXVGUnhMMti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAq
-jqFGOjGY5RH8zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn
-rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUXU8u3Zg5mTPj5
-dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6Jyr+zE7S6E5UMA8GA1UdEwEB
-/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEG
-MA0GCSqGSIb3DQEBCwUAA4ICAQAFNzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAK
-kEh47U6YA5n+KGCRHTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jO
-XKqYGwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c77NCR807
-VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3+GbHeJAAFS6LrVE1Uweo
-a2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WKvJUawSg5TB9D0pH0clmKuVb8P7Sd2nCc
-dlqMQ1DujjByTd//SffGqWfZbawCEeI6FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEV
-KV0jq9BgoRJP3vQXzTLlyb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gT
-Dx4JnW2PAJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpDy4Q0
-8ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8dNL/+I5c30jn6PQ0G
-C7TbO6Orb1wdtn7os4I07QZcJA==
------END CERTIFICATE-----
-
-T-TeleSec GlobalRoot Class 2
-============================
------BEGIN CERTIFICATE-----
-MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
-IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
-cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgx
-MDAxMTA0MDE0WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
-dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
-ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUdAqSzm1nzHoqvNK38DcLZ
-SBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiCFoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/F
-vudocP05l03Sx5iRUKrERLMjfTlH6VJi1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx970
-2cu+fjOlbpSD8DT6IavqjnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGV
-WOHAD3bZwI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGjQjBA
-MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/WSA2AHmgoCJrjNXy
-YdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhyNsZt+U2e+iKo4YFWz827n+qrkRk4
-r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPACuvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNf
-vNoBYimipidx5joifsFvHZVwIEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR
-3p1m0IvVVGb6g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN
-9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlPBSeOE6Fuwg==
------END CERTIFICATE-----
-
-Atos TrustedRoot 2011
-=====================
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIIXDPLYixfszIwDQYJKoZIhvcNAQELBQAwPDEeMBwGA1UEAwwVQXRvcyBU
-cnVzdGVkUm9vdCAyMDExMQ0wCwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0xMTA3MDcxNDU4
-MzBaFw0zMDEyMzEyMzU5NTlaMDwxHjAcBgNVBAMMFUF0b3MgVHJ1c3RlZFJvb3QgMjAxMTENMAsG
-A1UECgwEQXRvczELMAkGA1UEBhMCREUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCV
-hTuXbyo7LjvPpvMpNb7PGKw+qtn4TaA+Gke5vJrf8v7MPkfoepbCJI419KkM/IL9bcFyYie96mvr
-54rMVD6QUM+A1JX76LWC1BTFtqlVJVfbsVD2sGBkWXppzwO3bw2+yj5vdHLqqjAqc2K+SZFhyBH+
-DgMq92og3AIVDV4VavzjgsG1xZ1kCWyjWZgHJ8cblithdHFsQ/H3NYkQ4J7sVaE3IqKHBAUsR320
-HLliKWYoyrfhk/WklAOZuXCFteZI6o1Q/NnezG8HDt0Lcp2AMBYHlT8oDv3FdU9T1nSatCQujgKR
-z3bFmx5VdJx4IbHwLfELn8LVlhgf8FQieowHAgMBAAGjfTB7MB0GA1UdDgQWBBSnpQaxLKYJYO7R
-l+lwrrw7GWzbITAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKelBrEspglg7tGX6XCuvDsZ
-bNshMBgGA1UdIAQRMA8wDQYLKwYBBAGwLQMEAQEwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
-CwUAA4IBAQAmdzTblEiGKkGdLD4GkGDEjKwLVLgfuXvTBznk+j57sj1O7Z8jvZfza1zv7v1Apt+h
-k6EKhqzvINB5Ab149xnYJDE0BAGmuhWawyfc2E8PzBhj/5kPDpFrdRbhIfzYJsdHt6bPWHJxfrrh
-TZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pcmaHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a9
-61qn8FYiqTxlVMYVqL2Gns2Dlmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G
-3mB/ufNPRJLvKrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
------END CERTIFICATE-----
-
-QuoVadis Root CA 1 G3
-=====================
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQELBQAwSDELMAkG
-A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
-b3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJN
-MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEg
-RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakE
-PBtVwedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWerNrwU8lm
-PNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF34168Xfuw6cwI2H44g4hWf6
-Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh4Pw5qlPafX7PGglTvF0FBM+hSo+LdoIN
-ofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXpUhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/l
-g6AnhF4EwfWQvTA9xO+oabw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV
-7qJZjqlc3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/GKubX
-9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSthfbZxbGL0eUQMk1f
-iyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KOTk0k+17kBL5yG6YnLUlamXrXXAkg
-t3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOtzCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZI
-hvcNAQELBQADggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC
-MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2cDMT/uFPpiN3
-GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUNqXsCHKnQO18LwIE6PWThv6ct
-Tr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP
-+V04ikkwj+3x6xn0dxoxGE1nVGwvb2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh
-3jRJjehZrJ3ydlo28hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fa
-wx/kNSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNjZgKAvQU6
-O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhpq1467HxpvMc7hU6eFbm0
-FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFtnh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOV
-hMJKzRwuJIczYOXD
------END CERTIFICATE-----
-
-QuoVadis Root CA 2 G3
-=====================
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQELBQAwSDELMAkG
-A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
-b3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJN
-MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIg
-RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFh
-ZiFfqq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMWn4rjyduY
-NM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ymc5GQYaYDFCDy54ejiK2t
-oIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+O7q414AB+6XrW7PFXmAqMaCvN+ggOp+o
-MiwMzAkd056OXbxMmO7FGmh77FOm6RQ1o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+l
-V0POKa2Mq1W/xPtbAd0jIaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZo
-L1NesNKqIcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz8eQQ
-sSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43ehvNURG3YBZwjgQQvD
-6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l7ZizlWNof/k19N+IxWA1ksB8aRxh
-lRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALGcC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZI
-hvcNAQELBQADggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
-AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RCroijQ1h5fq7K
-pVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0GaW/ZZGYjeVYg3UQt4XAoeo0L9
-x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4nlv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgz
-dWqTHBLmYF5vHX/JHyPLhGGfHoJE+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6X
-U/IyAgkwo1jwDQHVcsaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+Nw
-mNtddbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNgKCLjsZWD
-zYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeMHVOyToV7BjjHLPj4sHKN
-JeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4WSr2Rz0ZiC3oheGe7IUIarFsNMkd7Egr
-O3jtZsSOeWmD3n+M
------END CERTIFICATE-----
-
-QuoVadis Root CA 3 G3
-=====================
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQELBQAwSDELMAkG
-A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
-b3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJN
-MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMg
-RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286
-IxSR/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNuFoM7pmRL
-Mon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXRU7Ox7sWTaYI+FrUoRqHe
-6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+cra1AdHkrAj80//ogaX3T7mH1urPnMNA3
-I4ZyYUUpSFlob3emLoG+B01vr87ERRORFHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3U
-VDmrJqMz6nWB2i3ND0/kA9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f7
-5li59wzweyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634RylsSqi
-Md5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBpVzgeAVuNVejH38DM
-dyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0QA4XN8f+MFrXBsj6IbGB/kE+V9/Yt
-rQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZI
-hvcNAQELBQADggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px
-KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnIFUBhynLWcKzS
-t/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5WvvoxXqA/4Ti2Tk08HS6IT7SdEQ
-TXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFgu/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9Du
-DcpmvJRPpq3t/O5jrFc/ZSXPsoaP0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGib
-Ih6BJpsQBJFxwAYf3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmD
-hPbl8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+DhcI00iX
-0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HNPlopNLk9hM6xZdRZkZFW
-dSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/ywaZWWDYWGWVjUTR939+J399roD1B0y2
-PpxxVJkES/1Y+Zj0
------END CERTIFICATE-----
-
-DigiCert Assured ID Root G2
-===========================
------BEGIN CERTIFICATE-----
-MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
-IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgw
-MTE1MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
-ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSAn61UQbVH
-35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4HteccbiJVMWWXvdMX0h5i89vq
-bFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9HpEgjAALAcKxHad3A2m67OeYfcgnDmCXRw
-VWmvo2ifv922ebPynXApVfSr/5Vh88lAbx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OP
-YLfykqGxvYmJHzDNw6YuYjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+Rn
-lTGNAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTO
-w0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPIQW5pJ6d1Ee88hjZv
-0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I0jJmwYrA8y8678Dj1JGG0VDjA9tz
-d29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4GnilmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAW
-hsI6yLETcDbYz+70CjTVW0z9B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0M
-jomZmWzwPDCvON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
-IhNzbM8m9Yop5w==
------END CERTIFICATE-----
-
-DigiCert Assured ID Root G3
-===========================
------BEGIN CERTIFICATE-----
-MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQswCQYDVQQGEwJV
-UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYD
-VQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
-MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQ
-BgcqhkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJfZn4f5dwb
-RXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17QRSAPWXYQ1qAk8C3eNvJs
-KTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgF
-UaFNN6KDec6NHSrkhDAKBggqhkjOPQQDAwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5Fy
-YZ5eEJJZVrmDxxDnOOlYJjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy
-1vUhZscv6pZjamVFkpUBtA==
------END CERTIFICATE-----
-
-DigiCert Global Root G2
-=======================
------BEGIN CERTIFICATE-----
-MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
-HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUx
-MjAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
-dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI2/Ou8jqJ
-kTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx1x7e/dfgy5SDN67sH0NO
-3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQq2EGnI/yuum06ZIya7XzV+hdG82MHauV
-BJVJ8zUtluNJbd134/tJS7SsVQepj5WztCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyM
-UNGPHgm+F6HmIcr9g+UQvIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQAB
-o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV5uNu
-5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY1Yl9PMWLSn/pvtsr
-F9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4NeF22d+mQrvHRAiGfzZ0JFrabA0U
-WTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NGFdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBH
-QRFXGU7Aj64GxJUTFy8bJZ918rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/
-iyK5S9kJRaTepLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
-MrY=
------END CERTIFICATE-----
-
-DigiCert Global Root G3
-=======================
------BEGIN CERTIFICATE-----
-MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQswCQYDVQQGEwJV
-UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAwHgYD
-VQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAw
-MDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5k
-aWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0C
-AQYFK4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FGfp4tn+6O
-YwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPOZ9wj/wMco+I+o0IwQDAP
-BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNp
-Yim8S8YwCgYIKoZIzj0EAwMDaAAwZQIxAK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y
-3maTD/HMsQmP3Wyr+mt/oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34
-VOKa5Vt8sycX
------END CERTIFICATE-----
-
-DigiCert Trusted Root G4
-========================
------BEGIN CERTIFICATE-----
-MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBiMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEw
-HwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
-MTIwMDAwWjBiMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3yithZwuEp
-pz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1Ifxp4VpX6+n6lXFllVcq9o
-k3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDVySAdYyktzuxeTsiT+CFhmzTrBcZe7Fsa
-vOvJz82sNEBfsXpm7nfISKhmV1efVFiODCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGY
-QJB5w3jHtrHEtWoYOAMQjdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6
-MUSaM0C/CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCiEhtm
-mnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADMfRyVw4/3IbKyEbe7
-f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QYuKZ3AeEPlAwhHbJUKSWJbOUOUlFH
-dL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXKchYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8
-oR7FwI+isX4KJpn15GkvmB0t9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
-DwEB/wQEAwIBhjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
-ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2SV1EY+CtnJYY
-ZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd+SeuMIW59mdNOj6PWTkiU0Tr
-yF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWcfFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy
-7zBZLq7gcfJW5GqXb5JQbZaNaHqasjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iah
-ixTXTBmyUEFxPT9NcCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN
-5r5N0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie4u1Ki7wb
-/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mIr/OSmbaz5mEP0oUA51Aa
-5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tK
-G48BtieVU+i2iW1bvGjUI+iLUaJW+fCmgKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP
-82Z+
------END CERTIFICATE-----
-
-WoSign
-======
------BEGIN CERTIFICATE-----
-MIIFdjCCA16gAwIBAgIQXmjWEXGUY1BWAGjzPsnFkTANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQG
-EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxKjAoBgNVBAMTIUNlcnRpZmljYXRpb24g
-QXV0aG9yaXR5IG9mIFdvU2lnbjAeFw0wOTA4MDgwMTAwMDFaFw0zOTA4MDgwMTAwMDFaMFUxCzAJ
-BgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEqMCgGA1UEAxMhQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgb2YgV29TaWduMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA
-vcqNrLiRFVaXe2tcesLea9mhsMMQI/qnobLMMfo+2aYpbxY94Gv4uEBf2zmoAHqLoE1UfcIiePyO
-CbiohdfMlZdLdNiefvAA5A6JrkkoRBoQmTIPJYhTpA2zDxIIFgsDcSccf+Hb0v1naMQFXQoOXXDX
-2JegvFNBmpGN9J42Znp+VsGQX+axaCA2pIwkLCxHC1l2ZjC1vt7tj/id07sBMOby8w7gLJKA84X5
-KIq0VC6a7fd2/BVoFutKbOsuEo/Uz/4Mx1wdC34FMr5esAkqQtXJTpCzWQ27en7N1QhatH/YHGkR
-+ScPewavVIMYe+HdVHpRaG53/Ma/UkpmRqGyZxq7o093oL5d//xWC0Nyd5DKnvnyOfUNqfTq1+ez
-EC8wQjchzDBwyYaYD8xYTYO7feUapTeNtqwylwA6Y3EkHp43xP901DfA4v6IRmAR3Qg/UDaruHqk
-lWJqbrDKaiFaafPz+x1wOZXzp26mgYmhiMU7ccqjUu6Du/2gd/Tkb+dC221KmYo0SLwX3OSACCK2
-8jHAPwQ+658geda4BmRkAjHXqc1S+4RFaQkAKtxVi8QGRkvASh0JWzko/amrzgD5LkhLJuYwTKVY
-yrREgk/nkR4zw7CT/xH8gdLKH3Ep3XZPkiWvHYG3Dy+MwwbMLyejSuQOmbp8HkUff6oZRZb9/D0C
-AwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFOFmzw7R
-8bNLtwYgFP6HEtX2/vs+MA0GCSqGSIb3DQEBBQUAA4ICAQCoy3JAsnbBfnv8rWTjMnvMPLZdRtP1
-LOJwXcgu2AZ9mNELIaCJWSQBnfmvCX0KI4I01fx8cpm5o9dU9OpScA7F9dY74ToJMuYhOZO9sxXq
-T2r09Ys/L3yNWC7F4TmgPsc9SnOeQHrAK2GpZ8nzJLmzbVUsWh2eJXLOC62qx1ViC777Y7NhRCOj
-y+EaDveaBk3e1CNOIZZbOVtXHS9dCF4Jef98l7VNg64N1uajeeAz0JmWAjCnPv/So0M/BVoG6kQC
-2nz4SNAzqfkHx5Xh9T71XXG68pWpdIhhWeO/yloTunK0jF02h+mmxTwTv97QRCbut+wucPrXnbes
-5cVAWubXbHssw1abR80LzvobtCHXt2a49CUwi1wNuepnsvRtrtWhnk/Yn+knArAdBtaP4/tIEp9/
-EaEQPkxROpaw0RPxx9gmrjrKkcRpnd8BKWRRb2jaFOwIQZeQjdCygPLPwj2/kWjFgGcexGATVdVh
-mVd8upUPYUk6ynW8yQqTP2cOEvIo4jEbwFcW3wh8GcF+Dx+FHgo2fFt+J7x6v+Db9NpSvd4MVHAx
-kUOVyLzwPt0JfjBkUO1/AaQzZ01oT74V77D2AhGiGxMlOtzCWfHjXEa7ZywCRuoeSKbmW9m1vFGi
-kpbbqsY3Iqb+zCB0oy2pLmvLwIIRIbWTee5Ehr7XHuQe+w==
------END CERTIFICATE-----
-
-WoSign China
-============
------BEGIN CERTIFICATE-----
-MIIFWDCCA0CgAwIBAgIQUHBrzdgT/BtOOzNy0hFIjTANBgkqhkiG9w0BAQsFADBGMQswCQYDVQQG
-EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNVBAMMEkNBIOayg+mAmuagueiv
-geS5pjAeFw0wOTA4MDgwMTAwMDFaFw0zOTA4MDgwMTAwMDFaMEYxCzAJBgNVBAYTAkNOMRowGAYD
-VQQKExFXb1NpZ24gQ0EgTGltaXRlZDEbMBkGA1UEAwwSQ0Eg5rKD6YCa5qC56K+B5LmmMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0EkhHiX8h8EqwqzbdoYGTufQdDTc7WU1/FDWiD+k
-8H/rD195L4mx/bxjWDeTmzj4t1up+thxx7S8gJeNbEvxUNUqKaqoGXqW5pWOdO2XCld19AXbbQs5
-uQF/qvbW2mzmBeCkTVL829B0txGMe41P/4eDrv8FAxNXUDf+jJZSEExfv5RxadmWPgxDT74wwJ85
-dE8GRV2j1lY5aAfMh09Qd5Nx2UQIsYo06Yms25tO4dnkUkWMLhQfkWsZHWgpLFbE4h4TV2TwYeO5
-Ed+w4VegG63XX9Gv2ystP9Bojg/qnw+LNVgbExz03jWhCl3W6t8Sb8D7aQdGctyB9gQjF+BNdeFy
-b7Ao65vh4YOhn0pdr8yb+gIgthhid5E7o9Vlrdx8kHccREGkSovrlXLp9glk3Kgtn3R46MGiCWOc
-76DbT52VqyBPt7D3h1ymoOQ3OMdc4zUPLK2jgKLsLl3Az+2LBcLmc272idX10kaO6m1jGx6KyX2m
-+Jzr5dVjhU1zZmkR/sgO9MHHZklTfuQZa/HpelmjbX7FF+Ynxu8b22/8DU0GAbQOXDBGVWCvOGU6
-yke6rCzMRh+yRpY/8+0mBe53oWprfi1tWFxK1I5nuPHa1UaKJ/kR8slC/k7e3x9cxKSGhxYzoacX
-GKUN5AXlK8IrC6KVkLn9YDxOiT7nnO4fuwECAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFOBNv9ybQV0T6GTwp+kVpOGBwboxMA0GCSqGSIb3DQEBCwUA
-A4ICAQBqinA4WbbaixjIvirTthnVZil6Xc1bL3McJk6jfW+rtylNpumlEYOnOXOvEESS5iVdT2H6
-yAa+Tkvv/vMx/sZ8cApBWNromUuWyXi8mHwCKe0JgOYKOoICKuLJL8hWGSbueBwj/feTZU7n85iY
-r83d2Z5AiDEoOqsuC7CsDCT6eiaY8xJhEPRdF/d+4niXVOKM6Cm6jBAyvd0zaziGfjk9DgNyp115
-j0WKWa5bIW4xRtVZjc8VX90xJc/bYNaBRHIpAlf2ltTW/+op2znFuCyKGo3Oy+dCMYYFaA6eFN0A
-kLppRQjbbpCBhqcqBT/mhDn4t/lXX0ykeVoQDF7Va/81XwVRHmyjdanPUIPTfPRm94KNPQx96N97
-qA4bLJyuQHCH2u2nFoJavjVsIE4iYdm8UXrNemHcSxH5/mc0zy4EZmFcV5cjjPOGG0jfKq+nwf/Y
-jj4Du9gqsPoUJbJRa4ZDhS4HIxaAjUz7tGM7zMN07RujHv41D198HRaG9Q7DlfEvr10lO1Hm13ZB
-ONFLAzkopR6RctR9q5czxNM+4Gm2KHmgCY0c0f9BckgG/Jou5yD5m6Leie2uPAmvylezkolwQOQv
-T8Jwg0DXJCxr5wkf09XHwQj02w47HAcLQxGEIYbpgNR12KvxAmLBsX5VYc8T1yaw15zLKYs4SgsO
-kI26oQ==
------END CERTIFICATE-----
diff --git a/tools/dependencies-report/README.md b/tools/dependencies-report/README.md
index 8b5b2841d..3e957b077 100644
--- a/tools/dependencies-report/README.md
+++ b/tools/dependencies-report/README.md
@@ -2,11 +2,11 @@
 
 The dependency audit tool automates the verification of the following criteria for all
 third-party dependencies that are shipped as part of either Logstash core or the [default Logstash 
-plugins](https://github.com/elastic/logstash/blob/master/rakelib/plugins-metadata.json):
-* The dependency has been added to the [dependency list file](https://github.com/elastic/logstash/blob/master/tools/dependencies-report/src/main/resources/licenseMapping.csv)
+plugins](https://github.com/elastic/logstash/blob/main/rakelib/plugins-metadata.json):
+* The dependency has been added to the [dependency list file](https://github.com/elastic/logstash/blob/main/tools/dependencies-report/src/main/resources/licenseMapping.csv)
 with an appropriate project URL and [SPDX license identifier](https://spdx.org/licenses/). 
-* The license for the dependency is among those [approved for distribution](https://github.com/elastic/logstash/blob/master/tools/dependencies-report/src/main/resources/acceptableLicenses.csv).
-* There is a corresponding `NOTICE.txt` file in the [notices folder](https://github.com/elastic/logstash/tree/master/tools/dependencies-report/src/main/resources/notices)
+* The license for the dependency is among those [approved for distribution](https://github.com/elastic/logstash/blob/main/tools/dependencies-report/src/main/resources/acceptableLicenses.csv).
+* There is a corresponding `NOTICE.txt` file in the [notices folder](https://github.com/elastic/logstash/tree/main/tools/dependencies-report/src/main/resources/notices)
 containing the appropriate notices or license information for the dependency. These individual 
 notice files will be combined to form the notice file shipped with Logstash.
 
diff --git a/tools/dependencies-report/build.gradle b/tools/dependencies-report/build.gradle
index a75a33c66..2e137d241 100644
--- a/tools/dependencies-report/build.gradle
+++ b/tools/dependencies-report/build.gradle
@@ -1,6 +1,25 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 import org.yaml.snakeyaml.Yaml
 
-// fetch version from Logstash's master versions.yml file
+// fetch version from Logstash's main versions.yml file
 def versionMap = (Map) (new Yaml()).load(new File("$projectDir/../../versions.yml").text)
 
 description = """Logstash Dependency Reporting Utility"""
@@ -9,27 +28,26 @@ String jacksonVersion = versionMap['jackson']
 
 repositories {
   mavenCentral()
-  jcenter()
 }
 
 buildscript {
   repositories {
     mavenCentral()
-    jcenter()
+    gradlePluginPortal()
   }
   dependencies {
-    classpath 'org.yaml:snakeyaml:1.17'
-    classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'
+    classpath "org.yaml:snakeyaml:${snakeYamlVersion}"
+    classpath "com.github.johnrengelman:shadow:${shadowGradlePluginVersion}"
   }
 }
 
 dependencies {
-  compile 'commons-io:commons-io:2.6'
-  compile 'org.apache.commons:commons-csv:1.5'
-  compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
-  compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
-  compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
-  testCompile 'junit:junit:4.12'
+  implementation 'commons-io:commons-io:2.16.1'
+  implementation 'org.apache.commons:commons-csv:1.7'
+  implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
+  implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
+  implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
+  testImplementation 'junit:junit:4.13.2'
 }
 
 javadoc {
@@ -45,9 +63,9 @@ test {
 apply plugin: 'com.github.johnrengelman.shadow'
 
 shadowJar {
-  baseName = 'dependencies-report'
-  classifier = null
-  version = null
+  archiveBaseName = 'dependencies-report'
+  archiveClassifier = null
+  archiveVersion = ''
 }
 
 assemble.dependsOn shadowJar
diff --git a/tools/dependencies-report/src/main/java/org/logstash/dependencies/Dependency.java b/tools/dependencies-report/src/main/java/org/logstash/dependencies/Dependency.java
index 52cee06c1..d8c1c4ae2 100644
--- a/tools/dependencies-report/src/main/java/org/logstash/dependencies/Dependency.java
+++ b/tools/dependencies-report/src/main/java/org/logstash/dependencies/Dependency.java
@@ -1,17 +1,33 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.dependencies;
 
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVRecord;
 
-import java.io.BufferedReader;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.net.URL;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Objects;
 import java.util.Scanner;
 import java.util.SortedSet;
@@ -22,13 +38,15 @@ class Dependency implements Comparable<Dependency> {
     String version;
     String url;
     String spdxLicense;
+    String sourceURL;
+    String copyright;
 
     /**
      * Returns an object array representing this dependency as a CSV record according
      * to the format requested here: https://github.com/elastic/logstash/issues/8725
      */
     Object[] toCsvReportRecord() {
-        return new String[] {name, version, "", url, spdxLicense, ""};
+        return new String[] {name, version, "", url, spdxLicense, copyright, sourceURL};
     }
 
     /**
@@ -58,10 +76,15 @@ class Dependency implements Comparable<Dependency> {
     private static Dependency fromRubyCsvRecord(CSVRecord record) {
         Dependency d = new Dependency();
 
-        // name, version, url, license
+        // name, version, url, license, copyright, sourceURL
         d.name = record.get(0);
         d.version = record.get(1);
-
+        if (record.size() > 4) {
+            d.copyright = record.get(4);
+        }
+        if (record.size() > 5) {
+            d.sourceURL = record.get(5);
+        }
         return d;
     }
 
@@ -102,17 +125,17 @@ class Dependency implements Comparable<Dependency> {
             return false;
         }
         Dependency d = (Dependency) o;
-        return Objects.equals(name, d.name) && Objects.equals(version, d.version);
+        return Objects.equals(name, d.name);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(name, version);
+        return Objects.hash(name);
     }
 
     @Override
     public int compareTo(Dependency o) {
-        return (name + version).compareTo(o.name + o.version);
+        return (name).compareTo(o.name);
     }
 
     public String noticeSourcePath() {
@@ -128,7 +151,7 @@ class Dependency implements Comparable<Dependency> {
     }
 
     public String noticeFilename() {
-        return String.format("%s-%s-NOTICE.txt", fsCompatibleName(), version != null ? version : "NOVERSION");
+        return String.format("%s-NOTICE.txt", fsCompatibleName());
     }
 
     public String resourceName() {
@@ -151,14 +174,6 @@ class Dependency implements Comparable<Dependency> {
        }
     }
 
-    public Path noticePath() {
-        // Get the base first since this always exists, otherwise getResource will return null if its for a notice
-        // that doesn't exist
-        String noticesBase = ReportGenerator.class.getResource("/notices").getPath();
-        Path path = Paths.get(noticesBase, noticeFilename());
-        return path;
-    }
-
     public String getName() {
         return name;
     }
@@ -167,6 +182,10 @@ class Dependency implements Comparable<Dependency> {
         return version;
     }
 
+    public String getSourceURL() {
+        return sourceURL;
+    }
+
     @Override
     public String toString() {
         return "<Dependency " + name + " v" + version + ">";
diff --git a/tools/dependencies-report/src/main/java/org/logstash/dependencies/Main.java b/tools/dependencies-report/src/main/java/org/logstash/dependencies/Main.java
index a8340a0ec..db60923f5 100644
--- a/tools/dependencies-report/src/main/java/org/logstash/dependencies/Main.java
+++ b/tools/dependencies-report/src/main/java/org/logstash/dependencies/Main.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.dependencies;
 
 import java.io.FileInputStream;
@@ -46,7 +66,7 @@ public class Main {
         );
 
         // If there were unknown results in the report, exit with a non-zero status
-        //System.exit(reportResult ? 0 : 1);
+        System.exit(reportResult ? 0 : 1);
     }
 
     static InputStream getResourceAsStream(String resourcePath) {
diff --git a/tools/dependencies-report/src/main/java/org/logstash/dependencies/ReportGenerator.java b/tools/dependencies-report/src/main/java/org/logstash/dependencies/ReportGenerator.java
index 232cf157f..78f1f651d 100644
--- a/tools/dependencies-report/src/main/java/org/logstash/dependencies/ReportGenerator.java
+++ b/tools/dependencies-report/src/main/java/org/logstash/dependencies/ReportGenerator.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.dependencies;
 
 import org.apache.commons.csv.CSVFormat;
@@ -29,9 +49,8 @@ public class ReportGenerator {
 
     final String UNKNOWN_LICENSE = "UNKNOWN";
     final Collection<Dependency> UNKNOWN_LICENSES = new ArrayList<>();
-    final String[] CSV_HEADERS = {"name", "version", "revision", "url", "license", "copyright"};
+    final String[] CSV_HEADERS = {"name", "version", "revision", "url", "license", "copyright","sourceURL"};
     final Collection<Dependency> MISSING_NOTICE = new ArrayList<>();
-    final HashMap<Dependency, Boolean> UNUSED_DEPENDENCIES = new HashMap<>();
 
     boolean generateReport(
             InputStream licenseMappingStream,
@@ -46,7 +65,7 @@ public class ReportGenerator {
         Dependency.addDependenciesFromRubyReport(rubyDependenciesStream, dependencies);
         addJavaDependencies(javaDependenciesStreams, dependencies);
 
-        Map<String, LicenseUrlPair> licenseMapping = new HashMap<>();
+        Map<String, LicenseInfo> licenseMapping = new HashMap<>();
         checkDependencyLicenses(licenseMappingStream, acceptableLicensesStream, licenseMapping, dependencies);
         checkDependencyNotices(noticeOutput, dependencies);
 
@@ -72,7 +91,7 @@ public class ReportGenerator {
     }
 
     private void checkDependencyLicenses(InputStream licenseMappingStream, InputStream acceptableLicensesStream,
-                                         Map<String, LicenseUrlPair> licenseMapping, SortedSet<Dependency> dependencies) throws IOException {
+                                         Map<String, LicenseInfo> licenseMapping, SortedSet<Dependency> dependencies) throws IOException {
         readLicenseMapping(licenseMappingStream, licenseMapping);
         List<String> acceptableLicenses = new ArrayList<>();
         readAcceptableLicenses(acceptableLicensesStream, acceptableLicenses);
@@ -115,10 +134,10 @@ public class ReportGenerator {
         }
     }
 
-    private void reportUnusedLicenseMappings(Writer unusedLicenseWriter, Map<String, LicenseUrlPair> licenseMapping) throws IOException {
+    private void reportUnusedLicenseMappings(Writer unusedLicenseWriter, Map<String, LicenseInfo> licenseMapping) throws IOException {
         SortedSet<String> unusedDependencies = new TreeSet<>();
 
-        for (Map.Entry<String, LicenseUrlPair> entry : licenseMapping.entrySet()) {
+        for (Map.Entry<String, LicenseInfo> entry : licenseMapping.entrySet()) {
             if (entry.getValue().isUnused) {
                 unusedDependencies.add(entry.getKey());
             }
@@ -158,14 +177,13 @@ public class ReportGenerator {
         }
     }
 
-    private void checkDependencyLicense(Map<String, LicenseUrlPair> licenseMapping, List<String> acceptableLicenses, Dependency dependency) {
-        String nameAndVersion = dependency.name + ":" + dependency.version;
-        if (licenseMapping.containsKey(nameAndVersion)) {
-            LicenseUrlPair pair = licenseMapping.get(nameAndVersion);
+    private void checkDependencyLicense(Map<String, LicenseInfo> licenseMapping, List<String> acceptableLicenses, Dependency dependency) {
+        if (licenseMapping.containsKey(dependency.name)) {
+            LicenseInfo licenseInfo = licenseMapping.get(dependency.name);
 
-            String[] dependencyLicenses = pair.license.split("\\|");
+            String[] dependencyLicenses = licenseInfo.license.split("\\|");
             boolean hasAcceptableLicense = false;
-            if (pair.url != null && !pair.url.equals("")) {
+            if (licenseInfo.url != null && !licenseInfo.url.equals("")) {
                 for (int k = 0; k < dependencyLicenses.length && !hasAcceptableLicense; k++) {
                     if (acceptableLicenses.stream().anyMatch(dependencyLicenses[k]::equalsIgnoreCase)) {
                         hasAcceptableLicense = true;
@@ -174,9 +192,11 @@ public class ReportGenerator {
             }
 
             if (hasAcceptableLicense) {
-                dependency.spdxLicense = pair.license;
-                dependency.url = pair.url;
-                pair.isUnused = false;
+                dependency.spdxLicense = licenseInfo.license;
+                dependency.url = licenseInfo.url;
+                dependency.sourceURL = licenseInfo.sourceURL;
+                dependency.copyright = licenseInfo.copyright;
+                licenseInfo.isUnused = false;
             } else {
                 // unacceptable license or missing URL
                 UNKNOWN_LICENSES.add(dependency);
@@ -198,26 +218,60 @@ public class ReportGenerator {
         }
     }
 
-    private void readLicenseMapping(InputStream stream, Map<String, LicenseUrlPair> licenseMapping)
+    private void readLicenseMapping(InputStream stream, Map<String, LicenseInfo> licenseMapping)
             throws IOException {
         Reader in = new InputStreamReader(stream);
         for (CSVRecord record : CSVFormat.DEFAULT.withFirstRecordAsHeader().parse(in)) {
             String dependencyNameAndVersion = record.get(0);
             if (dependencyNameAndVersion != null && !dependencyNameAndVersion.equals("")) {
-                licenseMapping.put(dependencyNameAndVersion, new LicenseUrlPair(record.get(2), record.get(1)));
+                int lastIndex = dependencyNameAndVersion.lastIndexOf(':');
+                String depName = lastIndex < 0
+                        ? dependencyNameAndVersion
+                        : dependencyNameAndVersion.substring(0,  lastIndex);
+
+                validateAndAdd(licenseMapping, depName, LicenseInfo.fromCSVRecord(record));
             }
         }
     }
 
+    private static void validateAndAdd(Map<String, LicenseInfo> licenses, String depName, LicenseInfo lup) {
+        if (licenses.containsKey(depName)) {
+            LicenseInfo existingLicense = licenses.get(depName);
+
+            // Because dependency versions are not treated independently, if dependencies with different versions
+            // have different licenses, we cannot distinguish between them
+            if (!existingLicense.license.equals(lup.license)) {
+                String err = String.format("License mapping contains duplicate dependencies '%s' with conflicting " +
+                        "licenses '%s' and '%s'", depName, existingLicense.license, lup.license);
+                throw new IllegalStateException(err);
+            }
+        } else {
+            licenses.put(depName, lup);
+        }
+    }
+
 }
 
-class LicenseUrlPair {
+class LicenseInfo {
     String license;
     String url;
+    String sourceURL;
+    String copyright;
     boolean isUnused = true;
 
-    LicenseUrlPair(String license, String url) {
+    LicenseInfo(String license, String url) {
         this.license = license;
         this.url = url;
     }
+
+    static LicenseInfo fromCSVRecord(CSVRecord record){
+        LicenseInfo info = new LicenseInfo(record.get(2), record.get(1));
+        if (record.size() > 3){
+            info.copyright = record.get(3);
+        }
+        if (record.size() > 4){
+            info.sourceURL = record.get(4);
+        }
+        return info;
+    }
 }
diff --git a/tools/dependencies-report/src/main/resources/acceptableLicenses.csv b/tools/dependencies-report/src/main/resources/acceptableLicenses.csv
index 9e2e6d69a..221feae0a 100644
--- a/tools/dependencies-report/src/main/resources/acceptableLicenses.csv
+++ b/tools/dependencies-report/src/main/resources/acceptableLicenses.csv
@@ -7,4 +7,5 @@ EPL-1.0
 EPL-2.0
 ISC
 MIT
-Ruby
\ No newline at end of file
+Ruby
+Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/licenseMapping.csv b/tools/dependencies-report/src/main/resources/licenseMapping.csv
index 2e7f43d42..1211d7bd6 100644
--- a/tools/dependencies-report/src/main/resources/licenseMapping.csv
+++ b/tools/dependencies-report/src/main/resources/licenseMapping.csv
@@ -1,188 +1,211 @@
-dependency,dependencyUrl,licenseOverride
-"addressable:2.3.8",https://github.com/sporkmonger/addressable,Apache-2.0
-"asm:6.0",http://asm.objectweb.org,BSD-3-Clause
-"atomic:1.1.99",http://github.com/ruby-concurrency/atomic,Apache-2.0
-"avl_tree:1.2.1",https://github.com/nahi/avl_tree,BSD-2-Clause-FreeBSD
-"awesome_print:1.7.0",https://github.com/awesome-print/awesome_print,MIT
-"aws-sdk-core:2.11.111",http://github.com/aws/aws-sdk-ruby,Apache-2.0
-"aws-sdk-resources:2.11.111",http://github.com/aws/aws-sdk-ruby,Apache-2.0
-"aws-sdk-v1:1.67.0",http://aws.amazon.com/sdkforruby,Apache-2.0
-"aws-sdk:2.11.111",http://github.com/aws/aws-sdk-ruby,Apache-2.0
-"aws-sigv4:1.0.3",http://github.com/aws/aws-sdk-ruby,Apache-2.0
-"backports:3.11.3",http://github.com/marcandre/backports,MIT
-"bindata:2.4.3",http://github.com/dmendel/bindata,BSD-2-Clause
-"bouncycastle",https://www.bouncycastle.org,MIT
-"buftok:0.2.0",https://github.com/sferik/buftok,MIT
-"builder:3.2.3",http://onestepback.org,MIT
-"bundler:1.9.10",https://bundler.io/,MIT
-"bytelist:",http://github.com/jruby/bytelist,EPL-1.0
-"cabin:0.9.0",https://github.com/jordansissel/ruby-cabin,Apache-2.0
-"childprocess:0.9.0",http://github.com/enkessler/childprocess,MIT
-"chronic_duration:0.10.6",https://github.com/hpoydar/chronic_duration,MIT
-"clamp:0.6.5",http://github.com/mdub/clamp,MIT
-"coderay:1.1.2",http://coderay.rubychan.de,MIT
-"com.fasterxml.jackson.core:jackson-annotations:2.9.5",https://github.com/FasterXML/jackson-annotations,Apache-2.0
-"com.fasterxml.jackson.core:jackson-core:2.9.5",https://github.com/FasterXML/jackson-core,Apache-2.0
-"com.fasterxml.jackson.core:jackson-databind:2.9.5",https://github.com/FasterXML/jackson-databind,Apache-2.0
-"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.5",https://github.com/FasterXML/jackson-dataformats-binary,Apache-2.0
-"com.fasterxml.jackson.module:jackson-module-afterburner:2.9.5",https://github.com/FasterXML/jackson-modules-base,Apache-2.0
-"com.github.jnr:jnr-unixsocket:","https://github.com/jnr/jnr-unixsocket",Apache-2.0
-"com.github.jnr:jnr-x86asm:","https://github.com/jnr/jnr-x86asm",MIT
-"com.google.code.findbugs:jsr305:1.3.9",http://findbugs.sourceforge.net,Apache-2.0
-"com.google.errorprone:error_prone_annotations:2.0.18",https://github.com/google/error-prone,Apache-2.0
-"com.google.googlejavaformat:google-java-format:1.1",https://github.com/google/google-java-format,Apache-2.0
-"com.google.guava:guava:22.0",https://github.com/google/guava,Apache-2.0
-"com.google.j2objc:j2objc-annotations:1.1",https://github.com/google/j2objc/,Apache-2.0
-"commons-codec:commons-codec:1.10.0",http://commons.apache.org/proper/commons-codec/,Apache-2.0
-"commons-codec:commons-codec:1.11",http://commons.apache.org/proper/commons-codec/,Apache-2.0
-"commons-logging:commons-logging:1.2.0",http://commons.apache.org/proper/commons-logging/,Apache-2.0
-"concurrent-ruby:1.0.5",http://www.concurrent-ruby.com,MIT
-"controls.js:",https://github.com/controlsjs/controls.js,GPL-3.0-only
-"crack:0.4.3",http://github.com/jnunemaker/crack,MIT
-"diff-lcs:1.3",https://github.com/halostatue/diff-lcs,MIT
-"domain_name:0.5.20180417",https://github.com/knu/ruby-domain_name,BSD-2-Clause
-"dotenv:2.5.0",https://github.com/bkeepers/dotenv,MIT
-"edn:1.1.1",https://github.com/relevance/edn-ruby,MIT
-"elasticsearch-api:5.0.5",https://github.com/elastic/elasticsearch-ruby,Apache-2.0
-"elasticsearch-transport:5.0.5",https://github.com/elastic/elasticsearch-ruby,Apache-2.0
-"elasticsearch:5.0.5",https://github.com/elastic/elasticsearch-ruby,Apache-2.0
-"equalizer:0.0.10",https://github.com/dkubb/equalizer,MIT
-"faraday:0.9.2",https://github.com/lostisland/faraday,MIT
-"ffi:1.9.25",https://github.com/ffi/ffi,BSD-3-CLAUSE
-"filesize:0.0.4",https://github.com/dominikh,MIT
-"filewatch:0.9.0",https://github.com/jordansissel/ruby-filewatch,MIT
-"ftw:0.0.48",https://github.com/jordansissel/ruby-ftw,Apache-2.0
-"gelf:3.0.0",https://github.com/graylog-labs/gelf-rb,MIT
-"gelfd:0.2.0",https://github.com/lusis/gelfd,Apache-2.0
-"gems:0.8.3",https://github.com/rubygems/gems,MIT
-"gmetric:0.1.3",https://github.com/igrigorik/gmetric,MIT
-"gradle.plugin.com.github.jk1:gradle-license-report:0.7.1",https://github.com/jk1/Gradle-License-Report,Apache-2.0
-"gserver:0.0.1",https://github.com/ruby/gserver/blob,Ruby
-"hitimes:1.3.0",https://github.com/copiousfreetime/hitimes,ISC
-"http-cookie:1.0.3",https://github.com/sparklemotion/http-cookie,MIT
-"http-form_data:1.0.1",https://github.com/httprb/form_data,MIT
-"http:0.9.9",https://github.com/httprb/http,MIT
-"http_parser.rb:0.6.0",https://github.com/tmm1/http_parser.rb,MIT
-"i18n:0.6.9",https://github.com/svenfuchs/i18n,MIT
-"insist:1.0.0",https://github.com/jordansissel/ruby-insist,Apache-2.0
-"invokebinder:1.7",https://github.com/headius/invokebinder,Apache-2.0
-"jar-dependencies:0.3.12",https://github.com/mkristian/jar-dependencies,MIT
-"jay-yydebug:",https://github.com/jruby/jay-yydebug,EPL-2.0|GPL-2.0|LGPL-2.1
-"jcodings:1.0.18",https://github.com/jruby/jcodings,MIT
-"jdbc-derby:10.12.1.1",https://github.com/jruby/activerecord-jdbc-adapter,Apache-2.0
-"jffi:1.2.16",https://github.com/jnr/jffi,Apache-2.0|LGPL-3.0
-"jitescript:0.4.1",https://github.com/qmx/jitescript,Apache-2.0
-"jline2:2.1.1",https://github.com/jline/jline2,BSD-2-Clause
-"jls-grok:0.11.5",https://github.com/jordansissel/ruby-grok,Apache-2.0
-"jls-lumberjack:0.0.26",https://github.com/elastic/ruby-lumberjack,Apache-2.0
-"jmespath:1.4.0",https://github.com/jmespath/jmespath.rb,Apache-2.0
-"jnr-constants:0.9.9",https://github.com/jnr/jnr-constants,Apache-2.0|LGPL-3.0
-"jnr-enxio:0.16",https://github.com/jnr/jnr-enxio,Apache-2.0|LGPL-3.0
-"jnr-ffi:2.1.7",https://github.com/jnr/jnr-ffi,Apache-2.0|LGPL-3.0
-"jnr-netdb:1.1.6",https://github.com/jnr/jnr-netdb,Apache-2.0
-"jnr-posix:3.0.41",https://github.com/jnr/jnr-posix,EPL-2.0|GPL-2.0|LGPL-2.1dependency,dependencyUrl,licenseOverride
-"joda-time","http://www.joda.org/joda-time/",Apache-2.0
-"joni","https://github.com/jruby/joni/",MIT
-"jrjackson:0.4.6",https://github.com/guyboertje/jrjackson,Apache-2.0
-"jruby-openssl:0.10.1","https://github.com/jruby/jruby-openssl/",EPL-1.0
-"jruby-readline","https://github.com/jruby/jruby-readline",EPL-1.0
-"jruby-stdin-channel:0.2.0","https://github.com/colinsurprenant/jruby-stdin-channel",Apache-2.0
-"json-generator","https://github.com/tmattia/json-generator/",MIT
-"json:1.8.6",http://json-jruby.rubyforge.org/,Ruby
-"jzlib","http://www.jcraft.com/jzlib/",BSD
-"lru_redux:1.1.0","https://github.com/SamSaffron/lru_redux/",MIT
-"mail:2.6.6","https://github.com/mikel/mail/",MIT
-"manticore:0.6.4","https://github.com/cheald/manticore/",MIT
-"march_hare:3.1.1","https://github.com/ruby-amqp/march_hare/",MIT
-"memoizable:0.4.2","https://github.com/dkubb/memoizable/",MIT
-"method_source:0.8.2","https://github.com/banister/method_source/",MIT
-"metriks:0.9.9.8","https://github.com/eric/metriks/",MIT
-"mime-types:2.6.2",https://github.com/mime-types/ruby-mime-types/,MIT
-"minitar:0.6.1",https://github.com/halostatue/minitar/,RUBY|BSD-2-Clause
-"msgpack:1.2.4","https://github.com/msgpack/msgpack-ruby",Apache-2.0
-"multi_json:1.13.1","https://github.com/intridea/multi_json",MIT
-"multipart-post:2.0.0","https://github.com/nicksieger/multipart-post",MIT
-"murmurhash3:0.1.6","https://github.com/funny-falcon/",MIT
-"mustache:0.99.8","https://github.com/mustache/mustache",MIT
-"nailgun","http://martiansoftware.com/nailgun",Apache-2.0
-"naught:1.1.0","https://github.com/avdi/naught/",MIT
-"nokogiri:1.8.4","http://nokogiri.org/",MIT
-"numerizer:0.1.1","https://github.com/jduff/numerizer/",MIT
-"openssl_pkcs8_pure:0.0.0.2",http://github.com/cielavenir/openssl_pkcs8_pure,Ruby
-"options",https://github.com/headius/options,Apache-2.0
-"org.apache.logging.log4j:log4j-1.2-api:2.6.2","https://logging.apache.org/log4j",Apache-2.0
-"org.apache.logging.log4j:log4j-api:2.6.2","https://logging.apache.org/log4j",Apache-2.0
-"org.apache.logging.log4j:log4j-api:2.8.2",https://logging.apache.org/log4j/2.x/index.html,Apache-2.0
-"org.apache.logging.log4j:log4j-api:2.9.1",https://logging.apache.org/log4j/2.x/index.html,Apache-2.0
-"org.apache.logging.log4j:log4j-core:2.8.2",https://logging.apache.org/log4j/2.x/index.html,Apache-2.0
-"org.apache.logging.log4j:log4j-core:2.9.1",https://logging.apache.org/log4j/2.x/index.html,Apache-2.0
-"org.apache.logging.log4j:log4j-slf4j-impl:2.8.2",https://logging.apache.org/log4j/2.x/index.html,Apache-2.0
-"org.apache.logging.log4j:log4j-slf4j-impl:2.9.1",https://logging.apache.org/log4j/2.x/index.html,Apache-2.0
-"org.codehaus.janino:commons-compiler:3.0.8",https://github.com/janino-compiler/janino,BSD-3-Clause
-"org.codehaus.janino:janino:3.0.8",https://github.com/janino-compiler/janino,BSD-3-Clause
-"org.codehaus.mojo:animal-sniffer-annotations:1.14",https://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/,MIT
-"org.eclipse.core:org.eclipse.core.commands:3.6.0",http://www.eclipse.org,EPL-1.0
-"org.eclipse.core:org.eclipse.core.contenttype:3.4.100",http://www.eclipse.org,EPL-1.0
-"org.eclipse.core:org.eclipse.core.expressions:3.4.300",http://www.eclipse.org,EPL-1.0
-"org.eclipse.core:org.eclipse.core.filesystem:1.3.100",http://www.eclipse.org,EPL-1.0
-"org.eclipse.core:org.eclipse.core.jobs:3.5.100",http://www.eclipse.org,EPL-1.0
-"org.eclipse.core:org.eclipse.core.resources:3.7.100",http://www.eclipse.org,EPL-1.0
-"org.eclipse.core:org.eclipse.core.runtime:3.7.0",http://www.eclipse.org,EPL-1.0
-"org.eclipse.equinox:org.eclipse.equinox.app:1.3.100",http://www.eclipse.org/platform,EPL-1.0
-"org.eclipse.equinox:org.eclipse.equinox.common:3.6.0",http://www.eclipse.org/platform,EPL-1.0
-"org.eclipse.equinox:org.eclipse.equinox.preferences:3.4.1",http://www.eclipse.org/platform,EPL-1.0
-"org.eclipse.equinox:org.eclipse.equinox.registry:3.5.101",http://www.eclipse.org/platform,EPL-1.0
-"org.eclipse.jdt:org.eclipse.jdt.core:3.10.0",http://www.eclipse.org/jdt,EPL-1.0
-"org.eclipse.osgi:org.eclipse.osgi:3.7.1",http://www.eclipse.org/jdt,EPL-1.0
-"org.eclipse.text:org.eclipse.text:3.5.101",http://www.eclipse.org/jdt,EPL-1.0
-"org.jruby:jruby-complete:9.1.13.0",http://jruby.org/,EPL-2.0
-"org.slf4j:slf4j-api:1.7.25",http://www.slf4j.org/,MIT
-"paquet:0.2.1",https://github.com/elastic/logstash,Apache-2.0
-"pleaserun:0.0.30",https://github.com/jordansissel/pleaserun,Apache-2.0
-"polyglot:0.3.5",http://github.com/cjheath/polyglot,MIT
-"poseidon:0.0.5",https://github.com/bpot/poseidon,MIT
-"prototype.js:",http://prototypejs.org,MIT  TODO: Another jruby dependency that is not shipped with it
-"pry:0.10.4",http://pryrepl.org,MIT
-"psych:2.2.4",https://github.com/ruby/psych,MIT
-"public_suffix:1.4.6",https://simonecarletti.com/code/publicsuffix-ruby,MIT
-"puma:2.16.0",http://puma.io,BSD-3-Clause
-"racc:",https://github.com/tenderlove/racc, TODO: https://github.com/tenderlove/racc/blob/master/COPYING vs https://github.com/jruby/jruby/blob/master/COPYING#L89
-"rack-protection:1.5.5",http://github.com/rkh/rack-protection,MIT
-"rack:1.6.6",http://rack.github.io/,MIT
-"rake:10.4.2",https://github.com/ruby/rake,MIT
-"redis:3.3.5",https://github.com/redis/redis-rb,MIT
-"rspec-core:3.7.1",https://github.com/rspec/rspec-core,MIT
-"rspec-expectations:3.7.0",https://github.com/rspec/rspec-expectations,MIT
-"rspec-mocks:3.7.0",https://github.com/rspec/rspec-mocks,MIT
-"rspec-sequencing:0.1.0",https://github.com/elastic/rspec-sequencing,Apache-2.0
-"rspec-support:3.7.1",https://github.com/rspec/rspec-support,MIT
-"rspec-wait:0.0.9",https://github.com/laserlemon/rspec-wait,MIT
-"rspec:3.7.0",https://github.com/rspec/rspec,MIT
-"ruby-progressbar:1.8.3",https://github.com/jfelchner/ruby-progressbar,MIT
-"rubyzip:1.2.1",https://github.com/rubyzip/rubyzip,BSD-2-Clause-FreeBSD
-"rufus-scheduler:3.0.9",http://github.com/jmettraux/rufus-scheduler,MIT
-"rumbster:1.1.0",https://github.com/aesterline/rumbster,Apache-2.0
-"safe_yaml:1.0.4",https://github.com/dtao/safe_yaml,MIT
-"sequel:5.11.0",https://github.com/jeremyevans/sequel,MIT
-"simple_oauth:0.3.1",https://github.com/laserlemon/simple_oauth,MIT
-"sinatra:1.4.8",https://github.com/sinatra/sinatra,MIT
-"slop:3.6.0",https://github.com/leejarvis/slop,MIT
-"snakeyaml:1.18",https://bitbucket.org/asomov/snakeyaml/,Apache-2.0
-"snappy-jars:1.1.0.1.2",https://github.com/doxavore/snappy-jars,Apache-2.0
-"snappy:0.0.12",https://github.com/miyucy/snappy,MIT
-"snmp:1.2.0",https://github.com/hallidave/ruby-snmp,MIT
-"spoon:0.0.6",https://github.com/headius/spoon,Apache-2.0
-"stud:0.0.23",https://github.com/jordansissel/ruby-stud,Apache-2.0
-"thread_safe:0.3.6",https://github.com/ruby-concurrency/thread_safe,Apache-2.0
-"tilt:2.0.8",https://github.com/rtomayko/tilt,MIT
-"timecop:0.9.1",https://github.com/travisjeffery/timecop,MIT
-"treetop:1.4.15",https://github.com/cjheath/treetop,MIT
-"twitter:5.15.0",https://github.com/sferik/twitter,MIT
-"tzinfo-data:1.2018.5",https://github.com/tzinfo/tzinfo-data,MIT
-"tzinfo:1.2.5",https://github.com/tzinfo/tzinfo,MIT,Philip Ross
-"unf:0.1.4",https://github.com/knu/ruby-unf,BSD-2-Clause
-"unsafe-fences:1.0",https://github.com/headius/unsafe-fences,Apache-2.0
-"webhdfs:0.8.0",https://github.com/kzk/webhdfs,Apache-2.0
-"webmock:1.21.0",https://github.com/bblimke/webmock,MIT
-"webrick:1.3.1",https://github.com/ruby/webrick,BSD-2-Clause
-"xml-simple:1.1.5",https://github.com/maik/xml-simple,BSD-2-Clause
+dependency,dependencyUrl,licenseOverride,copyright,sourceURL
+"addressable:",https://github.com/sporkmonger/addressable,Apache-2.0
+"atomic:",http://github.com/ruby-concurrency/atomic,Apache-2.0
+"avl_tree:",https://github.com/nahi/avl_tree,BSD-2-Clause-FreeBSD
+"avro:",https://github.com/apache/avro/tree/master/lang/ruby,Apache-2.0
+"amazing_print:",https://github.com/amazing-print/amazing_print,MIT
+"awesome_print:",https://github.com/awesome-print/awesome_print,MIT
+"aws-eventstream:1.2.0",https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-eventstream,Apache-2.0
+"aws-partitions:1.610.0",https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-partitions,Apache-2.0
+"aws-sdk-cloudfront:1.65.0",https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-sdk-cloudfront,Apache-2.0
+"aws-sdk-cloudwatch:1.65.0",https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-sdk-cloudwatch,Apache-2.0
+"aws-sdk-core:3.131.3",https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-sdk-core,Apache-2.0
+"aws-sdk-kms:1.58.0",https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-sdk-kms,Apache-2.0
+"aws-sdk-resourcegroups:1.45.0",https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-sdk-resources,Apache-2.0
+"aws-sdk-s3:1.114.0",https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-sdk-s3,Apache-2.0
+"aws-sdk-sns:1.53.0",https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-sdk-sns,Apache-2.0
+"aws-sdk-sqs:1.51.1",https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-sdk-sqs,Apache-2.0
+"aws-sigv4:1.5.1",https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-sigv4,Apache-2.0
+"back_pressure:",https://github.com/yaauie/ruby_back_pressure,Apache-2.0
+"base64:",https://github.com/ruby/base64,BSD-2-Clause
+"bigdecimal:",https://github.com/ruby/bigdecimal,BSD-2-Clause
+"bindata:",http://github.com/dmendel/bindata,BSD-2-Clause
+"buftok:",https://github.com/sferik/buftok,MIT
+"builder:",http://onestepback.org,MIT
+"bundler:",https://bundler.io/,MIT
+"cabin:",https://github.com/jordansissel/ruby-cabin,Apache-2.0
+"cgi:",https://github.com/ruby/cgi,BSD-2-Clause
+"clamp:",http://github.com/mdub/clamp,MIT
+"coderay:",http://coderay.rubychan.de,MIT
+"com.fasterxml.jackson.core:jackson-annotations:",https://github.com/FasterXML/jackson-annotations,Apache-2.0
+"com.fasterxml.jackson.core:jackson-databind:",https://github.com/FasterXML/jackson-databind,Apache-2.0
+"com.fasterxml.jackson.core:jackson-core:",https://github.com/FasterXML/jackson-core,Apache-2.0
+"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:",https://github.com/FasterXML/jackson-dataformats-binary,Apache-2.0
+"com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:",https://github.com/FasterXML/jackson-dataformats-binary,Apache-2.0
+"com.fasterxml.jackson.module:jackson-module-afterburner:",https://github.com/FasterXML/jackson-modules-base,Apache-2.0
+"com.google.code.findbugs:jsr305:",http://findbugs.sourceforge.net,Apache-2.0
+"com.google.errorprone:error_prone_annotations:",https://github.com/google/error-prone,Apache-2.0
+"com.google.googlejavaformat:google-java-format:",https://github.com/google/google-java-format,Apache-2.0
+"com.google.guava:guava:",https://github.com/google/guava,Apache-2.0
+"com.google.j2objc:j2objc-annotations:",https://github.com/google/j2objc/,Apache-2.0
+"commons-codec:commons-codec:",http://commons.apache.org/proper/commons-codec/,Apache-2.0
+"commons-codec:commons-codec:",http://commons.apache.org/proper/commons-codec/,Apache-2.0
+"commons-logging:commons-logging:",http://commons.apache.org/proper/commons-logging/,Apache-2.0
+"concurrent-ruby:",http://www.concurrent-ruby.com,MIT
+"csv:",https://github.com/ruby/csv,BSD-2-Clause
+"dalli:",https://github.com/petergoldstein/dalli,MIT
+"date:",https://github.com/ruby/date,BSD-2-Clause
+"diff-lcs:",https://github.com/halostatue/diff-lcs,MIT
+"domain_name:",https://github.com/knu/ruby-domain_name,BSD-2-Clause
+"dotenv:",https://github.com/bkeepers/dotenv,MIT
+"down",https://github.com/janko/down,MIT
+"e2mmap:",https://github.com/ruby/thwait,BSD-2-Clause
+"edn:",https://github.com/relevance/edn-ruby,MIT
+"elastic-app-search:",https://github.com/elastic/app-search-ruby,Apache-2.0
+"elastic-enterprise-search:",https://github.com/elastic/enterprise-search-ruby,Apache-2.0
+"elastic-transport:",https://github.com/elastic/elastic-transport-ruby,Apache-2.0
+"elastic-workplace-search:",https://github.com/elastic/workplace-search-ruby,Apache-2.0
+"elasticsearch-api:",https://github.com/elastic/elasticsearch-ruby,Apache-2.0
+"elasticsearch-transport:",https://github.com/elastic/elasticsearch-ruby,Apache-2.0
+"elasticsearch:",https://github.com/elastic/elasticsearch-ruby,Apache-2.0
+"equalizer:",https://github.com/dkubb/equalizer,MIT
+"et-orbi:",https://github.com/floraison/et-orbi,MIT
+"faraday:",https://github.com/lostisland/faraday,MIT
+"faraday-em_http",https://github.com/lostisland/faraday,MIT
+"faraday-em_synchrony",https://github.com/lostisland/faraday,MIT
+"faraday-excon",https://github.com/lostisland/faraday,MIT
+"faraday-httpclient",https://github.com/lostisland/faraday,MIT
+"faraday-multipart",https://github.com/lostisland/faraday,MIT
+"faraday-net_http",https://github.com/lostisland/faraday,MIT
+"faraday-net_http_persistent",https://github.com/lostisland/faraday,MIT
+"faraday-patron",https://github.com/lostisland/faraday,MIT
+"faraday-rack",https://github.com/lostisland/faraday,MIT
+"faraday-retry",https://github.com/lostisland/faraday,MIT
+"ffi:",https://github.com/ffi/ffi,BSD-3-CLAUSE
+"ffi-binary-libfixposix:",https://github.com/byteit101/subspawn,Ruby
+"filesize:",https://github.com/dominikh,MIT
+"fileutils:",https://github.com/ruby/fileutils,BSD-2-Clause
+"fugit:",https://github.com/floraison/fugit,MIT
+"gelfd2:",https://github.com/ptqa/gelfd2,Apache-2.0
+"gems:",https://github.com/rubygems/gems,MIT
+"gene_pool:",https://github.com/bpardee/gene_pool,MIT
+"gradle.plugin.com.github.jk1:gradle-license-report:",https://github.com/jk1/Gradle-License-Report,Apache-2.0
+"hitimes:",https://github.com/copiousfreetime/hitimes,ISC
+"http-cookie:",https://github.com/sparklemotion/http-cookie,MIT
+"http-form_data:",https://github.com/httprb/form_data,MIT
+"http:",https://github.com/httprb/http,MIT
+"http_parser.rb:",https://github.com/tmm1/http_parser.rb,MIT
+"i18n:",https://github.com/svenfuchs/i18n,MIT
+"io-console:",https://github.com/ruby/io-console,BSD-2-Clause
+"io.netty:netty-all:",https://github.com/netty/netty,Apache-2.0
+"insist:",https://github.com/jordansissel/ruby-insist,Apache-2.0
+"jar-dependencies:",https://github.com/mkristian/jar-dependencies,MIT
+"jls-grok:",https://github.com/jordansissel/ruby-grok,Apache-2.0
+"jls-lumberjack:",https://github.com/elastic/ruby-lumberjack,Apache-2.0
+"jmespath:",https://github.com/jmespath/jmespath.rb,Apache-2.0
+"jrjackson:",https://github.com/guyboertje/jrjackson,Apache-2.0
+"jruby:",https://jruby.org,EPL-2.0
+"jruby-jms:",https://github.com/reidmorrison/jruby-jms,Apache-2.0
+"jruby-openssl:","https://github.com/jruby/jruby-openssl/",EPL-1.0
+"jruby-stdin-channel:","https://github.com/colinsurprenant/jruby-stdin-channel",Apache-2.0
+"jwt:",https://github.com/jwt/ruby-jwt,MIT
+"json:",http://json-jruby.rubyforge.org/,Ruby
+"logger:",https://github.com/ruby/logger,BSD-2-Clause
+"lru_redux:","https://github.com/SamSaffron/lru_redux/",MIT
+"mail:","https://github.com/mikel/mail/",MIT
+"manticore:","https://github.com/cheald/manticore/",MIT
+"march_hare:","https://github.com/ruby-amqp/march_hare/",MIT
+"memoizable:","https://github.com/dkubb/memoizable/",MIT
+"method_source:","https://github.com/banister/method_source/",MIT
+"metriks:","https://github.com/eric/metriks/",MIT
+"mime-types:",https://github.com/mime-types/ruby-mime-types/,MIT
+"mini_mime:",https://github.com/discourse/mini_mime,MIT
+"minitar:",https://github.com/halostatue/minitar/,RUBY|BSD-2-Clause
+"msgpack:","https://github.com/msgpack/msgpack-ruby",Apache-2.0
+"multi_json:","https://github.com/intridea/multi_json",MIT
+"multipart-post:","https://github.com/nicksieger/multipart-post",MIT
+"murmurhash3:","https://github.com/funny-falcon/",MIT
+"mustermann:","https://github.com/sinatra/mustermann",MIT
+"mustache:","https://github.com/mustache/mustache",MIT
+"naught:","https://github.com/avdi/naught/",MIT
+"net-http:",https://github.com/ruby/net-http,BSD-2-Clause
+"net-imap:",https://github.com/ruby/net-imap,BSD-2-Clause
+"net-pop:",https://github.com/ruby/net-pop,BSD-2-Clause
+"net-protocol:",https://github.com/ruby/net-protocol,BSD-2-Clause
+"net-smtp:",https://github.com/ruby/net-smtp,BSD-2-Clause
+"nio4r:","https://github.com/socketry/nio4r",MIT
+"nokogiri:","http://nokogiri.org/",MIT
+"openssl_pkcs8_pure:",http://github.com/cielavenir/openssl_pkcs8_pure,Ruby
+"org.apache.httpcomponents:httpclient:",https://hc.apache.org/,Apache-2.0
+"org.apache.httpcomponents:httpcore:",https://hc.apache.org/,Apache-2.0
+"org.apache.logging.log4j:log4j-1.2-api:",https://logging.apache.org/log4j/2.x/index.html,Apache-2.0
+"org.apache.logging.log4j:log4j-api:",https://logging.apache.org/log4j/2.x/index.html,Apache-2.0
+"org.apache.logging.log4j:log4j-core:",https://logging.apache.org/log4j/2.x/index.html,Apache-2.0
+"org.apache.logging.log4j:log4j-jcl:",https://logging.apache.org/log4j/2.x/index.html,Apache-2.0
+"org.apache.logging.log4j:log4j-slf4j-impl:",https://logging.apache.org/log4j/2.x/index.html,Apache-2.0
+"org.codehaus.janino:commons-compiler:",https://github.com/janino-compiler/janino,BSD-3-Clause
+"org.codehaus.janino:janino:",https://github.com/janino-compiler/janino,BSD-3-Clause
+"org.codehaus.mojo:animal-sniffer-annotations:",https://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations/,MIT
+"org.eclipse.core:org.eclipse.core.commands:",http://www.eclipse.org,EPL-1.0
+"org.eclipse.core:org.eclipse.core.contenttype:",http://www.eclipse.org,EPL-1.0
+"org.eclipse.core:org.eclipse.core.expressions:",http://www.eclipse.org,EPL-1.0
+"org.eclipse.core:org.eclipse.core.filesystem:",http://www.eclipse.org,EPL-1.0
+"org.eclipse.core:org.eclipse.core.jobs:",http://www.eclipse.org,EPL-1.0
+"org.eclipse.core:org.eclipse.core.resources:",http://www.eclipse.org,EPL-1.0
+"org.eclipse.core:org.eclipse.core.runtime:",http://www.eclipse.org,EPL-1.0
+"org.eclipse.equinox:org.eclipse.equinox.app:",http://www.eclipse.org/platform,EPL-1.0
+"org.eclipse.equinox:org.eclipse.equinox.common:",http://www.eclipse.org/platform,EPL-1.0
+"org.eclipse.equinox:org.eclipse.equinox.preferences:",http://www.eclipse.org/platform,EPL-1.0
+"org.eclipse.equinox:org.eclipse.equinox.registry:",http://www.eclipse.org/platform,EPL-1.0
+"org.eclipse.jdt:org.eclipse.jdt.core:",http://www.eclipse.org/jdt,EPL-1.0
+"org.eclipse.osgi:org.eclipse.osgi:",http://www.eclipse.org/jdt,EPL-1.0
+"org.eclipse.text:org.eclipse.text:",http://www.eclipse.org/jdt,EPL-1.0
+"org.javassist:javassist:",https://github.com/jboss-javassist/javassist,Apache-2.0
+"org.jruby:jruby-core:",http://jruby.org/,EPL-2.0
+"org.logstash:jvm-options-parser:",http://github.com/elastic/logstash,Apache-2.0
+"org.reflections:reflections:",https://github.com/ronmamo/reflections,BSD-2-Clause
+"org.slf4j:slf4j-api:",http://www.slf4j.org/,MIT
+"org.yaml:snakeyaml:",https://bitbucket.org/snakeyaml/snakeyaml/src/master/,Apache-2.0
+"paquet:",https://github.com/elastic/logstash,Apache-2.0
+"pleaserun:",https://github.com/jordansissel/pleaserun,Apache-2.0
+"polyglot:",http://github.com/cjheath/polyglot,MIT
+"pry:",http://pryrepl.org,MIT
+"psych:",https://github.com/ruby/psych,MIT
+"public_suffix:",https://simonecarletti.com/code/publicsuffix-ruby,MIT
+"puma:",http://puma.io,BSD-3-Clause
+"raabro",https://github.com/floraison/raabro,MIT
+"racc:",https://github.com/ruby/rake,Ruby
+"rack-protection:",http://github.com/rkh/rack-protection,MIT
+"rack-session:",https://github.com/rack/rack-session,MIT
+"rack:",http://rack.github.io/,MIT
+"rake:",https://github.com/ruby/rake,MIT
+"Red Hat Universal Base Image minimal:",https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/61832888c0d15aff4912fe0d,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz
+"redis:",https://github.com/redis/redis-rb,MIT
+"reline:",https://github.com/ruby/reline,BSD-2-Clause
+"rexml:",https://github.com/ruby/rexml,MIT
+"rspec:",https://github.com/rspec/rspec-metagem,MIT
+"rspec-collection_matchers:",https://github.com/rspec/rspec-collection_matchers,MIT
+"rspec-core:",https://github.com/rspec/rspec-core,MIT
+"rspec-expectations:",https://github.com/rspec/rspec-expectations,MIT
+"rspec-mocks:",https://github.com/rspec/rspec-mocks,MIT
+"rspec-support:",https://github.com/rspec/rspec-support,MIT
+"rspec-wait:",https://github.com/laserlemon/rspec-wait,MIT
+"ruby-maven-libs:",https://github.com/jruby/ruby-maven-libs,Apache-2.0
+"ruby-progressbar:",https://github.com/jfelchner/ruby-progressbar,MIT
+"ruby2_keywords",https://github.com/ruby/ruby2_keywords,BSD-2-Clause
+"rubyzip:",https://github.com/rubyzip/rubyzip,BSD-2-Clause-FreeBSD
+"rufus-scheduler:",http://github.com/jmettraux/rufus-scheduler,MIT
+"semantic_logger:",https://github.com/rocketjob/semantic_logger,Apache-2.0
+"sequel:",https://github.com/jeremyevans/sequel,MIT
+"simple_oauth:",https://github.com/laserlemon/simple_oauth,MIT
+"sinatra:",https://github.com/sinatra/sinatra,MIT
+"snappy-jars:",https://github.com/doxavore/snappy-jars,Apache-2.0
+"snappy:",https://github.com/miyucy/snappy,MIT
+"snmp:",https://github.com/hallidave/ruby-snmp,MIT
+"strscan:",https://github.com/ruby/strscan,BSD-2-Clause
+"spoon:",https://github.com/headius/spoon,Apache-2.0
+"stud:",https://github.com/jordansissel/ruby-stud,Apache-2.0
+"thread_safe:",https://github.com/ruby-concurrency/thread_safe,Apache-2.0
+"thwait:",https://github.com/ruby/thwait,BSD-2-Clause
+"tilt:",https://github.com/rtomayko/tilt,MIT
+"time:",https://github.com/ruby/time,BSD-2-Clause
+"timeout:",https://github.com/ruby/timeout,BSD-2-Clause
+"treetop:",https://github.com/cjheath/treetop,MIT
+"twitter:",https://github.com/sferik/twitter,MIT
+"tzinfo-data:",https://github.com/tzinfo/tzinfo-data,MIT
+"tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross
+"unf:",https://github.com/knu/ruby-unf,BSD-2-Clause
+"uri:",https://github.com/ruby/uri,BSD-2-Clause
+"webhdfs:",https://github.com/kzk/webhdfs,Apache-2.0
+"webrick:",https://github.com/ruby/webrick,BSD-2-Clause
+"xml-simple:",https://github.com/maik/xml-simple,BSD-2-Clause
diff --git a/tools/dependencies-report/src/main/resources/notices/Red Hat Universal Base Image minimal-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/Red Hat Universal Base Image minimal-NOTICE.txt
new file mode 100644
index 000000000..dc945c768
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/Red Hat Universal Base Image minimal-NOTICE.txt	
@@ -0,0 +1,85 @@
+source: https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf
+
+END USER LICENSE AGREEMENT
+RED HAT UNIVERSAL BASE IMAGE
+
+PLEASE READ THIS END USER LICENSE AGREEMENT CAREFULLY BEFORE USING SOFTWARE FROM RED HAT. BY USING RED HAT
+SOFTWARE, YOU SIGNIFY YOUR ASSENT TO AND ACCEPTANCE OF THIS END USER LICENSE AGREEMENT AND ACKNOWLEDGE YOU
+HAVE READ AND UNDERSTAND THE TERMS. AN INDIVIDUAL ACTING ON BEHALF OF AN ENTITY REPRESENTS THAT HE OR SHE HAS THE
+AUTHORITY TO ENTER INTO THIS END USER LICENSE AGREEMENT ON BEHALF OF THAT ENTITY. IF YOU DO NOT ACCEPT THE TERMS
+OF THIS AGREEMENT, THEN YOU MUST NOT USE THE RED HAT SOFTWARE. THIS END USER LICENSE AGREEMENT DOES NOT PROVIDE
+ANY RIGHTS TO RED HAT SERVICES SUCH AS SOFTWARE MAINTENANCE, UPGRADES OR SUPPORT. PLEASE REVIEW YOUR SERVICE
+OR SUBSCRIPTION AGREEMENT(S) THAT YOU MAY HAVE WITH RED HAT OR OTHER AUTHORIZED RED HAT SERVICE PROVIDERS
+REGARDING SERVICES AND ASSOCIATED PAYMENTS.
+
+This end user license agreement (“EULA”) governs the use of Red Hat Universal Base Image and associated software supporting such container(s)
+and any related updates, source code, including the appearance, structure and organization (the “Programs”), regardless of the delivery mechanism.
+If a Red Hat Universal Base Image is included in another Red Hat product, the EULA terms of such other Red Hat product will apply and supersede
+this EULA. If a Red Hat Universal Base Image is included in a third party work, the terms of this EULA will continue to govern the Red Hat Universal
+Base Image.
+
+1. License Grant. Subject to the terms of this EULA, Red Hat, Inc. (“Red Hat”) grants to you a perpetual, worldwide license to the Programs (each
+of which may include multiple software components). With the exception of the Red Hat trademark identified in Section 2 below, each software
+component is governed by a license that permits you to run, copy, modify, and redistribute (subject to certain obligations in some cases) the
+software components. This EULA pertains solely to the Programs and does not limit your rights under, or grant you rights that supersede, the
+license terms applicable to any particular component. The license terms applicable to each software component are provided in the source code
+of that component.
+
+2. Intellectual Property Rights. The Programs and each of their components are owned by Red Hat and other licensors and are protected under
+copyright law and other laws as applicable. Title to the Programs and any component shall remain with Red Hat and other licensors, subject to
+the applicable license, excluding any independently developed and licensed work. The “Red Hat” trademark is a registered trademark of Red
+Hat and its affiliates in the U.S. and other countries. Subject to Red Hat’s trademark usage guidelines (set forth at
+http://www.redhat.com/about/corporate/trademark/), this EULA permits you to distribute the Programs that include the Red Hat trademark,
+provided you do not make any statements on behalf of Red Hat, including but not limited to, stating or in any way suggesting (in any public,
+private and/or confidential statement (whether written or verbal)) that Red Hat supports or endorses software built and delivered with a Red Hat
+Universal Base Image(s) (such derivative works referred to as a “Red Hat Based Container Images”); provided if a Red Hat Based Container
+Image is Red Hat Certified and deployed on a Red Hat supported configuration as set forth at https://access.redhat.com/articles/2726611 then
+you may state that the Red Hat Universal Base Image is supported by Red Hat. You agree to include this unmodified EULA in all distributions of
+container images sourced, built or otherwise derived from the Programs. If you modify the Red Hat Universal Base Image(s), you must remove
+any Red Hat trademark(s) prior to any subsequent distribution. Any breach of this Section 2 is a material breach of the EULA and you may no
+longer use and/or distribute the Red Hat trademark(s). Modifications to the software may corrupt the Programs.
+
+3. Limited Warranty. Except as specifically stated in this Section 3, a separate agreement with Red Hat, or a license for a particular component,
+to the maximum extent permitted under applicable law, the Programs and the components are provided and licensed “as is” without
+warranty of any kind, expressed or implied, including the implied warranties of merchantability, non-infringement or fitness for a
+particular purpose. Neither Red Hat nor its affiliates warrant that the functions contained in the Programs will meet your requirements or that
+the operation of the Programs will be entirely error free, appear or perform precisely as described in the accompanying documentation, or comply
+with regulatory requirements. Red Hat warrants that the media on which the Programs and the components are provided will be free from defects
+in materials and manufacture under normal use for a period of 30 days from the date of delivery to you. This warranty extends only to the party
+that purchases subscription services for the supported configurations from Red Hat and/or its affiliates or a Red Hat authorized
+distributor.
+
+4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, your exclusive remedy under this EULA is to return
+any defective media within 30 days of delivery along with a copy of your payment receipt and Red Hat, at its option, will replace it or refund the
+money you paid for the media. To the maximum extent permitted under applicable law, under no circumstances will Red Hat, its affiliates,
+any Red Hat authorized distributor, or the licensor of any component provided to you under this EULA be liable to you for any incidental
+or consequential damages, including lost profits or lost savings arising out of the use or inability to use the Programs or any
+component, even if Red Hat, its affiliates, an authorized distributor, and/or licensor has been advised of the possibility of such
+damages. In no event shall Red Hat's or its affiliates’ liability, an authorized distributor’s liability or the liability of the licensor of a
+component provided to you under this EULA exceed the amount that you paid to Red Hat for the media under this EULA.
+
+5. Export Control. As required by the laws of the United States and other countries, you represent and warrant that you: (a) understand that the
+Programs and their components may be subject to export controls under the U.S. Commerce Department’s Export Administration Regulations
+(“EAR”); (b) are not located in a prohibited destination country under the EAR or U.S. sanctions regulations (currently Cuba, Iran, North Korea,
+Sudan, Syria, and the Crimea Region of Ukraine, subject to change as posted by the United States government); (c) will not export, re-export, or
+transfer the Programs to any prohibited destination, persons or entities on the U.S. Bureau of Industry and Security Denied Parties List or Entity
+List, or the U.S. Office of Foreign Assets Control list of Specially Designated Nationals and Blocked Persons, or any similar lists maintained by
+other countries, without the necessary export license(s) or authorizations(s); (d) will not use or transfer the Programs for use in connection with
+any nuclear, chemical or biological weapons, missile technology, or military end-uses where prohibited by an applicable arms embargo, unless
+authorized by the relevant government agency by regulation or specific license; (e) understand and agree that if you are in the United States and
+export or transfer the Programs to eligible end users, you will, to the extent required by EAR Section 740.17(e), submit semi-annual reports to
+the Commerce Department’s Bureau of Industry and Security, which include the name and address (including country) of each transferee; and
+(f) understand that countries including the United States may restrict the import, use, or export of encryption products (which may include the
+Programs and the components) and agree that you shall be solely responsible for compliance with any such import, use, or export restrictions.
+
+6. Third Party Software. The Program may be provided with third party software programs subject to their own license terms. The license terms
+either accompany the third party software programs or, in some instances, may be viewed at registry.access.redhat.com. If you do not agree to
+abide by the applicable license terms for the third party software programs, then you may not install, distribute or use them.
+
+7. General. If any provision of this EULA is held to be unenforceable, the enforceability of the remaining provisions shall not be affected. Any claim,
+controversy or dispute arising under or relating to this EULA shall be governed by the laws of the State of New York and of the United States,
+without regard to any conflict of laws provisions. The rights and obligations of the parties to this EULA shall not be governed by the United
+Nations Convention on the International Sale of Goods.
+
+Copyright © 2019 Red Hat, Inc. All rights reserved. “Red Hat,” is a registered trademark of Red Hat, Inc.
+All other trademarks are the property of their respective owners.
diff --git a/tools/dependencies-report/src/main/resources/notices/addressable-2.3.8-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/addressable-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/addressable-2.3.8-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/addressable-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/amazing_print-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/amazing_print-NOTICE.txt
new file mode 100644
index 000000000..d5ab3a384
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/amazing_print-NOTICE.txt
@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2010-2019 Michael Dvorkin
+Copyright (c) 2020 AmazingPrint
+
+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.
diff --git a/tools/dependencies-report/src/main/resources/notices/asm-6.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/asm-6.0-NOTICE.txt
deleted file mode 100644
index 631ee53c5..000000000
--- a/tools/dependencies-report/src/main/resources/notices/asm-6.0-NOTICE.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-ASM: a very small and fast Java bytecode manipulation framework
-Copyright (c) 2000-2011 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-3. Neither the name of the copyright holders nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/atomic-1.1.99-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/atomic-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/atomic-1.1.99-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/atomic-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/avl_tree-1.2.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/avl_tree-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/avl_tree-1.2.1-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/avl_tree-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/avro-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/avro-NOTICE.txt
new file mode 100644
index 000000000..859ea81d7
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/avro-NOTICE.txt
@@ -0,0 +1,6 @@
+Apache Avro
+Copyright 2010-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
+
diff --git a/tools/dependencies-report/src/main/resources/notices/awesome_print-1.7.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/awesome_print-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/awesome_print-1.7.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/awesome_print-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/unsafe-fences-1.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/aws-eventstream-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/unsafe-fences-1.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/aws-eventstream-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/aws-partitions-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/aws-partitions-NOTICE.txt
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/aws-partitions-NOTICE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/aws-sdk-2.11.111-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/aws-sdk-2.11.111-NOTICE.txt
deleted file mode 100644
index 4fb0b4581..000000000
--- a/tools/dependencies-report/src/main/resources/notices/aws-sdk-2.11.111-NOTICE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-copyright 2013. amazon web services, inc. all rights reserved.
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/aws-sdk-cloudfront-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/aws-sdk-cloudfront-NOTICE.txt
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/aws-sdk-cloudfront-NOTICE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/aws-sdk-cloudwatch-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/aws-sdk-cloudwatch-NOTICE.txt
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/aws-sdk-cloudwatch-NOTICE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/aws-sdk-core-2.11.111-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/aws-sdk-core-2.11.111-NOTICE.txt
deleted file mode 100644
index 4fb0b4581..000000000
--- a/tools/dependencies-report/src/main/resources/notices/aws-sdk-core-2.11.111-NOTICE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-copyright 2013. amazon web services, inc. all rights reserved.
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/aws-sdk-core-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/aws-sdk-core-NOTICE.txt
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/aws-sdk-core-NOTICE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/aws-sdk-kms-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/aws-sdk-kms-NOTICE.txt
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/aws-sdk-kms-NOTICE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/aws-sdk-resourcegroups-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/aws-sdk-resourcegroups-NOTICE.txt
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/aws-sdk-resourcegroups-NOTICE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/aws-sdk-resources-2.11.111-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/aws-sdk-resources-2.11.111-NOTICE.txt
deleted file mode 100644
index 4fb0b4581..000000000
--- a/tools/dependencies-report/src/main/resources/notices/aws-sdk-resources-2.11.111-NOTICE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-copyright 2013. amazon web services, inc. all rights reserved.
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/aws-sdk-s3-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/aws-sdk-s3-NOTICE.txt
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/aws-sdk-s3-NOTICE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/aws-sdk-sns-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/aws-sdk-sns-NOTICE.txt
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/aws-sdk-sns-NOTICE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/aws-sdk-sqs-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/aws-sdk-sqs-NOTICE.txt
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/aws-sdk-sqs-NOTICE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/aws-sdk-v1-1.67.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/aws-sdk-v1-1.67.0-NOTICE.txt
deleted file mode 100644
index c917eaa78..000000000
--- a/tools/dependencies-report/src/main/resources/notices/aws-sdk-v1-1.67.0-NOTICE.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Copyright 2011-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License"). You
-may not use this file except in compliance with the License. A copy of
-the License is located at
-
-    http://aws.amazon.com/apache2.0/
-
-or in the "license" file accompanying this file. This file is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-ANY KIND, either express or implied. See the License for the specific
-language governing permissions and limitations under the License.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/aws-sigv4-1.0.3-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/aws-sigv4-1.0.3-NOTICE.txt
deleted file mode 100644
index 4fb0b4581..000000000
--- a/tools/dependencies-report/src/main/resources/notices/aws-sigv4-1.0.3-NOTICE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-copyright 2013. amazon web services, inc. all rights reserved.
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/aws-sigv4-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/aws-sigv4-NOTICE.txt
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/aws-sigv4-NOTICE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/back_pressure-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/back_pressure-NOTICE.txt
new file mode 100644
index 000000000..124d6a7cc
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/back_pressure-NOTICE.txt
@@ -0,0 +1,13 @@
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/backports-3.11.3-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/backports-3.11.3-NOTICE.txt
deleted file mode 100644
index 4b67862a4..000000000
--- a/tools/dependencies-report/src/main/resources/notices/backports-3.11.3-NOTICE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2009 Marc-Andre Lafortune
-
-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.
diff --git a/tools/dependencies-report/src/main/resources/notices/webrick-1.3.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/base64-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/webrick-1.3.1-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/base64-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/bigdecimal-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/bigdecimal-NOTICE.txt
new file mode 100644
index 000000000..74f70c0c3
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/bigdecimal-NOTICE.txt
@@ -0,0 +1,58 @@
+# source: https://github.com/ruby/bigdecimal/blob/v3.1.4/LICENSE
+
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
+You can redistribute it and/or modify it under either the terms of the
+2-clause BSDL (see the file BSDL), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
+
+       a) distribute the binaries and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under these terms.
+
+     For the list of those files and their copying conditions, see the
+     file LEGAL.
+
+  5. The scripts and library files supplied as input to or produced as
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them,
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/bindata-2.4.3-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/bindata-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/bindata-2.4.3-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/bindata-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/bouncycastle-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/bouncycastle-NOTICE.txt
deleted file mode 100644
index c445a93a0..000000000
--- a/tools/dependencies-report/src/main/resources/notices/bouncycastle-NOTICE.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright (c) 2000 - 2018 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
-
-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.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/buftok-0.2.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/buftok-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/buftok-0.2.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/buftok-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/builder-3.2.3-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/builder-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/builder-3.2.3-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/builder-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/bundler-1.9.10-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/bundler-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/bundler-1.9.10-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/bundler-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/bytelist-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/bytelist-NOTICE.txt
deleted file mode 100644
index a9fdfc945..000000000
--- a/tools/dependencies-report/src/main/resources/notices/bytelist-NOTICE.txt
+++ /dev/null
@@ -1,2487 +0,0 @@
-JRuby is Copyright (c) 2007-2013 The JRuby project, and is released
-under a tri EPL/GPL/LGPL license. You can use it, redistribute it
-and/or modify it under the terms of the:
-
-  Eclipse Public License version 1.0
-  GNU General Public License version 2
-  GNU Lesser General Public License version 2.1
-
-The complete text of the Eclipse Public License is as follows:
-
-  Eclipse Public License - v 1.0
-
-  THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-  PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-  OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-  1. DEFINITIONS
-
-  "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial code and
-         documentation distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor:
-
-          i) changes to the Program, and
-
-          ii) additions to the Program;
-              where such changes and/or additions to the Program
-              originate from and are distributed by that particular
-              Contributor. A Contribution 'originates' from a
-              Contributor if it was added to the Program by such
-              Contributor itself or anyone acting on such
-              Contributor's behalf. Contributions do not include
-              additions to the Program which: (i) are separate modules
-              of software distributed in conjunction with the Program
-              under their own license agreement, and (ii) are not
-              derivative works of the Program.
-
-  "Contributor" means any person or entity that distributes the Program.
-
-  "Licensed Patents" mean patent claims licensable by a Contributor
-  which are necessarily infringed by the use or sale of its
-  Contribution alone or when combined with the Program.
-
-  "Program" means the Contributions distributed in accordance with
-  this Agreement.
-
-  "Recipient" means anyone who receives the Program under this
-  Agreement, including all Contributors.
-
-  2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor
-         hereby grants Recipient a non-exclusive, worldwide,
-         royalty-free copyright license to reproduce, prepare
-         derivative works of, publicly display, publicly perform,
-         distribute and sublicense the Contribution of such
-         Contributor, if any, and such derivative works, in source
-         code and object code form.
-
-      b) Subject to the terms of this Agreement, each Contributor
-         hereby grants Recipient a non-exclusive, worldwide,
-         royalty-free patent license under Licensed Patents to make,
-         use, sell, offer to sell, import and otherwise transfer the
-         Contribution of such Contributor, if any, in source code and
-         object code form. This patent license shall apply to the
-         combination of the Contribution and the Program if, at the
-         time the Contribution is added by the Contributor, such
-         addition of the Contribution causes such combination to be
-         covered by the Licensed Patents. The patent license shall not
-         apply to any other combinations which include the
-         Contribution. No hardware per se is licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants
-         the licenses to its Contributions set forth herein, no
-         assurances are provided by any Contributor that the Program
-         does not infringe the patent or other intellectual property
-         rights of any other entity. Each Contributor disclaims any
-         liability to Recipient for claims brought by any other entity
-         based on infringement of intellectual property rights or
-         otherwise. As a condition to exercising the rights and
-         licenses granted hereunder, each Recipient hereby assumes
-         sole responsibility to secure any other intellectual property
-         rights needed, if any. For example, if a third party patent
-         license is required to allow Recipient to distribute the
-         Program, it is Recipient's responsibility to acquire that
-         license before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-         sufficient copyright rights in its Contribution, if any, to
-         grant the copyright license set forth in this Agreement.
-
-  3. REQUIREMENTS
-
-  A Contributor  may choose to  distribute the Program in  object code
-  form under its own license agreement, provided that:
-
-      a) it complies with the terms and conditions of this Agreement; and
-
-      b) its license agreement:
-
-          i) effectively disclaims on behalf of all Contributors all
-             warranties and conditions, express and implied, including
-             warranties or conditions of title and non-infringement,
-             and implied warranties or conditions of merchantability
-             and fitness for a particular purpose;
-
-          ii) effectively excludes on behalf of all Contributors all
-              liability for damages, including direct, indirect,
-              special, incidental and consequential damages, such as
-              lost profits;
-
-          iii) states that any provisions which differ from this
-               Agreement are offered by that Contributor alone and not
-               by any other party; and
-
-          iv) states that source code for the Program is available
-              from such Contributor, and informs licensees how to
-              obtain it in a reasonable manner on or through a medium
-              customarily used for software exchange.
-
-  When the Program is made available in source code form:
-
-      a) it must be made available under this Agreement; and
-
-      b) a copy of this Agreement must be included with each copy of
-         the Program.
-
-  Contributors may not remove or alter any copyright notices contained
-  within the Program.
-
-  Each Contributor must identify itself as the originator of its
-  Contribution, if any, in a manner that reasonably allows subsequent
-  Recipients to identify the originator of the Contribution.
-
-  4. COMMERCIAL DISTRIBUTION
-
-  Commercial distributors of software may accept certain
-  responsibilities with respect to end users, business partners and
-  the like. While this license is intended to facilitate the
-  commercial use of the Program, the Contributor who includes the
-  Program in a commercial product offering should do so in a manner
-  which does not create potential liability for other Contributors.
-  Therefore, if a Contributor includes the Program in a commercial
-  product offering, such Contributor ("Commercial Contributor") hereby
-  agrees to defend and indemnify every other Contributor ("Indemnified
-  Contributor") against any losses, damages and costs (collectively
-  "Losses") arising from claims, lawsuits and other legal actions
-  brought by a third party against the Indemnified Contributor to the
-  extent caused by the acts or omissions of such Commercial
-  Contributor in connection with its distribution of the Program in a
-  commercial product offering. The obligations in this section do not
-  apply to any claims or Losses relating to any actual or alleged
-  intellectual property infringement. In order to qualify, an
-  Indemnified Contributor must: a) promptly notify the Commercial
-  Contributor in writing of such claim, and b) allow the Commercial
-  Contributor to control, and cooperate with the Commercial
-  Contributor in, the defense and any related settlement negotiations.
-  The Indemnified Contributor may participate in any such claim at its
-  own expense.
-
-  For example, a Contributor might include the Program in a commercial
-  product offering, Product X. That Contributor is then a Commercial
-  Contributor. If that Commercial Contributor then makes performance
-  claims, or offers warranties related to Product X, those performance
-  claims and warranties are such Commercial Contributor's
-  responsibility alone. Under this section, the Commercial Contributor
-  would have to defend claims against the other Contributors related
-  to those performance claims and warranties, and if a court requires
-  any other Contributor to pay any damages as a result, the Commercial
-  Contributor must pay those damages.
-
-  5. NO WARRANTY
-
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-  PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-  ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-  ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-  MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient
-  is solely responsible for determining the appropriateness of using
-  and distributing the Program and assumes all risks associated with
-  its exercise of rights under this Agreement , including but not
-  limited to the risks and costs of program errors, compliance with
-  applicable laws, damage to or loss of data, programs or equipment,
-  and unavailability or interruption of operations.
-
-  6. DISCLAIMER OF LIABILITY
-
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-  NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT,
-  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON
-  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-  THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-  GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-  DAMAGES.
-
-  7. GENERAL
-
-  If any provision of this Agreement is invalid or unenforceable under
-  applicable law, it shall not affect the validity or enforceability
-  of the remainder of the terms of this Agreement, and without further
-  action by the parties hereto, such provision shall be reformed to
-  the minimum extent necessary to make such provision valid and
-  enforceable.
-
-  If Recipient institutes patent litigation against any entity
-  (including a cross-claim or counterclaim in a lawsuit) alleging that
-  the Program itself (excluding combinations of the Program with other
-  software or hardware) infringes such Recipient's patent(s), then
-  such Recipient's rights granted under Section 2(b) shall terminate
-  as of the date such litigation is filed.
-
-  All Recipient's rights under this Agreement shall terminate if it
-  fails to comply with any of the material terms or conditions of this
-  Agreement and does not cure such failure in a reasonable period of
-  time after becoming aware of such noncompliance. If all Recipient's
-  rights under this Agreement terminate, Recipient agrees to cease use
-  and distribution of the Program as soon as reasonably practicable.
-  However, Recipient's obligations under this Agreement and any
-  licenses granted by Recipient relating to the Program shall continue
-  and survive.
-
-  Everyone is permitted to copy and distribute copies of this
-  Agreement, but in order to avoid inconsistency the Agreement is
-  copyrighted and may only be modified in the following manner. The
-  Agreement Steward reserves the right to publish new versions
-  (including revisions) of this Agreement from time to time. No one
-  other than the Agreement Steward has the right to modify this
-  Agreement. The Eclipse Foundation is the initial Agreement Steward.
-  The Eclipse Foundation may assign the responsibility to serve as the
-  Agreement Steward to a suitable separate entity. Each new version of
-  the Agreement will be given a distinguishing version number. The
-  Program (including Contributions) may always be distributed subject
-  to the version of the Agreement under which it was received. In
-  addition, after a new version of the Agreement is published,
-  Contributor may elect to distribute the Program (including its
-  Contributions) under the new version. Except as expressly stated in
-  Sections 2(a) and 2(b) above, Recipient receives no rights or
-  licenses to the intellectual property of any Contributor under this
-  Agreement, whether expressly, by implication, estoppel or otherwise.
-  All rights in the Program not expressly granted under this Agreement
-  are reserved.
-
-  This Agreement is governed by the laws of the State of New York and
-  the intellectual property laws of the United States of America. No
-  party to this Agreement will bring a legal action under this
-  Agreement more than one year after the cause of action arose. Each
-  party waives its rights to a jury trial in any resulting litigation.
-
-The complete text of the Common Public License is as follows:
-
-  Common Public License - v 1.0
-
-  THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON
-  PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-  THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-  1. DEFINITIONS
-
-  "Contribution" means:
-
-  a) in the case of the initial Contributor, the initial code and
-    documentation distributed under this Agreement, and
-
-  b) in the case of each subsequent Contributor:
-
-  i) changes to the Program, and
-
-  ii) additions to the Program;
-
-  where such changes and/or additions to the Program originate
-  from and are distributed by that particular Contributor. A
-  Contribution 'originates' from a Contributor if it was added to the
-  Program by such Contributor itself or anyone acting on such
-  Contributor's behalf. Contributions do not include additions to the
-  Program which: (i) are separate modules of software distributed in
-  conjunction with the Program under their own license agreement,
-  and (ii) are not derivative works of the Program.
-
-  "Contributor" means any person or entity that distributes the Program.
-
-  "Licensed Patents " mean patent claims licensable by a Contributor
-  which are necessarily infringed by the use or sale of its Contribution
-  alone or when combined with the Program.
-
-  "Program" means the Contributions distributed in accordance with this Agreement.
-
-  "Recipient" means anyone who receives the Program under this
-  Agreement, including all Contributors.
-
-  2. GRANT OF RIGHTS
-
-  a) Subject to the terms of this Agreement, each Contributor
-  hereby grants Recipient a non-exclusive, worldwide, royalty-free
-  copyright license to reproduce, prepare derivative works of, publicly
-  display, publicly perform, distribute and sublicense the Contribution
-  of such Contributor, if any, and such derivative works, in source code
-  and object code form.
-
-  b) Subject to the terms of this Agreement, each Contributor
-  hereby grants Recipient a non-exclusive, worldwide, royalty-free
-  patent license under Licensed Patents to make, use, sell, offer to
-  sell, import and otherwise transfer the Contribution of such
-  Contributor, if any, in source code and object code form. This patent
-  license shall apply to the combination of the Contribution and the
-  Program if, at the time the Contribution is added by the Contributor,
-  such addition of the Contribution causes such combination to be
-  covered by the Licensed Patents. The patent license shall not apply to
-  any other combinations which include the Contribution. No hardware per
-  se is licensed hereunder.
-
-  c) Recipient understands that although each Contributor grants
-  the licenses to its Contributions set forth herein, no assurances are
-  provided by any Contributor that the Program does not infringe the
-  patent or other intellectual property rights of any other entity. Each
-  Contributor disclaims any liability to Recipient for claims brought by
-  any other entity based on infringement of intellectual property rights
-  or otherwise. As a condition to exercising the rights and licenses
-  granted hereunder, each Recipient hereby assumes sole responsibility
-  to secure any other intellectual property rights needed, if any. For
-  example, if a third party patent license is required to allow
-  Recipient to distribute the Program, it is Recipient's responsibility
-  to acquire that license before distributing the Program.
-
-  d) Each Contributor represents that to its knowledge it has
-  sufficient copyright rights in its Contribution, if any, to grant the
-  copyright license set forth in this Agreement.
-
-  3. REQUIREMENTS
-
-  A Contributor may choose to distribute the Program in object code form
-  under its own license agreement, provided that:
-
-  a) it complies with the terms and conditions of this Agreement;
-    and
-
-  b) its license agreement:
-
-  i) effectively disclaims on behalf of all Contributors all
-  warranties and conditions, express and implied, including warranties
-  or conditions of title and non-infringement, and implied warranties or
-  conditions of merchantability and fitness for a particular purpose;
-
-  ii) effectively excludes on behalf of all Contributors all
-  liability for damages, including direct, indirect, special, incidental
-  and consequential damages, such as lost profits;
-
-  iii) states that any provisions which differ from this Agreement
-  are offered by that Contributor alone and not by any other party; and
-
-  iv) states that source code for the Program is available from
-  such Contributor, and informs licensees how to obtain it in a
-  reasonable manner on or through a medium customarily used for software
-  exchange.
-
-  When the Program is made available in source code form:
-
-  a) it must be made available under this Agreement; and 
-
-  b) a copy of this Agreement must be included with each copy of
-  the Program.
-
-  Contributors may not remove or alter any copyright notices contained
-  within the Program.
-
-  Each Contributor must identify itself as the originator of its
-  Contribution, if any, in a manner that reasonably allows subsequent
-  Recipients to identify the originator of the Contribution.
-
-  4. COMMERCIAL DISTRIBUTION
-
-  Commercial distributors of software may accept certain
-  responsibilities with respect to end users, business partners and the
-  like. While this license is intended to facilitate the commercial use
-  of the Program, the Contributor who includes the Program in a
-  commercial product offering should do so in a manner which does not
-  create potential liability for other Contributors. Therefore, if a
-  Contributor includes the Program in a commercial product offering,
-  such Contributor ("Commercial Contributor") hereby agrees to defend
-  and indemnify every other Contributor ("Indemnified Contributor")
-  against any losses, damages and costs (collectively "Losses") arising
-  from claims, lawsuits and other legal actions brought by a third party
-  against the Indemnified Contributor to the extent caused by the acts
-  or omissions of such Commercial Contributor in connection with its
-  distribution of the Program in a commercial product offering. The
-  obligations in this section do not apply to any claims or Losses
-  relating to any actual or alleged intellectual property
-  infringement. In order to qualify, an Indemnified Contributor must: a)
-  promptly notify the Commercial Contributor in writing of such claim,
-  and b) allow the Commercial Contributor to control, and cooperate with
-  the Commercial Contributor in, the defense and any related settlement
-  negotiations. The Indemnified Contributor may participate in any such
-  claim at its own expense.
-
-  For example, a Contributor might include the Program in a commercial
-  product offering, Product X. That Contributor is then a Commercial
-  Contributor. If that Commercial Contributor then makes performance
-  claims, or offers warranties related to Product X, those performance
-  claims and warranties are such Commercial Contributor's responsibility
-  alone. Under this section, the Commercial Contributor would have to
-  defend claims against the other Contributors related to those
-  performance claims and warranties, and if a court requires any other
-  Contributor to pay any damages as a result, the Commercial Contributor
-  must pay those damages.
-
-  5. NO WARRANTY
-
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-  PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
-  WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-  OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-  responsible for determining the appropriateness of using and
-  distributing the Program and assumes all risks associated with its
-  exercise of rights under this Agreement, including but not limited to
-  the risks and costs of program errors, compliance with applicable
-  laws, damage to or loss of data, programs or equipment, and
-  unavailability or interruption of operations.
-
-  6. DISCLAIMER OF LIABILITY
-
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
-  ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-  WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-  DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-  HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-  7. GENERAL
-
-  If any provision of this Agreement is invalid or unenforceable under
-  applicable law, it shall not affect the validity or enforceability of
-  the remainder of the terms of this Agreement, and without further
-  action by the parties hereto, such provision shall be reformed to the
-  minimum extent necessary to make such provision valid and enforceable.
-
-  If Recipient institutes patent litigation against a Contributor with
-  respect to a patent applicable to software (including a cross-claim or
-  counterclaim in a lawsuit), then any patent licenses granted by that
-  Contributor to such Recipient under this Agreement shall terminate as
-  of the date such litigation is filed. In addition, if Recipient
-  institutes patent litigation against any entity (including a
-  cross-claim or counterclaim in a lawsuit) alleging that the Program
-  itself (excluding combinations of the Program with other software or
-  hardware) infringes such Recipient's patent(s), then such Recipient's
-  rights granted under Section 2(b) shall terminate as of the date such
-  litigation is filed.
-
-  All Recipient's rights under this Agreement shall terminate if it
-  fails to comply with any of the material terms or conditions of this
-  Agreement and does not cure such failure in a reasonable period of
-  time after becoming aware of such noncompliance. If all Recipient's
-  rights under this Agreement terminate, Recipient agrees to cease use
-  and distribution of the Program as soon as reasonably
-  practicable. However, Recipient's obligations under this Agreement and
-  any licenses granted by Recipient relating to the Program shall
-  continue and survive.
-
-  Everyone is permitted to copy and distribute copies of this Agreement,
-  but in order to avoid inconsistency the Agreement is copyrighted and
-  may only be modified in the following manner. The Agreement Steward
-  reserves the right to publish new versions (including revisions) of
-  this Agreement from time to time. No one other than the Agreement
-  Steward has the right to modify this Agreement. IBM is the initial
-  Agreement Steward. IBM may assign the responsibility to serve as the
-  Agreement Steward to a suitable separate entity. Each new version of
-  the Agreement will be given a distinguishing version number. The
-  Program (including Contributions) may always be distributed subject to
-  the version of the Agreement under which it was received. In addition,
-  after a new version of the Agreement is published, Contributor may
-  elect to distribute the Program (including its Contributions) under
-  the new version. Except as expressly stated in Sections 2(a) and 2(b)
-  above, Recipient receives no rights or licenses to the intellectual
-  property of any Contributor under this Agreement, whether expressly,
-  by implication, estoppel or otherwise. All rights in the Program not
-  expressly granted under this Agreement are reserved.
-
-  This Agreement is governed by the laws of the State of New York and
-  the intellectual property laws of the United States of America. No
-  party to this Agreement will bring a legal action under this Agreement
-  more than one year after the cause of action arose. Each party waives
- its rights to a jury trial in any resulting litigation.
-
-The complete text of the GNU General Public License v2 is as follows:
-
-          GNU GENERAL PUBLIC LICENSE
-             Version 2, June 1991
-
-   Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                         59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-   Everyone is permitted to copy and distribute verbatim copies
-   of this license document, but changing it is not allowed.
-
-            Preamble
-
-    The licenses for most software are designed to take away your
-  freedom to share and change it.  By contrast, the GNU General Public
-  License is intended to guarantee your freedom to share and change free
-  software--to make sure the software is free for all its users.  This
-  General Public License applies to most of the Free Software
-  Foundation's software and to any other program whose authors commit to
-  using it.  (Some other Free Software Foundation software is covered by
-  the GNU Library General Public License instead.)  You can apply it to
-  your programs, too.
-
-    When we speak of free software, we are referring to freedom, not
-  price.  Our General Public Licenses are designed to make sure that you
-  have the freedom to distribute copies of free software (and charge for
-  this service if you wish), that you receive source code or can get it
-  if you want it, that you can change the software or use pieces of it
-  in new free programs; and that you know you can do these things.
-
-    To protect your rights, we need to make restrictions that forbid
-  anyone to deny you these rights or to ask you to surrender the rights.
-  These restrictions translate to certain responsibilities for you if you
-  distribute copies of the software, or if you modify it.
-
-    For example, if you distribute copies of such a program, whether
-  gratis or for a fee, you must give the recipients all the rights that
-  you have.  You must make sure that they, too, receive or can get the
-  source code.  And you must show them these terms so they know their
-  rights.
-
-    We protect your rights with two steps: (1) copyright the software, and
-  (2) offer you this license which gives you legal permission to copy,
-  distribute and/or modify the software.
-
-    Also, for each author's protection and ours, we want to make certain
-  that everyone understands that there is no warranty for this free
-  software.  If the software is modified by someone else and passed on, we
-  want its recipients to know that what they have is not the original, so
-  that any problems introduced by others will not reflect on the original
-  authors' reputations.
-
-    Finally, any free program is threatened constantly by software
-  patents.  We wish to avoid the danger that redistributors of a free
-  program will individually obtain patent licenses, in effect making the
-  program proprietary.  To prevent this, we have made it clear that any
-  patent must be licensed for everyone's free use or not licensed at all.
-
-    The precise terms and conditions for copying, distribution and
-  modification follow.
-
-          GNU GENERAL PUBLIC LICENSE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-    0. This License applies to any program or other work which contains
-  a notice placed by the copyright holder saying it may be distributed
-  under the terms of this General Public License.  The "Program", below,
-  refers to any such program or work, and a "work based on the Program"
-  means either the Program or any derivative work under copyright law:
-  that is to say, a work containing the Program or a portion of it,
-  either verbatim or with modifications and/or translated into another
-  language.  (Hereinafter, translation is included without limitation in
-  the term "modification".)  Each licensee is addressed as "you".
-
-  Activities other than copying, distribution and modification are not
-  covered by this License; they are outside its scope.  The act of
-  running the Program is not restricted, and the output from the Program
-  is covered only if its contents constitute a work based on the
-  Program (independent of having been made by running the Program).
-  Whether that is true depends on what the Program does.
-
-    1. You may copy and distribute verbatim copies of the Program's
-  source code as you receive it, in any medium, provided that you
-  conspicuously and appropriately publish on each copy an appropriate
-  copyright notice and disclaimer of warranty; keep intact all the
-  notices that refer to this License and to the absence of any warranty;
-  and give any other recipients of the Program a copy of this License
-  along with the Program.
-
-  You may charge a fee for the physical act of transferring a copy, and
-  you may at your option offer warranty protection in exchange for a fee.
-
-    2. You may modify your copy or copies of the Program or any portion
-  of it, thus forming a work based on the Program, and copy and
-  distribute such modifications or work under the terms of Section 1
-  above, provided that you also meet all of these conditions:
-
-      a) You must cause the modified files to carry prominent notices
-      stating that you changed the files and the date of any change.
-
-      b) You must cause any work that you distribute or publish, that in
-      whole or in part contains or is derived from the Program or any
-      part thereof, to be licensed as a whole at no charge to all third
-      parties under the terms of this License.
-
-      c) If the modified program normally reads commands interactively
-      when run, you must cause it, when started running for such
-      interactive use in the most ordinary way, to print or display an
-      announcement including an appropriate copyright notice and a
-      notice that there is no warranty (or else, saying that you provide
-      a warranty) and that users may redistribute the program under
-      these conditions, and telling the user how to view a copy of this
-      License.  (Exception: if the Program itself is interactive but
-      does not normally print such an announcement, your work based on
-      the Program is not required to print an announcement.)
-
-  These requirements apply to the modified work as a whole.  If
-  identifiable sections of that work are not derived from the Program,
-  and can be reasonably considered independent and separate works in
-  themselves, then this License, and its terms, do not apply to those
-  sections when you distribute them as separate works.  But when you
-  distribute the same sections as part of a whole which is a work based
-  on the Program, the distribution of the whole must be on the terms of
-  this License, whose permissions for other licensees extend to the
-  entire whole, and thus to each and every part regardless of who wrote it.
-
-  Thus, it is not the intent of this section to claim rights or contest
-  your rights to work written entirely by you; rather, the intent is to
-  exercise the right to control the distribution of derivative or
-  collective works based on the Program.
-
-  In addition, mere aggregation of another work not based on the Program
-  with the Program (or with a work based on the Program) on a volume of
-  a storage or distribution medium does not bring the other work under
-  the scope of this License.
-
-    3. You may copy and distribute the Program (or a work based on it,
-  under Section 2) in object code or executable form under the terms of
-  Sections 1 and 2 above provided that you also do one of the following:
-
-      a) Accompany it with the complete corresponding machine-readable
-      source code, which must be distributed under the terms of Sections
-      1 and 2 above on a medium customarily used for software interchange; or,
-
-      b) Accompany it with a written offer, valid for at least three
-      years, to give any third party, for a charge no more than your
-      cost of physically performing source distribution, a complete
-      machine-readable copy of the corresponding source code, to be
-      distributed under the terms of Sections 1 and 2 above on a medium
-      customarily used for software interchange; or,
-
-      c) Accompany it with the information you received as to the offer
-      to distribute corresponding source code.  (This alternative is
-      allowed only for noncommercial distribution and only if you
-      received the program in object code or executable form with such
-      an offer, in accord with Subsection b above.)
-
-  The source code for a work means the preferred form of the work for
-  making modifications to it.  For an executable work, complete source
-  code means all the source code for all modules it contains, plus any
-  associated interface definition files, plus the scripts used to
-  control compilation and installation of the executable.  However, as a
-  special exception, the source code distributed need not include
-  anything that is normally distributed (in either source or binary
-  form) with the major components (compiler, kernel, and so on) of the
-  operating system on which the executable runs, unless that component
-  itself accompanies the executable.
-
-  If distribution of executable or object code is made by offering
-  access to copy from a designated place, then offering equivalent
-  access to copy the source code from the same place counts as
-  distribution of the source code, even though third parties are not
-  compelled to copy the source along with the object code.
-
-    4. You may not copy, modify, sublicense, or distribute the Program
-  except as expressly provided under this License.  Any attempt
-  otherwise to copy, modify, sublicense or distribute the Program is
-  void, and will automatically terminate your rights under this License.
-  However, parties who have received copies, or rights, from you under
-  this License will not have their licenses terminated so long as such
-  parties remain in full compliance.
-
-    5. You are not required to accept this License, since you have not
-  signed it.  However, nothing else grants you permission to modify or
-  distribute the Program or its derivative works.  These actions are
-  prohibited by law if you do not accept this License.  Therefore, by
-  modifying or distributing the Program (or any work based on the
-  Program), you indicate your acceptance of this License to do so, and
-  all its terms and conditions for copying, distributing or modifying
-  the Program or works based on it.
-
-    6. Each time you redistribute the Program (or any work based on the
-  Program), the recipient automatically receives a license from the
-  original licensor to copy, distribute or modify the Program subject to
-  these terms and conditions.  You may not impose any further
-  restrictions on the recipients' exercise of the rights granted herein.
-  You are not responsible for enforcing compliance by third parties to
-  this License.
-
-    7. If, as a consequence of a court judgment or allegation of patent
-  infringement or for any other reason (not limited to patent issues),
-  conditions are imposed on you (whether by court order, agreement or
-  otherwise) that contradict the conditions of this License, they do not
-  excuse you from the conditions of this License.  If you cannot
-  distribute so as to satisfy simultaneously your obligations under this
-  License and any other pertinent obligations, then as a consequence you
-  may not distribute the Program at all.  For example, if a patent
-  license would not permit royalty-free redistribution of the Program by
-  all those who receive copies directly or indirectly through you, then
-  the only way you could satisfy both it and this License would be to
-  refrain entirely from distribution of the Program.
-
-  If any portion of this section is held invalid or unenforceable under
-  any particular circumstance, the balance of the section is intended to
-  apply and the section as a whole is intended to apply in other
-  circumstances.
-
-  It is not the purpose of this section to induce you to infringe any
-  patents or other property right claims or to contest validity of any
-  such claims; this section has the sole purpose of protecting the
-  integrity of the free software distribution system, which is
-  implemented by public license practices.  Many people have made
-  generous contributions to the wide range of software distributed
-  through that system in reliance on consistent application of that
-  system; it is up to the author/donor to decide if he or she is willing
-  to distribute software through any other system and a licensee cannot
-  impose that choice.
-
-  This section is intended to make thoroughly clear what is believed to
-  be a consequence of the rest of this License.
-
-    8. If the distribution and/or use of the Program is restricted in
-  certain countries either by patents or by copyrighted interfaces, the
-  original copyright holder who places the Program under this License
-  may add an explicit geographical distribution limitation excluding
-  those countries, so that distribution is permitted only in or among
-  countries not thus excluded.  In such case, this License incorporates
-  the limitation as if written in the body of this License.
-
-    9. The Free Software Foundation may publish revised and/or new versions
-  of the General Public License from time to time.  Such new versions will
-  be similar in spirit to the present version, but may differ in detail to
-  address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the Program
-  specifies a version number of this License which applies to it and "any
-  later version", you have the option of following the terms and conditions
-  either of that version or of any later version published by the Free
-  Software Foundation.  If the Program does not specify a version number of
-  this License, you may choose any version ever published by the Free Software
-  Foundation.
-
-    10. If you wish to incorporate parts of the Program into other free
-  programs whose distribution conditions are different, write to the author
-  to ask for permission.  For software which is copyrighted by the Free
-  Software Foundation, write to the Free Software Foundation; we sometimes
-  make exceptions for this.  Our decision will be guided by the two goals
-  of preserving the free status of all derivatives of our free software and
-  of promoting the sharing and reuse of software generally.
-
-            NO WARRANTY
-
-    11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-  FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-  OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-  PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-  OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-  TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-  PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-  REPAIR OR CORRECTION.
-
-    12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-  WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-  REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-  INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-  OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-  TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-  YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-  PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGES.
-
-           END OF TERMS AND CONDITIONS
-
-The complete text of the GNU Lesser General Public License 2.1 is as follows:
-
-        GNU LESSER GENERAL PUBLIC LICENSE
-             Version 2.1, February 1999
-
-   Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-   Everyone is permitted to copy and distribute verbatim copies
-   of this license document, but changing it is not allowed.
-
-  [This is the first released version of the Lesser GPL.  It also counts
-   as the successor of the GNU Library Public License, version 2, hence
-   the version number 2.1.]
-
-            Preamble
-
-    The licenses for most software are designed to take away your
-  freedom to share and change it.  By contrast, the GNU General Public
-  Licenses are intended to guarantee your freedom to share and change
-  free software--to make sure the software is free for all its users.
-
-    This license, the Lesser General Public License, applies to some
-  specially designated software packages--typically libraries--of the
-  Free Software Foundation and other authors who decide to use it.  You
-  can use it too, but we suggest you first think carefully about whether
-  this license or the ordinary General Public License is the better
-  strategy to use in any particular case, based on the explanations below.
-
-    When we speak of free software, we are referring to freedom of use,
-  not price.  Our General Public Licenses are designed to make sure that
-  you have the freedom to distribute copies of free software (and charge
-  for this service if you wish); that you receive source code or can get
-  it if you want it; that you can change the software and use pieces of
-  it in new free programs; and that you are informed that you can do
-  these things.
-
-    To protect your rights, we need to make restrictions that forbid
-  distributors to deny you these rights or to ask you to surrender these
-  rights.  These restrictions translate to certain responsibilities for
-  you if you distribute copies of the library or if you modify it.
-
-    For example, if you distribute copies of the library, whether gratis
-  or for a fee, you must give the recipients all the rights that we gave
-  you.  You must make sure that they, too, receive or can get the source
-  code.  If you link other code with the library, you must provide
-  complete object files to the recipients, so that they can relink them
-  with the library after making changes to the library and recompiling
-  it.  And you must show them these terms so they know their rights.
-
-    We protect your rights with a two-step method: (1) we copyright the
-  library, and (2) we offer you this license, which gives you legal
-  permission to copy, distribute and/or modify the library.
-
-    To protect each distributor, we want to make it very clear that
-  there is no warranty for the free library.  Also, if the library is
-  modified by someone else and passed on, the recipients should know
-  that what they have is not the original version, so that the original
-  author's reputation will not be affected by problems that might be
-  introduced by others.
-
-    Finally, software patents pose a constant threat to the existence of
-  any free program.  We wish to make sure that a company cannot
-  effectively restrict the users of a free program by obtaining a
-  restrictive license from a patent holder.  Therefore, we insist that
-  any patent license obtained for a version of the library must be
-  consistent with the full freedom of use specified in this license.
-
-    Most GNU software, including some libraries, is covered by the
-  ordinary GNU General Public License.  This license, the GNU Lesser
-  General Public License, applies to certain designated libraries, and
-  is quite different from the ordinary General Public License.  We use
-  this license for certain libraries in order to permit linking those
-  libraries into non-free programs.
-
-    When a program is linked with a library, whether statically or using
-  a shared library, the combination of the two is legally speaking a
-  combined work, a derivative of the original library.  The ordinary
-  General Public License therefore permits such linking only if the
-  entire combination fits its criteria of freedom.  The Lesser General
-  Public License permits more lax criteria for linking other code with
-  the library.
-
-    We call this license the "Lesser" General Public License because it
-  does Less to protect the user's freedom than the ordinary General
-  Public License.  It also provides other free software developers Less
-  of an advantage over competing non-free programs.  These disadvantages
-  are the reason we use the ordinary General Public License for many
-  libraries.  However, the Lesser license provides advantages in certain
-  special circumstances.
-
-    For example, on rare occasions, there may be a special need to
-  encourage the widest possible use of a certain library, so that it becomes
-  a de-facto standard.  To achieve this, non-free programs must be
-  allowed to use the library.  A more frequent case is that a free
-  library does the same job as widely used non-free libraries.  In this
-  case, there is little to gain by limiting the free library to free
-  software only, so we use the Lesser General Public License.
-
-    In other cases, permission to use a particular library in non-free
-  programs enables a greater number of people to use a large body of
-  free software.  For example, permission to use the GNU C Library in
-  non-free programs enables many more people to use the whole GNU
-  operating system, as well as its variant, the GNU/Linux operating
-  system.
-
-    Although the Lesser General Public License is Less protective of the
-  users' freedom, it does ensure that the user of a program that is
-  linked with the Library has the freedom and the wherewithal to run
-  that program using a modified version of the Library.
-
-    The precise terms and conditions for copying, distribution and
-  modification follow.  Pay close attention to the difference between a
-  "work based on the library" and a "work that uses the library".  The
-  former contains code derived from the library, whereas the latter must
-  be combined with the library in order to run.
-
-        GNU LESSER GENERAL PUBLIC LICENSE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-    0. This License Agreement applies to any software library or other
-  program which contains a notice placed by the copyright holder or
-  other authorized party saying it may be distributed under the terms of
-  this Lesser General Public License (also called "this License").
-  Each licensee is addressed as "you".
-
-    A "library" means a collection of software functions and/or data
-  prepared so as to be conveniently linked with application programs
-  (which use some of those functions and data) to form executables.
-
-    The "Library", below, refers to any such software library or work
-  which has been distributed under these terms.  A "work based on the
-  Library" means either the Library or any derivative work under
-  copyright law: that is to say, a work containing the Library or a
-  portion of it, either verbatim or with modifications and/or translated
-  straightforwardly into another language.  (Hereinafter, translation is
-  included without limitation in the term "modification".)
-
-    "Source code" for a work means the preferred form of the work for
-  making modifications to it.  For a library, complete source code means
-  all the source code for all modules it contains, plus any associated
-  interface definition files, plus the scripts used to control compilation
-  and installation of the library.
-
-    Activities other than copying, distribution and modification are not
-  covered by this License; they are outside its scope.  The act of
-  running a program using the Library is not restricted, and output from
-  such a program is covered only if its contents constitute a work based
-  on the Library (independent of the use of the Library in a tool for
-  writing it).  Whether that is true depends on what the Library does
-  and what the program that uses the Library does.
-  
-    1. You may copy and distribute verbatim copies of the Library's
-  complete source code as you receive it, in any medium, provided that
-  you conspicuously and appropriately publish on each copy an
-  appropriate copyright notice and disclaimer of warranty; keep intact
-  all the notices that refer to this License and to the absence of any
-  warranty; and distribute a copy of this License along with the
-  Library.
-
-    You may charge a fee for the physical act of transferring a copy,
-  and you may at your option offer warranty protection in exchange for a
-  fee.
-
-    2. You may modify your copy or copies of the Library or any portion
-  of it, thus forming a work based on the Library, and copy and
-  distribute such modifications or work under the terms of Section 1
-  above, provided that you also meet all of these conditions:
-
-      a) The modified work must itself be a software library.
-
-      b) You must cause the files modified to carry prominent notices
-      stating that you changed the files and the date of any change.
-
-      c) You must cause the whole of the work to be licensed at no
-      charge to all third parties under the terms of this License.
-
-      d) If a facility in the modified Library refers to a function or a
-      table of data to be supplied by an application program that uses
-      the facility, other than as an argument passed when the facility
-      is invoked, then you must make a good faith effort to ensure that,
-      in the event an application does not supply such function or
-      table, the facility still operates, and performs whatever part of
-      its purpose remains meaningful.
-
-      (For example, a function in a library to compute square roots has
-      a purpose that is entirely well-defined independent of the
-      application.  Therefore, Subsection 2d requires that any
-      application-supplied function or table used by this function must
-      be optional: if the application does not supply it, the square
-      root function must still compute square roots.)
-
-  These requirements apply to the modified work as a whole.  If
-  identifiable sections of that work are not derived from the Library,
-  and can be reasonably considered independent and separate works in
-  themselves, then this License, and its terms, do not apply to those
-  sections when you distribute them as separate works.  But when you
-  distribute the same sections as part of a whole which is a work based
-  on the Library, the distribution of the whole must be on the terms of
-  this License, whose permissions for other licensees extend to the
-  entire whole, and thus to each and every part regardless of who wrote
-  it.
-
-  Thus, it is not the intent of this section to claim rights or contest
-  your rights to work written entirely by you; rather, the intent is to
-  exercise the right to control the distribution of derivative or
-  collective works based on the Library.
-
-  In addition, mere aggregation of another work not based on the Library
-  with the Library (or with a work based on the Library) on a volume of
-  a storage or distribution medium does not bring the other work under
-  the scope of this License.
-
-    3. You may opt to apply the terms of the ordinary GNU General Public
-  License instead of this License to a given copy of the Library.  To do
-  this, you must alter all the notices that refer to this License, so
-  that they refer to the ordinary GNU General Public License, version 2,
-  instead of to this License.  (If a newer version than version 2 of the
-  ordinary GNU General Public License has appeared, then you can specify
-  that version instead if you wish.)  Do not make any other change in
-  these notices.
-
-    Once this change is made in a given copy, it is irreversible for
-  that copy, so the ordinary GNU General Public License applies to all
-  subsequent copies and derivative works made from that copy.
-
-    This option is useful when you wish to copy part of the code of
-  the Library into a program that is not a library.
-
-    4. You may copy and distribute the Library (or a portion or
-  derivative of it, under Section 2) in object code or executable form
-  under the terms of Sections 1 and 2 above provided that you accompany
-  it with the complete corresponding machine-readable source code, which
-  must be distributed under the terms of Sections 1 and 2 above on a
-  medium customarily used for software interchange.
-
-    If distribution of object code is made by offering access to copy
-  from a designated place, then offering equivalent access to copy the
-  source code from the same place satisfies the requirement to
-  distribute the source code, even though third parties are not
-  compelled to copy the source along with the object code.
-
-    5. A program that contains no derivative of any portion of the
-  Library, but is designed to work with the Library by being compiled or
-  linked with it, is called a "work that uses the Library".  Such a
-  work, in isolation, is not a derivative work of the Library, and
-  therefore falls outside the scope of this License.
-
-    However, linking a "work that uses the Library" with the Library
-  creates an executable that is a derivative of the Library (because it
-  contains portions of the Library), rather than a "work that uses the
-  library".  The executable is therefore covered by this License.
-  Section 6 states terms for distribution of such executables.
-
-    When a "work that uses the Library" uses material from a header file
-  that is part of the Library, the object code for the work may be a
-  derivative work of the Library even though the source code is not.
-  Whether this is true is especially significant if the work can be
-  linked without the Library, or if the work is itself a library.  The
-  threshold for this to be true is not precisely defined by law.
-
-    If such an object file uses only numerical parameters, data
-  structure layouts and accessors, and small macros and small inline
-  functions (ten lines or less in length), then the use of the object
-  file is unrestricted, regardless of whether it is legally a derivative
-  work.  (Executables containing this object code plus portions of the
-  Library will still fall under Section 6.)
-
-    Otherwise, if the work is a derivative of the Library, you may
-  distribute the object code for the work under the terms of Section 6.
-  Any executables containing that work also fall under Section 6,
-  whether or not they are linked directly with the Library itself.
-
-    6. As an exception to the Sections above, you may also combine or
-  link a "work that uses the Library" with the Library to produce a
-  work containing portions of the Library, and distribute that work
-  under terms of your choice, provided that the terms permit
-  modification of the work for the customer's own use and reverse
-  engineering for debugging such modifications.
-
-    You must give prominent notice with each copy of the work that the
-  Library is used in it and that the Library and its use are covered by
-  this License.  You must supply a copy of this License.  If the work
-  during execution displays copyright notices, you must include the
-  copyright notice for the Library among them, as well as a reference
-  directing the user to the copy of this License.  Also, you must do one
-  of these things:
-
-      a) Accompany the work with the complete corresponding
-      machine-readable source code for the Library including whatever
-      changes were used in the work (which must be distributed under
-      Sections 1 and 2 above); and, if the work is an executable linked
-      with the Library, with the complete machine-readable "work that
-      uses the Library", as object code and/or source code, so that the
-      user can modify the Library and then relink to produce a modified
-      executable containing the modified Library.  (It is understood
-      that the user who changes the contents of definitions files in the
-      Library will not necessarily be able to recompile the application
-      to use the modified definitions.)
-
-      b) Use a suitable shared library mechanism for linking with the
-      Library.  A suitable mechanism is one that (1) uses at run time a
-      copy of the library already present on the user's computer system,
-      rather than copying library functions into the executable, and (2)
-      will operate properly with a modified version of the library, if
-      the user installs one, as long as the modified version is
-      interface-compatible with the version that the work was made with.
-
-      c) Accompany the work with a written offer, valid for at
-      least three years, to give the same user the materials
-      specified in Subsection 6a, above, for a charge no more
-      than the cost of performing this distribution.
-
-      d) If distribution of the work is made by offering access to copy
-      from a designated place, offer equivalent access to copy the above
-      specified materials from the same place.
-
-      e) Verify that the user has already received a copy of these
-      materials or that you have already sent this user a copy.
-
-    For an executable, the required form of the "work that uses the
-  Library" must include any data and utility programs needed for
-  reproducing the executable from it.  However, as a special exception,
-  the materials to be distributed need not include anything that is
-  normally distributed (in either source or binary form) with the major
-  components (compiler, kernel, and so on) of the operating system on
-  which the executable runs, unless that component itself accompanies
-  the executable.
-
-    It may happen that this requirement contradicts the license
-  restrictions of other proprietary libraries that do not normally
-  accompany the operating system.  Such a contradiction means you cannot
-  use both them and the Library together in an executable that you
-  distribute.
-
-    7. You may place library facilities that are a work based on the
-  Library side-by-side in a single library together with other library
-  facilities not covered by this License, and distribute such a combined
-  library, provided that the separate distribution of the work based on
-  the Library and of the other library facilities is otherwise
-  permitted, and provided that you do these two things:
-
-      a) Accompany the combined library with a copy of the same work
-      based on the Library, uncombined with any other library
-      facilities.  This must be distributed under the terms of the
-      Sections above.
-
-      b) Give prominent notice with the combined library of the fact
-      that part of it is a work based on the Library, and explaining
-      where to find the accompanying uncombined form of the same work.
-
-    8. You may not copy, modify, sublicense, link with, or distribute
-  the Library except as expressly provided under this License.  Any
-  attempt otherwise to copy, modify, sublicense, link with, or
-  distribute the Library is void, and will automatically terminate your
-  rights under this License.  However, parties who have received copies,
-  or rights, from you under this License will not have their licenses
-  terminated so long as such parties remain in full compliance.
-
-    9. You are not required to accept this License, since you have not
-  signed it.  However, nothing else grants you permission to modify or
-  distribute the Library or its derivative works.  These actions are
-  prohibited by law if you do not accept this License.  Therefore, by
-  modifying or distributing the Library (or any work based on the
-  Library), you indicate your acceptance of this License to do so, and
-  all its terms and conditions for copying, distributing or modifying
-  the Library or works based on it.
-
-    10. Each time you redistribute the Library (or any work based on the
-  Library), the recipient automatically receives a license from the
-  original licensor to copy, distribute, link with or modify the Library
-  subject to these terms and conditions.  You may not impose any further
-  restrictions on the recipients' exercise of the rights granted herein.
-  You are not responsible for enforcing compliance by third parties with
-  this License.
-
-    11. If, as a consequence of a court judgment or allegation of patent
-  infringement or for any other reason (not limited to patent issues),
-  conditions are imposed on you (whether by court order, agreement or
-  otherwise) that contradict the conditions of this License, they do not
-  excuse you from the conditions of this License.  If you cannot
-  distribute so as to satisfy simultaneously your obligations under this
-  License and any other pertinent obligations, then as a consequence you
-  may not distribute the Library at all.  For example, if a patent
-  license would not permit royalty-free redistribution of the Library by
-  all those who receive copies directly or indirectly through you, then
-  the only way you could satisfy both it and this License would be to
-  refrain entirely from distribution of the Library.
-
-  If any portion of this section is held invalid or unenforceable under any
-  particular circumstance, the balance of the section is intended to apply,
-  and the section as a whole is intended to apply in other circumstances.
-
-  It is not the purpose of this section to induce you to infringe any
-  patents or other property right claims or to contest validity of any
-  such claims; this section has the sole purpose of protecting the
-  integrity of the free software distribution system which is
-  implemented by public license practices.  Many people have made
-  generous contributions to the wide range of software distributed
-  through that system in reliance on consistent application of that
-  system; it is up to the author/donor to decide if he or she is willing
-  to distribute software through any other system and a licensee cannot
-  impose that choice.
-
-  This section is intended to make thoroughly clear what is believed to
-  be a consequence of the rest of this License.
-
-    12. If the distribution and/or use of the Library is restricted in
-  certain countries either by patents or by copyrighted interfaces, the
-  original copyright holder who places the Library under this License may add
-  an explicit geographical distribution limitation excluding those countries,
-  so that distribution is permitted only in or among countries not thus
-  excluded.  In such case, this License incorporates the limitation as if
-  written in the body of this License.
-
-    13. The Free Software Foundation may publish revised and/or new
-  versions of the Lesser General Public License from time to time.
-  Such new versions will be similar in spirit to the present version,
-  but may differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the Library
-  specifies a version number of this License which applies to it and
-  "any later version", you have the option of following the terms and
-  conditions either of that version or of any later version published by
-  the Free Software Foundation.  If the Library does not specify a
-  license version number, you may choose any version ever published by
-  the Free Software Foundation.
-
-    14. If you wish to incorporate parts of the Library into other free
-  programs whose distribution conditions are incompatible with these,
-  write to the author to ask for permission.  For software which is
-  copyrighted by the Free Software Foundation, write to the Free
-  Software Foundation; we sometimes make exceptions for this.  Our
-  decision will be guided by the two goals of preserving the free status
-  of all derivatives of our free software and of promoting the sharing
-  and reuse of software generally.
-
-            NO WARRANTY
-
-    15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-  WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-  OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-  KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-  PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-  LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-  THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-    16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-  WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-  AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-  FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-  CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-  LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-  RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-  FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-  SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-  DAMAGES.
-
-           END OF TERMS AND CONDITIONS
-
-             How to Apply These Terms to Your New Libraries
-
-    If you develop a new library, and you want it to be of the greatest
-  possible use to the public, we recommend making it free software that
-  everyone can redistribute and change.  You can do so by permitting
-  redistribution under these terms (or, alternatively, under the terms of the
-  ordinary General Public License).
-
-    To apply these terms, attach the following notices to the library.  It is
-  safest to attach them to the start of each source file to most effectively
-  convey the exclusion of warranty; and each file should have at least the
-  "copyright" line and a pointer to where the full notice is found.
-
-      <one line to give the library's name and a brief idea of what it does.>
-      Copyright (C) <year>  <name of author>
-
-      This library is free software; you can redistribute it and/or
-      modify it under the terms of the GNU Lesser General Public
-      License as published by the Free Software Foundation; either
-      version 2.1 of the License, or (at your option) any later version.
-
-      This library is distributed in the hope that it will be useful,
-      but WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Lesser General Public License for more details.
-
-      You should have received a copy of the GNU Lesser General Public
-      License along with this library; if not, write to the Free Software
-      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-  Also add information on how to contact you by electronic and paper mail.
-
-  You should also get your employer (if you work as a programmer) or your
-  school, if any, to sign a "copyright disclaimer" for the library, if
-  necessary.  Here is a sample; alter the names:
-
-    Yoyodyne, Inc., hereby disclaims all copyright interest in the
-    library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-    <signature of Ty Coon>, 1 April 1990
-    Ty Coon, President of Vice
-
-  That's all there is to it!
-
-The following licenses cover code other than JRuby which is included with JRuby.
-
-Licenses listed below include:
-
-* GNU General Public License version 3
-* Apache 2.0 License
-* BSD License
-* Apache Software License Version 1.1
-* MIT License
-
-The complete text of the GNU General Public License version 3 is as follows:
-
-          GNU GENERAL PUBLIC LICENSE
-             Version 3, 29 June 2007
-
-   Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
-   Everyone is permitted to copy and distribute verbatim copies
-   of this license document, but changing it is not allowed.
-
-            Preamble
-
-    The GNU General Public License is a free, copyleft license for
-  software and other kinds of works.
-
-    The licenses for most software and other practical works are designed
-  to take away your freedom to share and change the works.  By contrast,
-  the GNU General Public License is intended to guarantee your freedom to
-  share and change all versions of a program--to make sure it remains free
-  software for all its users.  We, the Free Software Foundation, use the
-  GNU General Public License for most of our software; it applies also to
-  any other work released this way by its authors.  You can apply it to
-  your programs, too.
-
-    When we speak of free software, we are referring to freedom, not
-  price.  Our General Public Licenses are designed to make sure that you
-  have the freedom to distribute copies of free software (and charge for
-  them if you wish), that you receive source code or can get it if you
-  want it, that you can change the software or use pieces of it in new
-  free programs, and that you know you can do these things.
-
-    To protect your rights, we need to prevent others from denying you
-  these rights or asking you to surrender the rights.  Therefore, you have
-  certain responsibilities if you distribute copies of the software, or if
-  you modify it: responsibilities to respect the freedom of others.
-
-    For example, if you distribute copies of such a program, whether
-  gratis or for a fee, you must pass on to the recipients the same
-  freedoms that you received.  You must make sure that they, too, receive
-  or can get the source code.  And you must show them these terms so they
-  know their rights.
-
-    Developers that use the GNU GPL protect your rights with two steps:
-  (1) assert copyright on the software, and (2) offer you this License
-  giving you legal permission to copy, distribute and/or modify it.
-
-    For the developers' and authors' protection, the GPL clearly explains
-  that there is no warranty for this free software.  For both users' and
-  authors' sake, the GPL requires that modified versions be marked as
-  changed, so that their problems will not be attributed erroneously to
-  authors of previous versions.
-
-    Some devices are designed to deny users access to install or run
-  modified versions of the software inside them, although the manufacturer
-  can do so.  This is fundamentally incompatible with the aim of
-  protecting users' freedom to change the software.  The systematic
-  pattern of such abuse occurs in the area of products for individuals to
-  use, which is precisely where it is most unacceptable.  Therefore, we
-  have designed this version of the GPL to prohibit the practice for those
-  products.  If such problems arise substantially in other domains, we
-  stand ready to extend this provision to those domains in future versions
-  of the GPL, as needed to protect the freedom of users.
-
-    Finally, every program is threatened constantly by software patents.
-  States should not allow patents to restrict development and use of
-  software on general-purpose computers, but in those that do, we wish to
-  avoid the special danger that patents applied to a free program could
-  make it effectively proprietary.  To prevent this, the GPL assures that
-  patents cannot be used to render the program non-free.
-
-    The precise terms and conditions for copying, distribution and
-  modification follow.
-
-             TERMS AND CONDITIONS
-
-    0. Definitions.
-
-    "This License" refers to version 3 of the GNU General Public License.
-
-    "Copyright" also means copyright-like laws that apply to other kinds of
-  works, such as semiconductor masks.
- 
-    "The Program" refers to any copyrightable work licensed under this
-  License.  Each licensee is addressed as "you".  "Licensees" and
-  "recipients" may be individuals or organizations.
-
-    To "modify" a work means to copy from or adapt all or part of the work
-  in a fashion requiring copyright permission, other than the making of an
-  exact copy.  The resulting work is called a "modified version" of the
-  earlier work or a work "based on" the earlier work.
-
-    A "covered work" means either the unmodified Program or a work based
-  on the Program.
-
-    To "propagate" a work means to do anything with it that, without
-  permission, would make you directly or secondarily liable for
-  infringement under applicable copyright law, except executing it on a
-  computer or modifying a private copy.  Propagation includes copying,
-  distribution (with or without modification), making available to the
-  public, and in some countries other activities as well.
-
-    To "convey" a work means any kind of propagation that enables other
-  parties to make or receive copies.  Mere interaction with a user through
-  a computer network, with no transfer of a copy, is not conveying.
-
-    An interactive user interface displays "Appropriate Legal Notices"
-  to the extent that it includes a convenient and prominently visible
-  feature that (1) displays an appropriate copyright notice, and (2)
-  tells the user that there is no warranty for the work (except to the
-  extent that warranties are provided), that licensees may convey the
-  work under this License, and how to view a copy of this License.  If
-  the interface presents a list of user commands or options, such as a
-  menu, a prominent item in the list meets this criterion.
-
-    1. Source Code.
-
-    The "source code" for a work means the preferred form of the work
-  for making modifications to it.  "Object code" means any non-source
-  form of a work.
-
-    A "Standard Interface" means an interface that either is an official
-  standard defined by a recognized standards body, or, in the case of
-  interfaces specified for a particular programming language, one that
-  is widely used among developers working in that language.
-
-    The "System Libraries" of an executable work include anything, other
-  than the work as a whole, that (a) is included in the normal form of
-  packaging a Major Component, but which is not part of that Major
-  Component, and (b) serves only to enable use of the work with that
-  Major Component, or to implement a Standard Interface for which an
-  implementation is available to the public in source code form.  A
-  "Major Component", in this context, means a major essential component
-  (kernel, window system, and so on) of the specific operating system
-  (if any) on which the executable work runs, or a compiler used to
-  produce the work, or an object code interpreter used to run it.
-
-    The "Corresponding Source" for a work in object code form means all
-  the source code needed to generate, install, and (for an executable
-  work) run the object code and to modify the work, including scripts to
-  control those activities.  However, it does not include the work's
-  System Libraries, or general-purpose tools or generally available free
-  programs which are used unmodified in performing those activities but
-  which are not part of the work.  For example, Corresponding Source
-  includes interface definition files associated with source files for
-  the work, and the source code for shared libraries and dynamically
-  linked subprograms that the work is specifically designed to require,
-  such as by intimate data communication or control flow between those
-  subprograms and other parts of the work.
-
-    The Corresponding Source need not include anything that users
-  can regenerate automatically from other parts of the Corresponding
-  Source.
-
-    The Corresponding Source for a work in source code form is that
-  same work.
-
-    2. Basic Permissions.
-
-    All rights granted under this License are granted for the term of
-  copyright on the Program, and are irrevocable provided the stated
-  conditions are met.  This License explicitly affirms your unlimited
-  permission to run the unmodified Program.  The output from running a
-  covered work is covered by this License only if the output, given its
-  content, constitutes a covered work.  This License acknowledges your
-  rights of fair use or other equivalent, as provided by copyright law.
-
-    You may make, run and propagate covered works that you do not
-  convey, without conditions so long as your license otherwise remains
-  in force.  You may convey covered works to others for the sole purpose
-  of having them make modifications exclusively for you, or provide you
-  with facilities for running those works, provided that you comply with
-  the terms of this License in conveying all material for which you do
-  not control copyright.  Those thus making or running the covered works
-  for you must do so exclusively on your behalf, under your direction
-  and control, on terms that prohibit them from making any copies of
-  your copyrighted material outside their relationship with you.
-
-    Conveying under any other circumstances is permitted solely under
-  the conditions stated below.  Sublicensing is not allowed; section 10
-  makes it unnecessary.
-
-    3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-    No covered work shall be deemed part of an effective technological
-  measure under any applicable law fulfilling obligations under article
-  11 of the WIPO copyright treaty adopted on 20 December 1996, or
-  similar laws prohibiting or restricting circumvention of such
-  measures.
-
-    When you convey a covered work, you waive any legal power to forbid
-  circumvention of technological measures to the extent such circumvention
-  is effected by exercising rights under this License with respect to
-  the covered work, and you disclaim any intention to limit operation or
-  modification of the work as a means of enforcing, against the work's
-  users, your or third parties' legal rights to forbid circumvention of
-  technological measures.
-
-    4. Conveying Verbatim Copies.
-
-    You may convey verbatim copies of the Program's source code as you
-  receive it, in any medium, provided that you conspicuously and
-  appropriately publish on each copy an appropriate copyright notice;
-  keep intact all notices stating that this License and any
-  non-permissive terms added in accord with section 7 apply to the code;
-  keep intact all notices of the absence of any warranty; and give all
-  recipients a copy of this License along with the Program.
-
-    You may charge any price or no price for each copy that you convey,
-  and you may offer support or warranty protection for a fee.
-
-    5. Conveying Modified Source Versions.
-
-    You may convey a work based on the Program, or the modifications to
-  produce it from the Program, in the form of source code under the
-  terms of section 4, provided that you also meet all of these conditions:
-
-      a) The work must carry prominent notices stating that you modified
-      it, and giving a relevant date.
-
-      b) The work must carry prominent notices stating that it is
-      released under this License and any conditions added under section
-      7.  This requirement modifies the requirement in section 4 to
-      "keep intact all notices".
-
-      c) You must license the entire work, as a whole, under this
-      License to anyone who comes into possession of a copy.  This
-      License will therefore apply, along with any applicable section 7
-      additional terms, to the whole of the work, and all its parts,
-      regardless of how they are packaged.  This License gives no
-      permission to license the work in any other way, but it does not
-      invalidate such permission if you have separately received it.
-
-      d) If the work has interactive user interfaces, each must display
-      Appropriate Legal Notices; however, if the Program has interactive
-      interfaces that do not display Appropriate Legal Notices, your
-      work need not make them do so.
-
-    A compilation of a covered work with other separate and independent
-  works, which are not by their nature extensions of the covered work,
-  and which are not combined with it such as to form a larger program,
-  in or on a volume of a storage or distribution medium, is called an
-  "aggregate" if the compilation and its resulting copyright are not
-  used to limit the access or legal rights of the compilation's users
-  beyond what the individual works permit.  Inclusion of a covered work
-  in an aggregate does not cause this License to apply to the other
-  parts of the aggregate.
-
-    6. Conveying Non-Source Forms.
-
-    You may convey a covered work in object code form under the terms
-  of sections 4 and 5, provided that you also convey the
-  machine-readable Corresponding Source under the terms of this License,
-  in one of these ways:
-
-      a) Convey the object code in, or embodied in, a physical product
-      (including a physical distribution medium), accompanied by the
-      Corresponding Source fixed on a durable physical medium
-      customarily used for software interchange.
-
-      b) Convey the object code in, or embodied in, a physical product
-      (including a physical distribution medium), accompanied by a
-      written offer, valid for at least three years and valid for as
-      long as you offer spare parts or customer support for that product
-      model, to give anyone who possesses the object code either (1) a
-      copy of the Corresponding Source for all the software in the
-      product that is covered by this License, on a durable physical
-      medium customarily used for software interchange, for a price no
-      more than your reasonable cost of physically performing this
-      conveying of source, or (2) access to copy the
-      Corresponding Source from a network server at no charge.
-
-      c) Convey individual copies of the object code with a copy of the
-      written offer to provide the Corresponding Source.  This
-      alternative is allowed only occasionally and noncommercially, and
-      only if you received the object code with such an offer, in accord
-      with subsection 6b.
-
-      d) Convey the object code by offering access from a designated
-      place (gratis or for a charge), and offer equivalent access to the
-      Corresponding Source in the same way through the same place at no
-      further charge.  You need not require recipients to copy the
-      Corresponding Source along with the object code.  If the place to
-      copy the object code is a network server, the Corresponding Source
-      may be on a different server (operated by you or a third party)
-      that supports equivalent copying facilities, provided you maintain
-      clear directions next to the object code saying where to find the
-      Corresponding Source.  Regardless of what server hosts the
-      Corresponding Source, you remain obligated to ensure that it is
-      available for as long as needed to satisfy these requirements.
-
-      e) Convey the object code using peer-to-peer transmission, provided
-      you inform other peers where the object code and Corresponding
-      Source of the work are being offered to the general public at no
-      charge under subsection 6d.
-
-    A separable portion of the object code, whose source code is excluded
-  from the Corresponding Source as a System Library, need not be
-  included in conveying the object code work.
-
-    A "User Product" is either (1) a "consumer product", which means any
-  tangible personal property which is normally used for personal, family,
-  or household purposes, or (2) anything designed or sold for incorporation
-  into a dwelling.  In determining whether a product is a consumer product,
-  doubtful cases shall be resolved in favor of coverage.  For a particular
-  product received by a particular user, "normally used" refers to a
-  typical or common use of that class of product, regardless of the status
-  of the particular user or of the way in which the particular user
-  actually uses, or expects or is expected to use, the product.  A product
-  is a consumer product regardless of whether the product has substantial
-  commercial, industrial or non-consumer uses, unless such uses represent
-  the only significant mode of use of the product.
-
-    "Installation Information" for a User Product means any methods,
-  procedures, authorization keys, or other information required to install
-  and execute modified versions of a covered work in that User Product from
-  a modified version of its Corresponding Source.  The information must
-  suffice to ensure that the continued functioning of the modified object
-  code is in no case prevented or interfered with solely because
-  modification has been made.
-
-    If you convey an object code work under this section in, or with, or
-  specifically for use in, a User Product, and the conveying occurs as
-  part of a transaction in which the right of possession and use of the
-  User Product is transferred to the recipient in perpetuity or for a
-  fixed term (regardless of how the transaction is characterized), the
-  Corresponding Source conveyed under this section must be accompanied
-  by the Installation Information.  But this requirement does not apply
-  if neither you nor any third party retains the ability to install
-  modified object code on the User Product (for example, the work has
-  been installed in ROM).
-
-    The requirement to provide Installation Information does not include a
-  requirement to continue to provide support service, warranty, or updates
-  for a work that has been modified or installed by the recipient, or for
-  the User Product in which it has been modified or installed.  Access to a
-  network may be denied when the modification itself materially and
-  adversely affects the operation of the network or violates the rules and
-  protocols for communication across the network.
-
-    Corresponding Source conveyed, and Installation Information provided,
-  in accord with this section must be in a format that is publicly
-  documented (and with an implementation available to the public in
-  source code form), and must require no special password or key for
-  unpacking, reading or copying.
-
-    7. Additional Terms.
-
-    "Additional permissions" are terms that supplement the terms of this
-  License by making exceptions from one or more of its conditions.
-  Additional permissions that are applicable to the entire Program shall
-  be treated as though they were included in this License, to the extent
-  that they are valid under applicable law.  If additional permissions
-  apply only to part of the Program, that part may be used separately
-  under those permissions, but the entire Program remains governed by
-  this License without regard to the additional permissions.
-
-    When you convey a copy of a covered work, you may at your option
-  remove any additional permissions from that copy, or from any part of
-  it.  (Additional permissions may be written to require their own
-  removal in certain cases when you modify the work.)  You may place
-  additional permissions on material, added by you to a covered work,
-  for which you have or can give appropriate copyright permission.
-
-    Notwithstanding any other provision of this License, for material you
-  add to a covered work, you may (if authorized by the copyright holders of
-  that material) supplement the terms of this License with terms:
-
-      a) Disclaiming warranty or limiting liability differently from the
-      terms of sections 15 and 16 of this License; or
-
-      b) Requiring preservation of specified reasonable legal notices or
-      author attributions in that material or in the Appropriate Legal
-      Notices displayed by works containing it; or
-
-      c) Prohibiting misrepresentation of the origin of that material, or
-      requiring that modified versions of such material be marked in
-      reasonable ways as different from the original version; or
-
-      d) Limiting the use for publicity purposes of names of licensors or
-      authors of the material; or
-
-      e) Declining to grant rights under trademark law for use of some
-      trade names, trademarks, or service marks; or
-
-      f) Requiring indemnification of licensors and authors of that
-      material by anyone who conveys the material (or modified versions of
-      it) with contractual assumptions of liability to the recipient, for
-      any liability that these contractual assumptions directly impose on
-      those licensors and authors.
-
-    All other non-permissive additional terms are considered "further
-  restrictions" within the meaning of section 10.  If the Program as you
-  received it, or any part of it, contains a notice stating that it is
-  governed by this License along with a term that is a further
-  restriction, you may remove that term.  If a license document contains
-  a further restriction but permits relicensing or conveying under this
-  License, you may add to a covered work material governed by the terms
-  of that license document, provided that the further restriction does
-  not survive such relicensing or conveying.
-
-    If you add terms to a covered work in accord with this section, you
-  must place, in the relevant source files, a statement of the
-  additional terms that apply to those files, or a notice indicating
-  where to find the applicable terms.
-
-    Additional terms, permissive or non-permissive, may be stated in the
-  form of a separately written license, or stated as exceptions;
-  the above requirements apply either way.
-
-    8. Termination.
-
-    You may not propagate or modify a covered work except as expressly
-  provided under this License.  Any attempt otherwise to propagate or
-  modify it is void, and will automatically terminate your rights under
-  this License (including any patent licenses granted under the third
-  paragraph of section 11).
-
-    However, if you cease all violation of this License, then your
-  license from a particular copyright holder is reinstated (a)
-  provisionally, unless and until the copyright holder explicitly and
-  finally terminates your license, and (b) permanently, if the copyright
-  holder fails to notify you of the violation by some reasonable means
-  prior to 60 days after the cessation.
-
-    Moreover, your license from a particular copyright holder is
-  reinstated permanently if the copyright holder notifies you of the
-  violation by some reasonable means, this is the first time you have
-  received notice of violation of this License (for any work) from that
-  copyright holder, and you cure the violation prior to 30 days after
-  your receipt of the notice.
-
-    Termination of your rights under this section does not terminate the
-  licenses of parties who have received copies or rights from you under
-  this License.  If your rights have been terminated and not permanently
-  reinstated, you do not qualify to receive new licenses for the same
-  material under section 10.
-
-    9. Acceptance Not Required for Having Copies.
-
-    You are not required to accept this License in order to receive or
-  run a copy of the Program.  Ancillary propagation of a covered work
-  occurring solely as a consequence of using peer-to-peer transmission
-  to receive a copy likewise does not require acceptance.  However,
-  nothing other than this License grants you permission to propagate or
-  modify any covered work.  These actions infringe copyright if you do
-  not accept this License.  Therefore, by modifying or propagating a
-  covered work, you indicate your acceptance of this License to do so.
-
-    10. Automatic Licensing of Downstream Recipients.
-
-    Each time you convey a covered work, the recipient automatically
-  receives a license from the original licensors, to run, modify and
-  propagate that work, subject to this License.  You are not responsible
-  for enforcing compliance by third parties with this License.
-
-    An "entity transaction" is a transaction transferring control of an
-  organization, or substantially all assets of one, or subdividing an
-  organization, or merging organizations.  If propagation of a covered
-  work results from an entity transaction, each party to that
-  transaction who receives a copy of the work also receives whatever
-  licenses to the work the party's predecessor in interest had or could
-  give under the previous paragraph, plus a right to possession of the
-  Corresponding Source of the work from the predecessor in interest, if
-  the predecessor has it or can get it with reasonable efforts.
-
-    You may not impose any further restrictions on the exercise of the
-  rights granted or affirmed under this License.  For example, you may
-  not impose a license fee, royalty, or other charge for exercise of
-  rights granted under this License, and you may not initiate litigation
-  (including a cross-claim or counterclaim in a lawsuit) alleging that
-  any patent claim is infringed by making, using, selling, offering for
-  sale, or importing the Program or any portion of it.
-
-    11. Patents.
-
-    A "contributor" is a copyright holder who authorizes use under this
-  License of the Program or a work on which the Program is based.  The
-  work thus licensed is called the contributor's "contributor version".
-
-    A contributor's "essential patent claims" are all patent claims
-  owned or controlled by the contributor, whether already acquired or
-  hereafter acquired, that would be infringed by some manner, permitted
-  by this License, of making, using, or selling its contributor version,
-  but do not include claims that would be infringed only as a
-  consequence of further modification of the contributor version.  For
-  purposes of this definition, "control" includes the right to grant
-  patent sublicenses in a manner consistent with the requirements of
-  this License.
-
-    Each contributor grants you a non-exclusive, worldwide, royalty-free
-  patent license under the contributor's essential patent claims, to
-  make, use, sell, offer for sale, import and otherwise run, modify and
-  propagate the contents of its contributor version.
-
-    In the following three paragraphs, a "patent license" is any express
-  agreement or commitment, however denominated, not to enforce a patent
-  (such as an express permission to practice a patent or covenant not to
-  sue for patent infringement).  To "grant" such a patent license to a
-  party means to make such an agreement or commitment not to enforce a
-  patent against the party.
-
-    If you convey a covered work, knowingly relying on a patent license,
-  and the Corresponding Source of the work is not available for anyone
-  to copy, free of charge and under the terms of this License, through a
-  publicly available network server or other readily accessible means,
-  then you must either (1) cause the Corresponding Source to be so
-  available, or (2) arrange to deprive yourself of the benefit of the
-  patent license for this particular work, or (3) arrange, in a manner
-  consistent with the requirements of this License, to extend the patent
-  license to downstream recipients.  "Knowingly relying" means you have
-  actual knowledge that, but for the patent license, your conveying the
-  covered work in a country, or your recipient's use of the covered work
-  in a country, would infringe one or more identifiable patents in that
-  country that you have reason to believe are valid.
-  
-    If, pursuant to or in connection with a single transaction or
-  arrangement, you convey, or propagate by procuring conveyance of, a
-  covered work, and grant a patent license to some of the parties
-  receiving the covered work authorizing them to use, propagate, modify
-  or convey a specific copy of the covered work, then the patent license
-  you grant is automatically extended to all recipients of the covered
-  work and works based on it.
-
-    A patent license is "discriminatory" if it does not include within
-  the scope of its coverage, prohibits the exercise of, or is
-  conditioned on the non-exercise of one or more of the rights that are
-  specifically granted under this License.  You may not convey a covered
-  work if you are a party to an arrangement with a third party that is
-  in the business of distributing software, under which you make payment
-  to the third party based on the extent of your activity of conveying
-  the work, and under which the third party grants, to any of the
-  parties who would receive the covered work from you, a discriminatory
-  patent license (a) in connection with copies of the covered work
-  conveyed by you (or copies made from those copies), or (b) primarily
-  for and in connection with specific products or compilations that
-  contain the covered work, unless you entered into that arrangement,
-  or that patent license was granted, prior to 28 March 2007.
-
-    Nothing in this License shall be construed as excluding or limiting
-  any implied license or other defenses to infringement that may
-  otherwise be available to you under applicable patent law.
-
-    12. No Surrender of Others' Freedom.
-
-    If conditions are imposed on you (whether by court order, agreement or
-  otherwise) that contradict the conditions of this License, they do not
-  excuse you from the conditions of this License.  If you cannot convey a
-  covered work so as to satisfy simultaneously your obligations under this
-  License and any other pertinent obligations, then as a consequence you may
-  not convey it at all.  For example, if you agree to terms that obligate you
-  to collect a royalty for further conveying from those to whom you convey
-  the Program, the only way you could satisfy both those terms and this
-  License would be to refrain entirely from conveying the Program.
-
-    13. Use with the GNU Affero General Public License.
-
-    Notwithstanding any other provision of this License, you have
-  permission to link or combine any covered work with a work licensed
-  under version 3 of the GNU Affero General Public License into a single
-  combined work, and to convey the resulting work.  The terms of this
-  License will continue to apply to the part which is the covered work,
-  but the special requirements of the GNU Affero General Public License,
-  section 13, concerning interaction through a network will apply to the
-  combination as such.
-
-    14. Revised Versions of this License.
-
-    The Free Software Foundation may publish revised and/or new versions of
-  the GNU General Public License from time to time.  Such new versions will
-  be similar in spirit to the present version, but may differ in detail to
-  address new problems or concerns.
-
-    Each version is given a distinguishing version number.  If the
-  Program specifies that a certain numbered version of the GNU General
-  Public License "or any later version" applies to it, you have the
-  option of following the terms and conditions either of that numbered
-  version or of any later version published by the Free Software
-  Foundation.  If the Program does not specify a version number of the
-  GNU General Public License, you may choose any version ever published
-  by the Free Software Foundation.
-
-    If the Program specifies that a proxy can decide which future
-  versions of the GNU General Public License can be used, that proxy's
-  public statement of acceptance of a version permanently authorizes you
-  to choose that version for the Program.
-
-    Later license versions may give you additional or different
-  permissions.  However, no additional obligations are imposed on any
-  author or copyright holder as a result of your choosing to follow a
-  later version.
-
-    15. Disclaimer of Warranty.
-
-    THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-  APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-  HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-  OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-  PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-  IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-  ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-    16. Limitation of Liability.
-
-    IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-  WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-  THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-  GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-  USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-  DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-  PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-  EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-  SUCH DAMAGES.
-
-    17. Interpretation of Sections 15 and 16.
-
-    If the disclaimer of warranty and limitation of liability provided
-  above cannot be given local legal effect according to their terms,
-  reviewing courts shall apply local law that most closely approximates
-  an absolute waiver of all civil liability in connection with the
-  Program, unless a warranty or assumption of liability accompanies a
-  copy of the Program in return for a fee.
-
-           END OF TERMS AND CONDITIONS
-
-        How to Apply These Terms to Your New Programs
-
-    If you develop a new program, and you want it to be of the greatest
-  possible use to the public, the best way to achieve this is to make it
-  free software which everyone can redistribute and change under these terms.
-
-    To do so, attach the following notices to the program.  It is safest
-  to attach them to the start of each source file to most effectively
-  state the exclusion of warranty; and each file should have at least
-  the "copyright" line and a pointer to where the full notice is found.
-
-      <one line to give the program's name and a brief idea of what it does.>
-      Copyright (C) <year>  <name of author>
-
-      This program is free software: you can redistribute it and/or modify
-      it under the terms of the GNU General Public License as published by
-      the Free Software Foundation, either version 3 of the License, or
-      (at your option) any later version.
-
-      This program is distributed in the hope that it will be useful,
-      but WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-      GNU General Public License for more details.
-
-      You should have received a copy of the GNU General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-  Also add information on how to contact you by electronic and paper mail.
-
-    If the program does terminal interaction, make it output a short
-  notice like this when it starts in an interactive mode:
-
-      <program>  Copyright (C) <year>  <name of author>
-      This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-      This is free software, and you are welcome to redistribute it
-      under certain conditions; type `show c' for details.
-
-  The hypothetical commands `show w' and `show c' should show the appropriate
-  parts of the General Public License.  Of course, your program's commands
-  might be different; for a GUI interface, you would use an "about box".
-
-    You should also get your employer (if you work as a programmer) or school,
-  if any, to sign a "copyright disclaimer" for the program, if necessary.
-  For more information on this, and how to apply and follow the GNU GPL, see
-  <http://www.gnu.org/licenses/>.
-
-    The GNU General Public License does not permit incorporating your program
-  into proprietary programs.  If your program is a subroutine library, you
-  may consider it more useful to permit linking proprietary applications with
-  the library.  If this is what you want to do, use the GNU Lesser General
-  Public License instead of this License.  But first, please read
-  <http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
-The complete text of the Apache 2.0 License is as follows:
-
-                                Apache License
-                          Version 2.0, January 2004
-                       http://www.apache.org/licenses/
-
-  TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-  1. Definitions.
-
-     "License" shall mean the terms and conditions for use, reproduction,
-     and distribution as defined by Sections 1 through 9 of this document.
-
-     "Licensor" shall mean the copyright owner or entity authorized by
-     the copyright owner that is granting the License.
-
-     "Legal Entity" shall mean the union of the acting entity and all
-     other entities that control, are controlled by, or are under common
-     control with that entity. For the purposes of this definition,
-     "control" means (i) the power, direct or indirect, to cause the
-     direction or management of such entity, whether by contract or
-     otherwise, or (ii) ownership of fifty percent (50%) or more of the
-     outstanding shares, or (iii) beneficial ownership of such entity.
-
-     "You" (or "Your") shall mean an individual or Legal Entity
-     exercising permissions granted by this License.
-
-     "Source" form shall mean the preferred form for making modifications,
-     including but not limited to software source code, documentation
-     source, and configuration files.
-
-     "Object" form shall mean any form resulting from mechanical
-     transformation or translation of a Source form, including but
-     not limited to compiled object code, generated documentation,
-     and conversions to other media types.
-
-     "Work" shall mean the work of authorship, whether in Source or
-     Object form, made available under the License, as indicated by a
-     copyright notice that is included in or attached to the work
-     (an example is provided in the Appendix below).
-
-     "Derivative Works" shall mean any work, whether in Source or Object
-     form, that is based on (or derived from) the Work and for which the
-     editorial revisions, annotations, elaborations, or other modifications
-     represent, as a whole, an original work of authorship. For the purposes
-     of this License, Derivative Works shall not include works that remain
-     separable from, or merely link (or bind by name) to the interfaces of,
-     the Work and Derivative Works thereof.
-
-     "Contribution" shall mean any work of authorship, including
-     the original version of the Work and any modifications or additions
-     to that Work or Derivative Works thereof, that is intentionally
-     submitted to Licensor for inclusion in the Work by the copyright owner
-     or by an individual or Legal Entity authorized to submit on behalf of
-     the copyright owner. For the purposes of this definition, "submitted"
-     means any form of electronic, verbal, or written communication sent
-     to the Licensor or its representatives, including but not limited to
-     communication on electronic mailing lists, source code control systems,
-     and issue tracking systems that are managed by, or on behalf of, the
-     Licensor for the purpose of discussing and improving the Work, but
-     excluding communication that is conspicuously marked or otherwise
-     designated in writing by the copyright owner as "Not a Contribution."
-
-     "Contributor" shall mean Licensor and any individual or Legal Entity
-     on behalf of whom a Contribution has been received by Licensor and
-     subsequently incorporated within the Work.
-
-  2. Grant of Copyright License. Subject to the terms and conditions of
-     this License, each Contributor hereby grants to You a perpetual,
-     worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-     copyright license to reproduce, prepare Derivative Works of,
-     publicly display, publicly perform, sublicense, and distribute the
-     Work and such Derivative Works in Source or Object form.
-
-  3. Grant of Patent License. Subject to the terms and conditions of
-     this License, each Contributor hereby grants to You a perpetual,
-     worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-     (except as stated in this section) patent license to make, have made,
-     use, offer to sell, sell, import, and otherwise transfer the Work,
-     where such license applies only to those patent claims licensable
-     by such Contributor that are necessarily infringed by their
-     Contribution(s) alone or by combination of their Contribution(s)
-     with the Work to which such Contribution(s) was submitted. If You
-     institute patent litigation against any entity (including a
-     cross-claim or counterclaim in a lawsuit) alleging that the Work
-     or a Contribution incorporated within the Work constitutes direct
-     or contributory patent infringement, then any patent licenses
-     granted to You under this License for that Work shall terminate
-     as of the date such litigation is filed.
-
-  4. Redistribution. You may reproduce and distribute copies of the
-     Work or Derivative Works thereof in any medium, with or without
-     modifications, and in Source or Object form, provided that You
-     meet the following conditions:
-
-     (a) You must give any other recipients of the Work or
-         Derivative Works a copy of this License; and
-
-     (b) You must cause any modified files to carry prominent notices
-         stating that You changed the files; and
-
-     (c) You must retain, in the Source form of any Derivative Works
-         that You distribute, all copyright, patent, trademark, and
-         attribution notices from the Source form of the Work,
-         excluding those notices that do not pertain to any part of
-         the Derivative Works; and
-
-     (d) If the Work includes a "NOTICE" text file as part of its
-         distribution, then any Derivative Works that You distribute must
-         include a readable copy of the attribution notices contained
-         within such NOTICE file, excluding those notices that do not
-         pertain to any part of the Derivative Works, in at least one
-         of the following places: within a NOTICE text file distributed
-         as part of the Derivative Works; within the Source form or
-         documentation, if provided along with the Derivative Works; or,
-         within a display generated by the Derivative Works, if and
-         wherever such third-party notices normally appear. The contents
-         of the NOTICE file are for informational purposes only and
-         do not modify the License. You may add Your own attribution
-         notices within Derivative Works that You distribute, alongside
-         or as an addendum to the NOTICE text from the Work, provided
-         that such additional attribution notices cannot be construed
-         as modifying the License.
-
-     You may add Your own copyright statement to Your modifications and
-     may provide additional or different license terms and conditions
-     for use, reproduction, or distribution of Your modifications, or
-     for any such Derivative Works as a whole, provided Your use,
-     reproduction, and distribution of the Work otherwise complies with
-     the conditions stated in this License.
-
-  5. Submission of Contributions. Unless You explicitly state otherwise,
-     any Contribution intentionally submitted for inclusion in the Work
-     by You to the Licensor shall be under the terms and conditions of
-     this License, without any additional terms or conditions.
-     Notwithstanding the above, nothing herein shall supersede or modify
-     the terms of any separate license agreement you may have executed
-     with Licensor regarding such Contributions.
-
-  6. Trademarks. This License does not grant permission to use the trade
-     names, trademarks, service marks, or product names of the Licensor,
-     except as required for reasonable and customary use in describing the
-     origin of the Work and reproducing the content of the NOTICE file.
-
-  7. Disclaimer of Warranty. Unless required by applicable law or
-     agreed to in writing, Licensor provides the Work (and each
-     Contributor provides its Contributions) on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-     implied, including, without limitation, any warranties or conditions
-     of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-     PARTICULAR PURPOSE. You are solely responsible for determining the
-     appropriateness of using or redistributing the Work and assume any
-     risks associated with Your exercise of permissions under this License.
-
-  8. Limitation of Liability. In no event and under no legal theory,
-     whether in tort (including negligence), contract, or otherwise,
-     unless required by applicable law (such as deliberate and grossly
-     negligent acts) or agreed to in writing, shall any Contributor be
-     liable to You for damages, including any direct, indirect, special,
-     incidental, or consequential damages of any character arising as a
-     result of this License or out of the use or inability to use the
-     Work (including but not limited to damages for loss of goodwill,
-     work stoppage, computer failure or malfunction, or any and all
-     other commercial damages or losses), even if such Contributor
-     has been advised of the possibility of such damages.
-
-  9. Accepting Warranty or Additional Liability. While redistributing
-     the Work or Derivative Works thereof, You may choose to offer,
-     and charge a fee for, acceptance of support, warranty, indemnity,
-     or other liability obligations and/or rights consistent with this
-     License. However, in accepting such obligations, You may act only
-     on Your own behalf and on Your sole responsibility, not on behalf
-     of any other Contributor, and only if You agree to indemnify,
-     defend, and hold each Contributor harmless for any liability
-     incurred by, or claims asserted against, such Contributor by reason
-     of your accepting any such warranty or additional liability.
-
-  END OF TERMS AND CONDITIONS
-
-  APPENDIX: How to apply the Apache License to your work.
-
-     To apply the Apache License to your work, attach the following
-     boilerplate notice, with the fields enclosed by brackets "[]"
-     replaced with your own identifying information. (Don't include
-     the brackets!)  The text should be enclosed in the appropriate
-     comment syntax for the file format. We also recommend that a
-     file or class name and description of purpose be included on the
-     same "printed page" as the copyright notice for easier
-     identification within third-party archives.
-
-  Copyright [yyyy] [name of copyright owner]
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-The complete text of the BSD license can be is as follows:
-
-  Copyright (c) The Regents of the University of California.
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-  3. Neither the name of the University nor the names of its contributors
-     may be used to endorse or promote products derived from this software
-     without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-  SUCH DAMAGE.
-
-The complete text of the Apache Software License Version 1.1 is as follows:
-
- /*                                      
-  * ================================================================
-  *                   The Apache Software License, Version 1.1
-  * ================================================================
-  * 
-  *    Copyright (C) 2000-2002 The Apache Software Foundation. All
-  *    rights reserved.
-  * 
-  * Redistribution and use in source and binary forms, with or without 
-  * modification, are permitted provided that the following
-  * conditions are met:
-  * 
-  * 1. Redistributions of  source code must  retain the above copyright
-  *    notice, this list of conditions and the following disclaimer.
-  * 
-  * 2. Redistributions in binary form must reproduce the above copyright
-  *    notice, this list of conditions and the following disclaimer in
-  *    the documentation and/or other materials provided with the 
-  *    distribution.
-  * 
-  * 3. The end-user documentation included with the redistribution, if
-  *    any, must include  the following  acknowledgment:  "This product
-  *    includes  software developed  by the  Apache Software Foundation
-  *    (http://www.apache.org/)." Alternately, this  acknowledgment may
-  *    appear in the software itself, if and wherever such third-party
-  *    acknowledgments normally appear.
-  * 
-  * 4. The names "Ant" and  "Apache Software Foundation" must not be
-  *    used to endorse  or promote  products derived  from this software
-  *    without prior written permission. For written permission, please
-  *    contact apache@apache.org.
-  * 
-  * 5. Products derived from this software may not  be called "Apache",
-  *    nor may "Apache" appear  in their name,  without prior written
-  *    permission of the Apache Software Foundation.
-  * 
-  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
-  * OF MERCHANTABILITY AND FITNESS  FOR A PARTICULAR PURPOSE ARE 
-  * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION
-  * OR ITS CONTRIBUTORS BE LIABLE FOR  ANY DIRECT, INDIRECT, INCIDENTAL,
-  * SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLUDING, BUT NOT
-  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  * DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
-  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-  * TORT (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN ANY WAY OUT
-  * OF THE  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-  * OF SUCH DAMAGE.
-  * 
-  * This software  consists of voluntary contributions made by many
-  * individuals on behalf of the  Apache Software Foundation. For more
-  * information on the Apache Software Foundation, please see
-  * <http://www.apache.org/>.
-  *
-  */
-
-The complete text of the MIT license is as follows:
-
-  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.
-
-The complete text of the Eclipse Public License v1.0 is as follows:
-
-  Eclipse Public License - v 1.0
-  
-  THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
-  LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-  CONSTITUTES RECIPIENT’S ACCEPTANCE OF THIS AGREEMENT.
-  
-  1. DEFINITIONS
-  
-  "Contribution" means:
-  
-  a) in the case of the initial Contributor, the initial code and documentation
-  distributed under this Agreement, and
-  b) in the case of each subsequent Contributor:
-  
-  i) changes to the Program, and
-  
-  ii) additions to the Program;
-  
-  where such changes and/or additions to the Program originate from and are
-  distributed by that particular Contributor. A Contribution 'originates' from a
-  Contributor if it was added to the Program by such Contributor itself or anyone
-  acting on such Contributor’s behalf. Contributions do not include additions to
-  the Program which: (i) are separate modules of software distributed in
-  conjunction with the Program under their own license agreement, and (ii) are not
-  derivative works of the Program.
-  
-  "Contributor" means any person or entity that distributes the Program.
-  
-  "Licensed Patents " mean patent claims licensable by a Contributor which are
-  necessarily infringed by the use or sale of its Contribution alone or when
-  combined with the Program.
-  
-  "Program" means the Contributions distributed in accordance with this Agreement.
-  
-  "Recipient" means anyone who receives the Program under this Agreement,
-  including all Contributors.
-  
-  2. GRANT OF RIGHTS
-  
-  a) Subject to the terms of this Agreement, each Contributor hereby grants
-  Recipient a non-exclusive, worldwide, royalty-free copyright license to
-  reproduce, prepare derivative works of, publicly display, publicly perform,
-  distribute and sublicense the Contribution of such Contributor, if any, and such
-  derivative works, in source code and object code form.
-  
-  b) Subject to the terms of this Agreement, each Contributor hereby grants
-  Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
-  Patents to make, use, sell, offer to sell, import and otherwise transfer the
-  Contribution of such Contributor, if any, in source code and object code form.
-  This patent license shall apply to the combination of the Contribution and the
-  Program if, at the time the Contribution is added by the Contributor, such
-  addition of the Contribution causes such combination to be covered by the
-  Licensed Patents. The patent license shall not apply to any other combinations
-  which include the Contribution. No hardware per se is licensed hereunder.
-  
-  c) Recipient understands that although each Contributor grants the licenses to
-  its Contributions set forth herein, no assurances are provided by any
-  Contributor that the Program does not infringe the patent or other intellectual
-  property rights of any other entity. Each Contributor disclaims any liability to
-  Recipient for claims brought by any other entity based on infringement of
-  intellectual property rights or otherwise. As a condition to exercising the
-  rights and licenses granted hereunder, each Recipient hereby assumes sole
-  responsibility to secure any other intellectual property rights needed, if any.
-  For example, if a third party patent license is required to allow Recipient to
-  distribute the Program, it is Recipient’s responsibility to acquire that license
-  before distributing the Program.
-  
-  d) Each Contributor represents that to its knowledge it has sufficient copyright
-  rights in its Contribution, if any, to grant the copyright license set forth in
-  this Agreement.
-  
-  3. REQUIREMENTS
-  
-  A Contributor may choose to distribute the Program in object code form under its
-  own license agreement, provided that:
-  
-  a) it complies with the terms and conditions of this Agreement; and
-  
-  b) its license agreement:
-  
-  i) effectively disclaims on behalf of all Contributors all warranties and
-  conditions, express and implied, including warranties or conditions of title and
-  non-infringement, and implied warranties or conditions of merchantability and
-  fitness for a particular purpose;
-  
-  ii) effectively excludes on behalf of all Contributors all liability for
-  damages, including direct, indirect, special, incidental and consequential
-  damages, such as lost profits;
-  
-  iii) states that any provisions which differ from this Agreement are offered by
-  that Contributor alone and not by any other party; and
-  
-  iv) states that source code for the Program is available from such Contributor,
-  and informs licensees how to obtain it in a reasonable manner on or through a
-  medium customarily used for software exchange.
-  
-  When the Program is made available in source code form:
-  
-  a) it must be made available under this Agreement; and
-  b) a copy of this Agreement must be included with each copy of the Program.
-  
-  Contributors may not remove or alter any copyright notices contained within the
-  Program.
-  
-  Each Contributor must identify itself as the originator of its Contribution, if
-  any, in a manner that reasonably allows subsequent Recipients to identify the
-  originator of the Contribution.
-  
-  4. COMMERCIAL DISTRIBUTION
-  
-  Commercial distributors of software may accept certain responsibilities with
-  respect to end users, business partners and the like. While this license is
-  intended to facilitate the commercial use of the Program, the Contributor who
-  includes the Program in a commercial product offering should do so in a manner
-  which does not create potential liability for other Contributors. Therefore, if
-  a Contributor includes the Program in a commercial product offering, such
-  Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-  every other Contributor ("Indemnified Contributor") against any losses, damages
-  and costs (collectively "Losses") arising from claims, lawsuits and other legal
-  actions brought by a third party against the Indemnified Contributor to the
-  extent caused by the acts or omissions of such Commercial Contributor in
-  connection with its distribution of the Program in a commercial product
-  offering. The obligations in this section do not apply to any claims or Losses
-  relating to any actual or alleged intellectual property infringement. In order
-  to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-  Contributor in writing of such claim, and b) allow the Commercial Contributor to
-  control, and cooperate with the Commercial Contributor in, the defense and any
-  related settlement negotiations. The Indemnified Contributor may participate in
-  any such claim at its own expense.
-  
-  For example, a Contributor might include the Program in a commercial product
-  offering, Product X. That Contributor is then a Commercial Contributor. If that
-  Commercial Contributor then makes performance claims, or offers warranties
-  related to Product X, those performance claims and warranties are such
-  Commercial Contributor’s responsibility alone. Under this section, the
-  Commercial Contributor would have to defend claims against the other
-  Contributors related to those performance claims and warranties, and if a court
-  requires any other Contributor to pay any damages as a result, the Commercial
-  Contributor must pay those damages.
-  
-  5. NO WARRANTY
-  
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-  IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-  NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-  Recipient is solely responsible for determining the appropriateness of using and
-  distributing the Program and assumes all risks associated with its exercise of
-  rights under this Agreement , including but not limited to the risks and costs
-  of program errors, compliance with applicable laws, damage to or loss of data,
-  programs or equipment, and unavailability or interruption of operations.
-  
-  6. DISCLAIMER OF LIABILITY
-  
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-  CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-  PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-  OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-  GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-  
-  7. GENERAL
-  
-  If any provision of this Agreement is invalid or unenforceable under applicable
-  law, it shall not affect the validity or enforceability of the remainder of the
-  terms of this Agreement, and without further action by the parties hereto, such
-  provision shall be reformed to the minimum extent necessary to make such
-  provision valid and enforceable.
-  
-  If Recipient institutes patent litigation against any entity (including a
-  cross-claim or counterclaim in a lawsuit) alleging that the Program itself
-  (excluding combinations of the Program with other software or hardware)
-  infringes such Recipient’s patent(s), then such Recipient’s rights granted under
-  Section 2(b) shall terminate as of the date such litigation is filed.
-  
-  All Recipient’s rights under this Agreement shall terminate if it fails to
-  comply with any of the material terms or conditions of this Agreement and does
-  not cure such failure in a reasonable period of time after becoming aware of
-  such noncompliance. If all Recipient’s rights under this Agreement terminate,
-  Recipient agrees to cease use and distribution of the Program as soon as
-  reasonably practicable. However, Recipient’s obligations under this Agreement
-  and any licenses granted by Recipient relating to the Program shall continue and
-  survive.
-  
-  Everyone is permitted to copy and distribute copies of this Agreement, but in
-  order to avoid inconsistency the Agreement is copyrighted and may only be
-  modified in the following manner. The Agreement Steward reserves the right to
-  publish new versions (including revisions) of this Agreement from time to time.
-  No one other than the Agreement Steward has the right to modify this Agreement.
-  The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation
-  may assign the responsibility to serve as the Agreement Steward to a suitable
-  separate entity. Each new version of the Agreement will be given a
-  distinguishing version number. The Program (including Contributions) may always
-  be distributed subject to the version of the Agreement under which it was
-  received. In addition, after a new version of the Agreement is published,
-  Contributor may elect to distribute the Program (including its Contributions)
-  under the new version. Except as expressly stated in Sections 2(a) and 2(b)
-  above, Recipient receives no rights or licenses to the intellectual property of
-  any Contributor under this Agreement, whether expressly, by implication,
-  estoppel or otherwise. All rights in the Program not expressly granted under
-  this Agreement are reserved.
-  
-  This Agreement is governed by the laws of the State of New York and the
-  intellectual property laws of the United States of America. No party to this
-  Agreement will bring a legal action under this Agreement more than one year
-  after the cause of action arose. Each party waives its rights to a jury trial in
-  any resulting litigation.
diff --git a/tools/dependencies-report/src/main/resources/notices/cabin-0.9.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/cabin-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/cabin-0.9.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/cabin-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/cgi-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/cgi-NOTICE.txt
new file mode 100644
index 000000000..44d33b0b5
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/cgi-NOTICE.txt
@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/childprocess-0.9.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/childprocess-0.9.0-NOTICE.txt
deleted file mode 100644
index 50cfbaec2..000000000
--- a/tools/dependencies-report/src/main/resources/notices/childprocess-0.9.0-NOTICE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2010-2015 Jari Bakken
-
-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.
diff --git a/tools/dependencies-report/src/main/resources/notices/chronic_duration-0.10.6-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/chronic_duration-0.10.6-NOTICE.txt
deleted file mode 100644
index 275a7f061..000000000
--- a/tools/dependencies-report/src/main/resources/notices/chronic_duration-0.10.6-NOTICE.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) Henry Poydar
-
-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.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/clamp-0.6.5-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/clamp-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/clamp-0.6.5-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/clamp-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/coderay-1.1.2-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/coderay-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/coderay-1.1.2-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/coderay-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.core!jackson-annotations-2.9.5-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.core!jackson-annotations-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.core!jackson-annotations-2.9.5-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.core!jackson-annotations-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.core!jackson-core-2.9.5-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.core!jackson-core-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.core!jackson-core-2.9.5-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.core!jackson-core-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.core!jackson-databind-2.9.5-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.core!jackson-databind-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.core!jackson-databind-2.9.5-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.core!jackson-databind-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.dataformat!jackson-dataformat-cbor-2.9.5-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.dataformat!jackson-dataformat-cbor-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.dataformat!jackson-dataformat-cbor-2.9.5-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.dataformat!jackson-dataformat-cbor-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.module!jackson-module-afterburner-2.9.5-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.dataformat!jackson-dataformat-yaml-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.module!jackson-module-afterburner-2.9.5-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.dataformat!jackson-dataformat-yaml-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.module!jackson-module-afterburner-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.module!jackson-module-afterburner-NOTICE.txt
new file mode 100644
index 000000000..b078e9643
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/com.fasterxml.jackson.module!jackson-module-afterburner-NOTICE.txt
@@ -0,0 +1,211 @@
+This copy of Jackson JSON processor databind module is licensed under the
+Apache (Software) License, version 2.0 ("the License").
+See the License for details about distribution rights, and the
+specific rights regarding derivate works.
+
+You may obtain a copy of the License at:
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/com.google.code.findbugs!jsr305-1.3.9-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/com.google.code.findbugs!jsr305-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/com.google.code.findbugs!jsr305-1.3.9-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/com.google.code.findbugs!jsr305-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/com.google.errorprone!error_prone_annotations-2.0.18-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/com.google.errorprone!error_prone_annotations-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/com.google.errorprone!error_prone_annotations-2.0.18-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/com.google.errorprone!error_prone_annotations-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/com.google.googlejavaformat!google-java-format-1.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/com.google.googlejavaformat!google-java-format-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/com.google.googlejavaformat!google-java-format-1.1-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/com.google.googlejavaformat!google-java-format-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/com.google.guava!guava-22.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/com.google.guava!guava-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/com.google.guava!guava-22.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/com.google.guava!guava-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/com.google.j2objc!j2objc-annotations-1.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/com.google.j2objc!j2objc-annotations-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/com.google.j2objc!j2objc-annotations-1.1-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/com.google.j2objc!j2objc-annotations-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/commons-codec!commons-codec-1.11-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/commons-codec!commons-codec-1.11-NOTICE.txt
deleted file mode 100644
index 186b540cc..000000000
--- a/tools/dependencies-report/src/main/resources/notices/commons-codec!commons-codec-1.11-NOTICE.txt
+++ /dev/null
@@ -1,220 +0,0 @@
-Apache Commons Codec
-Copyright 2002-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
-contains test data from http://aspell.net/test/orig/batch0.tab.
-Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org)
-
-===============================================================================
-
-The content of package org.apache.commons.codec.language.bm has been translated
-from the original php source code available at http://stevemorse.org/phoneticinfo.htm
-with permission from the original authors.
-Original source copyright:
-Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
-
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/commons-codec!commons-codec-1.10.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/commons-codec!commons-codec-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/commons-codec!commons-codec-1.10.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/commons-codec!commons-codec-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/commons-logging!commons-logging-1.2.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/commons-logging!commons-logging-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/commons-logging!commons-logging-1.2.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/commons-logging!commons-logging-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/concurrent-ruby-1.0.5-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/concurrent-ruby-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/concurrent-ruby-1.0.5-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/concurrent-ruby-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/controls.js-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/controls.js-NOTICE.txt
deleted file mode 100644
index 929c05d72..000000000
--- a/tools/dependencies-report/src/main/resources/notices/controls.js-NOTICE.txt
+++ /dev/null
@@ -1 +0,0 @@
-404: Not Found
diff --git a/tools/dependencies-report/src/main/resources/notices/crack-0.4.3-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/crack-0.4.3-NOTICE.txt
deleted file mode 100644
index fbbebe148..000000000
--- a/tools/dependencies-report/src/main/resources/notices/crack-0.4.3-NOTICE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2009 John Nunemaker
-
-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.
diff --git a/tools/dependencies-report/src/main/resources/notices/csv-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/csv-NOTICE.txt
new file mode 100644
index 000000000..5fd9d8afb
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/csv-NOTICE.txt
@@ -0,0 +1,33 @@
+Copyright (C) 2005-2016 James Edward Gray II. All rights reserved.
+Copyright (C) 2007-2017 Yukihiro Matsumoto. All rights reserved.
+Copyright (C) 2017 SHIBATA Hiroshi. All rights reserved.
+Copyright (C) 2017 Olivier Lacan. All rights reserved.
+Copyright (C) 2017 Espartaco Palma. All rights reserved.
+Copyright (C) 2017 Marcus Stollsteimer. All rights reserved.
+Copyright (C) 2017 pavel. All rights reserved.
+Copyright (C) 2017-2018 Steven Daniels. All rights reserved.
+Copyright (C) 2018 Tomohiro Ogoke. All rights reserved.
+Copyright (C) 2018 Kouhei Sutou. All rights reserved.
+Copyright (C) 2018 Mitsutaka Mimura. All rights reserved.
+Copyright (C) 2018 Vladislav. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/dalli-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/dalli-NOTICE.txt
new file mode 100644
index 000000000..51c00933c
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/dalli-NOTICE.txt
@@ -0,0 +1,20 @@
+Copyright (c) Peter M. Goldstein, Mike Perham
+
+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.
diff --git a/tools/dependencies-report/src/main/resources/notices/date-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/date-NOTICE.txt
new file mode 100644
index 000000000..44d33b0b5
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/date-NOTICE.txt
@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/diff-lcs-1.3-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/diff-lcs-1.3-NOTICE.txt
deleted file mode 100644
index c0ffb22b7..000000000
--- a/tools/dependencies-report/src/main/resources/notices/diff-lcs-1.3-NOTICE.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright 2004–2013 Austin Ziegler.
-
-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.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/diff-lcs-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/diff-lcs-NOTICE.txt
new file mode 100644
index 000000000..798032f77
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/diff-lcs-NOTICE.txt
@@ -0,0 +1,41 @@
+source: https://github.com/halostatue/diff-lcs/blob/v1.5.0/License.md
+
+== License
+
+This software is available under three licenses: the GNU GPL version 2 (or at
+your option, a later version), the Perl Artistic license, or the MIT license.
+Note that my preference for licensing is the MIT license, but Algorithm::Diff
+was dually originally licensed with the Perl Artistic and the GNU GPL ("the
+same terms as Perl itself") and given that the Ruby implementation originally
+hewed pretty closely to the Perl version, I must maintain the additional
+licensing terms.
+
+* Copyright 2004–2013 Austin Ziegler.
+* Adapted from Algorithm::Diff (Perl) by Ned Konz and a Smalltalk version by
+  Mario I. Wolczko.
+
+=== MIT License
+
+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.
+
+=== Perl Artistic License (version 2)
+See the file docs/artistic.txt in the main distribution.
+
+=== GNU GPL version 2
+See the file docs/COPYING.txt in the main distribution.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/domain_name-0.5.20180417-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/domain_name-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/domain_name-0.5.20180417-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/domain_name-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/dotenv-2.5.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/dotenv-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/dotenv-2.5.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/dotenv-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/down-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/down-NOTICE.txt
new file mode 100644
index 000000000..12ad42a8b
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/down-NOTICE.txt
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Janko Marohnić
+
+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.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/e2mmap-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/e2mmap-NOTICE.txt
new file mode 100644
index 000000000..7fc04232c
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/e2mmap-NOTICE.txt
@@ -0,0 +1,24 @@
+source: https://github.com/ruby/e2mmap/blob/master/LICENSE.txt
+
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/edn-1.1.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/edn-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/edn-1.1.1-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/edn-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/elastic-app-search-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/elastic-app-search-NOTICE.txt
new file mode 100644
index 000000000..de1008a58
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/elastic-app-search-NOTICE.txt
@@ -0,0 +1,5 @@
+source: https://github.com/elastic/app-search-ruby/blob/v7.8.0/NOTICE.txt
+
+Elastic App Search Ruby client.
+
+Copyright 2012-2019 Elasticsearch B.V.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/elastic-enterprise-search-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/elastic-enterprise-search-NOTICE.txt
new file mode 100644
index 000000000..b4fe897ab
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/elastic-enterprise-search-NOTICE.txt
@@ -0,0 +1,204 @@
+source: https://github.com/elastic/enterprise-search-ruby/blob/v7.16.0/LICENSE
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/elastic-transport-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/elastic-transport-NOTICE.txt
new file mode 100644
index 000000000..5f485fd05
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/elastic-transport-NOTICE.txt
@@ -0,0 +1,204 @@
+source: https://github.com/elastic/elastic-transport-ruby/blob/v8.3.0/LICENSE
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/elastic-workplace-search-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/elastic-workplace-search-NOTICE.txt
new file mode 100644
index 000000000..b1606fa1b
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/elastic-workplace-search-NOTICE.txt
@@ -0,0 +1,5 @@
+source: https://github.com/elastic/workplace-search-ruby/blob/master/NOTICE.txt
+
+Elastic Workplace Search Ruby client.
+
+Copyright 2012-2020 Elasticsearch B.V.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/elasticsearch-5.0.5-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/elasticsearch-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/elasticsearch-5.0.5-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/elasticsearch-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/elasticsearch-api-5.0.5-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/elasticsearch-api-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/elasticsearch-api-5.0.5-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/elasticsearch-api-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/elasticsearch-transport-5.0.5-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/elasticsearch-transport-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/elasticsearch-transport-5.0.5-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/elasticsearch-transport-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/equalizer-0.0.10-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/equalizer-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/equalizer-0.0.10-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/equalizer-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/et-orbi-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/et-orbi-NOTICE.txt
new file mode 100644
index 000000000..79b5f7fc3
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/et-orbi-NOTICE.txt
@@ -0,0 +1,24 @@
+source: https://github.com/floraison/et-orbi/blob/v1.2.7/LICENSE.txt
+
+Copyright (c) 2017-2022, John Mettraux, jmettraux+flor@gmail.com
+
+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.
+
+
+Made in Japan
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/faraday-0.9.2-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/faraday-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/faraday-0.9.2-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/faraday-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/faraday-em_http-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/faraday-em_http-NOTICE.txt
new file mode 100644
index 000000000..ec0e08ff9
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/faraday-em_http-NOTICE.txt
@@ -0,0 +1,12 @@
+source: https://github.com/lostisland/faraday-em_http/blob/v1.0.0/LICENSE.md
+
+The MIT License (MIT)
+
+Copyright (c) 2020 Jan van der Pas
+
+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.
+
diff --git a/tools/dependencies-report/src/main/resources/notices/faraday-em_synchrony-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/faraday-em_synchrony-NOTICE.txt
new file mode 100644
index 000000000..bccef13dc
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/faraday-em_synchrony-NOTICE.txt
@@ -0,0 +1,13 @@
+source: https://github.com/lostisland/faraday-em_synchrony/blob/v1.0.0/LICENSE.md
+
+
+The MIT License (MIT)
+
+Copyright (c) 2020 Jan van der Pas
+
+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.
+
diff --git a/tools/dependencies-report/src/main/resources/notices/faraday-excon-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/faraday-excon-NOTICE.txt
new file mode 100644
index 000000000..ecc828f40
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/faraday-excon-NOTICE.txt
@@ -0,0 +1,13 @@
+source: https://github.com/lostisland/faraday-excon/blob/v1.0.0/LICENSE.md
+
+
+The MIT License (MIT)
+
+Copyright (c) 2020 Jan van der Pas
+
+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.
+
diff --git a/tools/dependencies-report/src/main/resources/notices/faraday-httpclient-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/faraday-httpclient-NOTICE.txt
new file mode 100644
index 000000000..a6379e78e
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/faraday-httpclient-NOTICE.txt
@@ -0,0 +1,13 @@
+sourcE: https://github.com/lostisland/faraday-httpclient/blob/v1.0/LICENSE.md
+
+
+The MIT License (MIT)
+
+Copyright (c) 2020 Jan van der Pas
+
+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.
+
diff --git a/tools/dependencies-report/src/main/resources/notices/faraday-multipart-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/faraday-multipart-NOTICE.txt
new file mode 100644
index 000000000..089e33125
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/faraday-multipart-NOTICE.txt
@@ -0,0 +1,13 @@
+source: https://github.com/lostisland/faraday-multipart/blob/v1.0.3/LICENSE.md
+
+
+The MIT License (MIT)
+
+Copyright (c) 2020 Jan van der Pas
+
+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.
+
diff --git a/tools/dependencies-report/src/main/resources/notices/faraday-net_http-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/faraday-net_http-NOTICE.txt
new file mode 100644
index 000000000..1b11bedd7
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/faraday-net_http-NOTICE.txt
@@ -0,0 +1,12 @@
+source: https://github.com/lostisland/faraday-net_http/blob/v1.0.0/LICENSE.md
+
+The MIT License (MIT)
+
+Copyright (c) 2020 Jan van der Pas
+
+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.
+
diff --git a/tools/dependencies-report/src/main/resources/notices/faraday-net_http_persistent-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/faraday-net_http_persistent-NOTICE.txt
new file mode 100644
index 000000000..e6ffe5d47
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/faraday-net_http_persistent-NOTICE.txt
@@ -0,0 +1,12 @@
+source: https://github.com/lostisland/faraday-net_http_persistent/blob/v1.0.0/LICENSE.md
+
+The MIT License (MIT)
+
+Copyright (c) 2020 Jan van der Pas
+
+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.
+
diff --git a/tools/dependencies-report/src/main/resources/notices/faraday-patron-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/faraday-patron-NOTICE.txt
new file mode 100644
index 000000000..f1282ff78
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/faraday-patron-NOTICE.txt
@@ -0,0 +1,11 @@
+source: https://github.com/lostisland/faraday-patron/blob/v1.0/LICENSE.md
+
+The MIT License (MIT)
+
+Copyright (c) 2020 Jan van der Pas
+
+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.
diff --git a/tools/dependencies-report/src/main/resources/notices/faraday-rack-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/faraday-rack-NOTICE.txt
new file mode 100644
index 000000000..8d08f08f3
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/faraday-rack-NOTICE.txt
@@ -0,0 +1,11 @@
+source: https://github.com/lostisland/faraday-rack/blob/v1.0.0/LICENSE.md
+
+The MIT License (MIT)
+
+Copyright (c) 2020 Jan van der Pas
+
+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.
diff --git a/tools/dependencies-report/src/main/resources/notices/faraday-retry-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/faraday-retry-NOTICE.txt
new file mode 100644
index 000000000..8eb886ffd
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/faraday-retry-NOTICE.txt
@@ -0,0 +1,13 @@
+source: https://github.com/lostisland/faraday-retry/blob/v1.0.3/LICENSE.md
+
+
+The MIT License (MIT)
+
+Copyright (c) 2020 Jan van der Pas
+
+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.
+
diff --git a/tools/dependencies-report/src/main/resources/notices/ffi-1.9.25-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/ffi-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/ffi-1.9.25-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/ffi-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/ffi-binary-libfixposix-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/ffi-binary-libfixposix-NOTICE.txt
new file mode 100644
index 000000000..4981c19c0
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/ffi-binary-libfixposix-NOTICE.txt
@@ -0,0 +1,58 @@
+source: https://github.com/byteit101/subspawn/blob/lfp-0.5.1.1/LICENSE.RUBY
+
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
+You can redistribute it and/or modify it under either the terms of the
+2-clause BSDL (see the file BSDL), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
+
+       a) distribute the binaries and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under these terms.
+
+     For the list of those files and their copying conditions, see the
+     file LEGAL.
+
+  5. The scripts and library files supplied as input to or produced as
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them,
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/filesize-0.0.4-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/filesize-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/filesize-0.0.4-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/filesize-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/fileutils-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/fileutils-NOTICE.txt
new file mode 100644
index 000000000..44d33b0b5
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/fileutils-NOTICE.txt
@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/filewatch-0.9.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/filewatch-0.9.0-NOTICE.txt
deleted file mode 100644
index 663792949..000000000
--- a/tools/dependencies-report/src/main/resources/notices/filewatch-0.9.0-NOTICE.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-https://github.com/jordansissel/ruby-filewatch/blob/master/LICENSE
-
-License is MIT (very permissive).
diff --git a/tools/dependencies-report/src/main/resources/notices/ftw-0.0.48-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/ftw-0.0.48-NOTICE.txt
deleted file mode 100644
index d94e000d4..000000000
--- a/tools/dependencies-report/src/main/resources/notices/ftw-0.0.48-NOTICE.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-source: https://github.com/jordansissel/ruby-ftw/blob/master/ftw.gemspec#L19
-
-Apache License (2.0)
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/fugit-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/fugit-NOTICE.txt
new file mode 100644
index 000000000..7be9b692a
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/fugit-NOTICE.txt
@@ -0,0 +1,24 @@
+source: https://github.com/floraison/fugit/blob/v1.5.2/LICENSE.txt
+
+Copyright (c) 2017-2021, John Mettraux, jmettraux+flor@gmail.com
+
+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.
+
+
+Made in Japan
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/gelf-3.0.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/gelf-3.0.0-NOTICE.txt
deleted file mode 100644
index fe6c6e577..000000000
--- a/tools/dependencies-report/src/main/resources/notices/gelf-3.0.0-NOTICE.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-source: https://github.com/graylog-labs/gelf-rb/blob/v3.0.0/LICENSE
-
-Copyright (c) 2010-2016 Lennart Koopmann, Alexey Palazhchenko
-
-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.
diff --git a/tools/dependencies-report/src/main/resources/notices/gelfd-0.2.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/gelfd-0.2.0-NOTICE.txt
deleted file mode 100644
index b0b282e64..000000000
--- a/tools/dependencies-report/src/main/resources/notices/gelfd-0.2.0-NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-source: https://github.com/lusis/gelfd/blob/master/LICENSE
-
-Copyright 2011-2013 John E. Vincent and contributors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
diff --git a/tools/dependencies-report/src/main/resources/notices/gelfd2-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/gelfd2-NOTICE.txt
new file mode 100644
index 000000000..3d140d170
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/gelfd2-NOTICE.txt
@@ -0,0 +1,13 @@
+Copyright 2011-2013 John E. Vincent and contributors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/gems-0.8.3-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/gems-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/gems-0.8.3-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/gems-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/gene_pool-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/gene_pool-NOTICE.txt
new file mode 100644
index 000000000..a51d36247
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/gene_pool-NOTICE.txt
@@ -0,0 +1,20 @@
+Copyright (c) 2010-2011 Brad Pardee
+
+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.
diff --git a/tools/dependencies-report/src/main/resources/notices/gmetric-0.1.3-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/gmetric-0.1.3-NOTICE.txt
deleted file mode 100644
index da1b45b15..000000000
--- a/tools/dependencies-report/src/main/resources/notices/gmetric-0.1.3-NOTICE.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-source: https://github.com/igrigorik/gmetric/blob/master/README.md
-
-The MIT License, Copyright (c) 2009 Ilya Grigorik
diff --git a/tools/dependencies-report/src/main/resources/notices/gradle.plugin.com.github.jk1!gradle-license-report-0.7.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/gradle.plugin.com.github.jk1!gradle-license-report-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/gradle.plugin.com.github.jk1!gradle-license-report-0.7.1-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/gradle.plugin.com.github.jk1!gradle-license-report-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/gserver-0.0.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/gserver-0.0.1-NOTICE.txt
deleted file mode 100644
index d38b8ff5b..000000000
--- a/tools/dependencies-report/src/main/resources/notices/gserver-0.0.1-NOTICE.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-Source: https://github.com/ruby/gserver/blob/v0.0.1/LICENSE.txt
-
-Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
-You can redistribute it and/or modify it under either the terms of the
-2-clause BSDL (see the file BSDL), or the conditions below:
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or binary form,
-     provided that you do at least ONE of the following:
-
-       a) distribute the binaries and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-	  the software.
-
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under these terms.
-
-     For the list of those files and their copying conditions, see the
-     file LEGAL.
-
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
diff --git a/tools/dependencies-report/src/main/resources/notices/hitimes-1.3.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/hitimes-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/hitimes-1.3.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/hitimes-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/http-0.9.9-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/http-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/http-0.9.9-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/http-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/http-cookie-1.0.3-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/http-cookie-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/http-cookie-1.0.3-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/http-cookie-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/http-form_data-1.0.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/http-form_data-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/http-form_data-1.0.1-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/http-form_data-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/http_parser.rb-0.6.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/http_parser.rb-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/http_parser.rb-0.6.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/http_parser.rb-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/i18n-0.6.9-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/i18n-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/i18n-0.6.9-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/i18n-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/insist-1.0.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/insist-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/insist-1.0.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/insist-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/invokebinder-1.7-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/invokebinder-1.7-NOTICE.txt
deleted file mode 100644
index 8c32d8814..000000000
--- a/tools/dependencies-report/src/main/resources/notices/invokebinder-1.7-NOTICE.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-source: https://github.com/headius/invokebinder/search?q=copyright
-
-Copyright 2012-2014 headius.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/io-console-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/io-console-NOTICE.txt
new file mode 100644
index 000000000..44d33b0b5
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/io-console-NOTICE.txt
@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/jar-dependencies-0.3.12-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jar-dependencies-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/jar-dependencies-0.3.12-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/jar-dependencies-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/jay-yydebug-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jay-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/jay-yydebug-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/jay-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/jcodings-1.0.18-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jcodings-1.0.18-NOTICE.txt
deleted file mode 100644
index c70f00c0c..000000000
--- a/tools/dependencies-report/src/main/resources/notices/jcodings-1.0.18-NOTICE.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-source: https://github.com/jruby/jcodings/blob/master/LICENSE.txt
-
-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.
diff --git a/tools/dependencies-report/src/main/resources/notices/jdbc-derby-10.12.1.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jdbc-derby-10.12.1.1-NOTICE.txt
deleted file mode 100644
index c8f9117ec..000000000
--- a/tools/dependencies-report/src/main/resources/notices/jdbc-derby-10.12.1.1-NOTICE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-source: https://github.com/jruby/activerecord-jdbc-adapter/blob/master/jdbc-derby/LICENSE.txt
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/jffi-1.2.16-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jffi-1.2.16-NOTICE.txt
deleted file mode 100644
index aba0602f1..000000000
--- a/tools/dependencies-report/src/main/resources/notices/jffi-1.2.16-NOTICE.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-source: https://github.com/jnr/jffi/blob/master/LICENSE
-
-Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-
-  Alternatively, you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
- 
-  This code is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-  version 3 for more details.
- 
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/tools/dependencies-report/src/main/resources/notices/jitescript-0.4.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jitescript-0.4.1-NOTICE.txt
deleted file mode 100644
index 783fa6f2e..000000000
--- a/tools/dependencies-report/src/main/resources/notices/jitescript-0.4.1-NOTICE.txt
+++ /dev/null
@@ -1,179 +0,0 @@
-  source: https://github.com/qmx/jitescript/blob/master/LICENSE
-
-                               Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
diff --git a/tools/dependencies-report/src/main/resources/notices/jline2-2.1.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jline2-2.1.1-NOTICE.txt
deleted file mode 100644
index 747e6c777..000000000
--- a/tools/dependencies-report/src/main/resources/notices/jline2-2.1.1-NOTICE.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-source: https://github.com/jline/jline2/blob/master/LICENSE.txt
-
-Copyright (c) 2002-2016, the original author or authors.
-All rights reserved.
-
-http://www.opensource.org/licenses/bsd-license.php
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the following
-conditions are met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with
-the distribution.
-
-Neither the name of JLine nor the names of its contributors
-may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/tools/dependencies-report/src/main/resources/notices/jls-grok-0.11.5-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jls-grok-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/jls-grok-0.11.5-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/jls-grok-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/jls-lumberjack-0.0.26-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jls-lumberjack-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/jls-lumberjack-0.0.26-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/jls-lumberjack-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/jmespath-1.4.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jmespath-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/jmespath-1.4.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/jmespath-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/jnr-unixsocket-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jnr-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/jnr-unixsocket-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/jnr-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/jnr-constants-0.9.9-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jnr-constants-0.9.9-NOTICE.txt
deleted file mode 100644
index d012a0922..000000000
--- a/tools/dependencies-report/src/main/resources/notices/jnr-constants-0.9.9-NOTICE.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-source: https://github.com/jnr/jnr-constants/blob/jnr-constants-0.9.9/LICENSE
-
-Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-
-  Alternatively, you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  This code is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-  version 3 for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/tools/dependencies-report/src/main/resources/notices/jnr-enxio-0.16-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jnr-enxio-0.16-NOTICE.txt
deleted file mode 100644
index 913ff5665..000000000
--- a/tools/dependencies-report/src/main/resources/notices/jnr-enxio-0.16-NOTICE.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-source: https://github.com/jnr/jnr-enxio/blob/jnr-enxio-0.16/LICENSE
-
-Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/jnr-ffi-2.1.7-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jnr-ffi-2.1.7-NOTICE.txt
deleted file mode 100644
index 1c207c9fb..000000000
--- a/tools/dependencies-report/src/main/resources/notices/jnr-ffi-2.1.7-NOTICE.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-source: https://github.com/jnr/jnr-ffi/blob/master/LICENSE
-
-Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-
-  Alternatively, you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  This code is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-  version 3 for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/tools/dependencies-report/src/main/resources/notices/jnr-netdb-1.1.6-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jnr-netdb-1.1.6-NOTICE.txt
deleted file mode 100644
index 3416bc1ee..000000000
--- a/tools/dependencies-report/src/main/resources/notices/jnr-netdb-1.1.6-NOTICE.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-source: https://github.com/jnr/jnr-netdb/blob/master/LICENSE
-
-Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/jnr-posix-3.0.41-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jnr-posix-3.0.41-NOTICE.txt
deleted file mode 100644
index 16e6629ea..000000000
--- a/tools/dependencies-report/src/main/resources/notices/jnr-posix-3.0.41-NOTICE.txt
+++ /dev/null
@@ -1,2488 +0,0 @@
-source: https://github.com/jnr/jnr-posix/blob/master/LICENSE.txt
-
-jnr-posix is released under a tri EPL/GPL/LGPL license. You can use it,
-redistribute it and/or modify it under the terms of the:
-
-  Eclipse Public License version 1.0
-  GNU General Public License version 2
-  GNU Lesser General Public License version 2.1
-
-The complete text of the Eclipse Public License is as follows:
-
-  Eclipse Public License - v 1.0
-
-  THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-  PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-  OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-  1. DEFINITIONS
-
-  "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial code and
-         documentation distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor:
-
-          i) changes to the Program, and
-
-          ii) additions to the Program;
-              where such changes and/or additions to the Program
-              originate from and are distributed by that particular
-              Contributor. A Contribution 'originates' from a
-              Contributor if it was added to the Program by such
-              Contributor itself or anyone acting on such
-              Contributor's behalf. Contributions do not include
-              additions to the Program which: (i) are separate modules
-              of software distributed in conjunction with the Program
-              under their own license agreement, and (ii) are not
-              derivative works of the Program.
-
-  "Contributor" means any person or entity that distributes the Program.
-
-  "Licensed Patents" mean patent claims licensable by a Contributor
-  which are necessarily infringed by the use or sale of its
-  Contribution alone or when combined with the Program.
-
-  "Program" means the Contributions distributed in accordance with
-  this Agreement.
-
-  "Recipient" means anyone who receives the Program under this
-  Agreement, including all Contributors.
-
-  2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor
-         hereby grants Recipient a non-exclusive, worldwide,
-         royalty-free copyright license to reproduce, prepare
-         derivative works of, publicly display, publicly perform,
-         distribute and sublicense the Contribution of such
-         Contributor, if any, and such derivative works, in source
-         code and object code form.
-
-      b) Subject to the terms of this Agreement, each Contributor
-         hereby grants Recipient a non-exclusive, worldwide,
-         royalty-free patent license under Licensed Patents to make,
-         use, sell, offer to sell, import and otherwise transfer the
-         Contribution of such Contributor, if any, in source code and
-         object code form. This patent license shall apply to the
-         combination of the Contribution and the Program if, at the
-         time the Contribution is added by the Contributor, such
-         addition of the Contribution causes such combination to be
-         covered by the Licensed Patents. The patent license shall not
-         apply to any other combinations which include the
-         Contribution. No hardware per se is licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants
-         the licenses to its Contributions set forth herein, no
-         assurances are provided by any Contributor that the Program
-         does not infringe the patent or other intellectual property
-         rights of any other entity. Each Contributor disclaims any
-         liability to Recipient for claims brought by any other entity
-         based on infringement of intellectual property rights or
-         otherwise. As a condition to exercising the rights and
-         licenses granted hereunder, each Recipient hereby assumes
-         sole responsibility to secure any other intellectual property
-         rights needed, if any. For example, if a third party patent
-         license is required to allow Recipient to distribute the
-         Program, it is Recipient's responsibility to acquire that
-         license before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-         sufficient copyright rights in its Contribution, if any, to
-         grant the copyright license set forth in this Agreement.
-
-  3. REQUIREMENTS
-
-  A Contributor  may choose to  distribute the Program in  object code
-  form under its own license agreement, provided that:
-
-      a) it complies with the terms and conditions of this Agreement; and
-
-      b) its license agreement:
-
-          i) effectively disclaims on behalf of all Contributors all
-             warranties and conditions, express and implied, including
-             warranties or conditions of title and non-infringement,
-             and implied warranties or conditions of merchantability
-             and fitness for a particular purpose;
-
-          ii) effectively excludes on behalf of all Contributors all
-              liability for damages, including direct, indirect,
-              special, incidental and consequential damages, such as
-              lost profits;
-
-          iii) states that any provisions which differ from this
-               Agreement are offered by that Contributor alone and not
-               by any other party; and
-
-          iv) states that source code for the Program is available
-              from such Contributor, and informs licensees how to
-              obtain it in a reasonable manner on or through a medium
-              customarily used for software exchange.
-
-  When the Program is made available in source code form:
-
-      a) it must be made available under this Agreement; and
-
-      b) a copy of this Agreement must be included with each copy of
-         the Program.
-
-  Contributors may not remove or alter any copyright notices contained
-  within the Program.
-
-  Each Contributor must identify itself as the originator of its
-  Contribution, if any, in a manner that reasonably allows subsequent
-  Recipients to identify the originator of the Contribution.
-
-  4. COMMERCIAL DISTRIBUTION
-
-  Commercial distributors of software may accept certain
-  responsibilities with respect to end users, business partners and
-  the like. While this license is intended to facilitate the
-  commercial use of the Program, the Contributor who includes the
-  Program in a commercial product offering should do so in a manner
-  which does not create potential liability for other Contributors.
-  Therefore, if a Contributor includes the Program in a commercial
-  product offering, such Contributor ("Commercial Contributor") hereby
-  agrees to defend and indemnify every other Contributor ("Indemnified
-  Contributor") against any losses, damages and costs (collectively
-  "Losses") arising from claims, lawsuits and other legal actions
-  brought by a third party against the Indemnified Contributor to the
-  extent caused by the acts or omissions of such Commercial
-  Contributor in connection with its distribution of the Program in a
-  commercial product offering. The obligations in this section do not
-  apply to any claims or Losses relating to any actual or alleged
-  intellectual property infringement. In order to qualify, an
-  Indemnified Contributor must: a) promptly notify the Commercial
-  Contributor in writing of such claim, and b) allow the Commercial
-  Contributor to control, and cooperate with the Commercial
-  Contributor in, the defense and any related settlement negotiations.
-  The Indemnified Contributor may participate in any such claim at its
-  own expense.
-
-  For example, a Contributor might include the Program in a commercial
-  product offering, Product X. That Contributor is then a Commercial
-  Contributor. If that Commercial Contributor then makes performance
-  claims, or offers warranties related to Product X, those performance
-  claims and warranties are such Commercial Contributor's
-  responsibility alone. Under this section, the Commercial Contributor
-  would have to defend claims against the other Contributors related
-  to those performance claims and warranties, and if a court requires
-  any other Contributor to pay any damages as a result, the Commercial
-  Contributor must pay those damages.
-
-  5. NO WARRANTY
-
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-  PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-  ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-  ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-  MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient
-  is solely responsible for determining the appropriateness of using
-  and distributing the Program and assumes all risks associated with
-  its exercise of rights under this Agreement , including but not
-  limited to the risks and costs of program errors, compliance with
-  applicable laws, damage to or loss of data, programs or equipment,
-  and unavailability or interruption of operations.
-
-  6. DISCLAIMER OF LIABILITY
-
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-  NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT,
-  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON
-  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-  THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-  GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-  DAMAGES.
-
-  7. GENERAL
-
-  If any provision of this Agreement is invalid or unenforceable under
-  applicable law, it shall not affect the validity or enforceability
-  of the remainder of the terms of this Agreement, and without further
-  action by the parties hereto, such provision shall be reformed to
-  the minimum extent necessary to make such provision valid and
-  enforceable.
-
-  If Recipient institutes patent litigation against any entity
-  (including a cross-claim or counterclaim in a lawsuit) alleging that
-  the Program itself (excluding combinations of the Program with other
-  software or hardware) infringes such Recipient's patent(s), then
-  such Recipient's rights granted under Section 2(b) shall terminate
-  as of the date such litigation is filed.
-
-  All Recipient's rights under this Agreement shall terminate if it
-  fails to comply with any of the material terms or conditions of this
-  Agreement and does not cure such failure in a reasonable period of
-  time after becoming aware of such noncompliance. If all Recipient's
-  rights under this Agreement terminate, Recipient agrees to cease use
-  and distribution of the Program as soon as reasonably practicable.
-  However, Recipient's obligations under this Agreement and any
-  licenses granted by Recipient relating to the Program shall continue
-  and survive.
-
-  Everyone is permitted to copy and distribute copies of this
-  Agreement, but in order to avoid inconsistency the Agreement is
-  copyrighted and may only be modified in the following manner. The
-  Agreement Steward reserves the right to publish new versions
-  (including revisions) of this Agreement from time to time. No one
-  other than the Agreement Steward has the right to modify this
-  Agreement. The Eclipse Foundation is the initial Agreement Steward.
-  The Eclipse Foundation may assign the responsibility to serve as the
-  Agreement Steward to a suitable separate entity. Each new version of
-  the Agreement will be given a distinguishing version number. The
-  Program (including Contributions) may always be distributed subject
-  to the version of the Agreement under which it was received. In
-  addition, after a new version of the Agreement is published,
-  Contributor may elect to distribute the Program (including its
-  Contributions) under the new version. Except as expressly stated in
-  Sections 2(a) and 2(b) above, Recipient receives no rights or
-  licenses to the intellectual property of any Contributor under this
-  Agreement, whether expressly, by implication, estoppel or otherwise.
-  All rights in the Program not expressly granted under this Agreement
-  are reserved.
-
-  This Agreement is governed by the laws of the State of New York and
-  the intellectual property laws of the United States of America. No
-  party to this Agreement will bring a legal action under this
-  Agreement more than one year after the cause of action arose. Each
-  party waives its rights to a jury trial in any resulting litigation.
-
-The complete text of the Common Public License is as follows:
-
-  Common Public License - v 1.0
-
-  THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON
-  PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF
-  THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-  1. DEFINITIONS
-
-  "Contribution" means:
-
-  a) in the case of the initial Contributor, the initial code and
-    documentation distributed under this Agreement, and
-
-  b) in the case of each subsequent Contributor:
-
-  i) changes to the Program, and
-
-  ii) additions to the Program;
-
-  where such changes and/or additions to the Program originate
-  from and are distributed by that particular Contributor. A
-  Contribution 'originates' from a Contributor if it was added to the
-  Program by such Contributor itself or anyone acting on such
-  Contributor's behalf. Contributions do not include additions to the
-  Program which: (i) are separate modules of software distributed in
-  conjunction with the Program under their own license agreement,
-  and (ii) are not derivative works of the Program.
-
-  "Contributor" means any person or entity that distributes the Program.
-
-  "Licensed Patents " mean patent claims licensable by a Contributor
-  which are necessarily infringed by the use or sale of its Contribution
-  alone or when combined with the Program.
-
-  "Program" means the Contributions distributed in accordance with this Agreement.
-
-  "Recipient" means anyone who receives the Program under this
-  Agreement, including all Contributors.
-
-  2. GRANT OF RIGHTS
-
-  a) Subject to the terms of this Agreement, each Contributor
-  hereby grants Recipient a non-exclusive, worldwide, royalty-free
-  copyright license to reproduce, prepare derivative works of, publicly
-  display, publicly perform, distribute and sublicense the Contribution
-  of such Contributor, if any, and such derivative works, in source code
-  and object code form.
-
-  b) Subject to the terms of this Agreement, each Contributor
-  hereby grants Recipient a non-exclusive, worldwide, royalty-free
-  patent license under Licensed Patents to make, use, sell, offer to
-  sell, import and otherwise transfer the Contribution of such
-  Contributor, if any, in source code and object code form. This patent
-  license shall apply to the combination of the Contribution and the
-  Program if, at the time the Contribution is added by the Contributor,
-  such addition of the Contribution causes such combination to be
-  covered by the Licensed Patents. The patent license shall not apply to
-  any other combinations which include the Contribution. No hardware per
-  se is licensed hereunder.
-
-  c) Recipient understands that although each Contributor grants
-  the licenses to its Contributions set forth herein, no assurances are
-  provided by any Contributor that the Program does not infringe the
-  patent or other intellectual property rights of any other entity. Each
-  Contributor disclaims any liability to Recipient for claims brought by
-  any other entity based on infringement of intellectual property rights
-  or otherwise. As a condition to exercising the rights and licenses
-  granted hereunder, each Recipient hereby assumes sole responsibility
-  to secure any other intellectual property rights needed, if any. For
-  example, if a third party patent license is required to allow
-  Recipient to distribute the Program, it is Recipient's responsibility
-  to acquire that license before distributing the Program.
-
-  d) Each Contributor represents that to its knowledge it has
-  sufficient copyright rights in its Contribution, if any, to grant the
-  copyright license set forth in this Agreement.
-
-  3. REQUIREMENTS
-
-  A Contributor may choose to distribute the Program in object code form
-  under its own license agreement, provided that:
-
-  a) it complies with the terms and conditions of this Agreement;
-    and
-
-  b) its license agreement:
-
-  i) effectively disclaims on behalf of all Contributors all
-  warranties and conditions, express and implied, including warranties
-  or conditions of title and non-infringement, and implied warranties or
-  conditions of merchantability and fitness for a particular purpose;
-
-  ii) effectively excludes on behalf of all Contributors all
-  liability for damages, including direct, indirect, special, incidental
-  and consequential damages, such as lost profits;
-
-  iii) states that any provisions which differ from this Agreement
-  are offered by that Contributor alone and not by any other party; and
-
-  iv) states that source code for the Program is available from
-  such Contributor, and informs licensees how to obtain it in a
-  reasonable manner on or through a medium customarily used for software
-  exchange.
-
-  When the Program is made available in source code form:
-
-  a) it must be made available under this Agreement; and 
-
-  b) a copy of this Agreement must be included with each copy of
-  the Program.
-
-  Contributors may not remove or alter any copyright notices contained
-  within the Program.
-
-  Each Contributor must identify itself as the originator of its
-  Contribution, if any, in a manner that reasonably allows subsequent
-  Recipients to identify the originator of the Contribution.
-
-  4. COMMERCIAL DISTRIBUTION
-
-  Commercial distributors of software may accept certain
-  responsibilities with respect to end users, business partners and the
-  like. While this license is intended to facilitate the commercial use
-  of the Program, the Contributor who includes the Program in a
-  commercial product offering should do so in a manner which does not
-  create potential liability for other Contributors. Therefore, if a
-  Contributor includes the Program in a commercial product offering,
-  such Contributor ("Commercial Contributor") hereby agrees to defend
-  and indemnify every other Contributor ("Indemnified Contributor")
-  against any losses, damages and costs (collectively "Losses") arising
-  from claims, lawsuits and other legal actions brought by a third party
-  against the Indemnified Contributor to the extent caused by the acts
-  or omissions of such Commercial Contributor in connection with its
-  distribution of the Program in a commercial product offering. The
-  obligations in this section do not apply to any claims or Losses
-  relating to any actual or alleged intellectual property
-  infringement. In order to qualify, an Indemnified Contributor must: a)
-  promptly notify the Commercial Contributor in writing of such claim,
-  and b) allow the Commercial Contributor to control, and cooperate with
-  the Commercial Contributor in, the defense and any related settlement
-  negotiations. The Indemnified Contributor may participate in any such
-  claim at its own expense.
-
-  For example, a Contributor might include the Program in a commercial
-  product offering, Product X. That Contributor is then a Commercial
-  Contributor. If that Commercial Contributor then makes performance
-  claims, or offers warranties related to Product X, those performance
-  claims and warranties are such Commercial Contributor's responsibility
-  alone. Under this section, the Commercial Contributor would have to
-  defend claims against the other Contributors related to those
-  performance claims and warranties, and if a court requires any other
-  Contributor to pay any damages as a result, the Commercial Contributor
-  must pay those damages.
-
-  5. NO WARRANTY
-
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-  PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
-  WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-  OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-  responsible for determining the appropriateness of using and
-  distributing the Program and assumes all risks associated with its
-  exercise of rights under this Agreement, including but not limited to
-  the risks and costs of program errors, compliance with applicable
-  laws, damage to or loss of data, programs or equipment, and
-  unavailability or interruption of operations.
-
-  6. DISCLAIMER OF LIABILITY
-
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR
-  ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-  WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-  DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-  HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-  7. GENERAL
-
-  If any provision of this Agreement is invalid or unenforceable under
-  applicable law, it shall not affect the validity or enforceability of
-  the remainder of the terms of this Agreement, and without further
-  action by the parties hereto, such provision shall be reformed to the
-  minimum extent necessary to make such provision valid and enforceable.
-
-  If Recipient institutes patent litigation against a Contributor with
-  respect to a patent applicable to software (including a cross-claim or
-  counterclaim in a lawsuit), then any patent licenses granted by that
-  Contributor to such Recipient under this Agreement shall terminate as
-  of the date such litigation is filed. In addition, if Recipient
-  institutes patent litigation against any entity (including a
-  cross-claim or counterclaim in a lawsuit) alleging that the Program
-  itself (excluding combinations of the Program with other software or
-  hardware) infringes such Recipient's patent(s), then such Recipient's
-  rights granted under Section 2(b) shall terminate as of the date such
-  litigation is filed.
-
-  All Recipient's rights under this Agreement shall terminate if it
-  fails to comply with any of the material terms or conditions of this
-  Agreement and does not cure such failure in a reasonable period of
-  time after becoming aware of such noncompliance. If all Recipient's
-  rights under this Agreement terminate, Recipient agrees to cease use
-  and distribution of the Program as soon as reasonably
-  practicable. However, Recipient's obligations under this Agreement and
-  any licenses granted by Recipient relating to the Program shall
-  continue and survive.
-
-  Everyone is permitted to copy and distribute copies of this Agreement,
-  but in order to avoid inconsistency the Agreement is copyrighted and
-  may only be modified in the following manner. The Agreement Steward
-  reserves the right to publish new versions (including revisions) of
-  this Agreement from time to time. No one other than the Agreement
-  Steward has the right to modify this Agreement. IBM is the initial
-  Agreement Steward. IBM may assign the responsibility to serve as the
-  Agreement Steward to a suitable separate entity. Each new version of
-  the Agreement will be given a distinguishing version number. The
-  Program (including Contributions) may always be distributed subject to
-  the version of the Agreement under which it was received. In addition,
-  after a new version of the Agreement is published, Contributor may
-  elect to distribute the Program (including its Contributions) under
-  the new version. Except as expressly stated in Sections 2(a) and 2(b)
-  above, Recipient receives no rights or licenses to the intellectual
-  property of any Contributor under this Agreement, whether expressly,
-  by implication, estoppel or otherwise. All rights in the Program not
-  expressly granted under this Agreement are reserved.
-
-  This Agreement is governed by the laws of the State of New York and
-  the intellectual property laws of the United States of America. No
-  party to this Agreement will bring a legal action under this Agreement
-  more than one year after the cause of action arose. Each party waives
- its rights to a jury trial in any resulting litigation.
-
-The complete text of the GNU General Public License v2 is as follows:
-
-          GNU GENERAL PUBLIC LICENSE
-             Version 2, June 1991
-
-   Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                         59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-   Everyone is permitted to copy and distribute verbatim copies
-   of this license document, but changing it is not allowed.
-
-            Preamble
-
-    The licenses for most software are designed to take away your
-  freedom to share and change it.  By contrast, the GNU General Public
-  License is intended to guarantee your freedom to share and change free
-  software--to make sure the software is free for all its users.  This
-  General Public License applies to most of the Free Software
-  Foundation's software and to any other program whose authors commit to
-  using it.  (Some other Free Software Foundation software is covered by
-  the GNU Library General Public License instead.)  You can apply it to
-  your programs, too.
-
-    When we speak of free software, we are referring to freedom, not
-  price.  Our General Public Licenses are designed to make sure that you
-  have the freedom to distribute copies of free software (and charge for
-  this service if you wish), that you receive source code or can get it
-  if you want it, that you can change the software or use pieces of it
-  in new free programs; and that you know you can do these things.
-
-    To protect your rights, we need to make restrictions that forbid
-  anyone to deny you these rights or to ask you to surrender the rights.
-  These restrictions translate to certain responsibilities for you if you
-  distribute copies of the software, or if you modify it.
-
-    For example, if you distribute copies of such a program, whether
-  gratis or for a fee, you must give the recipients all the rights that
-  you have.  You must make sure that they, too, receive or can get the
-  source code.  And you must show them these terms so they know their
-  rights.
-
-    We protect your rights with two steps: (1) copyright the software, and
-  (2) offer you this license which gives you legal permission to copy,
-  distribute and/or modify the software.
-
-    Also, for each author's protection and ours, we want to make certain
-  that everyone understands that there is no warranty for this free
-  software.  If the software is modified by someone else and passed on, we
-  want its recipients to know that what they have is not the original, so
-  that any problems introduced by others will not reflect on the original
-  authors' reputations.
-
-    Finally, any free program is threatened constantly by software
-  patents.  We wish to avoid the danger that redistributors of a free
-  program will individually obtain patent licenses, in effect making the
-  program proprietary.  To prevent this, we have made it clear that any
-  patent must be licensed for everyone's free use or not licensed at all.
-
-    The precise terms and conditions for copying, distribution and
-  modification follow.
-
-          GNU GENERAL PUBLIC LICENSE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-    0. This License applies to any program or other work which contains
-  a notice placed by the copyright holder saying it may be distributed
-  under the terms of this General Public License.  The "Program", below,
-  refers to any such program or work, and a "work based on the Program"
-  means either the Program or any derivative work under copyright law:
-  that is to say, a work containing the Program or a portion of it,
-  either verbatim or with modifications and/or translated into another
-  language.  (Hereinafter, translation is included without limitation in
-  the term "modification".)  Each licensee is addressed as "you".
-
-  Activities other than copying, distribution and modification are not
-  covered by this License; they are outside its scope.  The act of
-  running the Program is not restricted, and the output from the Program
-  is covered only if its contents constitute a work based on the
-  Program (independent of having been made by running the Program).
-  Whether that is true depends on what the Program does.
-
-    1. You may copy and distribute verbatim copies of the Program's
-  source code as you receive it, in any medium, provided that you
-  conspicuously and appropriately publish on each copy an appropriate
-  copyright notice and disclaimer of warranty; keep intact all the
-  notices that refer to this License and to the absence of any warranty;
-  and give any other recipients of the Program a copy of this License
-  along with the Program.
-
-  You may charge a fee for the physical act of transferring a copy, and
-  you may at your option offer warranty protection in exchange for a fee.
-
-    2. You may modify your copy or copies of the Program or any portion
-  of it, thus forming a work based on the Program, and copy and
-  distribute such modifications or work under the terms of Section 1
-  above, provided that you also meet all of these conditions:
-
-      a) You must cause the modified files to carry prominent notices
-      stating that you changed the files and the date of any change.
-
-      b) You must cause any work that you distribute or publish, that in
-      whole or in part contains or is derived from the Program or any
-      part thereof, to be licensed as a whole at no charge to all third
-      parties under the terms of this License.
-
-      c) If the modified program normally reads commands interactively
-      when run, you must cause it, when started running for such
-      interactive use in the most ordinary way, to print or display an
-      announcement including an appropriate copyright notice and a
-      notice that there is no warranty (or else, saying that you provide
-      a warranty) and that users may redistribute the program under
-      these conditions, and telling the user how to view a copy of this
-      License.  (Exception: if the Program itself is interactive but
-      does not normally print such an announcement, your work based on
-      the Program is not required to print an announcement.)
-
-  These requirements apply to the modified work as a whole.  If
-  identifiable sections of that work are not derived from the Program,
-  and can be reasonably considered independent and separate works in
-  themselves, then this License, and its terms, do not apply to those
-  sections when you distribute them as separate works.  But when you
-  distribute the same sections as part of a whole which is a work based
-  on the Program, the distribution of the whole must be on the terms of
-  this License, whose permissions for other licensees extend to the
-  entire whole, and thus to each and every part regardless of who wrote it.
-
-  Thus, it is not the intent of this section to claim rights or contest
-  your rights to work written entirely by you; rather, the intent is to
-  exercise the right to control the distribution of derivative or
-  collective works based on the Program.
-
-  In addition, mere aggregation of another work not based on the Program
-  with the Program (or with a work based on the Program) on a volume of
-  a storage or distribution medium does not bring the other work under
-  the scope of this License.
-
-    3. You may copy and distribute the Program (or a work based on it,
-  under Section 2) in object code or executable form under the terms of
-  Sections 1 and 2 above provided that you also do one of the following:
-
-      a) Accompany it with the complete corresponding machine-readable
-      source code, which must be distributed under the terms of Sections
-      1 and 2 above on a medium customarily used for software interchange; or,
-
-      b) Accompany it with a written offer, valid for at least three
-      years, to give any third party, for a charge no more than your
-      cost of physically performing source distribution, a complete
-      machine-readable copy of the corresponding source code, to be
-      distributed under the terms of Sections 1 and 2 above on a medium
-      customarily used for software interchange; or,
-
-      c) Accompany it with the information you received as to the offer
-      to distribute corresponding source code.  (This alternative is
-      allowed only for noncommercial distribution and only if you
-      received the program in object code or executable form with such
-      an offer, in accord with Subsection b above.)
-
-  The source code for a work means the preferred form of the work for
-  making modifications to it.  For an executable work, complete source
-  code means all the source code for all modules it contains, plus any
-  associated interface definition files, plus the scripts used to
-  control compilation and installation of the executable.  However, as a
-  special exception, the source code distributed need not include
-  anything that is normally distributed (in either source or binary
-  form) with the major components (compiler, kernel, and so on) of the
-  operating system on which the executable runs, unless that component
-  itself accompanies the executable.
-
-  If distribution of executable or object code is made by offering
-  access to copy from a designated place, then offering equivalent
-  access to copy the source code from the same place counts as
-  distribution of the source code, even though third parties are not
-  compelled to copy the source along with the object code.
-
-    4. You may not copy, modify, sublicense, or distribute the Program
-  except as expressly provided under this License.  Any attempt
-  otherwise to copy, modify, sublicense or distribute the Program is
-  void, and will automatically terminate your rights under this License.
-  However, parties who have received copies, or rights, from you under
-  this License will not have their licenses terminated so long as such
-  parties remain in full compliance.
-
-    5. You are not required to accept this License, since you have not
-  signed it.  However, nothing else grants you permission to modify or
-  distribute the Program or its derivative works.  These actions are
-  prohibited by law if you do not accept this License.  Therefore, by
-  modifying or distributing the Program (or any work based on the
-  Program), you indicate your acceptance of this License to do so, and
-  all its terms and conditions for copying, distributing or modifying
-  the Program or works based on it.
-
-    6. Each time you redistribute the Program (or any work based on the
-  Program), the recipient automatically receives a license from the
-  original licensor to copy, distribute or modify the Program subject to
-  these terms and conditions.  You may not impose any further
-  restrictions on the recipients' exercise of the rights granted herein.
-  You are not responsible for enforcing compliance by third parties to
-  this License.
-
-    7. If, as a consequence of a court judgment or allegation of patent
-  infringement or for any other reason (not limited to patent issues),
-  conditions are imposed on you (whether by court order, agreement or
-  otherwise) that contradict the conditions of this License, they do not
-  excuse you from the conditions of this License.  If you cannot
-  distribute so as to satisfy simultaneously your obligations under this
-  License and any other pertinent obligations, then as a consequence you
-  may not distribute the Program at all.  For example, if a patent
-  license would not permit royalty-free redistribution of the Program by
-  all those who receive copies directly or indirectly through you, then
-  the only way you could satisfy both it and this License would be to
-  refrain entirely from distribution of the Program.
-
-  If any portion of this section is held invalid or unenforceable under
-  any particular circumstance, the balance of the section is intended to
-  apply and the section as a whole is intended to apply in other
-  circumstances.
-
-  It is not the purpose of this section to induce you to infringe any
-  patents or other property right claims or to contest validity of any
-  such claims; this section has the sole purpose of protecting the
-  integrity of the free software distribution system, which is
-  implemented by public license practices.  Many people have made
-  generous contributions to the wide range of software distributed
-  through that system in reliance on consistent application of that
-  system; it is up to the author/donor to decide if he or she is willing
-  to distribute software through any other system and a licensee cannot
-  impose that choice.
-
-  This section is intended to make thoroughly clear what is believed to
-  be a consequence of the rest of this License.
-
-    8. If the distribution and/or use of the Program is restricted in
-  certain countries either by patents or by copyrighted interfaces, the
-  original copyright holder who places the Program under this License
-  may add an explicit geographical distribution limitation excluding
-  those countries, so that distribution is permitted only in or among
-  countries not thus excluded.  In such case, this License incorporates
-  the limitation as if written in the body of this License.
-
-    9. The Free Software Foundation may publish revised and/or new versions
-  of the General Public License from time to time.  Such new versions will
-  be similar in spirit to the present version, but may differ in detail to
-  address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the Program
-  specifies a version number of this License which applies to it and "any
-  later version", you have the option of following the terms and conditions
-  either of that version or of any later version published by the Free
-  Software Foundation.  If the Program does not specify a version number of
-  this License, you may choose any version ever published by the Free Software
-  Foundation.
-
-    10. If you wish to incorporate parts of the Program into other free
-  programs whose distribution conditions are different, write to the author
-  to ask for permission.  For software which is copyrighted by the Free
-  Software Foundation, write to the Free Software Foundation; we sometimes
-  make exceptions for this.  Our decision will be guided by the two goals
-  of preserving the free status of all derivatives of our free software and
-  of promoting the sharing and reuse of software generally.
-
-            NO WARRANTY
-
-    11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-  FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-  OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-  PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-  OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-  TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-  PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-  REPAIR OR CORRECTION.
-
-    12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-  WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-  REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-  INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-  OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-  TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-  YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-  PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGES.
-
-           END OF TERMS AND CONDITIONS
-
-The complete text of the GNU Lesser General Public License 2.1 is as follows:
-
-        GNU LESSER GENERAL PUBLIC LICENSE
-             Version 2.1, February 1999
-
-   Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-   Everyone is permitted to copy and distribute verbatim copies
-   of this license document, but changing it is not allowed.
-
-  [This is the first released version of the Lesser GPL.  It also counts
-   as the successor of the GNU Library Public License, version 2, hence
-   the version number 2.1.]
-
-            Preamble
-
-    The licenses for most software are designed to take away your
-  freedom to share and change it.  By contrast, the GNU General Public
-  Licenses are intended to guarantee your freedom to share and change
-  free software--to make sure the software is free for all its users.
-
-    This license, the Lesser General Public License, applies to some
-  specially designated software packages--typically libraries--of the
-  Free Software Foundation and other authors who decide to use it.  You
-  can use it too, but we suggest you first think carefully about whether
-  this license or the ordinary General Public License is the better
-  strategy to use in any particular case, based on the explanations below.
-
-    When we speak of free software, we are referring to freedom of use,
-  not price.  Our General Public Licenses are designed to make sure that
-  you have the freedom to distribute copies of free software (and charge
-  for this service if you wish); that you receive source code or can get
-  it if you want it; that you can change the software and use pieces of
-  it in new free programs; and that you are informed that you can do
-  these things.
-
-    To protect your rights, we need to make restrictions that forbid
-  distributors to deny you these rights or to ask you to surrender these
-  rights.  These restrictions translate to certain responsibilities for
-  you if you distribute copies of the library or if you modify it.
-
-    For example, if you distribute copies of the library, whether gratis
-  or for a fee, you must give the recipients all the rights that we gave
-  you.  You must make sure that they, too, receive or can get the source
-  code.  If you link other code with the library, you must provide
-  complete object files to the recipients, so that they can relink them
-  with the library after making changes to the library and recompiling
-  it.  And you must show them these terms so they know their rights.
-
-    We protect your rights with a two-step method: (1) we copyright the
-  library, and (2) we offer you this license, which gives you legal
-  permission to copy, distribute and/or modify the library.
-
-    To protect each distributor, we want to make it very clear that
-  there is no warranty for the free library.  Also, if the library is
-  modified by someone else and passed on, the recipients should know
-  that what they have is not the original version, so that the original
-  author's reputation will not be affected by problems that might be
-  introduced by others.
-
-    Finally, software patents pose a constant threat to the existence of
-  any free program.  We wish to make sure that a company cannot
-  effectively restrict the users of a free program by obtaining a
-  restrictive license from a patent holder.  Therefore, we insist that
-  any patent license obtained for a version of the library must be
-  consistent with the full freedom of use specified in this license.
-
-    Most GNU software, including some libraries, is covered by the
-  ordinary GNU General Public License.  This license, the GNU Lesser
-  General Public License, applies to certain designated libraries, and
-  is quite different from the ordinary General Public License.  We use
-  this license for certain libraries in order to permit linking those
-  libraries into non-free programs.
-
-    When a program is linked with a library, whether statically or using
-  a shared library, the combination of the two is legally speaking a
-  combined work, a derivative of the original library.  The ordinary
-  General Public License therefore permits such linking only if the
-  entire combination fits its criteria of freedom.  The Lesser General
-  Public License permits more lax criteria for linking other code with
-  the library.
-
-    We call this license the "Lesser" General Public License because it
-  does Less to protect the user's freedom than the ordinary General
-  Public License.  It also provides other free software developers Less
-  of an advantage over competing non-free programs.  These disadvantages
-  are the reason we use the ordinary General Public License for many
-  libraries.  However, the Lesser license provides advantages in certain
-  special circumstances.
-
-    For example, on rare occasions, there may be a special need to
-  encourage the widest possible use of a certain library, so that it becomes
-  a de-facto standard.  To achieve this, non-free programs must be
-  allowed to use the library.  A more frequent case is that a free
-  library does the same job as widely used non-free libraries.  In this
-  case, there is little to gain by limiting the free library to free
-  software only, so we use the Lesser General Public License.
-
-    In other cases, permission to use a particular library in non-free
-  programs enables a greater number of people to use a large body of
-  free software.  For example, permission to use the GNU C Library in
-  non-free programs enables many more people to use the whole GNU
-  operating system, as well as its variant, the GNU/Linux operating
-  system.
-
-    Although the Lesser General Public License is Less protective of the
-  users' freedom, it does ensure that the user of a program that is
-  linked with the Library has the freedom and the wherewithal to run
-  that program using a modified version of the Library.
-
-    The precise terms and conditions for copying, distribution and
-  modification follow.  Pay close attention to the difference between a
-  "work based on the library" and a "work that uses the library".  The
-  former contains code derived from the library, whereas the latter must
-  be combined with the library in order to run.
-
-        GNU LESSER GENERAL PUBLIC LICENSE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-    0. This License Agreement applies to any software library or other
-  program which contains a notice placed by the copyright holder or
-  other authorized party saying it may be distributed under the terms of
-  this Lesser General Public License (also called "this License").
-  Each licensee is addressed as "you".
-
-    A "library" means a collection of software functions and/or data
-  prepared so as to be conveniently linked with application programs
-  (which use some of those functions and data) to form executables.
-
-    The "Library", below, refers to any such software library or work
-  which has been distributed under these terms.  A "work based on the
-  Library" means either the Library or any derivative work under
-  copyright law: that is to say, a work containing the Library or a
-  portion of it, either verbatim or with modifications and/or translated
-  straightforwardly into another language.  (Hereinafter, translation is
-  included without limitation in the term "modification".)
-
-    "Source code" for a work means the preferred form of the work for
-  making modifications to it.  For a library, complete source code means
-  all the source code for all modules it contains, plus any associated
-  interface definition files, plus the scripts used to control compilation
-  and installation of the library.
-
-    Activities other than copying, distribution and modification are not
-  covered by this License; they are outside its scope.  The act of
-  running a program using the Library is not restricted, and output from
-  such a program is covered only if its contents constitute a work based
-  on the Library (independent of the use of the Library in a tool for
-  writing it).  Whether that is true depends on what the Library does
-  and what the program that uses the Library does.
-  
-    1. You may copy and distribute verbatim copies of the Library's
-  complete source code as you receive it, in any medium, provided that
-  you conspicuously and appropriately publish on each copy an
-  appropriate copyright notice and disclaimer of warranty; keep intact
-  all the notices that refer to this License and to the absence of any
-  warranty; and distribute a copy of this License along with the
-  Library.
-
-    You may charge a fee for the physical act of transferring a copy,
-  and you may at your option offer warranty protection in exchange for a
-  fee.
-
-    2. You may modify your copy or copies of the Library or any portion
-  of it, thus forming a work based on the Library, and copy and
-  distribute such modifications or work under the terms of Section 1
-  above, provided that you also meet all of these conditions:
-
-      a) The modified work must itself be a software library.
-
-      b) You must cause the files modified to carry prominent notices
-      stating that you changed the files and the date of any change.
-
-      c) You must cause the whole of the work to be licensed at no
-      charge to all third parties under the terms of this License.
-
-      d) If a facility in the modified Library refers to a function or a
-      table of data to be supplied by an application program that uses
-      the facility, other than as an argument passed when the facility
-      is invoked, then you must make a good faith effort to ensure that,
-      in the event an application does not supply such function or
-      table, the facility still operates, and performs whatever part of
-      its purpose remains meaningful.
-
-      (For example, a function in a library to compute square roots has
-      a purpose that is entirely well-defined independent of the
-      application.  Therefore, Subsection 2d requires that any
-      application-supplied function or table used by this function must
-      be optional: if the application does not supply it, the square
-      root function must still compute square roots.)
-
-  These requirements apply to the modified work as a whole.  If
-  identifiable sections of that work are not derived from the Library,
-  and can be reasonably considered independent and separate works in
-  themselves, then this License, and its terms, do not apply to those
-  sections when you distribute them as separate works.  But when you
-  distribute the same sections as part of a whole which is a work based
-  on the Library, the distribution of the whole must be on the terms of
-  this License, whose permissions for other licensees extend to the
-  entire whole, and thus to each and every part regardless of who wrote
-  it.
-
-  Thus, it is not the intent of this section to claim rights or contest
-  your rights to work written entirely by you; rather, the intent is to
-  exercise the right to control the distribution of derivative or
-  collective works based on the Library.
-
-  In addition, mere aggregation of another work not based on the Library
-  with the Library (or with a work based on the Library) on a volume of
-  a storage or distribution medium does not bring the other work under
-  the scope of this License.
-
-    3. You may opt to apply the terms of the ordinary GNU General Public
-  License instead of this License to a given copy of the Library.  To do
-  this, you must alter all the notices that refer to this License, so
-  that they refer to the ordinary GNU General Public License, version 2,
-  instead of to this License.  (If a newer version than version 2 of the
-  ordinary GNU General Public License has appeared, then you can specify
-  that version instead if you wish.)  Do not make any other change in
-  these notices.
-
-    Once this change is made in a given copy, it is irreversible for
-  that copy, so the ordinary GNU General Public License applies to all
-  subsequent copies and derivative works made from that copy.
-
-    This option is useful when you wish to copy part of the code of
-  the Library into a program that is not a library.
-
-    4. You may copy and distribute the Library (or a portion or
-  derivative of it, under Section 2) in object code or executable form
-  under the terms of Sections 1 and 2 above provided that you accompany
-  it with the complete corresponding machine-readable source code, which
-  must be distributed under the terms of Sections 1 and 2 above on a
-  medium customarily used for software interchange.
-
-    If distribution of object code is made by offering access to copy
-  from a designated place, then offering equivalent access to copy the
-  source code from the same place satisfies the requirement to
-  distribute the source code, even though third parties are not
-  compelled to copy the source along with the object code.
-
-    5. A program that contains no derivative of any portion of the
-  Library, but is designed to work with the Library by being compiled or
-  linked with it, is called a "work that uses the Library".  Such a
-  work, in isolation, is not a derivative work of the Library, and
-  therefore falls outside the scope of this License.
-
-    However, linking a "work that uses the Library" with the Library
-  creates an executable that is a derivative of the Library (because it
-  contains portions of the Library), rather than a "work that uses the
-  library".  The executable is therefore covered by this License.
-  Section 6 states terms for distribution of such executables.
-
-    When a "work that uses the Library" uses material from a header file
-  that is part of the Library, the object code for the work may be a
-  derivative work of the Library even though the source code is not.
-  Whether this is true is especially significant if the work can be
-  linked without the Library, or if the work is itself a library.  The
-  threshold for this to be true is not precisely defined by law.
-
-    If such an object file uses only numerical parameters, data
-  structure layouts and accessors, and small macros and small inline
-  functions (ten lines or less in length), then the use of the object
-  file is unrestricted, regardless of whether it is legally a derivative
-  work.  (Executables containing this object code plus portions of the
-  Library will still fall under Section 6.)
-
-    Otherwise, if the work is a derivative of the Library, you may
-  distribute the object code for the work under the terms of Section 6.
-  Any executables containing that work also fall under Section 6,
-  whether or not they are linked directly with the Library itself.
-
-    6. As an exception to the Sections above, you may also combine or
-  link a "work that uses the Library" with the Library to produce a
-  work containing portions of the Library, and distribute that work
-  under terms of your choice, provided that the terms permit
-  modification of the work for the customer's own use and reverse
-  engineering for debugging such modifications.
-
-    You must give prominent notice with each copy of the work that the
-  Library is used in it and that the Library and its use are covered by
-  this License.  You must supply a copy of this License.  If the work
-  during execution displays copyright notices, you must include the
-  copyright notice for the Library among them, as well as a reference
-  directing the user to the copy of this License.  Also, you must do one
-  of these things:
-
-      a) Accompany the work with the complete corresponding
-      machine-readable source code for the Library including whatever
-      changes were used in the work (which must be distributed under
-      Sections 1 and 2 above); and, if the work is an executable linked
-      with the Library, with the complete machine-readable "work that
-      uses the Library", as object code and/or source code, so that the
-      user can modify the Library and then relink to produce a modified
-      executable containing the modified Library.  (It is understood
-      that the user who changes the contents of definitions files in the
-      Library will not necessarily be able to recompile the application
-      to use the modified definitions.)
-
-      b) Use a suitable shared library mechanism for linking with the
-      Library.  A suitable mechanism is one that (1) uses at run time a
-      copy of the library already present on the user's computer system,
-      rather than copying library functions into the executable, and (2)
-      will operate properly with a modified version of the library, if
-      the user installs one, as long as the modified version is
-      interface-compatible with the version that the work was made with.
-
-      c) Accompany the work with a written offer, valid for at
-      least three years, to give the same user the materials
-      specified in Subsection 6a, above, for a charge no more
-      than the cost of performing this distribution.
-
-      d) If distribution of the work is made by offering access to copy
-      from a designated place, offer equivalent access to copy the above
-      specified materials from the same place.
-
-      e) Verify that the user has already received a copy of these
-      materials or that you have already sent this user a copy.
-
-    For an executable, the required form of the "work that uses the
-  Library" must include any data and utility programs needed for
-  reproducing the executable from it.  However, as a special exception,
-  the materials to be distributed need not include anything that is
-  normally distributed (in either source or binary form) with the major
-  components (compiler, kernel, and so on) of the operating system on
-  which the executable runs, unless that component itself accompanies
-  the executable.
-
-    It may happen that this requirement contradicts the license
-  restrictions of other proprietary libraries that do not normally
-  accompany the operating system.  Such a contradiction means you cannot
-  use both them and the Library together in an executable that you
-  distribute.
-
-    7. You may place library facilities that are a work based on the
-  Library side-by-side in a single library together with other library
-  facilities not covered by this License, and distribute such a combined
-  library, provided that the separate distribution of the work based on
-  the Library and of the other library facilities is otherwise
-  permitted, and provided that you do these two things:
-
-      a) Accompany the combined library with a copy of the same work
-      based on the Library, uncombined with any other library
-      facilities.  This must be distributed under the terms of the
-      Sections above.
-
-      b) Give prominent notice with the combined library of the fact
-      that part of it is a work based on the Library, and explaining
-      where to find the accompanying uncombined form of the same work.
-
-    8. You may not copy, modify, sublicense, link with, or distribute
-  the Library except as expressly provided under this License.  Any
-  attempt otherwise to copy, modify, sublicense, link with, or
-  distribute the Library is void, and will automatically terminate your
-  rights under this License.  However, parties who have received copies,
-  or rights, from you under this License will not have their licenses
-  terminated so long as such parties remain in full compliance.
-
-    9. You are not required to accept this License, since you have not
-  signed it.  However, nothing else grants you permission to modify or
-  distribute the Library or its derivative works.  These actions are
-  prohibited by law if you do not accept this License.  Therefore, by
-  modifying or distributing the Library (or any work based on the
-  Library), you indicate your acceptance of this License to do so, and
-  all its terms and conditions for copying, distributing or modifying
-  the Library or works based on it.
-
-    10. Each time you redistribute the Library (or any work based on the
-  Library), the recipient automatically receives a license from the
-  original licensor to copy, distribute, link with or modify the Library
-  subject to these terms and conditions.  You may not impose any further
-  restrictions on the recipients' exercise of the rights granted herein.
-  You are not responsible for enforcing compliance by third parties with
-  this License.
-
-    11. If, as a consequence of a court judgment or allegation of patent
-  infringement or for any other reason (not limited to patent issues),
-  conditions are imposed on you (whether by court order, agreement or
-  otherwise) that contradict the conditions of this License, they do not
-  excuse you from the conditions of this License.  If you cannot
-  distribute so as to satisfy simultaneously your obligations under this
-  License and any other pertinent obligations, then as a consequence you
-  may not distribute the Library at all.  For example, if a patent
-  license would not permit royalty-free redistribution of the Library by
-  all those who receive copies directly or indirectly through you, then
-  the only way you could satisfy both it and this License would be to
-  refrain entirely from distribution of the Library.
-
-  If any portion of this section is held invalid or unenforceable under any
-  particular circumstance, the balance of the section is intended to apply,
-  and the section as a whole is intended to apply in other circumstances.
-
-  It is not the purpose of this section to induce you to infringe any
-  patents or other property right claims or to contest validity of any
-  such claims; this section has the sole purpose of protecting the
-  integrity of the free software distribution system which is
-  implemented by public license practices.  Many people have made
-  generous contributions to the wide range of software distributed
-  through that system in reliance on consistent application of that
-  system; it is up to the author/donor to decide if he or she is willing
-  to distribute software through any other system and a licensee cannot
-  impose that choice.
-
-  This section is intended to make thoroughly clear what is believed to
-  be a consequence of the rest of this License.
-
-    12. If the distribution and/or use of the Library is restricted in
-  certain countries either by patents or by copyrighted interfaces, the
-  original copyright holder who places the Library under this License may add
-  an explicit geographical distribution limitation excluding those countries,
-  so that distribution is permitted only in or among countries not thus
-  excluded.  In such case, this License incorporates the limitation as if
-  written in the body of this License.
-
-    13. The Free Software Foundation may publish revised and/or new
-  versions of the Lesser General Public License from time to time.
-  Such new versions will be similar in spirit to the present version,
-  but may differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the Library
-  specifies a version number of this License which applies to it and
-  "any later version", you have the option of following the terms and
-  conditions either of that version or of any later version published by
-  the Free Software Foundation.  If the Library does not specify a
-  license version number, you may choose any version ever published by
-  the Free Software Foundation.
-
-    14. If you wish to incorporate parts of the Library into other free
-  programs whose distribution conditions are incompatible with these,
-  write to the author to ask for permission.  For software which is
-  copyrighted by the Free Software Foundation, write to the Free
-  Software Foundation; we sometimes make exceptions for this.  Our
-  decision will be guided by the two goals of preserving the free status
-  of all derivatives of our free software and of promoting the sharing
-  and reuse of software generally.
-
-            NO WARRANTY
-
-    15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-  WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-  OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-  KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-  PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-  LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-  THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-    16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-  WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-  AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-  FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-  CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-  LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-  RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-  FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-  SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-  DAMAGES.
-
-           END OF TERMS AND CONDITIONS
-
-             How to Apply These Terms to Your New Libraries
-
-    If you develop a new library, and you want it to be of the greatest
-  possible use to the public, we recommend making it free software that
-  everyone can redistribute and change.  You can do so by permitting
-  redistribution under these terms (or, alternatively, under the terms of the
-  ordinary General Public License).
-
-    To apply these terms, attach the following notices to the library.  It is
-  safest to attach them to the start of each source file to most effectively
-  convey the exclusion of warranty; and each file should have at least the
-  "copyright" line and a pointer to where the full notice is found.
-
-      <one line to give the library's name and a brief idea of what it does.>
-      Copyright (C) <year>  <name of author>
-
-      This library is free software; you can redistribute it and/or
-      modify it under the terms of the GNU Lesser General Public
-      License as published by the Free Software Foundation; either
-      version 2.1 of the License, or (at your option) any later version.
-
-      This library is distributed in the hope that it will be useful,
-      but WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Lesser General Public License for more details.
-
-      You should have received a copy of the GNU Lesser General Public
-      License along with this library; if not, write to the Free Software
-      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-  Also add information on how to contact you by electronic and paper mail.
-
-  You should also get your employer (if you work as a programmer) or your
-  school, if any, to sign a "copyright disclaimer" for the library, if
-  necessary.  Here is a sample; alter the names:
-
-    Yoyodyne, Inc., hereby disclaims all copyright interest in the
-    library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-    <signature of Ty Coon>, 1 April 1990
-    Ty Coon, President of Vice
-
-  That's all there is to it!
-
-The following licenses cover code other than JRuby which is included with JRuby.
-
-Licenses listed below include:
-
-* GNU General Public License version 3
-* Apache 2.0 License
-* BSD License
-* Apache Software License Version 1.1
-* MIT License
-
-The complete text of the GNU General Public License version 3 is as follows:
-
-          GNU GENERAL PUBLIC LICENSE
-             Version 3, 29 June 2007
-
-   Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
-   Everyone is permitted to copy and distribute verbatim copies
-   of this license document, but changing it is not allowed.
-
-            Preamble
-
-    The GNU General Public License is a free, copyleft license for
-  software and other kinds of works.
-
-    The licenses for most software and other practical works are designed
-  to take away your freedom to share and change the works.  By contrast,
-  the GNU General Public License is intended to guarantee your freedom to
-  share and change all versions of a program--to make sure it remains free
-  software for all its users.  We, the Free Software Foundation, use the
-  GNU General Public License for most of our software; it applies also to
-  any other work released this way by its authors.  You can apply it to
-  your programs, too.
-
-    When we speak of free software, we are referring to freedom, not
-  price.  Our General Public Licenses are designed to make sure that you
-  have the freedom to distribute copies of free software (and charge for
-  them if you wish), that you receive source code or can get it if you
-  want it, that you can change the software or use pieces of it in new
-  free programs, and that you know you can do these things.
-
-    To protect your rights, we need to prevent others from denying you
-  these rights or asking you to surrender the rights.  Therefore, you have
-  certain responsibilities if you distribute copies of the software, or if
-  you modify it: responsibilities to respect the freedom of others.
-
-    For example, if you distribute copies of such a program, whether
-  gratis or for a fee, you must pass on to the recipients the same
-  freedoms that you received.  You must make sure that they, too, receive
-  or can get the source code.  And you must show them these terms so they
-  know their rights.
-
-    Developers that use the GNU GPL protect your rights with two steps:
-  (1) assert copyright on the software, and (2) offer you this License
-  giving you legal permission to copy, distribute and/or modify it.
-
-    For the developers' and authors' protection, the GPL clearly explains
-  that there is no warranty for this free software.  For both users' and
-  authors' sake, the GPL requires that modified versions be marked as
-  changed, so that their problems will not be attributed erroneously to
-  authors of previous versions.
-
-    Some devices are designed to deny users access to install or run
-  modified versions of the software inside them, although the manufacturer
-  can do so.  This is fundamentally incompatible with the aim of
-  protecting users' freedom to change the software.  The systematic
-  pattern of such abuse occurs in the area of products for individuals to
-  use, which is precisely where it is most unacceptable.  Therefore, we
-  have designed this version of the GPL to prohibit the practice for those
-  products.  If such problems arise substantially in other domains, we
-  stand ready to extend this provision to those domains in future versions
-  of the GPL, as needed to protect the freedom of users.
-
-    Finally, every program is threatened constantly by software patents.
-  States should not allow patents to restrict development and use of
-  software on general-purpose computers, but in those that do, we wish to
-  avoid the special danger that patents applied to a free program could
-  make it effectively proprietary.  To prevent this, the GPL assures that
-  patents cannot be used to render the program non-free.
-
-    The precise terms and conditions for copying, distribution and
-  modification follow.
-
-             TERMS AND CONDITIONS
-
-    0. Definitions.
-
-    "This License" refers to version 3 of the GNU General Public License.
-
-    "Copyright" also means copyright-like laws that apply to other kinds of
-  works, such as semiconductor masks.
- 
-    "The Program" refers to any copyrightable work licensed under this
-  License.  Each licensee is addressed as "you".  "Licensees" and
-  "recipients" may be individuals or organizations.
-
-    To "modify" a work means to copy from or adapt all or part of the work
-  in a fashion requiring copyright permission, other than the making of an
-  exact copy.  The resulting work is called a "modified version" of the
-  earlier work or a work "based on" the earlier work.
-
-    A "covered work" means either the unmodified Program or a work based
-  on the Program.
-
-    To "propagate" a work means to do anything with it that, without
-  permission, would make you directly or secondarily liable for
-  infringement under applicable copyright law, except executing it on a
-  computer or modifying a private copy.  Propagation includes copying,
-  distribution (with or without modification), making available to the
-  public, and in some countries other activities as well.
-
-    To "convey" a work means any kind of propagation that enables other
-  parties to make or receive copies.  Mere interaction with a user through
-  a computer network, with no transfer of a copy, is not conveying.
-
-    An interactive user interface displays "Appropriate Legal Notices"
-  to the extent that it includes a convenient and prominently visible
-  feature that (1) displays an appropriate copyright notice, and (2)
-  tells the user that there is no warranty for the work (except to the
-  extent that warranties are provided), that licensees may convey the
-  work under this License, and how to view a copy of this License.  If
-  the interface presents a list of user commands or options, such as a
-  menu, a prominent item in the list meets this criterion.
-
-    1. Source Code.
-
-    The "source code" for a work means the preferred form of the work
-  for making modifications to it.  "Object code" means any non-source
-  form of a work.
-
-    A "Standard Interface" means an interface that either is an official
-  standard defined by a recognized standards body, or, in the case of
-  interfaces specified for a particular programming language, one that
-  is widely used among developers working in that language.
-
-    The "System Libraries" of an executable work include anything, other
-  than the work as a whole, that (a) is included in the normal form of
-  packaging a Major Component, but which is not part of that Major
-  Component, and (b) serves only to enable use of the work with that
-  Major Component, or to implement a Standard Interface for which an
-  implementation is available to the public in source code form.  A
-  "Major Component", in this context, means a major essential component
-  (kernel, window system, and so on) of the specific operating system
-  (if any) on which the executable work runs, or a compiler used to
-  produce the work, or an object code interpreter used to run it.
-
-    The "Corresponding Source" for a work in object code form means all
-  the source code needed to generate, install, and (for an executable
-  work) run the object code and to modify the work, including scripts to
-  control those activities.  However, it does not include the work's
-  System Libraries, or general-purpose tools or generally available free
-  programs which are used unmodified in performing those activities but
-  which are not part of the work.  For example, Corresponding Source
-  includes interface definition files associated with source files for
-  the work, and the source code for shared libraries and dynamically
-  linked subprograms that the work is specifically designed to require,
-  such as by intimate data communication or control flow between those
-  subprograms and other parts of the work.
-
-    The Corresponding Source need not include anything that users
-  can regenerate automatically from other parts of the Corresponding
-  Source.
-
-    The Corresponding Source for a work in source code form is that
-  same work.
-
-    2. Basic Permissions.
-
-    All rights granted under this License are granted for the term of
-  copyright on the Program, and are irrevocable provided the stated
-  conditions are met.  This License explicitly affirms your unlimited
-  permission to run the unmodified Program.  The output from running a
-  covered work is covered by this License only if the output, given its
-  content, constitutes a covered work.  This License acknowledges your
-  rights of fair use or other equivalent, as provided by copyright law.
-
-    You may make, run and propagate covered works that you do not
-  convey, without conditions so long as your license otherwise remains
-  in force.  You may convey covered works to others for the sole purpose
-  of having them make modifications exclusively for you, or provide you
-  with facilities for running those works, provided that you comply with
-  the terms of this License in conveying all material for which you do
-  not control copyright.  Those thus making or running the covered works
-  for you must do so exclusively on your behalf, under your direction
-  and control, on terms that prohibit them from making any copies of
-  your copyrighted material outside their relationship with you.
-
-    Conveying under any other circumstances is permitted solely under
-  the conditions stated below.  Sublicensing is not allowed; section 10
-  makes it unnecessary.
-
-    3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-    No covered work shall be deemed part of an effective technological
-  measure under any applicable law fulfilling obligations under article
-  11 of the WIPO copyright treaty adopted on 20 December 1996, or
-  similar laws prohibiting or restricting circumvention of such
-  measures.
-
-    When you convey a covered work, you waive any legal power to forbid
-  circumvention of technological measures to the extent such circumvention
-  is effected by exercising rights under this License with respect to
-  the covered work, and you disclaim any intention to limit operation or
-  modification of the work as a means of enforcing, against the work's
-  users, your or third parties' legal rights to forbid circumvention of
-  technological measures.
-
-    4. Conveying Verbatim Copies.
-
-    You may convey verbatim copies of the Program's source code as you
-  receive it, in any medium, provided that you conspicuously and
-  appropriately publish on each copy an appropriate copyright notice;
-  keep intact all notices stating that this License and any
-  non-permissive terms added in accord with section 7 apply to the code;
-  keep intact all notices of the absence of any warranty; and give all
-  recipients a copy of this License along with the Program.
-
-    You may charge any price or no price for each copy that you convey,
-  and you may offer support or warranty protection for a fee.
-
-    5. Conveying Modified Source Versions.
-
-    You may convey a work based on the Program, or the modifications to
-  produce it from the Program, in the form of source code under the
-  terms of section 4, provided that you also meet all of these conditions:
-
-      a) The work must carry prominent notices stating that you modified
-      it, and giving a relevant date.
-
-      b) The work must carry prominent notices stating that it is
-      released under this License and any conditions added under section
-      7.  This requirement modifies the requirement in section 4 to
-      "keep intact all notices".
-
-      c) You must license the entire work, as a whole, under this
-      License to anyone who comes into possession of a copy.  This
-      License will therefore apply, along with any applicable section 7
-      additional terms, to the whole of the work, and all its parts,
-      regardless of how they are packaged.  This License gives no
-      permission to license the work in any other way, but it does not
-      invalidate such permission if you have separately received it.
-
-      d) If the work has interactive user interfaces, each must display
-      Appropriate Legal Notices; however, if the Program has interactive
-      interfaces that do not display Appropriate Legal Notices, your
-      work need not make them do so.
-
-    A compilation of a covered work with other separate and independent
-  works, which are not by their nature extensions of the covered work,
-  and which are not combined with it such as to form a larger program,
-  in or on a volume of a storage or distribution medium, is called an
-  "aggregate" if the compilation and its resulting copyright are not
-  used to limit the access or legal rights of the compilation's users
-  beyond what the individual works permit.  Inclusion of a covered work
-  in an aggregate does not cause this License to apply to the other
-  parts of the aggregate.
-
-    6. Conveying Non-Source Forms.
-
-    You may convey a covered work in object code form under the terms
-  of sections 4 and 5, provided that you also convey the
-  machine-readable Corresponding Source under the terms of this License,
-  in one of these ways:
-
-      a) Convey the object code in, or embodied in, a physical product
-      (including a physical distribution medium), accompanied by the
-      Corresponding Source fixed on a durable physical medium
-      customarily used for software interchange.
-
-      b) Convey the object code in, or embodied in, a physical product
-      (including a physical distribution medium), accompanied by a
-      written offer, valid for at least three years and valid for as
-      long as you offer spare parts or customer support for that product
-      model, to give anyone who possesses the object code either (1) a
-      copy of the Corresponding Source for all the software in the
-      product that is covered by this License, on a durable physical
-      medium customarily used for software interchange, for a price no
-      more than your reasonable cost of physically performing this
-      conveying of source, or (2) access to copy the
-      Corresponding Source from a network server at no charge.
-
-      c) Convey individual copies of the object code with a copy of the
-      written offer to provide the Corresponding Source.  This
-      alternative is allowed only occasionally and noncommercially, and
-      only if you received the object code with such an offer, in accord
-      with subsection 6b.
-
-      d) Convey the object code by offering access from a designated
-      place (gratis or for a charge), and offer equivalent access to the
-      Corresponding Source in the same way through the same place at no
-      further charge.  You need not require recipients to copy the
-      Corresponding Source along with the object code.  If the place to
-      copy the object code is a network server, the Corresponding Source
-      may be on a different server (operated by you or a third party)
-      that supports equivalent copying facilities, provided you maintain
-      clear directions next to the object code saying where to find the
-      Corresponding Source.  Regardless of what server hosts the
-      Corresponding Source, you remain obligated to ensure that it is
-      available for as long as needed to satisfy these requirements.
-
-      e) Convey the object code using peer-to-peer transmission, provided
-      you inform other peers where the object code and Corresponding
-      Source of the work are being offered to the general public at no
-      charge under subsection 6d.
-
-    A separable portion of the object code, whose source code is excluded
-  from the Corresponding Source as a System Library, need not be
-  included in conveying the object code work.
-
-    A "User Product" is either (1) a "consumer product", which means any
-  tangible personal property which is normally used for personal, family,
-  or household purposes, or (2) anything designed or sold for incorporation
-  into a dwelling.  In determining whether a product is a consumer product,
-  doubtful cases shall be resolved in favor of coverage.  For a particular
-  product received by a particular user, "normally used" refers to a
-  typical or common use of that class of product, regardless of the status
-  of the particular user or of the way in which the particular user
-  actually uses, or expects or is expected to use, the product.  A product
-  is a consumer product regardless of whether the product has substantial
-  commercial, industrial or non-consumer uses, unless such uses represent
-  the only significant mode of use of the product.
-
-    "Installation Information" for a User Product means any methods,
-  procedures, authorization keys, or other information required to install
-  and execute modified versions of a covered work in that User Product from
-  a modified version of its Corresponding Source.  The information must
-  suffice to ensure that the continued functioning of the modified object
-  code is in no case prevented or interfered with solely because
-  modification has been made.
-
-    If you convey an object code work under this section in, or with, or
-  specifically for use in, a User Product, and the conveying occurs as
-  part of a transaction in which the right of possession and use of the
-  User Product is transferred to the recipient in perpetuity or for a
-  fixed term (regardless of how the transaction is characterized), the
-  Corresponding Source conveyed under this section must be accompanied
-  by the Installation Information.  But this requirement does not apply
-  if neither you nor any third party retains the ability to install
-  modified object code on the User Product (for example, the work has
-  been installed in ROM).
-
-    The requirement to provide Installation Information does not include a
-  requirement to continue to provide support service, warranty, or updates
-  for a work that has been modified or installed by the recipient, or for
-  the User Product in which it has been modified or installed.  Access to a
-  network may be denied when the modification itself materially and
-  adversely affects the operation of the network or violates the rules and
-  protocols for communication across the network.
-
-    Corresponding Source conveyed, and Installation Information provided,
-  in accord with this section must be in a format that is publicly
-  documented (and with an implementation available to the public in
-  source code form), and must require no special password or key for
-  unpacking, reading or copying.
-
-    7. Additional Terms.
-
-    "Additional permissions" are terms that supplement the terms of this
-  License by making exceptions from one or more of its conditions.
-  Additional permissions that are applicable to the entire Program shall
-  be treated as though they were included in this License, to the extent
-  that they are valid under applicable law.  If additional permissions
-  apply only to part of the Program, that part may be used separately
-  under those permissions, but the entire Program remains governed by
-  this License without regard to the additional permissions.
-
-    When you convey a copy of a covered work, you may at your option
-  remove any additional permissions from that copy, or from any part of
-  it.  (Additional permissions may be written to require their own
-  removal in certain cases when you modify the work.)  You may place
-  additional permissions on material, added by you to a covered work,
-  for which you have or can give appropriate copyright permission.
-
-    Notwithstanding any other provision of this License, for material you
-  add to a covered work, you may (if authorized by the copyright holders of
-  that material) supplement the terms of this License with terms:
-
-      a) Disclaiming warranty or limiting liability differently from the
-      terms of sections 15 and 16 of this License; or
-
-      b) Requiring preservation of specified reasonable legal notices or
-      author attributions in that material or in the Appropriate Legal
-      Notices displayed by works containing it; or
-
-      c) Prohibiting misrepresentation of the origin of that material, or
-      requiring that modified versions of such material be marked in
-      reasonable ways as different from the original version; or
-
-      d) Limiting the use for publicity purposes of names of licensors or
-      authors of the material; or
-
-      e) Declining to grant rights under trademark law for use of some
-      trade names, trademarks, or service marks; or
-
-      f) Requiring indemnification of licensors and authors of that
-      material by anyone who conveys the material (or modified versions of
-      it) with contractual assumptions of liability to the recipient, for
-      any liability that these contractual assumptions directly impose on
-      those licensors and authors.
-
-    All other non-permissive additional terms are considered "further
-  restrictions" within the meaning of section 10.  If the Program as you
-  received it, or any part of it, contains a notice stating that it is
-  governed by this License along with a term that is a further
-  restriction, you may remove that term.  If a license document contains
-  a further restriction but permits relicensing or conveying under this
-  License, you may add to a covered work material governed by the terms
-  of that license document, provided that the further restriction does
-  not survive such relicensing or conveying.
-
-    If you add terms to a covered work in accord with this section, you
-  must place, in the relevant source files, a statement of the
-  additional terms that apply to those files, or a notice indicating
-  where to find the applicable terms.
-
-    Additional terms, permissive or non-permissive, may be stated in the
-  form of a separately written license, or stated as exceptions;
-  the above requirements apply either way.
-
-    8. Termination.
-
-    You may not propagate or modify a covered work except as expressly
-  provided under this License.  Any attempt otherwise to propagate or
-  modify it is void, and will automatically terminate your rights under
-  this License (including any patent licenses granted under the third
-  paragraph of section 11).
-
-    However, if you cease all violation of this License, then your
-  license from a particular copyright holder is reinstated (a)
-  provisionally, unless and until the copyright holder explicitly and
-  finally terminates your license, and (b) permanently, if the copyright
-  holder fails to notify you of the violation by some reasonable means
-  prior to 60 days after the cessation.
-
-    Moreover, your license from a particular copyright holder is
-  reinstated permanently if the copyright holder notifies you of the
-  violation by some reasonable means, this is the first time you have
-  received notice of violation of this License (for any work) from that
-  copyright holder, and you cure the violation prior to 30 days after
-  your receipt of the notice.
-
-    Termination of your rights under this section does not terminate the
-  licenses of parties who have received copies or rights from you under
-  this License.  If your rights have been terminated and not permanently
-  reinstated, you do not qualify to receive new licenses for the same
-  material under section 10.
-
-    9. Acceptance Not Required for Having Copies.
-
-    You are not required to accept this License in order to receive or
-  run a copy of the Program.  Ancillary propagation of a covered work
-  occurring solely as a consequence of using peer-to-peer transmission
-  to receive a copy likewise does not require acceptance.  However,
-  nothing other than this License grants you permission to propagate or
-  modify any covered work.  These actions infringe copyright if you do
-  not accept this License.  Therefore, by modifying or propagating a
-  covered work, you indicate your acceptance of this License to do so.
-
-    10. Automatic Licensing of Downstream Recipients.
-
-    Each time you convey a covered work, the recipient automatically
-  receives a license from the original licensors, to run, modify and
-  propagate that work, subject to this License.  You are not responsible
-  for enforcing compliance by third parties with this License.
-
-    An "entity transaction" is a transaction transferring control of an
-  organization, or substantially all assets of one, or subdividing an
-  organization, or merging organizations.  If propagation of a covered
-  work results from an entity transaction, each party to that
-  transaction who receives a copy of the work also receives whatever
-  licenses to the work the party's predecessor in interest had or could
-  give under the previous paragraph, plus a right to possession of the
-  Corresponding Source of the work from the predecessor in interest, if
-  the predecessor has it or can get it with reasonable efforts.
-
-    You may not impose any further restrictions on the exercise of the
-  rights granted or affirmed under this License.  For example, you may
-  not impose a license fee, royalty, or other charge for exercise of
-  rights granted under this License, and you may not initiate litigation
-  (including a cross-claim or counterclaim in a lawsuit) alleging that
-  any patent claim is infringed by making, using, selling, offering for
-  sale, or importing the Program or any portion of it.
-
-    11. Patents.
-
-    A "contributor" is a copyright holder who authorizes use under this
-  License of the Program or a work on which the Program is based.  The
-  work thus licensed is called the contributor's "contributor version".
-
-    A contributor's "essential patent claims" are all patent claims
-  owned or controlled by the contributor, whether already acquired or
-  hereafter acquired, that would be infringed by some manner, permitted
-  by this License, of making, using, or selling its contributor version,
-  but do not include claims that would be infringed only as a
-  consequence of further modification of the contributor version.  For
-  purposes of this definition, "control" includes the right to grant
-  patent sublicenses in a manner consistent with the requirements of
-  this License.
-
-    Each contributor grants you a non-exclusive, worldwide, royalty-free
-  patent license under the contributor's essential patent claims, to
-  make, use, sell, offer for sale, import and otherwise run, modify and
-  propagate the contents of its contributor version.
-
-    In the following three paragraphs, a "patent license" is any express
-  agreement or commitment, however denominated, not to enforce a patent
-  (such as an express permission to practice a patent or covenant not to
-  sue for patent infringement).  To "grant" such a patent license to a
-  party means to make such an agreement or commitment not to enforce a
-  patent against the party.
-
-    If you convey a covered work, knowingly relying on a patent license,
-  and the Corresponding Source of the work is not available for anyone
-  to copy, free of charge and under the terms of this License, through a
-  publicly available network server or other readily accessible means,
-  then you must either (1) cause the Corresponding Source to be so
-  available, or (2) arrange to deprive yourself of the benefit of the
-  patent license for this particular work, or (3) arrange, in a manner
-  consistent with the requirements of this License, to extend the patent
-  license to downstream recipients.  "Knowingly relying" means you have
-  actual knowledge that, but for the patent license, your conveying the
-  covered work in a country, or your recipient's use of the covered work
-  in a country, would infringe one or more identifiable patents in that
-  country that you have reason to believe are valid.
-  
-    If, pursuant to or in connection with a single transaction or
-  arrangement, you convey, or propagate by procuring conveyance of, a
-  covered work, and grant a patent license to some of the parties
-  receiving the covered work authorizing them to use, propagate, modify
-  or convey a specific copy of the covered work, then the patent license
-  you grant is automatically extended to all recipients of the covered
-  work and works based on it.
-
-    A patent license is "discriminatory" if it does not include within
-  the scope of its coverage, prohibits the exercise of, or is
-  conditioned on the non-exercise of one or more of the rights that are
-  specifically granted under this License.  You may not convey a covered
-  work if you are a party to an arrangement with a third party that is
-  in the business of distributing software, under which you make payment
-  to the third party based on the extent of your activity of conveying
-  the work, and under which the third party grants, to any of the
-  parties who would receive the covered work from you, a discriminatory
-  patent license (a) in connection with copies of the covered work
-  conveyed by you (or copies made from those copies), or (b) primarily
-  for and in connection with specific products or compilations that
-  contain the covered work, unless you entered into that arrangement,
-  or that patent license was granted, prior to 28 March 2007.
-
-    Nothing in this License shall be construed as excluding or limiting
-  any implied license or other defenses to infringement that may
-  otherwise be available to you under applicable patent law.
-
-    12. No Surrender of Others' Freedom.
-
-    If conditions are imposed on you (whether by court order, agreement or
-  otherwise) that contradict the conditions of this License, they do not
-  excuse you from the conditions of this License.  If you cannot convey a
-  covered work so as to satisfy simultaneously your obligations under this
-  License and any other pertinent obligations, then as a consequence you may
-  not convey it at all.  For example, if you agree to terms that obligate you
-  to collect a royalty for further conveying from those to whom you convey
-  the Program, the only way you could satisfy both those terms and this
-  License would be to refrain entirely from conveying the Program.
-
-    13. Use with the GNU Affero General Public License.
-
-    Notwithstanding any other provision of this License, you have
-  permission to link or combine any covered work with a work licensed
-  under version 3 of the GNU Affero General Public License into a single
-  combined work, and to convey the resulting work.  The terms of this
-  License will continue to apply to the part which is the covered work,
-  but the special requirements of the GNU Affero General Public License,
-  section 13, concerning interaction through a network will apply to the
-  combination as such.
-
-    14. Revised Versions of this License.
-
-    The Free Software Foundation may publish revised and/or new versions of
-  the GNU General Public License from time to time.  Such new versions will
-  be similar in spirit to the present version, but may differ in detail to
-  address new problems or concerns.
-
-    Each version is given a distinguishing version number.  If the
-  Program specifies that a certain numbered version of the GNU General
-  Public License "or any later version" applies to it, you have the
-  option of following the terms and conditions either of that numbered
-  version or of any later version published by the Free Software
-  Foundation.  If the Program does not specify a version number of the
-  GNU General Public License, you may choose any version ever published
-  by the Free Software Foundation.
-
-    If the Program specifies that a proxy can decide which future
-  versions of the GNU General Public License can be used, that proxy's
-  public statement of acceptance of a version permanently authorizes you
-  to choose that version for the Program.
-
-    Later license versions may give you additional or different
-  permissions.  However, no additional obligations are imposed on any
-  author or copyright holder as a result of your choosing to follow a
-  later version.
-
-    15. Disclaimer of Warranty.
-
-    THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-  APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-  HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-  OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-  PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-  IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-  ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-    16. Limitation of Liability.
-
-    IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-  WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-  THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-  GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-  USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-  DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-  PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-  EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-  SUCH DAMAGES.
-
-    17. Interpretation of Sections 15 and 16.
-
-    If the disclaimer of warranty and limitation of liability provided
-  above cannot be given local legal effect according to their terms,
-  reviewing courts shall apply local law that most closely approximates
-  an absolute waiver of all civil liability in connection with the
-  Program, unless a warranty or assumption of liability accompanies a
-  copy of the Program in return for a fee.
-
-           END OF TERMS AND CONDITIONS
-
-        How to Apply These Terms to Your New Programs
-
-    If you develop a new program, and you want it to be of the greatest
-  possible use to the public, the best way to achieve this is to make it
-  free software which everyone can redistribute and change under these terms.
-
-    To do so, attach the following notices to the program.  It is safest
-  to attach them to the start of each source file to most effectively
-  state the exclusion of warranty; and each file should have at least
-  the "copyright" line and a pointer to where the full notice is found.
-
-      <one line to give the program's name and a brief idea of what it does.>
-      Copyright (C) <year>  <name of author>
-
-      This program is free software: you can redistribute it and/or modify
-      it under the terms of the GNU General Public License as published by
-      the Free Software Foundation, either version 3 of the License, or
-      (at your option) any later version.
-
-      This program is distributed in the hope that it will be useful,
-      but WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-      GNU General Public License for more details.
-
-      You should have received a copy of the GNU General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-  Also add information on how to contact you by electronic and paper mail.
-
-    If the program does terminal interaction, make it output a short
-  notice like this when it starts in an interactive mode:
-
-      <program>  Copyright (C) <year>  <name of author>
-      This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-      This is free software, and you are welcome to redistribute it
-      under certain conditions; type `show c' for details.
-
-  The hypothetical commands `show w' and `show c' should show the appropriate
-  parts of the General Public License.  Of course, your program's commands
-  might be different; for a GUI interface, you would use an "about box".
-
-    You should also get your employer (if you work as a programmer) or school,
-  if any, to sign a "copyright disclaimer" for the program, if necessary.
-  For more information on this, and how to apply and follow the GNU GPL, see
-  <http://www.gnu.org/licenses/>.
-
-    The GNU General Public License does not permit incorporating your program
-  into proprietary programs.  If your program is a subroutine library, you
-  may consider it more useful to permit linking proprietary applications with
-  the library.  If this is what you want to do, use the GNU Lesser General
-  Public License instead of this License.  But first, please read
-  <http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
-The complete text of the Apache 2.0 License is as follows:
-
-                                Apache License
-                          Version 2.0, January 2004
-                       http://www.apache.org/licenses/
-
-  TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-  1. Definitions.
-
-     "License" shall mean the terms and conditions for use, reproduction,
-     and distribution as defined by Sections 1 through 9 of this document.
-
-     "Licensor" shall mean the copyright owner or entity authorized by
-     the copyright owner that is granting the License.
-
-     "Legal Entity" shall mean the union of the acting entity and all
-     other entities that control, are controlled by, or are under common
-     control with that entity. For the purposes of this definition,
-     "control" means (i) the power, direct or indirect, to cause the
-     direction or management of such entity, whether by contract or
-     otherwise, or (ii) ownership of fifty percent (50%) or more of the
-     outstanding shares, or (iii) beneficial ownership of such entity.
-
-     "You" (or "Your") shall mean an individual or Legal Entity
-     exercising permissions granted by this License.
-
-     "Source" form shall mean the preferred form for making modifications,
-     including but not limited to software source code, documentation
-     source, and configuration files.
-
-     "Object" form shall mean any form resulting from mechanical
-     transformation or translation of a Source form, including but
-     not limited to compiled object code, generated documentation,
-     and conversions to other media types.
-
-     "Work" shall mean the work of authorship, whether in Source or
-     Object form, made available under the License, as indicated by a
-     copyright notice that is included in or attached to the work
-     (an example is provided in the Appendix below).
-
-     "Derivative Works" shall mean any work, whether in Source or Object
-     form, that is based on (or derived from) the Work and for which the
-     editorial revisions, annotations, elaborations, or other modifications
-     represent, as a whole, an original work of authorship. For the purposes
-     of this License, Derivative Works shall not include works that remain
-     separable from, or merely link (or bind by name) to the interfaces of,
-     the Work and Derivative Works thereof.
-
-     "Contribution" shall mean any work of authorship, including
-     the original version of the Work and any modifications or additions
-     to that Work or Derivative Works thereof, that is intentionally
-     submitted to Licensor for inclusion in the Work by the copyright owner
-     or by an individual or Legal Entity authorized to submit on behalf of
-     the copyright owner. For the purposes of this definition, "submitted"
-     means any form of electronic, verbal, or written communication sent
-     to the Licensor or its representatives, including but not limited to
-     communication on electronic mailing lists, source code control systems,
-     and issue tracking systems that are managed by, or on behalf of, the
-     Licensor for the purpose of discussing and improving the Work, but
-     excluding communication that is conspicuously marked or otherwise
-     designated in writing by the copyright owner as "Not a Contribution."
-
-     "Contributor" shall mean Licensor and any individual or Legal Entity
-     on behalf of whom a Contribution has been received by Licensor and
-     subsequently incorporated within the Work.
-
-  2. Grant of Copyright License. Subject to the terms and conditions of
-     this License, each Contributor hereby grants to You a perpetual,
-     worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-     copyright license to reproduce, prepare Derivative Works of,
-     publicly display, publicly perform, sublicense, and distribute the
-     Work and such Derivative Works in Source or Object form.
-
-  3. Grant of Patent License. Subject to the terms and conditions of
-     this License, each Contributor hereby grants to You a perpetual,
-     worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-     (except as stated in this section) patent license to make, have made,
-     use, offer to sell, sell, import, and otherwise transfer the Work,
-     where such license applies only to those patent claims licensable
-     by such Contributor that are necessarily infringed by their
-     Contribution(s) alone or by combination of their Contribution(s)
-     with the Work to which such Contribution(s) was submitted. If You
-     institute patent litigation against any entity (including a
-     cross-claim or counterclaim in a lawsuit) alleging that the Work
-     or a Contribution incorporated within the Work constitutes direct
-     or contributory patent infringement, then any patent licenses
-     granted to You under this License for that Work shall terminate
-     as of the date such litigation is filed.
-
-  4. Redistribution. You may reproduce and distribute copies of the
-     Work or Derivative Works thereof in any medium, with or without
-     modifications, and in Source or Object form, provided that You
-     meet the following conditions:
-
-     (a) You must give any other recipients of the Work or
-         Derivative Works a copy of this License; and
-
-     (b) You must cause any modified files to carry prominent notices
-         stating that You changed the files; and
-
-     (c) You must retain, in the Source form of any Derivative Works
-         that You distribute, all copyright, patent, trademark, and
-         attribution notices from the Source form of the Work,
-         excluding those notices that do not pertain to any part of
-         the Derivative Works; and
-
-     (d) If the Work includes a "NOTICE" text file as part of its
-         distribution, then any Derivative Works that You distribute must
-         include a readable copy of the attribution notices contained
-         within such NOTICE file, excluding those notices that do not
-         pertain to any part of the Derivative Works, in at least one
-         of the following places: within a NOTICE text file distributed
-         as part of the Derivative Works; within the Source form or
-         documentation, if provided along with the Derivative Works; or,
-         within a display generated by the Derivative Works, if and
-         wherever such third-party notices normally appear. The contents
-         of the NOTICE file are for informational purposes only and
-         do not modify the License. You may add Your own attribution
-         notices within Derivative Works that You distribute, alongside
-         or as an addendum to the NOTICE text from the Work, provided
-         that such additional attribution notices cannot be construed
-         as modifying the License.
-
-     You may add Your own copyright statement to Your modifications and
-     may provide additional or different license terms and conditions
-     for use, reproduction, or distribution of Your modifications, or
-     for any such Derivative Works as a whole, provided Your use,
-     reproduction, and distribution of the Work otherwise complies with
-     the conditions stated in this License.
-
-  5. Submission of Contributions. Unless You explicitly state otherwise,
-     any Contribution intentionally submitted for inclusion in the Work
-     by You to the Licensor shall be under the terms and conditions of
-     this License, without any additional terms or conditions.
-     Notwithstanding the above, nothing herein shall supersede or modify
-     the terms of any separate license agreement you may have executed
-     with Licensor regarding such Contributions.
-
-  6. Trademarks. This License does not grant permission to use the trade
-     names, trademarks, service marks, or product names of the Licensor,
-     except as required for reasonable and customary use in describing the
-     origin of the Work and reproducing the content of the NOTICE file.
-
-  7. Disclaimer of Warranty. Unless required by applicable law or
-     agreed to in writing, Licensor provides the Work (and each
-     Contributor provides its Contributions) on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-     implied, including, without limitation, any warranties or conditions
-     of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-     PARTICULAR PURPOSE. You are solely responsible for determining the
-     appropriateness of using or redistributing the Work and assume any
-     risks associated with Your exercise of permissions under this License.
-
-  8. Limitation of Liability. In no event and under no legal theory,
-     whether in tort (including negligence), contract, or otherwise,
-     unless required by applicable law (such as deliberate and grossly
-     negligent acts) or agreed to in writing, shall any Contributor be
-     liable to You for damages, including any direct, indirect, special,
-     incidental, or consequential damages of any character arising as a
-     result of this License or out of the use or inability to use the
-     Work (including but not limited to damages for loss of goodwill,
-     work stoppage, computer failure or malfunction, or any and all
-     other commercial damages or losses), even if such Contributor
-     has been advised of the possibility of such damages.
-
-  9. Accepting Warranty or Additional Liability. While redistributing
-     the Work or Derivative Works thereof, You may choose to offer,
-     and charge a fee for, acceptance of support, warranty, indemnity,
-     or other liability obligations and/or rights consistent with this
-     License. However, in accepting such obligations, You may act only
-     on Your own behalf and on Your sole responsibility, not on behalf
-     of any other Contributor, and only if You agree to indemnify,
-     defend, and hold each Contributor harmless for any liability
-     incurred by, or claims asserted against, such Contributor by reason
-     of your accepting any such warranty or additional liability.
-
-  END OF TERMS AND CONDITIONS
-
-  APPENDIX: How to apply the Apache License to your work.
-
-     To apply the Apache License to your work, attach the following
-     boilerplate notice, with the fields enclosed by brackets "[]"
-     replaced with your own identifying information. (Don't include
-     the brackets!)  The text should be enclosed in the appropriate
-     comment syntax for the file format. We also recommend that a
-     file or class name and description of purpose be included on the
-     same "printed page" as the copyright notice for easier
-     identification within third-party archives.
-
-  Copyright [yyyy] [name of copyright owner]
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-The complete text of the BSD license can be is as follows:
-
-  Copyright (c) The Regents of the University of California.
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-  3. Neither the name of the University nor the names of its contributors
-     may be used to endorse or promote products derived from this software
-     without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-  SUCH DAMAGE.
-
-The complete text of the Apache Software License Version 1.1 is as follows:
-
- /*                                      
-  * ================================================================
-  *                   The Apache Software License, Version 1.1
-  * ================================================================
-  * 
-  *    Copyright (C) 2000-2002 The Apache Software Foundation. All
-  *    rights reserved.
-  * 
-  * Redistribution and use in source and binary forms, with or without 
-  * modification, are permitted provided that the following
-  * conditions are met:
-  * 
-  * 1. Redistributions of  source code must  retain the above copyright
-  *    notice, this list of conditions and the following disclaimer.
-  * 
-  * 2. Redistributions in binary form must reproduce the above copyright
-  *    notice, this list of conditions and the following disclaimer in
-  *    the documentation and/or other materials provided with the 
-  *    distribution.
-  * 
-  * 3. The end-user documentation included with the redistribution, if
-  *    any, must include  the following  acknowledgment:  "This product
-  *    includes  software developed  by the  Apache Software Foundation
-  *    (http://www.apache.org/)." Alternately, this  acknowledgment may
-  *    appear in the software itself, if and wherever such third-party
-  *    acknowledgments normally appear.
-  * 
-  * 4. The names "Ant" and  "Apache Software Foundation" must not be
-  *    used to endorse  or promote  products derived  from this software
-  *    without prior written permission. For written permission, please
-  *    contact apache@apache.org.
-  * 
-  * 5. Products derived from this software may not  be called "Apache",
-  *    nor may "Apache" appear  in their name,  without prior written
-  *    permission of the Apache Software Foundation.
-  * 
-  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
-  * OF MERCHANTABILITY AND FITNESS  FOR A PARTICULAR PURPOSE ARE 
-  * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION
-  * OR ITS CONTRIBUTORS BE LIABLE FOR  ANY DIRECT, INDIRECT, INCIDENTAL,
-  * SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLUDING, BUT NOT
-  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  * DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
-  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-  * TORT (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN ANY WAY OUT
-  * OF THE  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-  * OF SUCH DAMAGE.
-  * 
-  * This software  consists of voluntary contributions made by many
-  * individuals on behalf of the  Apache Software Foundation. For more
-  * information on the Apache Software Foundation, please see
-  * <http://www.apache.org/>.
-  *
-  */
-
-The complete text of the MIT license is as follows:
-
-  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.
-
-The complete text of the Eclipse Public License v1.0 is as follows:
-
-  Eclipse Public License - v 1.0
-  
-  THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
-  LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-  CONSTITUTES RECIPIENT’S ACCEPTANCE OF THIS AGREEMENT.
-  
-  1. DEFINITIONS
-  
-  "Contribution" means:
-  
-  a) in the case of the initial Contributor, the initial code and documentation
-  distributed under this Agreement, and
-  b) in the case of each subsequent Contributor:
-  
-  i) changes to the Program, and
-  
-  ii) additions to the Program;
-  
-  where such changes and/or additions to the Program originate from and are
-  distributed by that particular Contributor. A Contribution 'originates' from a
-  Contributor if it was added to the Program by such Contributor itself or anyone
-  acting on such Contributor’s behalf. Contributions do not include additions to
-  the Program which: (i) are separate modules of software distributed in
-  conjunction with the Program under their own license agreement, and (ii) are not
-  derivative works of the Program.
-  
-  "Contributor" means any person or entity that distributes the Program.
-  
-  "Licensed Patents " mean patent claims licensable by a Contributor which are
-  necessarily infringed by the use or sale of its Contribution alone or when
-  combined with the Program.
-  
-  "Program" means the Contributions distributed in accordance with this Agreement.
-  
-  "Recipient" means anyone who receives the Program under this Agreement,
-  including all Contributors.
-  
-  2. GRANT OF RIGHTS
-  
-  a) Subject to the terms of this Agreement, each Contributor hereby grants
-  Recipient a non-exclusive, worldwide, royalty-free copyright license to
-  reproduce, prepare derivative works of, publicly display, publicly perform,
-  distribute and sublicense the Contribution of such Contributor, if any, and such
-  derivative works, in source code and object code form.
-  
-  b) Subject to the terms of this Agreement, each Contributor hereby grants
-  Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
-  Patents to make, use, sell, offer to sell, import and otherwise transfer the
-  Contribution of such Contributor, if any, in source code and object code form.
-  This patent license shall apply to the combination of the Contribution and the
-  Program if, at the time the Contribution is added by the Contributor, such
-  addition of the Contribution causes such combination to be covered by the
-  Licensed Patents. The patent license shall not apply to any other combinations
-  which include the Contribution. No hardware per se is licensed hereunder.
-  
-  c) Recipient understands that although each Contributor grants the licenses to
-  its Contributions set forth herein, no assurances are provided by any
-  Contributor that the Program does not infringe the patent or other intellectual
-  property rights of any other entity. Each Contributor disclaims any liability to
-  Recipient for claims brought by any other entity based on infringement of
-  intellectual property rights or otherwise. As a condition to exercising the
-  rights and licenses granted hereunder, each Recipient hereby assumes sole
-  responsibility to secure any other intellectual property rights needed, if any.
-  For example, if a third party patent license is required to allow Recipient to
-  distribute the Program, it is Recipient’s responsibility to acquire that license
-  before distributing the Program.
-  
-  d) Each Contributor represents that to its knowledge it has sufficient copyright
-  rights in its Contribution, if any, to grant the copyright license set forth in
-  this Agreement.
-  
-  3. REQUIREMENTS
-  
-  A Contributor may choose to distribute the Program in object code form under its
-  own license agreement, provided that:
-  
-  a) it complies with the terms and conditions of this Agreement; and
-  
-  b) its license agreement:
-  
-  i) effectively disclaims on behalf of all Contributors all warranties and
-  conditions, express and implied, including warranties or conditions of title and
-  non-infringement, and implied warranties or conditions of merchantability and
-  fitness for a particular purpose;
-  
-  ii) effectively excludes on behalf of all Contributors all liability for
-  damages, including direct, indirect, special, incidental and consequential
-  damages, such as lost profits;
-  
-  iii) states that any provisions which differ from this Agreement are offered by
-  that Contributor alone and not by any other party; and
-  
-  iv) states that source code for the Program is available from such Contributor,
-  and informs licensees how to obtain it in a reasonable manner on or through a
-  medium customarily used for software exchange.
-  
-  When the Program is made available in source code form:
-  
-  a) it must be made available under this Agreement; and
-  b) a copy of this Agreement must be included with each copy of the Program.
-  
-  Contributors may not remove or alter any copyright notices contained within the
-  Program.
-  
-  Each Contributor must identify itself as the originator of its Contribution, if
-  any, in a manner that reasonably allows subsequent Recipients to identify the
-  originator of the Contribution.
-  
-  4. COMMERCIAL DISTRIBUTION
-  
-  Commercial distributors of software may accept certain responsibilities with
-  respect to end users, business partners and the like. While this license is
-  intended to facilitate the commercial use of the Program, the Contributor who
-  includes the Program in a commercial product offering should do so in a manner
-  which does not create potential liability for other Contributors. Therefore, if
-  a Contributor includes the Program in a commercial product offering, such
-  Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-  every other Contributor ("Indemnified Contributor") against any losses, damages
-  and costs (collectively "Losses") arising from claims, lawsuits and other legal
-  actions brought by a third party against the Indemnified Contributor to the
-  extent caused by the acts or omissions of such Commercial Contributor in
-  connection with its distribution of the Program in a commercial product
-  offering. The obligations in this section do not apply to any claims or Losses
-  relating to any actual or alleged intellectual property infringement. In order
-  to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-  Contributor in writing of such claim, and b) allow the Commercial Contributor to
-  control, and cooperate with the Commercial Contributor in, the defense and any
-  related settlement negotiations. The Indemnified Contributor may participate in
-  any such claim at its own expense.
-  
-  For example, a Contributor might include the Program in a commercial product
-  offering, Product X. That Contributor is then a Commercial Contributor. If that
-  Commercial Contributor then makes performance claims, or offers warranties
-  related to Product X, those performance claims and warranties are such
-  Commercial Contributor’s responsibility alone. Under this section, the
-  Commercial Contributor would have to defend claims against the other
-  Contributors related to those performance claims and warranties, and if a court
-  requires any other Contributor to pay any damages as a result, the Commercial
-  Contributor must pay those damages.
-  
-  5. NO WARRANTY
-  
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-  IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-  NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-  Recipient is solely responsible for determining the appropriateness of using and
-  distributing the Program and assumes all risks associated with its exercise of
-  rights under this Agreement , including but not limited to the risks and costs
-  of program errors, compliance with applicable laws, damage to or loss of data,
-  programs or equipment, and unavailability or interruption of operations.
-  
-  6. DISCLAIMER OF LIABILITY
-  
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-  CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-  PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-  OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-  GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-  
-  7. GENERAL
-  
-  If any provision of this Agreement is invalid or unenforceable under applicable
-  law, it shall not affect the validity or enforceability of the remainder of the
-  terms of this Agreement, and without further action by the parties hereto, such
-  provision shall be reformed to the minimum extent necessary to make such
-  provision valid and enforceable.
-  
-  If Recipient institutes patent litigation against any entity (including a
-  cross-claim or counterclaim in a lawsuit) alleging that the Program itself
-  (excluding combinations of the Program with other software or hardware)
-  infringes such Recipient’s patent(s), then such Recipient’s rights granted under
-  Section 2(b) shall terminate as of the date such litigation is filed.
-  
-  All Recipient’s rights under this Agreement shall terminate if it fails to
-  comply with any of the material terms or conditions of this Agreement and does
-  not cure such failure in a reasonable period of time after becoming aware of
-  such noncompliance. If all Recipient’s rights under this Agreement terminate,
-  Recipient agrees to cease use and distribution of the Program as soon as
-  reasonably practicable. However, Recipient’s obligations under this Agreement
-  and any licenses granted by Recipient relating to the Program shall continue and
-  survive.
-  
-  Everyone is permitted to copy and distribute copies of this Agreement, but in
-  order to avoid inconsistency the Agreement is copyrighted and may only be
-  modified in the following manner. The Agreement Steward reserves the right to
-  publish new versions (including revisions) of this Agreement from time to time.
-  No one other than the Agreement Steward has the right to modify this Agreement.
-  The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation
-  may assign the responsibility to serve as the Agreement Steward to a suitable
-  separate entity. Each new version of the Agreement will be given a
-  distinguishing version number. The Program (including Contributions) may always
-  be distributed subject to the version of the Agreement under which it was
-  received. In addition, after a new version of the Agreement is published,
-  Contributor may elect to distribute the Program (including its Contributions)
-  under the new version. Except as expressly stated in Sections 2(a) and 2(b)
-  above, Recipient receives no rights or licenses to the intellectual property of
-  any Contributor under this Agreement, whether expressly, by implication,
-  estoppel or otherwise. All rights in the Program not expressly granted under
-  this Agreement are reserved.
-  
-  This Agreement is governed by the laws of the State of New York and the
-  intellectual property laws of the United States of America. No party to this
-  Agreement will bring a legal action under this Agreement more than one year
-  after the cause of action arose. Each party waives its rights to a jury trial in
-  any resulting litigation.
diff --git a/tools/dependencies-report/src/main/resources/notices/jnr-x86asm-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jnr-x86asm-NOTICE.txt
deleted file mode 100644
index 87ace0005..000000000
--- a/tools/dependencies-report/src/main/resources/notices/jnr-x86asm-NOTICE.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-source: https://github.com/jnr/jnr-x86asm/blob/1.0.2/LICENSE
-
- Copyright (C) 2010 Wayne Meissner
- Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr@gmail.com>
-
- 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.
diff --git a/tools/dependencies-report/src/main/resources/notices/joda-time-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/joda-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/joda-time-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/joda-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/joni-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/joni-NOTICE.txt
deleted file mode 100644
index 7eb6908d6..000000000
--- a/tools/dependencies-report/src/main/resources/notices/joni-NOTICE.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-source: https://github.com/jruby/joni/blob/joni-2.1.16/LICENSE
-
-MIT License
-
-Copyright (c) 2017 JRuby Team
-
-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.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/jrjackson-0.4.6-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jrjackson-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/jrjackson-0.4.6-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/jrjackson-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/jruby-9.1.14.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jruby-9.1.14.0-NOTICE.txt
deleted file mode 100644
index b2d729c89..000000000
--- a/tools/dependencies-report/src/main/resources/notices/jruby-9.1.14.0-NOTICE.txt
+++ /dev/null
@@ -1,342 +0,0 @@
-source: https://github.com/jruby/jruby/blob/9.1.14.0/COPYING#L1-L340
-
-JRuby is Copyright (c) 2007-2017 The JRuby project, and is released
-under a tri EPL/GPL/LGPL license. You can use it, redistribute it
-and/or modify it under the terms of the:
-
-  Eclipse Public License version 1.0
-    OR
-  GNU General Public License version 2
-    OR
-  GNU Lesser General Public License version 2.1
-
-bytelist (http://github.com/jruby/bytelist),
-jnr-posix (https://github.com/jnr/jnr-posix),
-jruby-openssl (https://github.com/jruby/jruby-openssl),
-jruby-readline (https://github.com/jruby/jruby-readline),
-psych (https://github.com/ruby/psych),
-yydebug (http://svn.codehaus.org/jruby/trunk/jay/yydebug)
-are released under the same copyright/license.
-
-Some additional libraries distributed with JRuby are not covered by
-JRuby's licence. Most of these libraries and their licenses are listed
-below. Also see LICENSE.RUBY for most files found in lib/ruby/stdlib.
-
- bench/rails/public/javascripts/* are distributed under the MIT
- license, and have the following copyrights:
-
-   controls.js is Copyright:
-   (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-   (c) 2005-2007 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
-   (c) 2005-2007 Jon Tirsen (http://www.tirsen.com)
-
-   dragdrop.js is Copyright:
-   (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-   (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
-
-   effect.js is Copyright (c) 2005-2008 Thomas Fuchs.
-
-   prototype.js is Copyright (c) 2005-2007 Sam Stephenson.
-
- asm (http://asm.objectweb.org) is distributed under the BSD license and is
-
-   Copyright (c) 2000-2011 INRIA, France Telecom
-   All rights reserved.
-
- jline2 (https://github.com/jline/jline2) is distributed under the BSD license:
-
-   Copyright (c) 2002-2012, the original author or authors.
-   All rights reserved.
-
- jzlib (http://www.jcraft.com/jzlib/) is distributed under the BSD license:
-
-   Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved.
-
- The "rake" library (http://rake.rubyforge.org/) is distributed under
- the MIT license, and has the following copyright:
-
-   Copyright (c) 2003, 2004 Jim Weirich
-
- jcodings (http://github.com/jruby/jcodings) and
- joni (http://github.com/jruby/joni) are distributed
- under the MIT license without copyright.
-
- Bouncycastle is released under the MIT license:
-
-   Copyright (c) 2000 - 2006 The Legion Of The Bouncy Castle.
-
- jnr-x86asm (https://github.com/jnr/jnr-x86asm) is distributed under the MIT
- license with the following copyright:
-
-   Copyright (C) 2010 Wayne Meissner
-   Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr@gmail.com>
-
- The following libraries are redistributed under the Apache Software
- License v2.0, available below.
-   invokebinder (https://github.com/headius/invokebinder)
-   jffi (https://github.com/jnr/jffi)
-   jitescript (https://github.com/qmx/jitescript)
-   jnr-constants (http://github.com/jnr/jnr-constants)
-   jnr-enxio (https://github.com/jnr/jnr-enxio)
-   jnr-ffi (https://github.com/jnr/jnr-jffi)
-   jnr-netdb (http://github.com/jnr/jnr-netdb)
-   jnr-unixsocket (https://github.com/jnr/jnr-unixsocket)
-   joda-time (http://joda-time.sourceforge.net)
-   maven (http://maven.apache.org/)
-   nailgun (http://martiansoftware.com/nailgun)
-   options (https://github.com/headius/options)
-   snakeyaml (https://github.com/asomov/snakeyaml)
-   unsafe-fences (https://github.com/headius/unsafe-fences)
-
- racc (runtime only, https://github.com/tenderlove/racc) is
-   distributed under the same license terms as the Ruby standard
-   library. This includes all files under lib/ruby/stdlib/racc.
-   See LICENSE.RUBY.
-
- json-generator and json-parser (https://github.com/flori/json) native
-   extenstions under the same license terms as the Ruby standard library.
-   See LICENSE.RUBY
-
-The complete text of the Eclipse Public License is as follows:
-
-  Eclipse Public License - v 1.0
-
-  THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-  PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-  OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-  1. DEFINITIONS
-
-  "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial code and
-         documentation distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor:
-
-          i) changes to the Program, and
-
-          ii) additions to the Program;
-              where such changes and/or additions to the Program
-              originate from and are distributed by that particular
-              Contributor. A Contribution 'originates' from a
-              Contributor if it was added to the Program by such
-              Contributor itself or anyone acting on such
-              Contributor's behalf. Contributions do not include
-              additions to the Program which: (i) are separate modules
-              of software distributed in conjunction with the Program
-              under their own license agreement, and (ii) are not
-              derivative works of the Program.
-
-  "Contributor" means any person or entity that distributes the Program.
-
-  "Licensed Patents" mean patent claims licensable by a Contributor
-  which are necessarily infringed by the use or sale of its
-  Contribution alone or when combined with the Program.
-
-  "Program" means the Contributions distributed in accordance with
-  this Agreement.
-
-  "Recipient" means anyone who receives the Program under this
-  Agreement, including all Contributors.
-
-  2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor
-         hereby grants Recipient a non-exclusive, worldwide,
-         royalty-free copyright license to reproduce, prepare
-         derivative works of, publicly display, publicly perform,
-         distribute and sublicense the Contribution of such
-         Contributor, if any, and such derivative works, in source
-         code and object code form.
-
-      b) Subject to the terms of this Agreement, each Contributor
-         hereby grants Recipient a non-exclusive, worldwide,
-         royalty-free patent license under Licensed Patents to make,
-         use, sell, offer to sell, import and otherwise transfer the
-         Contribution of such Contributor, if any, in source code and
-         object code form. This patent license shall apply to the
-         combination of the Contribution and the Program if, at the
-         time the Contribution is added by the Contributor, such
-         addition of the Contribution causes such combination to be
-         covered by the Licensed Patents. The patent license shall not
-         apply to any other combinations which include the
-         Contribution. No hardware per se is licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants
-         the licenses to its Contributions set forth herein, no
-         assurances are provided by any Contributor that the Program
-         does not infringe the patent or other intellectual property
-         rights of any other entity. Each Contributor disclaims any
-         liability to Recipient for claims brought by any other entity
-         based on infringement of intellectual property rights or
-         otherwise. As a condition to exercising the rights and
-         licenses granted hereunder, each Recipient hereby assumes
-         sole responsibility to secure any other intellectual property
-         rights needed, if any. For example, if a third party patent
-         license is required to allow Recipient to distribute the
-         Program, it is Recipient's responsibility to acquire that
-         license before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-         sufficient copyright rights in its Contribution, if any, to
-         grant the copyright license set forth in this Agreement.
-
-  3. REQUIREMENTS
-
-  A Contributor  may choose to  distribute the Program in  object code
-  form under its own license agreement, provided that:
-
-      a) it complies with the terms and conditions of this Agreement; and
-
-      b) its license agreement:
-
-          i) effectively disclaims on behalf of all Contributors all
-             warranties and conditions, express and implied, including
-             warranties or conditions of title and non-infringement,
-             and implied warranties or conditions of merchantability
-             and fitness for a particular purpose;
-
-          ii) effectively excludes on behalf of all Contributors all
-              liability for damages, including direct, indirect,
-              special, incidental and consequential damages, such as
-              lost profits;
-
-          iii) states that any provisions which differ from this
-               Agreement are offered by that Contributor alone and not
-               by any other party; and
-
-          iv) states that source code for the Program is available
-              from such Contributor, and informs licensees how to
-              obtain it in a reasonable manner on or through a medium
-              customarily used for software exchange.
-
-  When the Program is made available in source code form:
-
-      a) it must be made available under this Agreement; and
-
-      b) a copy of this Agreement must be included with each copy of
-         the Program.
-
-  Contributors may not remove or alter any copyright notices contained
-  within the Program.
-
-  Each Contributor must identify itself as the originator of its
-  Contribution, if any, in a manner that reasonably allows subsequent
-  Recipients to identify the originator of the Contribution.
-
-  4. COMMERCIAL DISTRIBUTION
-
-  Commercial distributors of software may accept certain
-  responsibilities with respect to end users, business partners and
-  the like. While this license is intended to facilitate the
-  commercial use of the Program, the Contributor who includes the
-  Program in a commercial product offering should do so in a manner
-  which does not create potential liability for other Contributors.
-  Therefore, if a Contributor includes the Program in a commercial
-  product offering, such Contributor ("Commercial Contributor") hereby
-  agrees to defend and indemnify every other Contributor ("Indemnified
-  Contributor") against any losses, damages and costs (collectively
-  "Losses") arising from claims, lawsuits and other legal actions
-  brought by a third party against the Indemnified Contributor to the
-  extent caused by the acts or omissions of such Commercial
-  Contributor in connection with its distribution of the Program in a
-  commercial product offering. The obligations in this section do not
-  apply to any claims or Losses relating to any actual or alleged
-  intellectual property infringement. In order to qualify, an
-  Indemnified Contributor must: a) promptly notify the Commercial
-  Contributor in writing of such claim, and b) allow the Commercial
-  Contributor to control, and cooperate with the Commercial
-  Contributor in, the defense and any related settlement negotiations.
-  The Indemnified Contributor may participate in any such claim at its
-  own expense.
-
-  For example, a Contributor might include the Program in a commercial
-  product offering, Product X. That Contributor is then a Commercial
-  Contributor. If that Commercial Contributor then makes performance
-  claims, or offers warranties related to Product X, those performance
-  claims and warranties are such Commercial Contributor's
-  responsibility alone. Under this section, the Commercial Contributor
-  would have to defend claims against the other Contributors related
-  to those performance claims and warranties, and if a court requires
-  any other Contributor to pay any damages as a result, the Commercial
-  Contributor must pay those damages.
-
-  5. NO WARRANTY
-
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-  PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-  ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-  ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-  MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient
-  is solely responsible for determining the appropriateness of using
-  and distributing the Program and assumes all risks associated with
-  its exercise of rights under this Agreement , including but not
-  limited to the risks and costs of program errors, compliance with
-  applicable laws, damage to or loss of data, programs or equipment,
-  and unavailability or interruption of operations.
-
-  6. DISCLAIMER OF LIABILITY
-
-  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-  NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT,
-  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON
-  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-  THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-  GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-  DAMAGES.
-
-  7. GENERAL
-
-  If any provision of this Agreement is invalid or unenforceable under
-  applicable law, it shall not affect the validity or enforceability
-  of the remainder of the terms of this Agreement, and without further
-  action by the parties hereto, such provision shall be reformed to
-  the minimum extent necessary to make such provision valid and
-  enforceable.
-
-  If Recipient institutes patent litigation against any entity
-  (including a cross-claim or counterclaim in a lawsuit) alleging that
-  the Program itself (excluding combinations of the Program with other
-  software or hardware) infringes such Recipient's patent(s), then
-  such Recipient's rights granted under Section 2(b) shall terminate
-  as of the date such litigation is filed.
-
-  All Recipient's rights under this Agreement shall terminate if it
-  fails to comply with any of the material terms or conditions of this
-  Agreement and does not cure such failure in a reasonable period of
-  time after becoming aware of such noncompliance. If all Recipient's
-  rights under this Agreement terminate, Recipient agrees to cease use
-  and distribution of the Program as soon as reasonably practicable.
-  However, Recipient's obligations under this Agreement and any
-  licenses granted by Recipient relating to the Program shall continue
-  and survive.
-
-  Everyone is permitted to copy and distribute copies of this
-  Agreement, but in order to avoid inconsistency the Agreement is
-  copyrighted and may only be modified in the following manner. The
-  Agreement Steward reserves the right to publish new versions
-  (including revisions) of this Agreement from time to time. No one
-  other than the Agreement Steward has the right to modify this
-  Agreement. The Eclipse Foundation is the initial Agreement Steward.
-  The Eclipse Foundation may assign the responsibility to serve as the
-  Agreement Steward to a suitable separate entity. Each new version of
-  the Agreement will be given a distinguishing version number. The
-  Program (including Contributions) may always be distributed subject
-  to the version of the Agreement under which it was received. In
-  addition, after a new version of the Agreement is published,
-  Contributor may elect to distribute the Program (including its
-  Contributions) under the new version. Except as expressly stated in
-  Sections 2(a) and 2(b) above, Recipient receives no rights or
-  licenses to the intellectual property of any Contributor under this
-  Agreement, whether expressly, by implication, estoppel or otherwise.
-  All rights in the Program not expressly granted under this Agreement
-  are reserved.
-
-  This Agreement is governed by the laws of the State of New York and
-  the intellectual property laws of the United States of America. No
-  party to this Agreement will bring a legal action under this
-  Agreement more than one year after the cause of action arose. Each
-  party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/jruby-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jruby-NOTICE.txt
new file mode 100644
index 000000000..e1f33ed12
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/jruby-NOTICE.txt
@@ -0,0 +1,2459 @@
+JRuby is Copyright (c) 2007-2018 The JRuby project, and is released
+under a tri EPL/GPL/LGPL license. You can use it, redistribute it
+and/or modify it under the terms of the:
+
+  Eclipse Public License version 2.0
+    OR
+  GNU General Public License version 2
+    OR
+  GNU Lesser General Public License version 2.1
+
+bytelist (http://github.com/jruby/bytelist),
+jnr-posix (https://github.com/jnr/jnr-posix),
+jruby-openssl (https://github.com/jruby/jruby-openssl),
+jruby-readline (https://github.com/jruby/jruby-readline),
+psych (https://github.com/ruby/psych),
+yydebug (https://github.com/jruby/jay-yydebug/)
+are released under the same copyright/license.
+
+Some additional libraries distributed with JRuby are not covered by
+JRuby's licence. Most of these libraries and their licenses are listed 
+below. Also see LICENSE.RUBY for most files found in lib/ruby/stdlib.
+
+ asm (http://asm.objectweb.org) is distributed under the BSD license and is
+
+   Copyright (c) 2000-2011 INRIA, France Telecom
+   All rights reserved.
+
+ jline2 (https://github.com/jline/jline2) is distributed under the BSD license:
+
+   Copyright (c) 2002-2012, the original author or authors.
+   All rights reserved.
+
+ jzlib (http://www.jcraft.com/jzlib/) is distributed under the BSD license:
+
+   Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved.
+
+ The "rake" library (https://github.com/ruby/rake) is distributed under
+ the MIT license, and has the following copyright:
+   
+   Copyright (c) 2003, 2004 Jim Weirich
+
+ jcodings (http://github.com/jruby/jcodings) and
+ joni (http://github.com/jruby/joni) are distributed
+ under the MIT license without copyright.
+
+ Bouncycastle is released under the MIT license:
+
+   Copyright (c) 2000 - 2006 The Legion Of The Bouncy Castle.
+
+ jnr-x86asm (https://github.com/jnr/jnr-x86asm) is distributed under the MIT
+ license with the following copyright:
+
+   Copyright (C) 2010 Wayne Meissner
+   Copyright (c) 2008-2009, Petr Kobalicek <kobalicek.petr@gmail.com>
+
+ The following libraries are redistributed under the Apache Software
+ License v2.0, available below.
+   invokebinder (https://github.com/headius/invokebinder)
+   jffi (https://github.com/jnr/jffi)
+   jitescript (https://github.com/qmx/jitescript)
+   jnr-constants (http://github.com/jnr/jnr-constants)
+   jnr-enxio (https://github.com/jnr/jnr-enxio)
+   jnr-ffi (https://github.com/jnr/jnr-jffi)
+   jnr-netdb (http://github.com/jnr/jnr-netdb)
+   jnr-unixsocket (https://github.com/jnr/jnr-unixsocket)
+   joda-time (http://joda-time.sourceforge.net)
+   maven (http://maven.apache.org/)
+   nailgun (http://martiansoftware.com/nailgun)
+   options (https://github.com/headius/options)
+   snakeyaml (https://github.com/asomov/snakeyaml)
+   unsafe-fences (https://github.com/headius/unsafe-fences)
+
+ racc (runtime only, https://github.com/tenderlove/racc) is
+   distributed under the same license terms as the Ruby standard
+   library. This includes all files under lib/ruby/stdlib/racc.
+   See LICENSE.RUBY.
+
+ json-generator and json-parser (https://github.com/flori/json) native
+   extenstions under the same license terms as the Ruby standard library.
+   See LICENSE.RUBY
+
+The complete text of the Eclipse Public License is as follows:
+
+  Eclipse Public License - v 2.0
+
+      THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+      PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+      OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+  1. DEFINITIONS
+
+  "Contribution" means:
+
+    a) in the case of the initial Contributor, the initial content
+       Distributed under this Agreement, and
+
+    b) in the case of each subsequent Contributor:
+       i) changes to the Program, and
+       ii) additions to the Program;
+    where such changes and/or additions to the Program originate from
+    and are Distributed by that particular Contributor. A Contribution
+    "originates" from a Contributor if it was added to the Program by
+    such Contributor itself or anyone acting on such Contributor's behalf.
+    Contributions do not include changes or additions to the Program that
+    are not Modified Works.
+
+  "Contributor" means any person or entity that Distributes the Program.
+
+  "Licensed Patents" mean patent claims licensable by a Contributor which
+  are necessarily infringed by the use or sale of its Contribution alone
+  or when combined with the Program.
+
+  "Program" means the Contributions Distributed in accordance with this
+  Agreement.
+
+  "Recipient" means anyone who receives the Program under this Agreement
+  or any Secondary License (as applicable), including Contributors.
+
+  "Derivative Works" shall mean any work, whether in Source Code or other
+  form, that is based on (or derived from) the Program and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship.
+
+  "Modified Works" shall mean any work in Source Code or other form that
+  results from an addition to, deletion from, or modification of the
+  contents of the Program, including, for purposes of clarity any new file
+  in Source Code form that contains any contents of the Program. Modified
+  Works shall not include works that contain only declarations,
+  interfaces, types, classes, structures, or files of the Program solely
+  in each case in order to link to, bind by name, or subclass the Program
+  or Modified Works thereof.
+
+  "Distribute" means the acts of a) distributing or b) making available
+  in any manner that enables the transfer of a copy.
+
+  "Source Code" means the form of a Program preferred for making
+  modifications, including but not limited to software source code,
+  documentation source, and configuration files.
+
+  "Secondary License" means either the GNU General Public License,
+  Version 2.0, or any later versions of that license, including any
+  exceptions or additional permissions as identified by the initial
+  Contributor.
+
+  2. GRANT OF RIGHTS
+
+    a) Subject to the terms of this Agreement, each Contributor hereby
+    grants Recipient a non-exclusive, worldwide, royalty-free copyright
+    license to reproduce, prepare Derivative Works of, publicly display,
+    publicly perform, Distribute and sublicense the Contribution of such
+    Contributor, if any, and such Derivative Works.
+
+    b) Subject to the terms of this Agreement, each Contributor hereby
+    grants Recipient a non-exclusive, worldwide, royalty-free patent
+    license under Licensed Patents to make, use, sell, offer to sell,
+    import and otherwise transfer the Contribution of such Contributor,
+    if any, in Source Code or other form. This patent license shall
+    apply to the combination of the Contribution and the Program if, at
+    the time the Contribution is added by the Contributor, such addition
+    of the Contribution causes such combination to be covered by the
+    Licensed Patents. The patent license shall not apply to any other
+    combinations which include the Contribution. No hardware per se is
+    licensed hereunder.
+
+    c) Recipient understands that although each Contributor grants the
+    licenses to its Contributions set forth herein, no assurances are
+    provided by any Contributor that the Program does not infringe the
+    patent or other intellectual property rights of any other entity.
+    Each Contributor disclaims any liability to Recipient for claims
+    brought by any other entity based on infringement of intellectual
+    property rights or otherwise. As a condition to exercising the
+    rights and licenses granted hereunder, each Recipient hereby
+    assumes sole responsibility to secure any other intellectual
+    property rights needed, if any. For example, if a third party
+    patent license is required to allow Recipient to Distribute the
+    Program, it is Recipient's responsibility to acquire that license
+    before distributing the Program.
+
+    d) Each Contributor represents that to its knowledge it has
+    sufficient copyright rights in its Contribution, if any, to grant
+    the copyright license set forth in this Agreement.
+
+    e) Notwithstanding the terms of any Secondary License, no
+    Contributor makes additional grants to any Recipient (other than
+    those set forth in this Agreement) as a result of such Recipient's
+    receipt of the Program under the terms of a Secondary License
+    (if permitted under the terms of Section 3).
+
+  3. REQUIREMENTS
+
+  3.1 If a Contributor Distributes the Program in any form, then:
+
+    a) the Program must also be made available as Source Code, in
+    accordance with section 3.2, and the Contributor must accompany
+    the Program with a statement that the Source Code for the Program
+    is available under this Agreement, and informs Recipients how to
+    obtain it in a reasonable manner on or through a medium customarily
+    used for software exchange; and
+
+    b) the Contributor may Distribute the Program under a license
+    different than this Agreement, provided that such license:
+       i) effectively disclaims on behalf of all other Contributors all
+       warranties and conditions, express and implied, including
+       warranties or conditions of title and non-infringement, and
+       implied warranties or conditions of merchantability and fitness
+       for a particular purpose;
+
+       ii) effectively excludes on behalf of all other Contributors all
+       liability for damages, including direct, indirect, special,
+       incidental and consequential damages, such as lost profits;
+
+       iii) does not attempt to limit or alter the recipients' rights
+       in the Source Code under section 3.2; and
+
+       iv) requires any subsequent distribution of the Program by any
+       party to be under a license that satisfies the requirements
+       of this section 3.
+
+  3.2 When the Program is Distributed as Source Code:
+
+    a) it must be made available under this Agreement, or if the
+    Program (i) is combined with other material in a separate file or
+    files made available under a Secondary License, and (ii) the initial
+    Contributor attached to the Source Code the notice described in
+    Exhibit A of this Agreement, then the Program may be made available
+    under the terms of such Secondary Licenses, and
+
+    b) a copy of this Agreement must be included with each copy of
+    the Program.
+
+  3.3 Contributors may not remove or alter any copyright, patent,
+  trademark, attribution notices, disclaimers of warranty, or limitations
+  of liability ("notices") contained within the Program from any copy of
+  the Program which they Distribute, provided that Contributors may add
+  their own appropriate notices.
+
+  4. COMMERCIAL DISTRIBUTION
+
+  Commercial distributors of software may accept certain responsibilities
+  with respect to end users, business partners and the like. While this
+  license is intended to facilitate the commercial use of the Program,
+  the Contributor who includes the Program in a commercial product
+  offering should do so in a manner which does not create potential
+  liability for other Contributors. Therefore, if a Contributor includes
+  the Program in a commercial product offering, such Contributor
+  ("Commercial Contributor") hereby agrees to defend and indemnify every
+  other Contributor ("Indemnified Contributor") against any losses,
+  damages and costs (collectively "Losses") arising from claims, lawsuits
+  and other legal actions brought by a third party against the Indemnified
+  Contributor to the extent caused by the acts or omissions of such
+  Commercial Contributor in connection with its distribution of the Program
+  in a commercial product offering. The obligations in this section do not
+  apply to any claims or Losses relating to any actual or alleged
+  intellectual property infringement. In order to qualify, an Indemnified
+  Contributor must: a) promptly notify the Commercial Contributor in
+  writing of such claim, and b) allow the Commercial Contributor to control,
+  and cooperate with the Commercial Contributor in, the defense and any
+  related settlement negotiations. The Indemnified Contributor may
+  participate in any such claim at its own expense.
+
+  For example, a Contributor might include the Program in a commercial
+  product offering, Product X. That Contributor is then a Commercial
+  Contributor. If that Commercial Contributor then makes performance
+  claims, or offers warranties related to Product X, those performance
+  claims and warranties are such Commercial Contributor's responsibility
+  alone. Under this section, the Commercial Contributor would have to
+  defend claims against the other Contributors related to those performance
+  claims and warranties, and if a court requires any other Contributor to
+  pay any damages as a result, the Commercial Contributor must pay
+  those damages.
+
+  5. NO WARRANTY
+
+  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+  PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
+  BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+  IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+  TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+  PURPOSE. Each Recipient is solely responsible for determining the
+  appropriateness of using and distributing the Program and assumes all
+  risks associated with its exercise of rights under this Agreement,
+  including but not limited to the risks and costs of program errors,
+  compliance with applicable laws, damage to or loss of data, programs
+  or equipment, and unavailability or interruption of operations.
+
+  6. DISCLAIMER OF LIABILITY
+
+  EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+  PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+  SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+  PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+  EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGES.
+
+  7. GENERAL
+
+  If any provision of this Agreement is invalid or unenforceable under
+  applicable law, it shall not affect the validity or enforceability of
+  the remainder of the terms of this Agreement, and without further
+  action by the parties hereto, such provision shall be reformed to the
+  minimum extent necessary to make such provision valid and enforceable.
+
+  If Recipient institutes patent litigation against any entity
+  (including a cross-claim or counterclaim in a lawsuit) alleging that the
+  Program itself (excluding combinations of the Program with other software
+  or hardware) infringes such Recipient's patent(s), then such Recipient's
+  rights granted under Section 2(b) shall terminate as of the date such
+  litigation is filed.
+
+  All Recipient's rights under this Agreement shall terminate if it
+  fails to comply with any of the material terms or conditions of this
+  Agreement and does not cure such failure in a reasonable period of
+  time after becoming aware of such noncompliance. If all Recipient's
+  rights under this Agreement terminate, Recipient agrees to cease use
+  and distribution of the Program as soon as reasonably practicable.
+  However, Recipient's obligations under this Agreement and any licenses
+  granted by Recipient relating to the Program shall continue and survive.
+
+  Everyone is permitted to copy and distribute copies of this Agreement,
+  but in order to avoid inconsistency the Agreement is copyrighted and
+  may only be modified in the following manner. The Agreement Steward
+  reserves the right to publish new versions (including revisions) of
+  this Agreement from time to time. No one other than the Agreement
+  Steward has the right to modify this Agreement. The Eclipse Foundation
+  is the initial Agreement Steward. The Eclipse Foundation may assign the
+  responsibility to serve as the Agreement Steward to a suitable separate
+  entity. Each new version of the Agreement will be given a distinguishing
+  version number. The Program (including Contributions) may always be
+  Distributed subject to the version of the Agreement under which it was
+  received. In addition, after a new version of the Agreement is published,
+  Contributor may elect to Distribute the Program (including its
+  Contributions) under the new version.
+
+  Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+  receives no rights or licenses to the intellectual property of any
+  Contributor under this Agreement, whether expressly, by implication,
+  estoppel or otherwise. All rights in the Program not expressly granted
+  under this Agreement are reserved. Nothing in this Agreement is intended
+  to be enforceable by any entity that is not a Contributor or Recipient.
+  No third-party beneficiary rights are created under this Agreement.
+
+  Exhibit A - Form of Secondary Licenses Notice
+
+  "This Source Code may also be made available under the following
+  Secondary Licenses when the conditions for such availability set forth
+  in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+  version(s), and exceptions or additional permissions here}."
+
+    Simply including a copy of this Agreement, including this Exhibit A
+    is not sufficient to license the Source Code under Secondary Licenses.
+
+    If it is not possible or desirable to put the notice in a particular
+    file, then You may include the notice in a location (such as a LICENSE
+    file in a relevant directory) where a recipient would be likely to
+    look for such a notice.
+
+    You may add additional accurate notices of copyright ownership.
+
+The complete text of the GNU General Public License v2 is as follows:
+
+          GNU GENERAL PUBLIC LICENSE
+             Version 2, June 1991
+
+   Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                         59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   Everyone is permitted to copy and distribute verbatim copies
+   of this license document, but changing it is not allowed.
+
+            Preamble
+
+    The licenses for most software are designed to take away your
+  freedom to share and change it.  By contrast, the GNU General Public
+  License is intended to guarantee your freedom to share and change free
+  software--to make sure the software is free for all its users.  This
+  General Public License applies to most of the Free Software
+  Foundation's software and to any other program whose authors commit to
+  using it.  (Some other Free Software Foundation software is covered by
+  the GNU Library General Public License instead.)  You can apply it to
+  your programs, too.
+
+    When we speak of free software, we are referring to freedom, not
+  price.  Our General Public Licenses are designed to make sure that you
+  have the freedom to distribute copies of free software (and charge for
+  this service if you wish), that you receive source code or can get it
+  if you want it, that you can change the software or use pieces of it
+  in new free programs; and that you know you can do these things.
+
+    To protect your rights, we need to make restrictions that forbid
+  anyone to deny you these rights or to ask you to surrender the rights.
+  These restrictions translate to certain responsibilities for you if you
+  distribute copies of the software, or if you modify it.
+
+    For example, if you distribute copies of such a program, whether
+  gratis or for a fee, you must give the recipients all the rights that
+  you have.  You must make sure that they, too, receive or can get the
+  source code.  And you must show them these terms so they know their
+  rights.
+
+    We protect your rights with two steps: (1) copyright the software, and
+  (2) offer you this license which gives you legal permission to copy,
+  distribute and/or modify the software.
+
+    Also, for each author's protection and ours, we want to make certain
+  that everyone understands that there is no warranty for this free
+  software.  If the software is modified by someone else and passed on, we
+  want its recipients to know that what they have is not the original, so
+  that any problems introduced by others will not reflect on the original
+  authors' reputations.
+
+    Finally, any free program is threatened constantly by software
+  patents.  We wish to avoid the danger that redistributors of a free
+  program will individually obtain patent licenses, in effect making the
+  program proprietary.  To prevent this, we have made it clear that any
+  patent must be licensed for everyone's free use or not licensed at all.
+
+    The precise terms and conditions for copying, distribution and
+  modification follow.
+
+          GNU GENERAL PUBLIC LICENSE
+     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+    0. This License applies to any program or other work which contains
+  a notice placed by the copyright holder saying it may be distributed
+  under the terms of this General Public License.  The "Program", below,
+  refers to any such program or work, and a "work based on the Program"
+  means either the Program or any derivative work under copyright law:
+  that is to say, a work containing the Program or a portion of it,
+  either verbatim or with modifications and/or translated into another
+  language.  (Hereinafter, translation is included without limitation in
+  the term "modification".)  Each licensee is addressed as "you".
+
+  Activities other than copying, distribution and modification are not
+  covered by this License; they are outside its scope.  The act of
+  running the Program is not restricted, and the output from the Program
+  is covered only if its contents constitute a work based on the
+  Program (independent of having been made by running the Program).
+  Whether that is true depends on what the Program does.
+
+    1. You may copy and distribute verbatim copies of the Program's
+  source code as you receive it, in any medium, provided that you
+  conspicuously and appropriately publish on each copy an appropriate
+  copyright notice and disclaimer of warranty; keep intact all the
+  notices that refer to this License and to the absence of any warranty;
+  and give any other recipients of the Program a copy of this License
+  along with the Program.
+
+  You may charge a fee for the physical act of transferring a copy, and
+  you may at your option offer warranty protection in exchange for a fee.
+
+    2. You may modify your copy or copies of the Program or any portion
+  of it, thus forming a work based on the Program, and copy and
+  distribute such modifications or work under the terms of Section 1
+  above, provided that you also meet all of these conditions:
+
+      a) You must cause the modified files to carry prominent notices
+      stating that you changed the files and the date of any change.
+
+      b) You must cause any work that you distribute or publish, that in
+      whole or in part contains or is derived from the Program or any
+      part thereof, to be licensed as a whole at no charge to all third
+      parties under the terms of this License.
+
+      c) If the modified program normally reads commands interactively
+      when run, you must cause it, when started running for such
+      interactive use in the most ordinary way, to print or display an
+      announcement including an appropriate copyright notice and a
+      notice that there is no warranty (or else, saying that you provide
+      a warranty) and that users may redistribute the program under
+      these conditions, and telling the user how to view a copy of this
+      License.  (Exception: if the Program itself is interactive but
+      does not normally print such an announcement, your work based on
+      the Program is not required to print an announcement.)
+
+  These requirements apply to the modified work as a whole.  If
+  identifiable sections of that work are not derived from the Program,
+  and can be reasonably considered independent and separate works in
+  themselves, then this License, and its terms, do not apply to those
+  sections when you distribute them as separate works.  But when you
+  distribute the same sections as part of a whole which is a work based
+  on the Program, the distribution of the whole must be on the terms of
+  this License, whose permissions for other licensees extend to the
+  entire whole, and thus to each and every part regardless of who wrote it.
+
+  Thus, it is not the intent of this section to claim rights or contest
+  your rights to work written entirely by you; rather, the intent is to
+  exercise the right to control the distribution of derivative or
+  collective works based on the Program.
+
+  In addition, mere aggregation of another work not based on the Program
+  with the Program (or with a work based on the Program) on a volume of
+  a storage or distribution medium does not bring the other work under
+  the scope of this License.
+
+    3. You may copy and distribute the Program (or a work based on it,
+  under Section 2) in object code or executable form under the terms of
+  Sections 1 and 2 above provided that you also do one of the following:
+
+      a) Accompany it with the complete corresponding machine-readable
+      source code, which must be distributed under the terms of Sections
+      1 and 2 above on a medium customarily used for software interchange; or,
+
+      b) Accompany it with a written offer, valid for at least three
+      years, to give any third party, for a charge no more than your
+      cost of physically performing source distribution, a complete
+      machine-readable copy of the corresponding source code, to be
+      distributed under the terms of Sections 1 and 2 above on a medium
+      customarily used for software interchange; or,
+
+      c) Accompany it with the information you received as to the offer
+      to distribute corresponding source code.  (This alternative is
+      allowed only for noncommercial distribution and only if you
+      received the program in object code or executable form with such
+      an offer, in accord with Subsection b above.)
+
+  The source code for a work means the preferred form of the work for
+  making modifications to it.  For an executable work, complete source
+  code means all the source code for all modules it contains, plus any
+  associated interface definition files, plus the scripts used to
+  control compilation and installation of the executable.  However, as a
+  special exception, the source code distributed need not include
+  anything that is normally distributed (in either source or binary
+  form) with the major components (compiler, kernel, and so on) of the
+  operating system on which the executable runs, unless that component
+  itself accompanies the executable.
+
+  If distribution of executable or object code is made by offering
+  access to copy from a designated place, then offering equivalent
+  access to copy the source code from the same place counts as
+  distribution of the source code, even though third parties are not
+  compelled to copy the source along with the object code.
+
+    4. You may not copy, modify, sublicense, or distribute the Program
+  except as expressly provided under this License.  Any attempt
+  otherwise to copy, modify, sublicense or distribute the Program is
+  void, and will automatically terminate your rights under this License.
+  However, parties who have received copies, or rights, from you under
+  this License will not have their licenses terminated so long as such
+  parties remain in full compliance.
+
+    5. You are not required to accept this License, since you have not
+  signed it.  However, nothing else grants you permission to modify or
+  distribute the Program or its derivative works.  These actions are
+  prohibited by law if you do not accept this License.  Therefore, by
+  modifying or distributing the Program (or any work based on the
+  Program), you indicate your acceptance of this License to do so, and
+  all its terms and conditions for copying, distributing or modifying
+  the Program or works based on it.
+
+    6. Each time you redistribute the Program (or any work based on the
+  Program), the recipient automatically receives a license from the
+  original licensor to copy, distribute or modify the Program subject to
+  these terms and conditions.  You may not impose any further
+  restrictions on the recipients' exercise of the rights granted herein.
+  You are not responsible for enforcing compliance by third parties to
+  this License.
+
+    7. If, as a consequence of a court judgment or allegation of patent
+  infringement or for any other reason (not limited to patent issues),
+  conditions are imposed on you (whether by court order, agreement or
+  otherwise) that contradict the conditions of this License, they do not
+  excuse you from the conditions of this License.  If you cannot
+  distribute so as to satisfy simultaneously your obligations under this
+  License and any other pertinent obligations, then as a consequence you
+  may not distribute the Program at all.  For example, if a patent
+  license would not permit royalty-free redistribution of the Program by
+  all those who receive copies directly or indirectly through you, then
+  the only way you could satisfy both it and this License would be to
+  refrain entirely from distribution of the Program.
+
+  If any portion of this section is held invalid or unenforceable under
+  any particular circumstance, the balance of the section is intended to
+  apply and the section as a whole is intended to apply in other
+  circumstances.
+
+  It is not the purpose of this section to induce you to infringe any
+  patents or other property right claims or to contest validity of any
+  such claims; this section has the sole purpose of protecting the
+  integrity of the free software distribution system, which is
+  implemented by public license practices.  Many people have made
+  generous contributions to the wide range of software distributed
+  through that system in reliance on consistent application of that
+  system; it is up to the author/donor to decide if he or she is willing
+  to distribute software through any other system and a licensee cannot
+  impose that choice.
+
+  This section is intended to make thoroughly clear what is believed to
+  be a consequence of the rest of this License.
+
+    8. If the distribution and/or use of the Program is restricted in
+  certain countries either by patents or by copyrighted interfaces, the
+  original copyright holder who places the Program under this License
+  may add an explicit geographical distribution limitation excluding
+  those countries, so that distribution is permitted only in or among
+  countries not thus excluded.  In such case, this License incorporates
+  the limitation as if written in the body of this License.
+
+    9. The Free Software Foundation may publish revised and/or new versions
+  of the General Public License from time to time.  Such new versions will
+  be similar in spirit to the present version, but may differ in detail to
+  address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the Program
+  specifies a version number of this License which applies to it and "any
+  later version", you have the option of following the terms and conditions
+  either of that version or of any later version published by the Free
+  Software Foundation.  If the Program does not specify a version number of
+  this License, you may choose any version ever published by the Free Software
+  Foundation.
+
+    10. If you wish to incorporate parts of the Program into other free
+  programs whose distribution conditions are different, write to the author
+  to ask for permission.  For software which is copyrighted by the Free
+  Software Foundation, write to the Free Software Foundation; we sometimes
+  make exceptions for this.  Our decision will be guided by the two goals
+  of preserving the free status of all derivatives of our free software and
+  of promoting the sharing and reuse of software generally.
+
+            NO WARRANTY
+
+    11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+  FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+  OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+  PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+  OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+  TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+  PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+  REPAIR OR CORRECTION.
+
+    12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+  WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+  REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+  INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+  OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+  TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+  YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+  PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGES.
+
+           END OF TERMS AND CONDITIONS
+
+The complete text of the GNU Lesser General Public License 2.1 is as follows:
+
+        GNU LESSER GENERAL PUBLIC LICENSE
+             Version 2.1, February 1999
+
+   Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   Everyone is permitted to copy and distribute verbatim copies
+   of this license document, but changing it is not allowed.
+
+  [This is the first released version of the Lesser GPL.  It also counts
+   as the successor of the GNU Library Public License, version 2, hence
+   the version number 2.1.]
+
+            Preamble
+
+    The licenses for most software are designed to take away your
+  freedom to share and change it.  By contrast, the GNU General Public
+  Licenses are intended to guarantee your freedom to share and change
+  free software--to make sure the software is free for all its users.
+
+    This license, the Lesser General Public License, applies to some
+  specially designated software packages--typically libraries--of the
+  Free Software Foundation and other authors who decide to use it.  You
+  can use it too, but we suggest you first think carefully about whether
+  this license or the ordinary General Public License is the better
+  strategy to use in any particular case, based on the explanations below.
+
+    When we speak of free software, we are referring to freedom of use,
+  not price.  Our General Public Licenses are designed to make sure that
+  you have the freedom to distribute copies of free software (and charge
+  for this service if you wish); that you receive source code or can get
+  it if you want it; that you can change the software and use pieces of
+  it in new free programs; and that you are informed that you can do
+  these things.
+
+    To protect your rights, we need to make restrictions that forbid
+  distributors to deny you these rights or to ask you to surrender these
+  rights.  These restrictions translate to certain responsibilities for
+  you if you distribute copies of the library or if you modify it.
+
+    For example, if you distribute copies of the library, whether gratis
+  or for a fee, you must give the recipients all the rights that we gave
+  you.  You must make sure that they, too, receive or can get the source
+  code.  If you link other code with the library, you must provide
+  complete object files to the recipients, so that they can relink them
+  with the library after making changes to the library and recompiling
+  it.  And you must show them these terms so they know their rights.
+
+    We protect your rights with a two-step method: (1) we copyright the
+  library, and (2) we offer you this license, which gives you legal
+  permission to copy, distribute and/or modify the library.
+
+    To protect each distributor, we want to make it very clear that
+  there is no warranty for the free library.  Also, if the library is
+  modified by someone else and passed on, the recipients should know
+  that what they have is not the original version, so that the original
+  author's reputation will not be affected by problems that might be
+  introduced by others.
+
+    Finally, software patents pose a constant threat to the existence of
+  any free program.  We wish to make sure that a company cannot
+  effectively restrict the users of a free program by obtaining a
+  restrictive license from a patent holder.  Therefore, we insist that
+  any patent license obtained for a version of the library must be
+  consistent with the full freedom of use specified in this license.
+
+    Most GNU software, including some libraries, is covered by the
+  ordinary GNU General Public License.  This license, the GNU Lesser
+  General Public License, applies to certain designated libraries, and
+  is quite different from the ordinary General Public License.  We use
+  this license for certain libraries in order to permit linking those
+  libraries into non-free programs.
+
+    When a program is linked with a library, whether statically or using
+  a shared library, the combination of the two is legally speaking a
+  combined work, a derivative of the original library.  The ordinary
+  General Public License therefore permits such linking only if the
+  entire combination fits its criteria of freedom.  The Lesser General
+  Public License permits more lax criteria for linking other code with
+  the library.
+
+    We call this license the "Lesser" General Public License because it
+  does Less to protect the user's freedom than the ordinary General
+  Public License.  It also provides other free software developers Less
+  of an advantage over competing non-free programs.  These disadvantages
+  are the reason we use the ordinary General Public License for many
+  libraries.  However, the Lesser license provides advantages in certain
+  special circumstances.
+
+    For example, on rare occasions, there may be a special need to
+  encourage the widest possible use of a certain library, so that it becomes
+  a de-facto standard.  To achieve this, non-free programs must be
+  allowed to use the library.  A more frequent case is that a free
+  library does the same job as widely used non-free libraries.  In this
+  case, there is little to gain by limiting the free library to free
+  software only, so we use the Lesser General Public License.
+
+    In other cases, permission to use a particular library in non-free
+  programs enables a greater number of people to use a large body of
+  free software.  For example, permission to use the GNU C Library in
+  non-free programs enables many more people to use the whole GNU
+  operating system, as well as its variant, the GNU/Linux operating
+  system.
+
+    Although the Lesser General Public License is Less protective of the
+  users' freedom, it does ensure that the user of a program that is
+  linked with the Library has the freedom and the wherewithal to run
+  that program using a modified version of the Library.
+
+    The precise terms and conditions for copying, distribution and
+  modification follow.  Pay close attention to the difference between a
+  "work based on the library" and a "work that uses the library".  The
+  former contains code derived from the library, whereas the latter must
+  be combined with the library in order to run.
+
+        GNU LESSER GENERAL PUBLIC LICENSE
+     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+    0. This License Agreement applies to any software library or other
+  program which contains a notice placed by the copyright holder or
+  other authorized party saying it may be distributed under the terms of
+  this Lesser General Public License (also called "this License").
+  Each licensee is addressed as "you".
+
+    A "library" means a collection of software functions and/or data
+  prepared so as to be conveniently linked with application programs
+  (which use some of those functions and data) to form executables.
+
+    The "Library", below, refers to any such software library or work
+  which has been distributed under these terms.  A "work based on the
+  Library" means either the Library or any derivative work under
+  copyright law: that is to say, a work containing the Library or a
+  portion of it, either verbatim or with modifications and/or translated
+  straightforwardly into another language.  (Hereinafter, translation is
+  included without limitation in the term "modification".)
+
+    "Source code" for a work means the preferred form of the work for
+  making modifications to it.  For a library, complete source code means
+  all the source code for all modules it contains, plus any associated
+  interface definition files, plus the scripts used to control compilation
+  and installation of the library.
+
+    Activities other than copying, distribution and modification are not
+  covered by this License; they are outside its scope.  The act of
+  running a program using the Library is not restricted, and output from
+  such a program is covered only if its contents constitute a work based
+  on the Library (independent of the use of the Library in a tool for
+  writing it).  Whether that is true depends on what the Library does
+  and what the program that uses the Library does.
+  
+    1. You may copy and distribute verbatim copies of the Library's
+  complete source code as you receive it, in any medium, provided that
+  you conspicuously and appropriately publish on each copy an
+  appropriate copyright notice and disclaimer of warranty; keep intact
+  all the notices that refer to this License and to the absence of any
+  warranty; and distribute a copy of this License along with the
+  Library.
+
+    You may charge a fee for the physical act of transferring a copy,
+  and you may at your option offer warranty protection in exchange for a
+  fee.
+
+    2. You may modify your copy or copies of the Library or any portion
+  of it, thus forming a work based on the Library, and copy and
+  distribute such modifications or work under the terms of Section 1
+  above, provided that you also meet all of these conditions:
+
+      a) The modified work must itself be a software library.
+
+      b) You must cause the files modified to carry prominent notices
+      stating that you changed the files and the date of any change.
+
+      c) You must cause the whole of the work to be licensed at no
+      charge to all third parties under the terms of this License.
+
+      d) If a facility in the modified Library refers to a function or a
+      table of data to be supplied by an application program that uses
+      the facility, other than as an argument passed when the facility
+      is invoked, then you must make a good faith effort to ensure that,
+      in the event an application does not supply such function or
+      table, the facility still operates, and performs whatever part of
+      its purpose remains meaningful.
+
+      (For example, a function in a library to compute square roots has
+      a purpose that is entirely well-defined independent of the
+      application.  Therefore, Subsection 2d requires that any
+      application-supplied function or table used by this function must
+      be optional: if the application does not supply it, the square
+      root function must still compute square roots.)
+
+  These requirements apply to the modified work as a whole.  If
+  identifiable sections of that work are not derived from the Library,
+  and can be reasonably considered independent and separate works in
+  themselves, then this License, and its terms, do not apply to those
+  sections when you distribute them as separate works.  But when you
+  distribute the same sections as part of a whole which is a work based
+  on the Library, the distribution of the whole must be on the terms of
+  this License, whose permissions for other licensees extend to the
+  entire whole, and thus to each and every part regardless of who wrote
+  it.
+
+  Thus, it is not the intent of this section to claim rights or contest
+  your rights to work written entirely by you; rather, the intent is to
+  exercise the right to control the distribution of derivative or
+  collective works based on the Library.
+
+  In addition, mere aggregation of another work not based on the Library
+  with the Library (or with a work based on the Library) on a volume of
+  a storage or distribution medium does not bring the other work under
+  the scope of this License.
+
+    3. You may opt to apply the terms of the ordinary GNU General Public
+  License instead of this License to a given copy of the Library.  To do
+  this, you must alter all the notices that refer to this License, so
+  that they refer to the ordinary GNU General Public License, version 2,
+  instead of to this License.  (If a newer version than version 2 of the
+  ordinary GNU General Public License has appeared, then you can specify
+  that version instead if you wish.)  Do not make any other change in
+  these notices.
+
+    Once this change is made in a given copy, it is irreversible for
+  that copy, so the ordinary GNU General Public License applies to all
+  subsequent copies and derivative works made from that copy.
+
+    This option is useful when you wish to copy part of the code of
+  the Library into a program that is not a library.
+
+    4. You may copy and distribute the Library (or a portion or
+  derivative of it, under Section 2) in object code or executable form
+  under the terms of Sections 1 and 2 above provided that you accompany
+  it with the complete corresponding machine-readable source code, which
+  must be distributed under the terms of Sections 1 and 2 above on a
+  medium customarily used for software interchange.
+
+    If distribution of object code is made by offering access to copy
+  from a designated place, then offering equivalent access to copy the
+  source code from the same place satisfies the requirement to
+  distribute the source code, even though third parties are not
+  compelled to copy the source along with the object code.
+
+    5. A program that contains no derivative of any portion of the
+  Library, but is designed to work with the Library by being compiled or
+  linked with it, is called a "work that uses the Library".  Such a
+  work, in isolation, is not a derivative work of the Library, and
+  therefore falls outside the scope of this License.
+
+    However, linking a "work that uses the Library" with the Library
+  creates an executable that is a derivative of the Library (because it
+  contains portions of the Library), rather than a "work that uses the
+  library".  The executable is therefore covered by this License.
+  Section 6 states terms for distribution of such executables.
+
+    When a "work that uses the Library" uses material from a header file
+  that is part of the Library, the object code for the work may be a
+  derivative work of the Library even though the source code is not.
+  Whether this is true is especially significant if the work can be
+  linked without the Library, or if the work is itself a library.  The
+  threshold for this to be true is not precisely defined by law.
+
+    If such an object file uses only numerical parameters, data
+  structure layouts and accessors, and small macros and small inline
+  functions (ten lines or less in length), then the use of the object
+  file is unrestricted, regardless of whether it is legally a derivative
+  work.  (Executables containing this object code plus portions of the
+  Library will still fall under Section 6.)
+
+    Otherwise, if the work is a derivative of the Library, you may
+  distribute the object code for the work under the terms of Section 6.
+  Any executables containing that work also fall under Section 6,
+  whether or not they are linked directly with the Library itself.
+
+    6. As an exception to the Sections above, you may also combine or
+  link a "work that uses the Library" with the Library to produce a
+  work containing portions of the Library, and distribute that work
+  under terms of your choice, provided that the terms permit
+  modification of the work for the customer's own use and reverse
+  engineering for debugging such modifications.
+
+    You must give prominent notice with each copy of the work that the
+  Library is used in it and that the Library and its use are covered by
+  this License.  You must supply a copy of this License.  If the work
+  during execution displays copyright notices, you must include the
+  copyright notice for the Library among them, as well as a reference
+  directing the user to the copy of this License.  Also, you must do one
+  of these things:
+
+      a) Accompany the work with the complete corresponding
+      machine-readable source code for the Library including whatever
+      changes were used in the work (which must be distributed under
+      Sections 1 and 2 above); and, if the work is an executable linked
+      with the Library, with the complete machine-readable "work that
+      uses the Library", as object code and/or source code, so that the
+      user can modify the Library and then relink to produce a modified
+      executable containing the modified Library.  (It is understood
+      that the user who changes the contents of definitions files in the
+      Library will not necessarily be able to recompile the application
+      to use the modified definitions.)
+
+      b) Use a suitable shared library mechanism for linking with the
+      Library.  A suitable mechanism is one that (1) uses at run time a
+      copy of the library already present on the user's computer system,
+      rather than copying library functions into the executable, and (2)
+      will operate properly with a modified version of the library, if
+      the user installs one, as long as the modified version is
+      interface-compatible with the version that the work was made with.
+
+      c) Accompany the work with a written offer, valid for at
+      least three years, to give the same user the materials
+      specified in Subsection 6a, above, for a charge no more
+      than the cost of performing this distribution.
+
+      d) If distribution of the work is made by offering access to copy
+      from a designated place, offer equivalent access to copy the above
+      specified materials from the same place.
+
+      e) Verify that the user has already received a copy of these
+      materials or that you have already sent this user a copy.
+
+    For an executable, the required form of the "work that uses the
+  Library" must include any data and utility programs needed for
+  reproducing the executable from it.  However, as a special exception,
+  the materials to be distributed need not include anything that is
+  normally distributed (in either source or binary form) with the major
+  components (compiler, kernel, and so on) of the operating system on
+  which the executable runs, unless that component itself accompanies
+  the executable.
+
+    It may happen that this requirement contradicts the license
+  restrictions of other proprietary libraries that do not normally
+  accompany the operating system.  Such a contradiction means you cannot
+  use both them and the Library together in an executable that you
+  distribute.
+
+    7. You may place library facilities that are a work based on the
+  Library side-by-side in a single library together with other library
+  facilities not covered by this License, and distribute such a combined
+  library, provided that the separate distribution of the work based on
+  the Library and of the other library facilities is otherwise
+  permitted, and provided that you do these two things:
+
+      a) Accompany the combined library with a copy of the same work
+      based on the Library, uncombined with any other library
+      facilities.  This must be distributed under the terms of the
+      Sections above.
+
+      b) Give prominent notice with the combined library of the fact
+      that part of it is a work based on the Library, and explaining
+      where to find the accompanying uncombined form of the same work.
+
+    8. You may not copy, modify, sublicense, link with, or distribute
+  the Library except as expressly provided under this License.  Any
+  attempt otherwise to copy, modify, sublicense, link with, or
+  distribute the Library is void, and will automatically terminate your
+  rights under this License.  However, parties who have received copies,
+  or rights, from you under this License will not have their licenses
+  terminated so long as such parties remain in full compliance.
+
+    9. You are not required to accept this License, since you have not
+  signed it.  However, nothing else grants you permission to modify or
+  distribute the Library or its derivative works.  These actions are
+  prohibited by law if you do not accept this License.  Therefore, by
+  modifying or distributing the Library (or any work based on the
+  Library), you indicate your acceptance of this License to do so, and
+  all its terms and conditions for copying, distributing or modifying
+  the Library or works based on it.
+
+    10. Each time you redistribute the Library (or any work based on the
+  Library), the recipient automatically receives a license from the
+  original licensor to copy, distribute, link with or modify the Library
+  subject to these terms and conditions.  You may not impose any further
+  restrictions on the recipients' exercise of the rights granted herein.
+  You are not responsible for enforcing compliance by third parties with
+  this License.
+
+    11. If, as a consequence of a court judgment or allegation of patent
+  infringement or for any other reason (not limited to patent issues),
+  conditions are imposed on you (whether by court order, agreement or
+  otherwise) that contradict the conditions of this License, they do not
+  excuse you from the conditions of this License.  If you cannot
+  distribute so as to satisfy simultaneously your obligations under this
+  License and any other pertinent obligations, then as a consequence you
+  may not distribute the Library at all.  For example, if a patent
+  license would not permit royalty-free redistribution of the Library by
+  all those who receive copies directly or indirectly through you, then
+  the only way you could satisfy both it and this License would be to
+  refrain entirely from distribution of the Library.
+
+  If any portion of this section is held invalid or unenforceable under any
+  particular circumstance, the balance of the section is intended to apply,
+  and the section as a whole is intended to apply in other circumstances.
+
+  It is not the purpose of this section to induce you to infringe any
+  patents or other property right claims or to contest validity of any
+  such claims; this section has the sole purpose of protecting the
+  integrity of the free software distribution system which is
+  implemented by public license practices.  Many people have made
+  generous contributions to the wide range of software distributed
+  through that system in reliance on consistent application of that
+  system; it is up to the author/donor to decide if he or she is willing
+  to distribute software through any other system and a licensee cannot
+  impose that choice.
+
+  This section is intended to make thoroughly clear what is believed to
+  be a consequence of the rest of this License.
+
+    12. If the distribution and/or use of the Library is restricted in
+  certain countries either by patents or by copyrighted interfaces, the
+  original copyright holder who places the Library under this License may add
+  an explicit geographical distribution limitation excluding those countries,
+  so that distribution is permitted only in or among countries not thus
+  excluded.  In such case, this License incorporates the limitation as if
+  written in the body of this License.
+
+    13. The Free Software Foundation may publish revised and/or new
+  versions of the Lesser General Public License from time to time.
+  Such new versions will be similar in spirit to the present version,
+  but may differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the Library
+  specifies a version number of this License which applies to it and
+  "any later version", you have the option of following the terms and
+  conditions either of that version or of any later version published by
+  the Free Software Foundation.  If the Library does not specify a
+  license version number, you may choose any version ever published by
+  the Free Software Foundation.
+
+    14. If you wish to incorporate parts of the Library into other free
+  programs whose distribution conditions are incompatible with these,
+  write to the author to ask for permission.  For software which is
+  copyrighted by the Free Software Foundation, write to the Free
+  Software Foundation; we sometimes make exceptions for this.  Our
+  decision will be guided by the two goals of preserving the free status
+  of all derivatives of our free software and of promoting the sharing
+  and reuse of software generally.
+
+            NO WARRANTY
+
+    15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+  WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+  OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+  KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+  LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+  THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+    16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+  WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+  AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+  FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+  CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+  LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+  RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+  FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+  SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+  DAMAGES.
+
+           END OF TERMS AND CONDITIONS
+
+             How to Apply These Terms to Your New Libraries
+
+    If you develop a new library, and you want it to be of the greatest
+  possible use to the public, we recommend making it free software that
+  everyone can redistribute and change.  You can do so by permitting
+  redistribution under these terms (or, alternatively, under the terms of the
+  ordinary General Public License).
+
+    To apply these terms, attach the following notices to the library.  It is
+  safest to attach them to the start of each source file to most effectively
+  convey the exclusion of warranty; and each file should have at least the
+  "copyright" line and a pointer to where the full notice is found.
+
+      <one line to give the library's name and a brief idea of what it does.>
+      Copyright (C) <year>  <name of author>
+
+      This library is free software; you can redistribute it and/or
+      modify it under the terms of the GNU Lesser General Public
+      License as published by the Free Software Foundation; either
+      version 2.1 of the License, or (at your option) any later version.
+
+      This library is distributed in the hope that it will be useful,
+      but WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Lesser General Public License for more details.
+
+      You should have received a copy of the GNU Lesser General Public
+      License along with this library; if not, write to the Free Software
+      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+  Also add information on how to contact you by electronic and paper mail.
+
+  You should also get your employer (if you work as a programmer) or your
+  school, if any, to sign a "copyright disclaimer" for the library, if
+  necessary.  Here is a sample; alter the names:
+
+    Yoyodyne, Inc., hereby disclaims all copyright interest in the
+    library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+    <signature of Ty Coon>, 1 April 1990
+    Ty Coon, President of Vice
+
+  That's all there is to it!
+
+The following licenses cover code other than JRuby which is included with JRuby.
+
+Licenses listed below include:
+
+* GNU General Public License version 3
+* Apache 2.0 License
+* BSD License
+* MIT License
+
+The complete text of the GNU General Public License version 3 is as follows:
+
+          GNU GENERAL PUBLIC LICENSE
+             Version 3, 29 June 2007
+
+   Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+   Everyone is permitted to copy and distribute verbatim copies
+   of this license document, but changing it is not allowed.
+
+            Preamble
+
+    The GNU General Public License is a free, copyleft license for
+  software and other kinds of works.
+
+    The licenses for most software and other practical works are designed
+  to take away your freedom to share and change the works.  By contrast,
+  the GNU General Public License is intended to guarantee your freedom to
+  share and change all versions of a program--to make sure it remains free
+  software for all its users.  We, the Free Software Foundation, use the
+  GNU General Public License for most of our software; it applies also to
+  any other work released this way by its authors.  You can apply it to
+  your programs, too.
+
+    When we speak of free software, we are referring to freedom, not
+  price.  Our General Public Licenses are designed to make sure that you
+  have the freedom to distribute copies of free software (and charge for
+  them if you wish), that you receive source code or can get it if you
+  want it, that you can change the software or use pieces of it in new
+  free programs, and that you know you can do these things.
+
+    To protect your rights, we need to prevent others from denying you
+  these rights or asking you to surrender the rights.  Therefore, you have
+  certain responsibilities if you distribute copies of the software, or if
+  you modify it: responsibilities to respect the freedom of others.
+
+    For example, if you distribute copies of such a program, whether
+  gratis or for a fee, you must pass on to the recipients the same
+  freedoms that you received.  You must make sure that they, too, receive
+  or can get the source code.  And you must show them these terms so they
+  know their rights.
+
+    Developers that use the GNU GPL protect your rights with two steps:
+  (1) assert copyright on the software, and (2) offer you this License
+  giving you legal permission to copy, distribute and/or modify it.
+
+    For the developers' and authors' protection, the GPL clearly explains
+  that there is no warranty for this free software.  For both users' and
+  authors' sake, the GPL requires that modified versions be marked as
+  changed, so that their problems will not be attributed erroneously to
+  authors of previous versions.
+
+    Some devices are designed to deny users access to install or run
+  modified versions of the software inside them, although the manufacturer
+  can do so.  This is fundamentally incompatible with the aim of
+  protecting users' freedom to change the software.  The systematic
+  pattern of such abuse occurs in the area of products for individuals to
+  use, which is precisely where it is most unacceptable.  Therefore, we
+  have designed this version of the GPL to prohibit the practice for those
+  products.  If such problems arise substantially in other domains, we
+  stand ready to extend this provision to those domains in future versions
+  of the GPL, as needed to protect the freedom of users.
+
+    Finally, every program is threatened constantly by software patents.
+  States should not allow patents to restrict development and use of
+  software on general-purpose computers, but in those that do, we wish to
+  avoid the special danger that patents applied to a free program could
+  make it effectively proprietary.  To prevent this, the GPL assures that
+  patents cannot be used to render the program non-free.
+
+    The precise terms and conditions for copying, distribution and
+  modification follow.
+
+             TERMS AND CONDITIONS
+
+    0. Definitions.
+
+    "This License" refers to version 3 of the GNU General Public License.
+
+    "Copyright" also means copyright-like laws that apply to other kinds of
+  works, such as semiconductor masks.
+ 
+    "The Program" refers to any copyrightable work licensed under this
+  License.  Each licensee is addressed as "you".  "Licensees" and
+  "recipients" may be individuals or organizations.
+
+    To "modify" a work means to copy from or adapt all or part of the work
+  in a fashion requiring copyright permission, other than the making of an
+  exact copy.  The resulting work is called a "modified version" of the
+  earlier work or a work "based on" the earlier work.
+
+    A "covered work" means either the unmodified Program or a work based
+  on the Program.
+
+    To "propagate" a work means to do anything with it that, without
+  permission, would make you directly or secondarily liable for
+  infringement under applicable copyright law, except executing it on a
+  computer or modifying a private copy.  Propagation includes copying,
+  distribution (with or without modification), making available to the
+  public, and in some countries other activities as well.
+
+    To "convey" a work means any kind of propagation that enables other
+  parties to make or receive copies.  Mere interaction with a user through
+  a computer network, with no transfer of a copy, is not conveying.
+
+    An interactive user interface displays "Appropriate Legal Notices"
+  to the extent that it includes a convenient and prominently visible
+  feature that (1) displays an appropriate copyright notice, and (2)
+  tells the user that there is no warranty for the work (except to the
+  extent that warranties are provided), that licensees may convey the
+  work under this License, and how to view a copy of this License.  If
+  the interface presents a list of user commands or options, such as a
+  menu, a prominent item in the list meets this criterion.
+
+    1. Source Code.
+
+    The "source code" for a work means the preferred form of the work
+  for making modifications to it.  "Object code" means any non-source
+  form of a work.
+
+    A "Standard Interface" means an interface that either is an official
+  standard defined by a recognized standards body, or, in the case of
+  interfaces specified for a particular programming language, one that
+  is widely used among developers working in that language.
+
+    The "System Libraries" of an executable work include anything, other
+  than the work as a whole, that (a) is included in the normal form of
+  packaging a Major Component, but which is not part of that Major
+  Component, and (b) serves only to enable use of the work with that
+  Major Component, or to implement a Standard Interface for which an
+  implementation is available to the public in source code form.  A
+  "Major Component", in this context, means a major essential component
+  (kernel, window system, and so on) of the specific operating system
+  (if any) on which the executable work runs, or a compiler used to
+  produce the work, or an object code interpreter used to run it.
+
+    The "Corresponding Source" for a work in object code form means all
+  the source code needed to generate, install, and (for an executable
+  work) run the object code and to modify the work, including scripts to
+  control those activities.  However, it does not include the work's
+  System Libraries, or general-purpose tools or generally available free
+  programs which are used unmodified in performing those activities but
+  which are not part of the work.  For example, Corresponding Source
+  includes interface definition files associated with source files for
+  the work, and the source code for shared libraries and dynamically
+  linked subprograms that the work is specifically designed to require,
+  such as by intimate data communication or control flow between those
+  subprograms and other parts of the work.
+
+    The Corresponding Source need not include anything that users
+  can regenerate automatically from other parts of the Corresponding
+  Source.
+
+    The Corresponding Source for a work in source code form is that
+  same work.
+
+    2. Basic Permissions.
+
+    All rights granted under this License are granted for the term of
+  copyright on the Program, and are irrevocable provided the stated
+  conditions are met.  This License explicitly affirms your unlimited
+  permission to run the unmodified Program.  The output from running a
+  covered work is covered by this License only if the output, given its
+  content, constitutes a covered work.  This License acknowledges your
+  rights of fair use or other equivalent, as provided by copyright law.
+
+    You may make, run and propagate covered works that you do not
+  convey, without conditions so long as your license otherwise remains
+  in force.  You may convey covered works to others for the sole purpose
+  of having them make modifications exclusively for you, or provide you
+  with facilities for running those works, provided that you comply with
+  the terms of this License in conveying all material for which you do
+  not control copyright.  Those thus making or running the covered works
+  for you must do so exclusively on your behalf, under your direction
+  and control, on terms that prohibit them from making any copies of
+  your copyrighted material outside their relationship with you.
+
+    Conveying under any other circumstances is permitted solely under
+  the conditions stated below.  Sublicensing is not allowed; section 10
+  makes it unnecessary.
+
+    3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+    No covered work shall be deemed part of an effective technological
+  measure under any applicable law fulfilling obligations under article
+  11 of the WIPO copyright treaty adopted on 20 December 1996, or
+  similar laws prohibiting or restricting circumvention of such
+  measures.
+
+    When you convey a covered work, you waive any legal power to forbid
+  circumvention of technological measures to the extent such circumvention
+  is effected by exercising rights under this License with respect to
+  the covered work, and you disclaim any intention to limit operation or
+  modification of the work as a means of enforcing, against the work's
+  users, your or third parties' legal rights to forbid circumvention of
+  technological measures.
+
+    4. Conveying Verbatim Copies.
+
+    You may convey verbatim copies of the Program's source code as you
+  receive it, in any medium, provided that you conspicuously and
+  appropriately publish on each copy an appropriate copyright notice;
+  keep intact all notices stating that this License and any
+  non-permissive terms added in accord with section 7 apply to the code;
+  keep intact all notices of the absence of any warranty; and give all
+  recipients a copy of this License along with the Program.
+
+    You may charge any price or no price for each copy that you convey,
+  and you may offer support or warranty protection for a fee.
+
+    5. Conveying Modified Source Versions.
+
+    You may convey a work based on the Program, or the modifications to
+  produce it from the Program, in the form of source code under the
+  terms of section 4, provided that you also meet all of these conditions:
+
+      a) The work must carry prominent notices stating that you modified
+      it, and giving a relevant date.
+
+      b) The work must carry prominent notices stating that it is
+      released under this License and any conditions added under section
+      7.  This requirement modifies the requirement in section 4 to
+      "keep intact all notices".
+
+      c) You must license the entire work, as a whole, under this
+      License to anyone who comes into possession of a copy.  This
+      License will therefore apply, along with any applicable section 7
+      additional terms, to the whole of the work, and all its parts,
+      regardless of how they are packaged.  This License gives no
+      permission to license the work in any other way, but it does not
+      invalidate such permission if you have separately received it.
+
+      d) If the work has interactive user interfaces, each must display
+      Appropriate Legal Notices; however, if the Program has interactive
+      interfaces that do not display Appropriate Legal Notices, your
+      work need not make them do so.
+
+    A compilation of a covered work with other separate and independent
+  works, which are not by their nature extensions of the covered work,
+  and which are not combined with it such as to form a larger program,
+  in or on a volume of a storage or distribution medium, is called an
+  "aggregate" if the compilation and its resulting copyright are not
+  used to limit the access or legal rights of the compilation's users
+  beyond what the individual works permit.  Inclusion of a covered work
+  in an aggregate does not cause this License to apply to the other
+  parts of the aggregate.
+
+    6. Conveying Non-Source Forms.
+
+    You may convey a covered work in object code form under the terms
+  of sections 4 and 5, provided that you also convey the
+  machine-readable Corresponding Source under the terms of this License,
+  in one of these ways:
+
+      a) Convey the object code in, or embodied in, a physical product
+      (including a physical distribution medium), accompanied by the
+      Corresponding Source fixed on a durable physical medium
+      customarily used for software interchange.
+
+      b) Convey the object code in, or embodied in, a physical product
+      (including a physical distribution medium), accompanied by a
+      written offer, valid for at least three years and valid for as
+      long as you offer spare parts or customer support for that product
+      model, to give anyone who possesses the object code either (1) a
+      copy of the Corresponding Source for all the software in the
+      product that is covered by this License, on a durable physical
+      medium customarily used for software interchange, for a price no
+      more than your reasonable cost of physically performing this
+      conveying of source, or (2) access to copy the
+      Corresponding Source from a network server at no charge.
+
+      c) Convey individual copies of the object code with a copy of the
+      written offer to provide the Corresponding Source.  This
+      alternative is allowed only occasionally and noncommercially, and
+      only if you received the object code with such an offer, in accord
+      with subsection 6b.
+
+      d) Convey the object code by offering access from a designated
+      place (gratis or for a charge), and offer equivalent access to the
+      Corresponding Source in the same way through the same place at no
+      further charge.  You need not require recipients to copy the
+      Corresponding Source along with the object code.  If the place to
+      copy the object code is a network server, the Corresponding Source
+      may be on a different server (operated by you or a third party)
+      that supports equivalent copying facilities, provided you maintain
+      clear directions next to the object code saying where to find the
+      Corresponding Source.  Regardless of what server hosts the
+      Corresponding Source, you remain obligated to ensure that it is
+      available for as long as needed to satisfy these requirements.
+
+      e) Convey the object code using peer-to-peer transmission, provided
+      you inform other peers where the object code and Corresponding
+      Source of the work are being offered to the general public at no
+      charge under subsection 6d.
+
+    A separable portion of the object code, whose source code is excluded
+  from the Corresponding Source as a System Library, need not be
+  included in conveying the object code work.
+
+    A "User Product" is either (1) a "consumer product", which means any
+  tangible personal property which is normally used for personal, family,
+  or household purposes, or (2) anything designed or sold for incorporation
+  into a dwelling.  In determining whether a product is a consumer product,
+  doubtful cases shall be resolved in favor of coverage.  For a particular
+  product received by a particular user, "normally used" refers to a
+  typical or common use of that class of product, regardless of the status
+  of the particular user or of the way in which the particular user
+  actually uses, or expects or is expected to use, the product.  A product
+  is a consumer product regardless of whether the product has substantial
+  commercial, industrial or non-consumer uses, unless such uses represent
+  the only significant mode of use of the product.
+
+    "Installation Information" for a User Product means any methods,
+  procedures, authorization keys, or other information required to install
+  and execute modified versions of a covered work in that User Product from
+  a modified version of its Corresponding Source.  The information must
+  suffice to ensure that the continued functioning of the modified object
+  code is in no case prevented or interfered with solely because
+  modification has been made.
+
+    If you convey an object code work under this section in, or with, or
+  specifically for use in, a User Product, and the conveying occurs as
+  part of a transaction in which the right of possession and use of the
+  User Product is transferred to the recipient in perpetuity or for a
+  fixed term (regardless of how the transaction is characterized), the
+  Corresponding Source conveyed under this section must be accompanied
+  by the Installation Information.  But this requirement does not apply
+  if neither you nor any third party retains the ability to install
+  modified object code on the User Product (for example, the work has
+  been installed in ROM).
+
+    The requirement to provide Installation Information does not include a
+  requirement to continue to provide support service, warranty, or updates
+  for a work that has been modified or installed by the recipient, or for
+  the User Product in which it has been modified or installed.  Access to a
+  network may be denied when the modification itself materially and
+  adversely affects the operation of the network or violates the rules and
+  protocols for communication across the network.
+
+    Corresponding Source conveyed, and Installation Information provided,
+  in accord with this section must be in a format that is publicly
+  documented (and with an implementation available to the public in
+  source code form), and must require no special password or key for
+  unpacking, reading or copying.
+
+    7. Additional Terms.
+
+    "Additional permissions" are terms that supplement the terms of this
+  License by making exceptions from one or more of its conditions.
+  Additional permissions that are applicable to the entire Program shall
+  be treated as though they were included in this License, to the extent
+  that they are valid under applicable law.  If additional permissions
+  apply only to part of the Program, that part may be used separately
+  under those permissions, but the entire Program remains governed by
+  this License without regard to the additional permissions.
+
+    When you convey a copy of a covered work, you may at your option
+  remove any additional permissions from that copy, or from any part of
+  it.  (Additional permissions may be written to require their own
+  removal in certain cases when you modify the work.)  You may place
+  additional permissions on material, added by you to a covered work,
+  for which you have or can give appropriate copyright permission.
+
+    Notwithstanding any other provision of this License, for material you
+  add to a covered work, you may (if authorized by the copyright holders of
+  that material) supplement the terms of this License with terms:
+
+      a) Disclaiming warranty or limiting liability differently from the
+      terms of sections 15 and 16 of this License; or
+
+      b) Requiring preservation of specified reasonable legal notices or
+      author attributions in that material or in the Appropriate Legal
+      Notices displayed by works containing it; or
+
+      c) Prohibiting misrepresentation of the origin of that material, or
+      requiring that modified versions of such material be marked in
+      reasonable ways as different from the original version; or
+
+      d) Limiting the use for publicity purposes of names of licensors or
+      authors of the material; or
+
+      e) Declining to grant rights under trademark law for use of some
+      trade names, trademarks, or service marks; or
+
+      f) Requiring indemnification of licensors and authors of that
+      material by anyone who conveys the material (or modified versions of
+      it) with contractual assumptions of liability to the recipient, for
+      any liability that these contractual assumptions directly impose on
+      those licensors and authors.
+
+    All other non-permissive additional terms are considered "further
+  restrictions" within the meaning of section 10.  If the Program as you
+  received it, or any part of it, contains a notice stating that it is
+  governed by this License along with a term that is a further
+  restriction, you may remove that term.  If a license document contains
+  a further restriction but permits relicensing or conveying under this
+  License, you may add to a covered work material governed by the terms
+  of that license document, provided that the further restriction does
+  not survive such relicensing or conveying.
+
+    If you add terms to a covered work in accord with this section, you
+  must place, in the relevant source files, a statement of the
+  additional terms that apply to those files, or a notice indicating
+  where to find the applicable terms.
+
+    Additional terms, permissive or non-permissive, may be stated in the
+  form of a separately written license, or stated as exceptions;
+  the above requirements apply either way.
+
+    8. Termination.
+
+    You may not propagate or modify a covered work except as expressly
+  provided under this License.  Any attempt otherwise to propagate or
+  modify it is void, and will automatically terminate your rights under
+  this License (including any patent licenses granted under the third
+  paragraph of section 11).
+
+    However, if you cease all violation of this License, then your
+  license from a particular copyright holder is reinstated (a)
+  provisionally, unless and until the copyright holder explicitly and
+  finally terminates your license, and (b) permanently, if the copyright
+  holder fails to notify you of the violation by some reasonable means
+  prior to 60 days after the cessation.
+
+    Moreover, your license from a particular copyright holder is
+  reinstated permanently if the copyright holder notifies you of the
+  violation by some reasonable means, this is the first time you have
+  received notice of violation of this License (for any work) from that
+  copyright holder, and you cure the violation prior to 30 days after
+  your receipt of the notice.
+
+    Termination of your rights under this section does not terminate the
+  licenses of parties who have received copies or rights from you under
+  this License.  If your rights have been terminated and not permanently
+  reinstated, you do not qualify to receive new licenses for the same
+  material under section 10.
+
+    9. Acceptance Not Required for Having Copies.
+
+    You are not required to accept this License in order to receive or
+  run a copy of the Program.  Ancillary propagation of a covered work
+  occurring solely as a consequence of using peer-to-peer transmission
+  to receive a copy likewise does not require acceptance.  However,
+  nothing other than this License grants you permission to propagate or
+  modify any covered work.  These actions infringe copyright if you do
+  not accept this License.  Therefore, by modifying or propagating a
+  covered work, you indicate your acceptance of this License to do so.
+
+    10. Automatic Licensing of Downstream Recipients.
+
+    Each time you convey a covered work, the recipient automatically
+  receives a license from the original licensors, to run, modify and
+  propagate that work, subject to this License.  You are not responsible
+  for enforcing compliance by third parties with this License.
+
+    An "entity transaction" is a transaction transferring control of an
+  organization, or substantially all assets of one, or subdividing an
+  organization, or merging organizations.  If propagation of a covered
+  work results from an entity transaction, each party to that
+  transaction who receives a copy of the work also receives whatever
+  licenses to the work the party's predecessor in interest had or could
+  give under the previous paragraph, plus a right to possession of the
+  Corresponding Source of the work from the predecessor in interest, if
+  the predecessor has it or can get it with reasonable efforts.
+
+    You may not impose any further restrictions on the exercise of the
+  rights granted or affirmed under this License.  For example, you may
+  not impose a license fee, royalty, or other charge for exercise of
+  rights granted under this License, and you may not initiate litigation
+  (including a cross-claim or counterclaim in a lawsuit) alleging that
+  any patent claim is infringed by making, using, selling, offering for
+  sale, or importing the Program or any portion of it.
+
+    11. Patents.
+
+    A "contributor" is a copyright holder who authorizes use under this
+  License of the Program or a work on which the Program is based.  The
+  work thus licensed is called the contributor's "contributor version".
+
+    A contributor's "essential patent claims" are all patent claims
+  owned or controlled by the contributor, whether already acquired or
+  hereafter acquired, that would be infringed by some manner, permitted
+  by this License, of making, using, or selling its contributor version,
+  but do not include claims that would be infringed only as a
+  consequence of further modification of the contributor version.  For
+  purposes of this definition, "control" includes the right to grant
+  patent sublicenses in a manner consistent with the requirements of
+  this License.
+
+    Each contributor grants you a non-exclusive, worldwide, royalty-free
+  patent license under the contributor's essential patent claims, to
+  make, use, sell, offer for sale, import and otherwise run, modify and
+  propagate the contents of its contributor version.
+
+    In the following three paragraphs, a "patent license" is any express
+  agreement or commitment, however denominated, not to enforce a patent
+  (such as an express permission to practice a patent or covenant not to
+  sue for patent infringement).  To "grant" such a patent license to a
+  party means to make such an agreement or commitment not to enforce a
+  patent against the party.
+
+    If you convey a covered work, knowingly relying on a patent license,
+  and the Corresponding Source of the work is not available for anyone
+  to copy, free of charge and under the terms of this License, through a
+  publicly available network server or other readily accessible means,
+  then you must either (1) cause the Corresponding Source to be so
+  available, or (2) arrange to deprive yourself of the benefit of the
+  patent license for this particular work, or (3) arrange, in a manner
+  consistent with the requirements of this License, to extend the patent
+  license to downstream recipients.  "Knowingly relying" means you have
+  actual knowledge that, but for the patent license, your conveying the
+  covered work in a country, or your recipient's use of the covered work
+  in a country, would infringe one or more identifiable patents in that
+  country that you have reason to believe are valid.
+  
+    If, pursuant to or in connection with a single transaction or
+  arrangement, you convey, or propagate by procuring conveyance of, a
+  covered work, and grant a patent license to some of the parties
+  receiving the covered work authorizing them to use, propagate, modify
+  or convey a specific copy of the covered work, then the patent license
+  you grant is automatically extended to all recipients of the covered
+  work and works based on it.
+
+    A patent license is "discriminatory" if it does not include within
+  the scope of its coverage, prohibits the exercise of, or is
+  conditioned on the non-exercise of one or more of the rights that are
+  specifically granted under this License.  You may not convey a covered
+  work if you are a party to an arrangement with a third party that is
+  in the business of distributing software, under which you make payment
+  to the third party based on the extent of your activity of conveying
+  the work, and under which the third party grants, to any of the
+  parties who would receive the covered work from you, a discriminatory
+  patent license (a) in connection with copies of the covered work
+  conveyed by you (or copies made from those copies), or (b) primarily
+  for and in connection with specific products or compilations that
+  contain the covered work, unless you entered into that arrangement,
+  or that patent license was granted, prior to 28 March 2007.
+
+    Nothing in this License shall be construed as excluding or limiting
+  any implied license or other defenses to infringement that may
+  otherwise be available to you under applicable patent law.
+
+    12. No Surrender of Others' Freedom.
+
+    If conditions are imposed on you (whether by court order, agreement or
+  otherwise) that contradict the conditions of this License, they do not
+  excuse you from the conditions of this License.  If you cannot convey a
+  covered work so as to satisfy simultaneously your obligations under this
+  License and any other pertinent obligations, then as a consequence you may
+  not convey it at all.  For example, if you agree to terms that obligate you
+  to collect a royalty for further conveying from those to whom you convey
+  the Program, the only way you could satisfy both those terms and this
+  License would be to refrain entirely from conveying the Program.
+
+    13. Use with the GNU Affero General Public License.
+
+    Notwithstanding any other provision of this License, you have
+  permission to link or combine any covered work with a work licensed
+  under version 3 of the GNU Affero General Public License into a single
+  combined work, and to convey the resulting work.  The terms of this
+  License will continue to apply to the part which is the covered work,
+  but the special requirements of the GNU Affero General Public License,
+  section 13, concerning interaction through a network will apply to the
+  combination as such.
+
+    14. Revised Versions of this License.
+
+    The Free Software Foundation may publish revised and/or new versions of
+  the GNU General Public License from time to time.  Such new versions will
+  be similar in spirit to the present version, but may differ in detail to
+  address new problems or concerns.
+
+    Each version is given a distinguishing version number.  If the
+  Program specifies that a certain numbered version of the GNU General
+  Public License "or any later version" applies to it, you have the
+  option of following the terms and conditions either of that numbered
+  version or of any later version published by the Free Software
+  Foundation.  If the Program does not specify a version number of the
+  GNU General Public License, you may choose any version ever published
+  by the Free Software Foundation.
+
+    If the Program specifies that a proxy can decide which future
+  versions of the GNU General Public License can be used, that proxy's
+  public statement of acceptance of a version permanently authorizes you
+  to choose that version for the Program.
+
+    Later license versions may give you additional or different
+  permissions.  However, no additional obligations are imposed on any
+  author or copyright holder as a result of your choosing to follow a
+  later version.
+
+    15. Disclaimer of Warranty.
+
+    THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+  APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+  HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+  OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+  IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+  ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+    16. Limitation of Liability.
+
+    IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+  WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+  THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+  GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+  USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+  DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+  PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+  EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+  SUCH DAMAGES.
+
+    17. Interpretation of Sections 15 and 16.
+
+    If the disclaimer of warranty and limitation of liability provided
+  above cannot be given local legal effect according to their terms,
+  reviewing courts shall apply local law that most closely approximates
+  an absolute waiver of all civil liability in connection with the
+  Program, unless a warranty or assumption of liability accompanies a
+  copy of the Program in return for a fee.
+
+           END OF TERMS AND CONDITIONS
+
+        How to Apply These Terms to Your New Programs
+
+    If you develop a new program, and you want it to be of the greatest
+  possible use to the public, the best way to achieve this is to make it
+  free software which everyone can redistribute and change under these terms.
+
+    To do so, attach the following notices to the program.  It is safest
+  to attach them to the start of each source file to most effectively
+  state the exclusion of warranty; and each file should have at least
+  the "copyright" line and a pointer to where the full notice is found.
+
+      <one line to give the program's name and a brief idea of what it does.>
+      Copyright (C) <year>  <name of author>
+
+      This program is free software: you can redistribute it and/or modify
+      it under the terms of the GNU General Public License as published by
+      the Free Software Foundation, either version 3 of the License, or
+      (at your option) any later version.
+
+      This program is distributed in the hope that it will be useful,
+      but WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+      GNU General Public License for more details.
+
+      You should have received a copy of the GNU General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+  Also add information on how to contact you by electronic and paper mail.
+
+    If the program does terminal interaction, make it output a short
+  notice like this when it starts in an interactive mode:
+
+      <program>  Copyright (C) <year>  <name of author>
+      This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+      This is free software, and you are welcome to redistribute it
+      under certain conditions; type `show c' for details.
+
+  The hypothetical commands `show w' and `show c' should show the appropriate
+  parts of the General Public License.  Of course, your program's commands
+  might be different; for a GUI interface, you would use an "about box".
+
+    You should also get your employer (if you work as a programmer) or school,
+  if any, to sign a "copyright disclaimer" for the program, if necessary.
+  For more information on this, and how to apply and follow the GNU GPL, see
+  <http://www.gnu.org/licenses/>.
+
+    The GNU General Public License does not permit incorporating your program
+  into proprietary programs.  If your program is a subroutine library, you
+  may consider it more useful to permit linking proprietary applications with
+  the library.  If this is what you want to do, use the GNU Lesser General
+  Public License instead of this License.  But first, please read
+  <http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+The complete text of the Apache 2.0 License is as follows:
+
+                                Apache License
+                          Version 2.0, January 2004
+                       http://www.apache.org/licenses/
+
+  TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+  1. Definitions.
+
+     "License" shall mean the terms and conditions for use, reproduction,
+     and distribution as defined by Sections 1 through 9 of this document.
+
+     "Licensor" shall mean the copyright owner or entity authorized by
+     the copyright owner that is granting the License.
+
+     "Legal Entity" shall mean the union of the acting entity and all
+     other entities that control, are controlled by, or are under common
+     control with that entity. For the purposes of this definition,
+     "control" means (i) the power, direct or indirect, to cause the
+     direction or management of such entity, whether by contract or
+     otherwise, or (ii) ownership of fifty percent (50%) or more of the
+     outstanding shares, or (iii) beneficial ownership of such entity.
+
+     "You" (or "Your") shall mean an individual or Legal Entity
+     exercising permissions granted by this License.
+
+     "Source" form shall mean the preferred form for making modifications,
+     including but not limited to software source code, documentation
+     source, and configuration files.
+
+     "Object" form shall mean any form resulting from mechanical
+     transformation or translation of a Source form, including but
+     not limited to compiled object code, generated documentation,
+     and conversions to other media types.
+
+     "Work" shall mean the work of authorship, whether in Source or
+     Object form, made available under the License, as indicated by a
+     copyright notice that is included in or attached to the work
+     (an example is provided in the Appendix below).
+
+     "Derivative Works" shall mean any work, whether in Source or Object
+     form, that is based on (or derived from) the Work and for which the
+     editorial revisions, annotations, elaborations, or other modifications
+     represent, as a whole, an original work of authorship. For the purposes
+     of this License, Derivative Works shall not include works that remain
+     separable from, or merely link (or bind by name) to the interfaces of,
+     the Work and Derivative Works thereof.
+
+     "Contribution" shall mean any work of authorship, including
+     the original version of the Work and any modifications or additions
+     to that Work or Derivative Works thereof, that is intentionally
+     submitted to Licensor for inclusion in the Work by the copyright owner
+     or by an individual or Legal Entity authorized to submit on behalf of
+     the copyright owner. For the purposes of this definition, "submitted"
+     means any form of electronic, verbal, or written communication sent
+     to the Licensor or its representatives, including but not limited to
+     communication on electronic mailing lists, source code control systems,
+     and issue tracking systems that are managed by, or on behalf of, the
+     Licensor for the purpose of discussing and improving the Work, but
+     excluding communication that is conspicuously marked or otherwise
+     designated in writing by the copyright owner as "Not a Contribution."
+
+     "Contributor" shall mean Licensor and any individual or Legal Entity
+     on behalf of whom a Contribution has been received by Licensor and
+     subsequently incorporated within the Work.
+
+  2. Grant of Copyright License. Subject to the terms and conditions of
+     this License, each Contributor hereby grants to You a perpetual,
+     worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+     copyright license to reproduce, prepare Derivative Works of,
+     publicly display, publicly perform, sublicense, and distribute the
+     Work and such Derivative Works in Source or Object form.
+
+  3. Grant of Patent License. Subject to the terms and conditions of
+     this License, each Contributor hereby grants to You a perpetual,
+     worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+     (except as stated in this section) patent license to make, have made,
+     use, offer to sell, sell, import, and otherwise transfer the Work,
+     where such license applies only to those patent claims licensable
+     by such Contributor that are necessarily infringed by their
+     Contribution(s) alone or by combination of their Contribution(s)
+     with the Work to which such Contribution(s) was submitted. If You
+     institute patent litigation against any entity (including a
+     cross-claim or counterclaim in a lawsuit) alleging that the Work
+     or a Contribution incorporated within the Work constitutes direct
+     or contributory patent infringement, then any patent licenses
+     granted to You under this License for that Work shall terminate
+     as of the date such litigation is filed.
+
+  4. Redistribution. You may reproduce and distribute copies of the
+     Work or Derivative Works thereof in any medium, with or without
+     modifications, and in Source or Object form, provided that You
+     meet the following conditions:
+
+     (a) You must give any other recipients of the Work or
+         Derivative Works a copy of this License; and
+
+     (b) You must cause any modified files to carry prominent notices
+         stating that You changed the files; and
+
+     (c) You must retain, in the Source form of any Derivative Works
+         that You distribute, all copyright, patent, trademark, and
+         attribution notices from the Source form of the Work,
+         excluding those notices that do not pertain to any part of
+         the Derivative Works; and
+
+     (d) If the Work includes a "NOTICE" text file as part of its
+         distribution, then any Derivative Works that You distribute must
+         include a readable copy of the attribution notices contained
+         within such NOTICE file, excluding those notices that do not
+         pertain to any part of the Derivative Works, in at least one
+         of the following places: within a NOTICE text file distributed
+         as part of the Derivative Works; within the Source form or
+         documentation, if provided along with the Derivative Works; or,
+         within a display generated by the Derivative Works, if and
+         wherever such third-party notices normally appear. The contents
+         of the NOTICE file are for informational purposes only and
+         do not modify the License. You may add Your own attribution
+         notices within Derivative Works that You distribute, alongside
+         or as an addendum to the NOTICE text from the Work, provided
+         that such additional attribution notices cannot be construed
+         as modifying the License.
+
+     You may add Your own copyright statement to Your modifications and
+     may provide additional or different license terms and conditions
+     for use, reproduction, or distribution of Your modifications, or
+     for any such Derivative Works as a whole, provided Your use,
+     reproduction, and distribution of the Work otherwise complies with
+     the conditions stated in this License.
+
+  5. Submission of Contributions. Unless You explicitly state otherwise,
+     any Contribution intentionally submitted for inclusion in the Work
+     by You to the Licensor shall be under the terms and conditions of
+     this License, without any additional terms or conditions.
+     Notwithstanding the above, nothing herein shall supersede or modify
+     the terms of any separate license agreement you may have executed
+     with Licensor regarding such Contributions.
+
+  6. Trademarks. This License does not grant permission to use the trade
+     names, trademarks, service marks, or product names of the Licensor,
+     except as required for reasonable and customary use in describing the
+     origin of the Work and reproducing the content of the NOTICE file.
+
+  7. Disclaimer of Warranty. Unless required by applicable law or
+     agreed to in writing, Licensor provides the Work (and each
+     Contributor provides its Contributions) on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+     implied, including, without limitation, any warranties or conditions
+     of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+     PARTICULAR PURPOSE. You are solely responsible for determining the
+     appropriateness of using or redistributing the Work and assume any
+     risks associated with Your exercise of permissions under this License.
+
+  8. Limitation of Liability. In no event and under no legal theory,
+     whether in tort (including negligence), contract, or otherwise,
+     unless required by applicable law (such as deliberate and grossly
+     negligent acts) or agreed to in writing, shall any Contributor be
+     liable to You for damages, including any direct, indirect, special,
+     incidental, or consequential damages of any character arising as a
+     result of this License or out of the use or inability to use the
+     Work (including but not limited to damages for loss of goodwill,
+     work stoppage, computer failure or malfunction, or any and all
+     other commercial damages or losses), even if such Contributor
+     has been advised of the possibility of such damages.
+
+  9. Accepting Warranty or Additional Liability. While redistributing
+     the Work or Derivative Works thereof, You may choose to offer,
+     and charge a fee for, acceptance of support, warranty, indemnity,
+     or other liability obligations and/or rights consistent with this
+     License. However, in accepting such obligations, You may act only
+     on Your own behalf and on Your sole responsibility, not on behalf
+     of any other Contributor, and only if You agree to indemnify,
+     defend, and hold each Contributor harmless for any liability
+     incurred by, or claims asserted against, such Contributor by reason
+     of your accepting any such warranty or additional liability.
+
+  END OF TERMS AND CONDITIONS
+
+  APPENDIX: How to apply the Apache License to your work.
+
+     To apply the Apache License to your work, attach the following
+     boilerplate notice, with the fields enclosed by brackets "[]"
+     replaced with your own identifying information. (Don't include
+     the brackets!)  The text should be enclosed in the appropriate
+     comment syntax for the file format. We also recommend that a
+     file or class name and description of purpose be included on the
+     same "printed page" as the copyright notice for easier
+     identification within third-party archives.
+
+  Copyright [yyyy] [name of copyright owner]
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+The complete text of the BSD license can be is as follows:
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+  3. Neither the name of the University nor the names of its contributors
+     may be used to endorse or promote products derived from this software
+     without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+  THE POSSIBILITY OF SUCH DAMAGE.
+
+The complete text of the MIT license is as follows:
+
+  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.
+
+The complete text of the GPL v2, and classpath exception:
+
+The GNU General Public License (GPL)
+
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share
+and change it.  By contrast, the GNU General Public License is intended to
+guarantee your freedom to share and change free software--to make sure the
+software is free for all its users.  This General Public License applies to
+most of the Free Software Foundation's software and to any other program whose
+authors commit to using it.  (Some other Free Software Foundation software is
+covered by the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not price.  Our
+General Public Licenses are designed to make sure that you have the freedom to
+distribute copies of free software (and charge for this service if you wish),
+that you receive source code or can get it if you want it, that you can change
+the software or use pieces of it in new free programs; and that you know you
+can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny
+you these rights or to ask you to surrender the rights.  These restrictions
+translate to certain responsibilities for you if you distribute copies of the
+software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for
+a fee, you must give the recipients all the rights that you have.  You must
+make sure that they, too, receive or can get the source code.  And you must
+show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2)
+offer you this license which gives you legal permission to copy, distribute
+and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software.  If the
+software is modified by someone else and passed on, we want its recipients to
+know that what they have is not the original, so that any problems introduced
+by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents.  We
+wish to avoid the danger that redistributors of a free program will
+individually obtain patent licenses, in effect making the program proprietary.
+To prevent this, we have made it clear that any patent must be licensed for
+everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice
+placed by the copyright holder saying it may be distributed under the terms of
+this General Public License.  The "Program", below, refers to any such program
+or work, and a "work based on the Program" means either the Program or any
+derivative work under copyright law: that is to say, a work containing the
+Program or a portion of it, either verbatim or with modifications and/or
+translated into another language.  (Hereinafter, translation is included
+without limitation in the term "modification".) Each licensee is addressed as
+"you".
+
+Activities other than copying, distribution and modification are not covered by
+this License; they are outside its scope.  The act of running the Program is
+not restricted, and the output from the Program is covered only if its contents
+constitute a work based on the Program (independent of having been made by
+running the Program).  Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as
+you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this License
+and to the absence of any warranty; and give any other recipients of the
+Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may
+at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus
+forming a work based on the Program, and copy and distribute such modifications
+or work under the terms of Section 1 above, provided that you also meet all of
+these conditions:
+
+    a) You must cause the modified files to carry prominent notices stating
+    that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in whole or
+    in part contains or is derived from the Program or any part thereof, to be
+    licensed as a whole at no charge to all third parties under the terms of
+    this License.
+
+    c) If the modified program normally reads commands interactively when run,
+    you must cause it, when started running for such interactive use in the
+    most ordinary way, to print or display an announcement including an
+    appropriate copyright notice and a notice that there is no warranty (or
+    else, saying that you provide a warranty) and that users may redistribute
+    the program under these conditions, and telling the user how to view a copy
+    of this License.  (Exception: if the Program itself is interactive but does
+    not normally print such an announcement, your work based on the Program is
+    not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If identifiable
+sections of that work are not derived from the Program, and can be reasonably
+considered independent and separate works in themselves, then this License, and
+its terms, do not apply to those sections when you distribute them as separate
+works.  But when you distribute the same sections as part of a whole which is a
+work based on the Program, the distribution of the whole must be on the terms
+of this License, whose permissions for other licensees extend to the entire
+whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your
+rights to work written entirely by you; rather, the intent is to exercise the
+right to control the distribution of derivative or collective works based on
+the Program.
+
+In addition, mere aggregation of another work not based on the Program with the
+Program (or with a work based on the Program) on a volume of a storage or
+distribution medium does not bring the other work under the scope of this
+License.
+
+3. You may copy and distribute the Program (or a work based on it, under
+Section 2) in object code or executable form under the terms of Sections 1 and
+2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable source
+    code, which must be distributed under the terms of Sections 1 and 2 above
+    on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three years, to
+    give any third party, for a charge no more than your cost of physically
+    performing source distribution, a complete machine-readable copy of the
+    corresponding source code, to be distributed under the terms of Sections 1
+    and 2 above on a medium customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer to
+    distribute corresponding source code.  (This alternative is allowed only
+    for noncommercial distribution and only if you received the program in
+    object code or executable form with such an offer, in accord with
+    Subsection b above.)
+
+The source code for a work means the preferred form of the work for making
+modifications to it.  For an executable work, complete source code means all
+the source code for all modules it contains, plus any associated interface
+definition files, plus the scripts used to control compilation and installation
+of the executable.  However, as a special exception, the source code
+distributed need not include anything that is normally distributed (in either
+source or binary form) with the major components (compiler, kernel, and so on)
+of the operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the source
+code from the same place counts as distribution of the source code, even though
+third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as
+expressly provided under this License.  Any attempt otherwise to copy, modify,
+sublicense or distribute the Program is void, and will automatically terminate
+your rights under this License.  However, parties who have received copies, or
+rights, from you under this License will not have their licenses terminated so
+long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it.
+However, nothing else grants you permission to modify or distribute the Program
+or its derivative works.  These actions are prohibited by law if you do not
+accept this License.  Therefore, by modifying or distributing the Program (or
+any work based on the Program), you indicate your acceptance of this License to
+do so, and all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program),
+the recipient automatically receives a license from the original licensor to
+copy, distribute or modify the Program subject to these terms and conditions.
+You may not impose any further restrictions on the recipients' exercise of the
+rights granted herein.  You are not responsible for enforcing compliance by
+third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues), conditions
+are imposed on you (whether by court order, agreement or otherwise) that
+contradict the conditions of this License, they do not excuse you from the
+conditions of this License.  If you cannot distribute so as to satisfy
+simultaneously your obligations under this License and any other pertinent
+obligations, then as a consequence you may not distribute the Program at all.
+For example, if a patent license would not permit royalty-free redistribution
+of the Program by all those who receive copies directly or indirectly through
+you, then the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply and
+the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or
+other property right claims or to contest validity of any such claims; this
+section has the sole purpose of protecting the integrity of the free software
+distribution system, which is implemented by public license practices.  Many
+people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose that
+choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain
+countries either by patents or by copyrighted interfaces, the original
+copyright holder who places the Program under this License may add an explicit
+geographical distribution limitation excluding those countries, so that
+distribution is permitted only in or among countries not thus excluded.  In
+such case, this License incorporates the limitation as if written in the body
+of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the
+General Public License from time to time.  Such new versions will be similar in
+spirit to the present version, but may differ in detail to address new problems
+or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any later
+version", you have the option of following the terms and conditions either of
+that version or of any later version published by the Free Software Foundation.
+If the Program does not specify a version number of this License, you may
+choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs
+whose distribution conditions are different, write to the author to ask for
+permission.  For software which is copyrighted by the Free Software Foundation,
+write to the Free Software Foundation; we sometimes make exceptions for this.
+Our decision will be guided by the two goals of preserving the free status of
+all derivatives of our free software and of promoting the sharing and reuse of
+software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
+THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE
+STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE
+PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE,
+YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
+PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
+INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
+BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER
+OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible
+use to the public, the best way to achieve this is to make it free software
+which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program.  It is safest to attach
+them to the start of each source file to most effectively convey the exclusion
+of warranty; and each file should have at least the "copyright" line and a
+pointer to where the full notice is found.
+
+    One line to give the program's name and a brief idea of what it does.
+
+    Copyright (C) <year> <name of author>
+
+    This program is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the Free
+    Software Foundation; either version 2 of the License, or (at your option)
+    any later version.
+
+    This program is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+    more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc., 59
+    Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it
+starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author Gnomovision comes
+    with ABSOLUTELY NO WARRANTY; for details type 'show w'.  This is free
+    software, and you are welcome to redistribute it under certain conditions;
+    type 'show c' for details.
+
+The hypothetical commands 'show w' and 'show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may be
+called something other than 'show w' and 'show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.  Here
+is a sample; alter the names:
+
+    Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+    'Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+    signature of Ty Coon, 1 April 1989
+
+    Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General Public
+License instead of this License.
+
+"CLASSPATH" EXCEPTION TO THE GPL
+
+Certain source files distributed by Oracle America and/or its affiliates are
+subject to the following clarification and special exception to the GPL, but
+only where Oracle has expressly included in the particular source file's header
+the words "Oracle designates this particular file as subject to the "Classpath"
+exception as provided by Oracle in the LICENSE file that accompanied this code."
+
+    Linking this library statically or dynamically with other modules is making
+    a combined work based on this library.  Thus, the terms and conditions of
+    the GNU General Public License cover the whole combination.
+
+    As a special exception, the copyright holders of this library give you
+    permission to link this library with independent modules to produce an
+    executable, regardless of the license terms of these independent modules,
+    and to copy and distribute the resulting executable under terms of your
+    choice, provided that you also meet, for each linked independent module,
+    the terms and conditions of the license of that module.  An independent
+    module is a module which is not derived from or based on this library.  If
+    you modify this library, you may extend this exception to your version of
+    the library, but you are not obligated to do so.  If you do not wish to do
+    so, delete this exception statement from your version.
+
+The full text of the zlib licence:
+
+Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Jean-loup Gailly        Mark Adler
+jloup@gzip.org          madler@alumni.caltech.edu
diff --git a/tools/dependencies-report/src/main/resources/notices/jruby-jms-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jruby-jms-NOTICE.txt
new file mode 100644
index 000000000..91166f048
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/jruby-jms-NOTICE.txt
@@ -0,0 +1,13 @@
+Copyright 2008, 2009, 2010, 2011 J. Reid Morrison, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/jruby-openssl-0.10.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jruby-openssl-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/jruby-openssl-0.10.1-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/jruby-openssl-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/jruby-readline-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jruby-readline-NOTICE.txt
deleted file mode 100644
index 97f4b8df7..000000000
--- a/tools/dependencies-report/src/main/resources/notices/jruby-readline-NOTICE.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-source: https://github.com/jruby/jruby-readline/blob/1.2.2/License.txt
-
-JRuby-OpenSSL is distributed under the same license as JRuby (http://www.jruby.org/).
-
-Version: EPL 1.0/GPL 2.0/LGPL 2.1
-
-The contents of this file are subject to the Common Public
-License Version 1.0 (the "License"); you may not use this file
-except in compliance with the License. You may obtain a copy of
-the License at http://www.eclipse.org/legal/cpl-v10.html
-
-Software distributed under the License is distributed on an "AS
-IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-implied. See the License for the specific language governing
-rights and limitations under the License.
-
-Copyright (C) 2007 Ola Bini <ola.bini@gmail.com>
-
-Alternatively, the contents of this file may be used under the terms of
-either of the GNU General Public License Version 2 or later (the "GPL"),
-or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-in which case the provisions of the GPL or the LGPL are applicable instead
-of those above. If you wish to allow use of your version of this file only
-under the terms of either the GPL or the LGPL, and not to allow others to
-use your version of this file under the terms of the EPL, indicate your
-decision by deleting the provisions above and replace them with the notice
-and other provisions required by the GPL or the LGPL. If you do not delete
-the provisions above, a recipient may use your version of this file under
-the terms of any one of the EPL, the GPL or the LGPL.
-
-JRuby-OpenSSL includes software by the Legion of the Bouncy Castle
-(http://bouncycastle.org/license.html).
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/jruby-stdin-channel-0.2.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jruby-stdin-channel-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/jruby-stdin-channel-0.2.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/jruby-stdin-channel-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/json-1.8.6-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/json-1.8.6-NOTICE.txt
deleted file mode 100644
index b1e8df126..000000000
--- a/tools/dependencies-report/src/main/resources/notices/json-1.8.6-NOTICE.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-source: https://github.com/flori/json/blob/v1.8.6/README.md#license
-
-Ruby License, see https://www.ruby-lang.org/en/about/license.txt.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/json-generator-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/json-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/json-generator-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/json-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/jwt-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jwt-NOTICE.txt
new file mode 100644
index 000000000..316bf4578
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/jwt-NOTICE.txt
@@ -0,0 +1,9 @@
+source: https://github.com/jwt/ruby-jwt/blob/v2.2.2/LICENSE
+
+Copyright (c) 2011 Jeff Lindsay
+
+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.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/jzlib-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/jzlib-NOTICE.txt
deleted file mode 100644
index ce8a1dee7..000000000
--- a/tools/dependencies-report/src/main/resources/notices/jzlib-NOTICE.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-source: https://github.com/ymnk/jzlib/blob/1.1.3/LICENSE.txt#L5-L29
-
-Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in
-     the documentation and/or other materials provided with the distribution.
-
-  3. The names of the authors may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/logger-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/logger-NOTICE.txt
new file mode 100644
index 000000000..44d33b0b5
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/logger-NOTICE.txt
@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/lru_redux-1.1.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/lru_redux-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/lru_redux-1.1.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/lru_redux-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/mail-2.6.6-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/mail-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/mail-2.6.6-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/mail-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/manticore-0.6.4-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/manticore-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/manticore-0.6.4-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/manticore-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/march_hare-3.1.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/march_hare-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/march_hare-3.1.1-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/march_hare-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/memoizable-0.4.2-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/memoizable-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/memoizable-0.4.2-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/memoizable-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/method_source-0.8.2-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/method_source-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/method_source-0.8.2-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/method_source-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/metriks-0.9.9.8-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/metriks-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/metriks-0.9.9.8-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/metriks-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/mime-types-2.6.2-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/mime-types-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/mime-types-2.6.2-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/mime-types-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/mini_mime-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/mini_mime-NOTICE.txt
new file mode 100644
index 000000000..65b2b8a3a
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/mini_mime-NOTICE.txt
@@ -0,0 +1,23 @@
+# source: https://github.com/discourse/mini_mime/blob/v1.1.5/LICENSE.txt
+
+The MIT License (MIT)
+
+Copyright (c) 2016 Discourse Construction Kit, 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.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/minitar-0.6.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/minitar-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/minitar-0.6.1-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/minitar-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/msgpack-1.2.4-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/msgpack-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/msgpack-1.2.4-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/msgpack-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/multi_json-1.13.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/multi_json-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/multi_json-1.13.1-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/multi_json-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/multipart-post-2.0.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/multipart-post-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/multipart-post-2.0.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/multipart-post-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/murmurhash3-0.1.6-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/murmurhash3-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/murmurhash3-0.1.6-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/murmurhash3-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/mustache-0.99.8-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/mustache-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/mustache-0.99.8-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/mustache-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/mustermann-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/mustermann-NOTICE.txt
new file mode 100644
index 000000000..bc53b031f
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/mustermann-NOTICE.txt
@@ -0,0 +1,23 @@
+Copyright (c) 2013-2017 Konstantin Haase
+Copyright (c) 2016-2017 Zachary Scott
+
+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.
diff --git a/tools/dependencies-report/src/main/resources/notices/nailgun-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/nailgun-NOTICE.txt
deleted file mode 100644
index 84d3b7235..000000000
--- a/tools/dependencies-report/src/main/resources/notices/nailgun-NOTICE.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-source: https://github.com/facebook/nailgun/blob/nailgun-all-0.9.3/LICENSE.txt
-
-Nailgun Copyright © 2004-2012, Martian Software, Inc.
-
-Apache License
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/naught-1.1.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/naught-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/naught-1.1.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/naught-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/net-http-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/net-http-NOTICE.txt
new file mode 100644
index 000000000..44d33b0b5
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/net-http-NOTICE.txt
@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/net-imap-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/net-imap-NOTICE.txt
new file mode 100644
index 000000000..ccbc3033c
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/net-imap-NOTICE.txt
@@ -0,0 +1,86 @@
+# source: https://github.com/ruby/net-imap/blob/v0.3.7/LICENSE.txt
+
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+-------------------------------------------------------------------------
+
+This software includes documentation which has been copied from the relevant
+RFCs.  The copied documentation is covered by the following licenses:
+
+RFC 3501 (Editor: M. Crispin)
+Full Copyright Statement
+
+   Copyright (C) The Internet Society (2003).  All Rights Reserved.
+
+   This document and translations of it may be copied and furnished to
+   others, and derivative works that comment on or otherwise explain it
+   or assist in its implementation may be prepared, copied, published
+   and distributed, in whole or in part, without restriction of any
+   kind, provided that the above copyright notice and this paragraph are
+   included on all such copies and derivative works.  However, this
+   document itself may not be modified in any way, such as by removing
+   the copyright notice or references to the Internet Society or other
+   Internet organizations, except as needed for the purpose of
+   developing Internet standards in which case the procedures for
+   copyrights defined in the Internet Standards process must be
+   followed, or as required to translate it into languages other than
+   English.
+
+   The limited permissions granted above are perpetual and will not be
+   revoked by the Internet Society or its successors or assigns.  v This
+   document and the information contained herein is provided on an "AS
+   IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING TASK
+   FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+   LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL
+   NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY
+   OR FITNESS FOR A PARTICULAR PURPOSE.
+
+
+RFC9051 (Editors: A. Melnikov, B. Leiba)
+Copyright Notice
+
+   Copyright (c) 2021 IETF Trust and the persons identified as the
+   document authors.  All rights reserved.
+
+   This document is subject to BCP 78 and the IETF Trust's Legal
+   Provisions Relating to IETF Documents
+   (https://trustee.ietf.org/license-info) in effect on the date of
+   publication of this document.  Please review these documents
+   carefully, as they describe your rights and restrictions with respect
+   to this document.  Code Components extracted from this document must
+   include Simplified BSD License text as described in Section 4.e of
+   the Trust Legal Provisions and are provided without warranty as
+   described in the Simplified BSD License.
+
+   This document may contain material from IETF Documents or IETF
+   Contributions published or made publicly available before November
+   10, 2008.  The person(s) controlling the copyright in some of this
+   material may not have granted the IETF Trust the right to allow
+   modifications of such material outside the IETF Standards Process.
+   Without obtaining an adequate license from the person(s) controlling
+   the copyright in such materials, this document may not be modified
+   outside the IETF Standards Process, and derivative works of it may
+   not be created outside the IETF Standards Process, except to format
+   it for publication as an RFC or to translate it into languages other
+   than English.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/net-pop-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/net-pop-NOTICE.txt
new file mode 100644
index 000000000..889bab1e5
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/net-pop-NOTICE.txt
@@ -0,0 +1,24 @@
+source: https://github.com/ruby/net-pop/blob/v0.1.2/LICENSE.txt
+
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/net-protocol-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/net-protocol-NOTICE.txt
new file mode 100644
index 000000000..44d33b0b5
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/net-protocol-NOTICE.txt
@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/net-smtp-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/net-smtp-NOTICE.txt
new file mode 100644
index 000000000..8ed718d8d
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/net-smtp-NOTICE.txt
@@ -0,0 +1,24 @@
+# source: https://github.com/ruby/net-smtp/blob/v0.4.0/LICENSE.txt
+
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/netty-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/netty-NOTICE.txt
new file mode 100644
index 000000000..5ce108238
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/netty-NOTICE.txt
@@ -0,0 +1,264 @@
+
+                            The Netty Project
+                            =================
+
+Please visit the Netty web site for more information:
+
+  * https://netty.io/
+
+Copyright 2014 The Netty Project
+
+The Netty Project licenses this file to you under the Apache License,
+version 2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at:
+
+  https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
+
+Also, please refer to each LICENSE.<component>.txt file, which is located in
+the 'license' directory of the distribution file, for the license terms of the
+components that this product depends on.
+
+-------------------------------------------------------------------------------
+This product contains the extensions to Java Collections Framework which has
+been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:
+
+  * LICENSE:
+    * license/LICENSE.jsr166y.txt (Public Domain)
+  * HOMEPAGE:
+    * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/
+    * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/
+
+This product contains a modified version of Robert Harder's Public Domain
+Base64 Encoder and Decoder, which can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.base64.txt (Public Domain)
+  * HOMEPAGE:
+    * http://iharder.sourceforge.net/current/java/base64/
+
+This product contains a modified portion of 'Webbit', an event based
+WebSocket and HTTP server, which can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.webbit.txt (BSD License)
+  * HOMEPAGE:
+    * https://github.com/joewalnes/webbit
+
+This product contains a modified portion of 'SLF4J', a simple logging
+facade for Java, which can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.slf4j.txt (MIT License)
+  * HOMEPAGE:
+    * https://www.slf4j.org/
+
+This product contains a modified portion of 'Apache Harmony', an open source
+Java SE, which can be obtained at:
+
+  * NOTICE:
+    * license/NOTICE.harmony.txt
+  * LICENSE:
+    * license/LICENSE.harmony.txt (Apache License 2.0)
+  * HOMEPAGE:
+    * https://archive.apache.org/dist/harmony/
+
+This product contains a modified portion of 'jbzip2', a Java bzip2 compression
+and decompression library written by Matthew J. Francis. It can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.jbzip2.txt (MIT License)
+  * HOMEPAGE:
+    * https://code.google.com/p/jbzip2/
+
+This product contains a modified portion of 'libdivsufsort', a C API library to construct
+the suffix array and the Burrows-Wheeler transformed string for any input string of
+a constant-size alphabet written by Yuta Mori. It can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.libdivsufsort.txt (MIT License)
+  * HOMEPAGE:
+    * https://github.com/y-256/libdivsufsort
+
+This product contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM,
+ which can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.jctools.txt (ASL2 License)
+  * HOMEPAGE:
+    * https://github.com/JCTools/JCTools
+
+This product optionally depends on 'JZlib', a re-implementation of zlib in
+pure Java, which can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.jzlib.txt (BSD style License)
+  * HOMEPAGE:
+    * http://www.jcraft.com/jzlib/
+
+This product optionally depends on 'Compress-LZF', a Java library for encoding and
+decoding data in LZF format, written by Tatu Saloranta. It can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.compress-lzf.txt (Apache License 2.0)
+  * HOMEPAGE:
+    * https://github.com/ning/compress
+
+This product optionally depends on 'lz4', a LZ4 Java compression
+and decompression library written by Adrien Grand. It can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.lz4.txt (Apache License 2.0)
+  * HOMEPAGE:
+    * https://github.com/jpountz/lz4-java
+
+This product optionally depends on 'lzma-java', a LZMA Java compression
+and decompression library, which can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.lzma-java.txt (Apache License 2.0)
+  * HOMEPAGE:
+    * https://github.com/jponge/lzma-java
+
+This product optionally depends on 'zstd-jni', a zstd-jni Java compression
+and decompression library, which can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.zstd-jni.txt (Apache License 2.0)
+  * HOMEPAGE:
+    * https://github.com/luben/zstd-jni
+
+This product contains a modified portion of 'jfastlz', a Java port of FastLZ compression
+and decompression library written by William Kinney. It can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.jfastlz.txt (MIT License)
+  * HOMEPAGE:
+    * https://code.google.com/p/jfastlz/
+
+This product contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data
+interchange format, which can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.protobuf.txt (New BSD License)
+  * HOMEPAGE:
+    * https://github.com/google/protobuf
+
+This product optionally depends on 'Bouncy Castle Crypto APIs' to generate
+a temporary self-signed X.509 certificate when the JVM does not provide the
+equivalent functionality.  It can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.bouncycastle.txt (MIT License)
+  * HOMEPAGE:
+    * https://www.bouncycastle.org/
+
+This product optionally depends on 'Snappy', a compression library produced
+by Google Inc, which can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.snappy.txt (New BSD License)
+  * HOMEPAGE:
+    * https://github.com/google/snappy
+
+This product optionally depends on 'JBoss Marshalling', an alternative Java
+serialization API, which can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.jboss-marshalling.txt (Apache License 2.0)
+  * HOMEPAGE:
+    * https://github.com/jboss-remoting/jboss-marshalling
+
+This product optionally depends on 'Caliper', Google's micro-
+benchmarking framework, which can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.caliper.txt (Apache License 2.0)
+  * HOMEPAGE:
+    * https://github.com/google/caliper
+
+This product optionally depends on 'Apache Commons Logging', a logging
+framework, which can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.commons-logging.txt (Apache License 2.0)
+  * HOMEPAGE:
+    * https://commons.apache.org/logging/
+
+This product optionally depends on 'Apache Log4J', a logging framework, which
+can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.log4j.txt (Apache License 2.0)
+  * HOMEPAGE:
+    * https://logging.apache.org/log4j/
+
+This product optionally depends on 'Aalto XML', an ultra-high performance
+non-blocking XML processor, which can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.aalto-xml.txt (Apache License 2.0)
+  * HOMEPAGE:
+    * https://wiki.fasterxml.com/AaltoHome
+
+This product contains a modified version of 'HPACK', a Java implementation of
+the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.hpack.txt (Apache License 2.0)
+  * HOMEPAGE:
+    * https://github.com/twitter/hpack
+    
+This product contains a modified version of 'HPACK', a Java implementation of
+the HTTP/2 HPACK algorithm written by Cory Benfield. It can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.hyper-hpack.txt (MIT License)
+  * HOMEPAGE:
+    * https://github.com/python-hyper/hpack/
+
+This product contains a modified version of 'HPACK', a Java implementation of
+the HTTP/2 HPACK algorithm written by Tatsuhiro Tsujikawa. It can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.nghttp2-hpack.txt (MIT License)
+  * HOMEPAGE:
+    * https://github.com/nghttp2/nghttp2/
+
+This product contains a modified portion of 'Apache Commons Lang', a Java library
+provides utilities for the java.lang API, which can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.commons-lang.txt (Apache License 2.0)
+  * HOMEPAGE:
+    * https://commons.apache.org/proper/commons-lang/
+
+
+This product contains the Maven wrapper scripts from 'Maven Wrapper', that provides an easy way to ensure a user has everything necessary to run the Maven build.
+
+  * LICENSE:
+    * license/LICENSE.mvn-wrapper.txt (Apache License 2.0)
+  * HOMEPAGE:
+    * https://github.com/takari/maven-wrapper
+
+This product contains the dnsinfo.h header file, that provides a way to retrieve the system DNS configuration on MacOS.
+This private header is also used by Apple's open source
+ mDNSResponder (https://opensource.apple.com/tarballs/mDNSResponder/).
+
+ * LICENSE:
+    * license/LICENSE.dnsinfo.txt (Apple Public Source License 2.0)
+  * HOMEPAGE:
+    * https://www.opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h
+
+This product optionally depends on 'Brotli4j', Brotli compression and
+decompression for Java., which can be obtained at:
+
+  * LICENSE:
+    * license/LICENSE.brotli4j.txt (Apache License 2.0)
+  * HOMEPAGE:
+    * https://github.com/hyperxpro/Brotli4j
diff --git a/tools/dependencies-report/src/main/resources/notices/nio4r-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/nio4r-NOTICE.txt
new file mode 100644
index 000000000..ce4682240
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/nio4r-NOTICE.txt
@@ -0,0 +1,10 @@
+Released under the MIT license.
+
+Copyright, 2019, by Tony Arcieri.
+Copyright, 2019, by Samuel G. D. Williams.
+
+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.
diff --git a/tools/dependencies-report/src/main/resources/notices/nokogiri-1.8.4-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/nokogiri-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/nokogiri-1.8.4-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/nokogiri-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/numerizer-0.1.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/numerizer-0.1.1-NOTICE.txt
deleted file mode 100644
index 5ebc8b9ac..000000000
--- a/tools/dependencies-report/src/main/resources/notices/numerizer-0.1.1-NOTICE.txt
+++ /dev/null
@@ -1 +0,0 @@
-FAKER
diff --git a/tools/dependencies-report/src/main/resources/notices/openssl_pkcs8_pure-0.0.0.2-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/openssl_pkcs8_pure-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/openssl_pkcs8_pure-0.0.0.2-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/openssl_pkcs8_pure-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/options-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/options-NOTICE.txt
deleted file mode 100644
index b9015b394..000000000
--- a/tools/dependencies-report/src/main/resources/notices/options-NOTICE.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-source: https://github.com/headius/options/blob/options-1.4/src/main/java/com/headius/options/Option.java#L1-L13
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/org.apache.httpcomponents!httpclient-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.apache.httpcomponents!httpclient-NOTICE.txt
new file mode 100644
index 000000000..891234476
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/org.apache.httpcomponents!httpclient-NOTICE.txt
@@ -0,0 +1,7 @@
+source: https://github.com/apache/httpcomponents-client/blob/4.5.x/NOTICE.txt
+
+Apache HttpComponents Client
+Copyright 1999-2021 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/tools/dependencies-report/src/main/resources/notices/org.apache.httpcomponents!httpcore-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.apache.httpcomponents!httpcore-NOTICE.txt
new file mode 100644
index 000000000..f51188ead
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/org.apache.httpcomponents!httpcore-NOTICE.txt
@@ -0,0 +1,7 @@
+source: https://github.com/apache/httpcomponents-core/blob/4.4.x/NOTICE.txt
+
+Apache HttpComponents Core
+Copyright 2005-2021 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/tools/dependencies-report/src/main/resources/notices/org.apache.logging.log4j!log4j-1.2-api-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.apache.logging.log4j!log4j-1.2-api-NOTICE.txt
new file mode 100644
index 000000000..4ef04743a
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/org.apache.logging.log4j!log4j-1.2-api-NOTICE.txt
@@ -0,0 +1,19 @@
+source: https://github.com/apache/logging-log4j2/blob/rel/2.14.0/NOTICE.txt
+
+Apache Log4j
+Copyright 1999-2017 Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+ResolverUtil.java
+Copyright 2005-2006 Tim Fennell
+
+Dumbster SMTP test server
+Copyright 2004 Jason Paul Kitchen
+
+TypeUtil.java
+Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
+
+picocli (http://picocli.info)
+Copyright 2017 Remko Popma
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/org.apache.logging.log4j!log4j-api-2.9.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.apache.logging.log4j!log4j-api-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.apache.logging.log4j!log4j-api-2.9.1-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.apache.logging.log4j!log4j-api-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.apache.logging.log4j!log4j-core-2.9.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.apache.logging.log4j!log4j-core-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.apache.logging.log4j!log4j-core-2.9.1-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.apache.logging.log4j!log4j-core-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.apache.logging.log4j!log4j-jcl-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.apache.logging.log4j!log4j-jcl-NOTICE.txt
new file mode 100644
index 000000000..4ef04743a
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/org.apache.logging.log4j!log4j-jcl-NOTICE.txt
@@ -0,0 +1,19 @@
+source: https://github.com/apache/logging-log4j2/blob/rel/2.14.0/NOTICE.txt
+
+Apache Log4j
+Copyright 1999-2017 Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+ResolverUtil.java
+Copyright 2005-2006 Tim Fennell
+
+Dumbster SMTP test server
+Copyright 2004 Jason Paul Kitchen
+
+TypeUtil.java
+Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
+
+picocli (http://picocli.info)
+Copyright 2017 Remko Popma
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/org.apache.logging.log4j!log4j-slf4j-impl-2.9.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.apache.logging.log4j!log4j-slf4j-impl-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.apache.logging.log4j!log4j-slf4j-impl-2.9.1-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.apache.logging.log4j!log4j-slf4j-impl-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.codehaus.janino!commons-compiler-3.0.8-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.codehaus.janino!commons-compiler-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.codehaus.janino!commons-compiler-3.0.8-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.codehaus.janino!commons-compiler-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.codehaus.janino!janino-3.0.8-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.codehaus.janino!janino-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.codehaus.janino!janino-3.0.8-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.codehaus.janino!janino-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.codehaus.mojo!animal-sniffer-annotations-1.14-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.codehaus.mojo!animal-sniffer-annotations-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.codehaus.mojo!animal-sniffer-annotations-1.14-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.codehaus.mojo!animal-sniffer-annotations-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.commands-3.6.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.commands-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.commands-3.6.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.commands-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.contenttype-3.4.100-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.contenttype-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.contenttype-3.4.100-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.contenttype-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.expressions-3.4.300-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.expressions-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.expressions-3.4.300-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.expressions-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.filesystem-1.3.100-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.filesystem-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.filesystem-1.3.100-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.filesystem-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.jobs-3.5.100-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.jobs-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.jobs-3.5.100-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.jobs-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.resources-3.7.100-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.resources-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.resources-3.7.100-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.resources-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.runtime-3.7.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.runtime-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.runtime-3.7.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.eclipse.core!org.eclipse.core.runtime-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.eclipse.equinox!org.eclipse.equinox.app-1.3.100-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.eclipse.equinox!org.eclipse.equinox.app-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.eclipse.equinox!org.eclipse.equinox.app-1.3.100-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.eclipse.equinox!org.eclipse.equinox.app-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.eclipse.equinox!org.eclipse.equinox.common-3.6.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.eclipse.equinox!org.eclipse.equinox.common-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.eclipse.equinox!org.eclipse.equinox.common-3.6.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.eclipse.equinox!org.eclipse.equinox.common-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.eclipse.equinox!org.eclipse.equinox.preferences-3.4.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.eclipse.equinox!org.eclipse.equinox.preferences-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.eclipse.equinox!org.eclipse.equinox.preferences-3.4.1-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.eclipse.equinox!org.eclipse.equinox.preferences-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.eclipse.equinox!org.eclipse.equinox.registry-3.5.101-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.eclipse.equinox!org.eclipse.equinox.registry-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.eclipse.equinox!org.eclipse.equinox.registry-3.5.101-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.eclipse.equinox!org.eclipse.equinox.registry-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.eclipse.jdt!org.eclipse.jdt.core-3.10.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.eclipse.jdt!org.eclipse.jdt.core-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.eclipse.jdt!org.eclipse.jdt.core-3.10.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.eclipse.jdt!org.eclipse.jdt.core-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.eclipse.osgi!org.eclipse.osgi-3.7.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.eclipse.osgi!org.eclipse.osgi-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.eclipse.osgi!org.eclipse.osgi-3.7.1-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.eclipse.osgi!org.eclipse.osgi-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.eclipse.text!org.eclipse.text-3.5.101-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.eclipse.text!org.eclipse.text-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.eclipse.text!org.eclipse.text-3.5.101-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.eclipse.text!org.eclipse.text-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.javassist!javassist-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.javassist!javassist-NOTICE.txt
new file mode 100644
index 000000000..d73ba6b9e
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/org.javassist!javassist-NOTICE.txt
@@ -0,0 +1,3 @@
+Copyright (C) 1999-2019 by Shigeru Chiba, All rights reserved.
+
+This software is distributed under the Mozilla Public License Version 1.1, the GNU Lesser General Public License Version 2.1 or later, or the Apache License Version 2.0.
diff --git a/tools/dependencies-report/src/main/resources/notices/org.jruby!jruby-complete-9.1.13.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.jruby!jruby-core-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.jruby!jruby-complete-9.1.13.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.jruby!jruby-core-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.logstash!jvm-options-parser-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.logstash!jvm-options-parser-NOTICE.txt
new file mode 100644
index 000000000..62688c3eb
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/org.logstash!jvm-options-parser-NOTICE.txt
@@ -0,0 +1,13 @@
+Copyright (c) 2022 Elasticsearch B.V. <http://www.elastic.co>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/org.reflections!reflections-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.reflections!reflections-NOTICE.txt
new file mode 100644
index 000000000..77f62ea0f
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/org.reflections!reflections-NOTICE.txt
@@ -0,0 +1,15 @@
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.
+
+Also licensed under BSD-2-Clause according to https://github.com/ronmamo/reflections/blob/0.9.11/pom.xml#L20-L22
diff --git a/tools/dependencies-report/src/main/resources/notices/org.slf4j!slf4j-api-1.7.25-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.slf4j!slf4j-api-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/org.slf4j!slf4j-api-1.7.25-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/org.slf4j!slf4j-api-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/org.yaml!snakeyaml-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/org.yaml!snakeyaml-NOTICE.txt
new file mode 100644
index 000000000..742a717ee
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/org.yaml!snakeyaml-NOTICE.txt
@@ -0,0 +1,11 @@
+Copyright (c) 2008, SnakeYAML
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+in compliance with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License
+is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+or implied. See the License for the specific language governing permissions and limitations under
+the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/paquet-0.2.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/paquet-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/paquet-0.2.1-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/paquet-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/pleaserun-0.0.30-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/pleaserun-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/pleaserun-0.0.30-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/pleaserun-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/polyglot-0.3.5-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/polyglot-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/polyglot-0.3.5-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/polyglot-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/poseidon-0.0.5-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/poseidon-0.0.5-NOTICE.txt
deleted file mode 100644
index 391c8de27..000000000
--- a/tools/dependencies-report/src/main/resources/notices/poseidon-0.0.5-NOTICE.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2013 Bob Potter
-
-MIT License
-
-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.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/prototype.js-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/prototype.js-NOTICE.txt
deleted file mode 100644
index 30404ce4c..000000000
--- a/tools/dependencies-report/src/main/resources/notices/prototype.js-NOTICE.txt
+++ /dev/null
@@ -1 +0,0 @@
-TODO
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/pry-0.10.4-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/pry-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/pry-0.10.4-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/pry-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/psych-2.2.4-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/psych-2.2.4-NOTICE.txt
deleted file mode 100644
index 6055da4db..000000000
--- a/tools/dependencies-report/src/main/resources/notices/psych-2.2.4-NOTICE.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright 2009 Aaron Patterson, et al.
-
-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.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/psych-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/psych-NOTICE.txt
new file mode 100644
index 000000000..7609df5a7
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/psych-NOTICE.txt
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2009 Aaron Patterson, et al.
+
+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.
diff --git a/tools/dependencies-report/src/main/resources/notices/public_suffix-1.4.6-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/public_suffix-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/public_suffix-1.4.6-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/public_suffix-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/puma-2.16.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/puma-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/puma-2.16.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/puma-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/raabro-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/raabro-NOTICE.txt
new file mode 100644
index 000000000..eb601f067
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/raabro-NOTICE.txt
@@ -0,0 +1,24 @@
+source: https://github.com/floraison/raabro/blob/v1.4.0/LICENSE.txt
+
+Copyright (c) 2015-2020, John Mettraux, jmettraux@gmail.com
+
+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.
+
+
+Made in Japan.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/racc-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/racc-NOTICE.txt
index d7d4db9e8..c6ce0a915 100644
--- a/tools/dependencies-report/src/main/resources/notices/racc-NOTICE.txt
+++ b/tools/dependencies-report/src/main/resources/notices/racc-NOTICE.txt
@@ -1,8 +1,24 @@
-TODO 
+source: https://github.com/ruby/racc/blob/master/COPYING
 
+Copyright (C) 2019 Yukihiro Matsumoto. All rights reserved.
 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
 
-Racc is distributed under the terms of the GNU Lesser General
-Public License version 2. Note that you do NOT need to follow
-LGPL for your own parser (racc outputs). You can distribute those
-files under any licenses you want.Racc is
\ No newline at end of file
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/tools/dependencies-report/src/main/resources/notices/rack-1.6.6-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rack-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/rack-1.6.6-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/rack-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/rack-protection-1.5.5-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rack-protection-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/rack-protection-1.5.5-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/rack-protection-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/rack-session-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rack-session-NOTICE.txt
new file mode 100644
index 000000000..e861293c2
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/rack-session-NOTICE.txt
@@ -0,0 +1,72 @@
+# MIT License
+
+Copyright, 2007-2008, by Leah Neukirchen.  
+Copyright, 2007-2009, by Scytrin dai Kinthra.  
+Copyright, 2008, by Daniel Roethlisberger.  
+Copyright, 2009, by Joshua Peek.  
+Copyright, 2009, by Mickaël Riga.  
+Copyright, 2010, by Simon Chiang.  
+Copyright, 2010-2011, by José Valim.  
+Copyright, 2010-2013, by James Tucker.  
+Copyright, 2010-2019, by Aaron Patterson.  
+Copyright, 2011, by Max Cantor.  
+Copyright, 2011-2012, by Konstantin Haase.  
+Copyright, 2011, by Will Leinweber.  
+Copyright, 2011, by John Manoogian III.  
+Copyright, 2012, by Yun Huang Yong.  
+Copyright, 2012, by Ravil Bayramgalin.  
+Copyright, 2012, by Timothy Elliott.  
+Copyright, 2012, by Jamie Macey.  
+Copyright, 2012-2015, by Santiago Pastorino.  
+Copyright, 2013, by Andrew Cole.  
+Copyright, 2013, by Postmodern.  
+Copyright, 2013, by Vipul A M.  
+Copyright, 2013, by Charles Hornberger.  
+Copyright, 2014, by Michal Bryxí.  
+Copyright, 2015, by deepj.  
+Copyright, 2015, by Doug McInnes.  
+Copyright, 2015, by David Runger.  
+Copyright, 2015, by Francesco Rodríguez.  
+Copyright, 2015, by Yuichiro Kaneko.  
+Copyright, 2015, by Michael Sauter.  
+Copyright, 2016, by Kir Shatrov.  
+Copyright, 2016, by Yann Vanhalewyn.  
+Copyright, 2016, by Jian Weihang.  
+Copyright, 2017, by Jordan Raine.  
+Copyright, 2018, by Dillon Welch.  
+Copyright, 2018, by Yoshiyuki Hirano.  
+Copyright, 2019, by Krzysztof Rybka.  
+Copyright, 2019, by Frederick Cheung.  
+Copyright, 2019, by Adrian Setyadi.  
+Copyright, 2019, by Rafael Mendonça França.  
+Copyright, 2019-2020, by Pavel Rosicky.  
+Copyright, 2019, by Dima Fatko.  
+Copyright, 2019, by Oleh Demianiuk.  
+Copyright, 2020-2023, by Samuel Williams.  
+Copyright, 2020-2022, by Jeremy Evans.  
+Copyright, 2020, by Alex Speller.  
+Copyright, 2020, by Ryuta Kamizono.  
+Copyright, 2020, by Yudai Suzuki.  
+Copyright, 2020, by Bart de Water.  
+Copyright, 2020, by Alec Clarke.  
+Copyright, 2021, by Michael Coyne.  
+Copyright, 2022, by Philip Arndt.  
+Copyright, 2022, by Jon Dufresne.  
+
+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.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/rake-10.4.2-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rake-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/rake-10.4.2-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/rake-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/redis-3.3.5-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/redis-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/redis-3.3.5-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/redis-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/reline-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/reline-NOTICE.txt
new file mode 100644
index 000000000..44d33b0b5
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/reline-NOTICE.txt
@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/rexml-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rexml-NOTICE.txt
new file mode 100644
index 000000000..b98ff4bb2
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/rexml-NOTICE.txt
@@ -0,0 +1,24 @@
+source: https://github.com/ruby/rexml/blob/v3.2.5/LICENSE.txt
+
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/rspec-3.7.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rspec-3.7.0-NOTICE.txt
deleted file mode 100644
index ef0df45a0..000000000
--- a/tools/dependencies-report/src/main/resources/notices/rspec-3.7.0-NOTICE.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright © 2009 Chad Humphries, David Chelimsky  
-Copyright © 2006 David Chelimsky, The RSpec Development Team  
-Copyright © 2005 Steven Baker
-
-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.
diff --git a/tools/dependencies-report/src/main/resources/notices/rspec-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rspec-NOTICE.txt
new file mode 100644
index 000000000..f6e9e59f5
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/rspec-NOTICE.txt
@@ -0,0 +1,29 @@
+source: https://github.com/rspec/rspec-metagem/blob/v3.12.0/LICENSE.md
+
+The MIT License (MIT)
+=====================
+
+Copyright © 2009 Chad Humphries, David Chelimsky
+Copyright © 2006 David Chelimsky, The RSpec Development Team
+Copyright © 2005 Steven Baker
+
+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.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/rspec-collection_matchers-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rspec-collection_matchers-NOTICE.txt
new file mode 100644
index 000000000..0b2b250a6
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/rspec-collection_matchers-NOTICE.txt
@@ -0,0 +1,29 @@
+source: https://github.com/rspec/rspec-collection_matchers/blob/v1.2.1/LICENSE.txt
+
+(The MIT License)
+
+Copyright (c) 2013 Hugo Barauna
+Copyright (c) 2012 David Chelimsky, Myron Marston
+Copyright (c) 2006 David Chelimsky, The RSpec Development Team
+Copyright (c) 2005 Steven Baker
+
+MIT License
+
+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.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/rspec-core-3.7.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rspec-core-3.7.1-NOTICE.txt
deleted file mode 100644
index 76dc17d73..000000000
--- a/tools/dependencies-report/src/main/resources/notices/rspec-core-3.7.1-NOTICE.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-The MIT License (MIT)
-=====================
-
-* Copyright © 2012 Chad Humphries, David Chelimsky, Myron Marston
-* Copyright © 2009 Chad Humphries, David Chelimsky
-* Copyright © 2006 David Chelimsky, The RSpec Development Team
-* Copyright © 2005 Steven Baker
-
-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.
diff --git a/tools/dependencies-report/src/main/resources/notices/rspec-core-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rspec-core-NOTICE.txt
new file mode 100644
index 000000000..b456861b9
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/rspec-core-NOTICE.txt
@@ -0,0 +1,28 @@
+source: https://github.com/rspec/rspec-core/blob/v3.12.2/LICENSE.md
+
+The MIT License (MIT)
+=====================
+
+* Copyright © 2012 Chad Humphries, David Chelimsky, Myron Marston
+* Copyright © 2009 Chad Humphries, David Chelimsky
+* Copyright © 2006 David Chelimsky, The RSpec Development Team
+* Copyright © 2005 Steven Baker
+
+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.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/rspec-expectations-3.7.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rspec-expectations-3.7.0-NOTICE.txt
deleted file mode 100644
index dae02d8a7..000000000
--- a/tools/dependencies-report/src/main/resources/notices/rspec-expectations-3.7.0-NOTICE.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-The MIT License (MIT)
-=====================
-
-* Copyright © 2012 David Chelimsky, Myron Marston
-* Copyright © 2006 David Chelimsky, The RSpec Development Team
-* Copyright © 2005 Steven Baker
-
-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.
diff --git a/tools/dependencies-report/src/main/resources/notices/rspec-expectations-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rspec-expectations-NOTICE.txt
new file mode 100644
index 000000000..65e790bf8
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/rspec-expectations-NOTICE.txt
@@ -0,0 +1,27 @@
+source: https://github.com/rspec/rspec-expectations/blob/v3.12.3/LICENSE.md
+
+The MIT License (MIT)
+=====================
+
+* Copyright © 2012 David Chelimsky, Myron Marston
+* Copyright © 2006 David Chelimsky, The RSpec Development Team
+* Copyright © 2005 Steven Baker
+
+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.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/rspec-mocks-3.7.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rspec-mocks-3.7.0-NOTICE.txt
deleted file mode 100644
index dae02d8a7..000000000
--- a/tools/dependencies-report/src/main/resources/notices/rspec-mocks-3.7.0-NOTICE.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-The MIT License (MIT)
-=====================
-
-* Copyright © 2012 David Chelimsky, Myron Marston
-* Copyright © 2006 David Chelimsky, The RSpec Development Team
-* Copyright © 2005 Steven Baker
-
-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.
diff --git a/tools/dependencies-report/src/main/resources/notices/rspec-mocks-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rspec-mocks-NOTICE.txt
new file mode 100644
index 000000000..2ec455c78
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/rspec-mocks-NOTICE.txt
@@ -0,0 +1,27 @@
+source: https://github.com/rspec/rspec-mocks/blob/v3.12.6/LICENSE.md
+
+The MIT License (MIT)
+=====================
+
+* Copyright © 2012 David Chelimsky, Myron Marston
+* Copyright © 2006 David Chelimsky, The RSpec Development Team
+* Copyright © 2005 Steven Baker
+
+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.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/rspec-sequencing-0.1.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rspec-sequencing-0.1.0-NOTICE.txt
deleted file mode 100644
index 5446bebe6..000000000
--- a/tools/dependencies-report/src/main/resources/notices/rspec-sequencing-0.1.0-NOTICE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-Copyright (c) 2016 Elasticsearch <http://www.elastic.co>
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/tools/dependencies-report/src/main/resources/notices/rspec-support-3.7.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rspec-support-3.7.1-NOTICE.txt
deleted file mode 100644
index 7a5252109..000000000
--- a/tools/dependencies-report/src/main/resources/notices/rspec-support-3.7.1-NOTICE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-* Copyright © 2013 David Chelimsky, Myron Marston, Jon Rowe, Sam Phippen, Xavier Shay, Bradley Schaefer
-
-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.
diff --git a/tools/dependencies-report/src/main/resources/notices/rspec-support-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rspec-support-NOTICE.txt
new file mode 100644
index 000000000..7f1ea9955
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/rspec-support-NOTICE.txt
@@ -0,0 +1,25 @@
+source: https://github.com/rspec/rspec-support/blob/v3.12.1/LICENSE.md
+
+The MIT License (MIT)
+====================
+
+* Copyright © 2013 David Chelimsky, Myron Marston, Jon Rowe, Sam Phippen, Xavier Shay, Bradley Schaefer
+
+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.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/rspec-wait-0.0.9-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rspec-wait-0.0.9-NOTICE.txt
deleted file mode 100644
index d4d42e9b7..000000000
--- a/tools/dependencies-report/src/main/resources/notices/rspec-wait-0.0.9-NOTICE.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2014 Steve Richert
-
-MIT License
-
-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.
diff --git a/tools/dependencies-report/src/main/resources/notices/rspec-wait-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rspec-wait-NOTICE.txt
new file mode 100644
index 000000000..512f95aa3
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/rspec-wait-NOTICE.txt
@@ -0,0 +1,24 @@
+source: https://github.com/laserlemon/rspec-wait/blob/v0.0.9/LICENSE.txt
+
+Copyright (c) 2014 Steve Richert
+
+MIT License
+
+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.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/ruby-maven-libs-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/ruby-maven-libs-NOTICE.txt
new file mode 100644
index 000000000..2b9aa9e27
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/ruby-maven-libs-NOTICE.txt
@@ -0,0 +1,71 @@
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+(a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
+(b) You must cause any modified files to carry prominent notices stating that You changed the files; and
+(c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+(d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Standard License Header
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/ruby-progressbar-1.8.3-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/ruby-progressbar-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/ruby-progressbar-1.8.3-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/ruby-progressbar-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/ruby2_keywords-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/ruby2_keywords-NOTICE.txt
new file mode 100644
index 000000000..e7374344b
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/ruby2_keywords-NOTICE.txt
@@ -0,0 +1,24 @@
+source: https://github.com/ruby/ruby2_keywords/blob/v0.0.5/LICENSE
+
+Copyright 2019-2020 Nobuyoshi Nakada, Yusuke Endoh
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/rubyzip-1.2.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rubyzip-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/rubyzip-1.2.1-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/rubyzip-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/rufus-scheduler-3.0.9-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rufus-scheduler-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/rufus-scheduler-3.0.9-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/rufus-scheduler-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/rumbster-1.1.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/rumbster-1.1.0-NOTICE.txt
deleted file mode 100644
index 0aed17823..000000000
--- a/tools/dependencies-report/src/main/resources/notices/rumbster-1.1.0-NOTICE.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright (c) 2011 Adam Esterline. See LICENSE.txt for further details.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/safe_yaml-1.0.4-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/safe_yaml-1.0.4-NOTICE.txt
deleted file mode 100644
index 4b276dd15..000000000
--- a/tools/dependencies-report/src/main/resources/notices/safe_yaml-1.0.4-NOTICE.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2013 Dan Tao
-
-MIT License
-
-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.
diff --git a/tools/dependencies-report/src/main/resources/notices/semantic_logger-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/semantic_logger-NOTICE.txt
new file mode 100644
index 000000000..c6781dac8
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/semantic_logger-NOTICE.txt
@@ -0,0 +1,13 @@
+Copyright 2012, 2013, 2014, 2015, 2016 Reid Morrison
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/sequel-5.11.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/sequel-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/sequel-5.11.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/sequel-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/simple_oauth-0.3.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/simple_oauth-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/simple_oauth-0.3.1-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/simple_oauth-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/sinatra-1.4.8-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/sinatra-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/sinatra-1.4.8-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/sinatra-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/slop-3.6.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/slop-3.6.0-NOTICE.txt
deleted file mode 100644
index ab47fd754..000000000
--- a/tools/dependencies-report/src/main/resources/notices/slop-3.6.0-NOTICE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2012 Lee Jarvis
-
-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.
diff --git a/tools/dependencies-report/src/main/resources/notices/snakeyaml-1.18-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/snakeyaml-1.18-NOTICE.txt
deleted file mode 100644
index 8db00b5cb..000000000
--- a/tools/dependencies-report/src/main/resources/notices/snakeyaml-1.18-NOTICE.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright (c) 2008, http://www.snakeyaml.org
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/tools/dependencies-report/src/main/resources/notices/snappy-0.0.12-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/snappy-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/snappy-0.0.12-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/snappy-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/snappy-jars-1.1.0.1.2-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/snappy-jars-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/snappy-jars-1.1.0.1.2-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/snappy-jars-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/snmp-1.2.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/snmp-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/snmp-1.2.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/snmp-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/spoon-0.0.6-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/spoon-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/spoon-0.0.6-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/spoon-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/strscan-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/strscan-NOTICE.txt
new file mode 100644
index 000000000..4bda213e6
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/strscan-NOTICE.txt
@@ -0,0 +1,22 @@
+Copyright (C) 1999-2006 Minero Aoki. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/tools/dependencies-report/src/main/resources/notices/stud-0.0.23-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/stud-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/stud-0.0.23-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/stud-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/thread_safe-0.3.6-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/thread_safe-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/thread_safe-0.3.6-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/thread_safe-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/thwait-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/thwait-NOTICE.txt
new file mode 100644
index 000000000..09ae1d087
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/thwait-NOTICE.txt
@@ -0,0 +1,24 @@
+source: https://github.com/ruby/thwait/blob/master/LICENSE.txt
+
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/tilt-2.0.8-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/tilt-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/tilt-2.0.8-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/tilt-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/time-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/time-NOTICE.txt
new file mode 100644
index 000000000..44d33b0b5
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/time-NOTICE.txt
@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/timecop-0.9.1-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/timecop-0.9.1-NOTICE.txt
deleted file mode 100644
index ecd73f93b..000000000
--- a/tools/dependencies-report/src/main/resources/notices/timecop-0.9.1-NOTICE.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-(The MIT License)
-
-Copyright (c) 2012 — Travis Jeffery, John Trupiano
-
-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.
diff --git a/tools/dependencies-report/src/main/resources/notices/timeout-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/timeout-NOTICE.txt
new file mode 100644
index 000000000..44d33b0b5
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/timeout-NOTICE.txt
@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/treetop-1.4.15-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/treetop-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/treetop-1.4.15-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/treetop-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/twitter-5.15.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/twitter-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/twitter-5.15.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/twitter-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/tzinfo-1.2.5-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/tzinfo-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/tzinfo-1.2.5-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/tzinfo-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/tzinfo-data-1.2018.5-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/tzinfo-data-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/tzinfo-data-1.2018.5-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/tzinfo-data-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/unf-0.1.4-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/unf-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/unf-0.1.4-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/unf-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/uri-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/uri-NOTICE.txt
new file mode 100644
index 000000000..44d33b0b5
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/uri-NOTICE.txt
@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/webhdfs-0.8.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/webhdfs-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/webhdfs-0.8.0-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/webhdfs-NOTICE.txt
diff --git a/tools/dependencies-report/src/main/resources/notices/webmock-1.21.0-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/webmock-1.21.0-NOTICE.txt
deleted file mode 100644
index 9a6302d0b..000000000
--- a/tools/dependencies-report/src/main/resources/notices/webmock-1.21.0-NOTICE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2009-2010 Bartosz Blimke
-
-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.
diff --git a/tools/dependencies-report/src/main/resources/notices/webrick-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/webrick-NOTICE.txt
new file mode 100644
index 000000000..4c6deb4d3
--- /dev/null
+++ b/tools/dependencies-report/src/main/resources/notices/webrick-NOTICE.txt
@@ -0,0 +1,24 @@
+source: https://github.com/ruby/webrick/blob/v1.8.1/LICENSE.txt
+
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dependencies-report/src/main/resources/notices/xml-simple-1.1.5-NOTICE.txt b/tools/dependencies-report/src/main/resources/notices/xml-simple-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/main/resources/notices/xml-simple-1.1.5-NOTICE.txt
rename to tools/dependencies-report/src/main/resources/notices/xml-simple-NOTICE.txt
diff --git a/tools/dependencies-report/src/test/java/org/logstash/dependencies/ReportGeneratorTest.java b/tools/dependencies-report/src/test/java/org/logstash/dependencies/ReportGeneratorTest.java
index 266f1fd22..324d615ce 100644
--- a/tools/dependencies-report/src/test/java/org/logstash/dependencies/ReportGeneratorTest.java
+++ b/tools/dependencies-report/src/test/java/org/logstash/dependencies/ReportGeneratorTest.java
@@ -1,5 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
 package org.logstash.dependencies;
 
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -8,10 +29,15 @@ import java.io.InputStream;
 import java.io.StringWriter;
 import java.util.Optional;
 import java.util.Scanner;
+import java.util.regex.Pattern;
 
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.logstash.dependencies.Main.ACCEPTABLE_LICENSES_PATH;
 
 public class ReportGeneratorTest {
@@ -39,6 +65,8 @@ public class ReportGeneratorTest {
         assertTrue(result);
         assertEquals(normalizeEol(expectedOutput), normalizeEol(csvOutput.toString()));
         assertEquals(normalizeEol(expectedNoticeOutput), normalizeEol(noticeOutput.toString()));
+        String unusedLicenses = unusedLicenseWriter.toString();
+        assertThat(unusedLicenses, containsString("41 license mappings were specified but unused"));
     }
 
     @Test
@@ -49,8 +77,21 @@ public class ReportGeneratorTest {
 
         // verify that the two components in the test input with missing licenses are
         // listed in the output with no license, i.e., an empty license field followed by CR/LF
-        assertTrue(csvOutput.toString().contains("commons-io:commons-io,2.5,,,,\r\n"));
-        assertTrue(csvOutput.toString().contains("filesize,0.0.4,,,,\r\n"));
+        assertTrue(csvOutput.toString().contains("commons-io:commons-io,2.5,,,,,\r\n"));
+        assertTrue(csvOutput.toString().contains("filesize,0.0.4,,,,,\r\n"));
+        String unusedLicenses = unusedLicenseWriter.toString();
+        assertThat(unusedLicenses, containsString("43 license mappings were specified but unused"));
+    }
+
+    @Test
+    public void testReportWithConflictingLicenses() throws IOException {
+        try {
+            boolean result = runReportGenerator("/licenseMapping-conflicting.csv", csvOutput, noticeOutput, unusedLicenseWriter);
+            Assert.fail("Conflicting licenses should have been detected");
+        } catch (IllegalStateException ex) {
+            assertThat(ex.getMessage(),
+                    containsString("License mapping contains duplicate dependencies 'bundler' with conflicting licenses 'LGPL-2.0-only' and 'MIT'"));
+        }
     }
 
     @Test
@@ -61,8 +102,13 @@ public class ReportGeneratorTest {
 
         // verify that the two components in the test input with unacceptable licenses are
         // listed in the output with no license, i.e., an empty license field followed by CR/LF
-        assertThat(csvOutput.toString(), containsString("com.fasterxml.jackson.core:jackson-core,2.7.3,,,,\r\n"));
-        assertThat(csvOutput.toString(), containsString("bundler,1.16.0,,,,\r\n"));
+        String csvString = csvOutput.toString();
+        assertThat(csvString, containsString("com.fasterxml.jackson.core:jackson-core,2.7.3,,,,,\r\n"));
+
+        Pattern bundlerPattern = Pattern.compile(".*bundler,1\\.16\\.[0-1],,,,.*");
+        assertThat(bundlerPattern.matcher(csvString).find(), is(true));
+        String unusedLicenses = unusedLicenseWriter.toString();
+        assertThat(unusedLicenses, containsString("43 license mappings were specified but unused"));
     }
 
     @Test
@@ -73,8 +119,10 @@ public class ReportGeneratorTest {
 
         // verify that the two components in the test input with missing URLs are
         // listed in the output with no license, i.e., an empty license field followed by CR/LF
-        assertTrue(csvOutput.toString().contains("org.codehaus.janino:commons-compiler,3.0.8,,,,\r\n"));
-        assertTrue(csvOutput.toString().contains("json-parser,,,,,\r\n"));
+        assertTrue(csvOutput.toString().contains("org.codehaus.janino:commons-compiler,3.0.8,,,,,\r\n"));
+        assertTrue(csvOutput.toString().contains("json-parser,,,,,,\r\n"));
+        String unusedLicenses = unusedLicenseWriter.toString();
+        assertThat(unusedLicenses, containsString("43 license mappings were specified but unused"));
     }
 
     @Test
@@ -92,6 +140,8 @@ public class ReportGeneratorTest {
         assertThat(noticeOutput.toString(), not(containsString("noNoticeDep")));
         Optional<Dependency> found = rg.MISSING_NOTICE.stream().filter(d -> d.getName().equals("co.elastic:noNoticeDep") && d.getVersion().equals("0.0.1")).findFirst();
         assertTrue(found.isPresent());
+        String unusedLicenses = unusedLicenseWriter.toString();
+        assertThat(unusedLicenses, containsString("45 license mappings were specified but unused"));
     }
 
     @Test
@@ -105,8 +155,10 @@ public class ReportGeneratorTest {
 
         assertTrue("Unused licenses should not fail the license checker", result);
 
-        assertThat(unusedLicenseWriter.toString(), containsString("org.eclipse.core:org.eclipse.core.commands:3.6.0"));
-        assertThat(unusedLicenseWriter.toString(), not(containsString("junit:junit:4.12")));
+        String unusedLicenses = unusedLicenseWriter.toString();
+        assertThat(unusedLicenses, containsString("42 license mappings were specified but unused"));
+        assertThat(unusedLicenses, containsString("org.eclipse.core:org.eclipse.core.commands"));
+        assertThat(unusedLicenses, not(containsString("junit:junit")));
     }
 
     private boolean runReportGenerator(String licenseMappingPath, StringWriter csvOutput, StringWriter noticeOutput, StringWriter unusedLicenseWriter) throws IOException {
@@ -145,4 +197,3 @@ public class ReportGeneratorTest {
         return s.replaceAll("\\r\\n", "\n");
     }
 }
-
diff --git a/tools/dependencies-report/src/test/resources/expectedNoticeOutput.txt b/tools/dependencies-report/src/test/resources/expectedNoticeOutput.txt
index 49d416946..1b2af1e21 100644
--- a/tools/dependencies-report/src/test/resources/expectedNoticeOutput.txt
+++ b/tools/dependencies-report/src/test/resources/expectedNoticeOutput.txt
@@ -1,6 +1,6 @@
 
 ==========
-Notice for: bundler-1.16.0
+Notice for: Red Hat Universal Base Image minimal-9
 ----------
 
 TEST
@@ -8,26 +8,13 @@ TEST
 Notice for: bundler-1.16.1
 ----------
 
-TEST-bundler-1.16.1
-
+TEST
 ==========
 Notice for: com.fasterxml.jackson.core:jackson-core-2.7.3
 ----------
 
 TEST
 
-==========
-Notice for: com.fasterxml.jackson.core:jackson-core-2.9.1
-----------
-
-TEST
-
-==========
-Notice for: com.fasterxml.jackson.core:jackson-core-2.9.4
-----------
-
-TEST
-
 ==========
 Notice for: com.google.errorprone:javac-shaded-9-dev-r4023-3
 ----------
@@ -58,30 +45,12 @@ Notice for: gradle.plugin.com.github.jk1:gradle-license-report-0.7.1
 
 TEST
 
-==========
-Notice for: jar-dependencies-0.3.10
-----------
-
-TEST
-
-==========
-Notice for: jar-dependencies-0.3.11
-----------
-
-TEST
-
 ==========
 Notice for: jar-dependencies-0.3.12
 ----------
 
 TEST
 
-==========
-Notice for: jruby-openssl-0.9.20
-----------
-
-TEST
-
 ==========
 Notice for: jruby-openssl-0.9.21
 ----------
@@ -94,6 +63,12 @@ Notice for: jruby-readline-1.1.1
 
 TEST
 
+==========
+Notice for: json-generator-
+----------
+
+json-generator notice
+
 ==========
 Notice for: json-parser-
 ----------
@@ -101,7 +76,7 @@ Notice for: json-parser-
 TEST
 
 ==========
-Notice for: junit:junit-4.12
+Notice for: junit:junit-4.13.2
 ----------
 
 TEST
@@ -111,3 +86,9 @@ Notice for: org.codehaus.janino:commons-compiler-3.0.8
 ----------
 
 TEST
+
+==========
+Notice for: tzinfo-
+----------
+
+TEST
\ No newline at end of file
diff --git a/tools/dependencies-report/src/test/resources/expectedOutput.txt b/tools/dependencies-report/src/test/resources/expectedOutput.txt
index 94ac4b22c..cc7a4587e 100644
--- a/tools/dependencies-report/src/test/resources/expectedOutput.txt
+++ b/tools/dependencies-report/src/test/resources/expectedOutput.txt
@@ -1,20 +1,17 @@
-name,version,revision,url,license,copyright
-bundler,1.16.0,,https://rubygems.org/gems/bundler/versions/1.16.0,UnacceptableLicense|MIT,
-bundler,1.16.1,,https://rubygems.org/gems/bundler/versions/1.16.1,MIT,
-com.fasterxml.jackson.core:jackson-core,2.7.3,,https://github.com/FasterXML/jackson-core/tree/jackson-core-2.7.3,Apache-2.0,
-com.fasterxml.jackson.core:jackson-core,2.9.1,,https://github.com/FasterXML/jackson-core/tree/jackson-core-2.9.1,Apache-2.0,
-com.fasterxml.jackson.core:jackson-core,2.9.4,,https://github.com/FasterXML/jackson-core/tree/jackson-core-2.9.4,Apache-2.0,
-com.google.errorprone:javac-shaded,9-dev-r4023-3,,http://repo1.maven.org/maven2/com/google/errorprone/javac-shaded/9-dev-r4023-3/,EPL-1.0,
-commons-io:commons-io,2.5,,https://commons.apache.org/proper/commons-io/index.html,Apache-2.0,
-control.js,,,https://github.com/zombieleet/control,MIT,
-filesize,0.0.4,,https://rubygems.org/gems/filesize/versions/0.0.4,MIT,
-gradle.plugin.com.github.jk1:gradle-license-report,0.7.1,,https://github.com/jk1/Gradle-License-Report,Apache-2.0,
-jar-dependencies,0.3.10,,https://rubygems.org/gems/jar-dependencies/versions/0.3.10,Apache-2.0,
-jar-dependencies,0.3.11,,https://rubygems.org/gems/jar-dependencies/versions/0.3.11,MIT,
-jar-dependencies,0.3.12,,https://rubygems.org/gems/jar-dependencies/versions/0.3.12,MIT,
-jruby-openssl,0.9.20,,https://rubygems.org/gems/jruby-openssl/versions/0.9.20-java,Apache-2.0,
-jruby-openssl,0.9.21,,https://rubygems.org/gems/jruby-openssl/versions/0.9.21-java,Apache-2.0,
-jruby-readline,1.1.1,,https://rubygems.org/gems/jruby-readline/versions/1.1.1-java,Apache-2.0,
-json-parser,,,https://rubygems.org/gems/json-parser/versions/0.0.1,Apache-2.0,
-junit:junit,4.12,,https://github.com/junit-team/junit4,Apache-2.0,
-org.codehaus.janino:commons-compiler,3.0.8,,https://github.com/janino-compiler/janino,BSD-3-Clause-Attribution,
+name,version,revision,url,license,copyright,sourceURL
+Red Hat Universal Base Image minimal,9,,https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/61832888c0d15aff4912fe0d,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz
+bundler,1.16.1,,https://rubygems.org/gems/bundler/versions/1.16.0,UnacceptableLicense|MIT,,
+com.fasterxml.jackson.core:jackson-core,2.7.3,,https://github.com/FasterXML/jackson-core/tree/jackson-core-2.7.3,Apache-2.0,,
+com.google.errorprone:javac-shaded,9-dev-r4023-3,,http://repo1.maven.org/maven2/com/google/errorprone/javac-shaded/9-dev-r4023-3/,EPL-1.0,,
+commons-io:commons-io,2.5,,https://commons.apache.org/proper/commons-io/index.html,Apache-2.0,,
+control.js,,,https://github.com/zombieleet/control,MIT,,
+filesize,0.0.4,,https://rubygems.org/gems/filesize/versions/0.0.4,MIT,,
+gradle.plugin.com.github.jk1:gradle-license-report,0.7.1,,https://github.com/jk1/Gradle-License-Report,Apache-2.0,,
+jar-dependencies,0.3.12,,https://rubygems.org/gems/jar-dependencies/versions/0.3.11,MIT,,
+jruby-openssl,0.9.21,,https://rubygems.org/gems/jruby-openssl/versions/0.9.20-java,Apache-2.0,,
+jruby-readline,1.1.1,,https://rubygems.org/gems/jruby-readline/versions/1.1.1-java,Apache-2.0,,
+json-generator,,,https://github.com/flori/json,Ruby,,
+json-parser,,,https://rubygems.org/gems/json-parser/versions/0.0.1,Apache-2.0,,
+junit:junit,4.13.2,,https://github.com/junit-team/junit4,Apache-2.0,,
+org.codehaus.janino:commons-compiler,3.0.8,,https://github.com/janino-compiler/janino,BSD-3-Clause-Attribution,,
+tzinfo,,,https://github.com/tzinfo/tzinfo,MIT,Philip Ross,
diff --git a/tools/dependencies-report/src/test/resources/javaLicenses1.csv b/tools/dependencies-report/src/test/resources/javaLicenses1.csv
index 305cadaff..9bb374967 100644
--- a/tools/dependencies-report/src/test/resources/javaLicenses1.csv
+++ b/tools/dependencies-report/src/test/resources/javaLicenses1.csv
@@ -2,5 +2,5 @@
 "com.fasterxml.jackson.core:jackson-core:2.9.4","https://github.com/FasterXML/jackson-core","The Apache Software License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.txt",
 "com.google.errorprone:javac-shaded:9-dev-r4023-3","https://github.com/google/error-prone-javac","GNU General Public License, version 2, with the Classpath Exception","http://openjdk.java.net/legal/gplv2+ce.html",
 "gradle.plugin.com.github.jk1:gradle-license-report:0.7.1",,,,
-"junit:junit:4.12","http://junit.org","Eclipse Public License 1.0","http://www.eclipse.org/legal/epl-v10.html",
+"junit:junit:4.13.2","http://junit.org","Eclipse Public License 1.0","http://www.eclipse.org/legal/epl-v10.html",
 "org.codehaus.janino:commons-compiler:3.0.8",,"New BSD License","https://raw.githubusercontent.com/janino-compiler/janino/master/LICENSE",
diff --git a/tools/dependencies-report/src/test/resources/licenseMapping-conflicting.csv b/tools/dependencies-report/src/test/resources/licenseMapping-conflicting.csv
new file mode 100644
index 000000000..aec7e71f7
--- /dev/null
+++ b/tools/dependencies-report/src/test/resources/licenseMapping-conflicting.csv
@@ -0,0 +1,64 @@
+dependency,dependencyUrl,licenseOverride
+"webrick:1.3.1",,BSD-2-Clause-FreeBSD
+"bundler:1.16.0",https://rubygems.org/gems/bundler/versions/1.16.0,LGPL-2.0-only
+"webhdfs:0.8.0",,Apache-2.0
+"avl_tree:1.2.1",,BSD-2-Clause-FreeBSD
+"filesize:0.0.4",https://rubygems.org/gems/filesize/versions/0.0.4,MIT
+"filewatch:0.9.0",,MIT
+"gelfd:0.2.0",,Apache-2.0
+"gmetric:0.1.3",,MIT
+"UNKNOWNgzip:1.0",,UNKNOWN
+"UNKNOWNjls-grok:0.11.4",,UNKNOWN
+"jls-lumberjack:0.0.26",,Apache-2.0
+"march_hare:3.1.1",,MIT
+"method_source:0.8.2",,MIT
+"metriks:0.9.9.8",,MIT
+"numerizer:0.1.1",,MIT
+"rspec-sequencing:0.1.0",,Apache-2.0
+"rubyzip:1.2.1",,BSD-2-Clause-FreeBSD
+"snappy-jars:1.1.0.1.2",,Apache-2.0
+"snmp:1.2.0",,MIT
+"stud:0.0.23",,Apache-2.0
+"com.google.googlejavaformat:google-java-format:1.1",,Apache-2.0
+"com.google.guava:guava:19.0",,Apache-2.0
+"org.apache.logging.log4j:log4j-api:2.9.1",,Apache-2.0
+"org.apache.logging.log4j:log4j-core:2.9.1",,Apache-2.0
+"org.apache.logging.log4j:log4j-slf4j-impl:2.9.1",,Apache-2.0
+"org.codehaus.janino:commons-compiler:3.0.8",https://github.com/janino-compiler/janino,BSD-3-Clause-Attribution
+"org.codehaus.janino:janino:3.0.8",,BSD-3-Clause-Attribution
+"com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.5",,Apache-2.0
+"org.jruby:jruby-complete:9.1.13.0",,EPL-2.0|Ruby
+"org.slf4j:slf4j-api:1.7.25",,MIT
+"org.eclipse.core:org.eclipse.core.commands:3.6.0",,EPL-1.0
+"org.eclipse.core:org.eclipse.core.contenttype:3.4.100",,EPL-1.0
+"org.eclipse.core:org.eclipse.core.expressions:3.4.300",,EPL-1.0
+"org.eclipse.core:org.eclipse.core.filesystem:1.3.100",,EPL-1.0
+"org.eclipse.core:org.eclipse.core.jobs:3.5.100",,EPL-1.0
+"org.eclipse.core:org.eclipse.core.resources:3.7.100",,EPL-1.0
+"org.eclipse.core:org.eclipse.core.runtime:3.7.0",,EPL-1.0
+"org.eclipse.equinox:org.eclipse.equinox.app:1.3.100",,EPL-1.0
+"org.eclipse.equinox:org.eclipse.equinox.common:3.6.0",,EPL-1.0
+"org.eclipse.equinox:org.eclipse.equinox.preferences:3.4.1",,EPL-1.0
+"org.eclipse.equinox:org.eclipse.equinox.registry:3.5.101",,EPL-1.0
+"org.eclipse.jdt:org.eclipse.jdt.core:3.10.0",,EPL-1.0
+"org.eclipse.osgi:org.eclipse.osgi:3.7.1",,EPL-1.0
+"org.eclipse.text:org.eclipse.text:3.5.101",,EPL-1.0
+"bundler:1.16.1",https://rubygems.org/gems/bundler/versions/1.16.1,MIT
+"com.fasterxml.jackson.core:jackson-core:2.7.3",https://github.com/FasterXML/jackson-core/tree/jackson-core-2.7.3,LGPL-2.0-only
+"com.fasterxml.jackson.core:jackson-core:2.9.1",https://github.com/FasterXML/jackson-core/tree/jackson-core-2.9.1,Apache-2.0
+"com.fasterxml.jackson.core:jackson-core:2.9.4",https://github.com/FasterXML/jackson-core/tree/jackson-core-2.9.4,Apache-2.0
+"com.google.errorprone:javac-shaded:9-dev-r4023-3",http://repo1.maven.org/maven2/com/google/errorprone/javac-shaded/9-dev-r4023-3/,EPL-1.0
+"commons-io:commons-io:2.5",https://commons.apache.org/proper/commons-io/index.html,Apache-2.0
+"control.js:",https://github.com/zombieleet/control,MIT
+"gradle.plugin.com.github.jk1:gradle-license-report:0.7.1",https://github.com/jk1/Gradle-License-Report,Apache-2.0
+"jar-dependencies:0.3.10",https://rubygems.org/gems/jar-dependencies/versions/0.3.10,Apache-2.0
+"jar-dependencies:0.3.11",https://rubygems.org/gems/jar-dependencies/versions/0.3.11,MIT
+"jar-dependencies:0.3.12",https://rubygems.org/gems/jar-dependencies/versions/0.3.12,MIT
+"jruby-openssl:0.9.20",https://rubygems.org/gems/jruby-openssl/versions/0.9.20-java,Apache-2.0
+"jruby-openssl:0.9.21",https://rubygems.org/gems/jruby-openssl/versions/0.9.21-java,Apache-2.0
+"jruby-readline:1.1.1",https://rubygems.org/gems/jruby-readline/versions/1.1.1-java,Apache-2.0
+"json-parser:",https://rubygems.org/gems/json-parser/versions/0.0.1,Apache-2.0
+"junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0
+"json-generator",https://github.com/flori/json,Ruby
+"tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross
+"Red Hat Universal Base Image minimal:9",https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/61832888c0d15aff4912fe0d,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz
diff --git a/tools/dependencies-report/src/test/resources/licenseMapping-good.csv b/tools/dependencies-report/src/test/resources/licenseMapping-good.csv
index 3320d55eb..449176fed 100644
--- a/tools/dependencies-report/src/test/resources/licenseMapping-good.csv
+++ b/tools/dependencies-report/src/test/resources/licenseMapping-good.csv
@@ -1,4 +1,4 @@
-dependency,dependencyUrl,licenseOverride
+dependency,dependencyUrl,licenseOverride,copyright,sourceURL
 "webrick:1.3.1",,BSD-2-Clause-FreeBSD
 "bundler:1.16.0",https://rubygems.org/gems/bundler/versions/1.16.0,UnacceptableLicense|MIT
 "webhdfs:0.8.0",,Apache-2.0
@@ -43,7 +43,6 @@ dependency,dependencyUrl,licenseOverride
 "org.eclipse.jdt:org.eclipse.jdt.core:3.10.0",,EPL-1.0
 "org.eclipse.osgi:org.eclipse.osgi:3.7.1",,EPL-1.0
 "org.eclipse.text:org.eclipse.text:3.5.101",,EPL-1.0
-"bundler:1.16.1",https://rubygems.org/gems/bundler/versions/1.16.1,MIT
 "com.fasterxml.jackson.core:jackson-core:2.7.3",https://github.com/FasterXML/jackson-core/tree/jackson-core-2.7.3,Apache-2.0
 "com.fasterxml.jackson.core:jackson-core:2.9.1",https://github.com/FasterXML/jackson-core/tree/jackson-core-2.9.1,Apache-2.0
 "com.fasterxml.jackson.core:jackson-core:2.9.4",https://github.com/FasterXML/jackson-core/tree/jackson-core-2.9.4,Apache-2.0
@@ -51,11 +50,13 @@ dependency,dependencyUrl,licenseOverride
 "commons-io:commons-io:2.5",https://commons.apache.org/proper/commons-io/index.html,Apache-2.0
 "control.js:",https://github.com/zombieleet/control,MIT
 "gradle.plugin.com.github.jk1:gradle-license-report:0.7.1",https://github.com/jk1/Gradle-License-Report,Apache-2.0
-"jar-dependencies:0.3.10",https://rubygems.org/gems/jar-dependencies/versions/0.3.10,Apache-2.0
 "jar-dependencies:0.3.11",https://rubygems.org/gems/jar-dependencies/versions/0.3.11,MIT
 "jar-dependencies:0.3.12",https://rubygems.org/gems/jar-dependencies/versions/0.3.12,MIT
 "jruby-openssl:0.9.20",https://rubygems.org/gems/jruby-openssl/versions/0.9.20-java,Apache-2.0
 "jruby-openssl:0.9.21",https://rubygems.org/gems/jruby-openssl/versions/0.9.21-java,Apache-2.0
 "jruby-readline:1.1.1",https://rubygems.org/gems/jruby-readline/versions/1.1.1-java,Apache-2.0
 "json-parser:",https://rubygems.org/gems/json-parser/versions/0.0.1,Apache-2.0
-"junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0
\ No newline at end of file
+"junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0
+"json-generator",https://github.com/flori/json,Ruby
+"tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross
+"Red Hat Universal Base Image minimal:9",https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/61832888c0d15aff4912fe0d,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz
diff --git a/tools/dependencies-report/src/test/resources/licenseMapping-missing.csv b/tools/dependencies-report/src/test/resources/licenseMapping-missing.csv
index 931c385c6..3772f000c 100644
--- a/tools/dependencies-report/src/test/resources/licenseMapping-missing.csv
+++ b/tools/dependencies-report/src/test/resources/licenseMapping-missing.csv
@@ -1,4 +1,4 @@
-dependency,dependencyUrl,licenseOverride
+dependency,dependencyUrl,licenseOverride,copyright,sourceURL
 "webrick:1.3.1",,BSD-2-Clause-FreeBSD
 "bundler:1.16.0",https://rubygems.org/gems/bundler/versions/1.16.0,MIT
 "webhdfs:0.8.0",,Apache-2.0
@@ -51,11 +51,13 @@ dependency,dependencyUrl,licenseOverride
 "commons-io:commons-io:2.5",https://commons.apache.org/proper/commons-io/index.html,
 "control.js:",https://github.com/zombieleet/control,MIT
 "gradle.plugin.com.github.jk1:gradle-license-report:0.7.1",https://github.com/jk1/Gradle-License-Report,Apache-2.0
-"jar-dependencies:0.3.10",https://rubygems.org/gems/jar-dependencies/versions/0.3.10,Apache-2.0
 "jar-dependencies:0.3.11",https://rubygems.org/gems/jar-dependencies/versions/0.3.11,MIT
 "jar-dependencies:0.3.12",https://rubygems.org/gems/jar-dependencies/versions/0.3.12,MIT
 "jruby-openssl:0.9.20",https://rubygems.org/gems/jruby-openssl/versions/0.9.20-java,Apache-2.0
 "jruby-openssl:0.9.21",https://rubygems.org/gems/jruby-openssl/versions/0.9.21-java,Apache-2.0
 "jruby-readline:1.1.1",https://rubygems.org/gems/jruby-readline/versions/1.1.1-java,Apache-2.0
 "json-parser:",https://rubygems.org/gems/json-parser/versions/0.0.1,Apache-2.0
-"junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0
\ No newline at end of file
+"junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0
+"json-generator",https://github.com/flori/json,Ruby
+"tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross
+"Red Hat Universal Base Image minimal:9",https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/61832888c0d15aff4912fe0d,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz
diff --git a/tools/dependencies-report/src/test/resources/licenseMapping-missingNotices.csv b/tools/dependencies-report/src/test/resources/licenseMapping-missingNotices.csv
index f99b4bca8..6354e9d7c 100644
--- a/tools/dependencies-report/src/test/resources/licenseMapping-missingNotices.csv
+++ b/tools/dependencies-report/src/test/resources/licenseMapping-missingNotices.csv
@@ -1,4 +1,4 @@
-dependency,dependencyUrl,licenseOverride
+dependency,dependencyUrl,licenseOverride,copyright,sourceURL
 "co.elastic:noNoticeDep:0.0.1",,MIT
 "webrick:1.3.1",,BSD-2-Clause-FreeBSD
 "bundler:1.16.0",https://rubygems.org/gems/bundler/versions/1.16.0,MIT
@@ -52,7 +52,6 @@ dependency,dependencyUrl,licenseOverride
 "commons-io:commons-io:2.5",https://commons.apache.org/proper/commons-io/index.html,Apache-2.0
 "control.js:",https://github.com/zombieleet/control,MIT
 "gradle.plugin.com.github.jk1:gradle-license-report:0.7.1",https://github.com/jk1/Gradle-License-Report,Apache-2.0
-"jar-dependencies:0.3.10",https://rubygems.org/gems/jar-dependencies/versions/0.3.10,Apache-2.0
 "jar-dependencies:0.3.11",https://rubygems.org/gems/jar-dependencies/versions/0.3.11,MIT
 "jar-dependencies:0.3.12",https://rubygems.org/gems/jar-dependencies/versions/0.3.12,MIT
 "jruby-openssl:0.9.20",https://rubygems.org/gems/jruby-openssl/versions/0.9.20-java,Apache-2.0
@@ -61,3 +60,6 @@ dependency,dependencyUrl,licenseOverride
 "json-parser:",https://rubygems.org/gems/json-parser/versions/0.0.1,Apache-2.0
 "junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0
 "junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0
+"json-generator",https://github.com/flori/json,Ruby
+"tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross
+"Red Hat Universal Base Image minimal:9",https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/61832888c0d15aff4912fe0d,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz
diff --git a/tools/dependencies-report/src/test/resources/licenseMapping-missingUrls.csv b/tools/dependencies-report/src/test/resources/licenseMapping-missingUrls.csv
index 16171e54c..17f62f5e4 100644
--- a/tools/dependencies-report/src/test/resources/licenseMapping-missingUrls.csv
+++ b/tools/dependencies-report/src/test/resources/licenseMapping-missingUrls.csv
@@ -51,11 +51,13 @@ dependency,dependencyUrl,licenseOverride
 "commons-io:commons-io:2.5",https://commons.apache.org/proper/commons-io/index.html,Apache-2.0
 "control.js:",https://github.com/zombieleet/control,MIT
 "gradle.plugin.com.github.jk1:gradle-license-report:0.7.1",https://github.com/jk1/Gradle-License-Report,Apache-2.0
-"jar-dependencies:0.3.10",https://rubygems.org/gems/jar-dependencies/versions/0.3.10,Apache-2.0
 "jar-dependencies:0.3.11",https://rubygems.org/gems/jar-dependencies/versions/0.3.11,MIT
 "jar-dependencies:0.3.12",https://rubygems.org/gems/jar-dependencies/versions/0.3.12,MIT
 "jruby-openssl:0.9.20",https://rubygems.org/gems/jruby-openssl/versions/0.9.20-java,Apache-2.0
 "jruby-openssl:0.9.21",https://rubygems.org/gems/jruby-openssl/versions/0.9.21-java,Apache-2.0
 "jruby-readline:1.1.1",https://rubygems.org/gems/jruby-readline/versions/1.1.1-java,Apache-2.0
 "json-parser:",,Apache-2.0
-"junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0
\ No newline at end of file
+"junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0
+"json-generator",https://github.com/flori/json,Ruby
+"tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross
+"Red Hat Universal Base Image minimal:9",https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/61832888c0d15aff4912fe0d,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz
diff --git a/tools/dependencies-report/src/test/resources/licenseMapping-unacceptable.csv b/tools/dependencies-report/src/test/resources/licenseMapping-unacceptable.csv
index e0fff0c03..ca6352fd7 100644
--- a/tools/dependencies-report/src/test/resources/licenseMapping-unacceptable.csv
+++ b/tools/dependencies-report/src/test/resources/licenseMapping-unacceptable.csv
@@ -43,19 +43,18 @@ dependency,dependencyUrl,licenseOverride
 "org.eclipse.jdt:org.eclipse.jdt.core:3.10.0",,EPL-1.0
 "org.eclipse.osgi:org.eclipse.osgi:3.7.1",,EPL-1.0
 "org.eclipse.text:org.eclipse.text:3.5.101",,EPL-1.0
-"bundler:1.16.1",https://rubygems.org/gems/bundler/versions/1.16.1,MIT
 "com.fasterxml.jackson.core:jackson-core:2.7.3",https://github.com/FasterXML/jackson-core/tree/jackson-core-2.7.3,LGPL-2.0-only
-"com.fasterxml.jackson.core:jackson-core:2.9.1",https://github.com/FasterXML/jackson-core/tree/jackson-core-2.9.1,Apache-2.0
-"com.fasterxml.jackson.core:jackson-core:2.9.4",https://github.com/FasterXML/jackson-core/tree/jackson-core-2.9.4,Apache-2.0
 "com.google.errorprone:javac-shaded:9-dev-r4023-3",http://repo1.maven.org/maven2/com/google/errorprone/javac-shaded/9-dev-r4023-3/,EPL-1.0
 "commons-io:commons-io:2.5",https://commons.apache.org/proper/commons-io/index.html,Apache-2.0
 "control.js:",https://github.com/zombieleet/control,MIT
 "gradle.plugin.com.github.jk1:gradle-license-report:0.7.1",https://github.com/jk1/Gradle-License-Report,Apache-2.0
-"jar-dependencies:0.3.10",https://rubygems.org/gems/jar-dependencies/versions/0.3.10,Apache-2.0
 "jar-dependencies:0.3.11",https://rubygems.org/gems/jar-dependencies/versions/0.3.11,MIT
 "jar-dependencies:0.3.12",https://rubygems.org/gems/jar-dependencies/versions/0.3.12,MIT
 "jruby-openssl:0.9.20",https://rubygems.org/gems/jruby-openssl/versions/0.9.20-java,Apache-2.0
 "jruby-openssl:0.9.21",https://rubygems.org/gems/jruby-openssl/versions/0.9.21-java,Apache-2.0
 "jruby-readline:1.1.1",https://rubygems.org/gems/jruby-readline/versions/1.1.1-java,Apache-2.0
 "json-parser:",https://rubygems.org/gems/json-parser/versions/0.0.1,Apache-2.0
-"junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0
\ No newline at end of file
+"junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0
+"json-generator",https://github.com/flori/json,Ruby
+"tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross
+"Red Hat Universal Base Image minimal:9",https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/61832888c0d15aff4912fe0d,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz
diff --git a/tools/dependencies-report/src/test/resources/notices/bundler-1.16.0-NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/Red Hat Universal Base Image minimal-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/test/resources/notices/bundler-1.16.0-NOTICE.txt
rename to tools/dependencies-report/src/test/resources/notices/Red Hat Universal Base Image minimal-NOTICE.txt
diff --git a/tools/dependencies-report/src/test/resources/notices/bundler-1.16.1-NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/bundler-1.16.1-NOTICE.txt
deleted file mode 100644
index 2ce57e3db..000000000
--- a/tools/dependencies-report/src/test/resources/notices/bundler-1.16.1-NOTICE.txt
+++ /dev/null
@@ -1 +0,0 @@
-TEST-bundler-1.16.1
diff --git a/tools/dependencies-report/src/test/resources/notices/bundler-NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/bundler-NOTICE.txt
new file mode 100644
index 000000000..3b1246497
--- /dev/null
+++ b/tools/dependencies-report/src/test/resources/notices/bundler-NOTICE.txt
@@ -0,0 +1 @@
+TEST
\ No newline at end of file
diff --git a/tools/dependencies-report/src/test/resources/notices/com.fasterxml.jackson.core!jackson-core-2.7.3-NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/com.fasterxml.jackson.core!jackson-core-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/test/resources/notices/com.fasterxml.jackson.core!jackson-core-2.7.3-NOTICE.txt
rename to tools/dependencies-report/src/test/resources/notices/com.fasterxml.jackson.core!jackson-core-NOTICE.txt
diff --git a/tools/dependencies-report/src/test/resources/notices/com.fasterxml.jackson.core!jackson-core-2.9.1-NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/com.google.errorprone!javac-shaded-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/test/resources/notices/com.fasterxml.jackson.core!jackson-core-2.9.1-NOTICE.txt
rename to tools/dependencies-report/src/test/resources/notices/com.google.errorprone!javac-shaded-NOTICE.txt
diff --git a/tools/dependencies-report/src/test/resources/notices/com.fasterxml.jackson.core!jackson-core-2.9.4-NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/commons-io!commons-io-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/test/resources/notices/com.fasterxml.jackson.core!jackson-core-2.9.4-NOTICE.txt
rename to tools/dependencies-report/src/test/resources/notices/commons-io!commons-io-NOTICE.txt
diff --git a/tools/dependencies-report/src/test/resources/notices/com.google.errorprone!javac-shaded-9-dev-r4023-3-NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/control.js-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/test/resources/notices/com.google.errorprone!javac-shaded-9-dev-r4023-3-NOTICE.txt
rename to tools/dependencies-report/src/test/resources/notices/control.js-NOTICE.txt
diff --git a/tools/dependencies-report/src/test/resources/notices/commons-io!commons-io-2.5-NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/filesize-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/test/resources/notices/commons-io!commons-io-2.5-NOTICE.txt
rename to tools/dependencies-report/src/test/resources/notices/filesize-NOTICE.txt
diff --git a/tools/dependencies-report/src/test/resources/notices/control.js--NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/gradle.plugin.com.github.jk1!gradle-license-report-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/test/resources/notices/control.js--NOTICE.txt
rename to tools/dependencies-report/src/test/resources/notices/gradle.plugin.com.github.jk1!gradle-license-report-NOTICE.txt
diff --git a/tools/dependencies-report/src/test/resources/notices/filesize-0.0.4-NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/jar-dependencies-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/test/resources/notices/filesize-0.0.4-NOTICE.txt
rename to tools/dependencies-report/src/test/resources/notices/jar-dependencies-NOTICE.txt
diff --git a/tools/dependencies-report/src/test/resources/notices/jruby-openssl-0.9.21-NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/jruby-openssl-0.9.21-NOTICE.txt
deleted file mode 100644
index 2a02d41ce..000000000
--- a/tools/dependencies-report/src/test/resources/notices/jruby-openssl-0.9.21-NOTICE.txt
+++ /dev/null
@@ -1 +0,0 @@
-TEST
diff --git a/tools/dependencies-report/src/test/resources/notices/gradle.plugin.com.github.jk1!gradle-license-report-0.7.1-NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/jruby-openssl-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/test/resources/notices/gradle.plugin.com.github.jk1!gradle-license-report-0.7.1-NOTICE.txt
rename to tools/dependencies-report/src/test/resources/notices/jruby-openssl-NOTICE.txt
diff --git a/tools/dependencies-report/src/test/resources/notices/jruby-readline-1.1.1-NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/jruby-readline-1.1.1-NOTICE.txt
deleted file mode 100644
index 2a02d41ce..000000000
--- a/tools/dependencies-report/src/test/resources/notices/jruby-readline-1.1.1-NOTICE.txt
+++ /dev/null
@@ -1 +0,0 @@
-TEST
diff --git a/tools/dependencies-report/src/test/resources/notices/jar-dependencies-0.3.10-NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/jruby-readline-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/test/resources/notices/jar-dependencies-0.3.10-NOTICE.txt
rename to tools/dependencies-report/src/test/resources/notices/jruby-readline-NOTICE.txt
diff --git a/tools/dependencies-report/src/test/resources/notices/json-generator-NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/json-generator-NOTICE.txt
new file mode 100644
index 000000000..567d94fbb
--- /dev/null
+++ b/tools/dependencies-report/src/test/resources/notices/json-generator-NOTICE.txt
@@ -0,0 +1 @@
+json-generator notice
diff --git a/tools/dependencies-report/src/test/resources/notices/json-parser--NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/json-parser--NOTICE.txt
deleted file mode 100644
index 2a02d41ce..000000000
--- a/tools/dependencies-report/src/test/resources/notices/json-parser--NOTICE.txt
+++ /dev/null
@@ -1 +0,0 @@
-TEST
diff --git a/tools/dependencies-report/src/test/resources/notices/jar-dependencies-0.3.11-NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/json-parser-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/test/resources/notices/jar-dependencies-0.3.11-NOTICE.txt
rename to tools/dependencies-report/src/test/resources/notices/json-parser-NOTICE.txt
diff --git a/tools/dependencies-report/src/test/resources/notices/junit!junit-4.12-NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/junit!junit-4.12-NOTICE.txt
deleted file mode 100644
index 2a02d41ce..000000000
--- a/tools/dependencies-report/src/test/resources/notices/junit!junit-4.12-NOTICE.txt
+++ /dev/null
@@ -1 +0,0 @@
-TEST
diff --git a/tools/dependencies-report/src/test/resources/notices/jar-dependencies-0.3.12-NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/junit!junit-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/test/resources/notices/jar-dependencies-0.3.12-NOTICE.txt
rename to tools/dependencies-report/src/test/resources/notices/junit!junit-NOTICE.txt
diff --git a/tools/dependencies-report/src/test/resources/notices/org.codehaus.janino!commons-compiler-3.0.8-NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/org.codehaus.janino!commons-compiler-3.0.8-NOTICE.txt
deleted file mode 100644
index 2a02d41ce..000000000
--- a/tools/dependencies-report/src/test/resources/notices/org.codehaus.janino!commons-compiler-3.0.8-NOTICE.txt
+++ /dev/null
@@ -1 +0,0 @@
-TEST
diff --git a/tools/dependencies-report/src/test/resources/notices/jruby-openssl-0.9.20-NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/org.codehaus.janino!commons-compiler-NOTICE.txt
similarity index 100%
rename from tools/dependencies-report/src/test/resources/notices/jruby-openssl-0.9.20-NOTICE.txt
rename to tools/dependencies-report/src/test/resources/notices/org.codehaus.janino!commons-compiler-NOTICE.txt
diff --git a/tools/dependencies-report/src/test/resources/notices/tzinfo-NOTICE.txt b/tools/dependencies-report/src/test/resources/notices/tzinfo-NOTICE.txt
new file mode 100644
index 000000000..3b1246497
--- /dev/null
+++ b/tools/dependencies-report/src/test/resources/notices/tzinfo-NOTICE.txt
@@ -0,0 +1 @@
+TEST
\ No newline at end of file
diff --git a/tools/dependencies-report/src/test/resources/rubyDependencies.csv b/tools/dependencies-report/src/test/resources/rubyDependencies.csv
index a73b5e35c..a5d940e5f 100644
--- a/tools/dependencies-report/src/test/resources/rubyDependencies.csv
+++ b/tools/dependencies-report/src/test/resources/rubyDependencies.csv
@@ -1,14 +1,17 @@
-name,version,url,license
-bundler,1.16.1,http://bundler.io,MIT
-bundler,1.16.0,http://bundler.io,MIT
-filesize,0.0.4,http://filesize.rubyforge.org/,UNKNOWN
-jar-dependencies,0.3.12,https://github.com/mkristian/jar-dependencies,MIT
-jar-dependencies,0.3.11,https://github.com/mkristian/jar-dependencies,MIT
-jar-dependencies,0.3.10,https://github.com/mkristian/jar-dependencies,MIT
-jruby-openssl,0.9.21,https://github.com/jruby/jruby-openssl,EPL-1.0|GPL-2.0|LGPL-2.1
-jruby-openssl,0.9.20,https://github.com/jruby/jruby-openssl,EPL-1.0|GPL-2.0|LGPL-2.1
-jruby-readline,1.1.1,https://github.com/jruby/jruby,EPL-1.0|GPL-2.0|LGPL-2.1
-com.fasterxml.jackson.core:jackson-core,2.7.3,https://github.com/FasterXML/jackson-core,Apache-2.0
-com.fasterxml.jackson.core:jackson-core,2.9.1,https://github.com/FasterXML/jackson-core,Apache-2.0
-control.js,,,MIT
-json-parser,,https://github.com/flori/json,Ruby
+name,version,url,license,copyright,sourceURL
+bundler,1.16.1,http://bundler.io,MIT,,
+bundler,1.16.0,http://bundler.io,MIT,,
+filesize,0.0.4,http://filesize.rubyforge.org/,UNKNOWN,,
+jar-dependencies,0.3.12,https://github.com/mkristian/jar-dependencies,MIT,,
+jar-dependencies,0.3.11,https://github.com/mkristian/jar-dependencies,MIT,,
+jar-dependencies,0.3.10,https://github.com/mkristian/jar-dependencies,MIT,,
+jruby-openssl,0.9.21,https://github.com/jruby/jruby-openssl,EPL-1.0|GPL-2.0|LGPL-2.1,,
+jruby-openssl,0.9.20,https://github.com/jruby/jruby-openssl,EPL-1.0|GPL-2.0|LGPL-2.1,,
+jruby-readline,1.1.1,https://github.com/jruby/jruby,EPL-1.0|GPL-2.0|LGPL-2.1,,
+com.fasterxml.jackson.core:jackson-core,2.7.3,https://github.com/FasterXML/jackson-core,Apache-2.0,,
+com.fasterxml.jackson.core:jackson-core,2.9.1,https://github.com/FasterXML/jackson-core,Apache-2.0,,
+control.js,,,MIT,,
+json-generator,,https://github.com/flori/json,Ruby,,
+json-parser,,https://github.com/flori/json,Ruby,,
+tzinfo,,https://github.com/tzinfo/tzinfo,MIT,Philip Ross,
+Red Hat Universal Base Image minimal,9,https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/61832888c0d15aff4912fe0d,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz
diff --git a/tools/ingest-converter/build.gradle b/tools/ingest-converter/build.gradle
deleted file mode 100644
index 128b2573a..000000000
--- a/tools/ingest-converter/build.gradle
+++ /dev/null
@@ -1,43 +0,0 @@
-import org.yaml.snakeyaml.Yaml
-
-// fetch version from Logstash's master versions.yml file
-def versionMap = (Map) (new Yaml()).load(new File("$projectDir/../../versions.yml").text)
-
-description = """Ingest JSON to Logstash Grok Config Converter"""
-version = versionMap['logstash-core']
-
-repositories {
-  mavenCentral()
-  jcenter()
-}
-
-buildscript {
-  repositories {
-    mavenCentral()
-    jcenter()
-  }
-  dependencies {
-    classpath 'org.yaml:snakeyaml:1.17'
-    classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'
-  }
-}
-
-dependencies {
-  compile 'net.sf.jopt-simple:jopt-simple:5.0.3'
-  testCompile "junit:junit:4.12"
-  testCompile 'commons-io:commons-io:2.5'
-}
-
-javadoc {
-  enabled = true
-}
-
-apply plugin: 'com.github.johnrengelman.shadow'
-
-shadowJar {
-  baseName = 'ingest-converter'
-  classifier = null
-  version = null
-}
-
-assemble.dependsOn shadowJar
diff --git a/tools/ingest-converter/src/main/java/org/logstash/ingest/Append.java b/tools/ingest-converter/src/main/java/org/logstash/ingest/Append.java
deleted file mode 100644
index 47126fb04..000000000
--- a/tools/ingest-converter/src/main/java/org/logstash/ingest/Append.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.logstash.ingest;
-
-import javax.script.ScriptException;
-
-/**
- * Ingest Append DSL to Logstash mutate Transpiler.
- */
-public final class Append {
-
-    private Append() {
-        // Utility Wrapper for JS Script.
-    }
-
-    public static void main(final String... args) throws ScriptException, NoSuchMethodException {
-        JsUtil.convert(args, "ingest_append_to_logstash");
-    }
-}
diff --git a/tools/ingest-converter/src/main/java/org/logstash/ingest/Convert.java b/tools/ingest-converter/src/main/java/org/logstash/ingest/Convert.java
deleted file mode 100644
index f4a0fe2e7..000000000
--- a/tools/ingest-converter/src/main/java/org/logstash/ingest/Convert.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.logstash.ingest;
-
-import javax.script.ScriptException;
-
-/**
- * Ingest Convert DSL to Logstash Date Transpiler.
- */
-public final class Convert {
-
-    private Convert() {
-        // Utility Wrapper for JS Script.
-    }
-
-    public static void main(final String... args) throws ScriptException, NoSuchMethodException {
-        JsUtil.convert(args, "ingest_convert_to_logstash");
-    }
-}
diff --git a/tools/ingest-converter/src/main/java/org/logstash/ingest/Date.java b/tools/ingest-converter/src/main/java/org/logstash/ingest/Date.java
deleted file mode 100644
index 8ad435a32..000000000
--- a/tools/ingest-converter/src/main/java/org/logstash/ingest/Date.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.logstash.ingest;
-
-import javax.script.ScriptException;
-
-/**
- * Ingest Date DSL to Logstash Date Transpiler.
- */
-public final class Date {
-
-    private Date() {
-        // Utility Wrapper for JS Script.
-    }
-
-    public static void main(final String... args) throws ScriptException, NoSuchMethodException {
-        JsUtil.convert(args, "ingest_to_logstash_date");
-    }
-}
diff --git a/tools/ingest-converter/src/main/java/org/logstash/ingest/GeoIp.java b/tools/ingest-converter/src/main/java/org/logstash/ingest/GeoIp.java
deleted file mode 100644
index 129fe1ed4..000000000
--- a/tools/ingest-converter/src/main/java/org/logstash/ingest/GeoIp.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.logstash.ingest;
-
-import javax.script.ScriptException;
-
-public final class GeoIp {
-
-    private GeoIp() {
-        // Utility Wrapper for JS Script.
-    }
-    
-    public static void main(final String... args) throws ScriptException, NoSuchMethodException {
-        JsUtil.convert(args, "ingest_to_logstash_geoip");
-    }
-}
diff --git a/tools/ingest-converter/src/main/java/org/logstash/ingest/Grok.java b/tools/ingest-converter/src/main/java/org/logstash/ingest/Grok.java
deleted file mode 100644
index 0d13ed9a5..000000000
--- a/tools/ingest-converter/src/main/java/org/logstash/ingest/Grok.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.logstash.ingest;
-
-import javax.script.ScriptException;
-
-/**
- * Ingest JSON DSL to Logstash Grok Transpiler.
- */
-public final class Grok {
-
-    private Grok() {
-        // Utility Wrapper for JS Script.
-    }
-
-    public static void main(final String... args) throws ScriptException, NoSuchMethodException {
-        JsUtil.convert(args, "ingest_to_logstash_grok");
-    }
-}
diff --git a/tools/ingest-converter/src/main/java/org/logstash/ingest/Gsub.java b/tools/ingest-converter/src/main/java/org/logstash/ingest/Gsub.java
deleted file mode 100644
index ef57ae444..000000000
--- a/tools/ingest-converter/src/main/java/org/logstash/ingest/Gsub.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.logstash.ingest;
-
-import javax.script.ScriptException;
-
-public final class Gsub {
-
-    private Gsub() {
-        // Utility Wrapper for JS Script.
-    }
-    
-    public static void main(final String... args) throws ScriptException, NoSuchMethodException {
-        JsUtil.convert(args, "ingest_to_logstash_gsub");
-    }
-}
diff --git a/tools/ingest-converter/src/main/java/org/logstash/ingest/JsUtil.java b/tools/ingest-converter/src/main/java/org/logstash/ingest/JsUtil.java
deleted file mode 100644
index 83c55b5c2..000000000
--- a/tools/ingest-converter/src/main/java/org/logstash/ingest/JsUtil.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.logstash.ingest;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import javax.script.Invocable;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
-import joptsimple.OptionException;
-import joptsimple.OptionParser;
-import joptsimple.OptionSet;
-import joptsimple.OptionSpec;
-
-final class JsUtil {
-
-    /**
-     * Script names used by the converter in correct load order.
-     */
-
-    private static final String[] SCRIPTS = {
-        "shared", "date", "grok", "geoip", "gsub", "pipeline", "convert", "append", "json",
-        "rename", "lowercase", "set"
-    };
-
-    private JsUtil() {
-        // Utility Class
-    }
-
-    /**
-     * Sets up a {@link ScriptEngine} with all Ingest to LS DSL Converter JS scripts loaded.
-     * @return {@link ScriptEngine} for Ingest to LS DSL Converter
-     */
-    public static ScriptEngine engine() {
-        final ScriptEngine engine =
-            new ScriptEngineManager().getEngineByName("nashorn");
-        try {
-            for (final String file : SCRIPTS) {
-                add(engine, String.format("/ingest-%s.js", file));
-            }
-        } catch (final IOException | ScriptException ex) {
-            throw new IllegalStateException(ex);
-        }
-        return engine;
-    }
-
-    /**
-     * Converts the given files from ingest to LS conf using the javascript function
-     * @param args CLI Arguments
-     * @param jsFunc JS function to call
-     * @throws ScriptException
-     * @throws NoSuchMethodException
-     */
-    public static void convert(final String[] args, final String jsFunc)
-        throws ScriptException, NoSuchMethodException {
-        final OptionParser parser = new OptionParser();
-        final OptionSpec<URI> input = parser.accepts(
-            "input",
-            "Input JSON file location URI. Only supports 'file://' as URI schema."
-        ).withRequiredArg().ofType(URI.class).required().forHelp();
-        final OptionSpec<URI> output = parser.accepts(
-            "output",
-            "Output Logstash DSL file location URI. Only supports 'file://' as URI schema."
-        ).withRequiredArg().ofType(URI.class).required().forHelp();
-        final OptionSpec<Void> appendStdio = parser.accepts(
-            "append-stdio",
-            "Flag to append stdin and stdout as outputs instead of the default ES output."
-        ).forHelp();
-        try {
-            final OptionSet options;
-            try {
-                options = parser.parse(args);
-            } catch (final OptionException ex) {
-                parser.printHelpOn(System.out);
-                throw ex;
-            }
-            final ScriptEngine engine = JsUtil.engine();
-            Files.write(
-                Paths.get(options.valueOf(output)),
-                ((String) ((Invocable) engine).invokeFunction(
-                    jsFunc, input(options.valueOf(input)), options.has(appendStdio)
-                )).getBytes(StandardCharsets.UTF_8)
-            );
-        } catch (final IOException ex) {
-            throw new IllegalStateException(ex);
-        }
-    }
-
-    /**
-     * Retrieves the input Ingest JSON from a given {@link URI}.
-     * @param uri {@link URI} of Ingest JSON
-     * @return Json String
-     * @throws IOException On failure to load Ingest JSON
-     */
-    private static String input(final URI uri) throws IOException {
-        if ("file".equals(uri.getScheme())) {
-            return new String(
-                Files.readAllBytes(Paths.get(uri)), StandardCharsets.UTF_8
-            );
-        }
-        throw new IllegalArgumentException("--input must be of schema file://");
-    }
-
-    private static void add(final ScriptEngine engine, final String file)
-        throws IOException, ScriptException {
-        try (final Reader reader =
-                 new InputStreamReader(JsUtil.class.getResourceAsStream(file))) {
-            engine.eval(reader);
-        }
-    }
-}
diff --git a/tools/ingest-converter/src/main/java/org/logstash/ingest/Json.java b/tools/ingest-converter/src/main/java/org/logstash/ingest/Json.java
deleted file mode 100644
index 4b5e0a530..000000000
--- a/tools/ingest-converter/src/main/java/org/logstash/ingest/Json.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.logstash.ingest;
-
-import javax.script.ScriptException;
-
-/**
- * Ingest JSON processor DSL to Logstash json Transpiler.
- */
-public class Json {
-    private Json() {
-        // Utility Wrapper for JS Script.
-    }
-
-    public static void main(final String... args) throws ScriptException, NoSuchMethodException {
-        JsUtil.convert(args, "ingest_json_to_logstash");
-    }
-}
diff --git a/tools/ingest-converter/src/main/java/org/logstash/ingest/Lowercase.java b/tools/ingest-converter/src/main/java/org/logstash/ingest/Lowercase.java
deleted file mode 100644
index 29fb397e4..000000000
--- a/tools/ingest-converter/src/main/java/org/logstash/ingest/Lowercase.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.logstash.ingest;
-
-import javax.script.ScriptException;
-
-/**
- * Ingest Lowercase DSL to Logstash mutate Transpiler.
- */
-public final class Lowercase {
-
-    private Lowercase() {
-        // Utility Wrapper for JS Script.
-    }
-
-    public static void main(final String... args) throws ScriptException, NoSuchMethodException {
-        JsUtil.convert(args, "ingest_lowercase_to_logstash");
-    }
-}
diff --git a/tools/ingest-converter/src/main/java/org/logstash/ingest/Pipeline.java b/tools/ingest-converter/src/main/java/org/logstash/ingest/Pipeline.java
deleted file mode 100644
index 102db9af6..000000000
--- a/tools/ingest-converter/src/main/java/org/logstash/ingest/Pipeline.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.logstash.ingest;
-
-import javax.script.ScriptException;
-
-/**
- * Ingest Full DSL to Logstash DSL Transpiler.
- */
-public final class Pipeline {
-
-    private Pipeline() {
-        // Utility Wrapper for JS Script.
-    }
-
-    public static void main(final String... args) throws ScriptException, NoSuchMethodException {
-        JsUtil.convert(args, "ingest_pipeline_to_logstash");
-    }
-}
diff --git a/tools/ingest-converter/src/main/java/org/logstash/ingest/Rename.java b/tools/ingest-converter/src/main/java/org/logstash/ingest/Rename.java
deleted file mode 100644
index 5886537d4..000000000
--- a/tools/ingest-converter/src/main/java/org/logstash/ingest/Rename.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.logstash.ingest;
-
-import javax.script.ScriptException;
-
-public class Rename {
-    private Rename() {
-        // Utility Wrapper for JS Script.
-    }
-
-    public static void main(final String... args) throws ScriptException, NoSuchMethodException {
-        JsUtil.convert(args, "ingest_rename_to_logstash");
-    }
-}
diff --git a/tools/ingest-converter/src/main/java/org/logstash/ingest/Set.java b/tools/ingest-converter/src/main/java/org/logstash/ingest/Set.java
deleted file mode 100644
index 7e7f11d8d..000000000
--- a/tools/ingest-converter/src/main/java/org/logstash/ingest/Set.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.logstash.ingest;
-
-import javax.script.ScriptException;
-
-/**
- * Ingest Set DSL to Logstash mutate Transpiler.
- */
-public class Set {
-    private Set() {
-        // Utility Wrapper for JS Script.
-    }
-
-    public static void main(final String... args) throws ScriptException, NoSuchMethodException {
-        JsUtil.convert(args, "ingest_set_to_logstash");
-    }
-}
diff --git a/tools/ingest-converter/src/main/resources/ingest-append.js b/tools/ingest-converter/src/main/resources/ingest-append.js
deleted file mode 100644
index 191d7fdd8..000000000
--- a/tools/ingest-converter/src/main/resources/ingest-append.js
+++ /dev/null
@@ -1,40 +0,0 @@
-var IngestAppend = {
-    has_append: function (processor) {
-        return !!processor["append"];
-    },
-    append_hash: function (processor) {
-        var append_json = processor["append"];
-        var value_contents;
-        var value = append_json["value"];
-        if (Array.isArray(value)) {
-            value_contents = IngestConverter.create_array(value);
-        } else {
-            value_contents = IngestConverter.quote_string(value);
-        }
-        var mutate_contents = IngestConverter.create_field(
-            IngestConverter.quote_string(IngestConverter.dots_to_square_brackets(append_json["field"])),
-            value_contents);
-        return IngestConverter.create_field("add_field", IngestConverter.wrap_in_curly(mutate_contents));
-    }
-};
-
-/**
- * Converts Ingest Append JSON to LS mutate filter.
- */
-function ingest_append_to_logstash(json, append_stdio) {
-
-    function map_processor(processor) {
-
-        return IngestConverter.filter_hash(
-            IngestConverter.create_hash(
-                "mutate", IngestAppend.append_hash(processor)
-            )
-        );
-    }
-
-    var filters_pipeline = JSON.parse(json)["processors"].map(map_processor);
-    return IngestConverter.filters_to_file([
-        IngestConverter.append_io_plugins(filters_pipeline, append_stdio)
-        ]
-    );
-}
diff --git a/tools/ingest-converter/src/main/resources/ingest-convert.js b/tools/ingest-converter/src/main/resources/ingest-convert.js
deleted file mode 100644
index 977a48049..000000000
--- a/tools/ingest-converter/src/main/resources/ingest-convert.js
+++ /dev/null
@@ -1,34 +0,0 @@
-var IngestConvert = {
-    has_convert: function (processor) {
-        return !!processor["convert"];
-    },
-    convert_hash: function (processor) {
-        var convert_json = processor["convert"];
-        var mutate_contents = IngestConverter.create_field(
-            IngestConverter.quote_string(IngestConverter.dots_to_square_brackets(convert_json["field"])),
-            IngestConverter.quote_string(convert_json["type"])
-        );
-        return IngestConverter.create_field("convert", IngestConverter.wrap_in_curly(mutate_contents));
-    }
-};
-
-/**
- * Converts Ingest Convert JSON to LS Date filter.
- */
-function ingest_convert_to_logstash(json, append_stdio) {
-
-    function map_processor(processor) {
-
-        return IngestConverter.filter_hash(
-            IngestConverter.create_hash(
-                "mutate", IngestConvert.convert_hash(processor)
-            )
-        );
-    }
-
-    var filters_pipeline = JSON.parse(json)["processors"].map(map_processor);
-    return IngestConverter.filters_to_file([
-        IngestConverter.append_io_plugins(filters_pipeline, append_stdio)
-        ]
-    );
-}
diff --git a/tools/ingest-converter/src/main/resources/ingest-date.js b/tools/ingest-converter/src/main/resources/ingest-date.js
deleted file mode 100644
index b007ae918..000000000
--- a/tools/ingest-converter/src/main/resources/ingest-date.js
+++ /dev/null
@@ -1,60 +0,0 @@
-var IngestDate = {
-    has_date: function (processor) {
-        return !!processor["date"];
-    },
-    date_hash: function (processor) {
-        var date_json = processor["date"];
-        var formats = date_json["formats"];
-        var match_contents = [IngestConverter.dots_to_square_brackets(date_json["field"])];
-        for (var f in formats) {
-            match_contents.push(formats[f]);
-        }
-        var date_contents = IngestConverter.create_field(
-            "match",
-            IngestConverter.create_pattern_array(match_contents)
-        );
-        if (date_json["target_field"]) {
-            var target = IngestConverter.create_field(
-                "target",
-                IngestConverter.quote_string(
-                    IngestConverter.dots_to_square_brackets(date_json["target_field"])
-                )
-            );
-            date_contents = IngestConverter.join_hash_fields([date_contents, target]);
-        }
-        if (date_json["timezone"]) {
-            var timezone = IngestConverter.create_field(
-                "timezone",
-                IngestConverter.quote_string(date_json["timezone"])
-            );
-            date_contents = IngestConverter.join_hash_fields([date_contents, timezone]);
-        }
-        if (date_json["locale"]) {
-            var locale = IngestConverter.create_field(
-                "locale", IngestConverter.quote_string(date_json["locale"]));
-            date_contents = IngestConverter.join_hash_fields([date_contents, locale]);
-        }
-        return date_contents;
-    }
-};
-
-/**
- * Converts Ingest Date JSON to LS Date filter.
- */
-function ingest_to_logstash_date(json, append_stdio) {
-
-    function map_processor(processor) {
-
-        return IngestConverter.filter_hash(
-            IngestConverter.create_hash(
-                "date", IngestDate.date_hash(processor)
-            )
-        );
-    }
-
-    var filters_pipeline = JSON.parse(json)["processors"].map(map_processor);
-    return IngestConverter.filters_to_file([
-        IngestConverter.append_io_plugins(filters_pipeline, append_stdio)
-        ]
-    );
-}
diff --git a/tools/ingest-converter/src/main/resources/ingest-geoip.js b/tools/ingest-converter/src/main/resources/ingest-geoip.js
deleted file mode 100644
index fcaa81640..000000000
--- a/tools/ingest-converter/src/main/resources/ingest-geoip.js
+++ /dev/null
@@ -1,50 +0,0 @@
-var IngestGeoIp = {
-    has_geoip: function (processor) {
-        return !!processor["geoip"];
-    },
-    geoip_hash: function (processor) {
-        var geoip_data = processor["geoip"];
-        var parts = [
-            IngestConverter.create_field(
-                "source",
-                IngestConverter.quote_string(
-                    IngestConverter.dots_to_square_brackets(geoip_data["field"])
-                )
-            ),
-            IngestConverter.create_field(
-                "target",
-                IngestConverter.quote_string(
-                    IngestConverter.dots_to_square_brackets(geoip_data["target_field"])
-                )
-            )
-        ];
-        if (geoip_data["properties"]) {
-            parts.push(
-                IngestConverter.create_field(
-                    "fields",
-                    IngestConverter.create_pattern_array(geoip_data["properties"])
-                )
-            );
-        }
-        return IngestConverter.join_hash_fields(parts);
-    }
-};
-
-/**
- * Converts Ingest JSON to LS Grok.
- */
-function ingest_to_logstash_geoip(json, append_stdio) {
-
-    function map_processor(processor) {
-
-        return IngestConverter.filter_hash(
-            IngestConverter.create_hash("geoip", IngestGeoIp.geoip_hash(processor))
-        )
-    }
-
-    var filters_pipeline = JSON.parse(json)["processors"].map(map_processor);
-    return IngestConverter.filters_to_file([
-        IngestConverter.append_io_plugins(filters_pipeline, append_stdio)
-        ]
-    );
-}
diff --git a/tools/ingest-converter/src/main/resources/ingest-grok.js b/tools/ingest-converter/src/main/resources/ingest-grok.js
deleted file mode 100644
index 94e37903b..000000000
--- a/tools/ingest-converter/src/main/resources/ingest-grok.js
+++ /dev/null
@@ -1,68 +0,0 @@
-var IngestGrok = {
-    has_grok: function (processor) {
-        return !!processor[this.get_name()];
-    },
-    get_name: function () {
-        return "grok";
-    },
-    grok_hash: function (processor) {
-
-        function create_hash_field(name, content) {
-            return IngestConverter.create_field(
-                name, IngestConverter.wrap_in_curly(content)
-            );
-        }
-
-        function create_pattern_definition_hash(definitions) {
-            var content = [];
-            for (var key in definitions) {
-                if (definitions.hasOwnProperty(key)) {
-                    content.push(
-                        IngestConverter.create_field(
-                            IngestConverter.quote_string(key),
-                            IngestConverter.quote_string(definitions[key]))
-                    );
-                }
-            }
-            return create_hash_field(
-                "pattern_definitions", 
-                content.map(IngestConverter.dots_to_square_brackets).join("\n")
-            );
-        }
-
-        var grok_data = processor["grok"];
-        var grok_contents = create_hash_field(
-            "match",
-            IngestConverter.create_field(
-                IngestConverter.quote_string(grok_data["field"]),
-                IngestConverter.create_pattern_array_or_field(grok_data["patterns"])
-            )
-        );
-        if (grok_data["pattern_definitions"]) {
-            grok_contents = IngestConverter.join_hash_fields([
-                grok_contents,
-                create_pattern_definition_hash(grok_data["pattern_definitions"])
-            ])
-        }
-        return grok_contents;
-    }
-};
-
-/**
- * Converts Ingest JSON to LS Grok.
- */
-function ingest_to_logstash_grok(json, append_stdio) {
-
-    function map_processor(processor) {
-
-        return IngestConverter.filter_hash(
-            IngestConverter.create_hash("grok", IngestGrok.grok_hash(processor))
-        )
-    }
-
-    var filters_pipeline = JSON.parse(json)["processors"].map(map_processor);
-    return IngestConverter.filters_to_file([
-        IngestConverter.append_io_plugins(filters_pipeline, append_stdio)
-        ]
-    );
-}
diff --git a/tools/ingest-converter/src/main/resources/ingest-gsub.js b/tools/ingest-converter/src/main/resources/ingest-gsub.js
deleted file mode 100644
index 488649869..000000000
--- a/tools/ingest-converter/src/main/resources/ingest-gsub.js
+++ /dev/null
@@ -1,33 +0,0 @@
-var IngestGsub = {
-    has_gsub: function (processor) {
-        return !!processor["gsub"];
-    },
-    gsub_hash: function (processor) {
-        var gsub_data = processor["gsub"];
-        return IngestConverter.create_field(
-            "gsub",
-            "[\n" + [IngestConverter.dots_to_square_brackets(gsub_data["field"]),
-                gsub_data["pattern"], gsub_data["replacement"]].map(IngestConverter.quote_string)
-                .join(", ") + "\n]"
-        );
-    }
-};
-
-/**
- * Converts Ingest JSON to LS Grok.
- */
-function ingest_to_logstash_gsub(json, append_stdio) {
-
-    function map_processor(processor) {
-
-        return IngestConverter.filter_hash(
-            IngestConverter.create_hash("mutate", IngestGsub.gsub_hash(processor))
-        )
-    }
-
-    var filters_pipeline = JSON.parse(json)["processors"].map(map_processor);
-    return IngestConverter.filters_to_file([
-        IngestConverter.append_io_plugins(filters_pipeline, append_stdio)
-        ]
-    );
-}
diff --git a/tools/ingest-converter/src/main/resources/ingest-json.js b/tools/ingest-converter/src/main/resources/ingest-json.js
deleted file mode 100644
index ad2a71bc8..000000000
--- a/tools/ingest-converter/src/main/resources/ingest-json.js
+++ /dev/null
@@ -1,48 +0,0 @@
-var IngestJson = {
-    has_json: function (processor) {
-        return !!processor["json"];
-    },
-    json_hash: function (processor) {
-        var json_data = processor["json"];
-        var parts = [
-            IngestConverter.create_field(
-                "source",
-                IngestConverter.quote_string(
-                    IngestConverter.dots_to_square_brackets(json_data["field"])
-                )
-            )
-        ];
-
-        if (json_data["target_field"]) {
-            parts.push(
-                IngestConverter.create_field(
-                    "target",
-                    IngestConverter.quote_string(
-                        IngestConverter.dots_to_square_brackets(json_data["target_field"])
-                    )
-                )
-            );
-        }
-
-        return IngestConverter.join_hash_fields(parts);
-    }
-};
-
-/**
- * Converts Ingest json processor to LS json filter.
- */
-function ingest_json_to_logstash(json, append_stdio) {
-
-    function map_processor(processor) {
-
-        return IngestConverter.filter_hash(
-            IngestConverter.create_hash("json", IngestJson.json_hash(processor))
-        )
-    }
-
-    var filters_pipeline = JSON.parse(json)["processors"].map(map_processor);
-    return IngestConverter.filters_to_file([
-        IngestConverter.append_io_plugins(filters_pipeline, append_stdio)
-        ]
-    );
-}
diff --git a/tools/ingest-converter/src/main/resources/ingest-lowercase.js b/tools/ingest-converter/src/main/resources/ingest-lowercase.js
deleted file mode 100644
index aae5a9087..000000000
--- a/tools/ingest-converter/src/main/resources/ingest-lowercase.js
+++ /dev/null
@@ -1,34 +0,0 @@
-var IngestLowercase = {
-    has_lowercase: function (processor) {
-        return !!processor["lowercase"];
-    },
-    lowercase_hash: function (processor) {
-        return IngestConverter.create_field(
-            "lowercase", 
-            IngestConverter.quote_string(
-                IngestConverter.dots_to_square_brackets(processor["lowercase"]["field"])
-            )
-        );
-    }
-};
-
-/**
- * Converts Ingest Lowercase JSON to LS mutate filter.
- */
-function ingest_lowercase_to_logstash(json, append_stdio) {
-
-    function map_processor(processor) {
-
-        return IngestConverter.filter_hash(
-            IngestConverter.create_hash(
-                "mutate", IngestLowercase.lowercase_hash(processor)
-            )
-        );
-    }
-
-    var filters_pipeline = JSON.parse(json)["processors"].map(map_processor);
-    return IngestConverter.filters_to_file([
-        IngestConverter.append_io_plugins(filters_pipeline, append_stdio)
-        ]
-    );
-}
diff --git a/tools/ingest-converter/src/main/resources/ingest-pipeline.js b/tools/ingest-converter/src/main/resources/ingest-pipeline.js
deleted file mode 100644
index 2056c034c..000000000
--- a/tools/ingest-converter/src/main/resources/ingest-pipeline.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * Converts Ingest JSON to LS Grok.
- */
-function ingest_pipeline_to_logstash(json, append_stdio) {
-
-    function handle_on_failure_pipeline(on_failure_json, tag_name) {
-
-        return IngestConverter.create_tag_conditional(tag_name,
-            IngestConverter.join_hash_fields(on_failure_json.map(map_processor))
-        );
-    }
-
-    function map_processor(processor) {
-
-        var filter_blocks = [];
-        if (IngestGrok.has_grok(processor)) {
-            filter_blocks.push(
-                IngestConverter.create_hash(IngestGrok.get_name(), IngestGrok.grok_hash(processor))
-            );
-            if (IngestConverter.has_on_failure(processor, IngestGrok.get_name())) {
-                filter_blocks.push(
-                    handle_on_failure_pipeline(
-                        IngestConverter.get_on_failure(processor, IngestGrok.get_name()),
-                        "_grokparsefailure"
-                    )
-                );
-            }
-        }
-        if (IngestDate.has_date(processor)) {
-            filter_blocks.push(
-                IngestConverter.create_hash("date", IngestDate.date_hash(processor))
-            )
-        }
-        if (IngestGeoIp.has_geoip(processor)) {
-            filter_blocks.push(
-                IngestConverter.create_hash("geoip", IngestGeoIp.geoip_hash(processor))
-            )
-        }
-        if (IngestConvert.has_convert(processor)) {
-            filter_blocks.push(
-                IngestConverter.create_hash("mutate", IngestConvert.convert_hash(processor))
-            );
-        }
-        if (IngestGsub.has_gsub(processor)) {
-            filter_blocks.push(
-                IngestConverter.create_hash("mutate", IngestGsub.gsub_hash(processor))
-            );
-        }
-        if (IngestAppend.has_append(processor)) {
-            filter_blocks.push(
-                IngestConverter.create_hash("mutate", IngestAppend.append_hash(processor))
-            );
-        }
-        if (IngestJson.has_json(processor)) {
-            filter_blocks.push(
-                IngestConverter.create_hash("json", IngestJson.json_hash(processor))
-            );
-        }
-        if (IngestRename.has_rename(processor)) {
-            filter_blocks.push(
-                IngestConverter.create_hash("mutate", IngestRename.rename_hash(processor))
-            );
-        }
-        if (IngestLowercase.has_lowercase(processor)) {
-            filter_blocks.push(
-                IngestConverter.create_hash("mutate", IngestLowercase.lowercase_hash(processor))
-            );
-        }
-        if (IngestSet.has_set(processor)) {
-            filter_blocks.push(
-                IngestConverter.create_hash("mutate", IngestSet.set_hash(processor))
-            );
-        }
-        return IngestConverter.join_hash_fields(filter_blocks);
-    }
-
-    var logstash_pipeline = IngestConverter.filter_hash(
-        IngestConverter.join_hash_fields(JSON.parse(json)["processors"].map(map_processor))
-    );
-    return IngestConverter.filters_to_file([
-        IngestConverter.append_io_plugins(logstash_pipeline, append_stdio)
-        ]
-    );
-}
diff --git a/tools/ingest-converter/src/main/resources/ingest-rename.js b/tools/ingest-converter/src/main/resources/ingest-rename.js
deleted file mode 100644
index e861dbed5..000000000
--- a/tools/ingest-converter/src/main/resources/ingest-rename.js
+++ /dev/null
@@ -1,34 +0,0 @@
-var IngestRename = {
-    has_rename: function (processor) {
-        return !!processor["rename"];
-    },
-    rename_hash: function (processor) {
-        var rename_json = processor["rename"];
-        var mutate_contents = IngestConverter.create_field(
-            IngestConverter.quote_string(IngestConverter.dots_to_square_brackets(rename_json["field"])),
-            IngestConverter.quote_string(IngestConverter.dots_to_square_brackets(rename_json["target_field"]))
-        );
-        return IngestConverter.create_field("rename", IngestConverter.wrap_in_curly(mutate_contents));
-    }
-};
-
-/**
- * Converts Ingest Rename JSON to LS mutate filter.
- */
-function ingest_rename_to_logstash(json, append_stdio) {
-
-    function map_processor(processor) {
-
-        return IngestConverter.filter_hash(
-            IngestConverter.create_hash(
-                "mutate", IngestRename.rename_hash(processor)
-            )
-        );
-    }
-
-    var filters_pipeline = JSON.parse(json)["processors"].map(map_processor);
-    return IngestConverter.filters_to_file([
-        IngestConverter.append_io_plugins(filters_pipeline, append_stdio)
-        ]
-    );
-}
diff --git a/tools/ingest-converter/src/main/resources/ingest-set.js b/tools/ingest-converter/src/main/resources/ingest-set.js
deleted file mode 100644
index c5982b044..000000000
--- a/tools/ingest-converter/src/main/resources/ingest-set.js
+++ /dev/null
@@ -1,40 +0,0 @@
-var IngestSet = {
-    has_set: function (processor) {
-        return !!processor["set"];
-    },
-    set_hash: function (processor) {
-        var set_json = processor["set"];
-        var value_contents;
-        var value = set_json["value"];
-        if (typeof value === 'string' || value instanceof String) {
-            value_contents = IngestConverter.quote_string(value);
-        } else {
-            value_contents = value;
-        }
-        var mutate_contents = IngestConverter.create_field(
-            IngestConverter.quote_string(IngestConverter.dots_to_square_brackets(set_json["field"])),
-            value_contents);
-        return IngestConverter.create_field("add_field", IngestConverter.wrap_in_curly(mutate_contents));
-    }
-};
-
-/**
- * Converts Ingest Set JSON to LS mutate filter.
- */
-function ingest_set_to_logstash(json, append_stdio) {
-
-    function map_processor(processor) {
-
-        return IngestConverter.filter_hash(
-            IngestConverter.create_hash(
-                "mutate", IngestSet.set_hash(processor)
-            )
-        );
-    }
-
-    var filters_pipeline = JSON.parse(json)["processors"].map(map_processor);
-    return IngestConverter.filters_to_file([
-        IngestConverter.append_io_plugins(filters_pipeline, append_stdio)
-        ]
-    );
-}
diff --git a/tools/ingest-converter/src/main/resources/ingest-shared.js b/tools/ingest-converter/src/main/resources/ingest-shared.js
deleted file mode 100644
index 4f36ccafc..000000000
--- a/tools/ingest-converter/src/main/resources/ingest-shared.js
+++ /dev/null
@@ -1,184 +0,0 @@
-var IngestConverter = {
-    /**
-     * Translates the JSON naming pattern (`name.qualifier.sub`) into the LS pattern
-     * [name][qualifier][sub] for all applicable tokens in the given string.
-     * This function correctly identifies and omits renaming of string literals.
-     * @param string to replace naming pattern in
-     * @returns {string} with Json naming translated into grok naming
-     */
-    dots_to_square_brackets: function (string) {
-
-        function token_dots_to_square_brackets(string) {
-            var adjusted;
-            //Break out if this is not a naming pattern we convert
-            if (string.match(/([\w_]+\.)+[\w_]+/)) {
-                adjusted = string.replace(/(\w*)\.(\w*)/g, "$1][$2")
-                    .replace(/\[(\w+)(}|$)/g, "[$1]$2")
-                    .replace(/{(\w+):(\w+)]/g, "{$1:[$2]")
-                    .replace(/^(\w+)]\[/g, "[$1][");
-            } else {
-                adjusted = string;
-            }
-            return adjusted;
-        }
-
-        var literals = string.match(/\(\?:%{.*\|-\)/);
-        var i;
-        var tokens = [];
-        // Copy String before Manipulation
-        var right = string;
-        if (literals) {
-            for (i = 0; i < literals.length; ++i) {
-                var parts = right.split(literals[i], 2);
-                right = parts[1];
-                tokens.push(token_dots_to_square_brackets(parts[0]));
-                tokens.push(literals[i]);
-            }
-        }
-        tokens.push(token_dots_to_square_brackets(right));
-        return tokens.join("");
-    }, quote_string: function (string) {
-        return "\"" + string.replace(/"/g, "\\\"") + "\"";
-    }, wrap_in_curly: function (string) {
-        return "{\n" + string + "\n}";
-    }, create_field: function (name, content) {
-        return name + " => " + content;
-    }, create_hash: function (name, content) {
-        return name + " " + this.wrap_in_curly(content);
-    },
-
-    /**
-     * All hash fields in LS start on a new line.
-     * @param fields Array of Strings of Serialized Hash Fields
-     * @returns {string} Joined Serialization of Hash Fields
-     */
-    join_hash_fields: function (fields) {
-        return fields.join("\n");
-    },
-
-    /**
-     * Fixes indentation in LS string.
-     * @param string LS string to fix indentation in, that has no indentation intentionally with
-     * all lines starting on a token without preceding spaces.
-     * @returns {string} LS string indented by 3 spaces per level
-     */
-    fix_indent: function (string) {
-
-        function indent(string, shifts) {
-            return new Array(shifts * 3 + 1).join(" ") + string;
-        }
-
-        var lines = string.split("\n");
-        var count = 0;
-        var i;
-        for (i = 0; i < lines.length; ++i) {
-            if (lines[i].match(/(\{|\[)$/)) {
-                lines[i] = indent(lines[i], count);
-                ++count;
-            } else if (lines[i].match(/(\}|\])$/)) {
-                --count;
-                lines[i] = indent(lines[i], count);
-                // Only indent line if previous line ended on relevant control char.
-            } else if (i > 0 && lines[i - 1].match(/(=>\s+".+"|,|\{|\}|\[|\])$/)) {
-                lines[i] = indent(lines[i], count);
-            }
-        }
-        return lines.join("\n");
-    },
-
-    /**
-     * Converts Ingest/JSON style pattern array to LS pattern array, performing necessary variable
-     * name and quote escaping adjustments.
-     * @param patterns Pattern Array in JSON formatting
-     * @returns {string} Pattern array in LS formatting
-     */
-    create_pattern_array: function (patterns) {
-        return "[\n"
-            + patterns.map(this.dots_to_square_brackets).map(this.quote_string).join(",\n")
-            + "\n]";
-    },
-
-    create_array: function (ingest_array) {
-        return "[\n"
-            + ingest_array.map(this.quote_string).join(",\n")
-            + "\n]";
-    },
-
-    /**
-     * Converts Ingest/JSON style pattern array to LS pattern array or string if the given array
-     * contains a single element only, performing necessary variable name and quote escaping
-     * adjustments.
-     * @param patterns Pattern Array in JSON formatting
-     * @returns {string} Pattern array or string in LS formatting
-     */
-    create_pattern_array_or_field: function (patterns) {
-        return patterns.length === 1
-            ? this.quote_string(this.dots_to_square_brackets(patterns[0]))
-            : this.create_pattern_array(patterns);
-    },
-
-    filter_hash: function(contents) {
-        return this.fix_indent(this.create_hash("filter", contents))
-    },
-
-    filters_to_file: function(filters) {
-        return filters.join("\n\n") + "\n";
-    },
-
-    /**
-     * Does it have an on_failure field?
-     * @param processor Json
-     * @param name Name of the processor
-     * @returns {boolean} True if has on failure
-     */
-    has_on_failure: function (processor, name) {
-        return !!processor[name]["on_failure"];
-    },
-
-    get_on_failure: function (processor, name) {
-        return processor[name]["on_failure"];
-    },
-
-    /**
-     * Creates an if clause with the tag name
-     * @param tag String tag name to find in [tags] field
-     * @param on_failure_pipeline The on failure pipeline converted to LS to tack on in the conditional
-     * @returns {string} a string representing a conditional logic
-     */
-    create_tag_conditional: function (tag, on_failure_pipeline) {
-        return "if " + this.quote_string(tag) + " in [tags] {\n" +
-                on_failure_pipeline + "\n" +
-                "}";
-    },
-
-    get_elasticsearch_output: function () {
-        return this.fix_indent("output {\n" +
-            "elasticsearch {\n" +
-            "hosts => \"localhost\"\n" +
-            "}\n" +
-            "}");
-    },
-
-    get_stdin_input: function () {
-        return this.fix_indent("input {\n" +
-            "stdin {\n" +
-            "}\n" +
-            "}");
-    },
-
-    get_stdout_output: function () {
-        return this.fix_indent("output {\n" +
-            "stdout {\n" +
-            "codec => \"rubydebug\"\n" +
-            "}\n" +
-            "}");
-    },
-
-    append_io_plugins: function(filters_pipeline, append_stdio) {
-        if (append_stdio === true) {
-            return [IngestConverter.get_stdin_input(), filters_pipeline, IngestConverter.get_stdout_output()].join("\n");
-        } else {
-            return [filters_pipeline, IngestConverter.get_elasticsearch_output()].join("\n");
-        }
-    }
-};
diff --git a/tools/ingest-converter/src/test/java/org/logstash/ingest/AppendTest.java b/tools/ingest-converter/src/test/java/org/logstash/ingest/AppendTest.java
deleted file mode 100644
index 89a23ed21..000000000
--- a/tools/ingest-converter/src/test/java/org/logstash/ingest/AppendTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.logstash.ingest;
-
-import java.util.Arrays;
-import org.junit.Test;
-
-import static org.junit.runners.Parameterized.Parameters;
-
-public final class AppendTest extends IngestTest {
-
-    @Parameters
-    public static Iterable<String> data() {
-        return Arrays.asList("Append", "DotsInAppendField", "AppendScalar");
-    }
-
-    @Test
-    public void convertsAppendProcessorCorrectly() throws Exception {
-        assertCorrectConversion(Append.class);
-    }
-}
diff --git a/tools/ingest-converter/src/test/java/org/logstash/ingest/ConvertTest.java b/tools/ingest-converter/src/test/java/org/logstash/ingest/ConvertTest.java
deleted file mode 100644
index 0ba7f9a9a..000000000
--- a/tools/ingest-converter/src/test/java/org/logstash/ingest/ConvertTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.logstash.ingest;
-
-import java.util.Arrays;
-import org.junit.Test;
-
-import static org.junit.runners.Parameterized.Parameters;
-
-public final class ConvertTest extends IngestTest {
-
-    @Parameters
-    public static Iterable<String> data() {
-        return Arrays.asList("Convert", "DotsInConvertField", "ConvertBoolean", "ConvertString");
-    }
-
-    @Test
-    public void convertsConvertProcessorCorrectly() throws Exception {
-        assertCorrectConversion(Convert.class);
-    }
-}
diff --git a/tools/ingest-converter/src/test/java/org/logstash/ingest/DateTest.java b/tools/ingest-converter/src/test/java/org/logstash/ingest/DateTest.java
deleted file mode 100644
index dd8a45542..000000000
--- a/tools/ingest-converter/src/test/java/org/logstash/ingest/DateTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.logstash.ingest;
-
-import java.util.Arrays;
-import org.junit.Test;
-
-import static org.junit.runners.Parameterized.Parameters;
-
-public final class DateTest extends IngestTest {
-
-    @Parameters
-    public static Iterable<String> data() {
-        return Arrays.asList("Date", "DateExtraFields", "DotsInDateField");
-    }
-
-    @Test
-    public void convertsDateFieldCorrectly() throws Exception {
-        assertCorrectConversion(Date.class);
-    }
-}
diff --git a/tools/ingest-converter/src/test/java/org/logstash/ingest/GeoIpTest.java b/tools/ingest-converter/src/test/java/org/logstash/ingest/GeoIpTest.java
deleted file mode 100644
index 089747bc8..000000000
--- a/tools/ingest-converter/src/test/java/org/logstash/ingest/GeoIpTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.logstash.ingest;
-
-import java.util.Arrays;
-import org.junit.Test;
-
-import static org.junit.runners.Parameterized.Parameters;
-
-public final class GeoIpTest extends IngestTest {
-
-    @Parameters
-    public static Iterable<String> data() {
-        return Arrays.asList("GeoIpSimple", "DotsInGeoIpField");
-    }
-
-    @Test
-    public void convertsGeoIpFieldCorrectly() throws Exception {
-        assertCorrectConversion(GeoIp.class);
-    }
-}
diff --git a/tools/ingest-converter/src/test/java/org/logstash/ingest/GrokTest.java b/tools/ingest-converter/src/test/java/org/logstash/ingest/GrokTest.java
deleted file mode 100644
index 317618e0b..000000000
--- a/tools/ingest-converter/src/test/java/org/logstash/ingest/GrokTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.logstash.ingest;
-
-import java.util.Arrays;
-import org.junit.Test;
-
-import static org.junit.runners.Parameterized.Parameters;
-
-public final class GrokTest extends IngestTest {
-
-    @Parameters
-    public static Iterable<String> data() {
-        return Arrays.asList("Grok", "GrokPatternDefinition", "GrokMultiplePatternDefinitions");
-    }
-
-    @Test
-    public void convertsGrokFieldCorrectly() throws Exception {
-        assertCorrectConversion(Grok.class);
-    }
-}
diff --git a/tools/ingest-converter/src/test/java/org/logstash/ingest/GsubTest.java b/tools/ingest-converter/src/test/java/org/logstash/ingest/GsubTest.java
deleted file mode 100644
index 6dc5b069b..000000000
--- a/tools/ingest-converter/src/test/java/org/logstash/ingest/GsubTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.logstash.ingest;
-
-import java.util.Collections;
-import org.junit.Test;
-
-import static org.junit.runners.Parameterized.Parameters;
-
-public final class GsubTest extends IngestTest {
-
-    @Parameters
-    public static Iterable<String> data() {
-        return Collections.singletonList("GsubSimple");
-    }
-
-    @Test
-    public void convertsGsubCorrectly() throws Exception {
-        assertCorrectConversion(Gsub.class);
-    }
-}
diff --git a/tools/ingest-converter/src/test/java/org/logstash/ingest/IngestTest.java b/tools/ingest-converter/src/test/java/org/logstash/ingest/IngestTest.java
deleted file mode 100644
index 3117df7d4..000000000
--- a/tools/ingest-converter/src/test/java/org/logstash/ingest/IngestTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.logstash.ingest;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.regex.Pattern;
-import org.apache.commons.io.IOUtils;
-import org.junit.Rule;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.runners.Parameterized.Parameter;
-
-/**
- * Base class for ingest migration tests
- */
-@RunWith(Parameterized.class)
-public abstract class IngestTest {
-
-    /**
-     * Used to normalize line endings since static reference result files have Unix line endings.
-     */
-    private static final Pattern CR_LF =
-        Pattern.compile("\\r\\n");
-
-    /**
-     * Used to normalize line endings since static reference result files have Unix line endings.
-     */
-    private static final Pattern CARRIAGE_RETURN = Pattern.compile("\\r");
-
-    @Rule
-    public TemporaryFolder temp = new TemporaryFolder();
-
-    @Parameter
-    public String testCase;
-
-    protected final void assertCorrectConversion(final Class<?> clazz) throws Exception {
-        final URL append = getResultPath(temp);
-        clazz.getMethod("main", String[].class).invoke(
-            null,
-            (Object) new String[]{
-                String.format("--input=%s", resourcePath(String.format("ingest%s.json", testCase))),
-                String.format("--output=%s", append)
-            }
-        );
-        assertThat(
-            utf8File(append), is(utf8File(resourcePath(String.format("logstash%s.conf", testCase))))
-        );
-    }
-
-    /**
-     * Reads a file, normalizes line endings to Unix line endings and returns the whole content
-     * as a String.
-     * @param path Url to read
-     * @return String content of the URL
-     * @throws IOException On failure to read from given URL
-     */
-    private static String utf8File(final URL path) throws IOException {
-        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        try (final InputStream input = path.openStream()) {
-            IOUtils.copy(input, baos);
-        }
-        return CARRIAGE_RETURN.matcher(
-            CR_LF.matcher(
-                baos.toString(StandardCharsets.UTF_8.name())
-            ).replaceAll("\n")
-        ).replaceAll("\n");
-    }
-
-    private static URL resourcePath(final String name) {
-        return IngestTest.class.getResource(name);
-    }
-
-    private static URL getResultPath(TemporaryFolder temp) throws IOException {
-        return temp.newFolder().toPath().resolve("converted").toUri().toURL();
-    }
-}
diff --git a/tools/ingest-converter/src/test/java/org/logstash/ingest/JsonTest.java b/tools/ingest-converter/src/test/java/org/logstash/ingest/JsonTest.java
deleted file mode 100644
index 685f1e3f5..000000000
--- a/tools/ingest-converter/src/test/java/org/logstash/ingest/JsonTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.logstash.ingest;
-
-import java.util.Arrays;
-import org.junit.Test;
-
-import static org.junit.runners.Parameterized.Parameters;
-
-public final class JsonTest extends IngestTest {
-
-    @Parameters
-    public static Iterable<String> data() {
-        return Arrays.asList("Json", "DotsInJsonField", "JsonExtraFields");
-    }
-
-    @Test
-    public void convertsConvertProcessorCorrectly() throws Exception {
-        assertCorrectConversion(Json.class);
-    }
-}
diff --git a/tools/ingest-converter/src/test/java/org/logstash/ingest/LowercaseTest.java b/tools/ingest-converter/src/test/java/org/logstash/ingest/LowercaseTest.java
deleted file mode 100644
index ae188e24c..000000000
--- a/tools/ingest-converter/src/test/java/org/logstash/ingest/LowercaseTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.logstash.ingest;
-
-import java.util.Arrays;
-import org.junit.Test;
-
-import static org.junit.runners.Parameterized.Parameters;
-
-public final class LowercaseTest extends IngestTest {
-
-    @Parameters
-    public static Iterable<String> data() {
-        return Arrays.asList("LowercaseSimple", "LowercaseDots");
-    }
-
-    @Test
-    public void convertsAppendProcessorCorrectly() throws Exception {
-        assertCorrectConversion(Lowercase.class);
-    }
-}
diff --git a/tools/ingest-converter/src/test/java/org/logstash/ingest/PipelineTest.java b/tools/ingest-converter/src/test/java/org/logstash/ingest/PipelineTest.java
deleted file mode 100644
index 41f58633c..000000000
--- a/tools/ingest-converter/src/test/java/org/logstash/ingest/PipelineTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.logstash.ingest;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import org.junit.Test;
-
-import static org.junit.runners.Parameterized.Parameters;
-
-public final class PipelineTest extends IngestTest {
-
-    @Parameters
-    public static Iterable<String> data() {
-        final Collection<String> cases = new ArrayList<>();
-        cases.add("ComplexCase1");
-        cases.add("ComplexCase2");
-        cases.add("ComplexCase3");
-        cases.add("ComplexCase4");
-        GeoIpTest.data().forEach(cases::add);
-        DateTest.data().forEach(cases::add);
-        GrokTest.data().forEach(cases::add);
-        ConvertTest.data().forEach(cases::add);
-        GsubTest.data().forEach(cases::add);
-        AppendTest.data().forEach(cases::add);
-        JsonTest.data().forEach(cases::add);
-        RenameTest.data().forEach(cases::add);
-        LowercaseTest.data().forEach(cases::add);
-        SetTest.data().forEach(cases::add);
-        return cases;
-    }
-
-    @Test
-    public void convertsComplexCaseCorrectly() throws Exception {
-        assertCorrectConversion(Pipeline.class);
-    }
-}
diff --git a/tools/ingest-converter/src/test/java/org/logstash/ingest/RenameTest.java b/tools/ingest-converter/src/test/java/org/logstash/ingest/RenameTest.java
deleted file mode 100644
index 1734d119d..000000000
--- a/tools/ingest-converter/src/test/java/org/logstash/ingest/RenameTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.logstash.ingest;
-
-import java.util.Arrays;
-import org.junit.Test;
-
-import static org.junit.runners.Parameterized.Parameters;
-
-public final class RenameTest extends IngestTest {
-
-    @Parameters
-    public static Iterable<String> data() {
-        return Arrays.asList("Rename", "DotsInRenameField");
-    }
-
-    @Test
-    public void convertsConvertProcessorCorrectly() throws Exception {
-        assertCorrectConversion(Rename.class);
-    }
-}
diff --git a/tools/ingest-converter/src/test/java/org/logstash/ingest/SetTest.java b/tools/ingest-converter/src/test/java/org/logstash/ingest/SetTest.java
deleted file mode 100644
index 68af5e60c..000000000
--- a/tools/ingest-converter/src/test/java/org/logstash/ingest/SetTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.logstash.ingest;
-
-import java.util.Arrays;
-import org.junit.Test;
-
-import static org.junit.runners.Parameterized.Parameters;
-
-public final class SetTest extends IngestTest {
-
-    @Parameters
-    public static Iterable<String> data() {
-        return Arrays.asList("Set", "DotsInSetField", "SetNumber");
-    }
-
-    @Test
-    public void convertsSetProcessorCorrectly() throws Exception {
-        assertCorrectConversion(Set.class);
-    }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestAppend.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestAppend.json
deleted file mode 100644
index 471d4337c..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestAppend.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "description": "Pipeline to parse Apache logs",
-  "processors": [
-    {
-      "append": {
-        "field" : "client",
-        "value": ["host1", "host2"]
-      }
-    }
-  ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestAppendScalar.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestAppendScalar.json
deleted file mode 100644
index 34ad59e5e..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestAppendScalar.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "description": "Pipeline to parse Apache logs",
-  "processors": [
-    {
-      "append": {
-        "field" : "foo",
-        "value": "bar"
-      }
-    }
-  ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestComplexCase1.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestComplexCase1.json
deleted file mode 100644
index 370fd72d6..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestComplexCase1.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "description": "Pipeline to parse Apache logs",
-  "processors": [
-    {
-      "grok": {
-        "field": "message",
-        "patterns": [
-          "%{COMBINEDAPACHELOG}"
-        ]
-      }
-    },
-    {
-      "date": {
-        "field": "timestamp",
-        "target_field": "@timestamp",
-        "formats": [
-          "dd/MMM/YYYY:HH:mm:ss Z"
-        ],
-        "locale": "en"
-      }
-    },
-    {
-      "geoip": {
-        "field": "client.ip",
-        "target_field": "geo"
-      }
-    },
-    {
-      "convert": {
-        "field" : "bytes",
-        "type": "integer"
-      }
-    },
-    {
-      "append": {
-        "field" : "response_code",
-        "value": ["200", "400", "503"]
-      }
-    },
-    {
-      "json": {
-        "field": "string_source"
-      }
-    },
-    {
-      "rename": {
-        "field": "foo",
-        "target_field": "foobar"
-      }
-    }
-  ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestComplexCase2.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestComplexCase2.json
deleted file mode 100644
index 054f6e3fb..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestComplexCase2.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "description": "Pipeline to parse Apache logs",
-  "processors": [
-    {
-      "grok": {
-        "field": "message",
-        "patterns": [
-          "%{COMBINEDAPACHELOG}"
-        ]
-      }
-    },
-    {
-      "date": {
-        "field": "timestamp",
-        "target_field": "@timestamp",
-        "formats": [
-          "dd/MMM/YYYY:HH:mm:ss Z"
-        ],
-        "locale": "en"
-      }
-    },
-    {
-      "geoip": {
-        "field": "client.ip",
-        "target_field": "client.geo"
-      }
-    },
-    {
-      "geoip": {
-        "field": "source.ip",
-        "target_field": "source.geo"
-      }
-    },
-    {
-      "convert": {
-        "field" : "[client][bytes]",
-        "type": "integer"
-      }
-    }
-  ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestComplexCase3.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestComplexCase3.json
deleted file mode 100644
index d059b3536..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestComplexCase3.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "description": "Pipeline to parse Apache logs",
-  "processors": [
-    {
-      "grok": {
-        "field": "message",
-        "patterns": ["%{COMBINEDAPACHELOG}"],
-        "on_failure" : [
-          {
-            "set" : {
-              "field" : "error",
-              "value" : "field does not exist"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "date": {
-        "field": "timestamp",
-        "target_field": "@timestamp",
-        "formats": [
-          "dd/MMM/YYYY:HH:mm:ss Z"
-        ],
-        "locale": "en"
-      }
-    },
-    {
-      "geoip": {
-        "field": "clientip",
-        "target_field": "geo"
-      }
-    }
-  ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestComplexCase4.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestComplexCase4.json
deleted file mode 100644
index c63bda673..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestComplexCase4.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "description": "Pipeline to parse Apache logs",
-  "processors": [
-    {
-      "grok": {
-        "field": "message",
-        "patterns": ["%{COMBINEDAPACHELOG}"],
-        "on_failure" : [
-          {
-            "set" : {
-              "field" : "error",
-              "value" : "field does not exist"
-            }
-          },
-          {
-            "convert": {
-              "field" : "client.ip",
-              "type": "integer"
-            }
-          }
-        ]
-      }
-    },
-    {
-      "date": {
-        "field": "timestamp",
-        "target_field": "@timestamp",
-        "formats": [
-          "dd/MMM/YYYY:HH:mm:ss Z"
-        ],
-        "locale": "en"
-      }
-    },
-    {
-      "geoip": {
-        "field": "clientip",
-        "target_field": "geo"
-      }
-    }
-  ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestConvert.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestConvert.json
deleted file mode 100644
index 11b730dcd..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestConvert.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "processors": [
-    {
-        "convert": {
-            "field" : "bytes",
-            "type": "integer"
-        }
-    }
-]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestConvertBoolean.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestConvertBoolean.json
deleted file mode 100644
index 3904f5ab8..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestConvertBoolean.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "processors": [
-    {
-      "convert": {
-        "field" : "delete",
-        "type": "boolean"
-      }
-    }
-  ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestConvertString.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestConvertString.json
deleted file mode 100644
index e61614c56..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestConvertString.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "processors": [
-    {
-      "convert": {
-        "field" : "blah",
-        "type": "string"
-      }
-    }
-  ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDate.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDate.json
deleted file mode 100644
index b93104bc2..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDate.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "description" : "...",
-    "processors" : [
-        {
-            "date" : {
-                "field" : "initial_date",
-                "target_field" : "timestamp",
-                "formats" : ["dd/MM/yyyy hh:mm:ss", "dd/MM/yyyy"]
-            }
-        }
-    ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDateExtraFields.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDateExtraFields.json
deleted file mode 100644
index 8a342f95a..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDateExtraFields.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "description" : "...",
-  "processors" : [
-    {
-      "date" : {
-        "field" : "initial_date",
-        "target_field" : "timestamp",
-        "formats" : ["dd/MM/yyyy hh:mm:ss", "dd/MM/yyyy"],
-        "timezone" : "Europe/Amsterdam",
-        "locale": "en"
-      }
-    }
-  ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDotsInAppendField.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDotsInAppendField.json
deleted file mode 100644
index 70989b354..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDotsInAppendField.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "description": "Pipeline to parse Apache logs",
-  "processors": [
-    {
-      "append": {
-        "field" : "client.ip",
-        "value": ["127.0.0.1", "127.0.0.2"]
-      }
-    }
-  ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDotsInConvertField.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDotsInConvertField.json
deleted file mode 100644
index c8ac73b1b..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDotsInConvertField.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "description": "Pipeline to parse Apache logs",
-    "processors": [
-        {
-            "convert": {
-                "field" : "client.bytes",
-                "type": "float"
-            }
-        }
-    ]
-}
\ No newline at end of file
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDotsInDateField.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDotsInDateField.json
deleted file mode 100644
index 4a9a35766..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDotsInDateField.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "description" : "...",
-  "processors" : [
-    {
-      "date" : {
-        "field" : "initial_date",
-        "target_field" : "apache.timestamp",
-        "formats" : ["dd/MM/yyyy hh:mm:ss", "dd/MM/yyyy"],
-        "timezone" : "Europe/Amsterdam",
-        "locale": "en"
-      }
-    }
-  ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDotsInGeoIpField.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDotsInGeoIpField.json
deleted file mode 100644
index 4a3b7fe18..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDotsInGeoIpField.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "description" : "Add geoip info",
-  "processors" : [
-    {
-      "geoip" : {
-        "field" : "ip",
-        "target_field" : "apache.geo",
-        "database_file" : "GeoLite2-Country.mmdb.gz",
-        "properties": ["continent_name", "country_iso_code"]
-      }
-    }
-  ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDotsInJsonField.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDotsInJsonField.json
deleted file mode 100644
index ed4f41f1f..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDotsInJsonField.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "description": "ExampleJson",
-  "processors": [
-    {
-      "json": {
-        "field": "[foo][string_source]",
-        "target_field": "[bar][json_target]"
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDotsInRenameField.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDotsInRenameField.json
deleted file mode 100644
index 33aa582a6..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDotsInRenameField.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "description": "ExampleRename",
-  "processors": [
-    {
-      "rename": {
-        "field": "foo.bar",
-        "target_field": "foo.baz"
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDotsInSetField.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDotsInSetField.json
deleted file mode 100644
index 7112b7131..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestDotsInSetField.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "description": "SetExample",
-  "processors": [
-    {
-      "set": {
-        "field": "foo.bar",
-        "value": "baz"
-      }
-    }
-  ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestGeoIpSimple.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestGeoIpSimple.json
deleted file mode 100644
index 2554b92c4..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestGeoIpSimple.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "description": "Add geoip info",
-  "processors": [
-    {
-      "geoip": {
-        "field": "ip",
-        "target_field": "geo",
-        "database_file": "GeoLite2-Country.mmdb.gz",
-        "properties": [
-          "continent_name",
-          "country_iso_code"
-        ]
-      }
-    }
-  ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestGrok.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestGrok.json
deleted file mode 100644
index 36db975a1..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestGrok.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "description": "Pipeline for parsing apache error logs",
-  "processors": [
-    {
-      "grok": {
-        "field": "message",
-        "patterns": [
-          "%{IPORHOST:apache2.access.remote_ip} - %{DATA:apache2.access.user_name} \\[%{HTTPDATE:apache2.access.time}\\] \"%{WORD:apache2.access.method} %{DATA:apache2.access.url} HTTP/%{NUMBER:apache2.access.http_version}\" %{NUMBER:apache2.access.response_code} (?:%{NUMBER:apache2.access.body_sent.bytes}|-)( \"%{DATA:apache2.access.referrer}\")?( \"%{DATA:apache2.access.agent}\")?",
-          "%{IPORHOST:apache2.access.remote_ip} - %{DATA:apache2.access.user_name} \\[%{HTTPDATE:apache2.access.time}\\] \"-\" %{NUMBER:apache2.access.response_code} -"
-        ],
-        "ignore_missing": true
-      }
-    }
-  ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestGrokMultiplePatternDefinitions.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestGrokMultiplePatternDefinitions.json
deleted file mode 100644
index e3a2ce60e..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestGrokMultiplePatternDefinitions.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "description":"Syslog",
-  "processors":[
-    {
-      "grok":{
-        "field":"message",
-        "patterns":[
-          "%{SYSLOGTIMESTAMP:system.syslog.timestamp} %{SYSLOGHOST:system.syslog.hostname} %{DATA:system.syslog.program}(?:\\[%{POSINT:system.syslog.pid}\\])?: %{GREEDYMULTILINE:system.syslog.message}",
-          "%{SYSLOGTIMESTAMP:system.syslog.timestamp} %{GREEDYMULTILINE:system.syslog.message}"
-        ],
-        "pattern_definitions":{
-          "GREEDYMULTILINE":"(.|\\n)*",
-          "AUDIT_TYPE": "^type=%{NOTSPACE:auditd.log.record_type}"
-        },
-        "ignore_missing":true
-      }
-    }
-  ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestGrokPatternDefinition.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestGrokPatternDefinition.json
deleted file mode 100644
index bb123eed1..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestGrokPatternDefinition.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "description":"Syslog",
-  "processors":[
-    {
-      "grok":{
-        "field":"message",
-        "patterns":[
-          "%{SYSLOGTIMESTAMP:system.syslog.timestamp} %{SYSLOGHOST:system.syslog.hostname} %{DATA:system.syslog.program}(?:\\[%{POSINT:system.syslog.pid}\\])?: %{GREEDYMULTILINE:system.syslog.message}",
-          "%{SYSLOGTIMESTAMP:system.syslog.timestamp} %{GREEDYMULTILINE:system.syslog.message}"
-        ],
-        "pattern_definitions":{
-          "GREEDYMULTILINE":"(.|\\n)*"
-        },
-        "ignore_missing":true
-      }
-    }
-  ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestGsubSimple.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestGsubSimple.json
deleted file mode 100644
index 14835baa0..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestGsubSimple.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "description": "ExampleGsub",
-  "processors": [
-    {
-      "gsub": {
-        "field": "field1",
-        "pattern": "\\.",
-        "replacement": "_"
-      }
-    }
-  ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestJson.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestJson.json
deleted file mode 100644
index 54a8adf66..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestJson.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "description": "ExampleJson",
-  "processors": [
-    {
-      "json": {
-        "field": "string_source"
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestJsonExtraFields.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestJsonExtraFields.json
deleted file mode 100644
index e95bedc27..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestJsonExtraFields.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "description": "ExampleJson",
-  "processors": [
-    {
-      "json": {
-        "field": "string_source",
-        "target_field": "json_target"
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestLowercaseDots.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestLowercaseDots.json
deleted file mode 100644
index 2f375b36e..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestLowercaseDots.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "description": "ExampleLowercase",
-  "processors": [
-    {
-      "lowercase": {
-        "field": "foo.bar"
-      }
-    }
-  ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestLowercaseSimple.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestLowercaseSimple.json
deleted file mode 100644
index 8ae738f19..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestLowercaseSimple.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "description": "ExampleLowercase",
-  "processors": [
-    {
-      "lowercase": {
-        "field": "foo"
-      }
-    }
-  ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestRename.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestRename.json
deleted file mode 100644
index 7a2d89ed4..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestRename.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "description": "ExampleRename",
-  "processors": [
-    {
-      "rename": {
-        "field": "foo",
-        "target_field": "foobar"
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestSet.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestSet.json
deleted file mode 100644
index 3ae6f3c39..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestSet.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "description": "SetExample",
-  "processors": [
-    {
-      "set": {
-        "field": "field1",
-        "value": "bar"
-      }
-    }
-  ]
-}
-
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestSetNumber.json b/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestSetNumber.json
deleted file mode 100644
index 70558bd52..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/ingestSetNumber.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "description": "SetExample",
-  "processors": [
-    {
-      "set": {
-        "field": "field1",
-        "value": 5344.4
-      }
-    }
-  ]
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashAppend.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashAppend.conf
deleted file mode 100644
index 40372d15c..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashAppend.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-filter {
-   mutate {
-      add_field => {
-         "client" => [
-            "host1",
-            "host2"
-         ]
-      }
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashAppendScalar.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashAppendScalar.conf
deleted file mode 100644
index f40d36e38..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashAppendScalar.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-filter {
-   mutate {
-      add_field => {
-         "foo" => "bar"
-      }
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashComplexCase1.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashComplexCase1.conf
deleted file mode 100644
index be27a7bc6..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashComplexCase1.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-filter {
-   grok {
-      match => {
-         "message" => "%{COMBINEDAPACHELOG}"
-      }
-   }
-   date {
-      match => [
-         "timestamp",
-         "dd/MMM/YYYY:HH:mm:ss Z"
-      ]
-      target => "@timestamp"
-      locale => "en"
-   }
-   geoip {
-      source => "[client][ip]"
-      target => "geo"
-   }
-   mutate {
-      convert => {
-         "bytes" => "integer"
-      }
-   }
-   mutate {
-      add_field => {
-         "response_code" => [
-            "200",
-            "400",
-            "503"
-         ]
-      }
-   }
-   json {
-      source => "string_source"
-   }
-   mutate {
-      rename => {
-         "foo" => "foobar"
-      }
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashComplexCase2.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashComplexCase2.conf
deleted file mode 100644
index 20b94771d..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashComplexCase2.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-filter {
-   grok {
-      match => {
-         "message" => "%{COMBINEDAPACHELOG}"
-      }
-   }
-   date {
-      match => [
-         "timestamp",
-         "dd/MMM/YYYY:HH:mm:ss Z"
-      ]
-      target => "@timestamp"
-      locale => "en"
-   }
-   geoip {
-      source => "[client][ip]"
-      target => "[client][geo]"
-   }
-   geoip {
-      source => "[source][ip]"
-      target => "[source][geo]"
-   }
-   mutate {
-      convert => {
-         "[client][bytes]" => "integer"
-      }
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashComplexCase3.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashComplexCase3.conf
deleted file mode 100644
index 20ae4380e..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashComplexCase3.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-filter {
-   grok {
-      match => {
-         "message" => "%{COMBINEDAPACHELOG}"
-      }
-   }
-   if "_grokparsefailure" in [tags] {
-      mutate {
-         add_field => {
-            "error" => "field does not exist"
-         }
-      }
-   }
-   date {
-      match => [
-         "timestamp",
-         "dd/MMM/YYYY:HH:mm:ss Z"
-      ]
-      target => "@timestamp"
-      locale => "en"
-   }
-   geoip {
-      source => "clientip"
-      target => "geo"
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashComplexCase4.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashComplexCase4.conf
deleted file mode 100644
index 4da212f20..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashComplexCase4.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-filter {
-   grok {
-      match => {
-         "message" => "%{COMBINEDAPACHELOG}"
-      }
-   }
-   if "_grokparsefailure" in [tags] {
-      mutate {
-         add_field => {
-            "error" => "field does not exist"
-         }
-      }
-      mutate {
-         convert => {
-            "[client][ip]" => "integer"
-         }
-      }
-   }
-   date {
-      match => [
-         "timestamp",
-         "dd/MMM/YYYY:HH:mm:ss Z"
-      ]
-      target => "@timestamp"
-      locale => "en"
-   }
-   geoip {
-      source => "clientip"
-      target => "geo"
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashConvert.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashConvert.conf
deleted file mode 100644
index 1771fe204..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashConvert.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-filter {
-   mutate {
-      convert => {
-         "bytes" => "integer"
-      }
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashConvertBoolean.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashConvertBoolean.conf
deleted file mode 100644
index 0d98c5a47..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashConvertBoolean.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-filter {
-   mutate {
-      convert => {
-         "delete" => "boolean"
-      }
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashConvertString.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashConvertString.conf
deleted file mode 100644
index 6a872cf7a..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashConvertString.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-filter {
-   mutate {
-      convert => {
-         "blah" => "string"
-      }
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDate.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDate.conf
deleted file mode 100644
index 0533a7f52..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDate.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-filter {
-   date {
-      match => [
-         "initial_date",
-         "dd/MM/yyyy hh:mm:ss",
-         "dd/MM/yyyy"
-      ]
-      target => "timestamp"
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDateExtraFields.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDateExtraFields.conf
deleted file mode 100644
index 52cb3e471..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDateExtraFields.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-filter {
-   date {
-      match => [
-         "initial_date",
-         "dd/MM/yyyy hh:mm:ss",
-         "dd/MM/yyyy"
-      ]
-      target => "timestamp"
-      timezone => "Europe/Amsterdam"
-      locale => "en"
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDotsInAppendField.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDotsInAppendField.conf
deleted file mode 100644
index 8ee177213..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDotsInAppendField.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-filter {
-   mutate {
-      add_field => {
-         "[client][ip]" => [
-            "127.0.0.1",
-            "127.0.0.2"
-         ]
-      }
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDotsInConvertField.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDotsInConvertField.conf
deleted file mode 100644
index 8bbe66ce5..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDotsInConvertField.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-filter {
-   mutate {
-      convert => {
-         "[client][bytes]" => "float"
-      }
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDotsInDateField.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDotsInDateField.conf
deleted file mode 100644
index 881d9e47b..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDotsInDateField.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-filter {
-   date {
-      match => [
-         "initial_date",
-         "dd/MM/yyyy hh:mm:ss",
-         "dd/MM/yyyy"
-      ]
-      target => "[apache][timestamp]"
-      timezone => "Europe/Amsterdam"
-      locale => "en"
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDotsInGeoIpField.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDotsInGeoIpField.conf
deleted file mode 100644
index fbcd2b202..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDotsInGeoIpField.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-filter {
-   geoip {
-      source => "ip"
-      target => "[apache][geo]"
-      fields => [
-         "continent_name",
-         "country_iso_code"
-      ]
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDotsInJsonField.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDotsInJsonField.conf
deleted file mode 100644
index 57032dfcb..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDotsInJsonField.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-filter {
-   json {
-      source => "[foo][string_source]"
-      target => "[bar][json_target]"
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDotsInRenameField.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDotsInRenameField.conf
deleted file mode 100644
index aedde2200..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDotsInRenameField.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-filter {
-   mutate {
-      rename => {
-         "[foo][bar]" => "[foo][baz]"
-      }
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDotsInSetField.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDotsInSetField.conf
deleted file mode 100644
index 3b63d8f0f..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashDotsInSetField.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-filter {
-   mutate {
-      add_field => {
-         "[foo][bar]" => "baz"
-      }
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashGeoIpSimple.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashGeoIpSimple.conf
deleted file mode 100644
index 218e672c5..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashGeoIpSimple.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-filter {
-   geoip {
-      source => "ip"
-      target => "geo"
-      fields => [
-         "continent_name",
-         "country_iso_code"
-      ]
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashGrok.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashGrok.conf
deleted file mode 100644
index ddf6150c1..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashGrok.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-filter {
-   grok {
-      match => {
-         "message" => [
-            "%{IPORHOST:[apache2][access][remote_ip]} - %{DATA:[apache2][access][user_name]} \[%{HTTPDATE:[apache2][access][time]}\] \"%{WORD:[apache2][access][method]} %{DATA:[apache2][access][url]} HTTP/%{NUMBER:[apache2][access][http_version]}\" %{NUMBER:[apache2][access][response_code]} (?:%{NUMBER:apache2.access.body_sent.bytes}|-)( \"%{DATA:[apache2][access][referrer]}\")?( \"%{DATA:[apache2][access][agent]}\")?",
-            "%{IPORHOST:[apache2][access][remote_ip]} - %{DATA:[apache2][access][user_name]} \[%{HTTPDATE:[apache2][access][time]}\] \"-\" %{NUMBER:[apache2][access][response_code]} -"
-         ]
-      }
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashGrokMultiplePatternDefinitions.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashGrokMultiplePatternDefinitions.conf
deleted file mode 100644
index e89065b71..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashGrokMultiplePatternDefinitions.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-filter {
-   grok {
-      match => {
-         "message" => [
-            "%{SYSLOGTIMESTAMP:[system][syslog][timestamp]} %{SYSLOGHOST:[system][syslog][hostname]} %{DATA:[system][syslog][program]}(?:\[%{POSINT:[system][syslog][pid]}\])?: %{GREEDYMULTILINE:[system][syslog][message]}",
-            "%{SYSLOGTIMESTAMP:[system][syslog][timestamp]} %{GREEDYMULTILINE:[system][syslog][message]}"
-         ]
-      }
-      pattern_definitions => {
-         "GREEDYMULTILINE" => "(.|\n)*"
-         "AUDIT_TYPE" => "^type=%{NOTSPACE:[auditd][log][record_type]}"
-      }
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashGrokPatternDefinition.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashGrokPatternDefinition.conf
deleted file mode 100644
index 0a24c2676..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashGrokPatternDefinition.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-filter {
-   grok {
-      match => {
-         "message" => [
-            "%{SYSLOGTIMESTAMP:[system][syslog][timestamp]} %{SYSLOGHOST:[system][syslog][hostname]} %{DATA:[system][syslog][program]}(?:\[%{POSINT:[system][syslog][pid]}\])?: %{GREEDYMULTILINE:[system][syslog][message]}",
-            "%{SYSLOGTIMESTAMP:[system][syslog][timestamp]} %{GREEDYMULTILINE:[system][syslog][message]}"
-         ]
-      }
-      pattern_definitions => {
-         "GREEDYMULTILINE" => "(.|\n)*"
-      }
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashGsubSimple.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashGsubSimple.conf
deleted file mode 100644
index bc4092a80..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashGsubSimple.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-filter {
-   mutate {
-      gsub => [
-         "field1", "\.", "_"
-      ]
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashJson.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashJson.conf
deleted file mode 100644
index 1936d3c34..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashJson.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-filter {
-   json {
-      source => "string_source"
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashJsonExtraFields.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashJsonExtraFields.conf
deleted file mode 100644
index dfe7c2d48..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashJsonExtraFields.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-filter {
-   json {
-      source => "string_source"
-      target => "json_target"
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashLowercaseDots.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashLowercaseDots.conf
deleted file mode 100644
index 9f070e367..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashLowercaseDots.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-filter {
-   mutate {
-      lowercase => "[foo][bar]"
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashLowercaseSimple.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashLowercaseSimple.conf
deleted file mode 100644
index 49229ab26..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashLowercaseSimple.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-filter {
-   mutate {
-      lowercase => "foo"
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashRename.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashRename.conf
deleted file mode 100644
index daf5725ec..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashRename.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-filter {
-   mutate {
-      rename => {
-         "foo" => "foobar"
-      }
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashSet.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashSet.conf
deleted file mode 100644
index 204cb5424..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashSet.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-filter {
-   mutate {
-      add_field => {
-         "field1" => "bar"
-      }
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashSetNumber.conf b/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashSetNumber.conf
deleted file mode 100644
index 36a98a3f5..000000000
--- a/tools/ingest-converter/src/test/resources/org/logstash/ingest/logstashSetNumber.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-filter {
-   mutate {
-      add_field => {
-         "field1" => 5344.4
-      }
-   }
-}
-output {
-   elasticsearch {
-      hosts => "localhost"
-   }
-}
diff --git a/tools/jvm-options-parser/README.md b/tools/jvm-options-parser/README.md
new file mode 100644
index 000000000..018e9243f
--- /dev/null
+++ b/tools/jvm-options-parser/README.md
@@ -0,0 +1,2 @@
+Standalone jar for JvmOptionsParser to enable it to run under Java 8 to provide
+helpful fail fast message when logstash is run older versions of Java.
\ No newline at end of file
diff --git a/tools/jvm-options-parser/build.gradle b/tools/jvm-options-parser/build.gradle
new file mode 100644
index 000000000..c0b51e48b
--- /dev/null
+++ b/tools/jvm-options-parser/build.gradle
@@ -0,0 +1,45 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+description = """Logstash JVM options parser"""
+version = versionMap['logstash-core']
+
+repositories {
+  mavenCentral()
+}
+
+buildscript {
+  repositories {
+    mavenCentral()
+  }
+}
+
+java {
+  sourceCompatibility = JavaVersion.VERSION_11
+  targetCompatibility = JavaVersion.VERSION_11
+}
+
+dependencies {
+  testImplementation "junit:junit:4.13.2"
+}
+
+javadoc {
+  enabled = false
+}
\ No newline at end of file
diff --git a/tools/ingest-converter/gradle.properties b/tools/jvm-options-parser/gradle.properties
similarity index 100%
rename from tools/ingest-converter/gradle.properties
rename to tools/jvm-options-parser/gradle.properties
diff --git a/tools/jvm-options-parser/src/main/java/org/logstash/launchers/JavaVersion.java b/tools/jvm-options-parser/src/main/java/org/logstash/launchers/JavaVersion.java
new file mode 100644
index 000000000..7aa3f484d
--- /dev/null
+++ b/tools/jvm-options-parser/src/main/java/org/logstash/launchers/JavaVersion.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.logstash.launchers;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Helper class to compare current version of JVM with a target version.
+ * Based on JavaVersion class from elasticsearch java version checker tool
+ */
+public class JavaVersion implements Comparable<JavaVersion> {
+
+    public static final JavaVersion CURRENT = parse(System.getProperty("java.specification.version"));
+    public static final JavaVersion JAVA_17 = parse("17");
+    private final List<Integer> version;
+
+    private JavaVersion(List<Integer> version) {
+        this.version = version;
+    }
+
+    static JavaVersion parse(final String value) {
+        if (value.matches("^0*[0-9]+(\\.[0-9]+)*$") == false) {
+            throw new IllegalArgumentException(value);
+        }
+
+        final List<Integer> version = new ArrayList<Integer>();
+        final String[] components = value.split("\\.");
+        for (final String component : components) {
+            version.add(Integer.valueOf(component));
+        }
+        return new JavaVersion(version);
+    }
+
+    public static int majorVersion(final JavaVersion javaVersion) {
+        Objects.requireNonNull(javaVersion);
+        if (javaVersion.version.get(0) > 1) {
+            return javaVersion.version.get(0);
+        } else {
+            return javaVersion.version.get(1);
+        }
+    }
+
+    private static int compare(final JavaVersion leftVersion, final JavaVersion rightVersion) {
+        List<Integer> left = leftVersion.version;
+        List<Integer> right = rightVersion.version;
+        // lexicographically compare two lists, treating missing entries as zeros
+        final int len = Math.max(left.size(), right.size());
+        for (int i = 0; i < len; i++) {
+            final int l = (i < left.size()) ? left.get(i) : 0;
+            final int r = (i < right.size()) ? right.get(i) : 0;
+            if (l < r) {
+                return -1;
+            }
+            if (r < l) {
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    @Override
+    public int compareTo(JavaVersion other) {
+        return compare(this, other);
+    }
+}
\ No newline at end of file
diff --git a/tools/jvm-options-parser/src/main/java/org/logstash/launchers/JvmOptionsParser.java b/tools/jvm-options-parser/src/main/java/org/logstash/launchers/JvmOptionsParser.java
new file mode 100644
index 000000000..24edfec73
--- /dev/null
+++ b/tools/jvm-options-parser/src/main/java/org/logstash/launchers/JvmOptionsParser.java
@@ -0,0 +1,435 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+
+package org.logstash.launchers;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+
+
+/**
+ * Parse jvm.options file applying version conditional logic. Heavily inspired by same functionality in Elasticsearch.
+ * */
+public class JvmOptionsParser {
+
+    private static final String[] MANDATORY_JVM_OPTIONS = new String[]{
+            "-Djruby.regexp.interruptible=true",
+            "-Djdk.io.File.enableADS=true",
+            "16-:--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+            "16-:--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+            "16-:--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
+            "16-:--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+            "16-:--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
+            "11-:--add-opens=java.base/java.security=ALL-UNNAMED",
+            "11-:--add-opens=java.base/java.io=ALL-UNNAMED",
+            "11-:--add-opens=java.base/java.nio.channels=ALL-UNNAMED",
+            "11-:--add-opens=java.base/sun.nio.ch=ALL-UNNAMED",
+            "11-:--add-opens=java.management/sun.management=ALL-UNNAMED"
+    };
+
+
+    @SuppressWarnings("serial")
+    static class JvmOptionsFileParserException extends Exception {
+
+        private static final long serialVersionUID = 2446165130736962758L;
+
+        private final Path jvmOptionsFile;
+
+        Path jvmOptionsFile() {
+            return jvmOptionsFile;
+        }
+
+        private final SortedMap<Integer, String> invalidLines;
+
+        SortedMap<Integer, String> invalidLines() {
+            return invalidLines;
+        }
+
+        JvmOptionsFileParserException(final Path jvmOptionsFile, final SortedMap<Integer, String> invalidLines) {
+            this.jvmOptionsFile = jvmOptionsFile;
+            this.invalidLines = invalidLines;
+        }
+
+    }
+
+    private final String logstashHome;
+
+    JvmOptionsParser(String logstashHome) {
+        this.logstashHome = logstashHome;
+    }
+
+    /**
+     * The main entry point. The exit code is 0 if the JVM options were successfully parsed, otherwise the exit code is 1. If an improperly
+     * formatted line is discovered, the line is output to standard error.
+     *
+     * @param args the args to the program which should consist of a single option, the path to LOGSTASH_HOME
+     */
+    public static void main(final String[] args) {
+        if (args.length < 1 || args.length > 2) {
+            throw new IllegalArgumentException(
+                    "Expected two arguments specifying path to LOGSTASH_HOME and an optional LS_JVM_OPTS, but was " + Arrays.toString(args)
+            );
+        }
+        bailOnOldJava();
+        handleJvmOptions(args, System.getenv("LS_JAVA_OPTS"));
+    }
+
+    static void bailOnOldJava() {
+        if (JavaVersion.CURRENT.compareTo(JavaVersion.JAVA_17) < 0) {
+            final String message = String.format(
+                    Locale.ROOT,
+                    "The minimum required Java version is 17; your Java version from [%s] does not meet this requirement",
+                    System.getProperty("java.home")
+            );
+            System.err.println(message);
+            System.exit(1);
+        }
+    }
+    static void handleJvmOptions(String[] args, String lsJavaOpts) {
+        final JvmOptionsParser parser = new JvmOptionsParser(args[0]);
+        final String jvmOpts = args.length == 2 ? args[1] : null;
+        try {
+            Optional<Path> jvmOptions = parser.lookupJvmOptionsFile(jvmOpts);
+            parser.handleJvmOptions(jvmOptions, lsJavaOpts);
+        } catch (JvmOptionsFileParserException pex) {
+            System.err.printf(Locale.ROOT,
+                    "encountered [%d] error%s parsing [%s]",
+                    pex.invalidLines().size(),
+                    pex.invalidLines().size() == 1 ? "" : "s",
+                    pex.jvmOptionsFile());
+            int errorCounter = 0;
+            for (final Map.Entry<Integer, String> entry : pex.invalidLines().entrySet()) {
+                errorCounter++;
+                System.err.printf(Locale.ROOT,
+                        "[%d]: encountered improperly formatted JVM option in [%s] on line number [%d]: [%s]",
+                        errorCounter,
+                        pex.jvmOptionsFile(),
+                        entry.getKey(),
+                        entry.getValue());
+            }
+        } catch (IOException ex) {
+            System.err.println("Error accessing jvm.options file");
+            System.exit(1);
+        }
+    }
+
+    private Optional<Path> lookupJvmOptionsFile(String jvmOpts) {
+        if (jvmOpts != null && !jvmOpts.isEmpty()) {
+            return Optional.of(Paths.get(jvmOpts));
+        }
+        // Set the initial JVM options from the jvm.options file. Look in
+        // /etc/logstash first, and break if that file is found readable there.
+        return Arrays.stream(new Path[] { Paths.get("/etc/logstash/jvm.options"),
+                                          Paths.get(logstashHome, "config/jvm.options") })
+                .filter(p -> p.toFile().canRead())
+                .findFirst();
+    }
+
+    private void handleJvmOptions(Optional<Path> jvmOptionsFile, String lsJavaOpts) throws IOException, JvmOptionsFileParserException {
+        int javaMajorVersion = javaMajorVersion();
+
+        // Add JVM Options from config/jvm.options
+        final Set<String> jvmOptionsContent = new LinkedHashSet<>(getJvmOptionsFromFile(jvmOptionsFile, javaMajorVersion));
+
+        // Add JVM Options from LS_JAVA_OPTS
+        if (lsJavaOpts != null && !lsJavaOpts.isEmpty()) {
+            if (isDebugEnabled()) {
+                System.err.println("Appending jvm options from environment LS_JAVA_OPTS");
+            }
+            Arrays.stream(lsJavaOpts.split(" "))
+                    .filter(s -> !s.isBlank())
+                    .forEach(jvmOptionsContent::add);
+        }
+        // Set mandatory JVM options
+        jvmOptionsContent.addAll(getMandatoryJvmOptions(javaMajorVersion));
+
+        final Set<String> jvmFinalOptions = nettyMaxOrderDefaultTo11(jvmOptionsContent);
+
+        System.out.println(String.join(" ", jvmFinalOptions));
+    }
+
+    /**
+     * Inplace method that verifies if Netty's maxOrder option is already set, else configure it to have
+     * the default value of 11.
+     *
+     * @param options the collection of options to examine.
+     * @return the collection of input option eventually with Netty maxOrder added.
+     * */
+    private Set<String> nettyMaxOrderDefaultTo11(Set<String> options) {
+        boolean maxOrderAlreadyContained = options.stream().anyMatch(s -> s.startsWith("-Dio.netty.allocator.maxOrder"));
+        if (maxOrderAlreadyContained) {
+            return options;
+        }
+        // Order is important because LS_JAVA_OPTS is added last and must take precedence 
+        // over settings in jvm.options
+        final Set<String> acc = new LinkedHashSet<>(options);
+        acc.add("-Dio.netty.allocator.maxOrder=11");
+        return acc;
+    }
+
+    /**
+     * Returns the list of mandatory JVM options for the given version of Java.
+     * @param javaMajorVersion
+     * @return Collection of mandatory options
+     */
+     static Collection<String> getMandatoryJvmOptions(int javaMajorVersion){
+          return Arrays.stream(MANDATORY_JVM_OPTIONS)
+                  .map(option -> jvmOptionFromLine(javaMajorVersion, option))
+                  .flatMap(Optional::stream)
+                  .collect(Collectors.toUnmodifiableList());
+    }
+
+    private List<String> getJvmOptionsFromFile(final Optional<Path> jvmOptionsFile, final int javaMajorVersion) throws IOException, JvmOptionsFileParserException {
+        if (!jvmOptionsFile.isPresent()) {
+            System.err.println("Warning: no jvm.options file found.");
+            return Collections.emptyList();
+        }
+        final Path optionsFilePath = jvmOptionsFile.get();
+        if (!optionsFilePath.toFile().exists()) {
+            System.err.format("Warning: jvm.options file does not exist or is not readable: `%s`\n", optionsFilePath);
+            return Collections.emptyList();
+        }
+
+        if (isDebugEnabled()) {
+            System.err.format("Processing jvm.options file at `%s`\n", optionsFilePath);
+        }
+        try (InputStream is = Files.newInputStream(optionsFilePath);
+             Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8);
+             BufferedReader br = new BufferedReader(reader)
+        ) {
+            final ParseResult parseResults = parse(javaMajorVersion, br);
+            if (parseResults.hasErrors()) {
+                throw new JvmOptionsFileParserException(optionsFilePath, parseResults.getInvalidLines());
+            }
+            return parseResults.getJvmOptions();
+        }
+    }
+
+    private boolean isDebugEnabled() {
+        final String debug = System.getenv("DEBUG");
+        if (debug == null) {
+            return false;
+        }
+
+        return "1".equals(debug) || Boolean.parseBoolean(debug);
+    }
+
+    /**
+     * Collector of parsed lines and errors.
+     * */
+    static final class ParseResult {
+        private final List<String> jvmOptions = new ArrayList<>();
+        private final SortedMap<Integer, String> invalidLines = new TreeMap<>();
+
+        void appendOption(String option) {
+            jvmOptions.add(option);
+        }
+
+        void appendError(int lineNumber, String malformedLine) {
+            invalidLines.put(lineNumber, malformedLine);
+        }
+
+        public boolean hasErrors() {
+            return !invalidLines.isEmpty();
+        }
+
+        public SortedMap<Integer, String> getInvalidLines() {
+            return invalidLines;
+        }
+
+        public List<String> getJvmOptions() {
+            return jvmOptions;
+        }
+    }
+
+    private static final Pattern OPTION_DEFINITION = Pattern.compile("((?<start>\\d+)(?<range>-)?(?<end>\\d+)?:)?(?<option>-.*)$");
+    /**
+     *
+     * If the version syntax specified on a line matches the specified JVM options, the JVM option callback will be invoked with the JVM
+     * option. If the line does not match the specified syntax for the JVM options, the invalid line callback will be invoked with the
+     * contents of the entire line.
+     *
+     * @param javaMajorVersion the Java major version to match JVM options against
+     * @param br the buffered reader to read line-delimited JVM options from
+     * @return the admitted options lines respecting the javaMajorVersion and the error lines
+     * @throws IOException if an I/O exception occurs reading from the buffered reader
+     */
+    static ParseResult parse(final int javaMajorVersion, final BufferedReader br) throws IOException {
+        final ParseResult result = new ParseResult();
+        int lineNumber = 0;
+        while (true) {
+            final String line = br.readLine();
+            lineNumber++;
+            if (line == null) {
+                break;
+            }
+            try{
+                jvmOptionFromLine(javaMajorVersion, line).ifPresent(result::appendOption);
+            } catch (IllegalArgumentException e){
+                result.appendError(lineNumber, line);
+            };
+        }
+        return result;
+    }
+
+    /**
+     * Parse the line-delimited JVM options from the specified string for the specified Java major version.
+     * Valid JVM options are:
+     * <ul>
+     *     <li>
+     *         a line starting with a dash is treated as a JVM option that applies to all versions
+     *     </li>
+     *     <li>
+     *         a line starting with a number followed by a colon is treated as a JVM option that applies to the matching Java major version
+     *         only
+     *     </li>
+     *     <li>
+     *         a line starting with a number followed by a dash followed by a colon is treated as a JVM option that applies to the matching
+     *         Java specified major version and all larger Java major versions
+     *     </li>
+     *     <li>
+     *         a line starting with a number followed by a dash followed by a number followed by a colon is treated as a JVM option that
+     *         applies to the specified range of matching Java major versions
+     *     </li>
+     * </ul>
+     *
+     * For example, if the specified Java major version is 8, the following JVM options will be accepted:
+     * <ul>
+     *     <li>
+     *         {@code -XX:+PrintGCDateStamps}
+     *     </li>
+     *     <li>
+     *         {@code 8:-XX:+PrintGCDateStamps}
+     *     </li>
+     *     <li>
+     *         {@code 8-:-XX:+PrintGCDateStamps}
+     *     </li>
+     *     <li>
+     *         {@code 7-8:-XX:+PrintGCDateStamps}
+     *     </li>
+     * </ul>
+     * and the following JVM options will be skipped:
+     * <ul>
+     *     <li>
+     *         {@code 9:-Xlog:age*=trace,gc*,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m}
+     *     </li>
+     *     <li>
+     *         {@code 9-:-Xlog:age*=trace,gc*,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m}
+     *     </li>
+     *     <li>
+     *         {@code 9-10:-Xlog:age*=trace,gc*,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m}
+     *     </li>
+     * </ul>
+
+     * @param javaMajorVersion
+     * @param line
+     * @return Returns an Optional containing a string if the line contains a valid option for the specified Java
+     *         version and empty otherwise
+     */
+    private static Optional<String> jvmOptionFromLine(final int javaMajorVersion, final String line){
+        if (line.startsWith("#") || line.matches("\\s*")) {
+            // Skip comments and blank lines
+            return Optional.empty();
+        }
+
+        String subbedLine = resolveEnvVar(line, System.getenv());
+
+        final Matcher matcher = OPTION_DEFINITION.matcher(subbedLine);
+        if (matcher.matches()) {
+            final String start = matcher.group("start");
+            final String end = matcher.group("end");
+            if (start == null) {
+                // no range present, unconditionally apply the JVM option
+                return Optional.of(subbedLine);
+            } else {
+                final int lower = Integer.parseInt(start);
+                final int upper;
+                if (matcher.group("range") == null) {
+                    // no range is present, apply the JVM option to the specified major version only
+                    upper = lower;
+                } else if (end == null) {
+                    // a range of the form \\d+- is present, apply the JVM option to all major versions larger than the specified one
+                    upper = Integer.MAX_VALUE;
+                } else {
+                        upper = Integer.parseInt(end);
+                    if (upper < lower) {
+                        throw new IllegalArgumentException("Upper bound must be greater than lower bound");
+                    }
+                }
+                if (lower <= javaMajorVersion && javaMajorVersion <= upper) {
+                    return Optional.of(matcher.group("option"));
+                }
+            }
+        } else {
+            throw new IllegalArgumentException("Illegal JVM Option");
+        }
+        return Optional.empty();
+    }
+
+    private static final Pattern ENV_VAR_PATTERN = Pattern.compile("\\$\\{([a-zA-Z_.][a-zA-Z0-9_.]*)(?::([^}]*))?\\}");
+
+    static String resolveEnvVar(String line, Map<String,String> env) {
+        Matcher matcher = ENV_VAR_PATTERN.matcher(line);
+        StringBuilder sb = new StringBuilder();
+
+        while (matcher.find()) {
+            String varName = matcher.group(1);
+            String defaultValue = Optional.ofNullable(matcher.group(2)).orElse("");
+            String replacement = env.getOrDefault(varName, defaultValue);
+            matcher.appendReplacement(sb,  Matcher.quoteReplacement(replacement));
+        }
+        matcher.appendTail(sb);
+
+        return sb.toString();
+    }
+
+    private static final Pattern JAVA_VERSION = Pattern.compile("^(?:1\\.)?(?<javaMajorVersion>\\d+)(?:\\.\\d+)?$");
+
+    private static int javaMajorVersion() {
+        final String specVersion = System.getProperty("java.specification.version");
+        final Matcher specVersionMatcher = JAVA_VERSION.matcher(specVersion);
+        if (!specVersionMatcher.matches()) {
+            throw new IllegalStateException(String.format("Failed to extract Java major version from specification `%s`", specVersion));
+        }
+        return Integer.parseInt(specVersionMatcher.group("javaMajorVersion"));
+    }
+}
diff --git a/tools/jvm-options-parser/src/test/java/org/logstash/launchers/JvmOptionsParserTest.java b/tools/jvm-options-parser/src/test/java/org/logstash/launchers/JvmOptionsParserTest.java
new file mode 100644
index 000000000..49e28df7f
--- /dev/null
+++ b/tools/jvm-options-parser/src/test/java/org/logstash/launchers/JvmOptionsParserTest.java
@@ -0,0 +1,275 @@
+package org.logstash.launchers;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.lang.reflect.Field;
+import java.util.Map;
+import java.util.function.Consumer;
+
+import static org.junit.Assert.*;
+
+public class JvmOptionsParserTest {
+
+    @Rule
+    public TemporaryFolder temp = new TemporaryFolder();
+
+    private final PrintStream standardOut = System.out;
+    private final ByteArrayOutputStream outputStreamCaptor = new ByteArrayOutputStream();
+
+    @Before
+    public void setUp() {
+        System.setOut(new PrintStream(outputStreamCaptor));
+    }
+
+    @After
+    public void tearDown() {
+        System.setOut(standardOut);
+    }
+
+    @Test
+    public void test_LS_JAVA_OPTS_isUsedWhenNoJvmOptionsIsAvailable() {
+        JvmOptionsParser.handleJvmOptions(new String[] {temp.toString()}, "-Xblabla");
+
+        // Verify
+        final String output = outputStreamCaptor.toString();
+        assertTrue("Output MUST contains the options present in LS_JAVA_OPTS", output.contains("-Xblabla"));
+    }
+
+    @Test
+    public void givenLS_JAVA_OPTS_containingMultipleDefinitionsWithAlsoMaxOrderThenNoDuplicationOfMaxOrderOptionShouldHappen() throws IOException {
+        JvmOptionsParser.handleJvmOptions(new String[] {temp.toString()}, "-Xblabla -Dio.netty.allocator.maxOrder=13");
+
+        // Verify
+        final String output = outputStreamCaptor.toString();
+        int firstMatch = output.indexOf("-Dio.netty.allocator.maxOrder");
+        int lastMatch = output.lastIndexOf("-Dio.netty.allocator.maxOrder");
+        assertEquals("No duplication of options (io.netty.allocator.maxOrder) are admitted \n raw data[" + output + "]", firstMatch, lastMatch);
+    }
+
+    @SuppressWarnings({ "unchecked" })
+    public static void updateEnv(String name, String val) throws ReflectiveOperationException {
+        Map<String, String> env = System.getenv();
+        Field field = env.getClass().getDeclaredField("m");
+        field.setAccessible(true);
+        ((Map<String, String>) field.get(env)).put(name, val);
+    }
+
+
+    @Test
+    public void testParseCommentLine() throws IOException {
+        final BufferedReader options = asReader("# this is a comment" + System.lineSeparator() + "-XX:+UseConcMarkSweepGC");
+        final JvmOptionsParser.ParseResult res = JvmOptionsParser.parse(11, options);
+
+        assertTrue("no invalid lines can be present", res.getInvalidLines().isEmpty());
+        verifyOptions("Uncommented lines must be present", "-XX:+UseConcMarkSweepGC", res);
+    }
+
+    @Test
+    public void testParseOptionWithFixedVersion() throws IOException {
+        JvmOptionsParser.ParseResult res = JvmOptionsParser.parse(11, asReader("8:-XX:+UseConcMarkSweepGC"));
+
+        assertTrue("No option match for Java 11", res.getJvmOptions().isEmpty());
+
+        res = JvmOptionsParser.parse(8, asReader("8:-XX:+UseConcMarkSweepGC"));
+        verifyOptions("Option must be present for Java 8", "-XX:+UseConcMarkSweepGC", res);
+    }
+
+    @Test
+    public void testParseOptionGreaterThanVersion() throws IOException {
+        JvmOptionsParser.ParseResult res = JvmOptionsParser.parse(11, asReader("8-:-XX:+UseConcMarkSweepGC"));
+        verifyOptions("Option must be present for Java 11", "-XX:+UseConcMarkSweepGC", res);
+
+        res = JvmOptionsParser.parse(8, asReader("8-:-XX:+UseConcMarkSweepGC"));
+        verifyOptions("Option must be present also for Java 8", "-XX:+UseConcMarkSweepGC", res);
+    }
+
+    @Test
+    public void testParseOptionVersionRange() throws IOException {
+        JvmOptionsParser.ParseResult res = JvmOptionsParser.parse(11, asReader("10-11:-XX:+UseConcMarkSweepGC"));
+        verifyOptions("Option must be present for Java 11", "-XX:+UseConcMarkSweepGC", res);
+
+        res = JvmOptionsParser.parse(14, asReader("10-11:-XX:+UseConcMarkSweepGC"));
+        assertTrue("No option match outside the range [10-11]", res.getJvmOptions().isEmpty());
+    }
+
+    @Test
+    public void testMandatoryJvmOptionApplicableJvmPresent() throws IOException{
+        assertTrue("Contains add-exports value for Java 17",
+                JvmOptionsParser.getMandatoryJvmOptions(17).contains("--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"));
+    }
+
+    @Test
+    public void testMandatoryJvmOptionNonApplicableJvmNotPresent() throws IOException{
+        assertFalse("Does not contains add-exports value for Java 11",
+                JvmOptionsParser.getMandatoryJvmOptions(11).contains("--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"));
+    }
+
+    @Test
+    public void testAlwaysMandatoryJvmPresent() {
+        assertTrue("Contains regexp interruptible for Java 11",
+                JvmOptionsParser.getMandatoryJvmOptions(11).contains("-Djruby.regexp.interruptible=true"));
+        assertTrue("Contains regexp interruptible for Java 17",
+                JvmOptionsParser.getMandatoryJvmOptions(17).contains("-Djruby.regexp.interruptible=true"));
+
+    }
+
+    @Test
+    public void testErrorLinesAreReportedCorrectly() throws IOException {
+        final String jvmOptionsContent = "10-11:-XX:+UseConcMarkSweepGC" + System.lineSeparator() +
+                "invalidOption" + System.lineSeparator() +
+                "-Duser.country=US" + System.lineSeparator() +
+                "anotherInvalidOption";
+        JvmOptionsParser.ParseResult res = JvmOptionsParser.parse(11, asReader(jvmOptionsContent));
+        verifyOptions("Option must be present for Java 11", "-XX:+UseConcMarkSweepGC" + System.lineSeparator() + "-Duser.country=US", res);
+
+        assertEquals("invalidOption", res.getInvalidLines().get(2));
+        assertEquals("anotherInvalidOption", res.getInvalidLines().get(4));
+    }
+
+    @Test
+    public void testNettyMaxOrderRuleAppliesIfNotAlreadyDefinedExplicitlyByUser() throws IOException {
+        File optionsFile = writeIntoTempOptionsFile(writer -> writer.println("-Dsome.other.netty.property=123"));
+
+        JvmOptionsParser.handleJvmOptions(new String[] {"/path/to/ls_home", optionsFile.toString()}, "-Dcli.opts=something");
+
+        // Verify
+        final String output = outputStreamCaptor.toString();
+        assertTrue("Existing properties other than Netty's maxOrder ar preserved", output.contains("-Dsome.other.netty.property=123"));
+        assertTrue("Netty's maxOrder MUST be forcibly defined to the expected default", output.contains("-Dio.netty.allocator.maxOrder=11"));
+    }
+
+    @Test
+    public void testNettyMaxOrderRuleDoNotAppliesIfAlreadyDefinedExplicitlyByUser() throws IOException {
+        File optionsFile = writeIntoTempOptionsFile(writer -> writer.println("-Dio.netty.allocator.maxOrder=10"));
+
+        JvmOptionsParser.handleJvmOptions(new String[] {"/path/to/ls_home", optionsFile.toString()}, "-Dcli.opts=something");
+
+        // Verify
+        final String output = outputStreamCaptor.toString();
+        assertTrue("Netty's maxOrder MUST be forcibly defined to the expected default", output.contains("-Dio.netty.allocator.maxOrder=10"));
+
+    }
+
+    @Test
+    public void testEnvironmentOPTSVariableTakesPrecedenceOverOptionsFile() throws IOException {
+        String regex = "Xmx[^ ]+";
+        String expected = "Xmx25g";
+        File optionsFile = writeIntoTempOptionsFile(writer -> writer.println("-Xmx1g"));
+
+        JvmOptionsParser.handleJvmOptions(new String[] {"/path/to/ls_home", optionsFile.toString()}, expected);
+
+        final String output = outputStreamCaptor.toString();
+
+        java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(regex);
+        String lastMatch = pattern.matcher(output)
+                .results()
+                .map(java.util.regex.MatchResult::group)
+                .reduce((first, second) -> second)
+                .orElse(null);
+
+        assertEquals("LS_JAVA_OPTS env must take precedence over jvm.options file", expected, lastMatch);
+    }
+
+    private File writeIntoTempOptionsFile(Consumer<PrintWriter> writer) throws IOException {
+        File optionsFile = temp.newFile("jvm.options");
+        PrintWriter optionsWriter = new PrintWriter(new FileWriter(optionsFile));
+        writer.accept(optionsWriter);
+        optionsWriter.close();
+        return optionsFile;
+    }
+
+    private void verifyOptions(String message, String expected, JvmOptionsParser.ParseResult res) {
+        assertEquals(message, expected, String.join(System.lineSeparator(), res.getJvmOptions()));
+    }
+
+    private BufferedReader asReader(String s) {
+        return new BufferedReader(new StringReader(s));
+    }
+
+
+    @Test
+    public void testSingleEnvSub() throws IOException {
+        String result = JvmOptionsParser.resolveEnvVar("-XX:HeapDumpPath=${LOGSTASH_HOME}/heapdump.hprof",
+                Map.of("LOGSTASH_HOME", "/path/to/ls_home"));
+        assertEquals("-XX:HeapDumpPath=/path/to/ls_home/heapdump.hprof", result);
+    }
+
+    @Test
+    public void testMultipleEnvSub() throws IOException {
+        String result = JvmOptionsParser.resolveEnvVar("-XX:HeapDumpPath=${LOGSTASH_HOME}/${DATA}/heapdump.hprof",
+                Map.of("LOGSTASH_HOME", "/path/to/ls_home", "DATA", "data"));
+        assertEquals("-XX:HeapDumpPath=/path/to/ls_home/data/heapdump.hprof", result);
+    }
+
+    @Test
+    public void testPeriodEnvSub() throws IOException {
+        String result = JvmOptionsParser.resolveEnvVar("-XX:HeapDumpPath=${.HOME}/heapdump.hprof",
+                Map.of(".HOME", "/path/to/.home"));
+        assertEquals("-XX:HeapDumpPath=/path/to/.home/heapdump.hprof", result);
+    }
+
+    @Test
+    public void testEmptyEnvSub() throws IOException {
+        String result = JvmOptionsParser.resolveEnvVar("-XX:HeapDumpPath=${NOT_VALID}/heapdump.hprof", Map.of());
+        assertEquals("-XX:HeapDumpPath=/heapdump.hprof", result);
+    }
+
+    @Test
+    public void testNoSub() throws IOException {
+        String result = JvmOptionsParser.resolveEnvVar("   ", Map.of());
+        assertEquals("   ", result);
+    }
+
+    @Test
+    public void testEnvSubWithDefault() throws IOException {
+        String result = JvmOptionsParser.resolveEnvVar("-XX:HeapDumpPath=${LOGSTASH_HOME:/usr/share/logstash}/${DATA:data}/heapdump.hprof",
+                Map.of());
+        assertEquals("-XX:HeapDumpPath=/usr/share/logstash/data/heapdump.hprof", result);
+    }
+
+    @Test
+    public void testEnvSubWithDefaultSpecialChar() throws IOException {
+        String result = JvmOptionsParser.resolveEnvVar("-XX:HeapDumpPath=${LOGSTASH_HOME:/usr/share/logstash}/${DATA:{$crazy!enough?'bless'@[you]}/heapdump.hprof",
+                Map.of());
+        assertEquals("-XX:HeapDumpPath=/usr/share/logstash/{$crazy!enough?'bless'@[you]/heapdump.hprof", result);
+    }
+
+    @Test
+    public void testEnvSubWithDefaultOverwritten() throws IOException {
+        String result = JvmOptionsParser.resolveEnvVar("-XX:HeapDumpPath=${LOGSTASH_HOME:/usr/share/logstash}/${DATA:data}/heapdump.hprof",
+                Map.of("DATA", "data2"));
+        assertEquals("-XX:HeapDumpPath=/usr/share/logstash/data2/heapdump.hprof", result);
+    }
+
+    @Test
+    public void testEnvSubInFile() throws IOException {
+        File optionsFile = writeIntoTempOptionsFile(
+                writer -> writer.println("-Xlog:gc*,gc+age=trace,safepoint:file=${UNKNOWN}:"));
+
+        JvmOptionsParser.handleJvmOptions(new String[] {"/path/to/ls_home", optionsFile.toString()}, "-Dcli.opts=something");
+
+        final String output = outputStreamCaptor.toString();
+        assertTrue("env variable should be substituted ", output.contains("-Xlog:gc*,gc+age=trace,safepoint:file=:"));
+    }
+
+    @Test
+    public void testCommentedEnvSub() throws IOException {
+        final BufferedReader options = asReader("# -Xlog:gc*,gc+age=trace,safepoint:file=${UNKNOWN}:");
+        final JvmOptionsParser.ParseResult res = JvmOptionsParser.parse(11, options);
+
+        assertTrue("no invalid lines can be present", res.getInvalidLines().isEmpty());
+        assertFalse(String.join(System.lineSeparator(), res.getJvmOptions()).contains("-Xlog:gc*,gc+age=trace,safepoint"));
+    }
+}
\ No newline at end of file
diff --git a/tools/logstash-docgen/README.md b/tools/logstash-docgen/README.md
index b2a19abd4..c64857013 100644
--- a/tools/logstash-docgen/README.md
+++ b/tools/logstash-docgen/README.md
@@ -33,7 +33,7 @@ you can interrupt the process and it will output the current errors before exiti
 
 ## Generating the documentation for all the plugins from the organization
 
-You can now generate the documentation from master for all the plugin in the *logstash-plugins* organization.
+You can now generate the documentation from main for all the plugin in the *logstash-plugins* organization.
 
 *prerequisite*
 
@@ -47,7 +47,7 @@ You can now generate the documentation from master for all the plugin in the *lo
  bundle install
  ```
 
-You can use the the `bin/logstash-docgen` command to generate any plugin that you want, this executable can generate all the plugins or specific one from their master branch.
+You can use the `bin/logstash-docgen` command to generate any plugin that you want, this executable can generate all the plugins or specific one from their main branch.
 
 Usages:
 
diff --git a/tools/logstash-docgen/Rakefile b/tools/logstash-docgen/Rakefile
index 43022f711..32c3c9cf8 100644
--- a/tools/logstash-docgen/Rakefile
+++ b/tools/logstash-docgen/Rakefile
@@ -1,2 +1,19 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "bundler/gem_tasks"
 task :default => :spec
diff --git a/tools/logstash-docgen/bin/extract_doc.rb b/tools/logstash-docgen/bin/extract_doc.rb
index 34dbf9d6e..a66bcbd7f 100755
--- a/tools/logstash-docgen/bin/extract_doc.rb
+++ b/tools/logstash-docgen/bin/extract_doc.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "fileutils"
 
 # This scripts take the output result of the `logstash-docgen` and create the PR to the plugin repositoring
diff --git a/tools/logstash-docgen/lib/logstash/docgen.rb b/tools/logstash-docgen/lib/logstash/docgen.rb
index 7a70dce33..e5d565b4e 100644
--- a/tools/logstash-docgen/lib/logstash/docgen.rb
+++ b/tools/logstash-docgen/lib/logstash/docgen.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/docgen/version"
 
 module LogStash
diff --git a/tools/logstash-docgen/lib/logstash/docgen/asciidoc_format.rb b/tools/logstash-docgen/lib/logstash/docgen/asciidoc_format.rb
index 3be292291..465aa0b1f 100644
--- a/tools/logstash-docgen/lib/logstash/docgen/asciidoc_format.rb
+++ b/tools/logstash-docgen/lib/logstash/docgen/asciidoc_format.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "asciidoctor"
 require "erb"
 
@@ -12,7 +28,6 @@ module LogStash module Docgen
       /%PLUGIN%/ => :config_name
     }
 
-
     def initialize(options = {})
       @options = options
       @template = read_template(TEMPLATE_FILE)
@@ -38,7 +53,7 @@ module LogStash module Docgen
 
     private
     def read_template(file)
-      ERB.new(::File.read(file), nil, "-")
+      ERB.new(::File.read(file), trim_mode: "-")
     end
 
     def post_process!(context, erb)
diff --git a/tools/logstash-docgen/lib/logstash/docgen/dependency_lookup.rb b/tools/logstash-docgen/lib/logstash/docgen/dependency_lookup.rb
index 227f04109..528cbf56d 100644
--- a/tools/logstash-docgen/lib/logstash/docgen/dependency_lookup.rb
+++ b/tools/logstash-docgen/lib/logstash/docgen/dependency_lookup.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "singleton"
 require "gems"
 
diff --git a/tools/logstash-docgen/lib/logstash/docgen/dynamic_parser.rb b/tools/logstash-docgen/lib/logstash/docgen/dynamic_parser.rb
index 486d71b7c..b5b90ad24 100644
--- a/tools/logstash-docgen/lib/logstash/docgen/dynamic_parser.rb
+++ b/tools/logstash-docgen/lib/logstash/docgen/dynamic_parser.rb
@@ -1,10 +1,26 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # This is needed because some of the plugins have weird declaration in their header files
 # so I make sure the basic namespaces are correctly setup.
 module LogStash
-  module Codecs;end
-  module Inputs;end
-  module Output;end
+  module Codecs; end
+  module Inputs; end
+  module Output; end
 end
 
 module LogStash module Docgen
diff --git a/tools/logstash-docgen/lib/logstash/docgen/github_generator.rb b/tools/logstash-docgen/lib/logstash/docgen/github_generator.rb
index 9604772c0..25c4312af 100644
--- a/tools/logstash-docgen/lib/logstash/docgen/github_generator.rb
+++ b/tools/logstash-docgen/lib/logstash/docgen/github_generator.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/docgen/parser"
 require "logstash/docgen/task_runner"
 require "logstash/docgen/util"
@@ -70,9 +86,9 @@ module LogStash module Docgen
         g = Git.init(path)
         g.reset
         g.fetch
-        g.merge("origin/master")
+        g.merge("origin/main")
       else
-        g = Git.clone(repository, path, :depth => 1 )
+        g = Git.clone(repository, path, :depth => 1)
       end
     end
 
@@ -104,7 +120,7 @@ module LogStash module Docgen
 
     def run_in_directory(cmd = nil, &block)
       Dir.chdir(path) do
-        Bundler.with_clean_env do
+        Bundler.with_unbundled_env do
           stdin, stdout, stderr, wait_thr = Open3.popen3(cmd)
           if wait_thr.value.success?
             return stdout
@@ -116,7 +132,6 @@ module LogStash module Docgen
     end
   end
 
-
   # This class orchestrate all the operation between the `logstash-plugins` organization and the
   # doc build for each plugin.
   class DocumentationGenerator
@@ -135,7 +150,7 @@ module LogStash module Docgen
     end
 
     def create_plugins(plugins)
-      plugin_names = plugins == :all ?  retrieve_all_plugins : Array(plugins)
+      plugin_names = plugins == :all ? retrieve_all_plugins : Array(plugins)
       plugin_names.map do |name|
         if skip_plugin?(name)
           puts "#{name} > #{Util.yellow("IGNORED")}"
diff --git a/tools/logstash-docgen/lib/logstash/docgen/index.rb b/tools/logstash-docgen/lib/logstash/docgen/index.rb
index 3568be8ea..b01cf03aa 100644
--- a/tools/logstash-docgen/lib/logstash/docgen/index.rb
+++ b/tools/logstash-docgen/lib/logstash/docgen/index.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "erb"
 
 module LogStash module Docgen
@@ -64,7 +80,7 @@ module LogStash module Docgen
             .sort
             .collect { |file| ::File.basename(file, ASCIIDOC_EXTENSION) }
 
-        template = ERB.new(TEMPLATES[type.to_sym], nil, "-")
+        template = ERB.new(TEMPLATES[type.to_sym], trim_mode: "-")
         save(type, template.result(IndexContext.new(type, plugins).get_binding))
       end
     end
diff --git a/tools/logstash-docgen/lib/logstash/docgen/logstash_generator.rb b/tools/logstash-docgen/lib/logstash/docgen/logstash_generator.rb
index 93ce1faff..7866555f7 100644
--- a/tools/logstash-docgen/lib/logstash/docgen/logstash_generator.rb
+++ b/tools/logstash-docgen/lib/logstash/docgen/logstash_generator.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/docgen/parser"
 require "logstash/docgen/index"
 require "logstash/docgen/util"
diff --git a/tools/logstash-docgen/lib/logstash/docgen/parser.rb b/tools/logstash-docgen/lib/logstash/docgen/parser.rb
index 2c2814b30..cc2a2082a 100644
--- a/tools/logstash-docgen/lib/logstash/docgen/parser.rb
+++ b/tools/logstash-docgen/lib/logstash/docgen/parser.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/docgen/dynamic_parser"
 require "logstash/docgen/static_parser"
 require "logstash/docgen/asciidoc_format"
@@ -14,14 +30,14 @@ module LogStash module Docgen
 
     class << self
       def default_plugins_list
-        @default_plugins_list ||= from_master_json
+        @default_plugins_list ||= from_main_json
       end
 
       def include?(name)
         default_plugins_list.include?(name)
       end
 
-      def from_master_json
+      def from_main_json
         response = open(DEFAULT_PLUGINS_LIST_JSON)
         JSON.parse(response.read).select { |_, values| values["default-plugins"] == true }.keys
       end
@@ -63,10 +79,10 @@ module LogStash module Docgen
     CANONICAL_NAME_PREFIX = "logstash"
     GLOBAL_BLOCKLIST = ["enable_metric", "id"]
     BLOCKLIST = {
-      "input" => GLOBAL_BLOCKLIST + [ "type", "debug", "format", "charset", "message_format", "codec", "tags", "add_field"],
+      "input" => GLOBAL_BLOCKLIST + ["type", "debug", "format", "charset", "message_format", "codec", "tags", "add_field"],
       "codec" => GLOBAL_BLOCKLIST,
-      "output" => GLOBAL_BLOCKLIST + [ "type", "tags", "exclude_tags", "codec", "workers" ],
-      "filter" => GLOBAL_BLOCKLIST + ["type", "tags", "add_tag", "remove_tag", "add_field", "remove_field", "periodic_flush" ]
+      "output" => GLOBAL_BLOCKLIST + ["type", "tags", "exclude_tags", "codec", "workers"],
+      "filter" => GLOBAL_BLOCKLIST + ["type", "tags", "add_tag", "remove_tag", "add_field", "remove_field", "periodic_flush"]
     }
 
     attr_accessor :description, :config_name, :section, :name, :default_plugin, :gemspec
@@ -90,7 +106,7 @@ module LogStash module Docgen
 
     def release_date(format = "%B %-d, %Y")
       @release_date ||= begin
-                          url ="https://rubygems.org/api/v1/versions/#{canonical_name}.json"
+                          url = "https://rubygems.org/api/v1/versions/#{canonical_name}.json"
                           response = open(url).read
                           # HACK: One of out default plugins, the webhdfs, has a bad encoding in the gemspec
                           # which make our parser trip with this error:
@@ -134,8 +150,8 @@ module LogStash module Docgen
     alias_method :sorted_attributes, :config
 
     def changelog_url
-      # https://github.com/logstash-plugins/logstash-input-beats/blob/master/CHANGELOG.md#310beta3
-      "#{LOGSTASH_PLUGINS_ORGANIZATION}/#{canonical_name}/blob/master/CHANGELOG.md##{anchor_version}"
+      # https://github.com/logstash-plugins/logstash-input-beats/blob/main/CHANGELOG.md#310beta3
+      "#{LOGSTASH_PLUGINS_ORGANIZATION}/#{canonical_name}/blob/main/CHANGELOG.md##{anchor_version}"
     end
 
     def anchor_version
@@ -162,7 +178,7 @@ module LogStash module Docgen
   class Parser
     # This is a multipass parser
     def self.parse(file, options = { :default_plugin => true })
-      context =  PluginContext.new(options)
+      context = PluginContext.new(options)
       static = StaticParser.new(context)
 
       # Extract ancestors, classes and modules and retrieve the physical
diff --git a/tools/logstash-docgen/lib/logstash/docgen/plugin_doc.rb b/tools/logstash-docgen/lib/logstash/docgen/plugin_doc.rb
index 08fd52eff..13ae227b9 100644
--- a/tools/logstash-docgen/lib/logstash/docgen/plugin_doc.rb
+++ b/tools/logstash-docgen/lib/logstash/docgen/plugin_doc.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/docgen/parser"
 require "stud/temporary"
 
@@ -16,7 +32,6 @@ end
 
 task :doc => "doc:html"
 
-
 def generate_preview(options = {})
   LogStash::Docgen.generate_for_plugin(Dir.pwd, options).output
 end
diff --git a/tools/logstash-docgen/lib/logstash/docgen/runner.rb b/tools/logstash-docgen/lib/logstash/docgen/runner.rb
index 0fd08321f..492f1b8d1 100644
--- a/tools/logstash-docgen/lib/logstash/docgen/runner.rb
+++ b/tools/logstash-docgen/lib/logstash/docgen/runner.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/docgen/github_generator"
 require "clamp"
 require "yaml"
diff --git a/tools/logstash-docgen/lib/logstash/docgen/static_parser.rb b/tools/logstash-docgen/lib/logstash/docgen/static_parser.rb
index de4d9953f..a50ad29fa 100644
--- a/tools/logstash-docgen/lib/logstash/docgen/static_parser.rb
+++ b/tools/logstash-docgen/lib/logstash/docgen/static_parser.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module LogStash::Docgen
   # This class is parsing static content of the main class and
   # his ancestors, the result would be the description of the plugin and the
@@ -21,13 +37,13 @@ module LogStash::Docgen
     RESET_BUFFER_RE = /^require\s("|')\w+("|')/
 
     def initialize(context)
-      @rules =  [
-        [ COMMENT_RE, :parse_comment ],
-        [ CLASS_DEFINITION_RE, :parse_class_description ],
-        [ NEW_CLASS_DEFINITION_RE_ML, :parse_new_class_description ],
-        [ CONFIG_OPTION_RE, :parse_config ],
-        [ CONFIG_NAME_RE, :parse_config_name ],
-        [ RESET_BUFFER_RE, :reset_buffer ]
+      @rules = [
+        [COMMENT_RE, :parse_comment],
+        [CLASS_DEFINITION_RE, :parse_class_description],
+        [NEW_CLASS_DEFINITION_RE_ML, :parse_new_class_description],
+        [CONFIG_OPTION_RE, :parse_config],
+        [CONFIG_NAME_RE, :parse_config_name],
+        [RESET_BUFFER_RE, :reset_buffer]
       ]
 
       @context = context
diff --git a/tools/logstash-docgen/lib/logstash/docgen/task_runner.rb b/tools/logstash-docgen/lib/logstash/docgen/task_runner.rb
index e74fee30a..34b85f5b4 100644
--- a/tools/logstash-docgen/lib/logstash/docgen/task_runner.rb
+++ b/tools/logstash-docgen/lib/logstash/docgen/task_runner.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/docgen/util"
 
 module LogStash module Docgen
diff --git a/tools/logstash-docgen/lib/logstash/docgen/util.rb b/tools/logstash-docgen/lib/logstash/docgen/util.rb
index 47286cc1c..609c3f987 100644
--- a/tools/logstash-docgen/lib/logstash/docgen/util.rb
+++ b/tools/logstash-docgen/lib/logstash/docgen/util.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module LogStash module Docgen module Util
   def self.time_execution(&block)
     started_at = Time.now
diff --git a/tools/logstash-docgen/lib/logstash/docgen/version.rb b/tools/logstash-docgen/lib/logstash/docgen/version.rb
index b1940f52e..ee2cc7722 100644
--- a/tools/logstash-docgen/lib/logstash/docgen/version.rb
+++ b/tools/logstash-docgen/lib/logstash/docgen/version.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Logstash
   module Docgen
     VERSION = "0.1.0"
diff --git a/tools/logstash-docgen/logstash-docgen.gemspec b/tools/logstash-docgen/logstash-docgen.gemspec
index 961492cf3..cbec2c88f 100644
--- a/tools/logstash-docgen/logstash-docgen.gemspec
+++ b/tools/logstash-docgen/logstash-docgen.gemspec
@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "logstash/docgen/version"
@@ -23,15 +24,15 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "asciidoctor"
   spec.add_runtime_dependency "pry"
   spec.add_runtime_dependency "addressable"
-  spec.add_runtime_dependency "octokit", "~> 3.8.0"
+  spec.add_runtime_dependency "octokit", "~> 8"
 
   # gems 1.0.0 requires Ruby 2.1.9 or newer, so we pin down.
-  spec.add_runtime_dependency "gems", "0.8.3"
+  spec.add_runtime_dependency "gems", "~> 1"
 
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13"
   spec.add_development_dependency "rspec"
 
   # Used for the dependency lookup code
   spec.add_development_dependency "vcr"
-  spec.add_development_dependency "webmock", "2.2.0"
+  spec.add_development_dependency "webmock", "~> 3"
 end
diff --git a/tools/logstash-docgen/spec/fixtures/logstash-filter-dummy.gemspec b/tools/logstash-docgen/spec/fixtures/logstash-filter-dummy.gemspec
index 39db14d14..b9ec61cfc 100644
--- a/tools/logstash-docgen/spec/fixtures/logstash-filter-dummy.gemspec
+++ b/tools/logstash-docgen/spec/fixtures/logstash-filter-dummy.gemspec
@@ -8,11 +8,11 @@ Gem::Specification.new do |s|
   s.authors       = ["Elastic"]
   s.email         = ["info@elastic.co"]
 
-  s.homepage        = "http://www.elasticsearch.org/guide/en/logstash/current/index.html"
+  s.homepage = "http://www.elasticsearch.org/guide/en/logstash/current/index.html"
   s.require_paths = ["lib"]
 
   # Files
-  s.files = Dir["lib/**/*","spec/**/*","*.gemspec","*.md","CONTRIBUTORS","Gemfile","LICENSE","NOTICE.TXT", "vendor/jar-dependencies/**/*.jar", "vendor/jar-dependencies/**/*.rb", "VERSION"]
+  s.files = Dir["lib/**/*", "spec/**/*", "*.gemspec", "*.md", "CONTRIBUTORS", "Gemfile", "LICENSE", "NOTICE.TXT", "vendor/jar-dependencies/**/*.jar", "vendor/jar-dependencies/**/*.rb", "VERSION"]
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
diff --git a/tools/logstash-docgen/spec/fixtures/plugins_source/base.rb b/tools/logstash-docgen/spec/fixtures/plugins_source/base.rb
index 0f4a55469..325250f83 100644
--- a/tools/logstash-docgen/spec/fixtures/plugins_source/base.rb
+++ b/tools/logstash-docgen/spec/fixtures/plugins_source/base.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 class LogStash::Inputs::Base
   # Parent configuration
   config :parent_config, :type => :string, :require => true
diff --git a/tools/logstash-docgen/spec/fixtures/plugins_source/config_from_mixin.rb b/tools/logstash-docgen/spec/fixtures/plugins_source/config_from_mixin.rb
index 9a9583fa3..96a6166a6 100644
--- a/tools/logstash-docgen/spec/fixtures/plugins_source/config_from_mixin.rb
+++ b/tools/logstash-docgen/spec/fixtures/plugins_source/config_from_mixin.rb
@@ -1,4 +1,19 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 module ConfigFromMixin
   # Config mixing description
diff --git a/tools/logstash-docgen/spec/fixtures/plugins_source/new_style_header.rb b/tools/logstash-docgen/spec/fixtures/plugins_source/new_style_header.rb
index ec53055dd..013887f60 100644
--- a/tools/logstash-docgen/spec/fixtures/plugins_source/new_style_header.rb
+++ b/tools/logstash-docgen/spec/fixtures/plugins_source/new_style_header.rb
@@ -1,10 +1,24 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "base"
 
-# encoding: utf-8
-#
 # This is a new test plugins
 # with multiple line.
-
 module LogStash module Inputs class Dummy < LogStash::Inputs::Base
   config_name "dummy"
 
diff --git a/tools/logstash-docgen/spec/fixtures/plugins_source/old_style_header.rb b/tools/logstash-docgen/spec/fixtures/plugins_source/old_style_header.rb
index 26852f43d..498c88b97 100644
--- a/tools/logstash-docgen/spec/fixtures/plugins_source/old_style_header.rb
+++ b/tools/logstash-docgen/spec/fixtures/plugins_source/old_style_header.rb
@@ -1,11 +1,25 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require_relative "base"
 require_relative "config_from_mixin"
 
-# encoding: utf-8
-#
 # This is a new test plugins
 # with multiple line.
-
 class LogStash::Inputs::Dummy < LogStash::Inputs::Base
   config_name "dummy"
 
diff --git a/tools/logstash-docgen/spec/logstash/docgen/dependency_lookup_spec.rb b/tools/logstash-docgen/spec/logstash/docgen/dependency_lookup_spec.rb
index 516e1196d..25633a5c2 100644
--- a/tools/logstash-docgen/spec/logstash/docgen/dependency_lookup_spec.rb
+++ b/tools/logstash-docgen/spec/logstash/docgen/dependency_lookup_spec.rb
@@ -1,5 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/docgen/dependency_lookup"
 require "spec_helper"
 
@@ -28,7 +43,7 @@ describe LogStash::Docgen::DependencyLookup do
 
   it "doesn't include duplicates" do
     VCR.use_cassette("logstash-core") do
-      versions =  subject.supported_logstash(gemspec)
+      versions = subject.supported_logstash(gemspec)
       expect { versions.size }.not_to change { versions.uniq }
     end
   end
diff --git a/tools/logstash-docgen/spec/logstash/docgen/task_runner_spec.rb b/tools/logstash-docgen/spec/logstash/docgen/task_runner_spec.rb
index c28d71c7a..2daae9d79 100644
--- a/tools/logstash-docgen/spec/logstash/docgen/task_runner_spec.rb
+++ b/tools/logstash-docgen/spec/logstash/docgen/task_runner_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/docgen/task_runner"
 
 describe LogStash::Docgen::TaskRunner::Status do
@@ -33,7 +49,7 @@ describe LogStash::Docgen::TaskRunner do
   context "an execution without errors" do
     let(:job_with_no_errors) do
       lambda do
-        1+1
+        1 + 1
       end
     end
 
@@ -71,7 +87,7 @@ describe LogStash::Docgen::TaskRunner do
   context "an execution with errors" do
     let(:job_with_with_errors) do
       lambda do
-        1/0
+        1 / 0
       end
     end
 
@@ -109,7 +125,6 @@ describe LogStash::Docgen::TaskRunner do
       expect(output).to match(/FAILURE: #{name}/)
       expect(output).to match(/Exception:/)
 
-
       expect(output).to match(/FAILURE: not_working_bob/)
     end
   end
diff --git a/tools/logstash-docgen/spec/logstash/docgen/util_spec.rb b/tools/logstash-docgen/spec/logstash/docgen/util_spec.rb
index b8164470f..622c93155 100644
--- a/tools/logstash-docgen/spec/logstash/docgen/util_spec.rb
+++ b/tools/logstash-docgen/spec/logstash/docgen/util_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "logstash/docgen/util"
 require "spec_helper"
 
@@ -7,7 +23,6 @@ describe LogStash::Docgen::Util do
 
   context "time_execution" do
     it "prints the execution time to stdout" do
-
       output = capture do
         subject.time_execution do
           sleep(0.1)
diff --git a/tools/logstash-docgen/spec/spec_helper.rb b/tools/logstash-docgen/spec/spec_helper.rb
index 1856c339f..71980c650 100644
--- a/tools/logstash-docgen/spec/spec_helper.rb
+++ b/tools/logstash-docgen/spec/spec_helper.rb
@@ -1,5 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "vcr"
 require "webmock"
 require_relative "support/helpers"
diff --git a/tools/logstash-docgen/spec/support/helpers.rb b/tools/logstash-docgen/spec/support/helpers.rb
index 30e2c33fc..373d800ca 100644
--- a/tools/logstash-docgen/spec/support/helpers.rb
+++ b/tools/logstash-docgen/spec/support/helpers.rb
@@ -1,5 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # This make the test suite non thread safe.
 def capture(&block)
   old_stdout = $stdout
diff --git a/tools/logstash-docgen/templates/index-codecs.asciidoc.erb b/tools/logstash-docgen/templates/index-codecs.asciidoc.erb
index af0659be0..44ef06915 100644
--- a/tools/logstash-docgen/templates/index-codecs.asciidoc.erb
+++ b/tools/logstash-docgen/templates/index-codecs.asciidoc.erb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 [[codec-plugins]]
 == Codec plugins
 
diff --git a/tools/logstash-docgen/templates/index-filters.asciidoc.erb b/tools/logstash-docgen/templates/index-filters.asciidoc.erb
index 47340c5c2..abbb79372 100644
--- a/tools/logstash-docgen/templates/index-filters.asciidoc.erb
+++ b/tools/logstash-docgen/templates/index-filters.asciidoc.erb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 [[filter-plugins]]
 == Filter plugins
 
diff --git a/tools/logstash-docgen/templates/index-inputs.asciidoc.erb b/tools/logstash-docgen/templates/index-inputs.asciidoc.erb
index ecc477537..59b27ed58 100644
--- a/tools/logstash-docgen/templates/index-inputs.asciidoc.erb
+++ b/tools/logstash-docgen/templates/index-inputs.asciidoc.erb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 [[input-plugins]]
 == Input plugins
 
diff --git a/tools/logstash-docgen/templates/index-outputs.asciidoc.erb b/tools/logstash-docgen/templates/index-outputs.asciidoc.erb
index 6d6d241ba..0a097cdad 100644
--- a/tools/logstash-docgen/templates/index-outputs.asciidoc.erb
+++ b/tools/logstash-docgen/templates/index-outputs.asciidoc.erb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 [[output-plugins]]
 == Output plugins
 
diff --git a/tools/logstash-docgen/templates/plugin-doc.asciidoc.erb b/tools/logstash-docgen/templates/plugin-doc.asciidoc.erb
index 7373bdceb..1d9a00815 100644
--- a/tools/logstash-docgen/templates/plugin-doc.asciidoc.erb
+++ b/tools/logstash-docgen/templates/plugin-doc.asciidoc.erb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 :plugin: <%=name%>
 :type: <%=section%>
 
diff --git a/tools/paquet/README.md b/tools/paquet/README.md
index ac61e149a..87df4318c 100644
--- a/tools/paquet/README.md
+++ b/tools/paquet/README.md
@@ -23,7 +23,6 @@ And then execute:
 Define the dependencies in your Rakefile
 
 ```ruby
-# encoding: utf-8
 require "paquet"
 
 TARGET_DIRECTORY = File.join(File.dirname(__FILE__), "dependencies")
diff --git a/tools/paquet/Rakefile b/tools/paquet/Rakefile
index 43022f711..32c3c9cf8 100644
--- a/tools/paquet/Rakefile
+++ b/tools/paquet/Rakefile
@@ -1,2 +1,19 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "bundler/gem_tasks"
 task :default => :spec
diff --git a/tools/paquet/lib/paquet.rb b/tools/paquet/lib/paquet.rb
index 0e19b6221..a754e3f82 100644
--- a/tools/paquet/lib/paquet.rb
+++ b/tools/paquet/lib/paquet.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "paquet/version"
 require "paquet/shell_ui"
 require "paquet/gem"
diff --git a/tools/paquet/lib/paquet/dependency.rb b/tools/paquet/lib/paquet/dependency.rb
index 08fc739cc..64aac5f6a 100644
--- a/tools/paquet/lib/paquet/dependency.rb
+++ b/tools/paquet/lib/paquet/dependency.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Paquet
   class Dependency
     attr_reader :name, :version, :platform
diff --git a/tools/paquet/lib/paquet/gem.rb b/tools/paquet/lib/paquet/gem.rb
index 882196515..693433b17 100644
--- a/tools/paquet/lib/paquet/gem.rb
+++ b/tools/paquet/lib/paquet/gem.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "paquet/dependency"
 require "paquet/shell_ui"
 require "paquet/utils"
@@ -95,7 +111,7 @@ module Paquet
     end
 
     def gem_full_name(gem)
-      gem.ruby? ? "#{gem.name}-#{gem.version}.gem" : "#{gem.name}-#{gem.version}-#{gem.platform}.gem" 
+      gem.ruby? ? "#{gem.name}-#{gem.version}.gem" : "#{gem.name}-#{gem.version}-#{gem.platform}.gem"
     end
 
     def download_gem(gem_name)
diff --git a/tools/paquet/lib/paquet/rspec/tasks.rb b/tools/paquet/lib/paquet/rspec/tasks.rb
index de4aa9213..99726a0e9 100644
--- a/tools/paquet/lib/paquet/rspec/tasks.rb
+++ b/tools/paquet/lib/paquet/rspec/tasks.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "bundler"
 require "rake"
 require "rake/tasklib"
diff --git a/tools/paquet/lib/paquet/shell_ui.rb b/tools/paquet/lib/paquet/shell_ui.rb
index 331c37bef..ed534e38d 100644
--- a/tools/paquet/lib/paquet/shell_ui.rb
+++ b/tools/paquet/lib/paquet/shell_ui.rb
@@ -1,9 +1,26 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Paquet
   class SilentUI
     class << self
       def debug(message)
       end
+
       def info(message)
       end
     end
diff --git a/tools/paquet/lib/paquet/utils.rb b/tools/paquet/lib/paquet/utils.rb
index b7800db2e..4f1d2c838 100644
--- a/tools/paquet/lib/paquet/utils.rb
+++ b/tools/paquet/lib/paquet/utils.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "fileutils"
 require "uri"
 
@@ -15,8 +31,8 @@ module Paquet
 
         uri = URI.parse(source)
 
-        http = Net::HTTP.new(uri.host, uri.port, )
-        http.use_ssl = uri.scheme ==  HTTPS_SCHEME
+        http = Net::HTTP.new(uri.host, uri.port,)
+        http.use_ssl = uri.scheme == HTTPS_SCHEME
 
         response = http.get(uri.path)
 
diff --git a/tools/paquet/lib/paquet/version.rb b/tools/paquet/lib/paquet/version.rb
index 720bad35e..c5df561df 100644
--- a/tools/paquet/lib/paquet/version.rb
+++ b/tools/paquet/lib/paquet/version.rb
@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 module Paquet
   VERSION = "0.2.1"
 end
diff --git a/tools/paquet/paquet.gemspec b/tools/paquet/paquet.gemspec
index b195778d0..9668ba647 100644
--- a/tools/paquet/paquet.gemspec
+++ b/tools/paquet/paquet.gemspec
@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'paquet/version'
@@ -14,7 +15,6 @@ Gem::Specification.new do |spec|
   spec.description   = %q{This gem add a few rake tasks to create a uber gems that will be shipped as a zip}
   spec.homepage      = "https://github.com/elastic/logstash"
 
-
   spec.files         = Dir.glob(File.join(File.dirname(__FILE__), "lib", "**", "*.rb"))
 
   spec.bindir        = "exe"
@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "webmock", "~> 2.2.0"
+  spec.add_development_dependency "webmock", "~> 3"
   spec.add_development_dependency "stud"
 end
diff --git a/tools/paquet/spec/integration/paquet_spec.rb b/tools/paquet/spec/integration/paquet_spec.rb
index b5b52f1ec..836448aeb 100644
--- a/tools/paquet/spec/integration/paquet_spec.rb
+++ b/tools/paquet/spec/integration/paquet_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "bundler"
 require "fileutils"
 require "stud/temporary"
@@ -25,7 +41,7 @@ describe "Pack the dependencies", :integration => true do
       FileUtils.rm_rf(bundler_config)
       FileUtils.rm_rf(vendor_path)
 
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         Dir.chdir(path) do
           system(bundler_cmd)
           system(rake_cmd)
@@ -41,7 +57,7 @@ describe "Pack the dependencies", :integration => true do
       downloaded_dependencies = Dir.glob(File.join(dependencies_path, "*.gem"))
 
       expect(downloaded_dependencies.size).to eq(2)
-      expect(downloaded_dependencies).to include(/flores-0\.0\.6/,/stud/)
+      expect(downloaded_dependencies).to include(/flores-0\.0\.6/, /stud/)
       expect(downloaded_dependencies).not_to include(/logstash-devutils/)
 
       expect(File.read(Dir.glob(File.join(dependencies_path, "flores*.gem")).first)).to eq(dummy_checksum_content)
@@ -53,7 +69,7 @@ describe "Pack the dependencies", :integration => true do
       FileUtils.rm_rf(bundler_config)
       FileUtils.rm_rf(vendor_path)
 
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         Dir.chdir(path) do
           system(bundler_cmd)
           system(rake_cmd)
@@ -65,7 +81,7 @@ describe "Pack the dependencies", :integration => true do
       downloaded_dependencies = Dir.glob(File.join(dependencies_path, "*.gem"))
 
       expect(downloaded_dependencies.size).to eq(2)
-      expect(downloaded_dependencies).to include(/flores-0\.0\.6/,/stud/)
+      expect(downloaded_dependencies).to include(/flores-0\.0\.6/, /stud/)
       expect(downloaded_dependencies).not_to include(/logstash-devutils/)
 
       expect(File.read(Dir.glob(File.join(dependencies_path, "flores*.gem")).first)).not_to eq(dummy_checksum_content)
diff --git a/tools/paquet/spec/paquet/dependency_spec.rb b/tools/paquet/spec/paquet/dependency_spec.rb
index 0ed02f9fe..cb262d737 100644
--- a/tools/paquet/spec/paquet/dependency_spec.rb
+++ b/tools/paquet/spec/paquet/dependency_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "paquet/dependency"
 
 describe Paquet::Dependency do
diff --git a/tools/paquet/spec/paquet/gem_spec.rb b/tools/paquet/spec/paquet/gem_spec.rb
index c7c807f4a..31b82e7c0 100644
--- a/tools/paquet/spec/paquet/gem_spec.rb
+++ b/tools/paquet/spec/paquet/gem_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "paquet/gem"
 require "stud/temporary"
 require "fileutils"
diff --git a/tools/paquet/spec/paquet/shell_ui_spec.rb b/tools/paquet/spec/paquet/shell_ui_spec.rb
index 398274e94..b225aa5e0 100644
--- a/tools/paquet/spec/paquet/shell_ui_spec.rb
+++ b/tools/paquet/spec/paquet/shell_ui_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "paquet/shell_ui"
 
 describe Paquet::ShellUi do
diff --git a/tools/paquet/spec/paquet/utils_spec.rb b/tools/paquet/spec/paquet/utils_spec.rb
index d2c0f2074..ef5c44aa6 100644
--- a/tools/paquet/spec/paquet/utils_spec.rb
+++ b/tools/paquet/spec/paquet/utils_spec.rb
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "paquet/utils"
 require "stud/temporary"
 require "spec_helper"
diff --git a/tools/paquet/spec/spec_helper.rb b/tools/paquet/spec/spec_helper.rb
index a2d0aa45d..5ec3a3a42 100644
--- a/tools/paquet/spec/spec_helper.rb
+++ b/tools/paquet/spec/spec_helper.rb
@@ -1,2 +1,18 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "webmock/rspec"
diff --git a/tools/paquet/spec/support/Gemfile b/tools/paquet/spec/support/Gemfile
index 884cbedd8..2fe298fb4 100644
--- a/tools/paquet/spec/support/Gemfile
+++ b/tools/paquet/spec/support/Gemfile
@@ -1,4 +1,3 @@
 source "https://rubygems.org"
 gemspec
 gem "paquet", :path => "../../"
-
diff --git a/tools/paquet/spec/support/Rakefile b/tools/paquet/spec/support/Rakefile
index 5e8040d85..dc2363d66 100644
--- a/tools/paquet/spec/support/Rakefile
+++ b/tools/paquet/spec/support/Rakefile
@@ -1,4 +1,20 @@
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require "paquet"
 
 TARGET_DIRECTORY = File.join(File.dirname(__FILE__), "dependencies")
diff --git a/tools/paquet/spec/support/paquet.gemspec b/tools/paquet/spec/support/paquet.gemspec
index 668d109a7..abbedc31c 100644
--- a/tools/paquet/spec/support/paquet.gemspec
+++ b/tools/paquet/spec/support/paquet.gemspec
@@ -12,6 +12,6 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/elastic/logstash"
 
   spec.add_runtime_dependency "stud"
-  spec.add_runtime_dependency "flores", "0.0.6"
+  spec.add_runtime_dependency "flores", "0.0.8"
   spec.add_runtime_dependency "logstash-devutils", "0.0.6"
 end
diff --git a/tools/release/bump_plugin_versions.rb b/tools/release/bump_plugin_versions.rb
index 71cdfd7c7..2bea4b3cf 100755
--- a/tools/release/bump_plugin_versions.rb
+++ b/tools/release/bump_plugin_versions.rb
@@ -1,9 +1,42 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 require 'net/http'
 require 'uri'
 require 'fileutils'
 require 'yaml'
+require 'optparse'
+
+options = {pr: true}
+OptionParser.new do |opts|
+  opts.banner = <<~EOBANNER
+   Usage: bump_plugin_versions.rb base_branch last_release allow_for --[no-]pr
+
+   If you have a local lockfile, you can specify "LOCAL" for last_release to
+   use it as your baseline. This allows you to consume patch releases on a
+   minor release after feature freeze and the initial minor updates.
+
+  EOBANNER
+
+  opts.on("--[no-]pr", "Create Pull Request") do |v|
+    options[:pr] = v
+  end
+end.parse!
 
 def compute_dependecy(version, allow_for)
   gem_version = Gem::Version.new(version)
@@ -30,12 +63,22 @@ end
 
 puts "Computing #{allow_bump_for} plugin dependency bump from #{base_logstash_version}.."
 
-puts "Fetching lock file for #{base_logstash_version}.."
-uri = URI.parse("https://raw.githubusercontent.com/elastic/logstash/v#{base_logstash_version}/Gemfile.jruby-2.5.lock.release")
-result = Net::HTTP.get(uri)
-if result.match(/404/)
-  puts "Lock file or git tag for #{base_logstash_version} not found. Aborting"
-  exit(1)
+if base_logstash_version == "LOCAL"
+  puts "Using local lockfile..."
+  begin
+    result = File.read("Gemfile.jruby-3.1.lock.release")
+  rescue => e
+    puts "Failed to read local lockfile #{e}"
+    exit(1)
+  end
+else
+  puts "Fetching lock file for #{base_logstash_version}.."
+  uri = URI.parse("https://raw.githubusercontent.com/elastic/logstash/v#{base_logstash_version}/Gemfile.jruby-3.1.lock.release")
+  result = Net::HTTP.get(uri)
+  if result.match(/404/)
+    puts "Lock file or git tag for #{base_logstash_version} not found. Aborting"
+    exit(1)
+  end
 end
 
 base_plugin_versions = {}
@@ -53,19 +96,19 @@ puts "Generating new Gemfile.template file with computed dependencies"
 gemfile = IO.read("Gemfile.template")
 base_plugin_versions.each do |plugin, version|
   dependency = compute_dependecy(version, allow_bump_for)
-  gemfile.gsub!(/"#{plugin}".*$/, "\"#{plugin}\", \"#{dependency}\"")
+  if gemfile.gsub!(/"#{plugin}".*$/, "\"#{plugin}\", \"#{dependency}\"").nil?
+    gemfile << "gem \"#{plugin}\", \"#{dependency}\"\n"
+  end
 end
 
 IO.write("Gemfile.template", gemfile)
 
-puts "Cleaning up before running 'rake artifact:tar'"
-FileUtils.rm_f("Gemfile")
-FileUtils.rm_f("Gemfile.jruby-2.5.lock.release")
-FileUtils.rm_rf("vendor")
+puts "Cleaning up before running computing dependencies"
+FileUtils.rm_f("Gemfile.jruby-3.1.lock.release")
 
 # compute new lock file
-puts "Running 'rake artifact:tar'"
-result = `rake artifact:tar`
+puts "Running: ./gradlew clean installDefaultGems"
+`./gradlew clean installDefaultGems`
 
 puts "Cleaning up generated lock file (removing injected requirements)"
 # remove explicit requirements from lock file
@@ -78,23 +121,24 @@ IO.write("Gemfile.lock", new_lock.join("\n"))
 
 # rename file
 puts "Finishing up.."
-FileUtils.mv("Gemfile.lock", "Gemfile.jruby-2.5.lock.release")
+FileUtils.mv("Gemfile.lock", "Gemfile.jruby-3.1.lock.release")
 
 `git checkout -- Gemfile.template`
 
-puts `git diff Gemfile.jruby-2.5.lock.release`
+puts `git diff Gemfile.jruby-3.1.lock.release`
 
+exit(0) unless options[:pr]
 puts "Creating commit.."
 
 branch_name = "update_lock_#{Time.now.to_i}"
 `git checkout -b #{branch_name}`
-`git commit Gemfile.jruby-2.5.lock.release -m "Update #{allow_bump_for} plugin versions in gemfile lock"`
+`git commit Gemfile.jruby-3.1.lock.release -m "Update #{allow_bump_for} plugin versions in gemfile lock"`
 
 puts "Pushing commit.."
 `git remote add upstream git@github.com:elastic/logstash.git`
 `git push upstream #{branch_name}`
 
-current_release = YAML.parse(IO.read("versions.yml"))["logstash"]
+current_release = YAML.safe_load(IO.read("versions.yml"))["logstash"]
 puts "Creating Pull Request"
 pr_title = "bump lock file for #{current_release}"
 
diff --git a/tools/release/generate_release_notes.rb b/tools/release/generate_release_notes.rb
index cf48e350f..e1d88198e 100755
--- a/tools/release/generate_release_notes.rb
+++ b/tools/release/generate_release_notes.rb
@@ -1,8 +1,24 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # Example:
 # ruby generate_release_notes.rb 6.4 6.4.1
-# 
+#
 # This:
 # * compares the lock file of two commits
 # * for each plugin version bumped show CHANGELOG.md of the bumped version
@@ -14,6 +30,8 @@ require 'net/http'
 RELEASE_NOTES_PATH = "docs/static/releasenotes.asciidoc"
 release_branch = ARGV[0]
 previous_release_tag = ARGV[1]
+user = ARGV[2]
+token = ARGV[3]
 report = []
 
 `git checkout #{release_branch}`
@@ -23,16 +41,19 @@ current_release_dashes = current_release.tr(".", "-")
 
 release_notes = IO.read(RELEASE_NOTES_PATH).split("\n")
 
-release_notes.insert(5, "* <<logstash-#{current_release_dashes},Logstash #{current_release}>>")
+current_release_heading = "* <<logstash-#{current_release_dashes},Logstash #{current_release}>>"
+release_notes.insert(5, current_release_heading) unless release_notes[5].eql?(current_release_heading)
 
-release_notes_entry_index = release_notes.find_index {|line| line.match(/^\[\[logstash/) }
+coming_tag_index = release_notes.find_index {|line| line.match(/^coming\[#{current_release}\]/) }
+coming_tag_index += 1 if coming_tag_index
+release_notes_entry_index = coming_tag_index || release_notes.find_index {|line| line.match(/^\[\[logstash/) }
 
-report << "[[logstash-#{current_release_dashes}]]"
-report << "=== Logstash #{current_release} Release Notes\n"
+report << "[[logstash-#{current_release_dashes}]]" unless release_notes.any? { |line| line&.match(/^\[\[logstash-#{current_release_dashes}/) }
+report << "=== Logstash #{current_release} Release Notes\n" unless release_notes.any? { |line| line&.match(/^=== Logstash #{current_release}/)}
 
 plugin_changes = {}
 
-report <<  "---------- DELETE FROM HERE ------------"
+report <<  "---------- GENERATED CONTENT STARTS HERE ------------"
 report <<  "=== Logstash Pull Requests with label v#{current_release}\n"
 
 uri = URI.parse("https://api.github.com/search/issues?q=repo:elastic/logstash+is:pr+is:closed+label:v#{current_release}&sort=created&order=asc")
@@ -45,8 +66,8 @@ report << ""
 report <<  "=== Logstash Commits between #{release_branch} and #{previous_release_tag}\n"
 report <<  "Computed with \"git log --pretty=format:'%h -%d %s (%cr) <%an>' --abbrev-commit --date=relative v#{previous_release_tag}..#{release_branch}\""
 report <<  ""
-logstash_prs =  `git log --pretty=format:'%h -%d %s (%cr) <%an>' --abbrev-commit --date=relative v#{previous_release_tag}..#{release_branch}`
-report <<  logstash_prs
+logstash_prs = `git log --pretty=format:'%h -%d %s (%cr) <%an>' --abbrev-commit --date=relative v#{previous_release_tag}..#{release_branch}`
+report << logstash_prs
 report << "\n=== Logstash Plugin Release Changelogs ==="
 report << "Computed from \"git diff v#{previous_release_tag}..#{release_branch} *.release\""
 result = `git diff v#{previous_release_tag}..#{release_branch} *.release`.split("\n")
@@ -65,13 +86,13 @@ result.each do |line|
 end
 report << "Changed plugin versions:"
 plugin_changes.each {|p, v| report << "#{p}: #{v.first} -> #{v.last}" }
-report << "---------- DELETE UP TO HERE ------------\n"
+report << "---------- GENERATED CONTENT ENDS HERE ------------\n"
 
 report << "==== Plugins\n"
 
 plugin_changes.each do |plugin, versions|
   _, type, name = plugin.split("-")
-  header = "*#{name.capitalize} #{type.capitalize}*"
+  header = "*#{name.capitalize} #{type.capitalize} - #{versions.last}*"
   start_changelog_file = Tempfile.new(plugin + 'start')
   end_changelog_file = Tempfile.new(plugin + 'end')
   changelog = `curl https://raw.githubusercontent.com/logstash-plugins/#{plugin}/v#{versions.last}/CHANGELOG.md`.split("\n")
@@ -81,6 +102,7 @@ plugin_changes.each do |plugin, versions|
     next if line.match(/^##/)
     line.gsub!(/^\+/, "")
     line.gsub!(/ #(?<number>\d+)\s*$/, " https://github.com/logstash-plugins/#{plugin}/issues/\\k<number>[#\\k<number>]")
+    line.gsub!(/\[#(?<number>\d+)\]\((?<url>[^)]*)\)/, "\\k<url>[#\\k<number>]")
     line.gsub!(/^\s+-/, "*")
     report << line
   end
@@ -99,11 +121,13 @@ branch_name = "update_release_notes_#{Time.now.to_i}"
 `git commit docs/static/releasenotes.asciidoc -m "Update release notes for #{current_release}"`
 
 puts "Pushing commit.."
-`git remote add upstream git@github.com:elastic/logstash.git`
-`git push upstream #{branch_name}`
+`git remote set-url origin https://x-access-token:#{token}@github.com/elastic/logstash.git`
+`git push origin #{branch_name}`
 
 puts "Creating Pull Request"
-pr_title = "Release notes draft for #{current_release}"
-`curl -H "Authorization: token #{ENV['GITHUB_TOKEN']}" -d '{"title":"#{pr_title}","base":"#{ENV['branch_specifier']}", "head":"#{branch_name}"}' https://api.github.com/repos/elastic/logstash/pulls`
-
+pr_title = "Release notes for #{current_release}"
+result = `curl -H "Authorization: token #{token}" -d '{"title":"#{pr_title}","base":"#{release_branch}", "head":"#{branch_name}", "draft": true}' https://api.github.com/repos/elastic/logstash/pulls`
+puts result
+pr_number = JSON.parse(result)["number"]
+puts `curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: token #{token}" https://api.github.com/repos/elastic/logstash/issues/#{pr_number}/assignees -d '{"assignees":["#{user}"]}'`
 puts "Done"
diff --git a/versions.yml b/versions.yml
index b1d44ae95..1f99ba0eb 100644
--- a/versions.yml
+++ b/versions.yml
@@ -1,25 +1,29 @@
 ---
 # alpha and beta qualifiers are now added via VERSION_QUALIFIER environment var
-logstash: 7.0.0
-logstash-core: 7.0.0
+logstash: 9.1.0
+logstash-core: 9.1.0
 logstash-core-plugin-api: 2.1.16
 
+bundled_jdk:
+  # for AdoptOpenJDK/OpenJDK jdk-14.0.1+7.1, the revision is 14.0.1 while the build is 7.1
+  vendor: "adoptium"
+  revision: 21.0.6
+  build: 7
+
 # jruby must reference a *released* version of jruby which can be downloaded from the official download url
 # *and* for which jars artifacts are published for compile-time
 jruby:
-  version: 9.2.5.0
-  sha1: c78526ce98b1b4273d11989246cb9bf224ce9712
-
-# jruby-runtime-override, if specified, will override the jruby version installed in vendor/jruby for logstash runtime only,
-# not for the compile-time jars
-#
+  version: 9.4.9.0
+  sha1: 64d8ea53d3ef7637069637f6affa2e7d971c0ade
+# jruby-runtime-override, if specified, will override the jruby version installed in vendor/jruby
 #jruby-runtime-override:
-#  url: http://ci.jruby.org/snapshots/previous/jruby-bin-9.2.0.0-SNAPSHOT.tar.gz
-#  version: 9.2.0.0-SNAPSHOT
+#  url: https://oss.sonatype.org/content/repositories/snapshots/org/jruby/jruby-dist/9.3.0.0-SNAPSHOT/jruby-dist-9.3.0.0-20210723.214927-259-bin.tar.gz
+#  version: 9.3.0.0-SNAPSHOT
 #  sha1: IGNORE
 
 # Note: this file is copied to the root of logstash-core because its gemspec needs it when
 #       bundler evaluates the gemspec via bin/logstash
 # Ensure Jackson version here is kept in sync with version used by jrjackson gem
-jrjackson: 0.4.7
-jackson: 2.9.8
+jrjackson: 0.4.20
+jackson: 2.16.2
+jackson-databind: 2.16.2
diff --git a/x-pack/build.gradle b/x-pack/build.gradle
index b923cfd65..42ba297cd 100644
--- a/x-pack/build.gradle
+++ b/x-pack/build.gradle
@@ -1,3 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
 description = """Logstash X-Pack"""
 
 repositories {
@@ -10,28 +16,49 @@ buildscript {
   }
 }
 
+configurations {
+  geolite2
+}
+
 dependencies {
-  testCompile project(':logstash-core')
-  testCompile 'org.assertj:assertj-core:3.8.0'
-  testCompile 'junit:junit:4.12'
+  testImplementation project(':logstash-core')
+  testImplementation 'org.assertj:assertj-core:3.8.0'
+  testImplementation 'junit:junit:4.13.2'
+
+  geolite2('org.elasticsearch:geolite2-databases:20191119') {
+    transitive = false
+  }
 }
 
 test {
   exclude '/**'
 }
 
-task rubyTests(type: Test) {
+tasks.register("unzipGeolite", Copy) {
+  from(zipTree(configurations.geolite2.singleFile)) {
+    include "GeoLite2-ASN.mmdb"
+    include "GeoLite2-City.mmdb"
+  }
+  into file("${projectDir}/spec/filters/geoip/vendor")
+}
+
+tasks.register("rubyTests", Test) {
+  dependsOn unzipGeolite
   inputs.files fileTree("${projectDir}/spec")
   inputs.files fileTree("${projectDir}/lib")
   inputs.files fileTree("${projectDir}/modules")
-  systemProperty 'logstash.core.root.dir', projectDir.absolutePath
+  systemProperty 'logstash.root.dir', projectDir.parent
   include '/org/logstash/xpack/test/RSpecTests.class'
 }
 
-task rubyIntegrationTests(type: Test) {
+tasks.register("rubyIntegrationTests", Test) {
+  if ((JavaVersion.current().getMajorVersion() as int) >= 17) {
+    jvmArgs = ['--add-opens', 'java.base/sun.nio.ch=ALL-UNNAMED', '--add-opens', 'java.base/java.io=ALL-UNNAMED']
+  }
+  dependsOn (":copyEs")
   inputs.files fileTree("${projectDir}/qa")
   inputs.files fileTree("${projectDir}/lib")
   inputs.files fileTree("${projectDir}/modules")
-  systemProperty 'logstash.core.root.dir', projectDir.absolutePath
+  systemProperty 'logstash.root.dir', projectDir.parent
   include '/org/logstash/xpack/test/RSpecIntegrationTests.class'
 }
diff --git a/x-pack/ci/docker_integration_tests.sh b/x-pack/ci/docker_integration_tests.sh
deleted file mode 100755
index 479154337..000000000
--- a/x-pack/ci/docker_integration_tests.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-if [ -n "${ELASTICSEARCH_SNAPSHOT_URL}" ]; then
-  export DOCKER_ENV_OPTS="${DOCKER_ENV_OPTS} --env ELASTICSEARCH_SNAPSHOT_URL=${ELASTICSEARCH_SNAPSHOT_URL}"
-fi
-
-ci/docker_run.sh logstash-xpack-integration-tests x-pack/ci/integration_tests.sh $@
diff --git a/x-pack/ci/docker_unit_tests.sh b/x-pack/ci/docker_unit_tests.sh
deleted file mode 100755
index 74ed9dc3e..000000000
--- a/x-pack/ci/docker_unit_tests.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-ci/docker_run.sh logstash-xpack-unit-tests x-pack/ci/unit_tests.sh $@
diff --git a/x-pack/ci/integration_tests.sh b/x-pack/ci/integration_tests.sh
index 79e616b77..2ca952210 100755
--- a/x-pack/ci/integration_tests.sh
+++ b/x-pack/ci/integration_tests.sh
@@ -9,7 +9,12 @@
 # uses at least 1g of memory, If we don't do this we can get OOM issues when
 # installing gems. See https://github.com/elastic/logstash/issues/5179
 export JRUBY_OPTS="-J-Xmx1g"
-export GRADLE_OPTS="-Xmx2g -Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info"
+export GRADLE_OPTS="-Xmx4g -Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info"
 export CI=true
 
+if [ -n "$BUILD_JAVA_HOME" ]; then
+  GRADLE_OPTS="$GRADLE_OPTS -Dorg.gradle.java.home=$BUILD_JAVA_HOME"
+  export LS_JAVA_HOME="$BUILD_JAVA_HOME"
+fi
+
 ./gradlew runXPackIntegrationTests
\ No newline at end of file
diff --git a/x-pack/ci/unit_tests.sh b/x-pack/ci/unit_tests.sh
index 182f0138b..8ac523c4a 100755
--- a/x-pack/ci/unit_tests.sh
+++ b/x-pack/ci/unit_tests.sh
@@ -9,7 +9,11 @@
 # uses at least 1g of memory, If we don't do this we can get OOM issues when
 # installing gems. See https://github.com/elastic/logstash/issues/5179
 export JRUBY_OPTS="-J-Xmx1g"
-export GRADLE_OPTS="-Xmx2g -Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info"
+export GRADLE_OPTS="-Xmx4g -Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false -Dorg.gradle.logging.level=info"
 export CI=true
 
+if [ -n "$BUILD_JAVA_HOME" ]; then
+  GRADLE_OPTS="$GRADLE_OPTS -Dorg.gradle.java.home=$BUILD_JAVA_HOME"
+fi
+
 ./gradlew runXPackUnitTests
\ No newline at end of file
diff --git a/x-pack/lib/config_management/bootstrap_check.rb b/x-pack/lib/config_management/bootstrap_check.rb
index 432dd910d..89b675d0b 100644
--- a/x-pack/lib/config_management/bootstrap_check.rb
+++ b/x-pack/lib/config_management/bootstrap_check.rb
@@ -14,6 +14,10 @@ module LogStash
     class BootstrapCheck
       include LogStash::Util::Loggable
 
+      # pipeline ID must begin with a letter or underscore and contain only letters, underscores, dashes, and numbers
+      # wildcard character `*` is also acceptable and follows globbing rules
+      PIPELINE_ID_PATTERN = %r{\A[a-z_*][a-z_\-0-9*]*\Z}i
+
       def self.check(settings)
         check_path_config(settings)
 
@@ -25,23 +29,23 @@ module LogStash
           raise LogStash::BootstrapCheckError, "You cannot use -t since Elasticsearch is configured as the config store"
         end
 
-        if !settings.get("modules.cli").empty? || !settings.get("modules").empty?
-          raise LogStash::BootstrapCheckError, "You cannot use --modules since Elasticsearch is configured as the config store"
-        end
-
         interval = settings.get("xpack.management.logstash.poll_interval")
 
         # override core settings, so the agent will trigger the auto reload
         settings.set("config.reload.automatic", true)
         settings.set("config.reload.interval", interval)
 
-
         pipeline_ids = settings.get("xpack.management.pipeline.id")
 
         if pipeline_ids.reject { |id| id.strip.empty? }.empty?
           raise LogStash::BootstrapCheckError, "You need to specify the ID of the pipelines with the `xpack.management.pipeline.id` options in your logstash.yml"
         end
 
+        invalid_patterns = pipeline_ids.reject { |entry| PIPELINE_ID_PATTERN =~ entry }
+        if invalid_patterns.any?
+          raise LogStash::BootstrapCheckError, "Pipeline id in `xpack.management.pipeline.id` must begin with a letter or underscore and contain only letters, underscores, dashes, and numbers. The asterisk wildcard `*` can also be used. Invalid ids: #{invalid_patterns.join(', ')}"
+        end
+
         duplicate_ids = find_duplicate_ids(pipeline_ids)
         if duplicate_ids.size > 0
           raise LogStash::BootstrapCheckError, "Duplicate pipeline ids found in `xpack.management.pipeline.id`, defined IDs must be unique, Duplicated ids: #{duplicate_ids.join(', ')}"
@@ -50,7 +54,6 @@ module LogStash
         logger.info("Using Elasticsearch as config store", :pipeline_id => pipeline_ids, :poll_interval => "#{interval}ns")
       end
 
-
       def self.check_path_config(settings)
         path_config = settings.get("path.config")
         return if (path_config.nil? || path_config.empty?)
diff --git a/x-pack/lib/config_management/elasticsearch_source.rb b/x-pack/lib/config_management/elasticsearch_source.rb
index f8a860fbb..0baf448f6 100644
--- a/x-pack/lib/config_management/elasticsearch_source.rb
+++ b/x-pack/lib/config_management/elasticsearch_source.rb
@@ -2,15 +2,14 @@
 # or more contributor license agreements. Licensed under the Elastic License;
 # you may not use this file except in compliance with the Elastic License.
 
-require "logstash/config/pipeline_config"
 require "logstash/config/source/base"
 require "logstash/config/source_loader"
 require "logstash/outputs/elasticsearch"
 require "logstash/json"
 require 'helpers/elasticsearch_options'
+require 'helpers/loggable_try'
 require "license_checker/licensed"
 
-
 module LogStash
   module ConfigManagement
     class ElasticsearchSource < LogStash::Config::Source::Base
@@ -19,15 +18,16 @@ module LogStash
 
       class RemoteConfigError < LogStash::Error; end
 
-      PIPELINE_INDEX = ".logstash"
-      PIPELINE_TYPE = "doc"
-      VALID_LICENSES = %w(trial standard gold platinum)
+      # exclude basic
+      VALID_LICENSES = %w(trial standard gold platinum enterprise)
       FEATURE_INTERNAL = 'management'
       FEATURE_EXTERNAL = 'logstash'
       SUPPORTED_PIPELINE_SETTINGS = %w(
         pipeline.workers
         pipeline.batch.size
         pipeline.batch.delay
+        pipeline.ecs_compatibility
+        pipeline.ordered
         queue.type
         queue.max_bytes
         queue.checkpoint.writes
@@ -35,13 +35,9 @@ module LogStash
 
       def initialize(settings)
         super(settings)
-        if @settings.get("xpack.management.enabled") && !@settings.get_setting("xpack.management.elasticsearch.password").set?
-          raise ArgumentError.new("You must set the password using the \"xpack.management.elasticsearch.password\" in logstash.yml")
-        end
-
-        @es_options = es_options_from_settings('management', settings)
 
         if enabled?
+          @es_options = es_options_from_settings('management', settings)
           setup_license_checker(FEATURE_INTERNAL)
           license_check(true)
         end
@@ -55,57 +51,60 @@ module LogStash
         false
       end
 
+      # decide using system indices api (7.10+) or legacy api (< 7.10) base on elasticsearch server version
+      def get_pipeline_fetcher(es_version)
+        (es_version[:major] >= 8 || (es_version[:major] == 7 && es_version[:minor] >= 10)) ? SystemIndicesFetcher.new : LegacyHiddenIndicesFetcher.new
+      end
+
       def pipeline_configs
         logger.trace("Fetch remote config pipeline", :pipeline_ids => pipeline_ids)
 
+        license_check(true)
+        es_version = get_es_version
+        fetcher = get_pipeline_fetcher(es_version)
+
         begin
-          license_check(true)
-        rescue LogStash::LicenseChecker::LicenseError => e
-          if @cached_pipelines.nil?
-            raise e
-          else
-            return @cached_pipelines
-          end
+          fetcher.fetch_config(es_version, pipeline_ids, client)
+        rescue LogStash::Outputs::ElasticSearch::HttpClient::Pool::BadResponseCodeError => e
+          # es-output 12.0.2 throws 404 as error, but we want to handle it as empty config
+          return [] if e.response_code == 404
+          raise e
         end
 
-        response = fetch_config(pipeline_ids)
-
-        if response["error"]
-          raise RemoteConfigError, "Cannot find find configuration for pipeline_id: #{pipeline_ids}, server returned status: `#{response["status"]}`, message: `#{response["error"]}`"
-        end
-
-        if response["docs"].nil?
-          logger.debug("Server returned an unknown or malformed document structure", :response => response)
-          raise RemoteConfigError, "Elasticsearch returned an unknown or malformed document structure"
-        end
-
-        # Cache pipelines to handle the case where a remote configuration error can render a pipeline unusable
-        # it is not reloadable
-        @cached_pipelines = response["docs"].collect do |document|
-          get_pipeline(document)
+        fetcher.get_pipeline_ids.collect do |pid|
+          get_pipeline(pid, fetcher)
         end.compact
       end
 
-      def get_pipeline(response)
-        pipeline_id = response["_id"]
+      def get_es_version
+        retry_handler = ::LogStash::Helpers::LoggableTry.new(logger, 'fetch ES version from Central Management')
+        response = retry_handler.try(10.times, ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::HostUnreachableError) {
+          client.get("/")
+        }
 
-        if response["found"] == false
-          logger.debug("Could not find a remote configuration for a specific `pipeline_id`", :pipeline_id => pipeline_id)
-          return nil
+        if response["error"]
+          raise RemoteConfigError, "Cannot find elasticsearch version, server returned status: `#{response["status"]}`, message: `#{response["error"]}`"
         end
 
-        config_string = response.fetch("_source", {})["pipeline"]
+        logger.debug("Reading configuration from Elasticsearch version {}", response["version"]["number"])
+        version_number = response["version"]["number"].split(".")
+        { major: version_number[0].to_i, minor: version_number[1].to_i }
+      end
+
+      def get_pipeline(pipeline_id, fetcher)
+        config_string = fetcher.get_single_pipeline_setting(pipeline_id)["pipeline"]
+        pipeline_metadata_str = (fetcher.get_single_pipeline_setting(pipeline_id)["pipeline_metadata"] || "").to_s
 
         raise RemoteConfigError, "Empty configuration for pipeline_id: #{pipeline_id}" if config_string.nil? || config_string.empty?
 
-        config_part = org.logstash.common.SourceWithMetadata.new("x-pack-config-management", pipeline_id.to_s, config_string)
+        config_part = org.logstash.common.SourceWithMetadata.new("x-pack-config-management", pipeline_id.to_s, config_string, pipeline_metadata_str)
 
         # We don't support multiple pipelines, so use the global settings from the logstash.yml file
         settings = @settings.clone
         settings.set("pipeline.id", pipeline_id)
 
         # override global settings with pipeline settings from ES, if any
-        pipeline_settings = response["_source"]["pipeline_settings"]
+        pipeline_settings = fetcher.get_single_pipeline_setting(pipeline_id)["pipeline_settings"]
         unless pipeline_settings.nil?
           pipeline_settings.each do |setting, value|
             if SUPPORTED_PIPELINE_SETTINGS.include? setting
@@ -116,7 +115,7 @@ module LogStash
           end
         end
 
-        LogStash::Config::PipelineConfig.new(self.class.name, pipeline_id.to_sym, config_part, settings)
+        Java::OrgLogstashConfigIr::PipelineConfig.new(self.class, pipeline_id.to_sym, [config_part], settings)
       end
 
       # This is a bit of a hack until we refactor the ElasticSearch plugins
@@ -126,22 +125,13 @@ module LogStash
       # But we have to silence the logger from the plugin, to make sure the
       # log originate from the `ElasticsearchSource`
       def build_client
-        es = LogStash::Outputs::ElasticSearch.new(@es_options)
+        es = LogStash::Outputs::ElasticSearch.new(es_options_with_product_origin_header(@es_options))
         new_logger = logger
         es.instance_eval { @logger = new_logger }
         es.build_client
       end
 
-      def fetch_config(pipeline_ids)
-        request_body_string = LogStash::Json.dump({ "docs" => pipeline_ids.collect { |pipeline_id| { "_id" => pipeline_id } } })
-        client.post(config_path, {}, request_body_string)
-      end
-
-      def config_path
-        "#{PIPELINE_INDEX}/#{PIPELINE_TYPE}/_mget"
-      end
-
-      def populate_license_state(xpack_info)
+      def populate_license_state(xpack_info, is_serverless)
         if xpack_info.failed?
           {
               :state => :error,
@@ -180,7 +170,7 @@ module LogStash
           }
         else
           unless xpack_info.feature_enabled?(FEATURE_EXTERNAL)
-            logger.warn('Monitoring installed and enabled in Logstash, but not enabled in Elasticsearch')
+            logger.warn('Central Pipeline Management is enabled in Logstash, but not enabled in Elasticsearch')
           end
 
           { :state => :ok, :log_level => :info, :log_message => 'Configuration Management License OK' }
@@ -198,5 +188,131 @@ module LogStash
         @client ||= build_client
       end
     end
+
+    module Fetcher
+      include LogStash::Util::Loggable
+
+      def get_pipeline_ids
+        @pipelines.keys
+      end
+
+      def fetch_config(es_version, pipeline_ids, client) end
+      def get_single_pipeline_setting(pipeline_id) end
+
+      def log_pipeline_not_found(pipeline_ids)
+        logger.debug("Could not find a remote configuration for specific `pipeline_id`", :pipeline_ids => pipeline_ids) if pipeline_ids.any?
+      end
+    end
+
+    class SystemIndicesFetcher
+      include LogStash::Util::Loggable, Fetcher
+
+      SYSTEM_INDICES_API_PATH = "_logstash/pipeline"
+
+      def fetch_config(es_version, pipeline_ids, client)
+        es_supports_pipeline_wildcard_search = es_supports_pipeline_wildcard_search?(es_version)
+        retry_handler = ::LogStash::Helpers::LoggableTry.new(logger, 'fetch pipelines from Central Management')
+        response = retry_handler.try(10.times, ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::HostUnreachableError) {
+          path = es_supports_pipeline_wildcard_search ?
+                   "#{SYSTEM_INDICES_API_PATH}?id=#{ERB::Util.url_encode(pipeline_ids.join(","))}" :
+                   "#{SYSTEM_INDICES_API_PATH}/"
+          client.get(path)
+        }
+
+        if response["error"]
+          raise ElasticsearchSource::RemoteConfigError, "Cannot find find configuration for pipeline_id: #{pipeline_ids}, server returned status: `#{response["status"]}`, message: `#{response["error"]}`"
+        end
+
+        @pipelines = es_supports_pipeline_wildcard_search ?
+                       response :
+                       get_wildcard_pipelines(pipeline_ids, response)
+      end
+
+      def es_supports_pipeline_wildcard_search?(es_version)
+        (es_version[:major] > 8) || (es_version[:major] == 8 && es_version[:minor] >= 3)
+      end
+
+      def get_single_pipeline_setting(pipeline_id)
+        @pipelines.fetch(pipeline_id, {})
+      end
+
+      private
+      # get pipelines if pipeline_ids match wildcard patterns
+      # split user pipeline id setting into wildcard and non wildcard pattern
+      # take the non wildcard pipelines. take the wildcard pipelines by matching with glob pattern
+      def get_wildcard_pipelines(pipeline_ids, response)
+        wildcard_patterns, fix_pids = pipeline_ids.partition { |pattern| pattern.include?("*")}
+
+        fix_id_pipelines = fix_pids.map { |id|
+          response.has_key?(id) ? {id => response[id]} : {}
+        }.reduce({}, :merge)
+        fix_id_pipelines.keys.map { |id| response.delete(id)}
+
+        wildcard_matched_patterns = Set.new
+        wildcard_pipelines = response.keys.map { |id|
+          found_pattern = wildcard_patterns.any? { |pattern|
+            matched = ::File::fnmatch?(pattern, id)
+            wildcard_matched_patterns << pattern if matched
+            matched
+          }
+          found_pattern ? {id => response[id]} : {}
+        }.reduce({}, :merge)
+
+        log_pipeline_not_found((fix_pids - fix_id_pipelines.keys) + (wildcard_patterns - wildcard_matched_patterns.to_a))
+
+        fix_id_pipelines.merge(wildcard_pipelines)
+      end
+    end
+
+    # clean up LegacyHiddenIndicesFetcher https://github.com/elastic/logstash/issues/12291
+    class LegacyHiddenIndicesFetcher
+      include LogStash::Util::Loggable, Fetcher
+
+      PIPELINE_INDEX = ".logstash"
+
+      def fetch_config(es_version, pipeline_ids, client)
+        request_body_string = LogStash::Json.dump({ "docs" => pipeline_ids.collect { |pipeline_id| { "_id" => pipeline_id } } })
+        retry_handler = ::LogStash::Helpers::LoggableTry.new(logger, 'fetch pipelines from Central Management')
+        response = retry_handler.try(10.times, ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::HostUnreachableError) {
+          client.post("#{PIPELINE_INDEX}/_mget", {}, request_body_string)
+        }
+
+        if response["error"]
+          raise ElasticsearchSource::RemoteConfigError, "Cannot find find configuration for pipeline_id: #{pipeline_ids}, server returned status: `#{response["status"]}`, message: `#{response["error"]}`"
+        end
+
+        if response["docs"].nil?
+          logger.debug("Server returned an unknown or malformed document structure", :response => response)
+          raise ElasticsearchSource::RemoteConfigError, "Elasticsearch returned an unknown or malformed document structure"
+        end
+
+        @pipelines = format_response(response)
+
+        log_wildcard_unsupported(pipeline_ids)
+        log_pipeline_not_found(pipeline_ids - @pipelines.keys)
+
+        @pipelines
+      end
+
+      def get_single_pipeline_setting(pipeline_id)
+        @pipelines.fetch(pipeline_id, {}).fetch("_source", {})
+      end
+
+      private
+      # transform legacy response to be similar to system indices response
+      def format_response(response)
+        response["docs"].map { |pipeline|
+          {pipeline["_id"] => pipeline} if pipeline.fetch("found", false)
+        }.compact
+        .reduce({}, :merge)
+      end
+
+      def log_wildcard_unsupported(pipeline_ids)
+        has_wildcard = pipeline_ids.any? { |id| id.include?("*") }
+        if has_wildcard
+          logger.warn("wildcard '*' in xpack.management.pipeline.id is not supported in Elasticsearch version < 7.10")
+        end
+      end
+    end
   end
 end
diff --git a/x-pack/lib/config_management/extension.rb b/x-pack/lib/config_management/extension.rb
index 06e55feaa..edc5dbdf1 100644
--- a/x-pack/lib/config_management/extension.rb
+++ b/x-pack/lib/config_management/extension.rb
@@ -24,15 +24,23 @@ module LogStash
         settings.register(LogStash::Setting::Boolean.new("xpack.management.enabled", false))
         settings.register(LogStash::Setting::TimeValue.new("xpack.management.logstash.poll_interval", "5s"))
         settings.register(LogStash::Setting::ArrayCoercible.new("xpack.management.pipeline.id", String, ["main"]))
-        settings.register(LogStash::Setting::NullableString.new("xpack.management.elasticsearch.username", "logstash_system"))
-        settings.register(LogStash::Setting::NullableString.new("xpack.management.elasticsearch.password"))
-        settings.register(LogStash::Setting::ArrayCoercible.new("xpack.management.elasticsearch.hosts", String, [ "https://localhost:9200" ] ))
-        settings.register(LogStash::Setting::NullableString.new("xpack.management.elasticsearch.ssl.certificate_authority"))
-        settings.register(LogStash::Setting::NullableString.new("xpack.management.elasticsearch.ssl.truststore.path"))
-        settings.register(LogStash::Setting::NullableString.new("xpack.management.elasticsearch.ssl.truststore.password"))
-        settings.register(LogStash::Setting::NullableString.new("xpack.management.elasticsearch.ssl.keystore.path"))
-        settings.register(LogStash::Setting::NullableString.new("xpack.management.elasticsearch.ssl.keystore.password"))
-        settings.register(LogStash::Setting::String.new("xpack.management.elasticsearch.ssl.verification_mode", "certificate", true, ["none", "certificate"]))
+        settings.register(LogStash::Setting::SettingNullableString.new("xpack.management.elasticsearch.username", "logstash_system"))
+        settings.register(LogStash::Setting::SettingNullableString.new("xpack.management.elasticsearch.password"))
+        settings.register(LogStash::Setting::ArrayCoercible.new("xpack.management.elasticsearch.hosts", String, ["https://localhost:9200"]))
+        settings.register(LogStash::Setting::SettingNullableString.new("xpack.management.elasticsearch.cloud_id"))
+        settings.register(LogStash::Setting::SettingNullableString.new("xpack.management.elasticsearch.cloud_auth"))
+        settings.register(LogStash::Setting::SettingNullableString.new("xpack.management.elasticsearch.api_key"))
+        settings.register(LogStash::Setting::SettingNullableString.new("xpack.management.elasticsearch.proxy"))
+        settings.register(LogStash::Setting::SettingNullableString.new("xpack.management.elasticsearch.ssl.certificate_authority"))
+        settings.register(LogStash::Setting::SettingNullableString.new("xpack.management.elasticsearch.ssl.ca_trusted_fingerprint"))
+        settings.register(LogStash::Setting::SettingNullableString.new("xpack.management.elasticsearch.ssl.truststore.path"))
+        settings.register(LogStash::Setting::SettingNullableString.new("xpack.management.elasticsearch.ssl.truststore.password"))
+        settings.register(LogStash::Setting::SettingNullableString.new("xpack.management.elasticsearch.ssl.keystore.path"))
+        settings.register(LogStash::Setting::SettingNullableString.new("xpack.management.elasticsearch.ssl.keystore.password"))
+        settings.register(LogStash::Setting::SettingNullableString.new("xpack.management.elasticsearch.ssl.certificate"))
+        settings.register(LogStash::Setting::SettingNullableString.new("xpack.management.elasticsearch.ssl.key"))
+        settings.register(LogStash::Setting::ArrayCoercible.new("xpack.management.elasticsearch.ssl.cipher_suites", String, []))
+        settings.register(LogStash::Setting::SettingString.new("xpack.management.elasticsearch.ssl.verification_mode", "full", true, %w[none certificate full]))
         settings.register(LogStash::Setting::Boolean.new("xpack.management.elasticsearch.sniffing", false))
       rescue => e
         logger.error("Cannot register new settings", :message => e.message, :backtrace => e.backtrace)
diff --git a/x-pack/lib/config_management/hooks.rb b/x-pack/lib/config_management/hooks.rb
index 17de6bab5..c0ca58675 100644
--- a/x-pack/lib/config_management/hooks.rb
+++ b/x-pack/lib/config_management/hooks.rb
@@ -7,8 +7,6 @@ require "config_management/elasticsearch_source"
 require "logstash/config/source_loader"
 require "logstash/config/source/local"
 require "logstash/config/source/multi_local"
-require "logstash/config/source/modules"
-
 
 module LogStash
   module ConfigManagement
@@ -37,7 +35,6 @@ module LogStash
           logger.debug("Removing the `Logstash::Config::Source::Local` and replacing it with `ElasticsearchSource`")
           runner.source_loader.remove_source(LogStash::Config::Source::Local)
           runner.source_loader.remove_source(LogStash::Config::Source::MultiLocal)
-          runner.source_loader.remove_source(LogStash::Config::Source::Modules)
           source = LogStash::ConfigManagement::ElasticsearchSource.new(runner.settings)
           runner.source_loader.add_source(source)
         end
diff --git a/x-pack/lib/filters/geoip/database_manager.rb b/x-pack/lib/filters/geoip/database_manager.rb
new file mode 100644
index 000000000..1bdd9dc7c
--- /dev/null
+++ b/x-pack/lib/filters/geoip/database_manager.rb
@@ -0,0 +1,210 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+require "logstash/util/loggable"
+require "json"
+require "stud/try"
+require "singleton"
+require "concurrent/array"
+require "concurrent/timer_task"
+require "thread"
+
+require "geoip_database_management/manager"
+
+# The mission of DatabaseManager is to ensure the plugin running an up-to-date MaxMind database and
+#   thus users are compliant with EULA.
+# DatabaseManager does a daily checking by calling an endpoint to notice a version update.
+# DatabaseMetadata records the update timestamp and md5 of the database in the metadata file
+#   to keep track of versions and the number of days disconnects to the endpoint.
+# Once a new database version release, DownloadManager downloads it, and GeoIP Filter uses it on-the-fly.
+# If the last update timestamp is 25 days ago, a warning message shows in the log;
+# if it was 30 days ago, the GeoIP Filter should stop using EULA database in order to be compliant.
+# There are online mode and offline mode in DatabaseManager. `online` is for automatic database update
+#   while `offline` is for static database path provided by users
+
+module LogStash module Filters module Geoip class DatabaseManager
+  include LogStash::Util::Loggable
+  include Singleton
+
+  CC_DB_TYPES = %w(City ASN).map(&:freeze).freeze
+
+  java_import org.apache.logging.log4j.ThreadContext
+
+  private
+  def initialize
+    @triggered = false
+    @trigger_lock = Monitor.new
+
+    @data_dir_path = ::File.join(LogStash::SETTINGS.get_value("path.data"), "plugins", "filters", "geoip")
+  end
+
+  def eula_manager
+    @eula_manager ||= LogStash::GeoipDatabaseManagement::Manager.instance
+  end
+
+  def setup
+    @eula_subscriptions = eula_manager.supported_database_types.each_with_object({}) do |database_type, memo|
+      memo[database_type] = eula_manager.subscribe_database_path(database_type).observe(
+        construct: -> (initial_db_info) { create!(database_type, initial_db_info) },
+        on_update: -> (updated_db_info) { update!(database_type, updated_db_info) },
+        on_expire: -> (               ) { expire!(database_type) }
+      )
+    end
+  end
+
+  def trigger_download
+    return if @triggered
+    @trigger_lock.synchronize do
+      setup if @eula_subscriptions.nil?
+      @triggered = true
+    end
+  end
+
+  protected
+  # resolve vendored databases...
+  def prepare_cc_db
+    geoip_filter_plugin_path = Gem.loaded_specs['logstash-filter-geoip']&.full_gem_path or fail("geoip filter plugin library not found")
+    vendored_cc_licensed_dbs = ::File.expand_path('vendor', geoip_filter_plugin_path)
+
+    @cc_dbs = CC_DB_TYPES.each_with_object({}) do |database_type, memo|
+      database_filename = "GeoLite2-#{database_type}.mmdb"
+      vendored_database_path = ::File.expand_path(database_filename, vendored_cc_licensed_dbs)
+      fail("vendored #{database_type} database not present in #{vendored_cc_licensed_dbs}") unless ::File::exists?(vendored_database_path)
+
+      cc_dir_path = ::File.expand_path("CC", @data_dir_path)
+      FileUtils.mkdir_p(cc_dir_path)
+      FileUtils.cp_r(vendored_database_path, cc_dir_path)
+
+      memo[database_type] = ::File.expand_path(database_filename, cc_dir_path)
+    end
+    logger.info("CC-licensed GeoIP databases are prepared for use by the GeoIP filter: #{@cc_dbs}")
+  rescue => e
+    fail "CC-licensed GeoIP databases could not be loaded: #{e}"
+  end
+
+  def notify_plugins(database_type, action, *args)
+    plugins = @states[database_type].plugins.dup
+    ids = plugins.map { |plugin| plugin.execution_context.pipeline_id }.sort.uniq
+    yield database_type, ids
+    plugins.each { |plugin| plugin.update_filter(action, *args) if plugin }
+  end
+
+  def trigger_cc_database_fallback
+    @trigger_lock.synchronize do
+      return if @cc_dbs
+      setup_cc_database
+    end
+  end
+
+  def setup_cc_database
+    prepare_cc_db
+  end
+
+  public
+
+  def subscribe_database_path(database_type, database_path, geoip_plugin)
+    if database_path.nil?
+      if eula_manager.enabled?
+        trigger_download
+
+        logger.info "By not manually configuring a database path with `database =>`, you accepted and agreed MaxMind EULA. "\
+                    "For more details please visit https://www.maxmind.com/en/geolite2/eula"
+
+        @states[database_type].plugins.add(geoip_plugin)
+        @trigger_lock.synchronize do
+          @states.fetch(database_type).database_path
+        end
+      else
+        trigger_cc_database_fallback
+        @cc_dbs.fetch(database_type)
+      end
+    else
+      logger.info "GeoIP database path is configured manually so the plugin will not check for update. "\
+                  "Keep in mind that if you are not using the database shipped with this plugin, "\
+                  "please go to https://www.maxmind.com/en/geolite2/eula and understand the terms and conditions."
+      database_path
+    end
+  end
+
+  def unsubscribe_database_path(database_type, geoip_plugin)
+    @states[database_type].plugins.delete(geoip_plugin) if geoip_plugin && @states
+  end
+
+  def database_path(database_type)
+    @states[database_type].database_path
+  end
+
+  def update!(database_type, updated_db_info)
+    @trigger_lock.synchronize do
+      new_database_path = updated_db_info.path
+      @states[database_type].database_path = new_database_path
+      notify_plugins(database_type, :update, new_database_path) do |db_type, ids|
+        logger.info("geoip filter plugin will use database #{new_database_path}",
+                    :database_type => db_type, :pipeline_ids => ids) unless ids.empty?
+      end
+    end
+  end
+
+  def expire!(database_type)
+    @trigger_lock.synchronize do
+      @states[database_type].database_path = nil
+      notify_plugins(database_type, :expire) do |db_type, ids|
+        logger.warn("geoip filter plugin will stop filtering and will tag all events with the '_geoip_expired_database' tag.",
+                    :database_type => db_type, :pipeline_ids => ids)
+      end
+    end
+  end
+
+  def create!(database_type, initial_db_info)
+    @trigger_lock.synchronize do
+      @states ||= {}
+
+      if initial_db_info.pending?
+        trigger_cc_database_fallback
+        effective_database_path, is_eula = @cc_dbs.fetch(database_type), false
+      else
+        effective_database_path, is_eula = initial_db_info.path, true
+      end
+
+      @states[database_type] = DatabaseState.new(effective_database_path, is_eula)
+    end
+  end
+
+  ##
+  # @api testing
+  def subscribed_plugins_count(database_type)
+    @states&.dig(database_type)&.plugins&.size || 0
+  end
+  protected :subscribed_plugins_count
+
+  ##
+  # @api testing
+  def eula_subscribed?
+    @eula_subscriptions&.any?
+  end
+  protected :eula_subscribed?
+
+  ##
+  # @api testing
+  def eula_subscription(database_type)
+    @eula_subscriptions&.dig(database_type)
+  end
+  protected :eula_subscription
+
+  ##
+  # @api internal
+  class DatabaseState
+    attr_reader :plugins
+    attr_accessor :database_path
+    attr_reader :is_eula
+
+    # @param initial_database_path [String]
+    # @param is_eula [Boolean]
+    def initialize(initial_database_path, is_eula)
+      @plugins = Concurrent::Set.new
+      @database_path = initial_database_path
+      @is_eula = is_eula
+    end
+  end
+end end end end
diff --git a/x-pack/lib/geoip_database_management/constants.rb b/x-pack/lib/geoip_database_management/constants.rb
new file mode 100644
index 000000000..cf0c0d2d9
--- /dev/null
+++ b/x-pack/lib/geoip_database_management/constants.rb
@@ -0,0 +1,19 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+module LogStash module GeoipDatabaseManagement
+  module Constants
+    GZ_EXT = 'tgz'.freeze
+    DB_EXT = 'mmdb'.freeze
+
+    GEOLITE = 'GeoLite2-'.freeze
+    CITY = "City".freeze
+    ASN = "ASN".freeze
+    DB_TYPES = [ASN, CITY].freeze
+
+    CITY_DB_NAME = "#{GEOLITE}#{CITY}.#{DB_EXT}".freeze
+    ASN_DB_NAME = "#{GEOLITE}#{ASN}.#{DB_EXT}".freeze
+    DEFAULT_DB_NAMES = [CITY_DB_NAME, ASN_DB_NAME].freeze
+  end
+end end
\ No newline at end of file
diff --git a/x-pack/lib/geoip_database_management/data_path.rb b/x-pack/lib/geoip_database_management/data_path.rb
new file mode 100644
index 000000000..8a10d0321
--- /dev/null
+++ b/x-pack/lib/geoip_database_management/data_path.rb
@@ -0,0 +1,28 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+module LogStash module GeoipDatabaseManagement
+  class DataPath
+    include GeoipDatabaseManagement::Constants
+
+    def initialize(root)
+      @root = ::File::expand_path(root).freeze
+    end
+
+    attr_reader :root
+
+    def gz(database_type, dirname)
+      resolve(dirname, "#{GEOLITE}#{database_type}.#{GZ_EXT}")
+    end
+
+    def db(database_type, dirname)
+      resolve(dirname, "#{GEOLITE}#{database_type}.#{DB_EXT}")
+    end
+
+    def resolve(relative_path, *more)
+      ::File.expand_path(::File.join(relative_path, *more), @root)
+    end
+
+  end
+end; end
\ No newline at end of file
diff --git a/x-pack/lib/geoip_database_management/db_info.rb b/x-pack/lib/geoip_database_management/db_info.rb
new file mode 100644
index 000000000..7c8de8961
--- /dev/null
+++ b/x-pack/lib/geoip_database_management/db_info.rb
@@ -0,0 +1,36 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+module LogStash module GeoipDatabaseManagement
+
+  ##
+  # The DbInfo is the read-only immutable state of a managed database.
+  # It is provided by Subscription#value and Subscription#observe
+  class DbInfo
+
+    attr_reader :path
+
+    def initialize(path:, pending: false, expired: false)
+      @path = path&.dup.freeze
+      @pending = pending
+      @expired = expired
+    end
+
+    def expired?
+      @expired
+    end
+
+    def pending?
+      @pending
+    end
+
+    def removed?
+      !@pending && @path.nil?
+    end
+
+    EXPIRED = DbInfo.new(path: nil, expired: true)
+    PENDING = DbInfo.new(path: nil, pending: true)
+    REMOVED = DbInfo.new(path: nil, pending: false)
+  end
+end end
\ No newline at end of file
diff --git a/x-pack/lib/geoip_database_management/downloader.rb b/x-pack/lib/geoip_database_management/downloader.rb
new file mode 100644
index 000000000..fc532ab9d
--- /dev/null
+++ b/x-pack/lib/geoip_database_management/downloader.rb
@@ -0,0 +1,188 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+require_relative '../../../lib/bootstrap/util/compress'
+require 'logstash/util/loggable'
+
+require_relative 'util'
+require_relative 'metadata'
+
+require "json"
+require "zlib"
+require "stud/try"
+require "down"
+require "fileutils"
+require 'uri'
+
+module LogStash module GeoipDatabaseManagement
+  class Downloader
+    include GeoipDatabaseManagement::Constants
+    include GeoipDatabaseManagement::Util
+    include LogStash::Util::Loggable
+
+    class BadResponseCodeError < Error
+      attr_reader :response_code, :response_body
+
+      def initialize(response_code, response_body)
+        @response_code = response_code
+        @response_body = response_body
+      end
+
+      def message
+        "GeoIP service response code '#{response_code}', body '#{response_body}'"
+      end
+    end
+
+    attr_reader :list_databases_url
+
+    ##
+    # @param metadata [Metadata]
+    # @param service_endpoint [URI,String]
+    def initialize(metadata, service_endpoint)
+      logger.trace("init", metadata: metadata, endpoint: service_endpoint)
+      @metadata = metadata
+      @paths = metadata.paths
+      service_endpoint = URI(service_endpoint).dup.freeze
+
+      if service_endpoint.query&.chars&.any?
+        logger.warn("GeoIP endpoint URI includes query parameter, which will be ignored: `#{safe_uri service_endpoint}`")
+      end
+
+      @list_databases_url = service_endpoint.merge("?key=#{uuid}&elastic_geoip_service_tos=agree").freeze
+    end
+
+    public
+    # Check available update and download them. Unzip and validate the file.
+    # if the download failed, valid_download return false
+    # return Array of [database_type, valid_download, dirname, new_database_path]
+    def fetch_databases(db_types)
+      dirname = Time.now.to_i.to_s
+      check_update(db_types)
+        .map do |database_type, db_info|
+        begin
+          new_zip_path = download_database(database_type, dirname, db_info)
+          new_database_path = unzip(database_type, dirname, new_zip_path)
+          assert_database!(new_database_path)
+          [database_type, true, dirname, new_database_path]
+        rescue => e
+          logger.error("failed to fetch #{database_type} database", error_details(e, logger))
+          [database_type, false, nil, nil]
+        end
+      end
+    end
+
+    private
+    # Call infra endpoint to get md5 of latest databases and verify with metadata
+    # return Array of new database information [database_type, db_info]
+    def check_update(db_types)
+      return enum_for(:check_update, db_types).to_a unless block_given?
+
+      res = rest_client.get(list_databases_url)
+      logger.debug("check update", :endpoint => safe_uri(list_databases_url).to_s, :response => res.code)
+
+      if res.code < 200 || res.code > 299
+        raise BadResponseCodeError.new(res.code, res.body)
+      end
+
+      service_resp = JSON.parse(res.body)
+
+      db_types.each do |database_type|
+        db_info = service_resp.find { |db| db['name'].eql?("#{GEOLITE}#{database_type}.#{GZ_EXT}") }
+        if db_info.nil?
+          logger.debug("Database service did not include #{database_type}")
+        elsif @metadata.database_path(database_type).nil?
+          logger.debug("Local #{database_type} database is not present.")
+          yield(database_type, db_info)
+        elsif @metadata.gz_md5(database_type) == db_info['md5_hash']
+          logger.debug("Local #{database_type} database is up-to-date.")
+        else
+          logger.debug("Updated #{database_type} database is available.")
+          yield(database_type, db_info)
+        end
+      end
+    end
+
+    def download_database(database_type, dirname, db_info)
+      Stud.try(3.times) do
+        FileUtils.mkdir_p(@paths.resolve(dirname))
+        zip_path = @paths.gz(database_type, dirname)
+
+        actual_url = resolve_download_url(db_info['url']).to_s
+        logger.debug? && logger.debug("download #{actual_url}")
+
+        options = { destination: zip_path }
+        options.merge!({proxy: ENV['http_proxy']}) if ENV.include?('http_proxy')
+        Down.download(actual_url, **options)
+
+        raise "the new download has wrong checksum" if md5(zip_path) != db_info['md5_hash']
+
+        logger.debug("new database downloaded in ", :path => zip_path)
+        zip_path
+      end
+    end
+
+    # extract all files and folders from .tgz to path.data directory
+    # return dirname [String], new_database_path [String]
+    def unzip(database_type, dirname, zip_path)
+      temp_path = ::File.join(@paths.resolve(dirname), database_type)
+      LogStash::Util::Tar.extract(zip_path, temp_path)
+      FileUtils.cp_r(::File.join(temp_path, '.'), @paths.resolve(dirname))
+      FileUtils.rm_r(temp_path)
+
+      @paths.db(database_type, dirname)
+    end
+
+    def rest_client
+      @client ||= begin
+                    client_options = {
+                      request_timeout: 15,
+                      connect_timeout: 5
+                    }
+                    client_options[:proxy] = ENV['http_proxy'] if ENV.include?('http_proxy')
+                    Manticore::Client.new(client_options)
+                  end
+    end
+
+    def uuid
+      @uuid ||= ::File.read(::File.join(LogStash::SETTINGS.get("path.data"), "uuid"))
+    rescue
+      "UNSET"
+    end
+
+    def resolve_download_url(possibly_relative_url)
+      list_databases_url.merge(possibly_relative_url)
+    end
+
+    def assert_database!(database_path)
+      raise "failed to load database #{database_path} because it does not exist" unless file_exist?(database_path)
+      raise "failed to load database #{database_path} because it does not appear to be a MaxMind DB" unless scan_binary_file(database_path, "\xab\xcd\xefMaxMind.com")
+    end
+
+    def safe_uri(unsafe)
+      LogStash::Util::SafeURI.new(unsafe)
+    end
+
+    ##
+    # Scans a binary file for the given verbatim byte sequence
+    # without loading the entire binary file into memory by scanning
+    # in chunks
+    def scan_binary_file(file_path, byte_sequence)
+      byte_sequence = byte_sequence.b
+      partial_size = [byte_sequence.bytesize, 1024].max
+      ::File.open(file_path, 'r:BINARY') do |io|
+        a, b = ''.b, ''.b # two binary buffers
+        until io.eof?
+          io.readpartial(partial_size, b)
+
+          bridged_chunk = (a+b)
+
+          return true if bridged_chunk.include?(byte_sequence)
+          a,b = b,a # swap buffers before continuing
+        end
+      end
+
+      false
+    end
+  end
+end end
diff --git a/x-pack/lib/geoip_database_management/extension.rb b/x-pack/lib/geoip_database_management/extension.rb
new file mode 100644
index 000000000..7f7e0f12e
--- /dev/null
+++ b/x-pack/lib/geoip_database_management/extension.rb
@@ -0,0 +1,23 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+require "logstash/environment"
+
+module LogStash module GeoipDatabaseManagement
+  class Extension < LogStash::UniversalPlugin
+    include LogStash::Util::Loggable
+
+    def additionals_settings(settings)
+      require "logstash/runner"
+      logger.trace("Registering additional geoip settings")
+      settings.register(LogStash::Setting::SettingString.new("xpack.geoip.downloader.endpoint", "https://geoip.elastic.co/v1/database")
+                                                 .with_deprecated_alias("xpack.geoip.download.endpoint"))
+      settings.register(LogStash::Setting::TimeValue.new("xpack.geoip.downloader.poll.interval", "24h"))
+      settings.register(LogStash::Setting::Boolean.new("xpack.geoip.downloader.enabled", true))
+    rescue => e
+      logger.error("Cannot register new settings", :message => e.message, :backtrace => e.backtrace)
+      raise e
+    end
+  end
+end end
\ No newline at end of file
diff --git a/x-pack/lib/geoip_database_management/manager.rb b/x-pack/lib/geoip_database_management/manager.rb
new file mode 100644
index 000000000..92193a92f
--- /dev/null
+++ b/x-pack/lib/geoip_database_management/manager.rb
@@ -0,0 +1,365 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+require_relative 'constants'
+require_relative 'util'
+require_relative 'data_path'
+require_relative 'metadata'
+require_relative 'downloader'
+require_relative 'subscription'
+require_relative 'db_info'
+require_relative 'metric'
+
+require "logstash/util/loggable"
+require "singleton"
+require "concurrent/set"
+
+##
+# The GeoipDatabaseManagement's Manager can be used by plugins to acquire
+# a subscription to an auto-updating, EULA-compliant Geoip database.
+# The Manager is lazy by default, and begins maintaining local databases
+# on disk when the first subscription is started.
+#
+# Once started, it queries an Elastic database service daily to discover
+# available updates, loading discovered updates in the background and notifying
+# all subscribers before eventually removing databases from disk that are no
+# longer assigned to any subscribers.
+#
+# The terms of the MaxMind EULA are enforced, ensuring that databases that
+# have not been synchronized with the service in more than 30 days are not
+# assigned to subscribers so they can be freed. After 25 days without sync
+# the manager begins emitting warning messages.
+#
+# The provided Metric namespace is populated with information about the
+# current state of managed databases, age-since-sync, etc.
+#
+# @example Subscribe to a database
+#   sub = Manager.instance.subscribe_database_path("City")
+#   sub.observe(construct: -> (db_info) { ... },
+#               on_update: -> (db_info) { ... },
+#               on_expire: -> (       ) { ... })
+#   sub.release! # unsubscribe
+module LogStash module GeoipDatabaseManagement class Manager
+  include Constants
+  include Util
+  include LogStash::Util::Loggable
+  include Singleton
+
+  def initialize
+    @start_lock = Mutex.new
+
+    @enabled = LogStash::SETTINGS.get("xpack.geoip.downloader.enabled")
+    @endpoint = LogStash::SETTINGS.get("xpack.geoip.downloader.endpoint")
+    @poll_interval = LogStash::SETTINGS.get("xpack.geoip.downloader.poll.interval")
+
+    data_directory = ::File.expand_path("geoip_database_management", LogStash::SETTINGS.get_value('path.data'))
+    @data_path = GeoipDatabaseManagement::DataPath.new(data_directory)
+
+    @metadata = Metadata.new(data_path)
+
+    unless enabled?
+      if @metadata.exist?
+        logger.info("database manager is disabled; removing managed databases from disk``")
+        metadata.delete
+        clean_up_database
+      else
+        logger.info("database manager is disabled.")
+      end
+    end
+  end
+
+  ##
+  # @param database_type [String] one of `GeoipDatabaseManagement::DB_TYPES`
+  # @return [Subscription] the observer
+  def subscribe_database_path(database_type)
+    fail ArgumentError, "unsupported database type `#{database_type}`" unless DB_TYPES.include?(database_type)
+
+    return nil unless enabled?
+
+    ensure_started!
+
+    @states.fetch(database_type).subscribe
+  end
+
+  ##
+  # @return [Boolean] true unless the database management feature has been disabled
+  def enabled?
+    @enabled
+  end
+
+  ##
+  # @return [Enumerable<String>] the types of databases that can be subscribed to
+  def supported_database_types
+    DB_TYPES
+  end
+
+  ##
+  # @api internal
+  def database_metric=(database_metric)
+    @database_metric = database_metric
+  end
+
+  ##
+  # @api internal
+  def running?
+    @start_lock.synchronize { @download_task&.running? }
+  end
+
+  protected
+
+  attr_reader :endpoint
+  attr_reader :poll_interval
+  attr_reader :data_path
+  attr_reader :metadata
+
+  def database_metric
+    logger.debug("Database Metric is nil. No geoip metrics are available. Please report the bug") if @database_metric.nil?
+    @database_metric ||= LogStash::GeoipDatabaseManagement::Metric.new(LogStash::Instrument::NamespacedNullMetric.new)
+  end
+
+  def downloader
+    @downloader ||= Downloader.new(metadata, endpoint)
+  end
+
+  def ensure_started!
+    @start_lock.synchronize do
+      return if @download_task
+
+      setup
+      execute_download_job
+
+      logger.debug "spawning periodic check for updates (#{poll_interval})"
+      @download_task = Concurrent::TimerTask.execute(execution_interval: poll_interval.to_seconds) do
+        periodic_sync
+      end
+    end
+  end
+
+  def periodic_sync
+    LogStash::Util::set_thread_name 'geoip database sync task' do
+      LogStash::Util::with_logging_thread_context("pipeline.id" => nil) do
+        logger.debug "running database update check"
+        execute_download_job
+      end
+    end
+  end
+
+  def clean_up_database(excluded_dirnames = [])
+    return unless ::Dir.exist?(data_path.root)
+
+    protected_dirnames = excluded_dirnames.uniq
+    existing_dirnames = ::Dir.children(data_path.root)
+                             .select { |f| ::File.directory? ::File.join(data_path.root, f) }
+
+    (existing_dirnames - protected_dirnames).each do |dirname|
+      dir_path = data_path.resolve(dirname)
+      FileUtils.rm_r(dir_path)
+      logger.info("Stale database directory `#{dir_path}` has been deleted")
+    end
+  end
+
+  def setup
+    FileUtils.mkdir_p(data_path.root)
+    metadata.touch
+
+    @states = DB_TYPES.each_with_object({}) do |type, memo|
+      db_info = if metadata.has_type?(type)
+                  DbInfo.new(path: metadata.database_path(type))
+                else
+                  DbInfo::PENDING
+                end
+      memo[type] = State.new(db_info)
+    end
+
+    database_metric.initialize_metrics(metadata.get_all)
+  end
+
+  def execute_download_job
+    success_cnt = 0
+
+    database_metric.set_download_status_updating
+
+    updated_db = downloader.fetch_databases(DB_TYPES)
+    updated_db.each do |database_type, valid_download, dirname, new_database_path|
+      if valid_download
+        metadata.save_metadata(database_type, dirname, gz_md5: md5(data_path.gz(database_type, dirname)))
+
+        @states[database_type].update!(new_database_path) do |previous_db_info|
+          logger.info("managed geoip database has been updated on disk",
+                      :database_type => database_type, :database_path => new_database_path)
+        end
+
+        success_cnt += 1
+      end
+    end
+
+    updated_types = updated_db.map { |database_type, valid_download, dirname, new_database_path| database_type }
+    (DB_TYPES - updated_types).each do |unchange_type|
+      metadata.update_timestamp(unchange_type)
+      success_cnt += 1
+    end
+  rescue => e
+    logger.error("failed to sync databases", error_details(e, logger))
+  ensure
+    check_age
+    clean_up_database(metadata.dirnames)
+    database_metric.update_download_stats(success_cnt == DB_TYPES.size)
+  end
+
+  def check_age(database_types = DB_TYPES)
+    deferred_deletions = []
+    database_types.map do |database_type|
+      db_metadata = metadata.get_metadata(database_type).last
+      if db_metadata.nil?
+        logger.debug("No metadata for #{database_type}...")
+        next
+      end
+
+      check_at = db_metadata[Metadata::Column::CHECK_AT].to_i
+      days_without_update = time_diff_in_days(check_at)
+
+      case
+      when days_without_update >= 30
+        @states[database_type].expire! do |db_info|
+          logger.error("The managed MaxMind GeoIP #{database_type} database hasn't been synchronized in #{days_without_update} days "\
+                       "and #{db_info.expired? ? "has been" : "will be"} removed in order to remain compliant with the MaxMind EULA. "\
+                       "Logstash is unable to get newer version from internet. "\
+                       "Please check the network settings and allow Logstash accesses the internet to download the latest database. "\
+                       "Alternatively you can switch to a self-managed GeoIP database service (`xpack.geoip.download.endpoint`), or  "\
+                       "configure each plugin with a self-managed database which you can download from https://dev.maxmind.com/geoip/geoip2/geolite2/ ")
+        end
+
+        deferred_deletions << metadata.database_path(database_type)
+        metadata.unset_path(database_type)
+
+        database_status = Metric::DATABASE_EXPIRED
+      when days_without_update >= 25
+        logger.warn("The MaxMind GeoIP #{database_type} database hasn't been synchronized in #{days_without_update} days. "\
+                    "Logstash will remove access to the stale database in #{30 - days_without_update} days in order to remain compliant with the MaxMind EULA. "\
+                    "Please check the network settings and allow Logstash accesses the internet to download the latest database.")
+        database_status = Metric::DATABASE_TO_BE_EXPIRED
+      else
+        logger.trace("The MaxMind GeoIP #{database_type} database passed age check", :days_without_update => days_without_update)
+        database_status = Metric::DATABASE_UP_TO_DATE
+      end
+
+      database_metric.update_database_status(database_type, database_status, db_metadata, days_without_update)
+    end
+  ensure
+    deferred_deletions.compact.each do |path|
+      FileUtils.rm(path, force: true)
+      logger.debug("Removed database file `#{path}`")
+    end
+  end
+
+  ##
+  # @api testing
+  def shutdown!
+    @start_lock.synchronize do
+      return unless @download_task&.running?
+
+      @download_task.shutdown
+      10.times do
+        break unless @download_task.running?
+        sleep 1
+      end
+
+      @states.values.each(&:delete_observers)
+    end
+  end
+  private :shutdown!
+
+  ##
+  # @api testing
+  def current_db_info(database_type)
+    current_state(database_type)&.db_info
+  end
+  private :current_db_info
+
+  ##
+  # @api testing
+  def current_state(database_type)
+    @states&.dig(database_type)
+  end
+  private :current_state
+
+  ##
+  # @api private
+  class State
+    attr_reader :db_info
+
+    require 'observer' # ruby stdlib
+    include Observable
+
+    def initialize(db_info)
+      @db_info = db_info
+    end
+
+    ##
+    # @api internal
+    def subscribe
+      synchronize do
+        subscription = Subscription.new(@db_info, self)
+        add_observer(subscription, :notify)
+        subscription
+      end
+    end
+
+    def unsubscribe(observer)
+      synchronize do
+        delete_observer(observer)
+      end
+    end
+
+    ##
+    # @param new_database_path [String]
+    # @yieldparam previous_db_info [DbInfo]
+    # @yieldreturn [void]
+    def update!(new_database_path)
+      synchronize do
+        previous_db_info, @db_info = @db_info, DbInfo.new(path: new_database_path)
+
+        changed
+
+        yield(previous_db_info) if block_given?
+
+        notify_observers(@db_info)
+      end
+    end
+
+    ##
+    # @yieldparam previous_path [String]
+    # @yieldparam was_expired [Boolean]
+    # @yieldreturn [void]
+    def expire!
+      synchronize do
+        previous_db_info, @db_info = @db_info, DbInfo::EXPIRED
+
+        changed
+
+        yield(previous_db_info) if block_given?
+
+        notify_observers(@db_info)
+      end
+    end
+
+    ##
+    # @api internal
+    def release!(subscription)
+      synchronize do
+        delete_observer(subscription)
+      end
+    end
+
+    private
+
+    def synchronize(&block)
+      LogStash::Util.synchronize(self) do
+        yield
+      end
+    end
+
+  end
+
+end; end; end
diff --git a/x-pack/lib/geoip_database_management/metadata.rb b/x-pack/lib/geoip_database_management/metadata.rb
new file mode 100644
index 000000000..ffc852a09
--- /dev/null
+++ b/x-pack/lib/geoip_database_management/metadata.rb
@@ -0,0 +1,124 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+require_relative 'util'
+require_relative 'constants'
+
+require "csv"
+
+module LogStash module GeoipDatabaseManagement
+  class Metadata
+    include LogStash::Util::Loggable
+
+    include GeoipDatabaseManagement::Constants
+    include GeoipDatabaseManagement::Util
+
+    def initialize(paths)
+      @paths = paths
+      @metadata_path = paths.resolve("metadata.csv")
+    end
+
+    attr_reader :paths
+
+    # csv format: database_type, check_at, gz_md5, dirname, is_eula
+    def save_metadata(database_type, dirname, gz_md5:)
+      metadata = get_metadata(database_type, false)
+
+      current_timestamp = Time.now.to_i
+
+      entry = []
+      entry[Column::DATABASE_TYPE] = database_type
+      entry[Column::CHECK_AT] = current_timestamp
+      entry[Column::GZ_MD5] = gz_md5
+      entry[Column::DIRNAME] = dirname
+
+      metadata << entry
+      update(metadata)
+    end
+
+    def update_timestamp(database_type)
+      update_each_row do |row|
+        row[Column::CHECK_AT] = Time.now.to_i if row[Column::DATABASE_TYPE].eql?(database_type)
+        row
+      end
+    end
+
+    def update_each_row(&block)
+      metadata = get_all.map do |row|
+        yield row
+      end
+      update(metadata)
+    end
+
+    def update(metadata)
+      metadata = metadata.sort_by { |row| row[Column::DATABASE_TYPE] }
+      ::CSV.open(@metadata_path, 'w') do |csv|
+        metadata.each { |row| csv << row }
+      end
+      logger.trace("metadata updated", :metadata => metadata)
+    end
+
+    def touch
+      update_each_row(&:itself)
+    end
+
+    def unset_path(database_type)
+      update_each_row do |row|
+        row[Column::DIRNAME] = "" if row[Column::DATABASE_TYPE].eql?(database_type)
+        row
+      end
+    end
+
+    def get_all
+      file_exist?(@metadata_path) ? ::CSV.read(@metadata_path, headers: false) : Array.new
+    end
+
+    # Give rows of metadata that match/exclude the type
+    def get_metadata(database_type, match = true)
+      get_all.select { |row| row[Column::DATABASE_TYPE].eql?(database_type) == match }
+    end
+
+    # Return a valid database path
+    def database_path(database_type)
+      get_metadata(database_type).map { |metadata| @paths.db(database_type, metadata[Column::DIRNAME]) }
+                                 .reject(&:empty?)
+                                 .select { |path| file_exist?(path) }
+                                 .last
+    end
+
+    def has_type?(database_type)
+      get_metadata(database_type).any?
+    end
+
+    def gz_md5(database_type)
+      get_metadata(database_type).map { |metadata| metadata[Column::GZ_MD5] }
+                                 .last || ''
+    end
+
+    def check_at(database_type)
+      (get_metadata(database_type).map { |metadata| metadata[Column::CHECK_AT] }
+                                  .last || 0).to_i
+    end
+
+    # Return all active dirname
+    def dirnames
+      get_all.map { |metadata| metadata[Column::DIRNAME] }.reject(&:empty?)
+    end
+
+    def exist?
+      file_exist?(@metadata_path)
+    end
+
+    def delete
+      ::File.delete(@metadata_path) if exist?
+    end
+
+    module Column
+      DATABASE_TYPE = 0
+      CHECK_AT      = 1
+      GZ_MD5        = 2
+      DIRNAME       = 3
+    end
+  end
+end end
\ No newline at end of file
diff --git a/x-pack/lib/geoip_database_management/metric.rb b/x-pack/lib/geoip_database_management/metric.rb
new file mode 100644
index 000000000..0d785dcad
--- /dev/null
+++ b/x-pack/lib/geoip_database_management/metric.rb
@@ -0,0 +1,67 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+require_relative 'util'
+
+module LogStash module GeoipDatabaseManagement
+  class Metric
+    include GeoipDatabaseManagement::Util
+
+    DATABASE_INIT = "init".freeze
+    DATABASE_UP_TO_DATE = "up_to_date".freeze
+    DATABASE_TO_BE_EXPIRED = "to_be_expired".freeze
+    DATABASE_EXPIRED = "expired".freeze
+
+    DOWNLOAD_SUCCEEDED = "succeeded".freeze
+    DOWNLOAD_FAILED = "failed".freeze
+    DOWNLOAD_UPDATING = "updating".freeze
+
+    def initialize(metric)
+      # Fallback when testing plugin and no metric collector are correctly configured.
+      @metric = metric || LogStash::Instrument::NamespacedNullMetric.new
+    end
+
+    def initialize_metrics(metadatas)
+      metadatas.each do |row|
+        type = row[Metadata::Column::DATABASE_TYPE]
+        @metric.namespace([:database, type.to_sym]).tap do |n|
+          n.gauge(:status, DATABASE_INIT)
+          n.gauge(:last_updated_at, unix_time_to_iso8601(row[Metadata::Column::CHECK_AT]))
+          n.gauge(:fail_check_in_days, time_diff_in_days(row[Metadata::Column::CHECK_AT]))
+        end
+      end
+
+      @metric.namespace([:download_stats]).tap do |n|
+        check_at = metadatas.map { |row| row[Metadata::Column::CHECK_AT].to_i }.max
+        n.gauge(:last_checked_at, unix_time_to_iso8601(check_at))
+      end
+    end
+
+    def update_download_stats(is_success)
+      @metric.namespace([:download_stats]).tap do |n|
+        n.gauge(:last_checked_at, Time.now.iso8601)
+
+        if is_success
+          n.increment(:successes, 1)
+          n.gauge(:status, DOWNLOAD_SUCCEEDED)
+        else
+          n.increment(:failures, 1)
+          n.gauge(:status, DOWNLOAD_FAILED)
+        end
+      end
+    end
+
+    def set_download_status_updating
+      @metric.namespace([:download_stats]).gauge(:status, DOWNLOAD_UPDATING)
+    end
+
+    def update_database_status(database_type, database_status, metadata, days_without_update)
+      @metric.namespace([:database, database_type.to_sym]).tap do |n|
+        n.gauge(:status, database_status)
+        n.gauge(:last_updated_at, unix_time_to_iso8601(metadata[Metadata::Column::CHECK_AT]))
+        n.gauge(:fail_check_in_days, days_without_update)
+      end
+    end
+  end
+end end
\ No newline at end of file
diff --git a/x-pack/lib/geoip_database_management/subscription.rb b/x-pack/lib/geoip_database_management/subscription.rb
new file mode 100644
index 000000000..d6787e26a
--- /dev/null
+++ b/x-pack/lib/geoip_database_management/subscription.rb
@@ -0,0 +1,124 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+require "logstash/util/loggable"
+require "thread"
+
+require_relative "subscription_observer"
+
+require 'observer'
+require 'concurrent/atomic/reentrant_read_write_lock'
+
+module LogStash module GeoipDatabaseManagement
+  ##
+  # A Subscription is acquired with Manager#subscribe_database_path
+  class Subscription
+    include LogStash::Util::Loggable
+    include Observable # @api internal
+
+    ##
+    # @param initial [DBInfo]
+    # @param state [#release!]
+    # @api private
+    def initialize(initial, state=nil)
+      @state = state
+      @observable = true
+      @value = initial
+      @lock = Concurrent::ReentrantReadWriteLock.new
+    end
+
+    ##
+    # @overload value(&consumer)
+    #   Yields the current DbInfo and prevents changes from occurring until control is returned.
+    #   @note: this is intended for short-lived locks ONLY, as blocking writes will prevent updates
+    #          from being observed by other subscribers.
+    #   @yield db_info yields current DBInfo and returns the result of the block
+    #   @yieldparam db_info [DbInfo]
+    #   @return [Object] the result of the provided block
+    # @overload value()
+    #   Returns the current DBInfo immediately
+    #   @return [DbInfo]
+    def value(&consumer)
+      @lock.with_read_lock do
+        return yield(@value) if block_given?
+
+        @value
+      end
+    end
+
+    ##
+    # Register an observer that will observe the current value and each subsequent update and expire,
+    # until Subscription#release!
+    #
+    # @note: interacting with this Subscription or the Manager in any way in the provided hooks is
+    # not advised, as it may cause deadlocks.
+    # @overload observe(observer)
+    #   @param observer [SubscriptionObserver]
+    #   @return [Subscription]
+    # @overload observe(observer_spec)
+    #   @param observer_spec [Hash]: (@see SubscriptionObserver::coerce)
+    #   @return [Subscription]
+    def observe(observer_spec)
+      observer = SubscriptionObserver.coerce(observer_spec)
+
+      @lock.with_write_lock do
+        fail "Subscription has been released!" unless @observable
+
+        observer.construct(@value)
+        self.add_observer do |new_value|
+          @lock.with_read_lock do
+            if new_value.expired?
+              observer.on_expire
+            else
+              observer.on_update(new_value)
+            end
+          end
+        end
+      end
+
+      self
+    end
+
+    ##
+    # Releases this subscription and all of its observers
+    # from receiving additional notifications.
+    def release!
+      @lock.with_write_lock do
+        @observable = false
+        delete_observers
+
+        @state&.release!(self)
+        @state = nil
+      end
+    end
+
+    ##
+    # @api internal
+    def notify(updated_value)
+      write_lock_held = @lock.acquire_write_lock
+      @value = updated_value
+
+      # downgrade to read lock for notifications
+      @lock.with_read_lock do
+        write_lock_held = !@lock.release_write_lock
+        self.changed
+        self.notify_observers(updated_value)
+      end
+    ensure
+      @lock.release_read_lock if write_lock_held
+    end
+
+    ##
+    # @api private
+    def add_observer(*args, &block)
+      @lock.with_write_lock do
+        if block_given?
+          super(block, :call)
+        else
+          super(*args)
+        end
+      end
+    end
+  end
+end end
diff --git a/x-pack/lib/geoip_database_management/subscription_observer.rb b/x-pack/lib/geoip_database_management/subscription_observer.rb
new file mode 100644
index 000000000..4a58f24a1
--- /dev/null
+++ b/x-pack/lib/geoip_database_management/subscription_observer.rb
@@ -0,0 +1,105 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+require "logstash/util/loggable"
+require "thread"
+
+require 'observer'
+require 'concurrent/atomic/reentrant_read_write_lock'
+
+module LogStash module GeoipDatabaseManagement
+  ##
+  # Provide a SubscriptionObserver or a SubscriptionObserver::coerce-able object
+  # to Subscription#observe to use the current value and observe changes to the
+  # subscription's state
+  #
+  # @api public
+  module SubscriptionObserver
+
+    ##
+    # Coerce an object into an `SubscriptionObserver`, if necessary
+    # @overload coerce(observer)
+    #   @param observer [SubscriptionObserver]: an object that "quacks like" a `SubscriptionObserver`
+    #                                           as defined by `SubscriptionObserver::===`
+    #   @return [SubscriptionObserver]
+    # @overload coerce(construct:, :on_update, :on_expire)
+    #   @param construct [Proc(DbInfo)->void]: a single-arity Proc that will receive the current
+    #                                          DbInfo at the beginning of observation
+    #   @param on_update [Proc(DbInfo)->void]: a single-arity Proc that will receive notifications
+    #                                          of each subsequent `DBInfo`
+    #   @param on_expire [Proc()->void]: a zero-arity Proc that will receive notifications of the
+    #                                    current value expiring.
+    #   @return [SubscriptionObserver::Proxy]
+    # @api public
+    def self.coerce(observer_spec)
+      case observer_spec
+      when SubscriptionObserver then observer_spec
+      when Hash                 then Proxy.new(**observer_spec)
+      else
+        fail ArgumentError, "Could not make a SubscriptionObserver from #{observer_spec.inspect}"
+      end
+    end
+
+    ##
+    # Quacks-like check, to simplify consuming from Java where the ruby module can't be
+    # directly mixed into a Java class
+    def self.===(candidate)
+      return true if super
+
+      return false unless candidate.respond_to?(:construct)
+      return false unless candidate.respond_to?(:on_update)
+      return false unless candidate.respond_to?(:on_expire)
+
+      true
+    end
+
+    ##
+    # Observe the value at observer's construction, before any state-change notifications are fired
+    def construct(initial_value)
+      fail NotImplementedError
+    end
+
+    ##
+    # Observe an update notice, after construction is complete
+    def on_update(updated_value)
+      fail NotImplementedError
+    end
+
+    ##
+    # Observe an expiry notice, after construction is complete
+    def on_expire
+      fail NotImplementedError
+    end
+
+    ##
+    # @api internal
+    # @see SubscriptionObserver#coerce
+    class Proxy
+      include SubscriptionObserver
+
+      def initialize(construct:, on_update:, on_expire:)
+        fail ArgumentError unless construct.respond_to?(:call) && construct.arity == 1
+        fail ArgumentError unless on_update.respond_to?(:call) && on_update.arity == 1
+        fail ArgumentError unless on_expire.respond_to?(:call) && on_expire.arity == 0
+
+        @construct = construct
+        @on_update = on_update
+        @on_expire = on_expire
+      end
+
+      def construct(initial_value)
+        @construct.call(initial_value)
+      end
+
+      def on_update(updated_value)
+        @on_update.call(updated_value)
+      end
+
+      def on_expire
+        @on_expire.call
+      end
+    end
+    private_constant :Proxy
+  end
+end end
\ No newline at end of file
diff --git a/x-pack/lib/geoip_database_management/util.rb b/x-pack/lib/geoip_database_management/util.rb
new file mode 100644
index 000000000..db7d4a2e5
--- /dev/null
+++ b/x-pack/lib/geoip_database_management/util.rb
@@ -0,0 +1,37 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+module LogStash module GeoipDatabaseManagement
+
+  require_relative 'constants'
+  include Constants # TODO: push up
+
+  module Util
+    extend self
+
+    def file_exist?(path)
+      !path.nil? && ::File.exist?(path) && !::File.empty?(path)
+    end
+
+    def md5(file_path)
+      file_exist?(file_path) ? Digest::MD5.hexdigest(::File.read(file_path)) : ""
+    end
+
+    def error_details(e, logger)
+      {}.tap do |error_details|
+        error_details[:exception] = e.message
+        error_details[:cause] = e.cause if logger.debug? && e.cause
+        error_details[:backtrace] = e.backtrace if logger.debug?
+      end
+    end
+
+    def time_diff_in_days(timestamp)
+      (::Date.today - ::Time.at(timestamp.to_i).to_date).to_i
+    end
+
+    def unix_time_to_iso8601(timestamp)
+      Time.at(timestamp.to_i).iso8601
+    end
+  end
+end end
\ No newline at end of file
diff --git a/x-pack/lib/helpers/elasticsearch_options.rb b/x-pack/lib/helpers/elasticsearch_options.rb
index 0d44678bd..4436eea5f 100644
--- a/x-pack/lib/helpers/elasticsearch_options.rb
+++ b/x-pack/lib/helpers/elasticsearch_options.rb
@@ -6,86 +6,121 @@ module LogStash module Helpers
   module ElasticsearchOptions
     extend self
 
-    ES_SETTINGS =%w(ssl.certificate_authority ssl.truststore.path ssl.keystore.path hosts username password)
+    ES_SETTINGS = %w(
+      ssl.certificate_authority
+      ssl.ca_trusted_fingerprint
+      ssl.truststore.path
+      ssl.keystore.path
+      hosts
+      username
+      password
+      cloud_id
+      cloud_auth
+      api_key
+      proxy
+    )
 
-    # Retrieve elasticsearch options from either specific settings, or modules if the setting is not there and the
-    # feature supports falling back to modules if the feature is not specified in logstash.yml
-    def es_options_from_settings_or_modules(feature, settings)
-      only_modules_configured?(feature, settings) ? es_options_from_modules(settings) : es_options_from_settings(feature, settings)
-    end
+    # xpack setting to ES output setting
+    SETTINGS_MAPPINGS = {
+      "cloud_id" => "cloud_id",
+      "cloud_auth" => "cloud_auth",
+      "username" => "user",
+      "password" => "password",
+      "api_key" => "api_key",
+      "proxy" => "proxy",
+      "sniffing" => "sniffing",
+      "ssl.certificate_authority" => "ssl_certificate_authorities",
+      "ssl.cipher_suites" => "ssl_cipher_suites",
+      "ssl.ca_trusted_fingerprint" => "ca_trusted_fingerprint",
+      "ssl.truststore.path" => "ssl_truststore_path",
+      "ssl.truststore.password" => "ssl_truststore_password",
+      "ssl.keystore.path" => "ssl_keystore_path",
+      "ssl.keystore.password" => "ssl_keystore_password",
+      "ssl.certificate" => "ssl_certificate",
+      "ssl.key" => "ssl_key",
+    }
 
-    # Populate the Elasticsearch options from LogStashSettings file, based on the feature that is being
-    # used.
+    # Populate the Elasticsearch options from LogStashSettings file, based on the feature that is being used.
+    # @return Hash
     def es_options_from_settings(feature, settings)
+      prefix = (feature == "monitoring" && LogStash::MonitoringExtension.use_direct_shipping?(settings)) ? "" : "xpack."
       opts = {}
 
-      opts['hosts'] = settings.get("xpack.#{feature}.elasticsearch.hosts")
-      opts['user'] = settings.get("xpack.#{feature}.elasticsearch.username")
-      opts['password'] = settings.get("xpack.#{feature}.elasticsearch.password")
-      opts['sniffing'] = settings.get("xpack.#{feature}.elasticsearch.sniffing")
-      opts['ssl_certificate_verification'] = settings.get("xpack.#{feature}.elasticsearch.ssl.verification_mode") == 'certificate'
+      validate_authentication!(feature, settings, prefix)
 
-      if cacert = settings.get("xpack.#{feature}.elasticsearch.ssl.certificate_authority")
-        opts['cacert'] = cacert
-        opts['ssl'] = true
+      # transpose all directly mappable settings
+      SETTINGS_MAPPINGS.each do |xpack_setting, es_setting|
+        v = settings.get("#{prefix}#{feature}.elasticsearch.#{xpack_setting}")
+        opts[es_setting] = v unless v.nil?
       end
 
-      if truststore = settings.get("xpack.#{feature}.elasticsearch.ssl.truststore.path")
-        opts['truststore'] = truststore
-        opts['truststore_password'] = settings.get("xpack.#{feature}.elasticsearch.ssl.truststore.password")
-        opts['ssl'] = true
+      # avoid passing an empty array to the plugin configuration
+      if opts['ssl_cipher_suites']&.empty?
+        opts.delete('ssl_cipher_suites')
       end
 
-      if keystore = settings.get("xpack.#{feature}.elasticsearch.ssl.keystore.path")
-        opts['keystore'] = keystore
-        opts['keystore_password']= settings.get("xpack.#{feature}.elasticsearch.ssl.keystore.password")
-        opts['ssl'] = true
+      # process remaining settings
+
+      unless settings.get("#{prefix}#{feature}.elasticsearch.cloud_id")
+        opts['hosts'] = settings.get("#{prefix}#{feature}.elasticsearch.hosts")
       end
+
+      # The `certificate` mode is currently not supported by the ES output plugin. This value was used by Logstash to set the
+      # deprecated `ssl_certificate_verification` boolean option. To keep it backward compatible with the x-pack settings,
+      # it fallbacks any value different of `none` to `full` so the behaviour stills the same.
+      if settings.get("#{prefix}#{feature}.elasticsearch.ssl.verification_mode") == "none"
+        opts['ssl_verification_mode'] = "none"
+      else
+        opts['ssl_verification_mode'] = "full"
+      end
+
+      # if all hosts are using https or any of the ssl related settings are set
+      if ssl?(feature, settings, prefix)
+        opts['ssl_enabled'] = true
+      end
+
+      # the username setting has a default value and should not be included when using another authentication such as cloud_auth or api_key.
+      # it should also not be included when no password is set.
+      # it is safe to silently remove here since all authentication verifications have been validated at this point.
+      if settings.set?("#{prefix}#{feature}.elasticsearch.cloud_auth") ||
+         settings.set?("#{prefix}#{feature}.elasticsearch.api_key") ||
+         (!settings.set?("#{prefix}#{feature}.elasticsearch.password") && !settings.set?("#{prefix}#{feature}.elasticsearch.username"))
+        opts.delete('user')
+      end
+
       opts
     end
 
+    # when the Elasticsearch Output client is used exclusively to
+    # perform Logstash-defined actions without user input, adding
+    # a product origin header allows us to reduce log noise.
+    def es_options_with_product_origin_header(es_options)
+      custom_headers = es_options.delete('custom_headers') { Hash.new }
+                                 .merge('x-elastic-product-origin' => 'logstash')
 
-    # Elasticsearch settings can be extracted from the modules settings inside the configuration.
-    # Few options will be supported, however - the modules security configuration is
-    # different to
-    def es_options_from_modules(settings)
-      module_settings = extract_module_settings(settings)
-
-      if module_settings.empty?
-        return nil
-      end
-
-      opts = {}
-
-      setting = LogStash::Setting::SplittableStringArray.new("var.elasticsearch.hosts", String, ["localhost:9200"])
-      raw_value = module_settings[setting.name]
-      setting.set(raw_value) unless raw_value.nil?
-      opts['hosts'] = setting.value
-      opts['user'] = module_settings['var.elasticsearch.username']
-      password = module_settings['var.elasticsearch.password']
-      opts['password'] = password.value unless password.nil?
-
-      # Sniffing is not supported for modules.
-      opts['sniffing'] = false
-      if cacert = module_settings["var.elasticsearch.ssl.certificate_authority"]
-        opts['cacert'] = cacert
-        opts['ssl'] = true
-      end
-      opts
+      es_options.merge('custom_headers' => custom_headers)
     end
 
+    def ssl?(feature, settings, prefix)
+      return true if verify_https_scheme(feature, settings, prefix)
+      return true if settings.set?("#{prefix}#{feature}.elasticsearch.cloud_id") # cloud_id always resolves to https hosts
+      return true if settings.set?("#{prefix}#{feature}.elasticsearch.ssl.certificate_authority")
+      return true if settings.set?("#{prefix}#{feature}.elasticsearch.ssl.ca_trusted_fingerprint")
+      return true if settings.set?("#{prefix}#{feature}.elasticsearch.ssl.cipher_suites") && settings.get("#{prefix}#{feature}.elasticsearch.ssl.cipher_suites")&.any?
+      return true if settings.set?("#{prefix}#{feature}.elasticsearch.ssl.truststore.path") && settings.set?("#{prefix}#{feature}.elasticsearch.ssl.truststore.password")
+      return true if settings.set?("#{prefix}#{feature}.elasticsearch.ssl.keystore.path") && settings.set?("#{prefix}#{feature}.elasticsearch.ssl.keystore.password")
+      return true if settings.set?("#{prefix}#{feature}.elasticsearch.ssl.certificate") && settings.set?("#{prefix}#{feature}.elasticsearch.ssl.key")
 
-    # Determine whether only modules have been configured, and not monitoring
-    # @param String feature to be checked
-    # @param Logstash::Settings Logstash settings
-    def only_modules_configured?(feature, settings)
-      modules_configured?(settings) && !feature_configured?(feature, settings)
+      return false
     end
 
-    # If not settings are configured, then assume that the feature has not been configured.
-    # The assumption is that with security setup, at least one setting (password or certificates)
-    # should be configured. If security is not setup, and defaults 'just work' for monitoring, then
-    # this will need to be reconsidered.
+    HTTPS_SCHEME = /^https:\/\/.+/
+    def verify_https_scheme(feature, settings, prefix)
+      hosts = Array(settings.get("#{prefix}#{feature}.elasticsearch.hosts"))
+      hosts.all? {|host| host.match?(HTTPS_SCHEME)}
+    end
+
+    # If no settings are configured, then assume that the feature has not been configured.
     def feature_configured?(feature, settings)
       ES_SETTINGS.each do |option|
         return true if settings.set?("xpack.#{feature}.elasticsearch.#{option}")
@@ -93,24 +128,55 @@ module LogStash module Helpers
       false
     end
 
-    def modules_configured?(settings)
-      !extract_module_settings(settings).nil?
-    end
+    private
 
-    # Read module settings from yaml file. This should be refactored in Logstash proper to allow for DRY-ing up
-    # these settings
-    def extract_module_settings(settings)
-      cli_settings = settings.get("modules.cli")
-      yml_settings = settings.get("modules")
-      modules_array = if !(cli_settings.empty? && yml_settings.empty?)
-                        LogStash::Modules::SettingsMerger.merge(cli_settings, yml_settings)
-                      elsif cli_settings.empty?
-                        yml_settings
-                      else
-                        cli_settings
-                      end
-      LogStash::Modules::SettingsMerger.merge_cloud_settings(modules_array.first, settings) unless modules_array.empty?
-      # As only one module is supported in the initial rollout, use the first one found
-      modules_array.first
+    def validate_authentication!(feature, settings, prefix)
+      provided_cloud_id = settings.set?("#{prefix}#{feature}.elasticsearch.cloud_id")
+      provided_hosts = settings.set?("#{prefix}#{feature}.elasticsearch.hosts")
+      provided_cloud_auth = settings.set?("#{prefix}#{feature}.elasticsearch.cloud_auth")
+      provided_api_key = settings.set?("#{prefix}#{feature}.elasticsearch.api_key")
+      provided_username = settings.set?("#{prefix}#{feature}.elasticsearch.username")
+      provided_password = settings.set?("#{prefix}#{feature}.elasticsearch.password")
+
+      # note that the username setting has a default value and in the verifications below
+      # we can test on the password option being set as a proxy to using basic auth because
+      # if the username is not explicitly set it will use its default value.
+
+      if provided_cloud_auth && (provided_username || provided_password)
+        raise ArgumentError.new(
+          "Both #{prefix}#{feature}.elasticsearch.cloud_auth and " +
+          "#{prefix}#{feature}.elasticsearch.username/password " +
+          "specified, please only use one of those"
+        )
+      end
+
+      if provided_username && !provided_password
+        raise(ArgumentError,
+          "When using #{prefix}#{feature}.elasticsearch.username, " +
+          "#{prefix}#{feature}.elasticsearch.password must also be set"
+        )
+      end
+
+      if provided_cloud_id
+        if provided_hosts
+          raise(ArgumentError,
+            "Both #{prefix}#{feature}.elasticsearch.cloud_id and " +
+            "#{prefix}#{feature}.elasticsearch.hosts specified, please only use one of those"
+          )
+        end
+      end
+
+      authentication_count = 0
+      authentication_count += 1 if provided_cloud_auth
+      authentication_count += 1 if provided_password
+      authentication_count += 1 if provided_api_key
+
+      if authentication_count > 1
+        raise(ArgumentError, "Multiple authentication options are specified, please only use one of #{prefix}#{feature}.elasticsearch.username/password, #{prefix}#{feature}.elasticsearch.cloud_auth or #{prefix}#{feature}.elasticsearch.api_key")
+      end
+
+      if provided_api_key && !ssl?(feature, settings, prefix)
+        raise(ArgumentError, "Using api_key authentication requires SSL/TLS secured communication")
+      end
     end
-  end end end
\ No newline at end of file
+  end end end
diff --git a/x-pack/lib/helpers/loggable_try.rb b/x-pack/lib/helpers/loggable_try.rb
new file mode 100644
index 000000000..eab294a53
--- /dev/null
+++ b/x-pack/lib/helpers/loggable_try.rb
@@ -0,0 +1,18 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+require 'stud/try'
+
+module LogStash module Helpers
+  class LoggableTry < Stud::Try
+    def initialize(logger, name)
+      @logger = logger
+      @name = name
+    end
+
+    def log_failure(exception, fail_count, message)
+      @logger.warn("Attempt to #{@name} failed. #{message}", fail_count: fail_count, exception: exception.message)
+    end
+  end
+end end
diff --git a/x-pack/lib/license_checker/license_manager.rb b/x-pack/lib/license_checker/license_manager.rb
index 076570041..c56061cc9 100644
--- a/x-pack/lib/license_checker/license_manager.rb
+++ b/x-pack/lib/license_checker/license_manager.rb
@@ -10,7 +10,6 @@ java_import java.util.concurrent.TimeUnit
 
 module LogStash
   module LicenseChecker
-
     class LicenseError < StandardError; end
 
     class LicenseManager
@@ -18,17 +17,15 @@ module LogStash
 
       attr_reader :last_updated
 
-      LICENSE_TYPES = :trial, :basic, :standard, :gold, :platinum
-
-      def initialize (reader, feature, refresh_period=30, refresh_unit=TimeUnit::SECONDS)
+      def initialize(reader, feature, refresh_period = 30, refresh_unit = TimeUnit::SECONDS)
         @license_reader = reader
         @feature = feature
 
-        fetch_xpack_info
+        fetch_license
 
         if @executor.nil?
-            @executor = Executors.new_single_thread_scheduled_executor{ |runnable| create_daemon_thread (runnable)}
-            @executor.schedule_at_fixed_rate(Proc.new{fetch_xpack_info}, refresh_period, refresh_period, refresh_unit)
+            @executor = Executors.new_single_thread_scheduled_executor { |runnable| create_daemon_thread (runnable)}
+            @executor.schedule_at_fixed_rate(Proc.new {fetch_license}, refresh_period, refresh_period, refresh_unit)
         end
       end
 
@@ -42,6 +39,27 @@ module LogStash
         update_xpack_info(xpack_info)
       end
 
+      def fetch_cluster_info
+        @cluster_info = @license_reader.fetch_cluster_info
+      end
+
+      def build_flavor
+        @cluster_info&.dig('version', 'build_flavor')
+      end
+
+      def serverless?
+        build_flavor == 'serverless'
+      end
+
+      def fetch_license
+        fetch_cluster_info
+        if serverless?
+          update_xpack_info XPackInfo.serverless_response
+        else
+          fetch_xpack_info
+        end
+      end
+
       private
       def update_xpack_info(xpack_info)
         return if xpack_info == @xpack_info
@@ -49,7 +67,7 @@ module LogStash
         @xpack_info = xpack_info
         logger.debug('updating observers of xpack info change') if logger.debug?
         changed
-        notify_observers(current_xpack_info)
+        notify_observers(current_xpack_info, serverless?)
       end
 
       # Create a daemon thread for the license checker to stop this thread from keeping logstash running in the
diff --git a/x-pack/lib/license_checker/license_reader.rb b/x-pack/lib/license_checker/license_reader.rb
index be978ae1d..cc1bcea63 100644
--- a/x-pack/lib/license_checker/license_reader.rb
+++ b/x-pack/lib/license_checker/license_reader.rb
@@ -4,8 +4,6 @@
 
 require 'logstash/logging/logger'
 require 'logstash/outputs/elasticsearch'
-require 'logstash/json'
-require 'json'
 
 module LogStash
   module LicenseChecker
@@ -17,16 +15,20 @@ module LogStash
       def initialize(settings, feature, options)
         @namespace = "xpack.#{feature}"
         @settings = settings
-        @es_options = options
-        @es_options.merge!("resurrect_delay" => 30)
+
+        es_options = options.merge('resurrect_delay' => 30)
+        @es_options = Helpers::ElasticsearchOptions::es_options_with_product_origin_header(es_options)
       end
 
       ##
       # fetches an XPackInfo, or log and return nil if unavailable.
       # @return [XPathInfo, nil]
       def fetch_xpack_info
+        retry_handler = ::LogStash::Helpers::LoggableTry.new(logger, 'validate Elasticsearch license')
         begin
-          response = client.get('_xpack')
+          response = retry_handler.try(10.times, ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::HostUnreachableError) {
+            client.get("_xpack")
+          }
 
           # TODO: do we need both this AND the exception-based control flow??
           return XPackInfo.xpack_not_installed if xpack_missing_response?(response)
@@ -46,6 +48,20 @@ module LogStash
         XPackInfo.failed_to_fetch
       end
 
+      def fetch_cluster_info
+        retry_handler = ::LogStash::Helpers::LoggableTry.new(logger, 'fetch Elasticsearch cluster info')
+        begin
+          response = retry_handler.try(10.times, ::LogStash::Outputs::ElasticSearch::HttpClient::Pool::HostUnreachableError) {
+            client.get("/")
+          }
+          return response
+        rescue => e
+          logger.error("Unable to retrieve Elasticsearch cluster info.", message: e.message, exception: e.class)
+        end
+
+        {}
+      end
+
       ##
       # @api private
       def client
@@ -62,8 +78,7 @@ module LogStash
       # # log originate from the `ElasticsearchSource`
       def build_client
         es = LogStash::Outputs::ElasticSearch.new(@es_options)
-        new_logger = logger
-        es.instance_eval { @logger = new_logger }
+        es.instance_variable_set :@logger, logger
         es.build_client
       end
 
diff --git a/x-pack/lib/license_checker/licensed.rb b/x-pack/lib/license_checker/licensed.rb
index 7f5e7c57f..c94a0cff5 100644
--- a/x-pack/lib/license_checker/licensed.rb
+++ b/x-pack/lib/license_checker/licensed.rb
@@ -8,7 +8,6 @@ require 'license_checker/x_pack_info'
 require 'license_checker/license_reader'
 java_import java.util.concurrent.TimeUnit
 
-
 # Mixin to add License Checking functionality to a feature:
 # To add license checking:
 # - Include the Licensed mixin to the class under license
@@ -31,12 +30,13 @@ module LogStash
     module Licensed
       include LogStash::Util::Loggable
 
-      def setup_license_checker(feature, refresh_period=30, refresh_unit=TimeUnit::SECONDS)
+      def setup_license_checker(feature, refresh_period = 30, refresh_unit = TimeUnit::SECONDS)
         @feature = feature
 
         license_manager = LogStash::LicenseChecker::LicenseManager.new(license_reader, feature, refresh_period, refresh_unit)
         xpack_info = license_manager.current_xpack_info
-        update_license_state(xpack_info)
+        is_serverless = license_manager.serverless?
+        update_license_state(xpack_info, is_serverless)
 
         license_manager.add_observer(self, :update_license_state)
       end
@@ -44,16 +44,17 @@ module LogStash
       # Classes that include Licensed mixin should override this method, populating the values of state, log_level and log_message
       # appropriately for how the license is to be enforced for that feature.
       # @param [LogStash::LicenseChecker::XPackInfo] License Info object
+      # @param Boolean is_serverless
       # @return [Hash] The overriding class should construct an hash populated as follows:
       #                :state       - State of the license, should a license check succeed or fail. :ok or :error
       #                :log_message - Message to be logged when the license changes for this feature
       #                :log_level   - Level to log the license change message at - symbolized version of method names
       #                               for [LogStash::Logging::Logger] - eg :info, :warn, :error, etc
-      def populate_license_state(xpack_info)
+      def populate_license_state(xpack_info, is_serverless)
         { :state => :error, :log_level => :error, :log_message => "Licensing is not currently setup for #{@feature}, please contact support"}
       end
 
-      def with_license_check(raise_on_error=false)
+      def with_license_check(raise_on_error = false)
         current_license_state = get_current_license_state
         message = current_license_state[:log_message]
 
@@ -75,16 +76,15 @@ module LogStash
         LogStash::LicenseChecker::LicenseReader.new(@settings, @feature, @es_options)
       end
 
-      def update_license_state(xpack_info)
+      def update_license_state(xpack_info, is_serverless)
         logger.debug("updating licensing state #{xpack_info}")
-        @license_state = populate_license_state(xpack_info)
+        @license_state = populate_license_state(xpack_info, is_serverless)
       end
 
       private
       def get_current_license_state
         @license_state.dup
       end
-
     end
   end
-end
\ No newline at end of file
+end
diff --git a/x-pack/lib/license_checker/x_pack_info.rb b/x-pack/lib/license_checker/x_pack_info.rb
index e2461f56e..42f3cab03 100644
--- a/x-pack/lib/license_checker/x_pack_info.rb
+++ b/x-pack/lib/license_checker/x_pack_info.rb
@@ -9,12 +9,12 @@ java_import java.util.concurrent.TimeUnit
 
 module LogStash
   module LicenseChecker
+    LICENSE_TYPES = ['trial', 'basic', 'standard', 'gold', 'platinum', 'enterprise']
+
     class XPackInfo
       include LogStash::Util::Loggable
 
-      LICENSE_TYPES = :trial, :basic, :standard, :gold, :platinum
-
-      def initialize(license, features = nil, installed=true, failed = false)
+      def initialize(license, features = nil, installed = true, failed = false)
         @license = license
         @installed = installed
         @features = features
@@ -55,6 +55,7 @@ module LogStash
       end
 
       def feature_enabled?(feature)
+        return false if @features.nil?
         return false unless @features.include?(feature)
         return false unless @features[feature].fetch('available', false)
 
@@ -97,6 +98,145 @@ module LogStash
       def self.failed_to_fetch
         XPackInfo.new(nil, nil, false, true)
       end
+
+      def self.serverless_response
+        SERVERLESS_20231031
+      end
+
+      # "Elastic-Api-Version": "2023-10-31" is the first API version available in serverless
+      SERVERLESS_20231031 = XPackInfo.from_es_response(
+        {
+          "license" =>
+            {
+              "type" => "enterprise",
+              "mode" => "enterprise",
+              "status" => "active"
+            },
+          "features" =>
+            {
+              "aggregate_metric" =>
+                {
+                  "available" => true,
+                  "enabled" => true
+                },
+              "analytics" =>
+                {
+                  "available" => true,
+                  "enabled" => true
+                },
+              "archive" =>
+                {
+                  "available" => true,
+                  "enabled" => true
+                },
+              "ccr" =>
+                {
+                  "available" => true,
+                  "enabled" => true
+                },
+              "cluster =>monitor/xpack/info/ilm" =>
+                {
+                  "available" => false,
+                  "enabled" => false
+                },
+              "cluster =>monitor/xpack/info/monitoring" =>
+                {
+                  "available" => false,
+                  "enabled" => false
+                },
+              "cluster =>monitor/xpack/info/searchable_snapshots" =>
+                {
+                  "available" => false,
+                  "enabled" => false
+                },
+              "cluster =>monitor/xpack/info/voting_only" =>
+                {
+                  "available" => false,
+                  "enabled" => false
+                },
+              "cluster =>monitor/xpack/info/watcher" =>
+                {
+                  "available" => false,
+                  "enabled" => false
+                },
+              "data_streams" =>
+                {
+                  "available" => true,
+                  "enabled" => true
+                },
+              "data_tiers" =>
+                {
+                  "available" => true,
+                  "enabled" => true
+                },
+              "enrich" =>
+                {
+                  "available" => true,
+                  "enabled" => true
+                },
+              "enterprise_search" =>
+                {
+                  "available" => true,
+                  "enabled" => true
+                },
+              "eql" =>
+                {
+                  "available" => true,
+                  "enabled" => true
+                },
+              "frozen_indices" =>
+                {
+                  "available" => true,
+                  "enabled" => true
+                },
+              "graph" =>
+                {
+                  "available" => true,
+                  "enabled" => true
+                },
+              "logstash" =>
+                {
+                  "available" => true,
+                  "enabled" => true
+                },
+              "ml" =>
+                {
+                  "available" => true,
+                  "enabled" => true
+                },
+              "rollup" =>
+                {
+                  "available" => true,
+                  "enabled" => true
+                },
+              "security" =>
+                {
+                  "available" => true,
+                  "enabled" => true
+                },
+              "slm" =>
+                {
+                  "available" => true,
+                  "enabled" => true
+                },
+              "spatial" =>
+                {
+                  "available" => true,
+                  "enabled" => true
+                },
+              "sql" =>
+                {
+                  "available" => true,
+                  "enabled" => true
+                },
+              "transform" =>
+                {
+                  "available" => true,
+                  "enabled" => true
+                }
+            }
+        }
+      ).freeze
     end
   end
 end
diff --git a/x-pack/lib/modules/module_license_checker.rb b/x-pack/lib/modules/module_license_checker.rb
deleted file mode 100644
index 3e3ea15c2..000000000
--- a/x-pack/lib/modules/module_license_checker.rb
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-require 'license_checker/licensed'
-require 'helpers/elasticsearch_options'
-java_import java.util.concurrent.TimeUnit
-
-module LogStash
-  module LicenseChecker
-    class ModuleLicenseChecker
-
-      include LogStash::LicenseChecker::Licensed
-      include LogStash::Helpers::ElasticsearchOptions
-      include LogStash::Util::Loggable
-
-      def initialize(module_name, valid_licenses)
-        @module_name = module_name
-        @feature = "#{@module_name}_module"
-        @valid_licenses = valid_licenses
-        @setup = false
-      end
-
-      # returns true if license is valid, false otherwise
-      def check(settings)
-        setup(settings) unless @setup
-        license_check
-      end
-
-      private
-
-      def setup(settings)
-        @es_options = es_options_from_modules(settings) || {}
-        #TODO: reduce the refresh period and handle if a license expires while running
-        setup_license_checker(@feature, 3650, TimeUnit::DAYS)
-        @setup = true
-      end
-
-      def populate_license_state(xpack_info)
-        if xpack_info.failed?
-          {
-              :state => :error,
-              :log_level => :error,
-              :log_message => "Failed to fetch X-Pack information from Elasticsearch. This is likely due to failure to reach a live Elasticsearch cluster."
-          }
-        elsif !xpack_info.installed?
-          {
-              :state => :error,
-              :log_level => :error,
-              :log_message => "X-Pack is installed on Logstash but not on Elasticsearch. Please install X-Pack on Elasticsearch to use the #{@module_name} module."
-          }
-        elsif !xpack_info.license_available?
-          {
-              :state => :error,
-              :log_level => :error,
-              :log_message => "The #{@module_name} module is not available: License information is currently unavailable. Please make sure you have added your production elasticsearch connection information."
-          }
-        elsif !xpack_info.license_one_of?(@valid_licenses)
-          {
-              :state => :error,
-              :log_level => :error,
-              :log_message => "The #{@module_name} module is not available: #{xpack_info.license_type} is not a valid license for this feature."
-          }
-        elsif !xpack_info.license_active?
-          {
-              :state => :ok,
-              :log_level => :warn,
-              :log_message => "The #{@module_name} module requires an active license."
-          }
-        else
-          {:state => :ok, :log_level => :info, :log_message => "The #{@module_name} module License OK"}
-        end
-      end
-    end
-  end
-end
diff --git a/x-pack/lib/modules/xpack_scaffold.rb b/x-pack/lib/modules/xpack_scaffold.rb
deleted file mode 100644
index a46c4a75b..000000000
--- a/x-pack/lib/modules/xpack_scaffold.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-require "logstash/modules/scaffold"
-require "modules/module_license_checker"
-
-module LogStash
-  module Modules
-    class XpackScaffold < LogStash::Modules::Scaffold
-
-      def initialize(name, directory, valid_licenses)
-       super(name, directory)
-       @license_checker = LogStash::LicenseChecker::ModuleLicenseChecker.new(name, valid_licenses)
-      end
-
-      def is_enabled?(settings)
-         @license_checker.check(settings)
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/x-pack/lib/monitoring/inputs/metrics.rb b/x-pack/lib/monitoring/inputs/metrics.rb
index 34c3a0952..0514b2e31 100644
--- a/x-pack/lib/monitoring/inputs/metrics.rb
+++ b/x-pack/lib/monitoring/inputs/metrics.rb
@@ -2,7 +2,6 @@
 # or more contributor license agreements. Licensed under the Elastic License;
 # you may not use this file except in compliance with the Elastic License.
 
-require "logstash/event"
 require "logstash/inputs/base"
 require "logstash/instrument/collector"
 require 'helpers/elasticsearch_options'
@@ -18,14 +17,14 @@ module LogStash module Inputs
   class Metrics < LogStash::Inputs::Base
     require "monitoring/inputs/metrics/state_event_factory"
     require "monitoring/inputs/metrics/stats_event_factory"
-    
+
     @pipelines_mutex = Mutex.new
     @pipelines = {}
 
     require "monitoring/inputs/timer_task_logger"
-    
+
     attr_reader :queue, :agent
-  
+
     config_name "metrics"
 
     # Polling frequency in seconds on the metric store
@@ -44,6 +43,7 @@ module LogStash module Inputs
     def register
       @global_stats = fetch_global_stats
       @agent = nil
+      @cluster_uuids = nil
       @settings = LogStash::SETTINGS.clone
       @last_updated_pipeline_hashes = []
       @agent = execution_context.agent if execution_context
@@ -105,15 +105,28 @@ module LogStash module Inputs
     end
 
     def update(snapshot)
+      if LogStash::MonitoringExtension.use_direct_shipping?(LogStash::SETTINGS)
+        @cluster_uuids ||= extract_cluster_uuids(snapshot.metric_store)
+      end
       update_stats(snapshot)
       update_states
     end
 
     def update_stats(snapshot)
       @logger.debug("Metrics input: received a new snapshot", :created_at => snapshot.created_at, :snapshot => snapshot) if @logger.debug?
+      if @cluster_uuids.nil? || @cluster_uuids.empty?
+        fire_stats_event(snapshot, nil)
+      else
+        @cluster_uuids.each do |cluster_uuid|
+          fire_stats_event(snapshot, cluster_uuid)
+        end
+      end
+    end
 
+    private
+    def fire_stats_event(snapshot, cluster_uuid)
       begin
-        event = StatsEventFactory.new(@global_stats, snapshot).make(agent, @extended_performance_collection)
+        event = StatsEventFactory.new(@global_stats, snapshot, cluster_uuid).make(agent, @extended_performance_collection, @collection_interval)
       rescue => e
         if @logger.debug?
           @logger.error("Failed to create monitoring event", :message => e.message, :error => e.class.name, :backtrace => e.backtrace)
@@ -132,11 +145,12 @@ module LogStash module Inputs
       emit_event(event)
     end
 
+    public
     def update_states
       return unless @agent
 
       # Update once every 10m
-      time_for_update = @last_states_update.nil? || @last_states_update < (Time.now - 60*10)
+      time_for_update = @last_states_update.nil? || @last_states_update < (Time.now - 60 * 10)
 
       pipeline_hashes = []
       agent.running_pipelines.each do |pipeline_id, pipeline|
@@ -153,12 +167,19 @@ module LogStash module Inputs
     def update_pipeline_state(pipeline)
       return if pipeline.system?
       if @config_collection
-        emit_event(state_event_for(pipeline))
+        events = state_event_for(pipeline)
+        events.each { |event| emit_event(event) }
       end
     end
 
     def state_event_for(pipeline)
-      StateEventFactory.new(pipeline).make()
+      if @cluster_uuids.nil? || @cluster_uuids.empty?
+        [StateEventFactory.new(pipeline, nil, @collection_interval).make()]
+      else
+        @cluster_uuids.map do |cluster_uuid|
+          StateEventFactory.new(pipeline, cluster_uuid, @collection_interval).make()
+        end
+      end
     end
 
     def emit_event(event)
@@ -187,5 +208,27 @@ module LogStash module Inputs
         }
       }
     end
+
+    def extract_cluster_uuids(stats)
+      cluster_uuids = agent.running_pipelines.flat_map do |_, pipeline|
+        next if pipeline.system?
+        pipeline.resolve_cluster_uuids
+      end.compact.uniq
+
+      if cluster_uuids.any?
+        @logger.info("Found cluster_uuids from elasticsearch output plugins", :cluster_uuids => cluster_uuids)
+        if LogStash::SETTINGS.set?("monitoring.cluster_uuid")
+          @logger.warn("Found monitoring.cluster_uuid setting configured in logstash.yml while using the ones discovered from elasticsearch output plugins, ignoring setting monitoring.cluster_uuid")
+        end
+        cluster_uuids
+      else
+        if LogStash::SETTINGS.set?("monitoring.cluster_uuid")
+          [LogStash::SETTINGS.get("monitoring.cluster_uuid")]
+        else
+          @logger.warn("Can't find any cluster_uuid from elasticsearch output plugins nor monitoring.cluster_uuid in logstash.yml is defined")
+          [""]
+        end
+      end
+    end
   end
 end; end
diff --git a/x-pack/lib/monitoring/inputs/metrics/state_event/lir_serializer.rb b/x-pack/lib/monitoring/inputs/metrics/state_event/lir_serializer.rb
deleted file mode 100644
index 54ec8bf1b..000000000
--- a/x-pack/lib/monitoring/inputs/metrics/state_event/lir_serializer.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-#
-require 'monitoring/inputs/metrics'
-require 'logstash-core'
-require 'logstash/compiler'
-
-module LogStash; module Inputs; class Metrics; class StateEvent;
-  class LIRSerializer
-    attr_reader :lir_pipeline
-    
-    def self.serialize(lir_pipeline)
-      self.new(lir_pipeline).serialize
-    end
-    
-    def initialize(lir_pipeline)
-      @lir_pipeline = lir_pipeline
-    end
-    
-    def serialize
-      {
-        "hash" => lir_pipeline.unique_hash,
-        "type" => "lir",
-        "version" => "0.0.0",
-        "plugins" => plugins,
-        "graph" => {
-          "vertices" => vertices,
-          "edges" => edges
-        }
-      }
-    end
-    
-    def vertices
-      graph.getVertices.map {|v| vertex(v) }
-    end
-    
-    def edges
-      graph.getEdges.map {|e| edge(e) }
-    end
-    
-    def graph
-      lir_pipeline.graph
-    end
-    
-    def vertex(v)
-      hashified_vertex = case vertex_type(v) 
-                         when :plugin 
-                           plugin_vertex(v)
-                         when :if 
-                           if_vertex(v)
-                         when :queue
-                           queue_vertex(v)
-                         end
-
-      decorate_vertex(v, hashified_vertex)
-    end
-    
-    def vertex_type(v)
-      if v.java_kind_of?(org.logstash.config.ir.graph.PluginVertex)
-        :plugin
-      elsif v.java_kind_of?(org.logstash.config.ir.graph.IfVertex)
-        :if
-      elsif v.java_kind_of?(org.logstash.config.ir.graph.QueueVertex)
-        :queue
-      else
-        raise "Unexpected vertex type! #{v}"
-      end
-    end
-    
-    def decorate_vertex(v, v_json)
-      v_json["meta"] = format_swm(v.source_with_metadata)
-      v_json["id"] = v.id
-      v_json["explicit_id"] = !!v.explicit_id
-      v_json["type"] = vertex_type(v).to_s
-      v_json
-    end
-    
-    def plugin_vertex(v)
-      pd = v.plugin_definition
-      {
-        "config_name" => pd.name,
-        "plugin_type" => pd.getType.to_s.downcase
-      }
-    end
-    
-    def if_vertex(v)
-      {
-        "condition" => v.humanReadableExpression
-      }
-    end
-    
-    def queue_vertex(v)
-      {}
-    end
-    
-    def edge(e)
-      e_json = {
-        "from" => e.from.id,
-        "to" => e.to.id,
-        "id" => e.id
-      }
-      
-      if e.java_kind_of?(org.logstash.config.ir.graph.BooleanEdge)
-        e_json["when"] = e.edge_type
-        e_json["type"] = "boolean"
-      else
-        e_json["type"] = "plain"
-      end
-      
-      e_json
-    end
-    
-    def format_swm(source_with_metadata)
-      return nil unless source_with_metadata
-      {
-        "source" => {
-          "protocol" => source_with_metadata.protocol,
-          "id" => source_with_metadata.id,
-          "line" =>  source_with_metadata.line,
-          "column" => source_with_metadata.column
-          # We omit the text of the source code for security reasons
-          # raw text may contain passwords
-        }
-      }
-    end
-    
-    def plugins
-      ::Gem::Specification.
-        find_all.
-        select {|spec| spec.metadata && spec.metadata["logstash_plugin"] == "true"}.
-        map {|spec|  { :name => spec.name, :version => spec.version.to_s } }
-    end
-  end
-end; end; end; end
diff --git a/x-pack/lib/monitoring/inputs/metrics/state_event_factory.rb b/x-pack/lib/monitoring/inputs/metrics/state_event_factory.rb
index c0ef49d0a..2904be00f 100644
--- a/x-pack/lib/monitoring/inputs/metrics/state_event_factory.rb
+++ b/x-pack/lib/monitoring/inputs/metrics/state_event_factory.rb
@@ -1,20 +1,34 @@
 # Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
 # or more contributor license agreements. Licensed under the Elastic License;
 # you may not use this file except in compliance with the Elastic License.
-#
+
 module LogStash; module Inputs; class Metrics;
   class StateEventFactory
-    require "monitoring/inputs/metrics/state_event/lir_serializer"
-    def initialize(pipeline)
-      raise ArgumentError, "No pipeline passed in!" unless pipeline.is_a?(LogStash::Pipeline) || pipeline.is_a?(LogStash::JavaPipeline)
-      @event = LogStash::Event.new
+    require "logstash/config/lir_serializer"
 
-      @event.set("[@metadata]", {
-        "document_type" => "logstash_state",
-        "timestamp" => Time.now
-      })
+    def initialize(pipeline, cluster_uuid, collection_interval = 10)
+      raise ArgumentError, "No pipeline passed in!" unless pipeline.is_a?(LogStash::JavaPipeline)
 
-      @event.set("[pipeline]", pipeline_data(pipeline))
+      pipeline_doc = {"pipeline" => pipeline_data(pipeline)}
+
+      if (LogStash::MonitoringExtension.use_direct_shipping?(LogStash::SETTINGS))
+        event_body = {
+          "type" => "logstash_state",
+          "logstash_state" => pipeline_doc,
+          "cluster_uuid" => cluster_uuid,
+          "interval_ms" => collection_interval * 1000,
+          "timestamp" => DateTime.now.strftime('%Y-%m-%dT%H:%M:%S.%L%z')
+        }
+      else
+        event_body = pipeline_doc
+      end
+
+      @event = LogStash::Event.new(
+        {"@metadata" => {
+          "document_type" => "logstash_state",
+          "timestamp" => Time.now
+        }}.merge(event_body)
+      )
 
       @event.remove("@timestamp")
       @event.remove("@version")
@@ -29,7 +43,7 @@ module LogStash; module Inputs; class Metrics;
         "ephemeral_id" => pipeline.ephemeral_id,
         "workers" =>  pipeline.settings.get("pipeline.workers"),
         "batch_size" =>  pipeline.settings.get("pipeline.batch.size"),
-        "representation" => ::LogStash::Inputs::Metrics::StateEvent::LIRSerializer.serialize(pipeline.lir)
+        "representation" => ::LogStash::Config::LIRSerializer.serialize(pipeline.lir)
       }
     end
 
diff --git a/x-pack/lib/monitoring/inputs/metrics/stats_event/pipelines_info.rb b/x-pack/lib/monitoring/inputs/metrics/stats_event/pipelines_info.rb
deleted file mode 100644
index 9abd227b4..000000000
--- a/x-pack/lib/monitoring/inputs/metrics/stats_event/pipelines_info.rb
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-#
-module LogStash; module Inputs; class Metrics; module StatsEvent;
-  class PipelinesInfo
-    def self.format_pipelines_info(agent, metric_store, extended_performance_collection)
-      # It is important that we iterate via the agent's pipelines vs. the
-      # metrics pipelines. This prevents race conditions as pipeline stats may be
-      # populated before the agent has it in its own pipelines state
-      stats = metric_store.get_with_path("/stats/pipelines")[:stats][:pipelines]
-      agent.running_pipelines.map do |pipeline_id, pipeline|
-        p_stats = stats[pipeline_id]
-        # Don't record stats for system pipelines
-        next nil if pipeline.system?
-        res = {
-          "id" => pipeline_id.to_s,
-          "hash" => pipeline.lir.unique_hash,
-          "ephemeral_id" => pipeline.ephemeral_id,
-          "events" => format_pipeline_events(p_stats[:events]),
-          "queue" => format_queue_stats(pipeline_id, metric_store),
-          "reloads" => {
-            "successes" => p_stats[:reloads][:successes].value,
-            "failures" => p_stats[:reloads][:failures].value
-          }
-        }
-        
-        if extended_performance_collection
-          res["vertices"] = format_pipeline_vertex_stats(p_stats[:plugins], pipeline)
-        end
-        
-        res
-      end.compact
-    end
-
-    def self.format_pipeline_events(stats)
-      result = {}
-      (stats || {}).each { |stage, counter| result[stage.to_s] = counter.value }
-      result
-    end
-
-    def self.format_pipeline_vertex_stats(stats, pipeline)
-      return nil unless stats
-      
-      [:inputs, :filters, :outputs].flat_map do |section|
-        format_pipeline_vertex_section_stats(stats[section], pipeline)
-      end.select {|stats| !stats.nil?} # Ignore empty sections
-    end
-
-    ROOT_METRIC_MAPPINGS = {
-      'events.in' => 'events_in',
-      'events.out' => 'events_out',
-      'events.queue_push_duration_in_millis' => 'queue_push_duration_in_millis',
-      'events.duration_in_millis' => 'duration_in_millis',
-      'name' => :discard # we don't need this, pipeline_state has this already
-    }
-
-    def self.format_pipeline_vertex_section_stats(stats, pipeline)
-      return nil unless stats
-      
-       (stats || {}).reduce([]) do |acc,kv|
-        plugin_id, plugin_stats = kv
-        
-        props = Hash.new {|h,k| h[k] = []}
-        next unless plugin_stats
-        
-        flattened = flatten_metrics(plugin_stats)
-
-        segmented = flattened.reduce(Hash.new {|h,k| h[k] = []}) do |acc,kv|
-          k,v = kv
-          metric_value = v.value
-          root_metric_field = ROOT_METRIC_MAPPINGS[k]
-
-          if root_metric_field
-            if root_metric_field != :discard
-              acc[root_metric_field] = metric_value
-            end
-          else
-            type_sym = v.type.to_sym
-
-            nested_type = if type_sym == :"counter/long"
-                            :long_counters
-                          elsif type_sym == :"gauge/numeric"
-                            :double_gauges
-                          else
-                            nil
-                          end
-
-            if nested_type
-              acc[nested_type] << { :name => k, :value => metric_value }
-            end
-         end
-
-          acc
-        end
-        
-        acc << {
-          :id => plugin_id,
-          :pipeline_ephemeral_id => pipeline.ephemeral_id
-        }.merge(segmented)
-        acc
-      end
-    end
-
-    def self.flatten_metrics(hash_or_value, namespaces = [])
-      if hash_or_value.is_a?(Hash)
-        return hash_or_value.reduce({}) do |acc,kv| 
-          k,v = kv
-          # We must concat the arrays, creating a copy instead of mutation
-          # to handle the case where there are multiple sibling metrics in a namespace
-          new_namespaces = namespaces.clone
-          new_namespaces << k
-          acc.merge(flatten_metrics(v, new_namespaces))
-        end
-      else
-        { namespaces.join('.') => hash_or_value }
-      end
-    end
-
-    def self.format_queue_stats(pipeline_id, metric_store)
-      path = [:stats, :pipelines, pipeline_id, :queue, :type]
-      if metric_store.has_metric?(*path)
-        queue_type = metric_store.get_shallow(*path).value
-      else
-        queue_type = 'memory'
-      end
-
-      events = 0
-      queue_size_in_bytes = 0
-      max_queue_size_in_bytes = 0
-
-      if queue_type == "persisted"
-        queue_path = [:stats, :pipelines, pipeline_id, :queue]
-        events = metric_store.get_shallow(*queue_path, :events).value
-        queue_size_in_bytes = metric_store.get_shallow(*queue_path, :capacity, :queue_size_in_bytes).value
-        max_queue_size_in_bytes = metric_store.get_shallow(*queue_path, :capacity, :max_queue_size_in_bytes).value
-      end
-
-      {
-          :type => queue_type,
-          :events_count => events,
-          :queue_size_in_bytes => queue_size_in_bytes,
-          :max_queue_size_in_bytes => max_queue_size_in_bytes,
-      }
-    end
-  end
-end; end; end; end
diff --git a/x-pack/lib/monitoring/inputs/metrics/stats_event_factory.rb b/x-pack/lib/monitoring/inputs/metrics/stats_event_factory.rb
index a946a6d5e..0221a4b8a 100644
--- a/x-pack/lib/monitoring/inputs/metrics/stats_event_factory.rb
+++ b/x-pack/lib/monitoring/inputs/metrics/stats_event_factory.rb
@@ -1,33 +1,50 @@
 # Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
 # or more contributor license agreements. Licensed under the Elastic License;
 # you may not use this file except in compliance with the Elastic License.
-#
+
 module LogStash; module Inputs; class Metrics;
   class StatsEventFactory
     include ::LogStash::Util::Loggable
-    require 'monitoring/inputs/metrics/stats_event/pipelines_info'
+    require 'logstash/config/pipelines_info'
 
-    def initialize(global_stats, snapshot)
+    def initialize(global_stats, snapshot, cluster_uuid)
       @global_stats = global_stats
       @snapshot = snapshot
       @metric_store = @snapshot.metric_store
+      @cluster_uuid = cluster_uuid
+      @webserver_enabled = LogStash::SETTINGS.get_value("api.enabled")
     end
 
-    def make(agent, extended_performance_collection=true)
-      LogStash::Event.new(
+    def make(agent, extended_performance_collection = true, collection_interval = 10)
+      metrics_doc = {
         "timestamp" => @snapshot.created_at,
         "logstash" => fetch_node_stats(agent, @metric_store),
         "events" => format_global_event_count(@metric_store),
         "process" => format_process_stats(@metric_store),
-        "pipelines" => StatsEvent::PipelinesInfo.format_pipelines_info(agent, @metric_store, extended_performance_collection),
+        "pipelines" => LogStash::Config::PipelinesInfo.format_pipelines_info(agent, @metric_store, extended_performance_collection),
         "reloads" => format_reloads(@metric_store),
         "jvm" => format_jvm_stats(@metric_store),
         "os" => format_os_stats(@metric_store),
         "queue" => format_queue_stats(agent, @metric_store),
-        "@metadata" => {
+      }
+
+      if (LogStash::MonitoringExtension.use_direct_shipping?(LogStash::SETTINGS))
+        event_body = {
+          "type" => "logstash_stats",
+          "logstash_stats" => metrics_doc,
+          "cluster_uuid" => @cluster_uuid,
+          "interval_ms" => collection_interval * 1000,
+          "timestamp" => DateTime.now.strftime('%Y-%m-%dT%H:%M:%S.%L%z')
+        }
+      else
+        event_body = metrics_doc
+      end
+
+      LogStash::Event.new(
+        {"@metadata" => {
           "document_type" => "logstash_stats",
           "timestamp" => Time.now
-        }
+        }}.merge(event_body)
       )
     end
 
@@ -48,7 +65,7 @@ module LogStash; module Inputs; class Metrics;
       result["mem"] = {
         "heap_used_in_bytes" => heap_stats[:used_in_bytes],
         "heap_used_percent" => heap_stats[:used_percent],
-          "heap_max_in_bytes" => heap_stats[:max_in_bytes],
+        "heap_max_in_bytes" => heap_stats[:max_in_bytes],
         }
 
       result["gc"] = {
@@ -69,7 +86,7 @@ module LogStash; module Inputs; class Metrics;
         cpuacct = stats.extract_metrics([:os, :cgroup, :cpuacct], :control_group, :usage_nanos)
         cgroups_stats = stats.extract_metrics([:os, :cgroup, :cpu, :stat], :number_of_elapsed_periods, :number_of_times_throttled, :time_throttled_nanos)
         control_group = stats.get_shallow(:os, :cgroup, :cpu, :control_group).value
-        {:cpu => load_average, :cgroup => {:cpuacct =>  cpuacct, :cpu => {:control_group => control_group, :stat => cgroups_stats}}}
+        {:cpu => load_average, :cgroup => {:cpuacct => cpuacct, :cpu => {:control_group => control_group, :stat => cgroups_stats}}}
       else
         {:cpu => load_average}
       end
@@ -93,8 +110,6 @@ module LogStash; module Inputs; class Metrics;
     end
 
     def format_queue_stats(agent, stats)
-      events = 0
-
       pipelines_stats = stats.get_shallow(:stats, :pipelines)
 
       total_queued_events = 0
@@ -103,15 +118,20 @@ module LogStash; module Inputs; class Metrics;
         pipeline = agent.get_pipeline(pipeline_id)
         # Check if pipeline is nil to avoid race condition where metrics system refers pipeline that has been stopped already
         next if pipeline.nil? || pipeline.system? || type != 'persisted'
-        total_queued_events = p_stats[:queue][:events].value
+        total_queued_events += p_stats[:queue][:events].value
       end
 
       {:events_count => total_queued_events}
     end
 
     def fetch_node_stats(agent, stats)
+      if @webserver_enabled
+        http_addr = stats.get_shallow(:http_address).value
+      else
+        http_addr = nil
+      end
       @global_stats.merge({
-        "http_address" => stats.get_shallow(:http_address).value,
+        "http_address" => http_addr,
         "ephemeral_id" => agent.ephemeral_id
       })
     end
diff --git a/x-pack/lib/monitoring/inputs/timer_task_logger.rb b/x-pack/lib/monitoring/inputs/timer_task_logger.rb
index be3edac77..2471b26b8 100644
--- a/x-pack/lib/monitoring/inputs/timer_task_logger.rb
+++ b/x-pack/lib/monitoring/inputs/timer_task_logger.rb
@@ -14,7 +14,7 @@ module LogStash module Inputs
         if exception.is_a?(Concurrent::TimeoutError)
           logger.debug("metric shipper took too much time to complete", :exception => exception.class, :message => exception.message)
         else
-          logger.error("metric shipper exception", :exception => exception.class, :message => exception.message)
+          logger.error("metric shipper exception", :exception => exception.class, :message => exception.message, :backtrace => exception.backtrace)
         end
       end
     end
diff --git a/x-pack/lib/monitoring/internal_pipeline_source.rb b/x-pack/lib/monitoring/internal_pipeline_source.rb
index 403617960..15d782e77 100644
--- a/x-pack/lib/monitoring/internal_pipeline_source.rb
+++ b/x-pack/lib/monitoring/internal_pipeline_source.rb
@@ -11,15 +11,14 @@ module LogStash module Monitoring
     include LogStash::LicenseChecker::Licensed
     include LogStash::Helpers::ElasticsearchOptions
     include LogStash::Util::Loggable
-    VALID_LICENSES = %w(basic trial standard gold platinum)
     FEATURE = 'monitoring'
 
-    def initialize(pipeline_config, agent)
+    def initialize(pipeline_config, agent, settings)
       super(pipeline_config.settings)
       @pipeline_config = pipeline_config
-      @settings = LogStash::SETTINGS.clone
+      @settings = settings
       @agent = agent
-      @es_options = es_options_from_settings_or_modules(FEATURE, @settings)
+      @es_options = es_options_from_settings(FEATURE, @settings)
       setup_license_checker(FEATURE)
     end
 
@@ -31,12 +30,12 @@ module LogStash module Monitoring
       valid_basic_license?
     end
 
-    def update_license_state(xpack_info)
+    def update_license_state(xpack_info, is_serverless)
       return if valid_basic_license?
-      super(xpack_info) if xpack_info
+      super(xpack_info, is_serverless) if xpack_info
       if valid_basic_license?
         logger.info("Validated license for monitoring. Enabling monitoring pipeline.")
-        enable_monitoring()
+        enable_monitoring
       end
     end
 
@@ -46,10 +45,10 @@ module LogStash module Monitoring
     end
 
     def enable_monitoring
-      @agent.converge_state_and_update
+      @agent.converge_state_and_update_if_running
     end
 
-    def populate_license_state(xpack_info)
+    def populate_license_state(xpack_info, is_serverless)
       if xpack_info.failed?
         {
             :state => :error,
@@ -68,12 +67,20 @@ module LogStash module Monitoring
             :log_level => :error,
             :log_message => 'Monitoring is not available: License information is currently unavailable. Please make sure you have added your production elasticsearch connection info in the xpack.monitoring.elasticsearch settings.'
         }
-      elsif !xpack_info.license_one_of?(VALID_LICENSES)
+      elsif !xpack_info.license_one_of?(::LogStash::LicenseChecker::LICENSE_TYPES)
         {
             :state => :error,
             :log_level => :error,
             :log_message => "Monitoring is not available: #{xpack_info.license_type} is not a valid license for this feature."
         }
+      elsif !xpack_info.feature_enabled?(FEATURE) && is_serverless
+        {
+          :state => :error,
+          :log_level => :error,
+          :log_message => "Internal collection for monitoring is enabled in Logstash, but is not supported in the configured version of Elasticsearch.\n"\
+            "This instance of Logstash will NOT send its monitoring data to Elasticsearch. Please configure Elastic Agent to monitor Logstash. Documentation can be found at: \n"\
+            "https://www.elastic.co/guide/en/logstash/current/monitoring-with-elastic-agent.html"
+        }
       elsif !xpack_info.license_active?
         {
             :state => :ok,
diff --git a/x-pack/lib/monitoring/monitoring.rb b/x-pack/lib/monitoring/monitoring.rb
index 8fcdab088..c42ba7273 100644
--- a/x-pack/lib/monitoring/monitoring.rb
+++ b/x-pack/lib/monitoring/monitoring.rb
@@ -4,14 +4,14 @@
 
 require "logstash/agent"
 require "monitoring/internal_pipeline_source"
-require "logstash/config/pipeline_config"
 require 'helpers/elasticsearch_options'
-java_import java.util.concurrent.TimeUnit
 
 module LogStash
   class MonitoringExtension < LogStash::UniversalPlugin
     include LogStash::Util::Loggable
 
+    java_import java.util.concurrent.TimeUnit
+
     class TemplateData
       def initialize(node_uuid,
                      system_api_version,
@@ -29,18 +29,27 @@ module LogStash
         @es_hosts = es_settings['hosts']
         @user = es_settings['user']
         @password = es_settings['password']
-        @ca_path = es_settings['cacert']
-        @truststore_path = es_settings['truststore']
-        @truststore_password = es_settings['truststore_password']
-        @keystore_path = es_settings['keystore']
-        @keystore_password = es_settings['keystore_password']
+        @cloud_id = es_settings['cloud_id']
+        @cloud_auth = es_settings['cloud_auth']
+        @api_key = es_settings['api_key']
+        @proxy = es_settings['proxy']
+        @ssl_enabled = es_settings['ssl_enabled']
+        @ssl_certificate_authorities = es_settings['ssl_certificate_authorities']
+        @ca_trusted_fingerprint = es_settings['ca_trusted_fingerprint']
+        @ssl_truststore_path = es_settings['ssl_truststore_path']
+        @ssl_truststore_password = es_settings['ssl_truststore_password']
+        @ssl_keystore_path = es_settings['ssl_keystore_path']
+        @ssl_keystore_password = es_settings['ssl_keystore_password']
+        @ssl_verification_mode = es_settings.fetch('ssl_verification_mode', 'full')
+        @ssl_certificate = es_settings['ssl_certificate']
+        @ssl_key = es_settings['ssl_key']
+        @ssl_cipher_suites = es_settings['ssl_cipher_suites']
         @sniffing = es_settings['sniffing']
-        @ssl_certificate_verification = (es_settings['verification_mode'] == 'certificate')
       end
 
-      attr_accessor :system_api_version, :es_hosts, :user, :password, :node_uuid
-      attr_accessor :ca_path, :truststore_path, :truststore_password
-      attr_accessor :keystore_path, :keystore_password, :sniffing, :ssl_certificate_verification
+      attr_accessor :system_api_version, :es_hosts, :user, :password, :node_uuid, :cloud_id, :cloud_auth, :api_key
+      attr_accessor :proxy, :ssl_enabled, :ssl_certificate_authorities, :ca_trusted_fingerprint, :ssl_truststore_path, :ssl_truststore_password
+      attr_accessor :ssl_keystore_path, :ssl_keystore_password, :sniffing, :ssl_verification_mode, :ssl_cipher_suites, :ssl_certificate, :ssl_key
 
       def collection_interval
         TimeUnit::SECONDS.convert(@collection_interval, TimeUnit::NANOSECONDS)
@@ -50,20 +59,40 @@ module LogStash
         TimeUnit::SECONDS.convert(@collection_timeout_interval, TimeUnit::NANOSECONDS)
       end
 
+      def cloud_id?
+        !!cloud_id
+      end
+
+      def cloud_auth?
+        !!cloud_auth && cloud_id?
+      end
+
+      def proxy?
+        proxy
+      end
+
       def auth?
         user && password
       end
 
-      def ssl?
-        ca_path || (truststore_path && truststore_password) || (keystore_path && keystore_password)
+      def api_key?
+        api_key
       end
 
-      def truststore?
-        truststore_path && truststore_password
+      def ssl_enabled?
+        ssl_enabled || ssl_certificate_authorities || ca_trusted_fingerprint || ssl_truststore_path? || ssl_keystore_path? || ssl_certificate?
       end
 
-      def keystore?
-        keystore_path && keystore_password
+      def ssl_truststore_path?
+        ssl_truststore_path && ssl_truststore_password
+      end
+
+      def ssl_keystore_path?
+        ssl_keystore_path && ssl_keystore_password
+      end
+
+      def ssl_certificate?
+        ssl_certificate && ssl_key
       end
 
       def extended_performance_collection?
@@ -77,25 +106,46 @@ module LogStash
       def get_binding
         binding
       end
+
+      def monitoring_endpoint
+        if LogStash::MonitoringExtension.use_direct_shipping?(LogStash::SETTINGS)
+          "/_bulk/"
+        else
+          "/_monitoring/bulk?system_id=logstash&system_api_version=#{system_api_version}&interval=1s"
+        end
+      end
+
+      def monitoring_index
+        if LogStash::MonitoringExtension.use_direct_shipping?(LogStash::SETTINGS)
+          ".monitoring-logstash-#{system_api_version}-" + Time.now.utc.to_date.strftime("%Y.%m.%d")
+        else
+          "" #let the ES xpack's reporter to create it
+        end
+      end
     end
 
     class PipelineRegisterHook
       include LogStash::Util::Loggable, LogStash::Helpers::ElasticsearchOptions
 
       PIPELINE_ID = ".monitoring-logstash"
-      API_VERSION = 2
+      API_VERSION = 7
 
       def initialize
         # nothing to do here
       end
 
       def after_agent(runner)
-
         return unless monitoring_enabled?(runner.settings)
 
+        deprecation_logger.deprecated(
+            "Internal collectors option for Logstash monitoring is deprecated and targeted for removal in the next major version.\n"\
+            "Please configure Elastic Agent to monitor Logstash. Documentation can be found at: \n"\
+            "https://www.elastic.co/guide/en/logstash/current/monitoring-with-elastic-agent.html"
+            )
+
         logger.trace("registering the metrics pipeline")
         LogStash::SETTINGS.set("node.uuid", runner.agent.id)
-        internal_pipeline_source = LogStash::Monitoring::InternalPipelineSource.new(setup_metrics_pipeline, runner.agent)
+        internal_pipeline_source = LogStash::Monitoring::InternalPipelineSource.new(setup_metrics_pipeline, runner.agent, LogStash::SETTINGS.clone)
         runner.source_loader.add_source(internal_pipeline_source)
       rescue => e
         logger.error("Failed to set up the metrics pipeline", :message => e.message, :backtrace => e.backtrace)
@@ -105,11 +155,14 @@ module LogStash
       # For versions prior to 6.3 the default value of "xpack.monitoring.enabled" was true
       # For versions 6.3+ the default of "xpack.monitoring.enabled" is false.
       # To help keep passivity, assume that if "xpack.monitoring.elasticsearch.hosts" has been set that monitoring should be enabled.
-      # return true if xpack.monitoring.enabled=true (explicitly) or xpack.monitoring.elasticsearch.hosts is configured
+      # return true if xpack.monitoring.allow_legacy_collection=true and xpack.monitoring.enabled=true (explicitly) or xpack.monitoring.elasticsearch.hosts is configured
       def monitoring_enabled?(settings)
+        log_warn_if_legacy_is_enabled_and_not_allowed(settings)
+        return false unless settings.get_value("xpack.monitoring.allow_legacy_collection")
+        return settings.get_value("monitoring.enabled") if settings.set?("monitoring.enabled")
         return settings.get_value("xpack.monitoring.enabled") if settings.set?("xpack.monitoring.enabled")
 
-        if settings.set?("xpack.monitoring.elasticsearch.hosts")
+        if settings.set?("xpack.monitoring.elasticsearch.hosts") || settings.set?("xpack.monitoring.elasticsearch.cloud_id")
           logger.warn("xpack.monitoring.enabled has not been defined, but found elasticsearch configuration. Please explicitly set `xpack.monitoring.enabled: true` in logstash.yml")
           true
         else
@@ -119,6 +172,15 @@ module LogStash
         end
       end
 
+      def log_warn_if_legacy_is_enabled_and_not_allowed(settings)
+        allowed = settings.get_value("xpack.monitoring.allow_legacy_collection")
+        legacy_monitoring_enabled = (settings.get_value("xpack.monitoring.enabled") || settings.get_value("monitoring.enabled"))
+        if !allowed && legacy_monitoring_enabled
+          logger.warn("You have enabled legacy internal monitoring. However, starting from version 9.0, this feature is deactivated and behind a feature flag. Set `xpack.monitoring.allow_legacy_collection` to `true` to allow access to the feature.")
+        end
+      end
+      private :log_warn_if_legacy_is_enabled_and_not_allowed
+
       def setup_metrics_pipeline
         settings = LogStash::SETTINGS.clone
 
@@ -136,26 +198,55 @@ module LogStash
         logger.debug("compiled metrics pipeline config: ", :config => config)
 
         config_part = org.logstash.common.SourceWithMetadata.new("x-pack-metrics", "internal_pipeline_source", config)
-        LogStash::Config::PipelineConfig.new(self, PIPELINE_ID.to_sym, config_part, settings)
+        Java::OrgLogstashConfigIr::PipelineConfig.new(self.class, PIPELINE_ID.to_sym, [config_part], settings)
       end
 
       def generate_pipeline_config(settings)
-        collection_interval = settings.get("xpack.monitoring.collection.interval")
-        collection_timeout_interval = settings.get("xpack.monitoring.collection.timeout_interval")
-        extended_performance_collection = settings.get("xpack.monitoring.collection.pipeline.details.enabled")
-        config_collection = settings.get("xpack.monitoring.collection.config.enabled")
-        es_settings = es_options_from_settings_or_modules('monitoring', settings)
+        if settings.set?("xpack.monitoring.enabled") && settings.set?("monitoring.enabled")
+          raise ArgumentError.new("\"xpack.monitoring.enabled\" is configured while also \"monitoring.enabled\"")
+        end
+
+        if any_set?(settings, /^xpack.monitoring/, "xpack.monitoring.allow_legacy_collection") &&
+          any_set?(settings, /^monitoring./)
+          raise ArgumentError.new("\"xpack.monitoring.*\" settings can't be configured while using \"monitoring.*\"")
+        end
+
+        if MonitoringExtension.use_direct_shipping?(settings)
+          opt = retrieve_collection_settings(settings)
+        else
+          opt = retrieve_collection_settings(settings, "xpack.")
+        end
+        es_settings = es_options_from_settings('monitoring', settings)
         data = TemplateData.new(LogStash::SETTINGS.get("node.uuid"), API_VERSION,
                                 es_settings,
-                                collection_interval, collection_timeout_interval,
-                                extended_performance_collection, config_collection)
+                                opt[:collection_interval], opt[:collection_timeout_interval],
+                                opt[:extended_performance_collection], opt[:config_collection])
 
         template_path = ::File.join(::File.dirname(__FILE__), "..", "template.cfg.erb")
         template = ::File.read(template_path)
-        ERB.new(template, 3).result(data.get_binding)
+        ERB.new(template).result(data.get_binding)
+      end
+
+      private
+      def retrieve_collection_settings(settings, prefix = "")
+        opt = {}
+        opt[:collection_interval] = settings.get("#{prefix}monitoring.collection.interval").to_nanos
+        opt[:collection_timeout_interval] = settings.get("#{prefix}monitoring.collection.timeout_interval").to_nanos
+        opt[:extended_performance_collection] = settings.get("#{prefix}monitoring.collection.pipeline.details.enabled")
+        opt[:config_collection] = settings.get("#{prefix}monitoring.collection.config.enabled")
+        opt
+      end
+
+      def any_set?(settings, regexp, to_avoid = [])
+        !settings.get_subset(regexp).to_hash.keys.select{ |k| !to_avoid.include?(k)}.select { |k| settings.set?(k)}.empty?
       end
     end
 
+    def self.use_direct_shipping?(settings)
+      settings.get("monitoring.enabled")
+    end
+
+    public
     def initialize
       # nothing to do here
     end
@@ -167,28 +258,45 @@ module LogStash
 
     def additionals_settings(settings)
       logger.trace("registering additionals_settings")
+      register_monitoring_settings(settings, "xpack.")
+      # (Experimental) Direct shipping settings
+      register_monitoring_settings(settings)
 
-      settings.register(LogStash::Setting::Boolean.new("xpack.monitoring.enabled", false))
-      settings.register(LogStash::Setting::ArrayCoercible.new("xpack.monitoring.elasticsearch.hosts", String, [ "http://localhost:9200" ] ))
-      settings.register(LogStash::Setting::TimeValue.new("xpack.monitoring.collection.interval", "10s"))
-      settings.register(LogStash::Setting::TimeValue.new("xpack.monitoring.collection.timeout_interval", "10m"))
-      settings.register(LogStash::Setting::NullableString.new("xpack.monitoring.elasticsearch.username", "logstash_system"))
-      settings.register(LogStash::Setting::NullableString.new("xpack.monitoring.elasticsearch.password"))
-      settings.register(LogStash::Setting::NullableString.new("xpack.monitoring.elasticsearch.ssl.certificate_authority"))
-      settings.register(LogStash::Setting::NullableString.new("xpack.monitoring.elasticsearch.ssl.truststore.path"))
-      settings.register(LogStash::Setting::NullableString.new("xpack.monitoring.elasticsearch.ssl.truststore.password"))
-      settings.register(LogStash::Setting::NullableString.new("xpack.monitoring.elasticsearch.ssl.keystore.path"))
-      settings.register(LogStash::Setting::NullableString.new("xpack.monitoring.elasticsearch.ssl.keystore.password"))
-      settings.register(LogStash::Setting::String.new("xpack.monitoring.elasticsearch.ssl.verification_mode", "certificate", true, ["none", "certificate"]))
-      settings.register(LogStash::Setting::Boolean.new("xpack.monitoring.elasticsearch.sniffing", false))
-      settings.register(LogStash::Setting::Boolean.new("xpack.monitoring.collection.pipeline.details.enabled", true))
-      settings.register(LogStash::Setting::Boolean.new("xpack.monitoring.collection.config.enabled", true))
-
-      settings.register(LogStash::Setting::String.new("node.uuid", ""))
+      settings.register(LogStash::Setting::SettingString.new("node.uuid", ""))
     rescue => e
       logger.error e.message
       logger.error e.backtrace.to_s
       raise e
     end
+
+    private
+    def register_monitoring_settings(settings, prefix = "")
+      if prefix == "xpack."
+        settings.register(LogStash::Setting::Boolean.new("xpack.monitoring.allow_legacy_collection", false))
+      end
+      settings.register(LogStash::Setting::Boolean.new("#{prefix}monitoring.enabled", false))
+      settings.register(LogStash::Setting::ArrayCoercible.new("#{prefix}monitoring.elasticsearch.hosts", String, ["http://localhost:9200"]))
+      settings.register(LogStash::Setting::TimeValue.new("#{prefix}monitoring.collection.interval", "10s"))
+      settings.register(LogStash::Setting::TimeValue.new("#{prefix}monitoring.collection.timeout_interval", "10m"))
+      settings.register(LogStash::Setting::SettingNullableString.new("#{prefix}monitoring.elasticsearch.username", "logstash_system"))
+      settings.register(LogStash::Setting::SettingNullableString.new("#{prefix}monitoring.elasticsearch.password"))
+      settings.register(LogStash::Setting::SettingNullableString.new("#{prefix}monitoring.elasticsearch.proxy"))
+      settings.register(LogStash::Setting::SettingNullableString.new("#{prefix}monitoring.elasticsearch.cloud_id"))
+      settings.register(LogStash::Setting::SettingNullableString.new("#{prefix}monitoring.elasticsearch.cloud_auth"))
+      settings.register(LogStash::Setting::SettingNullableString.new("#{prefix}monitoring.elasticsearch.api_key"))
+      settings.register(LogStash::Setting::SettingNullableString.new("#{prefix}monitoring.elasticsearch.ssl.certificate_authority"))
+      settings.register(LogStash::Setting::SettingNullableString.new("#{prefix}monitoring.elasticsearch.ssl.ca_trusted_fingerprint"))
+      settings.register(LogStash::Setting::SettingNullableString.new("#{prefix}monitoring.elasticsearch.ssl.truststore.path"))
+      settings.register(LogStash::Setting::SettingNullableString.new("#{prefix}monitoring.elasticsearch.ssl.truststore.password"))
+      settings.register(LogStash::Setting::SettingNullableString.new("#{prefix}monitoring.elasticsearch.ssl.keystore.path"))
+      settings.register(LogStash::Setting::SettingNullableString.new("#{prefix}monitoring.elasticsearch.ssl.keystore.password"))
+      settings.register(LogStash::Setting::SettingString.new("#{prefix}monitoring.elasticsearch.ssl.verification_mode", "full", true, ["none", "certificate", "full"]))
+      settings.register(LogStash::Setting::SettingNullableString.new("#{prefix}monitoring.elasticsearch.ssl.certificate"))
+      settings.register(LogStash::Setting::SettingNullableString.new("#{prefix}monitoring.elasticsearch.ssl.key"))
+      settings.register(LogStash::Setting::ArrayCoercible.new("#{prefix}monitoring.elasticsearch.ssl.cipher_suites", String, []))
+      settings.register(LogStash::Setting::Boolean.new("#{prefix}monitoring.elasticsearch.sniffing", false))
+      settings.register(LogStash::Setting::Boolean.new("#{prefix}monitoring.collection.pipeline.details.enabled", true))
+      settings.register(LogStash::Setting::Boolean.new("#{prefix}monitoring.collection.config.enabled", true))
+    end
   end
 end
diff --git a/x-pack/lib/monitoring/outputs/elasticsearch_monitoring.rb b/x-pack/lib/monitoring/outputs/elasticsearch_monitoring.rb
new file mode 100644
index 000000000..84dadf8f5
--- /dev/null
+++ b/x-pack/lib/monitoring/outputs/elasticsearch_monitoring.rb
@@ -0,0 +1,16 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+module LogStash module Outputs
+  class ElasticSearchMonitoring < LogStash::Outputs::ElasticSearch
+    config_name "elasticsearch_monitoring"
+
+    # This is need to avoid deprecation warning in output
+    config :document_type, :validate => :string
+
+    def use_event_type?(client)
+      !LogStash::MonitoringExtension.use_direct_shipping?(LogStash::SETTINGS)
+    end
+  end
+end; end
diff --git a/x-pack/lib/template.cfg.erb b/x-pack/lib/template.cfg.erb
index 80e7b65f6..5f1b8e7cf 100644
--- a/x-pack/lib/template.cfg.erb
+++ b/x-pack/lib/template.cfg.erb
@@ -11,35 +11,62 @@ input {
   }
 }
 output {
-  elasticsearch {
-    hosts => <%= es_hosts %>
-    bulk_path => "/_xpack/monitoring/_bulk?system_id=logstash&system_api_version=<%= system_api_version %>&interval=1s"
-    manage_template => false
-    document_type => "%{[@metadata][document_type]}"
-    index => ""
-    sniffing => <%= sniffing %>
+  elasticsearch_monitoring {
   <% if auth? %>
     user => "<%= user %>"
     password => "<%= password %>"
   <% end %>
-  <% if ssl? %>
-    ssl => true
-    <% if ca_path %>
-        cacert => "<%= ca_path %>"
+  <% if api_key? %>
+    api_key => "<%= api_key %>"
+  <% end %>
+  <% if cloud_id? %>
+    cloud_id => "<%= cloud_id %>"
+  <% else %>
+    hosts => <%= es_hosts %>
+  <% end %>
+  <% if cloud_auth %>
+    cloud_auth => "<%= cloud_auth %>"
+  <% end %>
+    data_stream => false
+    bulk_path => "<%= monitoring_endpoint %>"
+    manage_template => false
+    document_type => "%{[@metadata][document_type]}"
+    index => "<%= monitoring_index %>"
+    sniffing => <%= sniffing %>
+  <% if proxy? %>
+    proxy => "<%= proxy %>"
+  <% end %>
+  <% if ssl_enabled? %>
+    ssl_enabled => true
+    <% if ssl_certificate_authorities %>
+        ssl_certificate_authorities => "<%= ssl_certificate_authorities %>"
     <% end %>
-    <% if truststore? %>
-        truststore => "<%= truststore_path %>"
-        truststore_password => "<%= truststore_password %>"
+    <% if ca_trusted_fingerprint %>
+        ca_trusted_fingerprint => <%= ca_trusted_fingerprint.inspect %>
     <% end %>
-    <% if keystore? %>
-        keystore => "<%= keystore_path %>"
-        keystore_password => "<%= keystore_password %>"
+    <% if ssl_truststore_path? %>
+        ssl_truststore_path => "<%= ssl_truststore_path %>"
+        ssl_truststore_password => "<%= ssl_truststore_password %>"
     <% end %>
-    ssl_certificate_verification => <%= ssl_certificate_verification %>
+    <% if ssl_keystore_path? %>
+        ssl_keystore_path => "<%= ssl_keystore_path %>"
+        ssl_keystore_password => "<%= ssl_keystore_password %>"
+    <% end %>
+    <% if ssl_certificate? %>
+        ssl_certificate => "<%= ssl_certificate %>"
+        ssl_key => "<%= ssl_key %>"
+    <% end %>
+    <% if ssl_cipher_suites %>
+        ssl_cipher_suites => <%= ssl_cipher_suites %>
+    <% end %>
+    ssl_verification_mode => <%= ssl_verification_mode %>
   <% else %>
     # In the case where the user does not want SSL we don't set ssl => false
     # the reason being that the user can still turn ssl on by using https in their URL
     # This causes the ES output to throw an error due to conflicting messages
   <% end %>
+    # Since this config is generated by Logstash and cannot be directly
+    # controlled by the user, we include a product origin header
+    custom_headers => { "x-elastic-product-origin" => "logstash" }
   }
 }
diff --git a/x-pack/lib/x-pack/logstash_registry.rb b/x-pack/lib/x-pack/logstash_registry.rb
index afa20d9e7..fbfa25cb4 100644
--- a/x-pack/lib/x-pack/logstash_registry.rb
+++ b/x-pack/lib/x-pack/logstash_registry.rb
@@ -3,29 +3,18 @@
 # you may not use this file except in compliance with the Elastic License.
 
 require "logstash/runner" # needed for LogStash::XPACK_PATH
-xpack_modules = ["azure", "arcsight"]
-xpack_modules.each do |name|
-  $LOAD_PATH << File.join(LogStash::XPACK_PATH, "modules", name, "lib")
-end
 require "logstash/plugins/registry"
-require "logstash/modules/util"
 require "monitoring/monitoring"
 require "monitoring/inputs/metrics"
+require "monitoring/outputs/elasticsearch_monitoring"
 require "config_management/extension"
-require "modules/xpack_scaffold"
-require "filters/azure_event"
+require "geoip_database_management/extension"
 
 LogStash::PLUGIN_REGISTRY.add(:input, "metrics", LogStash::Inputs::Metrics)
+LogStash::PLUGIN_REGISTRY.add(:output, "elasticsearch_monitoring", LogStash::Outputs::ElasticSearchMonitoring)
 LogStash::PLUGIN_REGISTRY.add(:universal, "monitoring", LogStash::MonitoringExtension)
 LogStash::PLUGIN_REGISTRY.add(:universal, "config_management", LogStash::ConfigManagement::Extension)
+LogStash::PLUGIN_REGISTRY.add(:universal, "geoip_database_management", LogStash::GeoipDatabaseManagement::Extension)
 
 license_levels = Hash.new
-license_levels.default = ["basic", "trial", "standard", "gold", "platinum"]
-
-xpack_modules.each do |name|
-  path = File.join(File.dirname(__FILE__), "..", "..", "modules", name, "configuration")
-  LogStash::PLUGIN_REGISTRY.add(:modules, name,
-    LogStash::Modules::XpackScaffold.new(name, path, license_levels[name]))
-end
-
-LogStash::PLUGIN_REGISTRY.add(:filter, "azure_event", LogStash::Filters::AzureEvent)
+license_levels.default = LogStash::LicenseChecker::LICENSE_TYPES
\ No newline at end of file
diff --git a/x-pack/modules/README.md b/x-pack/modules/README.md
deleted file mode 100644
index cafade216..000000000
--- a/x-pack/modules/README.md
+++ /dev/null
@@ -1,99 +0,0 @@
-# Module settings and structure
-
-## settings 
-
-### logstash.yml
-
-```
-modules:
-  - name: netflow
-    var.elasticsearch.hosts: "es.mycloud.com"
-    var.elasticsearch.username: "foo"
-    var.elasticsearch.password: "password"
-    var.kibana.host: "kb.mycloud.com"
-    var.kibana.username: "foo"
-    var.kibana.password: "password"
-    var.input.tcp.port: 5606
-```
-
-### command-line
-
-```
-bin/logstash \
- --modules netflow \
- -M "netflow.var.output.elasticsearch.host=es.mycloud.com" \
- -M "netflow.var.output.elasticsearch.user=foo" \
- -M "netflow.var.output.elasticsearch.password=password" \
- -M "netflow.var.input.tcp.port=5606"
-```
-
-## Current Gem structure
-```
-GEM File structure
-logstash-module-netflow
-├── configuration
-│   ├── elasticsearch
-│   │   └── netflow.json
-│   ├── kibana
-│   │   ├── dashboard
-│   │   │   └── netflow.json (contains '["dash1", "dash2"]')
-│   │   │   └── dash1.json ("panelJSON" contains refs to visualization panels 1,2 and search 1)
-│   │   │   └── dash2.json ("panelJSON" contains refs to visualization panel 3  and search 2)
-│   │   ├── index-pattern
-|   |   |   └── netflow.json
-│   │   ├── search
-|   |   |   └── search1.json
-|   |   |   └── search2.json
-│   │   └── vizualization
-|   |   |   └── panel1.json
-|   |   |   └── panel2.json
-|   |   |   └── panel3.json
-│   └── logstash
-│       └── netflow.conf.erb
-├── lib
-│   └── logstash_registry.rb
-└── logstash-module-netflow.gemspec
-```
-## Proposed multi-version Gem structure
-```
-GEM File structure
-logstash-module-netflow
-├── configuration
-│   ├── elasticsearch
-│   │   └── netflow.json
-│   ├── kibana
-│   │   ├── dashboard
-│   │   │   └── netflow.json (contains '{"v5.5.0": ["dash1", "dash2"], "v6.0.4": ["dash1", "dash2"]')
-│   │   │   └── v5.5.0
-│   │   │   |   └── dash1.json ("panelJSON" contains refs to visualization panels 1,2 and search 1)
-│   │   │   |   └── dash2.json ("panelJSON" contains refs to visualization panel 3  and search 2)
-│   │   │   └── v6.0.4
-│   │   │       └── dash1.json ("panelJSON" contains refs to visualization panels 1,2 and search 1)
-│   │   │       └── dash2.json ("panelJSON" contains refs to visualization panel 3  and search 2)
-│   │   ├── index-pattern
-│   │   │   └── v5
-|   |   |   |   └── netflow.json
-│   │   │   └── v6
-|   |   |       └── netflow.json
-│   │   ├── search
-│   │   │   └── v5
-|   |   |   |   └── search1.json
-|   |   |   |   └── search2.json
-│   │   │   └── v6
-|   |   |       └── search1.json
-|   |   |       └── search2.json
-│   │   └── vizualization
-│   │   │   └── v5
-|   |   |   |   └── panel1.json
-|   |   |   |   └── panel2.json
-|   |   |   |   └── panel3.json
-│   │   │   └── v6
-|   |   |       └── panel1.json
-|   |   |       └── panel2.json
-|   |   |       └── panel3.json
-│   └── logstash
-│       └── netflow.conf.erb
-├── lib
-│   └── logstash_registry.rb
-└── logstash-module-netflow.gemspec
-```
diff --git a/x-pack/modules/arcsight/configuration/elasticsearch/arcsight.json b/x-pack/modules/arcsight/configuration/elasticsearch/arcsight.json
deleted file mode 100644
index 2bad8e1bd..000000000
--- a/x-pack/modules/arcsight/configuration/elasticsearch/arcsight.json
+++ /dev/null
@@ -1,220 +0,0 @@
-{
-  "order": 0,
-  "index_patterns": "arcsight-*",
-  "mappings": {
-    "_meta": {
-      "version": "7.0.0"
-    },
-    "dynamic": true,
-    "dynamic_templates": [
-      {
-        "string_fields": {
-          "mapping": {
-            "type": "keyword"
-          },
-          "match_mapping_type": "string",
-          "match": "*"
-        }
-      }
-    ],
-    "properties": {
-      "destinationPort": {
-        "type": "integer"
-      },
-      "flexDate1": {
-        "format": "epoch_millis||epoch_second||date_time||MMM dd YYYY HH:mm:ss z||MMM dd yyyy HH:mm:ss",
-        "type": "date"
-      },
-      "sourcePort": {
-        "type": "integer"
-      },
-      "baseEventCount": {
-        "type": "integer"
-      },
-      "destinationAddress": {
-        "type": "ip"
-      },
-      "destinationProcessId": {
-        "type": "integer"
-      },
-      "oldFileSize": {
-        "type": "integer"
-      },
-      "destination": {
-        "dynamic": false,
-        "type": "object",
-        "properties": {
-          "city_name": {
-            "type": "keyword"
-          },
-          "country_name": {
-            "type": "keyword"
-          },
-          "country_code2": {
-              "type": "keyword"
-            },
-          "location": {
-            "type": "geo_point"
-          },
-          "region_name": {
-            "type": "keyword"
-          }
-        }
-      },
-      "source": {
-        "dynamic": false,
-        "type": "object",
-        "properties": {
-          "city_name": {
-            "type": "keyword"
-          },
-          "country_name": {
-            "type": "keyword"
-          },
-          "country_code2": {
-              "type": "keyword"
-            },
-          "location": {
-            "type": "geo_point"
-          },
-          "region_name": {
-            "type": "keyword"
-          }
-        }
-      },
-      "deviceReceiptTime": {
-        "format": "epoch_millis||epoch_second||date_time||MMM dd YYYY HH:mm:ss z||MMM dd yyyy HH:mm:ss",
-        "type": "date"
-      },
-      "destinationTranslatedPort": {
-        "type": "integer"
-      },
-      "deviceTranslatedAddress": {
-        "type": "ip"
-      },
-      "deviceAddress": {
-        "type": "ip"
-      },
-      "agentReceiptTime": {
-        "format": "epoch_millis||epoch_second||date_time||MMM dd YYYY HH:mm:ss z||MMM dd yyyy HH:mm:ss",
-        "type": "date"
-      },
-      "startTime": {
-        "format": "epoch_millis||epoch_second||date_time||MMM dd YYYY HH:mm:ss z||MMM dd yyyy HH:mm:ss",
-        "type": "date"
-      },
-      "sourceProcessId": {
-        "type": "integer"
-      },
-      "bytesIn": {
-        "type": "integer"
-      },
-      "bytesOut": {
-        "type": "integer"
-      },
-      "severity": {
-        "type": "keyword"
-      },
-      "deviceProcessId": {
-        "type": "integer"
-      },
-      "agentAddress": {
-        "type": "ip"
-      },
-      "sourceAddress": {
-        "type": "ip"
-      },
-      "sourceTranslatedPort": {
-        "type": "integer"
-      },
-      "deviceCustomDate2": {
-        "format": "epoch_millis||epoch_second||date_time||MMM dd YYYY HH:mm:ss z||MMM dd yyyy HH:mm:ss",
-        "type": "date"
-      },
-      "deviceCustomDate1": {
-        "format": "epoch_millis||epoch_second||date_time||MMM dd YYYY HH:mm:ss z||MMM dd yyyy HH:mm:ss",
-        "type": "date"
-      },
-      "flexNumber1": {
-        "type": "long"
-      },
-      "deviceCustomFloatingPoint1": {
-        "type": "float"
-      },
-      "oldFileModificationTime": {
-        "format": "epoch_millis||epoch_second||date_time||MMM dd YYYY HH:mm:ss z||MMM dd yyyy HH:mm:ss",
-        "type": "date"
-      },
-      "deviceCustomFloatingPoint2": {
-        "type": "float"
-      },
-      "oldFileCreateTime": {
-        "format": "epoch_millis||epoch_second||date_time||MMM dd YYYY HH:mm:ss z||MMM dd yyyy HH:mm:ss",
-        "type": "date"
-      },
-      "deviceCustomFloatingPoint3": {
-        "type": "float"
-      },
-      "sourceTranslatedAddress": {
-        "type": "ip"
-      },
-      "deviceCustomFloatingPoint4": {
-        "type": "float"
-      },
-      "flexNumber2": {
-        "type": "long"
-      },
-      "fileCreateTime": {
-        "format": "epoch_millis||epoch_second||date_time||MMM dd YYYY HH:mm:ss z||MMM dd yyyy HH:mm:ss",
-        "type": "date"
-      },
-      "fileModificationTime": {
-        "format": "epoch_millis||epoch_second||date_time||MMM dd YYYY HH:mm:ss z||MMM dd yyyy HH:mm:ss",
-        "type": "date"
-      },
-      "fileSize": {
-        "type": "integer"
-      },
-      "destinationTranslatedAddress": {
-        "type": "ip"
-      },
-      "endTime": {
-        "format": "epoch_millis||epoch_second||date_time||MMM dd YYYY HH:mm:ss z||MMM dd yyyy HH:mm:ss",
-        "type": "date"
-      },
-      "deviceCustomNumber1": {
-        "type": "long"
-      },
-      "deviceDirection": {
-        "type": "integer"
-      },
-      "device": {
-        "dynamic": false,
-        "type": "object",
-        "properties": {
-          "city_name": {
-            "type": "keyword"
-          },
-          "country_name": {
-            "type": "keyword"
-          },
-          "country_code2": {
-              "type": "keyword"
-            },
-          "location": {
-            "type": "geo_point"
-          },
-          "region_name": {
-            "type": "keyword"
-          }
-        }
-      },
-      "deviceCustomNumber3": {
-        "type": "long"
-      },
-      "deviceCustomNumber2": {
-        "type": "long"
-      }
-    }
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/dashboard/153e0bf0-752f-11e7-ae68-d756b92f3a9c.json b/x-pack/modules/arcsight/configuration/kibana/5.x/dashboard/153e0bf0-752f-11e7-ae68-d756b92f3a9c.json
deleted file mode 100644
index de87fe3cf..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/dashboard/153e0bf0-752f-11e7-ae68-d756b92f3a9c.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "title": "[ArcSight] Microsoft DNS Overview",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"col\":11,\"id\":\"4ee62420-7523-11e7-871d-5f0fb978413c\",\"panelIndex\":1,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"1de45d60-7523-11e7-9445-91c40765092f\",\"panelIndex\":3,\"row\":2,\"size_x\":10,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"d72d7940-7529-11e7-9445-91c40765092f\",\"panelIndex\":5,\"row\":9,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":1,\"id\":\"1c54cda0-752c-11e7-9445-91c40765092f\",\"panelIndex\":6,\"row\":13,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"8cda1c30-752a-11e7-9445-91c40765092f\",\"panelIndex\":7,\"row\":9,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":1,\"id\":\"aa57b050-7526-11e7-b440-f1d91dc5774d\",\"panelIndex\":9,\"row\":4,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"4303de60-752b-11e7-9445-91c40765092f\",\"panelIndex\":11,\"row\":15,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":1,\"id\":\"31b85570-454a-11e7-86b6-95298e9da6dc\",\"panelIndex\":12,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":1,\"id\":\"8f0161a0-752d-11e7-b440-f1d91dc5774d\",\"panelIndex\":13,\"row\":15,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":1,\"id\":\"ebfd45a0-75a4-11e7-b440-f1d91dc5774d\",\"panelIndex\":14,\"row\":6,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":7,\"id\":\"bd1c82c0-75a7-11e7-871d-5f0fb978413c\",\"panelIndex\":15,\"row\":6,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"size_x\":6,\"size_y\":3,\"panelIndex\":16,\"type\":\"visualization\",\"id\":\"c658b300-7745-11e7-8fb2-417804dc0ec8\",\"col\":7,\"row\":19},{\"size_x\":6,\"size_y\":3,\"panelIndex\":17,\"type\":\"visualization\",\"id\":\"b1f98ce0-7745-11e7-8fb2-417804dc0ec8\",\"col\":1,\"row\":19}]",
-  "optionsJSON": "{\"darkTheme\":false}",
-  "uiStateJSON": "{\"P-11\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-13\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-3\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-5\":{\"vis\":{\"defaultColors\":{\"0 - 18k\":\"rgb(247,251,255)\",\"18k - 36k\":\"rgb(227,238,249)\",\"36k - 54k\":\"rgb(208,225,242)\",\"54k - 72k\":\"rgb(182,212,233)\",\"72k - 90k\":\"rgb(148,196,223)\",\"90k - 108k\":\"rgb(107,174,214)\",\"108k - 126k\":\"rgb(74,152,201)\",\"126k - 144k\":\"rgb(46,126,188)\",\"144k - 162k\":\"rgb(23,100,171)\",\"162k - 180k\":\"rgb(8,74,145)\"},\"legendOpen\":false}},\"P-16\":{\"mapZoom\":1,\"mapCenter\":[12.211180191503997,0]},\"P-17\":{\"mapZoom\":1,\"mapCenter\":[-0.17578097424708533,0]}}",
-  "version": 1,
-  "timeRestore": true,
-  "timeTo": "now",
-  "timeFrom": "now-24h",
-  "refreshInterval": {
-    "display": "Off",
-    "pause": false,
-    "value": 0
-  },
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/dashboard/37af0b40-398d-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/5.x/dashboard/37af0b40-398d-11e7-ae19-21fb91585845.json
deleted file mode 100644
index 4bc87aece..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/dashboard/37af0b40-398d-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "title": "[ArcSight] Network Overview Dashboard",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"col\":1,\"id\":\"77cb1470-3989-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":1,\"row\":12,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"801fff70-395a-11e7-ae19-21fb91585845\",\"panelIndex\":2,\"row\":18,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"d6d526f0-395b-11e7-ae19-21fb91585845\",\"panelIndex\":5,\"row\":4,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"f57ea930-395d-11e7-ae19-21fb91585845\",\"panelIndex\":6,\"row\":16,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"161e27e0-3988-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":7,\"row\":2,\"size_x\":10,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"75582a90-3987-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":9,\"row\":6,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":5,\"id\":\"e9c3ee00-3978-11e7-ae19-21fb91585845\",\"panelIndex\":11,\"row\":6,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"ad802c10-3973-11e7-ae19-21fb91585845\",\"panelIndex\":13,\"row\":9,\"size_x\":8,\"size_y\":3,\"type\":\"visualization\"},{\"col\":9,\"id\":\"ec926660-396f-11e7-ae19-21fb91585845\",\"panelIndex\":15,\"row\":9,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":9,\"id\":\"154ff7e0-3987-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":16,\"row\":6,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"5acb74d0-398b-11e7-ae19-21fb91585845\",\"panelIndex\":17,\"row\":14,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"7a043760-3990-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":18,\"row\":20,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":7,\"id\":\"fd70bca0-398f-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":19,\"row\":20,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":11,\"id\":\"ed2f5570-3d5b-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":20,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"31b85570-454a-11e7-86b6-95298e9da6dc\",\"panelIndex\":21,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"size_x\":6,\"size_y\":6,\"panelIndex\":24,\"type\":\"visualization\",\"id\":\"45387480-3989-11e7-8b9d-ddc45b5f6d00\",\"col\":1,\"row\":24},{\"size_x\":6,\"size_y\":6,\"panelIndex\":25,\"type\":\"visualization\",\"id\":\"35ce1310-3989-11e7-8b9d-ddc45b5f6d00\",\"col\":7,\"row\":24}]",
-  "optionsJSON": "{\"darkTheme\":false}",
-  "uiStateJSON": "{\"P-11\":{\"vis\":{\"colors\":{\"/Attempt\":\"#0A50A1\",\"/Failure\":\"#BF1B00\",\"/Success\":\"#629E51\"}}},\"P-13\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-15\":{\"vis\":{\"defaultColors\":{\"0% - 17%\":\"rgb(255,255,204)\",\"17% - 34%\":\"rgb(255,230,146)\",\"34% - 50%\":\"rgb(254,191,90)\",\"50% - 67%\":\"rgb(253,141,60)\",\"67% - 84%\":\"rgb(244,61,37)\",\"84% - 100%\":\"rgb(202,8,35)\"},\"legendOpen\":false}},\"P-16\":{\"vis\":{\"colors\":{\"Anti-Virus\":\"#EF843C\",\"Content Security\":\"#7EB26D\",\"Firewall\":\"#E24D42\",\"Integrated Security\":\"#962D82\",\"Network-based IDS/IPS\":\"#1F78C1\",\"Operating System\":\"#1F78C1\",\"VPN\":\"#EAB839\"}}},\"P-18\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-7\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"},\"legendOpen\":false}},\"P-8\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-9\":{\"vis\":{\"colors\":{\"/Attempt\":\"#0A50A1\",\"/Failure\":\"#BF1B00\",\"/Success\":\"#629E51\"}}},\"P-25\":{\"mapZoom\":1,\"mapCenter\":[-0.3515602939922709,0]},\"P-24\":{\"mapZoom\":1,\"mapCenter\":[-0.3515602939922709,0]}}",
-  "version": 1,
-  "timeRestore": true,
-  "timeTo": "now",
-  "timeFrom": "now-24h",
-  "refreshInterval": {
-    "display": "Off",
-    "pause": false,
-    "value": 0
-  },
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/dashboard/64c92510-4555-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/5.x/dashboard/64c92510-4555-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index f16c6eb63..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/dashboard/64c92510-4555-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "title": "[ArcSight] Endpoint OS Activity Dashboard",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"col\":1,\"id\":\"c9e333a0-4550-11e7-86b6-95298e9da6dc\",\"panelIndex\":3,\"row\":8,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"463fc740-454e-11e7-86b6-95298e9da6dc\",\"panelIndex\":4,\"row\":2,\"size_x\":10,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"8f8d6230-454f-11e7-86b6-95298e9da6dc\",\"panelIndex\":5,\"row\":8,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"f0664070-4551-11e7-86b6-95298e9da6dc\",\"panelIndex\":7,\"row\":6,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"d8314510-454f-11e7-86b6-95298e9da6dc\",\"panelIndex\":8,\"row\":14,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"2b369910-4553-11e7-83ea-67cb6920446d\",\"panelIndex\":9,\"row\":11,\"size_x\":6,\"size_y\":6,\"type\":\"visualization\"},{\"col\":7,\"id\":\"9141cc20-4553-11e7-83ea-67cb6920446d\",\"panelIndex\":10,\"row\":11,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"31b85570-454a-11e7-86b6-95298e9da6dc\",\"panelIndex\":11,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":11,\"id\":\"0e4558b0-4552-11e7-86b6-95298e9da6dc\",\"panelIndex\":12,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"47c2a140-454f-11e7-86b6-95298e9da6dc\",\"panelIndex\":13,\"row\":4,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":9,\"id\":\"68180c80-4556-11e7-83ea-67cb6920446d\",\"panelIndex\":14,\"row\":17,\"size_x\":4,\"size_y\":5,\"type\":\"visualization\"},{\"col\":9,\"id\":\"08ee04d0-4556-11e7-83ea-67cb6920446d\",\"panelIndex\":15,\"row\":22,\"size_x\":4,\"size_y\":6,\"type\":\"visualization\"},{\"col\":1,\"id\":\"b897ce70-4556-11e7-83ea-67cb6920446d\",\"panelIndex\":16,\"row\":21,\"size_x\":8,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"93531890-4556-11e7-83ea-67cb6920446d\",\"panelIndex\":17,\"row\":26,\"size_x\":8,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"a8ce0ef0-4556-11e7-83ea-67cb6920446d\",\"panelIndex\":18,\"row\":17,\"size_x\":8,\"size_y\":4,\"type\":\"visualization\"},{\"col\":1,\"id\":\"82caeb10-4556-11e7-83ea-67cb6920446d\",\"panelIndex\":19,\"row\":24,\"size_x\":8,\"size_y\":2,\"type\":\"visualization\"}]",
-  "optionsJSON": "{\"darkTheme\":false}",
-  "uiStateJSON": "{\"P-13\":{\"vis\":{\"colors\":{\"Destination Users\":\"#E24D42\",\"Event Count\":\"#64B0C8\"}}},\"P-14\":{\"vis\":{\"legendOpen\":false}},\"P-15\":{\"vis\":{\"legendOpen\":false}},\"P-2\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-3\":{\"vis\":{\"colors\":{\"Count\":\"#64B0C8\",\"Destination User Names\":\"#E24D42\",\"Event Types\":\"#EF843C\"},\"legendOpen\":true}},\"P-4\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-5\":{\"vis\":{\"defaultColors\":{\"0 - 55k\":\"rgb(255,255,204)\",\"55k - 110k\":\"rgb(255,241,170)\",\"110k - 165k\":\"rgb(254,225,135)\",\"165k - 220k\":\"rgb(254,201,101)\",\"220k - 275k\":\"rgb(254,171,73)\",\"275k - 330k\":\"rgb(253,141,60)\",\"330k - 385k\":\"rgb(252,91,46)\",\"385k - 440k\":\"rgb(237,47,34)\",\"440k - 495k\":\"rgb(212,16,32)\",\"495k - 550k\":\"rgb(176,0,38)\"},\"legendOpen\":false}},\"P-8\":{\"vis\":{\"colors\":{\"/Attempt\":\"#447EBC\",\"/Failure\":\"#E24D42\",\"/Success\":\"#7EB26D\"}}},\"P-9\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}}",
-  "version": 1,
-  "timeRestore": true,
-  "timeTo": "now",
-  "timeFrom": "now-24h",
-  "refreshInterval": {
-    "display": "Off",
-    "pause": false,
-    "value": 0
-  },
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/dashboard/82051450-3e56-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/5.x/dashboard/82051450-3e56-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index ff6c22a0c..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/dashboard/82051450-3e56-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "title": "[ArcSight] Network Suspicious Activity Dashboard",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"col\":1,\"id\":\"aa2ff0a0-3e4a-11e7-96c4-0d3a291ec93a\",\"panelIndex\":1,\"row\":8,\"size_x\":8,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"992c7bd0-3e4e-11e7-96c4-0d3a291ec93a\",\"panelIndex\":2,\"row\":11,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":5,\"id\":\"f99c22e0-3e4e-11e7-96c4-0d3a291ec93a\",\"panelIndex\":3,\"row\":11,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"e3888410-3e50-11e7-96c4-0d3a291ec93a\",\"panelIndex\":5,\"row\":6,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":9,\"id\":\"75582a90-3987-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":9,\"row\":8,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"0bdbb5a0-3e55-11e7-96c4-0d3a291ec93a\",\"panelIndex\":11,\"row\":4,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"afdba840-3e55-11e7-96c4-0d3a291ec93a\",\"panelIndex\":12,\"row\":14,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":7,\"id\":\"bfa45650-3e55-11e7-96c4-0d3a291ec93a\",\"panelIndex\":13,\"row\":14,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":9,\"id\":\"cd462cc0-3e55-11e7-96c4-0d3a291ec93a\",\"panelIndex\":14,\"row\":11,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"31b85570-454a-11e7-86b6-95298e9da6dc\",\"panelIndex\":15,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":1,\"id\":\"161e27e0-3988-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":16,\"row\":2,\"size_x\":10,\"size_y\":2,\"type\":\"visualization\"},{\"col\":11,\"id\":\"ed2f5570-3d5b-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":17,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"}]",
-  "optionsJSON": "{\"darkTheme\":false}",
-  "uiStateJSON": "{\"P-1\":{\"vis\":{\"colors\":{\"Destination Addresses\":\"#E0752D\",\"Destination Ports\":\"#E24D42\"},\"legendOpen\":false}},\"P-16\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-17\":{\"vis\":{\"defaultColors\":{\"0 - 50\":\"rgb(255,255,204)\",\"100 - 200\":\"rgb(253,141,60)\",\"200 - 300\":\"rgb(227,27,28)\",\"300 - 400\":\"rgb(128,0,38)\",\"50 - 100\":\"rgb(254,217,118)\"}}},\"P-2\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-3\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-8\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-9\":{\"vis\":{\"colors\":{\"/Attempt\":\"#0A50A1\",\"/Failure\":\"#BF1B00\",\"/Success\":\"#629E51\"}}}}",
-  "version": 1,
-  "timeRestore": true,
-  "timeTo": "now",
-  "timeFrom": "now-24h",
-  "refreshInterval": {
-    "display": "Off",
-    "pause": false,
-    "value": 0
-  },
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/dashboard/arcsight.json b/x-pack/modules/arcsight/configuration/kibana/5.x/dashboard/arcsight.json
deleted file mode 100644
index dc18789aa..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/dashboard/arcsight.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  "153e0bf0-752f-11e7-ae68-d756b92f3a9c",
-  "37af0b40-398d-11e7-ae19-21fb91585845",
-  "64c92510-4555-11e7-83ea-67cb6920446d",
-  "82051450-3e56-11e7-96c4-0d3a291ec93a",
-  "d2fa5030-3e5d-11e7-b212-897f1496dc0e"
-]
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/dashboard/d2fa5030-3e5d-11e7-b212-897f1496dc0e.json b/x-pack/modules/arcsight/configuration/kibana/5.x/dashboard/d2fa5030-3e5d-11e7-b212-897f1496dc0e.json
deleted file mode 100644
index 899b113b2..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/dashboard/d2fa5030-3e5d-11e7-b212-897f1496dc0e.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "title": "[ArcSight] Endpoint Overview Dashboard",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"col\":11,\"id\":\"c53825b0-3e4b-11e7-af78-9fc514b4e118\",\"panelIndex\":1,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"e301a830-3e4d-11e7-af78-9fc514b4e118\",\"panelIndex\":2,\"row\":9,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"9de87d40-3e4e-11e7-af78-9fc514b4e118\",\"panelIndex\":3,\"row\":9,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"96af5bf0-3e50-11e7-af78-9fc514b4e118\",\"panelIndex\":5,\"row\":4,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"ff476320-3e4a-11e7-af78-9fc514b4e118\",\"panelIndex\":6,\"row\":12,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"b74e59b0-3e5f-11e7-899c-f940f646009b\",\"panelIndex\":7,\"row\":2,\"size_x\":10,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"7c6875e0-3e61-11e7-899c-f940f646009b\",\"panelIndex\":8,\"row\":12,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"columns\":[\"categoryDeviceGroup\",\"categoryTechnique\",\"categoryOutcome\",\"categorySignificance\",\"categoryObject\",\"categoryBehavior\",\"categoryDeviceType\"],\"id\":\"1d9ba830-3e47-11e7-af78-9fc514b4e118\",\"panelIndex\":9,\"row\":20,\"size_x\":12,\"size_y\":5,\"sort\":[\"deviceReceiptTime\",\"desc\"],\"type\":\"search\"},{\"col\":7,\"id\":\"cc8affd0-3e65-11e7-899c-f940f646009b\",\"panelIndex\":10,\"row\":15,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"1bde8be0-3e68-11e7-899c-f940f646009b\",\"panelIndex\":11,\"row\":6,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"7c414c90-3e66-11e7-899c-f940f646009b\",\"panelIndex\":12,\"row\":15,\"size_x\":6,\"size_y\":5,\"type\":\"visualization\"},{\"col\":7,\"id\":\"6fb90a30-3e6b-11e7-9d4a-89ea81333ea4\",\"panelIndex\":14,\"row\":6,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"31b85570-454a-11e7-86b6-95298e9da6dc\",\"panelIndex\":15,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"size_x\":6,\"size_y\":3,\"panelIndex\":17,\"type\":\"visualization\",\"id\":\"2a33c810-3e4d-11e7-af78-9fc514b4e118\",\"col\":7,\"row\":17}]",
-  "optionsJSON": "{\"darkTheme\":false}",
-  "uiStateJSON": "{\"P-11\":{\"vis\":{\"colors\":{\"Anti-Virus\":\"#EAB839\",\"Database\":\"#629E51\",\"Host-based IDS/IPS\":\"#E0752D\",\"Operating System\":\"#BF1B00\",\"Security Mangement\":\"#64B0C8\"}}},\"P-12\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-14\":{\"vis\":{\"colors\":{\"/Attempt\":\"#0A50A1\",\"/Failure\":\"#BF1B00\",\"/Informational\":\"#7EB26D\",\"/Informational/Warning\":\"#EF843C\",\"/Success\":\"#629E51\",\"Anti-Virus\":\"#EAB839\",\"Database\":\"#629E51\",\"Host-based IDS/IPS\":\"#E0752D\",\"Log Consolidator\":\"#E0F9D7\",\"Operating System\":\"#BF1B00\",\"Recon\":\"#BF1B00\",\"Security Mangement\":\"#64B0C8\"}}},\"P-2\":{\"vis\":{\"colors\":{\"/Attempt\":\"#0A50A1\",\"/Failure\":\"#BF1B00\",\"/Success\":\"#629E51\"}}},\"P-3\":{\"vis\":{\"colors\":{\"/Attempt\":\"#0A50A1\",\"/Failure\":\"#BF1B00\",\"/Success\":\"#629E51\"}}},\"P-7\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-8\":{\"vis\":{\"colors\":{\"/Attempt\":\"#0A50A1\",\"/Failure\":\"#BF1B00\",\"/Success\":\"#629E51\"}}},\"P-17\":{\"mapZoom\":1,\"mapCenter\":[12.897489183755892,0]}}",
-  "version": 1,
-  "timeRestore": true,
-  "timeTo": "now",
-  "timeFrom": "now-24h",
-  "refreshInterval": {
-    "display": "Off",
-    "pause": false,
-    "value": 0
-  },
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/index-pattern/arcsight.json b/x-pack/modules/arcsight/configuration/kibana/5.x/index-pattern/arcsight.json
deleted file mode 100644
index ef9b91ecb..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/index-pattern/arcsight.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "title":"arcsight-*",
-  "timeFieldName":"deviceReceiptTime",
-  "notExpandable":true,
-  "fieldFormatMap": "{\"bytesIn\":{\"id\":\"bytes\"},\"bytesOut\":{\"id\":\"bytes\"},\"totalBytes\":{\"id\":\"bytes\"}}",
-  "fields":"[{\"name\":\"flexDate1\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"fileName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString3Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"modelConfidence\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categoryObject\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"oldFileSize\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceLongitude\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceSeverity\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"source.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceServiceName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"device.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categoryOutcome\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"applicationProtocol\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString2Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceProcessId\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"deviceAction\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categoryBehavior\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"locality\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"priority\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomFloatingPoint1\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"relevance\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"oldFileModificationTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"deviceCustomFloatingPoint2\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destination.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceAssetId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomFloatingPoint3\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"sourceTranslatedAddress\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomFloatingPoint4\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"fileCreateTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"device.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"deviceFacility\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceUserId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationProcessName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomNumber1\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceDirection\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"source.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomNumber3\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomNumber2\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationPort\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"source.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceLatitude\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"device.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceHostName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationProcessId\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"destinationTimeZone\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString6Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomNumber2Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceOutboundInterface\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceAddress\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString5Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destination.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"requestUrl\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"transportProtocol\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceProcessName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"startTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceProduct\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceProcessId\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"deviceCustomNumber1Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categoryDeviceType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"bytesOut\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationDnsDomain\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceAddress\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationServiceName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceTranslatedPort\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString1\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString3\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString2\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationHostName\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString5\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"flexNumber1\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"devicePayloadId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString4\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"oldFileCreateTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"deviceCustomString6\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceEventCategory\",\"type\":\"string\",\"count\":3,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"flexNumber2\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"@timestamp\",\"type\":\"date\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"fileModificationTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"destinationTranslatedAddress\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categoryDeviceGroup\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"endTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destination.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationMacAddress\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourcePort\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationAddress\",\"type\":\"ip\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceReceiptTime\",\"type\":\"date\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationTranslatedZoneURI\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomDate2Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categoryTupleDescription\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationTranslatedPort\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceTranslatedAddress\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"sourceTranslatedZoneURI\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceInboundInterface\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"source.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentReceiptTime\",\"type\":\"date\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomDate1Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationLatitude\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceHostName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"eventId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentAddress\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceDnsDomain\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomDate2\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"deviceCustomDate1\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categorySignificance\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceEventClassId\",\"type\":\"string\",\"count\":3,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"port\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"fileSize\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"name\",\"type\":\"string\",\"count\":3,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"arcsightVersion\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationNtDomain\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"baseEventCount\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceVendor\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categoryTechnique\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentTimeZone\",\"type\":\"string\",\"count\":2,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"managerReceiptTime\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"customerURI\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceExternalId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationUserName\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationAssetId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"@version\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentHost\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationUserId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"bytesIn\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"severity\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomNumber3Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceUserName\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"filePath\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"externalId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString1Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceVersion\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationLongitude\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destination.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"device.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString4Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentVersion\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"fileType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationUserPrivileges\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"fileId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"originator\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceNtDomain\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceNtDomain\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceProcessName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"requestMethod\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentMacAddress\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceMacAddress\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false,\"searchable\":false,\"aggregatable\":false}]"
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/search/16a72e70-4543-11e7-9510-4b0b4978ab0e.json b/x-pack/modules/arcsight/configuration/kibana/5.x/search/16a72e70-4543-11e7-9510-4b0b4978ab0e.json
deleted file mode 100644
index e15b985f3..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/search/16a72e70-4543-11e7-9510-4b0b4978ab0e.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "title": "DNS Events",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "deviceVendor",
-    "deviceProduct",
-    "applicationProtocol",
-    "categoryBehavior",
-    "categoryOutcome",
-    "destinationAddress",
-    "destinationDnsDomain",
-    "destinationPort",
-    "deviceCustomString1Label",
-    "deviceCustomString1",
-    "deviceCustomString3Label",
-    "deviceCustomString3",
-    "deviceCustomString4Label",
-    "deviceCustomString4",
-    "deviceEventCategory",
-    "deviceHostName",
-    "deviceSeverity",
-    "sourceAddress",
-    "sourcePort",
-    "transportProtocol"
-  ],
-  "sort": [
-    "deviceReceiptTime",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"arcsight-*\",\"highlightAll\":true,\"version\":true,\"query\":{\"query_string\":{\"query\":\"deviceEventCategory:\\\"dns\\\"\",\"analyze_wildcard\":true}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/search/1d9ba830-3e47-11e7-af78-9fc514b4e118.json b/x-pack/modules/arcsight/configuration/kibana/5.x/search/1d9ba830-3e47-11e7-af78-9fc514b4e118.json
deleted file mode 100644
index 849977aef..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/search/1d9ba830-3e47-11e7-af78-9fc514b4e118.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "title": "Endpoint Event Explorer [ArcSight]",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "categoryDeviceGroup",
-    "categoryTechnique",
-    "categoryOutcome",
-    "categorySignificance",
-    "categoryObject",
-    "categoryBehavior",
-    "categoryDeviceType"
-  ],
-  "sort": [
-    "deviceReceiptTime",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"arcsight-*\",\"highlightAll\":true,\"version\":true,\"filter\":[],\"query\":{\"query_string\":{\"query\":\"categoryDeviceGroup:\\\"/Operating System\\\" OR categoryDeviceGroup:\\\"/IDS/Host\\\" OR categoryDeviceGroup:\\\"/Application\\\"\",\"analyze_wildcard\":true}}}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/search/6315e7a0-34be-11e7-95dc-4f6090d732f6.json b/x-pack/modules/arcsight/configuration/kibana/5.x/search/6315e7a0-34be-11e7-95dc-4f6090d732f6.json
deleted file mode 100644
index 47da6b1ba..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/search/6315e7a0-34be-11e7-95dc-4f6090d732f6.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "title": "Network Events [ArcSight]",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "priority",
-    "name",
-    "sourceAddress",
-    "sourcePort",
-    "destinationAddress",
-    "destinationPort",
-    "applicationProtocol",
-    "message",
-    "categoryBehavior",
-    "categoryOutcome",
-    "deviceAddress",
-    "deviceProduct",
-    "deviceVendor",
-    "categoryDeviceGroup",
-    "categoryDeviceType"
-  ],
-  "sort": [
-    "deviceReceiptTime",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"arcsight-*\",\"highlightAll\":true,\"version\":true,\"query\":{\"query_string\":{\"query\":\"categoryDeviceGroup:\\\"/Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\"\",\"analyze_wildcard\":true}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/search/7a2fc9c0-454d-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/5.x/search/7a2fc9c0-454d-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index a30a0099d..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/search/7a2fc9c0-454d-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "title": "Endpoint - OS Events [ArcSight]",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "deviceVendor",
-    "deviceProduct",
-    "name",
-    "deviceEventClassId",
-    "deviceEventCategory",
-    "sourceUserName",
-    "destinationUserName",
-    "destinationHostName",
-    "categoryBehavior",
-    "categoryOutcome",
-    "sourceNtDomain",
-    "destinationNTDomain"
-  ],
-  "sort": [
-    "deviceReceiptTime",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"arcsight-*\",\"highlightAll\":true,\"version\":true,\"filter\":[],\"query\":{\"query_string\":{\"query\":\"categoryDeviceGroup:\\\"/Operating System\\\"\",\"analyze_wildcard\":true}}}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/search/bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744.json b/x-pack/modules/arcsight/configuration/kibana/5.x/search/bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744.json
deleted file mode 100644
index 5a91447cf..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/search/bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "title": "Microsoft DNS Events [ArcSight]",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "deviceVendor",
-    "deviceProduct",
-    "categoryBehavior",
-    "categoryOutcome",
-    "destinationAddress",
-    "destinationPort",
-    "destinationHostName",
-    "deviceEventClassId",
-    "deviceCustomString1Label",
-    "deviceCustomString1",
-    "deviceCustomString2Label",
-    "deviceCustomString2",
-    "deviceCustomString3Label",
-    "deviceCustomString3",
-    "deviceCustomString4Label",
-    "deviceCustomString4",
-    "deviceEventCategory",
-    "deviceSeverity",
-    "sourceAddress",
-    "sourcePort",
-    "transportProtocol",
-    "bytesIn",
-    "requestUrl"
-  ],
-  "sort": [
-    "deviceReceiptTime",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"arcsight-*\",\"highlightAll\":true,\"version\":true,\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"deviceProduct:\\\"DNS Trace Log\\\"\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/039815b0-4548-11e7-a94a-5d0a73686c64.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/039815b0-4548-11e7-a94a-5d0a73686c64.json
deleted file mode 100644
index 4f6a514b7..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/039815b0-4548-11e7-a94a-5d0a73686c64.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Destination Domains by Source Address",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Source Address(es)\",\"field\":\"sourceAddress\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":10},\"schema\":\"segment\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"Destination Domain(s)\",\"field\":\"destinationDnsDomain\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":5},\"schema\":\"group\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Source Address(es)\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"value\"}]},\"title\":\"Top Destination Domains by Source Address\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "16a72e70-4543-11e7-9510-4b0b4978ab0e",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/08ee04d0-4556-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/08ee04d0-4556-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index df6551db6..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/08ee04d0-4556-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Source Users by Destination Users [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Source Users by Destination Users [ArcSight]\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"bottom\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"sourceUserName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source Users\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationUserName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Users\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/08f8cf10-3e57-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/08f8cf10-3e57-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index ecbe24d6e..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/08f8cf10-3e57-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Firewall - Navigation",
-  "visState": "{\"title\":\"Firewall - Navigation\",\"type\":\"markdown\",\"params\":{\"markdown\":\"### **Navigation Pane** ###\\n\\n[Firewall Devices Overview](#/dashboard/37af0b40-398d-11e7-ae19-21fb91585845)\\n\\n[Firewall Suspicious Activities](#/dashboard/82051450-3e56-11e7-96c4-0d3a291ec93a)\\n\\n[Endopint Overview](#dashboard/d2fa5030-3e5d-11e7-b212-897f1496dc0e)\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/0bdbb5a0-3e55-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/0bdbb5a0-3e55-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index 4e0820bf1..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/0bdbb5a0-3e55-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Source Addresses [ArcSight]",
-  "visState": "{\"title\":\"Events by Source Addresses [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"e1a58ab0-3957-11e7-ae19-21fb91585845\",\"type\":\"timeseries\",\"series\":[{\"id\":\"8f58a280-395a-11e7-ae19-21fb91585845\",\"color\":\"rgba(211,49,21,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"8f58a281-395a-11e7-ae19-21fb91585845\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"sigma\":\"\",\"id\":\"140cf490-395b-11e7-ae19-21fb91585845\",\"type\":\"moving_average\",\"field\":\"8f58a281-395a-11e7-ae19-21fb91585845\"}],\"seperate_axis\":1,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":\"0\",\"fill\":\"0\",\"stacked\":\"none\",\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\" \",\"terms_field\":\"deviceHostName\",\"terms_order_by\":null,\"label\":\"Events\",\"steps\":0,\"value_template\":\"{{value}}\"},{\"id\":\"3bb711b0-395b-11e7-ae19-21fb91585845\",\"color\":\"rgba(104,188,0,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"3bb711b1-395b-11e7-ae19-21fb91585845\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"4b515cc0-395b-11e7-ae19-21fb91585845\",\"type\":\"moving_average\",\"field\":\"3bb711b1-395b-11e7-ae19-21fb91585845\"}],\"seperate_axis\":1,\"axis_position\":\"left\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":\"0\",\"point_size\":1,\"fill\":\"0.5\",\"stacked\":\"none\",\"terms_field\":\"sourceAddress\",\"terms_size\":\"10\",\"label\":\"Top Source Addresses\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"id\":\"e4772140-3957-11e7-ae19-21fb91585845\"}],\"background_color\":null,\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\" \",\"background_color_rules\":[{\"id\":\"837bfbb0-395a-11e7-ae19-21fb91585845\"}],\"gauge_color_rules\":[{\"id\":\"8970f250-395a-11e7-ae19-21fb91585845\"}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/0e4558b0-4552-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/0e4558b0-4552-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 80a064424..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/0e4558b0-4552-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Endpoint - OS Average EPS [ArcSight]",
-  "visState": "{\"title\":\"Endpoint - OS Average EPS [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"3f2cf630-3e4b-11e7-af78-9fc514b4e118\",\"type\":\"gauge\",\"series\":[{\"id\":\"3f2cf631-3e4b-11e7-af78-9fc514b4e118\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"3f2cf632-3e4b-11e7-af78-9fc514b4e118\",\"type\":\"count\"},{\"id\":\"2f12f3d0-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"cumulative_sum\",\"field\":\"3f2cf632-3e4b-11e7-af78-9fc514b4e118\"},{\"unit\":\"1s\",\"id\":\"330d7a00-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"derivative\",\"field\":\"2f12f3d0-7dc5-11e7-95f6-690ab80d4e85\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"373fd910-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"moving_average\",\"field\":\"330d7a00-7dc5-11e7-95f6-690ab80d4e85\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Event Throughput\",\"offset_time\":\"1m\",\"value_template\":\"{{value}} / s\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"id\":\"527ca820-3e4b-11e7-af78-9fc514b4e118\"}],\"gauge_color_rules\":[{\"id\":\"52cee6d0-3e4b-11e7-af78-9fc514b4e118\"}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"filter\":\"categoryDeviceGroup:\\\"/Operating System\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/1439a5e0-3e69-11e7-899c-f940f646009b.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/1439a5e0-3e69-11e7-899c-f940f646009b.json
deleted file mode 100644
index 6dffb7e69..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/1439a5e0-3e69-11e7-899c-f940f646009b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Endpoint - Navigation",
-  "visState": "{\"title\":\"Endpoint - Navigation\",\"type\":\"markdown\",\"params\":{\"markdown\":\"### **Navigation Pane** ###\\n\\n[Endopint Overview](#dashboard/d2fa5030-3e5d-11e7-b212-897f1496dc0e)\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/154ff7e0-3987-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/154ff7e0-3987-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index ebad5d522..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/154ff7e0-3987-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Device Type Breakdown [ArcSight]",
-  "visState": "{\"title\":\"Device Type Breakdown [ArcSight]\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"categoryDeviceType\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Firewall Types\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/161e27e0-3988-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/161e27e0-3988-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index 96f03bf4b..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/161e27e0-3988-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Device Metrics Overview [ArcSight]",
-  "visState": "{\"title\":\"Device Metrics Overview [ArcSight]\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"30\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"12\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"8\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceHostName\",\"customLabel\":\"Devices\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceAddress\",\"customLabel\":\"Sources\"}},{\"id\":\"6\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationAddress\",\"customLabel\":\"Destinations\"}},{\"id\":\"7\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationPort\",\"customLabel\":\"Ports\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/1bde8be0-3e68-11e7-899c-f940f646009b.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/1bde8be0-3e68-11e7-899c-f940f646009b.json
deleted file mode 100644
index a4ac4d693..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/1bde8be0-3e68-11e7-899c-f940f646009b.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Device Types by Vendor [ArcSight]",
-  "visState": "{\"title\":\"Device Types by Vendor [ArcSight]\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"categoryDeviceType\",\"exclude\":\"Network-based IDS/IPS\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceVendor\",\"exclude\":\"\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/1c54cda0-752c-11e7-9445-91c40765092f.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/1c54cda0-752c-11e7-9445-91c40765092f.json
deleted file mode 100644
index bbfecefa1..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/1c54cda0-752c-11e7-9445-91c40765092f.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Event Types [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Event Types [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"square root\",\"orientation\":\"single\",\"minFontSize\":18,\"maxFontSize\":72},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceEventClassId\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/1de45d60-7523-11e7-9445-91c40765092f.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/1de45d60-7523-11e7-9445-91c40765092f.json
deleted file mode 100644
index 1852246bc..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/1de45d60-7523-11e7-9445-91c40765092f.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "DNS Metrics Overview [ArcSight]",
-  "visState": "{\"title\":\"DNS Metrics Overview [ArcSight]\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"32\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"type\":\"gauge\"},\"aggs\":[{\"id\":\"5\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceCustomString1\",\"customLabel\":\"Threads\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceCustomString2\",\"customLabel\":\"OpCodes\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceEventClassId\",\"customLabel\":\"Activity Types\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/2a33c810-3e4d-11e7-af78-9fc514b4e118.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/2a33c810-3e4d-11e7-af78-9fc514b4e118.json
deleted file mode 100644
index 41c822af8..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/2a33c810-3e4d-11e7-af78-9fc514b4e118.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Destination Locations by Event [ArcSight]",
-  "visState": "{\"title\":\"Top Destination Locations by Event [ArcSight]\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Shaded Circle Markers\",\"isDesaturated\":true,\"addTooltip\":true,\"heatMaxZoom\":0,\"heatMinOpacity\":0.1,\"heatRadius\":25,\"heatBlur\":15,\"heatNormalizeData\":true,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[0,0],\"wms\":{\"enabled\":false,\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\",\"options\":{\"version\":\"1.3.0\",\"layers\":\"0\",\"format\":\"image/png\",\"transparent\":true,\"attribution\":\"Maps provided by USGS\",\"styles\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"destination.location\",\"autoPrecision\":true,\"useGeocentroid\":true,\"precision\":2}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/2b369910-4553-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/2b369910-4553-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index 3d9899c01..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/2b369910-4553-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 15 Event Types by Events [ArcSight]",
-  "visState": "{\"title\":\"Top 15 Event Types by Events [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":15,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"categoryBehavior\",\"size\":15,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Types\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceUserName\",\"customLabel\":\"Source Users\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationUserName\",\"customLabel\":\"Destination Users\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceHostName\",\"customLabel\":\"Source Hosts\"}},{\"id\":\"6\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationHostName\",\"customLabel\":\"Destination Hosts\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/31b85570-454a-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/31b85570-454a-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 49ae1c4c5..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/31b85570-454a-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "ArcSight: Dashboard Navigation",
-  "visState": "{\"title\":\"ArcSight: Dashboard Navigation\",\"type\":\"markdown\",\"params\":{\"markdown\":\"[Network Overview](#/dashboard/37af0b40-398d-11e7-ae19-21fb91585845) | [Network Suspicious Activity](#/dashboard/82051450-3e56-11e7-96c4-0d3a291ec93a) | [Endpoint Overview](#dashboard/d2fa5030-3e5d-11e7-b212-897f1496dc0e) | [Endpoint OS Activity](#/dashboard/64c92510-4555-11e7-83ea-67cb6920446d) | [Microsoft DNS Overview](#/dashboard/153e0bf0-752f-11e7-ae68-d756b92f3a9c)\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/35ce1310-3989-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/35ce1310-3989-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index c3f38b9c9..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/35ce1310-3989-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Source Locations by Events [ArcSight]",
-  "visState": "{\"title\":\"Top Source Locations by Events [ArcSight]\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Shaded Circle Markers\",\"isDesaturated\":true,\"addTooltip\":true,\"heatMaxZoom\":0,\"heatMinOpacity\":0.1,\"heatRadius\":25,\"heatBlur\":15,\"heatNormalizeData\":true,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[0,0],\"wms\":{\"enabled\":false,\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\",\"options\":{\"version\":\"1.3.0\",\"layers\":\"0\",\"format\":\"image/png\",\"transparent\":true,\"attribution\":\"Maps provided by USGS\",\"styles\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"source.location\",\"autoPrecision\":true,\"useGeocentroid\":true,\"precision\":2,\"customLabel\":\"Source Location\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/4303de60-752b-11e7-9445-91c40765092f.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/4303de60-752b-11e7-9445-91c40765092f.json
deleted file mode 100644
index faa2946b2..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/4303de60-752b-11e7-9445-91c40765092f.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Destinations by Size [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Destinations by Size [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"destinationHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destinations\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesIn\",\"customLabel\":\"Bytes\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceAddress\",\"customLabel\":\"Sources\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Count\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/45387480-3989-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/45387480-3989-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index f2ea2c2f5..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/45387480-3989-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Destination Locations by Events [ArcSight]",
-  "visState": "{\"title\":\"Top Destination Locations by Events [ArcSight]\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Shaded Circle Markers\",\"isDesaturated\":true,\"addTooltip\":true,\"heatMaxZoom\":0,\"heatMinOpacity\":0.1,\"heatRadius\":25,\"heatBlur\":15,\"heatNormalizeData\":true,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[0,0],\"wms\":{\"enabled\":false,\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\",\"options\":{\"version\":\"1.3.0\",\"layers\":\"0\",\"format\":\"image/png\",\"transparent\":true,\"attribution\":\"Maps provided by USGS\",\"styles\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"destination.location\",\"autoPrecision\":true,\"useGeocentroid\":true,\"precision\":2,\"customLabel\":\"Destination Location\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/463fc740-454e-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/463fc740-454e-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 27f69b91b..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/463fc740-454e-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Endpoint OS Metrics Overview [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{\"customLabel\":\"Total Events\"},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"6\",\"params\":{\"customLabel\":\"Devices\",\"field\":\"deviceHostName\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"7\",\"params\":{\"customLabel\":\"Event Types\",\"field\":\"categoryBehavior\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"8\",\"params\":{\"customLabel\":\"Event Outcomes\",\"field\":\"categoryOutcome\"},\"schema\":\"metric\",\"type\":\"cardinality\"}],\"listeners\":{},\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"30\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"20\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"title\":\"Endpoint OS Metrics Overview [ArcSight]\",\"type\":\"metric\"}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/47c2a140-454f-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/47c2a140-454f-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 9949dcbe5..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/47c2a140-454f-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Events by Source and Destination Users [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{\"customLabel\":\"Event Count\"},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customInterval\":\"2h\",\"customLabel\":\"Timestamp\",\"extended_bounds\":{},\"field\":\"deviceReceiptTime\",\"interval\":\"auto\",\"min_doc_count\":1},\"schema\":\"segment\",\"type\":\"date_histogram\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"Source Users\",\"field\":\"sourceUserName\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"4\",\"params\":{\"customLabel\":\"Destination Users\",\"field\":\"destinationUserName\"},\"schema\":\"metric\",\"type\":\"cardinality\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Timestamp\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Event Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"},{\"data\":{\"id\":\"3\",\"label\":\"Source Users\"},\"drawLinesBetweenPoints\":true,\"interpolate\":\"linear\",\"lineWidth\":3,\"mode\":\"normal\",\"show\":true,\"showCircles\":true,\"type\":\"line\",\"valueAxis\":\"ValueAxis-2\"},{\"data\":{\"id\":\"4\",\"label\":\"Destination Users\"},\"drawLinesBetweenPoints\":true,\"interpolate\":\"linear\",\"lineWidth\":3,\"mode\":\"normal\",\"show\":true,\"showCircles\":true,\"type\":\"line\",\"valueAxis\":\"ValueAxis-2\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Event Count\"},\"type\":\"value\"},{\"id\":\"ValueAxis-2\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"RightAxis-1\",\"position\":\"right\",\"scale\":{\"mode\":\"normal\",\"type\":\"square root\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"\"},\"type\":\"value\"}]},\"title\":\"Events by Source and Destination Users [ArcSight]\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/49953800-4547-11e7-a94a-5d0a73686c64.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/49953800-4547-11e7-a94a-5d0a73686c64.json
deleted file mode 100644
index 7428f6902..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/49953800-4547-11e7-a94a-5d0a73686c64.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Top Destination Domains",
-  "visState": "{\"title\":\"Top Destination Domains\",\"type\":\"metrics\",\"params\":{\"id\":\"45479ab0-4545-11e7-a94a-5d0a73686c64\",\"type\":\"top_n\",\"series\":[{\"id\":\"45479ab1-4545-11e7-a94a-5d0a73686c64\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"45479ab2-4545-11e7-a94a-5d0a73686c64\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.3\",\"stacked\":\"none\",\"label\":\"Top Destination Domains\",\"terms_field\":\"destinationDnsDomain\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"deviceEventCategory:\\\"dns\\\"\",\"background_color_rules\":[{\"id\":\"efe6b130-4546-11e7-a94a-5d0a73686c64\"}],\"bar_color_rules\":[{\"id\":\"f596fdb0-4546-11e7-a94a-5d0a73686c64\"}]},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/4cf91f90-3d5c-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/4cf91f90-3d5c-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index b02fbeb48..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/4cf91f90-3d5c-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Firewall - Devices - Top EPS by Category Device Type",
-  "visState": "{\"title\":\"Firewall - Devices - Top EPS by Category Device Type\",\"type\":\"metrics\",\"params\":{\"id\":\"429af7e0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"top_n\",\"series\":[{\"id\":\"429af7e1-3d5b-11e7-8b9d-ddc45b5f6d00\",\"color\":\"rgba(252,220,0,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"linear\",\"unit\":\"\",\"id\":\"112da8a0-3d5c-11e7-8b9d-ddc45b5f6d00\",\"type\":\"moving_average\",\"field\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Top EPS contributors by Category Device Type\",\"value_template\":\"{{value}}/s\",\"terms_field\":\"categoryDeviceType\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\"\",\"bar_color_rules\":[{\"id\":\"77dd4e80-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"background_color_rules\":[{\"id\":\"798c5e10-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"gauge_color_rules\":[{\"value\":0,\"id\":\"988f35d0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"gauge\":null}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"gauge_max\":\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/4ee62420-7523-11e7-871d-5f0fb978413c.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/4ee62420-7523-11e7-871d-5f0fb978413c.json
deleted file mode 100644
index a9cd7ba92..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/4ee62420-7523-11e7-871d-5f0fb978413c.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "DNS - Event Throughput [ArcSight]",
-  "visState": "{\"title\":\"DNS - Event Throughput [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"429af7e0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"gauge\",\"series\":[{\"id\":\"429af7e1-3d5b-11e7-8b9d-ddc45b5f6d00\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"count\"},{\"id\":\"6497aaa0-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"cumulative_sum\",\"field\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\"},{\"unit\":\"1s\",\"id\":\"6800ed50-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"derivative\",\"field\":\"6497aaa0-7dc5-11e7-95f6-690ab80d4e85\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"6cf98290-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"moving_average\",\"field\":\"6800ed50-7dc5-11e7-95f6-690ab80d4e85\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Event Throughput\",\"value_template\":\"{{value}}  / s\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"deviceProduct:\\\"DNS Trace Log\\\"\",\"bar_color_rules\":[{\"id\":\"77dd4e80-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"background_color_rules\":[{\"id\":\"798c5e10-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"gauge_color_rules\":[{\"value\":0,\"id\":\"988f35d0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"gauge\":null}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"gauge_max\":\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/4ff86ee0-4549-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/4ff86ee0-4549-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index d845508c2..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/4ff86ee0-4549-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Source Address",
-  "visState": "{\"title\":\"Top Source Address\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"square root\",\"orientation\":\"single\",\"minFontSize\":11,\"maxFontSize\":60},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"sourceAddress\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source Addresses\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "16a72e70-4543-11e7-9510-4b0b4978ab0e",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/5acacad0-3986-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/5acacad0-3986-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index f6536a32a..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/5acacad0-3986-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Firewall - Devices - Event Outcome over Time",
-  "visState": "{\"title\":\"Firewall - Devices - Event Outcome over Time\",\"type\":\"area\",\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Time\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"interpolate\":\"linear\",\"mode\":\"normal\",\"show\":\"true\",\"showCircles\":true,\"type\":\"area\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Count\"},\"type\":\"value\"}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceReceiptTime\",\"interval\":\"auto\",\"customInterval\":\"2h\",\"min_doc_count\":1,\"extended_bounds\":{},\"customLabel\":\"Time\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"categoryOutcome\",\"size\":2,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Outcome\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"/Failure\":\"#BF1B00\",\"/Success\":\"#629E51\"}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/5acb74d0-398b-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/5acb74d0-398b-11e7-ae19-21fb91585845.json
deleted file mode 100644
index 0e3b215b9..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/5acb74d0-398b-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Device Types [ArcSight]",
-  "visState": "{\"title\":\"Events by Device Types [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"e1a58ab0-3957-11e7-ae19-21fb91585845\",\"type\":\"timeseries\",\"series\":[{\"id\":\"8f58a280-395a-11e7-ae19-21fb91585845\",\"color\":\"rgba(211,49,21,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"8f58a281-395a-11e7-ae19-21fb91585845\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"sigma\":\"\",\"id\":\"140cf490-395b-11e7-ae19-21fb91585845\",\"type\":\"moving_average\",\"field\":\"8f58a281-395a-11e7-ae19-21fb91585845\"}],\"seperate_axis\":1,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":\"0\",\"fill\":\"0\",\"stacked\":\"none\",\"filter\":\"\",\"terms_field\":\"deviceHostName\",\"terms_order_by\":null,\"label\":\"Events\",\"steps\":0,\"split_filters\":[{\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\"\",\"label\":\"Firewall\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"e403ef60-4684-11e7-8ffc-b5cec7c0edbb\"}]},{\"id\":\"3bb711b0-395b-11e7-ae19-21fb91585845\",\"color\":\"rgba(251,158,0,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"3bb711b1-395b-11e7-ae19-21fb91585845\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"4b515cc0-395b-11e7-ae19-21fb91585845\",\"type\":\"moving_average\",\"field\":\"3bb711b1-395b-11e7-ae19-21fb91585845\"}],\"seperate_axis\":1,\"axis_position\":\"left\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"terms_field\":\"categoryDeviceType\",\"terms_size\":\"10\",\"label\":\"Top Device Types by Mvg Averages\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"id\":\"e4772140-3957-11e7-ae19-21fb91585845\"}],\"background_color\":null,\"filter\":\"categoryDeviceType:\\\"Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\"\",\"background_color_rules\":[{\"id\":\"837bfbb0-395a-11e7-ae19-21fb91585845\"}],\"gauge_color_rules\":[{\"id\":\"8970f250-395a-11e7-ae19-21fb91585845\"}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/6414e6b0-4549-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/6414e6b0-4549-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index dd73a788c..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/6414e6b0-4549-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Destination Domain",
-  "visState": "{\"title\":\"Top Destination Domain\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"square root\",\"orientation\":\"single\",\"minFontSize\":11,\"maxFontSize\":60},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationDnsDomain\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"DNS Domains\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "16a72e70-4543-11e7-9510-4b0b4978ab0e",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/68180c80-4556-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/68180c80-4556-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index fbd5e8036..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/68180c80-4556-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Sources by Destinations [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Sources by Destinations [ArcSight]\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"bottom\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"sourceHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source Host\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Host\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/6bb7d0e0-4548-11e7-a94a-5d0a73686c64.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/6bb7d0e0-4548-11e7-a94a-5d0a73686c64.json
deleted file mode 100644
index 50b81de88..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/6bb7d0e0-4548-11e7-a94a-5d0a73686c64.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Query Type by Device",
-  "visState": "{\"title\":\"Query Type by Device\",\"type\":\"heatmap\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"enableHover\":false,\"legendPosition\":\"right\",\"times\":[],\"colorsNumber\":4,\"colorSchema\":\"Yellow to Red\",\"setColorRange\":false,\"colorsRange\":[],\"invertColors\":false,\"percentageMode\":false,\"valueAxes\":[{\"show\":false,\"id\":\"ValueAxis-1\",\"type\":\"value\",\"scale\":{\"type\":\"linear\",\"defaultYExtents\":false},\"labels\":{\"show\":false,\"rotate\":0,\"color\":\"#555\"}}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"DNS Device\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"deviceCustomString1\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"DNS Query Types\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 33\":\"rgb(255,255,204)\",\"33 - 65\":\"rgb(254,217,118)\",\"65 - 98\":\"rgb(253,141,60)\",\"98 - 130\":\"rgb(227,27,28)\"}}}",
-  "description": "",
-  "savedSearchId": "16a72e70-4543-11e7-9510-4b0b4978ab0e",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/6dfc0e30-3958-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/6dfc0e30-3958-11e7-ae19-21fb91585845.json
deleted file mode 100644
index 25df0ef43..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/6dfc0e30-3958-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Firewall - Devices - Top Devices by Event Count",
-  "visState": "{\"title\":\"Firewall - Devices - Top Devices by Event Count\",\"type\":\"metrics\",\"params\":{\"id\":\"e1a58ab0-3957-11e7-ae19-21fb91585845\",\"type\":\"top_n\",\"series\":[{\"id\":\"e1a58ab1-3957-11e7-ae19-21fb91585845\",\"color\":\"rgba(174,161,255,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"e1a58ab2-3957-11e7-ae19-21fb91585845\",\"type\":\"count\",\"field\":\"deviceHostName\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Top Firewall Devices\",\"terms_field\":\"deviceHostName\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"id\":\"e4772140-3957-11e7-ae19-21fb91585845\"}],\"background_color\":null,\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/6fb90a30-3e6b-11e7-9d4a-89ea81333ea4.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/6fb90a30-3e6b-11e7-9d4a-89ea81333ea4.json
deleted file mode 100644
index 749c41904..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/6fb90a30-3e6b-11e7-9d4a-89ea81333ea4.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Outcomes by User Names [ArcSight]",
-  "visState": "{\"title\":\"Outcomes by User Names [ArcSight]\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":false,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"categoryDeviceType\",\"exclude\":\"Network-based IDS/IPS\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"categoryOutcome\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"6\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationUserName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"/Informational\":\"#7EB26D\",\"/Informational/Warning\":\"#EF843C\",\"/Success\":\"#64B0C8\",\"Anti-Virus\":\"#B7DBAB\",\"Host-based IDS/IPS\":\"#629E51\",\"Log Consolidator\":\"#E0F9D7\",\"Operating System\":\"#3F6833\",\"Recon\":\"#BF1B00\",\"Security Mangement\":\"#CFFAFF\"},\"legendOpen\":true}}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/7008cd50-3988-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/7008cd50-3988-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index c6c260e8c..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/7008cd50-3988-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Bandwidth Overview",
-  "visState": "{\"title\":\"Bandwidth Overview\",\"type\":\"metric\",\"params\":{\"handleNoResults\":true,\"fontSize\":\"25\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesIn\",\"customLabel\":\"Incoming\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesOut\",\"customLabel\":\"Outgoing\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/75582a90-3987-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/75582a90-3987-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index e705ad00a..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/75582a90-3987-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Outcome by Device Type [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Firewall Types\",\"field\":\"categoryDeviceType\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":10},\"schema\":\"segment\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"Event Outcome\",\"field\":\"categoryOutcome\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":3},\"schema\":\"group\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"rotate\":75,\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Firewall Types\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"orderBucketsBySum\":true,\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"percentage\",\"type\":\"square root\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"value\"}]},\"title\":\"Outcome by Device Type [ArcSight]\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"/Success\":\"#629E51\",\"/Failure\":\"#BF1B00\"}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/77cb1470-3989-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/77cb1470-3989-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index 296621ddd..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/77cb1470-3989-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Application Protocols [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Application Protocols [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"square root\",\"orientation\":\"single\",\"minFontSize\":26,\"maxFontSize\":72,\"hideLabel\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"applicationProtocol\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/7a043760-3990-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/7a043760-3990-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index f865b6c0c..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/7a043760-3990-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Source Countries by Events [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Source Countries by Events [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Total Events\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"source.country_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source Country\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceAddress\",\"customLabel\":\"Source Addresses\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationAddress\",\"customLabel\":\"Destination Addresses\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationPort\",\"customLabel\":\"Destination Ports\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/7c414c90-3e66-11e7-899c-f940f646009b.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/7c414c90-3e66-11e7-899c-f940f646009b.json
deleted file mode 100644
index 4d79dcb46..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/7c414c90-3e66-11e7-899c-f940f646009b.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Source Countries by Event [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Source Countries by Event [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Total Events\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"source.country_name\",\"size\":35,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceAddress\",\"customLabel\":\"Source Addresses\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationAddress\",\"customLabel\":\"Destination Addresses\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationPort\",\"customLabel\":\"Destination Ports\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/7c6875e0-3e61-11e7-899c-f940f646009b.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/7c6875e0-3e61-11e7-899c-f940f646009b.json
deleted file mode 100644
index 124299cbe..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/7c6875e0-3e61-11e7-899c-f940f646009b.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Outcomes by Device Type [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"field\":\"categoryDeviceType\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":5},\"schema\":\"segment\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"field\":\"categoryOutcome\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":5},\"schema\":\"group\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":200},\"position\":\"left\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"categoryDeviceType: Descending\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"normal\",\"show\":true,\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":true,\"rotate\":75,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"bottom\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"value\"}]},\"title\":\"Outcomes by Device Type [ArcSight]\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"/Failure\":\"#BF1B00\"},\"legendOpen\":true}}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/801fff70-395a-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/801fff70-395a-11e7-ae19-21fb91585845.json
deleted file mode 100644
index a18226097..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/801fff70-395a-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Bandwidth Utilization [ArcSight]",
-  "visState": "{\"title\":\"Bandwidth Utilization [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"e1a58ab0-3957-11e7-ae19-21fb91585845\",\"type\":\"timeseries\",\"series\":[{\"id\":\"e1a58ab1-3957-11e7-ae19-21fb91585845\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"e1a58ab2-3957-11e7-ae19-21fb91585845\",\"type\":\"sum\",\"field\":\"bytesIn\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"bytes\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Inbound\",\"terms_field\":\"deviceHostName\",\"terms_order_by\":\"_count\",\"override_index_pattern\":1,\"series_index_pattern\":\"arcsight-*\",\"series_time_field\":\"deviceReceiptTime\"},{\"id\":\"67c18da0-3959-11e7-ae19-21fb91585845\",\"color\":\"rgba(244,78,59,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"67c18da1-3959-11e7-ae19-21fb91585845\",\"type\":\"sum\",\"field\":\"bytesOut\"},{\"script\":\"params.outbound > 0 ? params.outbound * -1 : 0\",\"id\":\"7ec4d1b0-3959-11e7-ae19-21fb91585845\",\"type\":\"calculation\",\"variables\":[{\"id\":\"a9fb70f0-3959-11e7-ae19-21fb91585845\",\"name\":\"outbound\",\"field\":\"67c18da1-3959-11e7-ae19-21fb91585845\"}]}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"bytes\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Outbound\",\"override_index_pattern\":1,\"series_index_pattern\":\"arcsight-*\",\"series_time_field\":\"deviceReceiptTime\",\"steps\":0}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"id\":\"e4772140-3957-11e7-ae19-21fb91585845\"}],\"background_color\":null,\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\" \"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/82caeb10-4556-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/82caeb10-4556-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index f43de99db..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/82caeb10-4556-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Source Users [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Source Users [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":10,\"maxFontSize\":60},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"sourceUserName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source Users\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/8bdaafe0-454e-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/8bdaafe0-454e-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 584b0c5dc..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/8bdaafe0-454e-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "OS Source and Destination Overview",
-  "visState": "{\"title\":\"OS Source and Destination Overview\",\"type\":\"metric\",\"params\":{\"handleNoResults\":true,\"fontSize\":\"25\"},\"aggs\":[{\"id\":\"9\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceHostName\",\"customLabel\":\"Source Hosts\"}},{\"id\":\"10\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationHostName\",\"customLabel\":\"Destination Hosts\"}},{\"id\":\"11\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceUserName\",\"customLabel\":\"Source Users\"}},{\"id\":\"12\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationUserName\",\"customLabel\":\"Destination Users\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/8cda1c30-752a-11e7-9445-91c40765092f.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/8cda1c30-752a-11e7-9445-91c40765092f.json
deleted file mode 100644
index f0aea8e82..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/8cda1c30-752a-11e7-9445-91c40765092f.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Event Types by Size [ArcSight]",
-  "visState": "{\"title\":\"Event Types by Size [ArcSight]\",\"type\":\"histogram\",\"params\":{\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"},\"valueAxis\":null},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"bottom\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"truncate\":100,\"rotate\":75},\"title\":{\"text\":\"Event Type\"}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"square root\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"Count\"}},{\"id\":\"ValueAxis-2\",\"name\":\"RightAxis-1\",\"type\":\"value\",\"position\":\"right\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"square root\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"Total (Bytes)\"}}],\"seriesParams\":[{\"show\":\"true\",\"type\":\"histogram\",\"mode\":\"normal\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"valueAxis\":\"ValueAxis-1\",\"drawLinesBetweenPoints\":true,\"showCircles\":true},{\"show\":true,\"mode\":\"normal\",\"type\":\"line\",\"drawLinesBetweenPoints\":true,\"showCircles\":false,\"interpolate\":\"linear\",\"lineWidth\":3,\"data\":{\"id\":\"3\",\"label\":\"Total (Bytes)\"},\"valueAxis\":\"ValueAxis-2\"}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false,\"orderBucketsBySum\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceEventClassId\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Type\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesIn\",\"customLabel\":\"Total (Bytes)\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"Total (Bytes)\":\"#E24D42\",\"Count\":\"#64B0C8\"}}}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/8f0161a0-752d-11e7-b440-f1d91dc5774d.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/8f0161a0-752d-11e7-b440-f1d91dc5774d.json
deleted file mode 100644
index da0421dfb..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/8f0161a0-752d-11e7-b440-f1d91dc5774d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Sources by Size [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Sources by Size [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"sourceHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Sources\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesIn\",\"customLabel\":\"Bytes\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationHostName\",\"customLabel\":\"Destinations\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Count\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"P-11\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-13\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-2\":{\"mapCenter\":[-0.17578097424708533,0],\"mapZoom\":0},\"P-3\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-4\":{\"mapCenter\":[-0.17578097424708533,0],\"mapZoom\":0},\"P-5\":{\"vis\":{\"defaultColors\":{\"0 - 18,000\":\"rgb(247,251,255)\",\"108,000 - 126,000\":\"rgb(74,152,201)\",\"126,000 - 144,000\":\"rgb(46,126,188)\",\"144,000 - 162,000\":\"rgb(23,100,171)\",\"162,000 - 180,000\":\"rgb(8,74,145)\",\"18,000 - 36,000\":\"rgb(227,238,249)\",\"36,000 - 54,000\":\"rgb(208,225,242)\",\"54,000 - 72,000\":\"rgb(182,212,233)\",\"72,000 - 90,000\":\"rgb(148,196,223)\",\"90,000 - 108,000\":\"rgb(107,174,214)\"},\"legendOpen\":false}},\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/8f8d6230-454f-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/8f8d6230-454f-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 43eaa9895..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/8f8d6230-454f-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Behaviors by Outcome [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Behaviors by Outcome [ArcSight]\",\"type\":\"heatmap\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"enableHover\":true,\"legendPosition\":\"right\",\"times\":[],\"colorsNumber\":10,\"colorSchema\":\"Yellow to Red\",\"setColorRange\":false,\"colorsRange\":[],\"invertColors\":false,\"percentageMode\":false,\"valueAxes\":[{\"show\":false,\"id\":\"ValueAxis-1\",\"type\":\"value\",\"scale\":{\"type\":\"linear\",\"defaultYExtents\":false},\"labels\":{\"show\":false,\"rotate\":0,\"color\":\"#555\"}}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"categoryBehavior\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Type\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"categoryOutcome\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Outcome\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 9,000\":\"rgb(255,255,204)\",\"9,000 - 18,000\":\"rgb(255,241,170)\",\"18,000 - 27,000\":\"rgb(254,225,135)\",\"27,000 - 36,000\":\"rgb(254,201,101)\",\"36,000 - 45,000\":\"rgb(254,171,73)\",\"45,000 - 54,000\":\"rgb(253,141,60)\",\"54,000 - 63,000\":\"rgb(252,91,46)\",\"63,000 - 72,000\":\"rgb(237,47,34)\",\"72,000 - 81,000\":\"rgb(212,16,32)\",\"81,000 - 90,000\":\"rgb(176,0,38)\"}}}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/9141cc20-4553-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/9141cc20-4553-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index bca0a4bbd..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/9141cc20-4553-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 5 Vendors by Product [ArcSight]",
-  "visState": "{\"title\":\"Top 5 Vendors by Product [ArcSight]\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceVendor\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"OS Vendor\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceProduct\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"OS Product\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/93531890-4556-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/93531890-4556-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index 2d5e96db9..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/93531890-4556-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Destination Users [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Destination Users [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":10,\"maxFontSize\":60},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationUserName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Users\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/96af5bf0-3e50-11e7-af78-9fc514b4e118.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/96af5bf0-3e50-11e7-af78-9fc514b4e118.json
deleted file mode 100644
index 3376e241c..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/96af5bf0-3e50-11e7-af78-9fc514b4e118.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Device [ArcSight]",
-  "visState": "{\"title\":\"Events by Device [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"f80221f0-3e4e-11e7-af78-9fc514b4e118\",\"type\":\"timeseries\",\"series\":[{\"id\":\"f80221f1-3e4e-11e7-af78-9fc514b4e118\",\"color\":\"rgba(254,37,37,1)\",\"split_mode\":\"filters\",\"metrics\":[{\"id\":\"f8024900-3e4e-11e7-af78-9fc514b4e118\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"1d93e660-3e4f-11e7-af78-9fc514b4e118\",\"type\":\"moving_average\",\"field\":\"f8024900-3e4e-11e7-af78-9fc514b4e118\"}],\"seperate_axis\":1,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"categoryDeviceGroup:\\\"/Operating System\\\" \",\"label\":\"Operating System\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"725ac7e0-3e4f-11e7-af78-9fc514b4e118\"},{\"filter\":\" categoryDeviceGroup:\\\"/IDS/Host\\\"\",\"label\":\"Host IDS\",\"color\":\"rgba(254,146,0,1)\",\"id\":\"bd6104c0-3e4f-11e7-af78-9fc514b4e118\"},{\"filter\":\"categoryDeviceGroup:\\\"/Application\\\"\",\"label\":\"Application\",\"color\":\"rgba(252,220,0,1)\",\"id\":\"cf5dd0e0-3e4f-11e7-af78-9fc514b4e118\"}],\"label\":\"Events\"},{\"id\":\"1633f8a0-3e50-11e7-af78-9fc514b4e118\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"1633f8a1-3e50-11e7-af78-9fc514b4e118\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"2b8a9e20-3e50-11e7-af78-9fc514b4e118\",\"type\":\"moving_average\",\"field\":\"1633f8a1-3e50-11e7-af78-9fc514b4e118\"}],\"seperate_axis\":1,\"axis_position\":\"left\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Moving Average by Device HostNames\",\"terms_field\":\"deviceHostName\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"categoryDeviceGroup:\\\"/Operating System\\\" OR categoryDeviceGroup:\\\"/IDS/Host\\\" OR categoryDeviceGroup:\\\"/Application\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/992c7bd0-3e4e-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/992c7bd0-3e4e-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index 4eeaad140..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/992c7bd0-3e4e-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 5 Sources by Destination Addresses [ArcSight]",
-  "visState": "{\"title\":\"Top 5 Sources by Destination Addresses [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationAddress\",\"customLabel\":\"Destination Addresses\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"sourceAddress\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Source Address\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/9d317890-3988-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/9d317890-3988-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index 11b98363f..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/9d317890-3988-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Overall Time Range",
-  "visState": "{\"title\":\"Overall Time Range\",\"type\":\"metric\",\"params\":{\"handleNoResults\":true,\"fontSize\":\"15\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"min\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceReceiptTime\",\"customLabel\":\"Start Time\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"max\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceReceiptTime\",\"customLabel\":\"End Time\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/9de87d40-3e4e-11e7-af78-9fc514b4e118.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/9de87d40-3e4e-11e7-af78-9fc514b4e118.json
deleted file mode 100644
index 895a0fe25..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/9de87d40-3e4e-11e7-af78-9fc514b4e118.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Outcomes Breakdown [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customInterval\":\"2h\",\"customLabel\":\"Time\",\"extended_bounds\":{},\"field\":\"deviceReceiptTime\",\"interval\":\"auto\",\"min_doc_count\":1},\"schema\":\"segment\",\"type\":\"date_histogram\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"field\":\"categoryOutcome\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":5},\"schema\":\"group\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Time\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"interpolate\":\"linear\",\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"area\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"value\"}]},\"title\":\"Outcomes Breakdown [ArcSight]\",\"type\":\"area\"}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"/Failure\":\"#BF1B00\",\"/Attempt\":\"#3F2B5B\"},\"legendOpen\":true}}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/9e4c5ca0-76cc-11e7-9fc0-830beaf5fb4b.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/9e4c5ca0-76cc-11e7-9fc0-830beaf5fb4b.json
deleted file mode 100644
index 59870f2d4..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/9e4c5ca0-76cc-11e7-9fc0-830beaf5fb4b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Event Count [ArcSight]",
-  "visState": "{\"title\":\"Event Count [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"19363b80-76cc-11e7-9fc0-830beaf5fb4b\",\"type\":\"metric\",\"series\":[{\"id\":\"19363b81-76cc-11e7-9fc0-830beaf5fb4b\",\"color\":\"#68BC00\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"19363b82-76cc-11e7-9fc0-830beaf5fb4b\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Event Count\",\"value_template\":\"\",\"override_index_pattern\":1,\"series_index_pattern\":\"arcsight-*\",\"series_time_field\":\"@timestamp\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"background_color_rules\":[{\"id\":\"30faacb0-76cc-11e7-9fc0-830beaf5fb4b\"}]},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/a8ce0ef0-4556-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/a8ce0ef0-4556-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index f3782bab6..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/a8ce0ef0-4556-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Sources [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Sources [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":10,\"maxFontSize\":60},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"sourceHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source Hosts\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/aa2ff0a0-3e4a-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/aa2ff0a0-3e4a-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index 85990965b..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/aa2ff0a0-3e4a-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Unique Destinations and Ports by Source [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{\"customLabel\":\"Destination Addresses\",\"field\":\"destinationAddress\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Source Addresses\",\"field\":\"sourceAddress\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":20},\"schema\":\"segment\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"Destination Ports\",\"field\":\"destinationPort\"},\"schema\":\"metric\",\"type\":\"cardinality\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Source Addresses\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Destination Addresses\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"},{\"data\":{\"id\":\"3\",\"label\":\"Destination Ports\"},\"drawLinesBetweenPoints\":true,\"interpolate\":\"linear\",\"lineWidth\":2,\"mode\":\"stacked\",\"show\":true,\"showCircles\":true,\"type\":\"line\",\"valueAxis\":\"ValueAxis-2\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Destination Addresses\"},\"type\":\"value\"},{\"id\":\"ValueAxis-2\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"RightAxis-1\",\"position\":\"right\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Destination Ports\"},\"type\":\"value\"}]},\"title\":\"Unique Destinations and Ports by Source [ArcSight]\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/aa57b050-7526-11e7-b440-f1d91dc5774d.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/aa57b050-7526-11e7-b440-f1d91dc5774d.json
deleted file mode 100644
index 4f281819c..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/aa57b050-7526-11e7-b440-f1d91dc5774d.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events Types by Severity [ArcSight]",
-  "visState": "{\"title\":\"Events Types by Severity [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"5f4e1f70-7523-11e7-b440-f1d91dc5774d\",\"type\":\"timeseries\",\"series\":[{\"id\":\"f7c4afd0-752d-11e7-ae68-d756b92f3a9c\",\"color\":\"#68BC00\",\"split_mode\":\"filters\",\"metrics\":[{\"id\":\"f7c4afd1-752d-11e7-ae68-d756b92f3a9c\",\"type\":\"count\",\"field\":\"bytesIn\"}],\"seperate_axis\":1,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":\"0\",\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"Cumulative Bytes\",\"split_filters\":[{\"filter\":\"(deviceSeverity:\\\"2\\\" OR deviceSeverity:\\\"3\\\" OR deviceSeverity:\\\"5\\\" OR deviceSeverity:\\\"16\\\" OR deviceCustomString4:\\\"SERVFAIL\\\" OR deviceCustomString4:\\\"NXDOMAIN\\\" OR deviceCustomString4:\\\"REFUSED\\\" OR deviceCustomString4:\\\"BADVERS\\\" OR deviceCustomString4:\\\"BADSIG\\\")\",\"label\":\"HIGH\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"53f76f80-7539-11e7-ae68-d756b92f3a9c\"},{\"filter\":\"(deviceSeverity:\\\"1\\\" OR  deviceSeverity:\\\"4\\\" OR  deviceSeverity:\\\"6\\\" OR  deviceSeverity:\\\"7\\\" OR  deviceSeverity:\\\"8\\\" OR  deviceSeverity:\\\"9\\\" OR  deviceSeverity:\\\"10\\\" OR deviceSeverity:\\\"17\\\" OR  deviceSeverity:\\\"18\\\" OR  deviceSeverity:\\\"19\\\" OR  deviceSeverity:\\\"20\\\" OR  deviceSeverity:\\\"21\\\" OR  deviceSeverity:\\\"22\\\" OR   deviceCustomString4:\\\"Error\\\" OR  deviceCustomString4:\\\"ERROR\\\" OR  deviceCustomString4:\\\"Warning\\\" OR  deviceCustomString4:\\\"WARNING\\\" OR  deviceCustomString4:\\\"FORMERR\\\" OR  deviceCustomString4:\\\"NOTIMP\\\" OR  deviceCustomString4:\\\"YXDOMAIN\\\" OR  deviceCustomString4:\\\"YXRRSET\\\" OR  deviceCustomString4:\\\"NXRRSET\\\" OR  deviceCustomString4:\\\"NOTAUTH\\\" OR  deviceCustomString4:\\\"NOTZONE\\\" OR  deviceCustomString4:\\\"BADKEY\\\" OR  deviceCustomString4:\\\"BADTIME\\\" OR  deviceCustomString4:\\\"BADMODE\\\" OR  deviceCustomString4:\\\"BADNAME\\\" OR  deviceCustomString4:\\\"BADALG\\\" OR  deviceCustomString4:\\\"BADTRUNC\\\")\",\"label\":\"MEDIUM\",\"color\":\"rgba(254,146,0,1)\",\"id\":\"6033e990-7539-11e7-ae68-d756b92f3a9c\"},{\"filter\":\"(NOT (deviceSeverity:\\\"2\\\" OR deviceSeverity:\\\"3\\\" OR deviceSeverity:\\\"5\\\" OR deviceSeverity:\\\"16\\\" OR deviceCustomString4:\\\"SERVFAIL\\\" OR deviceCustomString4:\\\"NXDOMAIN\\\" OR deviceCustomString4:\\\"REFUSED\\\" OR deviceCustomString4:\\\"BADVERS\\\" OR deviceCustomString4:\\\"BADSIG\\\" OR deviceSeverity:\\\"1\\\" OR  deviceSeverity:\\\"4\\\" OR  deviceSeverity:\\\"6\\\" OR  deviceSeverity:\\\"7\\\" OR  deviceSeverity:\\\"8\\\" OR  deviceSeverity:\\\"9\\\" OR  deviceSeverity:\\\"10\\\" OR deviceSeverity:\\\"17\\\" OR  deviceSeverity:\\\"18\\\" OR  deviceSeverity:\\\"19\\\" OR  deviceSeverity:\\\"20\\\" OR  deviceSeverity:\\\"21\\\" OR  deviceSeverity:\\\"22\\\" OR deviceCustomString4:\\\"Error\\\" OR  deviceCustomString4:\\\"ERROR\\\" OR  deviceCustomString4:\\\"Warning\\\" OR  deviceCustomString4:\\\"WARNING\\\" OR  deviceCustomString4:\\\"FORMERR\\\" OR  deviceCustomString4:\\\"NOTIMP\\\" OR  deviceCustomString4:\\\"YXDOMAIN\\\" OR  deviceCustomString4:\\\"YXRRSET\\\" OR  deviceCustomString4:\\\"NXRRSET\\\" OR  deviceCustomString4:\\\"NOTAUTH\\\" OR  deviceCustomString4:\\\"NOTZONE\\\" OR  deviceCustomString4:\\\"BADKEY\\\" OR  deviceCustomString4:\\\"BADTIME\\\" OR  deviceCustomString4:\\\"BADMODE\\\" OR  deviceCustomString4:\\\"BADNAME\\\" OR  deviceCustomString4:\\\"BADALG\\\" OR  deviceCustomString4:\\\"BADTRUNC\\\"))\",\"label\":\"LOW\",\"color\":\"rgba(252,220,0,1)\",\"id\":\"6b4be0d0-7539-11e7-ae68-d756b92f3a9c\"}]},{\"id\":\"e1a5d1f0-7525-11e7-b440-f1d91dc5774d\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"e1a5d1f1-7525-11e7-b440-f1d91dc5774d\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Count by Event Type\",\"terms_field\":\"deviceEventClassId\",\"terms_size\":\"20\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"deviceProduct:\\\"DNS Trace Log\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/ad802c10-3973-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/ad802c10-3973-11e7-ae19-21fb91585845.json
deleted file mode 100644
index e1416d1ca..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/ad802c10-3973-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Devices by Bandwidth [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Devices by Bandwidth [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showMeticsAtAllLevels\":false,\"showPartialRows\":false,\"showTotal\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"deviceHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Device\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceAddress\",\"customLabel\":\"Source(s)\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationAddress\",\"customLabel\":\"Destination(s)\"}},{\"id\":\"6\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationPort\",\"customLabel\":\"Destination Ports\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesIn\",\"customLabel\":\"Bandwidth (Incoming)\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesOut\",\"customLabel\":\"Bandwidth (Outgoing)\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/afdba840-3e55-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/afdba840-3e55-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index b9f6ca4e0..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/afdba840-3e55-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Source Addresses [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Source Addresses [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":18,\"maxFontSize\":72},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"sourceAddress\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source Addresses\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/b1f98ce0-7745-11e7-8fb2-417804dc0ec8.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/b1f98ce0-7745-11e7-8fb2-417804dc0ec8.json
deleted file mode 100644
index 7b95eb1dd..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/b1f98ce0-7745-11e7-8fb2-417804dc0ec8.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Sources by Events [ArcSight]",
-  "visState": "{\"title\":\"Top Sources by Events [ArcSight]\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Shaded Circle Markers\",\"isDesaturated\":true,\"addTooltip\":true,\"heatMaxZoom\":0,\"heatMinOpacity\":0.1,\"heatRadius\":25,\"heatBlur\":15,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[0,0],\"wms\":{\"enabled\":false,\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\",\"options\":{\"version\":\"1.3.0\",\"layers\":\"0\",\"format\":\"image/png\",\"transparent\":true,\"attribution\":\"Maps provided by USGS\",\"styles\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"source.location\",\"autoPrecision\":true,\"useGeocentroid\":true,\"precision\":2}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/b74e59b0-3e5f-11e7-899c-f940f646009b.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/b74e59b0-3e5f-11e7-899c-f940f646009b.json
deleted file mode 100644
index 4e7d3fcf6..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/b74e59b0-3e5f-11e7-899c-f940f646009b.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Endpoint Metrics Overview [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{\"customLabel\":\"Event Count\"},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Devices\",\"field\":\"deviceHostName\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"Source\",\"field\":\"sourceAddress\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"4\",\"params\":{\"customLabel\":\"Destination\",\"field\":\"destinationAddress\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"5\",\"params\":{\"customLabel\":\"Port\",\"field\":\"destinationPort\"},\"schema\":\"metric\",\"type\":\"cardinality\"}],\"listeners\":{},\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"30\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"12\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"title\":\"Endpoint Metrics Overview [ArcSight]\",\"type\":\"metric\"}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/b897ce70-4556-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/b897ce70-4556-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index 8d03dc079..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/b897ce70-4556-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Destinations [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Destinations [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":10,\"maxFontSize\":60},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Hosts\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/bd1c82c0-75a7-11e7-871d-5f0fb978413c.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/bd1c82c0-75a7-11e7-871d-5f0fb978413c.json
deleted file mode 100644
index df3b92b52..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/bd1c82c0-75a7-11e7-871d-5f0fb978413c.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Size [ArcSight]",
-  "visState": "{\"title\":\"Events by Size [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"8d6c10a0-75a6-11e7-871d-5f0fb978413c\",\"type\":\"timeseries\",\"series\":[{\"id\":\"8d6c10a1-75a6-11e7-871d-5f0fb978413c\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"8d6c10a2-75a6-11e7-871d-5f0fb978413c\",\"type\":\"sum\",\"field\":\"bytesIn\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"bytes\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"filter\":\"deviceDirection:\\\"0\\\"\",\"label\":\"Inbound Bytes\"},{\"id\":\"b15b6fb0-75a6-11e7-871d-5f0fb978413c\",\"color\":\"rgba(244,78,59,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"b15b6fb1-75a6-11e7-871d-5f0fb978413c\",\"type\":\"sum\",\"field\":\"bytesIn\"},{\"script\":\"params.outbound_bytes >= 0 ? params.outbound_bytes * -1 : 0\",\"id\":\"b6e2b060-75a6-11e7-871d-5f0fb978413c\",\"type\":\"calculation\",\"variables\":[{\"id\":\"b9031f60-75a6-11e7-871d-5f0fb978413c\",\"name\":\"outbound_bytes\",\"field\":\"b15b6fb1-75a6-11e7-871d-5f0fb978413c\"}]}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"bytes\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"filter\":\"deviceDirection:\\\"1\\\"\",\"label\":\"Outbound Bytes\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"deviceProduct:\\\"DNS Trace Log\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/bfa45650-3e55-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/bfa45650-3e55-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index 63f429367..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/bfa45650-3e55-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Destination Addresses [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Destination Addresses [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":18,\"maxFontSize\":72},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationAddress\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Addresses\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/c53825b0-3e4b-11e7-af78-9fc514b4e118.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/c53825b0-3e4b-11e7-af78-9fc514b4e118.json
deleted file mode 100644
index 66c44c98c..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/c53825b0-3e4b-11e7-af78-9fc514b4e118.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Endpoint Average EPS [ArcSight]",
-  "visState": "{\"title\":\"Endpoint Average EPS [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"3f2cf630-3e4b-11e7-af78-9fc514b4e118\",\"type\":\"gauge\",\"series\":[{\"id\":\"3f2cf631-3e4b-11e7-af78-9fc514b4e118\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"3f2cf632-3e4b-11e7-af78-9fc514b4e118\",\"type\":\"count\"},{\"id\":\"fbe01c40-7dc4-11e7-95f6-690ab80d4e85\",\"type\":\"cumulative_sum\",\"field\":\"3f2cf632-3e4b-11e7-af78-9fc514b4e118\"},{\"unit\":\"1s\",\"id\":\"01089b20-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"derivative\",\"field\":\"fbe01c40-7dc4-11e7-95f6-690ab80d4e85\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"070d9750-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"moving_average\",\"field\":\"01089b20-7dc5-11e7-95f6-690ab80d4e85\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Event Throughput\",\"value_template\":\"{{value}} / s\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"id\":\"527ca820-3e4b-11e7-af78-9fc514b4e118\"}],\"gauge_color_rules\":[{\"id\":\"52cee6d0-3e4b-11e7-af78-9fc514b4e118\"}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"filter\":\"categoryDeviceGroup:\\\"/Operating System\\\" OR categoryDeviceGroup:\\\"/IDS/Host\\\" OR categoryDeviceGroup:\\\"/Application\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/c658b300-7745-11e7-8fb2-417804dc0ec8.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/c658b300-7745-11e7-8fb2-417804dc0ec8.json
deleted file mode 100644
index 559c28300..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/c658b300-7745-11e7-8fb2-417804dc0ec8.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Destinations by Events [ArcSight]",
-  "visState": "{\"title\":\"Top Destinations by Events [ArcSight]\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Shaded Circle Markers\",\"isDesaturated\":true,\"addTooltip\":true,\"heatMaxZoom\":0,\"heatMinOpacity\":0.1,\"heatRadius\":25,\"heatBlur\":15,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[0,0],\"wms\":{\"enabled\":false,\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\",\"options\":{\"version\":\"1.3.0\",\"layers\":\"0\",\"format\":\"image/png\",\"transparent\":true,\"attribution\":\"Maps provided by USGS\",\"styles\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"destination.location\",\"autoPrecision\":true,\"useGeocentroid\":true,\"precision\":2}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/c6db4140-4544-11e7-a94a-5d0a73686c64.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/c6db4140-4544-11e7-a94a-5d0a73686c64.json
deleted file mode 100644
index 428070f96..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/c6db4140-4544-11e7-a94a-5d0a73686c64.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "DNS Metrics Overview",
-  "visState": "{\"title\":\"DNS Metrics Overview\",\"type\":\"metric\",\"params\":{\"handleNoResults\":true,\"fontSize\":\"25\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceHostName\",\"customLabel\":\"# of DNS Devices\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceAddress\",\"customLabel\":\"Source Address(es)\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceCustomString3\",\"customLabel\":\"Connection IDs\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationDnsDomain\",\"customLabel\":\"Domains\"}},{\"id\":\"6\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceCustomString1\",\"customLabel\":\"Query Type(s)\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "16a72e70-4543-11e7-9510-4b0b4978ab0e",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/c9e333a0-4550-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/c9e333a0-4550-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index ba1d1aefb..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/c9e333a0-4550-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Source Users by Event Type and Destination Users [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Source Users\",\"field\":\"sourceUserName\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":20},\"schema\":\"segment\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"Event Types\",\"field\":\"categoryBehavior\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"4\",\"params\":{\"customLabel\":\"Destination User Names\",\"field\":\"destinationUserName\"},\"schema\":\"metric\",\"type\":\"cardinality\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Source Users\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"},{\"data\":{\"id\":\"3\",\"label\":\"Event Types\"},\"drawLinesBetweenPoints\":true,\"interpolate\":\"linear\",\"lineWidth\":2,\"mode\":\"stacked\",\"show\":true,\"showCircles\":true,\"type\":\"line\",\"valueAxis\":\"ValueAxis-2\"},{\"data\":{\"id\":\"4\",\"label\":\"Destination User Names\"},\"drawLinesBetweenPoints\":true,\"interpolate\":\"linear\",\"lineWidth\":2,\"mode\":\"stacked\",\"show\":true,\"showCircles\":true,\"type\":\"line\",\"valueAxis\":\"ValueAxis-2\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"square root\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Count\"},\"type\":\"value\"},{\"id\":\"ValueAxis-2\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"RightAxis-1\",\"position\":\"right\",\"scale\":{\"mode\":\"normal\",\"type\":\"square root\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"\"},\"type\":\"value\"}]},\"title\":\"Source Users by Event Type and Destination Users [ArcSight]\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/cc8affd0-3e65-11e7-899c-f940f646009b.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/cc8affd0-3e65-11e7-899c-f940f646009b.json
deleted file mode 100644
index b68a868e9..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/cc8affd0-3e65-11e7-899c-f940f646009b.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 5 Source Countries [ArcSight]",
-  "visState": "{\"title\":\"Top 5 Source Countries [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":18,\"maxFontSize\":72},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"source.country_name\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/cd462cc0-3e55-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/cd462cc0-3e55-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index 1a1f5a645..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/cd462cc0-3e55-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Destination Ports [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Destination Ports [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":18,\"maxFontSize\":72},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationPort\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Addresses\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/d6d526f0-395b-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/d6d526f0-395b-11e7-ae19-21fb91585845.json
deleted file mode 100644
index 85e87e110..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/d6d526f0-395b-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Source [ArcSight]",
-  "visState": "{\"title\":\"Events by Source [ArcSight]\",\"type\":\"metrics\",\"params\":{\"axis_formatter\":\"number\",\"axis_position\":\"left\",\"background_color\":null,\"background_color_rules\":[{\"id\":\"837bfbb0-395a-11e7-ae19-21fb91585845\"}],\"bar_color_rules\":[{\"id\":\"e4772140-3957-11e7-ae19-21fb91585845\"}],\"filter\":\"categoryDeviceType:\\\"Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\"\",\"gauge_color_rules\":[{\"id\":\"8970f250-395a-11e7-ae19-21fb91585845\"}],\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"gauge_width\":10,\"id\":\"e1a58ab0-3957-11e7-ae19-21fb91585845\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"series\":[{\"axis_position\":\"right\",\"chart_type\":\"line\",\"color\":\"rgba(244,78,59,1)\",\"fill\":\"0\",\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\"\",\"formatter\":\"number\",\"id\":\"8f58a280-395a-11e7-ae19-21fb91585845\",\"label\":\"Events\",\"line_width\":\"3\",\"metrics\":[{\"id\":\"8f58a281-395a-11e7-ae19-21fb91585845\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"field\":\"8f58a281-395a-11e7-ae19-21fb91585845\",\"id\":\"140cf490-395b-11e7-ae19-21fb91585845\",\"sigma\":\"\",\"type\":\"moving_average\"}],\"point_size\":\"0\",\"seperate_axis\":1,\"split_mode\":\"filters\",\"stacked\":\"none\",\"steps\":0,\"terms_field\":\"deviceHostName\",\"terms_order_by\":null,\"split_filters\":[{\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\"\",\"label\":\"Firewall Events\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"1fd3fa30-4685-11e7-8ffc-b5cec7c0edbb\"},{\"filter\":\"categoryDeviceGroup:\\\"/IDS/Network\\\"\",\"label\":\"Intrusion Detection Events\",\"color\":\"rgba(254,146,0,1)\",\"id\":\"274111e0-4685-11e7-8ffc-b5cec7c0edbb\"},{\"filter\":\"categoryDeviceGroup:\\\"/VPN\\\"\",\"label\":\"VPN\",\"color\":\"rgba(252,220,0,1)\",\"id\":\"5682a680-468f-11e7-8116-65b4628ff93f\"}]},{\"axis_position\":\"left\",\"chart_type\":\"bar\",\"color\":\"rgba(0,156,224,1)\",\"fill\":\"0.5\",\"formatter\":\"number\",\"id\":\"3bb711b0-395b-11e7-ae19-21fb91585845\",\"label\":\"Moving Average by Device Hosts\",\"line_width\":1,\"metrics\":[{\"id\":\"3bb711b1-395b-11e7-ae19-21fb91585845\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"field\":\"3bb711b1-395b-11e7-ae19-21fb91585845\",\"id\":\"4b515cc0-395b-11e7-ae19-21fb91585845\",\"type\":\"moving_average\"}],\"point_size\":1,\"seperate_axis\":1,\"split_mode\":\"terms\",\"stacked\":\"none\",\"terms_field\":\"deviceHostName\",\"terms_size\":\"10\",\"split_color_mode\":\"gradient\"}],\"show_legend\":1,\"time_field\":\"deviceReceiptTime\",\"type\":\"timeseries\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/d72d7940-7529-11e7-9445-91c40765092f.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/d72d7940-7529-11e7-9445-91c40765092f.json
deleted file mode 100644
index 9225eac67..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/d72d7940-7529-11e7-9445-91c40765092f.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Destinations by Traffic Size [ArcSight]",
-  "visState": "{\"title\":\"Top Destinations by Traffic Size [ArcSight]\",\"type\":\"heatmap\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"enableHover\":true,\"legendPosition\":\"top\",\"times\":[],\"colorsNumber\":10,\"colorSchema\":\"Blues\",\"setColorRange\":false,\"colorsRange\":[{\"from\":0,\"to\":null}],\"invertColors\":false,\"percentageMode\":false,\"valueAxes\":[{\"show\":false,\"id\":\"ValueAxis-1\",\"type\":\"value\",\"scale\":{\"type\":\"linear\",\"defaultYExtents\":false},\"labels\":{\"show\":false,\"rotate\":0,\"color\":\"#555\"}}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesIn\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"filters\",\"schema\":\"segment\",\"params\":{\"filters\":[{\"input\":{\"query\":{\"query_string\":{\"query\":\"deviceDirection:\\\"0\\\"\",\"analyze_wildcard\":true}}},\"label\":\"Inbound\"},{\"input\":{\"query\":{\"query_string\":{\"query\":\"deviceDirection:\\\"1\\\"\",\"analyze_wildcard\":true}}},\"label\":\"Outbound\"}]}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"destinationHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 18k\":\"rgb(247,251,255)\",\"18k - 36k\":\"rgb(227,238,249)\",\"36k - 54k\":\"rgb(208,225,242)\",\"54k - 72k\":\"rgb(182,212,233)\",\"72k - 90k\":\"rgb(148,196,223)\",\"90k - 108k\":\"rgb(107,174,214)\",\"108k - 126k\":\"rgb(74,152,201)\",\"126k - 144k\":\"rgb(46,126,188)\",\"144k - 162k\":\"rgb(23,100,171)\",\"162k - 180k\":\"rgb(8,74,145)\"}}}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/d8314510-454f-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/d8314510-454f-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 6ddd0479d..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/d8314510-454f-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 20 Behaviors by Outcome [ArcSight]",
-  "visState": "{\"title\":\"Top 20 Behaviors by Outcome [ArcSight]\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"categoryBehavior\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Behavior\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"categoryOutcome\",\"size\":3,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Outcome\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/ddef4fc0-3e55-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/ddef4fc0-3e55-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index bc7f68b23..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/ddef4fc0-3e55-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Firewall - Suspicious - Top Application Protocols Word Cloud",
-  "visState": "{\"title\":\"Firewall - Suspicious - Top Application Protocols Word Cloud\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":18,\"maxFontSize\":72},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"applicationProtocol\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Addresses\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/e301a830-3e4d-11e7-af78-9fc514b4e118.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/e301a830-3e4d-11e7-af78-9fc514b4e118.json
deleted file mode 100644
index df2463335..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/e301a830-3e4d-11e7-af78-9fc514b4e118.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Destination Ports by Outcomes [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"field\":\"destinationPort\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":20},\"schema\":\"segment\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"field\":\"categoryOutcome\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":5},\"schema\":\"group\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"destinationPort: Descending\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"defaultYExtents\":true,\"mode\":\"normal\",\"setYExtents\":false,\"type\":\"square root\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"value\"}]},\"title\":\"Destination Ports by Outcomes [ArcSight]\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/e3888410-3e50-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/e3888410-3e50-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index b292e8087..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/e3888410-3e50-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Severity [ArcSight]",
-  "visState": "{\"title\":\"Events by Severity [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"69a9f020-3e50-11e7-96c4-0d3a291ec93a\",\"type\":\"top_n\",\"series\":[{\"id\":\"69a9f021-3e50-11e7-96c4-0d3a291ec93a\",\"color\":\"#68BC00\",\"split_mode\":\"filters\",\"metrics\":[{\"id\":\"69a9f022-3e50-11e7-96c4-0d3a291ec93a\",\"type\":\"count\"},{\"sigma\":\"\",\"id\":\"7bb17f50-76f3-11e7-82d9-83ee5c3338ae\",\"type\":\"sum_bucket\",\"field\":\"69a9f022-3e50-11e7-96c4-0d3a291ec93a\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0[0]a\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"severity:\\\"Low\\\" OR severity:\\\"0\\\"\",\"label\":\"LOW\",\"color\":\"rgba(104,204,202,1)\",\"id\":\"8819d6b0-3e50-11e7-96c4-0d3a291ec93a\"},{\"filter\":\"severity:\\\"Medium\\\"\",\"label\":\"MEDIUM\",\"color\":\"rgba(252,220,0,1)\",\"id\":\"9a4f6610-3e50-11e7-96c4-0d3a291ec93a\"},{\"filter\":\"severity:\\\"High\\\"\",\"label\":\"HIGH\",\"color\":\"rgba(254,146,0,1)\",\"id\":\"a3de4c50-3e50-11e7-96c4-0d3a291ec93a\"},{\"filter\":\"severity:\\\"Very-High\\\"\",\"label\":\"VERY HIGH\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"a9926960-3e50-11e7-96c4-0d3a291ec93a\"}],\"label\":\"Event by Severities\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"id\":\"6ed9c200-3e50-11e7-96c4-0d3a291ec93a\"}],\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/e7404c60-71cb-11e7-bdf5-8b8209f1c4b6.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/e7404c60-71cb-11e7-bdf5-8b8209f1c4b6.json
deleted file mode 100644
index 1daa81444..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/e7404c60-71cb-11e7-bdf5-8b8209f1c4b6.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Device Event Count [ArcSight]",
-  "visState": "{\"title\":\"Device Event Count [ArcSight]\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"30\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"12\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/e9c3ee00-3978-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/e9c3ee00-3978-11e7-ae19-21fb91585845.json
deleted file mode 100644
index 919183474..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/e9c3ee00-3978-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Destination Ports by Outcome [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Protocols\",\"field\":\"destinationPort\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":10},\"schema\":\"segment\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"field\":\"categoryOutcome\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":5},\"schema\":\"group\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"rotate\":75,\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Protocols\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"percentage\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Count\"},\"type\":\"value\"}]},\"title\":\"Destination Ports by Outcome [ArcSight]\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"/Success\":\"#629E51\",\"/Failure\":\"#BF1B00\"}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/ebfd45a0-75a4-11e7-b440-f1d91dc5774d.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/ebfd45a0-75a4-11e7-b440-f1d91dc5774d.json
deleted file mode 100644
index 6358a6d58..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/ebfd45a0-75a4-11e7-b440-f1d91dc5774d.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Direction [ArcSight]",
-  "visState": "{\"title\":\"Events by Direction [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"12cdd300-75a2-11e7-b440-f1d91dc5774d\",\"type\":\"timeseries\",\"series\":[{\"id\":\"12cdd301-75a2-11e7-b440-f1d91dc5774d\",\"color\":\"#68BC00\",\"split_mode\":\"filters\",\"metrics\":[{\"id\":\"12cdd302-75a2-11e7-b440-f1d91dc5774d\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"deviceDirection:\\\"0\\\"\",\"label\":\"Inbound Requests\",\"color\":\"rgba(0,156,224,1)\",\"id\":\"2bb9d440-75a2-11e7-b440-f1d91dc5774d\"}],\"label\":\"Inbound Requests\",\"filter\":\"device\"},{\"id\":\"bbe68d10-75a2-11e7-b440-f1d91dc5774d\",\"color\":\"#68BC00\",\"split_mode\":\"filters\",\"metrics\":[{\"id\":\"bbe68d11-75a2-11e7-b440-f1d91dc5774d\",\"type\":\"count\"},{\"script\":\"params.outbound > 0 ? params.outbound * -1 : 0\",\"id\":\"d50e5ed0-75a2-11e7-b440-f1d91dc5774d\",\"type\":\"calculation\",\"variables\":[{\"id\":\"d785ee80-75a2-11e7-b440-f1d91dc5774d\",\"name\":\"outbound\",\"field\":\"bbe68d11-75a2-11e7-b440-f1d91dc5774d\"}]}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"deviceDirection:\\\"1\\\"\",\"label\":\"Outbound Requests\",\"color\":\"rgba(211,49,21,1)\",\"id\":\"bfad3200-75a2-11e7-b440-f1d91dc5774d\"}],\"label\":\"Outbound Requests\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"deviceProduct:\\\"DNS Trace Log\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/ec576ff0-4546-11e7-a94a-5d0a73686c64.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/ec576ff0-4546-11e7-a94a-5d0a73686c64.json
deleted file mode 100644
index 9d0a2cd11..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/ec576ff0-4546-11e7-a94a-5d0a73686c64.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events over Time by Query Type",
-  "visState": "{\"title\":\"Events over Time by Query Type\",\"type\":\"metrics\",\"params\":{\"id\":\"45479ab0-4545-11e7-a94a-5d0a73686c64\",\"type\":\"timeseries\",\"series\":[{\"id\":\"45479ab1-4545-11e7-a94a-5d0a73686c64\",\"color\":\"#68BC00\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"45479ab2-4545-11e7-a94a-5d0a73686c64\",\"type\":\"count\"}],\"seperate_axis\":1,\"axis_position\":\"left\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.3\",\"stacked\":\"none\",\"label\":\"Event Count\"},{\"id\":\"afc2ab00-4545-11e7-a94a-5d0a73686c64\",\"color\":\"rgba(22,165,165,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"afc2ab01-4545-11e7-a94a-5d0a73686c64\",\"type\":\"count\"}],\"seperate_axis\":1,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"Query Types\",\"terms_field\":\"deviceCustomString1\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"deviceEventCategory:\\\"dns\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/ec926660-396f-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/ec926660-396f-11e7-ae19-21fb91585845.json
deleted file mode 100644
index 665293cfc..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/ec926660-396f-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Devices by Outcome [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Devices by Outcome [ArcSight]\",\"type\":\"heatmap\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"enableHover\":true,\"legendPosition\":\"right\",\"times\":[],\"colorsNumber\":6,\"colorSchema\":\"Yellow to Red\",\"setColorRange\":false,\"colorsRange\":[],\"invertColors\":false,\"percentageMode\":true,\"valueAxes\":[{\"show\":false,\"id\":\"ValueAxis-1\",\"type\":\"value\",\"scale\":{\"type\":\"linear\",\"defaultYExtents\":false},\"labels\":{\"show\":false,\"rotate\":0,\"color\":\"#555\"}}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Device Host Names\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"categoryOutcome\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Outcome\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0% - 17%\":\"rgb(255,255,204)\",\"17% - 34%\":\"rgb(255,230,146)\",\"34% - 50%\":\"rgb(254,191,90)\",\"50% - 67%\":\"rgb(253,141,60)\",\"67% - 84%\":\"rgb(244,61,37)\",\"84% - 100%\":\"rgb(202,8,35)\"}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/ed2f5570-3d5b-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/ed2f5570-3d5b-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index 0047ff645..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/ed2f5570-3d5b-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Network - Event Throughput [ArcSight]",
-  "visState": "{\"title\":\"Network - Event Throughput [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"429af7e0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"gauge\",\"series\":[{\"id\":\"429af7e1-3d5b-11e7-8b9d-ddc45b5f6d00\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"count\"},{\"id\":\"0bd1cb90-7dc4-11e7-95f6-690ab80d4e85\",\"type\":\"cumulative_sum\",\"field\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\"},{\"unit\":\"1s\",\"id\":\"103c9fc0-7dc4-11e7-95f6-690ab80d4e85\",\"type\":\"derivative\",\"field\":\"0bd1cb90-7dc4-11e7-95f6-690ab80d4e85\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"4f004810-7dc4-11e7-95f6-690ab80d4e85\",\"type\":\"moving_average\",\"field\":\"103c9fc0-7dc4-11e7-95f6-690ab80d4e85\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Event Throughput\",\"value_template\":\"{{value}}  / s\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"categoryDeviceType:\\\"Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\" \",\"bar_color_rules\":[{\"id\":\"77dd4e80-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"background_color_rules\":[{\"id\":\"798c5e10-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"gauge_color_rules\":[{\"value\":0,\"id\":\"988f35d0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"gauge\":null}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"gauge_max\":\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/f0664070-4551-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/f0664070-4551-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 152f191ef..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/f0664070-4551-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Outcomes [ArcSight]",
-  "visState": "{\"title\":\"Events by Outcomes [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"e10aefa0-4550-11e7-86b6-95298e9da6dc\",\"type\":\"timeseries\",\"series\":[{\"id\":\"1b5b1130-4551-11e7-86b6-95298e9da6dc\",\"color\":\"rgba(244,78,59,1)\",\"split_mode\":\"filters\",\"metrics\":[{\"id\":\"1b5b1131-4551-11e7-86b6-95298e9da6dc\",\"type\":\"count\"}],\"seperate_axis\":1,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"terms_field\":\"categoryOutcome\",\"terms_size\":\"3\",\"label\":\"Event Outcomes\",\"hide_in_legend\":0,\"split_filters\":[{\"filter\":\"categoryOutcome:\\\"/Failure\\\"\",\"label\":\"Failure\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"a4c1a0b0-4551-11e7-86b6-95298e9da6dc\"},{\"filter\":\"categoryOutcome:\\\"/Success\\\"\",\"label\":\"Success\",\"color\":\"rgba(104,188,0,1)\",\"id\":\"b51f14b0-4551-11e7-86b6-95298e9da6dc\"},{\"filter\":\"categoryOutcome:\\\"/Attempt\\\"\",\"label\":\"Attempt\",\"color\":\"rgba(251,158,0,1)\",\"id\":\"c4b19790-4551-11e7-86b6-95298e9da6dc\"}]},{\"id\":\"e10aefa1-4550-11e7-86b6-95298e9da6dc\",\"color\":\"rgba(104,182,204,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"e10aefa2-4550-11e7-86b6-95298e9da6dc\",\"type\":\"count\"}],\"seperate_axis\":1,\"axis_position\":\"left\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Event Count\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"categoryDeviceGroup:\\\"/Operating System\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/f23438c0-4548-11e7-a94a-5d0a73686c64.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/f23438c0-4548-11e7-a94a-5d0a73686c64.json
deleted file mode 100644
index 4884dfbbb..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/f23438c0-4548-11e7-a94a-5d0a73686c64.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "DNS - Moving Average Event Count",
-  "visState": "{\"title\":\"DNS - Moving Average Event Count\",\"type\":\"metrics\",\"params\":{\"id\":\"429af7e0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"gauge\",\"series\":[{\"id\":\"429af7e1-3d5b-11e7-8b9d-ddc45b5f6d00\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"5faf9430-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"moving_average\",\"field\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Last Event Avg\",\"value_template\":\"{{value}}/s\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"deviceEventCategory:\\\"dns\\\"\",\"bar_color_rules\":[{\"id\":\"77dd4e80-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"background_color_rules\":[{\"id\":\"798c5e10-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"gauge_color_rules\":[{\"value\":0,\"id\":\"988f35d0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"gauge\":null}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"gauge_max\":\"\",\"ignore_global_filter\":1},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/f57ea930-395d-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/f57ea930-395d-11e7-ae19-21fb91585845.json
deleted file mode 100644
index 8c840db9d..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/f57ea930-395d-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Outcome [ArcSight]",
-  "visState": "{\"title\":\"Events by Outcome [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"e1a58ab0-3957-11e7-ae19-21fb91585845\",\"type\":\"timeseries\",\"series\":[{\"id\":\"8f58a280-395a-11e7-ae19-21fb91585845\",\"color\":\"rgba(211,49,21,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"8f58a281-395a-11e7-ae19-21fb91585845\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"4ec00ae0-4686-11e7-8ffc-b5cec7c0edbb\",\"type\":\"moving_average\",\"field\":\"8f58a281-395a-11e7-ae19-21fb91585845\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":\"0\",\"fill\":\"0\",\"stacked\":\"none\",\"filter\":\"(categoryDeviceGroup:\\\"/Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\") AND _exists_:categoryOutcome\",\"terms_field\":\"deviceHostName\",\"terms_order_by\":null,\"label\":\"Events\",\"steps\":0,\"split_filters\":[{\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\"\",\"label\":\"Firewall\",\"color\":\"rgba(254,146,0,1)\",\"id\":\"ccf3be70-395c-11e7-ae19-21fb91585845\"}]},{\"id\":\"3bb711b0-395b-11e7-ae19-21fb91585845\",\"color\":\"rgba(104,188,0,1)\",\"split_mode\":\"filters\",\"metrics\":[{\"id\":\"3bb711b1-395b-11e7-ae19-21fb91585845\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"left\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"1\",\"stacked\":\"stacked\",\"terms_field\":\"categoryOutcome\",\"terms_size\":\"3\",\"label\":\"Moving Average by Event Outcome\",\"split_filters\":[{\"filter\":\"categoryOutcome:\\\"/Success\\\"\",\"label\":\"Success\",\"color\":\"rgba(104,188,0,0.35)\",\"id\":\"c3189780-395d-11e7-ae19-21fb91585845\"},{\"filter\":\"categoryOutcome:\\\"/Failure\\\"\",\"label\":\"Failure\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"d37d3770-395d-11e7-ae19-21fb91585845\"},{\"filter\":\"categoryOutcome:\\\"/Attempt\\\"\",\"label\":\"Attempt\",\"color\":\"rgba(0,156,224,1)\",\"id\":\"e59c7440-4685-11e7-8ffc-b5cec7c0edbb\"}]}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"value\":0,\"id\":\"e4772140-3957-11e7-ae19-21fb91585845\",\"bar_color\":null}],\"background_color\":null,\"filter\":\"categoryDeviceType:\\\"Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\"\",\"background_color_rules\":[{\"id\":\"837bfbb0-395a-11e7-ae19-21fb91585845\"}],\"gauge_color_rules\":[{\"id\":\"8970f250-395a-11e7-ae19-21fb91585845\"}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"drilldown_url\":\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/f99c22e0-3e4e-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/f99c22e0-3e4e-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index 53ec30917..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/f99c22e0-3e4e-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 5 Sources by Destination Ports [ArcSight]",
-  "visState": "{\"title\":\"Top 5 Sources by Destination Ports [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationPort\",\"customLabel\":\"Destination Ports\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"sourceAddress\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Source Address\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/fd70bca0-398f-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/fd70bca0-398f-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index 7a4da9dc5..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/fd70bca0-398f-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 20 Source Countries [ArcSight]",
-  "visState": "{\"title\":\"Top 20 Source Countries [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"square root\",\"orientation\":\"single\",\"minFontSize\":26,\"maxFontSize\":72,\"hideLabel\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"source.country_name\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/ff476320-3e4a-11e7-af78-9fc514b4e118.json b/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/ff476320-3e4a-11e7-af78-9fc514b4e118.json
deleted file mode 100644
index 435d2ee2d..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/5.x/visualization/ff476320-3e4a-11e7-af78-9fc514b4e118.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Destination Port [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Destination Port [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":18,\"maxFontSize\":72},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationPort\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/dashboard/153e0bf0-752f-11e7-ae68-d756b92f3a9c.json b/x-pack/modules/arcsight/configuration/kibana/6.x/dashboard/153e0bf0-752f-11e7-ae68-d756b92f3a9c.json
deleted file mode 100644
index de87fe3cf..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/dashboard/153e0bf0-752f-11e7-ae68-d756b92f3a9c.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "title": "[ArcSight] Microsoft DNS Overview",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"col\":11,\"id\":\"4ee62420-7523-11e7-871d-5f0fb978413c\",\"panelIndex\":1,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"1de45d60-7523-11e7-9445-91c40765092f\",\"panelIndex\":3,\"row\":2,\"size_x\":10,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"d72d7940-7529-11e7-9445-91c40765092f\",\"panelIndex\":5,\"row\":9,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":1,\"id\":\"1c54cda0-752c-11e7-9445-91c40765092f\",\"panelIndex\":6,\"row\":13,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"8cda1c30-752a-11e7-9445-91c40765092f\",\"panelIndex\":7,\"row\":9,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":1,\"id\":\"aa57b050-7526-11e7-b440-f1d91dc5774d\",\"panelIndex\":9,\"row\":4,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"4303de60-752b-11e7-9445-91c40765092f\",\"panelIndex\":11,\"row\":15,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":1,\"id\":\"31b85570-454a-11e7-86b6-95298e9da6dc\",\"panelIndex\":12,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":1,\"id\":\"8f0161a0-752d-11e7-b440-f1d91dc5774d\",\"panelIndex\":13,\"row\":15,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":1,\"id\":\"ebfd45a0-75a4-11e7-b440-f1d91dc5774d\",\"panelIndex\":14,\"row\":6,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":7,\"id\":\"bd1c82c0-75a7-11e7-871d-5f0fb978413c\",\"panelIndex\":15,\"row\":6,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"size_x\":6,\"size_y\":3,\"panelIndex\":16,\"type\":\"visualization\",\"id\":\"c658b300-7745-11e7-8fb2-417804dc0ec8\",\"col\":7,\"row\":19},{\"size_x\":6,\"size_y\":3,\"panelIndex\":17,\"type\":\"visualization\",\"id\":\"b1f98ce0-7745-11e7-8fb2-417804dc0ec8\",\"col\":1,\"row\":19}]",
-  "optionsJSON": "{\"darkTheme\":false}",
-  "uiStateJSON": "{\"P-11\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-13\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-3\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-5\":{\"vis\":{\"defaultColors\":{\"0 - 18k\":\"rgb(247,251,255)\",\"18k - 36k\":\"rgb(227,238,249)\",\"36k - 54k\":\"rgb(208,225,242)\",\"54k - 72k\":\"rgb(182,212,233)\",\"72k - 90k\":\"rgb(148,196,223)\",\"90k - 108k\":\"rgb(107,174,214)\",\"108k - 126k\":\"rgb(74,152,201)\",\"126k - 144k\":\"rgb(46,126,188)\",\"144k - 162k\":\"rgb(23,100,171)\",\"162k - 180k\":\"rgb(8,74,145)\"},\"legendOpen\":false}},\"P-16\":{\"mapZoom\":1,\"mapCenter\":[12.211180191503997,0]},\"P-17\":{\"mapZoom\":1,\"mapCenter\":[-0.17578097424708533,0]}}",
-  "version": 1,
-  "timeRestore": true,
-  "timeTo": "now",
-  "timeFrom": "now-24h",
-  "refreshInterval": {
-    "display": "Off",
-    "pause": false,
-    "value": 0
-  },
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/dashboard/37af0b40-398d-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/6.x/dashboard/37af0b40-398d-11e7-ae19-21fb91585845.json
deleted file mode 100644
index 4bc87aece..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/dashboard/37af0b40-398d-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "title": "[ArcSight] Network Overview Dashboard",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"col\":1,\"id\":\"77cb1470-3989-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":1,\"row\":12,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"801fff70-395a-11e7-ae19-21fb91585845\",\"panelIndex\":2,\"row\":18,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"d6d526f0-395b-11e7-ae19-21fb91585845\",\"panelIndex\":5,\"row\":4,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"f57ea930-395d-11e7-ae19-21fb91585845\",\"panelIndex\":6,\"row\":16,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"161e27e0-3988-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":7,\"row\":2,\"size_x\":10,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"75582a90-3987-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":9,\"row\":6,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":5,\"id\":\"e9c3ee00-3978-11e7-ae19-21fb91585845\",\"panelIndex\":11,\"row\":6,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"ad802c10-3973-11e7-ae19-21fb91585845\",\"panelIndex\":13,\"row\":9,\"size_x\":8,\"size_y\":3,\"type\":\"visualization\"},{\"col\":9,\"id\":\"ec926660-396f-11e7-ae19-21fb91585845\",\"panelIndex\":15,\"row\":9,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":9,\"id\":\"154ff7e0-3987-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":16,\"row\":6,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"5acb74d0-398b-11e7-ae19-21fb91585845\",\"panelIndex\":17,\"row\":14,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"7a043760-3990-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":18,\"row\":20,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":7,\"id\":\"fd70bca0-398f-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":19,\"row\":20,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":11,\"id\":\"ed2f5570-3d5b-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":20,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"31b85570-454a-11e7-86b6-95298e9da6dc\",\"panelIndex\":21,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"size_x\":6,\"size_y\":6,\"panelIndex\":24,\"type\":\"visualization\",\"id\":\"45387480-3989-11e7-8b9d-ddc45b5f6d00\",\"col\":1,\"row\":24},{\"size_x\":6,\"size_y\":6,\"panelIndex\":25,\"type\":\"visualization\",\"id\":\"35ce1310-3989-11e7-8b9d-ddc45b5f6d00\",\"col\":7,\"row\":24}]",
-  "optionsJSON": "{\"darkTheme\":false}",
-  "uiStateJSON": "{\"P-11\":{\"vis\":{\"colors\":{\"/Attempt\":\"#0A50A1\",\"/Failure\":\"#BF1B00\",\"/Success\":\"#629E51\"}}},\"P-13\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-15\":{\"vis\":{\"defaultColors\":{\"0% - 17%\":\"rgb(255,255,204)\",\"17% - 34%\":\"rgb(255,230,146)\",\"34% - 50%\":\"rgb(254,191,90)\",\"50% - 67%\":\"rgb(253,141,60)\",\"67% - 84%\":\"rgb(244,61,37)\",\"84% - 100%\":\"rgb(202,8,35)\"},\"legendOpen\":false}},\"P-16\":{\"vis\":{\"colors\":{\"Anti-Virus\":\"#EF843C\",\"Content Security\":\"#7EB26D\",\"Firewall\":\"#E24D42\",\"Integrated Security\":\"#962D82\",\"Network-based IDS/IPS\":\"#1F78C1\",\"Operating System\":\"#1F78C1\",\"VPN\":\"#EAB839\"}}},\"P-18\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-7\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"},\"legendOpen\":false}},\"P-8\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-9\":{\"vis\":{\"colors\":{\"/Attempt\":\"#0A50A1\",\"/Failure\":\"#BF1B00\",\"/Success\":\"#629E51\"}}},\"P-25\":{\"mapZoom\":1,\"mapCenter\":[-0.3515602939922709,0]},\"P-24\":{\"mapZoom\":1,\"mapCenter\":[-0.3515602939922709,0]}}",
-  "version": 1,
-  "timeRestore": true,
-  "timeTo": "now",
-  "timeFrom": "now-24h",
-  "refreshInterval": {
-    "display": "Off",
-    "pause": false,
-    "value": 0
-  },
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/dashboard/64c92510-4555-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/6.x/dashboard/64c92510-4555-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index f16c6eb63..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/dashboard/64c92510-4555-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "title": "[ArcSight] Endpoint OS Activity Dashboard",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"col\":1,\"id\":\"c9e333a0-4550-11e7-86b6-95298e9da6dc\",\"panelIndex\":3,\"row\":8,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"463fc740-454e-11e7-86b6-95298e9da6dc\",\"panelIndex\":4,\"row\":2,\"size_x\":10,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"8f8d6230-454f-11e7-86b6-95298e9da6dc\",\"panelIndex\":5,\"row\":8,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"f0664070-4551-11e7-86b6-95298e9da6dc\",\"panelIndex\":7,\"row\":6,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"d8314510-454f-11e7-86b6-95298e9da6dc\",\"panelIndex\":8,\"row\":14,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"2b369910-4553-11e7-83ea-67cb6920446d\",\"panelIndex\":9,\"row\":11,\"size_x\":6,\"size_y\":6,\"type\":\"visualization\"},{\"col\":7,\"id\":\"9141cc20-4553-11e7-83ea-67cb6920446d\",\"panelIndex\":10,\"row\":11,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"31b85570-454a-11e7-86b6-95298e9da6dc\",\"panelIndex\":11,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":11,\"id\":\"0e4558b0-4552-11e7-86b6-95298e9da6dc\",\"panelIndex\":12,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"47c2a140-454f-11e7-86b6-95298e9da6dc\",\"panelIndex\":13,\"row\":4,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":9,\"id\":\"68180c80-4556-11e7-83ea-67cb6920446d\",\"panelIndex\":14,\"row\":17,\"size_x\":4,\"size_y\":5,\"type\":\"visualization\"},{\"col\":9,\"id\":\"08ee04d0-4556-11e7-83ea-67cb6920446d\",\"panelIndex\":15,\"row\":22,\"size_x\":4,\"size_y\":6,\"type\":\"visualization\"},{\"col\":1,\"id\":\"b897ce70-4556-11e7-83ea-67cb6920446d\",\"panelIndex\":16,\"row\":21,\"size_x\":8,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"93531890-4556-11e7-83ea-67cb6920446d\",\"panelIndex\":17,\"row\":26,\"size_x\":8,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"a8ce0ef0-4556-11e7-83ea-67cb6920446d\",\"panelIndex\":18,\"row\":17,\"size_x\":8,\"size_y\":4,\"type\":\"visualization\"},{\"col\":1,\"id\":\"82caeb10-4556-11e7-83ea-67cb6920446d\",\"panelIndex\":19,\"row\":24,\"size_x\":8,\"size_y\":2,\"type\":\"visualization\"}]",
-  "optionsJSON": "{\"darkTheme\":false}",
-  "uiStateJSON": "{\"P-13\":{\"vis\":{\"colors\":{\"Destination Users\":\"#E24D42\",\"Event Count\":\"#64B0C8\"}}},\"P-14\":{\"vis\":{\"legendOpen\":false}},\"P-15\":{\"vis\":{\"legendOpen\":false}},\"P-2\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-3\":{\"vis\":{\"colors\":{\"Count\":\"#64B0C8\",\"Destination User Names\":\"#E24D42\",\"Event Types\":\"#EF843C\"},\"legendOpen\":true}},\"P-4\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-5\":{\"vis\":{\"defaultColors\":{\"0 - 55k\":\"rgb(255,255,204)\",\"55k - 110k\":\"rgb(255,241,170)\",\"110k - 165k\":\"rgb(254,225,135)\",\"165k - 220k\":\"rgb(254,201,101)\",\"220k - 275k\":\"rgb(254,171,73)\",\"275k - 330k\":\"rgb(253,141,60)\",\"330k - 385k\":\"rgb(252,91,46)\",\"385k - 440k\":\"rgb(237,47,34)\",\"440k - 495k\":\"rgb(212,16,32)\",\"495k - 550k\":\"rgb(176,0,38)\"},\"legendOpen\":false}},\"P-8\":{\"vis\":{\"colors\":{\"/Attempt\":\"#447EBC\",\"/Failure\":\"#E24D42\",\"/Success\":\"#7EB26D\"}}},\"P-9\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}}",
-  "version": 1,
-  "timeRestore": true,
-  "timeTo": "now",
-  "timeFrom": "now-24h",
-  "refreshInterval": {
-    "display": "Off",
-    "pause": false,
-    "value": 0
-  },
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/dashboard/82051450-3e56-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/6.x/dashboard/82051450-3e56-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index ff6c22a0c..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/dashboard/82051450-3e56-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "title": "[ArcSight] Network Suspicious Activity Dashboard",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"col\":1,\"id\":\"aa2ff0a0-3e4a-11e7-96c4-0d3a291ec93a\",\"panelIndex\":1,\"row\":8,\"size_x\":8,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"992c7bd0-3e4e-11e7-96c4-0d3a291ec93a\",\"panelIndex\":2,\"row\":11,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":5,\"id\":\"f99c22e0-3e4e-11e7-96c4-0d3a291ec93a\",\"panelIndex\":3,\"row\":11,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"e3888410-3e50-11e7-96c4-0d3a291ec93a\",\"panelIndex\":5,\"row\":6,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":9,\"id\":\"75582a90-3987-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":9,\"row\":8,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"0bdbb5a0-3e55-11e7-96c4-0d3a291ec93a\",\"panelIndex\":11,\"row\":4,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"afdba840-3e55-11e7-96c4-0d3a291ec93a\",\"panelIndex\":12,\"row\":14,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":7,\"id\":\"bfa45650-3e55-11e7-96c4-0d3a291ec93a\",\"panelIndex\":13,\"row\":14,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":9,\"id\":\"cd462cc0-3e55-11e7-96c4-0d3a291ec93a\",\"panelIndex\":14,\"row\":11,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"31b85570-454a-11e7-86b6-95298e9da6dc\",\"panelIndex\":15,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":1,\"id\":\"161e27e0-3988-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":16,\"row\":2,\"size_x\":10,\"size_y\":2,\"type\":\"visualization\"},{\"col\":11,\"id\":\"ed2f5570-3d5b-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":17,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"}]",
-  "optionsJSON": "{\"darkTheme\":false}",
-  "uiStateJSON": "{\"P-1\":{\"vis\":{\"colors\":{\"Destination Addresses\":\"#E0752D\",\"Destination Ports\":\"#E24D42\"},\"legendOpen\":false}},\"P-16\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-17\":{\"vis\":{\"defaultColors\":{\"0 - 50\":\"rgb(255,255,204)\",\"100 - 200\":\"rgb(253,141,60)\",\"200 - 300\":\"rgb(227,27,28)\",\"300 - 400\":\"rgb(128,0,38)\",\"50 - 100\":\"rgb(254,217,118)\"}}},\"P-2\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-3\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-8\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-9\":{\"vis\":{\"colors\":{\"/Attempt\":\"#0A50A1\",\"/Failure\":\"#BF1B00\",\"/Success\":\"#629E51\"}}}}",
-  "version": 1,
-  "timeRestore": true,
-  "timeTo": "now",
-  "timeFrom": "now-24h",
-  "refreshInterval": {
-    "display": "Off",
-    "pause": false,
-    "value": 0
-  },
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/dashboard/arcsight.json b/x-pack/modules/arcsight/configuration/kibana/6.x/dashboard/arcsight.json
deleted file mode 100644
index dc18789aa..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/dashboard/arcsight.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  "153e0bf0-752f-11e7-ae68-d756b92f3a9c",
-  "37af0b40-398d-11e7-ae19-21fb91585845",
-  "64c92510-4555-11e7-83ea-67cb6920446d",
-  "82051450-3e56-11e7-96c4-0d3a291ec93a",
-  "d2fa5030-3e5d-11e7-b212-897f1496dc0e"
-]
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/dashboard/d2fa5030-3e5d-11e7-b212-897f1496dc0e.json b/x-pack/modules/arcsight/configuration/kibana/6.x/dashboard/d2fa5030-3e5d-11e7-b212-897f1496dc0e.json
deleted file mode 100644
index 899b113b2..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/dashboard/d2fa5030-3e5d-11e7-b212-897f1496dc0e.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "title": "[ArcSight] Endpoint Overview Dashboard",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"col\":11,\"id\":\"c53825b0-3e4b-11e7-af78-9fc514b4e118\",\"panelIndex\":1,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"e301a830-3e4d-11e7-af78-9fc514b4e118\",\"panelIndex\":2,\"row\":9,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"9de87d40-3e4e-11e7-af78-9fc514b4e118\",\"panelIndex\":3,\"row\":9,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"96af5bf0-3e50-11e7-af78-9fc514b4e118\",\"panelIndex\":5,\"row\":4,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"ff476320-3e4a-11e7-af78-9fc514b4e118\",\"panelIndex\":6,\"row\":12,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"b74e59b0-3e5f-11e7-899c-f940f646009b\",\"panelIndex\":7,\"row\":2,\"size_x\":10,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"7c6875e0-3e61-11e7-899c-f940f646009b\",\"panelIndex\":8,\"row\":12,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"columns\":[\"categoryDeviceGroup\",\"categoryTechnique\",\"categoryOutcome\",\"categorySignificance\",\"categoryObject\",\"categoryBehavior\",\"categoryDeviceType\"],\"id\":\"1d9ba830-3e47-11e7-af78-9fc514b4e118\",\"panelIndex\":9,\"row\":20,\"size_x\":12,\"size_y\":5,\"sort\":[\"deviceReceiptTime\",\"desc\"],\"type\":\"search\"},{\"col\":7,\"id\":\"cc8affd0-3e65-11e7-899c-f940f646009b\",\"panelIndex\":10,\"row\":15,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"1bde8be0-3e68-11e7-899c-f940f646009b\",\"panelIndex\":11,\"row\":6,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"7c414c90-3e66-11e7-899c-f940f646009b\",\"panelIndex\":12,\"row\":15,\"size_x\":6,\"size_y\":5,\"type\":\"visualization\"},{\"col\":7,\"id\":\"6fb90a30-3e6b-11e7-9d4a-89ea81333ea4\",\"panelIndex\":14,\"row\":6,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"31b85570-454a-11e7-86b6-95298e9da6dc\",\"panelIndex\":15,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"size_x\":6,\"size_y\":3,\"panelIndex\":17,\"type\":\"visualization\",\"id\":\"2a33c810-3e4d-11e7-af78-9fc514b4e118\",\"col\":7,\"row\":17}]",
-  "optionsJSON": "{\"darkTheme\":false}",
-  "uiStateJSON": "{\"P-11\":{\"vis\":{\"colors\":{\"Anti-Virus\":\"#EAB839\",\"Database\":\"#629E51\",\"Host-based IDS/IPS\":\"#E0752D\",\"Operating System\":\"#BF1B00\",\"Security Mangement\":\"#64B0C8\"}}},\"P-12\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-14\":{\"vis\":{\"colors\":{\"/Attempt\":\"#0A50A1\",\"/Failure\":\"#BF1B00\",\"/Informational\":\"#7EB26D\",\"/Informational/Warning\":\"#EF843C\",\"/Success\":\"#629E51\",\"Anti-Virus\":\"#EAB839\",\"Database\":\"#629E51\",\"Host-based IDS/IPS\":\"#E0752D\",\"Log Consolidator\":\"#E0F9D7\",\"Operating System\":\"#BF1B00\",\"Recon\":\"#BF1B00\",\"Security Mangement\":\"#64B0C8\"}}},\"P-2\":{\"vis\":{\"colors\":{\"/Attempt\":\"#0A50A1\",\"/Failure\":\"#BF1B00\",\"/Success\":\"#629E51\"}}},\"P-3\":{\"vis\":{\"colors\":{\"/Attempt\":\"#0A50A1\",\"/Failure\":\"#BF1B00\",\"/Success\":\"#629E51\"}}},\"P-7\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-8\":{\"vis\":{\"colors\":{\"/Attempt\":\"#0A50A1\",\"/Failure\":\"#BF1B00\",\"/Success\":\"#629E51\"}}},\"P-17\":{\"mapZoom\":1,\"mapCenter\":[12.897489183755892,0]}}",
-  "version": 1,
-  "timeRestore": true,
-  "timeTo": "now",
-  "timeFrom": "now-24h",
-  "refreshInterval": {
-    "display": "Off",
-    "pause": false,
-    "value": 0
-  },
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/index-pattern/arcsight.json b/x-pack/modules/arcsight/configuration/kibana/6.x/index-pattern/arcsight.json
deleted file mode 100644
index ef9b91ecb..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/index-pattern/arcsight.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "title":"arcsight-*",
-  "timeFieldName":"deviceReceiptTime",
-  "notExpandable":true,
-  "fieldFormatMap": "{\"bytesIn\":{\"id\":\"bytes\"},\"bytesOut\":{\"id\":\"bytes\"},\"totalBytes\":{\"id\":\"bytes\"}}",
-  "fields":"[{\"name\":\"flexDate1\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"fileName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString3Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"modelConfidence\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categoryObject\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"oldFileSize\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceLongitude\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceSeverity\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"source.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceServiceName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"device.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categoryOutcome\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"applicationProtocol\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString2Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceProcessId\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"deviceAction\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categoryBehavior\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"locality\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"priority\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomFloatingPoint1\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"relevance\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"oldFileModificationTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"deviceCustomFloatingPoint2\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destination.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceAssetId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomFloatingPoint3\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"sourceTranslatedAddress\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomFloatingPoint4\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"fileCreateTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"device.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"deviceFacility\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceUserId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationProcessName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomNumber1\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceDirection\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"source.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomNumber3\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomNumber2\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationPort\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"source.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceLatitude\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"device.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceHostName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationProcessId\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"destinationTimeZone\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString6Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomNumber2Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceOutboundInterface\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceAddress\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString5Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destination.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"requestUrl\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"transportProtocol\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceProcessName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"startTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceProduct\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceProcessId\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"deviceCustomNumber1Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categoryDeviceType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"bytesOut\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationDnsDomain\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceAddress\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationServiceName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceTranslatedPort\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString1\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString3\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString2\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationHostName\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString5\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"flexNumber1\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"devicePayloadId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString4\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"oldFileCreateTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"deviceCustomString6\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceEventCategory\",\"type\":\"string\",\"count\":3,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"flexNumber2\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"@timestamp\",\"type\":\"date\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"fileModificationTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"destinationTranslatedAddress\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categoryDeviceGroup\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"endTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destination.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationMacAddress\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourcePort\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationAddress\",\"type\":\"ip\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceReceiptTime\",\"type\":\"date\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationTranslatedZoneURI\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomDate2Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categoryTupleDescription\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationTranslatedPort\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceTranslatedAddress\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"sourceTranslatedZoneURI\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceInboundInterface\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"source.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentReceiptTime\",\"type\":\"date\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomDate1Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationLatitude\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceHostName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"eventId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentAddress\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceDnsDomain\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomDate2\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"deviceCustomDate1\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categorySignificance\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceEventClassId\",\"type\":\"string\",\"count\":3,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"port\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"fileSize\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"name\",\"type\":\"string\",\"count\":3,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"arcsightVersion\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationNtDomain\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"baseEventCount\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceVendor\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categoryTechnique\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentTimeZone\",\"type\":\"string\",\"count\":2,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"managerReceiptTime\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"customerURI\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceExternalId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationUserName\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationAssetId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"@version\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentHost\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationUserId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"bytesIn\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"severity\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomNumber3Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceUserName\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"filePath\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"externalId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString1Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceVersion\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationLongitude\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destination.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"device.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString4Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentVersion\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"fileType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationUserPrivileges\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"fileId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"originator\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceNtDomain\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceNtDomain\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceProcessName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"requestMethod\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentMacAddress\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceMacAddress\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false,\"searchable\":false,\"aggregatable\":false}]"
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/search/16a72e70-4543-11e7-9510-4b0b4978ab0e.json b/x-pack/modules/arcsight/configuration/kibana/6.x/search/16a72e70-4543-11e7-9510-4b0b4978ab0e.json
deleted file mode 100644
index e15b985f3..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/search/16a72e70-4543-11e7-9510-4b0b4978ab0e.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "title": "DNS Events",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "deviceVendor",
-    "deviceProduct",
-    "applicationProtocol",
-    "categoryBehavior",
-    "categoryOutcome",
-    "destinationAddress",
-    "destinationDnsDomain",
-    "destinationPort",
-    "deviceCustomString1Label",
-    "deviceCustomString1",
-    "deviceCustomString3Label",
-    "deviceCustomString3",
-    "deviceCustomString4Label",
-    "deviceCustomString4",
-    "deviceEventCategory",
-    "deviceHostName",
-    "deviceSeverity",
-    "sourceAddress",
-    "sourcePort",
-    "transportProtocol"
-  ],
-  "sort": [
-    "deviceReceiptTime",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"arcsight-*\",\"highlightAll\":true,\"version\":true,\"query\":{\"query_string\":{\"query\":\"deviceEventCategory:\\\"dns\\\"\",\"analyze_wildcard\":true}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/search/1d9ba830-3e47-11e7-af78-9fc514b4e118.json b/x-pack/modules/arcsight/configuration/kibana/6.x/search/1d9ba830-3e47-11e7-af78-9fc514b4e118.json
deleted file mode 100644
index 849977aef..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/search/1d9ba830-3e47-11e7-af78-9fc514b4e118.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "title": "Endpoint Event Explorer [ArcSight]",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "categoryDeviceGroup",
-    "categoryTechnique",
-    "categoryOutcome",
-    "categorySignificance",
-    "categoryObject",
-    "categoryBehavior",
-    "categoryDeviceType"
-  ],
-  "sort": [
-    "deviceReceiptTime",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"arcsight-*\",\"highlightAll\":true,\"version\":true,\"filter\":[],\"query\":{\"query_string\":{\"query\":\"categoryDeviceGroup:\\\"/Operating System\\\" OR categoryDeviceGroup:\\\"/IDS/Host\\\" OR categoryDeviceGroup:\\\"/Application\\\"\",\"analyze_wildcard\":true}}}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/search/6315e7a0-34be-11e7-95dc-4f6090d732f6.json b/x-pack/modules/arcsight/configuration/kibana/6.x/search/6315e7a0-34be-11e7-95dc-4f6090d732f6.json
deleted file mode 100644
index 47da6b1ba..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/search/6315e7a0-34be-11e7-95dc-4f6090d732f6.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "title": "Network Events [ArcSight]",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "priority",
-    "name",
-    "sourceAddress",
-    "sourcePort",
-    "destinationAddress",
-    "destinationPort",
-    "applicationProtocol",
-    "message",
-    "categoryBehavior",
-    "categoryOutcome",
-    "deviceAddress",
-    "deviceProduct",
-    "deviceVendor",
-    "categoryDeviceGroup",
-    "categoryDeviceType"
-  ],
-  "sort": [
-    "deviceReceiptTime",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"arcsight-*\",\"highlightAll\":true,\"version\":true,\"query\":{\"query_string\":{\"query\":\"categoryDeviceGroup:\\\"/Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\"\",\"analyze_wildcard\":true}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/search/7a2fc9c0-454d-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/6.x/search/7a2fc9c0-454d-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index a30a0099d..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/search/7a2fc9c0-454d-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "title": "Endpoint - OS Events [ArcSight]",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "deviceVendor",
-    "deviceProduct",
-    "name",
-    "deviceEventClassId",
-    "deviceEventCategory",
-    "sourceUserName",
-    "destinationUserName",
-    "destinationHostName",
-    "categoryBehavior",
-    "categoryOutcome",
-    "sourceNtDomain",
-    "destinationNTDomain"
-  ],
-  "sort": [
-    "deviceReceiptTime",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"arcsight-*\",\"highlightAll\":true,\"version\":true,\"filter\":[],\"query\":{\"query_string\":{\"query\":\"categoryDeviceGroup:\\\"/Operating System\\\"\",\"analyze_wildcard\":true}}}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/search/bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744.json b/x-pack/modules/arcsight/configuration/kibana/6.x/search/bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744.json
deleted file mode 100644
index 5a91447cf..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/search/bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "title": "Microsoft DNS Events [ArcSight]",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "deviceVendor",
-    "deviceProduct",
-    "categoryBehavior",
-    "categoryOutcome",
-    "destinationAddress",
-    "destinationPort",
-    "destinationHostName",
-    "deviceEventClassId",
-    "deviceCustomString1Label",
-    "deviceCustomString1",
-    "deviceCustomString2Label",
-    "deviceCustomString2",
-    "deviceCustomString3Label",
-    "deviceCustomString3",
-    "deviceCustomString4Label",
-    "deviceCustomString4",
-    "deviceEventCategory",
-    "deviceSeverity",
-    "sourceAddress",
-    "sourcePort",
-    "transportProtocol",
-    "bytesIn",
-    "requestUrl"
-  ],
-  "sort": [
-    "deviceReceiptTime",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"arcsight-*\",\"highlightAll\":true,\"version\":true,\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"deviceProduct:\\\"DNS Trace Log\\\"\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/039815b0-4548-11e7-a94a-5d0a73686c64.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/039815b0-4548-11e7-a94a-5d0a73686c64.json
deleted file mode 100644
index 4f6a514b7..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/039815b0-4548-11e7-a94a-5d0a73686c64.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Destination Domains by Source Address",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Source Address(es)\",\"field\":\"sourceAddress\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":10},\"schema\":\"segment\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"Destination Domain(s)\",\"field\":\"destinationDnsDomain\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":5},\"schema\":\"group\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Source Address(es)\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"value\"}]},\"title\":\"Top Destination Domains by Source Address\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "16a72e70-4543-11e7-9510-4b0b4978ab0e",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/08ee04d0-4556-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/08ee04d0-4556-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index df6551db6..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/08ee04d0-4556-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Source Users by Destination Users [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Source Users by Destination Users [ArcSight]\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"bottom\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"sourceUserName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source Users\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationUserName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Users\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/08f8cf10-3e57-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/08f8cf10-3e57-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index ecbe24d6e..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/08f8cf10-3e57-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Firewall - Navigation",
-  "visState": "{\"title\":\"Firewall - Navigation\",\"type\":\"markdown\",\"params\":{\"markdown\":\"### **Navigation Pane** ###\\n\\n[Firewall Devices Overview](#/dashboard/37af0b40-398d-11e7-ae19-21fb91585845)\\n\\n[Firewall Suspicious Activities](#/dashboard/82051450-3e56-11e7-96c4-0d3a291ec93a)\\n\\n[Endopint Overview](#dashboard/d2fa5030-3e5d-11e7-b212-897f1496dc0e)\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/0bdbb5a0-3e55-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/0bdbb5a0-3e55-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index 4e0820bf1..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/0bdbb5a0-3e55-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Source Addresses [ArcSight]",
-  "visState": "{\"title\":\"Events by Source Addresses [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"e1a58ab0-3957-11e7-ae19-21fb91585845\",\"type\":\"timeseries\",\"series\":[{\"id\":\"8f58a280-395a-11e7-ae19-21fb91585845\",\"color\":\"rgba(211,49,21,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"8f58a281-395a-11e7-ae19-21fb91585845\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"sigma\":\"\",\"id\":\"140cf490-395b-11e7-ae19-21fb91585845\",\"type\":\"moving_average\",\"field\":\"8f58a281-395a-11e7-ae19-21fb91585845\"}],\"seperate_axis\":1,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":\"0\",\"fill\":\"0\",\"stacked\":\"none\",\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\" \",\"terms_field\":\"deviceHostName\",\"terms_order_by\":null,\"label\":\"Events\",\"steps\":0,\"value_template\":\"{{value}}\"},{\"id\":\"3bb711b0-395b-11e7-ae19-21fb91585845\",\"color\":\"rgba(104,188,0,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"3bb711b1-395b-11e7-ae19-21fb91585845\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"4b515cc0-395b-11e7-ae19-21fb91585845\",\"type\":\"moving_average\",\"field\":\"3bb711b1-395b-11e7-ae19-21fb91585845\"}],\"seperate_axis\":1,\"axis_position\":\"left\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":\"0\",\"point_size\":1,\"fill\":\"0.5\",\"stacked\":\"none\",\"terms_field\":\"sourceAddress\",\"terms_size\":\"10\",\"label\":\"Top Source Addresses\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"id\":\"e4772140-3957-11e7-ae19-21fb91585845\"}],\"background_color\":null,\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\" \",\"background_color_rules\":[{\"id\":\"837bfbb0-395a-11e7-ae19-21fb91585845\"}],\"gauge_color_rules\":[{\"id\":\"8970f250-395a-11e7-ae19-21fb91585845\"}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/0e4558b0-4552-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/0e4558b0-4552-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 80a064424..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/0e4558b0-4552-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Endpoint - OS Average EPS [ArcSight]",
-  "visState": "{\"title\":\"Endpoint - OS Average EPS [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"3f2cf630-3e4b-11e7-af78-9fc514b4e118\",\"type\":\"gauge\",\"series\":[{\"id\":\"3f2cf631-3e4b-11e7-af78-9fc514b4e118\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"3f2cf632-3e4b-11e7-af78-9fc514b4e118\",\"type\":\"count\"},{\"id\":\"2f12f3d0-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"cumulative_sum\",\"field\":\"3f2cf632-3e4b-11e7-af78-9fc514b4e118\"},{\"unit\":\"1s\",\"id\":\"330d7a00-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"derivative\",\"field\":\"2f12f3d0-7dc5-11e7-95f6-690ab80d4e85\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"373fd910-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"moving_average\",\"field\":\"330d7a00-7dc5-11e7-95f6-690ab80d4e85\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Event Throughput\",\"offset_time\":\"1m\",\"value_template\":\"{{value}} / s\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"id\":\"527ca820-3e4b-11e7-af78-9fc514b4e118\"}],\"gauge_color_rules\":[{\"id\":\"52cee6d0-3e4b-11e7-af78-9fc514b4e118\"}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"filter\":\"categoryDeviceGroup:\\\"/Operating System\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/1439a5e0-3e69-11e7-899c-f940f646009b.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/1439a5e0-3e69-11e7-899c-f940f646009b.json
deleted file mode 100644
index 6dffb7e69..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/1439a5e0-3e69-11e7-899c-f940f646009b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Endpoint - Navigation",
-  "visState": "{\"title\":\"Endpoint - Navigation\",\"type\":\"markdown\",\"params\":{\"markdown\":\"### **Navigation Pane** ###\\n\\n[Endopint Overview](#dashboard/d2fa5030-3e5d-11e7-b212-897f1496dc0e)\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/154ff7e0-3987-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/154ff7e0-3987-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index ebad5d522..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/154ff7e0-3987-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Device Type Breakdown [ArcSight]",
-  "visState": "{\"title\":\"Device Type Breakdown [ArcSight]\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"categoryDeviceType\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Firewall Types\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/161e27e0-3988-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/161e27e0-3988-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index 96f03bf4b..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/161e27e0-3988-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Device Metrics Overview [ArcSight]",
-  "visState": "{\"title\":\"Device Metrics Overview [ArcSight]\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"30\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"12\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"8\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceHostName\",\"customLabel\":\"Devices\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceAddress\",\"customLabel\":\"Sources\"}},{\"id\":\"6\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationAddress\",\"customLabel\":\"Destinations\"}},{\"id\":\"7\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationPort\",\"customLabel\":\"Ports\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/1bde8be0-3e68-11e7-899c-f940f646009b.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/1bde8be0-3e68-11e7-899c-f940f646009b.json
deleted file mode 100644
index a4ac4d693..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/1bde8be0-3e68-11e7-899c-f940f646009b.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Device Types by Vendor [ArcSight]",
-  "visState": "{\"title\":\"Device Types by Vendor [ArcSight]\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"categoryDeviceType\",\"exclude\":\"Network-based IDS/IPS\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceVendor\",\"exclude\":\"\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/1c54cda0-752c-11e7-9445-91c40765092f.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/1c54cda0-752c-11e7-9445-91c40765092f.json
deleted file mode 100644
index bbfecefa1..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/1c54cda0-752c-11e7-9445-91c40765092f.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Event Types [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Event Types [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"square root\",\"orientation\":\"single\",\"minFontSize\":18,\"maxFontSize\":72},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceEventClassId\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/1de45d60-7523-11e7-9445-91c40765092f.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/1de45d60-7523-11e7-9445-91c40765092f.json
deleted file mode 100644
index 1852246bc..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/1de45d60-7523-11e7-9445-91c40765092f.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "DNS Metrics Overview [ArcSight]",
-  "visState": "{\"title\":\"DNS Metrics Overview [ArcSight]\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"32\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"type\":\"gauge\"},\"aggs\":[{\"id\":\"5\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceCustomString1\",\"customLabel\":\"Threads\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceCustomString2\",\"customLabel\":\"OpCodes\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceEventClassId\",\"customLabel\":\"Activity Types\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/2a33c810-3e4d-11e7-af78-9fc514b4e118.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/2a33c810-3e4d-11e7-af78-9fc514b4e118.json
deleted file mode 100644
index 41c822af8..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/2a33c810-3e4d-11e7-af78-9fc514b4e118.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Destination Locations by Event [ArcSight]",
-  "visState": "{\"title\":\"Top Destination Locations by Event [ArcSight]\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Shaded Circle Markers\",\"isDesaturated\":true,\"addTooltip\":true,\"heatMaxZoom\":0,\"heatMinOpacity\":0.1,\"heatRadius\":25,\"heatBlur\":15,\"heatNormalizeData\":true,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[0,0],\"wms\":{\"enabled\":false,\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\",\"options\":{\"version\":\"1.3.0\",\"layers\":\"0\",\"format\":\"image/png\",\"transparent\":true,\"attribution\":\"Maps provided by USGS\",\"styles\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"destination.location\",\"autoPrecision\":true,\"useGeocentroid\":true,\"precision\":2}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/2b369910-4553-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/2b369910-4553-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index 3d9899c01..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/2b369910-4553-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 15 Event Types by Events [ArcSight]",
-  "visState": "{\"title\":\"Top 15 Event Types by Events [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":15,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"categoryBehavior\",\"size\":15,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Types\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceUserName\",\"customLabel\":\"Source Users\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationUserName\",\"customLabel\":\"Destination Users\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceHostName\",\"customLabel\":\"Source Hosts\"}},{\"id\":\"6\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationHostName\",\"customLabel\":\"Destination Hosts\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/31b85570-454a-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/31b85570-454a-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 49ae1c4c5..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/31b85570-454a-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "ArcSight: Dashboard Navigation",
-  "visState": "{\"title\":\"ArcSight: Dashboard Navigation\",\"type\":\"markdown\",\"params\":{\"markdown\":\"[Network Overview](#/dashboard/37af0b40-398d-11e7-ae19-21fb91585845) | [Network Suspicious Activity](#/dashboard/82051450-3e56-11e7-96c4-0d3a291ec93a) | [Endpoint Overview](#dashboard/d2fa5030-3e5d-11e7-b212-897f1496dc0e) | [Endpoint OS Activity](#/dashboard/64c92510-4555-11e7-83ea-67cb6920446d) | [Microsoft DNS Overview](#/dashboard/153e0bf0-752f-11e7-ae68-d756b92f3a9c)\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/35ce1310-3989-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/35ce1310-3989-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index c3f38b9c9..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/35ce1310-3989-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Source Locations by Events [ArcSight]",
-  "visState": "{\"title\":\"Top Source Locations by Events [ArcSight]\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Shaded Circle Markers\",\"isDesaturated\":true,\"addTooltip\":true,\"heatMaxZoom\":0,\"heatMinOpacity\":0.1,\"heatRadius\":25,\"heatBlur\":15,\"heatNormalizeData\":true,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[0,0],\"wms\":{\"enabled\":false,\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\",\"options\":{\"version\":\"1.3.0\",\"layers\":\"0\",\"format\":\"image/png\",\"transparent\":true,\"attribution\":\"Maps provided by USGS\",\"styles\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"source.location\",\"autoPrecision\":true,\"useGeocentroid\":true,\"precision\":2,\"customLabel\":\"Source Location\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/4303de60-752b-11e7-9445-91c40765092f.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/4303de60-752b-11e7-9445-91c40765092f.json
deleted file mode 100644
index faa2946b2..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/4303de60-752b-11e7-9445-91c40765092f.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Destinations by Size [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Destinations by Size [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"destinationHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destinations\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesIn\",\"customLabel\":\"Bytes\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceAddress\",\"customLabel\":\"Sources\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Count\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/45387480-3989-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/45387480-3989-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index f2ea2c2f5..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/45387480-3989-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Destination Locations by Events [ArcSight]",
-  "visState": "{\"title\":\"Top Destination Locations by Events [ArcSight]\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Shaded Circle Markers\",\"isDesaturated\":true,\"addTooltip\":true,\"heatMaxZoom\":0,\"heatMinOpacity\":0.1,\"heatRadius\":25,\"heatBlur\":15,\"heatNormalizeData\":true,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[0,0],\"wms\":{\"enabled\":false,\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\",\"options\":{\"version\":\"1.3.0\",\"layers\":\"0\",\"format\":\"image/png\",\"transparent\":true,\"attribution\":\"Maps provided by USGS\",\"styles\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"destination.location\",\"autoPrecision\":true,\"useGeocentroid\":true,\"precision\":2,\"customLabel\":\"Destination Location\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/463fc740-454e-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/463fc740-454e-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 27f69b91b..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/463fc740-454e-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Endpoint OS Metrics Overview [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{\"customLabel\":\"Total Events\"},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"6\",\"params\":{\"customLabel\":\"Devices\",\"field\":\"deviceHostName\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"7\",\"params\":{\"customLabel\":\"Event Types\",\"field\":\"categoryBehavior\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"8\",\"params\":{\"customLabel\":\"Event Outcomes\",\"field\":\"categoryOutcome\"},\"schema\":\"metric\",\"type\":\"cardinality\"}],\"listeners\":{},\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"30\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"20\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"title\":\"Endpoint OS Metrics Overview [ArcSight]\",\"type\":\"metric\"}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/47c2a140-454f-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/47c2a140-454f-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 9949dcbe5..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/47c2a140-454f-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Events by Source and Destination Users [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{\"customLabel\":\"Event Count\"},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customInterval\":\"2h\",\"customLabel\":\"Timestamp\",\"extended_bounds\":{},\"field\":\"deviceReceiptTime\",\"interval\":\"auto\",\"min_doc_count\":1},\"schema\":\"segment\",\"type\":\"date_histogram\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"Source Users\",\"field\":\"sourceUserName\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"4\",\"params\":{\"customLabel\":\"Destination Users\",\"field\":\"destinationUserName\"},\"schema\":\"metric\",\"type\":\"cardinality\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Timestamp\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Event Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"},{\"data\":{\"id\":\"3\",\"label\":\"Source Users\"},\"drawLinesBetweenPoints\":true,\"interpolate\":\"linear\",\"lineWidth\":3,\"mode\":\"normal\",\"show\":true,\"showCircles\":true,\"type\":\"line\",\"valueAxis\":\"ValueAxis-2\"},{\"data\":{\"id\":\"4\",\"label\":\"Destination Users\"},\"drawLinesBetweenPoints\":true,\"interpolate\":\"linear\",\"lineWidth\":3,\"mode\":\"normal\",\"show\":true,\"showCircles\":true,\"type\":\"line\",\"valueAxis\":\"ValueAxis-2\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Event Count\"},\"type\":\"value\"},{\"id\":\"ValueAxis-2\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"RightAxis-1\",\"position\":\"right\",\"scale\":{\"mode\":\"normal\",\"type\":\"square root\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"\"},\"type\":\"value\"}]},\"title\":\"Events by Source and Destination Users [ArcSight]\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/49953800-4547-11e7-a94a-5d0a73686c64.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/49953800-4547-11e7-a94a-5d0a73686c64.json
deleted file mode 100644
index 7428f6902..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/49953800-4547-11e7-a94a-5d0a73686c64.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Top Destination Domains",
-  "visState": "{\"title\":\"Top Destination Domains\",\"type\":\"metrics\",\"params\":{\"id\":\"45479ab0-4545-11e7-a94a-5d0a73686c64\",\"type\":\"top_n\",\"series\":[{\"id\":\"45479ab1-4545-11e7-a94a-5d0a73686c64\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"45479ab2-4545-11e7-a94a-5d0a73686c64\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.3\",\"stacked\":\"none\",\"label\":\"Top Destination Domains\",\"terms_field\":\"destinationDnsDomain\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"deviceEventCategory:\\\"dns\\\"\",\"background_color_rules\":[{\"id\":\"efe6b130-4546-11e7-a94a-5d0a73686c64\"}],\"bar_color_rules\":[{\"id\":\"f596fdb0-4546-11e7-a94a-5d0a73686c64\"}]},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/4cf91f90-3d5c-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/4cf91f90-3d5c-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index b02fbeb48..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/4cf91f90-3d5c-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Firewall - Devices - Top EPS by Category Device Type",
-  "visState": "{\"title\":\"Firewall - Devices - Top EPS by Category Device Type\",\"type\":\"metrics\",\"params\":{\"id\":\"429af7e0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"top_n\",\"series\":[{\"id\":\"429af7e1-3d5b-11e7-8b9d-ddc45b5f6d00\",\"color\":\"rgba(252,220,0,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"linear\",\"unit\":\"\",\"id\":\"112da8a0-3d5c-11e7-8b9d-ddc45b5f6d00\",\"type\":\"moving_average\",\"field\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Top EPS contributors by Category Device Type\",\"value_template\":\"{{value}}/s\",\"terms_field\":\"categoryDeviceType\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\"\",\"bar_color_rules\":[{\"id\":\"77dd4e80-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"background_color_rules\":[{\"id\":\"798c5e10-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"gauge_color_rules\":[{\"value\":0,\"id\":\"988f35d0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"gauge\":null}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"gauge_max\":\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/4ee62420-7523-11e7-871d-5f0fb978413c.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/4ee62420-7523-11e7-871d-5f0fb978413c.json
deleted file mode 100644
index a9cd7ba92..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/4ee62420-7523-11e7-871d-5f0fb978413c.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "DNS - Event Throughput [ArcSight]",
-  "visState": "{\"title\":\"DNS - Event Throughput [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"429af7e0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"gauge\",\"series\":[{\"id\":\"429af7e1-3d5b-11e7-8b9d-ddc45b5f6d00\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"count\"},{\"id\":\"6497aaa0-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"cumulative_sum\",\"field\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\"},{\"unit\":\"1s\",\"id\":\"6800ed50-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"derivative\",\"field\":\"6497aaa0-7dc5-11e7-95f6-690ab80d4e85\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"6cf98290-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"moving_average\",\"field\":\"6800ed50-7dc5-11e7-95f6-690ab80d4e85\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Event Throughput\",\"value_template\":\"{{value}}  / s\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"deviceProduct:\\\"DNS Trace Log\\\"\",\"bar_color_rules\":[{\"id\":\"77dd4e80-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"background_color_rules\":[{\"id\":\"798c5e10-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"gauge_color_rules\":[{\"value\":0,\"id\":\"988f35d0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"gauge\":null}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"gauge_max\":\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/4ff86ee0-4549-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/4ff86ee0-4549-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index d845508c2..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/4ff86ee0-4549-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Source Address",
-  "visState": "{\"title\":\"Top Source Address\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"square root\",\"orientation\":\"single\",\"minFontSize\":11,\"maxFontSize\":60},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"sourceAddress\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source Addresses\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "16a72e70-4543-11e7-9510-4b0b4978ab0e",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/5acacad0-3986-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/5acacad0-3986-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index f6536a32a..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/5acacad0-3986-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Firewall - Devices - Event Outcome over Time",
-  "visState": "{\"title\":\"Firewall - Devices - Event Outcome over Time\",\"type\":\"area\",\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Time\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"interpolate\":\"linear\",\"mode\":\"normal\",\"show\":\"true\",\"showCircles\":true,\"type\":\"area\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Count\"},\"type\":\"value\"}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceReceiptTime\",\"interval\":\"auto\",\"customInterval\":\"2h\",\"min_doc_count\":1,\"extended_bounds\":{},\"customLabel\":\"Time\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"categoryOutcome\",\"size\":2,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Outcome\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"/Failure\":\"#BF1B00\",\"/Success\":\"#629E51\"}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/5acb74d0-398b-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/5acb74d0-398b-11e7-ae19-21fb91585845.json
deleted file mode 100644
index 0e3b215b9..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/5acb74d0-398b-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Device Types [ArcSight]",
-  "visState": "{\"title\":\"Events by Device Types [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"e1a58ab0-3957-11e7-ae19-21fb91585845\",\"type\":\"timeseries\",\"series\":[{\"id\":\"8f58a280-395a-11e7-ae19-21fb91585845\",\"color\":\"rgba(211,49,21,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"8f58a281-395a-11e7-ae19-21fb91585845\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"sigma\":\"\",\"id\":\"140cf490-395b-11e7-ae19-21fb91585845\",\"type\":\"moving_average\",\"field\":\"8f58a281-395a-11e7-ae19-21fb91585845\"}],\"seperate_axis\":1,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":\"0\",\"fill\":\"0\",\"stacked\":\"none\",\"filter\":\"\",\"terms_field\":\"deviceHostName\",\"terms_order_by\":null,\"label\":\"Events\",\"steps\":0,\"split_filters\":[{\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\"\",\"label\":\"Firewall\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"e403ef60-4684-11e7-8ffc-b5cec7c0edbb\"}]},{\"id\":\"3bb711b0-395b-11e7-ae19-21fb91585845\",\"color\":\"rgba(251,158,0,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"3bb711b1-395b-11e7-ae19-21fb91585845\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"4b515cc0-395b-11e7-ae19-21fb91585845\",\"type\":\"moving_average\",\"field\":\"3bb711b1-395b-11e7-ae19-21fb91585845\"}],\"seperate_axis\":1,\"axis_position\":\"left\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"terms_field\":\"categoryDeviceType\",\"terms_size\":\"10\",\"label\":\"Top Device Types by Mvg Averages\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"id\":\"e4772140-3957-11e7-ae19-21fb91585845\"}],\"background_color\":null,\"filter\":\"categoryDeviceType:\\\"Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\"\",\"background_color_rules\":[{\"id\":\"837bfbb0-395a-11e7-ae19-21fb91585845\"}],\"gauge_color_rules\":[{\"id\":\"8970f250-395a-11e7-ae19-21fb91585845\"}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/6414e6b0-4549-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/6414e6b0-4549-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index dd73a788c..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/6414e6b0-4549-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Destination Domain",
-  "visState": "{\"title\":\"Top Destination Domain\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"square root\",\"orientation\":\"single\",\"minFontSize\":11,\"maxFontSize\":60},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationDnsDomain\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"DNS Domains\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "16a72e70-4543-11e7-9510-4b0b4978ab0e",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/68180c80-4556-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/68180c80-4556-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index fbd5e8036..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/68180c80-4556-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Sources by Destinations [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Sources by Destinations [ArcSight]\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"bottom\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"sourceHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source Host\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Host\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/6bb7d0e0-4548-11e7-a94a-5d0a73686c64.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/6bb7d0e0-4548-11e7-a94a-5d0a73686c64.json
deleted file mode 100644
index 50b81de88..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/6bb7d0e0-4548-11e7-a94a-5d0a73686c64.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Query Type by Device",
-  "visState": "{\"title\":\"Query Type by Device\",\"type\":\"heatmap\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"enableHover\":false,\"legendPosition\":\"right\",\"times\":[],\"colorsNumber\":4,\"colorSchema\":\"Yellow to Red\",\"setColorRange\":false,\"colorsRange\":[],\"invertColors\":false,\"percentageMode\":false,\"valueAxes\":[{\"show\":false,\"id\":\"ValueAxis-1\",\"type\":\"value\",\"scale\":{\"type\":\"linear\",\"defaultYExtents\":false},\"labels\":{\"show\":false,\"rotate\":0,\"color\":\"#555\"}}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"DNS Device\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"deviceCustomString1\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"DNS Query Types\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 33\":\"rgb(255,255,204)\",\"33 - 65\":\"rgb(254,217,118)\",\"65 - 98\":\"rgb(253,141,60)\",\"98 - 130\":\"rgb(227,27,28)\"}}}",
-  "description": "",
-  "savedSearchId": "16a72e70-4543-11e7-9510-4b0b4978ab0e",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/6dfc0e30-3958-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/6dfc0e30-3958-11e7-ae19-21fb91585845.json
deleted file mode 100644
index 25df0ef43..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/6dfc0e30-3958-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Firewall - Devices - Top Devices by Event Count",
-  "visState": "{\"title\":\"Firewall - Devices - Top Devices by Event Count\",\"type\":\"metrics\",\"params\":{\"id\":\"e1a58ab0-3957-11e7-ae19-21fb91585845\",\"type\":\"top_n\",\"series\":[{\"id\":\"e1a58ab1-3957-11e7-ae19-21fb91585845\",\"color\":\"rgba(174,161,255,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"e1a58ab2-3957-11e7-ae19-21fb91585845\",\"type\":\"count\",\"field\":\"deviceHostName\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Top Firewall Devices\",\"terms_field\":\"deviceHostName\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"id\":\"e4772140-3957-11e7-ae19-21fb91585845\"}],\"background_color\":null,\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/6fb90a30-3e6b-11e7-9d4a-89ea81333ea4.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/6fb90a30-3e6b-11e7-9d4a-89ea81333ea4.json
deleted file mode 100644
index 749c41904..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/6fb90a30-3e6b-11e7-9d4a-89ea81333ea4.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Outcomes by User Names [ArcSight]",
-  "visState": "{\"title\":\"Outcomes by User Names [ArcSight]\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":false,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"categoryDeviceType\",\"exclude\":\"Network-based IDS/IPS\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"categoryOutcome\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"6\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationUserName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"/Informational\":\"#7EB26D\",\"/Informational/Warning\":\"#EF843C\",\"/Success\":\"#64B0C8\",\"Anti-Virus\":\"#B7DBAB\",\"Host-based IDS/IPS\":\"#629E51\",\"Log Consolidator\":\"#E0F9D7\",\"Operating System\":\"#3F6833\",\"Recon\":\"#BF1B00\",\"Security Mangement\":\"#CFFAFF\"},\"legendOpen\":true}}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/7008cd50-3988-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/7008cd50-3988-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index c6c260e8c..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/7008cd50-3988-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Bandwidth Overview",
-  "visState": "{\"title\":\"Bandwidth Overview\",\"type\":\"metric\",\"params\":{\"handleNoResults\":true,\"fontSize\":\"25\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesIn\",\"customLabel\":\"Incoming\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesOut\",\"customLabel\":\"Outgoing\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/75582a90-3987-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/75582a90-3987-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index e705ad00a..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/75582a90-3987-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Outcome by Device Type [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Firewall Types\",\"field\":\"categoryDeviceType\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":10},\"schema\":\"segment\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"Event Outcome\",\"field\":\"categoryOutcome\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":3},\"schema\":\"group\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"rotate\":75,\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Firewall Types\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"orderBucketsBySum\":true,\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"percentage\",\"type\":\"square root\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"value\"}]},\"title\":\"Outcome by Device Type [ArcSight]\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"/Success\":\"#629E51\",\"/Failure\":\"#BF1B00\"}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/77cb1470-3989-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/77cb1470-3989-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index 296621ddd..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/77cb1470-3989-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Application Protocols [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Application Protocols [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"square root\",\"orientation\":\"single\",\"minFontSize\":26,\"maxFontSize\":72,\"hideLabel\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"applicationProtocol\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/7a043760-3990-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/7a043760-3990-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index f865b6c0c..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/7a043760-3990-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Source Countries by Events [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Source Countries by Events [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Total Events\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"source.country_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source Country\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceAddress\",\"customLabel\":\"Source Addresses\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationAddress\",\"customLabel\":\"Destination Addresses\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationPort\",\"customLabel\":\"Destination Ports\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/7c414c90-3e66-11e7-899c-f940f646009b.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/7c414c90-3e66-11e7-899c-f940f646009b.json
deleted file mode 100644
index 4d79dcb46..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/7c414c90-3e66-11e7-899c-f940f646009b.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Source Countries by Event [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Source Countries by Event [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Total Events\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"source.country_name\",\"size\":35,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceAddress\",\"customLabel\":\"Source Addresses\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationAddress\",\"customLabel\":\"Destination Addresses\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationPort\",\"customLabel\":\"Destination Ports\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/7c6875e0-3e61-11e7-899c-f940f646009b.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/7c6875e0-3e61-11e7-899c-f940f646009b.json
deleted file mode 100644
index 124299cbe..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/7c6875e0-3e61-11e7-899c-f940f646009b.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Outcomes by Device Type [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"field\":\"categoryDeviceType\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":5},\"schema\":\"segment\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"field\":\"categoryOutcome\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":5},\"schema\":\"group\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":200},\"position\":\"left\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"categoryDeviceType: Descending\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"normal\",\"show\":true,\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":true,\"rotate\":75,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"bottom\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"value\"}]},\"title\":\"Outcomes by Device Type [ArcSight]\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"/Failure\":\"#BF1B00\"},\"legendOpen\":true}}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/801fff70-395a-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/801fff70-395a-11e7-ae19-21fb91585845.json
deleted file mode 100644
index a18226097..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/801fff70-395a-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Bandwidth Utilization [ArcSight]",
-  "visState": "{\"title\":\"Bandwidth Utilization [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"e1a58ab0-3957-11e7-ae19-21fb91585845\",\"type\":\"timeseries\",\"series\":[{\"id\":\"e1a58ab1-3957-11e7-ae19-21fb91585845\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"e1a58ab2-3957-11e7-ae19-21fb91585845\",\"type\":\"sum\",\"field\":\"bytesIn\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"bytes\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Inbound\",\"terms_field\":\"deviceHostName\",\"terms_order_by\":\"_count\",\"override_index_pattern\":1,\"series_index_pattern\":\"arcsight-*\",\"series_time_field\":\"deviceReceiptTime\"},{\"id\":\"67c18da0-3959-11e7-ae19-21fb91585845\",\"color\":\"rgba(244,78,59,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"67c18da1-3959-11e7-ae19-21fb91585845\",\"type\":\"sum\",\"field\":\"bytesOut\"},{\"script\":\"params.outbound > 0 ? params.outbound * -1 : 0\",\"id\":\"7ec4d1b0-3959-11e7-ae19-21fb91585845\",\"type\":\"calculation\",\"variables\":[{\"id\":\"a9fb70f0-3959-11e7-ae19-21fb91585845\",\"name\":\"outbound\",\"field\":\"67c18da1-3959-11e7-ae19-21fb91585845\"}]}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"bytes\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Outbound\",\"override_index_pattern\":1,\"series_index_pattern\":\"arcsight-*\",\"series_time_field\":\"deviceReceiptTime\",\"steps\":0}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"id\":\"e4772140-3957-11e7-ae19-21fb91585845\"}],\"background_color\":null,\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\" \"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/82caeb10-4556-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/82caeb10-4556-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index f43de99db..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/82caeb10-4556-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Source Users [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Source Users [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":10,\"maxFontSize\":60},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"sourceUserName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source Users\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/8bdaafe0-454e-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/8bdaafe0-454e-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 584b0c5dc..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/8bdaafe0-454e-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "OS Source and Destination Overview",
-  "visState": "{\"title\":\"OS Source and Destination Overview\",\"type\":\"metric\",\"params\":{\"handleNoResults\":true,\"fontSize\":\"25\"},\"aggs\":[{\"id\":\"9\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceHostName\",\"customLabel\":\"Source Hosts\"}},{\"id\":\"10\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationHostName\",\"customLabel\":\"Destination Hosts\"}},{\"id\":\"11\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceUserName\",\"customLabel\":\"Source Users\"}},{\"id\":\"12\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationUserName\",\"customLabel\":\"Destination Users\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/8cda1c30-752a-11e7-9445-91c40765092f.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/8cda1c30-752a-11e7-9445-91c40765092f.json
deleted file mode 100644
index f0aea8e82..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/8cda1c30-752a-11e7-9445-91c40765092f.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Event Types by Size [ArcSight]",
-  "visState": "{\"title\":\"Event Types by Size [ArcSight]\",\"type\":\"histogram\",\"params\":{\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"},\"valueAxis\":null},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"bottom\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"truncate\":100,\"rotate\":75},\"title\":{\"text\":\"Event Type\"}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"square root\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"Count\"}},{\"id\":\"ValueAxis-2\",\"name\":\"RightAxis-1\",\"type\":\"value\",\"position\":\"right\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"square root\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"Total (Bytes)\"}}],\"seriesParams\":[{\"show\":\"true\",\"type\":\"histogram\",\"mode\":\"normal\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"valueAxis\":\"ValueAxis-1\",\"drawLinesBetweenPoints\":true,\"showCircles\":true},{\"show\":true,\"mode\":\"normal\",\"type\":\"line\",\"drawLinesBetweenPoints\":true,\"showCircles\":false,\"interpolate\":\"linear\",\"lineWidth\":3,\"data\":{\"id\":\"3\",\"label\":\"Total (Bytes)\"},\"valueAxis\":\"ValueAxis-2\"}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false,\"orderBucketsBySum\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceEventClassId\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Type\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesIn\",\"customLabel\":\"Total (Bytes)\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"Total (Bytes)\":\"#E24D42\",\"Count\":\"#64B0C8\"}}}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/8f0161a0-752d-11e7-b440-f1d91dc5774d.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/8f0161a0-752d-11e7-b440-f1d91dc5774d.json
deleted file mode 100644
index da0421dfb..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/8f0161a0-752d-11e7-b440-f1d91dc5774d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Sources by Size [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Sources by Size [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"sourceHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Sources\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesIn\",\"customLabel\":\"Bytes\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationHostName\",\"customLabel\":\"Destinations\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Count\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"P-11\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-13\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-2\":{\"mapCenter\":[-0.17578097424708533,0],\"mapZoom\":0},\"P-3\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-4\":{\"mapCenter\":[-0.17578097424708533,0],\"mapZoom\":0},\"P-5\":{\"vis\":{\"defaultColors\":{\"0 - 18,000\":\"rgb(247,251,255)\",\"108,000 - 126,000\":\"rgb(74,152,201)\",\"126,000 - 144,000\":\"rgb(46,126,188)\",\"144,000 - 162,000\":\"rgb(23,100,171)\",\"162,000 - 180,000\":\"rgb(8,74,145)\",\"18,000 - 36,000\":\"rgb(227,238,249)\",\"36,000 - 54,000\":\"rgb(208,225,242)\",\"54,000 - 72,000\":\"rgb(182,212,233)\",\"72,000 - 90,000\":\"rgb(148,196,223)\",\"90,000 - 108,000\":\"rgb(107,174,214)\"},\"legendOpen\":false}},\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/8f8d6230-454f-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/8f8d6230-454f-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 43eaa9895..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/8f8d6230-454f-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Behaviors by Outcome [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Behaviors by Outcome [ArcSight]\",\"type\":\"heatmap\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"enableHover\":true,\"legendPosition\":\"right\",\"times\":[],\"colorsNumber\":10,\"colorSchema\":\"Yellow to Red\",\"setColorRange\":false,\"colorsRange\":[],\"invertColors\":false,\"percentageMode\":false,\"valueAxes\":[{\"show\":false,\"id\":\"ValueAxis-1\",\"type\":\"value\",\"scale\":{\"type\":\"linear\",\"defaultYExtents\":false},\"labels\":{\"show\":false,\"rotate\":0,\"color\":\"#555\"}}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"categoryBehavior\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Type\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"categoryOutcome\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Outcome\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 9,000\":\"rgb(255,255,204)\",\"9,000 - 18,000\":\"rgb(255,241,170)\",\"18,000 - 27,000\":\"rgb(254,225,135)\",\"27,000 - 36,000\":\"rgb(254,201,101)\",\"36,000 - 45,000\":\"rgb(254,171,73)\",\"45,000 - 54,000\":\"rgb(253,141,60)\",\"54,000 - 63,000\":\"rgb(252,91,46)\",\"63,000 - 72,000\":\"rgb(237,47,34)\",\"72,000 - 81,000\":\"rgb(212,16,32)\",\"81,000 - 90,000\":\"rgb(176,0,38)\"}}}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/9141cc20-4553-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/9141cc20-4553-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index bca0a4bbd..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/9141cc20-4553-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 5 Vendors by Product [ArcSight]",
-  "visState": "{\"title\":\"Top 5 Vendors by Product [ArcSight]\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceVendor\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"OS Vendor\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceProduct\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"OS Product\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/93531890-4556-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/93531890-4556-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index 2d5e96db9..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/93531890-4556-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Destination Users [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Destination Users [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":10,\"maxFontSize\":60},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationUserName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Users\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/96af5bf0-3e50-11e7-af78-9fc514b4e118.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/96af5bf0-3e50-11e7-af78-9fc514b4e118.json
deleted file mode 100644
index 3376e241c..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/96af5bf0-3e50-11e7-af78-9fc514b4e118.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Device [ArcSight]",
-  "visState": "{\"title\":\"Events by Device [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"f80221f0-3e4e-11e7-af78-9fc514b4e118\",\"type\":\"timeseries\",\"series\":[{\"id\":\"f80221f1-3e4e-11e7-af78-9fc514b4e118\",\"color\":\"rgba(254,37,37,1)\",\"split_mode\":\"filters\",\"metrics\":[{\"id\":\"f8024900-3e4e-11e7-af78-9fc514b4e118\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"1d93e660-3e4f-11e7-af78-9fc514b4e118\",\"type\":\"moving_average\",\"field\":\"f8024900-3e4e-11e7-af78-9fc514b4e118\"}],\"seperate_axis\":1,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"categoryDeviceGroup:\\\"/Operating System\\\" \",\"label\":\"Operating System\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"725ac7e0-3e4f-11e7-af78-9fc514b4e118\"},{\"filter\":\" categoryDeviceGroup:\\\"/IDS/Host\\\"\",\"label\":\"Host IDS\",\"color\":\"rgba(254,146,0,1)\",\"id\":\"bd6104c0-3e4f-11e7-af78-9fc514b4e118\"},{\"filter\":\"categoryDeviceGroup:\\\"/Application\\\"\",\"label\":\"Application\",\"color\":\"rgba(252,220,0,1)\",\"id\":\"cf5dd0e0-3e4f-11e7-af78-9fc514b4e118\"}],\"label\":\"Events\"},{\"id\":\"1633f8a0-3e50-11e7-af78-9fc514b4e118\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"1633f8a1-3e50-11e7-af78-9fc514b4e118\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"2b8a9e20-3e50-11e7-af78-9fc514b4e118\",\"type\":\"moving_average\",\"field\":\"1633f8a1-3e50-11e7-af78-9fc514b4e118\"}],\"seperate_axis\":1,\"axis_position\":\"left\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Moving Average by Device HostNames\",\"terms_field\":\"deviceHostName\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"categoryDeviceGroup:\\\"/Operating System\\\" OR categoryDeviceGroup:\\\"/IDS/Host\\\" OR categoryDeviceGroup:\\\"/Application\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/992c7bd0-3e4e-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/992c7bd0-3e4e-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index 4eeaad140..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/992c7bd0-3e4e-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 5 Sources by Destination Addresses [ArcSight]",
-  "visState": "{\"title\":\"Top 5 Sources by Destination Addresses [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationAddress\",\"customLabel\":\"Destination Addresses\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"sourceAddress\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Source Address\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/9d317890-3988-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/9d317890-3988-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index 11b98363f..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/9d317890-3988-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Overall Time Range",
-  "visState": "{\"title\":\"Overall Time Range\",\"type\":\"metric\",\"params\":{\"handleNoResults\":true,\"fontSize\":\"15\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"min\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceReceiptTime\",\"customLabel\":\"Start Time\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"max\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceReceiptTime\",\"customLabel\":\"End Time\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/9de87d40-3e4e-11e7-af78-9fc514b4e118.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/9de87d40-3e4e-11e7-af78-9fc514b4e118.json
deleted file mode 100644
index 895a0fe25..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/9de87d40-3e4e-11e7-af78-9fc514b4e118.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Outcomes Breakdown [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customInterval\":\"2h\",\"customLabel\":\"Time\",\"extended_bounds\":{},\"field\":\"deviceReceiptTime\",\"interval\":\"auto\",\"min_doc_count\":1},\"schema\":\"segment\",\"type\":\"date_histogram\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"field\":\"categoryOutcome\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":5},\"schema\":\"group\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Time\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"interpolate\":\"linear\",\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"area\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"value\"}]},\"title\":\"Outcomes Breakdown [ArcSight]\",\"type\":\"area\"}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"/Failure\":\"#BF1B00\",\"/Attempt\":\"#3F2B5B\"},\"legendOpen\":true}}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/9e4c5ca0-76cc-11e7-9fc0-830beaf5fb4b.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/9e4c5ca0-76cc-11e7-9fc0-830beaf5fb4b.json
deleted file mode 100644
index 59870f2d4..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/9e4c5ca0-76cc-11e7-9fc0-830beaf5fb4b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Event Count [ArcSight]",
-  "visState": "{\"title\":\"Event Count [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"19363b80-76cc-11e7-9fc0-830beaf5fb4b\",\"type\":\"metric\",\"series\":[{\"id\":\"19363b81-76cc-11e7-9fc0-830beaf5fb4b\",\"color\":\"#68BC00\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"19363b82-76cc-11e7-9fc0-830beaf5fb4b\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Event Count\",\"value_template\":\"\",\"override_index_pattern\":1,\"series_index_pattern\":\"arcsight-*\",\"series_time_field\":\"@timestamp\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"background_color_rules\":[{\"id\":\"30faacb0-76cc-11e7-9fc0-830beaf5fb4b\"}]},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/a8ce0ef0-4556-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/a8ce0ef0-4556-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index f3782bab6..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/a8ce0ef0-4556-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Sources [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Sources [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":10,\"maxFontSize\":60},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"sourceHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source Hosts\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/aa2ff0a0-3e4a-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/aa2ff0a0-3e4a-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index 85990965b..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/aa2ff0a0-3e4a-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Unique Destinations and Ports by Source [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{\"customLabel\":\"Destination Addresses\",\"field\":\"destinationAddress\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Source Addresses\",\"field\":\"sourceAddress\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":20},\"schema\":\"segment\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"Destination Ports\",\"field\":\"destinationPort\"},\"schema\":\"metric\",\"type\":\"cardinality\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Source Addresses\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Destination Addresses\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"},{\"data\":{\"id\":\"3\",\"label\":\"Destination Ports\"},\"drawLinesBetweenPoints\":true,\"interpolate\":\"linear\",\"lineWidth\":2,\"mode\":\"stacked\",\"show\":true,\"showCircles\":true,\"type\":\"line\",\"valueAxis\":\"ValueAxis-2\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Destination Addresses\"},\"type\":\"value\"},{\"id\":\"ValueAxis-2\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"RightAxis-1\",\"position\":\"right\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Destination Ports\"},\"type\":\"value\"}]},\"title\":\"Unique Destinations and Ports by Source [ArcSight]\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/aa57b050-7526-11e7-b440-f1d91dc5774d.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/aa57b050-7526-11e7-b440-f1d91dc5774d.json
deleted file mode 100644
index 4f281819c..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/aa57b050-7526-11e7-b440-f1d91dc5774d.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events Types by Severity [ArcSight]",
-  "visState": "{\"title\":\"Events Types by Severity [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"5f4e1f70-7523-11e7-b440-f1d91dc5774d\",\"type\":\"timeseries\",\"series\":[{\"id\":\"f7c4afd0-752d-11e7-ae68-d756b92f3a9c\",\"color\":\"#68BC00\",\"split_mode\":\"filters\",\"metrics\":[{\"id\":\"f7c4afd1-752d-11e7-ae68-d756b92f3a9c\",\"type\":\"count\",\"field\":\"bytesIn\"}],\"seperate_axis\":1,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":\"0\",\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"Cumulative Bytes\",\"split_filters\":[{\"filter\":\"(deviceSeverity:\\\"2\\\" OR deviceSeverity:\\\"3\\\" OR deviceSeverity:\\\"5\\\" OR deviceSeverity:\\\"16\\\" OR deviceCustomString4:\\\"SERVFAIL\\\" OR deviceCustomString4:\\\"NXDOMAIN\\\" OR deviceCustomString4:\\\"REFUSED\\\" OR deviceCustomString4:\\\"BADVERS\\\" OR deviceCustomString4:\\\"BADSIG\\\")\",\"label\":\"HIGH\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"53f76f80-7539-11e7-ae68-d756b92f3a9c\"},{\"filter\":\"(deviceSeverity:\\\"1\\\" OR  deviceSeverity:\\\"4\\\" OR  deviceSeverity:\\\"6\\\" OR  deviceSeverity:\\\"7\\\" OR  deviceSeverity:\\\"8\\\" OR  deviceSeverity:\\\"9\\\" OR  deviceSeverity:\\\"10\\\" OR deviceSeverity:\\\"17\\\" OR  deviceSeverity:\\\"18\\\" OR  deviceSeverity:\\\"19\\\" OR  deviceSeverity:\\\"20\\\" OR  deviceSeverity:\\\"21\\\" OR  deviceSeverity:\\\"22\\\" OR   deviceCustomString4:\\\"Error\\\" OR  deviceCustomString4:\\\"ERROR\\\" OR  deviceCustomString4:\\\"Warning\\\" OR  deviceCustomString4:\\\"WARNING\\\" OR  deviceCustomString4:\\\"FORMERR\\\" OR  deviceCustomString4:\\\"NOTIMP\\\" OR  deviceCustomString4:\\\"YXDOMAIN\\\" OR  deviceCustomString4:\\\"YXRRSET\\\" OR  deviceCustomString4:\\\"NXRRSET\\\" OR  deviceCustomString4:\\\"NOTAUTH\\\" OR  deviceCustomString4:\\\"NOTZONE\\\" OR  deviceCustomString4:\\\"BADKEY\\\" OR  deviceCustomString4:\\\"BADTIME\\\" OR  deviceCustomString4:\\\"BADMODE\\\" OR  deviceCustomString4:\\\"BADNAME\\\" OR  deviceCustomString4:\\\"BADALG\\\" OR  deviceCustomString4:\\\"BADTRUNC\\\")\",\"label\":\"MEDIUM\",\"color\":\"rgba(254,146,0,1)\",\"id\":\"6033e990-7539-11e7-ae68-d756b92f3a9c\"},{\"filter\":\"(NOT (deviceSeverity:\\\"2\\\" OR deviceSeverity:\\\"3\\\" OR deviceSeverity:\\\"5\\\" OR deviceSeverity:\\\"16\\\" OR deviceCustomString4:\\\"SERVFAIL\\\" OR deviceCustomString4:\\\"NXDOMAIN\\\" OR deviceCustomString4:\\\"REFUSED\\\" OR deviceCustomString4:\\\"BADVERS\\\" OR deviceCustomString4:\\\"BADSIG\\\" OR deviceSeverity:\\\"1\\\" OR  deviceSeverity:\\\"4\\\" OR  deviceSeverity:\\\"6\\\" OR  deviceSeverity:\\\"7\\\" OR  deviceSeverity:\\\"8\\\" OR  deviceSeverity:\\\"9\\\" OR  deviceSeverity:\\\"10\\\" OR deviceSeverity:\\\"17\\\" OR  deviceSeverity:\\\"18\\\" OR  deviceSeverity:\\\"19\\\" OR  deviceSeverity:\\\"20\\\" OR  deviceSeverity:\\\"21\\\" OR  deviceSeverity:\\\"22\\\" OR deviceCustomString4:\\\"Error\\\" OR  deviceCustomString4:\\\"ERROR\\\" OR  deviceCustomString4:\\\"Warning\\\" OR  deviceCustomString4:\\\"WARNING\\\" OR  deviceCustomString4:\\\"FORMERR\\\" OR  deviceCustomString4:\\\"NOTIMP\\\" OR  deviceCustomString4:\\\"YXDOMAIN\\\" OR  deviceCustomString4:\\\"YXRRSET\\\" OR  deviceCustomString4:\\\"NXRRSET\\\" OR  deviceCustomString4:\\\"NOTAUTH\\\" OR  deviceCustomString4:\\\"NOTZONE\\\" OR  deviceCustomString4:\\\"BADKEY\\\" OR  deviceCustomString4:\\\"BADTIME\\\" OR  deviceCustomString4:\\\"BADMODE\\\" OR  deviceCustomString4:\\\"BADNAME\\\" OR  deviceCustomString4:\\\"BADALG\\\" OR  deviceCustomString4:\\\"BADTRUNC\\\"))\",\"label\":\"LOW\",\"color\":\"rgba(252,220,0,1)\",\"id\":\"6b4be0d0-7539-11e7-ae68-d756b92f3a9c\"}]},{\"id\":\"e1a5d1f0-7525-11e7-b440-f1d91dc5774d\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"e1a5d1f1-7525-11e7-b440-f1d91dc5774d\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Count by Event Type\",\"terms_field\":\"deviceEventClassId\",\"terms_size\":\"20\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"deviceProduct:\\\"DNS Trace Log\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/ad802c10-3973-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/ad802c10-3973-11e7-ae19-21fb91585845.json
deleted file mode 100644
index e1416d1ca..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/ad802c10-3973-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Devices by Bandwidth [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Devices by Bandwidth [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showMeticsAtAllLevels\":false,\"showPartialRows\":false,\"showTotal\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"deviceHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Device\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceAddress\",\"customLabel\":\"Source(s)\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationAddress\",\"customLabel\":\"Destination(s)\"}},{\"id\":\"6\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationPort\",\"customLabel\":\"Destination Ports\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesIn\",\"customLabel\":\"Bandwidth (Incoming)\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesOut\",\"customLabel\":\"Bandwidth (Outgoing)\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/afdba840-3e55-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/afdba840-3e55-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index b9f6ca4e0..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/afdba840-3e55-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Source Addresses [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Source Addresses [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":18,\"maxFontSize\":72},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"sourceAddress\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source Addresses\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/b1f98ce0-7745-11e7-8fb2-417804dc0ec8.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/b1f98ce0-7745-11e7-8fb2-417804dc0ec8.json
deleted file mode 100644
index 7b95eb1dd..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/b1f98ce0-7745-11e7-8fb2-417804dc0ec8.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Sources by Events [ArcSight]",
-  "visState": "{\"title\":\"Top Sources by Events [ArcSight]\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Shaded Circle Markers\",\"isDesaturated\":true,\"addTooltip\":true,\"heatMaxZoom\":0,\"heatMinOpacity\":0.1,\"heatRadius\":25,\"heatBlur\":15,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[0,0],\"wms\":{\"enabled\":false,\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\",\"options\":{\"version\":\"1.3.0\",\"layers\":\"0\",\"format\":\"image/png\",\"transparent\":true,\"attribution\":\"Maps provided by USGS\",\"styles\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"source.location\",\"autoPrecision\":true,\"useGeocentroid\":true,\"precision\":2}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/b74e59b0-3e5f-11e7-899c-f940f646009b.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/b74e59b0-3e5f-11e7-899c-f940f646009b.json
deleted file mode 100644
index 4e7d3fcf6..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/b74e59b0-3e5f-11e7-899c-f940f646009b.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Endpoint Metrics Overview [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{\"customLabel\":\"Event Count\"},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Devices\",\"field\":\"deviceHostName\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"Source\",\"field\":\"sourceAddress\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"4\",\"params\":{\"customLabel\":\"Destination\",\"field\":\"destinationAddress\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"5\",\"params\":{\"customLabel\":\"Port\",\"field\":\"destinationPort\"},\"schema\":\"metric\",\"type\":\"cardinality\"}],\"listeners\":{},\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"30\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"12\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"title\":\"Endpoint Metrics Overview [ArcSight]\",\"type\":\"metric\"}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/b897ce70-4556-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/b897ce70-4556-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index 8d03dc079..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/b897ce70-4556-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Destinations [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Destinations [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":10,\"maxFontSize\":60},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Hosts\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/bd1c82c0-75a7-11e7-871d-5f0fb978413c.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/bd1c82c0-75a7-11e7-871d-5f0fb978413c.json
deleted file mode 100644
index df3b92b52..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/bd1c82c0-75a7-11e7-871d-5f0fb978413c.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Size [ArcSight]",
-  "visState": "{\"title\":\"Events by Size [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"8d6c10a0-75a6-11e7-871d-5f0fb978413c\",\"type\":\"timeseries\",\"series\":[{\"id\":\"8d6c10a1-75a6-11e7-871d-5f0fb978413c\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"8d6c10a2-75a6-11e7-871d-5f0fb978413c\",\"type\":\"sum\",\"field\":\"bytesIn\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"bytes\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"filter\":\"deviceDirection:\\\"0\\\"\",\"label\":\"Inbound Bytes\"},{\"id\":\"b15b6fb0-75a6-11e7-871d-5f0fb978413c\",\"color\":\"rgba(244,78,59,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"b15b6fb1-75a6-11e7-871d-5f0fb978413c\",\"type\":\"sum\",\"field\":\"bytesIn\"},{\"script\":\"params.outbound_bytes >= 0 ? params.outbound_bytes * -1 : 0\",\"id\":\"b6e2b060-75a6-11e7-871d-5f0fb978413c\",\"type\":\"calculation\",\"variables\":[{\"id\":\"b9031f60-75a6-11e7-871d-5f0fb978413c\",\"name\":\"outbound_bytes\",\"field\":\"b15b6fb1-75a6-11e7-871d-5f0fb978413c\"}]}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"bytes\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"filter\":\"deviceDirection:\\\"1\\\"\",\"label\":\"Outbound Bytes\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"deviceProduct:\\\"DNS Trace Log\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/bfa45650-3e55-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/bfa45650-3e55-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index 63f429367..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/bfa45650-3e55-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Destination Addresses [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Destination Addresses [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":18,\"maxFontSize\":72},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationAddress\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Addresses\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/c53825b0-3e4b-11e7-af78-9fc514b4e118.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/c53825b0-3e4b-11e7-af78-9fc514b4e118.json
deleted file mode 100644
index 66c44c98c..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/c53825b0-3e4b-11e7-af78-9fc514b4e118.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Endpoint Average EPS [ArcSight]",
-  "visState": "{\"title\":\"Endpoint Average EPS [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"3f2cf630-3e4b-11e7-af78-9fc514b4e118\",\"type\":\"gauge\",\"series\":[{\"id\":\"3f2cf631-3e4b-11e7-af78-9fc514b4e118\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"3f2cf632-3e4b-11e7-af78-9fc514b4e118\",\"type\":\"count\"},{\"id\":\"fbe01c40-7dc4-11e7-95f6-690ab80d4e85\",\"type\":\"cumulative_sum\",\"field\":\"3f2cf632-3e4b-11e7-af78-9fc514b4e118\"},{\"unit\":\"1s\",\"id\":\"01089b20-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"derivative\",\"field\":\"fbe01c40-7dc4-11e7-95f6-690ab80d4e85\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"070d9750-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"moving_average\",\"field\":\"01089b20-7dc5-11e7-95f6-690ab80d4e85\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Event Throughput\",\"value_template\":\"{{value}} / s\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"id\":\"527ca820-3e4b-11e7-af78-9fc514b4e118\"}],\"gauge_color_rules\":[{\"id\":\"52cee6d0-3e4b-11e7-af78-9fc514b4e118\"}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"filter\":\"categoryDeviceGroup:\\\"/Operating System\\\" OR categoryDeviceGroup:\\\"/IDS/Host\\\" OR categoryDeviceGroup:\\\"/Application\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/c658b300-7745-11e7-8fb2-417804dc0ec8.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/c658b300-7745-11e7-8fb2-417804dc0ec8.json
deleted file mode 100644
index 559c28300..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/c658b300-7745-11e7-8fb2-417804dc0ec8.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Destinations by Events [ArcSight]",
-  "visState": "{\"title\":\"Top Destinations by Events [ArcSight]\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Shaded Circle Markers\",\"isDesaturated\":true,\"addTooltip\":true,\"heatMaxZoom\":0,\"heatMinOpacity\":0.1,\"heatRadius\":25,\"heatBlur\":15,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[0,0],\"wms\":{\"enabled\":false,\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\",\"options\":{\"version\":\"1.3.0\",\"layers\":\"0\",\"format\":\"image/png\",\"transparent\":true,\"attribution\":\"Maps provided by USGS\",\"styles\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"destination.location\",\"autoPrecision\":true,\"useGeocentroid\":true,\"precision\":2}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/c6db4140-4544-11e7-a94a-5d0a73686c64.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/c6db4140-4544-11e7-a94a-5d0a73686c64.json
deleted file mode 100644
index 428070f96..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/c6db4140-4544-11e7-a94a-5d0a73686c64.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "DNS Metrics Overview",
-  "visState": "{\"title\":\"DNS Metrics Overview\",\"type\":\"metric\",\"params\":{\"handleNoResults\":true,\"fontSize\":\"25\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceHostName\",\"customLabel\":\"# of DNS Devices\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceAddress\",\"customLabel\":\"Source Address(es)\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceCustomString3\",\"customLabel\":\"Connection IDs\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationDnsDomain\",\"customLabel\":\"Domains\"}},{\"id\":\"6\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceCustomString1\",\"customLabel\":\"Query Type(s)\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "16a72e70-4543-11e7-9510-4b0b4978ab0e",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/c9e333a0-4550-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/c9e333a0-4550-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index ba1d1aefb..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/c9e333a0-4550-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Source Users by Event Type and Destination Users [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Source Users\",\"field\":\"sourceUserName\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":20},\"schema\":\"segment\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"Event Types\",\"field\":\"categoryBehavior\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"4\",\"params\":{\"customLabel\":\"Destination User Names\",\"field\":\"destinationUserName\"},\"schema\":\"metric\",\"type\":\"cardinality\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Source Users\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"},{\"data\":{\"id\":\"3\",\"label\":\"Event Types\"},\"drawLinesBetweenPoints\":true,\"interpolate\":\"linear\",\"lineWidth\":2,\"mode\":\"stacked\",\"show\":true,\"showCircles\":true,\"type\":\"line\",\"valueAxis\":\"ValueAxis-2\"},{\"data\":{\"id\":\"4\",\"label\":\"Destination User Names\"},\"drawLinesBetweenPoints\":true,\"interpolate\":\"linear\",\"lineWidth\":2,\"mode\":\"stacked\",\"show\":true,\"showCircles\":true,\"type\":\"line\",\"valueAxis\":\"ValueAxis-2\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"square root\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Count\"},\"type\":\"value\"},{\"id\":\"ValueAxis-2\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"RightAxis-1\",\"position\":\"right\",\"scale\":{\"mode\":\"normal\",\"type\":\"square root\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"\"},\"type\":\"value\"}]},\"title\":\"Source Users by Event Type and Destination Users [ArcSight]\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/cc8affd0-3e65-11e7-899c-f940f646009b.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/cc8affd0-3e65-11e7-899c-f940f646009b.json
deleted file mode 100644
index b68a868e9..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/cc8affd0-3e65-11e7-899c-f940f646009b.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 5 Source Countries [ArcSight]",
-  "visState": "{\"title\":\"Top 5 Source Countries [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":18,\"maxFontSize\":72},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"source.country_name\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/cd462cc0-3e55-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/cd462cc0-3e55-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index 1a1f5a645..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/cd462cc0-3e55-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Destination Ports [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Destination Ports [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":18,\"maxFontSize\":72},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationPort\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Addresses\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/d6d526f0-395b-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/d6d526f0-395b-11e7-ae19-21fb91585845.json
deleted file mode 100644
index 85e87e110..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/d6d526f0-395b-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Source [ArcSight]",
-  "visState": "{\"title\":\"Events by Source [ArcSight]\",\"type\":\"metrics\",\"params\":{\"axis_formatter\":\"number\",\"axis_position\":\"left\",\"background_color\":null,\"background_color_rules\":[{\"id\":\"837bfbb0-395a-11e7-ae19-21fb91585845\"}],\"bar_color_rules\":[{\"id\":\"e4772140-3957-11e7-ae19-21fb91585845\"}],\"filter\":\"categoryDeviceType:\\\"Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\"\",\"gauge_color_rules\":[{\"id\":\"8970f250-395a-11e7-ae19-21fb91585845\"}],\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"gauge_width\":10,\"id\":\"e1a58ab0-3957-11e7-ae19-21fb91585845\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"series\":[{\"axis_position\":\"right\",\"chart_type\":\"line\",\"color\":\"rgba(244,78,59,1)\",\"fill\":\"0\",\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\"\",\"formatter\":\"number\",\"id\":\"8f58a280-395a-11e7-ae19-21fb91585845\",\"label\":\"Events\",\"line_width\":\"3\",\"metrics\":[{\"id\":\"8f58a281-395a-11e7-ae19-21fb91585845\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"field\":\"8f58a281-395a-11e7-ae19-21fb91585845\",\"id\":\"140cf490-395b-11e7-ae19-21fb91585845\",\"sigma\":\"\",\"type\":\"moving_average\"}],\"point_size\":\"0\",\"seperate_axis\":1,\"split_mode\":\"filters\",\"stacked\":\"none\",\"steps\":0,\"terms_field\":\"deviceHostName\",\"terms_order_by\":null,\"split_filters\":[{\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\"\",\"label\":\"Firewall Events\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"1fd3fa30-4685-11e7-8ffc-b5cec7c0edbb\"},{\"filter\":\"categoryDeviceGroup:\\\"/IDS/Network\\\"\",\"label\":\"Intrusion Detection Events\",\"color\":\"rgba(254,146,0,1)\",\"id\":\"274111e0-4685-11e7-8ffc-b5cec7c0edbb\"},{\"filter\":\"categoryDeviceGroup:\\\"/VPN\\\"\",\"label\":\"VPN\",\"color\":\"rgba(252,220,0,1)\",\"id\":\"5682a680-468f-11e7-8116-65b4628ff93f\"}]},{\"axis_position\":\"left\",\"chart_type\":\"bar\",\"color\":\"rgba(0,156,224,1)\",\"fill\":\"0.5\",\"formatter\":\"number\",\"id\":\"3bb711b0-395b-11e7-ae19-21fb91585845\",\"label\":\"Moving Average by Device Hosts\",\"line_width\":1,\"metrics\":[{\"id\":\"3bb711b1-395b-11e7-ae19-21fb91585845\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"field\":\"3bb711b1-395b-11e7-ae19-21fb91585845\",\"id\":\"4b515cc0-395b-11e7-ae19-21fb91585845\",\"type\":\"moving_average\"}],\"point_size\":1,\"seperate_axis\":1,\"split_mode\":\"terms\",\"stacked\":\"none\",\"terms_field\":\"deviceHostName\",\"terms_size\":\"10\",\"split_color_mode\":\"gradient\"}],\"show_legend\":1,\"time_field\":\"deviceReceiptTime\",\"type\":\"timeseries\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/d72d7940-7529-11e7-9445-91c40765092f.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/d72d7940-7529-11e7-9445-91c40765092f.json
deleted file mode 100644
index 9225eac67..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/d72d7940-7529-11e7-9445-91c40765092f.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Destinations by Traffic Size [ArcSight]",
-  "visState": "{\"title\":\"Top Destinations by Traffic Size [ArcSight]\",\"type\":\"heatmap\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"enableHover\":true,\"legendPosition\":\"top\",\"times\":[],\"colorsNumber\":10,\"colorSchema\":\"Blues\",\"setColorRange\":false,\"colorsRange\":[{\"from\":0,\"to\":null}],\"invertColors\":false,\"percentageMode\":false,\"valueAxes\":[{\"show\":false,\"id\":\"ValueAxis-1\",\"type\":\"value\",\"scale\":{\"type\":\"linear\",\"defaultYExtents\":false},\"labels\":{\"show\":false,\"rotate\":0,\"color\":\"#555\"}}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesIn\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"filters\",\"schema\":\"segment\",\"params\":{\"filters\":[{\"input\":{\"query\":{\"query_string\":{\"query\":\"deviceDirection:\\\"0\\\"\",\"analyze_wildcard\":true}}},\"label\":\"Inbound\"},{\"input\":{\"query\":{\"query_string\":{\"query\":\"deviceDirection:\\\"1\\\"\",\"analyze_wildcard\":true}}},\"label\":\"Outbound\"}]}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"destinationHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 18k\":\"rgb(247,251,255)\",\"18k - 36k\":\"rgb(227,238,249)\",\"36k - 54k\":\"rgb(208,225,242)\",\"54k - 72k\":\"rgb(182,212,233)\",\"72k - 90k\":\"rgb(148,196,223)\",\"90k - 108k\":\"rgb(107,174,214)\",\"108k - 126k\":\"rgb(74,152,201)\",\"126k - 144k\":\"rgb(46,126,188)\",\"144k - 162k\":\"rgb(23,100,171)\",\"162k - 180k\":\"rgb(8,74,145)\"}}}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/d8314510-454f-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/d8314510-454f-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 6ddd0479d..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/d8314510-454f-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 20 Behaviors by Outcome [ArcSight]",
-  "visState": "{\"title\":\"Top 20 Behaviors by Outcome [ArcSight]\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"categoryBehavior\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Behavior\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"categoryOutcome\",\"size\":3,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Outcome\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/ddef4fc0-3e55-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/ddef4fc0-3e55-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index bc7f68b23..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/ddef4fc0-3e55-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Firewall - Suspicious - Top Application Protocols Word Cloud",
-  "visState": "{\"title\":\"Firewall - Suspicious - Top Application Protocols Word Cloud\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":18,\"maxFontSize\":72},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"applicationProtocol\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Addresses\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/e301a830-3e4d-11e7-af78-9fc514b4e118.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/e301a830-3e4d-11e7-af78-9fc514b4e118.json
deleted file mode 100644
index df2463335..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/e301a830-3e4d-11e7-af78-9fc514b4e118.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Destination Ports by Outcomes [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"field\":\"destinationPort\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":20},\"schema\":\"segment\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"field\":\"categoryOutcome\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":5},\"schema\":\"group\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"destinationPort: Descending\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"defaultYExtents\":true,\"mode\":\"normal\",\"setYExtents\":false,\"type\":\"square root\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"value\"}]},\"title\":\"Destination Ports by Outcomes [ArcSight]\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/e3888410-3e50-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/e3888410-3e50-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index b292e8087..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/e3888410-3e50-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Severity [ArcSight]",
-  "visState": "{\"title\":\"Events by Severity [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"69a9f020-3e50-11e7-96c4-0d3a291ec93a\",\"type\":\"top_n\",\"series\":[{\"id\":\"69a9f021-3e50-11e7-96c4-0d3a291ec93a\",\"color\":\"#68BC00\",\"split_mode\":\"filters\",\"metrics\":[{\"id\":\"69a9f022-3e50-11e7-96c4-0d3a291ec93a\",\"type\":\"count\"},{\"sigma\":\"\",\"id\":\"7bb17f50-76f3-11e7-82d9-83ee5c3338ae\",\"type\":\"sum_bucket\",\"field\":\"69a9f022-3e50-11e7-96c4-0d3a291ec93a\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0[0]a\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"severity:\\\"Low\\\" OR severity:\\\"0\\\"\",\"label\":\"LOW\",\"color\":\"rgba(104,204,202,1)\",\"id\":\"8819d6b0-3e50-11e7-96c4-0d3a291ec93a\"},{\"filter\":\"severity:\\\"Medium\\\"\",\"label\":\"MEDIUM\",\"color\":\"rgba(252,220,0,1)\",\"id\":\"9a4f6610-3e50-11e7-96c4-0d3a291ec93a\"},{\"filter\":\"severity:\\\"High\\\"\",\"label\":\"HIGH\",\"color\":\"rgba(254,146,0,1)\",\"id\":\"a3de4c50-3e50-11e7-96c4-0d3a291ec93a\"},{\"filter\":\"severity:\\\"Very-High\\\"\",\"label\":\"VERY HIGH\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"a9926960-3e50-11e7-96c4-0d3a291ec93a\"}],\"label\":\"Event by Severities\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"id\":\"6ed9c200-3e50-11e7-96c4-0d3a291ec93a\"}],\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/e7404c60-71cb-11e7-bdf5-8b8209f1c4b6.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/e7404c60-71cb-11e7-bdf5-8b8209f1c4b6.json
deleted file mode 100644
index 1daa81444..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/e7404c60-71cb-11e7-bdf5-8b8209f1c4b6.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Device Event Count [ArcSight]",
-  "visState": "{\"title\":\"Device Event Count [ArcSight]\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"30\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"12\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/e9c3ee00-3978-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/e9c3ee00-3978-11e7-ae19-21fb91585845.json
deleted file mode 100644
index 919183474..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/e9c3ee00-3978-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Destination Ports by Outcome [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Protocols\",\"field\":\"destinationPort\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":10},\"schema\":\"segment\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"field\":\"categoryOutcome\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":5},\"schema\":\"group\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"rotate\":75,\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Protocols\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"percentage\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Count\"},\"type\":\"value\"}]},\"title\":\"Destination Ports by Outcome [ArcSight]\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"/Success\":\"#629E51\",\"/Failure\":\"#BF1B00\"}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/ebfd45a0-75a4-11e7-b440-f1d91dc5774d.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/ebfd45a0-75a4-11e7-b440-f1d91dc5774d.json
deleted file mode 100644
index 6358a6d58..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/ebfd45a0-75a4-11e7-b440-f1d91dc5774d.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Direction [ArcSight]",
-  "visState": "{\"title\":\"Events by Direction [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"12cdd300-75a2-11e7-b440-f1d91dc5774d\",\"type\":\"timeseries\",\"series\":[{\"id\":\"12cdd301-75a2-11e7-b440-f1d91dc5774d\",\"color\":\"#68BC00\",\"split_mode\":\"filters\",\"metrics\":[{\"id\":\"12cdd302-75a2-11e7-b440-f1d91dc5774d\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"deviceDirection:\\\"0\\\"\",\"label\":\"Inbound Requests\",\"color\":\"rgba(0,156,224,1)\",\"id\":\"2bb9d440-75a2-11e7-b440-f1d91dc5774d\"}],\"label\":\"Inbound Requests\",\"filter\":\"device\"},{\"id\":\"bbe68d10-75a2-11e7-b440-f1d91dc5774d\",\"color\":\"#68BC00\",\"split_mode\":\"filters\",\"metrics\":[{\"id\":\"bbe68d11-75a2-11e7-b440-f1d91dc5774d\",\"type\":\"count\"},{\"script\":\"params.outbound > 0 ? params.outbound * -1 : 0\",\"id\":\"d50e5ed0-75a2-11e7-b440-f1d91dc5774d\",\"type\":\"calculation\",\"variables\":[{\"id\":\"d785ee80-75a2-11e7-b440-f1d91dc5774d\",\"name\":\"outbound\",\"field\":\"bbe68d11-75a2-11e7-b440-f1d91dc5774d\"}]}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"deviceDirection:\\\"1\\\"\",\"label\":\"Outbound Requests\",\"color\":\"rgba(211,49,21,1)\",\"id\":\"bfad3200-75a2-11e7-b440-f1d91dc5774d\"}],\"label\":\"Outbound Requests\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"deviceProduct:\\\"DNS Trace Log\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/ec576ff0-4546-11e7-a94a-5d0a73686c64.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/ec576ff0-4546-11e7-a94a-5d0a73686c64.json
deleted file mode 100644
index 9d0a2cd11..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/ec576ff0-4546-11e7-a94a-5d0a73686c64.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events over Time by Query Type",
-  "visState": "{\"title\":\"Events over Time by Query Type\",\"type\":\"metrics\",\"params\":{\"id\":\"45479ab0-4545-11e7-a94a-5d0a73686c64\",\"type\":\"timeseries\",\"series\":[{\"id\":\"45479ab1-4545-11e7-a94a-5d0a73686c64\",\"color\":\"#68BC00\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"45479ab2-4545-11e7-a94a-5d0a73686c64\",\"type\":\"count\"}],\"seperate_axis\":1,\"axis_position\":\"left\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.3\",\"stacked\":\"none\",\"label\":\"Event Count\"},{\"id\":\"afc2ab00-4545-11e7-a94a-5d0a73686c64\",\"color\":\"rgba(22,165,165,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"afc2ab01-4545-11e7-a94a-5d0a73686c64\",\"type\":\"count\"}],\"seperate_axis\":1,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"Query Types\",\"terms_field\":\"deviceCustomString1\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"deviceEventCategory:\\\"dns\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/ec926660-396f-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/ec926660-396f-11e7-ae19-21fb91585845.json
deleted file mode 100644
index 665293cfc..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/ec926660-396f-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Devices by Outcome [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Devices by Outcome [ArcSight]\",\"type\":\"heatmap\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"enableHover\":true,\"legendPosition\":\"right\",\"times\":[],\"colorsNumber\":6,\"colorSchema\":\"Yellow to Red\",\"setColorRange\":false,\"colorsRange\":[],\"invertColors\":false,\"percentageMode\":true,\"valueAxes\":[{\"show\":false,\"id\":\"ValueAxis-1\",\"type\":\"value\",\"scale\":{\"type\":\"linear\",\"defaultYExtents\":false},\"labels\":{\"show\":false,\"rotate\":0,\"color\":\"#555\"}}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Device Host Names\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"categoryOutcome\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Outcome\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0% - 17%\":\"rgb(255,255,204)\",\"17% - 34%\":\"rgb(255,230,146)\",\"34% - 50%\":\"rgb(254,191,90)\",\"50% - 67%\":\"rgb(253,141,60)\",\"67% - 84%\":\"rgb(244,61,37)\",\"84% - 100%\":\"rgb(202,8,35)\"}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/ed2f5570-3d5b-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/ed2f5570-3d5b-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index 0047ff645..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/ed2f5570-3d5b-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Network - Event Throughput [ArcSight]",
-  "visState": "{\"title\":\"Network - Event Throughput [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"429af7e0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"gauge\",\"series\":[{\"id\":\"429af7e1-3d5b-11e7-8b9d-ddc45b5f6d00\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"count\"},{\"id\":\"0bd1cb90-7dc4-11e7-95f6-690ab80d4e85\",\"type\":\"cumulative_sum\",\"field\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\"},{\"unit\":\"1s\",\"id\":\"103c9fc0-7dc4-11e7-95f6-690ab80d4e85\",\"type\":\"derivative\",\"field\":\"0bd1cb90-7dc4-11e7-95f6-690ab80d4e85\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"4f004810-7dc4-11e7-95f6-690ab80d4e85\",\"type\":\"moving_average\",\"field\":\"103c9fc0-7dc4-11e7-95f6-690ab80d4e85\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Event Throughput\",\"value_template\":\"{{value}}  / s\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"categoryDeviceType:\\\"Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\" \",\"bar_color_rules\":[{\"id\":\"77dd4e80-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"background_color_rules\":[{\"id\":\"798c5e10-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"gauge_color_rules\":[{\"value\":0,\"id\":\"988f35d0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"gauge\":null}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"gauge_max\":\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/f0664070-4551-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/f0664070-4551-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 152f191ef..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/f0664070-4551-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Outcomes [ArcSight]",
-  "visState": "{\"title\":\"Events by Outcomes [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"e10aefa0-4550-11e7-86b6-95298e9da6dc\",\"type\":\"timeseries\",\"series\":[{\"id\":\"1b5b1130-4551-11e7-86b6-95298e9da6dc\",\"color\":\"rgba(244,78,59,1)\",\"split_mode\":\"filters\",\"metrics\":[{\"id\":\"1b5b1131-4551-11e7-86b6-95298e9da6dc\",\"type\":\"count\"}],\"seperate_axis\":1,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"terms_field\":\"categoryOutcome\",\"terms_size\":\"3\",\"label\":\"Event Outcomes\",\"hide_in_legend\":0,\"split_filters\":[{\"filter\":\"categoryOutcome:\\\"/Failure\\\"\",\"label\":\"Failure\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"a4c1a0b0-4551-11e7-86b6-95298e9da6dc\"},{\"filter\":\"categoryOutcome:\\\"/Success\\\"\",\"label\":\"Success\",\"color\":\"rgba(104,188,0,1)\",\"id\":\"b51f14b0-4551-11e7-86b6-95298e9da6dc\"},{\"filter\":\"categoryOutcome:\\\"/Attempt\\\"\",\"label\":\"Attempt\",\"color\":\"rgba(251,158,0,1)\",\"id\":\"c4b19790-4551-11e7-86b6-95298e9da6dc\"}]},{\"id\":\"e10aefa1-4550-11e7-86b6-95298e9da6dc\",\"color\":\"rgba(104,182,204,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"e10aefa2-4550-11e7-86b6-95298e9da6dc\",\"type\":\"count\"}],\"seperate_axis\":1,\"axis_position\":\"left\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Event Count\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"categoryDeviceGroup:\\\"/Operating System\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/f23438c0-4548-11e7-a94a-5d0a73686c64.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/f23438c0-4548-11e7-a94a-5d0a73686c64.json
deleted file mode 100644
index 4884dfbbb..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/f23438c0-4548-11e7-a94a-5d0a73686c64.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "DNS - Moving Average Event Count",
-  "visState": "{\"title\":\"DNS - Moving Average Event Count\",\"type\":\"metrics\",\"params\":{\"id\":\"429af7e0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"gauge\",\"series\":[{\"id\":\"429af7e1-3d5b-11e7-8b9d-ddc45b5f6d00\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"5faf9430-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"moving_average\",\"field\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Last Event Avg\",\"value_template\":\"{{value}}/s\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"deviceEventCategory:\\\"dns\\\"\",\"bar_color_rules\":[{\"id\":\"77dd4e80-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"background_color_rules\":[{\"id\":\"798c5e10-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"gauge_color_rules\":[{\"value\":0,\"id\":\"988f35d0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"gauge\":null}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"gauge_max\":\"\",\"ignore_global_filter\":1},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/f57ea930-395d-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/f57ea930-395d-11e7-ae19-21fb91585845.json
deleted file mode 100644
index 8c840db9d..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/f57ea930-395d-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Outcome [ArcSight]",
-  "visState": "{\"title\":\"Events by Outcome [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"e1a58ab0-3957-11e7-ae19-21fb91585845\",\"type\":\"timeseries\",\"series\":[{\"id\":\"8f58a280-395a-11e7-ae19-21fb91585845\",\"color\":\"rgba(211,49,21,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"8f58a281-395a-11e7-ae19-21fb91585845\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"4ec00ae0-4686-11e7-8ffc-b5cec7c0edbb\",\"type\":\"moving_average\",\"field\":\"8f58a281-395a-11e7-ae19-21fb91585845\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":\"0\",\"fill\":\"0\",\"stacked\":\"none\",\"filter\":\"(categoryDeviceGroup:\\\"/Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\") AND _exists_:categoryOutcome\",\"terms_field\":\"deviceHostName\",\"terms_order_by\":null,\"label\":\"Events\",\"steps\":0,\"split_filters\":[{\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\"\",\"label\":\"Firewall\",\"color\":\"rgba(254,146,0,1)\",\"id\":\"ccf3be70-395c-11e7-ae19-21fb91585845\"}]},{\"id\":\"3bb711b0-395b-11e7-ae19-21fb91585845\",\"color\":\"rgba(104,188,0,1)\",\"split_mode\":\"filters\",\"metrics\":[{\"id\":\"3bb711b1-395b-11e7-ae19-21fb91585845\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"left\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"1\",\"stacked\":\"stacked\",\"terms_field\":\"categoryOutcome\",\"terms_size\":\"3\",\"label\":\"Moving Average by Event Outcome\",\"split_filters\":[{\"filter\":\"categoryOutcome:\\\"/Success\\\"\",\"label\":\"Success\",\"color\":\"rgba(104,188,0,0.35)\",\"id\":\"c3189780-395d-11e7-ae19-21fb91585845\"},{\"filter\":\"categoryOutcome:\\\"/Failure\\\"\",\"label\":\"Failure\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"d37d3770-395d-11e7-ae19-21fb91585845\"},{\"filter\":\"categoryOutcome:\\\"/Attempt\\\"\",\"label\":\"Attempt\",\"color\":\"rgba(0,156,224,1)\",\"id\":\"e59c7440-4685-11e7-8ffc-b5cec7c0edbb\"}]}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"value\":0,\"id\":\"e4772140-3957-11e7-ae19-21fb91585845\",\"bar_color\":null}],\"background_color\":null,\"filter\":\"categoryDeviceType:\\\"Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\"\",\"background_color_rules\":[{\"id\":\"837bfbb0-395a-11e7-ae19-21fb91585845\"}],\"gauge_color_rules\":[{\"id\":\"8970f250-395a-11e7-ae19-21fb91585845\"}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"drilldown_url\":\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/f99c22e0-3e4e-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/f99c22e0-3e4e-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index 53ec30917..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/f99c22e0-3e4e-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 5 Sources by Destination Ports [ArcSight]",
-  "visState": "{\"title\":\"Top 5 Sources by Destination Ports [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationPort\",\"customLabel\":\"Destination Ports\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"sourceAddress\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Source Address\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/fd70bca0-398f-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/fd70bca0-398f-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index 7a4da9dc5..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/fd70bca0-398f-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 20 Source Countries [ArcSight]",
-  "visState": "{\"title\":\"Top 20 Source Countries [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"square root\",\"orientation\":\"single\",\"minFontSize\":26,\"maxFontSize\":72,\"hideLabel\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"source.country_name\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/ff476320-3e4a-11e7-af78-9fc514b4e118.json b/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/ff476320-3e4a-11e7-af78-9fc514b4e118.json
deleted file mode 100644
index 435d2ee2d..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/6.x/visualization/ff476320-3e4a-11e7-af78-9fc514b4e118.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Destination Port [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Destination Port [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":18,\"maxFontSize\":72},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationPort\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/dashboard/153e0bf0-752f-11e7-ae68-d756b92f3a9c.json b/x-pack/modules/arcsight/configuration/kibana/7.x/dashboard/153e0bf0-752f-11e7-ae68-d756b92f3a9c.json
deleted file mode 100644
index de87fe3cf..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/dashboard/153e0bf0-752f-11e7-ae68-d756b92f3a9c.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "title": "[ArcSight] Microsoft DNS Overview",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"col\":11,\"id\":\"4ee62420-7523-11e7-871d-5f0fb978413c\",\"panelIndex\":1,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"1de45d60-7523-11e7-9445-91c40765092f\",\"panelIndex\":3,\"row\":2,\"size_x\":10,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"d72d7940-7529-11e7-9445-91c40765092f\",\"panelIndex\":5,\"row\":9,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":1,\"id\":\"1c54cda0-752c-11e7-9445-91c40765092f\",\"panelIndex\":6,\"row\":13,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"8cda1c30-752a-11e7-9445-91c40765092f\",\"panelIndex\":7,\"row\":9,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":1,\"id\":\"aa57b050-7526-11e7-b440-f1d91dc5774d\",\"panelIndex\":9,\"row\":4,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"4303de60-752b-11e7-9445-91c40765092f\",\"panelIndex\":11,\"row\":15,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":1,\"id\":\"31b85570-454a-11e7-86b6-95298e9da6dc\",\"panelIndex\":12,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":1,\"id\":\"8f0161a0-752d-11e7-b440-f1d91dc5774d\",\"panelIndex\":13,\"row\":15,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":1,\"id\":\"ebfd45a0-75a4-11e7-b440-f1d91dc5774d\",\"panelIndex\":14,\"row\":6,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":7,\"id\":\"bd1c82c0-75a7-11e7-871d-5f0fb978413c\",\"panelIndex\":15,\"row\":6,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"size_x\":6,\"size_y\":3,\"panelIndex\":16,\"type\":\"visualization\",\"id\":\"c658b300-7745-11e7-8fb2-417804dc0ec8\",\"col\":7,\"row\":19},{\"size_x\":6,\"size_y\":3,\"panelIndex\":17,\"type\":\"visualization\",\"id\":\"b1f98ce0-7745-11e7-8fb2-417804dc0ec8\",\"col\":1,\"row\":19}]",
-  "optionsJSON": "{\"darkTheme\":false}",
-  "uiStateJSON": "{\"P-11\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-13\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-3\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-5\":{\"vis\":{\"defaultColors\":{\"0 - 18k\":\"rgb(247,251,255)\",\"18k - 36k\":\"rgb(227,238,249)\",\"36k - 54k\":\"rgb(208,225,242)\",\"54k - 72k\":\"rgb(182,212,233)\",\"72k - 90k\":\"rgb(148,196,223)\",\"90k - 108k\":\"rgb(107,174,214)\",\"108k - 126k\":\"rgb(74,152,201)\",\"126k - 144k\":\"rgb(46,126,188)\",\"144k - 162k\":\"rgb(23,100,171)\",\"162k - 180k\":\"rgb(8,74,145)\"},\"legendOpen\":false}},\"P-16\":{\"mapZoom\":1,\"mapCenter\":[12.211180191503997,0]},\"P-17\":{\"mapZoom\":1,\"mapCenter\":[-0.17578097424708533,0]}}",
-  "version": 1,
-  "timeRestore": true,
-  "timeTo": "now",
-  "timeFrom": "now-24h",
-  "refreshInterval": {
-    "display": "Off",
-    "pause": false,
-    "value": 0
-  },
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/dashboard/37af0b40-398d-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/7.x/dashboard/37af0b40-398d-11e7-ae19-21fb91585845.json
deleted file mode 100644
index 4bc87aece..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/dashboard/37af0b40-398d-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "title": "[ArcSight] Network Overview Dashboard",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"col\":1,\"id\":\"77cb1470-3989-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":1,\"row\":12,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"801fff70-395a-11e7-ae19-21fb91585845\",\"panelIndex\":2,\"row\":18,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"d6d526f0-395b-11e7-ae19-21fb91585845\",\"panelIndex\":5,\"row\":4,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"f57ea930-395d-11e7-ae19-21fb91585845\",\"panelIndex\":6,\"row\":16,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"161e27e0-3988-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":7,\"row\":2,\"size_x\":10,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"75582a90-3987-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":9,\"row\":6,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":5,\"id\":\"e9c3ee00-3978-11e7-ae19-21fb91585845\",\"panelIndex\":11,\"row\":6,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"ad802c10-3973-11e7-ae19-21fb91585845\",\"panelIndex\":13,\"row\":9,\"size_x\":8,\"size_y\":3,\"type\":\"visualization\"},{\"col\":9,\"id\":\"ec926660-396f-11e7-ae19-21fb91585845\",\"panelIndex\":15,\"row\":9,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":9,\"id\":\"154ff7e0-3987-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":16,\"row\":6,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"5acb74d0-398b-11e7-ae19-21fb91585845\",\"panelIndex\":17,\"row\":14,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"7a043760-3990-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":18,\"row\":20,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":7,\"id\":\"fd70bca0-398f-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":19,\"row\":20,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":11,\"id\":\"ed2f5570-3d5b-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":20,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"31b85570-454a-11e7-86b6-95298e9da6dc\",\"panelIndex\":21,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"size_x\":6,\"size_y\":6,\"panelIndex\":24,\"type\":\"visualization\",\"id\":\"45387480-3989-11e7-8b9d-ddc45b5f6d00\",\"col\":1,\"row\":24},{\"size_x\":6,\"size_y\":6,\"panelIndex\":25,\"type\":\"visualization\",\"id\":\"35ce1310-3989-11e7-8b9d-ddc45b5f6d00\",\"col\":7,\"row\":24}]",
-  "optionsJSON": "{\"darkTheme\":false}",
-  "uiStateJSON": "{\"P-11\":{\"vis\":{\"colors\":{\"/Attempt\":\"#0A50A1\",\"/Failure\":\"#BF1B00\",\"/Success\":\"#629E51\"}}},\"P-13\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-15\":{\"vis\":{\"defaultColors\":{\"0% - 17%\":\"rgb(255,255,204)\",\"17% - 34%\":\"rgb(255,230,146)\",\"34% - 50%\":\"rgb(254,191,90)\",\"50% - 67%\":\"rgb(253,141,60)\",\"67% - 84%\":\"rgb(244,61,37)\",\"84% - 100%\":\"rgb(202,8,35)\"},\"legendOpen\":false}},\"P-16\":{\"vis\":{\"colors\":{\"Anti-Virus\":\"#EF843C\",\"Content Security\":\"#7EB26D\",\"Firewall\":\"#E24D42\",\"Integrated Security\":\"#962D82\",\"Network-based IDS/IPS\":\"#1F78C1\",\"Operating System\":\"#1F78C1\",\"VPN\":\"#EAB839\"}}},\"P-18\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-7\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"},\"legendOpen\":false}},\"P-8\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-9\":{\"vis\":{\"colors\":{\"/Attempt\":\"#0A50A1\",\"/Failure\":\"#BF1B00\",\"/Success\":\"#629E51\"}}},\"P-25\":{\"mapZoom\":1,\"mapCenter\":[-0.3515602939922709,0]},\"P-24\":{\"mapZoom\":1,\"mapCenter\":[-0.3515602939922709,0]}}",
-  "version": 1,
-  "timeRestore": true,
-  "timeTo": "now",
-  "timeFrom": "now-24h",
-  "refreshInterval": {
-    "display": "Off",
-    "pause": false,
-    "value": 0
-  },
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/dashboard/64c92510-4555-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/7.x/dashboard/64c92510-4555-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index f16c6eb63..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/dashboard/64c92510-4555-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "title": "[ArcSight] Endpoint OS Activity Dashboard",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"col\":1,\"id\":\"c9e333a0-4550-11e7-86b6-95298e9da6dc\",\"panelIndex\":3,\"row\":8,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"463fc740-454e-11e7-86b6-95298e9da6dc\",\"panelIndex\":4,\"row\":2,\"size_x\":10,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"8f8d6230-454f-11e7-86b6-95298e9da6dc\",\"panelIndex\":5,\"row\":8,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"f0664070-4551-11e7-86b6-95298e9da6dc\",\"panelIndex\":7,\"row\":6,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"d8314510-454f-11e7-86b6-95298e9da6dc\",\"panelIndex\":8,\"row\":14,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"2b369910-4553-11e7-83ea-67cb6920446d\",\"panelIndex\":9,\"row\":11,\"size_x\":6,\"size_y\":6,\"type\":\"visualization\"},{\"col\":7,\"id\":\"9141cc20-4553-11e7-83ea-67cb6920446d\",\"panelIndex\":10,\"row\":11,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"31b85570-454a-11e7-86b6-95298e9da6dc\",\"panelIndex\":11,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":11,\"id\":\"0e4558b0-4552-11e7-86b6-95298e9da6dc\",\"panelIndex\":12,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"47c2a140-454f-11e7-86b6-95298e9da6dc\",\"panelIndex\":13,\"row\":4,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":9,\"id\":\"68180c80-4556-11e7-83ea-67cb6920446d\",\"panelIndex\":14,\"row\":17,\"size_x\":4,\"size_y\":5,\"type\":\"visualization\"},{\"col\":9,\"id\":\"08ee04d0-4556-11e7-83ea-67cb6920446d\",\"panelIndex\":15,\"row\":22,\"size_x\":4,\"size_y\":6,\"type\":\"visualization\"},{\"col\":1,\"id\":\"b897ce70-4556-11e7-83ea-67cb6920446d\",\"panelIndex\":16,\"row\":21,\"size_x\":8,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"93531890-4556-11e7-83ea-67cb6920446d\",\"panelIndex\":17,\"row\":26,\"size_x\":8,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"a8ce0ef0-4556-11e7-83ea-67cb6920446d\",\"panelIndex\":18,\"row\":17,\"size_x\":8,\"size_y\":4,\"type\":\"visualization\"},{\"col\":1,\"id\":\"82caeb10-4556-11e7-83ea-67cb6920446d\",\"panelIndex\":19,\"row\":24,\"size_x\":8,\"size_y\":2,\"type\":\"visualization\"}]",
-  "optionsJSON": "{\"darkTheme\":false}",
-  "uiStateJSON": "{\"P-13\":{\"vis\":{\"colors\":{\"Destination Users\":\"#E24D42\",\"Event Count\":\"#64B0C8\"}}},\"P-14\":{\"vis\":{\"legendOpen\":false}},\"P-15\":{\"vis\":{\"legendOpen\":false}},\"P-2\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-3\":{\"vis\":{\"colors\":{\"Count\":\"#64B0C8\",\"Destination User Names\":\"#E24D42\",\"Event Types\":\"#EF843C\"},\"legendOpen\":true}},\"P-4\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-5\":{\"vis\":{\"defaultColors\":{\"0 - 55k\":\"rgb(255,255,204)\",\"55k - 110k\":\"rgb(255,241,170)\",\"110k - 165k\":\"rgb(254,225,135)\",\"165k - 220k\":\"rgb(254,201,101)\",\"220k - 275k\":\"rgb(254,171,73)\",\"275k - 330k\":\"rgb(253,141,60)\",\"330k - 385k\":\"rgb(252,91,46)\",\"385k - 440k\":\"rgb(237,47,34)\",\"440k - 495k\":\"rgb(212,16,32)\",\"495k - 550k\":\"rgb(176,0,38)\"},\"legendOpen\":false}},\"P-8\":{\"vis\":{\"colors\":{\"/Attempt\":\"#447EBC\",\"/Failure\":\"#E24D42\",\"/Success\":\"#7EB26D\"}}},\"P-9\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}}",
-  "version": 1,
-  "timeRestore": true,
-  "timeTo": "now",
-  "timeFrom": "now-24h",
-  "refreshInterval": {
-    "display": "Off",
-    "pause": false,
-    "value": 0
-  },
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/dashboard/82051450-3e56-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/7.x/dashboard/82051450-3e56-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index ff6c22a0c..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/dashboard/82051450-3e56-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "title": "[ArcSight] Network Suspicious Activity Dashboard",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"col\":1,\"id\":\"aa2ff0a0-3e4a-11e7-96c4-0d3a291ec93a\",\"panelIndex\":1,\"row\":8,\"size_x\":8,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"992c7bd0-3e4e-11e7-96c4-0d3a291ec93a\",\"panelIndex\":2,\"row\":11,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":5,\"id\":\"f99c22e0-3e4e-11e7-96c4-0d3a291ec93a\",\"panelIndex\":3,\"row\":11,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"e3888410-3e50-11e7-96c4-0d3a291ec93a\",\"panelIndex\":5,\"row\":6,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":9,\"id\":\"75582a90-3987-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":9,\"row\":8,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"0bdbb5a0-3e55-11e7-96c4-0d3a291ec93a\",\"panelIndex\":11,\"row\":4,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"afdba840-3e55-11e7-96c4-0d3a291ec93a\",\"panelIndex\":12,\"row\":14,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":7,\"id\":\"bfa45650-3e55-11e7-96c4-0d3a291ec93a\",\"panelIndex\":13,\"row\":14,\"size_x\":6,\"size_y\":4,\"type\":\"visualization\"},{\"col\":9,\"id\":\"cd462cc0-3e55-11e7-96c4-0d3a291ec93a\",\"panelIndex\":14,\"row\":11,\"size_x\":4,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"31b85570-454a-11e7-86b6-95298e9da6dc\",\"panelIndex\":15,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"col\":1,\"id\":\"161e27e0-3988-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":16,\"row\":2,\"size_x\":10,\"size_y\":2,\"type\":\"visualization\"},{\"col\":11,\"id\":\"ed2f5570-3d5b-11e7-8b9d-ddc45b5f6d00\",\"panelIndex\":17,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"}]",
-  "optionsJSON": "{\"darkTheme\":false}",
-  "uiStateJSON": "{\"P-1\":{\"vis\":{\"colors\":{\"Destination Addresses\":\"#E0752D\",\"Destination Ports\":\"#E24D42\"},\"legendOpen\":false}},\"P-16\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-17\":{\"vis\":{\"defaultColors\":{\"0 - 50\":\"rgb(255,255,204)\",\"100 - 200\":\"rgb(253,141,60)\",\"200 - 300\":\"rgb(227,27,28)\",\"300 - 400\":\"rgb(128,0,38)\",\"50 - 100\":\"rgb(254,217,118)\"}}},\"P-2\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-3\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-8\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-9\":{\"vis\":{\"colors\":{\"/Attempt\":\"#0A50A1\",\"/Failure\":\"#BF1B00\",\"/Success\":\"#629E51\"}}}}",
-  "version": 1,
-  "timeRestore": true,
-  "timeTo": "now",
-  "timeFrom": "now-24h",
-  "refreshInterval": {
-    "display": "Off",
-    "pause": false,
-    "value": 0
-  },
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/dashboard/arcsight.json b/x-pack/modules/arcsight/configuration/kibana/7.x/dashboard/arcsight.json
deleted file mode 100644
index dc18789aa..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/dashboard/arcsight.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  "153e0bf0-752f-11e7-ae68-d756b92f3a9c",
-  "37af0b40-398d-11e7-ae19-21fb91585845",
-  "64c92510-4555-11e7-83ea-67cb6920446d",
-  "82051450-3e56-11e7-96c4-0d3a291ec93a",
-  "d2fa5030-3e5d-11e7-b212-897f1496dc0e"
-]
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/dashboard/d2fa5030-3e5d-11e7-b212-897f1496dc0e.json b/x-pack/modules/arcsight/configuration/kibana/7.x/dashboard/d2fa5030-3e5d-11e7-b212-897f1496dc0e.json
deleted file mode 100644
index 899b113b2..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/dashboard/d2fa5030-3e5d-11e7-b212-897f1496dc0e.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "title": "[ArcSight] Endpoint Overview Dashboard",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"col\":11,\"id\":\"c53825b0-3e4b-11e7-af78-9fc514b4e118\",\"panelIndex\":1,\"row\":2,\"size_x\":2,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"e301a830-3e4d-11e7-af78-9fc514b4e118\",\"panelIndex\":2,\"row\":9,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"9de87d40-3e4e-11e7-af78-9fc514b4e118\",\"panelIndex\":3,\"row\":9,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"96af5bf0-3e50-11e7-af78-9fc514b4e118\",\"panelIndex\":5,\"row\":4,\"size_x\":12,\"size_y\":2,\"type\":\"visualization\"},{\"col\":7,\"id\":\"ff476320-3e4a-11e7-af78-9fc514b4e118\",\"panelIndex\":6,\"row\":12,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"b74e59b0-3e5f-11e7-899c-f940f646009b\",\"panelIndex\":7,\"row\":2,\"size_x\":10,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"7c6875e0-3e61-11e7-899c-f940f646009b\",\"panelIndex\":8,\"row\":12,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"columns\":[\"categoryDeviceGroup\",\"categoryTechnique\",\"categoryOutcome\",\"categorySignificance\",\"categoryObject\",\"categoryBehavior\",\"categoryDeviceType\"],\"id\":\"1d9ba830-3e47-11e7-af78-9fc514b4e118\",\"panelIndex\":9,\"row\":20,\"size_x\":12,\"size_y\":5,\"sort\":[\"deviceReceiptTime\",\"desc\"],\"type\":\"search\"},{\"col\":7,\"id\":\"cc8affd0-3e65-11e7-899c-f940f646009b\",\"panelIndex\":10,\"row\":15,\"size_x\":6,\"size_y\":2,\"type\":\"visualization\"},{\"col\":1,\"id\":\"1bde8be0-3e68-11e7-899c-f940f646009b\",\"panelIndex\":11,\"row\":6,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"7c414c90-3e66-11e7-899c-f940f646009b\",\"panelIndex\":12,\"row\":15,\"size_x\":6,\"size_y\":5,\"type\":\"visualization\"},{\"col\":7,\"id\":\"6fb90a30-3e6b-11e7-9d4a-89ea81333ea4\",\"panelIndex\":14,\"row\":6,\"size_x\":6,\"size_y\":3,\"type\":\"visualization\"},{\"col\":1,\"id\":\"31b85570-454a-11e7-86b6-95298e9da6dc\",\"panelIndex\":15,\"row\":1,\"size_x\":12,\"size_y\":1,\"type\":\"visualization\"},{\"size_x\":6,\"size_y\":3,\"panelIndex\":17,\"type\":\"visualization\",\"id\":\"2a33c810-3e4d-11e7-af78-9fc514b4e118\",\"col\":7,\"row\":17}]",
-  "optionsJSON": "{\"darkTheme\":false}",
-  "uiStateJSON": "{\"P-11\":{\"vis\":{\"colors\":{\"Anti-Virus\":\"#EAB839\",\"Database\":\"#629E51\",\"Host-based IDS/IPS\":\"#E0752D\",\"Operating System\":\"#BF1B00\",\"Security Mangement\":\"#64B0C8\"}}},\"P-12\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-14\":{\"vis\":{\"colors\":{\"/Attempt\":\"#0A50A1\",\"/Failure\":\"#BF1B00\",\"/Informational\":\"#7EB26D\",\"/Informational/Warning\":\"#EF843C\",\"/Success\":\"#629E51\",\"Anti-Virus\":\"#EAB839\",\"Database\":\"#629E51\",\"Host-based IDS/IPS\":\"#E0752D\",\"Log Consolidator\":\"#E0F9D7\",\"Operating System\":\"#BF1B00\",\"Recon\":\"#BF1B00\",\"Security Mangement\":\"#64B0C8\"}}},\"P-2\":{\"vis\":{\"colors\":{\"/Attempt\":\"#0A50A1\",\"/Failure\":\"#BF1B00\",\"/Success\":\"#629E51\"}}},\"P-3\":{\"vis\":{\"colors\":{\"/Attempt\":\"#0A50A1\",\"/Failure\":\"#BF1B00\",\"/Success\":\"#629E51\"}}},\"P-7\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-8\":{\"vis\":{\"colors\":{\"/Attempt\":\"#0A50A1\",\"/Failure\":\"#BF1B00\",\"/Success\":\"#629E51\"}}},\"P-17\":{\"mapZoom\":1,\"mapCenter\":[12.897489183755892,0]}}",
-  "version": 1,
-  "timeRestore": true,
-  "timeTo": "now",
-  "timeFrom": "now-24h",
-  "refreshInterval": {
-    "display": "Off",
-    "pause": false,
-    "value": 0
-  },
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/index-pattern/arcsight.json b/x-pack/modules/arcsight/configuration/kibana/7.x/index-pattern/arcsight.json
deleted file mode 100644
index ef9b91ecb..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/index-pattern/arcsight.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "title":"arcsight-*",
-  "timeFieldName":"deviceReceiptTime",
-  "notExpandable":true,
-  "fieldFormatMap": "{\"bytesIn\":{\"id\":\"bytes\"},\"bytesOut\":{\"id\":\"bytes\"},\"totalBytes\":{\"id\":\"bytes\"}}",
-  "fields":"[{\"name\":\"flexDate1\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"fileName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString3Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"modelConfidence\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categoryObject\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"oldFileSize\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceLongitude\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceSeverity\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"source.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceServiceName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"device.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categoryOutcome\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"applicationProtocol\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString2Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceProcessId\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"deviceAction\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categoryBehavior\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"locality\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"priority\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomFloatingPoint1\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"relevance\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"oldFileModificationTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"deviceCustomFloatingPoint2\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destination.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceAssetId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomFloatingPoint3\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"sourceTranslatedAddress\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomFloatingPoint4\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"fileCreateTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"device.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"deviceFacility\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceUserId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationProcessName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomNumber1\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceDirection\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"source.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomNumber3\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomNumber2\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationPort\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"source.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceLatitude\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"device.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceHostName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationProcessId\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"destinationTimeZone\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString6Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomNumber2Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceOutboundInterface\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceAddress\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString5Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destination.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"requestUrl\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"transportProtocol\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceProcessName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"startTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceProduct\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceProcessId\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"deviceCustomNumber1Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categoryDeviceType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"bytesOut\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationDnsDomain\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceAddress\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationServiceName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceTranslatedPort\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString1\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString3\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString2\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationHostName\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString5\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"flexNumber1\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"devicePayloadId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString4\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"oldFileCreateTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"deviceCustomString6\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceEventCategory\",\"type\":\"string\",\"count\":3,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"flexNumber2\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"@timestamp\",\"type\":\"date\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"fileModificationTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"destinationTranslatedAddress\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categoryDeviceGroup\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"endTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destination.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationMacAddress\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourcePort\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationAddress\",\"type\":\"ip\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceReceiptTime\",\"type\":\"date\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationTranslatedZoneURI\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomDate2Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categoryTupleDescription\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationTranslatedPort\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceTranslatedAddress\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"sourceTranslatedZoneURI\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceInboundInterface\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"source.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentReceiptTime\",\"type\":\"date\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomDate1Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationLatitude\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceHostName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"eventId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentAddress\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceDnsDomain\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomDate2\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"deviceCustomDate1\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categorySignificance\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceEventClassId\",\"type\":\"string\",\"count\":3,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"port\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"fileSize\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"name\",\"type\":\"string\",\"count\":3,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"arcsightVersion\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationNtDomain\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"baseEventCount\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceVendor\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"categoryTechnique\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentTimeZone\",\"type\":\"string\",\"count\":2,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"managerReceiptTime\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"customerURI\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceExternalId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationUserName\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationAssetId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"@version\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentHost\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationUserId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"bytesIn\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"severity\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomNumber3Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceUserName\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"filePath\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"externalId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString1Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceVersion\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationLongitude\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destination.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"device.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceCustomString4Label\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentVersion\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"fileType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"destinationUserPrivileges\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"fileId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"originator\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceNtDomain\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceNtDomain\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"sourceProcessName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"requestMethod\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"agentMacAddress\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"deviceMacAddress\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false,\"searchable\":true,\"aggregatable\":true},  {\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false,\"searchable\":false,\"aggregatable\":false},  {\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false,\"searchable\":false,\"aggregatable\":false}]"
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/search/16a72e70-4543-11e7-9510-4b0b4978ab0e.json b/x-pack/modules/arcsight/configuration/kibana/7.x/search/16a72e70-4543-11e7-9510-4b0b4978ab0e.json
deleted file mode 100644
index e15b985f3..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/search/16a72e70-4543-11e7-9510-4b0b4978ab0e.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "title": "DNS Events",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "deviceVendor",
-    "deviceProduct",
-    "applicationProtocol",
-    "categoryBehavior",
-    "categoryOutcome",
-    "destinationAddress",
-    "destinationDnsDomain",
-    "destinationPort",
-    "deviceCustomString1Label",
-    "deviceCustomString1",
-    "deviceCustomString3Label",
-    "deviceCustomString3",
-    "deviceCustomString4Label",
-    "deviceCustomString4",
-    "deviceEventCategory",
-    "deviceHostName",
-    "deviceSeverity",
-    "sourceAddress",
-    "sourcePort",
-    "transportProtocol"
-  ],
-  "sort": [
-    "deviceReceiptTime",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"arcsight-*\",\"highlightAll\":true,\"version\":true,\"query\":{\"query_string\":{\"query\":\"deviceEventCategory:\\\"dns\\\"\",\"analyze_wildcard\":true}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/search/1d9ba830-3e47-11e7-af78-9fc514b4e118.json b/x-pack/modules/arcsight/configuration/kibana/7.x/search/1d9ba830-3e47-11e7-af78-9fc514b4e118.json
deleted file mode 100644
index 849977aef..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/search/1d9ba830-3e47-11e7-af78-9fc514b4e118.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "title": "Endpoint Event Explorer [ArcSight]",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "categoryDeviceGroup",
-    "categoryTechnique",
-    "categoryOutcome",
-    "categorySignificance",
-    "categoryObject",
-    "categoryBehavior",
-    "categoryDeviceType"
-  ],
-  "sort": [
-    "deviceReceiptTime",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"arcsight-*\",\"highlightAll\":true,\"version\":true,\"filter\":[],\"query\":{\"query_string\":{\"query\":\"categoryDeviceGroup:\\\"/Operating System\\\" OR categoryDeviceGroup:\\\"/IDS/Host\\\" OR categoryDeviceGroup:\\\"/Application\\\"\",\"analyze_wildcard\":true}}}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/search/6315e7a0-34be-11e7-95dc-4f6090d732f6.json b/x-pack/modules/arcsight/configuration/kibana/7.x/search/6315e7a0-34be-11e7-95dc-4f6090d732f6.json
deleted file mode 100644
index 47da6b1ba..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/search/6315e7a0-34be-11e7-95dc-4f6090d732f6.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "title": "Network Events [ArcSight]",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "priority",
-    "name",
-    "sourceAddress",
-    "sourcePort",
-    "destinationAddress",
-    "destinationPort",
-    "applicationProtocol",
-    "message",
-    "categoryBehavior",
-    "categoryOutcome",
-    "deviceAddress",
-    "deviceProduct",
-    "deviceVendor",
-    "categoryDeviceGroup",
-    "categoryDeviceType"
-  ],
-  "sort": [
-    "deviceReceiptTime",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"arcsight-*\",\"highlightAll\":true,\"version\":true,\"query\":{\"query_string\":{\"query\":\"categoryDeviceGroup:\\\"/Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\"\",\"analyze_wildcard\":true}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/search/7a2fc9c0-454d-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/7.x/search/7a2fc9c0-454d-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index a30a0099d..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/search/7a2fc9c0-454d-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "title": "Endpoint - OS Events [ArcSight]",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "deviceVendor",
-    "deviceProduct",
-    "name",
-    "deviceEventClassId",
-    "deviceEventCategory",
-    "sourceUserName",
-    "destinationUserName",
-    "destinationHostName",
-    "categoryBehavior",
-    "categoryOutcome",
-    "sourceNtDomain",
-    "destinationNTDomain"
-  ],
-  "sort": [
-    "deviceReceiptTime",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"arcsight-*\",\"highlightAll\":true,\"version\":true,\"filter\":[],\"query\":{\"query_string\":{\"query\":\"categoryDeviceGroup:\\\"/Operating System\\\"\",\"analyze_wildcard\":true}}}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/search/bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744.json b/x-pack/modules/arcsight/configuration/kibana/7.x/search/bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744.json
deleted file mode 100644
index 5a91447cf..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/search/bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "title": "Microsoft DNS Events [ArcSight]",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "deviceVendor",
-    "deviceProduct",
-    "categoryBehavior",
-    "categoryOutcome",
-    "destinationAddress",
-    "destinationPort",
-    "destinationHostName",
-    "deviceEventClassId",
-    "deviceCustomString1Label",
-    "deviceCustomString1",
-    "deviceCustomString2Label",
-    "deviceCustomString2",
-    "deviceCustomString3Label",
-    "deviceCustomString3",
-    "deviceCustomString4Label",
-    "deviceCustomString4",
-    "deviceEventCategory",
-    "deviceSeverity",
-    "sourceAddress",
-    "sourcePort",
-    "transportProtocol",
-    "bytesIn",
-    "requestUrl"
-  ],
-  "sort": [
-    "deviceReceiptTime",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"arcsight-*\",\"highlightAll\":true,\"version\":true,\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"deviceProduct:\\\"DNS Trace Log\\\"\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/039815b0-4548-11e7-a94a-5d0a73686c64.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/039815b0-4548-11e7-a94a-5d0a73686c64.json
deleted file mode 100644
index 4f6a514b7..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/039815b0-4548-11e7-a94a-5d0a73686c64.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Destination Domains by Source Address",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Source Address(es)\",\"field\":\"sourceAddress\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":10},\"schema\":\"segment\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"Destination Domain(s)\",\"field\":\"destinationDnsDomain\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":5},\"schema\":\"group\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Source Address(es)\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"value\"}]},\"title\":\"Top Destination Domains by Source Address\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "16a72e70-4543-11e7-9510-4b0b4978ab0e",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/08ee04d0-4556-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/08ee04d0-4556-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index df6551db6..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/08ee04d0-4556-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Source Users by Destination Users [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Source Users by Destination Users [ArcSight]\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"bottom\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"sourceUserName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source Users\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationUserName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Users\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/08f8cf10-3e57-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/08f8cf10-3e57-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index ecbe24d6e..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/08f8cf10-3e57-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Firewall - Navigation",
-  "visState": "{\"title\":\"Firewall - Navigation\",\"type\":\"markdown\",\"params\":{\"markdown\":\"### **Navigation Pane** ###\\n\\n[Firewall Devices Overview](#/dashboard/37af0b40-398d-11e7-ae19-21fb91585845)\\n\\n[Firewall Suspicious Activities](#/dashboard/82051450-3e56-11e7-96c4-0d3a291ec93a)\\n\\n[Endopint Overview](#dashboard/d2fa5030-3e5d-11e7-b212-897f1496dc0e)\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/0bdbb5a0-3e55-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/0bdbb5a0-3e55-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index 4e0820bf1..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/0bdbb5a0-3e55-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Source Addresses [ArcSight]",
-  "visState": "{\"title\":\"Events by Source Addresses [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"e1a58ab0-3957-11e7-ae19-21fb91585845\",\"type\":\"timeseries\",\"series\":[{\"id\":\"8f58a280-395a-11e7-ae19-21fb91585845\",\"color\":\"rgba(211,49,21,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"8f58a281-395a-11e7-ae19-21fb91585845\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"sigma\":\"\",\"id\":\"140cf490-395b-11e7-ae19-21fb91585845\",\"type\":\"moving_average\",\"field\":\"8f58a281-395a-11e7-ae19-21fb91585845\"}],\"seperate_axis\":1,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":\"0\",\"fill\":\"0\",\"stacked\":\"none\",\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\" \",\"terms_field\":\"deviceHostName\",\"terms_order_by\":null,\"label\":\"Events\",\"steps\":0,\"value_template\":\"{{value}}\"},{\"id\":\"3bb711b0-395b-11e7-ae19-21fb91585845\",\"color\":\"rgba(104,188,0,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"3bb711b1-395b-11e7-ae19-21fb91585845\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"4b515cc0-395b-11e7-ae19-21fb91585845\",\"type\":\"moving_average\",\"field\":\"3bb711b1-395b-11e7-ae19-21fb91585845\"}],\"seperate_axis\":1,\"axis_position\":\"left\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":\"0\",\"point_size\":1,\"fill\":\"0.5\",\"stacked\":\"none\",\"terms_field\":\"sourceAddress\",\"terms_size\":\"10\",\"label\":\"Top Source Addresses\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"id\":\"e4772140-3957-11e7-ae19-21fb91585845\"}],\"background_color\":null,\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\" \",\"background_color_rules\":[{\"id\":\"837bfbb0-395a-11e7-ae19-21fb91585845\"}],\"gauge_color_rules\":[{\"id\":\"8970f250-395a-11e7-ae19-21fb91585845\"}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/0e4558b0-4552-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/0e4558b0-4552-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 80a064424..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/0e4558b0-4552-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Endpoint - OS Average EPS [ArcSight]",
-  "visState": "{\"title\":\"Endpoint - OS Average EPS [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"3f2cf630-3e4b-11e7-af78-9fc514b4e118\",\"type\":\"gauge\",\"series\":[{\"id\":\"3f2cf631-3e4b-11e7-af78-9fc514b4e118\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"3f2cf632-3e4b-11e7-af78-9fc514b4e118\",\"type\":\"count\"},{\"id\":\"2f12f3d0-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"cumulative_sum\",\"field\":\"3f2cf632-3e4b-11e7-af78-9fc514b4e118\"},{\"unit\":\"1s\",\"id\":\"330d7a00-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"derivative\",\"field\":\"2f12f3d0-7dc5-11e7-95f6-690ab80d4e85\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"373fd910-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"moving_average\",\"field\":\"330d7a00-7dc5-11e7-95f6-690ab80d4e85\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Event Throughput\",\"offset_time\":\"1m\",\"value_template\":\"{{value}} / s\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"id\":\"527ca820-3e4b-11e7-af78-9fc514b4e118\"}],\"gauge_color_rules\":[{\"id\":\"52cee6d0-3e4b-11e7-af78-9fc514b4e118\"}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"filter\":\"categoryDeviceGroup:\\\"/Operating System\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/1439a5e0-3e69-11e7-899c-f940f646009b.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/1439a5e0-3e69-11e7-899c-f940f646009b.json
deleted file mode 100644
index 6dffb7e69..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/1439a5e0-3e69-11e7-899c-f940f646009b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Endpoint - Navigation",
-  "visState": "{\"title\":\"Endpoint - Navigation\",\"type\":\"markdown\",\"params\":{\"markdown\":\"### **Navigation Pane** ###\\n\\n[Endopint Overview](#dashboard/d2fa5030-3e5d-11e7-b212-897f1496dc0e)\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/154ff7e0-3987-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/154ff7e0-3987-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index ebad5d522..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/154ff7e0-3987-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Device Type Breakdown [ArcSight]",
-  "visState": "{\"title\":\"Device Type Breakdown [ArcSight]\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"categoryDeviceType\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Firewall Types\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/161e27e0-3988-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/161e27e0-3988-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index 96f03bf4b..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/161e27e0-3988-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Device Metrics Overview [ArcSight]",
-  "visState": "{\"title\":\"Device Metrics Overview [ArcSight]\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"30\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"12\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"8\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceHostName\",\"customLabel\":\"Devices\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceAddress\",\"customLabel\":\"Sources\"}},{\"id\":\"6\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationAddress\",\"customLabel\":\"Destinations\"}},{\"id\":\"7\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationPort\",\"customLabel\":\"Ports\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/1bde8be0-3e68-11e7-899c-f940f646009b.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/1bde8be0-3e68-11e7-899c-f940f646009b.json
deleted file mode 100644
index a4ac4d693..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/1bde8be0-3e68-11e7-899c-f940f646009b.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Device Types by Vendor [ArcSight]",
-  "visState": "{\"title\":\"Device Types by Vendor [ArcSight]\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"categoryDeviceType\",\"exclude\":\"Network-based IDS/IPS\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceVendor\",\"exclude\":\"\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/1c54cda0-752c-11e7-9445-91c40765092f.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/1c54cda0-752c-11e7-9445-91c40765092f.json
deleted file mode 100644
index bbfecefa1..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/1c54cda0-752c-11e7-9445-91c40765092f.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Event Types [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Event Types [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"square root\",\"orientation\":\"single\",\"minFontSize\":18,\"maxFontSize\":72},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceEventClassId\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/1de45d60-7523-11e7-9445-91c40765092f.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/1de45d60-7523-11e7-9445-91c40765092f.json
deleted file mode 100644
index 1852246bc..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/1de45d60-7523-11e7-9445-91c40765092f.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "DNS Metrics Overview [ArcSight]",
-  "visState": "{\"title\":\"DNS Metrics Overview [ArcSight]\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"32\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"type\":\"gauge\"},\"aggs\":[{\"id\":\"5\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceCustomString1\",\"customLabel\":\"Threads\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceCustomString2\",\"customLabel\":\"OpCodes\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceEventClassId\",\"customLabel\":\"Activity Types\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/2a33c810-3e4d-11e7-af78-9fc514b4e118.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/2a33c810-3e4d-11e7-af78-9fc514b4e118.json
deleted file mode 100644
index 41c822af8..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/2a33c810-3e4d-11e7-af78-9fc514b4e118.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Destination Locations by Event [ArcSight]",
-  "visState": "{\"title\":\"Top Destination Locations by Event [ArcSight]\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Shaded Circle Markers\",\"isDesaturated\":true,\"addTooltip\":true,\"heatMaxZoom\":0,\"heatMinOpacity\":0.1,\"heatRadius\":25,\"heatBlur\":15,\"heatNormalizeData\":true,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[0,0],\"wms\":{\"enabled\":false,\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\",\"options\":{\"version\":\"1.3.0\",\"layers\":\"0\",\"format\":\"image/png\",\"transparent\":true,\"attribution\":\"Maps provided by USGS\",\"styles\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"destination.location\",\"autoPrecision\":true,\"useGeocentroid\":true,\"precision\":2}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/2b369910-4553-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/2b369910-4553-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index 3d9899c01..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/2b369910-4553-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 15 Event Types by Events [ArcSight]",
-  "visState": "{\"title\":\"Top 15 Event Types by Events [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":15,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"categoryBehavior\",\"size\":15,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Types\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceUserName\",\"customLabel\":\"Source Users\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationUserName\",\"customLabel\":\"Destination Users\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceHostName\",\"customLabel\":\"Source Hosts\"}},{\"id\":\"6\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationHostName\",\"customLabel\":\"Destination Hosts\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/31b85570-454a-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/31b85570-454a-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 49ae1c4c5..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/31b85570-454a-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "ArcSight: Dashboard Navigation",
-  "visState": "{\"title\":\"ArcSight: Dashboard Navigation\",\"type\":\"markdown\",\"params\":{\"markdown\":\"[Network Overview](#/dashboard/37af0b40-398d-11e7-ae19-21fb91585845) | [Network Suspicious Activity](#/dashboard/82051450-3e56-11e7-96c4-0d3a291ec93a) | [Endpoint Overview](#dashboard/d2fa5030-3e5d-11e7-b212-897f1496dc0e) | [Endpoint OS Activity](#/dashboard/64c92510-4555-11e7-83ea-67cb6920446d) | [Microsoft DNS Overview](#/dashboard/153e0bf0-752f-11e7-ae68-d756b92f3a9c)\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/35ce1310-3989-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/35ce1310-3989-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index c3f38b9c9..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/35ce1310-3989-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Source Locations by Events [ArcSight]",
-  "visState": "{\"title\":\"Top Source Locations by Events [ArcSight]\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Shaded Circle Markers\",\"isDesaturated\":true,\"addTooltip\":true,\"heatMaxZoom\":0,\"heatMinOpacity\":0.1,\"heatRadius\":25,\"heatBlur\":15,\"heatNormalizeData\":true,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[0,0],\"wms\":{\"enabled\":false,\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\",\"options\":{\"version\":\"1.3.0\",\"layers\":\"0\",\"format\":\"image/png\",\"transparent\":true,\"attribution\":\"Maps provided by USGS\",\"styles\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"source.location\",\"autoPrecision\":true,\"useGeocentroid\":true,\"precision\":2,\"customLabel\":\"Source Location\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/4303de60-752b-11e7-9445-91c40765092f.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/4303de60-752b-11e7-9445-91c40765092f.json
deleted file mode 100644
index faa2946b2..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/4303de60-752b-11e7-9445-91c40765092f.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Destinations by Size [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Destinations by Size [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"destinationHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destinations\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesIn\",\"customLabel\":\"Bytes\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceAddress\",\"customLabel\":\"Sources\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Count\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/45387480-3989-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/45387480-3989-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index f2ea2c2f5..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/45387480-3989-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Destination Locations by Events [ArcSight]",
-  "visState": "{\"title\":\"Top Destination Locations by Events [ArcSight]\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Shaded Circle Markers\",\"isDesaturated\":true,\"addTooltip\":true,\"heatMaxZoom\":0,\"heatMinOpacity\":0.1,\"heatRadius\":25,\"heatBlur\":15,\"heatNormalizeData\":true,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[0,0],\"wms\":{\"enabled\":false,\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\",\"options\":{\"version\":\"1.3.0\",\"layers\":\"0\",\"format\":\"image/png\",\"transparent\":true,\"attribution\":\"Maps provided by USGS\",\"styles\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"destination.location\",\"autoPrecision\":true,\"useGeocentroid\":true,\"precision\":2,\"customLabel\":\"Destination Location\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/463fc740-454e-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/463fc740-454e-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 27f69b91b..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/463fc740-454e-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Endpoint OS Metrics Overview [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{\"customLabel\":\"Total Events\"},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"6\",\"params\":{\"customLabel\":\"Devices\",\"field\":\"deviceHostName\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"7\",\"params\":{\"customLabel\":\"Event Types\",\"field\":\"categoryBehavior\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"8\",\"params\":{\"customLabel\":\"Event Outcomes\",\"field\":\"categoryOutcome\"},\"schema\":\"metric\",\"type\":\"cardinality\"}],\"listeners\":{},\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"30\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"20\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"title\":\"Endpoint OS Metrics Overview [ArcSight]\",\"type\":\"metric\"}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/47c2a140-454f-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/47c2a140-454f-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 9949dcbe5..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/47c2a140-454f-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Events by Source and Destination Users [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{\"customLabel\":\"Event Count\"},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customInterval\":\"2h\",\"customLabel\":\"Timestamp\",\"extended_bounds\":{},\"field\":\"deviceReceiptTime\",\"interval\":\"auto\",\"min_doc_count\":1},\"schema\":\"segment\",\"type\":\"date_histogram\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"Source Users\",\"field\":\"sourceUserName\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"4\",\"params\":{\"customLabel\":\"Destination Users\",\"field\":\"destinationUserName\"},\"schema\":\"metric\",\"type\":\"cardinality\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Timestamp\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Event Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"},{\"data\":{\"id\":\"3\",\"label\":\"Source Users\"},\"drawLinesBetweenPoints\":true,\"interpolate\":\"linear\",\"lineWidth\":3,\"mode\":\"normal\",\"show\":true,\"showCircles\":true,\"type\":\"line\",\"valueAxis\":\"ValueAxis-2\"},{\"data\":{\"id\":\"4\",\"label\":\"Destination Users\"},\"drawLinesBetweenPoints\":true,\"interpolate\":\"linear\",\"lineWidth\":3,\"mode\":\"normal\",\"show\":true,\"showCircles\":true,\"type\":\"line\",\"valueAxis\":\"ValueAxis-2\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Event Count\"},\"type\":\"value\"},{\"id\":\"ValueAxis-2\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"RightAxis-1\",\"position\":\"right\",\"scale\":{\"mode\":\"normal\",\"type\":\"square root\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"\"},\"type\":\"value\"}]},\"title\":\"Events by Source and Destination Users [ArcSight]\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/49953800-4547-11e7-a94a-5d0a73686c64.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/49953800-4547-11e7-a94a-5d0a73686c64.json
deleted file mode 100644
index 7428f6902..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/49953800-4547-11e7-a94a-5d0a73686c64.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Top Destination Domains",
-  "visState": "{\"title\":\"Top Destination Domains\",\"type\":\"metrics\",\"params\":{\"id\":\"45479ab0-4545-11e7-a94a-5d0a73686c64\",\"type\":\"top_n\",\"series\":[{\"id\":\"45479ab1-4545-11e7-a94a-5d0a73686c64\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"45479ab2-4545-11e7-a94a-5d0a73686c64\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.3\",\"stacked\":\"none\",\"label\":\"Top Destination Domains\",\"terms_field\":\"destinationDnsDomain\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"deviceEventCategory:\\\"dns\\\"\",\"background_color_rules\":[{\"id\":\"efe6b130-4546-11e7-a94a-5d0a73686c64\"}],\"bar_color_rules\":[{\"id\":\"f596fdb0-4546-11e7-a94a-5d0a73686c64\"}]},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/4cf91f90-3d5c-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/4cf91f90-3d5c-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index b02fbeb48..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/4cf91f90-3d5c-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Firewall - Devices - Top EPS by Category Device Type",
-  "visState": "{\"title\":\"Firewall - Devices - Top EPS by Category Device Type\",\"type\":\"metrics\",\"params\":{\"id\":\"429af7e0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"top_n\",\"series\":[{\"id\":\"429af7e1-3d5b-11e7-8b9d-ddc45b5f6d00\",\"color\":\"rgba(252,220,0,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"linear\",\"unit\":\"\",\"id\":\"112da8a0-3d5c-11e7-8b9d-ddc45b5f6d00\",\"type\":\"moving_average\",\"field\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Top EPS contributors by Category Device Type\",\"value_template\":\"{{value}}/s\",\"terms_field\":\"categoryDeviceType\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\"\",\"bar_color_rules\":[{\"id\":\"77dd4e80-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"background_color_rules\":[{\"id\":\"798c5e10-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"gauge_color_rules\":[{\"value\":0,\"id\":\"988f35d0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"gauge\":null}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"gauge_max\":\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/4ee62420-7523-11e7-871d-5f0fb978413c.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/4ee62420-7523-11e7-871d-5f0fb978413c.json
deleted file mode 100644
index a9cd7ba92..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/4ee62420-7523-11e7-871d-5f0fb978413c.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "DNS - Event Throughput [ArcSight]",
-  "visState": "{\"title\":\"DNS - Event Throughput [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"429af7e0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"gauge\",\"series\":[{\"id\":\"429af7e1-3d5b-11e7-8b9d-ddc45b5f6d00\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"count\"},{\"id\":\"6497aaa0-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"cumulative_sum\",\"field\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\"},{\"unit\":\"1s\",\"id\":\"6800ed50-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"derivative\",\"field\":\"6497aaa0-7dc5-11e7-95f6-690ab80d4e85\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"6cf98290-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"moving_average\",\"field\":\"6800ed50-7dc5-11e7-95f6-690ab80d4e85\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Event Throughput\",\"value_template\":\"{{value}}  / s\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"deviceProduct:\\\"DNS Trace Log\\\"\",\"bar_color_rules\":[{\"id\":\"77dd4e80-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"background_color_rules\":[{\"id\":\"798c5e10-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"gauge_color_rules\":[{\"value\":0,\"id\":\"988f35d0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"gauge\":null}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"gauge_max\":\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/4ff86ee0-4549-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/4ff86ee0-4549-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index d845508c2..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/4ff86ee0-4549-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Source Address",
-  "visState": "{\"title\":\"Top Source Address\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"square root\",\"orientation\":\"single\",\"minFontSize\":11,\"maxFontSize\":60},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"sourceAddress\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source Addresses\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "16a72e70-4543-11e7-9510-4b0b4978ab0e",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/5acacad0-3986-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/5acacad0-3986-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index f6536a32a..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/5acacad0-3986-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Firewall - Devices - Event Outcome over Time",
-  "visState": "{\"title\":\"Firewall - Devices - Event Outcome over Time\",\"type\":\"area\",\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Time\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"interpolate\":\"linear\",\"mode\":\"normal\",\"show\":\"true\",\"showCircles\":true,\"type\":\"area\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Count\"},\"type\":\"value\"}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceReceiptTime\",\"interval\":\"auto\",\"customInterval\":\"2h\",\"min_doc_count\":1,\"extended_bounds\":{},\"customLabel\":\"Time\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"categoryOutcome\",\"size\":2,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Outcome\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"/Failure\":\"#BF1B00\",\"/Success\":\"#629E51\"}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/5acb74d0-398b-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/5acb74d0-398b-11e7-ae19-21fb91585845.json
deleted file mode 100644
index 0e3b215b9..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/5acb74d0-398b-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Device Types [ArcSight]",
-  "visState": "{\"title\":\"Events by Device Types [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"e1a58ab0-3957-11e7-ae19-21fb91585845\",\"type\":\"timeseries\",\"series\":[{\"id\":\"8f58a280-395a-11e7-ae19-21fb91585845\",\"color\":\"rgba(211,49,21,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"8f58a281-395a-11e7-ae19-21fb91585845\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"sigma\":\"\",\"id\":\"140cf490-395b-11e7-ae19-21fb91585845\",\"type\":\"moving_average\",\"field\":\"8f58a281-395a-11e7-ae19-21fb91585845\"}],\"seperate_axis\":1,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":\"0\",\"fill\":\"0\",\"stacked\":\"none\",\"filter\":\"\",\"terms_field\":\"deviceHostName\",\"terms_order_by\":null,\"label\":\"Events\",\"steps\":0,\"split_filters\":[{\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\"\",\"label\":\"Firewall\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"e403ef60-4684-11e7-8ffc-b5cec7c0edbb\"}]},{\"id\":\"3bb711b0-395b-11e7-ae19-21fb91585845\",\"color\":\"rgba(251,158,0,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"3bb711b1-395b-11e7-ae19-21fb91585845\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"4b515cc0-395b-11e7-ae19-21fb91585845\",\"type\":\"moving_average\",\"field\":\"3bb711b1-395b-11e7-ae19-21fb91585845\"}],\"seperate_axis\":1,\"axis_position\":\"left\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"terms_field\":\"categoryDeviceType\",\"terms_size\":\"10\",\"label\":\"Top Device Types by Mvg Averages\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"id\":\"e4772140-3957-11e7-ae19-21fb91585845\"}],\"background_color\":null,\"filter\":\"categoryDeviceType:\\\"Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\"\",\"background_color_rules\":[{\"id\":\"837bfbb0-395a-11e7-ae19-21fb91585845\"}],\"gauge_color_rules\":[{\"id\":\"8970f250-395a-11e7-ae19-21fb91585845\"}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/6414e6b0-4549-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/6414e6b0-4549-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index dd73a788c..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/6414e6b0-4549-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Destination Domain",
-  "visState": "{\"title\":\"Top Destination Domain\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"square root\",\"orientation\":\"single\",\"minFontSize\":11,\"maxFontSize\":60},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationDnsDomain\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"DNS Domains\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "16a72e70-4543-11e7-9510-4b0b4978ab0e",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/68180c80-4556-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/68180c80-4556-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index fbd5e8036..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/68180c80-4556-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Sources by Destinations [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Sources by Destinations [ArcSight]\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"bottom\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"sourceHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source Host\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Host\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/6bb7d0e0-4548-11e7-a94a-5d0a73686c64.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/6bb7d0e0-4548-11e7-a94a-5d0a73686c64.json
deleted file mode 100644
index 50b81de88..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/6bb7d0e0-4548-11e7-a94a-5d0a73686c64.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Query Type by Device",
-  "visState": "{\"title\":\"Query Type by Device\",\"type\":\"heatmap\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"enableHover\":false,\"legendPosition\":\"right\",\"times\":[],\"colorsNumber\":4,\"colorSchema\":\"Yellow to Red\",\"setColorRange\":false,\"colorsRange\":[],\"invertColors\":false,\"percentageMode\":false,\"valueAxes\":[{\"show\":false,\"id\":\"ValueAxis-1\",\"type\":\"value\",\"scale\":{\"type\":\"linear\",\"defaultYExtents\":false},\"labels\":{\"show\":false,\"rotate\":0,\"color\":\"#555\"}}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"DNS Device\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"deviceCustomString1\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"DNS Query Types\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 33\":\"rgb(255,255,204)\",\"33 - 65\":\"rgb(254,217,118)\",\"65 - 98\":\"rgb(253,141,60)\",\"98 - 130\":\"rgb(227,27,28)\"}}}",
-  "description": "",
-  "savedSearchId": "16a72e70-4543-11e7-9510-4b0b4978ab0e",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/6dfc0e30-3958-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/6dfc0e30-3958-11e7-ae19-21fb91585845.json
deleted file mode 100644
index 25df0ef43..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/6dfc0e30-3958-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Firewall - Devices - Top Devices by Event Count",
-  "visState": "{\"title\":\"Firewall - Devices - Top Devices by Event Count\",\"type\":\"metrics\",\"params\":{\"id\":\"e1a58ab0-3957-11e7-ae19-21fb91585845\",\"type\":\"top_n\",\"series\":[{\"id\":\"e1a58ab1-3957-11e7-ae19-21fb91585845\",\"color\":\"rgba(174,161,255,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"e1a58ab2-3957-11e7-ae19-21fb91585845\",\"type\":\"count\",\"field\":\"deviceHostName\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Top Firewall Devices\",\"terms_field\":\"deviceHostName\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"id\":\"e4772140-3957-11e7-ae19-21fb91585845\"}],\"background_color\":null,\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/6fb90a30-3e6b-11e7-9d4a-89ea81333ea4.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/6fb90a30-3e6b-11e7-9d4a-89ea81333ea4.json
deleted file mode 100644
index 749c41904..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/6fb90a30-3e6b-11e7-9d4a-89ea81333ea4.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Outcomes by User Names [ArcSight]",
-  "visState": "{\"title\":\"Outcomes by User Names [ArcSight]\",\"type\":\"pie\",\"params\":{\"addLegend\":true,\"addTooltip\":true,\"isDonut\":false,\"legendPosition\":\"right\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"categoryDeviceType\",\"exclude\":\"Network-based IDS/IPS\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"categoryOutcome\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"6\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationUserName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"/Informational\":\"#7EB26D\",\"/Informational/Warning\":\"#EF843C\",\"/Success\":\"#64B0C8\",\"Anti-Virus\":\"#B7DBAB\",\"Host-based IDS/IPS\":\"#629E51\",\"Log Consolidator\":\"#E0F9D7\",\"Operating System\":\"#3F6833\",\"Recon\":\"#BF1B00\",\"Security Mangement\":\"#CFFAFF\"},\"legendOpen\":true}}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/7008cd50-3988-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/7008cd50-3988-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index c6c260e8c..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/7008cd50-3988-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Bandwidth Overview",
-  "visState": "{\"title\":\"Bandwidth Overview\",\"type\":\"metric\",\"params\":{\"handleNoResults\":true,\"fontSize\":\"25\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesIn\",\"customLabel\":\"Incoming\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesOut\",\"customLabel\":\"Outgoing\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/75582a90-3987-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/75582a90-3987-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index e705ad00a..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/75582a90-3987-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Outcome by Device Type [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Firewall Types\",\"field\":\"categoryDeviceType\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":10},\"schema\":\"segment\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"Event Outcome\",\"field\":\"categoryOutcome\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":3},\"schema\":\"group\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"rotate\":75,\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Firewall Types\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"orderBucketsBySum\":true,\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"percentage\",\"type\":\"square root\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"value\"}]},\"title\":\"Outcome by Device Type [ArcSight]\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"/Success\":\"#629E51\",\"/Failure\":\"#BF1B00\"}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/77cb1470-3989-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/77cb1470-3989-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index 296621ddd..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/77cb1470-3989-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Application Protocols [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Application Protocols [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"square root\",\"orientation\":\"single\",\"minFontSize\":26,\"maxFontSize\":72,\"hideLabel\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"applicationProtocol\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/7a043760-3990-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/7a043760-3990-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index f865b6c0c..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/7a043760-3990-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Source Countries by Events [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Source Countries by Events [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Total Events\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"source.country_name\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source Country\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceAddress\",\"customLabel\":\"Source Addresses\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationAddress\",\"customLabel\":\"Destination Addresses\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationPort\",\"customLabel\":\"Destination Ports\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/7c414c90-3e66-11e7-899c-f940f646009b.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/7c414c90-3e66-11e7-899c-f940f646009b.json
deleted file mode 100644
index 4d79dcb46..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/7c414c90-3e66-11e7-899c-f940f646009b.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Source Countries by Event [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Source Countries by Event [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Total Events\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"source.country_name\",\"size\":35,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceAddress\",\"customLabel\":\"Source Addresses\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationAddress\",\"customLabel\":\"Destination Addresses\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationPort\",\"customLabel\":\"Destination Ports\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/7c6875e0-3e61-11e7-899c-f940f646009b.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/7c6875e0-3e61-11e7-899c-f940f646009b.json
deleted file mode 100644
index 124299cbe..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/7c6875e0-3e61-11e7-899c-f940f646009b.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Outcomes by Device Type [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"field\":\"categoryDeviceType\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":5},\"schema\":\"segment\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"field\":\"categoryOutcome\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":5},\"schema\":\"group\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":200},\"position\":\"left\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"categoryDeviceType: Descending\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"normal\",\"show\":true,\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":true,\"rotate\":75,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"bottom\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"value\"}]},\"title\":\"Outcomes by Device Type [ArcSight]\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"/Failure\":\"#BF1B00\"},\"legendOpen\":true}}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/801fff70-395a-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/801fff70-395a-11e7-ae19-21fb91585845.json
deleted file mode 100644
index a18226097..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/801fff70-395a-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Bandwidth Utilization [ArcSight]",
-  "visState": "{\"title\":\"Bandwidth Utilization [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"e1a58ab0-3957-11e7-ae19-21fb91585845\",\"type\":\"timeseries\",\"series\":[{\"id\":\"e1a58ab1-3957-11e7-ae19-21fb91585845\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"e1a58ab2-3957-11e7-ae19-21fb91585845\",\"type\":\"sum\",\"field\":\"bytesIn\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"bytes\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Inbound\",\"terms_field\":\"deviceHostName\",\"terms_order_by\":\"_count\",\"override_index_pattern\":1,\"series_index_pattern\":\"arcsight-*\",\"series_time_field\":\"deviceReceiptTime\"},{\"id\":\"67c18da0-3959-11e7-ae19-21fb91585845\",\"color\":\"rgba(244,78,59,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"67c18da1-3959-11e7-ae19-21fb91585845\",\"type\":\"sum\",\"field\":\"bytesOut\"},{\"script\":\"params.outbound > 0 ? params.outbound * -1 : 0\",\"id\":\"7ec4d1b0-3959-11e7-ae19-21fb91585845\",\"type\":\"calculation\",\"variables\":[{\"id\":\"a9fb70f0-3959-11e7-ae19-21fb91585845\",\"name\":\"outbound\",\"field\":\"67c18da1-3959-11e7-ae19-21fb91585845\"}]}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"bytes\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Outbound\",\"override_index_pattern\":1,\"series_index_pattern\":\"arcsight-*\",\"series_time_field\":\"deviceReceiptTime\",\"steps\":0}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"id\":\"e4772140-3957-11e7-ae19-21fb91585845\"}],\"background_color\":null,\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\" \"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/82caeb10-4556-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/82caeb10-4556-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index f43de99db..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/82caeb10-4556-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Source Users [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Source Users [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":10,\"maxFontSize\":60},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"sourceUserName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source Users\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/8bdaafe0-454e-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/8bdaafe0-454e-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 584b0c5dc..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/8bdaafe0-454e-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "OS Source and Destination Overview",
-  "visState": "{\"title\":\"OS Source and Destination Overview\",\"type\":\"metric\",\"params\":{\"handleNoResults\":true,\"fontSize\":\"25\"},\"aggs\":[{\"id\":\"9\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceHostName\",\"customLabel\":\"Source Hosts\"}},{\"id\":\"10\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationHostName\",\"customLabel\":\"Destination Hosts\"}},{\"id\":\"11\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceUserName\",\"customLabel\":\"Source Users\"}},{\"id\":\"12\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationUserName\",\"customLabel\":\"Destination Users\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/8cda1c30-752a-11e7-9445-91c40765092f.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/8cda1c30-752a-11e7-9445-91c40765092f.json
deleted file mode 100644
index f0aea8e82..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/8cda1c30-752a-11e7-9445-91c40765092f.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Event Types by Size [ArcSight]",
-  "visState": "{\"title\":\"Event Types by Size [ArcSight]\",\"type\":\"histogram\",\"params\":{\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"},\"valueAxis\":null},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"bottom\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"truncate\":100,\"rotate\":75},\"title\":{\"text\":\"Event Type\"}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"square root\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"Count\"}},{\"id\":\"ValueAxis-2\",\"name\":\"RightAxis-1\",\"type\":\"value\",\"position\":\"right\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"square root\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"Total (Bytes)\"}}],\"seriesParams\":[{\"show\":\"true\",\"type\":\"histogram\",\"mode\":\"normal\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"valueAxis\":\"ValueAxis-1\",\"drawLinesBetweenPoints\":true,\"showCircles\":true},{\"show\":true,\"mode\":\"normal\",\"type\":\"line\",\"drawLinesBetweenPoints\":true,\"showCircles\":false,\"interpolate\":\"linear\",\"lineWidth\":3,\"data\":{\"id\":\"3\",\"label\":\"Total (Bytes)\"},\"valueAxis\":\"ValueAxis-2\"}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false,\"orderBucketsBySum\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceEventClassId\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Type\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesIn\",\"customLabel\":\"Total (Bytes)\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"Total (Bytes)\":\"#E24D42\",\"Count\":\"#64B0C8\"}}}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/8f0161a0-752d-11e7-b440-f1d91dc5774d.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/8f0161a0-752d-11e7-b440-f1d91dc5774d.json
deleted file mode 100644
index da0421dfb..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/8f0161a0-752d-11e7-b440-f1d91dc5774d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Sources by Size [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Sources by Size [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"sourceHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Sources\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesIn\",\"customLabel\":\"Bytes\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationHostName\",\"customLabel\":\"Destinations\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Count\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"P-11\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-13\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"P-2\":{\"mapCenter\":[-0.17578097424708533,0],\"mapZoom\":0},\"P-3\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"P-4\":{\"mapCenter\":[-0.17578097424708533,0],\"mapZoom\":0},\"P-5\":{\"vis\":{\"defaultColors\":{\"0 - 18,000\":\"rgb(247,251,255)\",\"108,000 - 126,000\":\"rgb(74,152,201)\",\"126,000 - 144,000\":\"rgb(46,126,188)\",\"144,000 - 162,000\":\"rgb(23,100,171)\",\"162,000 - 180,000\":\"rgb(8,74,145)\",\"18,000 - 36,000\":\"rgb(227,238,249)\",\"36,000 - 54,000\":\"rgb(208,225,242)\",\"54,000 - 72,000\":\"rgb(182,212,233)\",\"72,000 - 90,000\":\"rgb(148,196,223)\",\"90,000 - 108,000\":\"rgb(107,174,214)\"},\"legendOpen\":false}},\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/8f8d6230-454f-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/8f8d6230-454f-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 43eaa9895..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/8f8d6230-454f-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Behaviors by Outcome [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Behaviors by Outcome [ArcSight]\",\"type\":\"heatmap\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"enableHover\":true,\"legendPosition\":\"right\",\"times\":[],\"colorsNumber\":10,\"colorSchema\":\"Yellow to Red\",\"setColorRange\":false,\"colorsRange\":[],\"invertColors\":false,\"percentageMode\":false,\"valueAxes\":[{\"show\":false,\"id\":\"ValueAxis-1\",\"type\":\"value\",\"scale\":{\"type\":\"linear\",\"defaultYExtents\":false},\"labels\":{\"show\":false,\"rotate\":0,\"color\":\"#555\"}}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"categoryBehavior\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Type\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"categoryOutcome\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Outcome\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 9,000\":\"rgb(255,255,204)\",\"9,000 - 18,000\":\"rgb(255,241,170)\",\"18,000 - 27,000\":\"rgb(254,225,135)\",\"27,000 - 36,000\":\"rgb(254,201,101)\",\"36,000 - 45,000\":\"rgb(254,171,73)\",\"45,000 - 54,000\":\"rgb(253,141,60)\",\"54,000 - 63,000\":\"rgb(252,91,46)\",\"63,000 - 72,000\":\"rgb(237,47,34)\",\"72,000 - 81,000\":\"rgb(212,16,32)\",\"81,000 - 90,000\":\"rgb(176,0,38)\"}}}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/9141cc20-4553-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/9141cc20-4553-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index bca0a4bbd..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/9141cc20-4553-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 5 Vendors by Product [ArcSight]",
-  "visState": "{\"title\":\"Top 5 Vendors by Product [ArcSight]\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceVendor\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"OS Vendor\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceProduct\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"OS Product\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/93531890-4556-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/93531890-4556-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index 2d5e96db9..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/93531890-4556-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Destination Users [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Destination Users [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":10,\"maxFontSize\":60},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationUserName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Users\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/96af5bf0-3e50-11e7-af78-9fc514b4e118.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/96af5bf0-3e50-11e7-af78-9fc514b4e118.json
deleted file mode 100644
index 3376e241c..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/96af5bf0-3e50-11e7-af78-9fc514b4e118.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Device [ArcSight]",
-  "visState": "{\"title\":\"Events by Device [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"f80221f0-3e4e-11e7-af78-9fc514b4e118\",\"type\":\"timeseries\",\"series\":[{\"id\":\"f80221f1-3e4e-11e7-af78-9fc514b4e118\",\"color\":\"rgba(254,37,37,1)\",\"split_mode\":\"filters\",\"metrics\":[{\"id\":\"f8024900-3e4e-11e7-af78-9fc514b4e118\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"1d93e660-3e4f-11e7-af78-9fc514b4e118\",\"type\":\"moving_average\",\"field\":\"f8024900-3e4e-11e7-af78-9fc514b4e118\"}],\"seperate_axis\":1,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"categoryDeviceGroup:\\\"/Operating System\\\" \",\"label\":\"Operating System\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"725ac7e0-3e4f-11e7-af78-9fc514b4e118\"},{\"filter\":\" categoryDeviceGroup:\\\"/IDS/Host\\\"\",\"label\":\"Host IDS\",\"color\":\"rgba(254,146,0,1)\",\"id\":\"bd6104c0-3e4f-11e7-af78-9fc514b4e118\"},{\"filter\":\"categoryDeviceGroup:\\\"/Application\\\"\",\"label\":\"Application\",\"color\":\"rgba(252,220,0,1)\",\"id\":\"cf5dd0e0-3e4f-11e7-af78-9fc514b4e118\"}],\"label\":\"Events\"},{\"id\":\"1633f8a0-3e50-11e7-af78-9fc514b4e118\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"1633f8a1-3e50-11e7-af78-9fc514b4e118\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"2b8a9e20-3e50-11e7-af78-9fc514b4e118\",\"type\":\"moving_average\",\"field\":\"1633f8a1-3e50-11e7-af78-9fc514b4e118\"}],\"seperate_axis\":1,\"axis_position\":\"left\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Moving Average by Device HostNames\",\"terms_field\":\"deviceHostName\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"categoryDeviceGroup:\\\"/Operating System\\\" OR categoryDeviceGroup:\\\"/IDS/Host\\\" OR categoryDeviceGroup:\\\"/Application\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/992c7bd0-3e4e-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/992c7bd0-3e4e-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index 4eeaad140..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/992c7bd0-3e4e-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 5 Sources by Destination Addresses [ArcSight]",
-  "visState": "{\"title\":\"Top 5 Sources by Destination Addresses [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationAddress\",\"customLabel\":\"Destination Addresses\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"sourceAddress\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Source Address\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/9d317890-3988-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/9d317890-3988-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index 11b98363f..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/9d317890-3988-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Overall Time Range",
-  "visState": "{\"title\":\"Overall Time Range\",\"type\":\"metric\",\"params\":{\"handleNoResults\":true,\"fontSize\":\"15\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"min\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceReceiptTime\",\"customLabel\":\"Start Time\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"max\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceReceiptTime\",\"customLabel\":\"End Time\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/9de87d40-3e4e-11e7-af78-9fc514b4e118.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/9de87d40-3e4e-11e7-af78-9fc514b4e118.json
deleted file mode 100644
index 895a0fe25..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/9de87d40-3e4e-11e7-af78-9fc514b4e118.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Outcomes Breakdown [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customInterval\":\"2h\",\"customLabel\":\"Time\",\"extended_bounds\":{},\"field\":\"deviceReceiptTime\",\"interval\":\"auto\",\"min_doc_count\":1},\"schema\":\"segment\",\"type\":\"date_histogram\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"field\":\"categoryOutcome\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":5},\"schema\":\"group\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Time\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"interpolate\":\"linear\",\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"area\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"value\"}]},\"title\":\"Outcomes Breakdown [ArcSight]\",\"type\":\"area\"}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"/Failure\":\"#BF1B00\",\"/Attempt\":\"#3F2B5B\"},\"legendOpen\":true}}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/9e4c5ca0-76cc-11e7-9fc0-830beaf5fb4b.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/9e4c5ca0-76cc-11e7-9fc0-830beaf5fb4b.json
deleted file mode 100644
index 59870f2d4..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/9e4c5ca0-76cc-11e7-9fc0-830beaf5fb4b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Event Count [ArcSight]",
-  "visState": "{\"title\":\"Event Count [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"19363b80-76cc-11e7-9fc0-830beaf5fb4b\",\"type\":\"metric\",\"series\":[{\"id\":\"19363b81-76cc-11e7-9fc0-830beaf5fb4b\",\"color\":\"#68BC00\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"19363b82-76cc-11e7-9fc0-830beaf5fb4b\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Event Count\",\"value_template\":\"\",\"override_index_pattern\":1,\"series_index_pattern\":\"arcsight-*\",\"series_time_field\":\"@timestamp\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"background_color_rules\":[{\"id\":\"30faacb0-76cc-11e7-9fc0-830beaf5fb4b\"}]},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/a8ce0ef0-4556-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/a8ce0ef0-4556-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index f3782bab6..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/a8ce0ef0-4556-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Sources [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Sources [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":10,\"maxFontSize\":60},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"sourceHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source Hosts\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/aa2ff0a0-3e4a-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/aa2ff0a0-3e4a-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index 85990965b..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/aa2ff0a0-3e4a-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Unique Destinations and Ports by Source [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{\"customLabel\":\"Destination Addresses\",\"field\":\"destinationAddress\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Source Addresses\",\"field\":\"sourceAddress\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":20},\"schema\":\"segment\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"Destination Ports\",\"field\":\"destinationPort\"},\"schema\":\"metric\",\"type\":\"cardinality\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Source Addresses\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Destination Addresses\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"},{\"data\":{\"id\":\"3\",\"label\":\"Destination Ports\"},\"drawLinesBetweenPoints\":true,\"interpolate\":\"linear\",\"lineWidth\":2,\"mode\":\"stacked\",\"show\":true,\"showCircles\":true,\"type\":\"line\",\"valueAxis\":\"ValueAxis-2\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Destination Addresses\"},\"type\":\"value\"},{\"id\":\"ValueAxis-2\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"RightAxis-1\",\"position\":\"right\",\"scale\":{\"mode\":\"normal\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Destination Ports\"},\"type\":\"value\"}]},\"title\":\"Unique Destinations and Ports by Source [ArcSight]\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/aa57b050-7526-11e7-b440-f1d91dc5774d.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/aa57b050-7526-11e7-b440-f1d91dc5774d.json
deleted file mode 100644
index 4f281819c..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/aa57b050-7526-11e7-b440-f1d91dc5774d.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events Types by Severity [ArcSight]",
-  "visState": "{\"title\":\"Events Types by Severity [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"5f4e1f70-7523-11e7-b440-f1d91dc5774d\",\"type\":\"timeseries\",\"series\":[{\"id\":\"f7c4afd0-752d-11e7-ae68-d756b92f3a9c\",\"color\":\"#68BC00\",\"split_mode\":\"filters\",\"metrics\":[{\"id\":\"f7c4afd1-752d-11e7-ae68-d756b92f3a9c\",\"type\":\"count\",\"field\":\"bytesIn\"}],\"seperate_axis\":1,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":\"0\",\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"Cumulative Bytes\",\"split_filters\":[{\"filter\":\"(deviceSeverity:\\\"2\\\" OR deviceSeverity:\\\"3\\\" OR deviceSeverity:\\\"5\\\" OR deviceSeverity:\\\"16\\\" OR deviceCustomString4:\\\"SERVFAIL\\\" OR deviceCustomString4:\\\"NXDOMAIN\\\" OR deviceCustomString4:\\\"REFUSED\\\" OR deviceCustomString4:\\\"BADVERS\\\" OR deviceCustomString4:\\\"BADSIG\\\")\",\"label\":\"HIGH\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"53f76f80-7539-11e7-ae68-d756b92f3a9c\"},{\"filter\":\"(deviceSeverity:\\\"1\\\" OR  deviceSeverity:\\\"4\\\" OR  deviceSeverity:\\\"6\\\" OR  deviceSeverity:\\\"7\\\" OR  deviceSeverity:\\\"8\\\" OR  deviceSeverity:\\\"9\\\" OR  deviceSeverity:\\\"10\\\" OR deviceSeverity:\\\"17\\\" OR  deviceSeverity:\\\"18\\\" OR  deviceSeverity:\\\"19\\\" OR  deviceSeverity:\\\"20\\\" OR  deviceSeverity:\\\"21\\\" OR  deviceSeverity:\\\"22\\\" OR   deviceCustomString4:\\\"Error\\\" OR  deviceCustomString4:\\\"ERROR\\\" OR  deviceCustomString4:\\\"Warning\\\" OR  deviceCustomString4:\\\"WARNING\\\" OR  deviceCustomString4:\\\"FORMERR\\\" OR  deviceCustomString4:\\\"NOTIMP\\\" OR  deviceCustomString4:\\\"YXDOMAIN\\\" OR  deviceCustomString4:\\\"YXRRSET\\\" OR  deviceCustomString4:\\\"NXRRSET\\\" OR  deviceCustomString4:\\\"NOTAUTH\\\" OR  deviceCustomString4:\\\"NOTZONE\\\" OR  deviceCustomString4:\\\"BADKEY\\\" OR  deviceCustomString4:\\\"BADTIME\\\" OR  deviceCustomString4:\\\"BADMODE\\\" OR  deviceCustomString4:\\\"BADNAME\\\" OR  deviceCustomString4:\\\"BADALG\\\" OR  deviceCustomString4:\\\"BADTRUNC\\\")\",\"label\":\"MEDIUM\",\"color\":\"rgba(254,146,0,1)\",\"id\":\"6033e990-7539-11e7-ae68-d756b92f3a9c\"},{\"filter\":\"(NOT (deviceSeverity:\\\"2\\\" OR deviceSeverity:\\\"3\\\" OR deviceSeverity:\\\"5\\\" OR deviceSeverity:\\\"16\\\" OR deviceCustomString4:\\\"SERVFAIL\\\" OR deviceCustomString4:\\\"NXDOMAIN\\\" OR deviceCustomString4:\\\"REFUSED\\\" OR deviceCustomString4:\\\"BADVERS\\\" OR deviceCustomString4:\\\"BADSIG\\\" OR deviceSeverity:\\\"1\\\" OR  deviceSeverity:\\\"4\\\" OR  deviceSeverity:\\\"6\\\" OR  deviceSeverity:\\\"7\\\" OR  deviceSeverity:\\\"8\\\" OR  deviceSeverity:\\\"9\\\" OR  deviceSeverity:\\\"10\\\" OR deviceSeverity:\\\"17\\\" OR  deviceSeverity:\\\"18\\\" OR  deviceSeverity:\\\"19\\\" OR  deviceSeverity:\\\"20\\\" OR  deviceSeverity:\\\"21\\\" OR  deviceSeverity:\\\"22\\\" OR deviceCustomString4:\\\"Error\\\" OR  deviceCustomString4:\\\"ERROR\\\" OR  deviceCustomString4:\\\"Warning\\\" OR  deviceCustomString4:\\\"WARNING\\\" OR  deviceCustomString4:\\\"FORMERR\\\" OR  deviceCustomString4:\\\"NOTIMP\\\" OR  deviceCustomString4:\\\"YXDOMAIN\\\" OR  deviceCustomString4:\\\"YXRRSET\\\" OR  deviceCustomString4:\\\"NXRRSET\\\" OR  deviceCustomString4:\\\"NOTAUTH\\\" OR  deviceCustomString4:\\\"NOTZONE\\\" OR  deviceCustomString4:\\\"BADKEY\\\" OR  deviceCustomString4:\\\"BADTIME\\\" OR  deviceCustomString4:\\\"BADMODE\\\" OR  deviceCustomString4:\\\"BADNAME\\\" OR  deviceCustomString4:\\\"BADALG\\\" OR  deviceCustomString4:\\\"BADTRUNC\\\"))\",\"label\":\"LOW\",\"color\":\"rgba(252,220,0,1)\",\"id\":\"6b4be0d0-7539-11e7-ae68-d756b92f3a9c\"}]},{\"id\":\"e1a5d1f0-7525-11e7-b440-f1d91dc5774d\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"e1a5d1f1-7525-11e7-b440-f1d91dc5774d\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Count by Event Type\",\"terms_field\":\"deviceEventClassId\",\"terms_size\":\"20\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"deviceProduct:\\\"DNS Trace Log\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/ad802c10-3973-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/ad802c10-3973-11e7-ae19-21fb91585845.json
deleted file mode 100644
index e1416d1ca..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/ad802c10-3973-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Devices by Bandwidth [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Devices by Bandwidth [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showMeticsAtAllLevels\":false,\"showPartialRows\":false,\"showTotal\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"deviceHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Device\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceAddress\",\"customLabel\":\"Source(s)\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationAddress\",\"customLabel\":\"Destination(s)\"}},{\"id\":\"6\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationPort\",\"customLabel\":\"Destination Ports\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesIn\",\"customLabel\":\"Bandwidth (Incoming)\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesOut\",\"customLabel\":\"Bandwidth (Outgoing)\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/afdba840-3e55-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/afdba840-3e55-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index b9f6ca4e0..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/afdba840-3e55-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Source Addresses [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Source Addresses [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":18,\"maxFontSize\":72},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"sourceAddress\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Source Addresses\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/b1f98ce0-7745-11e7-8fb2-417804dc0ec8.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/b1f98ce0-7745-11e7-8fb2-417804dc0ec8.json
deleted file mode 100644
index 7b95eb1dd..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/b1f98ce0-7745-11e7-8fb2-417804dc0ec8.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Sources by Events [ArcSight]",
-  "visState": "{\"title\":\"Top Sources by Events [ArcSight]\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Shaded Circle Markers\",\"isDesaturated\":true,\"addTooltip\":true,\"heatMaxZoom\":0,\"heatMinOpacity\":0.1,\"heatRadius\":25,\"heatBlur\":15,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[0,0],\"wms\":{\"enabled\":false,\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\",\"options\":{\"version\":\"1.3.0\",\"layers\":\"0\",\"format\":\"image/png\",\"transparent\":true,\"attribution\":\"Maps provided by USGS\",\"styles\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"source.location\",\"autoPrecision\":true,\"useGeocentroid\":true,\"precision\":2}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/b74e59b0-3e5f-11e7-899c-f940f646009b.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/b74e59b0-3e5f-11e7-899c-f940f646009b.json
deleted file mode 100644
index 4e7d3fcf6..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/b74e59b0-3e5f-11e7-899c-f940f646009b.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Endpoint Metrics Overview [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{\"customLabel\":\"Event Count\"},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Devices\",\"field\":\"deviceHostName\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"Source\",\"field\":\"sourceAddress\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"4\",\"params\":{\"customLabel\":\"Destination\",\"field\":\"destinationAddress\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"5\",\"params\":{\"customLabel\":\"Port\",\"field\":\"destinationPort\"},\"schema\":\"metric\",\"type\":\"cardinality\"}],\"listeners\":{},\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"30\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"12\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"title\":\"Endpoint Metrics Overview [ArcSight]\",\"type\":\"metric\"}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/b897ce70-4556-11e7-83ea-67cb6920446d.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/b897ce70-4556-11e7-83ea-67cb6920446d.json
deleted file mode 100644
index 8d03dc079..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/b897ce70-4556-11e7-83ea-67cb6920446d.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Destinations [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Destinations [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":10,\"maxFontSize\":60},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Hosts\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/bd1c82c0-75a7-11e7-871d-5f0fb978413c.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/bd1c82c0-75a7-11e7-871d-5f0fb978413c.json
deleted file mode 100644
index df3b92b52..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/bd1c82c0-75a7-11e7-871d-5f0fb978413c.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Size [ArcSight]",
-  "visState": "{\"title\":\"Events by Size [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"8d6c10a0-75a6-11e7-871d-5f0fb978413c\",\"type\":\"timeseries\",\"series\":[{\"id\":\"8d6c10a1-75a6-11e7-871d-5f0fb978413c\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"8d6c10a2-75a6-11e7-871d-5f0fb978413c\",\"type\":\"sum\",\"field\":\"bytesIn\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"bytes\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"filter\":\"deviceDirection:\\\"0\\\"\",\"label\":\"Inbound Bytes\"},{\"id\":\"b15b6fb0-75a6-11e7-871d-5f0fb978413c\",\"color\":\"rgba(244,78,59,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"b15b6fb1-75a6-11e7-871d-5f0fb978413c\",\"type\":\"sum\",\"field\":\"bytesIn\"},{\"script\":\"params.outbound_bytes >= 0 ? params.outbound_bytes * -1 : 0\",\"id\":\"b6e2b060-75a6-11e7-871d-5f0fb978413c\",\"type\":\"calculation\",\"variables\":[{\"id\":\"b9031f60-75a6-11e7-871d-5f0fb978413c\",\"name\":\"outbound_bytes\",\"field\":\"b15b6fb1-75a6-11e7-871d-5f0fb978413c\"}]}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"bytes\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"filter\":\"deviceDirection:\\\"1\\\"\",\"label\":\"Outbound Bytes\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"deviceProduct:\\\"DNS Trace Log\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/bfa45650-3e55-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/bfa45650-3e55-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index 63f429367..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/bfa45650-3e55-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Destination Addresses [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Destination Addresses [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":18,\"maxFontSize\":72},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationAddress\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Addresses\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/c53825b0-3e4b-11e7-af78-9fc514b4e118.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/c53825b0-3e4b-11e7-af78-9fc514b4e118.json
deleted file mode 100644
index 66c44c98c..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/c53825b0-3e4b-11e7-af78-9fc514b4e118.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Endpoint Average EPS [ArcSight]",
-  "visState": "{\"title\":\"Endpoint Average EPS [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"3f2cf630-3e4b-11e7-af78-9fc514b4e118\",\"type\":\"gauge\",\"series\":[{\"id\":\"3f2cf631-3e4b-11e7-af78-9fc514b4e118\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"3f2cf632-3e4b-11e7-af78-9fc514b4e118\",\"type\":\"count\"},{\"id\":\"fbe01c40-7dc4-11e7-95f6-690ab80d4e85\",\"type\":\"cumulative_sum\",\"field\":\"3f2cf632-3e4b-11e7-af78-9fc514b4e118\"},{\"unit\":\"1s\",\"id\":\"01089b20-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"derivative\",\"field\":\"fbe01c40-7dc4-11e7-95f6-690ab80d4e85\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"070d9750-7dc5-11e7-95f6-690ab80d4e85\",\"type\":\"moving_average\",\"field\":\"01089b20-7dc5-11e7-95f6-690ab80d4e85\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Event Throughput\",\"value_template\":\"{{value}} / s\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"id\":\"527ca820-3e4b-11e7-af78-9fc514b4e118\"}],\"gauge_color_rules\":[{\"id\":\"52cee6d0-3e4b-11e7-af78-9fc514b4e118\"}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"filter\":\"categoryDeviceGroup:\\\"/Operating System\\\" OR categoryDeviceGroup:\\\"/IDS/Host\\\" OR categoryDeviceGroup:\\\"/Application\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/c658b300-7745-11e7-8fb2-417804dc0ec8.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/c658b300-7745-11e7-8fb2-417804dc0ec8.json
deleted file mode 100644
index 559c28300..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/c658b300-7745-11e7-8fb2-417804dc0ec8.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Destinations by Events [ArcSight]",
-  "visState": "{\"title\":\"Top Destinations by Events [ArcSight]\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Shaded Circle Markers\",\"isDesaturated\":true,\"addTooltip\":true,\"heatMaxZoom\":0,\"heatMinOpacity\":0.1,\"heatRadius\":25,\"heatBlur\":15,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[0,0],\"wms\":{\"enabled\":false,\"url\":\"https://basemap.nationalmap.gov/arcgis/services/USGSTopo/MapServer/WMSServer\",\"options\":{\"version\":\"1.3.0\",\"layers\":\"0\",\"format\":\"image/png\",\"transparent\":true,\"attribution\":\"Maps provided by USGS\",\"styles\":\"\"}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"destination.location\",\"autoPrecision\":true,\"useGeocentroid\":true,\"precision\":2}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/c6db4140-4544-11e7-a94a-5d0a73686c64.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/c6db4140-4544-11e7-a94a-5d0a73686c64.json
deleted file mode 100644
index 428070f96..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/c6db4140-4544-11e7-a94a-5d0a73686c64.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "DNS Metrics Overview",
-  "visState": "{\"title\":\"DNS Metrics Overview\",\"type\":\"metric\",\"params\":{\"handleNoResults\":true,\"fontSize\":\"25\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceHostName\",\"customLabel\":\"# of DNS Devices\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"sourceAddress\",\"customLabel\":\"Source Address(es)\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceCustomString3\",\"customLabel\":\"Connection IDs\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationDnsDomain\",\"customLabel\":\"Domains\"}},{\"id\":\"6\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"deviceCustomString1\",\"customLabel\":\"Query Type(s)\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "16a72e70-4543-11e7-9510-4b0b4978ab0e",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/c9e333a0-4550-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/c9e333a0-4550-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index ba1d1aefb..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/c9e333a0-4550-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Source Users by Event Type and Destination Users [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Source Users\",\"field\":\"sourceUserName\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":20},\"schema\":\"segment\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"customLabel\":\"Event Types\",\"field\":\"categoryBehavior\"},\"schema\":\"metric\",\"type\":\"cardinality\"},{\"enabled\":true,\"id\":\"4\",\"params\":{\"customLabel\":\"Destination User Names\",\"field\":\"destinationUserName\"},\"schema\":\"metric\",\"type\":\"cardinality\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Source Users\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"},{\"data\":{\"id\":\"3\",\"label\":\"Event Types\"},\"drawLinesBetweenPoints\":true,\"interpolate\":\"linear\",\"lineWidth\":2,\"mode\":\"stacked\",\"show\":true,\"showCircles\":true,\"type\":\"line\",\"valueAxis\":\"ValueAxis-2\"},{\"data\":{\"id\":\"4\",\"label\":\"Destination User Names\"},\"drawLinesBetweenPoints\":true,\"interpolate\":\"linear\",\"lineWidth\":2,\"mode\":\"stacked\",\"show\":true,\"showCircles\":true,\"type\":\"line\",\"valueAxis\":\"ValueAxis-2\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"normal\",\"type\":\"square root\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Count\"},\"type\":\"value\"},{\"id\":\"ValueAxis-2\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"RightAxis-1\",\"position\":\"right\",\"scale\":{\"mode\":\"normal\",\"type\":\"square root\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"\"},\"type\":\"value\"}]},\"title\":\"Source Users by Event Type and Destination Users [ArcSight]\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/cc8affd0-3e65-11e7-899c-f940f646009b.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/cc8affd0-3e65-11e7-899c-f940f646009b.json
deleted file mode 100644
index b68a868e9..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/cc8affd0-3e65-11e7-899c-f940f646009b.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 5 Source Countries [ArcSight]",
-  "visState": "{\"title\":\"Top 5 Source Countries [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":18,\"maxFontSize\":72},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"source.country_name\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/cd462cc0-3e55-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/cd462cc0-3e55-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index 1a1f5a645..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/cd462cc0-3e55-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Destination Ports [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Destination Ports [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":18,\"maxFontSize\":72},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationPort\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Addresses\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/d6d526f0-395b-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/d6d526f0-395b-11e7-ae19-21fb91585845.json
deleted file mode 100644
index 85e87e110..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/d6d526f0-395b-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Source [ArcSight]",
-  "visState": "{\"title\":\"Events by Source [ArcSight]\",\"type\":\"metrics\",\"params\":{\"axis_formatter\":\"number\",\"axis_position\":\"left\",\"background_color\":null,\"background_color_rules\":[{\"id\":\"837bfbb0-395a-11e7-ae19-21fb91585845\"}],\"bar_color_rules\":[{\"id\":\"e4772140-3957-11e7-ae19-21fb91585845\"}],\"filter\":\"categoryDeviceType:\\\"Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\"\",\"gauge_color_rules\":[{\"id\":\"8970f250-395a-11e7-ae19-21fb91585845\"}],\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"gauge_width\":10,\"id\":\"e1a58ab0-3957-11e7-ae19-21fb91585845\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"series\":[{\"axis_position\":\"right\",\"chart_type\":\"line\",\"color\":\"rgba(244,78,59,1)\",\"fill\":\"0\",\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\"\",\"formatter\":\"number\",\"id\":\"8f58a280-395a-11e7-ae19-21fb91585845\",\"label\":\"Events\",\"line_width\":\"3\",\"metrics\":[{\"id\":\"8f58a281-395a-11e7-ae19-21fb91585845\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"field\":\"8f58a281-395a-11e7-ae19-21fb91585845\",\"id\":\"140cf490-395b-11e7-ae19-21fb91585845\",\"sigma\":\"\",\"type\":\"moving_average\"}],\"point_size\":\"0\",\"seperate_axis\":1,\"split_mode\":\"filters\",\"stacked\":\"none\",\"steps\":0,\"terms_field\":\"deviceHostName\",\"terms_order_by\":null,\"split_filters\":[{\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\"\",\"label\":\"Firewall Events\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"1fd3fa30-4685-11e7-8ffc-b5cec7c0edbb\"},{\"filter\":\"categoryDeviceGroup:\\\"/IDS/Network\\\"\",\"label\":\"Intrusion Detection Events\",\"color\":\"rgba(254,146,0,1)\",\"id\":\"274111e0-4685-11e7-8ffc-b5cec7c0edbb\"},{\"filter\":\"categoryDeviceGroup:\\\"/VPN\\\"\",\"label\":\"VPN\",\"color\":\"rgba(252,220,0,1)\",\"id\":\"5682a680-468f-11e7-8116-65b4628ff93f\"}]},{\"axis_position\":\"left\",\"chart_type\":\"bar\",\"color\":\"rgba(0,156,224,1)\",\"fill\":\"0.5\",\"formatter\":\"number\",\"id\":\"3bb711b0-395b-11e7-ae19-21fb91585845\",\"label\":\"Moving Average by Device Hosts\",\"line_width\":1,\"metrics\":[{\"id\":\"3bb711b1-395b-11e7-ae19-21fb91585845\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"field\":\"3bb711b1-395b-11e7-ae19-21fb91585845\",\"id\":\"4b515cc0-395b-11e7-ae19-21fb91585845\",\"type\":\"moving_average\"}],\"point_size\":1,\"seperate_axis\":1,\"split_mode\":\"terms\",\"stacked\":\"none\",\"terms_field\":\"deviceHostName\",\"terms_size\":\"10\",\"split_color_mode\":\"gradient\"}],\"show_legend\":1,\"time_field\":\"deviceReceiptTime\",\"type\":\"timeseries\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/d72d7940-7529-11e7-9445-91c40765092f.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/d72d7940-7529-11e7-9445-91c40765092f.json
deleted file mode 100644
index 9225eac67..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/d72d7940-7529-11e7-9445-91c40765092f.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top Destinations by Traffic Size [ArcSight]",
-  "visState": "{\"title\":\"Top Destinations by Traffic Size [ArcSight]\",\"type\":\"heatmap\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"enableHover\":true,\"legendPosition\":\"top\",\"times\":[],\"colorsNumber\":10,\"colorSchema\":\"Blues\",\"setColorRange\":false,\"colorsRange\":[{\"from\":0,\"to\":null}],\"invertColors\":false,\"percentageMode\":false,\"valueAxes\":[{\"show\":false,\"id\":\"ValueAxis-1\",\"type\":\"value\",\"scale\":{\"type\":\"linear\",\"defaultYExtents\":false},\"labels\":{\"show\":false,\"rotate\":0,\"color\":\"#555\"}}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"bytesIn\",\"customLabel\":\"Bytes\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"filters\",\"schema\":\"segment\",\"params\":{\"filters\":[{\"input\":{\"query\":{\"query_string\":{\"query\":\"deviceDirection:\\\"0\\\"\",\"analyze_wildcard\":true}}},\"label\":\"Inbound\"},{\"input\":{\"query\":{\"query_string\":{\"query\":\"deviceDirection:\\\"1\\\"\",\"analyze_wildcard\":true}}},\"label\":\"Outbound\"}]}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"destinationHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 18k\":\"rgb(247,251,255)\",\"18k - 36k\":\"rgb(227,238,249)\",\"36k - 54k\":\"rgb(208,225,242)\",\"54k - 72k\":\"rgb(182,212,233)\",\"72k - 90k\":\"rgb(148,196,223)\",\"90k - 108k\":\"rgb(107,174,214)\",\"108k - 126k\":\"rgb(74,152,201)\",\"126k - 144k\":\"rgb(46,126,188)\",\"144k - 162k\":\"rgb(23,100,171)\",\"162k - 180k\":\"rgb(8,74,145)\"}}}",
-  "description": "",
-  "savedSearchId": "bb1f4bc0-73fd-11e7-b4d0-0fc7dfb45744",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/d8314510-454f-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/d8314510-454f-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 6ddd0479d..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/d8314510-454f-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 20 Behaviors by Outcome [ArcSight]",
-  "visState": "{\"title\":\"Top 20 Behaviors by Outcome [ArcSight]\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"categoryBehavior\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Behavior\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"categoryOutcome\",\"size\":3,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Outcome\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "7a2fc9c0-454d-11e7-86b6-95298e9da6dc",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/ddef4fc0-3e55-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/ddef4fc0-3e55-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index bc7f68b23..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/ddef4fc0-3e55-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Firewall - Suspicious - Top Application Protocols Word Cloud",
-  "visState": "{\"title\":\"Firewall - Suspicious - Top Application Protocols Word Cloud\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":18,\"maxFontSize\":72},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"applicationProtocol\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Destination Addresses\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/e301a830-3e4d-11e7-af78-9fc514b4e118.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/e301a830-3e4d-11e7-af78-9fc514b4e118.json
deleted file mode 100644
index df2463335..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/e301a830-3e4d-11e7-af78-9fc514b4e118.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Destination Ports by Outcomes [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"field\":\"destinationPort\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":20},\"schema\":\"segment\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"field\":\"categoryOutcome\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":5},\"schema\":\"group\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"destinationPort: Descending\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"defaultYExtents\":true,\"mode\":\"normal\",\"setYExtents\":false,\"type\":\"square root\"},\"show\":true,\"style\":{},\"title\":{},\"type\":\"value\"}]},\"title\":\"Destination Ports by Outcomes [ArcSight]\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/e3888410-3e50-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/e3888410-3e50-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index b292e8087..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/e3888410-3e50-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Severity [ArcSight]",
-  "visState": "{\"title\":\"Events by Severity [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"69a9f020-3e50-11e7-96c4-0d3a291ec93a\",\"type\":\"top_n\",\"series\":[{\"id\":\"69a9f021-3e50-11e7-96c4-0d3a291ec93a\",\"color\":\"#68BC00\",\"split_mode\":\"filters\",\"metrics\":[{\"id\":\"69a9f022-3e50-11e7-96c4-0d3a291ec93a\",\"type\":\"count\"},{\"sigma\":\"\",\"id\":\"7bb17f50-76f3-11e7-82d9-83ee5c3338ae\",\"type\":\"sum_bucket\",\"field\":\"69a9f022-3e50-11e7-96c4-0d3a291ec93a\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0[0]a\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"severity:\\\"Low\\\" OR severity:\\\"0\\\"\",\"label\":\"LOW\",\"color\":\"rgba(104,204,202,1)\",\"id\":\"8819d6b0-3e50-11e7-96c4-0d3a291ec93a\"},{\"filter\":\"severity:\\\"Medium\\\"\",\"label\":\"MEDIUM\",\"color\":\"rgba(252,220,0,1)\",\"id\":\"9a4f6610-3e50-11e7-96c4-0d3a291ec93a\"},{\"filter\":\"severity:\\\"High\\\"\",\"label\":\"HIGH\",\"color\":\"rgba(254,146,0,1)\",\"id\":\"a3de4c50-3e50-11e7-96c4-0d3a291ec93a\"},{\"filter\":\"severity:\\\"Very-High\\\"\",\"label\":\"VERY HIGH\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"a9926960-3e50-11e7-96c4-0d3a291ec93a\"}],\"label\":\"Event by Severities\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"id\":\"6ed9c200-3e50-11e7-96c4-0d3a291ec93a\"}],\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/e7404c60-71cb-11e7-bdf5-8b8209f1c4b6.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/e7404c60-71cb-11e7-bdf5-8b8209f1c4b6.json
deleted file mode 100644
index 1daa81444..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/e7404c60-71cb-11e7-bdf5-8b8209f1c4b6.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Device Event Count [ArcSight]",
-  "visState": "{\"title\":\"Device Event Count [ArcSight]\",\"type\":\"metric\",\"params\":{\"addLegend\":false,\"addTooltip\":true,\"fontSize\":\"30\",\"gauge\":{\"autoExtend\":false,\"backStyle\":\"Full\",\"colorSchema\":\"Green to Red\",\"colorsRange\":[{\"from\":0,\"to\":100}],\"gaugeColorMode\":\"None\",\"gaugeStyle\":\"Full\",\"gaugeType\":\"Metric\",\"invertColors\":false,\"labels\":{\"color\":\"black\",\"show\":true},\"orientation\":\"vertical\",\"percentageMode\":false,\"scale\":{\"color\":\"#333\",\"labels\":false,\"show\":false,\"width\":2},\"style\":{\"bgColor\":false,\"bgFill\":\"#000\",\"fontSize\":\"12\",\"labelColor\":false,\"subText\":\"\"},\"type\":\"simple\",\"useRange\":false,\"verticalSplit\":false},\"handleNoResults\":true,\"type\":\"gauge\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/e9c3ee00-3978-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/e9c3ee00-3978-11e7-ae19-21fb91585845.json
deleted file mode 100644
index 919183474..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/e9c3ee00-3978-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Destination Ports by Outcome [ArcSight]",
-  "visState": "{\"aggs\":[{\"enabled\":true,\"id\":\"1\",\"params\":{},\"schema\":\"metric\",\"type\":\"count\"},{\"enabled\":true,\"id\":\"2\",\"params\":{\"customLabel\":\"Protocols\",\"field\":\"destinationPort\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":10},\"schema\":\"segment\",\"type\":\"terms\"},{\"enabled\":true,\"id\":\"3\",\"params\":{\"field\":\"categoryOutcome\",\"order\":\"desc\",\"orderBy\":\"1\",\"size\":5},\"schema\":\"group\",\"type\":\"terms\"}],\"listeners\":{},\"params\":{\"addLegend\":true,\"addTimeMarker\":false,\"addTooltip\":true,\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"labels\":{\"rotate\":75,\"show\":true,\"truncate\":100},\"position\":\"bottom\",\"scale\":{\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Protocols\"},\"type\":\"category\"}],\"defaultYExtents\":false,\"drawLinesBetweenPoints\":true,\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"interpolate\":\"linear\",\"legendPosition\":\"right\",\"radiusRatio\":9,\"scale\":\"linear\",\"seriesParams\":[{\"data\":{\"id\":\"1\",\"label\":\"Count\"},\"drawLinesBetweenPoints\":true,\"mode\":\"stacked\",\"show\":\"true\",\"showCircles\":true,\"type\":\"histogram\",\"valueAxis\":\"ValueAxis-1\"}],\"setYExtents\":false,\"showCircles\":true,\"times\":[],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"labels\":{\"filter\":false,\"rotate\":0,\"show\":true,\"truncate\":100},\"name\":\"LeftAxis-1\",\"position\":\"left\",\"scale\":{\"mode\":\"percentage\",\"type\":\"linear\"},\"show\":true,\"style\":{},\"title\":{\"text\":\"Count\"},\"type\":\"value\"}]},\"title\":\"Destination Ports by Outcome [ArcSight]\",\"type\":\"histogram\"}",
-  "uiStateJSON": "{\"vis\":{\"colors\":{\"/Success\":\"#629E51\",\"/Failure\":\"#BF1B00\"}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/ebfd45a0-75a4-11e7-b440-f1d91dc5774d.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/ebfd45a0-75a4-11e7-b440-f1d91dc5774d.json
deleted file mode 100644
index 6358a6d58..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/ebfd45a0-75a4-11e7-b440-f1d91dc5774d.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Direction [ArcSight]",
-  "visState": "{\"title\":\"Events by Direction [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"12cdd300-75a2-11e7-b440-f1d91dc5774d\",\"type\":\"timeseries\",\"series\":[{\"id\":\"12cdd301-75a2-11e7-b440-f1d91dc5774d\",\"color\":\"#68BC00\",\"split_mode\":\"filters\",\"metrics\":[{\"id\":\"12cdd302-75a2-11e7-b440-f1d91dc5774d\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"deviceDirection:\\\"0\\\"\",\"label\":\"Inbound Requests\",\"color\":\"rgba(0,156,224,1)\",\"id\":\"2bb9d440-75a2-11e7-b440-f1d91dc5774d\"}],\"label\":\"Inbound Requests\",\"filter\":\"device\"},{\"id\":\"bbe68d10-75a2-11e7-b440-f1d91dc5774d\",\"color\":\"#68BC00\",\"split_mode\":\"filters\",\"metrics\":[{\"id\":\"bbe68d11-75a2-11e7-b440-f1d91dc5774d\",\"type\":\"count\"},{\"script\":\"params.outbound > 0 ? params.outbound * -1 : 0\",\"id\":\"d50e5ed0-75a2-11e7-b440-f1d91dc5774d\",\"type\":\"calculation\",\"variables\":[{\"id\":\"d785ee80-75a2-11e7-b440-f1d91dc5774d\",\"name\":\"outbound\",\"field\":\"bbe68d11-75a2-11e7-b440-f1d91dc5774d\"}]}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"deviceDirection:\\\"1\\\"\",\"label\":\"Outbound Requests\",\"color\":\"rgba(211,49,21,1)\",\"id\":\"bfad3200-75a2-11e7-b440-f1d91dc5774d\"}],\"label\":\"Outbound Requests\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"deviceProduct:\\\"DNS Trace Log\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/ec576ff0-4546-11e7-a94a-5d0a73686c64.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/ec576ff0-4546-11e7-a94a-5d0a73686c64.json
deleted file mode 100644
index 9d0a2cd11..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/ec576ff0-4546-11e7-a94a-5d0a73686c64.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events over Time by Query Type",
-  "visState": "{\"title\":\"Events over Time by Query Type\",\"type\":\"metrics\",\"params\":{\"id\":\"45479ab0-4545-11e7-a94a-5d0a73686c64\",\"type\":\"timeseries\",\"series\":[{\"id\":\"45479ab1-4545-11e7-a94a-5d0a73686c64\",\"color\":\"#68BC00\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"45479ab2-4545-11e7-a94a-5d0a73686c64\",\"type\":\"count\"}],\"seperate_axis\":1,\"axis_position\":\"left\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.3\",\"stacked\":\"none\",\"label\":\"Event Count\"},{\"id\":\"afc2ab00-4545-11e7-a94a-5d0a73686c64\",\"color\":\"rgba(22,165,165,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"afc2ab01-4545-11e7-a94a-5d0a73686c64\",\"type\":\"count\"}],\"seperate_axis\":1,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"Query Types\",\"terms_field\":\"deviceCustomString1\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"deviceEventCategory:\\\"dns\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/ec926660-396f-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/ec926660-396f-11e7-ae19-21fb91585845.json
deleted file mode 100644
index 665293cfc..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/ec926660-396f-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Devices by Outcome [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Devices by Outcome [ArcSight]\",\"type\":\"heatmap\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"enableHover\":true,\"legendPosition\":\"right\",\"times\":[],\"colorsNumber\":6,\"colorSchema\":\"Yellow to Red\",\"setColorRange\":false,\"colorsRange\":[],\"invertColors\":false,\"percentageMode\":true,\"valueAxes\":[{\"show\":false,\"id\":\"ValueAxis-1\",\"type\":\"value\",\"scale\":{\"type\":\"linear\",\"defaultYExtents\":false},\"labels\":{\"show\":false,\"rotate\":0,\"color\":\"#555\"}}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"deviceHostName\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Device Host Names\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"categoryOutcome\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Event Outcome\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0% - 17%\":\"rgb(255,255,204)\",\"17% - 34%\":\"rgb(255,230,146)\",\"34% - 50%\":\"rgb(254,191,90)\",\"50% - 67%\":\"rgb(253,141,60)\",\"67% - 84%\":\"rgb(244,61,37)\",\"84% - 100%\":\"rgb(202,8,35)\"}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/ed2f5570-3d5b-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/ed2f5570-3d5b-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index 0047ff645..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/ed2f5570-3d5b-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Network - Event Throughput [ArcSight]",
-  "visState": "{\"title\":\"Network - Event Throughput [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"429af7e0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"gauge\",\"series\":[{\"id\":\"429af7e1-3d5b-11e7-8b9d-ddc45b5f6d00\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"count\"},{\"id\":\"0bd1cb90-7dc4-11e7-95f6-690ab80d4e85\",\"type\":\"cumulative_sum\",\"field\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\"},{\"unit\":\"1s\",\"id\":\"103c9fc0-7dc4-11e7-95f6-690ab80d4e85\",\"type\":\"derivative\",\"field\":\"0bd1cb90-7dc4-11e7-95f6-690ab80d4e85\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"4f004810-7dc4-11e7-95f6-690ab80d4e85\",\"type\":\"moving_average\",\"field\":\"103c9fc0-7dc4-11e7-95f6-690ab80d4e85\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Event Throughput\",\"value_template\":\"{{value}}  / s\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"categoryDeviceType:\\\"Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\" \",\"bar_color_rules\":[{\"id\":\"77dd4e80-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"background_color_rules\":[{\"id\":\"798c5e10-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"gauge_color_rules\":[{\"value\":0,\"id\":\"988f35d0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"gauge\":null}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"gauge_max\":\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/f0664070-4551-11e7-86b6-95298e9da6dc.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/f0664070-4551-11e7-86b6-95298e9da6dc.json
deleted file mode 100644
index 152f191ef..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/f0664070-4551-11e7-86b6-95298e9da6dc.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Outcomes [ArcSight]",
-  "visState": "{\"title\":\"Events by Outcomes [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"e10aefa0-4550-11e7-86b6-95298e9da6dc\",\"type\":\"timeseries\",\"series\":[{\"id\":\"1b5b1130-4551-11e7-86b6-95298e9da6dc\",\"color\":\"rgba(244,78,59,1)\",\"split_mode\":\"filters\",\"metrics\":[{\"id\":\"1b5b1131-4551-11e7-86b6-95298e9da6dc\",\"type\":\"count\"}],\"seperate_axis\":1,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"terms_field\":\"categoryOutcome\",\"terms_size\":\"3\",\"label\":\"Event Outcomes\",\"hide_in_legend\":0,\"split_filters\":[{\"filter\":\"categoryOutcome:\\\"/Failure\\\"\",\"label\":\"Failure\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"a4c1a0b0-4551-11e7-86b6-95298e9da6dc\"},{\"filter\":\"categoryOutcome:\\\"/Success\\\"\",\"label\":\"Success\",\"color\":\"rgba(104,188,0,1)\",\"id\":\"b51f14b0-4551-11e7-86b6-95298e9da6dc\"},{\"filter\":\"categoryOutcome:\\\"/Attempt\\\"\",\"label\":\"Attempt\",\"color\":\"rgba(251,158,0,1)\",\"id\":\"c4b19790-4551-11e7-86b6-95298e9da6dc\"}]},{\"id\":\"e10aefa1-4550-11e7-86b6-95298e9da6dc\",\"color\":\"rgba(104,182,204,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"e10aefa2-4550-11e7-86b6-95298e9da6dc\",\"type\":\"count\"}],\"seperate_axis\":1,\"axis_position\":\"left\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Event Count\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"categoryDeviceGroup:\\\"/Operating System\\\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/f23438c0-4548-11e7-a94a-5d0a73686c64.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/f23438c0-4548-11e7-a94a-5d0a73686c64.json
deleted file mode 100644
index 4884dfbbb..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/f23438c0-4548-11e7-a94a-5d0a73686c64.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "DNS - Moving Average Event Count",
-  "visState": "{\"title\":\"DNS - Moving Average Event Count\",\"type\":\"metrics\",\"params\":{\"id\":\"429af7e0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"gauge\",\"series\":[{\"id\":\"429af7e1-3d5b-11e7-8b9d-ddc45b5f6d00\",\"color\":\"rgba(0,156,224,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"5faf9430-3d5b-11e7-8b9d-ddc45b5f6d00\",\"type\":\"moving_average\",\"field\":\"429af7e2-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Last Event Avg\",\"value_template\":\"{{value}}/s\"}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"filter\":\"deviceEventCategory:\\\"dns\\\"\",\"bar_color_rules\":[{\"id\":\"77dd4e80-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"background_color_rules\":[{\"id\":\"798c5e10-3d5b-11e7-8b9d-ddc45b5f6d00\"}],\"gauge_color_rules\":[{\"value\":0,\"id\":\"988f35d0-3d5b-11e7-8b9d-ddc45b5f6d00\",\"gauge\":null}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"gauge_max\":\"\",\"ignore_global_filter\":1},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/f57ea930-395d-11e7-ae19-21fb91585845.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/f57ea930-395d-11e7-ae19-21fb91585845.json
deleted file mode 100644
index 8c840db9d..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/f57ea930-395d-11e7-ae19-21fb91585845.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Events by Outcome [ArcSight]",
-  "visState": "{\"title\":\"Events by Outcome [ArcSight]\",\"type\":\"metrics\",\"params\":{\"id\":\"e1a58ab0-3957-11e7-ae19-21fb91585845\",\"type\":\"timeseries\",\"series\":[{\"id\":\"8f58a280-395a-11e7-ae19-21fb91585845\",\"color\":\"rgba(211,49,21,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"8f58a281-395a-11e7-ae19-21fb91585845\",\"type\":\"count\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"4ec00ae0-4686-11e7-8ffc-b5cec7c0edbb\",\"type\":\"moving_average\",\"field\":\"8f58a281-395a-11e7-ae19-21fb91585845\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":\"0\",\"fill\":\"0\",\"stacked\":\"none\",\"filter\":\"(categoryDeviceGroup:\\\"/Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\") AND _exists_:categoryOutcome\",\"terms_field\":\"deviceHostName\",\"terms_order_by\":null,\"label\":\"Events\",\"steps\":0,\"split_filters\":[{\"filter\":\"categoryDeviceGroup:\\\"/Firewall\\\"\",\"label\":\"Firewall\",\"color\":\"rgba(254,146,0,1)\",\"id\":\"ccf3be70-395c-11e7-ae19-21fb91585845\"}]},{\"id\":\"3bb711b0-395b-11e7-ae19-21fb91585845\",\"color\":\"rgba(104,188,0,1)\",\"split_mode\":\"filters\",\"metrics\":[{\"id\":\"3bb711b1-395b-11e7-ae19-21fb91585845\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"left\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"1\",\"stacked\":\"stacked\",\"terms_field\":\"categoryOutcome\",\"terms_size\":\"3\",\"label\":\"Moving Average by Event Outcome\",\"split_filters\":[{\"filter\":\"categoryOutcome:\\\"/Success\\\"\",\"label\":\"Success\",\"color\":\"rgba(104,188,0,0.35)\",\"id\":\"c3189780-395d-11e7-ae19-21fb91585845\"},{\"filter\":\"categoryOutcome:\\\"/Failure\\\"\",\"label\":\"Failure\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"d37d3770-395d-11e7-ae19-21fb91585845\"},{\"filter\":\"categoryOutcome:\\\"/Attempt\\\"\",\"label\":\"Attempt\",\"color\":\"rgba(0,156,224,1)\",\"id\":\"e59c7440-4685-11e7-8ffc-b5cec7c0edbb\"}]}],\"time_field\":\"deviceReceiptTime\",\"index_pattern\":\"arcsight-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"bar_color_rules\":[{\"value\":0,\"id\":\"e4772140-3957-11e7-ae19-21fb91585845\",\"bar_color\":null}],\"background_color\":null,\"filter\":\"categoryDeviceType:\\\"Firewall\\\" OR categoryDeviceGroup:\\\"/IDS/Network\\\" OR categoryDeviceGroup:\\\"/VPN\\\"\",\"background_color_rules\":[{\"id\":\"837bfbb0-395a-11e7-ae19-21fb91585845\"}],\"gauge_color_rules\":[{\"id\":\"8970f250-395a-11e7-ae19-21fb91585845\"}],\"gauge_width\":10,\"gauge_inner_width\":10,\"gauge_style\":\"half\",\"drilldown_url\":\"\"},\"aggs\":[],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"query_string\":{\"query\":\"*\"}},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/f99c22e0-3e4e-11e7-96c4-0d3a291ec93a.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/f99c22e0-3e4e-11e7-96c4-0d3a291ec93a.json
deleted file mode 100644
index 53ec30917..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/f99c22e0-3e4e-11e7-96c4-0d3a291ec93a.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 5 Sources by Destination Ports [ArcSight]",
-  "visState": "{\"title\":\"Top 5 Sources by Destination Ports [ArcSight]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"2\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"destinationPort\",\"customLabel\":\"Destination Ports\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Event Count\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"sourceAddress\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"2\",\"customLabel\":\"Source Address\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/fd70bca0-398f-11e7-8b9d-ddc45b5f6d00.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/fd70bca0-398f-11e7-8b9d-ddc45b5f6d00.json
deleted file mode 100644
index 7a4da9dc5..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/fd70bca0-398f-11e7-8b9d-ddc45b5f6d00.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 20 Source Countries [ArcSight]",
-  "visState": "{\"title\":\"Top 20 Source Countries [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"square root\",\"orientation\":\"single\",\"minFontSize\":26,\"maxFontSize\":72,\"hideLabel\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"source.country_name\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "6315e7a0-34be-11e7-95dc-4f6090d732f6",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/ff476320-3e4a-11e7-af78-9fc514b4e118.json b/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/ff476320-3e4a-11e7-af78-9fc514b4e118.json
deleted file mode 100644
index 435d2ee2d..000000000
--- a/x-pack/modules/arcsight/configuration/kibana/7.x/visualization/ff476320-3e4a-11e7-af78-9fc514b4e118.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "title": "Top 10 Destination Port [ArcSight]",
-  "visState": "{\"title\":\"Top 10 Destination Port [ArcSight]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":18,\"maxFontSize\":72},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"destinationPort\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "savedSearchId": "1d9ba830-3e47-11e7-af78-9fc514b4e118",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/arcsight/configuration/logstash/arcsight.conf.erb b/x-pack/modules/arcsight/configuration/logstash/arcsight.conf.erb
deleted file mode 100644
index 483ae619a..000000000
--- a/x-pack/modules/arcsight/configuration/logstash/arcsight.conf.erb
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-#
-<%
-# Define the default inputs to use and a list of valid aliases
-defined_inputs = configured_inputs(["kafka"], {"eventbroker" => "kafka", "smartconnector" => "tcp"})
-
-alias_settings_keys!(
-    {
-        "var.input.kafka" => "var.input.eventbroker",
-        "var.input.tcp"   => "var.input.smartconnector"
-    })
-require 'arcsight_module_config_helper'
-%>
-
-input {
-  <% if defined_inputs.include?("kafka") %>
-  kafka {
-    codec => cef
-    bootstrap_servers => <%= csv_string(get_setting(LogStash::Setting::SplittableStringArray.new("var.input.kafka.bootstrap_servers", String, "localhost:39092"))) %>
-    topics => <%= array_to_string(get_setting(LogStash::Setting::SplittableStringArray.new("var.input.kafka.topics", String, ["eb-cef"]))) %>
-    <%= LogStash::Arcsight::ConfigHelper.kafka_input_ssl_sasl_config(self) %>
-    type => syslog
-  }
-  <% end %>
-
-  <% if defined_inputs.include?("tcp") %>
-  tcp {
-    # The delimiter config used is for TCP interpretation
-    codec => cef { delimiter => "\r\n" }
-    port => <%= setting("var.input.tcp.port", 5000) %>
-    <%= LogStash::Arcsight::ConfigHelper.tcp_input_ssl_config(self) %>
-    type => syslog
-  }
-  <% end %>
-}
-
-filter {
-
-  # Map the @timestamp with the event time, as recorded in deviceReceiptTime
-
-  date {
-    match => [ "deviceReceiptTime", "MMM dd yyyy HH:mm:ss", "MMM  d yyyy HH:mm:ss", "UNIX_MS" ]
-  }
-
-  # To map the attacker Geo IP if plausible
-
-  geoip {
-    source => "sourceAddress"
-    target => "source"
-  }
-
-  # To map the target Geo IP if plausible
-
-  geoip {
-    source => "destinationAddress"
-    target => "destination"
-  }
-
-  # To map the log producing device Geo IP if plausible
-
-  geoip {
-    source => "deviceAddress"
-    target => "device"
-  }
-}
-
-output {
-  <%= elasticsearch_output_config('syslog') %>
-}
diff --git a/x-pack/modules/arcsight/lib/arcsight_module_config_helper.rb b/x-pack/modules/arcsight/lib/arcsight_module_config_helper.rb
deleted file mode 100644
index c5a5ef3ea..000000000
--- a/x-pack/modules/arcsight/lib/arcsight_module_config_helper.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-require 'logstash/namespace'
-
-module LogStash
-  module Arcsight
-    module ConfigHelper
-      extend self
-      def kafka_input_ssl_sasl_config(bound_scope)
-        security_protocol = bound_scope.setting("var.input.kafka.security_protocol", "unset")
-        return "" if security_protocol == "unset"
-        lines = ["security_protocol => '#{security_protocol}'"]
-        lines.push("ssl_truststore_type => '#{bound_scope.setting("var.input.kafka.ssl_truststore_type", "")}'")
-
-        ssl_truststore_location = bound_scope.setting("var.input.kafka.ssl_truststore_location","")
-        lines.push("ssl_truststore_location => '#{ssl_truststore_location}'") unless ssl_truststore_location.empty?
-
-        ["ssl_truststore_password", "ssl_keystore_password", "ssl_key_password"].each do |name|
-          full_name = "var.input.kafka.".concat(name)
-          lines.push("#{name} => '#{bound_scope.raw_setting(full_name)}'") if bound_scope.has_setting?(full_name)
-        end
-
-        lines.push("ssl_keystore_type => '#{bound_scope.setting("var.input.kafka.ssl_keystore_type", "")}'")
-
-        ssl_keystore_location = bound_scope.setting("var.input.kafka.ssl_keystore_location","")
-        lines.push("ssl_keystore_location => '#{ssl_keystore_location}'") unless ssl_keystore_location.empty?
-
-        lines.push("sasl_mechanism => '#{bound_scope.setting("var.input.kafka.sasl_mechanism", "")}'")
-        lines.push("sasl_kerberos_service_name => '#{bound_scope.setting("var.input.kafka.sasl_kerberos_service_name", "")}'")
-
-        jaas_path = bound_scope.setting("var.input.kafka.jaas_path","")
-        lines.push("jaas_path => '#{jaas_path}'") unless jaas_path.empty?
-
-        kerberos_config = bound_scope.setting("var.input.kafka.kerberos_config","")
-        lines.push("kerberos_config => '#{kerberos_config}'") unless kerberos_config.empty?
-
-        lines.compact.join("\n    ")
-      end
-
-      def tcp_input_ssl_config(bound_scope)
-        ssl_enabled = bound_scope.setting("var.input.tcp.ssl_enable", false)
-        return "" unless ssl_enabled
-        lines = ["ssl_enable => true"]
-
-        verify_enabled = bound_scope.setting("var.input.tcp.ssl_verify", true)
-        lines.push("ssl_verify => #{verify_enabled}")
-
-        ssl_cert = bound_scope.setting("var.input.tcp.ssl_cert","")
-        lines.push("ssl_cert => '#{ssl_cert}'") unless ssl_cert.empty?
-
-        ssl_key = bound_scope.setting("var.input.tcp.ssl_key","")
-        lines.push("ssl_key => '#{ssl_key}'") unless ssl_key.empty?
-
-        lines.push("ssl_key_passphrase => '#{ bound_scope.setting("var.input.tcp.ssl_key_passphrase", "")}'")
-
-        certs_array_as_string = bound_scope.array_to_string(
-          bound_scope.get_setting(LogStash::Setting::SplittableStringArray.new("var.input.tcp.ssl_extra_chain_certs", String, []))
-        )
-        lines.push("ssl_extra_chain_certs => #{certs_array_as_string}")
-
-        lines.compact.join("\n    ")
-      end
-    end
-  end
-end
diff --git a/x-pack/modules/azure/README.md b/x-pack/modules/azure/README.md
deleted file mode 100644
index bdf58f3f2..000000000
--- a/x-pack/modules/azure/README.md
+++ /dev/null
@@ -1,115 +0,0 @@
-Azure Module
-----------
-
-Example configurations:
-
-##  Basic 
-
-All configuration is shared between Event Hubs
-
-```yaml
-modules:
-  - name: azure
-    var.elasticsearch.hosts: "localhost:9200"
-    var.kibana.host: "localhost:5601"
-    var.input.azure_event_hubs.threads: 8
-    var.input.azure_event_hubs.decorate_events: true
-    var.input.azure_event_hubs.consumer_group: "logstash"
-    var.input.azure_event_hubs.storage_connection: "DefaultEndpointsProtocol=https;AccountName=example...."
-    var.input.azure_event_hubs.event_hub_connections:
-      - "Endpoint=sb://example1...EntityPath=insights-logs-errors"
-      - "Endpoint=sb://example2...EntityPath=insights-metrics-pt1m"
-```
-
-## Advanced
-
-Configuration may be Event Hub specific. Requires 'header' array with 'name' as first position, and other options (in any order) labeled. Will use the 'global' config if not defined per Event Hub. The per Event Hub configuration takes precedence. For example, in the below example 'consumer_group' will be applied to each of the configured Event Hubs. 'decorate_events' is defined in both the 'global' and per Event Hub configuration, the per Event Hub configuration takes precedence, and the 'global' configuration is effectively ignored.  
-
-```yaml
-modules:
-  - name: azure
-    var.elasticsearch.hosts: "localhost:9200"
-    var.kibana.host: "localhost:5601"
-    var.input.azure_event_hubs.threads: 8
-    var.input.azure_event_hubs.decorate_events: true
-    var.input.azure_event_hubs.consumer_group: logstash
-    var.input.azure_event_hubs.event_hubs:
-      - ["name",                      "event_hub_connection",      "storage_connection",                                      "initial_position", "decorate_events"]
-      - ["insights-operational-logs", "Endpoint=sb://example1...", "DefaultEndpointsProtocol=https;AccountName=example1....", "HEAD",             "true"]
-      - ["insights-metrics-pt1m",     "Endpoint=sb://example2...", "DefaultEndpointsProtocol=https;AccountName=example2....", "TAIL",             "true"]
-      - ["insights-logs-errors",      "Endpoint=sb://example3...", "DefaultEndpointsProtocol=https;AccountName=example3....", "TAIL",             "false"]
-      - ["insights-operational-logs", "Endpoint=sb://example4...", "DefaultEndpointsProtocol=https;AccountName=example4....", "HEAD",             "true"]
-```
-## Command Line
-
-Basic mode with a single Event Hub is supported from the command line. The array syntax may not be used in the command line variant:
-```
-bin/logstash --modules azure -M "azure.var.elasticsearch.host=es.mycloud.com" -M "azure.var.input.azure_event_hubs.threads=8" -M "azure.var.input.azure_event_hubs.consumer_group=logstash" -M "azure.var.input.azure_event_hubs.decorate_events=true" -M "azure.var.input.azure_event_hubs.event_hub_connections=Endpoint=sb://example1...EntityPath=insights-logs-errors" -M "azure.var.input.azure_event_hubs.storage_connection=DefaultEndpointsProtocol=https;AccountName=example...."
-```
-
-###  Azure module schema
-
-This module reads data from the Azure Event Hub and adds some additional structure to the data for Activity Logs and SQL Diagnostics. The original data is always preserved and any data added or parsed will be namespaced under 'azure'.  For example, 'azure.subscription' may have been parsed from a longer more complex URN. 
-
-| name                 | description | note|
-|--------------------- | ----------- | --- | 
-| azure.subscription   | The Azure subscription from which this data originates. | Some Activity Log events may not be associated with a subscription.
-| azure.group          | The primary type of data. Current values are either 'activity_log' or 'sql_diagnostics' |
-| azure.category*      | The secondary type of data specific to group from which the data originated |
-| azure.provider       | The Azure provider |
-| azure.resource_group | The Azure resource group |  
-| azure.resource_type  | The Azure resource type | 
-| azure.resource_name  | The Azure resource name |
-| azure.database       | The Azure database name, for display purposes | SQL Diagnostics only |
-| azure.db_unique_id   | The Azure database name that is garunteed to be unique | SQL Diagnostics only |
-| azure.server         | The Azure server for the database | SQL Diagnostics only |
-| azure.server_and_database | The Azure server and database combined | SQL Diagnostics only |
-| azure.metadata       | Any @metadata added by the plugins, for example ` var.input.azure_event_hubs.decorate_events: true` |
-
-* Activity Logs can have the following categories: "Administrative", "ServiceHealth", "Alert", "Autoscale", "Security"
-* SQL Diagnostics can have the following categories: "Metric", "Blocks", "Errors", "Timeouts", "QueryStoreRuntimeStatistics", "QueryStoreWaitStatistics", "DatabaseWaitStatistics", "SQLInsights"
-
-Microsoft documents it's Activity log schema [here](https://docs.microsoft.com/en-us/azure/monitoring-and-diagnostics/monitoring-activity-log-schema), and the SQL Diagnostics data is documented [here](https://docs.microsoft.com/en-us/azure/sql-database/sql-database-metrics-diag-logging).  However, Elastic does not own these data models and as such can make any assurances of it's accuracy or passivity.
-
-#### Special note - Properties field
-
-Many of the logs contain a "properties" top level field. This is often where the most interesting data lives. There is not a fixed schema between log types for properties fields coming from different sources. This can cause mapping errors when shipping the data to Elasticsearch. For example, one log may have `properties.type` where one log sets this a String type and another sets this an Integer type. To avoid mapping errors, the original properties field is moved to `<azure.group>_<azure_category>_properties.<original_key>`. For example `properties.type` may end up as `sql_diagnostics_Errors_properties.type` or `activity_log_Security_properties.type` depending on the group/category from where the event originated. 
- 
-
-## Testing
-
-Testing is modules is easiest with Docker and Docker compose to stand up instances of Elasticsearch and Kibana. Below is a Docker compose file that can be used for quick testing. 
-
-```dockerfile
-version: '3'
-
-# docker-compose up --force-recreate 
-
-services:
-
-  elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:6.2.4
-    ports:
-      - "9200:9200"
-      - "9300:9300"
-    environment:
-      ES_JAVA_OPTS: "-Xmx512m -Xms512m"
-      discovery.type: "single-node"
-    networks:
-      - ek
-
-  kibana:
-    image: docker.elastic.co/kibana/kibana:6.2.4
-    ports:
-      - "5601:5601"
-    networks:
-      - ek
-    depends_on:
-      - elasticsearch
-
-networks:
-  ek:
-    driver: bridge
-```
-
-
diff --git a/x-pack/modules/azure/configuration/elasticsearch/azure.json b/x-pack/modules/azure/configuration/elasticsearch/azure.json
deleted file mode 100644
index 9e0466037..000000000
--- a/x-pack/modules/azure/configuration/elasticsearch/azure.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "index_patterns" : "azure-*",
-  "version" : 1,
-  "settings" : {
-    "index.refresh_interval" : "5s",
-    "number_of_shards": 1
-  },
-  "mappings" : {
-    "dynamic_templates" : [ {
-      "message_field" : {
-        "path_match" : "message",
-        "match_mapping_type" : "string",
-        "mapping" : {
-          "type" : "text",
-          "norms" : false
-        }
-      }
-    }, {
-      "string_fields" : {
-        "match" : "*",
-        "match_mapping_type" : "string",
-        "mapping" : {
-          "type" : "text", "norms" : false,
-          "fields" : {
-            "keyword" : { "type": "keyword", "ignore_above": 256 }
-          }
-        }
-      }
-    } ],
-    "properties" : {
-      "@timestamp": { "type": "date"},
-      "@version": { "type": "keyword"},
-      "geoip"  : {
-        "dynamic": true,
-        "properties" : {
-          "ip": { "type": "ip" },
-          "location" : { "type" : "geo_point" },
-          "latitude" : { "type" : "half_float" },
-          "longitude" : { "type" : "half_float" }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/dashboard/06fa0b60-121a-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/dashboard/06fa0b60-121a-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index cb38d3519..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/dashboard/06fa0b60-121a-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "title": "[Azure Monitor] User Activity",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"panelIndex\":\"2\",\"gridData\":{\"x\":0,\"y\":14,\"w\":12,\"h\":5,\"i\":\"2\"},\"embeddableConfig\":{\"mapCenter\":[35.746512259918504,-29.443359375000004],\"mapZoom\":3},\"id\":\"7fe767b0-11fd-11e8-8c94-a3d8d0cfd62b\",\"title\":\"Global User Activity\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"17\",\"gridData\":{\"x\":0,\"y\":2,\"w\":6,\"h\":6,\"i\":\"17\"},\"id\":\"a0340090-1389-11e8-8c94-a3d8d0cfd62b\",\"title\":\"Users\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"26\",\"gridData\":{\"x\":6,\"y\":0,\"w\":6,\"h\":2,\"i\":\"26\"},\"id\":\"fec4c5c0-139a-11e8-8c94-a3d8d0cfd62b\",\"title\":\"User Activity\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"29\",\"gridData\":{\"x\":0,\"y\":1,\"w\":6,\"h\":1,\"i\":\"29\"},\"id\":\"5e89e2b0-13a0-11e8-8c94-a3d8d0cfd62b\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"32\",\"gridData\":{\"x\":0,\"y\":0,\"w\":6,\"h\":1,\"i\":\"32\"},\"id\":\"aa01fff0-13bb-11e8-8c94-a3d8d0cfd62b\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"33\",\"gridData\":{\"x\":6,\"y\":2,\"w\":6,\"h\":2,\"i\":\"33\"},\"id\":\"27f9bd40-13ca-11e8-8c94-a3d8d0cfd62b\",\"title\":\"Access Requests\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"34\",\"gridData\":{\"x\":6,\"y\":4,\"w\":6,\"h\":4,\"i\":\"34\"},\"id\":\"fca6aa70-13cb-11e8-8c94-a3d8d0cfd62b\",\"title\":\"Resource Changes\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"35\",\"gridData\":{\"x\":6,\"y\":11,\"w\":6,\"h\":3,\"i\":\"35\"},\"id\":\"f7d7bb80-1824-11e8-8c94-a3d8d0cfd62b\",\"title\":\"Top Resource Groups\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"37\",\"gridData\":{\"x\":0,\"y\":8,\"w\":6,\"h\":6,\"i\":\"37\"},\"id\":\"f93f09d0-1bec-11e8-8c94-a3d8d0cfd62b\",\"title\":\"Top Caller IPs\",\"type\":\"visualization\",\"version\":\"6.2.1\",\"embeddableConfig\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":3,\"direction\":\"desc\"}}}}},{\"panelIndex\":\"38\",\"gridData\":{\"x\":6,\"y\":8,\"w\":6,\"h\":3,\"i\":\"38\"},\"id\":\"2e863080-1bef-11e8-8c94-a3d8d0cfd62b\",\"title\":\"Top Resource Types\",\"type\":\"visualization\",\"version\":\"6.2.1\"}]",
-  "optionsJSON": "{\"darkTheme\":true,\"hidePanelTitles\":false,\"useMargins\":false}",
-  "version": 1,
-  "timeRestore": false,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/dashboard/16302750-1223-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/dashboard/16302750-1223-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 0ae717b94..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/dashboard/16302750-1223-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "title": "[Azure Monitor] Alerts",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"panelIndex\":\"1\",\"gridData\":{\"x\":0,\"y\":1,\"w\":6,\"h\":1,\"i\":\"1\"},\"id\":\"890f3af0-093a-11e8-93e5-299e2b5c963a\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"15\",\"gridData\":{\"x\":0,\"y\":4,\"w\":6,\"h\":1,\"i\":\"15\"},\"id\":\"15b9f8d0-1216-11e8-8c94-a3d8d0cfd62b\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"16\",\"gridData\":{\"x\":0,\"y\":5,\"w\":12,\"h\":30,\"i\":\"16\"},\"id\":\"f802b0b0-1211-11e8-8c94-a3d8d0cfd62b\",\"title\":\"Alerts Viewer\",\"type\":\"search\",\"version\":\"6.2.1\"},{\"panelIndex\":\"17\",\"gridData\":{\"x\":0,\"y\":2,\"w\":6,\"h\":2,\"i\":\"17\"},\"id\":\"94e47b60-1385-11e8-8c94-a3d8d0cfd62b\",\"title\":\"Alert Activity\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"18\",\"gridData\":{\"x\":0,\"y\":0,\"w\":6,\"h\":1,\"i\":\"18\"},\"id\":\"8e2e0480-13bc-11e8-8c94-a3d8d0cfd62b\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"19\",\"gridData\":{\"x\":6,\"y\":0,\"w\":6,\"h\":5,\"i\":\"19\"},\"embeddableConfig\":{\"vis\":{\"colors\":{\"0 - 12\":\"#F9D9F9\",\"12 - 23\":\"#E5A8E2\",\"23 - 34\":\"#D683CE\",\"34 - 45\":\"#BA43A9\"},\"defaultColors\":{\"0 - 12\":\"rgb(247,252,245)\",\"12 - 23\":\"rgb(199,233,192)\",\"23 - 34\":\"rgb(116,196,118)\",\"34 - 45\":\"rgb(35,139,69)\"},\"legendOpen\":false}},\"id\":\"2d11a9b0-1ac2-11e8-8c94-a3d8d0cfd62b\",\"title\":\"Alerts Heatmap\",\"type\":\"visualization\",\"version\":\"6.2.1\"}]",
-  "optionsJSON": "{\"darkTheme\":true,\"hidePanelTitles\":false,\"useMargins\":false}",
-  "version": 1,
-  "timeRestore": false,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/dashboard/91ba2090-07cb-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/6.x/dashboard/91ba2090-07cb-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index a5a26a34f..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/dashboard/91ba2090-07cb-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "title": "[Azure Monitor] SQL DB Overview",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"embeddableConfig\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"gridData\":{\"h\":1,\"i\":\"1\",\"w\":7,\"x\":0,\"y\":2},\"id\":\"b98ec5a0-0706-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"1\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":2,\"i\":\"3\",\"w\":5,\"x\":7,\"y\":2},\"id\":\"009a25c0-07d9-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"3\",\"title\":\"Errors\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":2,\"i\":\"5\",\"w\":5,\"x\":7,\"y\":6},\"id\":\"85cee3b0-07df-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"5\",\"title\":\"Database Wait Time\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":2,\"i\":\"6\",\"w\":5,\"x\":7,\"y\":10},\"id\":\"418ce210-07e4-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"6\",\"title\":\"Query Duration (ms)\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":2,\"i\":\"7\",\"w\":5,\"x\":7,\"y\":12},\"id\":\"a71ed100-07e5-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"7\",\"title\":\"Query Wait Time (ms)\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"embeddableConfig\":{\"table\":{\"sort\":{\"column\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"order\":\"desc\"}}},\"gridData\":{\"h\":7,\"i\":\"9\",\"w\":7,\"x\":0,\"y\":3},\"id\":\"880a53f0-080f-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"9\",\"title\":\"Databases\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":2,\"i\":\"11\",\"w\":5,\"x\":7,\"y\":8},\"id\":\"5465b680-0809-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"11\",\"title\":\"Read & Write I/O\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":1,\"i\":\"12\",\"w\":7,\"x\":0,\"y\":0},\"id\":\"68dd8530-083f-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"12\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"embeddableConfig\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"gridData\":{\"h\":6,\"i\":\"13\",\"w\":7,\"x\":0,\"y\":10},\"id\":\"2060bce0-0840-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"13\",\"title\":\"Servers\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"embeddableConfig\":{\"vis\":{\"legendOpen\":false}},\"gridData\":{\"h\":1,\"i\":\"16\",\"w\":7,\"x\":0,\"y\":1},\"id\":\"890f3af0-093a-11e8-93e5-299e2b5c963a\",\"panelIndex\":\"16\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":2,\"i\":\"19\",\"w\":5,\"x\":7,\"y\":4},\"id\":\"eb4363d0-0986-11e8-93e5-299e2b5c963a\",\"panelIndex\":\"19\",\"title\":\"Storage Used\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":2,\"i\":\"20\",\"w\":5,\"x\":7,\"y\":0},\"id\":\"6bab50c0-0877-11e8-93e5-299e2b5c963a\",\"panelIndex\":\"20\",\"title\":\"DTU Utilization\",\"type\":\"visualization\",\"version\":\"6.2.1\"}]",
-  "optionsJSON": "{\"darkTheme\":true,\"useMargins\":false}",
-  "version": 1,
-  "timeRestore": false,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[{\"$state\":{\"store\":\"appState\"},\"meta\":{\"alias\":null,\"controlledBy\":\"1517598395667\",\"disabled\":false,\"index\":\"azure-*\",\"key\":\"azure.subscription.keyword\",\"negate\":false,\"params\":{\"query\":\"741FD0F5-9CB8-442C-91C3-3EF4CA231C2A\",\"type\":\"phrase\"},\"type\":\"phrase\",\"value\":\"741FD0F5-9CB8-442C-91C3-3EF4CA231C2A\"},\"query\":{\"match\":{\"azure.subscription.keyword\":{\"query\":\"741FD0F5-9CB8-442C-91C3-3EF4CA231C2A\",\"type\":\"phrase\"}}}}],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/dashboard/9adef750-08b0-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/dashboard/9adef750-08b0-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 34cbb8b9e..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/dashboard/9adef750-08b0-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "title": "[Azure Monitor] SQL DB Queries",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"gridData\":{\"h\":2,\"i\":\"11\",\"w\":5,\"x\":7,\"y\":2},\"id\":\"6d71abf0-0842-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"11\",\"title\":\"Query Wait Time\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":2,\"i\":\"12\",\"w\":5,\"x\":2,\"y\":2},\"id\":\"518cb600-0842-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"12\",\"title\":\"Query Duration\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":2,\"i\":\"23\",\"w\":3,\"x\":6,\"y\":0},\"id\":\"d02c64c0-08a0-11e8-93e5-299e2b5c963a\",\"panelIndex\":\"23\",\"title\":\"DTU Utilization\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":1,\"i\":\"25\",\"w\":6,\"x\":0,\"y\":0},\"id\":\"20a043b0-13c1-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"25\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":2,\"i\":\"27\",\"w\":2,\"x\":0,\"y\":2},\"id\":\"3fb82260-1527-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"27\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":2,\"i\":\"28\",\"w\":3,\"x\":9,\"y\":0},\"id\":\"5dbd8b20-08a1-11e8-93e5-299e2b5c963a\",\"panelIndex\":\"28\",\"title\":\"Errors\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":9,\"i\":\"29\",\"w\":12,\"x\":0,\"y\":4},\"id\":\"35de9400-1526-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"29\",\"title\":\"Top Queries\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":1,\"i\":\"30\",\"w\":6,\"x\":0,\"y\":1},\"id\":\"db0ec510-152d-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"30\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"}]",
-  "optionsJSON": "{\"darkTheme\":true,\"useMargins\":false}",
-  "version": 1,
-  "timeRestore": false,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/dashboard/aaf909b0-0800-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/6.x/dashboard/aaf909b0-0800-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index 3b4bbe2a7..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/dashboard/aaf909b0-0800-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "title": "[Azure Monitor] SQL DB Database View",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"panelIndex\":\"4\",\"gridData\":{\"x\":6,\"y\":4,\"w\":6,\"h\":2,\"i\":\"4\"},\"id\":\"5465b680-0809-11e8-adb5-e1a2d559cdf5\",\"title\":\"Read & Write I/O\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"5\",\"gridData\":{\"x\":0,\"y\":0,\"w\":6,\"h\":1,\"i\":\"5\"},\"id\":\"68dd8530-083f-11e8-adb5-e1a2d559cdf5\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"14\",\"gridData\":{\"x\":0,\"y\":4,\"w\":6,\"h\":2,\"i\":\"14\"},\"id\":\"9bb5e3e0-0843-11e8-adb5-e1a2d559cdf5\",\"title\":\"Database Wait Time\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"15\",\"gridData\":{\"x\":0,\"y\":1,\"w\":6,\"h\":1,\"i\":\"15\"},\"id\":\"88dcf980-084c-11e8-93e5-299e2b5c963a\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"18\",\"gridData\":{\"x\":9,\"y\":2,\"w\":3,\"h\":2,\"i\":\"18\"},\"id\":\"90ed5940-0850-11e8-93e5-299e2b5c963a\",\"title\":\"Database Size\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"23\",\"gridData\":{\"x\":6,\"y\":0,\"w\":3,\"h\":2,\"i\":\"23\"},\"id\":\"d02c64c0-08a0-11e8-93e5-299e2b5c963a\",\"title\":\"DTU Utilization\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"24\",\"gridData\":{\"x\":9,\"y\":0,\"w\":3,\"h\":2,\"i\":\"24\"},\"id\":\"5dbd8b20-08a1-11e8-93e5-299e2b5c963a\",\"title\":\"Errors\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"25\",\"gridData\":{\"x\":6,\"y\":2,\"w\":3,\"h\":2,\"i\":\"25\"},\"id\":\"5ff32870-08a4-11e8-93e5-299e2b5c963a\",\"title\":\"Storage Utilization\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"28\",\"gridData\":{\"x\":4,\"y\":2,\"w\":2,\"h\":1,\"i\":\"28\"},\"id\":\"e7ac55f0-0c9d-11e8-93e5-299e2b5c963a\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"29\",\"gridData\":{\"x\":0,\"y\":3,\"w\":4,\"h\":1,\"i\":\"29\"},\"id\":\"f819a870-0c9d-11e8-93e5-299e2b5c963a\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"30\",\"gridData\":{\"x\":0,\"y\":2,\"w\":4,\"h\":1,\"i\":\"30\"},\"id\":\"59510c50-0c9e-11e8-93e5-299e2b5c963a\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"31\",\"gridData\":{\"x\":4,\"y\":3,\"w\":2,\"h\":1,\"i\":\"31\"},\"id\":\"72ab38b0-0c9e-11e8-93e5-299e2b5c963a\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"title\":\"Errors Viewer\",\"panelIndex\":\"32\",\"gridData\":{\"x\":0,\"y\":6,\"w\":12,\"h\":6,\"i\":\"32\"},\"id\":\"5a91a3e0-1829-11e8-8c94-a3d8d0cfd62b\",\"type\":\"search\",\"version\":\"6.2.1\"}]",
-  "optionsJSON": "{\"darkTheme\":true,\"useMargins\":false}",
-  "version": 1,
-  "timeRestore": false,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[{\"$state\":{\"store\":\"appState\"},\"meta\":{\"alias\":null,\"controlledBy\":\"1517598395667\",\"disabled\":false,\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"key\":\"azure.db_unique_id.keyword\",\"negate\":false,\"params\":{\"query\":\"741FD0F5-9CB8-442C-91C3-3EF4CA231C2A/WIDEMO/WIDEMO/WORKLOADINSIGHTSDEMO\",\"type\":\"phrase\"},\"type\":\"phrase\",\"value\":\"741FD0F5-9CB8-442C-91C3-3EF4CA231C2A/WIDEMO/WIDEMO/WORKLOADINSIGHTSDEMO\"},\"query\":{\"match\":{\"azure.db_unique_id.keyword\":{\"query\":\"741FD0F5-9CB8-442C-91C3-3EF4CA231C2A/WIDEMO/WIDEMO/WORKLOADINSIGHTSDEMO\",\"type\":\"phrase\"}}}}],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/dashboard/azure.json b/x-pack/modules/azure/configuration/kibana/6.x/dashboard/azure.json
deleted file mode 100644
index 38a051af5..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/dashboard/azure.json
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-  "06fa0b60-121a-11e8-8c94-a3d8d0cfd62b",
-  "16302750-1223-11e8-8c94-a3d8d0cfd62b",
-  "91ba2090-07cb-11e8-adb5-e1a2d559cdf5",
-  "9adef750-08b0-11e8-93e5-299e2b5c963a",
-  "aaf909b0-0800-11e8-adb5-e1a2d559cdf5",
-  "f110f010-11fc-11e8-8c94-a3d8d0cfd62b"
-]
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/dashboard/f110f010-11fc-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/dashboard/f110f010-11fc-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 66fd9916d..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/dashboard/f110f010-11fc-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "title": "[Azure Monitor] Overview",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"gridData\":{\"h\":1,\"i\":\"1\",\"w\":6,\"x\":0,\"y\":1},\"id\":\"890f3af0-093a-11e8-93e5-299e2b5c963a\",\"panelIndex\":\"1\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":2,\"i\":\"4\",\"w\":6,\"x\":6,\"y\":0},\"id\":\"0f1d8b80-11fe-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"4\",\"title\":\"Activity Level\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":1,\"i\":\"11\",\"w\":6,\"x\":0,\"y\":2},\"id\":\"ccabf560-1208-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"11\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":2,\"i\":\"14\",\"w\":6,\"x\":6,\"y\":9},\"id\":\"23e31d20-1215-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"14\",\"title\":\"Alerts\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":1,\"i\":\"15\",\"w\":6,\"x\":6,\"y\":11},\"id\":\"15b9f8d0-1216-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"15\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":2,\"i\":\"19\",\"w\":6,\"x\":0,\"y\":9},\"id\":\"053b9cc0-137e-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"19\",\"title\":\"Service Health\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":1,\"i\":\"20\",\"w\":6,\"x\":0,\"y\":11},\"id\":\"33072240-137f-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"20\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":15,\"i\":\"21\",\"w\":12,\"x\":0,\"y\":12},\"id\":\"3a4ec5b0-1381-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"21\",\"title\":\"Service Health Viewer\",\"type\":\"search\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":4,\"i\":\"23\",\"w\":6,\"x\":0,\"y\":5},\"id\":\"19c51b50-138b-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"23\",\"title\":\"Top Resource Groups\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":5,\"i\":\"24\",\"w\":6,\"x\":6,\"y\":4},\"id\":\"e9391690-1226-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"24\",\"title\":\"Resource Changes\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":2,\"i\":\"25\",\"w\":6,\"x\":0,\"y\":3},\"id\":\"df69c8a0-13aa-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"25\",\"title\":\"Top Active Users\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":2,\"i\":\"26\",\"w\":6,\"x\":6,\"y\":2},\"id\":\"1c885a30-13b0-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"26\",\"title\":\"Access Requests\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":1,\"i\":\"27\",\"w\":6,\"x\":0,\"y\":0},\"id\":\"25eb1470-13bd-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"27\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"}]",
-  "optionsJSON": "{\"darkTheme\":true,\"hidePanelTitles\":false,\"useMargins\":false}",
-  "version": 1,
-  "timeRestore": false,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[{\"$state\":{\"store\":\"appState\"},\"meta\":{\"alias\":null,\"controlledBy\":\"1517598395667\",\"disabled\":false,\"index\":\"azure-*\",\"key\":\"azure.subscription.keyword\",\"negate\":false,\"params\":{\"query\":\"872F2E12-6CCC-4EAD-8D3C-AC833009C1A4\",\"type\":\"phrase\"},\"type\":\"phrase\",\"value\":\"872F2E12-6CCC-4EAD-8D3C-AC833009C1A4\"},\"query\":{\"match\":{\"azure.subscription.keyword\":{\"query\":\"872F2E12-6CCC-4EAD-8D3C-AC833009C1A4\",\"type\":\"phrase\"}}}}],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/index-pattern/azure.json b/x-pack/modules/azure/configuration/kibana/6.x/index-pattern/azure.json
deleted file mode 100644
index 1a1677166..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/index-pattern/azure.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "title" : "azure-*",
-  "timeFieldName" : "@timestamp",
-  "fields" : "[{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"@version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"LogicalServerName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"LogicalServerName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"ResourceGroup\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"ResourceGroup.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"SubscriptionId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"SubscriptionId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.deploymentId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.deploymentId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventCategory\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventCategory.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.aadTenantId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.aadTenantId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.activeSince\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.activeSince.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.component\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.component.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.conditionAggregation\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.conditionAggregation.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.conditionOperator\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.conditionOperator.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.conditionOperatorRaw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.conditionOperatorRaw.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.conditionThreshold\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.conditionWindowSize\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.dateTimestampUtc\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.dateTimestampUtc.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.firstSample\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.firstSample.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.lastSample\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.lastSample.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.metricName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.metricName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.metricScale\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.metricUnit\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.metricUnit.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.metricValue\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.region\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.region.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.resourceName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.resourceName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.ruleDescription\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.ruleDescription.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.ruleId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.ruleId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.ruleName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.ruleName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.sampleCount\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.source\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.source.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.subscriptionId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.subscriptionId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.operationId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.operationId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.policies\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.policies.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.requestbody\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.requestbody.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.resourceLocation\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.resourceLocation.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.responseBody\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.responseBody.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.serviceRequestId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.serviceRequestId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.statusCode\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.statusCode.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.statusMessage\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.statusMessage.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventCategory\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventCategory.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.Aggregation\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.Aggregation.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.MetricName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.MetricName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.MetricUnit\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.MetricUnit.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.Operator\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.Operator.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.RuleDescription\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.RuleDescription.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.RuleName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.RuleName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.RuleUri\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.RuleUri.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.Threshold\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.WindowSizeInMinutes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.eventDataId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.eventDataId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.eventTimestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.operationName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.operationName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.resourceGroup\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.resourceGroup.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.resourceId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.resourceId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.status\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.status.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.subscriptionId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.subscriptionId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.operationId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.operationId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Security_properties.eventCategory\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Security_properties.eventCategory.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Security_properties.eventName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Security_properties.eventName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Security_properties.operationId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Security_properties.operationId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.channels\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.channels.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.correlationId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.correlationId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.description.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventCategory\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventCategory.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventDataId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventDataId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.communication\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.communication.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.communicationId\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.defaultLanguageContent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.defaultLanguageContent.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.defaultLanguageTitle\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.defaultLanguageTitle.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.impactMitigationTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.impactStartTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.impactedServices.ImpactedRegions.RegionName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.impactedServices.ImpactedRegions.RegionName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.impactedServices.ServiceName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.impactedServices.ServiceName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.incidentType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.incidentType.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.region\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.region.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.service\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.service.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.stage\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.stage.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.title.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.trackingId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.trackingId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.version.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventSource\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventSource.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventTimestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.level\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.level.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.operationId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.operationId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.operationName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.operationName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.communication\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.communication.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.communicationId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.communicationId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.defaultLanguageContent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.defaultLanguageContent.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.defaultLanguageTitle\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.defaultLanguageTitle.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.impactMitigationTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.impactStartTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.impactedServices\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.impactedServices.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.incidentType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.incidentType.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.region\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.region.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.service\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.service.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.stage\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.stage.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.title.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.trackingId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.trackingId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.version.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.status\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.status.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.submissionTimestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.subscriptionId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.subscriptionId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"average\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.category\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.category.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.database\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.database.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.db_unique_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.db_unique_id.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.group\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.group.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.metadata.azure_event_hubs.consumer_group\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.metadata.azure_event_hubs.consumer_group.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.metadata.azure_event_hubs.event_size\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.metadata.azure_event_hubs.name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.metadata.azure_event_hubs.name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.metadata.azure_event_hubs.offset\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.metadata.azure_event_hubs.offset.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.metadata.azure_event_hubs.partition\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.metadata.azure_event_hubs.partition.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.metadata.azure_event_hubs.processor_host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.metadata.azure_event_hubs.processor_host.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.metadata.azure_event_hubs.sequence\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.metadata.azure_event_hubs.timestamp\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.provider\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.provider.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.resource_group\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.resource_group.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.resource_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.resource_name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.resource_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.resource_type.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.server\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.server.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.server_and_database\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.server_and_database.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.subscription\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.subscription.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"callerIpAddress\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"callerIpAddress.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"category\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"category.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"correlationId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"correlationId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"count\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"durationMs\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"geoip.city_name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.continent_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"geoip.continent_code.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_code2\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"geoip.country_code2.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_code3\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"geoip.country_code3.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"geoip.country_name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.dma_code\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.latitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.longitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.postal_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"geoip.postal_code.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.region_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"geoip.region_code.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"geoip.region_name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.timezone\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"geoip.timezone.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.authorization.action\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.authorization.action.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.authorization.evidence.principalId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.authorization.evidence.principalId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.authorization.evidence.principalType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.authorization.evidence.principalType.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.authorization.evidence.role\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.authorization.evidence.role.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.authorization.evidence.roleAssignmentId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.authorization.evidence.roleAssignmentId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.authorization.evidence.roleAssignmentScope\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.authorization.evidence.roleAssignmentScope.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.authorization.evidence.roleDefinitionId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.authorization.evidence.roleDefinitionId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.authorization.scope\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.authorization.scope.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims._claim_names\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims._claim_names.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims._claim_sources\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims._claim_sources.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.aio\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.aio.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.appid\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.appid.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.appidacr\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.appidacr.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.aud\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.aud.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.e_exp\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.e_exp.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.exp\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.exp.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.microsoft.com/claims/authnclassreference\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.microsoft.com/claims/authnclassreference.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.microsoft.com/claims/authnmethodsreferences\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.microsoft.com/claims/authnmethodsreferences.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.microsoft.com/identity/claims/identityprovider\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.microsoft.com/identity/claims/identityprovider.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.microsoft.com/identity/claims/objectidentifier\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.microsoft.com/identity/claims/objectidentifier.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.microsoft.com/identity/claims/scope\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.microsoft.com/identity/claims/scope.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.microsoft.com/identity/claims/tenantid\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.microsoft.com/identity/claims/tenantid.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.iat\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.iat.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.in_corp\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.in_corp.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.ipaddr\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.ipaddr.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.iss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.iss.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.nbf\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.nbf.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.onprem_sid\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.onprem_sid.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.puid\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.puid.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.uti\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.uti.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.ver\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.ver.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"level\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"level.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"location\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"location.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"maximum\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metricName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"metricName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"minimum\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"operationName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"operationName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"resourceId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"resourceId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"resultDescription\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"resultDescription.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"resultSignature\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"resultSignature.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"resultType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"resultType.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Blocks_properties.DatabaseName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_Blocks_properties.DatabaseName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Blocks_properties.ElasticPoolName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_Blocks_properties.ElasticPoolName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Blocks_properties.blocked_process_filtered\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_Blocks_properties.blocked_process_filtered.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Blocks_properties.duration\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Blocks_properties.lock_mode\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_Blocks_properties.lock_mode.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Blocks_properties.resource_owner_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_Blocks_properties.resource_owner_type.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.DatabaseName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.DatabaseName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.ElasticPoolName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.ElasticPoolName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.delta_max_wait_time_ms\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.delta_signal_wait_time_ms\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.delta_wait_time_ms\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.delta_waiting_tasks_count\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.end_utc_date\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.start_utc_date\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.wait_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.wait_type.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Errors_properties.DatabaseName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_Errors_properties.DatabaseName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Errors_properties.ElasticPoolName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_Errors_properties.ElasticPoolName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Errors_properties.error_number\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Errors_properties.message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_Errors_properties.message.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Errors_properties.query_hash\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_Errors_properties.query_hash.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Errors_properties.query_plan_hash\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_Errors_properties.query_plan_hash.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Errors_properties.severity\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Errors_properties.state\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Errors_properties.user_defined\",\"type\":\"boolean\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.DatabaseName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.DatabaseName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.ElasticPoolName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.ElasticPoolName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.count_executions\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.cpu_time\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.dop\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.duration\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.execution_type\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.interval_end_time\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.interval_start_time\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.log_bytes_used\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.logical_io_reads\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.logical_io_writes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.max_cpu_time\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.max_dop\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.max_duration\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.max_log_bytes_used\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.max_logical_io_reads\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.max_logical_io_writes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.max_num_physical_io_reads\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.max_physical_io_reads\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.max_query_max_used_memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.max_rowcount\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.num_physical_io_reads\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.physical_io_reads\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.plan_id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_hash\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_hash.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_max_used_memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_plan_hash\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_plan_hash.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.rowcount\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.statement_sql_handle\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.statement_sql_handle.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.DatabaseName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.DatabaseName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.ElasticPoolName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.ElasticPoolName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.count_executions\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.exec_type\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.interval_end_time\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.interval_start_time\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.is_parameterizable\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.is_parameterizable.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.max_query_wait_time_ms\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.plan_id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.query_hash\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.query_hash.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.query_id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.query_param_type\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.query_plan_hash\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.query_plan_hash.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.statement_key_hash\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.statement_key_hash.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.statement_sql_handle\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.statement_sql_handle.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.statement_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.statement_type.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.total_query_wait_time_ms\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.wait_category\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.wait_category.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"tags.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"timeGrain\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"timeGrain.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"total\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]"
-}
\ No newline at end of file
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/search/3a4ec5b0-1381-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/search/3a4ec5b0-1381-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index e5764017b..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/search/3a4ec5b0-1381-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "title": "Service Health Search [Azure Monitor][Activity Log]",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "resultDescription",
-    "resultType"
-  ],
-  "sort": [
-    "@timestamp",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"azure-*\",\"highlightAll\":true,\"version\":true,\"query\":{\"language\":\"lucene\",\"query\":\"azure.group:activity_log AND azure.category:ServiceHealth\"},\"filter\":[{\"$state\":{\"store\":\"appState\"},\"exists\":{\"field\":\"resultType\"},\"meta\":{\"alias\":null,\"disabled\":false,\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"key\":\"resultType\",\"negate\":false,\"type\":\"exists\",\"value\":\"exists\"}}]}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/search/5a91a3e0-1829-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/search/5a91a3e0-1829-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index e146e44ed..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/search/5a91a3e0-1829-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "title": "Errors Viewer [Azure Monitor][SQL DB]",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "sql_diagnostics_Errors_properties.message",
-    "sql_diagnostics_Errors_properties.error_number"
-  ],
-  "sort": [
-    "@timestamp",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"azure-*\",\"highlightAll\":true,\"version\":true,\"query\":{\"language\":\"lucene\",\"query\":\"azure.group:sql_diagnostics AND azure.category:Errors\"},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/search/9a8ffc60-1155-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/search/9a8ffc60-1155-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 271a1ed91..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/search/9a8ffc60-1155-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "title": "SQL Diagnostics [Azure Monitor]",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "_source"
-  ],
-  "sort": [
-    "@timestamp",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"highlightAll\":true,\"version\":true,\"query\":{\"query\":\"azure.group: \\\"sql_diagnostics\\\"\",\"language\":\"lucene\"},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/search/f802b0b0-1211-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/search/f802b0b0-1211-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 17ff6dbcb..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/search/f802b0b0-1211-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "title": "Alerts Search [Azure Monitor][Activity Log]",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "resultDescription",
-    "resultType",
-    "azure.provider",
-    "azure.resource_name",
-    "azure.resource_group"
-  ],
-  "sort": [
-    "@timestamp",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"azure-*\",\"highlightAll\":true,\"version\":true,\"query\":{\"language\":\"lucene\",\"query\":\"azure.group:activity_log AND azure.category:Alert\"},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/009a25c0-07d9-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/009a25c0-07d9-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index a3c126a77..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/009a25c0-07d9-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Errors [Azure Monitor]",
-  "visState": "{\"title\":\"Errors [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(255,222,85,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"1\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"Errors\",\"split_filters\":[{\"filter\":\"data.category:Errors\",\"label\":\"Errors\",\"color\":\"rgba(255,57,36,1)\",\"id\":\"ead38060-07d8-11e8-ac3e-4b165adb3935\"}]},{\"id\":\"2c144750-0881-11e8-b3d6-f7127beb4493\",\"color\":\"rgba(223,73,152,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"2c144751-0881-11e8-b3d6-f7127beb4493\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.5\",\"stacked\":\"none\",\"split_filters\":[{\"color\":\"rgba(244,78,59,1)\",\"id\":\"41fc5760-0881-11e8-b3d6-f7127beb4493\"}],\"terms_field\":\"azure.resource_name.keyword\",\"terms_size\":\"3\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics AND category:Errors\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/053b9cc0-137e-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/053b9cc0-137e-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 38a6efff2..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/053b9cc0-137e-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Service Health Overview [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Service Health Overview [Azure Monitor][Activity Log]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(175,0,88,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":\"1\",\"point_size\":1,\"fill\":\"0.5\",\"stacked\":\"none\",\"terms_field\":\"resultType.keyword\",\"filter\":\"resultType:Active\",\"label\":\"Activated\"},{\"id\":\"8b100950-1214-11e8-bd17-77879a6f9d49\",\"color\":\"rgba(1,155,143,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"8b100951-1214-11e8-bd17-77879a6f9d49\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.6\",\"stacked\":\"none\",\"label\":\"Resolved\",\"filter\":\"resultType:Resolved\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:activity_log AND azure.category:ServiceHealth\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/0ac34a40-138c-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/0ac34a40-138c-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index e71714f38..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/0ac34a40-138c-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Top 3 Users [Azure Monitor][Activity Log]",
-  "visState": "{\n  \"title\": \"Top 3 Users [Azure Monitor][Activity Log]\",\n  \"type\": \"horizontal_bar\",\n  \"params\": {\n    \"type\": \"histogram\",\n    \"grid\": {\n      \"categoryLines\": false,\n      \"style\": {\n        \"color\": \"#eee\"\n      }\n    },\n    \"categoryAxes\": [\n      {\n        \"id\": \"CategoryAxis-1\",\n        \"type\": \"category\",\n        \"position\": \"left\",\n        \"show\": true,\n        \"style\": {},\n        \"scale\": {\n          \"type\": \"linear\"\n        },\n        \"labels\": {\n          \"show\": true,\n          \"rotate\": 0,\n          \"filter\": false,\n          \"truncate\": 200\n        },\n        \"title\": {}\n      }\n    ],\n    \"valueAxes\": [\n      {\n        \"id\": \"ValueAxis-1\",\n        \"name\": \"LeftAxis-1\",\n        \"type\": \"value\",\n        \"position\": \"bottom\",\n        \"show\": false,\n        \"style\": {},\n        \"scale\": {\n          \"type\": \"linear\",\n          \"mode\": \"normal\"\n        },\n        \"labels\": {\n          \"show\": true,\n          \"rotate\": 75,\n          \"filter\": true,\n          \"truncate\": 100\n        },\n        \"title\": {\n          \"text\": \"Events\"\n        }\n      }\n    ],\n    \"seriesParams\": [\n      {\n        \"show\": true,\n        \"type\": \"histogram\",\n        \"mode\": \"normal\",\n        \"data\": {\n          \"label\": \"Events\",\n          \"id\": \"1\"\n        },\n        \"valueAxis\": \"ValueAxis-1\",\n        \"drawLinesBetweenPoints\": true,\n        \"showCircles\": true\n      }\n    ],\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"times\": [],\n    \"addTimeMarker\": false\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Events\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 3,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Users\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{\n  \"vis\": {\n    \"legendOpen\": false,\n    \"colors\": {\n      \"Events\": \"#019B8F\"\n    }\n  }\n}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:activity_log\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/0d5dd2c0-1201-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/0d5dd2c0-1201-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index b24fa95ad..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/0d5dd2c0-1201-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Resource Deletions [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Resource Deletions [Azure Monitor][Activity Log]\",\"type\":\"pie\",\"params\":{\"type\":\"pie\",\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true,\"labels\":{\"show\":true,\"values\":true,\"last_level\":true,\"truncate\":100}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.resource_type.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":25,\"order\":\"desc\",\"orderBy\":\"1\"}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND identity.authorization.action:*delete\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/0f1d8b80-11fe-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/0f1d8b80-11fe-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index f0b2a257b..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/0f1d8b80-11fe-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Administrative Activity Overview [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Administrative Activity Overview [Azure Monitor][Activity Log]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(1,155,143,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.4\",\"stacked\":\"none\",\"label\":\"Actions\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:activity_log and azure.category:Administrative\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/13d987a0-1398-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/13d987a0-1398-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 2ce078e3f..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/13d987a0-1398-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Subscriptions Tag Cloud [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Subscriptions Tag Cloud [Azure Monitor][Activity Log]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":6,\"maxFontSize\":20},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.subscription.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\"}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/15b9f8d0-1216-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/15b9f8d0-1216-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 167de25bf..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/15b9f8d0-1216-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Alerts Count [Azure Monitor][Activity Log]",
-  "visState": "{\n  \"title\": \"Alerts Count [Azure Monitor][Activity Log]\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": false,\n    \"type\": \"metric\",\n    \"metric\": {\n      \"percentageMode\": false,\n      \"useRanges\": false,\n      \"colorSchema\": \"Green to Red\",\n      \"metricColorMode\": \"None\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 10000\n        }\n      ],\n      \"labels\": {\n        \"show\": true\n      },\n      \"invertColors\": false,\n      \"style\": {\n        \"bgFill\": \"#000\",\n        \"bgColor\": false,\n        \"labelColor\": false,\n        \"subText\": \"\",\n        \"fontSize\": 12\n      }\n    }\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Alerts\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"filters\",\n      \"schema\": \"group\",\n      \"params\": {\n        \"filters\": [\n          {\n            \"input\": {\n              \"query\": \"resultType:Activated\"\n            },\n            \"label\": \"Activated\"\n          },\n          {\n            \"input\": {\n              \"query\": \"resultType:Resolved\"\n            },\n            \"label\": \"Resolved\"\n          },\n          {\n            \"input\": {\n              \"query\": \"resultType:Succeeded\"\n            },\n            \"label\": \"Succeeded\"\n          }\n        ]\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:activity_log AND azure.category:Alert\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/176bd440-1226-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/176bd440-1226-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index d150483d4..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/176bd440-1226-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Testing",
-  "visState": "{\"title\":\"Testing\",\"type\":\"heatmap\",\"params\":{\"type\":\"heatmap\",\"addTooltip\":true,\"addLegend\":true,\"enableHover\":false,\"legendPosition\":\"right\",\"times\":[],\"colorsNumber\":4,\"colorSchema\":\"Greens\",\"setColorRange\":false,\"colorsRange\":[],\"invertColors\":false,\"percentageMode\":false,\"valueAxes\":[{\"show\":false,\"id\":\"ValueAxis-1\",\"type\":\"value\",\"scale\":{\"type\":\"linear\",\"defaultYExtents\":false},\"labels\":{\"show\":false,\"rotate\":0,\"color\":\"#555\"}}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.resource_type.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 23\":\"rgb(247,252,245)\",\"23 - 45\":\"rgb(199,233,192)\",\"45 - 68\":\"rgb(116,196,118)\",\"68 - 90\":\"rgb(35,139,69)\"}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/19c51b50-138b-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/19c51b50-138b-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 5c2bd424a..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/19c51b50-138b-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Activity by Resource Group [Azure Monitor][Activity Log]",
-  "visState": "{\n  \"title\": \"Activity by Resource Group [Azure Monitor][Activity Log]\",\n  \"type\": \"horizontal_bar\",\n  \"params\": {\n    \"type\": \"histogram\",\n    \"grid\": {\n      \"categoryLines\": false,\n      \"style\": {\n        \"color\": \"#eee\"\n      }\n    },\n    \"categoryAxes\": [\n      {\n        \"id\": \"CategoryAxis-1\",\n        \"type\": \"category\",\n        \"position\": \"left\",\n        \"show\": true,\n        \"style\": {},\n        \"scale\": {\n          \"type\": \"linear\"\n        },\n        \"labels\": {\n          \"show\": true,\n          \"rotate\": 0,\n          \"filter\": false,\n          \"truncate\": 200\n        },\n        \"title\": {}\n      }\n    ],\n    \"valueAxes\": [\n      {\n        \"id\": \"ValueAxis-1\",\n        \"name\": \"LeftAxis-1\",\n        \"type\": \"value\",\n        \"position\": \"bottom\",\n        \"show\": false,\n        \"style\": {},\n        \"scale\": {\n          \"type\": \"linear\",\n          \"mode\": \"normal\"\n        },\n        \"labels\": {\n          \"show\": true,\n          \"rotate\": 75,\n          \"filter\": true,\n          \"truncate\": 100\n        },\n        \"title\": {\n          \"text\": \"Count\"\n        }\n      }\n    ],\n    \"seriesParams\": [\n      {\n        \"show\": true,\n        \"type\": \"histogram\",\n        \"mode\": \"normal\",\n        \"data\": {\n          \"label\": \"Count\",\n          \"id\": \"1\"\n        },\n        \"valueAxis\": \"ValueAxis-1\",\n        \"drawLinesBetweenPoints\": true,\n        \"showCircles\": true\n      }\n    ],\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"times\": [],\n    \"addTimeMarker\": false\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {}\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"azure.resource_group.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Resource Group\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{\n  \"vis\": {\n    \"legendOpen\": false,\n    \"colors\": {\n      \"Count\": \"#019B8F\"\n    }\n  }\n}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:activity_log\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/1c509130-0853-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/1c509130-0853-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 0b74c6d18..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/1c509130-0853-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Storage Stats [Azure Monitor]",
-  "visState": "{\"title\":\"Storage Stats [Azure Monitor]\",\"type\":\"gauge\",\"params\":{\"type\":\"gauge\",\"addTooltip\":true,\"addLegend\":true,\"isDisplayWarning\":false,\"gauge\":{\"verticalSplit\":false,\"extendRange\":true,\"percentageMode\":true,\"gaugeType\":\"Arc\",\"gaugeStyle\":\"Full\",\"backStyle\":\"Full\",\"orientation\":\"vertical\",\"colorSchema\":\"Green to Red\",\"gaugeColorMode\":\"Labels\",\"colorsRange\":[{\"from\":0,\"to\":50},{\"from\":50,\"to\":75},{\"from\":75,\"to\":100}],\"invertColors\":false,\"labels\":{\"show\":true,\"color\":\"black\"},\"scale\":{\"show\":false,\"labels\":false,\"color\":\"#333\"},\"type\":\"meter\",\"style\":{\"bgWidth\":0.9,\"width\":0.9,\"mask\":false,\"bgMask\":false,\"maskBars\":50,\"bgFill\":\"#eee\",\"bgColor\":false,\"subText\":\"Storage Used\",\"fontSize\":60,\"labelColor\":true}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"avg\",\"schema\":\"metric\",\"params\":{\"field\":\"data.average\",\"customLabel\":\"AVG\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"max\",\"schema\":\"metric\",\"params\":{\"field\":\"data.average\",\"customLabel\":\"MAX\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 50\":\"rgb(0,104,55)\",\"50 - 75\":\"rgb(255,255,190)\",\"75 - 100\":\"rgb(165,0,38)\"}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"data.metricName:storage_percent\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/1c885a30-13b0-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/1c885a30-13b0-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index c08df944f..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/1c885a30-13b0-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Authorization Activity [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Authorization Activity [Azure Monitor][Activity Log]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(1,155,143,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"filter\":\"resultType:Success\",\"label\":\"Success\"},{\"id\":\"8a097400-13af-11e8-bdbe-d961aa20f52a\",\"color\":\"rgba(175,0,88,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"8a097401-13af-11e8-bdbe-d961aa20f52a\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"filter\":\"resultType:Failed\",\"label\":\"Failure\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:activity_log AND operationName:*LISTKEYS*\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/2060bce0-0840-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/2060bce0-0840-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index 6fbb02d09..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/2060bce0-0840-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Servers [Azure Monitor]",
-  "visState": "{\n  \"title\": \"Servers [Azure Monitor]\",\n  \"type\": \"table\",\n  \"params\": {\n    \"perPage\": 10,\n    \"showMeticsAtAllLevels\": false,\n    \"showPartialRows\": false,\n    \"showTotal\": false,\n    \"sort\": {\n      \"columnIndex\": null,\n      \"direction\": null\n    },\n    \"totalFunc\": \"sum\"\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"azure.resource_name.keyword\",\n        \"customLabel\": \"DBs\"\n      }\n    },\n    {\n      \"id\": \"4\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"azure.server.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Server\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"azure.resource_group.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Resource Group\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"azure.subscription.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Subscription\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{\n  \"vis\": {\n    \"params\": {\n      \"sort\": {\n        \"columnIndex\": null,\n        \"direction\": null\n      }\n    }\n  }\n}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"language\": \"lucene\",\n    \"query\": \"\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/20a043b0-13c1-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/20a043b0-13c1-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 54decf417..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/20a043b0-13c1-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Navigation SQL DB Queries [Azure Monitor]",
-  "visState": "{\"title\":\"Navigation SQL DB Queries [Azure Monitor]\",\"type\":\"markdown\",\"params\":{\"fontSize\":10,\"markdown\":\"### Azure Monitoring\\n\\n[Overview](#/dashboard/f110f010-11fc-11e8-8c94-a3d8d0cfd62b) | [Users](#/dashboard/06fa0b60-121a-11e8-8c94-a3d8d0cfd62b) | [Alerts](#/dashboard/16302750-1223-11e8-8c94-a3d8d0cfd62b) | [SQL DB](#/dashboard/91ba2090-07cb-11e8-adb5-e1a2d559cdf5) | [**SQL DB Queries**](#/dashboard/9adef750-08b0-11e8-93e5-299e2b5c963a)\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/23e31d20-1215-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/23e31d20-1215-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index e1cec4ac0..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/23e31d20-1215-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Alerts Overview [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Alerts Overview [Azure Monitor][Activity Log]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(175,0,88,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":\"3\",\"point_size\":1,\"fill\":\"0.5\",\"stacked\":\"none\",\"terms_field\":\"resultType.keyword\",\"filter\":\"resultType:Activated\",\"label\":\"Activated\"},{\"id\":\"8b100950-1214-11e8-bd17-77879a6f9d49\",\"color\":\"rgba(0,191,179,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"8b100951-1214-11e8-bd17-77879a6f9d49\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":\"1\",\"point_size\":1,\"fill\":\"0.6\",\"stacked\":\"none\",\"label\":\"Resolved or Succeeded\",\"filter\":\"resultType:Resolved OR resultType:Succeeded\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:activity_log AND azure.category:Alert\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/2404b5e0-0804-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/2404b5e0-0804-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index c9f251d8c..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/2404b5e0-0804-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Top Queries [Azure Monitor]",
-  "visState": "{\"title\":\"Top Queries [Azure Monitor]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"3\",\"enabled\":true,\"type\":\"max\",\"schema\":\"metric\",\"params\":{\"field\":\"sql_diagnostics_query_store_runtime_stats_properties.duration\",\"customLabel\":\"Max Duration (ms)\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"avg\",\"schema\":\"metric\",\"params\":{\"field\":\"sql_diagnostics_query_store_runtime_stats_properties.duration\",\"customLabel\":\"Average Duration (ms)\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Executions\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"sql_diagnostics_query_store_runtime_stats_properties.query_hash.keyword\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Query Hash\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"data.category:QueryStoreRuntimeStatistics\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/25eb1470-13bd-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/25eb1470-13bd-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index c206fdbbb..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/25eb1470-13bd-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Navigation Overview [Azure Monitor]",
-  "visState": "{\"title\":\"Navigation Overview [Azure Monitor]\",\"type\":\"markdown\",\"params\":{\"fontSize\":10,\"markdown\":\"### Azure Monitoring\\n\\n[**Overview**](#/dashboard/f110f010-11fc-11e8-8c94-a3d8d0cfd62b) | [Users](#/dashboard/06fa0b60-121a-11e8-8c94-a3d8d0cfd62b) | [Alerts](#/dashboard/16302750-1223-11e8-8c94-a3d8d0cfd62b) | [SQL DB](#/dashboard/91ba2090-07cb-11e8-adb5-e1a2d559cdf5) | [SQL DB Queries](#/dashboard/9adef750-08b0-11e8-93e5-299e2b5c963a)\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/27f9bd40-13ca-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/27f9bd40-13ca-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 73b173eee..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/27f9bd40-13ca-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Authorization Activity User [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Authorization Activity User [Azure Monitor][Activity Log]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(1,155,143,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"filter\":\"resultType:Success\",\"label\":\"Success\"},{\"id\":\"8a097400-13af-11e8-bdbe-d961aa20f52a\",\"color\":\"rgba(175,0,88,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"8a097401-13af-11e8-bdbe-d961aa20f52a\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"filter\":\"resultType:Fail\",\"label\":\"Failure\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:activity_log AND operationName:*LISTKEYS* AND azure.category:Administrative AND _exists_:identity.claims.name\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/2d11a9b0-1ac2-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/2d11a9b0-1ac2-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 777895899..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/2d11a9b0-1ac2-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Alerts Heatmap [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Alerts Heatmap [Azure Monitor][Activity Log]\",\"type\":\"heatmap\",\"params\":{\"type\":\"heatmap\",\"addTooltip\":true,\"addLegend\":true,\"enableHover\":false,\"legendPosition\":\"right\",\"times\":[],\"colorsNumber\":4,\"colorSchema\":\"Reds\",\"setColorRange\":false,\"colorsRange\":[{\"from\":0,\"to\":null}],\"invertColors\":false,\"percentageMode\":false,\"valueAxes\":[{\"show\":false,\"id\":\"ValueAxis-1\",\"type\":\"value\",\"scale\":{\"type\":\"linear\",\"defaultYExtents\":false},\"labels\":{\"show\":true,\"rotate\":0,\"color\":\"#555\"}}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.provider.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Provider\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"azure.resource_group.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Resource Group\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 12\":\"rgb(255,245,240)\",\"12 - 23\":\"rgb(252,187,161)\",\"23 - 34\":\"rgb(251,106,74)\",\"34 - 45\":\"rgb(203,24,29)\"},\"colors\":{\"34 - 45\":\"#BA43A9\",\"23 - 34\":\"#D683CE\",\"12 - 23\":\"#E5A8E2\",\"0 - 12\":\"#F9D9F9\"},\"legendOpen\":true}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"azure-*\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND azure.category:Alert\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/2e863080-1bef-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/2e863080-1bef-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index b307c6fc0..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/2e863080-1bef-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Resource Type Breakdown [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Resource Type Breakdown [Azure Monitor][Activity Log]\",\"type\":\"pie\",\"params\":{\"type\":\"pie\",\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":false,\"labels\":{\"show\":false,\"values\":true,\"last_level\":true,\"truncate\":100}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.resource_type.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\"}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"azure-*\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND _exists_:identity.claims.name\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/33072240-137f-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/33072240-137f-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 83aa35b65..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/33072240-137f-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Service Health Count [Azure Monitor][Activity Log]",
-  "visState": "{\n  \"title\": \"Service Health Count [Azure Monitor][Activity Log]\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": false,\n    \"type\": \"metric\",\n    \"metric\": {\n      \"percentageMode\": false,\n      \"useRanges\": false,\n      \"colorSchema\": \"Green to Red\",\n      \"metricColorMode\": \"None\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 10000\n        }\n      ],\n      \"labels\": {\n        \"show\": true\n      },\n      \"invertColors\": false,\n      \"style\": {\n        \"bgFill\": \"#000\",\n        \"bgColor\": false,\n        \"labelColor\": false,\n        \"subText\": \"\",\n        \"fontSize\": 12\n      }\n    }\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Incidents\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"filters\",\n      \"schema\": \"group\",\n      \"params\": {\n        \"filters\": [\n          {\n            \"input\": {\n              \"query\": \"resultType:Active\"\n            },\n            \"label\": \"Activated\"\n          },\n          {\n            \"input\": {\n              \"query\": \"resultType:Resolved\"\n            },\n            \"label\": \"Resolved\"\n          }\n        ]\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:activity_log AND azure.category:ServiceHealth\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/35de9400-1526-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/35de9400-1526-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 081256e6d..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/35de9400-1526-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Query Viewer [Azure Monitor][SQL DB]",
-  "visState": "{\n  \"title\": \"Query Viewer [Azure Monitor][SQL DB]\",\n  \"type\": \"table\",\n  \"params\": {\n    \"perPage\": 20,\n    \"showPartialRows\": false,\n    \"showMeticsAtAllLevels\": false,\n    \"sort\": {\n      \"columnIndex\": 5,\n      \"direction\": \"desc\"\n    },\n    \"showTotal\": false,\n    \"totalFunc\": \"sum\"\n  },\n  \"aggs\": [\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_id\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 1000,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Query ID\"\n      }\n    },\n    {\n      \"id\": \"5\",\n      \"enabled\": true,\n      \"type\": \"avg\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"sql_diagnostics_QueryStoreRuntimeStatistics_properties.duration\",\n        \"customLabel\": \"Average Duration (ms)\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_hash.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 1000,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Query Hash\"\n      }\n    },\n    {\n      \"id\": \"6\",\n      \"enabled\": true,\n      \"type\": \"max\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"sql_diagnostics_QueryStoreRuntimeStatistics_properties.duration\",\n        \"customLabel\": \"Max Duration (ms)\"\n      }\n    },\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Executions\"\n      }\n    },\n    {\n      \"id\": \"7\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"sql_diagnostics_QueryStoreRuntimeStatistics_properties.plan_id\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 1000,\n        \"order\": \"desc\",\n        \"orderBy\": \"5\",\n        \"customLabel\": \"Plan ID\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{\n  \"vis\": {\n    \"params\": {\n      \"sort\": {\n        \"columnIndex\": 5,\n        \"direction\": \"desc\"\n      }\n    }\n  }\n}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:sql_diagnostics AND azure.category:QueryStoreRuntimeStatistics AND _exists_:sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_id\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/381c5ad0-120c-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/381c5ad0-120c-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 91dbf39fe..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/381c5ad0-120c-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Alerts List [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Alerts List [Azure Monitor][Activity Log]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"resultDescription.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Alert\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"activity_log_Alert_properties.eventProperties.status.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Status\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"azure.resource_name.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":557,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Resource\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"azure.resource_group.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":true,\"missingBucketLabel\":\"Missing\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Resource Group\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND azure.category:Alert\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/3fb82260-1527-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/3fb82260-1527-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 549c4edad..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/3fb82260-1527-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Query Count [Azure Monitor][SQL DB]",
-  "visState": "{\n  \"title\": \"Query Count [Azure Monitor][SQL DB]\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": false,\n    \"type\": \"metric\",\n    \"metric\": {\n      \"percentageMode\": false,\n      \"useRanges\": false,\n      \"colorSchema\": \"Green to Red\",\n      \"metricColorMode\": \"None\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 10000\n        }\n      ],\n      \"labels\": {\n        \"show\": true\n      },\n      \"invertColors\": false,\n      \"style\": {\n        \"bgFill\": \"#000\",\n        \"bgColor\": false,\n        \"labelColor\": false,\n        \"subText\": \"\",\n        \"fontSize\": 20\n      }\n    }\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Queries Executed\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:sql_diagnostics AND azure.category:QueryStoreRuntimeStatistics AND _exists_:sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_id\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/418ce210-07e4-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/418ce210-07e4-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index a7821c539..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/418ce210-07e4-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Query Duration (ms) [Azure Monitor]",
-  "visState": "{\"title\":\"Query Duration (ms) [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"a5439470-07fd-11e8-92fe-81a50acfdb07\",\"color\":\"rgba(255,222,85,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"a5439471-07fd-11e8-92fe-81a50acfdb07\",\"type\":\"avg\",\"field\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.duration\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"bf5c2ed0-07fd-11e8-92fe-81a50acfdb07\",\"type\":\"moving_average\",\"field\":\"a5439471-07fd-11e8-92fe-81a50acfdb07\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"1\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"Query Duration\"},{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(0,191,179,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\",\"field\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.duration\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"4e9246e0-07e3-11e8-a756-61fb48b75e56\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.4\",\"stacked\":\"none\",\"terms_field\":\"azure.resource_name.keyword\",\"terms_order_by\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"terms_size\":\"3\",\"value_template\":\"{{value}}\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/4b9f1300-07ed-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/4b9f1300-07ed-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index 8a510c53e..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/4b9f1300-07ed-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Subscriptions [Azure Monitor]",
-  "visState": "{\"title\":\"Subscriptions [Azure Monitor]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"resource_name.keyword\",\"customLabel\":\"Databases\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"subscription.keyword\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Subscription\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/518cb600-0842-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/518cb600-0842-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index 37cf9e9c2..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/518cb600-0842-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Query Duration (ms) Single [Azure Monitor]",
-  "visState": "{\"title\":\"Query Duration (ms) Single [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"axis_formatter\":\"number\",\"axis_position\":\"left\",\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"series\":[{\"axis_position\":\"right\",\"chart_type\":\"bar\",\"color\":\"rgba(0,191,179,1)\",\"fill\":\"0.1\",\"formatter\":\"0a\",\"hide_in_legend\":1,\"id\":\"a5439470-07fd-11e8-92fe-81a50acfdb07\",\"label\":\"Query Duration\",\"line_width\":\"1\",\"metrics\":[{\"field\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.duration\",\"id\":\"a5439471-07fd-11e8-92fe-81a50acfdb07\",\"type\":\"avg\"},{\"field\":\"a5439471-07fd-11e8-92fe-81a50acfdb07\",\"id\":\"bf5c2ed0-07fd-11e8-92fe-81a50acfdb07\",\"minimize\":0,\"model\":\"simple\",\"settings\":\"\",\"type\":\"moving_average\",\"window\":\"\"}],\"point_size\":1,\"seperate_axis\":0,\"split_mode\":\"everything\",\"stacked\":\"none\",\"value_template\":\"{{value}} ms\"}],\"show_grid\":1,\"show_legend\":0,\"time_field\":\"@timestamp\",\"type\":\"timeseries\",\"filter\":\"azure.group:sql_diagnostics\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/5465b680-0809-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/5465b680-0809-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index de8a66937..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/5465b680-0809-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Read and Write I/O [Azure Monitor]",
-  "visState": "{\"title\":\"Read and Write I/O [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(0,191,179,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"sum\",\"field\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.logical_io_reads\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"dfe3d0d0-0808-11e8-b19d-a7e960a5b5ca\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"label\":\"Logical Reads\"},{\"id\":\"b9a2f290-0806-11e8-b19d-a7e960a5b5ca\",\"color\":\"rgba(255,222,85,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"b9a2f291-0806-11e8-b19d-a7e960a5b5ca\",\"type\":\"sum\",\"field\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.logical_io_writes\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"f0b3dcc0-0808-11e8-b19d-a7e960a5b5ca\",\"type\":\"moving_average\",\"field\":\"b9a2f291-0806-11e8-b19d-a7e960a5b5ca\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"label\":\"Logical Writes\"},{\"id\":\"53f923f0-0807-11e8-b19d-a7e960a5b5ca\",\"color\":\"rgba(223,73,152,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"53f923f1-0807-11e8-b19d-a7e960a5b5ca\",\"type\":\"sum\",\"field\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.physical_io_reads\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"03ccee50-0809-11e8-b19d-a7e960a5b5ca\",\"type\":\"moving_average\",\"field\":\"53f923f1-0807-11e8-b19d-a7e960a5b5ca\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"label\":\"Physical Reads\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/59510c50-0c9e-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/59510c50-0c9e-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 66df7cf62..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/59510c50-0c9e-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Database Info 1 [Azure Monitor]",
-  "visState": "{\n  \"title\": \"Database Info 1 [Azure Monitor]\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": false,\n    \"type\": \"metric\",\n    \"metric\": {\n      \"percentageMode\": false,\n      \"useRanges\": false,\n      \"colorSchema\": \"Green to Red\",\n      \"metricColorMode\": \"None\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 10000\n        }\n      ],\n      \"labels\": {\n        \"show\": true\n      },\n      \"invertColors\": false,\n      \"style\": {\n        \"bgFill\": \"#000\",\n        \"bgColor\": false,\n        \"labelColor\": false,\n        \"subText\": \"\",\n        \"fontSize\": 12\n      }\n    }\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"top_hits\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"azure.resource_name.keyword\",\n        \"aggregate\": \"concat\",\n        \"size\": 1,\n        \"sortField\": \"@timestamp\",\n        \"sortOrder\": \"desc\",\n        \"customLabel\": \"Database\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:sql_diagnostics\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/5c934df0-07db-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/5c934df0-07db-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index 9413e4b73..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/5c934df0-07db-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Errors [Azure Monitor]",
-  "visState": "{\n  \"title\": \"Errors [Azure Monitor]\",\n  \"type\": \"table\",\n  \"params\": {\n    \"perPage\": 10,\n    \"showMeticsAtAllLevels\": false,\n    \"showPartialRows\": false,\n    \"showTotal\": false,\n    \"sort\": {\n      \"columnIndex\": null,\n      \"direction\": null\n    },\n    \"totalFunc\": \"sum\"\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"top_hits\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"@timestamp\",\n        \"aggregate\": \"concat\",\n        \"size\": 1,\n        \"sortField\": \"@timestamp\",\n        \"sortOrder\": \"desc\",\n        \"customLabel\": \"Timestamp\"\n      }\n    },\n    {\n      \"id\": \"5\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"sql_diagnostics_Errors_properties.message.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 5,\n        \"order\": \"desc\",\n        \"orderBy\": \"_term\",\n        \"customLabel\": \"Error\"\n      }\n    },\n    {\n      \"id\": \"7\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"sql_diagnostics_Errors_properties.error_number\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 200,\n        \"order\": \"desc\",\n        \"orderBy\": \"_term\",\n        \"customLabel\": \"Error #\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"sql_diagnostics_Errors_properties.DatabaseName.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 5,\n        \"order\": \"desc\",\n        \"orderBy\": \"_term\",\n        \"customLabel\": \"Database\"\n      }\n    },\n    {\n      \"id\": \"6\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"sql_diagnostics_Errors_properties.ElasticPoolName.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 20,\n        \"order\": \"desc\",\n        \"orderBy\": \"_term\",\n        \"customLabel\": \"Elastic Pool\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{\n  \"vis\": {\n    \"params\": {\n      \"sort\": {\n        \"columnIndex\": null,\n        \"direction\": null\n      }\n    }\n  }\n}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"language\": \"lucene\",\n    \"query\": \"azure.group:sql_diagnostics AND azure.category:Errors\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/5dbd8b20-08a1-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/5dbd8b20-08a1-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 22374e8f1..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/5dbd8b20-08a1-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Errors Single [Azure Monitor]",
-  "visState": "{\"title\":\"Errors Single [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(223,73,152,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.3\",\"stacked\":\"none\",\"label\":\"Errors\",\"split_filters\":[{\"filter\":\"data.category:Errors\",\"label\":\"Errors\",\"color\":\"rgba(255,57,36,1)\",\"id\":\"ead38060-07d8-11e8-ac3e-4b165adb3935\"}]}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics AND azure.category:Errors\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/5e89e2b0-13a0-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/5e89e2b0-13a0-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 5701ce362..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/5e89e2b0-13a0-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Select Combo [Azure Monitor]",
-  "visState": "{\"title\":\"Select Combo [Azure Monitor]\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1517598395667\",\"indexPattern\":\"azure-*\",\"fieldName\":\"azure.subscription.keyword\",\"label\":\"Subscription\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":100,\"order\":\"desc\"}},{\"id\":\"1518843942322\",\"indexPattern\":\"azure-*\",\"fieldName\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name.keyword\",\"label\":\"User Email\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":100,\"order\":\"desc\"}}],\"updateFiltersOnChange\":true,\"useTimeFilter\":false},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/5ff32870-08a4-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/5ff32870-08a4-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index afccb38f3..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/5ff32870-08a4-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Storage Utilization Single [Azure Monitor]",
-  "visState": "{\"title\":\"Storage Utilization Single [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(0,191,179,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\",\"field\":\"average\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"ac54e1d0-0850-11e8-8a9e-77e15a1ba1ec\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"data.metricName:storage_percent\",\"label\":\"Database Storage %\",\"color\":\"#68BC00\",\"id\":\"b0e7fe80-0850-11e8-8a9e-77e15a1ba1ec\"}],\"label\":\"Storage\",\"value_template\":\"{{value}}%\",\"axis_max\":\"100\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"axis_max\":\"100\",\"filter\":\"azure.group:sql_diagnostics AND metricName:storage_percent\",\"axis_min\":\"0\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/647b8770-11ff-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/647b8770-11ff-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index b79a12364..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/647b8770-11ff-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Category Breakdown [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Category Breakdown [Azure Monitor][Activity Log]\",\"type\":\"pie\",\"params\":{\"type\":\"pie\",\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"bottom\",\"isDonut\":false,\"labels\":{\"show\":true,\"values\":true,\"last_level\":true,\"truncate\":100}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.category.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":25,\"order\":\"desc\",\"orderBy\":\"1\"}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/65e23580-1382-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/65e23580-1382-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index b43bd480b..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/65e23580-1382-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Service Health Metric [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Service Health Metric [Azure Monitor][Activity Log]\",\"type\":\"metric\",\"params\":{\"addTooltip\":true,\"addLegend\":false,\"type\":\"metric\",\"metric\":{\"percentageMode\":false,\"useRanges\":false,\"colorSchema\":\"Green to Red\",\"metricColorMode\":\"None\",\"colorsRange\":[{\"from\":0,\"to\":10000}],\"labels\":{\"show\":true},\"invertColors\":false,\"style\":{\"bgFill\":\"#000\",\"bgColor\":false,\"labelColor\":false,\"subText\":\"\",\"fontSize\":12}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Service Health\"}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND azure.category:ServiceHealth\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/68bd4dd0-0851-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/68bd4dd0-0851-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index b007f7b0f..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/68bd4dd0-0851-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Database Overview Info [Azure Monitor]",
-  "visState": "{\"title\":\"Database Overview Info [Azure Monitor]\",\"type\":\"metric\",\"params\":{\"addTooltip\":true,\"addLegend\":false,\"type\":\"metric\",\"metric\":{\"percentageMode\":false,\"useRanges\":false,\"colorSchema\":\"Green to Red\",\"metricColorMode\":\"None\",\"colorsRange\":[{\"from\":0,\"to\":10000}],\"labels\":{\"show\":true},\"invertColors\":false,\"style\":{\"bgFill\":\"#000\",\"bgColor\":false,\"labelColor\":false,\"subText\":\"\",\"fontSize\":18}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"top_hits\",\"schema\":\"metric\",\"params\":{\"field\":\"resource_name\",\"aggregate\":\"concat\",\"size\":1,\"sortField\":\"@timestamp\",\"sortOrder\":\"desc\",\"customLabel\":\"Database\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"top_hits\",\"schema\":\"metric\",\"params\":{\"field\":\"server.keyword\",\"aggregate\":\"concat\",\"size\":1,\"sortField\":\"@timestamp\",\"sortOrder\":\"desc\",\"customLabel\":\"Server\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"top_hits\",\"schema\":\"metric\",\"params\":{\"field\":\"resource_group.keyword\",\"aggregate\":\"concat\",\"size\":1,\"sortField\":\"@timestamp\",\"sortOrder\":\"desc\",\"customLabel\":\"Resource Group\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"top_hits\",\"schema\":\"metric\",\"params\":{\"field\":\"subscription.keyword\",\"aggregate\":\"concat\",\"size\":1,\"sortField\":\"@timestamp\",\"sortOrder\":\"desc\",\"customLabel\":\"Subscription\"}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"data.metricName:dtu_consumption_percent\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/68dd8530-083f-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/68dd8530-083f-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index 5fa22ba21..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/68dd8530-083f-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Navigation SQL DB [Azure Monitor]",
-  "visState": "{\"title\":\"Navigation SQL DB [Azure Monitor]\",\"type\":\"markdown\",\"params\":{\"fontSize\":10,\"markdown\":\"### Azure Monitoring\\n\\n[Overview](#/dashboard/f110f010-11fc-11e8-8c94-a3d8d0cfd62b) | [Users](#/dashboard/06fa0b60-121a-11e8-8c94-a3d8d0cfd62b) | [Alerts](#/dashboard/16302750-1223-11e8-8c94-a3d8d0cfd62b) | [**SQL DB**](#/dashboard/91ba2090-07cb-11e8-adb5-e1a2d559cdf5) | [SQL DB Queries](#/dashboard/9adef750-08b0-11e8-93e5-299e2b5c963a)\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/6bab50c0-0877-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/6bab50c0-0877-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 55d8ddd9c..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/6bab50c0-0877-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "DTU Utilization [Azure Monitor]",
-  "visState": "{\"title\":\"DTU Utilization [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(255,222,85,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\",\"field\":\"average\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"b75f7650-0876-11e8-8a9e-77e15a1ba1ec\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"1\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"data.metricName:dtu_consumption_percent\",\"label\":\"DTU %\",\"color\":\"#68BC00\",\"id\":\"bdf1be60-0876-11e8-8a9e-77e15a1ba1ec\"}],\"label\":\"DTU\",\"value_template\":\"{{value}}%\"},{\"id\":\"e92aa790-0876-11e8-8a9e-77e15a1ba1ec\",\"color\":\"rgba(1,155,143,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"e92aa791-0876-11e8-8a9e-77e15a1ba1ec\",\"type\":\"avg\",\"field\":\"average\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"1544c900-0877-11e8-8a9e-77e15a1ba1ec\",\"type\":\"moving_average\",\"field\":\"e92aa791-0876-11e8-8a9e-77e15a1ba1ec\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.4\",\"stacked\":\"none\",\"terms_field\":\"azure.resource_name.keyword\",\"terms_size\":\"3\",\"terms_direction\":\"desc\",\"value_template\":\"{{value}}%\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics AND metricName:dtu_consumption_percent\",\"axis_max\":\"100\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/6d71abf0-0842-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/6d71abf0-0842-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index 3b62e3024..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/6d71abf0-0842-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Query Wait Time (ms) Single [Azure Monitor]",
-  "visState": "{\"title\":\"Query Wait Time (ms) Single [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"07fbc160-07fd-11e8-92fe-81a50acfdb07\",\"color\":\"rgba(0,191,179,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"07fbc161-07fd-11e8-92fe-81a50acfdb07\",\"type\":\"avg\",\"field\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.total_query_wait_time_ms\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"197b9550-07fd-11e8-92fe-81a50acfdb07\",\"type\":\"moving_average\",\"field\":\"07fbc161-07fd-11e8-92fe-81a50acfdb07\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0a\",\"chart_type\":\"bar\",\"line_width\":\"1\",\"point_size\":\"1\",\"fill\":\"0.1\",\"stacked\":\"none\",\"label\":\"Query Wait Time\",\"value_template\":\"{{value}} ms\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/727c5be0-1201-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/727c5be0-1201-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index d9e84abb8..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/727c5be0-1201-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Resource Creations [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Resource Creations [Azure Monitor][Activity Log]\",\"type\":\"pie\",\"params\":{\"type\":\"pie\",\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true,\"labels\":{\"show\":true,\"values\":true,\"last_level\":true,\"truncate\":100}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.resource_type.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":25,\"order\":\"desc\",\"orderBy\":\"1\"}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND identity.authorization.action:*write\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/72ab38b0-0c9e-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/72ab38b0-0c9e-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 2a0151044..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/72ab38b0-0c9e-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Database Info 3 [Azure Monitor]",
-  "visState": "{\n  \"title\": \"Database Info 3 [Azure Monitor]\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": false,\n    \"type\": \"metric\",\n    \"metric\": {\n      \"percentageMode\": false,\n      \"useRanges\": false,\n      \"colorSchema\": \"Green to Red\",\n      \"metricColorMode\": \"None\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 10000\n        }\n      ],\n      \"labels\": {\n        \"show\": true\n      },\n      \"invertColors\": false,\n      \"style\": {\n        \"bgFill\": \"#000\",\n        \"bgColor\": false,\n        \"labelColor\": false,\n        \"subText\": \"\",\n        \"fontSize\": 12\n      }\n    }\n  },\n  \"aggs\": [\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"top_hits\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"azure.resource_group.keyword\",\n        \"aggregate\": \"concat\",\n        \"size\": 1,\n        \"sortField\": \"@timestamp\",\n        \"sortOrder\": \"desc\",\n        \"customLabel\": \"Resource Group\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:sql_diagnostics\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/74680350-1382-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/74680350-1382-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 0d05c4a07..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/74680350-1382-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Alerts Metric [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Alerts Metric [Azure Monitor][Activity Log]\",\"type\":\"metric\",\"params\":{\"addTooltip\":true,\"addLegend\":false,\"type\":\"metric\",\"metric\":{\"percentageMode\":false,\"useRanges\":false,\"colorSchema\":\"Green to Red\",\"metricColorMode\":\"None\",\"colorsRange\":[{\"from\":0,\"to\":10000}],\"labels\":{\"show\":true},\"invertColors\":false,\"style\":{\"bgFill\":\"#000\",\"bgColor\":false,\"labelColor\":false,\"subText\":\"\",\"fontSize\":12}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Alerts\"}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND azure.category:Alert\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/79085650-0985-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/79085650-0985-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 630900bc7..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/79085650-0985-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Select Resource Group [Azure Monitor]",
-  "visState": "{\"title\":\"Select Resource Group [Azure Monitor]\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1517598395667\",\"indexPattern\":\"d6962b40-06f5-11e8-adb5-e1a2d559cdf5\",\"fieldName\":\"resource_group.keyword\",\"label\":\"Resource Group\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":100,\"order\":\"desc\"}}],\"updateFiltersOnChange\":true},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/7fe767b0-11fd-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/7fe767b0-11fd-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index ff6aa714f..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/7fe767b0-11fd-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Geo Activity [Azure Monitor]",
-  "visState": "{\"title\":\"Geo Activity [Azure Monitor]\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Scaled Circle Markers\",\"isDesaturated\":true,\"addTooltip\":true,\"heatClusterSize\":1.5,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[0,0],\"wms\":{\"enabled\":false,\"options\":{\"format\":\"image/png\",\"transparent\":true},\"baseLayersAreLoaded\":{},\"tmsLayers\":[{\"id\":\"road_map\",\"url\":\"https://tiles.maps.elastic.co/v2/default/{z}/{x}/{y}.png?elastic_tile_service_tos=agree&my_app_name=kibana&my_app_version=6.2.1&license=c16ab9db-b270-4466-9535-a15cb66a4df5\",\"minZoom\":0,\"maxZoom\":18,\"attribution\":\"<p>&#169; <a href=\\\"http://www.openstreetmap.org/copyright\\\">OpenStreetMap</a> contributors | <a href=\\\"https://www.elastic.co/elastic-maps-service\\\">Elastic Maps Service</a></p>&#10;\",\"subdomains\":[]}],\"selectedTmsLayer\":{\"id\":\"road_map\",\"url\":\"https://tiles.maps.elastic.co/v2/default/{z}/{x}/{y}.png?elastic_tile_service_tos=agree&my_app_name=kibana&my_app_version=6.2.1&license=c16ab9db-b270-4466-9535-a15cb66a4df5\",\"minZoom\":0,\"maxZoom\":18,\"attribution\":\"<p>&#169; <a href=\\\"http://www.openstreetmap.org/copyright\\\">OpenStreetMap</a> contributors | <a href=\\\"https://www.elastic.co/elastic-maps-service\\\">Elastic Maps Service</a></p>&#10;\",\"subdomains\":[]}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.location\",\"autoPrecision\":true,\"isFilteredByCollar\":true,\"useGeocentroid\":true,\"precision\":2}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"azure-*\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND _exists_:identity.claims.name\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/820e7fb0-11f8-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/820e7fb0-11f8-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 1710b2dcd..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/820e7fb0-11f8-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Blockings Single [Azure Monitor]",
-  "visState": "{\"title\":\"Blockings Single [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(233,228,16,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\",\"field\":\"sql_diagnostics_query_store_runtime_stats_properties.logical_io_reads\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"dfe3d0d0-0808-11e8-b19d-a7e960a5b5ca\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"Blockings\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"logstash-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics AND data.category:Blocks\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/849be630-0985-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/849be630-0985-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 7fe90e777..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/849be630-0985-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Select Server [Azure Monitor]",
-  "visState": "{\"title\":\"Select Server [Azure Monitor]\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1517598395667\",\"indexPattern\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"fieldName\":\"azure.server.keyword\",\"label\":\"Server\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":100,\"order\":\"desc\"}}],\"updateFiltersOnChange\":true,\"useTimeFilter\":false},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/85cee3b0-07df-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/85cee3b0-07df-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index b3672233d..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/85cee3b0-07df-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Database Wait Time (ms) [Azure Monitor]",
-  "visState": "{\"title\":\"Database Wait Time (ms) [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"0dc3f820-07fc-11e8-92fe-81a50acfdb07\",\"color\":\"rgba(255,222,85,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"0dc3f821-07fc-11e8-92fe-81a50acfdb07\",\"type\":\"avg\",\"field\":\"sql_diagnostics_DatabaseWaitStatistics_properties.delta_wait_time_ms\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"2fecef10-07fc-11e8-92fe-81a50acfdb07\",\"type\":\"moving_average\",\"field\":\"0dc3f821-07fc-11e8-92fe-81a50acfdb07\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"1\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"DB Wait\",\"value_template\":\"{{value}} ms\"},{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(1,155,143,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\",\"field\":\"sql_diagnostics_DatabaseWaitStatistics_properties.delta_wait_time_ms\"},{\"settings\":\"\",\"minimize\":null,\"window\":\"\",\"model\":\"simple\",\"id\":\"2c2449f0-07de-11e8-ac3e-4b165adb3935\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"bar\",\"line_width\":\"1\",\"point_size\":1,\"fill\":\"0.4\",\"stacked\":\"none\",\"split_filters\":[{\"color\":\"#68BC00\",\"id\":\"7383c5f0-07de-11e8-ac3e-4b165adb3935\"}],\"terms_field\":\"azure.resource_name.keyword\",\"terms_order_by\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"label\":\"\",\"split_color_mode\":\"gradient\",\"terms_size\":\"3\",\"hide_in_legend\":0,\"value_template\":\"{{value}} ms\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/880a53f0-080f-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/880a53f0-080f-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index cad198ece..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/880a53f0-080f-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Databases [Azure Monitor]",
-  "visState": "{\"title\":\"Databases [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"axis_formatter\":\"number\",\"axis_max\":\"100\",\"axis_position\":\"left\",\"bar_color_rules\":[{\"id\":\"8f26aa90-0872-11e8-8a9e-77e15a1ba1ec\"}],\"drilldown_url\":\"#dashboard/aaf909b0-0800-11e8-adb5-e1a2d559cdf5?_a=(description:'',filters:!(('$state':(store:appState),meta:(alias:!n,controlledBy:'1517598395667',disabled:!f,index:'73e18ac0-104c-11e8-8c94-a3d8d0cfd62b',key:azure.db_unique_id.keyword,negate:!f,params:(query:'{{key}}',type:phrase),type:phrase,value:'{{key}}'),query:(match:(azure.db_unique_id.keyword:(query:'{{key}}',type:phrase))))))\",\"filter\":\"azure.group:sql_diagnostics\",\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"pivot_id\":\"azure.db_unique_id.keyword\",\"pivot_label\":\"Database\",\"pivot_rows\":\"20\",\"series\":[{\"aggregate_by\":null,\"aggregate_function\":null,\"axis_position\":\"right\",\"chart_type\":\"line\",\"color\":\"#68BC00\",\"color_rules\":[{\"id\":\"dfdd33f0-0872-11e8-8a9e-77e15a1ba1ec\",\"opperator\":\"gte\",\"text\":\"rgba(244,78,59,1)\",\"value\":75}],\"fill\":\"0.8\",\"filter\":\"metricName:dtu_consumption_percent\",\"formatter\":null,\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"label\":\"DTU\",\"line_width\":\"3\",\"metrics\":[{\"field\":\"average\",\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\"}],\"offset_time\":\"\",\"point_size\":1,\"seperate_axis\":0,\"split_filters\":[{\"color\":\"#68BC00\",\"filter\":\"data.metricName:dtu_consumption_percent\",\"id\":\"5cc3d630-080f-11e8-b19d-a7e960a5b5ca\",\"label\":\"DTU %\"}],\"split_mode\":\"filters\",\"stacked\":\"none\",\"trend_arrows\":0,\"value_template\":\"{{value}}%\"},{\"axis_position\":\"right\",\"chart_type\":\"line\",\"color\":\"#68BC00\",\"color_rules\":[{\"id\":\"632bf0a0-0875-11e8-8a9e-77e15a1ba1ec\"}],\"fill\":0.5,\"filter\":\"azure.category:Errors\",\"formatter\":\"number\",\"id\":\"4b4159d0-0875-11e8-8a9e-77e15a1ba1ec\",\"label\":\"Errors\",\"line_width\":1,\"metrics\":[{\"id\":\"4b4159d1-0875-11e8-8a9e-77e15a1ba1ec\",\"type\":\"count\"}],\"point_size\":1,\"seperate_axis\":0,\"split_mode\":\"everything\",\"stacked\":\"none\"}],\"show_grid\":1,\"show_legend\":1,\"time_field\":\"@timestamp\",\"type\":\"table\"},\"aggs\":[]}",
-  "uiStateJSON": "{\"table\":{\"sort\":{\"column\":\"4b4159d0-0875-11e8-8a9e-77e15a1ba1ec\",\"order\":\"desc\"}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/88dcf980-084c-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/88dcf980-084c-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index edbff7648..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/88dcf980-084c-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Select Database [Azure Monitor]",
-  "visState": "{\"title\":\"Select Database [Azure Monitor]\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1517598395667\",\"indexPattern\":\"azure-*\",\"fieldName\":\"azure.db_unique_id.keyword\",\"label\":\"Database\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":false,\"size\":20,\"order\":\"desc\"}}],\"updateFiltersOnChange\":true,\"useTimeFilter\":false},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/890f3af0-093a-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/890f3af0-093a-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 361aa5017..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/890f3af0-093a-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Select Subscription [Azure Monitor]",
-  "visState": "{\"title\":\"Select Subscription [Azure Monitor]\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1517598395667\",\"indexPattern\":\"azure-*\",\"fieldName\":\"azure.subscription.keyword\",\"label\":\"Select Subscription\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":100,\"order\":\"desc\"}}],\"updateFiltersOnChange\":true,\"useTimeFilter\":false},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/8e2e0480-13bc-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/8e2e0480-13bc-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index c283a2cdc..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/8e2e0480-13bc-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Navigation Alerts [Azure Monitor]",
-  "visState": "{\"title\":\"Navigation Alerts [Azure Monitor]\",\"type\":\"markdown\",\"params\":{\"fontSize\":10,\"markdown\":\"### Azure Monitoring\\n\\n[Overview](#/dashboard/f110f010-11fc-11e8-8c94-a3d8d0cfd62b) | [Users](#/dashboard/06fa0b60-121a-11e8-8c94-a3d8d0cfd62b) | [**Alerts**](#/dashboard/16302750-1223-11e8-8c94-a3d8d0cfd62b) | [SQL DB](#/dashboard/91ba2090-07cb-11e8-adb5-e1a2d559cdf5) | [SQL DB Queries](#/dashboard/9adef750-08b0-11e8-93e5-299e2b5c963a)\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/90045780-1382-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/90045780-1382-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index cbb859488..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/90045780-1382-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Administrative Metric [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Administrative Metric [Azure Monitor][Activity Log]\",\"type\":\"metric\",\"params\":{\"addTooltip\":true,\"addLegend\":false,\"type\":\"metric\",\"metric\":{\"percentageMode\":false,\"useRanges\":false,\"colorSchema\":\"Green to Red\",\"metricColorMode\":\"None\",\"colorsRange\":[{\"from\":0,\"to\":10000}],\"labels\":{\"show\":true},\"invertColors\":false,\"style\":{\"bgFill\":\"#000\",\"bgColor\":false,\"labelColor\":false,\"subText\":\"\",\"fontSize\":12}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Administrative\"}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND azure.category:Administrative\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/90ed5940-0850-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/90ed5940-0850-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 51bf4679b..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/90ed5940-0850-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Database Size [Azure Monitor]",
-  "visState": "{\"title\":\"Database Size [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(0,191,179,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\",\"field\":\"average\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"bytes\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.3\",\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"data.metricName:storage\",\"label\":\"Storage Used\",\"color\":\"#68BC00\",\"id\":\"5b487040-0850-11e8-8a9e-77e15a1ba1ec\"}],\"label\":\"GB\",\"hide_in_legend\":1}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics AND metricName:storage\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/934c6780-138b-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/934c6780-138b-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 2cf6ddee4..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/934c6780-138b-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Resource Creations and Deletions 2 [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Resource Creations and Deletions 2 [Azure Monitor][Activity Log]\",\"type\":\"horizontal_bar\",\"params\":{\"type\":\"histogram\",\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":200},\"title\":{}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"bottom\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":75,\"filter\":true,\"truncate\":100},\"title\":{\"text\":\"Count\"}}],\"seriesParams\":[{\"show\":true,\"type\":\"histogram\",\"mode\":\"stacked\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"valueAxis\":\"ValueAxis-1\",\"drawLinesBetweenPoints\":true,\"showCircles\":true}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.resource_type.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Resource Type\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"filters\",\"schema\":\"group\",\"params\":{\"filters\":[{\"input\":{\"query\":\"identity.authorization.action:*write\"},\"label\":\"Creations\"},{\"input\":{\"query\":\"identity.authorization.action:*delete\"},\"label\":\"Deletions\"}]}}]}",
-  "uiStateJSON": "{\"vis\":{\"legendOpen\":false}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/94e47b60-1385-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/94e47b60-1385-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index e4507d79f..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/94e47b60-1385-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Alerts Overview 2 [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Alerts Overview 2 [Azure Monitor][Activity Log]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(223,73,152,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.5\",\"stacked\":\"none\",\"terms_field\":\"resultType.keyword\",\"filter\":\"resultType:Activated\",\"label\":\"Activated\"},{\"id\":\"8b100950-1214-11e8-bd17-77879a6f9d49\",\"color\":\"rgba(0,191,179,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"8b100951-1214-11e8-bd17-77879a6f9d49\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.6\",\"stacked\":\"none\",\"label\":\"Resolved or Succeeded\",\"filter\":\"resultType:Resolved OR resultType:Succeeded\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:activity_log AND azure.category:Alert\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/983722f0-087b-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/983722f0-087b-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 2c4fcde9c..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/983722f0-087b-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Top Queries [Azure Monitor]",
-  "visState": "{\"title\":\"Top Queries [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"table\",\"series\":[{\"id\":\"556ca980-08a9-11e8-b3d6-f7127beb4493\",\"color\":\"#68BC00\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"556ca981-08a9-11e8-b3d6-f7127beb4493\",\"type\":\"max\",\"field\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_id\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"color_rules\":[{\"id\":\"57810a90-08a9-11e8-b3d6-f7127beb4493\"}],\"label\":\"Query ID\"},{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"#68BC00\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\",\"field\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.duration\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"color_rules\":[{\"id\":\"6c7a15a0-087b-11e8-b3d6-f7127beb4493\"}],\"label\":\"Average Duration (ms)\"},{\"id\":\"374a3590-087b-11e8-b3d6-f7127beb4493\",\"color\":\"#68BC00\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"374a3591-087b-11e8-b3d6-f7127beb4493\",\"type\":\"max\",\"field\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.duration\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Max Duration (ms)\",\"color_rules\":[{\"id\":\"8a84f8d0-087b-11e8-b3d6-f7127beb4493\"}]},{\"id\":\"f6966090-087b-11e8-b3d6-f7127beb4493\",\"color\":\"#68BC00\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"f6966091-087b-11e8-b3d6-f7127beb4493\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"a\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Executions\",\"color_rules\":[{\"id\":\"34c7b3f0-087c-11e8-b3d6-f7127beb4493\"}]}],\"time_field\":\"@timestamp\",\"index_pattern\":\"logstash-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"show_grid\":1,\"bar_color_rules\":[{\"id\":\"f31ebb70-087a-11e8-b3d6-f7127beb4493\"}],\"pivot_id\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_hash.keyword\",\"pivot_label\":\"Query Hash\",\"pivot_rows\":\"20\",\"filter\":\"azure.group:sql_diagnostics AND azure.category:QueryStoreRuntimeStatistics AND NOT sql_diagnostics_query_store_runtime_stats_properties.query_id:0\"},\"aggs\":[]}",
-  "uiStateJSON": "{\"table\":{\"sort\":{\"column\":\"556ca980-08a9-11e8-b3d6-f7127beb4493\",\"order\":\"asc\"}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/9bb5e3e0-0843-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/9bb5e3e0-0843-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index a0e0847fa..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/9bb5e3e0-0843-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Database Wait Time (ms) Single [Azure Monitor]",
-  "visState": "{\"title\":\"Database Wait Time (ms) Single [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"0dc3f820-07fc-11e8-92fe-81a50acfdb07\",\"color\":\"rgba(0,191,179,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"0dc3f821-07fc-11e8-92fe-81a50acfdb07\",\"type\":\"avg\",\"field\":\"sql_diagnostics_DatabaseWaitStatistics_properties.delta_wait_time_ms\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"2fecef10-07fc-11e8-92fe-81a50acfdb07\",\"type\":\"moving_average\",\"field\":\"0dc3f821-07fc-11e8-92fe-81a50acfdb07\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0a\",\"chart_type\":\"bar\",\"line_width\":\"1\",\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"label\":\"Database Wait Time (ms)\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/a0340090-1389-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/a0340090-1389-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 0c802415b..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/a0340090-1389-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Users List [Azure Monitor][Activity Log]",
-  "visState": "{\n  \"title\": \"Users List [Azure Monitor][Activity Log]\",\n  \"type\": \"table\",\n  \"params\": {\n    \"perPage\": 10,\n    \"showPartialRows\": false,\n    \"showMeticsAtAllLevels\": false,\n    \"sort\": {\n      \"columnIndex\": null,\n      \"direction\": null\n    },\n    \"showTotal\": false,\n    \"totalFunc\": \"sum\"\n  },\n  \"aggs\": [\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 20,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Email\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 5,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"First Name\"\n      }\n    },\n    {\n      \"id\": \"4\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 5,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Last Name\"\n      }\n    },\n    {\n      \"id\": \"5\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"callerIpAddress.keyword\",\n        \"customLabel\": \"IPs\"\n      }\n    },\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Actions\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{\n  \"vis\": {\n    \"params\": {\n      \"sort\": {\n        \"columnIndex\": null,\n        \"direction\": null\n      }\n    }\n  }\n}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:activity_log\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/a71ed100-07e5-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/a71ed100-07e5-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index 45bee3a0e..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/a71ed100-07e5-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Query Wait Time (ms) [Azure Monitor]",
-  "visState": "{\"title\":\"Query Wait Time (ms) [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"07fbc160-07fd-11e8-92fe-81a50acfdb07\",\"color\":\"rgba(255,222,85,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"07fbc161-07fd-11e8-92fe-81a50acfdb07\",\"type\":\"avg\",\"field\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.total_query_wait_time_ms\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"197b9550-07fd-11e8-92fe-81a50acfdb07\",\"type\":\"moving_average\",\"field\":\"07fbc161-07fd-11e8-92fe-81a50acfdb07\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"1\",\"point_size\":\"1\",\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"Query Wait\"},{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(0,191,179,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\",\"field\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.total_query_wait_time_ms\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"833d0680-07e5-11e8-a756-61fb48b75e56\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.4\",\"stacked\":\"none\",\"terms_field\":\"azure.resource_name.keyword\",\"terms_size\":\"3\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/aa01fff0-13bb-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/aa01fff0-13bb-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 2add45a51..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/aa01fff0-13bb-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Navigation Users [Azure Monitor]",
-  "visState": "{\"title\":\"Navigation Users [Azure Monitor]\",\"type\":\"markdown\",\"params\":{\"fontSize\":10,\"markdown\":\"### Azure Monitoring\\n\\n[Overview](#/dashboard/f110f010-11fc-11e8-8c94-a3d8d0cfd62b) | [**Users**](#/dashboard/06fa0b60-121a-11e8-8c94-a3d8d0cfd62b) | [Alerts](#/dashboard/16302750-1223-11e8-8c94-a3d8d0cfd62b) | [SQL DB](#/dashboard/91ba2090-07cb-11e8-adb5-e1a2d559cdf5) | [SQL DB Queries](#/dashboard/9adef750-08b0-11e8-93e5-299e2b5c963a)\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/ac81f600-11f8-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/ac81f600-11f8-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index a1a20c3c6..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/ac81f600-11f8-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Timeouts Single [Azure Monitor]",
-  "visState": "{\"title\":\"Timeouts Single [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(233,228,16,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\",\"field\":\"sql_diagnostics_query_store_runtime_stats_properties.logical_io_reads\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"dfe3d0d0-0808-11e8-b19d-a7e960a5b5ca\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"Timeouts\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"logstash-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics AND data.category:Timeouts\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/af0fee20-07d7-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/af0fee20-07d7-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index bf9bb614c..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/af0fee20-07d7-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Databases++ [Azure Monitor]",
-  "visState": "{\"title\":\"Databases++ [Azure Monitor]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showMeticsAtAllLevels\":false,\"showPartialRows\":false,\"showTotal\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"avg\",\"schema\":\"metric\",\"params\":{\"field\":\"data.average\",\"customLabel\":\"Average DTU %\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"resource_name.keyword\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"_term\",\"customLabel\":\"Database\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"server.keyword\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"_term\",\"customLabel\":\"Server\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"resource_group.keyword\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"_term\",\"customLabel\":\"Resource Group\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"max\",\"schema\":\"metric\",\"params\":{\"field\":\"data.average\",\"customLabel\":\"Max DTU %\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"data.metricName:dtu_consumption_percent\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/b07ea8a0-1204-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/b07ea8a0-1204-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 6c3c4bae4..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/b07ea8a0-1204-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Category Breakdown [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Category Breakdown [Azure Monitor][Activity Log]\",\"type\":\"horizontal_bar\",\"params\":{\"type\":\"histogram\",\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"},\"valueAxis\":\"ValueAxis-1\"},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":200},\"title\":{}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"bottom\",\"show\":false,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":false,\"rotate\":75,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"Events\"}}],\"seriesParams\":[{\"show\":true,\"type\":\"histogram\",\"mode\":\"normal\",\"data\":{\"label\":\"Events\",\"id\":\"1\"},\"valueAxis\":\"ValueAxis-1\",\"drawLinesBetweenPoints\":true,\"showCircles\":true}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false,\"orderBucketsBySum\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Events\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.category.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Category\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"legendOpen\":false}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/b98ec5a0-0706-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/b98ec5a0-0706-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index 7c855e9b9..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/b98ec5a0-0706-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "SQL DB Overview [Azure Monitor]",
-  "visState": "{\"title\":\"SQL DB Overview [Azure Monitor]\",\"type\":\"metric\",\"params\":{\"addTooltip\":true,\"addLegend\":false,\"type\":\"metric\",\"metric\":{\"percentageMode\":false,\"colorSchema\":\"Green to Red\",\"useRange\":false,\"colorsRange\":[{\"from\":0,\"to\":100}],\"invertColors\":false,\"labels\":{\"show\":true,\"color\":\"black\"},\"style\":{\"fontSize\":15,\"bgColor\":false,\"labelColor\":false,\"subText\":\"\",\"bgFill\":\"#d3d3d3\"},\"metricColorMode\":\"None\"}},\"aggs\":[{\"id\":\"3\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"azure.resource_name.keyword\",\"customLabel\":\"Databases\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"azure.server.keyword\",\"customLabel\":\"Servers\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"azure.resource_group.keyword\",\"customLabel\":\"Resource Groups\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"azure.subscription.keyword\",\"customLabel\":\"Subscriptions\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"},\"colors\":{\"0 - 100\":\"#64B0C8\"}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"azure-*\",\"filter\":[],\"query\":{\"query\":\"azure.group:\\\"sql_diagnostics\\\"\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/be1f58b0-1beb-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/be1f58b0-1beb-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 0b578552a..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/be1f58b0-1beb-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Geo Count [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Geo Count [Azure Monitor][Activity Log]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"geoip.country_name.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"azure-*\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND _exists_:identity.claims.name\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/ccabf560-1208-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/ccabf560-1208-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index ac18fcc5f..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/ccabf560-1208-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Activity Log Overview [Azure Monitor][Activity Log]",
-  "visState": "{\n  \"title\": \"Activity Log Overview [Azure Monitor][Activity Log]\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": false,\n    \"type\": \"metric\",\n    \"metric\": {\n      \"percentageMode\": false,\n      \"colorSchema\": \"Green to Red\",\n      \"useRange\": false,\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 100\n        }\n      ],\n      \"invertColors\": false,\n      \"labels\": {\n        \"show\": true,\n        \"color\": \"black\"\n      },\n      \"style\": {\n        \"fontSize\": 18,\n        \"bgColor\": false,\n        \"labelColor\": false,\n        \"subText\": \"\",\n        \"bgFill\": \"#d3d3d3\"\n      },\n      \"metricColorMode\": \"None\"\n    }\n  },\n  \"aggs\": [\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"azure.resource_name.keyword\",\n        \"customLabel\": \"Resources\"\n      }\n    },\n    {\n      \"id\": \"5\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name.keyword\",\n        \"customLabel\": \"Users\"\n      }\n    },\n    {\n      \"id\": \"4\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"azure.resource_group.keyword\",\n        \"customLabel\": \"Resource Groups\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"azure.subscription.keyword\",\n        \"customLabel\": \"Subscriptions\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{\n  \"vis\": {\n    \"defaultColors\": {\n      \"0 - 100\": \"rgb(0,104,55)\"\n    },\n    \"colors\": {\n      \"0 - 100\": \"#64B0C8\"\n    }\n  }\n}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:activity_log\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/cf876780-0c98-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/cf876780-0c98-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index db4371f87..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/cf876780-0c98-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Timeouts [Azure Monitor]",
-  "visState": "{\"title\":\"Timeouts [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(233,228,16,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\",\"field\":\"sql_diagnostics_query_store_runtime_stats_properties.logical_io_reads\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"dfe3d0d0-0808-11e8-b19d-a7e960a5b5ca\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"Timeouts\"},{\"id\":\"b9a2f290-0806-11e8-b19d-a7e960a5b5ca\",\"color\":\"rgba(104,188,0,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"b9a2f291-0806-11e8-b19d-a7e960a5b5ca\",\"type\":\"count\",\"field\":\"sql_diagnostics_query_store_runtime_stats_properties.logical_io_writes\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"f0b3dcc0-0808-11e8-b19d-a7e960a5b5ca\",\"type\":\"moving_average\",\"field\":\"b9a2f291-0806-11e8-b19d-a7e960a5b5ca\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"label\":\"\",\"terms_field\":\"resource_name.keyword\"}],\"time_field\":\"data.time\",\"index_pattern\":\"*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"data.category:Timeouts\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/d02c64c0-08a0-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/d02c64c0-08a0-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 69e900e68..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/d02c64c0-08a0-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "DTU Utilization Single [Azure Monitor]",
-  "visState": "{\"title\":\"DTU Utilization Single [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(0,191,179,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\",\"field\":\"average\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"4b2cfff0-08a0-11e8-b3d6-f7127beb4493\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.3\",\"stacked\":\"none\",\"axis_max\":\"100\",\"label\":\"DTU\",\"value_template\":\"{{value}}%\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics AND metricName:dtu_consumption_percent\",\"axis_max\":\"100\",\"annotations\":[]},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/d49fb650-0851-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/d49fb650-0851-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index e937a9f84..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/d49fb650-0851-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "DTU Stats [Azure Monitor]",
-  "visState": "{\"title\":\"DTU Stats [Azure Monitor]\",\"type\":\"gauge\",\"params\":{\"type\":\"gauge\",\"addTooltip\":true,\"addLegend\":true,\"isDisplayWarning\":false,\"gauge\":{\"verticalSplit\":false,\"extendRange\":true,\"percentageMode\":true,\"gaugeType\":\"Arc\",\"gaugeStyle\":\"Full\",\"backStyle\":\"Full\",\"orientation\":\"vertical\",\"colorSchema\":\"Green to Red\",\"gaugeColorMode\":\"Labels\",\"colorsRange\":[{\"from\":0,\"to\":50},{\"from\":50,\"to\":75},{\"from\":75,\"to\":100}],\"invertColors\":false,\"labels\":{\"show\":true,\"color\":\"black\"},\"scale\":{\"show\":false,\"labels\":false,\"color\":\"#333\"},\"type\":\"meter\",\"style\":{\"bgWidth\":0.9,\"width\":0.9,\"mask\":false,\"bgMask\":false,\"maskBars\":50,\"bgFill\":\"#eee\",\"bgColor\":false,\"subText\":\"DTU\",\"fontSize\":60,\"labelColor\":true}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"avg\",\"schema\":\"metric\",\"params\":{\"field\":\"data.average\",\"customLabel\":\"AVG\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"max\",\"schema\":\"metric\",\"params\":{\"field\":\"data.average\",\"customLabel\":\"MAX\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 50\":\"rgb(0,104,55)\",\"50 - 75\":\"rgb(255,255,190)\",\"75 - 100\":\"rgb(165,0,38)\"}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"data.metricName:dtu_consumption_percent\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/db0ec510-152d-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/db0ec510-152d-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index c420c12f2..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/db0ec510-152d-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Select Database Query Combo [Azure Monitor][SQL DB]",
-  "visState": "{\"title\":\"Select Database Query Combo [Azure Monitor][SQL DB]\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1519014869989\",\"indexPattern\":\"azure-*\",\"fieldName\":\"azure.db_unique_id.keyword\",\"label\":\"Database\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":20,\"order\":\"desc\"}},{\"id\":\"1517598395667\",\"indexPattern\":\"azure-*\",\"fieldName\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_id\",\"label\":\"Query ID\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":false,\"size\":20,\"order\":\"desc\"}}],\"updateFiltersOnChange\":true,\"useTimeFilter\":false},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/de505970-1396-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/de505970-1396-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 7877e8eed..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/de505970-1396-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Select User Email [Azure Monitor]",
-  "visState": "{\"title\":\"Select User Email [Azure Monitor]\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1517598395667\",\"indexPattern\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"fieldName\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name.keyword\",\"label\":\"Select User Email\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":100,\"order\":\"desc\"}}],\"updateFiltersOnChange\":true,\"useTimeFilter\":false},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/df69c8a0-13aa-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/df69c8a0-13aa-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index dcf792692..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/df69c8a0-13aa-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Users Tag Cloud [Azure Monitor][Activity Log]",
-  "visState": "{\n  \"title\": \"Users Tag Cloud [Azure Monitor][Activity Log]\",\n  \"type\": \"tagcloud\",\n  \"params\": {\n    \"scale\": \"linear\",\n    \"orientation\": \"single\",\n    \"minFontSize\": 12,\n    \"maxFontSize\": 32,\n    \"hideLabel\": false\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {}\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/e2b9f1a0-08c0-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/e2b9f1a0-08c0-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 83545560a..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/e2b9f1a0-08c0-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Subscriptions Breakdown Pie [Azure Monitor]",
-  "visState": "{\"title\":\"Subscriptions Breakdown Pie [Azure Monitor]\",\"type\":\"pie\",\"params\":{\"type\":\"pie\",\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":false,\"labels\":{\"show\":true,\"values\":false,\"last_level\":false,\"truncate\":100}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"subscription.keyword\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"resource_group.keyword\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"server.keyword\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/e7ac55f0-0c9d-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/e7ac55f0-0c9d-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 5966ab392..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/e7ac55f0-0c9d-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Database Info 2 [Azure Monitor]",
-  "visState": "{\n  \"title\": \"Database Info 2 [Azure Monitor]\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": false,\n    \"type\": \"metric\",\n    \"metric\": {\n      \"percentageMode\": false,\n      \"useRanges\": false,\n      \"colorSchema\": \"Green to Red\",\n      \"metricColorMode\": \"None\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 10000\n        }\n      ],\n      \"labels\": {\n        \"show\": true\n      },\n      \"invertColors\": false,\n      \"style\": {\n        \"bgFill\": \"#000\",\n        \"bgColor\": false,\n        \"labelColor\": false,\n        \"subText\": \"\",\n        \"fontSize\": 12\n      }\n    }\n  },\n  \"aggs\": [\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"top_hits\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"azure.server.keyword\",\n        \"aggregate\": \"concat\",\n        \"size\": 1,\n        \"sortField\": \"@timestamp\",\n        \"sortOrder\": \"desc\",\n        \"customLabel\": \"Server\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:sql_diagnostics\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/e9391690-1226-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/e9391690-1226-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 5db4e02c9..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/e9391690-1226-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Resource Creations and Deletions [Azure Monitor][Activity Log]",
-  "visState": "{\n  \"title\": \"Resource Creations and Deletions [Azure Monitor][Activity Log]\",\n  \"type\": \"horizontal_bar\",\n  \"params\": {\n    \"addLegend\": true,\n    \"addTimeMarker\": false,\n    \"addTooltip\": true,\n    \"categoryAxes\": [\n      {\n        \"id\": \"CategoryAxis-1\",\n        \"labels\": {\n          \"filter\": false,\n          \"rotate\": 0,\n          \"show\": true,\n          \"truncate\": 200\n        },\n        \"position\": \"left\",\n        \"scale\": {\n          \"type\": \"linear\"\n        },\n        \"show\": true,\n        \"style\": {},\n        \"title\": {},\n        \"type\": \"category\"\n      }\n    ],\n    \"grid\": {\n      \"categoryLines\": false,\n      \"style\": {\n        \"color\": \"#eee\"\n      }\n    },\n    \"legendPosition\": \"right\",\n    \"seriesParams\": [\n      {\n        \"data\": {\n          \"id\": \"1\",\n          \"label\": \"Count\"\n        },\n        \"drawLinesBetweenPoints\": true,\n        \"mode\": \"stacked\",\n        \"show\": true,\n        \"showCircles\": true,\n        \"type\": \"histogram\",\n        \"valueAxis\": \"ValueAxis-1\"\n      }\n    ],\n    \"times\": [],\n    \"type\": \"histogram\",\n    \"valueAxes\": [\n      {\n        \"id\": \"ValueAxis-1\",\n        \"labels\": {\n          \"filter\": true,\n          \"rotate\": 75,\n          \"show\": true,\n          \"truncate\": 100\n        },\n        \"name\": \"LeftAxis-1\",\n        \"position\": \"bottom\",\n        \"scale\": {\n          \"mode\": \"normal\",\n          \"type\": \"linear\"\n        },\n        \"show\": false,\n        \"style\": {},\n        \"title\": {\n          \"text\": \"Count\"\n        },\n        \"type\": \"value\"\n      }\n    ]\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {}\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"azure.resource_type.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 15,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Resource Type\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"filters\",\n      \"schema\": \"group\",\n      \"params\": {\n        \"filters\": [\n          {\n            \"input\": {\n              \"query\": \"identity.authorization.action:*write\"\n            },\n            \"label\": \"Creations\"\n          },\n          {\n            \"input\": {\n              \"query\": \"identity.authorization.action:*delete\"\n            },\n            \"label\": \"Deletions\"\n          }\n        ]\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{\n  \"vis\": {\n    \"legendOpen\": false,\n    \"colors\": {\n      \"Creations\": \"#019B8F\",\n      \"Deletions\": \"#AF0058\"\n    }\n  }\n}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:activity_log\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/eafc2880-0850-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/eafc2880-0850-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 3e636c899..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/eafc2880-0850-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Storage Used [Azure Monitor]",
-  "visState": "{\"title\":\"Storage Used [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(104,188,0,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\",\"field\":\"data.average\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"ac54e1d0-0850-11e8-8a9e-77e15a1ba1ec\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.4\",\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"data.metricName:storage_percent\",\"label\":\"Database Storage %\",\"color\":\"#68BC00\",\"id\":\"b0e7fe80-0850-11e8-8a9e-77e15a1ba1ec\"}],\"label\":\"Storage\",\"value_template\":\"{{value}}%\",\"axis_max\":\"100\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"axis_max\":\"100\",\"filter\":\"data.metricName:storage_percent\",\"axis_min\":\"0\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/eb4363d0-0986-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/eb4363d0-0986-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 7f544c3c2..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/eb4363d0-0986-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Storage Used [Azure Monitor]",
-  "visState": "{\"title\":\"Storage Used [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(255,222,85,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\",\"field\":\"average\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"ac54e1d0-0850-11e8-8a9e-77e15a1ba1ec\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"1\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"data.metricName:storage_percent\",\"label\":\"Database Storage %\",\"color\":\"#68BC00\",\"id\":\"b0e7fe80-0850-11e8-8a9e-77e15a1ba1ec\"}],\"label\":\"Storage Used\",\"value_template\":\"{{value}}%\",\"axis_max\":\"100\"},{\"id\":\"86f2d910-0986-11e8-8938-f3a79168be7b\",\"color\":\"rgba(1,155,143,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"86f2d911-0986-11e8-8938-f3a79168be7b\",\"type\":\"avg\",\"field\":\"average\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"d4c68dd0-0986-11e8-8938-f3a79168be7b\",\"type\":\"moving_average\",\"field\":\"86f2d911-0986-11e8-8938-f3a79168be7b\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"data.resour\",\"label\":\"\",\"color\":\"#68BC00\",\"id\":\"b5af6ac0-0986-11e8-8938-f3a79168be7b\"}],\"label\":\"\",\"terms_field\":\"azure.resource_name.keyword\",\"terms_size\":\"3\",\"value_template\":\"{{value}}%\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"show_grid\":1,\"axis_max\":\"100\",\"filter\":\"azure.group:sql_diagnostics AND metricName:storage_percent\",\"axis_min\":\"0\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/ebeaf080-08ac-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/ebeaf080-08ac-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 8fe16ff09..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/ebeaf080-08ac-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Queries Markdown [Azure Monitor]",
-  "visState": "{\"title\":\"Queries Markdown [Azure Monitor]\",\"type\":\"markdown\",\"params\":{\"fontSize\":10,\"markdown\":\"### Queries\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/f057a350-138a-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/f057a350-138a-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 2c69ee7f3..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/f057a350-138a-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Activity by Resource Type [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Activity by Resource Type [Azure Monitor][Activity Log]\",\"type\":\"horizontal_bar\",\"params\":{\"type\":\"histogram\",\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":200},\"title\":{}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"bottom\",\"show\":false,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":75,\"filter\":true,\"truncate\":100},\"title\":{\"text\":\"Count\"}}],\"seriesParams\":[{\"show\":true,\"type\":\"histogram\",\"mode\":\"normal\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"valueAxis\":\"ValueAxis-1\",\"drawLinesBetweenPoints\":true,\"showCircles\":true}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.resource_type.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Resource Type\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"legendOpen\":false}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/f0d7f540-0c97-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/f0d7f540-0c97-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index d1461be94..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/f0d7f540-0c97-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Blockings [Azure Monitor]",
-  "visState": "{\"title\":\"Blockings [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(233,228,16,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\",\"field\":\"sql_diagnostics_query_store_runtime_stats_properties.logical_io_reads\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"dfe3d0d0-0808-11e8-b19d-a7e960a5b5ca\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"Blockings\"},{\"id\":\"b9a2f290-0806-11e8-b19d-a7e960a5b5ca\",\"color\":\"rgba(104,188,0,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"b9a2f291-0806-11e8-b19d-a7e960a5b5ca\",\"type\":\"count\",\"field\":\"sql_diagnostics_query_store_runtime_stats_properties.logical_io_writes\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"f0b3dcc0-0808-11e8-b19d-a7e960a5b5ca\",\"type\":\"moving_average\",\"field\":\"b9a2f291-0806-11e8-b19d-a7e960a5b5ca\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"label\":\"\",\"terms_field\":\"resource_name.keyword\"}],\"time_field\":\"data.time\",\"index_pattern\":\"*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"data.category:Blocks\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/f7d7bb80-1824-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/f7d7bb80-1824-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index c06cad48a..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/f7d7bb80-1824-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Activity by Resource Group User [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Activity by Resource Group User [Azure Monitor][Activity Log]\",\"type\":\"horizontal_bar\",\"params\":{\"type\":\"histogram\",\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":200},\"title\":{}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"bottom\",\"show\":false,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":75,\"filter\":true,\"truncate\":100},\"title\":{\"text\":\"Count\"}}],\"seriesParams\":[{\"show\":true,\"type\":\"histogram\",\"mode\":\"normal\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"valueAxis\":\"ValueAxis-1\",\"drawLinesBetweenPoints\":true,\"showCircles\":true}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.resource_group.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Resource Group\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"legendOpen\":false,\"colors\":{\"Count\":\"#019B8F\"}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"azure-*\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND _exists_:identity.claims.name\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/f819a870-0c9d-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/f819a870-0c9d-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index a9cd12865..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/f819a870-0c9d-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Database Info 4 [Azure Monitor]",
-  "visState": "{\n  \"title\": \"Database Info 4 [Azure Monitor]\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": false,\n    \"type\": \"metric\",\n    \"metric\": {\n      \"percentageMode\": false,\n      \"useRanges\": false,\n      \"colorSchema\": \"Green to Red\",\n      \"metricColorMode\": \"None\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 10000\n        }\n      ],\n      \"labels\": {\n        \"show\": true\n      },\n      \"invertColors\": false,\n      \"style\": {\n        \"bgFill\": \"#000\",\n        \"bgColor\": false,\n        \"labelColor\": false,\n        \"subText\": \"\",\n        \"fontSize\": 12\n      }\n    }\n  },\n  \"aggs\": [\n    {\n      \"id\": \"4\",\n      \"enabled\": true,\n      \"type\": \"top_hits\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"azure.subscription.keyword\",\n        \"aggregate\": \"concat\",\n        \"size\": 1,\n        \"sortField\": \"@timestamp\",\n        \"sortOrder\": \"desc\",\n        \"customLabel\": \"Subscription\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:sql_diagnostics\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/f93f09d0-1bec-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/f93f09d0-1bec-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 2d2b03e5c..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/f93f09d0-1bec-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Caller IP [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Caller IP [Azure Monitor][Activity Log]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"callerIpAddress.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":1000,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Caller IP\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"geoip.country_name.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":100,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Email\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"azure-*\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND _exists_:identity.claims.name\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/fca6aa70-13cb-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/fca6aa70-13cb-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 5bd256b87..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/fca6aa70-13cb-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Resource Creations and Deletions User [Azure Monitor][Activity Log]",
-  "visState": "{\n  \"title\": \"Resource Creations and Deletions User [Azure Monitor][Activity Log]\",\n  \"type\": \"horizontal_bar\",\n  \"params\": {\n    \"addLegend\": true,\n    \"addTimeMarker\": false,\n    \"addTooltip\": true,\n    \"categoryAxes\": [\n      {\n        \"id\": \"CategoryAxis-1\",\n        \"labels\": {\n          \"filter\": false,\n          \"rotate\": 0,\n          \"show\": true,\n          \"truncate\": 200\n        },\n        \"position\": \"left\",\n        \"scale\": {\n          \"type\": \"linear\"\n        },\n        \"show\": true,\n        \"style\": {},\n        \"title\": {},\n        \"type\": \"category\"\n      }\n    ],\n    \"grid\": {\n      \"categoryLines\": false,\n      \"style\": {\n        \"color\": \"#eee\"\n      }\n    },\n    \"legendPosition\": \"right\",\n    \"seriesParams\": [\n      {\n        \"data\": {\n          \"id\": \"1\",\n          \"label\": \"Count\"\n        },\n        \"drawLinesBetweenPoints\": true,\n        \"mode\": \"stacked\",\n        \"show\": true,\n        \"showCircles\": true,\n        \"type\": \"histogram\",\n        \"valueAxis\": \"ValueAxis-1\"\n      }\n    ],\n    \"times\": [],\n    \"type\": \"histogram\",\n    \"valueAxes\": [\n      {\n        \"id\": \"ValueAxis-1\",\n        \"labels\": {\n          \"filter\": true,\n          \"rotate\": 75,\n          \"show\": true,\n          \"truncate\": 100\n        },\n        \"name\": \"LeftAxis-1\",\n        \"position\": \"bottom\",\n        \"scale\": {\n          \"mode\": \"normal\",\n          \"type\": \"linear\"\n        },\n        \"show\": false,\n        \"style\": {},\n        \"title\": {\n          \"text\": \"Count\"\n        },\n        \"type\": \"value\"\n      }\n    ]\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {}\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"azure.resource_type.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 15,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Resource Type\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"filters\",\n      \"schema\": \"group\",\n      \"params\": {\n        \"filters\": [\n          {\n            \"input\": {\n              \"query\": \"identity.authorization.action:*write\"\n            },\n            \"label\": \"Creations\"\n          },\n          {\n            \"input\": {\n              \"query\": \"identity.authorization.action:*delete\"\n            },\n            \"label\": \"Deletions\"\n          }\n        ]\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{\n  \"vis\": {\n    \"legendOpen\": false,\n    \"colors\": {\n      \"Creations\": \"#019B8F\",\n      \"Deletions\": \"#AF0058\"\n    }\n  }\n}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:activity_log AND _exists_:identity.claims.name\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/6.x/visualization/fec4c5c0-139a-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/6.x/visualization/fec4c5c0-139a-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 243874d30..000000000
--- a/x-pack/modules/azure/configuration/kibana/6.x/visualization/fec4c5c0-139a-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "User Activity Overview [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"User Activity Overview [Azure Monitor][Activity Log]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(1,155,143,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.4\",\"stacked\":\"none\",\"label\":\"Actions\",\"split_filters\":[{\"filter\":\"_exists_:identity.claims.name\",\"label\":\"\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"a5302500-1399-11e8-a699-f390e75f4dd5\"}],\"filter\":\"\",\"hide_in_legend\":0}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:activity_log AND azure.category:Administrative AND _exists_:identity.claims.name\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/dashboard/06fa0b60-121a-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/dashboard/06fa0b60-121a-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index cb38d3519..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/dashboard/06fa0b60-121a-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "title": "[Azure Monitor] User Activity",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"panelIndex\":\"2\",\"gridData\":{\"x\":0,\"y\":14,\"w\":12,\"h\":5,\"i\":\"2\"},\"embeddableConfig\":{\"mapCenter\":[35.746512259918504,-29.443359375000004],\"mapZoom\":3},\"id\":\"7fe767b0-11fd-11e8-8c94-a3d8d0cfd62b\",\"title\":\"Global User Activity\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"17\",\"gridData\":{\"x\":0,\"y\":2,\"w\":6,\"h\":6,\"i\":\"17\"},\"id\":\"a0340090-1389-11e8-8c94-a3d8d0cfd62b\",\"title\":\"Users\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"26\",\"gridData\":{\"x\":6,\"y\":0,\"w\":6,\"h\":2,\"i\":\"26\"},\"id\":\"fec4c5c0-139a-11e8-8c94-a3d8d0cfd62b\",\"title\":\"User Activity\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"29\",\"gridData\":{\"x\":0,\"y\":1,\"w\":6,\"h\":1,\"i\":\"29\"},\"id\":\"5e89e2b0-13a0-11e8-8c94-a3d8d0cfd62b\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"32\",\"gridData\":{\"x\":0,\"y\":0,\"w\":6,\"h\":1,\"i\":\"32\"},\"id\":\"aa01fff0-13bb-11e8-8c94-a3d8d0cfd62b\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"33\",\"gridData\":{\"x\":6,\"y\":2,\"w\":6,\"h\":2,\"i\":\"33\"},\"id\":\"27f9bd40-13ca-11e8-8c94-a3d8d0cfd62b\",\"title\":\"Access Requests\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"34\",\"gridData\":{\"x\":6,\"y\":4,\"w\":6,\"h\":4,\"i\":\"34\"},\"id\":\"fca6aa70-13cb-11e8-8c94-a3d8d0cfd62b\",\"title\":\"Resource Changes\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"35\",\"gridData\":{\"x\":6,\"y\":11,\"w\":6,\"h\":3,\"i\":\"35\"},\"id\":\"f7d7bb80-1824-11e8-8c94-a3d8d0cfd62b\",\"title\":\"Top Resource Groups\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"37\",\"gridData\":{\"x\":0,\"y\":8,\"w\":6,\"h\":6,\"i\":\"37\"},\"id\":\"f93f09d0-1bec-11e8-8c94-a3d8d0cfd62b\",\"title\":\"Top Caller IPs\",\"type\":\"visualization\",\"version\":\"6.2.1\",\"embeddableConfig\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":3,\"direction\":\"desc\"}}}}},{\"panelIndex\":\"38\",\"gridData\":{\"x\":6,\"y\":8,\"w\":6,\"h\":3,\"i\":\"38\"},\"id\":\"2e863080-1bef-11e8-8c94-a3d8d0cfd62b\",\"title\":\"Top Resource Types\",\"type\":\"visualization\",\"version\":\"6.2.1\"}]",
-  "optionsJSON": "{\"darkTheme\":true,\"hidePanelTitles\":false,\"useMargins\":false}",
-  "version": 1,
-  "timeRestore": false,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/dashboard/16302750-1223-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/dashboard/16302750-1223-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 0ae717b94..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/dashboard/16302750-1223-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "title": "[Azure Monitor] Alerts",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"panelIndex\":\"1\",\"gridData\":{\"x\":0,\"y\":1,\"w\":6,\"h\":1,\"i\":\"1\"},\"id\":\"890f3af0-093a-11e8-93e5-299e2b5c963a\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"15\",\"gridData\":{\"x\":0,\"y\":4,\"w\":6,\"h\":1,\"i\":\"15\"},\"id\":\"15b9f8d0-1216-11e8-8c94-a3d8d0cfd62b\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"16\",\"gridData\":{\"x\":0,\"y\":5,\"w\":12,\"h\":30,\"i\":\"16\"},\"id\":\"f802b0b0-1211-11e8-8c94-a3d8d0cfd62b\",\"title\":\"Alerts Viewer\",\"type\":\"search\",\"version\":\"6.2.1\"},{\"panelIndex\":\"17\",\"gridData\":{\"x\":0,\"y\":2,\"w\":6,\"h\":2,\"i\":\"17\"},\"id\":\"94e47b60-1385-11e8-8c94-a3d8d0cfd62b\",\"title\":\"Alert Activity\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"18\",\"gridData\":{\"x\":0,\"y\":0,\"w\":6,\"h\":1,\"i\":\"18\"},\"id\":\"8e2e0480-13bc-11e8-8c94-a3d8d0cfd62b\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"panelIndex\":\"19\",\"gridData\":{\"x\":6,\"y\":0,\"w\":6,\"h\":5,\"i\":\"19\"},\"embeddableConfig\":{\"vis\":{\"colors\":{\"0 - 12\":\"#F9D9F9\",\"12 - 23\":\"#E5A8E2\",\"23 - 34\":\"#D683CE\",\"34 - 45\":\"#BA43A9\"},\"defaultColors\":{\"0 - 12\":\"rgb(247,252,245)\",\"12 - 23\":\"rgb(199,233,192)\",\"23 - 34\":\"rgb(116,196,118)\",\"34 - 45\":\"rgb(35,139,69)\"},\"legendOpen\":false}},\"id\":\"2d11a9b0-1ac2-11e8-8c94-a3d8d0cfd62b\",\"title\":\"Alerts Heatmap\",\"type\":\"visualization\",\"version\":\"6.2.1\"}]",
-  "optionsJSON": "{\"darkTheme\":true,\"hidePanelTitles\":false,\"useMargins\":false}",
-  "version": 1,
-  "timeRestore": false,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/dashboard/91ba2090-07cb-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/7.x/dashboard/91ba2090-07cb-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index a5a26a34f..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/dashboard/91ba2090-07cb-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "title": "[Azure Monitor] SQL DB Overview",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"embeddableConfig\":{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"}}},\"gridData\":{\"h\":1,\"i\":\"1\",\"w\":7,\"x\":0,\"y\":2},\"id\":\"b98ec5a0-0706-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"1\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":2,\"i\":\"3\",\"w\":5,\"x\":7,\"y\":2},\"id\":\"009a25c0-07d9-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"3\",\"title\":\"Errors\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":2,\"i\":\"5\",\"w\":5,\"x\":7,\"y\":6},\"id\":\"85cee3b0-07df-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"5\",\"title\":\"Database Wait Time\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":2,\"i\":\"6\",\"w\":5,\"x\":7,\"y\":10},\"id\":\"418ce210-07e4-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"6\",\"title\":\"Query Duration (ms)\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":2,\"i\":\"7\",\"w\":5,\"x\":7,\"y\":12},\"id\":\"a71ed100-07e5-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"7\",\"title\":\"Query Wait Time (ms)\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"embeddableConfig\":{\"table\":{\"sort\":{\"column\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"order\":\"desc\"}}},\"gridData\":{\"h\":7,\"i\":\"9\",\"w\":7,\"x\":0,\"y\":3},\"id\":\"880a53f0-080f-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"9\",\"title\":\"Databases\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":2,\"i\":\"11\",\"w\":5,\"x\":7,\"y\":8},\"id\":\"5465b680-0809-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"11\",\"title\":\"Read & Write I/O\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":1,\"i\":\"12\",\"w\":7,\"x\":0,\"y\":0},\"id\":\"68dd8530-083f-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"12\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"embeddableConfig\":{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}},\"gridData\":{\"h\":6,\"i\":\"13\",\"w\":7,\"x\":0,\"y\":10},\"id\":\"2060bce0-0840-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"13\",\"title\":\"Servers\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"embeddableConfig\":{\"vis\":{\"legendOpen\":false}},\"gridData\":{\"h\":1,\"i\":\"16\",\"w\":7,\"x\":0,\"y\":1},\"id\":\"890f3af0-093a-11e8-93e5-299e2b5c963a\",\"panelIndex\":\"16\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":2,\"i\":\"19\",\"w\":5,\"x\":7,\"y\":4},\"id\":\"eb4363d0-0986-11e8-93e5-299e2b5c963a\",\"panelIndex\":\"19\",\"title\":\"Storage Used\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":2,\"i\":\"20\",\"w\":5,\"x\":7,\"y\":0},\"id\":\"6bab50c0-0877-11e8-93e5-299e2b5c963a\",\"panelIndex\":\"20\",\"title\":\"DTU Utilization\",\"type\":\"visualization\",\"version\":\"6.2.1\"}]",
-  "optionsJSON": "{\"darkTheme\":true,\"useMargins\":false}",
-  "version": 1,
-  "timeRestore": false,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[{\"$state\":{\"store\":\"appState\"},\"meta\":{\"alias\":null,\"controlledBy\":\"1517598395667\",\"disabled\":false,\"index\":\"azure-*\",\"key\":\"azure.subscription.keyword\",\"negate\":false,\"params\":{\"query\":\"741FD0F5-9CB8-442C-91C3-3EF4CA231C2A\",\"type\":\"phrase\"},\"type\":\"phrase\",\"value\":\"741FD0F5-9CB8-442C-91C3-3EF4CA231C2A\"},\"query\":{\"match\":{\"azure.subscription.keyword\":{\"query\":\"741FD0F5-9CB8-442C-91C3-3EF4CA231C2A\",\"type\":\"phrase\"}}}}],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/dashboard/9adef750-08b0-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/dashboard/9adef750-08b0-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 34cbb8b9e..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/dashboard/9adef750-08b0-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "title": "[Azure Monitor] SQL DB Queries",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"gridData\":{\"h\":2,\"i\":\"11\",\"w\":5,\"x\":7,\"y\":2},\"id\":\"6d71abf0-0842-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"11\",\"title\":\"Query Wait Time\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":2,\"i\":\"12\",\"w\":5,\"x\":2,\"y\":2},\"id\":\"518cb600-0842-11e8-adb5-e1a2d559cdf5\",\"panelIndex\":\"12\",\"title\":\"Query Duration\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":2,\"i\":\"23\",\"w\":3,\"x\":6,\"y\":0},\"id\":\"d02c64c0-08a0-11e8-93e5-299e2b5c963a\",\"panelIndex\":\"23\",\"title\":\"DTU Utilization\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"gridData\":{\"h\":1,\"i\":\"25\",\"w\":6,\"x\":0,\"y\":0},\"id\":\"20a043b0-13c1-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"25\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":2,\"i\":\"27\",\"w\":2,\"x\":0,\"y\":2},\"id\":\"3fb82260-1527-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"27\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":2,\"i\":\"28\",\"w\":3,\"x\":9,\"y\":0},\"id\":\"5dbd8b20-08a1-11e8-93e5-299e2b5c963a\",\"panelIndex\":\"28\",\"title\":\"Errors\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":9,\"i\":\"29\",\"w\":12,\"x\":0,\"y\":4},\"id\":\"35de9400-1526-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"29\",\"title\":\"Top Queries\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":1,\"i\":\"30\",\"w\":6,\"x\":0,\"y\":1},\"id\":\"db0ec510-152d-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"30\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"}]",
-  "optionsJSON": "{\"darkTheme\":true,\"useMargins\":false}",
-  "version": 1,
-  "timeRestore": false,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/dashboard/aaf909b0-0800-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/7.x/dashboard/aaf909b0-0800-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index 3b4bbe2a7..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/dashboard/aaf909b0-0800-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "title": "[Azure Monitor] SQL DB Database View",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"panelIndex\":\"4\",\"gridData\":{\"x\":6,\"y\":4,\"w\":6,\"h\":2,\"i\":\"4\"},\"id\":\"5465b680-0809-11e8-adb5-e1a2d559cdf5\",\"title\":\"Read & Write I/O\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"5\",\"gridData\":{\"x\":0,\"y\":0,\"w\":6,\"h\":1,\"i\":\"5\"},\"id\":\"68dd8530-083f-11e8-adb5-e1a2d559cdf5\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"14\",\"gridData\":{\"x\":0,\"y\":4,\"w\":6,\"h\":2,\"i\":\"14\"},\"id\":\"9bb5e3e0-0843-11e8-adb5-e1a2d559cdf5\",\"title\":\"Database Wait Time\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"15\",\"gridData\":{\"x\":0,\"y\":1,\"w\":6,\"h\":1,\"i\":\"15\"},\"id\":\"88dcf980-084c-11e8-93e5-299e2b5c963a\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"18\",\"gridData\":{\"x\":9,\"y\":2,\"w\":3,\"h\":2,\"i\":\"18\"},\"id\":\"90ed5940-0850-11e8-93e5-299e2b5c963a\",\"title\":\"Database Size\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"23\",\"gridData\":{\"x\":6,\"y\":0,\"w\":3,\"h\":2,\"i\":\"23\"},\"id\":\"d02c64c0-08a0-11e8-93e5-299e2b5c963a\",\"title\":\"DTU Utilization\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"24\",\"gridData\":{\"x\":9,\"y\":0,\"w\":3,\"h\":2,\"i\":\"24\"},\"id\":\"5dbd8b20-08a1-11e8-93e5-299e2b5c963a\",\"title\":\"Errors\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"25\",\"gridData\":{\"x\":6,\"y\":2,\"w\":3,\"h\":2,\"i\":\"25\"},\"id\":\"5ff32870-08a4-11e8-93e5-299e2b5c963a\",\"title\":\"Storage Utilization\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"28\",\"gridData\":{\"x\":4,\"y\":2,\"w\":2,\"h\":1,\"i\":\"28\"},\"id\":\"e7ac55f0-0c9d-11e8-93e5-299e2b5c963a\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"29\",\"gridData\":{\"x\":0,\"y\":3,\"w\":4,\"h\":1,\"i\":\"29\"},\"id\":\"f819a870-0c9d-11e8-93e5-299e2b5c963a\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"30\",\"gridData\":{\"x\":0,\"y\":2,\"w\":4,\"h\":1,\"i\":\"30\"},\"id\":\"59510c50-0c9e-11e8-93e5-299e2b5c963a\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"panelIndex\":\"31\",\"gridData\":{\"x\":4,\"y\":3,\"w\":2,\"h\":1,\"i\":\"31\"},\"id\":\"72ab38b0-0c9e-11e8-93e5-299e2b5c963a\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.1.3\"},{\"title\":\"Errors Viewer\",\"panelIndex\":\"32\",\"gridData\":{\"x\":0,\"y\":6,\"w\":12,\"h\":6,\"i\":\"32\"},\"id\":\"5a91a3e0-1829-11e8-8c94-a3d8d0cfd62b\",\"type\":\"search\",\"version\":\"6.2.1\"}]",
-  "optionsJSON": "{\"darkTheme\":true,\"useMargins\":false}",
-  "version": 1,
-  "timeRestore": false,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[{\"$state\":{\"store\":\"appState\"},\"meta\":{\"alias\":null,\"controlledBy\":\"1517598395667\",\"disabled\":false,\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"key\":\"azure.db_unique_id.keyword\",\"negate\":false,\"params\":{\"query\":\"741FD0F5-9CB8-442C-91C3-3EF4CA231C2A/WIDEMO/WIDEMO/WORKLOADINSIGHTSDEMO\",\"type\":\"phrase\"},\"type\":\"phrase\",\"value\":\"741FD0F5-9CB8-442C-91C3-3EF4CA231C2A/WIDEMO/WIDEMO/WORKLOADINSIGHTSDEMO\"},\"query\":{\"match\":{\"azure.db_unique_id.keyword\":{\"query\":\"741FD0F5-9CB8-442C-91C3-3EF4CA231C2A/WIDEMO/WIDEMO/WORKLOADINSIGHTSDEMO\",\"type\":\"phrase\"}}}}],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/dashboard/azure.json b/x-pack/modules/azure/configuration/kibana/7.x/dashboard/azure.json
deleted file mode 100644
index 38a051af5..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/dashboard/azure.json
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-  "06fa0b60-121a-11e8-8c94-a3d8d0cfd62b",
-  "16302750-1223-11e8-8c94-a3d8d0cfd62b",
-  "91ba2090-07cb-11e8-adb5-e1a2d559cdf5",
-  "9adef750-08b0-11e8-93e5-299e2b5c963a",
-  "aaf909b0-0800-11e8-adb5-e1a2d559cdf5",
-  "f110f010-11fc-11e8-8c94-a3d8d0cfd62b"
-]
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/dashboard/f110f010-11fc-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/dashboard/f110f010-11fc-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 66fd9916d..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/dashboard/f110f010-11fc-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "title": "[Azure Monitor] Overview",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": "[{\"gridData\":{\"h\":1,\"i\":\"1\",\"w\":6,\"x\":0,\"y\":1},\"id\":\"890f3af0-093a-11e8-93e5-299e2b5c963a\",\"panelIndex\":\"1\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":2,\"i\":\"4\",\"w\":6,\"x\":6,\"y\":0},\"id\":\"0f1d8b80-11fe-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"4\",\"title\":\"Activity Level\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":1,\"i\":\"11\",\"w\":6,\"x\":0,\"y\":2},\"id\":\"ccabf560-1208-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"11\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":2,\"i\":\"14\",\"w\":6,\"x\":6,\"y\":9},\"id\":\"23e31d20-1215-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"14\",\"title\":\"Alerts\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":1,\"i\":\"15\",\"w\":6,\"x\":6,\"y\":11},\"id\":\"15b9f8d0-1216-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"15\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":2,\"i\":\"19\",\"w\":6,\"x\":0,\"y\":9},\"id\":\"053b9cc0-137e-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"19\",\"title\":\"Service Health\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":1,\"i\":\"20\",\"w\":6,\"x\":0,\"y\":11},\"id\":\"33072240-137f-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"20\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":15,\"i\":\"21\",\"w\":12,\"x\":0,\"y\":12},\"id\":\"3a4ec5b0-1381-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"21\",\"title\":\"Service Health Viewer\",\"type\":\"search\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":4,\"i\":\"23\",\"w\":6,\"x\":0,\"y\":5},\"id\":\"19c51b50-138b-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"23\",\"title\":\"Top Resource Groups\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":5,\"i\":\"24\",\"w\":6,\"x\":6,\"y\":4},\"id\":\"e9391690-1226-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"24\",\"title\":\"Resource Changes\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":2,\"i\":\"25\",\"w\":6,\"x\":0,\"y\":3},\"id\":\"df69c8a0-13aa-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"25\",\"title\":\"Top Active Users\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":2,\"i\":\"26\",\"w\":6,\"x\":6,\"y\":2},\"id\":\"1c885a30-13b0-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"26\",\"title\":\"Access Requests\",\"type\":\"visualization\",\"version\":\"6.2.1\"},{\"gridData\":{\"h\":1,\"i\":\"27\",\"w\":6,\"x\":0,\"y\":0},\"id\":\"25eb1470-13bd-11e8-8c94-a3d8d0cfd62b\",\"panelIndex\":\"27\",\"title\":\"\",\"type\":\"visualization\",\"version\":\"6.2.1\"}]",
-  "optionsJSON": "{\"darkTheme\":true,\"hidePanelTitles\":false,\"useMargins\":false}",
-  "version": 1,
-  "timeRestore": false,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[{\"$state\":{\"store\":\"appState\"},\"meta\":{\"alias\":null,\"controlledBy\":\"1517598395667\",\"disabled\":false,\"index\":\"azure-*\",\"key\":\"azure.subscription.keyword\",\"negate\":false,\"params\":{\"query\":\"872F2E12-6CCC-4EAD-8D3C-AC833009C1A4\",\"type\":\"phrase\"},\"type\":\"phrase\",\"value\":\"872F2E12-6CCC-4EAD-8D3C-AC833009C1A4\"},\"query\":{\"match\":{\"azure.subscription.keyword\":{\"query\":\"872F2E12-6CCC-4EAD-8D3C-AC833009C1A4\",\"type\":\"phrase\"}}}}],\"highlightAll\":true,\"version\":true}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/index-pattern/azure.json b/x-pack/modules/azure/configuration/kibana/7.x/index-pattern/azure.json
deleted file mode 100644
index 1a1677166..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/index-pattern/azure.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "title" : "azure-*",
-  "timeFieldName" : "@timestamp",
-  "fields" : "[{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"@version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"LogicalServerName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"LogicalServerName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"ResourceGroup\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"ResourceGroup.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"SubscriptionId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"SubscriptionId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.deploymentId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.deploymentId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventCategory\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventCategory.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.aadTenantId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.aadTenantId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.activeSince\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.activeSince.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.component\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.component.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.conditionAggregation\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.conditionAggregation.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.conditionOperator\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.conditionOperator.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.conditionOperatorRaw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.conditionOperatorRaw.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.conditionThreshold\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.conditionWindowSize\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.dateTimestampUtc\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.dateTimestampUtc.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.firstSample\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.firstSample.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.lastSample\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.lastSample.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.metricName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.metricName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.metricScale\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.metricUnit\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.metricUnit.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.metricValue\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.region\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.region.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.resourceName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.resourceName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.ruleDescription\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.ruleDescription.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.ruleId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.ruleId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.ruleName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.ruleName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.sampleCount\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.source\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.source.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.eventProperties.subscriptionId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.eventProperties.subscriptionId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.operationId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.operationId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.policies\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.policies.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.requestbody\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.requestbody.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.resourceLocation\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.resourceLocation.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.responseBody\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.responseBody.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.serviceRequestId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.serviceRequestId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.statusCode\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.statusCode.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Administrative_properties.statusMessage\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Administrative_properties.statusMessage.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventCategory\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventCategory.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.Aggregation\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.Aggregation.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.MetricName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.MetricName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.MetricUnit\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.MetricUnit.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.Operator\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.Operator.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.RuleDescription\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.RuleDescription.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.RuleName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.RuleName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.RuleUri\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.RuleUri.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.Threshold\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.WindowSizeInMinutes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.eventDataId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.eventDataId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.eventTimestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.operationName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.operationName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.resourceGroup\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.resourceGroup.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.resourceId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.resourceId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.status\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.status.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.eventProperties.subscriptionId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.eventProperties.subscriptionId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Alert_properties.operationId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Alert_properties.operationId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Security_properties.eventCategory\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Security_properties.eventCategory.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Security_properties.eventName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Security_properties.eventName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_Security_properties.operationId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_Security_properties.operationId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.channels\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.channels.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.correlationId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.correlationId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.description.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventCategory\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventCategory.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventDataId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventDataId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.communication\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.communication.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.communicationId\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.defaultLanguageContent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.defaultLanguageContent.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.defaultLanguageTitle\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.defaultLanguageTitle.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.impactMitigationTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.impactStartTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.impactedServices.ImpactedRegions.RegionName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.impactedServices.ImpactedRegions.RegionName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.impactedServices.ServiceName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.impactedServices.ServiceName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.incidentType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.incidentType.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.region\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.region.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.service\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.service.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.stage\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.stage.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.title.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.trackingId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.trackingId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventProperties.version.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventSource\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.eventSource.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.eventTimestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.level\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.level.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.operationId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.operationId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.operationName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.operationName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.communication\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.communication.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.communicationId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.communicationId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.defaultLanguageContent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.defaultLanguageContent.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.defaultLanguageTitle\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.defaultLanguageTitle.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.impactMitigationTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.impactStartTime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.impactedServices\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.impactedServices.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.incidentType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.incidentType.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.region\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.region.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.service\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.service.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.stage\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.stage.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.title.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.trackingId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.trackingId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.properties.version\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.properties.version.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.status\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.status.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.submissionTimestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"activity_log_ServiceHealth_properties.subscriptionId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"activity_log_ServiceHealth_properties.subscriptionId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"average\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.category\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.category.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.database\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.database.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.db_unique_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.db_unique_id.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.group\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.group.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.metadata.azure_event_hubs.consumer_group\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.metadata.azure_event_hubs.consumer_group.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.metadata.azure_event_hubs.event_size\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.metadata.azure_event_hubs.name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.metadata.azure_event_hubs.name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.metadata.azure_event_hubs.offset\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.metadata.azure_event_hubs.offset.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.metadata.azure_event_hubs.partition\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.metadata.azure_event_hubs.partition.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.metadata.azure_event_hubs.processor_host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.metadata.azure_event_hubs.processor_host.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.metadata.azure_event_hubs.sequence\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.metadata.azure_event_hubs.timestamp\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.provider\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.provider.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.resource_group\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.resource_group.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.resource_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.resource_name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.resource_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.resource_type.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.server\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.server.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.server_and_database\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.server_and_database.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"azure.subscription\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"azure.subscription.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"callerIpAddress\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"callerIpAddress.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"category\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"category.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"correlationId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"correlationId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"count\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"durationMs\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.city_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"geoip.city_name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.continent_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"geoip.continent_code.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_code2\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"geoip.country_code2.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_code3\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"geoip.country_code3.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.country_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"geoip.country_name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.dma_code\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.latitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.location\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.longitude\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.postal_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"geoip.postal_code.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.region_code\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"geoip.region_code.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.region_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"geoip.region_name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geoip.timezone\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"geoip.timezone.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.authorization.action\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.authorization.action.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.authorization.evidence.principalId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.authorization.evidence.principalId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.authorization.evidence.principalType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.authorization.evidence.principalType.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.authorization.evidence.role\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.authorization.evidence.role.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.authorization.evidence.roleAssignmentId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.authorization.evidence.roleAssignmentId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.authorization.evidence.roleAssignmentScope\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.authorization.evidence.roleAssignmentScope.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.authorization.evidence.roleDefinitionId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.authorization.evidence.roleDefinitionId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.authorization.scope\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.authorization.scope.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims._claim_names\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims._claim_names.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims._claim_sources\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims._claim_sources.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.aio\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.aio.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.appid\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.appid.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.appidacr\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.appidacr.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.aud\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.aud.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.e_exp\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.e_exp.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.exp\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.exp.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.microsoft.com/claims/authnclassreference\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.microsoft.com/claims/authnclassreference.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.microsoft.com/claims/authnmethodsreferences\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.microsoft.com/claims/authnmethodsreferences.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.microsoft.com/identity/claims/identityprovider\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.microsoft.com/identity/claims/identityprovider.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.microsoft.com/identity/claims/objectidentifier\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.microsoft.com/identity/claims/objectidentifier.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.microsoft.com/identity/claims/scope\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.microsoft.com/identity/claims/scope.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.microsoft.com/identity/claims/tenantid\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.microsoft.com/identity/claims/tenantid.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.iat\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.iat.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.in_corp\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.in_corp.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.ipaddr\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.ipaddr.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.iss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.iss.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.name.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.nbf\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.nbf.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.onprem_sid\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.onprem_sid.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.puid\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.puid.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.uti\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.uti.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"identity.claims.ver\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"identity.claims.ver.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"level\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"level.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"location\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"location.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"maximum\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"metricName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"metricName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"minimum\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"operationName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"operationName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"resourceId\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"resourceId.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"resultDescription\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"resultDescription.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"resultSignature\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"resultSignature.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"resultType\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"resultType.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Blocks_properties.DatabaseName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_Blocks_properties.DatabaseName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Blocks_properties.ElasticPoolName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_Blocks_properties.ElasticPoolName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Blocks_properties.blocked_process_filtered\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_Blocks_properties.blocked_process_filtered.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Blocks_properties.duration\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Blocks_properties.lock_mode\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_Blocks_properties.lock_mode.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Blocks_properties.resource_owner_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_Blocks_properties.resource_owner_type.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.DatabaseName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.DatabaseName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.ElasticPoolName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.ElasticPoolName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.delta_max_wait_time_ms\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.delta_signal_wait_time_ms\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.delta_wait_time_ms\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.delta_waiting_tasks_count\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.end_utc_date\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.start_utc_date\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.wait_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_DatabaseWaitStatistics_properties.wait_type.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Errors_properties.DatabaseName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_Errors_properties.DatabaseName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Errors_properties.ElasticPoolName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_Errors_properties.ElasticPoolName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Errors_properties.error_number\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Errors_properties.message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_Errors_properties.message.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Errors_properties.query_hash\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_Errors_properties.query_hash.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Errors_properties.query_plan_hash\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_Errors_properties.query_plan_hash.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Errors_properties.severity\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Errors_properties.state\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_Errors_properties.user_defined\",\"type\":\"boolean\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.DatabaseName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.DatabaseName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.ElasticPoolName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.ElasticPoolName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.count_executions\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.cpu_time\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.dop\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.duration\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.execution_type\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.interval_end_time\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.interval_start_time\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.log_bytes_used\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.logical_io_reads\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.logical_io_writes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.max_cpu_time\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.max_dop\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.max_duration\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.max_log_bytes_used\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.max_logical_io_reads\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.max_logical_io_writes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.max_num_physical_io_reads\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.max_physical_io_reads\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.max_query_max_used_memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.max_rowcount\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.num_physical_io_reads\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.physical_io_reads\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.plan_id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_hash\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_hash.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_max_used_memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_plan_hash\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_plan_hash.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.rowcount\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.statement_sql_handle\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.statement_sql_handle.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.DatabaseName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.DatabaseName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.ElasticPoolName\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.ElasticPoolName.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.count_executions\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.exec_type\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.interval_end_time\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.interval_start_time\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.is_parameterizable\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.is_parameterizable.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.max_query_wait_time_ms\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.plan_id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.query_hash\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.query_hash.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.query_id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.query_param_type\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.query_plan_hash\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.query_plan_hash.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.statement_key_hash\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.statement_key_hash.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.statement_sql_handle\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.statement_sql_handle.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.statement_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.statement_type.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.total_query_wait_time_ms\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.wait_category\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.wait_category.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"tags.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"timeGrain\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"timeGrain.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"total\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]"
-}
\ No newline at end of file
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/search/3a4ec5b0-1381-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/search/3a4ec5b0-1381-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index e5764017b..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/search/3a4ec5b0-1381-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "title": "Service Health Search [Azure Monitor][Activity Log]",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "resultDescription",
-    "resultType"
-  ],
-  "sort": [
-    "@timestamp",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"azure-*\",\"highlightAll\":true,\"version\":true,\"query\":{\"language\":\"lucene\",\"query\":\"azure.group:activity_log AND azure.category:ServiceHealth\"},\"filter\":[{\"$state\":{\"store\":\"appState\"},\"exists\":{\"field\":\"resultType\"},\"meta\":{\"alias\":null,\"disabled\":false,\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"key\":\"resultType\",\"negate\":false,\"type\":\"exists\",\"value\":\"exists\"}}]}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/search/5a91a3e0-1829-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/search/5a91a3e0-1829-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index e146e44ed..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/search/5a91a3e0-1829-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "title": "Errors Viewer [Azure Monitor][SQL DB]",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "sql_diagnostics_Errors_properties.message",
-    "sql_diagnostics_Errors_properties.error_number"
-  ],
-  "sort": [
-    "@timestamp",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"azure-*\",\"highlightAll\":true,\"version\":true,\"query\":{\"language\":\"lucene\",\"query\":\"azure.group:sql_diagnostics AND azure.category:Errors\"},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/search/9a8ffc60-1155-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/search/9a8ffc60-1155-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 271a1ed91..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/search/9a8ffc60-1155-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "title": "SQL Diagnostics [Azure Monitor]",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "_source"
-  ],
-  "sort": [
-    "@timestamp",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"highlightAll\":true,\"version\":true,\"query\":{\"query\":\"azure.group: \\\"sql_diagnostics\\\"\",\"language\":\"lucene\"},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/search/f802b0b0-1211-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/search/f802b0b0-1211-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 17ff6dbcb..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/search/f802b0b0-1211-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "title": "Alerts Search [Azure Monitor][Activity Log]",
-  "description": "",
-  "hits": 0,
-  "columns": [
-    "resultDescription",
-    "resultType",
-    "azure.provider",
-    "azure.resource_name",
-    "azure.resource_group"
-  ],
-  "sort": [
-    "@timestamp",
-    "desc"
-  ],
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"azure-*\",\"highlightAll\":true,\"version\":true,\"query\":{\"language\":\"lucene\",\"query\":\"azure.group:activity_log AND azure.category:Alert\"},\"filter\":[]}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/009a25c0-07d9-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/009a25c0-07d9-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index a3c126a77..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/009a25c0-07d9-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Errors [Azure Monitor]",
-  "visState": "{\"title\":\"Errors [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(255,222,85,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"1\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"Errors\",\"split_filters\":[{\"filter\":\"data.category:Errors\",\"label\":\"Errors\",\"color\":\"rgba(255,57,36,1)\",\"id\":\"ead38060-07d8-11e8-ac3e-4b165adb3935\"}]},{\"id\":\"2c144750-0881-11e8-b3d6-f7127beb4493\",\"color\":\"rgba(223,73,152,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"2c144751-0881-11e8-b3d6-f7127beb4493\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.5\",\"stacked\":\"none\",\"split_filters\":[{\"color\":\"rgba(244,78,59,1)\",\"id\":\"41fc5760-0881-11e8-b3d6-f7127beb4493\"}],\"terms_field\":\"azure.resource_name.keyword\",\"terms_size\":\"3\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics AND category:Errors\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/053b9cc0-137e-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/053b9cc0-137e-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 38a6efff2..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/053b9cc0-137e-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Service Health Overview [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Service Health Overview [Azure Monitor][Activity Log]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(175,0,88,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":\"1\",\"point_size\":1,\"fill\":\"0.5\",\"stacked\":\"none\",\"terms_field\":\"resultType.keyword\",\"filter\":\"resultType:Active\",\"label\":\"Activated\"},{\"id\":\"8b100950-1214-11e8-bd17-77879a6f9d49\",\"color\":\"rgba(1,155,143,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"8b100951-1214-11e8-bd17-77879a6f9d49\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.6\",\"stacked\":\"none\",\"label\":\"Resolved\",\"filter\":\"resultType:Resolved\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:activity_log AND azure.category:ServiceHealth\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/0ac34a40-138c-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/0ac34a40-138c-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index e71714f38..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/0ac34a40-138c-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Top 3 Users [Azure Monitor][Activity Log]",
-  "visState": "{\n  \"title\": \"Top 3 Users [Azure Monitor][Activity Log]\",\n  \"type\": \"horizontal_bar\",\n  \"params\": {\n    \"type\": \"histogram\",\n    \"grid\": {\n      \"categoryLines\": false,\n      \"style\": {\n        \"color\": \"#eee\"\n      }\n    },\n    \"categoryAxes\": [\n      {\n        \"id\": \"CategoryAxis-1\",\n        \"type\": \"category\",\n        \"position\": \"left\",\n        \"show\": true,\n        \"style\": {},\n        \"scale\": {\n          \"type\": \"linear\"\n        },\n        \"labels\": {\n          \"show\": true,\n          \"rotate\": 0,\n          \"filter\": false,\n          \"truncate\": 200\n        },\n        \"title\": {}\n      }\n    ],\n    \"valueAxes\": [\n      {\n        \"id\": \"ValueAxis-1\",\n        \"name\": \"LeftAxis-1\",\n        \"type\": \"value\",\n        \"position\": \"bottom\",\n        \"show\": false,\n        \"style\": {},\n        \"scale\": {\n          \"type\": \"linear\",\n          \"mode\": \"normal\"\n        },\n        \"labels\": {\n          \"show\": true,\n          \"rotate\": 75,\n          \"filter\": true,\n          \"truncate\": 100\n        },\n        \"title\": {\n          \"text\": \"Events\"\n        }\n      }\n    ],\n    \"seriesParams\": [\n      {\n        \"show\": true,\n        \"type\": \"histogram\",\n        \"mode\": \"normal\",\n        \"data\": {\n          \"label\": \"Events\",\n          \"id\": \"1\"\n        },\n        \"valueAxis\": \"ValueAxis-1\",\n        \"drawLinesBetweenPoints\": true,\n        \"showCircles\": true\n      }\n    ],\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"times\": [],\n    \"addTimeMarker\": false\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Events\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 3,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Users\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{\n  \"vis\": {\n    \"legendOpen\": false,\n    \"colors\": {\n      \"Events\": \"#019B8F\"\n    }\n  }\n}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:activity_log\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/0d5dd2c0-1201-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/0d5dd2c0-1201-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index b24fa95ad..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/0d5dd2c0-1201-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Resource Deletions [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Resource Deletions [Azure Monitor][Activity Log]\",\"type\":\"pie\",\"params\":{\"type\":\"pie\",\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true,\"labels\":{\"show\":true,\"values\":true,\"last_level\":true,\"truncate\":100}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.resource_type.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":25,\"order\":\"desc\",\"orderBy\":\"1\"}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND identity.authorization.action:*delete\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/0f1d8b80-11fe-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/0f1d8b80-11fe-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index f0b2a257b..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/0f1d8b80-11fe-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Administrative Activity Overview [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Administrative Activity Overview [Azure Monitor][Activity Log]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(1,155,143,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.4\",\"stacked\":\"none\",\"label\":\"Actions\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:activity_log and azure.category:Administrative\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/13d987a0-1398-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/13d987a0-1398-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 2ce078e3f..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/13d987a0-1398-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Subscriptions Tag Cloud [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Subscriptions Tag Cloud [Azure Monitor][Activity Log]\",\"type\":\"tagcloud\",\"params\":{\"scale\":\"linear\",\"orientation\":\"single\",\"minFontSize\":6,\"maxFontSize\":20},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.subscription.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\"}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/15b9f8d0-1216-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/15b9f8d0-1216-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 167de25bf..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/15b9f8d0-1216-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Alerts Count [Azure Monitor][Activity Log]",
-  "visState": "{\n  \"title\": \"Alerts Count [Azure Monitor][Activity Log]\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": false,\n    \"type\": \"metric\",\n    \"metric\": {\n      \"percentageMode\": false,\n      \"useRanges\": false,\n      \"colorSchema\": \"Green to Red\",\n      \"metricColorMode\": \"None\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 10000\n        }\n      ],\n      \"labels\": {\n        \"show\": true\n      },\n      \"invertColors\": false,\n      \"style\": {\n        \"bgFill\": \"#000\",\n        \"bgColor\": false,\n        \"labelColor\": false,\n        \"subText\": \"\",\n        \"fontSize\": 12\n      }\n    }\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Alerts\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"filters\",\n      \"schema\": \"group\",\n      \"params\": {\n        \"filters\": [\n          {\n            \"input\": {\n              \"query\": \"resultType:Activated\"\n            },\n            \"label\": \"Activated\"\n          },\n          {\n            \"input\": {\n              \"query\": \"resultType:Resolved\"\n            },\n            \"label\": \"Resolved\"\n          },\n          {\n            \"input\": {\n              \"query\": \"resultType:Succeeded\"\n            },\n            \"label\": \"Succeeded\"\n          }\n        ]\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:activity_log AND azure.category:Alert\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/176bd440-1226-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/176bd440-1226-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index d150483d4..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/176bd440-1226-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Testing",
-  "visState": "{\"title\":\"Testing\",\"type\":\"heatmap\",\"params\":{\"type\":\"heatmap\",\"addTooltip\":true,\"addLegend\":true,\"enableHover\":false,\"legendPosition\":\"right\",\"times\":[],\"colorsNumber\":4,\"colorSchema\":\"Greens\",\"setColorRange\":false,\"colorsRange\":[],\"invertColors\":false,\"percentageMode\":false,\"valueAxes\":[{\"show\":false,\"id\":\"ValueAxis-1\",\"type\":\"value\",\"scale\":{\"type\":\"linear\",\"defaultYExtents\":false},\"labels\":{\"show\":false,\"rotate\":0,\"color\":\"#555\"}}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.resource_type.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 23\":\"rgb(247,252,245)\",\"23 - 45\":\"rgb(199,233,192)\",\"45 - 68\":\"rgb(116,196,118)\",\"68 - 90\":\"rgb(35,139,69)\"}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/19c51b50-138b-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/19c51b50-138b-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 5c2bd424a..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/19c51b50-138b-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Activity by Resource Group [Azure Monitor][Activity Log]",
-  "visState": "{\n  \"title\": \"Activity by Resource Group [Azure Monitor][Activity Log]\",\n  \"type\": \"horizontal_bar\",\n  \"params\": {\n    \"type\": \"histogram\",\n    \"grid\": {\n      \"categoryLines\": false,\n      \"style\": {\n        \"color\": \"#eee\"\n      }\n    },\n    \"categoryAxes\": [\n      {\n        \"id\": \"CategoryAxis-1\",\n        \"type\": \"category\",\n        \"position\": \"left\",\n        \"show\": true,\n        \"style\": {},\n        \"scale\": {\n          \"type\": \"linear\"\n        },\n        \"labels\": {\n          \"show\": true,\n          \"rotate\": 0,\n          \"filter\": false,\n          \"truncate\": 200\n        },\n        \"title\": {}\n      }\n    ],\n    \"valueAxes\": [\n      {\n        \"id\": \"ValueAxis-1\",\n        \"name\": \"LeftAxis-1\",\n        \"type\": \"value\",\n        \"position\": \"bottom\",\n        \"show\": false,\n        \"style\": {},\n        \"scale\": {\n          \"type\": \"linear\",\n          \"mode\": \"normal\"\n        },\n        \"labels\": {\n          \"show\": true,\n          \"rotate\": 75,\n          \"filter\": true,\n          \"truncate\": 100\n        },\n        \"title\": {\n          \"text\": \"Count\"\n        }\n      }\n    ],\n    \"seriesParams\": [\n      {\n        \"show\": true,\n        \"type\": \"histogram\",\n        \"mode\": \"normal\",\n        \"data\": {\n          \"label\": \"Count\",\n          \"id\": \"1\"\n        },\n        \"valueAxis\": \"ValueAxis-1\",\n        \"drawLinesBetweenPoints\": true,\n        \"showCircles\": true\n      }\n    ],\n    \"addTooltip\": true,\n    \"addLegend\": true,\n    \"legendPosition\": \"right\",\n    \"times\": [],\n    \"addTimeMarker\": false\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {}\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"azure.resource_group.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Resource Group\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{\n  \"vis\": {\n    \"legendOpen\": false,\n    \"colors\": {\n      \"Count\": \"#019B8F\"\n    }\n  }\n}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:activity_log\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/1c509130-0853-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/1c509130-0853-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 0b74c6d18..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/1c509130-0853-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Storage Stats [Azure Monitor]",
-  "visState": "{\"title\":\"Storage Stats [Azure Monitor]\",\"type\":\"gauge\",\"params\":{\"type\":\"gauge\",\"addTooltip\":true,\"addLegend\":true,\"isDisplayWarning\":false,\"gauge\":{\"verticalSplit\":false,\"extendRange\":true,\"percentageMode\":true,\"gaugeType\":\"Arc\",\"gaugeStyle\":\"Full\",\"backStyle\":\"Full\",\"orientation\":\"vertical\",\"colorSchema\":\"Green to Red\",\"gaugeColorMode\":\"Labels\",\"colorsRange\":[{\"from\":0,\"to\":50},{\"from\":50,\"to\":75},{\"from\":75,\"to\":100}],\"invertColors\":false,\"labels\":{\"show\":true,\"color\":\"black\"},\"scale\":{\"show\":false,\"labels\":false,\"color\":\"#333\"},\"type\":\"meter\",\"style\":{\"bgWidth\":0.9,\"width\":0.9,\"mask\":false,\"bgMask\":false,\"maskBars\":50,\"bgFill\":\"#eee\",\"bgColor\":false,\"subText\":\"Storage Used\",\"fontSize\":60,\"labelColor\":true}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"avg\",\"schema\":\"metric\",\"params\":{\"field\":\"data.average\",\"customLabel\":\"AVG\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"max\",\"schema\":\"metric\",\"params\":{\"field\":\"data.average\",\"customLabel\":\"MAX\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 50\":\"rgb(0,104,55)\",\"50 - 75\":\"rgb(255,255,190)\",\"75 - 100\":\"rgb(165,0,38)\"}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"data.metricName:storage_percent\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/1c885a30-13b0-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/1c885a30-13b0-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index c08df944f..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/1c885a30-13b0-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Authorization Activity [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Authorization Activity [Azure Monitor][Activity Log]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(1,155,143,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"filter\":\"resultType:Success\",\"label\":\"Success\"},{\"id\":\"8a097400-13af-11e8-bdbe-d961aa20f52a\",\"color\":\"rgba(175,0,88,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"8a097401-13af-11e8-bdbe-d961aa20f52a\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"filter\":\"resultType:Failed\",\"label\":\"Failure\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:activity_log AND operationName:*LISTKEYS*\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/2060bce0-0840-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/2060bce0-0840-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index 6fbb02d09..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/2060bce0-0840-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Servers [Azure Monitor]",
-  "visState": "{\n  \"title\": \"Servers [Azure Monitor]\",\n  \"type\": \"table\",\n  \"params\": {\n    \"perPage\": 10,\n    \"showMeticsAtAllLevels\": false,\n    \"showPartialRows\": false,\n    \"showTotal\": false,\n    \"sort\": {\n      \"columnIndex\": null,\n      \"direction\": null\n    },\n    \"totalFunc\": \"sum\"\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"azure.resource_name.keyword\",\n        \"customLabel\": \"DBs\"\n      }\n    },\n    {\n      \"id\": \"4\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"azure.server.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Server\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"azure.resource_group.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Resource Group\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"azure.subscription.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Subscription\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{\n  \"vis\": {\n    \"params\": {\n      \"sort\": {\n        \"columnIndex\": null,\n        \"direction\": null\n      }\n    }\n  }\n}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"language\": \"lucene\",\n    \"query\": \"\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/20a043b0-13c1-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/20a043b0-13c1-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 54decf417..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/20a043b0-13c1-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Navigation SQL DB Queries [Azure Monitor]",
-  "visState": "{\"title\":\"Navigation SQL DB Queries [Azure Monitor]\",\"type\":\"markdown\",\"params\":{\"fontSize\":10,\"markdown\":\"### Azure Monitoring\\n\\n[Overview](#/dashboard/f110f010-11fc-11e8-8c94-a3d8d0cfd62b) | [Users](#/dashboard/06fa0b60-121a-11e8-8c94-a3d8d0cfd62b) | [Alerts](#/dashboard/16302750-1223-11e8-8c94-a3d8d0cfd62b) | [SQL DB](#/dashboard/91ba2090-07cb-11e8-adb5-e1a2d559cdf5) | [**SQL DB Queries**](#/dashboard/9adef750-08b0-11e8-93e5-299e2b5c963a)\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/23e31d20-1215-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/23e31d20-1215-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index e1cec4ac0..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/23e31d20-1215-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Alerts Overview [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Alerts Overview [Azure Monitor][Activity Log]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(175,0,88,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":\"3\",\"point_size\":1,\"fill\":\"0.5\",\"stacked\":\"none\",\"terms_field\":\"resultType.keyword\",\"filter\":\"resultType:Activated\",\"label\":\"Activated\"},{\"id\":\"8b100950-1214-11e8-bd17-77879a6f9d49\",\"color\":\"rgba(0,191,179,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"8b100951-1214-11e8-bd17-77879a6f9d49\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":\"1\",\"point_size\":1,\"fill\":\"0.6\",\"stacked\":\"none\",\"label\":\"Resolved or Succeeded\",\"filter\":\"resultType:Resolved OR resultType:Succeeded\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:activity_log AND azure.category:Alert\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/2404b5e0-0804-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/2404b5e0-0804-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index c9f251d8c..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/2404b5e0-0804-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Top Queries [Azure Monitor]",
-  "visState": "{\"title\":\"Top Queries [Azure Monitor]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"3\",\"enabled\":true,\"type\":\"max\",\"schema\":\"metric\",\"params\":{\"field\":\"sql_diagnostics_query_store_runtime_stats_properties.duration\",\"customLabel\":\"Max Duration (ms)\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"avg\",\"schema\":\"metric\",\"params\":{\"field\":\"sql_diagnostics_query_store_runtime_stats_properties.duration\",\"customLabel\":\"Average Duration (ms)\"}},{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Executions\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"sql_diagnostics_query_store_runtime_stats_properties.query_hash.keyword\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Query Hash\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"data.category:QueryStoreRuntimeStatistics\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/25eb1470-13bd-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/25eb1470-13bd-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index c206fdbbb..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/25eb1470-13bd-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Navigation Overview [Azure Monitor]",
-  "visState": "{\"title\":\"Navigation Overview [Azure Monitor]\",\"type\":\"markdown\",\"params\":{\"fontSize\":10,\"markdown\":\"### Azure Monitoring\\n\\n[**Overview**](#/dashboard/f110f010-11fc-11e8-8c94-a3d8d0cfd62b) | [Users](#/dashboard/06fa0b60-121a-11e8-8c94-a3d8d0cfd62b) | [Alerts](#/dashboard/16302750-1223-11e8-8c94-a3d8d0cfd62b) | [SQL DB](#/dashboard/91ba2090-07cb-11e8-adb5-e1a2d559cdf5) | [SQL DB Queries](#/dashboard/9adef750-08b0-11e8-93e5-299e2b5c963a)\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/27f9bd40-13ca-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/27f9bd40-13ca-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 73b173eee..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/27f9bd40-13ca-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Authorization Activity User [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Authorization Activity User [Azure Monitor][Activity Log]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(1,155,143,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"filter\":\"resultType:Success\",\"label\":\"Success\"},{\"id\":\"8a097400-13af-11e8-bdbe-d961aa20f52a\",\"color\":\"rgba(175,0,88,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"8a097401-13af-11e8-bdbe-d961aa20f52a\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"filter\":\"resultType:Fail\",\"label\":\"Failure\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:activity_log AND operationName:*LISTKEYS* AND azure.category:Administrative AND _exists_:identity.claims.name\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/2d11a9b0-1ac2-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/2d11a9b0-1ac2-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 777895899..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/2d11a9b0-1ac2-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Alerts Heatmap [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Alerts Heatmap [Azure Monitor][Activity Log]\",\"type\":\"heatmap\",\"params\":{\"type\":\"heatmap\",\"addTooltip\":true,\"addLegend\":true,\"enableHover\":false,\"legendPosition\":\"right\",\"times\":[],\"colorsNumber\":4,\"colorSchema\":\"Reds\",\"setColorRange\":false,\"colorsRange\":[{\"from\":0,\"to\":null}],\"invertColors\":false,\"percentageMode\":false,\"valueAxes\":[{\"show\":false,\"id\":\"ValueAxis-1\",\"type\":\"value\",\"scale\":{\"type\":\"linear\",\"defaultYExtents\":false},\"labels\":{\"show\":true,\"rotate\":0,\"color\":\"#555\"}}]},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.provider.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Provider\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"group\",\"params\":{\"field\":\"azure.resource_group.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Resource Group\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 12\":\"rgb(255,245,240)\",\"12 - 23\":\"rgb(252,187,161)\",\"23 - 34\":\"rgb(251,106,74)\",\"34 - 45\":\"rgb(203,24,29)\"},\"colors\":{\"34 - 45\":\"#BA43A9\",\"23 - 34\":\"#D683CE\",\"12 - 23\":\"#E5A8E2\",\"0 - 12\":\"#F9D9F9\"},\"legendOpen\":true}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"azure-*\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND azure.category:Alert\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/2e863080-1bef-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/2e863080-1bef-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index b307c6fc0..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/2e863080-1bef-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Resource Type Breakdown [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Resource Type Breakdown [Azure Monitor][Activity Log]\",\"type\":\"pie\",\"params\":{\"type\":\"pie\",\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":false,\"labels\":{\"show\":false,\"values\":true,\"last_level\":true,\"truncate\":100}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.resource_type.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\"}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"azure-*\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND _exists_:identity.claims.name\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/33072240-137f-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/33072240-137f-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 83aa35b65..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/33072240-137f-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Service Health Count [Azure Monitor][Activity Log]",
-  "visState": "{\n  \"title\": \"Service Health Count [Azure Monitor][Activity Log]\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": false,\n    \"type\": \"metric\",\n    \"metric\": {\n      \"percentageMode\": false,\n      \"useRanges\": false,\n      \"colorSchema\": \"Green to Red\",\n      \"metricColorMode\": \"None\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 10000\n        }\n      ],\n      \"labels\": {\n        \"show\": true\n      },\n      \"invertColors\": false,\n      \"style\": {\n        \"bgFill\": \"#000\",\n        \"bgColor\": false,\n        \"labelColor\": false,\n        \"subText\": \"\",\n        \"fontSize\": 12\n      }\n    }\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Incidents\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"filters\",\n      \"schema\": \"group\",\n      \"params\": {\n        \"filters\": [\n          {\n            \"input\": {\n              \"query\": \"resultType:Active\"\n            },\n            \"label\": \"Activated\"\n          },\n          {\n            \"input\": {\n              \"query\": \"resultType:Resolved\"\n            },\n            \"label\": \"Resolved\"\n          }\n        ]\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:activity_log AND azure.category:ServiceHealth\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/35de9400-1526-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/35de9400-1526-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 081256e6d..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/35de9400-1526-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Query Viewer [Azure Monitor][SQL DB]",
-  "visState": "{\n  \"title\": \"Query Viewer [Azure Monitor][SQL DB]\",\n  \"type\": \"table\",\n  \"params\": {\n    \"perPage\": 20,\n    \"showPartialRows\": false,\n    \"showMeticsAtAllLevels\": false,\n    \"sort\": {\n      \"columnIndex\": 5,\n      \"direction\": \"desc\"\n    },\n    \"showTotal\": false,\n    \"totalFunc\": \"sum\"\n  },\n  \"aggs\": [\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_id\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 1000,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Query ID\"\n      }\n    },\n    {\n      \"id\": \"5\",\n      \"enabled\": true,\n      \"type\": \"avg\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"sql_diagnostics_QueryStoreRuntimeStatistics_properties.duration\",\n        \"customLabel\": \"Average Duration (ms)\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_hash.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 1000,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Query Hash\"\n      }\n    },\n    {\n      \"id\": \"6\",\n      \"enabled\": true,\n      \"type\": \"max\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"sql_diagnostics_QueryStoreRuntimeStatistics_properties.duration\",\n        \"customLabel\": \"Max Duration (ms)\"\n      }\n    },\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Executions\"\n      }\n    },\n    {\n      \"id\": \"7\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"sql_diagnostics_QueryStoreRuntimeStatistics_properties.plan_id\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 1000,\n        \"order\": \"desc\",\n        \"orderBy\": \"5\",\n        \"customLabel\": \"Plan ID\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{\n  \"vis\": {\n    \"params\": {\n      \"sort\": {\n        \"columnIndex\": 5,\n        \"direction\": \"desc\"\n      }\n    }\n  }\n}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:sql_diagnostics AND azure.category:QueryStoreRuntimeStatistics AND _exists_:sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_id\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/381c5ad0-120c-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/381c5ad0-120c-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 91dbf39fe..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/381c5ad0-120c-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Alerts List [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Alerts List [Azure Monitor][Activity Log]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"resultDescription.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Alert\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"activity_log_Alert_properties.eventProperties.status.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Status\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"azure.resource_name.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":557,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Resource\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"azure.resource_group.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":true,\"missingBucketLabel\":\"Missing\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Resource Group\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND azure.category:Alert\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/3fb82260-1527-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/3fb82260-1527-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 549c4edad..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/3fb82260-1527-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Query Count [Azure Monitor][SQL DB]",
-  "visState": "{\n  \"title\": \"Query Count [Azure Monitor][SQL DB]\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": false,\n    \"type\": \"metric\",\n    \"metric\": {\n      \"percentageMode\": false,\n      \"useRanges\": false,\n      \"colorSchema\": \"Green to Red\",\n      \"metricColorMode\": \"None\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 10000\n        }\n      ],\n      \"labels\": {\n        \"show\": true\n      },\n      \"invertColors\": false,\n      \"style\": {\n        \"bgFill\": \"#000\",\n        \"bgColor\": false,\n        \"labelColor\": false,\n        \"subText\": \"\",\n        \"fontSize\": 20\n      }\n    }\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Queries Executed\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:sql_diagnostics AND azure.category:QueryStoreRuntimeStatistics AND _exists_:sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_id\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/418ce210-07e4-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/418ce210-07e4-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index a7821c539..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/418ce210-07e4-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Query Duration (ms) [Azure Monitor]",
-  "visState": "{\"title\":\"Query Duration (ms) [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"a5439470-07fd-11e8-92fe-81a50acfdb07\",\"color\":\"rgba(255,222,85,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"a5439471-07fd-11e8-92fe-81a50acfdb07\",\"type\":\"avg\",\"field\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.duration\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"bf5c2ed0-07fd-11e8-92fe-81a50acfdb07\",\"type\":\"moving_average\",\"field\":\"a5439471-07fd-11e8-92fe-81a50acfdb07\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"1\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"Query Duration\"},{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(0,191,179,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\",\"field\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.duration\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"4e9246e0-07e3-11e8-a756-61fb48b75e56\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.4\",\"stacked\":\"none\",\"terms_field\":\"azure.resource_name.keyword\",\"terms_order_by\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"terms_size\":\"3\",\"value_template\":\"{{value}}\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/4b9f1300-07ed-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/4b9f1300-07ed-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index 8a510c53e..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/4b9f1300-07ed-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Subscriptions [Azure Monitor]",
-  "visState": "{\"title\":\"Subscriptions [Azure Monitor]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"resource_name.keyword\",\"customLabel\":\"Databases\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"subscription.keyword\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Subscription\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/518cb600-0842-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/518cb600-0842-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index 37cf9e9c2..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/518cb600-0842-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Query Duration (ms) Single [Azure Monitor]",
-  "visState": "{\"title\":\"Query Duration (ms) Single [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"axis_formatter\":\"number\",\"axis_position\":\"left\",\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"series\":[{\"axis_position\":\"right\",\"chart_type\":\"bar\",\"color\":\"rgba(0,191,179,1)\",\"fill\":\"0.1\",\"formatter\":\"0a\",\"hide_in_legend\":1,\"id\":\"a5439470-07fd-11e8-92fe-81a50acfdb07\",\"label\":\"Query Duration\",\"line_width\":\"1\",\"metrics\":[{\"field\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.duration\",\"id\":\"a5439471-07fd-11e8-92fe-81a50acfdb07\",\"type\":\"avg\"},{\"field\":\"a5439471-07fd-11e8-92fe-81a50acfdb07\",\"id\":\"bf5c2ed0-07fd-11e8-92fe-81a50acfdb07\",\"minimize\":0,\"model\":\"simple\",\"settings\":\"\",\"type\":\"moving_average\",\"window\":\"\"}],\"point_size\":1,\"seperate_axis\":0,\"split_mode\":\"everything\",\"stacked\":\"none\",\"value_template\":\"{{value}} ms\"}],\"show_grid\":1,\"show_legend\":0,\"time_field\":\"@timestamp\",\"type\":\"timeseries\",\"filter\":\"azure.group:sql_diagnostics\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/5465b680-0809-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/5465b680-0809-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index de8a66937..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/5465b680-0809-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Read and Write I/O [Azure Monitor]",
-  "visState": "{\"title\":\"Read and Write I/O [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(0,191,179,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"sum\",\"field\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.logical_io_reads\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"dfe3d0d0-0808-11e8-b19d-a7e960a5b5ca\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"label\":\"Logical Reads\"},{\"id\":\"b9a2f290-0806-11e8-b19d-a7e960a5b5ca\",\"color\":\"rgba(255,222,85,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"b9a2f291-0806-11e8-b19d-a7e960a5b5ca\",\"type\":\"sum\",\"field\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.logical_io_writes\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"f0b3dcc0-0808-11e8-b19d-a7e960a5b5ca\",\"type\":\"moving_average\",\"field\":\"b9a2f291-0806-11e8-b19d-a7e960a5b5ca\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"label\":\"Logical Writes\"},{\"id\":\"53f923f0-0807-11e8-b19d-a7e960a5b5ca\",\"color\":\"rgba(223,73,152,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"53f923f1-0807-11e8-b19d-a7e960a5b5ca\",\"type\":\"sum\",\"field\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.physical_io_reads\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"03ccee50-0809-11e8-b19d-a7e960a5b5ca\",\"type\":\"moving_average\",\"field\":\"53f923f1-0807-11e8-b19d-a7e960a5b5ca\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"label\":\"Physical Reads\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/59510c50-0c9e-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/59510c50-0c9e-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 66df7cf62..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/59510c50-0c9e-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Database Info 1 [Azure Monitor]",
-  "visState": "{\n  \"title\": \"Database Info 1 [Azure Monitor]\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": false,\n    \"type\": \"metric\",\n    \"metric\": {\n      \"percentageMode\": false,\n      \"useRanges\": false,\n      \"colorSchema\": \"Green to Red\",\n      \"metricColorMode\": \"None\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 10000\n        }\n      ],\n      \"labels\": {\n        \"show\": true\n      },\n      \"invertColors\": false,\n      \"style\": {\n        \"bgFill\": \"#000\",\n        \"bgColor\": false,\n        \"labelColor\": false,\n        \"subText\": \"\",\n        \"fontSize\": 12\n      }\n    }\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"top_hits\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"azure.resource_name.keyword\",\n        \"aggregate\": \"concat\",\n        \"size\": 1,\n        \"sortField\": \"@timestamp\",\n        \"sortOrder\": \"desc\",\n        \"customLabel\": \"Database\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:sql_diagnostics\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/5c934df0-07db-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/5c934df0-07db-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index 9413e4b73..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/5c934df0-07db-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Errors [Azure Monitor]",
-  "visState": "{\n  \"title\": \"Errors [Azure Monitor]\",\n  \"type\": \"table\",\n  \"params\": {\n    \"perPage\": 10,\n    \"showMeticsAtAllLevels\": false,\n    \"showPartialRows\": false,\n    \"showTotal\": false,\n    \"sort\": {\n      \"columnIndex\": null,\n      \"direction\": null\n    },\n    \"totalFunc\": \"sum\"\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"top_hits\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"@timestamp\",\n        \"aggregate\": \"concat\",\n        \"size\": 1,\n        \"sortField\": \"@timestamp\",\n        \"sortOrder\": \"desc\",\n        \"customLabel\": \"Timestamp\"\n      }\n    },\n    {\n      \"id\": \"5\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"sql_diagnostics_Errors_properties.message.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 5,\n        \"order\": \"desc\",\n        \"orderBy\": \"_term\",\n        \"customLabel\": \"Error\"\n      }\n    },\n    {\n      \"id\": \"7\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"sql_diagnostics_Errors_properties.error_number\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 200,\n        \"order\": \"desc\",\n        \"orderBy\": \"_term\",\n        \"customLabel\": \"Error #\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"sql_diagnostics_Errors_properties.DatabaseName.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 5,\n        \"order\": \"desc\",\n        \"orderBy\": \"_term\",\n        \"customLabel\": \"Database\"\n      }\n    },\n    {\n      \"id\": \"6\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"sql_diagnostics_Errors_properties.ElasticPoolName.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 20,\n        \"order\": \"desc\",\n        \"orderBy\": \"_term\",\n        \"customLabel\": \"Elastic Pool\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{\n  \"vis\": {\n    \"params\": {\n      \"sort\": {\n        \"columnIndex\": null,\n        \"direction\": null\n      }\n    }\n  }\n}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"language\": \"lucene\",\n    \"query\": \"azure.group:sql_diagnostics AND azure.category:Errors\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/5dbd8b20-08a1-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/5dbd8b20-08a1-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 22374e8f1..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/5dbd8b20-08a1-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Errors Single [Azure Monitor]",
-  "visState": "{\"title\":\"Errors Single [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(223,73,152,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.3\",\"stacked\":\"none\",\"label\":\"Errors\",\"split_filters\":[{\"filter\":\"data.category:Errors\",\"label\":\"Errors\",\"color\":\"rgba(255,57,36,1)\",\"id\":\"ead38060-07d8-11e8-ac3e-4b165adb3935\"}]}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics AND azure.category:Errors\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/5e89e2b0-13a0-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/5e89e2b0-13a0-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 5701ce362..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/5e89e2b0-13a0-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Select Combo [Azure Monitor]",
-  "visState": "{\"title\":\"Select Combo [Azure Monitor]\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1517598395667\",\"indexPattern\":\"azure-*\",\"fieldName\":\"azure.subscription.keyword\",\"label\":\"Subscription\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":100,\"order\":\"desc\"}},{\"id\":\"1518843942322\",\"indexPattern\":\"azure-*\",\"fieldName\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name.keyword\",\"label\":\"User Email\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":100,\"order\":\"desc\"}}],\"updateFiltersOnChange\":true,\"useTimeFilter\":false},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/5ff32870-08a4-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/5ff32870-08a4-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index afccb38f3..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/5ff32870-08a4-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Storage Utilization Single [Azure Monitor]",
-  "visState": "{\"title\":\"Storage Utilization Single [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(0,191,179,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\",\"field\":\"average\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"ac54e1d0-0850-11e8-8a9e-77e15a1ba1ec\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"data.metricName:storage_percent\",\"label\":\"Database Storage %\",\"color\":\"#68BC00\",\"id\":\"b0e7fe80-0850-11e8-8a9e-77e15a1ba1ec\"}],\"label\":\"Storage\",\"value_template\":\"{{value}}%\",\"axis_max\":\"100\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"axis_max\":\"100\",\"filter\":\"azure.group:sql_diagnostics AND metricName:storage_percent\",\"axis_min\":\"0\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/647b8770-11ff-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/647b8770-11ff-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index b79a12364..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/647b8770-11ff-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Category Breakdown [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Category Breakdown [Azure Monitor][Activity Log]\",\"type\":\"pie\",\"params\":{\"type\":\"pie\",\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"bottom\",\"isDonut\":false,\"labels\":{\"show\":true,\"values\":true,\"last_level\":true,\"truncate\":100}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.category.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":25,\"order\":\"desc\",\"orderBy\":\"1\"}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/65e23580-1382-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/65e23580-1382-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index b43bd480b..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/65e23580-1382-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Service Health Metric [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Service Health Metric [Azure Monitor][Activity Log]\",\"type\":\"metric\",\"params\":{\"addTooltip\":true,\"addLegend\":false,\"type\":\"metric\",\"metric\":{\"percentageMode\":false,\"useRanges\":false,\"colorSchema\":\"Green to Red\",\"metricColorMode\":\"None\",\"colorsRange\":[{\"from\":0,\"to\":10000}],\"labels\":{\"show\":true},\"invertColors\":false,\"style\":{\"bgFill\":\"#000\",\"bgColor\":false,\"labelColor\":false,\"subText\":\"\",\"fontSize\":12}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Service Health\"}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND azure.category:ServiceHealth\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/68bd4dd0-0851-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/68bd4dd0-0851-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index b007f7b0f..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/68bd4dd0-0851-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Database Overview Info [Azure Monitor]",
-  "visState": "{\"title\":\"Database Overview Info [Azure Monitor]\",\"type\":\"metric\",\"params\":{\"addTooltip\":true,\"addLegend\":false,\"type\":\"metric\",\"metric\":{\"percentageMode\":false,\"useRanges\":false,\"colorSchema\":\"Green to Red\",\"metricColorMode\":\"None\",\"colorsRange\":[{\"from\":0,\"to\":10000}],\"labels\":{\"show\":true},\"invertColors\":false,\"style\":{\"bgFill\":\"#000\",\"bgColor\":false,\"labelColor\":false,\"subText\":\"\",\"fontSize\":18}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"top_hits\",\"schema\":\"metric\",\"params\":{\"field\":\"resource_name\",\"aggregate\":\"concat\",\"size\":1,\"sortField\":\"@timestamp\",\"sortOrder\":\"desc\",\"customLabel\":\"Database\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"top_hits\",\"schema\":\"metric\",\"params\":{\"field\":\"server.keyword\",\"aggregate\":\"concat\",\"size\":1,\"sortField\":\"@timestamp\",\"sortOrder\":\"desc\",\"customLabel\":\"Server\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"top_hits\",\"schema\":\"metric\",\"params\":{\"field\":\"resource_group.keyword\",\"aggregate\":\"concat\",\"size\":1,\"sortField\":\"@timestamp\",\"sortOrder\":\"desc\",\"customLabel\":\"Resource Group\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"top_hits\",\"schema\":\"metric\",\"params\":{\"field\":\"subscription.keyword\",\"aggregate\":\"concat\",\"size\":1,\"sortField\":\"@timestamp\",\"sortOrder\":\"desc\",\"customLabel\":\"Subscription\"}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"data.metricName:dtu_consumption_percent\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/68dd8530-083f-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/68dd8530-083f-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index 5fa22ba21..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/68dd8530-083f-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Navigation SQL DB [Azure Monitor]",
-  "visState": "{\"title\":\"Navigation SQL DB [Azure Monitor]\",\"type\":\"markdown\",\"params\":{\"fontSize\":10,\"markdown\":\"### Azure Monitoring\\n\\n[Overview](#/dashboard/f110f010-11fc-11e8-8c94-a3d8d0cfd62b) | [Users](#/dashboard/06fa0b60-121a-11e8-8c94-a3d8d0cfd62b) | [Alerts](#/dashboard/16302750-1223-11e8-8c94-a3d8d0cfd62b) | [**SQL DB**](#/dashboard/91ba2090-07cb-11e8-adb5-e1a2d559cdf5) | [SQL DB Queries](#/dashboard/9adef750-08b0-11e8-93e5-299e2b5c963a)\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/6bab50c0-0877-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/6bab50c0-0877-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 55d8ddd9c..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/6bab50c0-0877-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "DTU Utilization [Azure Monitor]",
-  "visState": "{\"title\":\"DTU Utilization [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(255,222,85,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\",\"field\":\"average\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"b75f7650-0876-11e8-8a9e-77e15a1ba1ec\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"1\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"data.metricName:dtu_consumption_percent\",\"label\":\"DTU %\",\"color\":\"#68BC00\",\"id\":\"bdf1be60-0876-11e8-8a9e-77e15a1ba1ec\"}],\"label\":\"DTU\",\"value_template\":\"{{value}}%\"},{\"id\":\"e92aa790-0876-11e8-8a9e-77e15a1ba1ec\",\"color\":\"rgba(1,155,143,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"e92aa791-0876-11e8-8a9e-77e15a1ba1ec\",\"type\":\"avg\",\"field\":\"average\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"1544c900-0877-11e8-8a9e-77e15a1ba1ec\",\"type\":\"moving_average\",\"field\":\"e92aa791-0876-11e8-8a9e-77e15a1ba1ec\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.4\",\"stacked\":\"none\",\"terms_field\":\"azure.resource_name.keyword\",\"terms_size\":\"3\",\"terms_direction\":\"desc\",\"value_template\":\"{{value}}%\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics AND metricName:dtu_consumption_percent\",\"axis_max\":\"100\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/6d71abf0-0842-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/6d71abf0-0842-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index 3b62e3024..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/6d71abf0-0842-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Query Wait Time (ms) Single [Azure Monitor]",
-  "visState": "{\"title\":\"Query Wait Time (ms) Single [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"07fbc160-07fd-11e8-92fe-81a50acfdb07\",\"color\":\"rgba(0,191,179,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"07fbc161-07fd-11e8-92fe-81a50acfdb07\",\"type\":\"avg\",\"field\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.total_query_wait_time_ms\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"197b9550-07fd-11e8-92fe-81a50acfdb07\",\"type\":\"moving_average\",\"field\":\"07fbc161-07fd-11e8-92fe-81a50acfdb07\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0a\",\"chart_type\":\"bar\",\"line_width\":\"1\",\"point_size\":\"1\",\"fill\":\"0.1\",\"stacked\":\"none\",\"label\":\"Query Wait Time\",\"value_template\":\"{{value}} ms\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/727c5be0-1201-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/727c5be0-1201-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index d9e84abb8..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/727c5be0-1201-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Resource Creations [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Resource Creations [Azure Monitor][Activity Log]\",\"type\":\"pie\",\"params\":{\"type\":\"pie\",\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":true,\"labels\":{\"show\":true,\"values\":true,\"last_level\":true,\"truncate\":100}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.resource_type.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":25,\"order\":\"desc\",\"orderBy\":\"1\"}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND identity.authorization.action:*write\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/72ab38b0-0c9e-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/72ab38b0-0c9e-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 2a0151044..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/72ab38b0-0c9e-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Database Info 3 [Azure Monitor]",
-  "visState": "{\n  \"title\": \"Database Info 3 [Azure Monitor]\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": false,\n    \"type\": \"metric\",\n    \"metric\": {\n      \"percentageMode\": false,\n      \"useRanges\": false,\n      \"colorSchema\": \"Green to Red\",\n      \"metricColorMode\": \"None\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 10000\n        }\n      ],\n      \"labels\": {\n        \"show\": true\n      },\n      \"invertColors\": false,\n      \"style\": {\n        \"bgFill\": \"#000\",\n        \"bgColor\": false,\n        \"labelColor\": false,\n        \"subText\": \"\",\n        \"fontSize\": 12\n      }\n    }\n  },\n  \"aggs\": [\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"top_hits\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"azure.resource_group.keyword\",\n        \"aggregate\": \"concat\",\n        \"size\": 1,\n        \"sortField\": \"@timestamp\",\n        \"sortOrder\": \"desc\",\n        \"customLabel\": \"Resource Group\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:sql_diagnostics\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/74680350-1382-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/74680350-1382-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 0d05c4a07..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/74680350-1382-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Alerts Metric [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Alerts Metric [Azure Monitor][Activity Log]\",\"type\":\"metric\",\"params\":{\"addTooltip\":true,\"addLegend\":false,\"type\":\"metric\",\"metric\":{\"percentageMode\":false,\"useRanges\":false,\"colorSchema\":\"Green to Red\",\"metricColorMode\":\"None\",\"colorsRange\":[{\"from\":0,\"to\":10000}],\"labels\":{\"show\":true},\"invertColors\":false,\"style\":{\"bgFill\":\"#000\",\"bgColor\":false,\"labelColor\":false,\"subText\":\"\",\"fontSize\":12}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Alerts\"}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND azure.category:Alert\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/79085650-0985-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/79085650-0985-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 630900bc7..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/79085650-0985-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Select Resource Group [Azure Monitor]",
-  "visState": "{\"title\":\"Select Resource Group [Azure Monitor]\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1517598395667\",\"indexPattern\":\"d6962b40-06f5-11e8-adb5-e1a2d559cdf5\",\"fieldName\":\"resource_group.keyword\",\"label\":\"Resource Group\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":100,\"order\":\"desc\"}}],\"updateFiltersOnChange\":true},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/7fe767b0-11fd-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/7fe767b0-11fd-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index ff6aa714f..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/7fe767b0-11fd-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Geo Activity [Azure Monitor]",
-  "visState": "{\"title\":\"Geo Activity [Azure Monitor]\",\"type\":\"tile_map\",\"params\":{\"mapType\":\"Scaled Circle Markers\",\"isDesaturated\":true,\"addTooltip\":true,\"heatClusterSize\":1.5,\"legendPosition\":\"bottomright\",\"mapZoom\":2,\"mapCenter\":[0,0],\"wms\":{\"enabled\":false,\"options\":{\"format\":\"image/png\",\"transparent\":true},\"baseLayersAreLoaded\":{},\"tmsLayers\":[{\"id\":\"road_map\",\"url\":\"https://tiles.maps.elastic.co/v2/default/{z}/{x}/{y}.png?elastic_tile_service_tos=agree&my_app_name=kibana&my_app_version=6.2.1&license=c16ab9db-b270-4466-9535-a15cb66a4df5\",\"minZoom\":0,\"maxZoom\":18,\"attribution\":\"<p>&#169; <a href=\\\"http://www.openstreetmap.org/copyright\\\">OpenStreetMap</a> contributors | <a href=\\\"https://www.elastic.co/elastic-maps-service\\\">Elastic Maps Service</a></p>&#10;\",\"subdomains\":[]}],\"selectedTmsLayer\":{\"id\":\"road_map\",\"url\":\"https://tiles.maps.elastic.co/v2/default/{z}/{x}/{y}.png?elastic_tile_service_tos=agree&my_app_name=kibana&my_app_version=6.2.1&license=c16ab9db-b270-4466-9535-a15cb66a4df5\",\"minZoom\":0,\"maxZoom\":18,\"attribution\":\"<p>&#169; <a href=\\\"http://www.openstreetmap.org/copyright\\\">OpenStreetMap</a> contributors | <a href=\\\"https://www.elastic.co/elastic-maps-service\\\">Elastic Maps Service</a></p>&#10;\",\"subdomains\":[]}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"geohash_grid\",\"schema\":\"segment\",\"params\":{\"field\":\"geoip.location\",\"autoPrecision\":true,\"isFilteredByCollar\":true,\"useGeocentroid\":true,\"precision\":2}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"azure-*\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND _exists_:identity.claims.name\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/820e7fb0-11f8-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/820e7fb0-11f8-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 1710b2dcd..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/820e7fb0-11f8-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Blockings Single [Azure Monitor]",
-  "visState": "{\"title\":\"Blockings Single [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(233,228,16,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\",\"field\":\"sql_diagnostics_query_store_runtime_stats_properties.logical_io_reads\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"dfe3d0d0-0808-11e8-b19d-a7e960a5b5ca\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"Blockings\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"logstash-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics AND data.category:Blocks\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/849be630-0985-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/849be630-0985-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 7fe90e777..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/849be630-0985-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Select Server [Azure Monitor]",
-  "visState": "{\"title\":\"Select Server [Azure Monitor]\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1517598395667\",\"indexPattern\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"fieldName\":\"azure.server.keyword\",\"label\":\"Server\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":100,\"order\":\"desc\"}}],\"updateFiltersOnChange\":true,\"useTimeFilter\":false},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/85cee3b0-07df-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/85cee3b0-07df-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index b3672233d..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/85cee3b0-07df-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Database Wait Time (ms) [Azure Monitor]",
-  "visState": "{\"title\":\"Database Wait Time (ms) [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"0dc3f820-07fc-11e8-92fe-81a50acfdb07\",\"color\":\"rgba(255,222,85,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"0dc3f821-07fc-11e8-92fe-81a50acfdb07\",\"type\":\"avg\",\"field\":\"sql_diagnostics_DatabaseWaitStatistics_properties.delta_wait_time_ms\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"2fecef10-07fc-11e8-92fe-81a50acfdb07\",\"type\":\"moving_average\",\"field\":\"0dc3f821-07fc-11e8-92fe-81a50acfdb07\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"1\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"DB Wait\",\"value_template\":\"{{value}} ms\"},{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(1,155,143,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\",\"field\":\"sql_diagnostics_DatabaseWaitStatistics_properties.delta_wait_time_ms\"},{\"settings\":\"\",\"minimize\":null,\"window\":\"\",\"model\":\"simple\",\"id\":\"2c2449f0-07de-11e8-ac3e-4b165adb3935\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"bar\",\"line_width\":\"1\",\"point_size\":1,\"fill\":\"0.4\",\"stacked\":\"none\",\"split_filters\":[{\"color\":\"#68BC00\",\"id\":\"7383c5f0-07de-11e8-ac3e-4b165adb3935\"}],\"terms_field\":\"azure.resource_name.keyword\",\"terms_order_by\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"label\":\"\",\"split_color_mode\":\"gradient\",\"terms_size\":\"3\",\"hide_in_legend\":0,\"value_template\":\"{{value}} ms\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/880a53f0-080f-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/880a53f0-080f-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index cad198ece..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/880a53f0-080f-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Databases [Azure Monitor]",
-  "visState": "{\"title\":\"Databases [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"axis_formatter\":\"number\",\"axis_max\":\"100\",\"axis_position\":\"left\",\"bar_color_rules\":[{\"id\":\"8f26aa90-0872-11e8-8a9e-77e15a1ba1ec\"}],\"drilldown_url\":\"#dashboard/aaf909b0-0800-11e8-adb5-e1a2d559cdf5?_a=(description:'',filters:!(('$state':(store:appState),meta:(alias:!n,controlledBy:'1517598395667',disabled:!f,index:'73e18ac0-104c-11e8-8c94-a3d8d0cfd62b',key:azure.db_unique_id.keyword,negate:!f,params:(query:'{{key}}',type:phrase),type:phrase,value:'{{key}}'),query:(match:(azure.db_unique_id.keyword:(query:'{{key}}',type:phrase))))))\",\"filter\":\"azure.group:sql_diagnostics\",\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"pivot_id\":\"azure.db_unique_id.keyword\",\"pivot_label\":\"Database\",\"pivot_rows\":\"20\",\"series\":[{\"aggregate_by\":null,\"aggregate_function\":null,\"axis_position\":\"right\",\"chart_type\":\"line\",\"color\":\"#68BC00\",\"color_rules\":[{\"id\":\"dfdd33f0-0872-11e8-8a9e-77e15a1ba1ec\",\"opperator\":\"gte\",\"text\":\"rgba(244,78,59,1)\",\"value\":75}],\"fill\":\"0.8\",\"filter\":\"metricName:dtu_consumption_percent\",\"formatter\":null,\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"label\":\"DTU\",\"line_width\":\"3\",\"metrics\":[{\"field\":\"average\",\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\"}],\"offset_time\":\"\",\"point_size\":1,\"seperate_axis\":0,\"split_filters\":[{\"color\":\"#68BC00\",\"filter\":\"data.metricName:dtu_consumption_percent\",\"id\":\"5cc3d630-080f-11e8-b19d-a7e960a5b5ca\",\"label\":\"DTU %\"}],\"split_mode\":\"filters\",\"stacked\":\"none\",\"trend_arrows\":0,\"value_template\":\"{{value}}%\"},{\"axis_position\":\"right\",\"chart_type\":\"line\",\"color\":\"#68BC00\",\"color_rules\":[{\"id\":\"632bf0a0-0875-11e8-8a9e-77e15a1ba1ec\"}],\"fill\":0.5,\"filter\":\"azure.category:Errors\",\"formatter\":\"number\",\"id\":\"4b4159d0-0875-11e8-8a9e-77e15a1ba1ec\",\"label\":\"Errors\",\"line_width\":1,\"metrics\":[{\"id\":\"4b4159d1-0875-11e8-8a9e-77e15a1ba1ec\",\"type\":\"count\"}],\"point_size\":1,\"seperate_axis\":0,\"split_mode\":\"everything\",\"stacked\":\"none\"}],\"show_grid\":1,\"show_legend\":1,\"time_field\":\"@timestamp\",\"type\":\"table\"},\"aggs\":[]}",
-  "uiStateJSON": "{\"table\":{\"sort\":{\"column\":\"4b4159d0-0875-11e8-8a9e-77e15a1ba1ec\",\"order\":\"desc\"}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/88dcf980-084c-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/88dcf980-084c-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index edbff7648..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/88dcf980-084c-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Select Database [Azure Monitor]",
-  "visState": "{\"title\":\"Select Database [Azure Monitor]\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1517598395667\",\"indexPattern\":\"azure-*\",\"fieldName\":\"azure.db_unique_id.keyword\",\"label\":\"Database\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":false,\"size\":20,\"order\":\"desc\"}}],\"updateFiltersOnChange\":true,\"useTimeFilter\":false},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/890f3af0-093a-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/890f3af0-093a-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 361aa5017..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/890f3af0-093a-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Select Subscription [Azure Monitor]",
-  "visState": "{\"title\":\"Select Subscription [Azure Monitor]\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1517598395667\",\"indexPattern\":\"azure-*\",\"fieldName\":\"azure.subscription.keyword\",\"label\":\"Select Subscription\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":100,\"order\":\"desc\"}}],\"updateFiltersOnChange\":true,\"useTimeFilter\":false},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/8e2e0480-13bc-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/8e2e0480-13bc-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index c283a2cdc..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/8e2e0480-13bc-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Navigation Alerts [Azure Monitor]",
-  "visState": "{\"title\":\"Navigation Alerts [Azure Monitor]\",\"type\":\"markdown\",\"params\":{\"fontSize\":10,\"markdown\":\"### Azure Monitoring\\n\\n[Overview](#/dashboard/f110f010-11fc-11e8-8c94-a3d8d0cfd62b) | [Users](#/dashboard/06fa0b60-121a-11e8-8c94-a3d8d0cfd62b) | [**Alerts**](#/dashboard/16302750-1223-11e8-8c94-a3d8d0cfd62b) | [SQL DB](#/dashboard/91ba2090-07cb-11e8-adb5-e1a2d559cdf5) | [SQL DB Queries](#/dashboard/9adef750-08b0-11e8-93e5-299e2b5c963a)\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/90045780-1382-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/90045780-1382-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index cbb859488..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/90045780-1382-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Administrative Metric [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Administrative Metric [Azure Monitor][Activity Log]\",\"type\":\"metric\",\"params\":{\"addTooltip\":true,\"addLegend\":false,\"type\":\"metric\",\"metric\":{\"percentageMode\":false,\"useRanges\":false,\"colorSchema\":\"Green to Red\",\"metricColorMode\":\"None\",\"colorsRange\":[{\"from\":0,\"to\":10000}],\"labels\":{\"show\":true},\"invertColors\":false,\"style\":{\"bgFill\":\"#000\",\"bgColor\":false,\"labelColor\":false,\"subText\":\"\",\"fontSize\":12}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Administrative\"}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND azure.category:Administrative\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/90ed5940-0850-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/90ed5940-0850-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 51bf4679b..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/90ed5940-0850-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Database Size [Azure Monitor]",
-  "visState": "{\"title\":\"Database Size [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(0,191,179,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\",\"field\":\"average\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"bytes\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.3\",\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"data.metricName:storage\",\"label\":\"Storage Used\",\"color\":\"#68BC00\",\"id\":\"5b487040-0850-11e8-8a9e-77e15a1ba1ec\"}],\"label\":\"GB\",\"hide_in_legend\":1}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics AND metricName:storage\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/934c6780-138b-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/934c6780-138b-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 2cf6ddee4..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/934c6780-138b-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Resource Creations and Deletions 2 [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Resource Creations and Deletions 2 [Azure Monitor][Activity Log]\",\"type\":\"horizontal_bar\",\"params\":{\"type\":\"histogram\",\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":200},\"title\":{}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"bottom\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":75,\"filter\":true,\"truncate\":100},\"title\":{\"text\":\"Count\"}}],\"seriesParams\":[{\"show\":true,\"type\":\"histogram\",\"mode\":\"stacked\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"valueAxis\":\"ValueAxis-1\",\"drawLinesBetweenPoints\":true,\"showCircles\":true}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.resource_type.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Resource Type\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"filters\",\"schema\":\"group\",\"params\":{\"filters\":[{\"input\":{\"query\":\"identity.authorization.action:*write\"},\"label\":\"Creations\"},{\"input\":{\"query\":\"identity.authorization.action:*delete\"},\"label\":\"Deletions\"}]}}]}",
-  "uiStateJSON": "{\"vis\":{\"legendOpen\":false}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/94e47b60-1385-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/94e47b60-1385-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index e4507d79f..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/94e47b60-1385-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Alerts Overview 2 [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Alerts Overview 2 [Azure Monitor][Activity Log]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(223,73,152,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.5\",\"stacked\":\"none\",\"terms_field\":\"resultType.keyword\",\"filter\":\"resultType:Activated\",\"label\":\"Activated\"},{\"id\":\"8b100950-1214-11e8-bd17-77879a6f9d49\",\"color\":\"rgba(0,191,179,1)\",\"split_mode\":\"filter\",\"metrics\":[{\"id\":\"8b100951-1214-11e8-bd17-77879a6f9d49\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.6\",\"stacked\":\"none\",\"label\":\"Resolved or Succeeded\",\"filter\":\"resultType:Resolved OR resultType:Succeeded\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:activity_log AND azure.category:Alert\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/983722f0-087b-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/983722f0-087b-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 2c4fcde9c..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/983722f0-087b-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Top Queries [Azure Monitor]",
-  "visState": "{\"title\":\"Top Queries [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"table\",\"series\":[{\"id\":\"556ca980-08a9-11e8-b3d6-f7127beb4493\",\"color\":\"#68BC00\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"556ca981-08a9-11e8-b3d6-f7127beb4493\",\"type\":\"max\",\"field\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_id\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"color_rules\":[{\"id\":\"57810a90-08a9-11e8-b3d6-f7127beb4493\"}],\"label\":\"Query ID\"},{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"#68BC00\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\",\"field\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.duration\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"color_rules\":[{\"id\":\"6c7a15a0-087b-11e8-b3d6-f7127beb4493\"}],\"label\":\"Average Duration (ms)\"},{\"id\":\"374a3590-087b-11e8-b3d6-f7127beb4493\",\"color\":\"#68BC00\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"374a3591-087b-11e8-b3d6-f7127beb4493\",\"type\":\"max\",\"field\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.duration\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Max Duration (ms)\",\"color_rules\":[{\"id\":\"8a84f8d0-087b-11e8-b3d6-f7127beb4493\"}]},{\"id\":\"f6966090-087b-11e8-b3d6-f7127beb4493\",\"color\":\"#68BC00\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"f6966091-087b-11e8-b3d6-f7127beb4493\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"a\",\"chart_type\":\"line\",\"line_width\":1,\"point_size\":1,\"fill\":0.5,\"stacked\":\"none\",\"label\":\"Executions\",\"color_rules\":[{\"id\":\"34c7b3f0-087c-11e8-b3d6-f7127beb4493\"}]}],\"time_field\":\"@timestamp\",\"index_pattern\":\"logstash-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"show_grid\":1,\"bar_color_rules\":[{\"id\":\"f31ebb70-087a-11e8-b3d6-f7127beb4493\"}],\"pivot_id\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_hash.keyword\",\"pivot_label\":\"Query Hash\",\"pivot_rows\":\"20\",\"filter\":\"azure.group:sql_diagnostics AND azure.category:QueryStoreRuntimeStatistics AND NOT sql_diagnostics_query_store_runtime_stats_properties.query_id:0\"},\"aggs\":[]}",
-  "uiStateJSON": "{\"table\":{\"sort\":{\"column\":\"556ca980-08a9-11e8-b3d6-f7127beb4493\",\"order\":\"asc\"}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/9bb5e3e0-0843-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/9bb5e3e0-0843-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index a0e0847fa..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/9bb5e3e0-0843-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Database Wait Time (ms) Single [Azure Monitor]",
-  "visState": "{\"title\":\"Database Wait Time (ms) Single [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"0dc3f820-07fc-11e8-92fe-81a50acfdb07\",\"color\":\"rgba(0,191,179,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"0dc3f821-07fc-11e8-92fe-81a50acfdb07\",\"type\":\"avg\",\"field\":\"sql_diagnostics_DatabaseWaitStatistics_properties.delta_wait_time_ms\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"2fecef10-07fc-11e8-92fe-81a50acfdb07\",\"type\":\"moving_average\",\"field\":\"0dc3f821-07fc-11e8-92fe-81a50acfdb07\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0a\",\"chart_type\":\"bar\",\"line_width\":\"1\",\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"label\":\"Database Wait Time (ms)\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/a0340090-1389-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/a0340090-1389-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 0c802415b..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/a0340090-1389-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Users List [Azure Monitor][Activity Log]",
-  "visState": "{\n  \"title\": \"Users List [Azure Monitor][Activity Log]\",\n  \"type\": \"table\",\n  \"params\": {\n    \"perPage\": 10,\n    \"showPartialRows\": false,\n    \"showMeticsAtAllLevels\": false,\n    \"sort\": {\n      \"columnIndex\": null,\n      \"direction\": null\n    },\n    \"showTotal\": false,\n    \"totalFunc\": \"sum\"\n  },\n  \"aggs\": [\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 20,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Email\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 5,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"First Name\"\n      }\n    },\n    {\n      \"id\": \"4\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"bucket\",\n      \"params\": {\n        \"field\": \"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 5,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Last Name\"\n      }\n    },\n    {\n      \"id\": \"5\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"callerIpAddress.keyword\",\n        \"customLabel\": \"IPs\"\n      }\n    },\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"customLabel\": \"Actions\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{\n  \"vis\": {\n    \"params\": {\n      \"sort\": {\n        \"columnIndex\": null,\n        \"direction\": null\n      }\n    }\n  }\n}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:activity_log\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/a71ed100-07e5-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/a71ed100-07e5-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index 45bee3a0e..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/a71ed100-07e5-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Query Wait Time (ms) [Azure Monitor]",
-  "visState": "{\"title\":\"Query Wait Time (ms) [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"07fbc160-07fd-11e8-92fe-81a50acfdb07\",\"color\":\"rgba(255,222,85,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"07fbc161-07fd-11e8-92fe-81a50acfdb07\",\"type\":\"avg\",\"field\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.total_query_wait_time_ms\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"197b9550-07fd-11e8-92fe-81a50acfdb07\",\"type\":\"moving_average\",\"field\":\"07fbc161-07fd-11e8-92fe-81a50acfdb07\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"1\",\"point_size\":\"1\",\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"Query Wait\"},{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(0,191,179,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\",\"field\":\"sql_diagnostics_QueryStoreWaitStatistics_properties.total_query_wait_time_ms\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"833d0680-07e5-11e8-a756-61fb48b75e56\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.4\",\"stacked\":\"none\",\"terms_field\":\"azure.resource_name.keyword\",\"terms_size\":\"3\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/aa01fff0-13bb-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/aa01fff0-13bb-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 2add45a51..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/aa01fff0-13bb-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Navigation Users [Azure Monitor]",
-  "visState": "{\"title\":\"Navigation Users [Azure Monitor]\",\"type\":\"markdown\",\"params\":{\"fontSize\":10,\"markdown\":\"### Azure Monitoring\\n\\n[Overview](#/dashboard/f110f010-11fc-11e8-8c94-a3d8d0cfd62b) | [**Users**](#/dashboard/06fa0b60-121a-11e8-8c94-a3d8d0cfd62b) | [Alerts](#/dashboard/16302750-1223-11e8-8c94-a3d8d0cfd62b) | [SQL DB](#/dashboard/91ba2090-07cb-11e8-adb5-e1a2d559cdf5) | [SQL DB Queries](#/dashboard/9adef750-08b0-11e8-93e5-299e2b5c963a)\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/ac81f600-11f8-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/ac81f600-11f8-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index a1a20c3c6..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/ac81f600-11f8-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Timeouts Single [Azure Monitor]",
-  "visState": "{\"title\":\"Timeouts Single [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(233,228,16,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\",\"field\":\"sql_diagnostics_query_store_runtime_stats_properties.logical_io_reads\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"dfe3d0d0-0808-11e8-b19d-a7e960a5b5ca\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"Timeouts\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"logstash-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics AND data.category:Timeouts\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/af0fee20-07d7-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/af0fee20-07d7-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index bf9bb614c..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/af0fee20-07d7-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Databases++ [Azure Monitor]",
-  "visState": "{\"title\":\"Databases++ [Azure Monitor]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showMeticsAtAllLevels\":false,\"showPartialRows\":false,\"showTotal\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"avg\",\"schema\":\"metric\",\"params\":{\"field\":\"data.average\",\"customLabel\":\"Average DTU %\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"resource_name.keyword\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"_term\",\"customLabel\":\"Database\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"server.keyword\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"_term\",\"customLabel\":\"Server\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"resource_group.keyword\",\"size\":20,\"order\":\"desc\",\"orderBy\":\"_term\",\"customLabel\":\"Resource Group\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"max\",\"schema\":\"metric\",\"params\":{\"field\":\"data.average\",\"customLabel\":\"Max DTU %\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"data.metricName:dtu_consumption_percent\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/b07ea8a0-1204-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/b07ea8a0-1204-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 6c3c4bae4..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/b07ea8a0-1204-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Category Breakdown [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Category Breakdown [Azure Monitor][Activity Log]\",\"type\":\"horizontal_bar\",\"params\":{\"type\":\"histogram\",\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"},\"valueAxis\":\"ValueAxis-1\"},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":200},\"title\":{}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"bottom\",\"show\":false,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":false,\"rotate\":75,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"Events\"}}],\"seriesParams\":[{\"show\":true,\"type\":\"histogram\",\"mode\":\"normal\",\"data\":{\"label\":\"Events\",\"id\":\"1\"},\"valueAxis\":\"ValueAxis-1\",\"drawLinesBetweenPoints\":true,\"showCircles\":true}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false,\"orderBucketsBySum\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{\"customLabel\":\"Events\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.category.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Category\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"legendOpen\":false}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/b98ec5a0-0706-11e8-adb5-e1a2d559cdf5.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/b98ec5a0-0706-11e8-adb5-e1a2d559cdf5.json
deleted file mode 100644
index 7c855e9b9..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/b98ec5a0-0706-11e8-adb5-e1a2d559cdf5.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "SQL DB Overview [Azure Monitor]",
-  "visState": "{\"title\":\"SQL DB Overview [Azure Monitor]\",\"type\":\"metric\",\"params\":{\"addTooltip\":true,\"addLegend\":false,\"type\":\"metric\",\"metric\":{\"percentageMode\":false,\"colorSchema\":\"Green to Red\",\"useRange\":false,\"colorsRange\":[{\"from\":0,\"to\":100}],\"invertColors\":false,\"labels\":{\"show\":true,\"color\":\"black\"},\"style\":{\"fontSize\":15,\"bgColor\":false,\"labelColor\":false,\"subText\":\"\",\"bgFill\":\"#d3d3d3\"},\"metricColorMode\":\"None\"}},\"aggs\":[{\"id\":\"3\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"azure.resource_name.keyword\",\"customLabel\":\"Databases\"}},{\"id\":\"5\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"azure.server.keyword\",\"customLabel\":\"Servers\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"azure.resource_group.keyword\",\"customLabel\":\"Resource Groups\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"azure.subscription.keyword\",\"customLabel\":\"Subscriptions\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 100\":\"rgb(0,104,55)\"},\"colors\":{\"0 - 100\":\"#64B0C8\"}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"azure-*\",\"filter\":[],\"query\":{\"query\":\"azure.group:\\\"sql_diagnostics\\\"\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/be1f58b0-1beb-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/be1f58b0-1beb-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 0b578552a..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/be1f58b0-1beb-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Geo Count [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Geo Count [Azure Monitor][Activity Log]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"geoip.country_name.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"azure-*\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND _exists_:identity.claims.name\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/ccabf560-1208-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/ccabf560-1208-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index ac18fcc5f..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/ccabf560-1208-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Activity Log Overview [Azure Monitor][Activity Log]",
-  "visState": "{\n  \"title\": \"Activity Log Overview [Azure Monitor][Activity Log]\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": false,\n    \"type\": \"metric\",\n    \"metric\": {\n      \"percentageMode\": false,\n      \"colorSchema\": \"Green to Red\",\n      \"useRange\": false,\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 100\n        }\n      ],\n      \"invertColors\": false,\n      \"labels\": {\n        \"show\": true,\n        \"color\": \"black\"\n      },\n      \"style\": {\n        \"fontSize\": 18,\n        \"bgColor\": false,\n        \"labelColor\": false,\n        \"subText\": \"\",\n        \"bgFill\": \"#d3d3d3\"\n      },\n      \"metricColorMode\": \"None\"\n    }\n  },\n  \"aggs\": [\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"azure.resource_name.keyword\",\n        \"customLabel\": \"Resources\"\n      }\n    },\n    {\n      \"id\": \"5\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name.keyword\",\n        \"customLabel\": \"Users\"\n      }\n    },\n    {\n      \"id\": \"4\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"azure.resource_group.keyword\",\n        \"customLabel\": \"Resource Groups\"\n      }\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"cardinality\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"azure.subscription.keyword\",\n        \"customLabel\": \"Subscriptions\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{\n  \"vis\": {\n    \"defaultColors\": {\n      \"0 - 100\": \"rgb(0,104,55)\"\n    },\n    \"colors\": {\n      \"0 - 100\": \"#64B0C8\"\n    }\n  }\n}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:activity_log\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/cf876780-0c98-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/cf876780-0c98-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index db4371f87..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/cf876780-0c98-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Timeouts [Azure Monitor]",
-  "visState": "{\"title\":\"Timeouts [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(233,228,16,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\",\"field\":\"sql_diagnostics_query_store_runtime_stats_properties.logical_io_reads\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"dfe3d0d0-0808-11e8-b19d-a7e960a5b5ca\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"Timeouts\"},{\"id\":\"b9a2f290-0806-11e8-b19d-a7e960a5b5ca\",\"color\":\"rgba(104,188,0,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"b9a2f291-0806-11e8-b19d-a7e960a5b5ca\",\"type\":\"count\",\"field\":\"sql_diagnostics_query_store_runtime_stats_properties.logical_io_writes\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"f0b3dcc0-0808-11e8-b19d-a7e960a5b5ca\",\"type\":\"moving_average\",\"field\":\"b9a2f291-0806-11e8-b19d-a7e960a5b5ca\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"label\":\"\",\"terms_field\":\"resource_name.keyword\"}],\"time_field\":\"data.time\",\"index_pattern\":\"*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"data.category:Timeouts\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/d02c64c0-08a0-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/d02c64c0-08a0-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 69e900e68..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/d02c64c0-08a0-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "DTU Utilization Single [Azure Monitor]",
-  "visState": "{\"title\":\"DTU Utilization Single [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(0,191,179,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\",\"field\":\"average\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"4b2cfff0-08a0-11e8-b3d6-f7127beb4493\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.3\",\"stacked\":\"none\",\"axis_max\":\"100\",\"label\":\"DTU\",\"value_template\":\"{{value}}%\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:sql_diagnostics AND metricName:dtu_consumption_percent\",\"axis_max\":\"100\",\"annotations\":[]},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/d49fb650-0851-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/d49fb650-0851-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index e937a9f84..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/d49fb650-0851-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "DTU Stats [Azure Monitor]",
-  "visState": "{\"title\":\"DTU Stats [Azure Monitor]\",\"type\":\"gauge\",\"params\":{\"type\":\"gauge\",\"addTooltip\":true,\"addLegend\":true,\"isDisplayWarning\":false,\"gauge\":{\"verticalSplit\":false,\"extendRange\":true,\"percentageMode\":true,\"gaugeType\":\"Arc\",\"gaugeStyle\":\"Full\",\"backStyle\":\"Full\",\"orientation\":\"vertical\",\"colorSchema\":\"Green to Red\",\"gaugeColorMode\":\"Labels\",\"colorsRange\":[{\"from\":0,\"to\":50},{\"from\":50,\"to\":75},{\"from\":75,\"to\":100}],\"invertColors\":false,\"labels\":{\"show\":true,\"color\":\"black\"},\"scale\":{\"show\":false,\"labels\":false,\"color\":\"#333\"},\"type\":\"meter\",\"style\":{\"bgWidth\":0.9,\"width\":0.9,\"mask\":false,\"bgMask\":false,\"maskBars\":50,\"bgFill\":\"#eee\",\"bgColor\":false,\"subText\":\"DTU\",\"fontSize\":60,\"labelColor\":true}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"avg\",\"schema\":\"metric\",\"params\":{\"field\":\"data.average\",\"customLabel\":\"AVG\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"max\",\"schema\":\"metric\",\"params\":{\"field\":\"data.average\",\"customLabel\":\"MAX\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"defaultColors\":{\"0 - 50\":\"rgb(0,104,55)\",\"50 - 75\":\"rgb(255,255,190)\",\"75 - 100\":\"rgb(165,0,38)\"}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"data.metricName:dtu_consumption_percent\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/db0ec510-152d-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/db0ec510-152d-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index c420c12f2..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/db0ec510-152d-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Select Database Query Combo [Azure Monitor][SQL DB]",
-  "visState": "{\"title\":\"Select Database Query Combo [Azure Monitor][SQL DB]\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1519014869989\",\"indexPattern\":\"azure-*\",\"fieldName\":\"azure.db_unique_id.keyword\",\"label\":\"Database\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":20,\"order\":\"desc\"}},{\"id\":\"1517598395667\",\"indexPattern\":\"azure-*\",\"fieldName\":\"sql_diagnostics_QueryStoreRuntimeStatistics_properties.query_id\",\"label\":\"Query ID\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":false,\"size\":20,\"order\":\"desc\"}}],\"updateFiltersOnChange\":true,\"useTimeFilter\":false},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/de505970-1396-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/de505970-1396-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 7877e8eed..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/de505970-1396-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Select User Email [Azure Monitor]",
-  "visState": "{\"title\":\"Select User Email [Azure Monitor]\",\"type\":\"input_control_vis\",\"params\":{\"controls\":[{\"id\":\"1517598395667\",\"indexPattern\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"fieldName\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name.keyword\",\"label\":\"Select User Email\",\"type\":\"list\",\"options\":{\"type\":\"terms\",\"multiselect\":true,\"size\":100,\"order\":\"desc\"}}],\"updateFiltersOnChange\":true,\"useTimeFilter\":false},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/df69c8a0-13aa-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/df69c8a0-13aa-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index dcf792692..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/df69c8a0-13aa-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Users Tag Cloud [Azure Monitor][Activity Log]",
-  "visState": "{\n  \"title\": \"Users Tag Cloud [Azure Monitor][Activity Log]\",\n  \"type\": \"tagcloud\",\n  \"params\": {\n    \"scale\": \"linear\",\n    \"orientation\": \"single\",\n    \"minFontSize\": 12,\n    \"maxFontSize\": 32,\n    \"hideLabel\": false\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {}\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 10,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/e2b9f1a0-08c0-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/e2b9f1a0-08c0-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 83545560a..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/e2b9f1a0-08c0-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Subscriptions Breakdown Pie [Azure Monitor]",
-  "visState": "{\"title\":\"Subscriptions Breakdown Pie [Azure Monitor]\",\"type\":\"pie\",\"params\":{\"type\":\"pie\",\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":false,\"labels\":{\"show\":true,\"values\":false,\"last_level\":false,\"truncate\":100}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"subscription.keyword\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"resource_group.keyword\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"server.keyword\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/e7ac55f0-0c9d-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/e7ac55f0-0c9d-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 5966ab392..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/e7ac55f0-0c9d-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Database Info 2 [Azure Monitor]",
-  "visState": "{\n  \"title\": \"Database Info 2 [Azure Monitor]\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": false,\n    \"type\": \"metric\",\n    \"metric\": {\n      \"percentageMode\": false,\n      \"useRanges\": false,\n      \"colorSchema\": \"Green to Red\",\n      \"metricColorMode\": \"None\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 10000\n        }\n      ],\n      \"labels\": {\n        \"show\": true\n      },\n      \"invertColors\": false,\n      \"style\": {\n        \"bgFill\": \"#000\",\n        \"bgColor\": false,\n        \"labelColor\": false,\n        \"subText\": \"\",\n        \"fontSize\": 12\n      }\n    }\n  },\n  \"aggs\": [\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"top_hits\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"azure.server.keyword\",\n        \"aggregate\": \"concat\",\n        \"size\": 1,\n        \"sortField\": \"@timestamp\",\n        \"sortOrder\": \"desc\",\n        \"customLabel\": \"Server\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:sql_diagnostics\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/e9391690-1226-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/e9391690-1226-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 5db4e02c9..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/e9391690-1226-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Resource Creations and Deletions [Azure Monitor][Activity Log]",
-  "visState": "{\n  \"title\": \"Resource Creations and Deletions [Azure Monitor][Activity Log]\",\n  \"type\": \"horizontal_bar\",\n  \"params\": {\n    \"addLegend\": true,\n    \"addTimeMarker\": false,\n    \"addTooltip\": true,\n    \"categoryAxes\": [\n      {\n        \"id\": \"CategoryAxis-1\",\n        \"labels\": {\n          \"filter\": false,\n          \"rotate\": 0,\n          \"show\": true,\n          \"truncate\": 200\n        },\n        \"position\": \"left\",\n        \"scale\": {\n          \"type\": \"linear\"\n        },\n        \"show\": true,\n        \"style\": {},\n        \"title\": {},\n        \"type\": \"category\"\n      }\n    ],\n    \"grid\": {\n      \"categoryLines\": false,\n      \"style\": {\n        \"color\": \"#eee\"\n      }\n    },\n    \"legendPosition\": \"right\",\n    \"seriesParams\": [\n      {\n        \"data\": {\n          \"id\": \"1\",\n          \"label\": \"Count\"\n        },\n        \"drawLinesBetweenPoints\": true,\n        \"mode\": \"stacked\",\n        \"show\": true,\n        \"showCircles\": true,\n        \"type\": \"histogram\",\n        \"valueAxis\": \"ValueAxis-1\"\n      }\n    ],\n    \"times\": [],\n    \"type\": \"histogram\",\n    \"valueAxes\": [\n      {\n        \"id\": \"ValueAxis-1\",\n        \"labels\": {\n          \"filter\": true,\n          \"rotate\": 75,\n          \"show\": true,\n          \"truncate\": 100\n        },\n        \"name\": \"LeftAxis-1\",\n        \"position\": \"bottom\",\n        \"scale\": {\n          \"mode\": \"normal\",\n          \"type\": \"linear\"\n        },\n        \"show\": false,\n        \"style\": {},\n        \"title\": {\n          \"text\": \"Count\"\n        },\n        \"type\": \"value\"\n      }\n    ]\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {}\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"azure.resource_type.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 15,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Resource Type\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"filters\",\n      \"schema\": \"group\",\n      \"params\": {\n        \"filters\": [\n          {\n            \"input\": {\n              \"query\": \"identity.authorization.action:*write\"\n            },\n            \"label\": \"Creations\"\n          },\n          {\n            \"input\": {\n              \"query\": \"identity.authorization.action:*delete\"\n            },\n            \"label\": \"Deletions\"\n          }\n        ]\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{\n  \"vis\": {\n    \"legendOpen\": false,\n    \"colors\": {\n      \"Creations\": \"#019B8F\",\n      \"Deletions\": \"#AF0058\"\n    }\n  }\n}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:activity_log\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/eafc2880-0850-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/eafc2880-0850-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 3e636c899..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/eafc2880-0850-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Storage Used [Azure Monitor]",
-  "visState": "{\"title\":\"Storage Used [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(104,188,0,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\",\"field\":\"data.average\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"ac54e1d0-0850-11e8-8a9e-77e15a1ba1ec\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.4\",\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"data.metricName:storage_percent\",\"label\":\"Database Storage %\",\"color\":\"#68BC00\",\"id\":\"b0e7fe80-0850-11e8-8a9e-77e15a1ba1ec\"}],\"label\":\"Storage\",\"value_template\":\"{{value}}%\",\"axis_max\":\"100\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"axis_max\":\"100\",\"filter\":\"data.metricName:storage_percent\",\"axis_min\":\"0\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/eb4363d0-0986-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/eb4363d0-0986-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 7f544c3c2..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/eb4363d0-0986-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Storage Used [Azure Monitor]",
-  "visState": "{\"title\":\"Storage Used [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(255,222,85,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"avg\",\"field\":\"average\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"ac54e1d0-0850-11e8-8a9e-77e15a1ba1ec\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"1\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"data.metricName:storage_percent\",\"label\":\"Database Storage %\",\"color\":\"#68BC00\",\"id\":\"b0e7fe80-0850-11e8-8a9e-77e15a1ba1ec\"}],\"label\":\"Storage Used\",\"value_template\":\"{{value}}%\",\"axis_max\":\"100\"},{\"id\":\"86f2d910-0986-11e8-8938-f3a79168be7b\",\"color\":\"rgba(1,155,143,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"86f2d911-0986-11e8-8938-f3a79168be7b\",\"type\":\"avg\",\"field\":\"average\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"d4c68dd0-0986-11e8-8938-f3a79168be7b\",\"type\":\"moving_average\",\"field\":\"86f2d911-0986-11e8-8938-f3a79168be7b\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"split_filters\":[{\"filter\":\"data.resour\",\"label\":\"\",\"color\":\"#68BC00\",\"id\":\"b5af6ac0-0986-11e8-8938-f3a79168be7b\"}],\"label\":\"\",\"terms_field\":\"azure.resource_name.keyword\",\"terms_size\":\"3\",\"value_template\":\"{{value}}%\"}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":1,\"show_grid\":1,\"axis_max\":\"100\",\"filter\":\"azure.group:sql_diagnostics AND metricName:storage_percent\",\"axis_min\":\"0\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/ebeaf080-08ac-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/ebeaf080-08ac-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index 8fe16ff09..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/ebeaf080-08ac-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Queries Markdown [Azure Monitor]",
-  "visState": "{\"title\":\"Queries Markdown [Azure Monitor]\",\"type\":\"markdown\",\"params\":{\"fontSize\":10,\"markdown\":\"### Queries\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/f057a350-138a-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/f057a350-138a-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 2c69ee7f3..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/f057a350-138a-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Activity by Resource Type [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Activity by Resource Type [Azure Monitor][Activity Log]\",\"type\":\"horizontal_bar\",\"params\":{\"type\":\"histogram\",\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":200},\"title\":{}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"bottom\",\"show\":false,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":75,\"filter\":true,\"truncate\":100},\"title\":{\"text\":\"Count\"}}],\"seriesParams\":[{\"show\":true,\"type\":\"histogram\",\"mode\":\"normal\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"valueAxis\":\"ValueAxis-1\",\"drawLinesBetweenPoints\":true,\"showCircles\":true}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.resource_type.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Resource Type\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"legendOpen\":false}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"73e18ac0-104c-11e8-8c94-a3d8d0cfd62b\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/f0d7f540-0c97-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/f0d7f540-0c97-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index d1461be94..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/f0d7f540-0c97-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Blockings [Azure Monitor]",
-  "visState": "{\"title\":\"Blockings [Azure Monitor]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(233,228,16,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\",\"field\":\"sql_diagnostics_query_store_runtime_stats_properties.logical_io_reads\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"dfe3d0d0-0808-11e8-b19d-a7e960a5b5ca\",\"type\":\"moving_average\",\"field\":\"61ca57f2-469d-11e7-af02-69e470af7417\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"3\",\"point_size\":1,\"fill\":\"0\",\"stacked\":\"none\",\"label\":\"Blockings\"},{\"id\":\"b9a2f290-0806-11e8-b19d-a7e960a5b5ca\",\"color\":\"rgba(104,188,0,1)\",\"split_mode\":\"terms\",\"metrics\":[{\"id\":\"b9a2f291-0806-11e8-b19d-a7e960a5b5ca\",\"type\":\"count\",\"field\":\"sql_diagnostics_query_store_runtime_stats_properties.logical_io_writes\"},{\"settings\":\"\",\"minimize\":0,\"window\":\"\",\"model\":\"simple\",\"id\":\"f0b3dcc0-0808-11e8-b19d-a7e960a5b5ca\",\"type\":\"moving_average\",\"field\":\"b9a2f291-0806-11e8-b19d-a7e960a5b5ca\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"0.0a\",\"chart_type\":\"line\",\"line_width\":\"2\",\"point_size\":1,\"fill\":\"0.2\",\"stacked\":\"none\",\"label\":\"\",\"terms_field\":\"resource_name.keyword\"}],\"time_field\":\"data.time\",\"index_pattern\":\"*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"data.category:Blocks\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/f7d7bb80-1824-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/f7d7bb80-1824-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index c06cad48a..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/f7d7bb80-1824-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Activity by Resource Group User [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Activity by Resource Group User [Azure Monitor][Activity Log]\",\"type\":\"horizontal_bar\",\"params\":{\"type\":\"histogram\",\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":200},\"title\":{}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"bottom\",\"show\":false,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":75,\"filter\":true,\"truncate\":100},\"title\":{\"text\":\"Count\"}}],\"seriesParams\":[{\"show\":true,\"type\":\"histogram\",\"mode\":\"normal\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"valueAxis\":\"ValueAxis-1\",\"drawLinesBetweenPoints\":true,\"showCircles\":true}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"azure.resource_group.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Resource Group\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"legendOpen\":false,\"colors\":{\"Count\":\"#019B8F\"}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"azure-*\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND _exists_:identity.claims.name\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/f819a870-0c9d-11e8-93e5-299e2b5c963a.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/f819a870-0c9d-11e8-93e5-299e2b5c963a.json
deleted file mode 100644
index a9cd12865..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/f819a870-0c9d-11e8-93e5-299e2b5c963a.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Database Info 4 [Azure Monitor]",
-  "visState": "{\n  \"title\": \"Database Info 4 [Azure Monitor]\",\n  \"type\": \"metric\",\n  \"params\": {\n    \"addTooltip\": true,\n    \"addLegend\": false,\n    \"type\": \"metric\",\n    \"metric\": {\n      \"percentageMode\": false,\n      \"useRanges\": false,\n      \"colorSchema\": \"Green to Red\",\n      \"metricColorMode\": \"None\",\n      \"colorsRange\": [\n        {\n          \"from\": 0,\n          \"to\": 10000\n        }\n      ],\n      \"labels\": {\n        \"show\": true\n      },\n      \"invertColors\": false,\n      \"style\": {\n        \"bgFill\": \"#000\",\n        \"bgColor\": false,\n        \"labelColor\": false,\n        \"subText\": \"\",\n        \"fontSize\": 12\n      }\n    }\n  },\n  \"aggs\": [\n    {\n      \"id\": \"4\",\n      \"enabled\": true,\n      \"type\": \"top_hits\",\n      \"schema\": \"metric\",\n      \"params\": {\n        \"field\": \"azure.subscription.keyword\",\n        \"aggregate\": \"concat\",\n        \"size\": 1,\n        \"sortField\": \"@timestamp\",\n        \"sortOrder\": \"desc\",\n        \"customLabel\": \"Subscription\"\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:sql_diagnostics\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/f93f09d0-1bec-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/f93f09d0-1bec-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 2d2b03e5c..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/f93f09d0-1bec-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Caller IP [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"Caller IP [Azure Monitor][Activity Log]\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"callerIpAddress.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":1000,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Caller IP\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"geoip.country_name.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":100,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Country\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"identity.claims.http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name.keyword\",\"otherBucket\":false,\"otherBucketLabel\":\"Other\",\"missingBucket\":false,\"missingBucketLabel\":\"Missing\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\",\"customLabel\":\"Email\"}}]}",
-  "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\"index\":\"azure-*\",\"filter\":[],\"query\":{\"query\":\"azure.group:activity_log AND _exists_:identity.claims.name\",\"language\":\"lucene\"}}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/fca6aa70-13cb-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/fca6aa70-13cb-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 5bd256b87..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/fca6aa70-13cb-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "Resource Creations and Deletions User [Azure Monitor][Activity Log]",
-  "visState": "{\n  \"title\": \"Resource Creations and Deletions User [Azure Monitor][Activity Log]\",\n  \"type\": \"horizontal_bar\",\n  \"params\": {\n    \"addLegend\": true,\n    \"addTimeMarker\": false,\n    \"addTooltip\": true,\n    \"categoryAxes\": [\n      {\n        \"id\": \"CategoryAxis-1\",\n        \"labels\": {\n          \"filter\": false,\n          \"rotate\": 0,\n          \"show\": true,\n          \"truncate\": 200\n        },\n        \"position\": \"left\",\n        \"scale\": {\n          \"type\": \"linear\"\n        },\n        \"show\": true,\n        \"style\": {},\n        \"title\": {},\n        \"type\": \"category\"\n      }\n    ],\n    \"grid\": {\n      \"categoryLines\": false,\n      \"style\": {\n        \"color\": \"#eee\"\n      }\n    },\n    \"legendPosition\": \"right\",\n    \"seriesParams\": [\n      {\n        \"data\": {\n          \"id\": \"1\",\n          \"label\": \"Count\"\n        },\n        \"drawLinesBetweenPoints\": true,\n        \"mode\": \"stacked\",\n        \"show\": true,\n        \"showCircles\": true,\n        \"type\": \"histogram\",\n        \"valueAxis\": \"ValueAxis-1\"\n      }\n    ],\n    \"times\": [],\n    \"type\": \"histogram\",\n    \"valueAxes\": [\n      {\n        \"id\": \"ValueAxis-1\",\n        \"labels\": {\n          \"filter\": true,\n          \"rotate\": 75,\n          \"show\": true,\n          \"truncate\": 100\n        },\n        \"name\": \"LeftAxis-1\",\n        \"position\": \"bottom\",\n        \"scale\": {\n          \"mode\": \"normal\",\n          \"type\": \"linear\"\n        },\n        \"show\": false,\n        \"style\": {},\n        \"title\": {\n          \"text\": \"Count\"\n        },\n        \"type\": \"value\"\n      }\n    ]\n  },\n  \"aggs\": [\n    {\n      \"id\": \"1\",\n      \"enabled\": true,\n      \"type\": \"count\",\n      \"schema\": \"metric\",\n      \"params\": {}\n    },\n    {\n      \"id\": \"2\",\n      \"enabled\": true,\n      \"type\": \"terms\",\n      \"schema\": \"segment\",\n      \"params\": {\n        \"field\": \"azure.resource_type.keyword\",\n        \"otherBucket\": false,\n        \"otherBucketLabel\": \"Other\",\n        \"missingBucket\": false,\n        \"missingBucketLabel\": \"Missing\",\n        \"size\": 15,\n        \"order\": \"desc\",\n        \"orderBy\": \"1\",\n        \"customLabel\": \"Resource Type\"\n      }\n    },\n    {\n      \"id\": \"3\",\n      \"enabled\": true,\n      \"type\": \"filters\",\n      \"schema\": \"group\",\n      \"params\": {\n        \"filters\": [\n          {\n            \"input\": {\n              \"query\": \"identity.authorization.action:*write\"\n            },\n            \"label\": \"Creations\"\n          },\n          {\n            \"input\": {\n              \"query\": \"identity.authorization.action:*delete\"\n            },\n            \"label\": \"Deletions\"\n          }\n        ]\n      }\n    }\n  ]\n}",
-  "uiStateJSON": "{\n  \"vis\": {\n    \"legendOpen\": false,\n    \"colors\": {\n      \"Creations\": \"#019B8F\",\n      \"Deletions\": \"#AF0058\"\n    }\n  }\n}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{\n  \"index\": \"azure-*\",\n  \"filter\": [],\n  \"query\": {\n    \"query\": \"azure.group:activity_log AND _exists_:identity.claims.name\",\n    \"language\": \"lucene\"\n  }\n}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/kibana/7.x/visualization/fec4c5c0-139a-11e8-8c94-a3d8d0cfd62b.json b/x-pack/modules/azure/configuration/kibana/7.x/visualization/fec4c5c0-139a-11e8-8c94-a3d8d0cfd62b.json
deleted file mode 100644
index 243874d30..000000000
--- a/x-pack/modules/azure/configuration/kibana/7.x/visualization/fec4c5c0-139a-11e8-8c94-a3d8d0cfd62b.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "title": "User Activity Overview [Azure Monitor][Activity Log]",
-  "visState": "{\"title\":\"User Activity Overview [Azure Monitor][Activity Log]\",\"type\":\"metrics\",\"params\":{\"id\":\"61ca57f0-469d-11e7-af02-69e470af7417\",\"type\":\"timeseries\",\"series\":[{\"id\":\"61ca57f1-469d-11e7-af02-69e470af7417\",\"color\":\"rgba(1,155,143,1)\",\"split_mode\":\"everything\",\"metrics\":[{\"id\":\"61ca57f2-469d-11e7-af02-69e470af7417\",\"type\":\"count\"}],\"seperate_axis\":0,\"axis_position\":\"right\",\"formatter\":\"number\",\"chart_type\":\"bar\",\"line_width\":1,\"point_size\":1,\"fill\":\"0.4\",\"stacked\":\"none\",\"label\":\"Actions\",\"split_filters\":[{\"filter\":\"_exists_:identity.claims.name\",\"label\":\"\",\"color\":\"rgba(244,78,59,1)\",\"id\":\"a5302500-1399-11e8-a699-f390e75f4dd5\"}],\"filter\":\"\",\"hide_in_legend\":0}],\"time_field\":\"@timestamp\",\"index_pattern\":\"azure-*\",\"interval\":\"auto\",\"axis_position\":\"left\",\"axis_formatter\":\"number\",\"show_legend\":0,\"show_grid\":1,\"filter\":\"azure.group:activity_log AND azure.category:Administrative AND _exists_:identity.claims.name\"},\"aggs\":[]}",
-  "uiStateJSON": "{}",
-  "description": "",
-  "version": 1,
-  "kibanaSavedObjectMeta": {
-    "searchSourceJSON": "{}"
-  }
-}
diff --git a/x-pack/modules/azure/configuration/logstash/azure.conf.erb b/x-pack/modules/azure/configuration/logstash/azure.conf.erb
deleted file mode 100644
index a762198b0..000000000
--- a/x-pack/modules/azure/configuration/logstash/azure.conf.erb
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-input{
-<%=
-require 'azure_module_config_generator'
-config_generator = LogStash::Azure::ConfigGenerator.new
-config_generator.generate_input(@settings)
-%>
-}
-
-filter {
-  json {
-    source => "message"
-  }
-
-  if "_jsonparsefailure" not in [tags] {
-    split {
-      field => "records"
-      target => "data"
-    }
-
-    if "_split_type_failure" not in [tags] {
-      ruby{
-        code => "
-          event.get('data').each { |k,v|
-            event.set(k, v)
-          }
-          event.remove('data')
-        "
-        remove_field => ["message", "records"]
-      }
-
-      if "_rubyexception" not in [tags] {
-        azure_event{}
-
-        if "_azure_event_failure" not in [tags] {
-          if [callerIpAddress]{
-            geoip {
-              source => "callerIpAddress"
-            }
-          }
-          date {
-              match => [ "time", "ISO8601" ]
-          }
-          mutate {
-              copy => { "@metadata" => "[azure][metadata]" }
-          }
-        }
-      }
-    }
-  }
-}
-
-output {
-<%= elasticsearch_output_config('_doc') %>
-}
diff --git a/x-pack/modules/azure/lib/azure_module_config_generator.rb b/x-pack/modules/azure/lib/azure_module_config_generator.rb
deleted file mode 100644
index 3829fb66b..000000000
--- a/x-pack/modules/azure/lib/azure_module_config_generator.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-require 'logstash/namespace'
-
-module LogStash
-  module Azure
-    class ConfigGenerator
-
-      def generate_input(module_hash)
-        lines = []
-        config = []
-        module_hash.each do |k, v|
-          config << {parse_key(k) => v} if k.start_with?('var.input.azure_event_hubs') && !k.eql?('var.input.azure_event_hubs.event_hubs')
-        end
-        mode = :basic
-        event_hubs = module_hash['var.input.azure_event_hubs.event_hubs']
-        if event_hubs
-          raise "Invalid configuration. 'var.input.azure_event_hubs.event_hubs' must be a set of arrays. Please check your configuration." unless event_hubs.is_a?(Array) && event_hubs.size > 1 && event_hubs[0][0].eql?('name')
-          reference = event_hubs[0]
-          if reference.is_a?(Array)
-            mode = :advanced
-            # convert parallel arrays to array of hashes
-            advanced_config = []
-            event_hubs.size.times do |x| # process event hubs north -> south
-              hub_array = []
-              next if x == 0 # skip reference array, reference array must be in position 0
-              reference.each_with_index do |key, y| # process the reference array west -> east
-                next if y == 0 # skip the 'name' in the reference array
-                hub_array << {key => event_hubs[x][y]} # for each item in the reference array, create a hash of reference key to the correct x,y axis, add to array
-              end
-              advanced_config << {event_hubs[x][0] => hub_array} # for each event hub create a hash keyed by the hub name. Note the hub name must always be position 0.
-            end
-            config << {'event_hubs' => advanced_config} # add the advanced config to the main config... advanced config will always take precedence via the plugin.
-          end
-        end
-
-        basic_valid = false
-        advanced_valid = false
-        lines << '# start azure_event_hubs' # helps with testing
-        # write the config to the buffer
-        config.each do |c|
-          c.each do |k, v|
-            if v.is_a?(Array) && k.eql?('event_hubs') && mode.eql?(:advanced)
-              lines << '  config_mode => "advanced"'
-              lines << '  ' + k + ' => ['
-              v.each_with_index do |entry, i|
-                if mode.eql?(:advanced)
-                  entry.each do |_k, _v|
-                    lines << '    {"' + _k + '" => {'
-                    _v.each do |_entry|
-                      _entry.each do |__k, __v|
-                        advanced_valid = true if __k.eql?('event_hub_connection')
-                        lines << '      ' + format_key_value(__k, __v)
-                      end
-                    end
-                    lines << '    ' + '}}' + (i < v.length - 1 ? ',' : '')
-                  end
-                end
-              end
-              lines << '  ' + ']'
-            end
-            if k.eql?('event_hub_connections')
-              v.each do |connection|
-                basic_valid = connection.include?('EntityPath')
-              end
-            end
-            lines << '  ' + format_key_value(k, v) unless k.eql?('event_hubs')
-          end
-        end
-        lines << '# end azure_event_hubs' # helps with testing
-        raise "Invalid configuration. 'var.input.azure_event_hubs.event_hub_connections' must be set, and the connection string must contain the EntityPath." if mode.eql?(:basic) && !basic_valid
-        raise "Invalid configuration. Could not parse out 'var.input.azure_event_hubs.event_hubs'. Please check your configuration." if mode.eql?(:advanced) && !advanced_valid
-
-        <<-CONF
-  azure_event_hubs {
-    #{lines.compact.join("\n    ")}
-  }
-        CONF
-      end
-
-      def format_key_value(key, value)
-        key.to_s + ' => ' + format_value(value)
-      end
-
-      def parse_key(key)
-        key.split('.').last
-      end
-
-      def format_value(value)
-        # protects against special symbols in value string
-        if value.is_a?(String)
-          '"' + value + '"'
-        else
-          value.to_s
-        end
-      end
-    end
-  end
-end
diff --git a/x-pack/modules/azure/lib/filters/azure_event.rb b/x-pack/modules/azure/lib/filters/azure_event.rb
deleted file mode 100644
index 920b1f870..000000000
--- a/x-pack/modules/azure/lib/filters/azure_event.rb
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-require "logstash/filters/base"
-require "logstash/namespace"
-require "logstash/json"
-
-module LogStash
-  module Filters
-    class AzureEvent < LogStash::Filters::Base
-
-      config_name "azure_event"
-
-      # When all heuristics fail to identify a category, this category will be used if and only if the default_match fields are present, and the resource has been parsed correctly
-      config :default_category, :validate => :string, :default => "Administrative"
-
-      # These fields must be present to match to the default default category
-      config :default_match, :validate => :array, :default => ["operationName", "level"]
-
-      # Possible [azure][category] values for [azure][group] = "activity_log", the category names must be mutually exclusive between groups
-      config :activity_log_categories, :validate => :array, :default => ["Administrative", "ServiceHealth", "Alert", "Autoscale", "Security"]
-
-      # Possible [azure][category] values for [azure][group] = "sql_diagnostics", the category names must be mutually exclusive between groups
-      config :sql_diagnostics_categories, :validate => :array, :default =>
-          ["Metric", "Blocks", "Errors", "Timeouts", "QueryStoreRuntimeStatistics", "QueryStoreWaitStatistics", "DatabaseWaitStatistics", "SQLInsights"]
-
-      # Append values to the `tags` field when there has been not been a match to a known azure event group or category.
-      config :tag_on_failure, :validate => :array, :default => ["_azure_event_failure"]
-
-      ACTIVITY_LOG_GROUP = "activity_log".freeze
-      SQL_DIAGNOSTICS_GROUP = "sql_diagnostics".freeze
-
-      def register
-        # do nothing
-      end
-
-      def filter(event)
-        resource_id = event.get("resourceId")
-        if resource_id && add_resources(resource_id, event) && add_group_and_category(event)
-          # rename properties to include the group/category to help avoid mapping errors
-          if event.get("properties")
-            group = event.get("[azure][group]")
-            category = event.get("[azure][category]")
-            explode_properties(group, category, event)
-            event.set("[#{group}_#{category}_properties]", event.get("properties"))
-            event.remove("properties")
-          end
-          filter_matched(event)
-        else
-          @tag_on_failure.each do |tag|
-            event.tag(tag)
-          end
-          logger.trace("Failed to parse event as an Azure Event", :event => event) if logger.trace?
-        end
-      end
-
-      # public methods may change state of event, and should return true if successful
-
-      ##
-      # Parses the resourceId to pull out the relevant parts into the event
-      # return true if the common set of fields can be extracted from the resourceId, false otherwise
-      def add_resources(resource_id, event)
-        common_resources = explode_common_resources(resource_id)
-        if common_resources
-          common_resources.each do |k, v|
-            event.set("[azure][#{k}]", v)
-          end
-
-          if common_resources["provider"] == "MICROSOFT.SQL"
-            sql_resources = explode_sql_resources(resource_id)
-            if sql_resources
-              sql_resources.each do |k, v|
-                event.set("[azure][#{k}]", v)
-              end
-            end
-          end
-        end
-        !common_resources.nil?
-      end
-
-      ##
-      # adds a group and category to the provided event
-      # return true if the group and category are added, false otherwise
-      def add_group_and_category(event)
-        #always prefer @metadata category over the heuristics
-        category = event.get("[@metadata][category]")
-        if category.nil?
-          category = find_category(event)
-        end
-        event.set("[azure][category]", category) if category
-        group = @activity_log_categories.include?(category) ? ACTIVITY_LOG_GROUP : @sql_diagnostics_categories.include?(category) ? SQL_DIAGNOSTICS_GROUP : nil
-        event.set("[azure][group]", group) if group
-
-        !category.nil?
-      end
-
-      ##
-      # Based on the group and category, explode the custom properties bag
-      def explode_properties(group, category, event)
-        if group == ACTIVITY_LOG_GROUP && category == "ServiceHealth"
-          add_json_event_properties(event)
-        end
-      end
-
-      # Some events such as Service Health can have a Json inside Json as [properties][eventProperties]. This will explode the inner json and replace it with indivisual fields on the event.
-      def add_json_event_properties(event)
-        inner_json = event.get("[properties][eventProperties]")
-        inner_json_as_hash = json_to_hash(inner_json)
-        if inner_json_as_hash
-          inner_json_as_hash.each do |k, v|
-            event.set("[properties][#{k}]", v)
-          end
-          event.remove("[properties][eventProperties]")
-        end
-      end
-
-      # private methods should not change the state of the event
-      private
-
-      CONST_FIELD_NAMES = {
-          "SUBSCRIPTIONS" => "subscription",
-          "RESOURCEGROUPS" =>"resource_group",
-          "PROVIDERS" => "provider"
-      }.freeze
-
-      ##
-      # In general the format of the resourceID for all types is:
-      # /SUBSCRIPTIONS/<subscription>/RESOURCEGROUPS/<resource_group>/PROVIDERS/<provider>/<resource_type1>/<resource_name1>/<resource_typeN/<resource_nameN>
-      # However, it can be something as short as
-      # /SUBSCRIPTIONS/<subscription>
-      # It was also observed to be:
-      # /SUBSCRIPTIONS/<subscription>/PROVIDERS/<provider>
-      # Or as long as needed where the resource_type/resource_name pairings can continue N times.
-      # The display values for repeating resource_type/resource_name pairings should be:
-      # resource_type = resource_type1/resource_type2/resource_typeN (concat the types separated by a "/")
-      # resource_name = resource_nameN (don't concat the names, only use the last)
-      # returns a hash of the key/value pairings with VALUE always UPPERCASE, returns nil if there are not at least 2 parts
-      ##
-      def explode_common_resources(_resource_id)
-        resource_id = _resource_id.upcase
-        logger.debug("parsing resourceId={}", resource_id)
-        grouped_parts = {}
-        parts = resource_id.split("/")
-        return nil unless parts.size >= 3
-        return nil unless parts.shift == "" # split returns an empty first result when the string starts with the split value
-
-        index = 1
-        const_count = 0
-        const_count += 1 if resource_id.include?("/SUBSCRIPTIONS/")
-        const_count += 1 if resource_id.include?("/RESOURCEGROUPS/")
-        const_count += 1 if resource_id.include?("/PROVIDERS/")
-
-        const_count.times do
-          const = parts.shift
-          index += const.size + 1
-          part_name = to_field_name(const)
-          value = parts.shift
-          index += value.size + 1
-          grouped_parts[part_name] = value if part_name
-        end
-
-        type_name_repeating = resource_id[index, resource_id.size]
-
-        # For a/b/c/d/e/f , resource_type = a/c/e, resource_name = f
-        if type_name_repeating
-          type_name_repeating_pairs = type_name_repeating.split("/")
-          grouped_parts["resource_name"] = type_name_repeating_pairs.last
-          grouped_parts["resource_type"] = type_name_repeating_pairs.each_slice(2).map(&:first).join("/")
-        end
-        grouped_parts
-      end
-
-      def to_field_name(const)
-        CONST_FIELD_NAMES[const]
-      end
-
-      ##
-      #  Retrieve resources from a MICROSOFT.SQL provider resource_id
-      # /SUBSCRIPTIONS/<subscription>/RESOURCEGROUPS/<resource_group>/PROVIDERS/MICROSOFT.SQL/SERVERS/<server>/DATABASES/<database>
-      # returns a hash of the key/value pairings for server and database, with VALUE always UPPERCASE, nil if ANY expectations of the format are not found
-      def explode_sql_resources(resource_id)
-        grouped_parts = {}
-        parts = resource_id.upcase.split("/", 11)
-        return nil unless parts.size == 11
-        parts[7] == "SERVERS" ? grouped_parts["server"] = parts[8] : (return nil)
-        parts[9] == "DATABASES" ? grouped_parts["database"] = parts[10] : (return nil)
-        grouped_parts["server_and_database"] = parts[8] + "/" + parts[10]
-        grouped_parts["db_unique_id"] = parts[2] + "/" + parts[4] + "/" + parts[8] + "/" + parts[10]
-        grouped_parts
-      end
-
-      ##
-      # returns the Hash of the provided json, nil if not json
-      def json_to_hash(json)
-        if json && json.to_s.strip[0] == "{" #faster then throwing an exception if not json
-          begin
-            LogStash::Json.load(json)
-          rescue
-            # Do nothing, there are no documented guarantees that this is indeed Json
-            nil
-          end
-        end
-      end
-
-      ##
-      # finds the category based on event heuristics
-      # returns the category as string if can be found, nil otherwise
-      def find_category(event)
-        category = find_category_sql_diagnostics(event)
-        category ||= find_category_activity_log(event)
-        category ||= find_category_default(event)
-        category
-      end
-
-      ##
-      # attempt to find the category of an sql diagnostic log
-      # returns the category if can match the heuristics for sql_diagnostic logs, nil otherwise
-      def find_category_sql_diagnostics(event)
-        return nil unless event.get("[azure][provider]") == "MICROSOFT.SQL"
-        event.get("metricName") ? "Metric" : event.get("category")
-       end
-
-      ##
-      # attempt to find the category of an activity log
-      # returns the category if can match the heuristics for activity logs, nil otherwise
-      def find_category_activity_log(event)
-        category = event.get("[properties][eventCategory]") #observerd location
-        category ||= event.get("[category][value]")  #documented location
-        category = "Security" if category == "Recommendation"
-        category
-      end
-
-      ##
-      # attempt to apply the default category
-      # returns the default category if and only if all the default_match parameters exist in the event
-      def find_category_default(event)
-        if @default_match.all? {|match| event.get(match)}
-          @default_category
-        else
-          nil
-        end
-      end
-    end
-  end
-end
-
diff --git a/x-pack/qa/integration/management/multiple_pipelines_spec.rb b/x-pack/qa/integration/management/multiple_pipelines_spec.rb
index b069fa89a..612f4cd8e 100644
--- a/x-pack/qa/integration/management/multiple_pipelines_spec.rb
+++ b/x-pack/qa/integration/management/multiple_pipelines_spec.rb
@@ -4,6 +4,7 @@
 
 require_relative "../spec_helper"
 require "stud/temporary"
+require "rspec/wait"
 
 describe "Read configuration from elasticsearch" do
   before :each do
@@ -17,7 +18,7 @@ describe "Read configuration from elasticsearch" do
       "hello" => nil
     }
 
-    cleanup_elasticsearch(".logstash*")
+    cleanup_system_indices(@pipelines.keys)
     cleanup_elasticsearch(".monitoring-logstash*")
 
     @pipelines.each do |pipeline_id, config|
@@ -27,11 +28,12 @@ describe "Read configuration from elasticsearch" do
     @logstash_service = logstash("bin/logstash -w 1", {
       :settings => {
         "xpack.management.enabled" => true,
-        "xpack.management.pipeline.id" => @pipelines.keys,
+        "xpack.management.pipeline.id" => @pipelines.keys + ["*"],
         "xpack.management.logstash.poll_interval" => "1s",
         "xpack.management.elasticsearch.hosts" => ["http://localhost:9200"],
         "xpack.management.elasticsearch.username" => "elastic",
         "xpack.management.elasticsearch.password" => elastic_password,
+        "xpack.monitoring.allow_legacy_collection" => true,
         "xpack.monitoring.elasticsearch.username" => "elastic",
         "xpack.monitoring.elasticsearch.password" => elastic_password
 
@@ -73,7 +75,6 @@ describe "Read configuration from elasticsearch" do
       count_hashes(@pipelines.keys)
     end.to eq(2)
 
-
     pipelines = {
       "super_generator" => "input { generator { count => 100 } tcp { port => 6005 } } output { file { path => '#{@temporary_directory}/super_generator_new' }}",
       "another_generator" => "input { generator { count => 100 } tcp { port => 6006 } } output { file { path => '#{@temporary_directory}/another_generator_new' }}"
@@ -89,6 +90,19 @@ describe "Read configuration from elasticsearch" do
     end.to eq(4)
   end
 
+  it "add new pipelines" do
+    temporary_file = File.join(Stud::Temporary.directory, "wildcard_pipeline.log")
+    new_config = "input { generator { count => 10000 } tcp { port => 6008 }} output { file { path => '#{temporary_file}' } }"
+
+    expect(File.exist?(temporary_file)).to be_falsey
+    push_elasticsearch_config("wildcard_pipeline", new_config)
+    elasticsearch_client.indices.refresh
+
+    Stud.try(max_retry.times, [RSpec::Expectations::ExpectationNotMetError]) do
+      expect(File.exist?(temporary_file)).to be_truthy
+    end
+  end
+
   # Returns the number of hashes for the list of pipelines
   # Returns nil if the response is bad
   # This can happen if ES is not yet up or if the data is not yet in ES
@@ -96,7 +110,7 @@ describe "Read configuration from elasticsearch" do
     elasticsearch_client.indices.refresh
 
     query = {
-      "size": 0, 
+      "size": 0,
       "query": {
         "term": {
           "type": {
@@ -124,7 +138,7 @@ describe "Read configuration from elasticsearch" do
 
     begin
       res = elasticsearch_client.search(index: '.monitoring-logstash-*', body: query)
-    rescue Elasticsearch::Transport::Transport::Errors::ServiceUnavailable 
+    rescue Elastic::Transport::Transport::Errors::ServiceUnavailable
       return nil
     end
 
@@ -143,7 +157,6 @@ describe "Read configuration from elasticsearch" do
     end
   end
 
-
   it "reloads the configuration when its different from the running pipeline" do
     pipelines = {
       "super_generator" => "input { generator { count => 100 } tcp { port => 6005 } } output { file { path => '#{@temporary_directory}/super_generator_new' }}",
@@ -164,6 +177,29 @@ describe "Read configuration from elasticsearch" do
     end
   end
 
+  it "should pick up recreated pipeline with the same config string and different metadata" do
+    elasticsearch_client.indices.refresh
+
+    pipeline_id = @pipelines.keys[0]
+    config = @pipelines.values[0]
+    file = File.join(@temporary_directory, pipeline_id)
+
+    Stud.try(max_retry.times, [RSpec::Expectations::ExpectationNotMetError]) do
+      expect(File.exist?(file)).to be_truthy
+    end
+
+    cleanup_system_indices([pipeline_id])
+    File.delete(file)
+    expect(File.exist?(file)).to be_falsey
+
+    push_elasticsearch_config(pipeline_id, config, "2")
+    elasticsearch_client.indices.refresh
+
+    Stud.try(max_retry.times, [RSpec::Expectations::ExpectationNotMetError]) do
+      expect(File.exist?(file)).to be_truthy
+    end
+  end
+
   after :each do
     @logstash_service.stop if !!@logstash_service
     @elasticsearch_service.stop if !!@elasticsearch_service
diff --git a/x-pack/qa/integration/management/read_configuration_spec.rb b/x-pack/qa/integration/management/read_configuration_spec.rb
index 809d70c89..fc90d5c7f 100644
--- a/x-pack/qa/integration/management/read_configuration_spec.rb
+++ b/x-pack/qa/integration/management/read_configuration_spec.rb
@@ -15,7 +15,7 @@ describe "Read configuration from elasticsearch" do
         "xpack.management.enabled" => true,
         "xpack.management.pipeline.id" => pipeline_id,
         "xpack.management.logstash.poll_interval" => "1s",
-        "xpack.management.elasticsearch.hosts" => ["http://localhost:9200"],
+        "xpack.management.elasticsearch.hosts" => ["http://localhost:9200", "http://localhost:19200"],
         "xpack.management.elasticsearch.username" => "elastic",
         "xpack.management.elasticsearch.password" => elastic_password,
         "xpack.monitoring.elasticsearch.username" => "elastic",
@@ -31,12 +31,15 @@ describe "Read configuration from elasticsearch" do
   def start_services(elasticsearch_options, logstash_options)
     @elasticsearch_service = elasticsearch(elasticsearch_options)
 
-    cleanup_elasticsearch(".logstash*")
+    cleanup_system_indices([PIPELINE_ID])
 
     config = "input { generator { count => 100 } tcp { port => 6000 } } output { null {} }"
     push_elasticsearch_config(PIPELINE_ID, config)
 
     @logstash_service = logstash("bin/logstash -w 1", logstash_options)
+
+    full_log = @logstash_service.stdout_lines.join("\n")
+    expect(full_log).not_to match(/Could not fetch all the sources/)
   end
 
   def stop_services
@@ -66,8 +69,8 @@ describe "Read configuration from elasticsearch" do
     end
 
     it "reloads the configuration when its different from the running pipeline" do
-      [ File.join(Stud::Temporary.directory, "hello.log"),
-        File.join(Stud::Temporary.directory, "whole-new-file.log") ].each do |temporary_file|
+      [File.join(Stud::Temporary.directory, "hello.log"),
+        File.join(Stud::Temporary.directory, "whole-new-file.log")].each do |temporary_file|
         new_config = "input { generator { count => 10000 }} output { file { path => '#{temporary_file}' } }"
 
         expect(File.exist?(temporary_file)).to be_falsey
diff --git a/x-pack/qa/integration/monitoring/direct_shipping_spec.rb b/x-pack/qa/integration/monitoring/direct_shipping_spec.rb
new file mode 100644
index 000000000..2228c158c
--- /dev/null
+++ b/x-pack/qa/integration/monitoring/direct_shipping_spec.rb
@@ -0,0 +1,44 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+require_relative "../spec_helper"
+require 'securerandom'
+
+describe "Direct shipping" do
+  before :all do
+    @elasticsearch_service = elasticsearch
+
+    cleanup_elasticsearch
+
+    config = "input { generator { count => 100 } tcp { port => 6000 } } output { null {} }"
+
+    @logstash_service = logstash_with_empty_default("bin/logstash -e '#{config}' -w 1  --pipeline.id #{SecureRandom.hex(8)}", {
+      :settings => {
+        "xpack.monitoring.allow_legacy_collection" => true,
+        "monitoring.enabled" => true,
+        "monitoring.elasticsearch.hosts" => ["http://localhost:9200", "http://localhost:9200"],
+        "monitoring.collection.interval" => "1s",
+        "monitoring.elasticsearch.username" => "elastic",
+        "monitoring.elasticsearch.password" => elastic_password
+      }, # will be saved in the logstash.yml
+      :belzebuth => {
+        :wait_condition => /Pipelines running/,
+        :timeout => 5 * 60 # Fail safe, this mean something went wrong if we hit this before the wait_condition
+      }
+    })
+  end
+
+  include_examples "record monitoring data to es"
+
+  it "gives pipelines stats" do
+    api = MonitoringAPI.new
+    stats = api.pipelines_stats
+    expect(stats.keys).not_to be_nil
+  end
+
+  after :all do
+    @logstash_service.stop unless @logstash_service.nil?
+    @elasticsearch_service.stop unless @elasticsearch_service.nil?
+  end
+end
diff --git a/x-pack/qa/integration/monitoring/es_documents_structure_validation_spec.rb b/x-pack/qa/integration/monitoring/es_documents_structure_validation_spec.rb
new file mode 100644
index 000000000..94fb9b7b5
--- /dev/null
+++ b/x-pack/qa/integration/monitoring/es_documents_structure_validation_spec.rb
@@ -0,0 +1,123 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+require_relative "../spec_helper"
+
+describe "Monitoring internal collector documents" do
+  before :all do
+    @elasticsearch_service = elasticsearch
+
+    cleanup_elasticsearch
+
+    # this is tcp input useful to keep main pipeline alive
+    @config = "input { tcp { port => 6000 } } output { null {} }"
+  end
+
+  let(:max_retry) { 10 }
+  let(:schemas_path) { File.join(File.dirname(__FILE__), "..", "..", "..", "spec", "monitoring", "schemas") }
+  let(:retryable_errors) do
+    [NoMethodError,
+     RSpec::Expectations::ExpectationNotMetError,
+     Elastic::Transport::Transport::Errors::ServiceUnavailable,
+     Elastic::Transport::Transport::Errors::NotFound]
+  end
+
+  describe "metrics" do
+    it "should be equal to with direct shipping" do
+      @logstash_service = start_monitoring_logstash(@config)
+      direct_shipping_document = retrieve_monitoring_document_from_es("logstash_stats")
+
+      @logstash_service.stop unless @logstash_service.nil?
+
+      cleanup_elasticsearch
+
+      @logstash_service = start_monitoring_logstash(@config, "xpack")
+      es_reporter_shaped_document = retrieve_monitoring_document_from_es("logstash_stats")
+
+      @logstash_service.stop unless @logstash_service.nil?
+
+      verify_same_structure(es_reporter_shaped_document, direct_shipping_document)
+    end
+  end
+
+  describe "state" do
+    it "should be equal to with direct shipping" do
+      @logstash_service = start_monitoring_logstash(@config)
+      direct_shipping_document = retrieve_monitoring_document_from_es("logstash_state")
+      @logstash_service.stop unless @logstash_service.nil?
+
+      cleanup_elasticsearch
+
+      @logstash_service = start_monitoring_logstash(@config, "xpack")
+      es_reporter_shaped_document = retrieve_monitoring_document_from_es("logstash_state")
+
+      @logstash_service.stop unless @logstash_service.nil?
+
+      verify_same_structure(es_reporter_shaped_document, direct_shipping_document)
+    end
+  end
+
+  after :all do
+    @elasticsearch_service.stop unless @elasticsearch_service.nil?
+  end
+end
+
+def retrieve_monitoring_document_from_es(document_type)
+  monitoring_document = nil
+
+  Stud.try(max_retry.times, retryable_errors) do
+    elasticsearch_client.indices.refresh
+    api_response = elasticsearch_client.search :index => MONITORING_INDEXES, :body => {:query => {:term => {"type" => document_type}}}
+    expect(api_response["hits"]["total"]["value"]).to be > 0
+    api_response["hits"]["hits"].each do |full_document|
+      monitoring_document = full_document["_source"]
+    end
+  end
+  monitoring_document
+end
+
+def start_monitoring_logstash(config, prefix = "")
+  if !prefix.nil? && !prefix.empty?
+    mon_prefix = prefix + "."
+  else
+    mon_prefix = ""
+  end
+  logstash_with_empty_default("bin/logstash -e '#{config}' -w 1", {
+    :settings => {
+      "xpack.monitoring.allow_legacy_collection" => true,
+      "#{mon_prefix}monitoring.enabled" => true,
+      "#{mon_prefix}monitoring.elasticsearch.hosts" => ["http://localhost:9200", "http://localhost:9200"],
+      "#{mon_prefix}monitoring.collection.interval" => "1s",
+      "#{mon_prefix}monitoring.elasticsearch.username" => "elastic",
+      "#{mon_prefix}monitoring.elasticsearch.password" => elastic_password
+    }, # will be saved in the logstash.yml
+    :belzebuth => {
+      :wait_condition => /Pipelines running/,
+      :timeout => 5 * 60 # Fail safe, this mean something went wrong if we hit this before the wait_condition
+    }
+  })
+end
+
+def verify_same_structure(original, other, ignored_keys = /^source_node/)
+  orig_keys = filter_ignored_and_make_set(flatten_keys(original), ignored_keys)
+  other_keys = filter_ignored_and_make_set(flatten_keys(other), ignored_keys)
+  expect(other_keys - orig_keys).to eq([])
+  expect(orig_keys - other_keys).to eq([])
+end
+
+def filter_ignored_and_make_set(keys_list, ignored_keys)
+  keys_list.sort.uniq.select { |k| !(k =~ ignored_keys) }
+end
+
+def flatten_keys(hash, prefix = "")
+  flattened_keys = []
+  hash.each do |k, v|
+    if v.is_a? Hash
+      flattened_keys += flatten_keys(v, k.to_s)
+    else
+      flattened_keys << (prefix + (prefix.empty? ? "" : ".") + k.to_s)
+    end
+  end
+  flattened_keys
+end
diff --git a/x-pack/qa/integration/monitoring/geoip_metric_spec.rb b/x-pack/qa/integration/monitoring/geoip_metric_spec.rb
new file mode 100644
index 000000000..e92984e09
--- /dev/null
+++ b/x-pack/qa/integration/monitoring/geoip_metric_spec.rb
@@ -0,0 +1,50 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+require_relative "../spec_helper"
+require_relative "../../../../qa/integration/services/monitoring_api"
+
+describe "GeoIP database service" do
+  let(:input) { "input { generator { lines => ['{\\\"host\\\": \\\"0.42.56.104\\\"}'] } } " }
+  let(:output) { "output { null {} }" }
+  let(:filter) { " " }
+  let(:config) { input + filter + output }
+
+  context "monitoring API with geoip plugin" do
+    let(:filter) do
+      "filter { json { source => \\\"message\\\" } geoip { source => \\\"host\\\" target => \\\"geoip\\\" } } "
+    end
+
+    it "should have geoip" do
+      start_logstash
+      api = MonitoringAPI.new
+      stats = api.node_stats
+
+      expect(stats["geoip_download_manager"]).not_to be_nil
+    end
+  end
+
+  context "monitoring API without geoip plugin" do
+    it "should not have geoip" do
+      start_logstash
+      api = MonitoringAPI.new
+      stats = api.node_stats
+
+      expect(stats["geoip_download_manager"]).to be_nil
+    end
+  end
+
+  def start_logstash
+    @logstash_service = logstash("bin/logstash -e \"#{config}\" -w 1", {
+      :belzebuth => {
+        :wait_condition => /Pipelines running/, # Check for all pipeline started
+        :timeout => 5 * 60 # Fail safe, this mean something went wrong if we hit this before the wait_condition
+      }
+    })
+  end
+
+  after(:each) do
+    @logstash_service.stop unless @logstash_service.nil?
+  end
+end
diff --git a/x-pack/qa/integration/monitoring/monitoring_is_disabled_spec.rb b/x-pack/qa/integration/monitoring/monitoring_is_disabled_spec.rb
index 1723c72e8..c153c31aa 100644
--- a/x-pack/qa/integration/monitoring/monitoring_is_disabled_spec.rb
+++ b/x-pack/qa/integration/monitoring/monitoring_is_disabled_spec.rb
@@ -33,6 +33,6 @@ describe "Monitoring is disabled" do
   let(:monitoring_index) { ".monitoring-logstash-2-*" }
 
   it "doesn't record any metrics" do
-    expect(elasticsearch_client.search(:index => monitoring_index)["hits"]["total"]["value"]).to  eq(0)
+    expect(elasticsearch_client.search(:index => monitoring_index)["hits"]["total"]["value"]).to eq(0)
   end
 end
diff --git a/x-pack/qa/integration/monitoring/multiple_host_defined_spec.rb b/x-pack/qa/integration/monitoring/multiple_host_defined_spec.rb
index 235c92de4..67e7d4f65 100644
--- a/x-pack/qa/integration/monitoring/multiple_host_defined_spec.rb
+++ b/x-pack/qa/integration/monitoring/multiple_host_defined_spec.rb
@@ -14,6 +14,7 @@ describe "Multiple hosts defined" do
 
     @logstash_service = logstash("bin/logstash -e '#{config}' -w 1", {
       :settings => {
+        "xpack.monitoring.allow_legacy_collection" => true,
         "xpack.monitoring.elasticsearch.hosts" => ["http://localhost:9200", "http://localhost:9200"],
         "xpack.monitoring.collection.interval" => "1s",
         "xpack.monitoring.elasticsearch.username" => "elastic",
diff --git a/x-pack/qa/integration/monitoring/no_ssl_create_monitoring_indexes_spec.rb b/x-pack/qa/integration/monitoring/no_ssl_create_monitoring_indexes_spec.rb
index 0213d675a..17b494bfa 100644
--- a/x-pack/qa/integration/monitoring/no_ssl_create_monitoring_indexes_spec.rb
+++ b/x-pack/qa/integration/monitoring/no_ssl_create_monitoring_indexes_spec.rb
@@ -16,6 +16,7 @@ describe "Without SSL monitoring index" do
 
     @logstash_service = logstash("bin/logstash -e '#{config}' -w 1", {
       :settings => {
+        "xpack.monitoring.allow_legacy_collection" => true,
         "xpack.monitoring.collection.interval" => "1s",
         "xpack.monitoring.elasticsearch.username" => "elastic",
         "xpack.monitoring.elasticsearch.password" => elastic_password
diff --git a/x-pack/qa/integration/monitoring/persisted_queue_is_enabled_spec.rb b/x-pack/qa/integration/monitoring/persisted_queue_is_enabled_spec.rb
index 1ed1ca846..126d5efcc 100644
--- a/x-pack/qa/integration/monitoring/persisted_queue_is_enabled_spec.rb
+++ b/x-pack/qa/integration/monitoring/persisted_queue_is_enabled_spec.rb
@@ -14,6 +14,7 @@ describe "Multiple hosts defined" do
 
     @logstash_service = logstash("bin/logstash -e '#{config}' -w 1", {
       :settings => {
+        "xpack.monitoring.allow_legacy_collection" => true,
         "xpack.monitoring.elasticsearch.hosts" => ["http://localhost:9200", "http://localhost:9200"],
         "xpack.monitoring.collection.interval" => "1s",
         "queue.type" => "persisted",
diff --git a/x-pack/qa/integration/spec_helper.rb b/x-pack/qa/integration/spec_helper.rb
index d93b3c26c..974092b02 100644
--- a/x-pack/qa/integration/spec_helper.rb
+++ b/x-pack/qa/integration/spec_helper.rb
@@ -2,11 +2,10 @@
 # or more contributor license agreements. Licensed under the Elastic License;
 # you may not use this file except in compliance with the Elastic License.
 
-MONITORING_INDEXES = ".monitoring-logstash-2*,.monitoring-logstash-6*"
+MONITORING_INDEXES = ".monitoring-logstash-*"
 
 require_relative "support/helpers"
 require_relative "support/shared_examples"
 require_relative "support/elasticsearch/api/actions/update_password"
 require "json"
 require "json-schema"
-
diff --git a/x-pack/qa/integration/support/elasticsearch/api/actions/update_password.rb b/x-pack/qa/integration/support/elasticsearch/api/actions/update_password.rb
index a3cfb549f..cc44f77bd 100644
--- a/x-pack/qa/integration/support/elasticsearch/api/actions/update_password.rb
+++ b/x-pack/qa/integration/support/elasticsearch/api/actions/update_password.rb
@@ -5,11 +5,10 @@
 module Elasticsearch
   module API
     module Actions
-
       # Update the password of the specified user
-      def update_password(arguments={})
+      def update_password(arguments = {})
         method = HTTP_PUT
-        path   = Utils.__pathify '_xpack/security/user/',
+        path   = Utils.__pathify '_security/user/',
                                  Utils.__escape(arguments[:user]),
                                  '/_password'
         params = {}
diff --git a/x-pack/qa/integration/support/helpers.rb b/x-pack/qa/integration/support/helpers.rb
index 23c6135e7..0122b8dba 100644
--- a/x-pack/qa/integration/support/helpers.rb
+++ b/x-pack/qa/integration/support/helpers.rb
@@ -8,10 +8,11 @@ require "elasticsearch"
 require "fileutils"
 require "stud/try"
 require "open3"
+require "time"
 
 VERSIONS_YML_PATH = File.join(File.dirname(__FILE__), "..", "..", "..", "..", "versions.yml")
 VERSION_PATH = File.join(File.dirname(__FILE__), "..", "..", "..", "VERSION")
-VERSION = File.exists?(VERSIONS_YML_PATH) ? YAML.load_file(VERSIONS_YML_PATH)['logstash'] : File.read(VERSION_PATH).strip
+VERSION = File.exist?(VERSIONS_YML_PATH) ? YAML.load_file(VERSIONS_YML_PATH)['logstash'] : File.read(VERSION_PATH).strip
 
 def get_logstash_path
   ENV["LOGSTASH_PATH"] || File.join(File.dirname(__FILE__), "../../../../")
@@ -32,9 +33,10 @@ def elasticsearch(options = {})
   temporary_path_data = Stud::Temporary.directory
   default_settings = {
     "path.data" => temporary_path_data,
-    "xpack.monitoring.enabled" => true,
+
     "xpack.monitoring.collection.enabled" => true,
-    "xpack.security.enabled" => true
+    "xpack.security.enabled" => true,
+    "action.destructive_requires_name" => false
   }
   settings = default_settings.merge(options.fetch(:settings, {}))
   settings_arguments = settings.collect { |k, v| "-E#{k}=#{v}" }
@@ -46,7 +48,7 @@ def elasticsearch(options = {})
   # Launch in the background and wait for /started/ stdout
   cmd = "bin/elasticsearch #{settings_arguments.join(' ')}"
   puts "Running elasticsearch: #{cmd}"
-  response = Belzebuth.run(cmd, { :directory => get_elasticsearch_path, :wait_condition => /license.*valid/, :timeout => 15 * 60 })
+  response = Belzebuth.run(cmd, { :directory => get_elasticsearch_path, :wait_condition => /ClusterStateLicenseService.*license.*valid/, :timeout => 15 * 60 })
   unless response.successful?
     raise "Could not start Elasticsearch, response: #{response}"
   end
@@ -57,8 +59,8 @@ def elasticsearch(options = {})
 end
 
 def start_es_xpack_trial
-  if elasticsearch_client.perform_request(:get, '_xpack/license').body['license']['type'] != 'trial'
-    resp = elasticsearch_client.perform_request(:post, '_xpack/license/start_trial', "acknowledge" => true)
+  if elasticsearch_client.perform_request(:get, '_license').body['license']['type'] != 'trial'
+    resp = elasticsearch_client.perform_request(:post, '_license/start_trial', "acknowledge" => true)
     if resp.body["trial_was_started"] != true
       raise "Trial not started: #{resp.body}"
     end
@@ -83,7 +85,6 @@ def bootstrap_password_exists?
   response.successful? && response.stdout_lines.any? { |line| line =~ /^bootstrap.password$/ }
 end
 
-
 def elasticsearch_xpack_installed?
   cmd = "bin/elasticsearch-plugin list"
   response = Belzebuth.run(cmd, { :directory => get_elasticsearch_path })
@@ -94,8 +95,21 @@ def elasticsearch_client(options = { :url => "http://elastic:#{elastic_password}
   Elasticsearch::Client.new(options)
 end
 
-def push_elasticsearch_config(pipeline_id, config)
-  elasticsearch_client.index :index => '.logstash', :type => "doc", id: pipeline_id, :body => { :pipeline => config }
+def es_version
+  response = elasticsearch_client.perform_request(:get, "")
+  major, minor = response.body["version"]["number"].split(".")
+  [major.to_i, minor.to_i]
+end
+
+def push_elasticsearch_config(pipeline_id, config, version = "1")
+  major, minor = es_version
+  if major >= 8 || (major == 7 && minor >= 10)
+    elasticsearch_client.perform_request(:put, "_logstash/pipeline/#{pipeline_id}", {},
+      { :pipeline => config, :username => "log.stash", :pipeline_metadata => {:version => version },
+              :pipeline_settings => {"pipeline.batch.delay": "50"}, :last_modified => Time.now.utc.iso8601})
+  else
+    elasticsearch_client.index :index => '.logstash', :type => "_doc", id: pipeline_id, :body => { :pipeline => config }
+  end
 end
 
 def cleanup_elasticsearch(index = MONITORING_INDEXES)
@@ -103,6 +117,24 @@ def cleanup_elasticsearch(index = MONITORING_INDEXES)
   elasticsearch_client.indices.refresh
 end
 
+def cleanup_system_indices(pipeline_ids)
+  major, minor = es_version
+
+  if major >= 8 || (major == 7 && minor >= 10)
+    pipeline_ids.each do |id|
+      begin
+        elasticsearch_client.perform_request(:delete, "_logstash/pipeline/#{id}")
+      rescue Elastic::Transport::Transport::Errors::NotFound => e
+        puts ".logstash can be empty #{e.message}"
+      end
+    end
+  else
+    cleanup_elasticsearch(".logstash*")
+  end
+
+  elasticsearch_client.indices.refresh
+end
+
 def logstash_command_append(cmd, argument, value)
   if cmd !~ /#{Regexp.escape(argument)}/
     cmd << " #{argument} #{value}"
@@ -114,6 +146,10 @@ def logstash_command_append(cmd, argument, value)
 end
 
 def logstash(cmd, options = {})
+  logstash_with_empty_default(cmd, options, {"xpack.monitoring.enabled" => true})
+end
+
+def logstash_with_empty_default(cmd, options = {}, default_settings = {})
   temporary_settings = Stud::Temporary.directory
   temporary_data = Stud::Temporary.directory
 
@@ -121,9 +157,8 @@ def logstash(cmd, options = {})
   cmd = logstash_command_append(cmd, "--path.data", temporary_data)
 
   logstash_yaml = File.join(temporary_settings, "logstash.yml")
-  default_settings = {"xpack.monitoring.enabled" => true}
   IO.write(logstash_yaml, YAML::dump(default_settings.merge(options.fetch(:settings, {}))))
-  FileUtils.cp(File.join(get_logstash_path, "config", "log4j2.properties"), File.join(temporary_settings, "log4j2.properties") )
+  FileUtils.cp(File.join(get_logstash_path, "config", "log4j2.properties"), File.join(temporary_settings, "log4j2.properties"))
 
   puts "Running logstash with #{cmd} in #{get_logstash_path} with settings #{options.inspect}"
   Belzebuth.run(cmd, {:directory => get_logstash_path }.merge(options.fetch(:belzebuth, { })))
diff --git a/x-pack/qa/integration/support/shared_examples.rb b/x-pack/qa/integration/support/shared_examples.rb
index d1465051d..e38903396 100644
--- a/x-pack/qa/integration/support/shared_examples.rb
+++ b/x-pack/qa/integration/support/shared_examples.rb
@@ -9,8 +9,8 @@ shared_examples "record monitoring data to es" do
   let(:retryable_errors) do
     [NoMethodError,
      RSpec::Expectations::ExpectationNotMetError,
-     Elasticsearch::Transport::Transport::Errors::ServiceUnavailable,
-     Elasticsearch::Transport::Transport::Errors::NotFound]
+     Elastic::Transport::Transport::Errors::ServiceUnavailable,
+     Elastic::Transport::Transport::Errors::NotFound]
   end
 
   describe "metrics" do
@@ -28,7 +28,7 @@ shared_examples "record monitoring data to es" do
     end
   end
 
-  describe "state" do 
+  describe "state" do
     let(:schema_file) { File.join(schemas_path, "states_document_schema.json") }
 
     it "records state on es" do
diff --git a/x-pack/spec/config_management/bootstrap_check_spec.rb b/x-pack/spec/config_management/bootstrap_check_spec.rb
index 77d4f7586..d1ce70103 100644
--- a/x-pack/spec/config_management/bootstrap_check_spec.rb
+++ b/x-pack/spec/config_management/bootstrap_check_spec.rb
@@ -40,10 +40,9 @@ describe LogStash::ConfigManagement::BootstrapCheck do
 
     it "sets the `config.reload.interval`" do
       expect { subject.check(settings) }
-        .to change { settings.get_value("config.reload.interval") }.to(interval * 1_000_000_000)
+        .to change { settings.get_value("config.reload.interval").to_nanos }.to(interval * 1_000_000_000)
     end
 
-
     context "when `config.string` is given" do
       let(:settings) do
         apply_settings(
@@ -76,38 +75,6 @@ describe LogStash::ConfigManagement::BootstrapCheck do
       end
     end
 
-    context "when `modules.cli` is given" do
-      let(:settings) do
-        apply_settings(
-          {
-            "xpack.management.enabled" => true,
-            "modules.cli" => [{ "name" => "hello" }]
-          },
-          system_settings
-        )
-      end
-
-      it "raises a `LogStash::BootstrapCheckError` error" do
-        expect { subject.check(settings) }.to raise_error LogStash::BootstrapCheckError
-      end
-    end
-
-    context "when `modules` is given" do
-      let(:settings) do
-        apply_settings(
-          {
-            "xpack.management.enabled" => true,
-            "modules" => [{ "name" => "hello" }]
-          },
-          system_settings
-        )
-      end
-
-      it "raises a `LogStash::BootstrapCheckError` error" do
-        expect { subject.check(settings) }.to raise_error LogStash::BootstrapCheckError
-      end
-    end
-
     context "when `path.config` is given" do
       let(:settings) do
         apply_settings(
@@ -120,7 +87,9 @@ describe LogStash::ConfigManagement::BootstrapCheck do
       end
 
       context 'when a configuration file exists in the specified location' do
-        let(:config_location) { Stud::Temporary.file.path }
+        # gsub replacement is only for Windows platform, without `gsub` `Dir.glob` cannot discover files and test fails
+        # note that in other `Dir.glob` places, we used `File.join/dirname` operations which doesn't create issue on Windows
+        let(:config_location) { Stud::Temporary.file.path.gsub("\\", "/") }
 
         it "raises a `LogStash::BootstrapCheckError` error" do
           expect { subject.check(settings) }.to raise_error LogStash::BootstrapCheckError
@@ -177,6 +146,40 @@ describe LogStash::ConfigManagement::BootstrapCheck do
         end
       end
 
+      context "when defining invalid patterns" do
+        let(:pipeline_ids) { ["pipeline1", "pipeline2", "@o@"] }
+        let(:settings) do
+          apply_settings(
+            {
+              "xpack.management.enabled" => true,
+              "xpack.management.pipeline.id" => pipeline_ids
+            },
+            system_settings
+          )
+        end
+
+        it "raises a `LogStash::BootstrapCheckError` with the invalid patterns" do
+          expect { subject.check(settings) }.to raise_error LogStash::BootstrapCheckError, /@o@/
+        end
+      end
+
+      context "when defining wildcard patterns" do
+        let(:pipeline_ids) { ["pipeline1", "pipeline2", "*pipeline*"] }
+        let(:settings) do
+          apply_settings(
+              {
+                  "xpack.management.enabled" => true,
+                  "xpack.management.pipeline.id" => pipeline_ids
+              },
+              system_settings
+          )
+        end
+
+        it "does not raise a `LogStash::BootstrapCheckError` error" do
+          expect { subject.check(settings) }.to_not raise_error
+        end
+      end
+
       context "when defining duplicate ids" do
         let(:pipeline_ids) { ["pipeline1", "pipeline2", "pipeline1"] }
         let(:settings) do
diff --git a/x-pack/spec/config_management/elasticsearch_source_spec.rb b/x-pack/spec/config_management/elasticsearch_source_spec.rb
index e34069b9e..b16916ca5 100644
--- a/x-pack/spec/config_management/elasticsearch_source_spec.rb
+++ b/x-pack/spec/config_management/elasticsearch_source_spec.rb
@@ -4,6 +4,7 @@
 
 require "spec_helper"
 require "logstash/json"
+require "logstash/runner"
 require "config_management/elasticsearch_source"
 require "config_management/extension"
 require "license_checker/license_manager"
@@ -11,6 +12,8 @@ require "monitoring/monitoring"
 require "stud/temporary"
 
 describe LogStash::ConfigManagement::ElasticsearchSource do
+  let(:system_indices_api) { LogStash::ConfigManagement::SystemIndicesFetcher::SYSTEM_INDICES_API_PATH }
+  let(:system_indices_url_regex) { Regexp.new("^#{system_indices_api}") }
   let(:elasticsearch_url) { ["https://localhost:9898"] }
   let(:elasticsearch_username) { "elastictest" }
   let(:elasticsearch_password) { "testchangeme" }
@@ -40,13 +43,12 @@ describe LogStash::ConfigManagement::ElasticsearchSource do
 }"
   }
 
-
   let(:valid_xpack_response) {
     {
       "license" => {
         "status" => license_status,
         "uid" => "9a48c67c-ce2c-4169-97bf-37d324b8ab80",
-        "type"=> license_type,
+        "type" => license_type,
         "expiry_date_in_millis" => license_expiry_in_millis
       },
       "features" => {
@@ -60,29 +62,23 @@ describe LogStash::ConfigManagement::ElasticsearchSource do
   }
 
   let(:no_xpack_response) {
-    LogStash::Json.load("{
-          \"error\": {
-            \"root_cause\": [
-              {
-                \"type\": \"index_not_found_exception\",
-                \"reason\": \"no such index\",
-                \"resource.type\": \"index_or_alias\",
-                \"resource.id\": \"_xpack\",
-                \"index_uuid\": \"_na_\",
-                \"index\": \"_xpack\"
-              }],
-            \"type\": \"index_not_found_exception\",
-            \"reason\": \"no such index\",
-            \"resource.type\": \"index_or_alias\",
-            \"resource.id\": \"_xpack\",
-            \"index_uuid\": \"_na_\",
-            \"index\": \"_xpack\"
-          },
-          \"status\": 404
-        }")
+    {"error" =>
+       {"root_cause" =>
+          [{"type" => "index_not_found_exception",
+            "reason" => "no such index",
+            "resource.type" => "index_or_alias",
+            "resource.id" => "_xpack",
+            "index_uuid" => "_na_",
+            "index" => "_xpack"}],
+        "type" => "index_not_found_exception",
+        "reason" => "no such index",
+        "resource.type" => "index_or_alias",
+        "resource.id" => "_xpack",
+        "index_uuid" => "_na_",
+        "index" => "_xpack"},
+     "status" => 404}
   }
 
-
   let(:settings) do
     {
       "xpack.management.enabled" => true,
@@ -93,6 +89,22 @@ describe LogStash::ConfigManagement::ElasticsearchSource do
     }
   end
 
+  let(:es_version_response) { es_version_8_response }
+  let(:es_version_8_response) { cluster_info("8.0.0-SNAPSHOT") }
+  let(:es_version_7_9_response) { cluster_info("7.9.1") }
+
+  let(:elasticsearch_7_9_err_response) {
+    {"error" =>
+         {"root_cause" =>
+              [{"type" => "parse_exception",
+                "reason" => "request body or source parameter is required"}],
+          "type" => "parse_exception",
+          "reason" => "request body or source parameter is required"},
+     "status" => 400}
+  }
+
+  let(:elasticsearch_8_err_response) { {"error" => "Incorrect HTTP method for uri", "status" => 405} }
+
   before do
     extension.additionals_settings(system_settings)
     apply_settings(settings, system_settings)
@@ -103,7 +115,9 @@ describe LogStash::ConfigManagement::ElasticsearchSource do
   describe ".new" do
     before do
       allow_any_instance_of(described_class).to receive(:setup_license_checker)
+      allow_any_instance_of(described_class).to receive(:license_check)
     end
+
     context "when password isn't set" do
       let(:settings) do
         {
@@ -114,25 +128,238 @@ describe LogStash::ConfigManagement::ElasticsearchSource do
           #"xpack.management.elasticsearch.password" => elasticsearch_password,
         }
       end
+
       it "should raise an ArgumentError" do
         expect { described_class.new(system_settings) }.to raise_error(ArgumentError)
       end
     end
-  end
 
-  describe "#config_path" do
-    before do
-      # we are testing the arguments here, not the behavior of the elasticsearch output
-      allow_any_instance_of(described_class).to receive(:build_client).and_return(nil)
+    context "cloud settings" do
+      let(:cloud_name) { 'abcdefghijklmnopqrstuvxyz' }
+      let(:cloud_domain) { 'elastic.co' }
+      let(:cloud_id) { "label:#{Base64.urlsafe_encode64("#{cloud_domain}$#{cloud_name}$ignored")}" }
+
+      let(:settings) do
+        {
+            "xpack.management.enabled" => true,
+            "xpack.management.pipeline.id" => "main",
+            "xpack.management.elasticsearch.cloud_id" => cloud_id,
+            "xpack.management.elasticsearch.cloud_auth" => "#{elasticsearch_username}:#{elasticsearch_password}"
+        }
+      end
+
+      it "should not raise an ArgumentError" do
+        expect { described_class.new(system_settings) }.not_to raise_error
+      end
+
+      context "when cloud_auth isn't set" do
+        let(:settings) do
+          {
+              "xpack.management.enabled" => true,
+              "xpack.management.pipeline.id" => "main",
+              "xpack.management.elasticsearch.cloud_id" => cloud_id,
+              #"xpack.management.elasticsearch.cloud_auth" => "#{elasticsearch_username}:#{elasticsearch_password}"
+          }
+        end
+
+        it "will rely on username and password settings" do
+          # since cloud_id and cloud_auth are simply containers for host and username/password
+          # both could be set independently and if cloud_auth is not set then authn will be done
+          # using the provided username/password settings, which can be set or not if not auth is
+          # required.
+          expect { described_class.new(system_settings) }.to_not raise_error
+        end
+      end
     end
 
-    let(:pipeline_id) { "foobar" }
-    let(:settings) { { "xpack.management.pipeline.id" => pipeline_id,
-                       "xpack.management.elasticsearch.password" => "testpassword"
-          } }
+    context "valid settings" do
+      let(:settings) do
+        {
+          "xpack.management.enabled" => true,
+          "xpack.management.pipeline.id" => "main",
+          "xpack.management.elasticsearch.hosts" => elasticsearch_url,
+          "xpack.management.elasticsearch.username" => elasticsearch_username,
+          "xpack.management.elasticsearch.password" => elasticsearch_password,
+        }
+      end
 
-    it "generates the path to get the configuration" do
-      expect(subject.config_path).to eq("#{described_class::PIPELINE_INDEX}/#{described_class::PIPELINE_TYPE}/_mget")
+      # This spec is certainly indirect, and assumes that communication with Elasticsearch
+      # will be done through an ES-output HttpClient available at described_class.client
+      it 'creates an Elasticsearch HttpClient with product origin custom headers' do
+        internal_client = subject.send(:client) # internal reach
+        expect(internal_client)
+          .to be_a_kind_of(LogStash::Outputs::ElasticSearch::HttpClient)
+          .and(have_attributes(:client_settings => hash_including(:headers => hash_including("x-elastic-product-origin" => "logstash"))))
+      end
+    end
+  end
+
+  describe LogStash::ConfigManagement::SystemIndicesFetcher do
+    subject { described_class.new }
+
+    describe "system indices api" do
+      let(:mock_client)  { double("http_client") }
+      let(:config) { "input { generator { count => 100 } tcp { port => 6005 } } output { }}" }
+      let(:es_version_8_2) { { major: 8, minor: 2} }
+      let(:es_version_8_3) { { major: 8, minor: 3} }
+      let(:es_version_9_0) { { major: 9, minor: 0} }
+      let(:pipeline_id) { "super_generator" }
+      let(:elasticsearch_response) { {"#{pipeline_id}" => {"pipeline" => "#{config}"}} }
+      let(:all_pipelines) { JSON.parse(::File.read(::File.join(::File.dirname(__FILE__), "fixtures", "pipelines.json"))) }
+      let(:mock_logger) { double("fetcher's logger") }
+
+      before(:each) {
+        allow(subject).to receive(:logger).and_return(mock_logger)
+      }
+
+      it "#fetch_config from ES v8.2" do
+        expect(mock_client).to receive(:get).with("#{described_class::SYSTEM_INDICES_API_PATH}/").and_return(elasticsearch_response.clone)
+        expect(subject.fetch_config(es_version_8_2, [pipeline_id], mock_client)).to eq(elasticsearch_response)
+        expect(subject.get_single_pipeline_setting(pipeline_id)).to eq({"pipeline" => "#{config}"})
+      end
+
+      it "#fetch_config from ES v8.3" do
+        expect(mock_client).to receive(:get).with("#{described_class::SYSTEM_INDICES_API_PATH}?id=#{pipeline_id}").and_return(elasticsearch_response.clone)
+        expect(subject.fetch_config(es_version_8_3, [pipeline_id], mock_client)).to eq(elasticsearch_response)
+        expect(subject.get_single_pipeline_setting(pipeline_id)).to eq({"pipeline" => "#{config}"})
+      end
+
+      it "#fetch_config from ES v9.0" do
+        expect(mock_client).to receive(:get).with("#{described_class::SYSTEM_INDICES_API_PATH}?id=#{pipeline_id}").and_return(elasticsearch_response.clone)
+        expect(subject.fetch_config(es_version_9_0, [pipeline_id], mock_client)).to eq(elasticsearch_response)
+        expect(subject.get_single_pipeline_setting(pipeline_id)).to eq({"pipeline" => "#{config}"})
+      end
+
+      it "#fetch_config should raise error" do
+        expect(mock_client).to receive(:get).with("#{described_class::SYSTEM_INDICES_API_PATH}/").and_return(elasticsearch_8_err_response.clone)
+        expect { subject.fetch_config(es_version_8_2, ["apache", "nginx"], mock_client) }.to raise_error(LogStash::ConfigManagement::ElasticsearchSource::RemoteConfigError)
+      end
+
+      describe "wildcard" do
+        it "should accept * " do
+          expect(mock_client).to receive(:get).with("#{described_class::SYSTEM_INDICES_API_PATH}/").and_return(all_pipelines.clone)
+          expect(mock_logger).to receive(:warn).never
+          expect(subject.fetch_config(es_version_8_2, ["*"], mock_client).keys.length).to eq(all_pipelines.keys.length)
+        end
+
+        it "should accept multiple * in one pattern " do
+          expect(mock_client).to receive(:get).with("#{described_class::SYSTEM_INDICES_API_PATH}/").and_return(all_pipelines.clone)
+          expect(mock_logger).to receive(:warn).never
+          expect(subject.fetch_config(es_version_8_2, ["host*_pipeline*"], mock_client).keys).to eq(["host1_pipeline1", "host1_pipeline2", "host2_pipeline1", "host2_pipeline2"])
+        end
+
+        it "should give unique pipeline with multiple wildcard patterns" do
+          expect(mock_client).to receive(:get).with("#{described_class::SYSTEM_INDICES_API_PATH}/").and_return(all_pipelines.clone)
+          expect(subject).to receive(:log_pipeline_not_found).with(["*pipeline*"]).exactly(1)
+          expect(subject.fetch_config(es_version_8_2, ["host1_pipeline*", "host2_pipeline*", "*pipeline*"], mock_client).keys).to eq(["host1_pipeline1", "host1_pipeline2", "host2_pipeline1", "host2_pipeline2"])
+        end
+
+        it "should accept a mix of wildcard and non wildcard pattern" do
+          expect(mock_client).to receive(:get).with("#{described_class::SYSTEM_INDICES_API_PATH}/").and_return(all_pipelines.clone)
+          expect(mock_logger).to receive(:warn).never
+          expect(subject.fetch_config(es_version_8_2, ["host1_pipeline*", "host2_pipeline*", "super_generator"], mock_client).keys).to eq(["super_generator", "host1_pipeline1", "host1_pipeline2", "host2_pipeline1", "host2_pipeline2"])
+        end
+
+        it "should log unmatched pattern" do
+          pipeline_ids = ["very_awesome_pipeline", "*whatever*"]
+          expect(mock_client).to receive(:get).with("#{described_class::SYSTEM_INDICES_API_PATH}/").and_return(all_pipelines.clone)
+          expect(subject).to receive(:log_pipeline_not_found).with(pipeline_ids).exactly(1)
+          expect(subject.fetch_config(es_version_8_2, pipeline_ids, mock_client)).to eq({})
+        end
+
+        it "should log unmatched pattern and return matched pipeline" do
+          pipeline_ids = ["very_awesome_pipeline", "*whatever*"]
+          expect(mock_client).to receive(:get).with("#{described_class::SYSTEM_INDICES_API_PATH}/").and_return(all_pipelines.clone)
+          expect(subject).to receive(:log_pipeline_not_found).with(pipeline_ids).exactly(1)
+          expect(subject.fetch_config(es_version_8_2, pipeline_ids + [pipeline_id], mock_client)).to eq(elasticsearch_response)
+        end
+      end
+    end
+  end
+
+  describe LogStash::ConfigManagement::LegacyHiddenIndicesFetcher do
+    subject { described_class.new }
+
+    describe "legacy api" do
+      let(:mock_client)  { double("http_client") }
+      let(:config) { "input { generator { count => 100 } tcp { port => 6005 } } output {  }}" }
+      let(:another_config) { "input { generator { count => 100 } tcp { port => 6006 } } output {  }}" }
+      let(:empty_es_version) { {
+        # will not be used
+      } }
+      let(:pipeline_id) { "super_generator" }
+      let(:another_pipeline_id) { "another_generator" }
+      let(:elasticsearch_response) {
+        {"docs" =>
+             [{"_index" => ".logstash",
+               "_id" => "#{pipeline_id}",
+               "_version" => 2,
+               "_seq_no" => 2,
+               "_primary_term" => 1,
+               "found" => true,
+               "_source" =>
+                   {"pipeline" => "#{config}"}},
+              {"_index" => ".logstash",
+               "_id" => "#{another_pipeline_id}",
+               "_version" => 2,
+               "_seq_no" => 3,
+               "_primary_term" => 1,
+               "found" => true,
+               "_source" =>
+                   {"pipeline" => "#{another_config}"}},
+              {"_index" => ".logstash", "_id" => "not_exists", "found" => false}]}
+      }
+
+      let(:formatted_es_response) {
+        {"super_generator" => {"_index" => ".logstash", "_id" => "super_generator", "_version" => 2, "_seq_no" => 2, "_primary_term" => 1, "found" => true, "_source" => {"pipeline" => "input { generator { count => 100 } tcp { port => 6005 } } output {  }}"}}}
+      }
+
+      let(:mock_logger) { double("fetcher's logger") }
+
+      before(:each) {
+        allow(subject).to receive(:logger).and_return(mock_logger)
+        allow(mock_logger).to receive(:debug)
+      }
+
+      it "#fetch_config" do
+        expect(mock_client).to receive(:post).with("#{described_class::PIPELINE_INDEX}/_mget", {}, "{\"docs\":[{\"_id\":\"#{pipeline_id}\"},{\"_id\":\"#{another_pipeline_id}\"}]}").and_return(elasticsearch_response)
+        expect(mock_logger).to receive(:warn).never
+        expect(subject.fetch_config(empty_es_version, [pipeline_id, another_pipeline_id], mock_client).size).to eq(2)
+        expect(subject.get_single_pipeline_setting(pipeline_id)).to eq({"pipeline" => "#{config}"})
+        expect(subject.get_single_pipeline_setting(another_pipeline_id)).to eq({"pipeline" => "#{another_config}"})
+      end
+
+      it "#fetch_config should raise error" do
+        expect(mock_client).to receive(:post).with("#{described_class::PIPELINE_INDEX}/_mget", {}, "{\"docs\":[{\"_id\":\"#{pipeline_id}\"},{\"_id\":\"#{another_pipeline_id}\"}]}").and_return(elasticsearch_7_9_err_response)
+        expect(mock_logger).to receive(:warn).never
+        expect { subject.fetch_config(empty_es_version, [pipeline_id, another_pipeline_id], mock_client) }.to raise_error(LogStash::ConfigManagement::ElasticsearchSource::RemoteConfigError)
+      end
+
+      it "#fetch_config should raise error when response is empty" do
+        expect(mock_client).to receive(:post).with("#{described_class::PIPELINE_INDEX}/_mget", {}, "{\"docs\":[{\"_id\":\"#{pipeline_id}\"},{\"_id\":\"#{another_pipeline_id}\"}]}").and_return(LogStash::Json.load("{}"))
+        expect { subject.fetch_config(empty_es_version, [pipeline_id, another_pipeline_id], mock_client) }.to raise_error(LogStash::ConfigManagement::ElasticsearchSource::RemoteConfigError)
+      end
+
+      it "#fetch_config should log unmatched pipeline id" do
+        expect(mock_client).to receive(:post).with("#{described_class::PIPELINE_INDEX}/_mget", {}, "{\"docs\":[{\"_id\":\"#{pipeline_id}\"},{\"_id\":\"#{another_pipeline_id}\"},{\"_id\":\"*\"}]}").and_return(elasticsearch_response)
+        expect(subject).to receive(:log_pipeline_not_found).with(["*"]).exactly(1)
+        expect(mock_logger).to receive(:warn).with(/is not supported in Elasticsearch version < 7\.10/)
+        expect(subject.fetch_config(empty_es_version, [pipeline_id, another_pipeline_id, "*"], mock_client).size).to eq(2)
+        expect(subject.get_single_pipeline_setting(pipeline_id)).to eq({"pipeline" => "#{config}"})
+        expect(subject.get_single_pipeline_setting(another_pipeline_id)).to eq({"pipeline" => "#{another_config}"})
+      end
+
+      it "#format_response should return pipelines" do
+        result = subject.send(:format_response, elasticsearch_response)
+        expect(result.size).to eq(2)
+        expect(result.has_key?(pipeline_id)).to be_truthy
+        expect(result.has_key?(another_pipeline_id)).to be_truthy
+      end
+
+      it "should log wildcard warning" do
+        expect(mock_logger).to receive(:warn).with("wildcard '*' in xpack.management.pipeline.id is not supported in Elasticsearch version < 7.10")
+        subject.send(:log_wildcard_unsupported, [pipeline_id, another_pipeline_id, "*"])
+      end
     end
   end
 
@@ -145,10 +372,13 @@ describe LogStash::ConfigManagement::ElasticsearchSource do
     end
 
     context "when enabled" do
-      let(:settings) { {
-        "xpack.management.enabled" => true,
-        "xpack.management.elasticsearch.password" => "testpassword"
-      } }
+      let(:settings) do
+        {
+          "xpack.management.enabled" => true,
+          "xpack.management.elasticsearch.username" => "testuser",
+          "xpack.management.elasticsearch.password" => "testpassword"
+        }
+      end
 
       it "returns true" do
         expect(subject.match?).to be_truthy
@@ -167,268 +397,384 @@ describe LogStash::ConfigManagement::ElasticsearchSource do
   describe "#pipeline_configs" do
     let(:pipeline_id) { "apache" }
     let(:mock_client)  { double("http_client") }
-    let(:settings) { super.merge({ "xpack.management.pipeline.id" => pipeline_id }) }
-    let(:es_path) { "#{described_class::PIPELINE_INDEX}/#{described_class::PIPELINE_TYPE}/_mget" }
+    let(:settings) { super().merge({ "xpack.management.pipeline.id" => pipeline_id }) }
+    let(:config) { "input { generator {} } filter { mutate {} } output { }" }
+    let(:username) { 'log.stash' }
+    let(:pipeline_settings) do
+      {
+        "pipeline.batch.delay"       => "50",
+        "pipeline.workers"           => "99",
+        "pipeline.ordered"           => "false",
+        "pipeline.ecs_compatibility" => "v1",
+
+        # invalid settings to be ignored...
+        "pipeline.output.workers"    => "99",
+        "nonsensical.invalid.setting" => "-9999",
+      }
+    end
+    let(:pipeline_metadata) do
+      {
+        "version" => 5,
+        "type" => "logstash_pipeline",
+      }
+    end
+    let(:elasticsearch_response) { elasticsearch_8_response }
+    let(:elasticsearch_8_response) do
+      {
+        pipeline_id => {
+          username: username,
+          modified_timestamp: "2017-02-28T23:02:17.023Z",
+          pipeline_metadata: pipeline_metadata,
+          pipeline: config,
+          pipeline_settings: pipeline_settings,
+        }
+      }.to_json
+    end
+
+    let(:elasticsearch_7_9_response) do
+      {
+        docs: [{
+                 _index: ".logstash",
+                 _type: "pipelines",
+                 _id: pipeline_id,
+                 _version: 8,
+                 found: true,
+                 _source: {
+                   id: pipeline_id,
+                   description: "Process apache logs",
+                   modified_timestamp: "2017-02-28T23:02:17.023Z",
+                   pipeline_metadata: pipeline_metadata.merge(username: username),
+                   pipeline: config,
+                   pipeline_settings: pipeline_settings,
+                 }
+               }]
+      }.to_json
+    end
+    let(:legacy_api) { ".logstash/_mget" }
     let(:request_body_string) { LogStash::Json.dump({ "docs" => [{ "_id" => pipeline_id }] }) }
 
     before do
-      allow(mock_client).to receive(:post).with(es_path, {}, request_body_string).and_return(LogStash::Json.load(elasticsearch_response))
+      allow(mock_client).to receive(:get).with(system_indices_url_regex).and_return(LogStash::Json.load(elasticsearch_response))
+      allow(mock_client).to receive(:get).with("/").and_return(es_version_response)
+      allow(mock_client).to receive(:post).with(legacy_api, {}, request_body_string).and_return(LogStash::Json.load(elasticsearch_7_9_response))
       allow(mock_license_client).to receive(:get).with('_xpack').and_return(valid_xpack_response)
-      allow_any_instance_of(LogStash::LicenseChecker::LicenseReader).to receive(:client).and_return(mock_license_client)
+      allow(mock_license_client).to receive(:get).with('/').and_return(cluster_info(LOGSTASH_VERSION))
 
+      allow_any_instance_of(LogStash::LicenseChecker::LicenseReader).to receive(:client).and_return(mock_license_client)
     end
 
-    context "with one `pipeline_id` configured" do
-      context "when successfully fetching a remote configuration" do
+    describe "system indices [8] and legacy api [7.9]" do
+      [8, 7.9].each { |es_version|
+        let(:elasticsearch_response) { (es_version >= 8) ? elasticsearch_8_response : elasticsearch_7_9_response }
 
         before :each do
-          expect_any_instance_of(described_class).to receive(:build_client).and_return(mock_client)
+          allow(mock_client).to receive(:get).with("/").and_return(es_version >= 8 ? es_version_response : es_version_7_9_response)
         end
 
-        let(:config) { "input { generator {} } filter { mutate {} } output { }" }
-        let(:whitelisted_pipeline_setting_name) {"pipeline.workers"}
-        let(:whitelisted_pipeline_setting_value) {"99"}
-        let(:non_whitelisted_pipeline_setting_name) {"pipeline.output.workers"}
-        let(:non_whitelisted_pipeline_setting_value) {"99"}
-        let(:invalid_pipeline_setting) {"nonsensical.invalid.setting"}
-        let(:elasticsearch_response) {
-          %{
-          { "docs": [{
-              "_index":".logstash",
-              "_type":"pipelines",
-              "_id":"#{pipeline_id}",
-              "_version":8,
-              "found":true,
-              "_source": {
-                "id":"apache",
-                "description":"Process apache logs",
-                "modified_timestamp":"2017-02-28T23:02:17.023Z",
-                "pipeline_metadata":{
-                  "version":5,
-                  "type":"logstash_pipeline",
-                  "username":"elastic"
-                },
-                "pipeline":"#{config}",
-                "pipeline_settings": {
-                  "#{whitelisted_pipeline_setting_name}":#{whitelisted_pipeline_setting_value},
-                  "#{non_whitelisted_pipeline_setting_name}":#{non_whitelisted_pipeline_setting_value},
-                  "#{invalid_pipeline_setting}":-9999
-                }
+        context "with one `pipeline_id` configured [#{es_version}]" do
+          context "when successfully fetching a remote configuration" do
+            let(:logger_stub) { double("Logger").as_null_object }
+            before :each do
+              expect_any_instance_of(described_class).to receive(:build_client).and_return(mock_client)
+              allow_any_instance_of(described_class).to receive(:logger).and_return(logger_stub)
+              allow(mock_client).to receive(:post).with(legacy_api, {}, request_body_string).and_return(LogStash::Json.load(elasticsearch_7_9_response))
+            end
+
+            let(:config) { "input { generator {} } filter { mutate {} } output { }" }
+
+            it "returns a valid pipeline config" do
+              pipeline_config = subject.pipeline_configs
+
+              expect(pipeline_config.first.config_string).to match(config)
+              expect(pipeline_config.first.pipeline_id.to_sym).to eq(pipeline_id.to_sym)
+            end
+
+            it "applies allowed settings and logs warning about ignored settings" do
+              pipeline_config = subject.pipeline_configs
+              pipeline_settings = pipeline_config[0].settings
+
+              aggregate_failures do
+                # explicitly given settings
+                expect(pipeline_settings.get_setting("pipeline.workers")).to be_set.and(have_attributes(value: 99))
+                expect(pipeline_settings.get_setting("pipeline.batch.delay")).to be_set.and(have_attributes(value: 50))
+                expect(pipeline_settings.get_setting("pipeline.ordered")).to be_set.and(have_attributes(value: "false"))
+                expect(pipeline_settings.get_setting("pipeline.ecs_compatibility")).to be_set.and(have_attributes(value: "v1"))
+
+                # valid non-provided settings
+                expect(pipeline_settings.get_setting("queue.type")).to_not be_set
+
+                # invalid provided settings
+                %w(
+                  pipeline.output.workers
+                  nonsensical.invalid.setting
+                ).each do |invalid_setting|
+                  expect(pipeline_settings.registered?(invalid_setting)).to be false
+                  expect(logger_stub).to have_received(:warn).with(/Ignoring .+ '#{Regexp.quote(invalid_setting)}'/)
+                end
+              end
+            end
+          end
+
+          context "when the license has expired [#{es_version}]" do
+            let(:license_status) { 'expired'}
+            let(:license_expiry_date) { Time.now - (60 * 60 * 24)}
+
+            before :each do
+              expect_any_instance_of(described_class).to receive(:build_client).and_return(mock_client)
+            end
+
+            it "returns a valid pipeline config" do
+              pipeline_config = subject.pipeline_configs
+
+              expect(pipeline_config.first.config_string).to match(config)
+              expect(pipeline_config.first.pipeline_id.to_sym).to eq(pipeline_id.to_sym)
+            end
+          end
+
+          context "when the license server is not available [#{es_version}]" do
+            before :each do
+              allow(mock_license_client).to receive(:get).with('_xpack').and_raise("An error is here")
+              allow_any_instance_of(LogStash::LicenseChecker::LicenseReader).to receive(:build_client).and_return(mock_license_client)
+            end
+
+            it 'should raise an error' do
+              expect {subject.pipeline_configs}.to raise_error(LogStash::LicenseChecker::LicenseError)
+            end
+          end
+
+          context "when the xpack is not installed [#{es_version}]" do
+            before :each do
+              expect(mock_license_client).to receive(:get).with('_xpack').and_return(no_xpack_response)
+              allow_any_instance_of(LogStash::LicenseChecker::LicenseReader).to receive(:build_client).and_return(mock_license_client)
+            end
+
+            it 'should raise an error' do
+              expect {subject.pipeline_configs}.to raise_error(LogStash::LicenseChecker::LicenseError)
+            end
+          end
+
+          context "when ES is serverless" do
+            before do
+              expect(mock_license_client).to receive(:get).with('/').and_return(cluster_info(LOGSTASH_VERSION, 'serverless'))
+            end
+
+            it "passes license check" do
+              expect(subject.license_check).to be_truthy
+            end
+          end
+
+          describe "security enabled/disabled in Elasticsearch [#{es_version}]" do
+            let(:xpack_response) do
+              {
+                  "license" => {
+                      "status" => license_status,
+                      "uid" => "9a48c67c-ce2c-4169-97bf-37d324b8ab80",
+                      "type" => license_type,
+                      "expiry_date_in_millis" => license_expiry_in_millis
+                  },
+                  "features" => {
+                      "security" => {
+                          "description" => "Security for the Elastic Stack",
+                          "available" => true,
+                          "enabled" => security_enabled
+                      }
+                  }
               }
-            }]
-          }
-          }
-        }
+            end
 
-        it "returns a valid pipeline config" do
-          pipeline_config = subject.pipeline_configs
+            before :each do
+              allow(mock_license_client).to receive(:get).with('_xpack').and_return(xpack_response)
+              allow_any_instance_of(LogStash::LicenseChecker::LicenseReader).to receive(:build_client).and_return(mock_license_client)
+            end
 
-          expect(pipeline_config.first.config_string).to match(config)
-          expect(pipeline_config.first.pipeline_id).to eq(pipeline_id.to_sym)
-        end
+            context "when security is disabled in Elasticsearch [#{es_version}]" do
+              let(:security_enabled) { false }
+              it 'should raise an error' do
+                expect { subject.pipeline_configs }.to raise_error(LogStash::LicenseChecker::LicenseError)
+              end
+            end
 
-        it "ignores non-whitelisted and invalid settings" do
-          pipeline_config = subject.pipeline_configs
-          settings_hash = pipeline_config[0].settings.to_hash
+            context "when security is enabled in Elasticsearch [#{es_version}]" do
+              let(:security_enabled) { true }
+              it 'should not raise an error' do
+                expect_any_instance_of(described_class).to receive(:build_client).and_return(mock_client)
+                expect { subject.pipeline_configs }.not_to raise_error
+              end
+            end
+          end
 
-          expect(settings_hash[whitelisted_pipeline_setting_name]).to eq(whitelisted_pipeline_setting_value.to_i)
-          expect(settings_hash[non_whitelisted_pipeline_setting_name]).not_to eq(non_whitelisted_pipeline_setting_value.to_i)
-          expect(settings_hash[invalid_pipeline_setting]).to be_falsey
-        end
-      end
+          context "With an invalid basic license, it should raise an error [#{es_version}]" do
+            let(:license_type) { 'basic' }
 
-      context 'when the license has expired' do
-        let(:config) { "input { generator {} } filter { mutate {} } output { }" }
-        let(:elasticsearch_response) { "{ \"docs\":[{\"_index\":\".logstash\",\"_type\":\"pipelines\",\"_id\":\"#{pipeline_id}\",\"_version\":8,\"found\":true,\"_source\":{\"id\":\"apache\",\"description\":\"Process apache logs\",\"modified_timestamp\":\"2017-02-28T23:02:17.023Z\",\"pipeline_metadata\":{\"version\":5,\"type\":\"logstash_pipeline\",\"username\":\"elastic\"},\"pipeline\":\"#{config}\"}}]}" }
-        let(:license_status) { 'expired'}
-        let(:license_expiry_date) { Time.now - (60 * 60 * 24)}
+            it 'should raise an error' do
+              expect {subject.pipeline_configs}.to raise_error(LogStash::LicenseChecker::LicenseError)
+            end
+          end
 
-        before :each do
-          expect_any_instance_of(described_class).to receive(:build_client).and_return(mock_client)
-        end
+          # config management can be used with any license type except basic
+          (::LogStash::LicenseChecker::LICENSE_TYPES - ["basic"]).each do |license_type|
+            context "With a valid #{license_type} license, it should return a pipeline  [#{es_version}]" do
+              before do
+                expect_any_instance_of(described_class).to receive(:build_client).and_return(mock_client)
+              end
 
-        it "returns a valid pipeline config" do
-          pipeline_config = subject.pipeline_configs
+              let(:license_type) { license_type }
 
-          expect(pipeline_config.first.config_string).to match(config)
-          expect(pipeline_config.first.pipeline_id).to eq(pipeline_id.to_sym)
-        end
-      end
+              it "returns a valid pipeline config" do
+                pipeline_config = subject.pipeline_configs
 
-      context 'when the license server is not available' do
-        let(:config) { "input { generator {} } filter { mutate {} } output { }" }
-        let(:elasticsearch_response) { "{ \"docs\":[{\"_index\":\".logstash\",\"_type\":\"pipelines\",\"_id\":\"#{pipeline_id}\",\"_version\":8,\"found\":true,\"_source\":{\"id\":\"apache\",\"description\":\"Process apache logs\",\"modified_timestamp\":\"2017-02-28T23:02:17.023Z\",\"pipeline_metadata\":{\"version\":5,\"type\":\"logstash_pipeline\",\"username\":\"elastic\"},\"pipeline\":\"#{config}\"}}]}" }
-
-        before :each do
-          allow(mock_license_client).to receive(:get).with('_xpack').and_raise("An error is here")
-          allow_any_instance_of(LogStash::LicenseChecker::LicenseReader).to receive(:build_client).and_return(mock_license_client)
-        end
-
-        it 'should raise an error' do
-          expect{subject.pipeline_configs}.to raise_error(LogStash::LicenseChecker::LicenseError)
-        end
-      end
-
-      context 'when the xpack is not installed' do
-        let(:config) { "input { generator {} } filter { mutate {} } output { }" }
-        let(:elasticsearch_response) { "{ \"docs\":[{\"_index\":\".logstash\",\"_type\":\"pipelines\",\"_id\":\"#{pipeline_id}\",\"_version\":8,\"found\":true,\"_source\":{\"id\":\"apache\",\"description\":\"Process apache logs\",\"modified_timestamp\":\"2017-02-28T23:02:17.023Z\",\"pipeline_metadata\":{\"version\":5,\"type\":\"logstash_pipeline\",\"username\":\"elastic\"},\"pipeline\":\"#{config}\"}}]}" }
-
-        before :each do
-          expect(mock_license_client).to receive(:get).with('_xpack').and_return(no_xpack_response)
-          allow_any_instance_of(LogStash::LicenseChecker::LicenseReader).to receive(:build_client).and_return(mock_license_client)
-        end
-
-        it 'should raise an error' do
-          expect{subject.pipeline_configs}.to raise_error(LogStash::LicenseChecker::LicenseError)
-        end
-      end
-
-      describe 'security enabled/disabled in Elasticsearch' do
-        let(:config) { "input { generator {} } filter { mutate {} } output { }" }
-        let(:elasticsearch_response) { "{ \"docs\":[{\"_index\":\".logstash\",\"_type\":\"pipelines\",\"_id\":\"#{pipeline_id}\",\"_version\":8,\"found\":true,\"_source\":{\"id\":\"apache\",\"description\":\"Process apache logs\",\"modified_timestamp\":\"2017-02-28T23:02:17.023Z\",\"pipeline_metadata\":{\"version\":5,\"type\":\"logstash_pipeline\",\"username\":\"elastic\"},\"pipeline\":\"#{config}\"}}]}" }
-
-        let(:xpack_response) do
-          {
-            "license"=> {
-              "status"=> license_status,
-              "uid"=> "9a48c67c-ce2c-4169-97bf-37d324b8ab80",
-              "type"=> license_type,
-              "expiry_date_in_millis"=> license_expiry_in_millis
-            },
-            "features" => {
-              "security" => {
-                "description" => "Security for the Elastic Stack",
-                "available" => true,
-                "enabled" => security_enabled
-              }
-            }
-          }
-        end
-
-        before :each do
-          allow(mock_license_client).to receive(:get).with('_xpack').and_return(xpack_response)
-          allow_any_instance_of(LogStash::LicenseChecker::LicenseReader).to receive(:build_client).and_return(mock_license_client)
-        end
-
-        context 'when security is disabled in Elasticsearch' do
-          let(:security_enabled) { false }
-          it 'should raise an error' do
-            expect { subject.pipeline_configs }.to raise_error(LogStash::LicenseChecker::LicenseError)
+                expect(pipeline_config.first.config_string).to match(config)
+                expect(pipeline_config.first.pipeline_id.to_sym).to eq(pipeline_id.to_sym)
+              end
+            end
           end
         end
 
-        context 'when security is enabled in Elasticsearch' do
-          let(:security_enabled) { true }
-          it 'should not raise an error' do
-            expect { subject.pipeline_configs }.not_to raise_error(LogStash::LicenseChecker::LicenseError)
+        context "with multiples `pipeline_id` configured [#{es_version}]" do
+          before do
+            expect_any_instance_of(described_class).to receive(:build_client).and_return(mock_client)
+          end
+
+          context "when successfully fetching multiple remote configuration" do
+            let(:pipelines) do
+              {
+                  "apache" => config_apache,
+                  "firewall" => config_firewall
+              }
+            end
+            let(:pipeline_id) { pipelines.keys }
+
+            let(:config_apache) { "input { generator { id => '123'} } filter { mutate {} } output { }" }
+            let(:config_firewall) { "input { generator { id => '321' } } filter { mutate {} } output { }" }
+            let(:elasticsearch_response) do
+              content = "{"
+              content << pipelines.collect do |pipeline_id, config|
+                "\"#{pipeline_id}\":{\"username\":\"log.stash\",\"modified_timestamp\":\"2017-02-28T23:02:17.023Z\",\"pipeline_metadata\":{\"version\":5,\"type\":\"logstash_pipeline\"},\"pipeline\":\"#{config}\",\"pipeline_settings\":{\"pipeline.batch.delay\":\"50\"}}"
+              end.join(",")
+              content << "}"
+              content
+            end
+
+            let(:elasticsearch_7_9_response) do
+              content = "{ \"docs\":["
+              content << pipelines.collect do |pipeline_id, config|
+                "{\"_index\":\".logstash\",\"_type\":\"pipelines\",\"_id\":\"#{pipeline_id}\",\"_version\":8,\"found\":true,\"_source\":{\"id\":\"apache\",\"description\":\"Process apache logs\",\"modified_timestamp\":\"2017-02-28T23:02:17.023Z\",\"pipeline_metadata\":{\"version\":5,\"type\":\"logstash_pipeline\",\"username\":\"elastic\"},\"pipeline\":\"#{config}\"}}"
+              end.join(",")
+              content << "]}"
+              content
+            end
+            let(:request_body_string) { LogStash::Json.dump({ "docs" => pipeline_id.collect { |pipeline_id| { "_id" => pipeline_id } } }) }
+
+            it "returns a valid pipeline config" do
+              pipeline_config = subject.pipeline_configs
+
+              expect(pipeline_config.collect(&:config_string)).to include(*pipelines.values)
+              expect(pipeline_config.map(&:pipeline_id).collect(&:to_sym)).to include(*pipelines.keys.collect(&:to_sym))
+            end
           end
         end
-      end
 
-
-      context "With an invalid basic license, it should raise an error" do
-        let(:config) { "input { generator {} } filter { mutate {} } output { }" }
-        let(:elasticsearch_response) { "{ \"docs\":[{\"_index\":\".logstash\",\"_type\":\"pipelines\",\"_id\":\"#{pipeline_id}\",\"_version\":8,\"found\":true,\"_source\":{\"id\":\"apache\",\"description\":\"Process apache logs\",\"modified_timestamp\":\"2017-02-28T23:02:17.023Z\",\"pipeline_metadata\":{\"version\":5,\"type\":\"logstash_pipeline\",\"username\":\"elastic\"},\"pipeline\":\"#{config}\"}}]}" }
-        let(:license_type) { 'basic' }
-
-        it 'should raise an error' do
-          expect{subject.pipeline_configs}.to raise_error(LogStash::LicenseChecker::LicenseError)
-        end
-      end
-
-
-      %w(standard trial standard gold platinum).each do |license_type|
-        context "With a valid #{license_type} license, it should return a pipeline" do
+        context "when the configuration is not found [#{es_version}]" do
+          let(:elasticsearch_8_response) { "{}" }
+          let(:elasticsearch_7_9_response) { "{ \"docs\": [{\"_index\":\".logstash\",\"_type\":\"pipelines\",\"_id\":\"donotexist\",\"found\":false}]}" }
 
           before do
             expect_any_instance_of(described_class).to receive(:build_client).and_return(mock_client)
           end
 
-          let(:config) { "input { generator {} } filter { mutate {} } output { }" }
-          let(:elasticsearch_response) { "{ \"docs\":[{\"_index\":\".logstash\",\"_type\":\"pipelines\",\"_id\":\"#{pipeline_id}\",\"_version\":8,\"found\":true,\"_source\":{\"id\":\"apache\",\"description\":\"Process apache logs\",\"modified_timestamp\":\"2017-02-28T23:02:17.023Z\",\"pipeline_metadata\":{\"version\":5,\"type\":\"logstash_pipeline\",\"username\":\"elastic\"},\"pipeline\":\"#{config}\"}}]}" }
-          let(:license_type) { license_type }
-
-          it "returns a valid pipeline config" do
-            pipeline_config = subject.pipeline_configs
-
-            expect(pipeline_config.first.config_string).to match(config)
-            expect(pipeline_config.first.pipeline_id).to eq(pipeline_id.to_sym)
+          it "returns no pipeline config" do
+            expect(subject.pipeline_configs).to be_empty
           end
         end
-      end
 
+        context "when any error returned from elasticsearch [#{es_version}]" do
+          let(:elasticsearch_8_response) {"{\"error\" : \"no handler found for uri [/_logstash/pipelines?pretty] and method [GET]\"}" }
+          let(:elasticsearch_7_9_response) { '{ "error":{"root_cause":[{"type":"illegal_argument_exception","reason":"No endpoint or operation is available at [testing_ph]"}],"type":"illegal_argument_exception","reason":"No endpoint or operation is available at [testing_ph]"},"status":400}' }
+
+          before do
+            expect_any_instance_of(described_class).to receive(:build_client).and_return(mock_client)
+          end
+
+          it "raises a `RemoteConfigError`" do
+            expect { subject.pipeline_configs }.to raise_error LogStash::ConfigManagement::ElasticsearchSource::RemoteConfigError
+          end
+        end
+      }
     end
 
-    context "with multiples `pipeline_id` configured" do
-
-      before do
-        allow(mock_client).to receive(:post).with(es_path, {}, request_body_string).and_return(LogStash::Json.load(elasticsearch_response))
-        expect_any_instance_of(described_class).to receive(:build_client).and_return(mock_client)
+    describe "create pipeline fetcher by es version" do
+      it "should give SystemIndicesFetcher in [8]" do
+        expect(subject.get_pipeline_fetcher({ major: 8, minor: 2 })).to be_an_instance_of LogStash::ConfigManagement::SystemIndicesFetcher
       end
 
-      context "when successfully fetching multiple remote configuration" do
-        let(:pipelines) do
-          {
-            "apache" => config_apache,
-            "firewall" => config_firewall
-          }
-        end
+      it "should give SystemIndicesFetcher in [7.10]" do
+        expect(subject.get_pipeline_fetcher({ major: 7, minor: 10 })).to be_an_instance_of LogStash::ConfigManagement::SystemIndicesFetcher
+      end
 
-        let(:config_apache) { "input { generator { id => '123'} } filter { mutate {} } output { }" }
-        let(:config_firewall) { "input { generator { id => '321' } } filter { mutate {} } output { }" }
-        let(:elasticsearch_response) do
-          content = "{ \"docs\":["
-          content << pipelines.collect do |pipeline_id, config|
-            "{\"_index\":\".logstash\",\"_type\":\"pipelines\",\"_id\":\"#{pipeline_id}\",\"_version\":8,\"found\":true,\"_source\":{\"id\":\"apache\",\"description\":\"Process apache logs\",\"modified_timestamp\":\"2017-02-28T23:02:17.023Z\",\"pipeline_metadata\":{\"version\":5,\"type\":\"logstash_pipeline\",\"username\":\"elastic\"},\"pipeline\":\"#{config}\"}}"
-          end.join(",")
-          content << "]}"
-          content
-        end
-
-        it "returns a valid pipeline config" do
-          pipeline_config = subject.pipeline_configs
-
-          expect(pipeline_config.collect(&:config_string)).to include(*pipelines.values)
-          expect(pipeline_config.collect(&:pipeline_id)).to include(*pipelines.keys.collect(&:to_sym))
-        end
+      it "should give LegacyHiddenIndicesFetcher in [7.9]" do
+        expect(subject.get_pipeline_fetcher({ major: 7, minor: 9 })).to be_an_instance_of LogStash::ConfigManagement::LegacyHiddenIndicesFetcher
       end
     end
 
-    context "when the configuration is not found" do
-      let(:elasticsearch_response) { "{ \"docs\": [{\"_index\":\".logstash\",\"_type\":\"pipelines\",\"_id\":\"donotexist\",\"found\":false}]}" }
+    describe "when exception occur" do
+      let(:elasticsearch_response) { "" }
+      let(:bad_response_404) { LogStash::Outputs::ElasticSearch::HttpClient::Pool::BadResponseCodeError.new(404, "url", "request_body", "response_body") }
 
       before do
         expect_any_instance_of(described_class).to receive(:build_client).and_return(mock_client)
       end
 
-      it "returns no pipeline config" do
+      it "raises the exception upstream in [8]" do
+        allow(mock_client).to receive(:get).with("/").and_return(es_version_response)
+        allow(mock_client).to receive(:get).with(system_indices_url_regex).and_raise("Something bad")
+        expect { subject.pipeline_configs }.to raise_error /Something bad/
+      end
+
+      it "raises the exception upstream in [7.9]" do
+        allow(mock_client).to receive(:get).with("/").and_return(es_version_7_9_response)
+        expect(mock_client).to receive(:post).with(legacy_api, {}, request_body_string).and_raise("Something bad")
+        expect { subject.pipeline_configs }.to raise_error /Something bad/
+      end
+
+      it "returns empty pipeline when ES client raise BadResponseCodeError in [8]" do
+        allow(mock_client).to receive(:get).with("/").and_return(es_version_response)
+        expect(mock_client).to receive(:get).with(system_indices_url_regex).and_raise(bad_response_404)
+        expect(subject.pipeline_configs).to be_empty
+      end
+
+      it "returns empty pipeline when ES client raise BadResponseCodeError in [7.9]" do
+        allow(mock_client).to receive(:get).with("/").and_return(es_version_7_9_response)
+        expect(mock_client).to receive(:post).with(legacy_api, {}, request_body_string).and_raise(bad_response_404)
         expect(subject.pipeline_configs).to be_empty
       end
     end
+  end
 
-    context "when any error returned from elasticsearch" do
-      let(:elasticsearch_response){'{ "error":{"root_cause":[{"type":"illegal_argument_exception","reason":"No endpoint or operation is available at [testing_ph]"}],"type":"illegal_argument_exception","reason":"No endpoint or operation is available at [testing_ph]"},"status":400}' }
+  describe "#get_es_version" do
+    let(:mock_client)  { double("http_client") }
 
-      before do
-        expect_any_instance_of(described_class).to receive(:build_client).and_return(mock_client)
-      end
-
-      it "raises a `RemoteConfigError`" do
-        expect { subject.pipeline_configs }.to raise_error /illegal_argument_exception/
-      end
+    before do
+      expect_any_instance_of(described_class).to receive(:build_client).and_return(mock_client)
+      allow(mock_license_client).to receive(:get).with('/').and_return(cluster_info(LOGSTASH_VERSION))
+      allow(mock_license_client).to receive(:get).with('_xpack').and_return(valid_xpack_response)
+      allow_any_instance_of(LogStash::LicenseChecker::LicenseReader).to receive(:client).and_return(mock_license_client)
     end
 
-    context "when exception occur" do
-      let(:elasticsearch_response) { "" }
+    it "responses [7.10] ES version" do
+      expected_version = { major: 7, minor: 10 }
+      allow(mock_client).to receive(:get).with("/").and_return(cluster_info("7.10.0-SNAPSHOT"))
+      expect(subject.get_es_version).to eq expected_version
+    end
 
-      before do
-        expect_any_instance_of(described_class).to receive(:build_client).and_return(mock_client)
-      end
+    it "responses [8.0] ES version" do
+      expected_version = { major: 8, minor: 0 }
+      allow(mock_client).to receive(:get).with("/").and_return(es_version_8_response)
+      expect(subject.get_es_version).to eq expected_version
+    end
 
-      it "raises the exception upstream" do
-        expect(mock_client).to receive(:post).with(es_path, {}, request_body_string).and_raise("Something bad")
-        expect { subject.pipeline_configs }.to raise_error /Something bad/
-      end
+    it "responses with an error" do
+      allow(mock_client).to receive(:get).with("/").and_return(elasticsearch_8_err_response)
+      expect { subject.get_es_version }.to raise_error(LogStash::ConfigManagement::ElasticsearchSource::RemoteConfigError)
     end
   end
 end
diff --git a/x-pack/spec/config_management/extension_spec.rb b/x-pack/spec/config_management/extension_spec.rb
index d25a87672..9a782c859 100644
--- a/x-pack/spec/config_management/extension_spec.rb
+++ b/x-pack/spec/config_management/extension_spec.rb
@@ -29,17 +29,31 @@ describe LogStash::ConfigManagement::Extension do
     describe "#additionals_settings" do
       define_settings(
         "xpack.management.enabled" => [LogStash::Setting::Boolean, false],
-        "xpack.management.logstash.poll_interval" => [LogStash::Setting::TimeValue, 5000000000],
+        "xpack.management.logstash.poll_interval" => [LogStash::Setting::TimeValue, LogStash::Util::TimeValue.from_value("5s")],
         "xpack.management.pipeline.id" => [LogStash::Setting::ArrayCoercible, ["main"]],
         "xpack.management.elasticsearch.hosts" => [LogStash::Setting::ArrayCoercible, ["https://localhost:9200"]],
-        "xpack.management.elasticsearch.username" => [LogStash::Setting::String, "logstash_system"],
-        "xpack.management.elasticsearch.password" => [LogStash::Setting::String, nil],
-        "xpack.management.elasticsearch.ssl.certificate_authority" => [LogStash::Setting::NullableString, nil],
-        "xpack.management.elasticsearch.ssl.truststore.path" => [LogStash::Setting::NullableString, nil],
-        "xpack.management.elasticsearch.ssl.truststore.password" => [LogStash::Setting::NullableString, nil],
-        "xpack.management.elasticsearch.ssl.keystore.path" => [LogStash::Setting::NullableString, nil],
-        "xpack.management.elasticsearch.ssl.keystore.password" => [LogStash::Setting::NullableString, nil]
+        "xpack.management.elasticsearch.username" => [LogStash::Setting::SettingString, "logstash_system"],
+        "xpack.management.elasticsearch.password" => [LogStash::Setting::SettingString, nil],
+        "xpack.management.elasticsearch.ssl.certificate_authority" => [LogStash::Setting::SettingNullableString, nil],
+        "xpack.management.elasticsearch.ssl.ca_trusted_fingerprint" => [LogStash::Setting::SettingNullableString, nil],
+        "xpack.management.elasticsearch.ssl.truststore.path" => [LogStash::Setting::SettingNullableString, nil],
+        "xpack.management.elasticsearch.ssl.truststore.password" => [LogStash::Setting::SettingNullableString, nil],
+        "xpack.management.elasticsearch.ssl.keystore.path" => [LogStash::Setting::SettingNullableString, nil],
+        "xpack.management.elasticsearch.ssl.keystore.password" => [LogStash::Setting::SettingNullableString, nil],
+        "xpack.management.elasticsearch.ssl.certificate" => [LogStash::Setting::SettingNullableString, nil],
+        "xpack.management.elasticsearch.ssl.key" => [LogStash::Setting::SettingNullableString, nil],
+        "xpack.management.elasticsearch.ssl.cipher_suites" => [LogStash::Setting::ArrayCoercible, []],
       )
+
+      it "has a cloud_id setting" do
+        name = "xpack.management.elasticsearch.cloud_id"
+        expect { settings.get_setting(name) }.not_to raise_error
+      end
+
+      it "has a cloud_auth setting" do
+        name = "xpack.management.elasticsearch.cloud_auth"
+        expect { settings.get_setting(name) }.not_to raise_error
+      end
     end
   end
 end
diff --git a/x-pack/spec/config_management/fixtures/pipelines.json b/x-pack/spec/config_management/fixtures/pipelines.json
new file mode 100644
index 000000000..8ed5fe8f6
--- /dev/null
+++ b/x-pack/spec/config_management/fixtures/pipelines.json
@@ -0,0 +1,60 @@
+{
+  "super_generator": {
+    "pipeline": "input { generator { count => 100 } tcp { port => 6005 } } output { }}"
+  },
+  "another_generator": {
+    "pipeline": "input { generator { count => 100 } tcp { port => 6006 } } output { file { path => '/var/folders/8g/415b_scd6ql1vxc2p128kfn40000gn/T/studtmp-b0f4079ab3df20f7eb2389958a6568b6614b38fffec1fcbf1627c4e5edc3/another_generator_new' }}",
+    "username": "log.stash",
+    "pipeline_metadata": {
+      "version": "1"
+    },
+    "pipeline_settings": {
+      "pipeline.batch.delay": "50"
+    },
+    "last_modified": "2020-10-06T23:11:38Z"
+  },
+  "host1_pipeline1": {
+    "pipeline": "input { generator { count => 10000000 }} filter { sleep { time => \"1\" every => 10}} output { file { path  => '/var/folders/8g/415b_scd6ql1vxc2p128kfn40000gn/T/studtmp-b0f4079ab3df20f7eb2389958a6568b6614b38fffec1fcbf1627c4e5edc3/host1_generator1'}}",
+    "username": "log.stash",
+    "pipeline_metadata": {
+      "version": "3"
+    },
+    "pipeline_settings": {
+      "pipeline.batch.delay": "50"
+    },
+    "last_modified": "2020-10-01T15:42:30.229Z"
+  },
+  "host1_pipeline2": {
+    "pipeline": "input { generator { count => 10000000 }} filter { sleep { time => \"1\" every => 10}} output { file { path  => '/var/folders/8g/415b_scd6ql1vxc2p128kfn40000gn/T/studtmp-b0f4079ab3df20f7eb2389958a6568b6614b38fffec1fcbf1627c4e5edc3/host1_generator2'}}",
+    "username": "log.stash",
+    "pipeline_metadata": {
+      "version": "3"
+    },
+    "pipeline_settings": {
+      "pipeline.batch.delay": "50"
+    },
+    "last_modified": "2020-10-01T15:42:30.229Z"
+  },
+  "host2_pipeline1": {
+    "pipeline": "input { generator { count => 10000000 }} filter { sleep { time => \"1\" every => 10}} output { file { path  => '/var/folders/8g/415b_scd6ql1vxc2p128kfn40000gn/T/studtmp-b0f4079ab3df20f7eb2389958a6568b6614b38fffec1fcbf1627c4e5edc3/host2_generator1'}}",
+    "username": "log.stash",
+    "pipeline_metadata": {
+      "version": "3"
+    },
+    "pipeline_settings": {
+      "pipeline.batch.delay": "50"
+    },
+    "last_modified": "2020-10-01T15:42:30.229Z"
+  },
+  "host2_pipeline2": {
+    "pipeline": "input { generator { count => 10000000 }} filter { sleep { time => \"1\" every => 10}} output { file { path  => '/var/folders/8g/415b_scd6ql1vxc2p128kfn40000gn/T/studtmp-b0f4079ab3df20f7eb2389958a6568b6614b38fffec1fcbf1627c4e5edc3/host2_generator2'}}",
+    "username": "log.stash",
+    "pipeline_metadata": {
+      "version": "3"
+    },
+    "pipeline_settings": {
+      "pipeline.batch.delay": "50"
+    },
+    "last_modified": "2020-10-01T15:42:30.229Z"
+  }
+}
\ No newline at end of file
diff --git a/x-pack/spec/config_management/hooks_spec.rb b/x-pack/spec/config_management/hooks_spec.rb
index 7fe9ebb88..492f7ef79 100644
--- a/x-pack/spec/config_management/hooks_spec.rb
+++ b/x-pack/spec/config_management/hooks_spec.rb
@@ -60,9 +60,5 @@ describe LogStash::ConfigManagement::Hooks do
     it "remove the Multilocal source" do
       expect(runner.source_loader.sources.select { |source| source.is_a?(LogStash::Config::Source::MultiLocal) }.any?).to be_falsey
     end
-
-    it "remove the Modules source" do
-      expect(runner.source_loader.sources.select { |source| source.is_a?(LogStash::Config::Source::Modules) }.any?).to be_falsey
-    end
   end
 end
diff --git a/x-pack/spec/filters/geoip/database_manager_spec.rb b/x-pack/spec/filters/geoip/database_manager_spec.rb
new file mode 100644
index 000000000..67b2e0d94
--- /dev/null
+++ b/x-pack/spec/filters/geoip/database_manager_spec.rb
@@ -0,0 +1,241 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+require_relative 'test_helper'
+require "filters/geoip/database_manager"
+
+describe LogStash::Filters::Geoip do
+  describe 'DatabaseManager', :aggregate_failures do
+    let(:pipeline_id) { SecureRandom.hex(16) }
+    let(:mock_geoip_plugin) { mock_geoip_plugin_factory.call }
+    let(:mock_geoip_plugin_factory) do
+      ->() {
+        double("LogStash::Filters::Geoip").tap do |c|
+          allow(c).to receive(:execution_context).and_return(double("EC", pipeline_id: pipeline_id))
+          allow(c).to receive(:update_filter).with(anything)
+        end
+      }
+    end
+
+    let(:eula_database_infos) { Hash.new { LogStash::GeoipDatabaseManagement::DbInfo::PENDING } }
+    let(:eula_manager_enabled) { true }
+    let(:mock_eula_manager) do
+      double('LogStash::GeoipDatabaseManagement::Manager').tap do |c|
+        allow(c).to receive(:enabled?).and_return(eula_manager_enabled)
+        allow(c).to receive(:supported_database_types).and_return(%w(City ASN))
+        allow(c).to receive(:subscribe_database_path) do |type|
+          LogStash::GeoipDatabaseManagement::Subscription.new(eula_database_infos[type])
+        end
+      end
+    end
+
+    let(:testable_described_class) do
+      Class.new(LogStash::Filters::Geoip::DatabaseManager) do
+        public :eula_subscription
+        public :eula_subscribed?
+        public :subscribed_plugins_count
+      end
+    end
+
+    subject(:db_manager) { testable_described_class.instance }
+
+    let(:mock_logger) { double("Logger").as_null_object }
+
+    before(:each) do
+      allow(db_manager).to receive(:logger).and_return(mock_logger)
+      allow(db_manager).to receive(:eula_manager).and_return(mock_eula_manager)
+      allow(mock_geoip_plugin).to receive(:update_filter)
+    end
+
+    self::CITY = LogStash::GeoipDatabaseManagement::Constants::CITY
+    self::ASN = LogStash::GeoipDatabaseManagement::Constants::ASN
+
+    shared_examples "not subscribed to the EULA manager" do
+      it "is not subscribed to the EULA manager" do
+        expect(db_manager).to_not be_eula_subscribed
+      end
+    end
+
+    shared_examples "subscribed to the EULA manager" do
+      it "is subscribed to the EULA manager" do
+        expect(db_manager).to be_eula_subscribed
+      end
+    end
+
+    context "initialize" do
+      include_examples "not subscribed to the EULA manager"
+    end
+
+    context "subscribe database path" do
+      let(:eula_database_infos) {
+        super().merge("City" => LogStash::GeoipDatabaseManagement::DbInfo.new(path: default_city_db_path))
+      }
+
+      shared_examples "explicit path" do
+        context "when user subscribes to explicit path" do
+          let(:explicit_path) { "/this/that/another.mmdb" }
+          subject!(:resolved_path) { db_manager.subscribe_database_path("City", explicit_path, mock_geoip_plugin) }
+
+          it "returns user input path" do
+            expect(resolved_path).to eq(explicit_path)
+          end
+
+          it "logs about the path being configured manually" do
+            expect(db_manager.logger).to have_received(:info).with(a_string_including "GeoIP database path is configured manually")
+          end
+
+          include_examples "not subscribed to the EULA manager"
+        end
+      end
+
+      shared_examples "CC-fallback" do |type|
+        it 'returns the CC-licensed database' do
+          expect(resolved_path).to end_with("/CC/GeoLite2-#{type}.mmdb")
+          expect(::File).to exist(resolved_path)
+        end
+        it 'logged about preparing CC' do
+          expect(db_manager.logger).to have_received(:info).with(a_string_including "CC-licensed GeoIP databases are prepared")
+        end
+      end
+
+      context "when manager is disabled" do
+        let(:eula_manager_enabled) { false }
+
+        include_examples "explicit path"
+
+        context "when user does not specify an explict path" do
+          subject!(:resolved_path) { db_manager.subscribe_database_path("City", nil, mock_geoip_plugin) }
+
+          include_examples "CC-fallback", "City"
+          include_examples "not subscribed to the EULA manager"
+        end
+      end
+
+      context "when manager is enabled" do
+        let(:eula_manager_enabled) { true }
+
+        include_examples "explicit path"
+
+        context "when user does not specify an explicit path" do
+          subject!(:resolved_path) { db_manager.subscribe_database_path("City", nil, mock_geoip_plugin) }
+
+          shared_examples "subscribed to expire notifications" do
+            context "when the manager expires the db" do
+              before(:each) do
+                db_manager.eula_subscription("City").notify(LogStash::GeoipDatabaseManagement::DbInfo::EXPIRED)
+              end
+              it "notifies the plugin" do
+                expect(mock_geoip_plugin).to have_received(:update_filter).with(:expire)
+              end
+              context "subsequent subscriptions" do
+                it "are given the nil path" do
+                  plugin2 = mock_geoip_plugin_factory.call
+                  path2 = db_manager.subscribe_database_path("City", nil, plugin2)
+                  expect(path2).to be_nil
+                end
+              end
+            end
+            context "when the manager expires a different DB" do
+              it 'does not notify the plugin' do
+                db_manager.eula_subscription("ASN").notify(LogStash::GeoipDatabaseManagement::DbInfo::EXPIRED)
+                expect(mock_geoip_plugin).to_not have_received(:update_filter)
+              end
+            end
+          end
+
+          shared_examples "subscribed to update notifications" do
+            context "when the manager updates the db" do
+              let(:updated_db_path) { "/this/that/another.mmdb" }
+              before(:each) do
+                db_manager.eula_subscription("City").notify(LogStash::GeoipDatabaseManagement::DbInfo.new(path: updated_db_path))
+              end
+              it "notifies the plugin" do
+                expect(mock_geoip_plugin).to have_received(:update_filter).with(:update, updated_db_path)
+              end
+              context "subsequent subscriptions" do
+                it "are given the updated path" do
+                  plugin2 = mock_geoip_plugin_factory.call
+                  path2 = db_manager.subscribe_database_path("City", nil, plugin2)
+                  expect(path2).to eq updated_db_path
+                end
+              end
+            end
+            context "when the manager updates a different DB" do
+              let(:updated_db_path) { "/this/that/another.mmdb" }
+              it 'does not notify the plugin' do
+                db_manager.eula_subscription("ASN").notify(LogStash::GeoipDatabaseManagement::DbInfo.new(path: updated_db_path))
+                expect(mock_geoip_plugin).to_not have_received(:update_filter)
+              end
+            end
+          end
+
+          shared_examples "logs implicit EULA" do
+            it 'logs about the user implicitly accepting the MaxMind EULA' do
+              expect(db_manager.logger).to have_received(:info).with(a_string_including "you accepted and agreed MaxMind EULA")
+            end
+          end
+
+          context "and EULA database is expired" do
+            let(:eula_database_infos) {
+              super().merge("City" => LogStash::GeoipDatabaseManagement::DbInfo::EXPIRED)
+            }
+            it 'returns nil' do
+              expect(resolved_path).to be_nil
+            end
+            it 'is subscribed for updates' do
+              expect(db_manager.subscribed_plugins_count("City")).to eq(1)
+            end
+            include_examples "subscribed to update notifications"
+            include_examples "logs implicit EULA"
+          end
+
+          context "and EULA database is pending" do
+            let(:eula_database_infos) {
+              super().merge("City" => LogStash::GeoipDatabaseManagement::DbInfo::PENDING)
+            }
+            include_examples "CC-fallback", "City"
+            include_examples "subscribed to update notifications"
+            include_examples "subscribed to expire notifications"
+            include_examples "logs implicit EULA"
+          end
+
+          context "and EULA database has a recent database" do
+            let(:managed_city_database) { "/this/that/GeoLite2-City.mmdb"}
+            let(:eula_database_infos) {
+              super().merge("City" => LogStash::GeoipDatabaseManagement::DbInfo.new(path: managed_city_database))
+            }
+            it 'returns the path to the managed database' do
+              expect(resolved_path).to eq(managed_city_database)
+            end
+            it 'is subscribed for updates' do
+              expect(db_manager.subscribed_plugins_count("City")).to eq(1)
+            end
+            include_examples "subscribed to update notifications"
+            include_examples "subscribed to expire notifications"
+            include_examples "logs implicit EULA"
+          end
+        end
+      end
+    end
+
+    context "unsubscribe" do
+      before(:each) do
+        db_manager.subscribe_database_path("City", nil, mock_geoip_plugin)
+        expect(db_manager.subscribed_plugins_count("City")).to eq(1)
+      end
+
+      it "removes plugin in state" do
+        db_manager.unsubscribe_database_path("City", mock_geoip_plugin)
+        expect(db_manager.subscribed_plugins_count("City")).to eq(0)
+      end
+    end
+
+    context "shutdown" do
+      it "unsubscribes gracefully" do
+        db_manager.subscribe_database_path("City", default_city_db_path, mock_geoip_plugin)
+        expect { db_manager.unsubscribe_database_path("City", mock_geoip_plugin) }.not_to raise_error
+      end
+    end
+  end
+end
diff --git a/x-pack/spec/filters/geoip/test_helper.rb b/x-pack/spec/filters/geoip/test_helper.rb
new file mode 100644
index 000000000..e355a52f7
--- /dev/null
+++ b/x-pack/spec/filters/geoip/test_helper.rb
@@ -0,0 +1,135 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+require 'spec_helper'
+require "digest"
+
+module GeoipHelper
+  def get_data_dir_path
+    ::File.join(LogStash::SETTINGS.get_value("path.data"), "plugins", "filters", "geoip")
+  end
+
+  def get_dir_path(dirname)
+    ::File.join(get_data_dir_path, dirname)
+  end
+
+  def get_file_path(dirname, filename)
+    ::File.join(get_dir_path(dirname), filename)
+  end
+
+  def md5(file_path)
+    ::File.exist?(file_path) ? Digest::MD5.hexdigest(::File.read(file_path)) : ''
+  end
+
+  def default_city_db_path
+    ::File.join(get_data_dir_path, "CC", default_city_db_name)
+  end
+
+  def default_city_gz_path
+    ::File.join(get_data_dir_path, "CC", "GeoLite2-City.tgz")
+  end
+
+  def default_asn_db_path
+    ::File.join(get_data_dir_path, "CC", default_asn_db_name)
+  end
+
+  def metadata_path
+    ::File.join(get_data_dir_path, "metadata.csv")
+  end
+
+  def default_city_db_name
+    "GeoLite2-City.mmdb"
+  end
+
+  def default_asn_db_name
+    "GeoLite2-ASN.mmdb"
+  end
+
+  def second_city_db_path
+    ::File.join(get_data_dir_path, second_dirname, default_city_db_name)
+  end
+
+  def second_asn_db_path
+    ::File.join(get_data_dir_path, second_dirname, default_asn_db_name)
+  end
+
+  def second_dirname
+    "1582156922"
+  end
+
+  def create_default_city_gz
+    ::File.open(default_city_gz_path, "w") { |f| f.write "make a non empty file" }
+  end
+
+  def default_city_db_md5
+    md5(default_city_db_path)
+  end
+
+  def default_asn_db_md5
+    md5(default_asn_db_path)
+  end
+
+  def write_temp_metadata(temp_file_path, row = nil)
+    now = Time.now.to_i
+    dirname = "CC"
+
+    metadata = []
+    metadata << ["ASN", now, "", dirname, false]
+    metadata << ["City", now, "", dirname, false]
+    metadata << row if row
+
+    FileUtils.mkdir_p(::File.dirname(temp_file_path))
+    CSV.open temp_file_path, 'w' do |csv|
+      metadata.each { |row| csv << row }
+    end
+  end
+
+  def rewrite_temp_metadata(temp_file_path, metadata = [])
+    FileUtils.mkdir_p(::File.dirname(temp_file_path))
+    CSV.open temp_file_path, 'w' do |csv|
+      metadata.each { |row| csv << row }
+    end
+  end
+
+  def city2_metadata
+    ["City", Time.now.to_i, "", second_dirname, true]
+  end
+
+  def city_expired_metadata
+    ["City", "1220227200", "", "1220227200", true]
+  end
+
+  def copy_city_database(filename)
+    new_path = default_city_db_path.gsub(default_city_db_name, filename)
+    FileUtils.cp(default_city_db_path, new_path)
+  end
+
+  def delete_file(*filepaths)
+    filepaths.map { |filepath| FileUtils.rm_r(filepath) if ::File.exist?(filepath) }
+  end
+
+  def get_metadata_database_name
+    ::File.exist?(metadata_path) ? ::File.read(metadata_path).split(",").last[0..-2] : nil
+  end
+
+  def copy_cc(dir_path)
+    cc_database_paths = ::Dir.glob(::File.expand_path(
+      ::File.join("..", "..", "..", "..", "..", "vendor", "**", "{GeoLite2-ASN,GeoLite2-City}.mmdb"),
+      __FILE__))
+    FileUtils.mkdir_p(dir_path)
+    FileUtils.cp_r(cc_database_paths, dir_path)
+  end
+
+  def now_in_ymd
+    Time.now.strftime('%Y-%m-%d')
+  end
+
+  def second_dirname_in_ymd
+    Time.at(second_dirname.to_i).strftime('%Y-%m-%d')
+  end
+end
+
+RSpec.configure do |c|
+  c.include GeoipHelper
+end
diff --git a/x-pack/spec/geoip_database_management/downloader_spec.rb b/x-pack/spec/geoip_database_management/downloader_spec.rb
new file mode 100644
index 000000000..fdeb67716
--- /dev/null
+++ b/x-pack/spec/geoip_database_management/downloader_spec.rb
@@ -0,0 +1,287 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+describe LogStash::GeoipDatabaseManagement::Downloader, aggregate_failures: true, verify_stubs: true do
+  let(:temp_metadata_path) { Stud::Temporary.directory }
+  let(:data_path) { LogStash::GeoipDatabaseManagement::DataPath.new(temp_metadata_path) }
+  let(:metadata) { LogStash::GeoipDatabaseManagement::Metadata.new(data_path) }
+
+  let(:service_host) { "https://geoip.elastic.dev" }
+  let(:service_path) { "v1/database" }
+  let(:service_endpoint) { "#{service_host}/#{service_path}" }
+
+  let(:database_type) { constants::CITY }
+
+  let(:constants) { LogStash::GeoipDatabaseManagement::Constants }
+
+  subject(:downloader) { described_class.new(metadata, service_endpoint) }
+
+  after(:each) do
+    FileUtils::rm_rf(temp_metadata_path)
+  end
+
+  context "rest client" do
+    it "can call endpoint" do
+      conn = downloader.send(:rest_client)
+      res = conn.get(downloader.list_databases_url)
+      expect(res.code).to eq(200)
+    end
+
+    it 'raises error when endpoint response 4xx' do
+      bad_uri = "#{service_host}/?key=#{SecureRandom.uuid}&elastic_geoip_service_tos=agree"
+      expect(downloader).to receive(:list_databases_url).and_return(bad_uri).twice
+      expect { downloader.send(:check_update, constants::DB_TYPES) }.to raise_error(described_class::BadResponseCodeError, /404/)
+    end
+
+    context "when ENV['http_proxy'] is set" do
+      let(:mock_resp) { JSON.parse(::File.read(::File.expand_path("./fixtures/normal_resp.json", ::File.dirname(__FILE__)))) }
+      let(:db_info) { mock_resp.find {|i| i["name"].include?(database_type) } }
+      let(:proxy_url) { 'http://user:pass@example.com:1234' }
+
+      around(:each) { |example| with_environment('http_proxy' => proxy_url, &example) }
+
+      it "initializes the rest client with the proxy" do
+        expect(::Manticore::Client).to receive(:new).with(a_hash_including(:proxy => proxy_url)).and_call_original
+
+        downloader.send(:rest_client)
+      end
+
+      it "download database with the proxy" do
+        dirname = Time.now.to_i.to_s
+        expected_gz_download_location = data_path.gz(database_type, dirname)
+        expect(downloader).to receive(:md5).with(expected_gz_download_location).and_return(db_info['md5_hash'])
+        expect(::Down).to receive(:download).with(db_info['url'], a_hash_including(:proxy => proxy_url)).and_return(true)
+
+        downloader.send(:download_database, database_type, dirname, db_info)
+      end
+    end
+  end
+
+  context 'check_update' do
+    let(:mock_resp_decoded) { JSON.parse(mock_resp_body) }
+    let(:mock_resp_body) { ::File.read(::File.expand_path("./fixtures/normal_resp.json", ::File.dirname(__FILE__))) }
+    let(:mock_resp) { double("list_databases_response", :body => mock_resp_body, code: 200)}
+
+    let(:asn_info) { mock_resp_decoded.find { |i| i["name"].include?(constants::ASN) } }
+    let(:city_info) { mock_resp_decoded.find { |i| i["name"].include?(constants::CITY) } }
+
+    before(:each) do
+      allow(downloader).to receive_message_chain('rest_client.get').and_return(mock_resp)
+    end
+
+    it "returns City db info when City md5 does not match" do
+      metadata_city_gzmd5 = SecureRandom.hex(20)
+      expect(metadata).to receive(:database_path).with(constants::CITY).and_return("/this/that/GeoLite2-City.mmdb")
+      expect(metadata).to receive(:gz_md5).with(constants::CITY).and_return(metadata_city_gzmd5)
+
+      expect(metadata).to receive(:database_path).with(constants::ASN).and_return("/this/that/GeoLite2-ASN.mmdb")
+      expect(metadata).to receive(:gz_md5).with(constants::ASN).and_return(asn_info['md5_hash'])
+
+      updated_dbs = downloader.send(:check_update, constants::DB_TYPES)
+      expect(updated_dbs.size).to eql(1)
+
+      type, info = updated_dbs[0]
+      expect(info).to have_key("md5_hash")
+      expect(info).to have_key("name")
+      expect(info).to have_key("provider")
+      expect(info).to have_key("updated")
+      expect(info).to have_key("url")
+      expect(type).to eql(constants::CITY)
+    end
+
+    it "returns empty array when all md5's match" do
+      expect(metadata).to receive(:database_path).with(constants::CITY).and_return("/this/that/GeoLite2-City.mmdb")
+      expect(metadata).to receive(:gz_md5).with(constants::CITY).and_return(city_info['md5_hash'])
+
+      expect(metadata).to receive(:database_path).with(constants::ASN).and_return("/this/that/GeoLite2-ASN.mmdb")
+      expect(metadata).to receive(:gz_md5).with(constants::ASN).and_return(asn_info['md5_hash'])
+
+      updated_dbs = downloader.send(:check_update, constants::DB_TYPES)
+      expect(updated_dbs.size).to eql(0)
+    end
+
+    it "returns City db info when City db not in metadata" do
+      expect(metadata).to receive(:database_path).with(constants::CITY).and_return(nil) # signal missing file
+
+      expect(metadata).to receive(:database_path).with(constants::ASN).and_return("/this/that/GeoLite2-ASN.mmdb")
+      expect(metadata).to receive(:gz_md5).with(constants::ASN).and_return(asn_info['md5_hash'])
+
+      updated_dbs = downloader.send(:check_update, constants::DB_TYPES)
+      expect(updated_dbs.size).to eql(1)
+
+      type, info = updated_dbs[0]
+      expect(info).to have_key("md5_hash")
+      expect(info).to have_key("name")
+      expect(info).to have_key("provider")
+      expect(info).to have_key("updated")
+      expect(info).to have_key("url")
+      expect(type).to eql(constants::CITY)
+    end
+  end
+
+  context "download database" do
+    let(:db_info) do
+      {
+        "age" => 297221,
+        "md5_hash" => md5_hash,
+        "name" => filename,
+        "provider" => "maxmind",
+        "updated" => 1609891257,
+        "url" => expected_download_url
+      }
+    end
+    let(:md5_hash) { SecureRandom.hex }
+    let(:filename) { "GeoLite2-City.tgz"}
+    let(:dirname) { "0123456789" }
+
+    let(:expected_download_url) { "#{service_host}/blob/sample.tgz" }
+    let(:sample_city_db_gz) { ::File.expand_path("./fixtures/sample.tgz", ::File.dirname(__FILE__)) }
+
+    before(:each) do
+      allow(Down).to receive(:download).with(expected_download_url, anything) do |url, options|
+        FileUtils::cp(sample_city_db_gz, options[:destination])
+        true
+      end
+    end
+
+    context "with mismatched md5 checksum" do
+      let(:md5_hash) { SecureRandom.hex }
+      it "should raise error if md5 does not match" do
+        expect { downloader.send(:download_database, database_type, dirname, db_info) }.to raise_error /wrong checksum/
+      end
+    end
+
+    context "with matching md5 checksum" do
+      let(:md5_hash) { LogStash::GeoipDatabaseManagement::Util.md5(sample_city_db_gz) }
+      it "should download file and return zip path" do
+        new_zip_path = downloader.send(:download_database, database_type, dirname, db_info)
+        expect(new_zip_path).to match /GeoLite2-City\.tgz/
+        expect(::File.exist?(new_zip_path)).to be_truthy
+      end
+    end
+  end
+
+  context "unzip" do
+    let(:dirname) { Time.now.to_i.to_s }
+    let(:copyright_path) { data_path.resolve(dirname, 'COPYRIGHT.txt') }
+    let(:license_path) { data_path.resolve(dirname, 'LICENSE.txt') }
+    let(:readme_path) { data_path.resolve(dirname, 'README.txt') }
+    let(:folder_path) { data_path.resolve(dirname, 'inner') }
+    let(:folder_more_path) { data_path.resolve(dirname, 'inner', 'more.txt') }
+    let(:folder_less_path) { data_path.resolve(dirname, 'inner', 'less.txt') }
+
+    before do
+      FileUtils.mkdir_p(data_path.resolve(dirname))
+    end
+
+    it "should extract all files in tarball" do
+      zip_path = ::File.expand_path("./fixtures/sample.tgz", ::File.dirname(__FILE__))
+      new_db_path = downloader.send(:unzip, database_type, dirname, zip_path)
+
+      expect(new_db_path).to match /GeoLite2-#{database_type}\.mmdb/
+      expect(::File.exist?(new_db_path)).to be_truthy
+      expect(::File.exist?(copyright_path)).to be_truthy
+      expect(::File.exist?(license_path)).to be_truthy
+      expect(::File.exist?(readme_path)).to be_truthy
+      expect(::File.directory?(folder_path)).to be_truthy
+      expect(::File.exist?(folder_more_path)).to be_truthy
+      expect(::File.exist?(folder_less_path)).to be_truthy
+    end
+  end
+
+  context "assert_database!" do
+
+    let(:sample_city_db_gz) { ::File.expand_path("./fixtures/sample.tgz", ::File.dirname(__FILE__)) }
+
+    it "rejects files that don't exist" do
+      expect { downloader.send(:assert_database!, data_path.resolve("nope.mmdb") ) }.to raise_exception(/does not exist/)
+    end
+    it "rejects files that aren't MMDB" do
+      expect { downloader.send(:assert_database!, __FILE__ ) }.to raise_exception(/does not appear to be a MaxMind DB/)
+    end
+    it "accepts files that have MMDB marker" do
+      candidate = data_path.db(constants::CITY, "expanded")
+      FileUtils.mkdir_p(data_path.resolve("expanded"))
+
+      # A file that has the magic MaxMind marker buried inside it
+      ::File.open(candidate, 'w:BINARY') do |handle|
+        handle.write("#{database_type}".b)
+        handle.write(SecureRandom.bytes(rand(2048...10240)).b)
+        handle.write("#\xab\xcd\xefMaxMind.com".b)
+        handle.write(SecureRandom.bytes(rand(2048...10240)).b)
+        handle.write("#{database_type}".b)
+        handle.flush
+      end
+
+      downloader.send(:assert_database!, candidate)
+    end
+  end
+
+  context "fetch_databases" do
+    it "should return array of db which has valid download" do
+      expect(downloader).to receive(:check_update).and_return([[constants::ASN, {}],
+                                                               [constants::CITY, {}]])
+      allow(downloader).to receive(:download_database)
+      allow(downloader).to receive(:unzip).and_return("NEW_DATABASE_PATH")
+      expect(downloader).to receive(:assert_database!).at_least(:once)
+
+      updated_db = downloader.send(:fetch_databases, constants::DB_TYPES)
+
+      expect(updated_db.size).to eql(2)
+      asn_type, asn_valid_download, asn_dirname, asn_path = updated_db[0]
+      city_type, city_valid_download, city_dirname, city_path = updated_db[1]
+      expect(asn_valid_download).to be_truthy
+      expect(asn_path).to eql("NEW_DATABASE_PATH")
+      expect(city_valid_download).to be_truthy
+      expect(city_path).to eql("NEW_DATABASE_PATH")
+    end
+
+    it "should return array of db which has invalid download" do
+      expect(downloader).to receive(:check_update).and_return([[constants::ASN, {}],
+                                                               [constants::CITY, {}]])
+      expect(downloader).to receive(:download_database).and_raise('boom').at_least(:twice)
+
+      updated_db = downloader.send(:fetch_databases, constants::DB_TYPES)
+
+      expect(updated_db.size).to eql(2)
+      asn_type, asn_valid_download, asn_path = updated_db[0]
+      city_type, city_valid_download, city_path = updated_db[1]
+      expect(asn_valid_download).to be_falsey
+      expect(asn_path).to be_nil
+      expect(city_valid_download).to be_falsey
+      expect(city_path).to be_nil
+    end
+  end
+
+  context "#resolve_download_url" do
+    context "when given an absolute URL" do
+      let(:absolute_url) { "https://example.com/blob/this.tgz" }
+      it 'returns the provided URL' do
+        expect(downloader.send(:resolve_download_url, absolute_url).to_s).to eq(absolute_url)
+      end
+    end
+    context "when given a relative URL with absolute path" do
+      let(:relative_url) { "/blob/this.tgz" }
+      it 'returns a url resolved relative to service endpoint' do
+        expect(downloader.send(:resolve_download_url, relative_url).to_s).to eq("#{service_host}#{relative_url}")
+      end
+    end
+    context "when given a relative URL with relative path" do
+      let(:relative_url) { "blob/this.tgz" }
+      it 'returns a url resolved relative to service endpoint' do
+        expect(downloader.send(:resolve_download_url, relative_url).to_s).to eq("#{service_host}/v1/#{relative_url}")
+      end
+    end
+  end
+
+  context "#list_databases_url" do
+    subject(:list_databases_url) { downloader.list_databases_url }
+    it "adds the key and tos agreement parameters" do
+      expect(list_databases_url.host).to eq("geoip.elastic.dev")
+      expect(list_databases_url.path).to eq("/v1/database")
+      expect(list_databases_url.query).to include "key=#{downloader.send(:uuid)}"
+      expect(list_databases_url.query).to include "elastic_geoip_service_tos=agree"
+    end
+  end
+end
\ No newline at end of file
diff --git a/x-pack/spec/geoip_database_management/fixtures/normal_resp.json b/x-pack/spec/geoip_database_management/fixtures/normal_resp.json
new file mode 100644
index 000000000..a4c334aa7
--- /dev/null
+++ b/x-pack/spec/geoip_database_management/fixtures/normal_resp.json
@@ -0,0 +1,26 @@
+[
+  {
+    "age": 297221,
+    "md5_hash": "8d57aec1958070f01042ac1ecd8ec2ab",
+    "name": "GeoLite2-ASN.tgz",
+    "provider": "maxmind",
+    "updated": 1619740833,
+    "url": "https://storage.googleapis.com/elastic-paisano-production/maxmind/GeoLite2-ASN.tgz?X-Goog-Algorithm=GOOG4-RSA-SHA256&X-Goog-Credential=elastic-paisano-production%40elastic-apps-163815.iam.gserviceaccount.com%2F20210430%2Fhenk%2Fstorage%2Fgoog4_request&X-Goog-Date=20210430T000140Z&X-Goog-Expires=86400&X-Goog-SignedHeaders=host&X-Goog-Signature=7212ea23f94454c8008bff13f7a54507b7fa88055f88224ba0d2c8f65bf172c6dfd0844f329223f141b0e1a6e68060df2fe2e5bb1c0bb75aefe246535a30710198d351b36cf59bfc42b0217ae7c3d4ae3da307781dcd603db7768070ac755a45596b1ae77739092b2eeb75b30cf82c6631e02ee48caf1268d0268477fa57f0482511b84ef1f10814dd2aaf7888abfe7c264ebb68c6e477fb2510cb00ed9c469e8fd43e1738dc10fb3702b84c452a12919340bd6fbcbdd1bc75e47a2457c25fb082a280ecd8465cd2eaba38e3f3a1786ec16d06d76fbf6a4b7758665dd517a34ffd583a67a95eff7d7c2106243771bb6aa247e735aeb260b7ebc231c2f2d3404f"
+  },
+  {
+    "age": 222085,
+    "md5_hash": "a195a73d4651a2bd02e5edd680f6703c",
+    "name": "GeoLite2-City.tgz",
+    "provider": "maxmind",
+    "updated": 1619740834,
+    "url": "https://storage.googleapis.com/elastic-paisano-production/maxmind/GeoLite2-City.tgz?X-Goog-Algorithm=GOOG4-RSA-SHA256&X-Goog-Credential=elastic-paisano-production%40elastic-apps-163815.iam.gserviceaccount.com%2F20210430%2Fhenk%2Fstorage%2Fgoog4_request&X-Goog-Date=20210430T000140Z&X-Goog-Expires=86400&X-Goog-SignedHeaders=host&X-Goog-Signature=9e27f47fe4f9b92a57e0844eb53b44c4ec8948ff85ddc830394261c2b6ddb9a4bd9b9c56df703d362843ed06a4a6ded5558bcc47ffee5edce9e07e47cc945493d7808b05c5e70001308da0750ed6157dddc00e4eea4b90736d1103b3b437d0bed9468f74902c68d62ca4e8460969fd6adc6c1faf227eb08c70943a3079f9f52350a94038a9229e05cdf38fcb3c0a849e4cbf523c74729b04e0a7e5ac51df1b4baaa3202564e550716a1025baedfcf3c57a057ec57f5cfd38be499cd2ebd4621085eefda750ce60dbab611c8c09dae1625505a6f62b6a7a9164345a6b61ba697a9b0c9d6cf436caac64d5b5da2e75e074eaf87694f67b5f72aa8bccff4297e99b"
+  },
+  {
+    "age": 222445,
+    "md5_hash": "8b2092c0fc23e620fe4d801f2feff708",
+    "name": "GeoLite2-Country.tgz",
+    "provider": "maxmind",
+    "updated": 1619740833,
+    "url": "https://storage.googleapis.com/elastic-paisano-production/maxmind/GeoLite2-Country.tgz?X-Goog-Algorithm=GOOG4-RSA-SHA256&X-Goog-Credential=elastic-paisano-production%40elastic-apps-163815.iam.gserviceaccount.com%2F20210430%2Fhenk%2Fstorage%2Fgoog4_request&X-Goog-Date=20210430T000140Z&X-Goog-Expires=86400&X-Goog-SignedHeaders=host&X-Goog-Signature=33f24e6a7e4660eaa225668cf8424ec7f2b8219b43fe6c7b446ee91eb907ef17871f3a4dba63796e28916317c0aaa581d384b4eb89c4acd1b3a8eaa44cb6a6fd2e43449ba9edc4e20e5a65dc583a13ed1cddc05072b80f8529939d1300da6540dc044811839dd43b13889c89b9101d1e31fb2d050b2af9bf059ab5d403427f4fd206ef845b7b985c7316a6943873c278000cccc14192576a639a1c5eb714c3673eb6dc286af09be244f3e01f5306bcb20787847d543598a64287657d39a7721f91f0afeb41309221d717515956f773625aaf7a6e3f51e5480f3dda601b0068523c4a84ca75070147b4d95bbce3c40bbe13ec152325ce0ce1ea394174f318bde5"
+  }
+]
\ No newline at end of file
diff --git a/x-pack/spec/geoip_database_management/fixtures/sample.tgz b/x-pack/spec/geoip_database_management/fixtures/sample.tgz
new file mode 100644
index 000000000..3336704a4
Binary files /dev/null and b/x-pack/spec/geoip_database_management/fixtures/sample.tgz differ
diff --git a/x-pack/spec/geoip_database_management/manager_spec.rb b/x-pack/spec/geoip_database_management/manager_spec.rb
new file mode 100644
index 000000000..2d753ec61
--- /dev/null
+++ b/x-pack/spec/geoip_database_management/manager_spec.rb
@@ -0,0 +1,563 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+describe LogStash::GeoipDatabaseManagement::Manager, aggregate_failures: true, verify_stubs: true do
+
+  def write_dummy_mmdb(type, path)
+    FileUtils.mkdir_p(File::dirname(path))
+    File.open(path, "w:BINARY") do |handle|
+      handle.write("#{type}\xab\xcd\xefMaxMind.com#{type}".force_encoding("BINARY"))
+    end
+  end
+
+  let(:manager_instance) do
+    apply_settings(settings_overrides) do |applied_settings|
+      stub_const("LogStash::SETTINGS", applied_settings)
+      Class.new(described_class) do
+        public :setup
+        public :shutdown!
+        public :current_db_info
+        public :current_state
+        public :execute_download_job
+        public :metadata
+        public :downloader
+      end.instance
+    end
+  end
+
+  let(:constants) { LogStash::GeoipDatabaseManagement::Constants }
+
+  let(:settings_overrides) do
+    {
+      'path.data' => settings_path_data,
+    }
+  end
+  let(:settings_path_data) { Stud::Temporary.directory }
+  let(:geoip_data_path) { ::File.expand_path("geoip_database_management", settings_path_data)}
+  let(:geoip_metadata_path) { ::File.expand_path("metadata.csv", geoip_data_path) }
+
+  let(:populate_geoip_data_path) { true }
+  let(:metadata_contents) { nil }
+  before(:each) do
+    if populate_geoip_data_path
+      ::FileUtils.mkdir_p(::File.dirname(geoip_metadata_path))
+      ::File.write(geoip_metadata_path, metadata_contents) unless metadata_contents.nil?
+    end
+  end
+
+  after(:each) do
+    manager_instance.shutdown!
+    FileUtils.rm_rf(settings_path_data)
+  end
+
+  shared_context "existing databases from metadata" do
+    let(:existing_dirname) { (Time.now.to_i - 1000).to_s }
+
+    let(:existing_city_db_check_at) { Time.now.to_i - 100 }
+    let(:existing_city_gzmd5) { SecureRandom::hex(20) }
+    let(:existing_city_db_path) { ::File.join(geoip_data_path, existing_dirname, "GeoLite2-City.mmdb") }
+
+    let(:existing_asn_db_check_at) { Time.now.to_i - 100 }
+    let(:existing_asn_gzmd5) { SecureRandom::hex(20) }
+    let(:existing_asn_db_path) { ::File.join(geoip_data_path, existing_dirname, "GeoLite2-ASN.mmdb") }
+
+    before(:each) do
+      write_dummy_mmdb(constants::CITY, existing_city_db_path) unless existing_city_db_path.nil?
+      write_dummy_mmdb(constants::ASN, existing_asn_db_path) unless existing_asn_db_path.nil?
+    end
+
+    let(:metadata_contents) do
+      <<~EOMETA
+        #{constants::CITY},#{existing_city_db_check_at},#{existing_city_gzmd5},#{existing_dirname}
+        #{constants::ASN},#{existing_asn_db_check_at},#{existing_asn_gzmd5},#{existing_dirname}
+      EOMETA
+    end
+  end
+
+  context "pre-use" do
+    before(:each) do
+      expect_any_instance_of(described_class).to_not receive(:execute_download_job)
+    end
+    it 'is not running' do
+      expect(manager_instance).to_not be_running
+    end
+    context "when disabled" do
+      let(:settings_overrides) { super().merge('xpack.geoip.downloader.enabled' => false) }
+
+      include_context "existing databases from metadata"
+
+      let(:mock_logger) { double('logger').as_null_object }
+      before(:each) do
+        allow(described_class).to receive(:logger).and_return(mock_logger)
+      end
+
+      it 'logs info about removing managed databases' do
+        manager_instance # instantiate
+
+        expect(mock_logger).to have_received(:info).with(a_string_including "removing managed databases from disk")
+      end
+      it 'removes on-disk metadata' do
+        manager_instance # instantiate
+
+        expect(manager_instance.metadata).to_not exist
+        expect(Pathname(geoip_metadata_path)).to_not be_file
+      end
+      it 'removes on-disk databases' do
+        manager_instance # instantiate
+
+        expect(Pathname(existing_city_db_path)).to_not be_file
+        expect(Pathname(existing_asn_db_path)).to_not be_file
+      end
+
+      context "and data directory does not exist" do
+        let(:populate_geoip_data_path) { false }
+        let(:existing_city_db_path) { nil }
+        let(:existing_asn_db_path) { nil }
+
+        it 'logs info about database manager being disabled' do
+          manager_instance # instantiate
+
+          expect(mock_logger).to have_received(:info).with(a_string_including "database manager is disabled")
+        end
+      end
+    end
+  end
+
+  context "once started" do
+    before(:each) do
+      allow(manager_instance).to receive(:execute_download_job).and_return(nil)
+      manager_instance.send(:ensure_started!)
+    end
+    it 'is running' do
+      expect(manager_instance).to be_running
+      expect(manager_instance).to have_received(:execute_download_job)
+    end
+    it 'has a data directory' do
+      expect(Pathname(geoip_data_path)).to be_directory
+    end
+    it 'has metadata' do
+      expect(Pathname(::File.expand_path("metadata.csv", geoip_data_path))).to be_file
+    end
+  end
+
+  context "#supported_database_types" do
+    subject(:supported_database_types) { manager_instance.supported_database_types }
+    it 'includes City' do
+      expect(supported_database_types).to include(constants::CITY)
+    end
+    it 'includes ASN' do
+      expect(supported_database_types).to include(constants::ASN)
+    end
+    it 'returns only frozen strings' do
+      expect(supported_database_types).to all( be_a_kind_of String )
+      expect(supported_database_types).to all( be_frozen )
+    end
+  end
+
+  context "#subscribe_database_path" do
+
+    context "and manager is not enabled" do
+      let(:settings_overrides) { super().merge('xpack.geoip.downloader.enabled' => false) }
+      it "returns nil" do
+        expect(manager_instance.subscribe_database_path(constants::CITY)).to be_nil
+      end
+    end
+
+    shared_examples "active subscription" do |database_type|
+      it 'receives expiry notifications' do
+        allow(subscription).to receive(:notify).and_call_original
+
+        manager_instance.current_state(database_type).expire!
+
+        expect(subscription)
+          .to have_received(:notify)
+          .with(an_object_having_attributes({:expired? => true,
+                                             :path => nil,
+                                             :removed? => true}))
+      end
+      it 'receives update notifications' do
+        allow(subscription).to receive(:notify).and_call_original
+
+        updated_db_path = ::File.join(geoip_data_path, Time.now.to_i.to_s, "GeoLite2-#{database_type}.mmdb")
+        write_dummy_mmdb(database_type, updated_db_path)
+
+        manager_instance.current_state(database_type).update!(updated_db_path)
+
+        expect(subscription)
+          .to have_received(:notify)
+                .with(an_object_having_attributes({:expired? => false,
+                                                   :path => updated_db_path}))
+      end
+    end
+
+    context "when metadata exists" do
+      include_context "existing databases from metadata"
+
+      before(:each) do
+        allow(manager_instance).to receive(:execute_download_job).and_return(nil)
+      end
+
+      context "the returned subscription" do
+        subject(:subscription) { manager_instance.subscribe_database_path(constants::CITY) }
+
+        it 'carries the path of the DB from metadata' do
+          expect(subscription.value).to have_attributes(:path => existing_city_db_path)
+        end
+
+        include_examples "active subscription", LogStash::GeoipDatabaseManagement::Constants::CITY
+      end
+
+      context "and metadata references an mmdb that has been removed" do
+        let(:existing_city_db_path) { nil } # prevent write
+
+        context "the returned subscription" do
+          subject(:subscription) { manager_instance.subscribe_database_path(constants::CITY) }
+
+          it 'indicates that the DB has been removed' do
+            expect(subscription.value).to be_removed
+          end
+
+          include_examples "active subscription", LogStash::GeoipDatabaseManagement::Constants::CITY
+        end
+      end
+
+      context "and metadata does not contain an entry for the specified DB" do
+        let(:metadata_contents) do
+          <<~EOMETA
+            #{constants::ASN},#{existing_asn_db_check_at},#{existing_asn_gzmd5},#{existing_dirname}
+          EOMETA
+        end
+        context "the returned subscription" do
+          subject(:subscription) { manager_instance.subscribe_database_path(constants::CITY) }
+
+          it 'indicates that the DB is pending' do
+            expect(subscription.value).to be_pending
+          end
+
+          include_examples "active subscription", LogStash::GeoipDatabaseManagement::Constants::CITY
+        end
+      end
+    end
+
+    context "when metadata does not yet exist" do
+      before(:each) do
+        allow(manager_instance).to receive(:execute_download_job).and_return(nil)
+      end
+
+      context "the returned subscription" do
+        subject(:subscription) { manager_instance.subscribe_database_path(constants::CITY) }
+
+        it 'is marked as pending' do
+          expect(subscription.value).to be_pending
+        end
+
+        include_examples "active subscription", LogStash::GeoipDatabaseManagement::Constants::CITY
+      end
+    end
+  end
+
+  context "execute_download_job" do
+    let(:mock_logger) { double('logger').as_null_object }
+    before(:each) do
+      allow(manager_instance).to receive(:logger).and_return(mock_logger)
+      expect(manager_instance).to receive(:downloader).and_return(mock_downloader)
+    end
+
+    let(:downloader_response) { [] }
+    let(:mock_downloader) do
+      double("downloader").tap do |downloader|
+        allow(downloader).to receive(:fetch_databases).with(constants::DB_TYPES).and_return(downloader_response)
+        allow(downloader).to receive(:uuid).and_return(SecureRandom.uuid)
+      end
+    end
+
+    let(:updated_dirname) { (Time.now.to_i - 1).to_s }
+    let(:updated_city_db_path) { ::File.join(geoip_data_path, updated_dirname, "GeoLite2-City.mmdb")}
+    let(:updated_asn_db_path) { ::File.join(geoip_data_path, updated_dirname, "GeoLite2-ASN.mmdb")}
+
+    shared_examples "ASN near expiry warning" do
+      context "when a near-expiry ASN database is not succesfully updated" do
+        let(:existing_asn_db_check_at) { Time.now.to_i - (27 * 24 * 60 * 60) } # 27 days ago
+
+        it 'retains ASN state' do
+          allow(manager_instance.current_state(constants::ASN)).to receive(:update!).and_call_original
+
+          manager_instance.execute_download_job
+
+          expected_asn_attributes = {
+            :path => existing_asn_db_path, :pending? => false, :expired? => false, :removed? => false
+          }
+          expect(manager_instance.current_db_info(constants::ASN)).to have_attributes(expected_asn_attributes)
+          expect(manager_instance.current_state(constants::ASN)).to_not have_received(:update!)
+        end
+
+        it "emits a warning log about pending ASN expiry" do
+          manager_instance.execute_download_job
+
+          expect(manager_instance.logger).to have_received(:warn).with(a_string_including "MaxMind GeoIP ASN database hasn't been synchronized in 27 days")
+        end
+      end
+    end
+
+    shared_examples "ASN past expiry eviction" do
+      context "when a past-expiry ASN database is not successfully updated" do
+        let(:existing_asn_db_check_at) { Time.now.to_i - (31 * 24 * 60 * 60) } # 31 days ago
+
+        it 'expires the ASN state' do
+          allow(manager_instance.current_state(constants::ASN)).to receive(:expire!).and_call_original
+
+          manager_instance.execute_download_job
+
+          expected_asn_attributes = {
+            :path => nil, :pending? => false, :expired? => true, :removed? => true
+          }
+          expect(manager_instance.current_db_info(constants::ASN)).to have_attributes(expected_asn_attributes)
+          expect(manager_instance.current_state(constants::ASN)).to have_received(:expire!)
+        end
+
+        it "emits an error log about ASN expiry eviction" do
+          manager_instance.execute_download_job
+
+          expect(manager_instance.logger).to have_received(:error).with(a_string_including("MaxMind GeoIP ASN database hasn't been synchronized in 31 days").and(including("removed")))
+        end
+
+        it "removes the expired ASN dbpath from metadata" do
+          manager_instance.execute_download_job
+          expect(manager_instance.metadata.database_path(constants::ASN)).to be_nil
+        end
+      end
+    end
+
+    shared_examples "ASN updated" do
+      it "updates ASN state" do
+        allow(manager_instance.current_state(constants::ASN)).to receive(:update!).and_call_original
+
+        manager_instance.execute_download_job
+
+        manager_instance.current_db_info(constants::ASN).tap do |asn_db_info|
+          expect(asn_db_info.path).to eq(updated_asn_db_path)
+          expect(asn_db_info).to_not be_pending
+          expect(asn_db_info).to_not be_expired
+          expect(asn_db_info).to_not be_removed
+        end
+
+        expect(manager_instance.current_state(constants::ASN)).to have_received(:update!).with(updated_asn_db_path)
+      end
+      it "updates ASN metadata" do
+        manager_instance.execute_download_job
+
+        expect(manager_instance.metadata.database_path(constants::ASN)).to eq(updated_asn_db_path)
+        expect(manager_instance.metadata.check_at(constants::ASN)).to satisfy { |x| Time.now.to_i - x <= 1 }
+      end
+    end
+
+    shared_examples "ASN unchanged" do
+      it "retains ASN state" do
+        allow(manager_instance.current_state(constants::ASN)).to receive(:update!).and_call_original
+
+        manager_instance.execute_download_job
+
+        manager_instance.current_db_info(constants::ASN).tap do |asn_db_info|
+          expect(asn_db_info.path).to eq(existing_asn_db_path)
+          expect(asn_db_info).to_not be_pending
+          expect(asn_db_info).to_not be_expired
+          expect(asn_db_info).to_not be_removed
+        end
+
+        expect(manager_instance.current_state(constants::ASN)).to_not have_received(:update!)
+      end
+      it "updates ASN metadata check_at" do
+        manager_instance.execute_download_job
+
+        expect(manager_instance.metadata.database_path(constants::ASN)).to eq(existing_asn_db_path)
+        expect(manager_instance.metadata.check_at(constants::ASN)).to satisfy { |x| Time.now.to_i - x <= 1 }
+      end
+    end
+
+    shared_examples "ASN errored" do
+      it "retains ASN state" do
+        allow(manager_instance.current_state(constants::ASN)).to receive(:update!).and_call_original
+
+        manager_instance.execute_download_job
+
+        manager_instance.current_db_info(constants::ASN).tap do |asn_db_info|
+          expect(asn_db_info.path).to eq(existing_asn_db_path)
+          expect(asn_db_info).to_not be_pending
+          expect(asn_db_info).to_not be_expired
+          expect(asn_db_info).to_not be_removed
+        end
+
+        expect(manager_instance.current_state(constants::ASN)).to_not have_received(:update!)
+      end
+      it "retains ASN metadata check_at" do
+        manager_instance.execute_download_job
+
+        expect(manager_instance.metadata.database_path(constants::ASN)).to eq(existing_asn_db_path)
+        expect(manager_instance.metadata.check_at(constants::ASN)).to eq(existing_asn_db_check_at)
+      end
+    end
+
+    shared_examples "City updated" do
+      it "updates City state" do
+        allow(manager_instance.current_state(constants::CITY)).to receive(:update!).and_call_original
+
+        manager_instance.execute_download_job
+
+        manager_instance.current_db_info(constants::CITY).tap do |city_db_info|
+          expect(city_db_info.path).to eq(updated_city_db_path)
+          expect(city_db_info).to_not be_pending
+          expect(city_db_info).to_not be_expired
+          expect(city_db_info).to_not be_removed
+        end
+
+        expect(manager_instance.current_state(constants::CITY)).to have_received(:update!).with(updated_city_db_path)
+      end
+      it "updates City metadata" do
+        manager_instance.execute_download_job
+
+        expect(manager_instance.metadata.database_path(constants::CITY)).to eq(updated_city_db_path)
+        expect(manager_instance.metadata.check_at(constants::CITY)).to satisfy { |x| Time.now.to_i - x <= 1 }
+      end
+    end
+
+    shared_examples "City unchanged" do
+      it "retains City state" do
+        allow(manager_instance.current_state(constants::CITY)).to receive(:update!).and_call_original
+
+        manager_instance.execute_download_job
+
+        manager_instance.current_db_info(constants::CITY).tap do |city_db_info|
+          expect(city_db_info.path).to eq(existing_city_db_path)
+          expect(city_db_info).to_not be_pending
+          expect(city_db_info).to_not be_expired
+          expect(city_db_info).to_not be_removed
+        end
+
+        expect(manager_instance.current_state(constants::CITY)).to_not have_received(:update!)
+      end
+      it "updates City metadata check_at" do
+        manager_instance.execute_download_job
+
+        expect(manager_instance.metadata.database_path(constants::CITY)).to eq(existing_city_db_path)
+        expect(manager_instance.metadata.check_at(constants::CITY)).to satisfy { |x| Time.now.to_i - x <= 1 }
+      end
+    end
+
+    shared_examples "City errored" do
+      it "retains City state" do
+        allow(manager_instance.current_state(constants::CITY)).to receive(:update!).and_call_original
+
+        manager_instance.execute_download_job
+
+        manager_instance.current_db_info(constants::CITY).tap do |city_db_info|
+          expect(city_db_info.path).to eq(existing_city_db_path)
+          expect(city_db_info).to_not be_pending
+          expect(city_db_info).to_not be_expired
+          expect(city_db_info).to_not be_removed
+        end
+
+        expect(manager_instance.current_state(constants::CITY)).to_not have_received(:update!)
+      end
+      it "retains City metadata check_at" do
+        manager_instance.execute_download_job
+
+        expect(manager_instance.metadata.database_path(constants::CITY)).to eq(existing_city_db_path)
+        expect(manager_instance.metadata.check_at(constants::CITY)).to eq(existing_city_db_check_at)
+      end
+    end
+
+    context "when downloader has updates for all" do
+      include_context "existing databases from metadata"
+
+      let(:updated_city_fetch) { [constants::CITY, true, updated_dirname, updated_city_db_path] }
+      let(:updated_asn_fetch) { [constants::ASN, true, updated_dirname, updated_asn_db_path] }
+      let(:downloader_response) do
+        [
+          updated_city_fetch,
+          updated_asn_fetch
+        ]
+      end
+
+      before(:each) do
+        manager_instance.setup
+        write_dummy_mmdb(constants::CITY, updated_city_db_path)
+        write_dummy_mmdb(constants::ASN, updated_asn_db_path)
+      end
+
+      include_examples "City updated"
+      include_examples "ASN updated"
+    end
+
+    context "when downloader has updates for City, but ASN is unchanged" do
+      include_context "existing databases from metadata"
+
+      let(:updated_city_fetch) { [constants::CITY, true, updated_dirname, updated_city_db_path] }
+
+      # implementation detail: the downloader _excludes_ confirmed-same entries from the response
+      let(:downloader_response) do
+        [
+          updated_city_fetch
+        ]
+      end
+
+      before(:each) do
+        manager_instance.setup
+        write_dummy_mmdb(constants::CITY, updated_city_db_path)
+      end
+
+      include_examples "City updated"
+      include_examples "ASN unchanged"
+    end
+
+    context "when downloader has updates for City, but ASN has errors" do
+      include_context "existing databases from metadata"
+
+      let(:updated_city_fetch) { [constants::CITY, true, updated_dirname, updated_city_db_path] }
+      let(:updated_asn_fetch) { [constants::ASN, false, nil, nil] }
+
+      # implementation detail: the downloader _excludes_ confirmed-same entries from the response
+      let(:downloader_response) do
+        [
+          updated_city_fetch,
+          updated_asn_fetch
+        ]
+      end
+
+      before(:each) do
+        manager_instance.setup
+        write_dummy_mmdb(constants::CITY, updated_city_db_path)
+      end
+
+      include_examples "City updated"
+      include_examples "ASN errored"
+      include_examples "ASN near expiry warning"
+      include_examples "ASN past expiry eviction"
+    end
+
+    context "when downloader has no changes" do
+      include_context "existing databases from metadata"
+
+      before(:each) do
+        manager_instance.setup
+      end
+
+      include_examples "City unchanged"
+      include_examples "ASN unchanged"
+    end
+
+    context "when downloader is exceptional" do
+      include_context "existing databases from metadata"
+
+      before(:each) do
+        expect(mock_downloader).to receive(:fetch_databases).with(constants::DB_TYPES).and_raise(RuntimeError)
+        manager_instance.setup
+      end
+
+      include_examples "City errored"
+      include_examples "ASN errored"
+      include_examples "ASN near expiry warning"
+      include_examples "ASN past expiry eviction"
+    end
+  end
+end
\ No newline at end of file
diff --git a/x-pack/spec/geoip_database_management/metadata_spec.rb b/x-pack/spec/geoip_database_management/metadata_spec.rb
new file mode 100644
index 000000000..de8ee05af
--- /dev/null
+++ b/x-pack/spec/geoip_database_management/metadata_spec.rb
@@ -0,0 +1,86 @@
+# # Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# # or more contributor license agreements. Licensed under the Elastic License;
+# # you may not use this file except in compliance with the Elastic License.
+
+require 'geoip_database_management/manager'
+require 'geoip_database_management/metadata'
+require 'geoip_database_management/data_path'
+require 'geoip_database_management/util'
+
+describe LogStash::GeoipDatabaseManagement::Metadata, :aggregate_failures do
+  let(:temp_metadata_path) { Stud::Temporary.directory }
+  let(:data_path) { LogStash::GeoipDatabaseManagement::DataPath.new(temp_metadata_path) }
+  let(:dbm) { described_class.new(data_path) }
+  let(:logger) { double("Logger").as_null_object }
+
+  context "get all" do
+    it "returns multiple rows" do
+      dbm.save_metadata(LogStash::GeoipDatabaseManagement::CITY, "#{Time.now.to_i - 1}", gz_md5: SecureRandom.hex(40))
+      dbm.save_metadata(LogStash::GeoipDatabaseManagement::ASN, "#{Time.now.to_i}", gz_md5: SecureRandom.hex(40))
+
+      expect(dbm.get_all.size).to eq(2)
+    end
+  end
+
+  context "get metadata" do
+    context "when populated file exists" do
+      before(:each) do
+        dbm.save_metadata(LogStash::GeoipDatabaseManagement::CITY, "#{Time.now.to_i - 1}", gz_md5: SecureRandom.hex(40))
+        dbm.save_metadata(LogStash::GeoipDatabaseManagement::ASN, "#{Time.now.to_i}", gz_md5: SecureRandom.hex(40))
+      end
+      it "returns matching metadata" do
+        city_rows = dbm.get_metadata(LogStash::GeoipDatabaseManagement::CITY)
+        expect(city_rows.size).to eq(1)
+        expect(city_rows).to all satisfy {|row| row[described_class::Column::DATABASE_TYPE] == LogStash::GeoipDatabaseManagement::CITY }
+
+        asn_rows = dbm.get_metadata(LogStash::GeoipDatabaseManagement::ASN)
+        expect(asn_rows.size).to eq(1)
+        expect(asn_rows).to all satisfy {|row| row[described_class::Column::DATABASE_TYPE] == LogStash::GeoipDatabaseManagement::ASN }
+      end
+    end
+
+    context "when file does not exist" do
+      it "returns empty results" do
+        city_rows = dbm.get_metadata(LogStash::GeoipDatabaseManagement::CITY)
+        expect(city_rows).to be_empty
+
+        asn_rows = dbm.get_metadata(LogStash::GeoipDatabaseManagement::ASN)
+        expect(asn_rows).to be_empty
+      end
+    end
+
+    context "when empty file exists" do
+      before(:each) do
+        FileUtils.touch(temp_metadata_path)
+      end
+      it "returns empty results" do
+        city_rows = dbm.get_metadata(LogStash::GeoipDatabaseManagement::CITY)
+        expect(city_rows).to be_empty
+
+        asn_rows = dbm.get_metadata(LogStash::GeoipDatabaseManagement::ASN)
+        expect(asn_rows).to be_empty
+      end
+    end
+
+    context "saving" do
+      let(:database_dirname) { "#{Time.now.to_i}" }
+      let(:database_gz_md5) { "1bad1dea" }
+      let(:database_db_md5) { "0f1c1a17" }
+      before(:each) do
+        dbm.save_metadata(LogStash::GeoipDatabaseManagement::CITY, database_dirname, gz_md5: database_gz_md5)
+      end
+
+      it "saves the metadata" do
+        metadata = dbm.get_metadata(LogStash::GeoipDatabaseManagement::CITY).last
+
+        expect(metadata[described_class::Column::DATABASE_TYPE]).to eq(LogStash::GeoipDatabaseManagement::CITY)
+
+        check_at = metadata[described_class::Column::CHECK_AT]
+        expect(Time.now.to_i - check_at.to_i).to be < 100
+
+        expect(metadata[described_class::Column::DIRNAME]).to eq(database_dirname)
+        expect(metadata[described_class::Column::GZ_MD5]).to eq(database_gz_md5)
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/x-pack/spec/geoip_database_management/spec_helper.rb b/x-pack/spec/geoip_database_management/spec_helper.rb
new file mode 100644
index 000000000..e175f75c4
--- /dev/null
+++ b/x-pack/spec/geoip_database_management/spec_helper.rb
@@ -0,0 +1,14 @@
+
+RSpec.configure do |config|
+  config.around(:each, verify_stubs: true) do |example|
+    config.mock_with :rspec do |mocks|
+      begin
+        previous_verify = mockes.verify_partial_doubles
+        mocks.verify_partial_doubles = true
+        example.run
+      ensure
+        mocks.verify_partial_doubles = previous_verify
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/x-pack/spec/geoip_database_management/subscription_spec.rb b/x-pack/spec/geoip_database_management/subscription_spec.rb
new file mode 100644
index 000000000..53ce31de6
--- /dev/null
+++ b/x-pack/spec/geoip_database_management/subscription_spec.rb
@@ -0,0 +1,223 @@
+# # Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# # or more contributor license agreements. Licensed under the Elastic License;
+# # you may not use this file except in compliance with the Elastic License.
+
+require 'geoip_database_management/subscription'
+
+describe LogStash::GeoipDatabaseManagement::Subscription, :aggregate_failures do
+  let(:mock_state) { double("state", release!: nil) }
+  let(:initial_value) { LogStash::GeoipDatabaseManagement::DbInfo::PENDING }
+
+  subject(:subscription) { described_class.new(initial_value, mock_state) }
+
+  context "#value" do
+    context "blocking" do
+      it 'yields the current value' do
+        expect { |b| subscription.value(&b) }.to yield_with_args(initial_value)
+      end
+      it 'returns the result of the block' do
+        return_value = Object.new
+        expect(subscription.value { |_| return_value}).to equal return_value
+      end
+      context "under contention" do
+        it 'allows many concurrent readers' do
+          concurrency = 10
+
+          start_latch = Concurrent::CountDownLatch.new(concurrency)
+          release_latch = Concurrent::CountDownLatch.new(concurrency)
+          finish_latch = Concurrent::CountDownLatch.new(concurrency)
+
+          max_concurrent = Concurrent::AtomicFixnum.new
+
+          threads = concurrency.times.map do |idx|
+            Thread.new do
+              Thread.current.abort_on_exception = true
+              start_latch.count_down
+              start_latch.wait(2) || fail("threads failed to start")
+              subscription.value do |db_info|
+                max_concurrent.increment
+
+                release_latch.count_down
+                release_latch.wait(2) || fail("threads failed to concurrently lock value (#{max_concurrent})")
+              end
+              finish_latch.count_down
+              finish_latch.wait(2) || fail("failed to release")
+            end
+          end
+
+          # cleanup threads
+          deadline = Time.now + 10
+          threads.each do |t|
+            timeout_remaining = [deadline - Time.now, 0].max
+            t.kill unless t.join(timeout_remaining)
+          end
+
+          expect(max_concurrent.value).to eq(concurrency)
+        end
+
+        # validates that #value with a block will prevent updates until control is returned.
+        # sets up a sequence in which several readers get the initial value concurrently,
+        # a writer contends for the lock and modifies the value, and subsequent readers get
+        # the updated value.
+        it 'read-write contention', aggregate_failures: true do
+
+          pre_write_count = 3
+          post_write_count = 7
+          reader_count = pre_write_count + post_write_count
+
+          readers_ready_latch = Concurrent::CountDownLatch.new(reader_count)
+          writer_ready_event = Concurrent::Event.new
+          pre_write_read_acquired_latch = Concurrent::CountDownLatch.new(pre_write_count)
+          pre_write_read_released_latch = Concurrent::CountDownLatch.new(pre_write_count)
+          pre_write_event = Concurrent::Event.new
+
+          values = Queue.new
+
+          threads = []
+
+          # pre-write: acquire multiple locks, then signal writer and give it
+          # a chance to contend for the lock before releasing
+          pre_write_count.times do |idx|
+            threads << Thread.new do
+              Thread.current.abort_on_exception = true
+              readers_ready_latch.count_down
+              writer_ready_event.wait(2) || fail("writer failed to become ready")
+              subscription.value do |db_info|
+                pre_write_read_acquired_latch.count_down
+                values << db_info
+
+                # wait until writer has signaled that it is about to try to write
+                pre_write_event.wait(2) || fail("writer failed to begin action")
+                sleep(1) # wait long enough to ensure contention
+                # ensure that the other readers are free to begin
+                pre_write_read_released_latch.count_down
+              end
+            end
+          end
+
+          # post-write: wait until _just_ before the pre-write readers release their lock,
+          # ensuring we are queued after the writer's blocked write.
+          post_write_count.times do |idx|
+            threads << Thread.new do
+              Thread.current.abort_on_exception = true
+              readers_ready_latch.count_down
+              pre_write_read_released_latch.wait(10) || fail("pre-write readers failed to finish")
+              subscription.value do |db_info|
+                values << db_info
+              end
+            end
+          end
+
+          # write: wait until the pre-write readers have acquired the lock
+          # before performing the write.
+          updated_db_info = LogStash::GeoipDatabaseManagement::DbInfo.new(path: "/path/to/db")
+          threads << Thread.new do
+            Thread.current.abort_on_exception = true
+            writer_ready_event.set
+            readers_ready_latch.wait(10) || fail("readers never became ready")
+            pre_write_read_acquired_latch.wait(10) || fail("pre reads never acquired")
+            pre_write_event.set
+            subscription.notify(updated_db_info)
+          end
+
+          # cleanup threads
+          deadline = Time.now + 10
+          threads.each do |t|
+            timeout_remaining = [deadline - Time.now, 0].max
+            t.kill unless t.join(timeout_remaining)
+          end
+
+          expect(values.size).to eq(pre_write_count + post_write_count)
+          pre_write_count.times do
+            expect(values.pop(true)).to equal initial_value
+          end
+          post_write_count.times do
+            expect(values.pop(true)).to equal updated_db_info
+          end
+          expect(values).to be_empty
+        end
+      end
+    end
+
+    context "non-blocking" do
+      it 'returns the current value' do
+        expect(subscription.value).to equal initial_value
+      end
+    end
+  end
+
+  context '#release!' do
+    it 'releases' do
+      subscription.release!
+
+      expect(mock_state).to have_received(:release!).with(subscription)
+    end
+  end
+
+  context "#observe" do
+    shared_examples "observation" do
+      let!(:log) { Queue.new }
+
+      it "observes construct, update, and expiry" do
+        current_value = LogStash::GeoipDatabaseManagement::DbInfo.new(path: "/one/two")
+        subscription.notify(current_value)
+        expect(log).to be_empty
+
+        subscription.observe(observer_spec)
+
+        expect(log.size).to eq(1)
+        expect(log.pop(true)).to eq([:construct, current_value])
+
+        updated_value = LogStash::GeoipDatabaseManagement::DbInfo.new(path: "/three/four")
+        subscription.notify(updated_value)
+        expect(log.size).to eq(1)
+        expect(log.pop(true)).to eq([:on_update, updated_value])
+
+        expired_value = LogStash::GeoipDatabaseManagement::DbInfo::EXPIRED
+        subscription.notify(expired_value)
+
+        expect(log.size).to eq(1)
+        expect(log.pop(true)).to eq([:on_expire])
+
+        another_updated_value = LogStash::GeoipDatabaseManagement::DbInfo.new(path: "/five/six")
+        subscription.notify(another_updated_value)
+        expect(log.size).to eq(1)
+        expect(log.pop(true)).to eq([:on_update, another_updated_value])
+      end
+
+      context 'when subscription was previously released' do
+        before(:each) { subscription.release! }
+        it 'prevents new observation' do
+          expect { subscription.observe(observer_spec) }.to raise_exception(/released/)
+          expect(log).to be_empty
+        end
+      end
+    end
+
+    context "when given a components hash" do
+      let(:observer_spec) {
+        {
+          construct: ->(v) { log << [:construct, v]},
+          on_update: ->(v) { log << [:on_update, v]},
+          on_expire: ->( ) { log << [:on_expire]   },
+        }
+      }
+
+      include_examples "observation"
+    end
+
+    context "when given an object that quacks like a SubscriptionObserver instance" do
+      let(:observer_class) do
+        Class.new do
+          def initialize(log); @log = log; end
+          def construct(v); @log << [:construct, v]; end
+          def on_update(v); @log << [:on_update, v]; end
+          def on_expire;    @log << [:on_expire];    end
+        end
+      end
+      let(:observer_spec) { observer_class.new(log) }
+
+      include_examples "observation"
+    end
+  end
+end
\ No newline at end of file
diff --git a/x-pack/spec/helpers/elasticsearch_options_spec.rb b/x-pack/spec/helpers/elasticsearch_options_spec.rb
index 546cea7dc..80ee22a6b 100644
--- a/x-pack/spec/helpers/elasticsearch_options_spec.rb
+++ b/x-pack/spec/helpers/elasticsearch_options_spec.rb
@@ -4,33 +4,48 @@
 
 require "spec_helper"
 require "logstash/json"
+require "logstash/runner"
 require 'helpers/elasticsearch_options'
 require "license_checker/license_manager"
 require 'monitoring/monitoring'
 
 shared_examples "elasticsearch options hash is populated without security" do
   it "with username, hosts and password" do
-      expect(test_class.es_options_from_settings_or_modules('monitoring', system_settings)).to include(
+      expect(test_class.es_options_from_settings('monitoring', system_settings)).to include(
                                                                                                    "hosts" => expected_url,
                                                                                                    "user" => expected_username,
                                                                                                    "password" => expected_password
                                                                                                )
-
   end
 end
 
 shared_examples 'elasticsearch options hash is populated with secure options' do
   context "with ca" do
     let(:elasticsearch_ca) { Stud::Temporary.file.path }
-    let(:settings) { super.merge({ "xpack.monitoring.elasticsearch.ssl.certificate_authority" => elasticsearch_ca })}
+    let(:settings) { super().merge({ "xpack.monitoring.elasticsearch.ssl.certificate_authority" => elasticsearch_ca })}
 
     it "creates the elasticsearch output options hash" do
       expect(test_class.es_options_from_settings('monitoring', system_settings)).to include(
                                                                                         "hosts" => elasticsearch_url,
                                                                                         "user" => elasticsearch_username,
                                                                                         "password" => elasticsearch_password,
-                                                                                        "ssl" => true,
-                                                                                        "cacert" => elasticsearch_ca
+                                                                                        "ssl_enabled" => true,
+                                                                                        "ssl_certificate_authorities" => elasticsearch_ca
+                                                                                    )
+    end
+  end
+
+  context "with ca_trusted_fingerprint" do
+    let(:ca_trusted_fingerprint) { SecureRandom.hex(32) }
+    let(:settings) { super().merge("xpack.monitoring.elasticsearch.ssl.ca_trusted_fingerprint" => ca_trusted_fingerprint) }
+
+    it "creates the elasticsearch output options hash" do
+      expect(test_class.es_options_from_settings('monitoring', system_settings)).to include(
+                                                                                      "hosts" => elasticsearch_url,
+                                                                                      "user" => elasticsearch_username,
+                                                                                      "password" => elasticsearch_password,
+                                                                                      "ssl_enabled" => true,
+                                                                                      "ca_trusted_fingerprint" => ca_trusted_fingerprint
                                                                                     )
     end
   end
@@ -39,7 +54,7 @@ shared_examples 'elasticsearch options hash is populated with secure options' do
     let(:elasticsearch_truststore_path) { Stud::Temporary.file.path }
     let(:elasticsearch_truststore_password) { "truststore_password" }
     let(:settings) do
-      super.merge({
+      super().merge({
                       "xpack.monitoring.elasticsearch.ssl.truststore.path" => elasticsearch_truststore_path,
                       "xpack.monitoring.elasticsearch.ssl.truststore.password" => elasticsearch_truststore_password,
                   })
@@ -50,9 +65,9 @@ shared_examples 'elasticsearch options hash is populated with secure options' do
                                                                                         "hosts" => elasticsearch_url,
                                                                                         "user" => elasticsearch_username,
                                                                                         "password" => elasticsearch_password,
-                                                                                        "ssl" => true,
-                                                                                        "truststore" => elasticsearch_truststore_path,
-                                                                                        "truststore_password" => elasticsearch_truststore_password
+                                                                                        "ssl_enabled" => true,
+                                                                                        "ssl_truststore_path" => elasticsearch_truststore_path,
+                                                                                        "ssl_truststore_password" => elasticsearch_truststore_password
                                                                                     )
     end
   end
@@ -62,7 +77,7 @@ shared_examples 'elasticsearch options hash is populated with secure options' do
     let(:elasticsearch_keystore_password) { "keystore_password" }
 
     let(:settings) do
-      super.merge({
+      super().merge({
                       "xpack.monitoring.elasticsearch.ssl.keystore.path" => elasticsearch_keystore_path,
                       "xpack.monitoring.elasticsearch.ssl.keystore.password" => elasticsearch_keystore_password,
                   })
@@ -73,12 +88,67 @@ shared_examples 'elasticsearch options hash is populated with secure options' do
                                                                                         "hosts" => elasticsearch_url,
                                                                                         "user" => elasticsearch_username,
                                                                                         "password" => elasticsearch_password,
-                                                                                        "ssl" => true,
-                                                                                        "keystore" => elasticsearch_keystore_path,
-                                                                                        "keystore_password" => elasticsearch_keystore_password
+                                                                                        "ssl_enabled" => true,
+                                                                                        "ssl_keystore_path" => elasticsearch_keystore_path,
+                                                                                        "ssl_keystore_password" => elasticsearch_keystore_password
                                                                                     )
     end
   end
+
+  context "with certificate and key" do
+    let(:elasticsearch_certificate_path) { Stud::Temporary.file.path }
+    let(:elasticsearch_key_path) { Stud::Temporary.file.path }
+
+    let(:settings) do
+      super().merge({
+        "xpack.monitoring.elasticsearch.ssl.certificate" => elasticsearch_certificate_path,
+        "xpack.monitoring.elasticsearch.ssl.key" => elasticsearch_key_path,
+      })
+    end
+
+    it "creates the elasticsearch output options hash" do
+      expect(test_class.es_options_from_settings('monitoring', system_settings)).to include(
+                                                                                        "hosts" => elasticsearch_url,
+                                                                                        "user" => elasticsearch_username,
+                                                                                        "password" => elasticsearch_password,
+                                                                                        "ssl_enabled" => true,
+                                                                                        "ssl_certificate" => elasticsearch_certificate_path,
+                                                                                        "ssl_key" => elasticsearch_key_path
+                                                                                      )
+    end
+  end
+
+  context "with cipher suites" do
+    context "provided" do
+      let(:settings) do
+        super().merge({
+          "xpack.monitoring.elasticsearch.ssl.cipher_suites" => ["FOO", "BAR"],
+        })
+      end
+
+      it "creates the elasticsearch output options hash" do
+        expect(test_class.es_options_from_settings('monitoring', system_settings)).to include(
+                                                                                          "hosts" => elasticsearch_url,
+                                                                                          "user" => elasticsearch_username,
+                                                                                          "password" => elasticsearch_password,
+                                                                                          "ssl_enabled" => true,
+                                                                                          "ssl_cipher_suites" => ["FOO", "BAR"],
+                                                                                        )
+      end
+    end
+
+    context "empty" do
+      let(:settings) do
+        super().merge({
+          "xpack.monitoring.elasticsearch.ssl.cipher_suites" => [],
+        })
+      end
+
+      it "creates the elasticsearch output options hash" do
+        expect(test_class.es_options_from_settings('monitoring', system_settings)).to_not have_key("ssl_cipher_suites")
+      end
+    end
+  end
 end
 
 describe LogStash::Helpers::ElasticsearchOptions do
@@ -98,20 +168,268 @@ describe LogStash::Helpers::ElasticsearchOptions do
   end
 
   describe "es_options_from_settings" do
-    let(:settings) do
-      {
+    context "with implicit username" do
+      let(:settings) do
+        {
+          "xpack.monitoring.enabled" => true,
+          "xpack.monitoring.elasticsearch.hosts" => elasticsearch_url,
+        }
+      end
+
+      it "ignores the implicit default username when no password is set" do
+        # when no explicit password is set then the default/implicit username should be ignored
+        es_options = test_class.es_options_from_settings('monitoring', system_settings)
+        expect(es_options).to_not include("user")
+        expect(es_options).to_not include("password")
+      end
+
+      context "with cloud_auth" do
+        let(:cloud_username) { 'elastic' }
+        let(:cloud_password) { 'passw0rd'}
+        let(:cloud_auth) { "#{cloud_username}:#{cloud_password}" }
+
+        let(:settings) do
+          super().merge(
+            "xpack.monitoring.elasticsearch.cloud_auth" => cloud_auth,
+          )
+        end
+
+        it "silently ignores the default username" do
+          es_options = test_class.es_options_from_settings('monitoring', system_settings)
+          expect(es_options).to include("cloud_auth")
+          expect(es_options).to_not include("user")
+        end
+      end
+
+      context "with api_key" do
+        let(:settings) do
+          super().merge(
+            "xpack.monitoring.elasticsearch.api_key" => 'foo:bar'
+          )
+        end
+
+        it "silently ignores the default username" do
+          es_options = test_class.es_options_from_settings('monitoring', system_settings)
+          expect(es_options).to include("api_key")
+          expect(es_options).to_not include("user")
+        end
+
+        context "and explicit password" do
+          let(:settings) do
+            super().merge(
+              "xpack.monitoring.elasticsearch.password" => elasticsearch_password
+            )
+          end
+
+          it "fails for multiple authentications" do
+            expect {
+              test_class.es_options_from_settings('monitoring', system_settings)
+            }.to raise_error(ArgumentError, /Multiple authentication options are specified/)
+          end
+        end
+      end
+    end
+
+    context "with explicit username" do
+      let(:settings) do
+        {
+          "xpack.monitoring.enabled" => true,
+          "xpack.monitoring.elasticsearch.hosts" => elasticsearch_url,
+          "xpack.monitoring.elasticsearch.username" => "foo",
+        }
+      end
+
+      it "fails without password" do
+        expect {
+          test_class.es_options_from_settings('monitoring', system_settings)
+        }.to raise_error(ArgumentError, /password must also be set/)
+      end
+
+      context "with cloud_auth" do
+        let(:settings) do
+          super().merge(
+            "xpack.monitoring.elasticsearch.password" => "bar",
+            "xpack.monitoring.elasticsearch.cloud_auth" => "foo:bar",
+          )
+        end
+
+        it "fails for multiple authentications" do
+          expect {
+            test_class.es_options_from_settings('monitoring', system_settings)
+          }.to raise_error(ArgumentError, /Both.*?cloud_auth.*?and.*?username.*?specified/)
+        end
+      end
+
+      context "with api_key" do
+        let(:settings) do
+          super().merge(
+            "xpack.monitoring.elasticsearch.password" => "bar",
+            "xpack.monitoring.elasticsearch.api_key" => 'foo:bar'
+          )
+        end
+
+        it "fails for multiple authentications" do
+          expect {
+            test_class.es_options_from_settings('monitoring', system_settings)
+          }.to raise_error(ArgumentError, /Multiple authentication options are specified/)
+        end
+      end
+    end
+
+    context "with username and password" do
+      let(:settings) do
+        {
           "xpack.monitoring.enabled" => true,
           "xpack.monitoring.elasticsearch.hosts" => elasticsearch_url,
           "xpack.monitoring.elasticsearch.username" => elasticsearch_username,
           "xpack.monitoring.elasticsearch.password" => elasticsearch_password,
-      }
+        }
+      end
+
+      it_behaves_like 'elasticsearch options hash is populated without security'
+      it_behaves_like 'elasticsearch options hash is populated with secure options'
     end
 
-    it_behaves_like 'elasticsearch options hash is populated without security'
-    it_behaves_like 'elasticsearch options hash is populated with secure options'
+    context 'when cloud_id' do
+      let(:cloud_name) { 'thebigone'}
+      let(:cloud_domain) { 'elastic.co'}
+      let(:cloud_id) { "monitoring:#{Base64.urlsafe_encode64("#{cloud_domain}$#{cloud_name}$ignored")}" }
+      let(:expected_url) { ["https://#{cloud_name}.#{cloud_domain}:443"] }
+      let(:settings) do
+        {
+          "xpack.monitoring.enabled" => true,
+          "xpack.monitoring.elasticsearch.cloud_id" => cloud_id,
+        }
+      end
+
+      context 'hosts also set' do
+        let(:settings) do
+          super().merge(
+            "xpack.monitoring.elasticsearch.hosts" => 'https://localhost:9200'
+          )
+        end
+
+        it "raises due invalid configuration" do
+          expect {
+            test_class.es_options_from_settings('monitoring', system_settings)
+           }.to raise_error(ArgumentError, /Both.*?cloud_id.*?and.*?hosts.*?specified/)
+        end
+      end
+
+      context "when cloud_auth is set" do
+        let(:cloud_username) { 'elastic' }
+        let(:cloud_password) { 'passw0rd'}
+        let(:cloud_auth) { "#{cloud_username}:#{cloud_password}" }
+        let(:settings) do
+          super().merge(
+            "xpack.monitoring.elasticsearch.cloud_auth" => cloud_auth,
+          )
+        end
+
+        it "creates the elasticsearch output options hash" do
+          es_options = test_class.es_options_from_settings('monitoring', system_settings)
+          expect(es_options).to include("cloud_id" => cloud_id, "cloud_auth" => cloud_auth)
+          expect(es_options.keys).to_not include("hosts")
+          expect(es_options.keys).to_not include("username")
+          expect(es_options.keys).to_not include("password")
+        end
+
+        context 'username also set' do
+          let(:settings) do
+            super().merge(
+                "xpack.monitoring.elasticsearch.username" => 'elastic'
+            )
+          end
+
+          it "raises for invalid configuration" do
+            expect {
+              test_class.es_options_from_settings('monitoring', system_settings)
+            }.to raise_error(ArgumentError, /Both.*?cloud_auth.*?and.*?username.*?specified/)
+          end
+        end
+
+        context 'api_key also set' do
+          let(:settings) do
+            super().merge(
+                "xpack.monitoring.elasticsearch.api_key" => 'foo:bar',
+            )
+          end
+
+          it "raises for invalid configuration" do
+            expect {
+              test_class.es_options_from_settings('monitoring', system_settings)
+            }.to raise_error(ArgumentError, /Multiple authentication options are specified/)
+          end
+        end
+      end
+
+      context "when cloud_auth is not set" do
+        it "does not use authentication and ignores the default username" do
+          es_options = test_class.es_options_from_settings('monitoring', system_settings)
+          expect(es_options).to include("cloud_id")
+          expect(es_options.keys).to_not include("hosts", "user", "password")
+        end
+
+        context 'username and password set' do
+          let(:settings) do
+            super().merge(
+              "xpack.monitoring.elasticsearch.username" => 'foo',
+              "xpack.monitoring.elasticsearch.password" => 'bar'
+            )
+          end
+
+          it "creates the elasticsearch output options hash" do
+            es_options = test_class.es_options_from_settings('monitoring', system_settings)
+            expect(es_options).to include("cloud_id", "user", "password")
+            expect(es_options.keys).to_not include("hosts")
+          end
+        end
+
+        context 'api_key set' do
+          let(:settings) do
+            super().merge(
+              "xpack.monitoring.elasticsearch.api_key" => 'foo:bar'
+            )
+          end
+
+          it "creates the elasticsearch output options hash" do
+            es_options = test_class.es_options_from_settings('monitoring', system_settings)
+            expect(es_options).to include("cloud_id", "api_key")
+            expect(es_options.keys).to_not include("hosts")
+          end
+        end
+      end
+    end
+
+    context 'when api_key is set' do
+      let(:api_key) { 'foo:bar'}
+      let(:settings) do
+        {
+          "xpack.monitoring.enabled" => true,
+          "xpack.monitoring.elasticsearch.hosts" => elasticsearch_url,
+          "xpack.monitoring.elasticsearch.api_key" => api_key,
+        }
+      end
+
+      it "creates the elasticsearch output options hash" do
+        es_options = test_class.es_options_from_settings('monitoring', system_settings)
+        expect(es_options).to include("api_key" => api_key)
+        expect(es_options.keys).to include("hosts")
+      end
+
+      context "with a non https host" do
+        let(:elasticsearch_url) { ["https://host1", "http://host2"] }
+
+        it "fails at options validation" do
+          expect {
+            test_class.es_options_from_settings('monitoring', system_settings)
+          }.to raise_error(ArgumentError, /api_key authentication requires SSL\/TLS/)
+        end
+      end
+    end
   end
 
-  describe 'es_options_from_settings_or_modules' do
+  describe 'es_options_from_settings' do
     context 'when only settings are set' do
       let(:settings) do
         {
@@ -125,113 +443,5 @@ describe LogStash::Helpers::ElasticsearchOptions do
       it_behaves_like 'elasticsearch options hash is populated without security'
       it_behaves_like 'elasticsearch options hash is populated with secure options'
     end
-
-    context 'with modules set' do
-      let(:modules_es_url) { ["https://localhost:9898", "https://localhost:9999"]}
-      let(:modules_es_username) { "modules_user"}
-      let(:modules_es_password) { "correcthorsebatterystaple"}
-
-      context 'when only modules cli are set' do
-        let(:expected_url) { modules_es_url }
-        let(:expected_username) { modules_es_username }
-        let(:expected_password) { modules_es_password }
-        let(:settings) { {"modules.cli" => [{ "name" => "hello",
-                                                          'var.elasticsearch.hosts' => modules_es_url,
-                                                          'var.elasticsearch.username' => modules_es_username,
-                                                          'var.elasticsearch.password' => modules_es_password}]}
-        }
-
-        it_behaves_like 'elasticsearch options hash is populated without security'
-      end
-
-      context 'when only modules yaml are set' do
-        let(:expected_url) { modules_es_url }
-        let(:expected_username) { modules_es_username }
-        let(:expected_password) { modules_es_password }
-        let(:settings) { {"modules" => [{ "name" => "hello",
-                                              'var.elasticsearch.hosts' => modules_es_url,
-                                              'var.elasticsearch.username' => modules_es_username,
-                                              'var.elasticsearch.password' => modules_es_password}]}
-        }
-
-        it_behaves_like 'elasticsearch options hash is populated without security'
-      end
-
-      context 'when cloud id and auth are set' do
-        let(:cloud_name) { 'thebigone'}
-        let(:cloud_domain) { 'elastic.co'}
-        let(:base64_encoded) { Base64.urlsafe_encode64("#{cloud_domain}$#{cloud_name}$ignored")}
-        let(:cloud_id) { "label:#{base64_encoded}" }
-        let(:cloud_username) { 'cloudy' }
-        let(:cloud_password) { 'cloud_password'}
-        let(:expected_url) { ["https://#{cloud_name}.#{cloud_domain}:443"] }
-        let(:expected_username) { cloud_username }
-        let(:expected_password) { cloud_password }
-        let(:settings) {
-          {
-              "cloud.id" => cloud_id,
-              "cloud.auth" => "#{cloud_username}:#{cloud_password}",
-              "modules" => [{ "name" => "hello",
-                                          'var.elasticsearch.hosts' => modules_es_url,
-                                          'var.elasticsearch.username' => modules_es_username,
-                                          'var.elasticsearch.password' => modules_es_password}]}
-        }
-
-        it_behaves_like 'elasticsearch options hash is populated without security'
-      end
-
-      context 'when only modules cli and yaml are set' do
-        let(:modules_cli_url) { ['cli:9200']}
-        let(:modules_cli_username) { 'cli_user' }
-        let(:modules_cli_password) { 'cli_password'}
-        let(:expected_url) { modules_cli_url }
-        let(:expected_username) { modules_cli_username }
-        let(:expected_password) { modules_cli_password }
-        let(:settings) { {"modules.cli" => [{ "name" => "hello",
-                                              'var.elasticsearch.hosts' => modules_cli_url,
-                                              'var.elasticsearch.username' => modules_cli_username,
-                                              'var.elasticsearch.password' => modules_cli_password}],
-                          "modules" => [{ "name" => "hello",
-                                           'var.elasticsearch.hosts' => modules_es_url,
-                                           'var.elasticsearch.username' => modules_es_username,
-                                           'var.elasticsearch.password' => modules_es_password}]}
-        }
-
-        it_behaves_like 'elasticsearch options hash is populated without security'
-      end
-
-
-      context 'when everything is set' do
-        let(:cloud_name) { 'thebigone'}
-        let(:cloud_domain) { 'elastic.co'}
-        let(:base64_encoded) { Base64.urlsafe_encode64("#{cloud_domain}$#{cloud_name}$ignored")}
-        let(:cloud_id) { "label:#{base64_encoded}" }
-        let(:cloud_username) { 'cloudy' }
-        let(:cloud_password) { 'cloud_password'}
-        let(:modules_cli_url) { ['cli:9200']}
-        let(:modules_cli_username) { 'cli_user' }
-        let(:modules_cli_password) { 'cli_password'}
-        let(:settings) do
-          { "modules" => [{ "name" => "hello",
-                            'var.elasticsearch.hosts' => modules_es_url,
-                            'var.elasticsearch.username' => modules_es_username,
-                            'var.elasticsearch.password' => modules_es_password}],
-            "modules.cli" => [{ "name" => "hello",
-                                 'var.elasticsearch.hosts' => modules_cli_url,
-                                 'var.elasticsearch.username' => modules_cli_username,
-                                 'var.elasticsearch.password' => modules_cli_password}],
-            "cloud.id" => cloud_id,
-            "cloud.auth" => "#{cloud_username}:#{cloud_password}",
-            "xpack.monitoring.enabled" => true,
-            "xpack.monitoring.elasticsearch.hosts" => elasticsearch_url,
-            "xpack.monitoring.elasticsearch.username" => elasticsearch_username,
-            "xpack.monitoring.elasticsearch.password" => elasticsearch_password,
-          }
-        end
-
-        it_behaves_like 'elasticsearch options hash is populated without security'
-        it_behaves_like 'elasticsearch options hash is populated with secure options'
-      end
-    end
   end
 end
diff --git a/x-pack/spec/license_checker/license_info_spec.rb b/x-pack/spec/license_checker/license_info_spec.rb
index 0fdbdf176..8d2009bcf 100644
--- a/x-pack/spec/license_checker/license_info_spec.rb
+++ b/x-pack/spec/license_checker/license_info_spec.rb
@@ -9,6 +9,7 @@ require 'monitoring/monitoring'
 
 class Observer
   attr_reader :license
+
   def initialize
     @license = nil
   end
@@ -47,7 +48,6 @@ describe LogStash::LicenseChecker::XPackInfo do
     }
   end
 
-
   let(:license) do
       {
           "status" => status,
@@ -87,21 +87,20 @@ describe LogStash::LicenseChecker::XPackInfo do
     end
   end
 
-
   context "when the license type is valid" do
     context 'the license has expired' do
       let(:expiry_date) { Time.now - ONE_HOUR }
       let(:status) { 'expired' }
       it_behaves_like 'available? returns correctly', true
       it_behaves_like 'active? returns correctly', false
-      it_behaves_like 'one_of? returns correctly', %w(basic trial standard gold platinum), true
+      it_behaves_like 'one_of? returns correctly', LogStash::LicenseChecker::LICENSE_TYPES, true
     end
 
     context 'the license is active' do
       let(:status) { 'active' }
       it_behaves_like 'available? returns correctly', true
       it_behaves_like 'active? returns correctly', true
-      it_behaves_like 'one_of? returns correctly', %w(basic trial standard gold platinum), true
+      it_behaves_like 'one_of? returns correctly', LogStash::LicenseChecker::LICENSE_TYPES, true
     end
   end
 
diff --git a/x-pack/spec/license_checker/license_manager_spec.rb b/x-pack/spec/license_checker/license_manager_spec.rb
index 19601659d..d6832dea3 100644
--- a/x-pack/spec/license_checker/license_manager_spec.rb
+++ b/x-pack/spec/license_checker/license_manager_spec.rb
@@ -10,12 +10,14 @@ require 'monitoring/monitoring'
 class Observer
   attr_reader :xpack_info
 
-  def initialize(xpack_info)
+  def initialize(xpack_info, is_serverless)
     @xpack_info = xpack_info
+    @is_serverless = is_serverless
   end
 
-  def update(xpack_info)
+  def update(xpack_info, is_serverless)
     @xpack_info = xpack_info
+    @is_serverless = is_serverless
   end
 end
 
@@ -57,29 +59,6 @@ describe LogStash::LicenseChecker::LicenseManager do
             }")
   }
 
-  let(:no_xpack_response) {
-    LogStash::Json.load("{
-   \"error\": {
-      \"root_cause\":
-        [{
-          \"type\":\"index_not_found_exception\",
-          \"reason\": \"no such index\",
-          \"resource.type\": \"index_or_alias\",
-          \"resource.id\": \"_xpack\",
-          \"index_uuid\": \"_na_\",
-          \"index\": \"_xpack\"
-        }],
-        \"type\": \"index_not_found_exception\",
-        \"reason\": \"no such index\",
-        \"resource.type\": \"index_or_alias\",
-        \"resource.id\": \"_xpack\",
-        \"index_uuid\": \"_na_\",
-        \"index\": \"_xpack\"
-      },
-      \"status\": 404}
-    }")
-  }
-
   let(:settings) do
     {
         "xpack.monitoring.enabled" => true,
@@ -113,10 +92,12 @@ describe LogStash::LicenseChecker::LicenseManager do
   end
 
   context 'observers' do
-    let(:observer) { Observer.new(xpack_info) }
+    let(:observer) { Observer.new(xpack_info, is_serverless) }
+    let(:is_serverless) { false }
     let(:xpack_info) { LogStash::LicenseChecker::XPackInfo.from_es_response(license) }
 
     before(:each) do
+      expect(license_reader).to receive(:fetch_cluster_info).and_return(cluster_info)
       expect(license_reader).to receive(:fetch_xpack_info).and_return(xpack_info)
       subject.add_observer(observer)
     end
@@ -124,7 +105,7 @@ describe LogStash::LicenseChecker::LicenseManager do
     context 'when the type changes' do
       let(:new_type) { 'basic' }
       let(:second_license) do
-        { 'license' => license['license'].merge( { 'type' => new_type })}
+        { 'license' => license['license'].merge({ 'type' => new_type })}
       end
 
       it 'updates observers' do
@@ -139,7 +120,7 @@ describe LogStash::LicenseChecker::LicenseManager do
     context 'when the status changes' do
       let(:new_status) { 'expired' }
       let(:second_license) do
-        { 'license' => license['license'].merge( { 'status' => new_status })}
+        { 'license' => license['license'].merge({ 'status' => new_status })}
       end
       it 'updates observers' do
         expect(license_reader).to receive(:fetch_xpack_info).and_return LogStash::LicenseChecker::XPackInfo.from_es_response(second_license)
@@ -172,4 +153,36 @@ describe LogStash::LicenseChecker::LicenseManager do
       end
     end
   end
+
+  context "serverless" do
+    context 'when fetch cluster info successfully' do
+      let(:build_flavour) { 'serverless' }
+
+      before(:each) do
+        expect(license_reader).to receive(:fetch_cluster_info).and_return(cluster_info(LOGSTASH_VERSION, build_flavour)).at_most(:twice)
+        expect(license_reader).not_to receive(:fetch_xpack_info)
+      end
+
+      it 'does not fetch xpack info' do
+        subject.fetch_license
+      end
+
+      it 'checks build flavour' do
+        expect(subject.serverless?).to be_truthy
+      end
+    end
+
+    context 'when it fails to fetch cluster info' do
+      let(:xpack_info) { LogStash::LicenseChecker::XPackInfo.from_es_response(license) }
+
+      before(:each) do
+        expect(license_reader).to receive(:fetch_cluster_info).and_return({})
+        expect(license_reader).to receive(:fetch_xpack_info).and_return(xpack_info)
+      end
+
+      it 'checks build flavour' do
+        expect(subject.serverless?).to be_falsey
+      end
+    end
+  end
 end
diff --git a/x-pack/spec/license_checker/license_reader_spec.rb b/x-pack/spec/license_checker/license_reader_spec.rb
index ce52189a6..1e9f9caba 100644
--- a/x-pack/spec/license_checker/license_reader_spec.rb
+++ b/x-pack/spec/license_checker/license_reader_spec.rb
@@ -3,15 +3,14 @@
 # you may not use this file except in compliance with the Elastic License.
 
 require "spec_helper"
-require "logstash/json"
+require 'support/helpers'
 require "license_checker/license_reader"
 require "helpers/elasticsearch_options"
 require "monitoring/monitoring"
-require "stud/temporary"
-
+require "logstash/runner"
 
 describe LogStash::LicenseChecker::LicenseReader do
-  let(:elasticsearch_url) { ["https://localhost:9898"] }
+  let(:elasticsearch_url) { "https://localhost:9898" }
   let(:elasticsearch_username) { "elastictest" }
   let(:elasticsearch_password) { "testchangeme" }
   let(:extension) { LogStash::MonitoringExtension.new }
@@ -21,11 +20,12 @@ describe LogStash::LicenseChecker::LicenseReader do
       apply_settings(settings, system_settings) # apply `settings`
     end
   end
+  let(:product_origin_header) { { "x-elastic-product-origin" => "logstash" } }
 
   let(:settings) do
     {
       "xpack.monitoring.enabled" => true,
-      "xpack.monitoring.elasticsearch.hosts" => elasticsearch_url,
+      "xpack.monitoring.elasticsearch.hosts" => [elasticsearch_url],
       "xpack.monitoring.elasticsearch.username" => elasticsearch_username,
       "xpack.monitoring.elasticsearch.password" => elasticsearch_password,
     }
@@ -39,20 +39,27 @@ describe LogStash::LicenseChecker::LicenseReader do
     LogStash::Helpers::ElasticsearchOptions.es_options_from_settings('monitoring', system_settings)
   end
 
+  before(:each) do
+    # We do _not_ want the client's connection pool to start on initialization, as error conditions
+    # from accidentally succeeding at establishing a connection to an HTTP resource that's not actually
+    # a live Elasticsearch (e.g., reaped cloud instance) can cause errors.
+    allow_any_instance_of(LogStash::Outputs::ElasticSearch::HttpClient::Pool).to receive(:start)
+  end
+
   subject { described_class.new(system_settings, 'monitoring', elasticsearch_options) }
 
   describe '#fetch_xpack_info' do
     let(:xpack_info_class) { LogStash::LicenseChecker::XPackInfo }
     let(:mock_client) { double('Client') }
-    before(:each) { expect(subject).to receive(:client).and_return(mock_client) }
+    before(:each) { expect(subject).to receive(:client).and_return(mock_client).at_most(:twice) }
+    let(:xpack_info) do
+      {
+          "license" => {},
+          "features" => {},
+      }
+    end
 
     context 'when client fetches xpack info' do
-      let(:xpack_info) do
-        {
-            "license" => {},
-            "features" => {},
-        }
-      end
       before(:each) do
         expect(mock_client).to receive(:get).with('_xpack').and_return(xpack_info)
       end
@@ -60,6 +67,21 @@ describe LogStash::LicenseChecker::LicenseReader do
         expect(subject.fetch_xpack_info).to eq(xpack_info_class.from_es_response(xpack_info))
       end
     end
+
+    context 'and receives HostUnreachableError' do
+      let(:host_not_reachable) { LogStash::Outputs::ElasticSearch::HttpClient::Pool::HostUnreachableError.new(StandardError.new("original error"), "http://localhost:19200") }
+      before(:each) do
+        # set up expectation of single failure
+        expect(subject.logger).to receive(:warn).with(a_string_starting_with("Attempt to validate Elasticsearch license failed."), any_args)
+        expect(mock_client).to receive(:get).with('_xpack').and_raise(host_not_reachable).once
+
+        # ensure subsequent success
+        expect(mock_client).to receive(:get).with('_xpack').and_return(xpack_info)
+      end
+      it 'continues to fetch and return an XPackInfo' do
+        expect(subject.fetch_xpack_info.failed?).to be false
+      end
+    end
     context 'when client raises a ConnectionError' do
       before(:each) do
         expect(mock_client).to receive(:get).with('_xpack').and_raise(Puma::ConnectionError)
@@ -78,7 +100,7 @@ describe LogStash::LicenseChecker::LicenseReader do
       end
     end
     context 'when client raises a 404' do
-      let(:exception_404)do
+      let(:exception_404) do
         LogStash::Outputs::ElasticSearch::HttpClient::Pool::BadResponseCodeError.new(404, '', '', '')
       end
       before(:each) do
@@ -101,4 +123,95 @@ describe LogStash::LicenseChecker::LicenseReader do
       end
     end
   end
+
+  describe 'fetch_cluster_info' do
+    let(:mock_client) { double('Client') }
+    before(:each) { expect(subject).to receive(:client).and_return(mock_client).at_most(:twice) }
+
+    context 'when client fetches cluster info' do
+      before(:each) do
+        expect(mock_client).to receive(:get).with('/').and_return(cluster_info)
+      end
+      it 'returns cluster info' do
+        expect(subject.fetch_cluster_info).to eq(cluster_info)
+      end
+    end
+
+    context 'and receives HostUnreachableError' do
+      let(:host_not_reachable) { LogStash::Outputs::ElasticSearch::HttpClient::Pool::HostUnreachableError.new(StandardError.new("original error"), "http://localhost:19200") }
+      before(:each) do
+        expect(mock_client).to receive(:get).with('/').and_raise(host_not_reachable).once
+        expect(mock_client).to receive(:get).with('/').and_return(cluster_info)
+      end
+      it 'continues to fetch and return cluster info' do
+        expect(subject.fetch_cluster_info).to eq(cluster_info)
+      end
+    end
+
+    context 'and receives ConnectionError' do
+      before(:each) do
+        expect(mock_client).to receive(:get).with('/').and_raise(LogStash::Outputs::ElasticSearch::HttpClient::Pool::NoConnectionAvailableError.new)
+      end
+      it 'returns empty map' do
+        expect(subject.fetch_cluster_info).to eq({})
+      end
+    end
+
+    context 'when client raises a 5XX' do
+      let(:exception_500) { LogStash::Outputs::ElasticSearch::HttpClient::Pool::BadResponseCodeError.new(500, '', '', '') }
+      before(:each) do
+        expect(mock_client).to receive(:get).with('/').and_raise(exception_500)
+      end
+      it 'returns empty map' do
+        expect(subject.fetch_cluster_info).to eq({})
+      end
+    end
+  end
+
+  it "builds ES client" do
+    expect(subject.client.options[:hosts].size).to eql 1
+    expect(subject.client.options[:hosts][0].to_s).to eql elasticsearch_url # URI#to_s
+    expect(subject.client.options).to include(:user => elasticsearch_username, :password => elasticsearch_password)
+    expect(subject.client.client_settings[:headers]).to include(product_origin_header)
+  end
+
+  context 'with cloud_id' do
+    let(:cloud_id) do
+      'westeurope-1:d2VzdGV1cm9wZS5henVyZS5lbGFzdGljLWNsb3VkLmNvbTo5MjQzJGUxZTYzMTIwMWZiNjRkNTVhNzVmNDMxZWI2MzQ5NTg5JDljYzYwMGUwMGQwYjRhMThiNmY2NmU2ZTcyMTQwODA3'
+    end
+    let(:cloud_auth) do
+      'elastic:LnWMLeK3EQPTf3G3F1IBdFvO'
+    end
+
+    let(:settings) do
+      {
+          "xpack.monitoring.enabled" => true,
+          "xpack.monitoring.elasticsearch.cloud_id" => cloud_id,
+          "xpack.monitoring.elasticsearch.cloud_auth" => cloud_auth
+      }
+    end
+
+    it "builds ES client" do
+      expect(subject.client.options[:hosts].size).to eql 1
+      expect(subject.client.options[:hosts][0].to_s).to eql 'https://e1e631201fb64d55a75f431eb6349589.westeurope.azure.elastic-cloud.com:9243'
+      expect(subject.client.options).to include(:user => 'elastic', :password => 'LnWMLeK3EQPTf3G3F1IBdFvO')
+      expect(subject.client.client_settings[:headers]).to include(product_origin_header)
+    end
+  end
+
+  context 'with api_key' do
+    let(:api_key) { "foo:bar" }
+    let(:settings) do
+      {
+        "xpack.monitoring.enabled" => true,
+        "xpack.monitoring.elasticsearch.hosts" => [elasticsearch_url],
+        "xpack.monitoring.elasticsearch.api_key" => api_key,
+      }
+    end
+
+    it "builds ES client" do
+      expect(subject.client.client_settings[:headers]).to include("Authorization" => "ApiKey Zm9vOmJhcg==")
+      expect(subject.client.client_settings[:headers]).to include(product_origin_header)
+    end
+  end
 end
diff --git a/x-pack/spec/modules/arcsight/arcsight_module_config_helper_spec.rb b/x-pack/spec/modules/arcsight/arcsight_module_config_helper_spec.rb
deleted file mode 100644
index 854c25a71..000000000
--- a/x-pack/spec/modules/arcsight/arcsight_module_config_helper_spec.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# encoding: utf-8
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-# require "logstash/devutils/rspec/spec_helper"
-
-require 'x-pack/logstash_registry'
-require 'logstash-core'
-require 'logstash/settings'
-require 'logstash/util/modules_setting_array'
-require 'logstash/modules/scaffold'
-require 'arcsight_module_config_helper'
-
-describe LogStash::Arcsight::ConfigHelper do
-
-  let(:sample_yaml_folder) { ::File.join(File.dirname(__FILE__), "yaml") }
-  let(:settings) { settings = LogStash::SETTINGS.clone }
-  let(:module_name) { "arcsight" }
-  let(:module_hash) { Hash.new }
-  let(:scaffolding) { LogStash::Modules::Scaffold.new(module_name, ::File.join(File.dirname(__FILE__), '..', '..', '..', 'modules', 'arcsight', 'configuration')) }
-  let(:module_config) { LogStash::Modules::LogStashConfig.new(scaffolding, module_hash) }
-
-  describe "`tcp_input_ssl_config` method" do
-    context "when ssl_enabled is not enabled" do
-      it "returns an empty string" do
-        expect(described_class.tcp_input_ssl_config(module_config)).to be_empty
-      end
-    end
-
-    context "when ssl_enabled is enabled" do
-      before do
-        settings.from_yaml(sample_yaml_folder, "smart_connector_with_ssl.yml")
-      end
-      let(:module_hash) { settings.get("modules").find {|m| m["name"] == module_name} }
-
-      it "returns a tcp input ssl settings snippet" do
-        actual = described_class.tcp_input_ssl_config(module_config)
-        expect(actual).not_to be_empty
-        expect(actual).to include("ssl_enable => true")
-        expect(actual).to include("ssl_verify => false")
-        expect(actual).to include("ssl_cert => '/some/path/to/a/cert.p12'")
-        expect(actual).to include("ssl_key => '/some/path/to/a/cert.p12'")
-        expect(actual).to include("ssl_key_passphrase => 'foobar'")
-        expect(actual).to include("ssl_extra_chain_certs => ['/some/path/to/a/cert.p12']")
-      end
-    end
-  end
-
-  describe "`kafka_input_ssl_sasl_config` method" do
-    context "when security_protocol is not set" do
-      it "returns an empty string" do
-        expect(described_class.kafka_input_ssl_sasl_config(module_config)).to be_empty
-      end
-    end
-
-    context "when security_protocol is set" do
-      before do
-        settings.from_yaml(sample_yaml_folder, "event_broker_with_security.yml")
-      end
-      let(:module_hash) { settings.get("modules").find {|m| m["name"] == module_name} }
-      it "returns a kafka input security settings snippet" do
-        actual = described_class.kafka_input_ssl_sasl_config(module_config)
-        expect(actual).not_to be_empty
-        expect(actual).to include("security_protocol => 'SASL_SSL'")
-        expect(actual).to include("ssl_truststore_type => 'foo'")
-        expect(actual).to include("ssl_truststore_location => '/some/path/to/a/file'")
-        expect(actual).to include("ssl_truststore_password => '<password>'")
-        expect(actual).to include("ssl_keystore_password => '<password>'")
-        expect(actual).to include("ssl_key_password => '<password>'")
-        expect(actual).to include("ssl_keystore_type => 'bar'")
-        expect(actual).to include("ssl_keystore_location => '/some/path/to/a/file'")
-        expect(actual).to include("sasl_mechanism => 'GSSAPI'")
-        expect(actual).to include("sasl_kerberos_service_name => 'baz'")
-        expect(actual).to include("jaas_path => '/some/path/to/a/file'")
-        expect(actual).to include("kerberos_config => '/some/path/to/a/file'")
-      end
-    end
-  end
-end
diff --git a/x-pack/spec/modules/arcsight/yaml/event_broker_with_security.yml b/x-pack/spec/modules/arcsight/yaml/event_broker_with_security.yml
deleted file mode 100644
index 6e1d7cc52..000000000
--- a/x-pack/spec/modules/arcsight/yaml/event_broker_with_security.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-modules:
-  - name: arcsight
-    var.inputs: "kafka"
-    var.input.kafka.security_protocol: "SASL_SSL"
-    var.input.kafka.ssl_truststore_type: "foo"
-    var.input.kafka.ssl_truststore_location: "/some/path/to/a/file"
-    var.input.kafka.ssl_truststore_password: "foobar"
-    var.input.kafka.ssl_keystore_type: "bar"
-    var.input.kafka.ssl_keystore_location: "/some/path/to/a/file"
-    var.input.kafka.ssl_keystore_password: "barfoo"
-    var.input.kafka.ssl_key_password: "foobaz"
-    var.input.kafka.sasl_mechanism: "GSSAPI"
-    var.input.kafka.sasl_kerberos_service_name: "baz"
-    var.input.kafka.jaas_path: "/some/path/to/a/file"
-    var.input.kafka.kerberos_config: "/some/path/to/a/file"
-    var.input.kafka.bootstrap_servers: "kcluster.local:1234"
-    var.input.kafka.topics: ["foo", "bar", "baz"]
-
-# although this file is named eventbroker..., the arcsight config ERB
-# file duplicates the eventbroker based settings to be kafka based ones
-# plus, the arcsight_module_config_helper's module methods expect
-# kafka based settings
diff --git a/x-pack/spec/modules/arcsight/yaml/smart_connector_with_ssl.yml b/x-pack/spec/modules/arcsight/yaml/smart_connector_with_ssl.yml
deleted file mode 100644
index 0f2777ea1..000000000
--- a/x-pack/spec/modules/arcsight/yaml/smart_connector_with_ssl.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-modules:
-  - name: arcsight
-    var.inputs: "tcp"
-    var.input.tcp.port: 5050
-    var.input.tcp.ssl_enable: true
-    var.input.tcp.ssl_cert: "/some/path/to/a/cert.p12"
-    var.input.tcp.ssl_extra_chain_certs: ["/some/path/to/a/cert.p12"]
-    var.input.tcp.ssl_key: "/some/path/to/a/cert.p12"
-    var.input.tcp.ssl_key_passphrase: "foobar"
-    var.input.tcp.ssl_verify: false
-
-# although this file is named smartconnector..., the arcsight config ERB
-# file duplicates the smartconnector based settings to be tcp based ones
-# plus, the arcsight_module_config_helper's module methods expect
-# tcp based settings
diff --git a/x-pack/spec/modules/azure/azure_module_config_generator_spec.rb b/x-pack/spec/modules/azure/azure_module_config_generator_spec.rb
deleted file mode 100644
index 54c4132f3..000000000
--- a/x-pack/spec/modules/azure/azure_module_config_generator_spec.rb
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-require 'x-pack/logstash_registry'
-require 'logstash-core'
-require 'logstash/settings'
-require 'logstash/util/modules_setting_array'
-require 'logstash/modules/scaffold'
-require 'azure_module_config_generator'
-
-describe LogStash::Azure::ConfigGenerator do
-
-  # always clone and work with the clone since settings are global and can bleed between tests
-  let(:settings) {settings = LogStash::SETTINGS.clone}
-
-  describe "valid configuration" do
-    it "advanced" do
-      settings.from_yaml(::File.join(File.dirname(__FILE__), "samples", "yaml"), "logstash.advanced.yml")
-      module_hash = settings.get("modules").find {|m| m["name"] == 'azure'}
-      scaffolding = LogStash::Modules::Scaffold.new('azure', ::File.join(File.dirname(__FILE__), '..', '..', '..', 'modules', 'azure', 'configuration'))
-      module_config = LogStash::Modules::LogStashConfig.new(scaffolding, module_hash)
-
-      expected = <<-EXPECTED
-threads => 8
-decorate_events => true
-consumer_group => "logstash"
-config_mode => "advanced"
-event_hubs => [
-  {"insights-operational-logs" => {
-    event_hub_connection => "Endpoint=sb://example1..."
-    storage_connection => "DefaultEndpointsProtocol=https;AccountName=example1...."
-    initial_position => "HEAD"
-    decorate_events => "true"
-  }},
-  {"insights-metrics-pt1m" => {
-    event_hub_connection => "Endpoint=sb://example2..."
-    storage_connection => "DefaultEndpointsProtocol=https;AccountName=example2...."
-    initial_position => "TAIL"
-    decorate_events => "true"
-  }},
-  {"insights-logs-errors" => {
-    event_hub_connection => "Endpoint=sb://example3..."
-    storage_connection => "DefaultEndpointsProtocol=https;AccountName=example3...."
-    initial_position => "LOOK_BACK"
-    decorate_events => "false"
-  }},
-  {"insights-operational-logs" => {
-    event_hub_connection => "Endpoint=sb://example4..."
-    storage_connection => "DefaultEndpointsProtocol=https;AccountName=example4...."
-    initial_position => "HEAD"
-    decorate_events => "true"
-  }}
-]
-      EXPECTED
-
-      expected_config_lines = expected.lines
-      actual_config_lines = module_config.config_string.lines
-      expect(expected_config_lines.size).to be < actual_config_lines.size
-      compare = false
-      i = 0
-      actual_config_lines.each do |line|
-        if line.include?('end azure_event_hubs')
-          compare = false
-        end
-        if compare
-          expect(line.strip).to eql(expected_config_lines[i].strip)
-          i += 1
-        end
-        if line.include?('start azure_event_hubs')
-          compare = true
-        end
-      end
-    end
-
-    it "basic" do
-      settings.from_yaml(::File.join(File.dirname(__FILE__), "samples", "yaml"), "logstash.basic.yml")
-      # puts settings.to_hash.to_s
-      module_hash = settings.get("modules").find {|m| m["name"] == 'azure'}
-      scaffolding = LogStash::Modules::Scaffold.new('azure', ::File.join(File.dirname(__FILE__), '..', '..', '..', 'modules', 'azure', 'configuration'))
-      module_config = LogStash::Modules::LogStashConfig.new(scaffolding, module_hash)
-      module_config.config_string
-      expected = <<-EXPECTED
-threads => 8
-decorate_events => true
-consumer_group => "logstash"
-storage_connection => "DefaultEndpointsProtocol=https;AccountName=example...."
-event_hub_connections => ["Endpoint=sb://example1...EntityPath=insights-logs-errors", "Endpoint=sb://example2...EntityPath=insights-metrics-pt1m"]
-      EXPECTED
-
-      expected_config_lines = expected.lines
-      actual_config_lines = module_config.config_string.lines
-      expect(expected_config_lines.size).to be < actual_config_lines.size
-      compare = false
-      i = 0
-      actual_config_lines.each do |line|
-        if line.include?('end azure_event_hubs')
-          compare = false
-        end
-        if compare
-          expect(line.strip).to eql(expected_config_lines[i].strip)
-          i += 1
-        end
-        if line.include?('start azure_event_hubs')
-          compare = true
-        end
-      end
-    end
-  end
-
-  describe "invalid configuration" do
-    it "advanced1" do
-      settings.from_yaml(::File.join(File.dirname(__FILE__), "samples", "yaml"), "logstash.advanced_invalid1.yml")
-      module_hash = settings.get("modules").find {|m| m["name"] == 'azure'}
-      scaffolding = LogStash::Modules::Scaffold.new('azure', ::File.join(File.dirname(__FILE__), '..', '..', '..', 'modules', 'azure', 'configuration'))
-      module_config = LogStash::Modules::LogStashConfig.new(scaffolding, module_hash)
-      expect {module_config.config_string}.to raise_error(/must be a set of arrays/)
-    end
-
-    it "advanced2" do
-      settings.from_yaml(::File.join(File.dirname(__FILE__), "samples", "yaml"), "logstash.advanced_invalid2.yml")
-      module_hash = settings.get("modules").find {|m| m["name"] == 'azure'}
-      scaffolding = LogStash::Modules::Scaffold.new('azure', ::File.join(File.dirname(__FILE__), '..', '..', '..', 'modules', 'azure', 'configuration'))
-      module_config = LogStash::Modules::LogStashConfig.new(scaffolding, module_hash)
-      expect {module_config.config_string}.to raise_error(/'var.input.azure_event_hubs.event_hub_connections' must be set/)
-    end
-
-    it "basic1" do
-      settings.from_yaml(::File.join(File.dirname(__FILE__), "samples", "yaml"), "logstash.basic_invalid1.yml")
-      module_hash = settings.get("modules").find {|m| m["name"] == 'azure'}
-      scaffolding = LogStash::Modules::Scaffold.new('azure', ::File.join(File.dirname(__FILE__), '..', '..', '..', 'modules', 'azure', 'configuration'))
-      module_config = LogStash::Modules::LogStashConfig.new(scaffolding, module_hash)
-      expect {module_config.config_string}.to raise_error(/'var.input.azure_event_hubs.event_hub_connections' must be set./)
-    end
-
-    it "basic2" do
-      settings.from_yaml(::File.join(File.dirname(__FILE__), "samples", "yaml"), "logstash.basic_invalid2.yml")
-      module_hash = settings.get("modules").find {|m| m["name"] == 'azure'}
-      scaffolding = LogStash::Modules::Scaffold.new('azure', ::File.join(File.dirname(__FILE__), '..', '..', '..', 'modules', 'azure', 'configuration'))
-      module_config = LogStash::Modules::LogStashConfig.new(scaffolding, module_hash)
-      expect {module_config.config_string}.to raise_error(/'var.input.azure_event_hubs.event_hub_connections' must be set./)
-    end
-
-  end
-
-end
\ No newline at end of file
diff --git a/x-pack/spec/modules/azure/filters/azure_event_spec.rb b/x-pack/spec/modules/azure/filters/azure_event_spec.rb
deleted file mode 100644
index 43db6f7e9..000000000
--- a/x-pack/spec/modules/azure/filters/azure_event_spec.rb
+++ /dev/null
@@ -1,495 +0,0 @@
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-require 'x-pack/logstash_registry'
-require 'logstash/devutils/rspec/spec_helper'
-require 'logstash/json'
-require 'filters/azure_event'
-
-
-describe LogStash::Filters::AzureEvent do
-  describe "Parses the admin activity log" do
-    let(:config) do
-      <<-CONFIG
-      filter {
-        azure_event {
-          # ensure defaults don't kick in
-          default_match => ["nonexistent"]
-        }
-      }
-      CONFIG
-    end
-
-    # as documented
-    file = File.read(File.join(File.dirname(__FILE__), '../samples/activity_log/administrative1.json'))
-    sample(LogStash::Json.load(file)) do
-      expect(subject).to include("resourceId")
-      expect(subject.get("[azure][subscription]")).to eq("DD042F02-6B3E-4F79-939A-6A381FFED3C0")
-      expect(subject.get("[azure][resource_group]")).to eq("MYRESOURCEGROUP")
-      expect(subject.get("[azure][provider]")).to eq("MICROSOFT.NETWORK")
-      expect(subject.get("[azure][resource_type]")).to eq("NETWORKSECURITYGROUPS")
-      expect(subject.get("[azure][resource_name]")).to eq("MYNSG")
-      expect(subject.get("[azure][group]")).to eq("activity_log")
-      expect(subject.get("[azure][category]")).to eq("Administrative")
-      expect(subject).to include("activity_log_Administrative_properties")
-      expect(subject).not_to include("properties")
-    end
-
-
-    describe "with default" do
-      let(:config) do
-        <<-CONFIG
-      filter {
-        azure_event {
-          # allow default 
-        }
-      }
-        CONFIG
-      end
-      # as observed
-      file = File.read(File.join(File.dirname(__FILE__), '../samples/activity_log/administrative2.json'))
-      sample(LogStash::Json.load(file)) do
-        expect(subject).to include("resourceId")
-        expect(subject.get("[azure][subscription]")).to eq("9103C2E0-A392-4CE3-BADD-E50F19378DEB")
-        expect(subject.get("[azure][resource_group]")).to eq("MYLINUXVMRG")
-        expect(subject.get("[azure][provider]")).to eq("MICROSOFT.STORAGE")
-        expect(subject.get("[azure][resource_type]")).to eq("STORAGEACCOUNTS")
-        expect(subject.get("[azure][resource_name]")).to eq("STORE835G")
-        expect(subject.get("[azure][group]")).to eq("activity_log")
-        expect(subject.get("[azure][category]")).to eq("Administrative")
-        expect(subject).not_to include("activity_log_Administrative_properties")
-        expect(subject).not_to include("properties")
-      end
-
-
-      # as observed, missing the resource group, type, and name
-      file = File.read(File.join(File.dirname(__FILE__), '../samples/activity_log/administrative3.json'))
-      sample(LogStash::Json.load(file)) do
-        expect(subject).to include("resourceId")
-        expect(subject.get("[azure][subscription]")).to eq("872F2E12-6CCC-4EAD-8D3C-AC833009C1A4")
-        expect(subject.get("[azure][resource_group]")).to be_nil
-        expect(subject.get("[azure][provider]")).to eq("MICROSOFT.ADVISOR")
-        expect(subject.get("[azure][resource_type]")).to be_nil
-        expect(subject.get("[azure][resource_name]")).to be_nil
-        expect(subject.get("[azure][group]")).to eq("activity_log")
-        expect(subject.get("[azure][category]")).to eq("Administrative")
-        expect(subject).not_to include("activity_log_Administrative_properties")
-        expect(subject).not_to include("properties")
-      end
-    end
-
-  end
-
-  describe "Parses the service health activity log" do
-    let(:config) do
-      <<-CONFIG
-      filter {
-        azure_event {
-          # ensure defaults don't kick in
-          default_match => ["nonexistent"]
-        }
-      }
-      CONFIG
-    end
-
-    # as documented
-    file = File.read(File.join(File.dirname(__FILE__), '../samples/activity_log/service_health1.json'))
-    sample(LogStash::Json.load(file)) do
-      expect(subject).to include("resourceId")
-      expect(subject.get("[azure][subscription]")).to eq("MYSUBSCRIPTIONID")
-      expect(subject.get("[azure][resource_group]")).to be_nil
-      expect(subject.get("[azure][provider]")).to be_nil
-      expect(subject.get("[azure][resource_type]")).to be_nil
-      expect(subject.get("[azure][resource_name]")).to be_nil
-      expect(subject.get("[azure][group]")).to eq("activity_log")
-      expect(subject.get("[azure][category]")).to eq("ServiceHealth")
-      expect(subject).to include("activity_log_ServiceHealth_properties")
-      expect(subject).not_to include("properties")
-    end
-
-    # as observed
-    file = File.read(File.join(File.dirname(__FILE__), '../samples/activity_log/service_health2.json'))
-    sample(LogStash::Json.load(file)) do
-      expect(subject).to include("resourceId")
-      expect(subject.get("[azure][subscription]")).to eq("13100E9F-5DCE-4686-B4F4-FF997D407A75")
-      expect(subject.get("[azure][resource_group]")).to be_nil
-      expect(subject.get("[azure][provider]")).to be_nil
-      expect(subject.get("[azure][resource_type]")).to be_nil
-      expect(subject.get("[azure][resource_name]")).to be_nil
-      expect(subject.get("[azure][group]")).to eq("activity_log")
-      expect(subject.get("[azure][category]")).to eq("ServiceHealth")
-      expect(subject).to include("activity_log_ServiceHealth_properties")
-      expect(subject).not_to include("properties")
-    end
-  end
-
-  describe "Parses the Security activity log" do
-    let(:config) do
-      <<-CONFIG
-      filter {
-        azure_event {
-          # ensure defaults don't kick in
-          default_match => ["nonexistent"]
-        }
-      }
-      CONFIG
-    end
-
-    # as documented
-    file = File.read(File.join(File.dirname(__FILE__), '../samples/activity_log/security1.json'))
-    sample(LogStash::Json.load(file)) do
-      expect(subject).to include("resourceId")
-      expect(subject.get("[azure][subscription]")).to eq("D4742BB8-C279-4903-9653-9858B17D0C2E")
-      expect(subject.get("[azure][resource_group]")).to be_nil
-      expect(subject.get("[azure][provider]")).to eq("MICROSOFT.SECURITY")
-      expect(subject.get("[azure][resource_type]")).to eq("LOCATIONS/ALERTS")
-      expect(subject.get("[azure][resource_name]")).to eq("2518939942613820660_A48F8653-3FC6-4166-9F19-914F030A13D3")
-      expect(subject.get("[azure][group]")).to eq("activity_log")
-      expect(subject.get("[azure][category]")).to eq("Security")
-      expect(subject).to include("activity_log_Security_properties")
-      expect(subject).not_to include("properties")
-    end
-
-    # as observed
-    file = File.read(File.join(File.dirname(__FILE__), '../samples/activity_log/security2.json'))
-    sample(LogStash::Json.load(file)) do
-      expect(subject).to include("resourceId")
-      expect(subject.get("[azure][subscription]")).to eq("F628BA4C-F07B-4AEB-86CB-C89784BBD9B3")
-      expect(subject.get("[azure][resource_group]")).to be_nil
-      expect(subject.get("[azure][provider]")).to be_nil
-      expect(subject.get("[azure][resource_type]")).to be_nil
-      expect(subject.get("[azure][resource_name]")).to be_nil
-      expect(subject.get("[azure][group]")).to eq("activity_log")
-      expect(subject.get("[azure][category]")).to eq("Security")
-      expect(subject).to include("activity_log_Security_properties")
-      expect(subject).not_to include("properties")
-    end
-  end
-
-  describe "Parses the Autoscale activity log" do
-    let(:config) do
-      <<-CONFIG
-      filter {
-        azure_event {
-          # ensure defaults don't kick in
-          default_match => ["nonexistent"]
-        }
-      }
-      CONFIG
-    end
-
-    # as documented
-    file = File.read(File.join(File.dirname(__FILE__), '../samples/activity_log/auto_scale1.json'))
-    sample(LogStash::Json.load(file)) do
-      assert
-    end
-
-    # as observed TODO: actually observe this ! (I don't have any examples for autoscale)
-    file = File.read(File.join(File.dirname(__FILE__), '../samples/activity_log/auto_scale2.json'))
-    sample(LogStash::Json.load(file)) do
-      assert
-    end
-
-    def assert
-      expect(subject).to include("resourceId")
-      expect(subject.get("[azure][subscription]")).to eq("MYSUBSCRIPTIONID")
-      expect(subject.get("[azure][resource_group]")).to eq("MYRESOURCEGROUP")
-      expect(subject.get("[azure][provider]")).to eq("MICROSOFT.INSIGHTS")
-      expect(subject.get("[azure][resource_type]")).to eq("AUTOSCALESETTINGS")
-      expect(subject.get("[azure][resource_name]")).to eq("MYRESOURCEGROUP-PRODUCTION-MYRESOURCE-MYRESOURCEGROUP")
-      expect(subject.get("[azure][group]")).to eq("activity_log")
-      expect(subject.get("[azure][category]")).to eq("Autoscale")
-      expect(subject).to include("activity_log_Autoscale_properties")
-      expect(subject).not_to include("properties")
-    end
-
-  end
-
-  describe "Parses the Alert activity log" do
-    let(:config) do
-      <<-CONFIG
-      filter {
-        azure_event {
-          # ensure defaults don't kick in
-          default_match => ["nonexistent"]
-        }
-      }
-      CONFIG
-    end
-
-    # as documented
-    file = File.read(File.join(File.dirname(__FILE__), '../samples/activity_log/alert1.json'))
-    sample(LogStash::Json.load(file)) do
-      expect(subject).to include("resourceId")
-      expect(subject.get("[azure][subscription]")).to eq("MYSUBSCRIPTIONID")
-      expect(subject.get("[azure][resource_group]")).to eq("MYRESOURCEGROUP")
-      expect(subject.get("[azure][provider]")).to eq("MICROSOFT.CLASSICCOMPUTE")
-      expect(subject.get("[azure][resource_type]")).to eq("DOMAINNAMES/SLOTS/ROLES")
-      expect(subject.get("[azure][resource_name]")).to eq("EVENT.BACKGROUNDJOBSWORKER.RAZZLE")
-      expect(subject.get("[azure][group]")).to eq("activity_log")
-      expect(subject.get("[azure][category]")).to eq("Alert")
-      expect(subject).to include("activity_log_Alert_properties")
-      expect(subject).not_to include("properties")
-    end
-
-    # as observed
-    file = File.read(File.join(File.dirname(__FILE__), '../samples/activity_log/alert2.json'))
-    sample(LogStash::Json.load(file)) do
-      expect(subject).to include("resourceId")
-      expect(subject.get("[azure][subscription]")).to eq("C27F13D5-E19A-4A4C-8415-4056C7C752BC")
-      expect(subject.get("[azure][resource_group]")).to eq("DEFAULT-ACTIVITYLOGALERTS")
-      expect(subject.get("[azure][provider]")).to eq("MICROSOFT.INSIGHTS")
-      expect(subject.get("[azure][resource_type]")).to eq("ACTIVITYLOGALERTS")
-      expect(subject.get("[azure][resource_name]")).to eq("NOTIFY OPEN HEALTH ALERT")
-      expect(subject.get("[azure][group]")).to eq("activity_log")
-      expect(subject.get("[azure][category]")).to eq("Alert")
-      expect(subject).to include("activity_log_Alert_properties")
-      expect(subject).not_to include("properties")
-    end
-
-  end
-
-  describe "Parses database wait stats logs" do
-    let(:config) do
-      <<-CONFIG
-      filter {
-        azure_event {
-
-        }
-      }
-      CONFIG
-    end
-
-    # sql diagnostic
-    file = File.read(File.join(File.dirname(__FILE__), '../samples/sql_diagnostics/database_wait_statistics.json'))
-    sample(LogStash::Json.load(file)) do
-      expect(subject).to include("resourceId")
-      expect(subject.get("[azure][subscription]")).to eq("741FD6F5-9FB8-462C-97C3-3HF4CH23HC2A")
-      expect(subject.get("[azure][resource_group]")).to eq("GO5RG")
-      expect(subject.get("[azure][provider]")).to eq("MICROSOFT.SQL")
-      expect(subject.get("[azure][resource_type]")).to eq("SERVERS/DATABASES")
-      expect(subject.get("[azure][resource_name]")).to eq("WORKGO5")
-      # db specific resources
-      expect(subject.get("[azure][server]")).to eq("GO5RS")
-      expect(subject.get("[azure][database]")).to eq("WORKGO5")
-      expect(subject.get("[azure][server_and_database]")).to eq("GO5RS/WORKGO5")
-      expect(subject.get("[azure][db_unique_id]")).to eq("741FD6F5-9FB8-462C-97C3-3HF4CH23HC2A/GO5RG/GO5RS/WORKGO5")
-      # group/category
-      expect(subject.get("[azure][group]")).to eq("sql_diagnostics")
-      expect(subject.get("[azure][category]")).to eq("DatabaseWaitStatistics")
-      expect(subject).to include("sql_diagnostics_DatabaseWaitStatistics_properties")
-      expect(subject).not_to include("properties")
-
-    end
-
-  end
-  describe "Parses database block logs" do
-    let(:config) do
-      <<-CONFIG
-      filter {
-        azure_event {
-
-        }
-      }
-      CONFIG
-    end
-
-    file = File.read(File.join(File.dirname(__FILE__), '../samples/sql_diagnostics/blocks.json'))
-    sample(LogStash::Json.load(file)) do
-      expect(subject).to include("resourceId")
-      expect(subject.get("[azure][subscription]")).to eq("851FD0F5-9GB8-552C-41C3-3TH4FA231C3A")
-      expect(subject.get("[azure][resource_group]")).to eq("DEMTP789")
-      expect(subject.get("[azure][provider]")).to eq("MICROSOFT.SQL")
-      expect(subject.get("[azure][resource_type]")).to eq("SERVERS/DATABASES")
-      expect(subject.get("[azure][resource_name]")).to eq("DB05001")
-      # db specific resources
-      expect(subject.get("[azure][server]")).to eq("SRV1238FG9")
-      expect(subject.get("[azure][database]")).to eq("DB05001")
-      expect(subject.get("[azure][server_and_database]")).to eq("SRV1238FG9/DB05001")
-      expect(subject.get("[azure][db_unique_id]")).to eq("851FD0F5-9GB8-552C-41C3-3TH4FA231C3A/DEMTP789/SRV1238FG9/DB05001")
-      # group/category
-      expect(subject.get("[azure][group]")).to eq("sql_diagnostics")
-      expect(subject.get("[azure][category]")).to eq("Blocks")
-      expect(subject).to include("sql_diagnostics_Blocks_properties")
-      expect(subject).not_to include("properties")
-    end
-  end
-
-  describe "Parses database error logs" do
-    let(:config) do
-      <<-CONFIG
-      filter {
-        azure_event {
-
-        }
-      }
-      CONFIG
-    end
-
-    file = File.read(File.join(File.dirname(__FILE__), '../samples/sql_diagnostics/errors.json'))
-    sample(LogStash::Json.load(file)) do
-      expect(subject).to include("resourceId")
-      expect(subject.get("[azure][subscription]")).to eq("846FY0F5-9C8H-452C-95C3-555555666C2A")
-      expect(subject.get("[azure][resource_group]")).to eq("OPT489")
-      expect(subject.get("[azure][provider]")).to eq("MICROSOFT.SQL")
-      expect(subject.get("[azure][resource_type]")).to eq("SERVERS/DATABASES")
-      expect(subject.get("[azure][resource_name]")).to eq("DB874999")
-      # db specific resources
-      expect(subject.get("[azure][server]")).to eq("OPT489")
-      expect(subject.get("[azure][database]")).to eq("DB874999")
-      expect(subject.get("[azure][server_and_database]")).to eq("OPT489/DB874999")
-      expect(subject.get("[azure][db_unique_id]")).to eq("846FY0F5-9C8H-452C-95C3-555555666C2A/OPT489/OPT489/DB874999")
-      # group/category
-      expect(subject.get("[azure][group]")).to eq("sql_diagnostics")
-      expect(subject.get("[azure][category]")).to eq("Errors")
-      expect(subject).to include("sql_diagnostics_Errors_properties")
-      expect(subject).not_to include("properties")
-    end
-  end
-
-  describe "Parses database timeout logs" do
-    let(:config) do
-      <<-CONFIG
-      filter {
-        azure_event {
-
-        }
-      }
-      CONFIG
-    end
-
-    file = File.read(File.join(File.dirname(__FILE__), '../samples/sql_diagnostics/timeouts.json'))
-    sample(LogStash::Json.load(file)) do
-      expect(subject).to include("resourceId")
-      expect(subject.get("[azure][subscription]")).to eq("E3E7F07F-161E-4591-BB76-711473D4940C")
-      expect(subject.get("[azure][resource_group]")).to eq("ST76")
-      expect(subject.get("[azure][provider]")).to eq("MICROSOFT.SQL")
-      expect(subject.get("[azure][resource_type]")).to eq("SERVERS/DATABASES")
-      expect(subject.get("[azure][resource_name]")).to eq("DB9977")
-      # db specific resources
-      expect(subject.get("[azure][server]")).to eq("ST76")
-      expect(subject.get("[azure][database]")).to eq("DB9977")
-      expect(subject.get("[azure][server_and_database]")).to eq("ST76/DB9977")
-      expect(subject.get("[azure][db_unique_id]")).to eq("E3E7F07F-161E-4591-BB76-711473D4940C/ST76/ST76/DB9977")
-      # group/category
-      expect(subject.get("[azure][group]")).to eq("sql_diagnostics")
-      expect(subject.get("[azure][category]")).to eq("Timeouts")
-      expect(subject).to include("sql_diagnostics_Timeouts_properties")
-      expect(subject).not_to include("properties")
-    end
-  end
-
-  describe "Parses query store runtime statistic logs" do
-    let(:config) do
-      <<-CONFIG
-      filter {
-        azure_event {
-
-        }
-      }
-      CONFIG
-    end
-
-    file = File.read(File.join(File.dirname(__FILE__), '../samples/sql_diagnostics/querystore_runtime_statistics.json'))
-    sample(LogStash::Json.load(file)) do
-      expect(subject).to include("resourceId")
-      expect(subject.get("[azure][subscription]")).to eq("CBB8D135-BF4F-4792-B835-5872F7EAC917")
-      expect(subject.get("[azure][resource_group]")).to eq("WWD66")
-      expect(subject.get("[azure][provider]")).to eq("MICROSOFT.SQL")
-      expect(subject.get("[azure][resource_type]")).to eq("SERVERS/DATABASES")
-      expect(subject.get("[azure][resource_name]")).to eq("DB73635G")
-      # db specific resources
-      expect(subject.get("[azure][server]")).to eq("WWD66")
-      expect(subject.get("[azure][database]")).to eq("DB73635G")
-      expect(subject.get("[azure][server_and_database]")).to eq("WWD66/DB73635G")
-      expect(subject.get("[azure][db_unique_id]")).to eq("CBB8D135-BF4F-4792-B835-5872F7EAC917/WWD66/WWD66/DB73635G")
-      # group/category
-      expect(subject.get("[azure][group]")).to eq("sql_diagnostics")
-      expect(subject.get("[azure][category]")).to eq("QueryStoreRuntimeStatistics")
-      expect(subject).to include("sql_diagnostics_QueryStoreRuntimeStatistics_properties")
-      expect(subject).not_to include("properties")
-    end
-  end
-
-  describe "Parses querystore wait statistics logs" do
-    let(:config) do
-      <<-CONFIG
-      filter {
-        azure_event {
-
-        }
-      }
-      CONFIG
-    end
-
-    file = File.read(File.join(File.dirname(__FILE__), '../samples/sql_diagnostics/querystore_wait_statistics.json'))
-    sample(LogStash::Json.load(file)) do
-      expect(subject).to include("resourceId")
-      expect(subject.get("[azure][subscription]")).to eq("70E322AB-5B33-40C7-AD1E-88B2B7CFA236")
-      expect(subject.get("[azure][resource_group]")).to eq("W66PT")
-      expect(subject.get("[azure][provider]")).to eq("MICROSOFT.SQL")
-      expect(subject.get("[azure][resource_type]")).to eq("SERVERS/DATABASES")
-      expect(subject.get("[azure][resource_name]")).to eq("DB45")
-      # db specific resources
-      expect(subject.get("[azure][server]")).to eq("W66PT")
-      expect(subject.get("[azure][database]")).to eq("DB45")
-      expect(subject.get("[azure][server_and_database]")).to eq("W66PT/DB45")
-      expect(subject.get("[azure][db_unique_id]")).to eq("70E322AB-5B33-40C7-AD1E-88B2B7CFA236/W66PT/W66PT/DB45")
-      # group/category
-      expect(subject.get("[azure][group]")).to eq("sql_diagnostics")
-      expect(subject.get("[azure][category]")).to eq("QueryStoreWaitStatistics")
-      expect(subject).to include("sql_diagnostics_QueryStoreWaitStatistics_properties")
-      expect(subject).not_to include("properties")
-    end
-  end
-
-  describe "Parses database metric logs" do
-    let(:config) do
-      <<-CONFIG
-      filter {
-        azure_event {
-
-        }
-      }
-      CONFIG
-    end
-
-    file = File.read(File.join(File.dirname(__FILE__), '../samples/sql_diagnostics/metric.json'))
-    sample(LogStash::Json.load(file)) do
-      expect(subject).to include("resourceId")
-      expect(subject.get("[azure][subscription]")).to eq("D427EE51-17CB-441A-9363-07390D5DC79E")
-      expect(subject.get("[azure][resource_group]")).to eq("RG5")
-      expect(subject.get("[azure][provider]")).to eq("MICROSOFT.SQL")
-      expect(subject.get("[azure][resource_type]")).to eq("SERVERS/DATABASES")
-      expect(subject.get("[azure][resource_name]")).to eq("DJFU48")
-      # db specific resources
-      expect(subject.get("[azure][server]")).to eq("SRV12")
-      expect(subject.get("[azure][database]")).to eq("DJFU48")
-      expect(subject.get("[azure][server_and_database]")).to eq("SRV12/DJFU48")
-      expect(subject.get("[azure][db_unique_id]")).to eq("D427EE51-17CB-441A-9363-07390D5DC79E/RG5/SRV12/DJFU48")
-      # group/category
-      expect(subject.get("[azure][group]")).to eq("sql_diagnostics")
-      expect(subject.get("[azure][category]")).to eq("Metric")
-      expect(subject).not_to include("properties")
-    end
-  end
-
-  describe "Fails to parse" do
-    let(:config) do
-      <<-CONFIG
-      filter {
-        azure_event {
-
-        }
-      }
-      CONFIG
-    end
-
-    sample("{'a': 'b'}") do
-      expect(subject).to include("tags")
-      expect(subject.get("[tags][0]")).to eq("_azure_event_failure")
-    end
-  end
-
-end
diff --git a/x-pack/spec/modules/azure/samples/activity_log/administrative1.json b/x-pack/spec/modules/azure/samples/activity_log/administrative1.json
deleted file mode 100644
index ee86bbe42..000000000
--- a/x-pack/spec/modules/azure/samples/activity_log/administrative1.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  "_comment": "Administrative example from https://docs.microsoft.com/en-us/azure/monitoring-and-diagnostics/monitoring-activity-log-schema",
-  "authorization": {
-    "action": "Microsoft.Network/networkSecurityGroups/write",
-    "scope": "/subscriptions/dd042f02-6b3e-4f79-939a-6a381ffed3c0/resourcegroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/myNSG"
-  },
-  "caller": "rob@contoso.com",
-  "channels": "Operation",
-  "claims": {
-    "aud": "https://management.core.windows.net/",
-    "iss": "https://sts.windows.net/1114444b-7467-4144-a616-e3a5d63e147b/",
-    "iat": "1234567890",
-    "nbf": "1234567890",
-    "exp": "1234567890",
-    "_claim_names": "{\"groups\":\"src1\"}",
-    "_claim_sources": "{\"src1\":{\"endpoint\":\"https://graph.windows.net/1114444b-7467-4144-a616-e3a5d63e147b/users/f409edeb-4d29-44b5-9763-ee9348ad91bb/getMemberObjects\"}}",
-    "http://schemas.microsoft.com/claims/authnclassreference": "1",
-    "aio": "A3GgTJdwK4vy7Fa7l6DgJC2mI0GX44tML385OpU1Q+z+jaPnFMwB",
-    "http://schemas.microsoft.com/claims/authnmethodsreferences": "rsa,mfa",
-    "appid": "355249ed-15d9-460d-8481-84026b065942",
-    "appidacr": "2",
-    "http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier": "10845a4d-ffa4-4b61-a3b4-e57b9b31cdb5",
-    "e_exp": "262800",
-    "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname": "Robertson",
-    "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname": "Rob",
-    "ipaddr": "111.111.1.111",
-    "name": "Rob Robertson",
-    "http://schemas.microsoft.com/identity/claims/objectidentifier": "f409edeb-4d29-44b5-9763-ee9348ad91bb",
-    "onprem_sid": "S-1-5-21-4837261184-168309720-1886587427-18514304",
-    "puid": "18247BBD84827C6D",
-    "http://schemas.microsoft.com/identity/claims/scope": "user_impersonation",
-    "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier": "b-24Jf94A3FH2sHWVIFqO3-RSJEiv24Jnif3gj7s",
-    "http://schemas.microsoft.com/identity/claims/tenantid": "1114444b-7467-4144-a616-e3a5d63e147b",
-    "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name": "rob@contoso.com",
-    "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn": "rob@contoso.com",
-    "uti": "IdP3SUJGtkGlt7dDQVRPAA",
-    "ver": "1.0"
-  },
-  "correlationId": "b5768deb-836b-41cc-803e-3f4de2f9e40b",
-  "eventDataId": "d0d36f97-b29c-4cd9-9d3d-ea2b92af3e9d",
-  "eventName": {
-    "value": "EndRequest",
-    "localizedValue": "End request"
-  },
-  "category": {
-    "value": "Administrative",
-    "localizedValue": "Administrative"
-  },
-  "eventTimestamp": "2018-01-29T20:42:31.3810679Z",
-  "id": "/subscriptions/dd042f02-6b3e-4f79-939a-6a381ffed3c0/resourcegroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/myNSG/events/d0d36f97-b29c-4cd9-9d3d-ea2b92af3e9d/ticks/636528553513810679",
-  "level": "Informational",
-  "operationId": "04e575f8-48d0-4c43-a8b3-78c4eb01d287",
-  "operationName": {
-    "value": "Microsoft.Network/networkSecurityGroups/write",
-    "localizedValue": "Microsoft.Network/networkSecurityGroups/write"
-  },
-  "resourceGroupName": "myResourceGroup",
-  "resourceProviderName": {
-    "value": "Microsoft.Network",
-    "localizedValue": "Microsoft.Network"
-  },
-  "resourceType": {
-    "value": "Microsoft.Network/networkSecurityGroups",
-    "localizedValue": "Microsoft.Network/networkSecurityGroups"
-  },
-  "resourceId": "/subscriptions/dd042f02-6b3e-4f79-939a-6a381ffed3c0/resourcegroups/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/myNSG",
-  "status": {
-    "value": "Succeeded",
-    "localizedValue": "Succeeded"
-  },
-  "subStatus": {
-    "value": "",
-    "localizedValue": ""
-  },
-  "submissionTimestamp": "2018-01-29T20:42:50.0724829Z",
-  "subscriptionId": "dd042f02-6b3e-4f79-939a-6a381ffed3c0",
-  "properties": {
-    "statusCode": "Created",
-    "serviceRequestId": "a4c11dbd-697e-47c5-9663-12362307157d",
-    "responseBody": "",
-    "requestbody": ""
-  },
-  "relatedEvents": []
-}
\ No newline at end of file
diff --git a/x-pack/spec/modules/azure/samples/activity_log/administrative2.json b/x-pack/spec/modules/azure/samples/activity_log/administrative2.json
deleted file mode 100644
index 8bdf61072..000000000
--- a/x-pack/spec/modules/azure/samples/activity_log/administrative2.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "comment": "as observed",
-  "time": "2018-01-14T17:01:30.0206739Z",
-  "resourceId": "/SUBSCRIPTIONS/9103C2E0-A392-4CE3-BADD-E50F19378DEB/RESOURCEGROUPS/MYLINUXVMRG/PROVIDERS/MICROSOFT.STORAGE/STORAGEACCOUNTS/store835G",
-  "operationName": "MICROSOFT.STORAGE/STORAGEACCOUNTS/LISTKEYS/ACTION",
-  "category": "Administrative",
-  "resultType": "Start",
-  "resultSignature": "Started.",
-  "durationMs": 0,
-  "callerIpAddress": "96.238.111.0",
-  "correlationId": "db84350f-c0bd-4531-a2bf-810a857d287e",
-  "identity": {"authorization":{"scope":"/subscriptions/9103C2E0-A392-4CE3-BADD-E50F19378DEB/resourceGroups/MyLinuxVMRG/providers/Microsoft.Storage/storageAccounts/store835G","action":"Microsoft.Storage/storageAccounts/listKeys/action","evidence":{"role":"Insights Management Service Role","roleAssignmentScope":"/subscriptions/9103C2E0-A392-4CE3-BADD-E50F19378DEB","roleAssignmentId":"126C0FC827F94412B3F8CD170A670569","roleDefinitionId":"A1E4B681D228474FB8C9417FA51EA1DD","principalId":"305CF1ABA4AA418BA44CFBBD096C0C1A","principalType":"ServicePrincipal"}},"claims":{"aud":"https://management.azure.com/","iss":"https://sts.windows.net/C4520330-BEAB-4A22-8FD4-59FF78196A05/","iat":"1515948989","nbf":"1515948989","exp":"1515952889","aio":"Y2NgYJgW3OHjWydaGi3vL5iRpVIPAA==","appid":"11c174dc-1945-4a9a-a36b-c79a0f246b9b","appidacr":"2","e_exp":"262800","http://schemas.microsoft.com/identity/claims/identityprovider":"https://sts.windows.net/C45203C0-CEAB-4A22-8FD4-59FFF8196A05/","http://schemas.microsoft.com/identity/claims/objectidentifier":"79D0CC17-AF3F-4CCC-A23C-A3FCC18475B4","http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier":"79D0CC17-AF3F-4CCC-A23C-A3FCC18475B4","http://schemas.microsoft.com/identity/claims/tenantid":"C4520330-BEAB-4B22-8FD4-59FF78196A05","uti":"Ztcp1xZ4t0S0Cb_v0j0kAA","ver":"1.0"}},
-  "level": "Information",
-  "location": "global"
-}
diff --git a/x-pack/spec/modules/azure/samples/activity_log/administrative3.json b/x-pack/spec/modules/azure/samples/activity_log/administrative3.json
deleted file mode 100644
index 650a25f2b..000000000
--- a/x-pack/spec/modules/azure/samples/activity_log/administrative3.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "_comment":"as observed, missing the resource group",
-  "callerIpAddress": "100.14.28.29",
-  "FAILURE": true,
-  "time": "2017-12-19T00:01:04.4382629Z",
-  "identity": {
-    "claims": {
-      "http://schemas.microsoft.com/identity/claims/objectidentifier": "2d43f8b4-a732-4570-a3a2-3f1ab49e30ac",
-      "http://schemas.microsoft.com/claims/authnmethodsreferences": "pwd,mfa",
-      "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name": "bill.gates@microsoft.com",
-      "iat": "1513639560",
-      "http://schemas.microsoft.com/claims/authnclassreference": "1",
-      "nbf": "1513639560",
-      "http://schemas.microsoft.com/identity/claims/scope": "user_impersonation",
-      "http://schemas.microsoft.com/identity/claims/tenantid": "95BD959B-A8C2-4AB8-9188-2A5647689841",
-      "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier": "2_2WJr9rionVzG7dYMqKH-VC3UWhPVXngLPpXPQYog0",
-      "aud": "https://management.core.windows.net/",
-      "in_corp": "true",
-      "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn": "bill.gates@microsoft.com",
-      "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname": "billy bob",
-      "ver": "1.0",
-      "appid": "c44b4083-3bb0-49c1-b47d-974e53vbtf3c",
-      "uti": "1UWEqubsQ0OCsnLug3AMAA",
-      "_claim_names": "{\"groups\":\"src1\"}",
-      "_claim_sources": "{\"src1\":{\"endpoint\":\"https://graph.windows.net/95BD959B-A8C2-4AB8-9188-2A5147989841/users/2d43f8b4-a732-4570-a3a2-3f1ab49f30ac/getMemberObjects\"}}",
-      "iss": "https://sts.windows.net/95BD959B-A8C2-4AB8-9188-2A5147989841/",
-      "exp": "1513643460",
-      "aio": "Y2NgYOC5He38sHp9h/8vrfchqS2NZ0918+0vETD9+inoRjxDgTsA",
-      "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname": "Robinson",
-      "onprem_sid": "S-1-5-21-2127521184-1604012920-1887927527-15292006",
-      "e_exp": "262800",
-      "puid": "100300008BB08AB6",
-      "name": "John Smith",
-      "ipaddr": "252.69.73.240",
-      "appidacr": "2"
-    },
-    "authorization": {
-      "action": "Microsoft.Advisor/generateRecommendations/action",
-      "scope": "/subscriptions/872F2E12-6CCC-4EAD-8D3C-AC833009C1A4"
-    }
-  },
-  "correlationId": "7f206be7-2639-4417-9776-2aa9eb0e78db",
-  "@version": "1",
-  "resultType": "Start",
-  "location": "global",
-  "category": "Action",
-  "@timestamp": "2018-02-12T20:18:27.319Z",
-  "level": "Information",
-  "durationMs": 0,
-  "resultSignature": "Started.",
-  "resourceId": "/SUBSCRIPTIONS/872F2E12-6CCC-4EAD-8D3C-AC833009C1A4/PROVIDERS/MICROSOFT.ADVISOR",
-  "operationName": "MICROSOFT.ADVISOR/GENERATERECOMMENDATIONS/ACTION"
-}
diff --git a/x-pack/spec/modules/azure/samples/activity_log/alert1.json b/x-pack/spec/modules/azure/samples/activity_log/alert1.json
deleted file mode 100644
index d2a103130..000000000
--- a/x-pack/spec/modules/azure/samples/activity_log/alert1.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "_comment": "Alert example from https://docs.microsoft.com/en-us/azure/monitoring-and-diagnostics/monitoring-activity-log-schema",
-  "caller": "Microsoft.Insights/alertRules",
-  "channels": "Admin, Operation",
-  "claims": {
-    "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/spn": "Microsoft.Insights/alertRules"
-  },
-  "correlationId": "/subscriptions/mySubscriptionID/resourceGroups/myResourceGroup/providers/microsoft.insights/alertrules/myalert/incidents/L3N1YnNjcmlwdGlvbnMvZGY2MDJjOWMtN2FhMC00MDdkLWE2ZmItZWIyMGM4YmQxMTkyL3Jlc291cmNlR3JvdXBzL0NzbUV2ZW50RE9HRk9PRC1XZXN0VVMvcHJvdmlkZXJzL21pY3Jvc29mdC5pbnNpZ2h0cy9hbGVydHJ1bGVzL215YWxlcnQwNjM2MzYyMjU4NTM1MjIxOTIw",
-  "description": "'Disk read LessThan 100000 ([Count]) in the last 5 minutes' has been resolved for CloudService: myResourceGroup/Production/Event.BackgroundJobsWorker.razzle (myResourceGroup)",
-  "eventDataId": "149d4baf-53dc-4cf4-9e29-17de37405cd9",
-  "eventName": {
-    "value": "Alert",
-    "localizedValue": "Alert"
-  },
-  "category": {
-    "value": "Alert",
-    "localizedValue": "Alert"
-  },
-  "id": "/subscriptions/mySubscriptionID/resourceGroups/myResourceGroup/providers/Microsoft.ClassicCompute/domainNames/myResourceGroup/slots/Production/roles/Event.BackgroundJobsWorker.razzle/events/149d4baf-53dc-4cf4-9e29-17de37405cd9/ticks/636362258535221920",
-  "level": "Informational",
-  "resourceGroupName": "myResourceGroup",
-  "resourceProviderName": {
-    "value": "Microsoft.ClassicCompute",
-    "localizedValue": "Microsoft.ClassicCompute"
-  },
-  "resourceId": "/subscriptions/mySubscriptionID/resourceGroups/myResourceGroup/providers/Microsoft.ClassicCompute/domainNames/myResourceGroup/slots/Production/roles/Event.BackgroundJobsWorker.razzle",
-  "resourceType": {
-    "value": "Microsoft.ClassicCompute/domainNames/slots/roles",
-    "localizedValue": "Microsoft.ClassicCompute/domainNames/slots/roles"
-  },
-  "operationId": "/subscriptions/mySubscriptionID/resourceGroups/myResourceGroup/providers/microsoft.insights/alertrules/myalert/incidents/L3N1YnNjcmlwdGlvbnMvZGY2MDJjOWMtN2FhMC00MDdkLWE2ZmItZWIyMGM4YmQxMTkyL3Jlc291cmNlR3JvdXBzL0NzbUV2ZW50RE9HRk9PRC1XZXN0VVMvcHJvdmlkZXJzL21pY3Jvc29mdC5pbnNpZ2h0cy9hbGVydHJ1bGVzL215YWxlcnQwNjM2MzYyMjU4NTM1MjIxOTIw",
-  "operationName": {
-    "value": "Microsoft.Insights/AlertRules/Resolved/Action",
-    "localizedValue": "Microsoft.Insights/AlertRules/Resolved/Action"
-  },
-  "properties": {
-    "RuleUri": "/subscriptions/mySubscriptionID/resourceGroups/myResourceGroup/providers/microsoft.insights/alertrules/myalert",
-    "RuleName": "myalert",
-    "RuleDescription": "",
-    "Threshold": "100000",
-    "WindowSizeInMinutes": "5",
-    "Aggregation": "Average",
-    "Operator": "LessThan",
-    "MetricName": "Disk read",
-    "MetricUnit": "Count"
-  },
-  "status": {
-    "value": "Resolved",
-    "localizedValue": "Resolved"
-  },
-  "subStatus": {
-    "value": null
-  },
-  "eventTimestamp": "2017-07-21T09:24:13.522192Z",
-  "submissionTimestamp": "2017-07-21T09:24:15.6578651Z",
-  "subscriptionId": "mySubscriptionID"
-}
diff --git a/x-pack/spec/modules/azure/samples/activity_log/alert2.json b/x-pack/spec/modules/azure/samples/activity_log/alert2.json
deleted file mode 100644
index b2498c48d..000000000
--- a/x-pack/spec/modules/azure/samples/activity_log/alert2.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "comment": "as observed",
-  "time": "2017-12-20T02:45:46.9935702Z",
-  "resourceId": "/SUBSCRIPTIONS/C27F13D5-E19A-4A4C-8415-4056C7C752BC/RESOURCEGROUPS/DEFAULT-ACTIVITYLOGALERTS/PROVIDERS/MICROSOFT.INSIGHTS/ACTIVITYLOGALERTS/NOTIFY OPEN HEALTH ALERT",
-  "correlationId": "6b87b2d4-e788-4169-849d-456450ea1965",
-  "operationName": "Microsoft.Insights/ActivityLogAlerts/Activated/action",
-  "level": "Information",
-  "resultType": "Succeeded",
-  "resultDescription": "Alert: Notify Open Health Alert called on action groups : Notify%20Open",
-  "category": "Action",
-  "location": "global",
-  "properties": {
-    "eventCategory": "Alert",
-    "eventProperties": "{\"authorization\":null,\"channels\":\"Operation\",\"claims\":\"{\\\"http://schemas.xmlsoap.org/ws/2005/05/identity/claims/spn\\\":\\\"Microsoft.Insights/activityLogAlerts\\\"}\",\"caller\":null,\"correlationId\":\"6b87b2d4-e788-4169-849d-456450ea1965\",\"description\":\"Alert: Notify Open Health Alert called on action groups : Notify%20Open\",\"eventSource\":\"Alert\",\"eventTimestamp\":\"2017-12-20T02:45:46.9935702+00:00\",\"httpRequest\":null,\"eventDataId\":\"68b67da7-9504-4fa8-8223-c7bb51789c5c\",\"level\":\"Informational\",\"operationName\":\"Microsoft.Insights/ActivityLogAlerts/Activated/action\",\"operationId\":\"2db0b2c1-bf63-4379-bf8a-de3ebd11203a\",\"properties\":{\"subscriptionId\":\"C27F13D5-E19A-4A4C-8415-4056C7C752BC\",\"eventDataId\":\"a9e82a0d-3580-aa96-a7aa-5b0419107a04\",\"resourceGroup\":null,\"resourceId\":null,\"eventTimestamp\":\"2017-12-20T02:45:39.3441022Z\",\"operationName\":\"Microsoft.ServiceHealth/actionrequired/action\",\"status\":\"Active\"},\"resourceId\":\"/subscriptions/C27F13D5-E19A-4A4C-8415-4056C7C752BC/resourceGroups/Default-ActivityLogAlerts/providers/microsoft.insights/activityLogAlerts/Notify Open Health Alert\",\"resourceGroupName\":\"Default-ActivityLogAlerts\",\"resourceProviderName\":\"microsoft.insights\",\"status\":\"Succeeded\",\"subStatus\":null,\"subscriptionId\":\"C27F13D5-E19A-4A4C-8415-4056C7C752BC\",\"submissionTimestamp\":\"0001-01-01T00:00:00+00:00\",\"ResourceType\":\"microsoft.insights/activityLogAlerts\"}"
-  }
-}
diff --git a/x-pack/spec/modules/azure/samples/activity_log/auto_scale1.json b/x-pack/spec/modules/azure/samples/activity_log/auto_scale1.json
deleted file mode 100644
index 8d5c067e5..000000000
--- a/x-pack/spec/modules/azure/samples/activity_log/auto_scale1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "_comment": "Auto scale example from https://docs.microsoft.com/en-us/azure/monitoring-and-diagnostics/monitoring-activity-log-schema",
-  "caller": "Microsoft.Insights/autoscaleSettings",
-  "channels": "Admin, Operation",
-  "claims": {
-    "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/spn": "Microsoft.Insights/autoscaleSettings"
-  },
-  "correlationId": "fc6a7ff5-ff68-4bb7-81b4-3629212d03d0",
-  "description": "The autoscale engine attempting to scale resource '/subscriptions/mySubscriptionID/resourceGroups/myResourceGroup/providers/Microsoft.ClassicCompute/domainNames/myResourceGroup/slots/Production/roles/myResource' from 3 instances count to 2 instances count.",
-  "eventDataId": "a5b92075-1de9-42f1-b52e-6f3e4945a7c7",
-  "eventName": {
-    "value": "AutoscaleAction",
-    "localizedValue": "AutoscaleAction"
-  },
-  "category": {
-    "value": "Autoscale",
-    "localizedValue": "Autoscale"
-  },
-  "id": "/subscriptions/mySubscriptionID/resourceGroups/myResourceGroup/providers/microsoft.insights/autoscalesettings/myResourceGroup-Production-myResource-myResourceGroup/events/a5b92075-1de9-42f1-b52e-6f3e4945a7c7/ticks/636361956518681572",
-  "level": "Informational",
-  "resourceGroupName": "myResourceGroup",
-  "resourceProviderName": {
-    "value": "microsoft.insights",
-    "localizedValue": "microsoft.insights"
-  },
-  "resourceId": "/subscriptions/mySubscriptionID/resourceGroups/myResourceGroup/providers/microsoft.insights/autoscalesettings/myResourceGroup-Production-myResource-myResourceGroup",
-  "resourceType": {
-    "value": "microsoft.insights/autoscalesettings",
-    "localizedValue": "microsoft.insights/autoscalesettings"
-  },
-  "operationId": "fc6a7ff5-ff68-4bb7-81b4-3629212d03d0",
-  "operationName": {
-    "value": "Microsoft.Insights/AutoscaleSettings/Scaledown/Action",
-    "localizedValue": "Microsoft.Insights/AutoscaleSettings/Scaledown/Action"
-  },
-  "properties": {
-    "Description": "The autoscale engine attempting to scale resource '/subscriptions/mySubscriptionID/resourceGroups/myResourceGroup/providers/Microsoft.ClassicCompute/domainNames/myResourceGroup/slots/Production/roles/myResource' from 3 instances count to 2 instances count.",
-    "ResourceName": "/subscriptions/mySubscriptionID/resourceGroups/myResourceGroup/providers/Microsoft.ClassicCompute/domainNames/myResourceGroup/slots/Production/roles/myResource",
-    "OldInstancesCount": "3",
-    "NewInstancesCount": "2",
-    "LastScaleActionTime": "Fri, 21 Jul 2017 01:00:51 GMT"
-  },
-  "status": {
-    "value": "Succeeded",
-    "localizedValue": "Succeeded"
-  },
-  "subStatus": {
-    "value": null
-  },
-  "eventTimestamp": "2017-07-21T01:00:51.8681572Z",
-  "submissionTimestamp": "2017-07-21T01:00:52.3008754Z",
-  "subscriptionId": "mySubscriptionID"
-}
\ No newline at end of file
diff --git a/x-pack/spec/modules/azure/samples/activity_log/auto_scale2.json b/x-pack/spec/modules/azure/samples/activity_log/auto_scale2.json
deleted file mode 100644
index 9f32d75f4..000000000
--- a/x-pack/spec/modules/azure/samples/activity_log/auto_scale2.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "_comment": "with eventCategory=Autoscale",
-  "caller": "Microsoft.Insights/autoscaleSettings",
-  "channels": "Admin, Operation",
-  "claims": {
-    "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/spn": "Microsoft.Insights/autoscaleSettings"
-  },
-  "correlationId": "fc6a7ff5-ff68-4bb7-81b4-3629212d03d0",
-  "description": "The autoscale engine attempting to scale resource '/subscriptions/mySubscriptionID/resourceGroups/myResourceGroup/providers/Microsoft.ClassicCompute/domainNames/myResourceGroup/slots/Production/roles/myResource' from 3 instances count to 2 instances count.",
-  "eventDataId": "a5b92075-1de9-42f1-b52e-6f3e4945a7c7",
-  "eventName": {
-    "value": "AutoscaleAction",
-    "localizedValue": "AutoscaleAction"
-  },
-  "id": "/subscriptions/mySubscriptionID/resourceGroups/myResourceGroup/providers/microsoft.insights/autoscalesettings/myResourceGroup-Production-myResource-myResourceGroup/events/a5b92075-1de9-42f1-b52e-6f3e4945a7c7/ticks/636361956518681572",
-  "level": "Informational",
-  "resourceGroupName": "myResourceGroup",
-  "resourceProviderName": {
-    "value": "microsoft.insights",
-    "localizedValue": "microsoft.insights"
-  },
-  "resourceId": "/subscriptions/mySubscriptionID/resourceGroups/myResourceGroup/providers/microsoft.insights/autoscalesettings/myResourceGroup-Production-myResource-myResourceGroup",
-  "resourceType": {
-    "value": "microsoft.insights/autoscalesettings",
-    "localizedValue": "microsoft.insights/autoscalesettings"
-  },
-  "operationId": "fc6a7ff5-ff68-4bb7-81b4-3629212d03d0",
-  "operationName": {
-    "value": "Microsoft.Insights/AutoscaleSettings/Scaledown/Action",
-    "localizedValue": "Microsoft.Insights/AutoscaleSettings/Scaledown/Action"
-  },
-  "properties": {
-    "eventCategory":"Autoscale",
-    "Description": "The autoscale engine attempting to scale resource '/subscriptions/mySubscriptionID/resourceGroups/myResourceGroup/providers/Microsoft.ClassicCompute/domainNames/myResourceGroup/slots/Production/roles/myResource' from 3 instances count to 2 instances count.",
-    "ResourceName": "/subscriptions/mySubscriptionID/resourceGroups/myResourceGroup/providers/Microsoft.ClassicCompute/domainNames/myResourceGroup/slots/Production/roles/myResource",
-    "OldInstancesCount": "3",
-    "NewInstancesCount": "2",
-    "LastScaleActionTime": "Fri, 21 Jul 2017 01:00:51 GMT"
-  },
-  "status": {
-    "value": "Succeeded",
-    "localizedValue": "Succeeded"
-  },
-  "subStatus": {
-    "value": null
-  },
-  "eventTimestamp": "2017-07-21T01:00:51.8681572Z",
-  "submissionTimestamp": "2017-07-21T01:00:52.3008754Z",
-  "subscriptionId": "mySubscriptionID"
-}
\ No newline at end of file
diff --git a/x-pack/spec/modules/azure/samples/activity_log/security1.json b/x-pack/spec/modules/azure/samples/activity_log/security1.json
deleted file mode 100644
index d06756d63..000000000
--- a/x-pack/spec/modules/azure/samples/activity_log/security1.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "_comment": "Security example from https://docs.microsoft.com/en-us/azure/monitoring-and-diagnostics/monitoring-activity-log-schema",
-  "channels": "Operation",
-  "correlationId": "965d6c6a-a790-4a7e-8e9a-41771b3fbc38",
-  "description": "Suspicious double extension file executed. Machine logs indicate an execution of a process with a suspicious double extension.\r\nThis extension may trick users into thinking files are safe to be opened and might indicate the presence of malware on the system.",
-  "eventDataId": "965d6c6a-a790-4a7e-8e9a-41771b3fbc38",
-  "eventName": {
-    "value": "Suspicious double extension file executed",
-    "localizedValue": "Suspicious double extension file executed"
-  },
-  "category": {
-    "value": "Security",
-    "localizedValue": "Security"
-  },
-  "eventTimestamp": "2017-10-18T06:02:18.6179339Z",
-  "id": "/subscriptions/d4742bb8-c279-4903-9653-9858b17d0c2e/providers/Microsoft.Security/locations/centralus/alerts/965d6c6a-a790-4a7e-8e9a-41771b3fbc38/events/965d6c6a-a790-4a7e-8e9a-41771b3fbc38/ticks/636439033386179339",
-  "level": "Informational",
-  "operationId": "965d6c6a-a790-4a7e-8e9a-41771b3fbc38",
-  "operationName": {
-    "value": "Microsoft.Security/locations/alerts/activate/action",
-    "localizedValue": "Microsoft.Security/locations/alerts/activate/action"
-  },
-  "resourceGroupName": "myResourceGroup",
-  "resourceProviderName": {
-    "value": "Microsoft.Security",
-    "localizedValue": "Microsoft.Security"
-  },
-  "resourceType": {
-    "value": "Microsoft.Security/locations/alerts",
-    "localizedValue": "Microsoft.Security/locations/alerts"
-  },
-  "resourceId": "/subscriptions/d4742bb8-c279-4903-9653-9858b17d0c2e/providers/Microsoft.Security/locations/centralus/alerts/2518939942613820660_a48f8653-3fc6-4166-9f19-914f030a13d3",
-  "status": {
-    "value": "Active",
-    "localizedValue": "Active"
-  },
-  "subStatus": {
-    "value": null
-  },
-  "submissionTimestamp": "2017-10-18T06:02:52.2176969Z",
-  "subscriptionId": "d4742bb8-c279-4903-9653-9858b17d0c2e",
-  "properties": {
-    "accountLogonId": "0x2r4",
-    "commandLine": "c:\\mydirectory\\doubleetension.pdf.exe",
-    "domainName": "hpc",
-    "parentProcess": "unknown",
-    "parentProcess id": "0",
-    "processId": "6988",
-    "processName": "c:\\mydirectory\\doubleetension.pdf.exe",
-    "userName": "myUser",
-    "UserSID": "S-3-2-12",
-    "ActionTaken": "Detected",
-    "Severity": "High"
-  },
-  "relatedEvents": []
-}
\ No newline at end of file
diff --git a/x-pack/spec/modules/azure/samples/activity_log/security2.json b/x-pack/spec/modules/azure/samples/activity_log/security2.json
deleted file mode 100644
index 68714774a..000000000
--- a/x-pack/spec/modules/azure/samples/activity_log/security2.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "comment": "as observed",
-  "time": "2017-12-21T10:55:48.6238832Z",
-  "resourceId": "/SUBSCRIPTIONS/F628BA4C-F07B-4AEB-86CB-C89784BBD9B3",
-  "correlationId": "54ade416-3c64-42ba-994f-1f6309efc989",
-  "operationName": "Microsoft.Security/tasks/write",
-  "level": "Information",
-  "resultType": "Succeeded",
-  "category": "Action",
-  "location": "global",
-  "properties": {"eventCategory":"Recommendation","eventName":"New Recommendation","operationId":"e447c42f-af43-40ca-962b-c3740893f100"}
-}
\ No newline at end of file
diff --git a/x-pack/spec/modules/azure/samples/activity_log/service_health1.json b/x-pack/spec/modules/azure/samples/activity_log/service_health1.json
deleted file mode 100644
index 409a6fe96..000000000
--- a/x-pack/spec/modules/azure/samples/activity_log/service_health1.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "_comment": "Service health example from https://docs.microsoft.com/en-us/azure/monitoring-and-diagnostics/monitoring-activity-log-schema",
-  "channels": "Admin",
-  "correlationId": "c550176b-8f52-4380-bdc5-36c1b59d3a44",
-  "description": "Active: Network Infrastructure - UK South",
-  "eventDataId": "c5bc4514-6642-2be3-453e-c6a67841b073",
-  "eventName": {
-    "value": null
-  },
-  "category": {
-    "value": "ServiceHealth",
-    "localizedValue": "Service Health"
-  },
-  "eventTimestamp": "2017-07-20T23:30:14.8022297Z",
-  "id": "/subscriptions/mySubscriptionID/events/c5bc4514-6642-2be3-453e-c6a67841b073/ticks/636361902148022297",
-  "level": "Warning",
-  "operationName": {
-    "value": "Microsoft.ServiceHealth/incident/action",
-    "localizedValue": "Microsoft.ServiceHealth/incident/action"
-  },
-  "resourceProviderName": {
-    "value": null
-  },
-  "resourceType": {
-    "value": null,
-    "localizedValue": ""
-  },
-  "resourceId": "/subscriptions/mySubscriptionID",
-  "status": {
-    "value": "Active",
-    "localizedValue": "Active"
-  },
-  "subStatus": {
-    "value": null
-  },
-  "submissionTimestamp": "2017-07-20T23:30:34.7431946Z",
-  "subscriptionId": "mySubscriptionID",
-  "properties": {
-    "title": "Network Infrastructure - UK South",
-    "service": "Service Fabric",
-    "region": "UK South",
-    "communication": "Starting at approximately 21:41 UTC on 20 Jul 2017, a subset of customers in UK South may experience degraded performance, connectivity drops or timeouts when accessing their Azure resources hosted in this region. Engineers are investigating underlying Network Infrastructure issues in this region. Impacted services may include, but are not limited to App Services, Automation, Service Bus, Log Analytics, Key Vault, SQL Database, Service Fabric, Event Hubs, Stream Analytics, Azure Data Movement, API Management, and Azure Search. Multiple engineering teams are engaged in multiple workflows to mitigate the impact. The next update will be provided in 60 minutes, or as events warrant.",
-    "incidentType": "Incident",
-    "trackingId": "NA0F-BJG",
-    "impactStartTime": "2017-07-20T21:41:00.0000000Z",
-    "impactedServices": "[{\"ImpactedRegions\":[{\"RegionName\":\"UK South\"}],\"ServiceName\":\"Service Fabric\"}]",
-    "defaultLanguageTitle": "Network Infrastructure - UK South",
-    "defaultLanguageContent": "Starting at approximately 21:41 UTC on 20 Jul 2017, a subset of customers in UK South may experience degraded performance, connectivity drops or timeouts when accessing their Azure resources hosted in this region. Engineers are investigating underlying Network Infrastructure issues in this region. Impacted services may include, but are not limited to App Services, Automation, Service Bus, Log Analytics, Key Vault, SQL Database, Service Fabric, Event Hubs, Stream Analytics, Azure Data Movement, API Management, and Azure Search. Multiple engineering teams are engaged in multiple workflows to mitigate the impact. The next update will be provided in 60 minutes, or as events warrant.",
-    "stage": "Active",
-    "communicationId": "636361902146035247",
-    "version": "0.1.1"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/spec/modules/azure/samples/activity_log/service_health2.json b/x-pack/spec/modules/azure/samples/activity_log/service_health2.json
deleted file mode 100644
index 45b120077..000000000
--- a/x-pack/spec/modules/azure/samples/activity_log/service_health2.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "comment": "as observed",
-  "time": "2017-12-20T02:45:39.3441022Z",
-  "resourceId": "/SUBSCRIPTIONS/13100E9F-5DCE-4686-B4F4-FF997D407A75",
-  "correlationId": "6b87b2d4-e788-4169-849d-456450ea1965",
-  "operationName": "Microsoft.ServiceHealth/actionrequired/action",
-  "level": "Information",
-  "resultType": "Active",
-  "resultDescription": "Active: Action Required Regarding Your Linux Virtual Machine(s)",
-  "category": "Action",
-  "location": "global",
-  "properties": {
-    "eventCategory": "ServiceHealth",
-    "eventProperties": "{\"authorization\":null,\"channels\":\"Admin\",\"claims\":null,\"caller\":null,\"correlationId\":\"6b87b2d4-e788-4169-849d-456450ea1965\",\"description\":\"Active: Action Required Regarding Your Linux Virtual Machine(s)\",\"eventSource\":\"ServiceHealth\",\"eventTimestamp\":\"2017-12-20T02:45:39.3441022+00:00\",\"httpRequest\":null,\"eventDataId\":\"a9e82a0d-3580-aa96-a7aa-5b0419107a04\",\"level\":\"Informational\",\"operationName\":\"Microsoft.ServiceHealth/actionrequired/action\",\"operationId\":\"6b87b2d4-e788-4169-849d-456450ea1965\",\"properties\":{\"title\":\"Action Required Regarding Your Linux Virtual Machine(s)\",\"service\":\"Virtual Machines\",\"region\":\"Canada Central\",\"communication\":\"Between approximately 23:15 and 23:25 UTC on 12 Dec 2017, we detected that one or more of your Linux Virtual Machines which have the update assessment feature enabled (currently in Preview) during the impact duration may incorrectly report whether your Virtual Machine (VM) requires updates. This includes the update assessment feature enabled in Azure Security Center. In addition, the change tracking feature (currently in Preview) may also be affected if this feature is enabled.  Linux VMs onboarded with these features after 23:25 UTC on 12 Dec 2017 are not affected. For short-term mitigation, you can follow the steps in the following documentation: https://aka.ms/updateasstlinux. A fix has been developed and is currently in an extended deployment phase following our safe deployment practices. Engineering teams identified a brief availability drop to a back-end server which caused a monitoring agent responsible for reporting whether or not your VM requires updates to become stuck, resulting in the VM update status not reporting correctly. The next update will be provided in 48 hours, or as events warrant.\",\"incidentType\":\"ActionRequired\",\"trackingId\":\"Q5K2-12O\",\"impactStartTime\":\"2017-12-12T23:15:00.0000000Z\",\"impactMitigationTime\":\"2017-12-12T23:25:00.0000000Z\",\"impactedServices\":\"[{\\\"ImpactedRegions\\\":[{\\\"RegionName\\\":\\\"Canada Central\\\"}],\\\"ServiceName\\\":\\\"Virtual Machines\\\"}]\",\"defaultLanguageTitle\":\"Action Required Regarding Your Linux Virtual Machine(s)\",\"defaultLanguageContent\":\"Between approximately 23:15 and 23:25 UTC on 12 Dec 2017, we detected that one or more of your Linux Virtual Machines which have the update assessment feature enabled (currently in Preview) during the impact duration may incorrectly report whether your Virtual Machine (VM) requires updates. This includes the update assessment feature enabled in Azure Security Center. In addition, the change tracking feature (currently in Preview) may also be affected if this feature is enabled.  Linux VMs onboarded with these features after 23:25 UTC on 12 Dec 2017 are not affected. For short-term mitigation, you can follow the steps in the following documentation: https://aka.ms/updateasstlinux. A fix has been developed and is currently in an extended deployment phase following our safe deployment practices. Engineering teams identified a brief availability drop to a back-end server which caused a monitoring agent responsible for reporting whether or not your VM requires updates to become stuck, resulting in the VM update status not reporting correctly. The next update will be provided in 48 hours, or as events warrant.\",\"stage\":\"Active\",\"communicationId\":\"636493347390219010\",\"version\":\"0.1.1\"},\"resourceId\":null,\"resourceGroupName\":null,\"resourceProviderName\":null,\"status\":\"Active\",\"subStatus\":null,\"subscriptionId\":\"13100e9f-5dce-4686-b4f4-ff997d407a75\",\"submissionTimestamp\":\"2017-12-20T02:45:42.4609886+00:00\",\"ResourceType\":null}"
-  }
-}
\ No newline at end of file
diff --git a/x-pack/spec/modules/azure/samples/sql_diagnostics/blocks.json b/x-pack/spec/modules/azure/samples/sql_diagnostics/blocks.json
deleted file mode 100644
index 727ee120b..000000000
--- a/x-pack/spec/modules/azure/samples/sql_diagnostics/blocks.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "ResourceGroup": "DEMTP789",
-  "time": "2018-01-22T15:42:46.3137688Z",
-  "LogicalServerName": "SRV1238FG9",
-  "SubscriptionId": "851FD0F5-9GB8-552C-41C3-3TH4FA231C3A",
-  "category": "Blocks",
-  "operationName": "BlockEvent",
-  "properties": {
-    "blocked_process_filtered": "<blocked-process-report monitorLoop='104388'>   <blocked-process>    <process id='process58d73a2108' taskpriority='0' logused='0' waitresource='OBJECT: 65:363148339:3 ' waittime='51854' ownerId='454363420' transactionname='SELECT' lasttranstarted='2018-01-22T15:41:54.453' XDES='0x5a307b5ac0' lockMode='Sch-S' schedulerid='1' kpid='165976' status='suspended' spid='230' sbid='0' ecid='0' priority='0' trancount='0' lastbatchstarted='2018-01-22T15:41:54.460' lastbatchcompleted='2018-01-22T15:41:54.450' lastattention='1900-01-01T00:00:00.450' clientapp='.Net SqlClient Data Provider' hostname='filtered' hostpid='5124' loginname='filtered' isolationlevel='read committed (2)' xactid='454363420' currentdb='65' currentdbname='DB05001' lockTimeout='4294967295' clientoption1='671088672' clientoption2='128056'>     <executionStack>      <frame queryhash='0xbcc06b67ca5cecff' queryplanhash='0x9cf26df29c2d7d2a' line='1' stmtstart='38' stmtend='274' sqlhandle='0x02000000dd66e937ed6b147ad8099e7d1481648f368497df0000000000000000000000000000000000000000'/>      <frame queryhash='0xbcc06b67ca5cecff' queryplanhash='0x9cf26df29c2d7d2a' line='1' stmtend='228' sqlhandle='0x02000000fbb78d31e0cb73b4dec4a434218183ab3b1eeedc0000000000000000000000000000000000000000'/>      <frame queryhash='0x0000000000000000' queryplanhash='0x0000000000000000' line='1' stmtstart='-1' sqlhandle='0x0400ff7f427f99d9010000000000000000000000000000000000000000000000000000000000000000000000'/>      <frame queryhash='0x0000000000000000' queryplanhash='0x0000000000000000' line='16' stmtstart='1210' stmtend='1260' sqlhandle='0x030041007ed2cf484ac89900eea7000001000000000000000000000000000000000000000000000000000000'/>      <frame queryhash='0x0000000000000000' queryplanhash='0x0000000000000000' line='1' stmtend='52' sqlhandle='0x01004100ab41e10680f561775f00000000000000000000000000000000000000000000000000000000000000'/>     </executionStack>     <inputbuf>  filtered   </inputbuf>    </process>   </blocked-process>   <blocking-process>    <process status='running' waittime='15774' spid='209' sbid='0' ecid='0' priority='0' trancount='2' lastbatchstarted='2018-01-22T15:40:09.497' lastbatchcompleted='2018-01-22T15:40:09.370' lastattention='1900-01-01T00:00:00.370' clientapp='.Net SqlClient Data Provider' hostname='filtered' hostpid='4724' loginname='filtered' isolationlevel='read committed (2)' xactid='454360926' currentdb='65' currentdbname='DB05001' lockTimeout='4294967295' clientoption1='671088672' clientoption2='128056'>     <executionStack>      <frame queryhash='0x3871b247104a37a2' queryplanhash='0xd4e4985185ee038d' line='1' stmtend='416' sqlhandle='0x02000000cc53ed029c794decae4814b184150c6b14736c450000000000000000000000000000000000000000'/>      <frame queryhash='0x0000000000000000' queryplanhash='0x0000000000000000' line='1' stmtstart='-1' sqlhandle='0x0400ff7f427f99d9010000000000000000000000000000000000000000000000000000000000000000000000'/>      <frame queryhash='0x0000000000000000' queryplanhash='0x0000000000000000' line='33' stmtstart='2686' stmtend='2736' sqlhandle='0x0300410045aedb4779b6fa00f9a7000001000000000000000000000000000000000000000000000000000000'/>      <frame queryhash='0x0000000000000000' queryplanhash='0x0000000000000000' line='2' stmtstart='72' stmtend='114' sqlhandle='0x0200000033c6d138b7dcd9f242499afa3d47983ce60277000000000000000000000000000000000000000000'/>     </executionStack>     <inputbuf>  filtered   </inputbuf>    </process>   </blocking-process>  </blocked-process-report>  ",
-    "lock_mode": "SCH_S",
-    "resource_owner_type": "LOCK",
-    "ElasticPoolName": "epdemoatoff",
-    "DatabaseName": "DB05001",
-    "duration": 51854000
-  },
-  "resourceId": "/SUBSCRIPTIONS/851FD0F5-9GB8-552C-41C3-3TH4FA231C3A/RESOURCEGROUPS/DEMTP789/PROVIDERS/MICROSOFT.SQL/SERVERS/SRV1238FG9/DATABASES/DB05001"
-}
\ No newline at end of file
diff --git a/x-pack/spec/modules/azure/samples/sql_diagnostics/database_wait_statistics.json b/x-pack/spec/modules/azure/samples/sql_diagnostics/database_wait_statistics.json
deleted file mode 100644
index b35de0b62..000000000
--- a/x-pack/spec/modules/azure/samples/sql_diagnostics/database_wait_statistics.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "ResourceGroup":"go5rg",
-  "time":"2017-09-15T13:25:50.5770000Z",
-  "LogicalServerName":"go5rS",
-  "SubscriptionId":"741fd6f5-9fb8-462c-97c3-3hf4ch23hc2a",
-  "category":"DatabaseWaitStatistics",
-  "operationName":"DatabaseWaitStatistcsEvent",
-  "properties":{
-    "start_utc_date":"2017-09-15T13:25:50.5770000Z",
-    "end_utc_date":"2017-09-15T13:30:50.5770000Z",
-    "delta_signal_wait_time_ms":111567,
-    "ElasticPoolName":"RecommendedStandardPool1",
-    "wait_type":"SOS_SCHEDULER_YIELD",
-    "DatabaseName":"WorkGO5",
-    "delta_max_wait_time_ms":0,
-    "delta_waiting_tasks_count":5429,
-    "delta_wait_time_ms":111567
-  },
-  "resourceId":"/SUBSCRIPTIONS/741fd6f5-9fb8-462c-97c3-3hf4ch23hc2a/RESOURCEGROUPS/go5rg/PROVIDERS/MICROSOFT.SQL/SERVERS/go5rS/DATABASES/WORKGO5"
-}
\ No newline at end of file
diff --git a/x-pack/spec/modules/azure/samples/sql_diagnostics/errors.json b/x-pack/spec/modules/azure/samples/sql_diagnostics/errors.json
deleted file mode 100644
index 8fa23b6c4..000000000
--- a/x-pack/spec/modules/azure/samples/sql_diagnostics/errors.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "ResourceGroup": "OPT489",
-  "time": "2018-01-16T15:14:41.1342222Z",
-  "LogicalServerName": "OPT489",
-  "SubscriptionId": "846FY0F5-9C8H-452C-95C3-555555666C2A",
-  "category": "Errors",
-  "operationName": "ErrorEvent",
-  "properties": {
-    "query_hash": "0",
-    "state": 1,
-    "ElasticPoolName": "RecommendedStandardPool1",
-    "query_plan_hash": "0",
-    "DatabaseName": "DB874999",
-    "user_defined": false,
-    "error_number": 3902,
-    "message": "The COMMIT TRANSACTION request has no corresponding BEGIN TRANSACTION.",
-    "severity": 16
-  },
-  "resourceId": "/SUBSCRIPTIONS/846FY0F5-9C8H-452C-95C3-555555666C2A/RESOURCEGROUPS/OPT489/PROVIDERS/MICROSOFT.SQL/SERVERS/OPT489/DATABASES/DB874999"
-}
\ No newline at end of file
diff --git a/x-pack/spec/modules/azure/samples/sql_diagnostics/metric.json b/x-pack/spec/modules/azure/samples/sql_diagnostics/metric.json
deleted file mode 100644
index 3ca434214..000000000
--- a/x-pack/spec/modules/azure/samples/sql_diagnostics/metric.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "resourceId": "/SUBSCRIPTIONS/D427EE51-17CB-441A-9363-07390D5DC79E/RESOURCEGROUPS/RG5/PROVIDERS/MICROSOFT.SQL/SERVERS/SRV12/DATABASES/DJFU48",
-  "time": "2018-01-29T01:11:00.0000000Z",
-  "metricName": "cpu_percent",
-  "maximum": 0.265,
-  "total": 0.956,
-  "minimum": 0.227,
-  "average": 0.239,
-  "timeGrain": "PT1M",
-  "count": 4
-}
\ No newline at end of file
diff --git a/x-pack/spec/modules/azure/samples/sql_diagnostics/querystore_runtime_statistics.json b/x-pack/spec/modules/azure/samples/sql_diagnostics/querystore_runtime_statistics.json
deleted file mode 100644
index 73a1b9e85..000000000
--- a/x-pack/spec/modules/azure/samples/sql_diagnostics/querystore_runtime_statistics.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "ResourceGroup": "WWD66",
-  "time": "2017-11-16T04:07:34.1170000Z",
-  "LogicalServerName": "WWD66",
-  "SubscriptionId": "cbb8d135-bf4f-4792-b835-5872f7eac917",
-  "category": "QueryStoreRuntimeStatistics",
-  "operationName": "QueryStoreRuntimeStatisticsEvent",
-  "properties": {
-    "physical_io_reads": 0,
-    "max_rowcount": 21,
-    "num_physical_io_reads": 0,
-    "interval_end_time": 184911231314688,
-    "log_bytes_used": 0,
-    "interval_start_time": 184911230234688,
-    "cpu_time": 290,
-    "max_logical_io_reads": 0,
-    "rowcount": 20,
-    "dop": 1,
-    "execution_type": 0,
-    "plan_id": 1,
-    "duration": 291,
-    "max_query_max_used_memory": 128,
-    "query_plan_hash": "0xEF1E46726521C430",
-    "statement_sql_handle": "0x090055259E8A2BD73C43B8CD9F7FD43769CE0000000000000000000000000000000000000000000000000000",
-    "logical_io_reads": 0,
-    "query_id": 3,
-    "max_cpu_time": 366,
-    "max_num_physical_io_reads": 0,
-    "logical_io_writes": 0,
-    "max_logical_io_writes": 0,
-    "max_dop": 1,
-    "max_duration": 367,
-    "query_hash": "0xC619BA0B734EA585",
-    "ElasticPoolName": "RecommendedStandardPool1",
-    "DatabaseName": "DB73635G",
-    "count_executions": 1,
-    "max_physical_io_reads": 0,
-    "max_log_bytes_used": 0,
-    "query_max_used_memory": 128
-  },
-  "resourceId": "/SUBSCRIPTIONS/cbb8d135-bf4f-4792-b835-5872f7eac917/RESOURCEGROUPS/WWD66/PROVIDERS/MICROSOFT.SQL/SERVERS/WWD66/DATABASES/DB73635G"
-}
\ No newline at end of file
diff --git a/x-pack/spec/modules/azure/samples/sql_diagnostics/querystore_wait_statistics.json b/x-pack/spec/modules/azure/samples/sql_diagnostics/querystore_wait_statistics.json
deleted file mode 100644
index 764b84357..000000000
--- a/x-pack/spec/modules/azure/samples/sql_diagnostics/querystore_wait_statistics.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "ResourceGroup": "W66PT",
-  "time": "2017-09-24T09:39:33.7960000Z",
-  "LogicalServerName": "W66PT",
-  "SubscriptionId": "70e322ab-5b33-40c7-ad1e-88b2b7cfa236",
-  "category": "QueryStoreWaitStatistics",
-  "operationName": "QueryStoreWaitStatisticsEvent",
-  "properties": {
-    "query_id": 102871,
-    "query_param_type": 0,
-    "interval_end_time": 184683604528000,
-    "statement_key_hash": "4015210136",
-    "total_query_wait_time_ms": 29015,
-    "interval_start_time": 184683603448000,
-    "wait_category": "UNKNOWN",
-    "statement_type": "x_estypSelect",
-    "query_hash": "0x70E9B2B8E70EC4FB",
-    "ElasticPoolName": "RecommendedStandardPool1",
-    "query_plan_hash": "0xEBF8F8853BAC4D2C",
-    "DatabaseName": "DB45",
-    "count_executions": 14.0,
-    "statement_sql_handle": "0x0900D010687B69843F347EF35B3FE15D5F9F0000000000000000000000000000000000000000000000000000",
-    "plan_id": 288,
-    "is_parameterizable": "true",
-    "exec_type": 0,
-    "max_query_wait_time_ms": 2610
-  },
-  "resourceId": "/SUBSCRIPTIONS/70e322ab-5b33-40c7-ad1e-88b2b7cfa236/RESOURCEGROUPS/W66PT/PROVIDERS/MICROSOFT.SQL/SERVERS/W66PT/DATABASES/DB45"
-}
\ No newline at end of file
diff --git a/x-pack/spec/modules/azure/samples/sql_diagnostics/sql_insights.json b/x-pack/spec/modules/azure/samples/sql_diagnostics/sql_insights.json
deleted file mode 100644
index 4faec3443..000000000
--- a/x-pack/spec/modules/azure/samples/sql_diagnostics/sql_insights.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "ResourceGroup": "99SGV6",
-  "time": "2017-09-15T21:25:14.9950534Z",
-  "level": "Informational",
-  "LogicalServerName": "99SGV6",
-  "SubscriptionId": "83109cf8-e0d2-4fba-b262-e7722c72826c",
-  "category": "SQLInsights",
-  "operationName": "Insight",
-  "properties": {
-    "impact": [
-      {
-        "metric": "ExcessiveWaitingSeconds",
-        "value": 68,
-        "entity": {
-          "value": "0x8A3EF414DC5DABC8",
-          "type": "Query"
-        }
-      },
-      {
-        "metric": "ExcessiveWaitingSeconds",
-        "value": 17,
-        "entity": {
-          "value": "0x93DC8A02889C03D2",
-          "type": "Query"
-        }
-      },
-      {
-        "metric": "ExcessiveWaitingSeconds",
-        "value": 15.1,
-        "entity": {
-          "value": "0x70E9B2B8E70EC4FB",
-          "type": "Query"
-        }
-      }
-    ],
-    "issueId": 5213749,
-    "intervalEndTme": "2017-09-15T21:00:00.0000000Z",
-    "status": "Active",
-    "elasticPoolName": "RecommendedStandardPool1",
-    "intervalStartTime": "2017-09-15T20:45:00.0000000Z",
-    "rootCauseAnalysis": "The database is hitting its CPU limits. Average consumption has reached 86.8.",
-    "databaseName": "DB99876",
-    "detections": [],
-    "metric": "ExcessiveWaitingSeconds",
-    "value": 527.403
-  },
-  "resourceId": "/SUBSCRIPTIONS/83109cf8-e0d2-4fba-b262-e7722c72826c/RESOURCEGROUPS/99SGV6/PROVIDERS/MICROSOFT.SQL/SERVERS/99SGV6/DATABASES/DB99876"
-}
\ No newline at end of file
diff --git a/x-pack/spec/modules/azure/samples/sql_diagnostics/timeouts.json b/x-pack/spec/modules/azure/samples/sql_diagnostics/timeouts.json
deleted file mode 100644
index d2398d2f6..000000000
--- a/x-pack/spec/modules/azure/samples/sql_diagnostics/timeouts.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "ResourceGroup": "St76",
-  "time": "2017-09-18T22:39:52.1234940Z",
-  "LogicalServerName": "St76",
-  "SubscriptionId": "e3e7f07f-161e-4591-bb76-711473d4940c",
-  "category": "Timeouts",
-  "operationName": "TimeoutEvent",
-  "properties": {
-    "error_state": 173,
-    "query_hash": "8136230709041743099",
-    "ElasticPoolName": "RecommendedStandardPool1",
-    "query_plan_hash": "-1",
-    "DatabaseName": "DB9977"
-  },
-  "resourceId": "/SUBSCRIPTIONS/e3e7f07f-161e-4591-bb76-711473d4940c/RESOURCEGROUPS/St76/PROVIDERS/MICROSOFT.SQL/SERVERS/St76/DATABASES/DB9977"
-}
\ No newline at end of file
diff --git a/x-pack/spec/modules/azure/samples/yaml/logstash.advanced.yml b/x-pack/spec/modules/azure/samples/yaml/logstash.advanced.yml
deleted file mode 100644
index 496d35af7..000000000
--- a/x-pack/spec/modules/azure/samples/yaml/logstash.advanced.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-modules:
-  - name: azure
-    var.input.azure_event_hubs.threads: 8
-    var.input.azure_event_hubs.decorate_events: true
-    var.input.azure_event_hubs.consumer_group: logstash
-    var.input.azure_event_hubs.event_hubs:
-      - ["name",                      "event_hub_connection",      "storage_connection",                                      "initial_position", "decorate_events"]
-      - ["insights-operational-logs", "Endpoint=sb://example1...", "DefaultEndpointsProtocol=https;AccountName=example1....", "HEAD",             "true"]
-      - ["insights-metrics-pt1m",     "Endpoint=sb://example2...", "DefaultEndpointsProtocol=https;AccountName=example2....", "TAIL",             "true"]
-      - ["insights-logs-errors",      "Endpoint=sb://example3...", "DefaultEndpointsProtocol=https;AccountName=example3....", "LOOK_BACK",        "false"]
-      - ["insights-operational-logs", "Endpoint=sb://example4...", "DefaultEndpointsProtocol=https;AccountName=example4....", "HEAD",             "true"]
diff --git a/x-pack/spec/modules/azure/samples/yaml/logstash.advanced_invalid1.yml b/x-pack/spec/modules/azure/samples/yaml/logstash.advanced_invalid1.yml
deleted file mode 100644
index 78effe1b7..000000000
--- a/x-pack/spec/modules/azure/samples/yaml/logstash.advanced_invalid1.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-modules:
-  - name: azure
-    var.input.azure_event_hubs.threads: 8
-    var.input.azure_event_hubs.decorate_events: true
-    var.input.azure_event_hubs.consumer_group: logstash
-    var.input.azure_event_hubs.event_hubs:
-      - "Endpoint=sb://example1...EntityPath=insights-logs-errors"
-      - "Endpoint=sb://example2...EntityPath=insights-metrics-pt1m"
-
diff --git a/x-pack/spec/modules/azure/samples/yaml/logstash.advanced_invalid2.yml b/x-pack/spec/modules/azure/samples/yaml/logstash.advanced_invalid2.yml
deleted file mode 100644
index 7d3509874..000000000
--- a/x-pack/spec/modules/azure/samples/yaml/logstash.advanced_invalid2.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-modules:
-  - name: azure
-    var.input.azure_event_hubs.threads: 8
-    var.input.azure_event_hubs.decorate_events: true
-    var.input.azure_event_hubs.consumer_group: logstash
-
-
diff --git a/x-pack/spec/modules/azure/samples/yaml/logstash.basic.yml b/x-pack/spec/modules/azure/samples/yaml/logstash.basic.yml
deleted file mode 100644
index a7b979377..000000000
--- a/x-pack/spec/modules/azure/samples/yaml/logstash.basic.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-modules:
-  - name: azure
-    var.input.azure_event_hubs.threads: 8
-    var.input.azure_event_hubs.decorate_events: true
-    var.input.azure_event_hubs.consumer_group: "logstash"
-    var.input.azure_event_hubs.storage_connection: "DefaultEndpointsProtocol=https;AccountName=example...."
-    var.input.azure_event_hubs.event_hub_connections:
-      - "Endpoint=sb://example1...EntityPath=insights-logs-errors"
-      - "Endpoint=sb://example2...EntityPath=insights-metrics-pt1m"
-
-      
\ No newline at end of file
diff --git a/x-pack/spec/modules/azure/samples/yaml/logstash.basic_invalid1.yml b/x-pack/spec/modules/azure/samples/yaml/logstash.basic_invalid1.yml
deleted file mode 100644
index 6fe1a4f7f..000000000
--- a/x-pack/spec/modules/azure/samples/yaml/logstash.basic_invalid1.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-modules:
-  - name: azure
-    var.input.azure_event_hubs.threads: 8
-    var.input.azure_event_hubs.decorate_events: true
-    var.input.azure_event_hubs.consumer_group: "logstash"
-    var.input.azure_event_hubs.storage_connection: "DefaultEndpointsProtocol=https;AccountName=example...."
-    var.input.azure_event_hubs.event_hub_connections:
-      - ["name",                      "event_hub_connection",      "storage_connection",                                      "initial_position", "decorate_events"]
-      - ["insights-operational-logs", "Endpoint=sb://example1...", "DefaultEndpointsProtocol=https;AccountName=example1....", "HEAD",             "true"]
-      - ["insights-metrics-pt1m",     "Endpoint=sb://example2...", "DefaultEndpointsProtocol=https;AccountName=example2....", "TAIL",             "true"]
-      - ["insights-logs-errors",      "Endpoint=sb://example3...", "DefaultEndpointsProtocol=https;AccountName=example3....", "LOOK_BACK",        "false"]
-      - ["insights-operational-logs", "Endpoint=sb://example4...", "DefaultEndpointsProtocol=https;AccountName=example4....", "HEAD",             "true"]
-      
\ No newline at end of file
diff --git a/x-pack/spec/modules/azure/samples/yaml/logstash.basic_invalid2.yml b/x-pack/spec/modules/azure/samples/yaml/logstash.basic_invalid2.yml
deleted file mode 100644
index 7edd711d5..000000000
--- a/x-pack/spec/modules/azure/samples/yaml/logstash.basic_invalid2.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-modules:
-  - name: azure
-    var.input.azure_event_hubs.threads: 8
-    var.input.azure_event_hubs.decorate_events: true
-    var.input.azure_event_hubs.consumer_group: "logstash"
-    var.input.azure_event_hubs.storage_connection: "DefaultEndpointsProtocol=https;AccountName=example...."
-
-      
\ No newline at end of file
diff --git a/x-pack/spec/modules/module_license_checker_spec.rb b/x-pack/spec/modules/module_license_checker_spec.rb
deleted file mode 100644
index b22fa2ebd..000000000
--- a/x-pack/spec/modules/module_license_checker_spec.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-require "modules/module_license_checker"
-require "logstash/modules/settings_merger"
-require 'license_checker/x_pack_info'
-
-describe LogStash::LicenseChecker::ModuleLicenseChecker do
-
-
-  let(:settings) { LogStash::Runner::SYSTEM_SETTINGS }
-
-
-  shared_examples "can not get a license" do
-
-    before(:each) {
-      expect(subject).to receive(:license_reader).and_return(mock_reader)
-      expect(mock_reader).to receive(:fetch_xpack_info).and_return(LogStash::LicenseChecker::XPackInfo.failed_to_fetch)
-
-    }
-    let(:mock_reader) {double("reader")}
-
-    it "can't get a license" do
-      expect(subject.check(settings)).to be_falsey
-    end
-  end
-
-  shared_examples "can get a license" do
-    before(:each) {
-      expect(subject).to receive(:license_reader).and_return(mock_reader)
-      expect(mock_reader).to receive(:fetch_xpack_info).and_return(xpack_info)
-    }
-    let(:mock_reader) {double("reader")}
-    let(:xpack_info) {LogStash::LicenseChecker::XPackInfo.from_es_response(license)}
-    let(:issue_date) {Time.now - 86400}
-    let(:expiry_date) {Time.now + 86400}
-    let(:license) do
-      {
-          "license" => {
-              "status" => "active",
-              "uid" => SecureRandom.uuid,
-              "type" => returned_license,
-              "issue_date" => issue_date,
-              "issue_date_in_millis" => issue_date.to_i * 1000,
-              "expiry_date" => expiry_date,
-              "expiry_date_in_millis" => expiry_date.to_i * 1000,
-              "max_nodes" => 1000,
-              "issued_to" => "logstasher",
-              "issuer" => "elasticsearch",
-              "start_date_in_millis" => -1
-          }
-      }
-    end
-  end
-
-  context "any license" do
-    let(:subject) {LogStash::LicenseChecker::ModuleLicenseChecker.new(name,  ["basic", "trial", "standard", "gold", "platinum"])}
-    let(:returned_license) {"basic"}
-    let(:name) {"foo_module"}
-    let(:settings) do
-      LogStash::SETTINGS.clone.tap do |settings|
-        settings.set("modules", [{}])
-      end
-    end
-    include_examples "can get a license"
-
-    it "has valid license" do
-      expect(subject.check(settings)).to be_truthy
-    end
-  end
-
-  context "platinum license" do
-    let(:subject) {LogStash::LicenseChecker::ModuleLicenseChecker.new(name,  ["platinum"])}
-    let(:returned_license) {"platinum"}
-    let(:name) {"foo_module"}
-    let(:settings) do
-      LogStash::SETTINGS.clone.tap do |settings|
-        settings.set("modules", [{}])
-      end
-    end
-    include_examples "can get a license"
-
-    it "has valid license" do
-      expect(subject.check(settings)).to be_truthy
-    end
-  end
-
-  context "wrong license" do
-    let(:subject) {LogStash::LicenseChecker::ModuleLicenseChecker.new(name,  ["platinum"])}
-    let(:returned_license) {"basic"}
-    let(:name) {"foo_module"}
-    let(:settings) do
-      LogStash::SETTINGS.clone.tap do |settings|
-        settings.set("modules", [{}])
-      end
-    end
-    include_examples "can get a license"
-
-    it "does not have valid license" do
-      expect(subject.check(settings)).to be_falsey
-    end
-  end
-
-  context "no license" do
-    let(:subject) {LogStash::LicenseChecker::ModuleLicenseChecker.new(name,  ["basic", "trial", "standard", "gold", "platinum"])}
-    let(:name) {"foo_module"}
-    let(:settings) do
-      LogStash::SETTINGS.clone.tap do |settings|
-        settings.set("modules", [{}])
-      end
-    end
-    include_examples "can not get a license"
-  end
-
-end
diff --git a/x-pack/spec/monitoring/inputs/metrics/state_event/lir_serializer_spec.rb b/x-pack/spec/monitoring/inputs/metrics/state_event/lir_serializer_spec.rb
index 9d5096707..0a703bb6f 100644
--- a/x-pack/spec/monitoring/inputs/metrics/state_event/lir_serializer_spec.rb
+++ b/x-pack/spec/monitoring/inputs/metrics/state_event/lir_serializer_spec.rb
@@ -5,13 +5,13 @@
 require "spec_helper"
 require "logstash/environment"
 
-describe ::LogStash::Inputs::Metrics::StateEvent::LIRSerializer do
+describe ::LogStash::Config::LIRSerializer do
   let(:config) do
     <<-EOC
       input { fake_input {} }
-      filter { 
-        if ([foo] > 2) {
-          fake_filter {} 
+      filter {
+        if ([foo] < 2) {
+          fake_filter {}
         }
       }
       output { fake_output {} }
@@ -21,8 +21,11 @@ describe ::LogStash::Inputs::Metrics::StateEvent::LIRSerializer do
     [org.logstash.common.SourceWithMetadata.new("string", "spec", config)]
   end
 
+  let(:cve) { org.logstash.plugins.ConfigVariableExpander.without_secret(org.logstash.common.EnvironmentVariableProvider.default_provider()) }
   let(:lir_pipeline) do
-    ::LogStash::Compiler.compile_sources(config_source_with_metadata, LogStash::SETTINGS)
+#     ::LogStash::Compiler.compile_sources(config_source_with_metadata, true)
+    java_import org.logstash.config.ir.ConfigCompiler
+    ConfigCompiler.compileSources(config_source_with_metadata, true, cve)
   end
 
   describe "#serialize" do
diff --git a/x-pack/spec/monitoring/inputs/metrics/state_event_factory_spec.rb b/x-pack/spec/monitoring/inputs/metrics/state_event_factory_spec.rb
new file mode 100644
index 000000000..f79dcc8e0
--- /dev/null
+++ b/x-pack/spec/monitoring/inputs/metrics/state_event_factory_spec.rb
@@ -0,0 +1,78 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+require "logstash/agent"
+require "logstash/runner"
+require "spec_helper"
+require "monitoring/inputs/metrics/state_event_factory"
+require 'json'
+
+describe LogStash::Inputs::Metrics::StateEventFactory do
+  let(:schemas_path) { File.join(File.dirname(__FILE__), "..", "..", "..", "..", "spec", "monitoring", "schemas") }
+
+  let(:config) {
+    config_part = org.logstash.common.SourceWithMetadata.new("local", "...", 0, 0, "input { dummyblockinginput { } } output { null { } }")
+    Java::OrgLogstashConfigIr::PipelineConfig.new("DummySource".class, "fake_main".to_sym, [config_part], LogStash::SETTINGS)
+  }
+
+  let(:pipeline_settings) { LogStash::Runner::SYSTEM_SETTINGS.clone.merge({
+    "pipeline.id" => "main",
+    "config.string" => config.config_parts.first.text,
+  }) }
+
+  let(:agent) { LogStash::Agent.new(pipeline_settings) }
+  let(:metric) { agent.metric }
+  let(:collector) { metric.collector }
+  let(:agent_task) { start_agent(agent) }
+
+  before :each do
+    agent
+    agent_task
+
+    wait(60).for { agent.get_pipeline(:main) }.to_not be_nil
+
+    # collector.snapshot_metric is timing dependant and if fired too fast will miss some metrics.
+    # after some tests a correct metric_store.size is 72 but when it is incomplete it is lower.
+    # I guess this 72 is dependant on the metrics we collect and there is probably a better
+    # way to make sure no metrics are missing without forcing a hard sleep but this is what is
+    # easily observable, feel free to refactor with a better "timing" test here.
+    wait(60).for { collector.snapshot_metric.metric_store.size }.to be >= 72
+  end
+
+  after :each do
+    agent.shutdown
+    agent_task.wait
+    LogStash::SETTINGS.set_value("monitoring.enabled", false)
+  end
+
+  let(:pipeline) { LogStash::JavaPipeline.new(config) }
+
+  subject(:sut) { described_class.new(pipeline, "funky_cluster_uuid") }
+
+  context "with write direct flag enabled" do
+    let(:schema_file) { File.join(schemas_path, "states_document_new_schema.json") }
+
+    it "should create a valid new event shape" do
+      LogStash::SETTINGS.set_value("monitoring.enabled", true)
+
+      state_evt = sut.make
+      json = JSON.parse(state_evt.to_json)
+      expect(json['type']).to eq('logstash_state')
+      expect(json['logstash_state']).to be_truthy
+      expect(json['logstash_state']['pipeline']).to be_truthy
+      expect(JSON::Validator.fully_validate(schema_file, state_evt.to_json)).to be_empty
+    end
+  end
+
+  context "with write direct flag disabled" do
+    let(:schema_file) { File.join(schemas_path, "states_document_schema.json") }
+
+    it "should create a valid old event shape" do
+      LogStash::SETTINGS.set_value("monitoring.enabled", false)
+
+      state_evt = sut.make
+      expect(JSON::Validator.fully_validate(schema_file, state_evt.to_json)).to be_empty
+    end
+  end
+end
diff --git a/x-pack/spec/monitoring/inputs/metrics/stats_event_factory_spec.rb b/x-pack/spec/monitoring/inputs/metrics/stats_event_factory_spec.rb
new file mode 100644
index 000000000..b37b13a26
--- /dev/null
+++ b/x-pack/spec/monitoring/inputs/metrics/stats_event_factory_spec.rb
@@ -0,0 +1,118 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+require "logstash/agent"
+require "logstash/runner"
+require "spec_helper"
+require "monitoring/inputs/metrics/stats_event_factory"
+require "logstash/config/pipeline_config"
+require 'json'
+require "json-schema"
+
+shared_examples_for("old model monitoring event with webserver setting") do
+  let(:schema_file) { File.join(schemas_path, "monitoring_document_schema.json") }
+
+  it "should be valid" do
+    global_stats = {"uuid" => "00001" }
+    sut = described_class.new(global_stats, collector.snapshot_metric, nil)
+    LogStash::SETTINGS.set_value("monitoring.enabled", false)
+    LogStash::SETTINGS.set_value("api.enabled", webserver_enabled)
+
+    monitoring_evt = sut.make(agent, true)
+    json = JSON.parse(monitoring_evt.to_json)
+    expect(JSON::Validator.fully_validate(schema_file, monitoring_evt.to_json)).to be_empty
+  end
+end
+
+shared_examples_for("new model monitoring event with webserver setting") do
+  let(:schema_file) { File.join(schemas_path, "monitoring_document_new_schema.json") }
+
+  it "should be valid" do
+    global_stats = {"uuid" => "00001" }
+    sut = described_class.new(global_stats, collector.snapshot_metric, "funky_cluster_uuid")
+    LogStash::SETTINGS.set_value("monitoring.enabled", true)
+    LogStash::SETTINGS.set_value("api.enabled", webserver_enabled)
+
+    monitoring_evt = sut.make(agent, true)
+    json = JSON.parse(monitoring_evt.to_json)
+    expect(json['type']).to eq('logstash_stats')
+    expect(JSON::Validator.fully_validate(schema_file, monitoring_evt.to_json)).to be_empty
+  end
+end
+
+describe LogStash::Inputs::Metrics::StatsEventFactory do
+  let(:schemas_path) { File.join(File.dirname(__FILE__), "..", "..", "..", "..", "spec", "monitoring", "schemas") }
+  let(:queue) { Concurrent::Array.new }
+
+  let(:config) { "input { dummyblockinginput { } } output { null { } }" }
+
+  let(:pipeline_settings) { LogStash::Runner::SYSTEM_SETTINGS.clone.merge({
+    "pipeline.id" => "main",
+    "config.string" => config,
+    "api.enabled" => webserver_enabled,
+  }) }
+
+  let(:agent) { LogStash::Agent.new(pipeline_settings) }
+  let(:metric) { agent.metric }
+  let(:collector) { metric.collector }
+  let(:agent_task) { start_agent(agent) }
+
+  before :each do
+    @existing_api_enabled = LogStash::SETTINGS.get_value("api.enabled")
+    LogStash::SETTINGS.set_value("api.enabled", webserver_enabled)
+    agent
+    agent_task
+
+    wait(60).for { agent.get_pipeline(:main) }.to_not be_nil
+
+    # collector.snapshot_metric is timing dependant and if fired too fast will miss some metrics.
+    # after some tests a correct metric_store.size is 72 but when it is incomplete it is lower.
+    # I guess this 72 is dependant on the metrics we collect and there is probably a better
+    # way to make sure no metrics are missing without forcing a hard sleep but this is what is
+    # easily observable, feel free to refactor with a better "timing" test here.
+    wait(60).for { collector.snapshot_metric.metric_store.size }.to be >= 72
+
+    if webserver_enabled
+      # Wait http server is up
+      wait(120).for {
+        begin
+          collector.snapshot_metric.metric_store.get_shallow(:http_address)
+        rescue LogStash::Instrument::MetricStore::MetricNotFound => e
+          nil
+        end
+      }.not_to be_nil
+    end
+  end
+
+  after :each do
+    agent.shutdown
+    agent_task.wait
+    LogStash::SETTINGS.set_value("api.enabled", @existing_api_enabled)
+    LogStash::SETTINGS.set_value("monitoring.enabled", false)
+  end
+
+  context "new model" do
+    context "with webserver disabled" do
+      it_behaves_like("new model monitoring event with webserver setting") do
+        let(:webserver_enabled) {false}
+      end
+    end
+
+    context "with webserver enabled" do
+      it_behaves_like("new model monitoring event with webserver setting") do
+        let(:webserver_enabled) {true}
+      end
+    end
+  end
+
+ # TODO: fix issue https://github.com/elastic/logstash/issues/12711
+ xcontext "old model" do
+    it_behaves_like("old model monitoring event with webserver setting") do
+      let(:webserver_enabled) {false}
+    end
+    it_behaves_like("old model monitoring event with webserver setting") do
+      let(:webserver_enabled) {true}
+    end
+  end
+end
diff --git a/x-pack/spec/monitoring/inputs/metrics_spec.rb b/x-pack/spec/monitoring/inputs/metrics_spec.rb
index b94ebd334..4f669cf4c 100644
--- a/x-pack/spec/monitoring/inputs/metrics_spec.rb
+++ b/x-pack/spec/monitoring/inputs/metrics_spec.rb
@@ -2,11 +2,12 @@
 # or more contributor license agreements. Licensed under the Elastic License;
 # you may not use this file except in compliance with the Elastic License.
 
+require 'spec_helper'
 require "logstash-core"
+require "logstash/runner"
 require "logstash/agent"
 require "monitoring/inputs/metrics"
 require "rspec/wait"
-require 'spec_helper'
 require "json"
 require "json-schema"
 require 'monitoring/monitoring'
@@ -19,7 +20,6 @@ describe LogStash::Inputs::Metrics do
   let(:elasticsearch_username) { nil }
   let(:elasticsearch_password) { nil }
 
-
   subject(:metrics_input) { described_class.new(options) }
   let(:settings) do
     {
@@ -39,7 +39,6 @@ describe LogStash::Inputs::Metrics do
   end
 
   context "integration" do
-
     let(:schemas_path) { File.join(File.dirname(__FILE__), "..", "..", "..", "spec", "monitoring", "schemas") }
     let(:queue) { Concurrent::Array.new }
 
@@ -70,7 +69,6 @@ describe LogStash::Inputs::Metrics do
     end
 
     context "with pipeline execution" do
-
       before :each do
         allow(metrics_input).to receive(:fetch_global_stats).and_return({"uuid" => "00001" })
         allow(metrics_input).to receive(:exec_timer_task)
@@ -81,7 +79,7 @@ describe LogStash::Inputs::Metrics do
 
         wait(60).for { agent.get_pipeline(:main) }.to_not be_nil
 
-        metrics_input.metric = agent.metric
+        metrics_input.metric = agent.metric.namespace(:test)
 
         metrics_input.register
         metrics_input.run(queue)
@@ -135,7 +133,7 @@ describe LogStash::Inputs::Metrics do
           let(:schema_file) { File.join(schemas_path, "monitoring_document_schema.json") }
 
           describe "data event" do
-            it "has the correct schema" do
+            xit "has the correct schema" do
               wait(60).for { stats_events }.to_not be_empty
               expect(JSON::Validator.fully_validate(schema_file, stats_events.first.to_json)).to be_empty
             end
@@ -175,7 +173,7 @@ describe LogStash::Inputs::Metrics do
       describe "normal pipelines" do
         before(:each) do
           allow(pipeline).to receive(:system?).and_return(false)
-          allow(metrics_input).to receive(:state_event_for).with(pipeline).and_return(state_event)
+          allow(metrics_input).to receive(:state_event_for).with(pipeline).and_return([state_event])
           allow(metrics_input).to receive(:emit_event)
 
           metrics_input.update_pipeline_state(pipeline)
diff --git a/x-pack/spec/monitoring/inputs/timer_task_logger_spec.rb b/x-pack/spec/monitoring/inputs/timer_task_logger_spec.rb
index 32388961c..cffef9834 100644
--- a/x-pack/spec/monitoring/inputs/timer_task_logger_spec.rb
+++ b/x-pack/spec/monitoring/inputs/timer_task_logger_spec.rb
@@ -23,7 +23,7 @@ describe LogStash::Inputs::TimerTaskLogger do
         let(:exception) { Concurrent::TimeoutError.new }
 
         it "logs the exception in debug mode" do
-          expect(subject.logger).to receive(:debug).with(/metric shipper/, hash_including(:exception => exception.class, :message => exception.message ))
+          expect(subject.logger).to receive(:debug).with(/metric shipper/, hash_including(:exception => exception.class, :message => exception.message))
           subject.update(run_at, result, exception)
         end
       end
@@ -32,7 +32,7 @@ describe LogStash::Inputs::TimerTaskLogger do
         let(:exception) { ArgumentError.new }
 
         it "logs the exception in debug mode" do
-          expect(subject.logger).to receive(:error).with(/metric shipper/, hash_including(:exception => exception.class, :message => exception.message ))
+          expect(subject.logger).to receive(:error).with(/metric shipper/, hash_including(:exception => exception.class, :message => exception.message))
           subject.update(run_at, result, exception)
         end
       end
diff --git a/x-pack/spec/monitoring/internal_pipeline_source_spec.rb b/x-pack/spec/monitoring/internal_pipeline_source_spec.rb
index 1639f188a..ccbd9af1c 100644
--- a/x-pack/spec/monitoring/internal_pipeline_source_spec.rb
+++ b/x-pack/spec/monitoring/internal_pipeline_source_spec.rb
@@ -4,9 +4,8 @@
 
 require "logstash-core"
 require "logstash/agent"
-require "logstash/agent"
+require "logstash/runner"
 require "monitoring/inputs/metrics"
-require "logstash/config/pipeline_config"
 require "logstash/config/source/local"
 require 'license_checker/x_pack_info'
 require "rspec/wait"
@@ -16,18 +15,23 @@ require "json-schema"
 require 'license_checker/x_pack_info'
 require 'monitoring/monitoring'
 
-
 describe LogStash::Monitoring::InternalPipelineSource do
   context 'license testing' do
     let(:xpack_monitoring_interval) { 1 }
     let(:options) { { "collection_interval" => xpack_monitoring_interval,
                         "collection_timeout_interval" => 600 } }
 
-    subject { described_class.new(pipeline_config, mock_agent) }
+    subject { described_class.new(pipeline_config, mock_agent, system_settings) }
     let(:mock_agent) { double("agent")}
     let(:mock_license_client) { double("es_client")}
     let(:license_reader) { LogStash::LicenseChecker::LicenseReader.new(system_settings, 'monitoring', es_options)}
-    let(:system_settings) { LogStash::Runner::SYSTEM_SETTINGS.clone }
+    let(:extension) { LogStash::MonitoringExtension.new }
+    let(:system_settings) do
+      LogStash::Runner::SYSTEM_SETTINGS.clone.tap do |system_settings|
+        extension.additionals_settings(system_settings) # register defaults from extension
+        apply_settings(settings, system_settings) # apply `settings`
+      end
+    end
     let(:license_status) { 'active'}
     let(:license_type) { 'trial' }
     let(:license_expiry_date) { Time.now + (60 * 60 * 24)}
@@ -47,7 +51,7 @@ describe LogStash::Monitoring::InternalPipelineSource do
 
     let(:unordered_config_parts) { ordered_config_parts.shuffle }
 
-    let(:pipeline_config) { LogStash::Config::PipelineConfig.new(source, pipeline_id, unordered_config_parts, system_settings) }
+    let(:pipeline_config) { Java::OrgLogstashConfigIr::PipelineConfig.new(source, pipeline_id, unordered_config_parts, system_settings) }
 
     let(:es_options) do
       {
@@ -70,17 +74,18 @@ describe LogStash::Monitoring::InternalPipelineSource do
     end
 
     before :each do
-      allow(subject).to receive(:es_options_from_settings_or_modules).and_return(es_options)
       allow(subject).to receive(:license_reader).and_return(license_reader)
       allow(license_reader).to receive(:build_client).and_return(mock_license_client)
     end
 
     describe 'with licensing' do
+      let(:is_serverless) { false }
+
       context 'when xpack has not been installed on es 6' do
         let(:xpack_info) { LogStash::LicenseChecker::XPackInfo.xpack_not_installed }
         it "does not start the pipeline" do
           expect(subject).to_not receive(:enable_monitoring)
-          subject.update_license_state(xpack_info)
+          subject.update_license_state(xpack_info, is_serverless)
         end
       end
       context 'when the license has expired' do
@@ -90,33 +95,45 @@ describe LogStash::Monitoring::InternalPipelineSource do
         let(:xpack_info) { LogStash::LicenseChecker::XPackInfo.new(license, nil) }
         it "still starts the pipeline" do
           expect(subject).to receive(:enable_monitoring)
-          subject.update_license_state(xpack_info)
+          subject.update_license_state(xpack_info, is_serverless)
         end
       end
       context 'when the license server is not available' do
         let(:xpack_info) { LogStash::LicenseChecker::XPackInfo.new(nil, nil, nil, true) }
         it "does not start the pipeline" do
           expect(subject).to_not receive(:enable_monitoring)
-          subject.update_license_state(xpack_info)
+          subject.update_license_state(xpack_info, is_serverless)
         end
       end
 
-      %w(basic standard trial gold platinum).each  do |license_type|
+      LogStash::LicenseChecker::LICENSE_TYPES.each  do |license_type|
         context "With a valid #{license_type} license" do
           let(:license_type) { license_type }
           let(:license) do
             { "status" => "active", "type" => license_type }
           end
           let(:features) do
-            { "monitoring" => { "enabled" => true } }
+            { "monitoring" => { "available" => true, "enabled" => true } }
           end
           let(:xpack_info) { LogStash::LicenseChecker::XPackInfo.new(license, features) }
           it "starts the pipeline" do
             expect(subject).to receive(:enable_monitoring)
-            subject.update_license_state(xpack_info)
+            subject.update_license_state(xpack_info, is_serverless)
           end
         end
       end
     end
+
+    describe 'with serverless' do
+      let(:is_serverless) { true }
+
+      context 'when ES does not support monitoring API' do
+        let(:xpack_info) { LogStash::LicenseChecker::XPackInfo::SERVERLESS_20231031 }
+        it "does not start the pipeline" do
+          expect(subject).to_not receive(:enable_monitoring)
+          subject.update_license_state(xpack_info, is_serverless)
+        end
+      end
+    end
   end
 end
diff --git a/x-pack/spec/monitoring/pipeline_register_hook_spec.rb b/x-pack/spec/monitoring/pipeline_register_hook_spec.rb
new file mode 100644
index 000000000..e2074baae
--- /dev/null
+++ b/x-pack/spec/monitoring/pipeline_register_hook_spec.rb
@@ -0,0 +1,163 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+require 'monitoring/monitoring'
+
+describe LogStash::MonitoringExtension::PipelineRegisterHook do
+  subject(:monitoring_extension) { described_class.new }
+
+  let(:settings) {
+                   settings = @sys_settings.clone
+                   settings.set_value("xpack.monitoring.enabled", true)
+                   settings.set_value("xpack.monitoring.elasticsearch.hosts", "http://localhost:9200")
+                   settings.set_value("xpack.monitoring.elasticsearch.username", "elastic")
+                   settings.set_value("xpack.monitoring.elasticsearch.password", "changeme")
+                   settings
+                 }
+
+  before(:all) {
+    @extension = LogStash::MonitoringExtension.new
+    # used to register monitoring xpack's settings
+    @sys_settings = LogStash::Runner::SYSTEM_SETTINGS.clone
+    @extension.additionals_settings(@sys_settings)
+  }
+
+  context 'validate monitoring settings' do
+    it "it's not enabled with just xpack.monitoring.enabled set to true" do
+      expect(subject.monitoring_enabled?(settings)).to be_falsey
+    end
+
+    context 'when legacy monitoring is allowed and xpack monitoring is enabled' do
+      let(:settings) { super().merge({"xpack.monitoring.allow_legacy_collection" => true}) }
+
+      it "then internal monitoring should be effectively enabled" do
+        expect(subject.monitoring_enabled?(settings)).to be_truthy
+      end
+    end
+
+    it "work without any monitoring settings" do
+      settings.set_value("xpack.monitoring.enabled", true)
+      expect(subject.generate_pipeline_config(settings)).to be_truthy
+    end
+
+    it "monitoring.enabled should conflict with xpack.monitoring.enabled" do
+      settings.set_value("xpack.monitoring.enabled", true)
+      settings.set_value("monitoring.enabled", true)
+
+      expect {
+        subject.generate_pipeline_config(settings)
+      }.to raise_error(ArgumentError)
+    end
+
+    it "monitoring.* should conflict with any xpack.monitoring.*" do
+      settings.set_value("xpack.monitoring.collection.interval", "10s")
+      settings.set_value("monitoring.enabled", true)
+
+      expect {
+        subject.generate_pipeline_config(settings)
+      }.to raise_error(ArgumentError)
+    end
+
+    context 'ssl certificate verification setting' do
+    { 'full' => 'full',
+      'certificate' => 'full',
+      'none' => 'none',
+       nil => 'full', # unset, uses default
+    }.each do |setting_value, expected_result|
+        context "ssl certificate verification setting with `xpack.monitoring.elasticsearch.ssl.verification_mode` #{setting_value ? "set to `#{setting_value}`" : 'unset'}" do
+          let(:settings) {
+                           settings = super().merge("xpack.monitoring.elasticsearch.hosts" => "https://localhost:9200")
+                           setting_value.nil? ? settings : settings.merge("xpack.monitoring.elasticsearch.ssl.verification_mode" => setting_value)
+                         }
+
+          it "the generated pipeline includes `ssl_verification_mode => #{expected_result}`" do
+            generated_pipeline_config = subject.generate_pipeline_config(settings)
+            expect(generated_pipeline_config).to include("ssl_verification_mode => #{expected_result}")
+          end
+        end
+      end
+    end
+
+    context 'ssl ca_trusted_fingerprint setting' do
+      let(:ca_trusted_fingerprint) { SecureRandom.hex(32) }
+      let(:settings) { super().merge("xpack.monitoring.elasticsearch.ssl.ca_trusted_fingerprint" => ca_trusted_fingerprint) }
+
+      context 'the generated pipeline' do
+        subject(:generated_pipeline_config) { monitoring_extension.generate_pipeline_config(settings) }
+
+        it %Q(includes `ca_trusted_fingerprint` with the value of the provided `ssl.ca_trusted_fingerprint`) do
+          expect(generated_pipeline_config).to include(%Q(ca_trusted_fingerprint => "#{ca_trusted_fingerprint}"))
+        end
+      end
+    end
+
+    context 'ssl cipher suites setting' do
+      let(:settings) { super().merge("xpack.monitoring.elasticsearch.ssl.cipher_suites" => ["FOO", "BAR"]) }
+
+      context 'the generated pipeline' do
+        subject(:generated_pipeline_config) { monitoring_extension.generate_pipeline_config(settings) }
+
+        it 'The generated pipeline includes `ssl_cipher_suites`' do
+          expect(generated_pipeline_config).to include('ssl_cipher_suites => ["FOO", "BAR"]')
+        end
+      end
+    end
+
+    context 'ssl keystore setting' do
+      let(:ssl_keystore_path) { Tempfile.new('ssl_keystore_file') }
+      let(:settings) { super().merge(
+        "xpack.monitoring.elasticsearch.ssl.keystore.path" => ssl_keystore_path.path,
+        "xpack.monitoring.elasticsearch.ssl.keystore.password" => "foo"
+      ) }
+
+      context 'the generated pipeline' do
+        subject(:generated_pipeline_config) { monitoring_extension.generate_pipeline_config(settings) }
+
+        it 'The generated pipeline includes `ssl_keystore_path` and `ssl_keystore_password`' do
+          expect(generated_pipeline_config).to include("ssl_keystore_path => \"#{ssl_keystore_path.path}\"")
+          expect(generated_pipeline_config).to include('ssl_keystore_password => "foo"')
+        end
+      end
+    end
+
+    context 'ssl truststore setting' do
+      let(:ssl_truststore_path) { Tempfile.new('ssl_truststore_file') }
+      let(:settings) do
+        super().merge(
+          "xpack.monitoring.elasticsearch.ssl.truststore.path" => ssl_truststore_path.path,
+          "xpack.monitoring.elasticsearch.ssl.truststore.password" => "foo"
+        )
+      end
+
+      context 'the generated pipeline' do
+        subject(:generated_pipeline_config) { monitoring_extension.generate_pipeline_config(settings) }
+
+        it 'The generated pipeline includes `ssl_truststore_path` and `ssl_truststore_password`' do
+          expect(generated_pipeline_config).to include("ssl_truststore_path => \"#{ssl_truststore_path.path}\"")
+          expect(generated_pipeline_config).to include('ssl_truststore_password => "foo"')
+        end
+      end
+    end
+
+    context 'ssl certificate setting' do
+      let(:ssl_certificate_path) { Tempfile.new('ssl_certificate_file') }
+      let(:ssl_key_path) { Tempfile.new('ssl_key_file') }
+      let(:settings) do
+        super().merge(
+          "xpack.monitoring.elasticsearch.ssl.certificate" => ssl_certificate_path.path,
+          "xpack.monitoring.elasticsearch.ssl.key" => ssl_key_path.path
+        )
+      end
+
+      context 'the generated pipeline' do
+        subject(:generated_pipeline_config) { monitoring_extension.generate_pipeline_config(settings) }
+
+        it 'The generated pipeline includes `ssl_truststore_path` and `ssl_truststore_password`' do
+          expect(generated_pipeline_config).to include("ssl_certificate => \"#{ssl_certificate_path.path}\"")
+          expect(generated_pipeline_config).to include("ssl_key => \"#{ssl_key_path.path}\"")
+        end
+      end
+    end
+  end
+end
diff --git a/x-pack/spec/monitoring/schemas/monitoring_document_new_schema.json b/x-pack/spec/monitoring/schemas/monitoring_document_new_schema.json
new file mode 100644
index 000000000..d8fd6855b
--- /dev/null
+++ b/x-pack/spec/monitoring/schemas/monitoring_document_new_schema.json
@@ -0,0 +1,186 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "definitions": {
+    "reloads": {
+      "type": "object",
+      "required": ["failures", "successes"],
+      "properties": {
+        "failures": { "type": "number" },
+        "successes": { "type": "number" }
+      }
+    },
+    "events": {
+      "type": "object",
+      "required": ["filtered", "in", "duration_in_millis", "out"],
+      "properties": {
+        "filtered": { "type": "number" },
+        "in": { "type": "number" },
+        "duration_in_millis": { "type": "number" },
+        "out": { "type": "number" }
+      }
+    }
+  },
+  "type": {"type": "string" },
+  "cluster_uuid": {"type": "string" },
+  "interval_ms": {"type": "integer" },
+  "timestamp": {"type": "string" },
+  "logstash_stats": {
+    "type": "object",
+    "required": ["jvm", "logstash", "process", "os", "events", "queue", "reloads", "pipelines"],
+    "properties": {
+      "jvm": {
+        "type": "object",
+        "required": ["mem", "uptime_in_millis", "gc"],
+        "properties": {
+          "mem": {
+            "type": "object",
+            "require": ["heap_used_in_bytes", "heap_max_in_bytes", "heap_used_percent"],
+            "properties": {
+              "heap_used_percent": { "type": "number" },
+              "heap_max_in_bytes": { "type": "number" },
+              "heap_used_in_bytes": { "type": "number" }
+            }
+          },
+          "uptime_in_millis": { "type": "number" },
+          "gc": {
+            "type": "object",
+            "required": ["collectors"],
+            "properties": {
+              "collectors": {
+                "type": "object",
+                "required": ["young", "old"],
+                "properties": {
+                  "young": {
+                    "type": "object",
+                    "required": ["collection_count", "collection_time_in_millis"],
+                    "properties": {
+                      "collection_count": {"type": "number"},
+                      "collection_time_in_millis": {"type": "number"}
+                    }
+                  },
+                  "old": {
+                    "type": "object",
+                    "required": ["collection_count", "collection_time_in_millis"],
+                    "properties": {
+                      "collection_count": {"type": "number"},
+                      "collection_time_in_millis": {"type": "number"}
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "logstash": {
+        "type": "object",
+        "required": ["http_address", "uuid", "ephemeral_id"],
+        "properties": {
+          "http_address": { "type": "string" },
+          "uuid": { "type": "string" },
+          "ephemeral_id": { "type": "string" }
+        }
+      },
+      "process": {
+        "type": "object",
+        "required": ["open_file_descriptors", "max_file_descriptors", "cpu"],
+        "properties": {
+          "open_file_descriptors": { "type": "number" },
+          "max_file_descriptors": { "type": "number" },
+          "cpu": {
+            "type": "object",
+            "required": ["percent"],
+            "properties": { "percent": { "type": "number"} }
+          }
+        }
+      },
+      "os": {
+        "type": "object",
+        "required": ["cpu"],
+        "properties": {
+          "cpu": {
+            "type": "object",
+            "required": ["load_average"],
+            "properties": {
+              "load_average": {
+                "type": "object",
+                "required": ["1m"],
+                "properties": {
+                  "1m": {"type": "number"},
+                  "5m": {"type": "number"},
+                  "15m": {"type": "number"}
+                }
+              }
+            }
+          }
+        }
+      },
+      "events": {"$ref": "#/definitions/events"},
+      "queue": {
+        "type": "object",
+        "required": ["events_count"],
+        "properties": {
+          "events_count": {"type": "number"}
+        }
+      },
+      "reloads": {"$ref": "#/definitions/reloads"},
+      "timestamp": {"type": "string"},
+      "pipelines": {
+        "type": "array",
+        "minItems": 1,
+        "uniqueItems": true,
+        "items": {
+          "type": "object",
+          "required": ["id", "hash", "ephemeral_id", "events", "queue", "reloads", "vertices"],
+          "properties": {
+            "id": {"type": "string"},
+            "hash": {"type": "string"},
+            "ephemeral_id": {"type": "string"},
+            "reloads": {"$ref": "#/definitions/reloads"},
+            "queue": {
+              "type": "object",
+              "required": ["events_count", "type", "queue_size_in_bytes", "max_queue_size_in_bytes"],
+              "properties": {
+                "type": {"type": "string"},
+                "events_count": {"type": "number"},
+                "queue_size_in_bytes": {"type": "number"},
+                "max_queue_size_in_bytes": {"type": "number"}
+              }
+            },
+            "events": {"$ref": "#/definitions/events"},
+            "vertices": {
+              "type": "array",
+              "minItems": 1,
+              "uniqueItems": true,
+              "items": {
+                "type": "object",
+                "patternProperties": {
+                  "long_counters": {
+                    "type": "array",
+                    "items": {
+                      "type": "object",
+                      "properties": {
+                        "name": {"type": "string"},
+                        "value": {"type": "number"}
+                      }
+                    }
+                  },
+                  "double_gauges": {
+                    "type": "array",
+                    "items": {
+                      "type": "object",
+                      "properties": {
+                        "name": {"type": "string"},
+                        "value": {"type": "string"}
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/x-pack/spec/monitoring/schemas/monitoring_document_schema.json b/x-pack/spec/monitoring/schemas/monitoring_document_schema.json
index df7238b06..d0c31fd7b 100644
--- a/x-pack/spec/monitoring/schemas/monitoring_document_schema.json
+++ b/x-pack/spec/monitoring/schemas/monitoring_document_schema.json
@@ -71,7 +71,7 @@
       "type": "object",
       "required": ["http_address", "uuid", "ephemeral_id"],
       "properties": {
-        "http_address": { "type": "string" },
+        "http_address": { "type": ["string", "null"] },
         "uuid": { "type": "string" },
         "ephemeral_id": { "type": "string" }
       }
diff --git a/x-pack/spec/monitoring/schemas/states_document_new_schema.json b/x-pack/spec/monitoring/schemas/states_document_new_schema.json
new file mode 100644
index 000000000..eb9e90f4f
--- /dev/null
+++ b/x-pack/spec/monitoring/schemas/states_document_new_schema.json
@@ -0,0 +1,94 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "definitions": {
+    "edge": {
+      "type": "object",
+      "properties": {
+        "from": {"type": "string"},
+        "id": {"type": "string"},
+        "to": {"type": "string"},
+        "type": {"type": "string"}
+      }
+    },
+    "vertex": {
+      "type": "object",
+      "properties": {
+        "id": {"type": "string"},
+        "explicit_id": {"type": "boolean"},
+        "type": {"type": "string"},
+        "meta": {
+          "anyOf": [
+            {"type": "null"},
+            {
+              "type": "object",
+              "properties": {
+                "source": {
+                  "type": "object",
+                  "properties": {
+                    "protocol": {"type": "string"},
+                    "id": {"type": "string"},
+                    "line": {"type": "number"},
+                    "column": {"type": "number"},
+                    "text": {"type": "string"}
+                  }
+                }
+              }
+            }
+          ]
+        }
+      }
+    }
+  },
+  "properties": {
+    "type": {"type": "string" },
+    "cluster_uuid": {"type": "string" },
+    "interval_ms": {"type": "integer" },
+    "timestamp": {"type": "string" },
+    "logstash_state": {
+      "type": "object",
+      "properties": {
+        "pipeline": {
+          "type": "object",
+          "properties": {
+            "batch_size": {"type": "integer"},
+            "workers": {"type": "integer"},
+            "hash": {"type": "string"},
+            "ephemeral_id": {"type": "string"},
+            "type": {"type": "string"},
+            "name": {"type": "string"},
+            "representation": {
+              "type": "object",
+              "properties": {
+                "hash": {"type": "string"},
+                "version": {"type": "string"},
+                "graph": {
+                  "type": "object",
+                  "properties": {
+                    "edges": {
+                      "type": "array",
+                      "items": {"$ref": "#/definitions/edge"}
+                    },
+                    "vertices": {
+                      "type": "array",
+                      "items": {"$ref": "#/definitions/vertex"}
+                    }
+                  }
+                },
+                "plugins": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "name": {"type": "string"},
+                      "version": {"type": "string"}
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/x-pack/spec/support/helpers.rb b/x-pack/spec/support/helpers.rb
index eb26a1262..340750346 100644
--- a/x-pack/spec/support/helpers.rb
+++ b/x-pack/spec/support/helpers.rb
@@ -30,9 +30,37 @@ def apply_settings(settings_values, settings = nil)
     settings.set(key, value)
   end
 
+  return yield(settings) if block_given?
+
   settings
 end
 
+##
+# yields to the provided block with the ENV modified by
+# the provided overrides. Values given as `nil` will be deleted
+# if present in the base ENV.
+#
+# @param replacement [Hash{String=>[String,nil]}]
+def with_environment(overrides)
+  replacement = ENV.to_hash
+                   .merge(overrides)
+                   .reject { |_, v| v.nil? }
+
+  with_environment!(replacement) { yield }
+end
+
+##
+# yields to the provided block with the ENV replaced
+# @param replacement [Hash{String=>String}]
+def with_environment!(replacement)
+  original = ENV.to_hash.dup.freeze
+  ENV.replace(replacement)
+
+  yield
+ensure
+  ENV.replace(original)
+end
+
 def start_agent(agent)
   agent_task = Stud::Task.new do
     begin
@@ -64,3 +92,20 @@ module LogStash
     end
   end
 end
+
+def cluster_info(version = LOGSTASH_VERSION, build_flavour = "default")
+  {"name" => "MacBook-Pro",
+   "cluster_name" => "elasticsearch",
+   "cluster_uuid" => "YgpKq8VkTJuGTSb9aidlIA",
+   "version" =>
+     {"number" => "#{version}",
+      "build_flavor" => "#{build_flavour}",
+      "build_type" => "tar",
+      "build_hash" => "26eb422dc55236a1c5625e8a73e5d866e54610a2",
+      "build_date" => "2020-09-24T09:37:06.459350Z",
+      "build_snapshot" => true,
+      "lucene_version" => "8.7.0",
+      "minimum_wire_compatibility_version" => "7.17.0",
+      "minimum_index_compatibility_version" => "7.0.0"},
+   "tagline" => "You Know, for Search"}
+end
diff --git a/x-pack/src/test/java/org/logstash/xpack/test/RSpecIntegrationTests.java b/x-pack/src/test/java/org/logstash/xpack/test/RSpecIntegrationTests.java
index 2524581ac..c62f29f17 100644
--- a/x-pack/src/test/java/org/logstash/xpack/test/RSpecIntegrationTests.java
+++ b/x-pack/src/test/java/org/logstash/xpack/test/RSpecIntegrationTests.java
@@ -1,34 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+
 package org.logstash.xpack.test;
 
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.junit.Assert;
 import org.junit.Test;
-import org.logstash.RubyUtil;
-import org.logstash.Rubyfier;
 
-public final class RSpecIntegrationTests {
-    @Test
-    public void rspecTests() throws Exception {
-        RubyUtil.RUBY.getENV().put("IS_JUNIT_RUN", "true");
-        RubyUtil.RUBY.getGlobalVariables().set(
-            "$JUNIT_ARGV", Rubyfier.deep(RubyUtil.RUBY, Arrays.asList(
-                "-fd", "qa/integration"
-            ))
-        );
-        final Path rspec = Paths.get(
-            org.assertj.core.util.Files.currentFolder().getParent(), "lib/bootstrap/rspec.rb"
-        );
-        final IRubyObject result = RubyUtil.RUBY.executeScript(
-            new String(Files.readAllBytes(rspec), StandardCharsets.UTF_8),
-            rspec.toFile().getAbsolutePath()
-        );
-        if (!result.toJava(Long.class).equals(0L)) {
-            Assert.fail("RSpec test suit saw at least one failure.");
-        }
+import java.util.Arrays;
+import java.util.List;
+
+public class RSpecIntegrationTests extends RSpecTests {
+
+    @Override
+    protected List<String> rspecArgs() {
+        return Arrays.asList("-fd", "qa/integration");
     }
+
+    @Test
+    @Override
+    public void rspecTests() throws Exception {
+        super.rspecTests();
+    }
+
 }
diff --git a/x-pack/src/test/java/org/logstash/xpack/test/RSpecTests.java b/x-pack/src/test/java/org/logstash/xpack/test/RSpecTests.java
index 241c6590d..1012f1e1a 100644
--- a/x-pack/src/test/java/org/logstash/xpack/test/RSpecTests.java
+++ b/x-pack/src/test/java/org/logstash/xpack/test/RSpecTests.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+
 package org.logstash.xpack.test;
 
 import java.nio.charset.StandardCharsets;
@@ -5,24 +12,57 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
+import java.util.List;
+
+import org.jruby.Ruby;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.junit.Assert;
 import org.junit.Test;
+
+import org.logstash.Logstash;
 import org.logstash.RubyUtil;
 import org.logstash.Rubyfier;
 
-public final class RSpecTests {
+public class RSpecTests {
+
+    static final Path LS_HOME;
+
+    static {
+        Path root;
+        if (System.getProperty("logstash.root.dir") == null) {
+            // make sure we work from IDE as well as when run with Gradle
+            root = Paths.get("").toAbsolutePath(); // LS_HOME/x-pack
+            if (root.endsWith("x-pack")) root = root.getParent();
+        } else {
+            root = Paths.get(System.getProperty("logstash.root.dir")).toAbsolutePath();
+        }
+
+        if (!root.resolve("versions.yml").toFile().exists()) {
+            throw new AssertionError("versions.yml not found is logstash root dir: " + root);
+        }
+        LS_HOME = root;
+
+        initializeGlobalRuntime(root);
+    }
+
+    private static Ruby initializeGlobalRuntime(final Path root) {
+        String[] args = new String[] { "--disable-did_you_mean" };
+        Ruby runtime = Ruby.newInstance(Logstash.initRubyConfig(root, null /* qa/integration */, args));
+        if (runtime != RubyUtil.RUBY) throw new AssertionError("runtime already initialized");
+        return runtime;
+    }
+
+    protected List<String> rspecArgs() {
+        return Arrays.asList("-fd", "--pattern", "spec/**/*_spec.rb");
+    }
+
     @Test
     public void rspecTests() throws Exception {
         RubyUtil.RUBY.getENV().put("IS_JUNIT_RUN", "true");
         RubyUtil.RUBY.getGlobalVariables().set(
-            "$JUNIT_ARGV", Rubyfier.deep(RubyUtil.RUBY, Arrays.asList(
-                "-fd", "--pattern", "spec/**/*_spec.rb"
-            ))
-        );
-        final Path rspec = Paths.get(
-            org.assertj.core.util.Files.currentFolder().getParent(), "lib/bootstrap/rspec.rb"
+            "$JUNIT_ARGV", Rubyfier.deep(RubyUtil.RUBY, rspecArgs())
         );
+        final Path rspec = LS_HOME.resolve("lib").resolve("bootstrap").resolve("rspec.rb");
         final IRubyObject result = RubyUtil.RUBY.executeScript(
             new String(Files.readAllBytes(rspec), StandardCharsets.UTF_8),
             rspec.toFile().getAbsolutePath()